[rt-commit] [svn] r660 - in rt: . branches/rt-3.3 branches/rt-3.3/bin branches/rt-3.3/etc branches/rt-3.3/etc/upgrade/3.1.15 branches/rt-3.3/html branches/rt-3.3/html/Admin/Elements branches/rt-3.3/html/Elements branches/rt-3.3/html/REST/1.0 branches/rt-3.3/html/REST/1.0/Forms/ticket branches/rt-3.3/html/REST/1.0/search branches/rt-3.3/html/Scope/Elements branches/rt-3.3/html/Search/Elements branches/rt-3.3/html/SelfService/Elements branches/rt-3.3/html/Ticket branches/rt-3.3/html/Ticket/Attachment branches/rt-3.3/html/Ticket/Elements branches/rt-3.3/lib/RT branches/rt-3.3/lib/RT/Action branches/rt-3.3/lib/RT/I18N branches/rt-3.3/lib/RT/Interface branches/rt-3.3/lib/RT/Interface/Email/Auth branches/rt-3.3/lib/t branches/rt-3.3/sbin

autrijus at fsck.com autrijus at fsck.com
Fri Apr 2 08:43:46 EST 2004


Author: autrijus
Date: Fri Apr  2 08:43:44 2004
New Revision: 660

Added:
   rt/branches/rt-3.3/README.Oracle
   rt/branches/rt-3.3/etc/upgrade/3.1.15/
   rt/branches/rt-3.3/etc/upgrade/3.1.15/content
Modified:
   rt/   (props changed)
   rt/branches/rt-3.3/   (props changed)
   rt/branches/rt-3.3/Makefile.in   (props changed)
   rt/branches/rt-3.3/UPGRADING   (props changed)
   rt/branches/rt-3.3/bin/mason_handler.fcgi.in   (props changed)
   rt/branches/rt-3.3/bin/mason_handler.scgi.in   (props changed)
   rt/branches/rt-3.3/bin/rt-crontool.in   (props changed)
   rt/branches/rt-3.3/bin/rt-mailgate.in   (props changed)
   rt/branches/rt-3.3/bin/rt.in   (contents, props changed)
   rt/branches/rt-3.3/bin/webmux.pl.in   (props changed)
   rt/branches/rt-3.3/config.layout   (props changed)
   rt/branches/rt-3.3/configure.ac   (props changed)
   rt/branches/rt-3.3/etc/initialdata
   rt/branches/rt-3.3/etc/schema.Informix   (props changed)
   rt/branches/rt-3.3/etc/schema.Oracle   (props changed)
   rt/branches/rt-3.3/etc/schema.SQLite   (props changed)
   rt/branches/rt-3.3/html/Admin/Elements/EditScrip   (props changed)
   rt/branches/rt-3.3/html/Admin/Elements/SelectStage
   rt/branches/rt-3.3/html/Elements/Callback   (props changed)
   rt/branches/rt-3.3/html/Elements/MessageBox   (props changed)
   rt/branches/rt-3.3/html/Elements/SelectLang   (props changed)
   rt/branches/rt-3.3/html/Elements/SelectMatch   (props changed)
   rt/branches/rt-3.3/html/Elements/SelectWatcherType   (props changed)
   rt/branches/rt-3.3/html/Elements/SetupSessionCookie   (props changed)
   rt/branches/rt-3.3/html/Elements/SimpleSearch   (props changed)
   rt/branches/rt-3.3/html/REST/1.0/Forms/ticket/default   (props changed)
   rt/branches/rt-3.3/html/REST/1.0/Forms/ticket/history   (props changed)
   rt/branches/rt-3.3/html/REST/1.0/autohandler   (props changed)
   rt/branches/rt-3.3/html/REST/1.0/dhandler   (props changed)
   rt/branches/rt-3.3/html/REST/1.0/search/ticket   (props changed)
   rt/branches/rt-3.3/html/Scope/Elements/ShowHistory
   rt/branches/rt-3.3/html/Scope/Elements/ShowTransaction
   rt/branches/rt-3.3/html/Search/Elements/PickRestriction   (props changed)
   rt/branches/rt-3.3/html/SelfService/Elements/MyRequests   (props changed)
   rt/branches/rt-3.3/html/Ticket/Attachment/dhandler   (props changed)
   rt/branches/rt-3.3/html/Ticket/Display.html
   rt/branches/rt-3.3/html/Ticket/Elements/FindAttachments
   rt/branches/rt-3.3/html/Ticket/Elements/ShowAttachments   (props changed)
   rt/branches/rt-3.3/html/Ticket/Elements/ShowHistory
   rt/branches/rt-3.3/html/Ticket/Elements/ShowMessageStanza   (props changed)
   rt/branches/rt-3.3/html/Ticket/Elements/ShowRequestor
   rt/branches/rt-3.3/html/Ticket/Elements/ShowTransaction
   rt/branches/rt-3.3/html/Ticket/Elements/Tabs
   rt/branches/rt-3.3/html/index.html   (contents, props changed)
   rt/branches/rt-3.3/lib/RT/Action/AutoOpen.pm   (props changed)
   rt/branches/rt-3.3/lib/RT/Action/CreateTickets.pm   (contents, props changed)
   rt/branches/rt-3.3/lib/RT/Attachment_Overlay.pm   (props changed)
   rt/branches/rt-3.3/lib/RT/Attachments_Overlay.pm
   rt/branches/rt-3.3/lib/RT/Base.pm   (props changed)
   rt/branches/rt-3.3/lib/RT/CustomField_Overlay.pm   (props changed)
   rt/branches/rt-3.3/lib/RT/EmailParser.pm   (props changed)
   rt/branches/rt-3.3/lib/RT/Group_Overlay.pm   (props changed)
   rt/branches/rt-3.3/lib/RT/Handle.pm   (contents, props changed)
   rt/branches/rt-3.3/lib/RT/I18N.pm   (props changed)
   rt/branches/rt-3.3/lib/RT/I18N/fi.po   (contents, props changed)
   rt/branches/rt-3.3/lib/RT/I18N/fr.po   (props changed)
   rt/branches/rt-3.3/lib/RT/I18N/zh_cn.po
   rt/branches/rt-3.3/lib/RT/I18N/zh_tw.po
   rt/branches/rt-3.3/lib/RT/Interface/Email/Auth/MailFrom.pm   (props changed)
   rt/branches/rt-3.3/lib/RT/Interface/Web.pm   (contents, props changed)
   rt/branches/rt-3.3/lib/RT/Principal_Overlay.pm   (props changed)
   rt/branches/rt-3.3/lib/RT/Queue_Overlay.pm   (contents, props changed)
   rt/branches/rt-3.3/lib/RT/StyleGuide.pod   (props changed)
   rt/branches/rt-3.3/lib/RT/Template_Overlay.pm   (props changed)
   rt/branches/rt-3.3/lib/RT/Ticket_Overlay.pm   (contents, props changed)
   rt/branches/rt-3.3/lib/RT/Tickets_Overlay.pm   (contents, props changed)
   rt/branches/rt-3.3/lib/RT/Tickets_Overlay_SQL.pm   (contents, props changed)
   rt/branches/rt-3.3/lib/RT/Transaction_Overlay.pm   (props changed)
   rt/branches/rt-3.3/lib/RT/Transactions_Overlay.pm
   rt/branches/rt-3.3/lib/RT/URI.pm   (contents, props changed)
   rt/branches/rt-3.3/lib/RT/User_Overlay.pm   (props changed)
   rt/branches/rt-3.3/lib/RT/Users_Overlay.pm   (props changed)
   rt/branches/rt-3.3/lib/t/03web.pl.in   (props changed)
   rt/branches/rt-3.3/lib/t/04_send_email.pl.in   (props changed)
   rt/branches/rt-3.3/sbin/license_tag   (props changed)
   rt/branches/rt-3.3/sbin/rt-test-dependencies.in   (props changed)
Log:
MERGE: 3.1 to 3.3

Added: rt/branches/rt-3.3/README.Oracle
==============================================================================
--- (empty file)
+++ rt/branches/rt-3.3/README.Oracle	Fri Apr  2 08:43:44 2004
@@ -0,0 +1,37 @@
+In order to install RT with Oracle, the database must first be
+prepared.  Ports of RT to other databases will automatically create
+the RT schema.  This is not done for Oracle because most sites wishing
+to deploy RT on Oracle will have choose to make specific configuration
+of the RT user, for example to select the appropriate tablespace or to
+set up a resource profile.  The RT user must have appropriate
+privileges similar to the resource and connect roles and must have the
+"query rewrite" system privilege.
+  Here is an example of commands to create an RT user called "RT" with
+a password of "rt".
+
+  create user rt identified by rt default tablespace users temporary
+    tablespace temp;
+  grant resource, connect, query rewrite to rt;
+
+
+RT should not run its schema creation as the Oracle DBA; instead the
+schema creation should be run as the RT user.  To accomplish this set
+the --with-rt-dba configuration parameter to the RT user, not to the
+Oracle DBA.  As an example, the following might be appropriate to
+configure RT for the example.com Oracle database.
+
+  ./configure --prefix /usr/local/rt --with-db-type=Oracle \
+        --with-db-dba=rt --with-db-database=example.com \
+    --with-db-rt-user=rt \
+        --with-db-rt-pass=rt 
+
+
+As with all databases it is important to analyze the Schema and get
+current statistics after any significant dataset change.  Oracle's
+cost-based optimizer can provide particularly bad performance when the
+schema statistics are significantly inaccurate.  To analyze the schema
+of a user called rt, execute the following from withing Sqlplus.
+
+  execute dbms_utility.analyze_schema( 'RT', 'estimate');
+
+

Modified: rt/branches/rt-3.3/bin/rt.in
==============================================================================
--- rt/branches/rt-3.3/bin/rt.in	(original)
+++ rt/branches/rt-3.3/bin/rt.in	Fri Apr  2 08:43:44 2004
@@ -148,9 +148,8 @@
             my $title = $item->[2]{Title};
             my @titles = ref $title eq 'ARRAY' ? @$title : $title;
 
-            foreach $title (@titles) {
-                $help{$title} = $item->[2]{Text};
-            }
+        foreach $title (grep $_, @titles) {
+            $help{$title} = $item->[2]{Text};
         }
     }
 
@@ -235,7 +234,7 @@
     }
     return help("list", $type) if $bad;
 
-    my $r = submit("$REST/search/$type", { query => $q, %data });
+    my $r = submit("$REST/search/$type", { query => $q, %data, orderby => $orderby || "" });
     print $r->content;
 }
 

Modified: rt/branches/rt-3.3/etc/initialdata
==============================================================================
--- rt/branches/rt-3.3/etc/initialdata	(original)
+++ rt/branches/rt-3.3/etc/initialdata	Fri Apr  2 08:43:44 2004
@@ -373,6 +373,9 @@
     {  ScripCondition => 'On Correspond',
        ScripAction    => 'Open Tickets',
        Template       => 'Blank' },
+    {  ScripCondition => 'On Owner Change',
+       ScripAction    => 'Notify Owner',
+       Template       => 'Transaction' },
     {  ScripCondition => 'On Create',
        ScripAction    => 'AutoReply To Requestors',
        Template       => 'AutoReply' },

Added: rt/branches/rt-3.3/etc/upgrade/3.1.15/content
==============================================================================
--- (empty file)
+++ rt/branches/rt-3.3/etc/upgrade/3.1.15/content	Fri Apr  2 08:43:44 2004
@@ -0,0 +1,7 @@
+ at Scrips = (
+    {  ScripCondition => 'On Owner Change',
+       ScripAction    => 'Notify Owner',
+       Template       => 'Transaction' },
+);
+
+1;

Modified: rt/branches/rt-3.3/html/Admin/Elements/SelectStage
==============================================================================
--- rt/branches/rt-3.3/html/Admin/Elements/SelectStage	(original)
+++ rt/branches/rt-3.3/html/Admin/Elements/SelectStage	Fri Apr  2 08:43:44 2004
@@ -22,7 +22,7 @@
 %# 
 %# END LICENSE BLOCK
 <SELECT NAME=<%$Name%>>
-% foreach my $stage (qw(TransactionCreate TransactionBatch)) {
+% foreach my $stage (qw(TransactionCreate TransactionBatch Disabled)) {
 <OPTION VALUE=<%$stage%>
 <% ($stage eq $Default) && 'SELECTED' %>
 ><% loc($stage) %>

Modified: rt/branches/rt-3.3/html/Scope/Elements/ShowHistory
==============================================================================
--- rt/branches/rt-3.3/html/Scope/Elements/ShowHistory	(original)
+++ rt/branches/rt-3.3/html/Scope/Elements/ShowHistory	Fri Apr  2 08:43:44 2004
@@ -32,7 +32,7 @@
     $title = '&nbsp;';
 }
 $titleright = loc('Display mode') . ":";
-if ($ShowHeaders &&  $ShowHeaders == $Ticket->Id ) {
+if ($ShowHeaders) {
     $titleright .= "[<A HREF=\"" . $URIFile . "?id="
       . $Ticket->id . "\">"
       . loc("Brief headers")
@@ -44,8 +44,8 @@
       . loc("Brief headers")
       . "]</b> [<A HREF=\""
       . $URIFile
-      . "?ShowHeaders="
-      . $Ticket->Id . "&id="
+      . "?ShowHeaders=1"
+      . "&id="
       . $Ticket->id . "\">"
       . loc("Full headers") . "</a>]";
 }
@@ -80,7 +80,7 @@
 <%ARGS>
 $URIFile => 'Display.html'
 $Ticket => undef
-$ShowHeaders => undef
+$ShowHeaders => 0
 $Collapsed => undef
 $ShowTitle => 1
 $ShowDisplayModes => 1

Modified: rt/branches/rt-3.3/html/Scope/Elements/ShowTransaction
==============================================================================
--- rt/branches/rt-3.3/html/Scope/Elements/ShowTransaction	(original)
+++ rt/branches/rt-3.3/html/Scope/Elements/ShowTransaction	Fri Apr  2 08:43:44 2004
@@ -42,7 +42,7 @@
      next unless ($message->ContentLength || $message->Children->Count);
 
   my ($headers, $quoted);
-      if ($ShowHeaders && ($ShowHeaders == $Ticket->Id)) {
+      if ($ShowHeaders) {
 	  $headers = $message->Headers;
       } else {
 	  $headers = $message->NiceHeaders;

Modified: rt/branches/rt-3.3/html/Ticket/Display.html
==============================================================================
--- rt/branches/rt-3.3/html/Ticket/Display.html	(original)
+++ rt/branches/rt-3.3/html/Ticket/Display.html	Fri Apr  2 08:43:44 2004
@@ -38,6 +38,7 @@
 <BR>
 <& /Ticket/Elements/ShowHistory , 
       Ticket => $TicketObj, 
+      Tickets => $Tickets, 
       Collapsed => $ARGS{'Collapsed'}, 
       ShowHeaders => $ARGS{'ShowHeaders'},
       Attachments => $attachments 
@@ -48,13 +49,13 @@
 <%ARGS>
 $id => undef
 $Create => undef
-$ShowHeaders => undef
+$ShowHeaders => 0
 $Collapsed => undef
 $TicketObj => undef
 </%ARGS>
 
 <%INIT>
-  my ($linkid, $message, $tid, @Actions);  
+my ($linkid, $message, $tid, @Actions, $Tickets);  
 
 unless ($id || $TicketObj) {
     Abort('No ticket specified');
@@ -112,16 +113,15 @@
     }
     #Process status updates
     my @BasicActions = ProcessTicketBasics(ARGSRef => \%ARGS, TicketObj=>$TicketObj);
-    my @results = ProcessTicketLinks( TicketObj => $TicketObj, ARGSRef => \%ARGS);                            
+    my @results = ProcessTicketLinks( TicketObj => $TicketObj, ARGSRef => \%ARGS);
 
     push (@Actions, @BasicActions, @results);
 }
 
-my $attachments = $m->comp('Elements/FindAttachments', Ticket => $TicketObj);
-
-
-</%INIT>
-
+$m->comp('/Elements/Callback', _CallbackName => 'BeforeDisplay',
+	 TicketObj => \$TicketObj, Tickets => \$Tickets, ARGSRef => \%ARGS);
 
 
+my $attachments = $m->comp('Elements/FindAttachments', Ticket => $TicketObj, Tickets => $Tickets);
 
+</%INIT>

Modified: rt/branches/rt-3.3/html/Ticket/Elements/FindAttachments
==============================================================================
--- rt/branches/rt-3.3/html/Ticket/Elements/FindAttachments	(original)
+++ rt/branches/rt-3.3/html/Ticket/Elements/FindAttachments	Fri Apr  2 08:43:44 2004
@@ -6,45 +6,40 @@
 
 # We force the cache of ticket transactions to get populated up front. otherwise, the 
 # code that looks at attachments will look at each one in turn.
-my $transactions = $Ticket->Transactions->First;
-
-
 my $attachments = RT::Attachments->new( $session{'CurrentUser'} );
 
 $attachments->Columns( qw( Id Filename ContentType Headers Subject Parent ContentEncoding ContentType TransactionId Created));
 
-if ( $Ticket->CurrentUserHasRight('ShowTicket') ) {
-    my $transactions = $attachments->NewAlias('Transactions');
-    $attachments->Join( ALIAS1 => 'main',
-                                           FIELD1 => 'TransactionId',
-                                           ALIAS2 => $transactions,
-                                           FIELD2 => 'id' );
+my $transactions = $attachments->NewAlias('Transactions');
+$attachments->Join( ALIAS1 => 'main',
+		    FIELD1 => 'TransactionId',
+		    ALIAS2 => $transactions,
+		    FIELD2 => 'id' );
     
-    my $tickets = $attachments->NewAlias('Tickets');
+my $tickets = $attachments->NewAlias('Tickets');
 
-    $attachments->Join( ALIAS1 => $transactions,
-                        FIELD1 => 'Ticket',
-                        ALIAS2 => $tickets,
-                        FIELD2 => 'id' );
-
-    $attachments->Limit( ALIAS => $tickets,
-                         FIELD => 'EffectiveId',
-                         VALUE => $Ticket->id() );
-    # if the user may not see comments do not return them
-    unless ( $Ticket->CurrentUserHasRight('ShowTicketComments') ) {
-        $attachments->Limit( ALIAS    => $transactions,
-                             FIELD    => 'Type',
-                             OPERATOR => '!=',
-                             VALUE    => "CommentEmailRecord" );
-        $attachments->Limit( ALIAS    => $transactions,
-                             FIELD    => 'Type',
-                             OPERATOR => '!=',
-                             VALUE    => "Comment" );
+$attachments->Join( ALIAS1 => $transactions,
+		    FIELD1 => 'Ticket',
+		    ALIAS2 => $tickets,
+		    FIELD2 => 'id' );
+
+if ($Tickets) {
+    while ($Ticket = $Tickets->Next) {
+	$attachments->Limit( ALIAS => $tickets,
+			     FIELD => 'EffectiveId',
+			     VALUE => $Ticket->id() );
     }
+} else {
+    $attachments->Limit( ALIAS => $tickets,
+			 FIELD => 'EffectiveId',
+			 VALUE => $Ticket->id() );
 }
+
+
 return ($attachments);
 </%INIT>
 <%ARGS>
 $Ticket => undef
+$Tickets => undef
 </%ARGS>
 

Modified: rt/branches/rt-3.3/html/Ticket/Elements/ShowHistory
==============================================================================
--- rt/branches/rt-3.3/html/Ticket/Elements/ShowHistory	(original)
+++ rt/branches/rt-3.3/html/Ticket/Elements/ShowHistory	Fri Apr  2 08:43:44 2004
@@ -32,7 +32,7 @@
     $title = '&nbsp;';
 }
 $titleright = loc('Display mode') . ":";
-if ($ShowHeaders &&  $ShowHeaders == $Ticket->Id ) {
+if ($ShowHeaders) {
     $titleright .= "[<A HREF=\"" . $URIFile . "?id="
       . $Ticket->id . "\">"
       . loc("Brief headers")
@@ -44,8 +44,8 @@
       . loc("Brief headers")
       . "]</b> [<A HREF=\""
       . $URIFile
-      . "?ShowHeaders="
-      . $Ticket->Id . "&id="
+      . "?ShowHeaders=1"
+      . "&id="
       . $Ticket->id . "\">"
       . loc("Full headers") . "</a>]";
 }
@@ -99,19 +99,28 @@
 <& /Elements/TitleBoxEnd &>
 % }
 <%INIT>
-
-my $Transactions = $Ticket->Transactions;
+my $Transactions = new RT::Transactions($session{'CurrentUser'});
+if ($Tickets) {
+    while (my $t = $Tickets->Next) {
+	$Transactions->Limit(FIELD => 'Ticket',
+			     OPERATOR => '=',
+			     VALUE => $t->Id);
+    }
+} else {
+    $Transactions = $Ticket->Transactions;
+}
 my $i;
 
-
-$Attachments ||=  $m->comp('/Ticket/Elements/FindAttachments', Ticket => $Ticket);
+$Attachments ||=  $m->comp('/Ticket/Elements/FindAttachments', Ticket => $Ticket, Tickets => $Tickets || undef);
 
 </%INIT>
 <%ARGS>
 $URIFile => 'Display.html'
 $Ticket => undef
+$Tickets => undef
 $Attachments => undef
-$ShowHeaders => undef
+$ShowHeaders => 0
+$AttachmentContent => undef
 $Collapsed => undef
 $ShowTitle => 1
 $ShowDisplayModes => 1

Modified: rt/branches/rt-3.3/html/Ticket/Elements/ShowRequestor
==============================================================================
--- rt/branches/rt-3.3/html/Ticket/Elements/ShowRequestor	(original)
+++ rt/branches/rt-3.3/html/Ticket/Elements/ShowRequestor	Fri Apr  2 08:43:44 2004
@@ -36,9 +36,12 @@
 		  ORDER => 'DESC');
 </%PERL>
 
-% unless ($requestor->Privileged) {
+% if ($requestor->Privileged) {
 <& /Elements/TitleBoxStart, 
 	title => "<a class='inverse' href=\"$RT::WebPath/Admin/Users/Modify.html?id=".$requestor->id."\">".loc("More about [_1]", $name)."</a>" &>
+
+%# Additional information about this user.  Empty by default.
+<& /Elements/Callback, _CallbackName => 'AboutThisUser', requestor => $requestor, %ARGS &>
 
 <&|/l&>Comments about this user</&>:<BR>
 <B><% ($requestor->Comments || loc("No comment entered about this user")) %></B><BR>

Modified: rt/branches/rt-3.3/html/Ticket/Elements/ShowTransaction
==============================================================================
--- rt/branches/rt-3.3/html/Ticket/Elements/ShowTransaction	(original)
+++ rt/branches/rt-3.3/html/Ticket/Elements/ShowTransaction	Fri Apr  2 08:43:44 2004
@@ -58,14 +58,25 @@
           my $MAX_INLINE_BODY = $RT::MaxInlineBody || 13456;
         if (    $message->ContentType =~ m{^(text/plain|message|text$)}i
              && $message->ContentLength < $MAX_INLINE_BODY ) {
-            eval {
-                require Text::Quoted;
-                $quoted = Text::Quoted::extract( $message->Content );
-            };
-            if ($@) {
-                $quoted = $message->Content;
-            }
+  		my $content;
+        	# If we've preloaded all the content, let's pull from there
+        	# if we haven't, load it now
+        	if ($AttachmentContent->{$message->id}) {
+            $content = $AttachmentContent->{$message->id}->Content;
+        	} else {
+            $content = $message->Content;
+        	} 
+
+
+
+        eval {
+            require Text::Quoted;
+            $quoted = Text::Quoted::extract( $content );
+        };
+        if ($@) {
+            $quoted = $content;
         }
+    }
 
 </%PERL>
 <TR class="<% $RowNum%2 ? 'oddline' : 'evenline'%>" >                                
@@ -194,7 +205,7 @@
 # If the transaction has anything attached to it at all
 else {
 
-    unless ( $ShowHeaders && ( $ShowHeaders == $Ticket->Id ) ) {
+    unless ( $ShowHeaders ) {
         @DisplayHeaders = qw(To From RT-Send-Cc Cc Bcc Date Subject);
     }
 

Modified: rt/branches/rt-3.3/html/Ticket/Elements/Tabs
==============================================================================
--- rt/branches/rt-3.3/html/Ticket/Elements/Tabs	(original)
+++ rt/branches/rt-3.3/html/Ticket/Elements/Tabs	Fri Apr  2 08:43:44 2004
@@ -51,7 +51,7 @@
 		$session{'tickets'}->PrepForSerialization();
         }
 
-            # Don't $current_toptab = display prev links if we're on the first ticket
+        # Don't $current_toptab = display prev links if we're on the first ticket
         if ($item_map->{$Ticket->Id}->{prev}) {
                 $searchtabs->{'_a'} = {
                             class => "nav",

Modified: rt/branches/rt-3.3/html/index.html
==============================================================================
--- rt/branches/rt-3.3/html/index.html	(original)
+++ rt/branches/rt-3.3/html/index.html	Fri Apr  2 08:43:44 2004
@@ -63,36 +63,40 @@
 if ( $ARGS{'q'} ) {
     my $query = $ARGS{'q'};
 
-    if ( $query =~ m/^\s*(\d+)\s*$/ ) {
-        $m->redirect("$RT::WebPath/Ticket/Display.html?id=$1");
+   if ( $query =~ m/^\s*(\d+)\s*$/ ) {
+        $m->comp("/Ticket/Display.html", id=> $1);
+        return();
+    }
+
+    if ($m->comp('/Elements/Callback', _CallbackName => 'SearchPreFilter', 
+		 query => $query, %ARGS)) {
+	return();
     }
 
     $session{'tickets'} = RT::Tickets->new( $session{'CurrentUser'} );
 
     if ( $query =~ m/\@/ ) {
-        $session{'tickets'}->LimitWatcher( VALUE    => $query,
-                                            TYPE => 'Requestor',
-                                             OPERATOR => '=', );
-        $m->redirect("$RT::WebPath/Search/Listing.html");
+        $m->comp("/Search/Results.html", Query => "Requestor = '$query'");
+
+        return();
     }
 
     #
     # Any search on queue name or subject will be for new/open tickets
     # only.
     #
-    $session{'tickets'}->LimitStatus( VALUE    => $_,
-                                      OPERATOR => '=', ) for qw(open new);
+
+    my $status = "Status = 'new' OR Status = 'open'";
 
     my $queue = RT::Queue->new( $session{'CurrentUser'} );
     if ( $queue->Load($query) && $queue->Id ) {
-        $session{'tickets'}->LimitQueue( VALUE    => $queue->Id,
-                                         OPERATOR => '=', );
-        $m->redirect("$RT::WebPath/Search/Listing.html");
+        $m->comp("/Search/Results.html", Query => "Queue = '" . $queue->Id . "' AND ($status)");
+        return();
     }
-    $session{'tickets'}->LimitSubject( VALUE    =>  $query,
-                                       OPERATOR => 'LIKE' );
 
-    $m->redirect("$RT::WebPath/Search/Listing.html");
+    $m->comp("/Search/Results.html", Query => "Subject LIKE '$query' AND ($status)");
+    return();
+
 }
 
 if ($ARGS{'HomeRefreshInterval'}) {

Modified: rt/branches/rt-3.3/lib/RT/Action/CreateTickets.pm
==============================================================================
--- rt/branches/rt-3.3/lib/RT/Action/CreateTickets.pm	(original)
+++ rt/branches/rt-3.3/lib/RT/Action/CreateTickets.pm	Fri Apr  2 08:43:44 2004
@@ -387,7 +387,25 @@
 	    } else {
 		$dateobj->Set(Format => 'unknown', Value => $args{$date});
 	    }
-	    $args{$date} = $dateobj->ISO;
+	    elsif (defined ($args{$tag})) { #if we're about to get a second value, make it an array
+		$args{$tag} = [$args{$tag}, $value];
+	    }
+	    else { #if there's nothing there, just set the value
+		$args{ $tag } = $value;
+	    }
+	    
+	    if ( $tag eq 'content' ) { #just build up the content
+		# convert it to an array
+		$args{$tag} = defined($value) ? [ $value."\n" ] : [];
+		while ( defined(my $l = shift @lines) ) {
+		    last if ($l =~  /^ENDOFCONTENT\s*$/) ;
+		    push @{$args{'content'}}, $l."\n";
+		}
+	    } else {
+		# if it's not content, strip leading and trailing spaces
+		$args{ $tag } =~ s/^\s+//g;
+		$args{ $tag } =~ s/\s+$//g;
+	    }
 	}
 	my $mimeobj = MIME::Entity->new();
 	$mimeobj->build(Type => $args{'contenttype'},

Modified: rt/branches/rt-3.3/lib/RT/Attachments_Overlay.pm
==============================================================================
--- rt/branches/rt-3.3/lib/RT/Attachments_Overlay.pm	(original)
+++ rt/branches/rt-3.3/lib/RT/Attachments_Overlay.pm	Fri Apr  2 08:43:44 2004
@@ -109,6 +109,34 @@
   return($item);
 }
 # }}}
+
+# {{{ sub Next
+sub Next {
+    my $self = shift;
+ 	
+    my $Attachment = $self->SUPER::Next();
+    if ((defined($Attachment)) and (ref($Attachment))) {
+	if ($Attachment->TransactionObj->__Value('Type') =~ /^Comment/ && 
+	    $Attachment->TransactionObj->TicketObj->CurrentUserHasRight('ShowTicketComments')) {
+	    return($Attachment);
+	} elsif ($Attachment->TransactionObj->__Value('Type') !~ /^Comment/ && 
+		 $Attachment->TransactionObj->TicketObj->CurrentUserHasRight('ShowTicket')) {
+	    return($Attachment);
+	}
+
+	#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);
+    }	
+}
+# }}}
+
   1;
 
 

Modified: rt/branches/rt-3.3/lib/RT/Handle.pm
==============================================================================
--- rt/branches/rt-3.3/lib/RT/Handle.pm	(original)
+++ rt/branches/rt-3.3/lib/RT/Handle.pm	Fri Apr  2 08:43:44 2004
@@ -58,7 +58,7 @@
 =cut
 
 sub Connect {
-my $self=shift;
+    my $self = shift;
 
 
     if ($RT::DatabaseType eq 'Oracle') {

Modified: rt/branches/rt-3.3/lib/RT/I18N/fi.po
==============================================================================
--- rt/branches/rt-3.3/lib/RT/I18N/fi.po	(original)
+++ rt/branches/rt-3.3/lib/RT/I18N/fi.po	Fri Apr  2 08:43:44 2004
@@ -4,8 +4,8 @@
 msgstr ""
 "Project-Id-Version: RT 2.1.x\n"
 "POT-Creation-Date: 2002-07-08 17:41+0200\n"
-"PO-Revision-Date: 2002-07-09 18:09+0200\n"
-"Last-Translator: Janne Pirkkanen <jp at oppipoika.net>\n"
+"PO-Revision-Date: 2004-01-13 15:21+0200\n"
+"Last-Translator: Tuukka Vainio <tuukka.vainio at utu.fi>\n"
 "Language-Team: Finnish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -46,12 +46,12 @@
 #. ($field, $self->NewValue)
 #. ($self->Field, $principal->Object->Name)
 msgid "%1 %2 added"
-msgstr ""
+msgstr "%1 %2 lisätty"
 
 #: lib/RT/Date.pm:334
 #. ($s, $time_unit)
 msgid "%1 %2 ago"
-msgstr ""
+msgstr "%1 %2 sitten"
 
 #: lib/RT/Ticket_Overlay.pm:3444 lib/RT/Transaction_Overlay.pm:566
 #. ($cf->Name, $old_value, $new_value->Content)
@@ -64,21 +64,21 @@
 #. ($field, $self->OldValue)
 #. ($self->Field, $principal->Object->Name)
 msgid "%1 %2 deleted"
-msgstr ""
+msgstr "%1 %2 poistettu"
 
 #: html/Admin/Elements/EditScrips:44 html/Admin/Elements/ListGlobalScrips:28
 #. (loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name))
 msgid "%1 %2 with template %3"
-msgstr ""
+msgstr "%1 %2 pohjalla %3"
 
 #: NOT FOUND IN SOURCE
 msgid "%1 (%2) %3 this ticket\\n"
-msgstr "%1 (%2) %3 tässä työpyynnössä\\n"
+msgstr "%1 (%2) %3 tässä tapauksessa\\n"
 
 #: html/Search/Listing.html:57
 #. (($session{'tickets'}->FirstRow+1), ($session{'tickets'}->FirstRow() + $session{'tickets'}->RowsPerPage()  ))
 msgid "%1 - %2 shown"
-msgstr ""
+msgstr "näkyvillä %1 - %2"
 
 #: bin/rt-crontool:169 bin/rt-crontool:176 bin/rt-crontool:182
 #. ("--search-argument", "--search")
@@ -119,15 +119,15 @@
 
 #: NOT FOUND IN SOURCE
 msgid "%1 aliases require a TicketId to work on"
-msgstr "%1 aliakset vaativat työpyynnön id:n"
+msgstr "%1 aliakset vaativat tapauksen id:n"
 
 #: NOT FOUND IN SOURCE
 msgid "%1 aliases require a TicketId to work on "
-msgstr "%1 aliakset vaativat työpyynnön id:n "
+msgstr "%1 aliakset vaativat tapauksen id:n "
 
 #: NOT FOUND IN SOURCE
 msgid "%1 aliases require a TicketId to work on (from %2) %3"
-msgstr "%1 aliakset vaativat työpyynnön id:n (osoite %2) %3"
+msgstr "%1 aliakset vaativat tapauksen id:n (osoite %2) %3"
 
 #: lib/RT/Link_Overlay.pm:117 lib/RT/Link_Overlay.pm:124
 #. ($args{'Base'})
@@ -151,26 +151,26 @@
 
 #: lib/RT/Interface/Web.pm:857
 msgid "%1 could not be set to %2."
-msgstr ""
+msgstr "Arvoa %1 ei voitu asettaa arvoksi %2"
 
 #: NOT FOUND IN SOURCE
 msgid "%1 couldn't init a transaction (%2)\\n"
-msgstr "%1 ei voinut suorittaa toimintoa (%2)\\n"
+msgstr "%1 ei voinut suorittaa tapahtumaa (%2)\\n"
 
 #: lib/RT/Ticket_Overlay.pm:2813
 #. ($self)
 msgid "%1 couldn't set status to resolved. RT's Database may be inconsistent."
-msgstr "%1 ei voinut asettaa tilan arvoa päätetyksi. RT:n tietokanta saattaa olla vioittunut."
+msgstr "%1 ei voinut asettaa tilaa päätetyksi. RT:n tietokanta saattaa olla vioittunut."
 
 #: html/Elements/MyTickets:25
 #. ($rows)
 msgid "%1 highest priority tickets I own..."
-msgstr ""
+msgstr "%1 tärkeintä omistamaani tapausta..."
 
 #: html/Elements/MyRequests:25
 #. ($rows)
 msgid "%1 highest priority tickets I requested..."
-msgstr ""
+msgstr "%1 tärkeintä tilaamaani tapausta..."
 
 #: bin/rt-crontool:161
 #. ($0)
@@ -185,7 +185,7 @@
 #: lib/RT/Ticket_Overlay.pm:1570
 #. ($principal->Object->Name, $args{'Type'})
 msgid "%1 is no longer a %2 for this ticket."
-msgstr "%1 ei ole enää %2 tälle työpyynnölle"
+msgstr "%1 ei ole enää %2 tälle tapaukselle"
 
 #: lib/RT/Ticket_Overlay.pm:3527
 #. ($args{'Value'}, $cf->Name)
@@ -229,11 +229,11 @@
 #: lib/RT/Action/ResolveMembers.pm:42
 #. (ref $self)
 msgid "%1 will resolve all members of a resolved group ticket."
-msgstr "%1 päättää kaikki päätetyt työpyynnöt -ryhmän työpyynnöt."
+msgstr "%1 päättää kaikki päätetyn ryhmän jäsentapaukset."
 
 #: NOT FOUND IN SOURCE
 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ä työpyynnöstä [tai on sen jäsen]."
+msgstr "%1 jäädyttää [paikallisen] BASE jos se riippuu linkitetystä tapauksesta [tai on sen jäsen]."
 
 #: lib/RT/Transaction_Overlay.pm:435
 #. ($self)
@@ -261,11 +261,11 @@
 
 #: NOT FOUND IN SOURCE
 msgid "(Check box to delete group member)"
-msgstr ""
+msgstr "(Rastita laatikko poistaaksesi ryhmän jäsenen)"
 
 #: NOT FOUND IN SOURCE
 msgid "(Check box to delete scrip)"
-msgstr "(Rastita laatikko poistaaksesi skriptin)"
+msgstr "(Rastita laatikko poistaaksesi toiminnon)"
 
 #: html/Admin/Elements/EditQueueWatchers:29 html/Admin/Elements/EditScrips:35 html/Admin/Elements/EditTemplates:36 html/Admin/Groups/Members.html:52 html/Ticket/Elements/EditLinks:33 html/Ticket/Elements/EditPeople:46 html/User/Groups/Members.html:55
 msgid "(Check box to delete)"
@@ -273,25 +273,25 @@
 
 #: NOT FOUND IN SOURCE
 msgid "(Check boxes to delete)"
-msgstr ""
+msgstr "(Rastita laatikko poistaaksesi)"
 
 #: html/Ticket/Create.html:178
 msgid "(Enter ticket ids or URLs, seperated with spaces)"
-msgstr "(Syötä työpyynnön numerot tai www-osoitteet, välilyönneillä erotettuina)"
+msgstr "(Syötä tapausten numerot tai www-osoitteet, välilyönneillä erotettuina)"
 
 #: html/Admin/Queues/Modify.html:54 html/Admin/Queues/Modify.html:60
 #. ($RT::CorrespondAddress)
 #. ($RT::CommentAddress)
 msgid "(If left blank, will default to %1"
-msgstr ""
+msgstr "(Jos jätetään tyhjäksi, palaa arvoon %1)"
 
 #: NOT FOUND IN SOURCE
 msgid "(No Value)"
-msgstr ""
+msgstr "(Ei arvoa)"
 
 #: html/Admin/Elements/EditCustomFields:33 html/Admin/Elements/ListGlobalCustomFields:32
 msgid "(No custom fields)"
-msgstr ""
+msgstr "(Ei kenttiä)"
 
 #: html/Admin/Groups/Members.html:50 html/User/Groups/Members.html:53
 msgid "(No members)"
@@ -299,35 +299,35 @@
 
 #: html/Admin/Elements/EditScrips:32 html/Admin/Elements/ListGlobalScrips:32
 msgid "(No scrips)"
-msgstr "(Ei skriptejä)"
+msgstr "(Ei toimintoja)"
 
 #: html/Admin/Elements/EditTemplates:31
 msgid "(No templates)"
-msgstr ""
+msgstr "(Ei pohjia)"
 
 #: html/Ticket/Update.html:85
 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 ""
+msgstr "(Lähettää piilokopion vain tästä päivityksestä pilkulla erotettuihin sähköpostiosoitteisiin. <b>Ei lisää</b> pysyviksi vastaanottajiksi.)"
 
 #: 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 "(Lähettää piilokopion tästä päivityksestä pilkulla erotettuihin sähköpostiosoitteisiin. <b>Ei muuta</b> jatkossa tehtävien lähetysten kohteita.)"
+msgstr "(Lähettää piilokopion vain tästä päivityksestä pilkulla erotettuihin sähköpostiosoitteisiin. <b>Ei lisää</b> pysyviksi vastaanottajiksi.)"
 
 #: html/Ticket/Create.html:79
 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 "(Lähettää kopion tästä päivityksestä pilkulla erotettuihin hallinnollisiin sähköpostiosoitteisiin. <b>Lisää</b> pysyviksi vastaanottajiksi.)"
 
 #: html/Ticket/Update.html:81
 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 ""
+msgstr "(Lähettää kopion vain tästä päivityksestä pilkulla erotettuihin sähköpostiosoitteisiin. <b>Ei lisää</b> pysyviksi vastaanottajiksi.)"
 
 #: 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 "(Lähettää kopion tästä päivityksestä pilkulla erotettuihin sähköpostiosoitteisiin. <b>Ei muuta</b> jatkossa tehtävien lähetysten kohteita.)"
+msgstr "(Lähettää kopion vain tästä päivityksestä pilkulla erotettuihin sähköpostiosoitteisiin. <b>Ei lisää</b> pysyviksi vastaanottajiksi.)"
 
 #: html/Ticket/Create.html:69
 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 "(Lähettää kopion tästä päivityksestä pilkulla erotettuihin sähköpostiosoitteisiin. <b>Lisää</b> pysyviksi vastaanottajiksi.)"
 
 #: html/Admin/Groups/index.html:33 html/User/Groups/index.html:33
 msgid "(empty)"
@@ -335,7 +335,7 @@
 
 #: html/Admin/Users/index.html:39
 msgid "(no name listed)"
-msgstr ""
+msgstr "(ei nimiä listattuna)"
 
 #: html/Elements/MyRequests:43 html/Elements/MyTickets:45
 msgid "(no subject)"
@@ -347,15 +347,15 @@
 
 #: html/Ticket/Elements/EditLinks:116
 msgid "(only one ticket)"
-msgstr "(vain yksi työpyyntö)"
+msgstr "(vain yksi tapaus)"
 
 #: html/Elements/MyRequests:52 html/Elements/MyTickets:55
 msgid "(pending approval)"
-msgstr ""
+msgstr "(odottaa hyväksyntää)"
 
 #: html/Elements/MyRequests:54 html/Elements/MyTickets:57
 msgid "(pending other tickets)"
-msgstr ""
+msgstr "(odottaa toisia tapauksia)"
 
 #: html/Admin/Users/Modify.html:50
 msgid "(required)"
@@ -363,15 +363,15 @@
 
 #: html/Ticket/Elements/ShowTransaction:105
 msgid "(untitled)"
-msgstr ""
+msgstr "(nimetön)"
 
 #: NOT FOUND IN SOURCE
 msgid "25 highest priority tickets I own..."
-msgstr "25 omistamaani korkeimpien prioriteettien työpyyntöä..."
+msgstr "25 tärkeintä omistamaani tapausta..."
 
 #: NOT FOUND IN SOURCE
 msgid "25 highest priority tickets I requested..."
-msgstr "25 tilaamaani korkeimman prioriteetin työpyyntöä..."
+msgstr "25 tärkeintä tilaamaani tapausta..."
 
 #: html/Ticket/Elements/ShowBasics:32
 msgid "<% $Ticket->Status%>"
@@ -384,11 +384,11 @@
 #: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:26
 #. ($m->scomp('/Elements/SelectNewTicketQueue'))
 msgid "<input type=\"submit\" value=\"New ticket in\">&nbsp;%1"
-msgstr "<input type=\"submit\" value=\"Uusi työpyyntö\">&nbsp;%1"
+msgstr "<input type=\"submit\" value=\"Uusi tapaus\">&nbsp;%1"
 
 #: etc/initialdata:203
 msgid "A blank template"
-msgstr ""
+msgstr "Tyhjä pohja"
 
 #: NOT FOUND IN SOURCE
 msgid "ACE Deleted"
@@ -416,11 +416,11 @@
 
 #: bin/rt-commit-handler:755
 msgid "Aborting to avoid unintended ticket modifications.\\n"
-msgstr "Poistuminen ei-tarkoitettujen työpyyntömuutosten välttämiseksi.\\n"
+msgstr "Peruutetaan tarkoittamattomien tapausmuutosten välttämiseksi.\\n"
 
 #: html/User/Elements/Tabs:32
 msgid "About me"
-msgstr ""
+msgstr "Omat asetukset"
 
 #: html/Admin/Users/Modify.html:80
 msgid "Access control"
@@ -453,7 +453,7 @@
 
 #: html/Ticket/Create.html:114 html/Ticket/Update.html:100
 msgid "Add More Files"
-msgstr ""
+msgstr "Lisää useampi tiedosto"
 
 #: html/Search/Bulk.html:88
 msgid "Add Requestor"
@@ -465,23 +465,23 @@
 
 #: NOT FOUND IN SOURCE
 msgid "Add a new a global scrip"
-msgstr "Lisää uusi globaali lappu"
+msgstr "Lisää uusi yleinen toiminto"
 
 #: NOT FOUND IN SOURCE
 msgid "Add a scrip to this queue"
-msgstr "Lisää lappu tälle työjonolle"
+msgstr "Lisää toiminto tähän työjonoon"
 
 #: html/Admin/Global/Scrip.html:55
 msgid "Add a scrip which will apply to all queues"
-msgstr "Lisää kaikille työjonoille yhteinen lappu"
+msgstr "Lisää kaikille työjonoille yhteinen toiminto"
 
 #: html/Search/Bulk.html:118
 msgid "Add comments or replies to selected tickets"
-msgstr "Lisää kommentteja tai vastauksia valituille työpyynnöille"
+msgstr "Lisää kommentteja tai vastauksia valituille tapauksille"
 
 #: html/Admin/Groups/Members.html:42 html/User/Groups/Members.html:39
 msgid "Add members"
-msgstr "Lisää jäsenä"
+msgstr "Lisää jäseniä"
 
 #: html/Admin/Queues/People.html:66 html/Ticket/Elements/AddWatchers:28
 msgid "Add new watchers"
@@ -499,7 +499,7 @@
 #: lib/RT/Ticket_Overlay.pm:1454
 #. ($self->loc($args{'Type'}))
 msgid "Added principal as a %1 for this ticket"
-msgstr "Lisätty toimeksiantaja %1:ksi tälle työpyynnölle"
+msgstr "Lisätty toimeksiantaja %1:ksi tälle tapaukselle"
 
 #: html/Admin/Elements/ModifyUser:76 html/Admin/Users/Modify.html:122 html/User/Prefs.html:88
 msgid "Address1"
@@ -531,7 +531,7 @@
 
 #: html/Admin/Global/index.html:26 html/Admin/Global/index.html:28
 msgid "Admin/Global configuration"
-msgstr "Ylläpito/Globaalit asetukset"
+msgstr "Ylläpito/Yleiset asetukset"
 
 #: NOT FOUND IN SOURCE
 msgid "Admin/Groups"
@@ -595,11 +595,11 @@
 
 #: NOT FOUND IN SOURCE
 msgid "Age"
-msgstr ""
+msgstr "Ikä"
 
 #: html/Admin/Elements/EditCustomFields:96
 msgid "All Custom Fields"
-msgstr ""
+msgstr "Kaikki kentät"
 
 #: html/Admin/Queues/index.html:53
 msgid "All Queues"
@@ -611,7 +611,7 @@
 
 #: html/Elements/Tabs:58
 msgid "Approval"
-msgstr ""
+msgstr "Hyväksyntä"
 
 #: html/Approvals/Display.html:46 html/Approvals/Elements/Approve:27 html/Approvals/Elements/ShowDependency:42 html/Approvals/index.html:65
 #. ($Ticket->Id, $Ticket->Subject)
@@ -633,7 +633,7 @@
 
 #: NOT FOUND IN SOURCE
 msgid "Approval Details"
-msgstr ""
+msgstr "Hyväksynnän lisätiedot"
 
 #: NOT FOUND IN SOURCE
 msgid "Approval diagram"
@@ -641,19 +641,19 @@
 
 #: html/Approvals/Elements/Approve:45
 msgid "Approve"
-msgstr ""
+msgstr "Hyväksy"
 
 #: etc/initialdata:431 etc/upgrade/2.1.71:148
 msgid "Approver's notes: %1"
-msgstr ""
+msgstr "Hyväksyjän merkintöjä: %1"
 
 #: lib/RT/Date.pm:414
 msgid "Apr."
-msgstr "Huhti"
+msgstr "huhti"
 
 #: NOT FOUND IN SOURCE
 msgid "April"
-msgstr ""
+msgstr "huhtikuu"
 
 #: html/Elements/SelectSortOrder:35
 msgid "Ascending"
@@ -669,7 +669,7 @@
 
 #: html/Ticket/Create.html:98 html/Ticket/Update.html:89
 msgid "Attached file"
-msgstr ""
+msgstr "Liitä tiedosto"
 
 #: html/SelfService/Attachment/dhandler:36
 msgid "Attachment '%1' could not be loaded"
@@ -689,11 +689,11 @@
 
 #: lib/RT/Date.pm:418
 msgid "Aug."
-msgstr "Elo"
+msgstr "elo"
 
 #: NOT FOUND IN SOURCE
 msgid "August"
-msgstr ""
+msgstr "elokuu"
 
 #: html/Admin/Elements/ModifyUser:66
 msgid "AuthSystem"
@@ -705,7 +705,7 @@
 
 #: etc/initialdata:72
 msgid "Autoreply To Requestors"
-msgstr ""
+msgstr "Automaattivastaus tilaajille"
 
 #: NOT FOUND IN SOURCE
 msgid "AutoreplyToRequestors"
@@ -727,7 +727,7 @@
 #: html/SelfService/Attachment/dhandler:43
 #. ($trans, $AttachmentObj->TransactionId())
 msgid "Bad transaction number for attachment. %1 should be %2\\n"
-msgstr "Virheellinen toiminnon numero liitetiedostolle. %1 pitäisi olla %2\\n"
+msgstr "Virheellinen tapahtuman numero liitetiedostolle. %1 pitäisi olla %2\\n"
 
 #: html/Admin/Elements/GroupTabs:39 html/Admin/Elements/QueueTabs:39 html/Admin/Elements/UserTabs:38 html/Ticket/Elements/Tabs:90 html/User/Elements/GroupTabs:38
 msgid "Basics"
@@ -743,7 +743,7 @@
 
 #: html/Elements/SelectDateRelation:34 lib/RT/CurrentUser.pm:322
 msgid "Before"
-msgstr "Ennen"
+msgstr "ennen"
 
 #: NOT FOUND IN SOURCE
 msgid "Begin Approval"
@@ -751,7 +751,7 @@
 
 #: etc/initialdata:202
 msgid "Blank"
-msgstr ""
+msgstr "Tyhjä"
 
 #: html/Search/Listing.html:79
 msgid "Bookmarkable URL for this search"
@@ -763,15 +763,15 @@
 
 #: html/Search/Bulk.html:25 html/Search/Bulk.html:26
 msgid "Bulk ticket update"
-msgstr "Työpyyntöjen ryhmäpäivitys"
+msgstr "Tapausten ryhmäpäivitys"
 
 #: lib/RT/User_Overlay.pm:1331
 msgid "Can not modify system users"
-msgstr "Systeemikäyttäjien muokkaus ei ole sallittua"
+msgstr "Järjestelmäkäyttäjien muokkaus ei ole sallittua"
 
 #: lib/RT/Queue_Overlay.pm:67
 msgid "Can this principal see this queue"
-msgstr ""
+msgstr "Näkeekö toimeksiantaja tämän työjonon"
 
 #: lib/RT/CustomField_Overlay.pm:144
 msgid "Can't add a custom field value without a name"
@@ -779,15 +779,15 @@
 
 #: lib/RT/Link_Overlay.pm:132
 msgid "Can't link a ticket to itself"
-msgstr "Työpyyntöä ei voi linkittää itseensä"
+msgstr "Tapausta ei voi linkittää itseensä"
 
 #: lib/RT/Ticket_Overlay.pm:2787
 msgid "Can't merge into a merged ticket. You should never get this error"
-msgstr "Et voi yhdistää jo yhdistettyyn työpyyntöön. Sinun ei pitäisi saada tätä virhettä koskaan."
+msgstr "Et voi yhdistää jo yhdistettyyn tapaukseen. Sinun ei pitäisi saada tätä virhettä koskaan."
 
 #: lib/RT/Ticket_Overlay.pm:2605 lib/RT/Ticket_Overlay.pm:2674
 msgid "Can't specifiy both base and target"
-msgstr "Sekä basen ja kohteen määritteleminen samalla ei ole mahdollista"
+msgstr "Sekä juuren ja kohteen määritteleminen samalla ei ole mahdollista"
 
 #: html/autohandler:112
 #. ($msg)
@@ -804,15 +804,15 @@
 
 #: html/Ticket/Create.html:101 html/Ticket/Update.html:92
 msgid "Check box to delete"
-msgstr ""
+msgstr "Valitse laatikko poistaaksesi"
 
 #: html/Admin/Elements/SelectRights:31
 msgid "Check box to revoke right"
-msgstr "Valitse laatikko poistaaksesi oikeuden"
+msgstr "Valitse laatikko peruaksesi oikeuden"
 
 #: html/Ticket/Create.html:183 html/Ticket/Elements/EditLinks:131 html/Ticket/Elements/EditLinks:69 html/Ticket/Elements/ShowLinks:51
 msgid "Children"
-msgstr "Lapsi"
+msgstr "Lapset"
 
 #: html/Admin/Elements/ModifyUser:80 html/Admin/Users/Modify.html:132 html/User/Prefs.html:92
 msgid "City"
@@ -820,11 +820,11 @@
 
 #: html/Ticket/Elements/ShowDates:47
 msgid "Closed"
-msgstr ""
+msgstr "Suljettu"
 
 #: html/SelfService/Elements/Tabs:60
 msgid "Closed requests"
-msgstr "Suljetut työpyynnöt"
+msgstr "Suljetut tapaukset"
 
 #: NOT FOUND IN SOURCE
 msgid "Command not understood!\\n"
@@ -844,7 +844,7 @@
 
 #: lib/RT/Queue_Overlay.pm:86
 msgid "Comment on tickets"
-msgstr ""
+msgstr "Kommentoi tapauksia"
 
 #: lib/RT/Queue_Overlay.pm:86
 msgid "CommentOnTicket"
@@ -856,11 +856,11 @@
 
 #: html/Ticket/ModifyAll.html:70 html/Ticket/Update.html:70
 msgid "Comments (Not sent to requestors)"
-msgstr "Kommentit (Ei lähetetä tilaajille)"
+msgstr "Kommentti (ei lähetetä tilaajille)"
 
 #: html/Search/Bulk.html:122
 msgid "Comments (not sent to requestors)"
-msgstr "Kommentit (Ei lähetetä tilaajille)"
+msgstr "Kommentti (ei lähetetä tilaajille)"
 
 #: html/Elements/ViewUser:27
 #. ($name)
@@ -901,11 +901,11 @@
 
 #: html/SelfService/Prefs.html:33
 msgid "Confirm"
-msgstr "Varmista"
+msgstr "Vahvista"
 
 #: html/Admin/Elements/ModifyUser:60
 msgid "ContactInfoSystem"
-msgstr "Kontaktitietojärjestelmä"
+msgstr "Yhteystietojärjestelmä"
 
 #: NOT FOUND IN SOURCE
 msgid "Contacted date '%1' could not be parsed"
@@ -937,11 +937,11 @@
 
 #: lib/RT/Ticket_Overlay.pm:3458
 msgid "Could not add new custom field value for ticket. "
-msgstr "Uuden tiedon lisääminen kenttään ei onnistunut"
+msgstr "Uuden tiedon lisääminen kenttään epäonnistui"
 
 #: NOT FOUND IN SOURCE
 msgid "Could not add new custom field value for ticket. %1 "
-msgstr ""
+msgstr "Uuden kentän lisäys tapaukselle epäonnistui. %1 "
 
 #: lib/RT/Ticket_Overlay.pm:2963 lib/RT/Ticket_Overlay.pm:2971 lib/RT/Ticket_Overlay.pm:2987
 msgid "Could not change owner. "
@@ -950,24 +950,24 @@
 #: html/Admin/Elements/EditCustomField:68 html/Admin/Elements/EditCustomFields:166
 #. ($msg)
 msgid "Could not create CustomField"
-msgstr "Uuden kentän lisääminen ei onnistunut"
+msgstr "Uuden kentän lisääminen epäonnistui"
 
 #: html/User/Groups/Modify.html:77 lib/RT/Group_Overlay.pm:474 lib/RT/Group_Overlay.pm:481
 msgid "Could not create group"
-msgstr "Ryhmän luominen ei onnistunut"
+msgstr "Ryhmän luominen epäonnistui"
 
 #: html/Admin/Global/Template.html:75 html/Admin/Queues/Template.html:72
 #. ($msg)
 msgid "Could not create template: %1"
-msgstr "Ei onnistuttu luomaan pohjaa: "
+msgstr "Pohjan luonti epäonnistui: %1"
 
 #: lib/RT/Ticket_Overlay.pm:1073 lib/RT/Ticket_Overlay.pm:333
 msgid "Could not create ticket. Queue not set"
-msgstr "Työpyynön luominen ei onnistunut. Työjonoa ei ole asetettu"
+msgstr "Tapauksen luonti epäonnistui. Työjonoa ei ole asetettu"
 
 #: lib/RT/User_Overlay.pm:208 lib/RT/User_Overlay.pm:220 lib/RT/User_Overlay.pm:238 lib/RT/User_Overlay.pm:414
 msgid "Could not create user"
-msgstr "Käyttäjän luominen ei onnistunut"
+msgstr "Käyttäjän luonti epäonnistui"
 
 #: NOT FOUND IN SOURCE
 msgid "Could not create watcher for requestor"
@@ -975,11 +975,11 @@
 
 #: NOT FOUND IN SOURCE
 msgid "Could not find a ticket with id %1"
-msgstr "Työpyyntöä numero '%1' ei löytynyt."
+msgstr "Tapausta numerolla %1 ei löytynyt."
 
 #: NOT FOUND IN SOURCE
 msgid "Could not find group %1."
-msgstr "Ryhmää '%1' ei löytynyt."
+msgstr "Ryhmää %1 ei löytynyt."
 
 #: lib/RT/Queue_Overlay.pm:621 lib/RT/Ticket_Overlay.pm:1422
 msgid "Could not find or create that user"
@@ -991,7 +991,7 @@
 
 #: NOT FOUND IN SOURCE
 msgid "Could not find user %1."
-msgstr "Käyttäjää '%1' ei löytynyt."
+msgstr "Käyttäjää %1 ei löytynyt."
 
 #: html/Admin/Groups/Members.html:88 html/User/Groups/Members.html:90 html/User/Groups/Modify.html:82
 msgid "Could not load group"
@@ -1005,17 +1005,17 @@
 #: lib/RT/Ticket_Overlay.pm:1443
 #. ($self->loc($args{'Type'}))
 msgid "Could not make that principal a %1 for this ticket"
-msgstr "Ei voinut tehdä toimeksiantajaa tälle työpyynnölle: %1"
+msgstr "Ei voinut tehdä toimeksiantajaa tälle tapaukselle: %1"
 
 #: lib/RT/Queue_Overlay.pm:740
 #. ($args{'Type'})
 msgid "Could not remove that principal as a %1 for this queue"
-msgstr "Ei voinut poistaa toimeksiantajaa tältä työjonolta: %1"
+msgstr "Toimeksiantajaa ei voitu poistaa tältä työjonolta: %1"
 
 #: lib/RT/Ticket_Overlay.pm:1559
 #. ($args{'Type'})
 msgid "Could not remove that principal as a %1 for this ticket"
-msgstr "Ei voinut poistaa toimeksiantajaa tältä työpyynnöltä: %1"
+msgstr "Toimeksiantajaa ei voitu poistaa tältä tapaukselta: %1"
 
 #: lib/RT/Group_Overlay.pm:985
 msgid "Couldn't add member to group"
@@ -1024,11 +1024,11 @@
 #: lib/RT/Ticket_Overlay.pm:3468 lib/RT/Ticket_Overlay.pm:3524
 #. ($Msg)
 msgid "Couldn't create a transaction: %1"
-msgstr "Toiminnon luominen ei onnistunut: %1"
+msgstr "Tapahtuman luominen ei onnistunut: %1"
 
 #: NOT FOUND IN SOURCE
 msgid "Couldn't figure out what to do from gpg's reply\\n"
-msgstr "Järjestelmä ei ymmärtänyt mitä tehdä pgp:n vastauksella\\n"
+msgstr "Järjestelmä ei gpg:n vastauksesta ymmärtänyt mitä tehdä\\n"
 
 #: NOT FOUND IN SOURCE
 msgid "Couldn't find group\\n"
@@ -1036,19 +1036,19 @@
 
 #: lib/RT/Interface/Web.pm:866
 msgid "Couldn't find row"
-msgstr ""
+msgstr "Riviä ei löytynyt"
 
 #: lib/RT/Group_Overlay.pm:959
 msgid "Couldn't find that principal"
-msgstr "Tätä toimeksiantajaa ei löytynyt"
+msgstr "Toimeksiantajaa ei löytynyt"
 
 #: lib/RT/CustomField_Overlay.pm:175
 msgid "Couldn't find that value"
-msgstr "Tätä arvoa ei löytynyt"
+msgstr "Arvoa ei löytynyt"
 
 #: NOT FOUND IN SOURCE
 msgid "Couldn't find that watcher"
-msgstr ""
+msgstr "Tarkkailijaa ei löytynyt"
 
 #: NOT FOUND IN SOURCE
 msgid "Couldn't find user\\n"
@@ -1057,7 +1057,7 @@
 #: lib/RT/CurrentUser.pm:112
 #. ($self->Id)
 msgid "Couldn't load %1 from the users database.\\n"
-msgstr "Ei onnistuttu lataamaan käytäjää %1 tietokannasta.\\n"
+msgstr "Ei onnistuttu lataamaan käyttäjää %1 tietokannasta.\\n"
 
 #: NOT FOUND IN SOURCE
 msgid "Couldn't load KeywordSelects."
@@ -1065,11 +1065,11 @@
 
 #: NOT FOUND IN SOURCE
 msgid "Couldn't load RT config file '%1' %2"
-msgstr "RT asetustiedoston lataaminen ei onnistunut:'%1' %2"
+msgstr "RT-asetustiedoston lataaminen ei onnistunut:'%1' %2"
 
 #: NOT FOUND IN SOURCE
 msgid "Couldn't load Scrips."
-msgstr "Lappujen lataaminen ei onnistunut."
+msgstr "Toimintojen lataaminen ei onnistunut."
 
 #: html/Admin/Groups/GroupRights.html:88 html/Admin/Groups/UserRights.html:75
 #. ($id)
@@ -1092,7 +1092,7 @@
 
 #: NOT FOUND IN SOURCE
 msgid "Couldn't load scrip"
-msgstr "Lapun lataaminen ei onnistunut"
+msgstr "Toiminnon lataaminen ei onnistunut"
 
 #: NOT FOUND IN SOURCE
 msgid "Couldn't load template"
@@ -1106,7 +1106,7 @@
 #: html/SelfService/Display.html:166
 #. ($id)
 msgid "Couldn't load ticket '%1'"
-msgstr "Työpyynnön '%1' lataaminen ei onnistunut"
+msgstr "Tapauksen '%1' lataaminen ei onnistunut"
 
 #: html/Admin/Elements/ModifyUser:86 html/Admin/Users/Modify.html:149 html/User/Prefs.html:98
 msgid "Country"
@@ -1118,7 +1118,7 @@
 
 #: etc/initialdata:128
 msgid "Create Tickets"
-msgstr ""
+msgstr "Luo tapauksia"
 
 #: html/Admin/Elements/EditCustomField:58
 msgid "Create a CustomField"
@@ -1127,11 +1127,11 @@
 #: html/Admin/Queues/CustomField.html:48
 #. ($QueueObj->Name())
 msgid "Create a CustomField for queue %1"
-msgstr ""
+msgstr "Luo kenttä työjonolle %1"
 
 #: html/Admin/Global/CustomField.html:48
 msgid "Create a CustomField which applies to all queues"
-msgstr ""
+msgstr "Luo kenttä, jota sovelletaan kaikkiin työjonoihin"
 
 #: NOT FOUND IN SOURCE
 msgid "Create a new Custom Field"
@@ -1139,7 +1139,7 @@
 
 #: NOT FOUND IN SOURCE
 msgid "Create a new global scrip"
-msgstr "Luo uusi globaali lappu"
+msgstr "Luo uusi yleinen toiminto"
 
 #: html/Admin/Groups/Modify.html:67 html/Admin/Groups/Modify.html:93
 msgid "Create a new group"
@@ -1147,7 +1147,7 @@
 
 #: html/User/Groups/Modify.html:67 html/User/Groups/Modify.html:92
 msgid "Create a new personal group"
-msgstr "Luo uusi personaali ryhmä"
+msgstr "Luo uusi henkilökohtainen ryhmä"
 
 #: NOT FOUND IN SOURCE
 msgid "Create a new queue"
@@ -1155,7 +1155,7 @@
 
 #: NOT FOUND IN SOURCE
 msgid "Create a new scrip"
-msgstr ""
+msgstr "Luo uusi toiminto"
 
 #: NOT FOUND IN SOURCE
 msgid "Create a new template"
@@ -1163,7 +1163,7 @@
 
 #: html/SelfService/Create.html:30 html/Ticket/Create.html:25 html/Ticket/Create.html:28 html/Ticket/Create.html:36
 msgid "Create a new ticket"
-msgstr "Luo uusi työpyyntö"
+msgstr "Luo uusi tapaus"
 
 #: html/Admin/Users/Modify.html:214 html/Admin/Users/Modify.html:241
 msgid "Create a new user"
@@ -1179,12 +1179,12 @@
 
 #: html/SelfService/Create.html:25 html/SelfService/Create.html:27
 msgid "Create a request"
-msgstr "Luo työpyyntö"
+msgstr "Luo tapaus"
 
 #: html/Admin/Queues/Scrip.html:59
 #. ($QueueObj->Name)
 msgid "Create a scrip for queue %1"
-msgstr ""
+msgstr "Luo toiminto työjonolle %1"
 
 #: html/Admin/Global/Template.html:69 html/Admin/Queues/Template.html:65
 msgid "Create a template"
@@ -1192,43 +1192,43 @@
 
 #: NOT FOUND IN SOURCE
 msgid "Create failed: %1 / %2 / %3 "
-msgstr ""
+msgstr "Luonti epäonnistui %1 / %2 / %3 "
 
 #: NOT FOUND IN SOURCE
 msgid "Create failed: %1/%2/%3"
-msgstr ""
+msgstr "Luonti epäonnistui: %1/%2/%3"
 
 #: etc/initialdata:130
 msgid "Create new tickets based on this scrip's template"
-msgstr ""
+msgstr "Luo uusia tapauksia tämän toiminnon pohjalta"
 
 #: html/SelfService/Create.html:81
 msgid "Create ticket"
-msgstr "Luo työpyyntö"
+msgstr "Luo tapaus"
 
 #: lib/RT/Queue_Overlay.pm:84
 msgid "Create tickets in this queue"
-msgstr ""
+msgstr "Luo tapauksia tähän työjonoon"
 
 #: lib/RT/Queue_Overlay.pm:72
 msgid "Create, delete and modify custom fields"
-msgstr ""
+msgstr "Luo, muokkaa ja poista kenttiä"
 
 #: lib/RT/Queue_Overlay.pm:68
 msgid "Create, delete and modify queues"
-msgstr ""
+msgstr "Luo, poista ja muokkaa työjonoja"
 
 #: NOT FOUND IN SOURCE
 msgid "Create, delete and modify the members of any user's personal groups"
-msgstr ""
+msgstr "Luo, poista ja muokkaa kenen tahansa henkilökohtaisten ryhmien jäseniä"
 
 #: lib/RT/System.pm:59
 msgid "Create, delete and modify the members of personal groups"
-msgstr ""
+msgstr "Luo, poista ja muokkaa henkilökohtaisten ryhmien jäseniä"
 
 #: lib/RT/System.pm:60
 msgid "Create, delete and modify users"
-msgstr ""
+msgstr "Luo, poista ja muokkaa käyttäjiä"
 
 #: lib/RT/Queue_Overlay.pm:84
 msgid "CreateTicket"
@@ -1253,7 +1253,7 @@
 
 #: html/Admin/Elements/EditScrips:30
 msgid "Current Scrips"
-msgstr ""
+msgstr "Tämänhetkinen toiminto"
 
 #: html/Admin/Groups/Members.html:39 html/User/Groups/Members.html:42
 msgid "Current members"
@@ -1265,7 +1265,7 @@
 
 #: html/Search/Listing.html:71
 msgid "Current search criteria"
-msgstr ""
+msgstr "Tämänhetkiset hakumääritteet"
 
 #: html/Admin/Queues/People.html:41 html/Ticket/Elements/EditPeople:45
 msgid "Current watchers"
@@ -1314,7 +1314,7 @@
 
 #: html/Admin/Elements/EditCustomFields:197
 msgid "Custom field deleted"
-msgstr ""
+msgstr "Kenttä poistettu"
 
 #: lib/RT/Ticket_Overlay.pm:3510
 msgid "Custom field not found"
@@ -1323,23 +1323,23 @@
 #: lib/RT/CustomField_Overlay.pm:283
 #. ($args{'Content'}, $self->Name)
 msgid "Custom field value %1 could not be found for custom field %2"
-msgstr "Kenttän arvoa %1 ei löytynyt kentälle %2"
+msgstr "Kentän arvoa %1 ei löytynyt kentälle %2"
 
 #: NOT FOUND IN SOURCE
 msgid "Custom field value changed from %1 to %2"
-msgstr "Kenttän arvo muutettu arvosta %1 arvoon"
+msgstr "Kentän arvo muutettu arvosta %1 arvoon"
 
 #: lib/RT/CustomField_Overlay.pm:185
 msgid "Custom field value could not be deleted"
-msgstr "Kenttän arvoa ei pystytty poistamaan"
+msgstr "Kentän arvoa ei pystytty poistamaan"
 
 #: lib/RT/CustomField_Overlay.pm:289
 msgid "Custom field value could not be found"
-msgstr "Kenttän arvoa ei löydetty"
+msgstr "Kentän arvoa ei löydetty"
 
 #: lib/RT/CustomField_Overlay.pm:183 lib/RT/CustomField_Overlay.pm:291
 msgid "Custom field value deleted"
-msgstr "Kenttän arvo poistettu"
+msgstr "Kentän arvo poistettu"
 
 #: lib/RT/Transaction_Overlay.pm:550
 msgid "CustomField"
@@ -1355,11 +1355,11 @@
 
 #: lib/RT/Date.pm:422
 msgid "Dec."
-msgstr "Joulu"
+msgstr "joulu"
 
 #: NOT FOUND IN SOURCE
 msgid "December"
-msgstr ""
+msgstr "joulukuu"
 
 #: NOT FOUND IN SOURCE
 msgid "Default Autoresponse Template"
@@ -1383,12 +1383,12 @@
 
 #: etc/initialdata:238
 msgid "Default transaction template"
-msgstr ""
+msgstr "Oletustapahtumapohja"
 
 #: lib/RT/Transaction_Overlay.pm:645
 #. ($type, $self->Field, $self->OldValue, $self->NewValue)
 msgid "Default: %1/%2 changed from %3 to %4"
-msgstr ""
+msgstr "Oletus: %1/%2 muutettu arvosta %3 arvoon %4"
 
 #: html/User/Delegation.html:25 html/User/Delegation.html:28
 msgid "Delegate rights"
@@ -1412,7 +1412,7 @@
 
 #: lib/RT/Queue_Overlay.pm:90
 msgid "Delete tickets"
-msgstr ""
+msgstr "Poista tapaukset"
 
 #: lib/RT/Queue_Overlay.pm:90
 msgid "DeleteTicket"
@@ -1444,7 +1444,7 @@
 
 #: html/Ticket/Create.html:181 html/Ticket/Elements/EditLinks:123 html/Ticket/Elements/EditLinks:47 html/Ticket/Elements/ShowDependencies:32 html/Ticket/Elements/ShowLinks:35
 msgid "Depended on by"
-msgstr "Tästä pyynnöstä riippuu"
+msgstr "Tästä tapauksesta riippuu"
 
 #: NOT FOUND IN SOURCE
 msgid "Dependencies: \\n"
@@ -1452,7 +1452,7 @@
 
 #: html/Elements/SelectLinkType:27 html/Ticket/Create.html:180 html/Ticket/Elements/EditLinks:119 html/Ticket/Elements/EditLinks:36 html/Ticket/Elements/ShowDependencies:25 html/Ticket/Elements/ShowLinks:27
 msgid "Depends on"
-msgstr "Riippuu pyynnöstä"
+msgstr "Riippuu tapauksesta"
 
 #: NOT FOUND IN SOURCE
 msgid "DependsOn"
@@ -1464,7 +1464,7 @@
 
 #: html/SelfService/Create.html:75 html/Ticket/Create.html:119
 msgid "Describe the issue below"
-msgstr "Työtilauksen kuvaus"
+msgstr "Kuvaa tapausta"
 
 #: html/Admin/Elements/AddCustomFieldValue:27 html/Admin/Elements/EditCustomField:33 html/Admin/Elements/EditScrip:34 html/Admin/Elements/ModifyQueue:36 html/Admin/Elements/ModifyTemplate:36 html/Admin/Groups/Modify.html:49 html/Admin/Queues/Modify.html:48 html/Elements/SelectGroups:27 html/User/Groups/Modify.html:49
 msgid "Description"
@@ -1480,15 +1480,15 @@
 
 #: lib/RT/Queue_Overlay.pm:69
 msgid "Display Access Control List"
-msgstr ""
+msgstr "Näytä käyttöoikeuslista"
 
 #: lib/RT/Queue_Overlay.pm:75
 msgid "Display Scrip templates for this queue"
-msgstr ""
+msgstr "Näytä työjonon toimintopohjat"
 
 #: lib/RT/Queue_Overlay.pm:78
 msgid "Display Scrips for this queue"
-msgstr ""
+msgstr "Näytä työjonon toiminnot"
 
 #: html/Ticket/Elements/ShowHistory:35
 msgid "Display mode"
@@ -1497,11 +1497,11 @@
 #: html/SelfService/Display.html:25 html/SelfService/Display.html:29
 #. ($Ticket->id)
 msgid "Display ticket #%1"
-msgstr "Näytä työpyyntö #%1"
+msgstr "Näytä tapaus #%1"
 
 #: lib/RT/System.pm:54
 msgid "Do anything and everything"
-msgstr ""
+msgstr "Tee mitä tahansa ja kaikki"
 
 #: html/Elements/Refresh:30
 msgid "Don't refresh this page."
@@ -1509,7 +1509,7 @@
 
 #: html/Search/Elements/PickRestriction:114
 msgid "Don't show search results"
-msgstr ""
+msgstr "Älä näytä hakutuloksia"
 
 #: html/Ticket/Elements/ShowTransaction:105
 msgid "Download"
@@ -1517,16 +1517,16 @@
 
 #: html/Elements/SelectDateType:32 html/Ticket/Create.html:167 html/Ticket/Elements/EditDates:45 html/Ticket/Elements/ShowDates:43 lib/RT/Ticket_Overlay.pm:1171
 msgid "Due"
-msgstr "Mennessä"
+msgstr "Erääntyy"
 
 #: NOT FOUND IN SOURCE
 msgid "Due date '%1' could not be parsed"
-msgstr "Mennessä -päivää '%1' ei onnistuttu kääntämään järjestelmälle."
+msgstr "Erääntymispäivää '%1' ei onnistuttu tulkkaamaan järjestelmälle."
 
 #: bin/rt-commit-handler:754
 #. ($1, $msg)
 msgid "ERROR: Couldn't load ticket '%1': %2.\\n"
-msgstr "VIRHE: Työpyynnön '%1' lataaminen ei onnistunut: %2.\\n"
+msgstr "VIRHE: Tapauksen '%1' lataaminen ei onnistunut: %2.\\n"
 
 #: NOT FOUND IN SOURCE
 msgid "Edit"
@@ -1535,7 +1535,7 @@
 #: html/Admin/Queues/CustomFields.html:45
 #. ($Queue->Name)
 msgid "Edit Custom Fields for %1"
-msgstr "Muokkaa kenttiä: työjono %1"
+msgstr "Muokkaa työjonon %1 kenttiä"
 
 #: html/Ticket/ModifyLinks.html:36
 msgid "Edit Relationships"
@@ -1544,53 +1544,53 @@
 #: html/Admin/Queues/Templates.html:41
 #. ($QueueObj->Name)
 msgid "Edit Templates for queue %1"
-msgstr ""
+msgstr "Muokkaa työjonon %1 pohjia"
 
 #: NOT FOUND IN SOURCE
 msgid "Edit keywords"
-msgstr ""
+msgstr "Muokkaa avainsanoja"
 
 #: NOT FOUND IN SOURCE
 msgid "Edit scrips"
-msgstr "Muokkaa lappuja"
+msgstr "Muokkaa toimintoja"
 
 #: html/Admin/Global/index.html:46
 msgid "Edit system templates"
-msgstr "Muokkaa systeemipohjia"
+msgstr "Muokkaa järjestelmäpohjia"
 
 #: NOT FOUND IN SOURCE
 msgid "Edit templates for %1"
-msgstr "Muokkaa pohjia: työjono %1"
+msgstr "Muokkaa työjonon %1 pohjia"
 
 #: html/Admin/Elements/ModifyQueue:25 html/Admin/Queues/Modify.html:117
 #. ($QueueObj->Name)
 #. ($QueueObj->Id)
 msgid "Editing Configuration for queue %1"
-msgstr "Asetusten muokkaus: työjono %1"
+msgstr "Muokataan työjonon %1 asetuksia"
 
 #: html/Admin/Elements/ModifyUser:25
 #. ($UserObj->Name)
 msgid "Editing Configuration for user %1"
-msgstr "Asetusten muokkaus: käyttäjä %1"
+msgstr "Muokataan käyttäjän %1 asetuksia"
 
 #: html/Admin/Elements/EditCustomField:74
 #. ($CustomFieldObj->Name())
 msgid "Editing CustomField %1"
-msgstr "Kentän %1 muokkaus"
+msgstr "Muokataan kenttää %1"
 
 #: html/Admin/Groups/Members.html:32
 #. ($Group->Name)
 msgid "Editing membership for group %1"
-msgstr "Ryhmän %1 jäsenten muokkaus"
+msgstr "Muokataan ryhmän %1 jäseniä"
 
 #: html/User/Groups/Members.html:129
 #. ($Group->Name)
 msgid "Editing membership for personal group %1"
-msgstr "Henkilökohtaisen ryhmän %1 jäsenten muokkaus"
+msgstr "Muokataan henkilökohtaisen ryhmän %1 jäseniä"
 
 #: NOT FOUND IN SOURCE
 msgid "Editing template %1"
-msgstr "Pohjan %1 muokkaus"
+msgstr "Muokataan pohjaa %1"
 
 #: lib/RT/Ticket_Overlay.pm:2615 lib/RT/Ticket_Overlay.pm:2683
 msgid "Either base or target must be specified"
@@ -1614,15 +1614,15 @@
 
 #: html/Admin/Elements/EditCustomField:36
 msgid "Enabled (Unchecking this box disables this custom field)"
-msgstr ""
+msgstr "Aktiivinen (rastin poistaminen passivoi kentän)"
 
 #: html/Admin/Groups/Modify.html:53 html/User/Groups/Modify.html:53
 msgid "Enabled (Unchecking this box disables this group)"
-msgstr ""
+msgstr "Aktiivinen (rastin poistaminen passivoi ryhmän)"
 
 #: html/Admin/Queues/Modify.html:84
 msgid "Enabled (Unchecking this box disables this queue)"
-msgstr "Aktiivinen (Rastin poistaminen asettaa työjonon ei-aktiiviseksi)"
+msgstr "Aktiivinen (rastin poistaminen passivoi työjonon)"
 
 #: html/Admin/Elements/EditCustomFields:99
 msgid "Enabled Custom Fields"
@@ -1639,15 +1639,15 @@
 
 #: lib/RT/CustomField_Overlay.pm:361
 msgid "Enter multiple values"
-msgstr ""
+msgstr "Anna useampi arvo"
 
 #: lib/RT/CustomField_Overlay.pm:358
 msgid "Enter one value"
-msgstr ""
+msgstr "Anna yksi arvo"
 
 #: html/Ticket/Elements/EditLinks:112
 msgid "Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces."
-msgstr "Lisää työpyyntöjen numerot tai www-linkit. Käytä välilyöntiä erottimena syöttäessäsi useampaa numeroa tai linkkiä."
+msgstr "Lisää tapausten numerot tai www-linkit. Erota useammat välilyönneillä."
 
 #: html/Elements/Login:29 html/SelfService/Error.html:25 html/SelfService/Error.html:26
 msgid "Error"
@@ -1675,7 +1675,7 @@
 
 #: etc/initialdata:20
 msgid "Everyone"
-msgstr ""
+msgstr "Kaikki"
 
 #: bin/rt-crontool:194
 msgid "Example:"
@@ -1691,15 +1691,15 @@
 
 #: html/Admin/Users/Modify.html:73
 msgid "Extra info"
-msgstr "Lisatieto"
+msgstr "Lisätieto"
 
 #: lib/RT/User_Overlay.pm:302
 msgid "Failed to find 'Privileged' users pseudogroup."
-msgstr "'Etuoikeutettu' -pseudoryhmää ei löytynyt"
+msgstr "'Erioikeutettu'-valeryhmää ei löytynyt"
 
 #: lib/RT/User_Overlay.pm:309
 msgid "Failed to find 'Unprivileged' users pseudogroup"
-msgstr "Ei-etuoikeutettu' -pseudoryhmää ei löytynyt"
+msgstr "'Erioikeudeton'-valeryhmää ei löytynyt"
 
 #: bin/rt-crontool:138
 #. ($modname, $@)
@@ -1708,11 +1708,11 @@
 
 #: lib/RT/Date.pm:412
 msgid "Feb."
-msgstr "Helmi"
+msgstr "helmi"
 
 #: NOT FOUND IN SOURCE
 msgid "February"
-msgstr ""
+msgstr "helmikuu"
 
 #: NOT FOUND IN SOURCE
 msgid "Fin"
@@ -1728,19 +1728,19 @@
 
 #: html/Admin/Queues/People.html:61 html/Ticket/Elements/EditPeople:34
 msgid "Find group whose"
-msgstr ""
+msgstr "Etsi ryhmä, jonka"
 
 #: html/Elements/Quicksearch:25
 msgid "Find new/open tickets"
-msgstr "Etsi uudet/avoimet työpyynnöt"
+msgstr "Etsi uudet/avoimet tapaukset"
 
 #: html/Admin/Queues/People.html:57 html/Admin/Users/index.html:46 html/Ticket/Elements/EditPeople:30
 msgid "Find people whose"
-msgstr "Etsi käyttäjät joiden"
+msgstr "Etsi käyttäjät, joiden"
 
 #: html/Search/Listing.html:108
 msgid "Find tickets"
-msgstr ""
+msgstr "Hae tapauksia"
 
 #: NOT FOUND IN SOURCE
 msgid "Finish Approval"
@@ -1802,11 +1802,11 @@
 #: lib/RT/Transaction_Overlay.pm:595
 #. ($New->Name)
 msgid "Given to %1"
-msgstr ""
+msgstr "Annettu käyttäjälle %1"
 
 #: html/Admin/Elements/Tabs:41 html/Admin/index.html:38
 msgid "Global"
-msgstr "Globaali"
+msgstr "Yleiset"
 
 #: NOT FOUND IN SOURCE
 msgid "Global Keyword Selections"
@@ -1814,12 +1814,12 @@
 
 #: NOT FOUND IN SOURCE
 msgid "Global Scrips"
-msgstr "Globaalit laput"
+msgstr "Yleiset toiminnot"
 
 #: html/Admin/Elements/SelectTemplate:38
 #. (loc($Template->Name))
 msgid "Global template: %1"
-msgstr ""
+msgstr "Yleinen pohja: %1"
 
 #: html/Admin/Elements/EditCustomFields:75 html/Admin/Queues/People.html:59 html/Admin/Queues/People.html:63 html/Admin/Queues/index.html:44 html/Admin/Users/index.html:49 html/Ticket/Elements/EditPeople:32 html/Ticket/Elements/EditPeople:36 html/index.html:41
 msgid "Go!"
@@ -1827,7 +1827,7 @@
 
 #: NOT FOUND IN SOURCE
 msgid "Good pgp sig from %1\\n"
-msgstr "Hyvä PGP allekirjoitus käyttäjältä %1\\n"
+msgstr "Hyvä PGP-allekirjoitus käyttäjältä %1\\n"
 
 #: html/Search/Listing.html:50
 msgid "Goto page"
@@ -1835,11 +1835,11 @@
 
 #: html/Elements/GotoTicket:25 html/SelfService/Elements/GotoTicket:25
 msgid "Goto ticket"
-msgstr "Siirry työpyyntöön"
+msgstr "Siirry tapaukseen"
 
 #: html/Ticket/Elements/AddWatchers:46 html/User/Elements/DelegateRights:78
 msgid "Group"
-msgstr ""
+msgstr "Ryhmä"
 
 #: NOT FOUND IN SOURCE
 msgid "Group %1 %2: %3"
@@ -1855,12 +1855,12 @@
 
 #: NOT FOUND IN SOURCE
 msgid "Group could not be created."
-msgstr ""
+msgstr "Ryhmää ei voitu luoda."
 
 #: html/Admin/Groups/Modify.html:77
 #. ($create_msg)
 msgid "Group could not be created: %1"
-msgstr ""
+msgstr "Ryhmää ei voitu luoda: %1"
 
 #: lib/RT/Group_Overlay.pm:497
 msgid "Group created"
@@ -1868,7 +1868,7 @@
 
 #: lib/RT/Group_Overlay.pm:1133
 msgid "Group has no such member"
-msgstr ""
+msgstr "Ryhmässä ei ole sellaista jäsentä"
 
 #: lib/RT/Group_Overlay.pm:945 lib/RT/Queue_Overlay.pm:628 lib/RT/Queue_Overlay.pm:688 lib/RT/Ticket_Overlay.pm:1429 lib/RT/Ticket_Overlay.pm:1507
 msgid "Group not found"
@@ -1930,7 +1930,7 @@
 
 #: etc/upgrade/2.1.71:86
 msgid "If an approval is rejected, reject the original and delete pending approvals"
-msgstr ""
+msgstr "Jos hyväksyntä hylätään, hylkää alkuperäinen ja poista siitä riippuvat hyväksynnät"
 
 #: bin/rt-crontool:190
 msgid "If this tool were setgid, a hostile local user could use this tool to gain administrative access to RT."
@@ -1942,23 +1942,23 @@
 
 #: lib/RT/Interface/Web.pm:860
 msgid "Illegal value for %1"
-msgstr ""
+msgstr "Kelpaamaton arvo %1"
 
 #: lib/RT/Interface/Web.pm:863
 msgid "Immutable field"
-msgstr ""
+msgstr "Muuttumaton kenttä"
 
 #: html/Admin/Elements/EditCustomFields:74
 msgid "Include disabled custom fields in listing."
-msgstr ""
+msgstr "Sisällytä passiiviset kentät listaukseen"
 
 #: html/Admin/Queues/index.html:43
 msgid "Include disabled queues in listing."
-msgstr "Sisällytä listaukseen myös ei-aktiiviset työjonot."
+msgstr "Sisällytä listaukseen myös passiiviset työjonot."
 
 #: html/Admin/Users/index.html:47
 msgid "Include disabled users in search."
-msgstr "Sisällytä listaukseen myös ei-aktiiviset käyttäjät."
+msgstr "Sisällytä listaukseen myös passiiviset käyttäjät."
 
 #: lib/RT/Tickets_Overlay.pm:1067
 msgid "Initial Priority"
@@ -1978,12 +1978,12 @@
 
 #: lib/RT/Ticket_Overlay.pm:3729
 msgid "Internal Error"
-msgstr ""
+msgstr "Sisäinen virhe"
 
 #: lib/RT/Record.pm:143
 #. ($id->{error_message})
 msgid "Internal Error: %1"
-msgstr ""
+msgstr "Sisäinen virhe: %1"
 
 #: lib/RT/Group_Overlay.pm:644
 msgid "Invalid Group Type"
@@ -1991,19 +1991,19 @@
 
 #: lib/RT/Principal_Overlay.pm:128
 msgid "Invalid Right"
-msgstr ""
+msgstr "Kelpaamaton oikeus"
 
 #: NOT FOUND IN SOURCE
 msgid "Invalid Type"
-msgstr ""
+msgstr "Kelpaamaton tyyppi"
 
 #: lib/RT/Interface/Web.pm:865
 msgid "Invalid data"
-msgstr ""
+msgstr "Kelpaamatonta dataa"
 
 #: lib/RT/Ticket_Overlay.pm:438
 msgid "Invalid owner. Defaulting to 'nobody'."
-msgstr "Omistaja ei kelpaa. Asetetaan oletusasetusten mukaan 'eikukaan'"
+msgstr "Omistaja ei kelpaa. Asetetaan oletusasetusten mukaan 'ei kukaan'"
 
 #: lib/RT/Scrip_Overlay.pm:134 lib/RT/Template_Overlay.pm:251
 msgid "Invalid queue"
@@ -2048,11 +2048,11 @@
 
 #: NOT FOUND IN SOURCE
 msgid "January"
-msgstr ""
+msgstr "tammikuu"
 
 #: lib/RT/Group_Overlay.pm:149
 msgid "Join or leave this group"
-msgstr ""
+msgstr "Liity tai jätä ryhmä"
 
 #: lib/RT/Date.pm:417
 msgid "Jul."
@@ -2060,19 +2060,19 @@
 
 #: NOT FOUND IN SOURCE
 msgid "July"
-msgstr ""
+msgstr "Heinäkuu"
 
 #: html/Ticket/Elements/Tabs:99
 msgid "Jumbo"
-msgstr "Jumbo"
+msgstr "Jätti"
 
 #: lib/RT/Date.pm:416
 msgid "Jun."
-msgstr "Kesä"
+msgstr "kesä"
 
 #: NOT FOUND IN SOURCE
 msgid "June"
-msgstr ""
+msgstr "kesäkuu"
 
 #: NOT FOUND IN SOURCE
 msgid "Keyword"
@@ -2080,7 +2080,7 @@
 
 #: html/Admin/Elements/ModifyUser:52
 msgid "Lang"
-msgstr "Keili"
+msgstr "Kieli"
 
 #: html/Ticket/Elements/Tabs:73
 msgid "Last"
@@ -2096,7 +2096,7 @@
 
 #: html/Search/Elements/TicketHeader:41
 msgid "Last Notified"
-msgstr ""
+msgstr "Viimeksi huomautettu"
 
 #: html/Elements/SelectDateType:30
 msgid "Last Updated"
@@ -2108,11 +2108,11 @@
 
 #: NOT FOUND IN SOURCE
 msgid "Left"
-msgstr "Vasen"
+msgstr "Jäljellä"
 
 #: html/Admin/Users/Modify.html:83
 msgid "Let this user access RT"
-msgstr "Päästä tämä käyttäjä sisään RT:een"
+msgstr "Päästä tämä käyttäjä sisään RT:iin"
 
 #: html/Admin/Users/Modify.html:87
 msgid "Let this user be granted rights"
@@ -2151,11 +2151,11 @@
 #: html/Ticket/ModifyLinks.html:25 html/Ticket/ModifyLinks.html:29
 #. ($Ticket->Id)
 msgid "Link ticket #%1"
-msgstr "Linkitä työpyyntö #%1"
+msgstr "Linkitä tapaus #%1"
 
 #: NOT FOUND IN SOURCE
 msgid "Link ticket %1"
-msgstr ""
+msgstr "Linkitä tapaus #%1"
 
 #: html/Ticket/Elements/Tabs:97
 msgid "Links"
@@ -2168,12 +2168,12 @@
 #: lib/RT.pm:158
 #. ($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 kirkoittaminen ei onnistunut.\\n RT ei voi toimia."
+msgstr "Lokihakemistoa %1 ei löytynyt tai kirjoittaminen ei onnistunut.\\n RT ei voi toimia."
 
 #: html/Elements/Header:57
 #. ("<b>".$session{'CurrentUser'}->Name."</b>")
 msgid "Logged in as %1"
-msgstr "Kirjautunut sisään tunnuksella %1"
+msgstr "Olet kirjautunut sisään tunnuksella %1"
 
 #: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:25 html/Elements/Login:34 html/Elements/Login:45
 msgid "Login"
@@ -2193,19 +2193,19 @@
 
 #: html/Search/Bulk.html:109
 msgid "Make date Due"
-msgstr "Aseta mennessä -aika"
+msgstr "Aseta erääntymisaika"
 
 #: html/Search/Bulk.html:110
 msgid "Make date Resolved"
-msgstr "Aseta päätetty -aika"
+msgstr "Aseta päätösaika"
 
 #: html/Search/Bulk.html:107
 msgid "Make date Started"
-msgstr "Aseta aloitettu -aika"
+msgstr "Aseta aloitusaika"
 
 #: html/Search/Bulk.html:106
 msgid "Make date Starts"
-msgstr "Aseta alkaa -aika"
+msgstr "Aseta alkuaika"
 
 #: html/Search/Bulk.html:108
 msgid "Make date Told"
@@ -2225,31 +2225,31 @@
 
 #: html/Admin/index.html:33
 msgid "Manage groups and group membership"
-msgstr ""
+msgstr "Hallinnoi ryhmiä ja jäsenyyksiä"
 
 #: html/Admin/index.html:39
 msgid "Manage properties and configuration which apply to all queues"
-msgstr ""
+msgstr "Hallinnoi yleisiä asetuksia, jotka vaikuttavat kaikkiin työjonoihin"
 
 #: html/Admin/index.html:36
 msgid "Manage queues and queue-specific properties"
-msgstr ""
+msgstr "Hallinnoi työjonoja ja työjonokohtaisia asetuksia"
 
 #: html/Admin/index.html:30
 msgid "Manage users and passwords"
-msgstr ""
+msgstr "Hallinnoi käyttäjiä ja salasanoja"
 
 #: lib/RT/Date.pm:413
 msgid "Mar."
-msgstr "Maasis"
+msgstr "Maalis"
 
 #: NOT FOUND IN SOURCE
 msgid "March"
-msgstr ""
+msgstr "Maaliskuu"
 
 #: NOT FOUND IN SOURCE
 msgid "May"
-msgstr ""
+msgstr "Toukokuu"
 
 #: lib/RT/Date.pm:415
 msgid "May."
@@ -2293,7 +2293,7 @@
 
 #: html/Ticket/Update.html:102
 msgid "Message"
-msgstr ""
+msgstr "Viesti"
 
 #: lib/RT/Interface/Web.pm:867
 msgid "Missing a primary key?: %1"
@@ -2301,15 +2301,15 @@
 
 #: html/Admin/Users/Modify.html:169 html/User/Prefs.html:54
 msgid "Mobile"
-msgstr "Käsipuhelin"
+msgstr "Kännykkä"
 
 #: html/Admin/Elements/ModifyUser:72
 msgid "MobilePhone"
-msgstr "Käsipuhelin"
+msgstr "Kännykkä"
 
 #: lib/RT/Queue_Overlay.pm:70
 msgid "Modify Access Control List"
-msgstr ""
+msgstr "Muokkaa käyttöoikeusluetteloa"
 
 #: NOT FOUND IN SOURCE
 msgid "Modify Custom Field %1"
@@ -2317,23 +2317,23 @@
 
 #: html/Admin/Global/CustomFields.html:44 html/Admin/Global/index.html:51
 msgid "Modify Custom Fields which apply to all queues"
-msgstr ""
+msgstr "Muokkaa kaikkia työjonoja koskevia kenttiä"
 
 #: lib/RT/Queue_Overlay.pm:73
 msgid "Modify Scrip templates for this queue"
-msgstr ""
+msgstr "Muokkaa tämän työjonon toimintopohjia"
 
 #: lib/RT/Queue_Overlay.pm:76
 msgid "Modify Scrips for this queue"
-msgstr ""
+msgstr "Muokkaa tämän työjonon toimintoja"
 
 #: NOT FOUND IN SOURCE
 msgid "Modify System ACLS"
-msgstr ""
+msgstr "Muokkaa järjestelmän käyttöoikeusluetteloa"
 
 #: NOT FOUND IN SOURCE
 msgid "Modify Template %1"
-msgstr ""
+msgstr "Muokkaa pohjaa %1"
 
 #: html/Admin/Queues/CustomField.html:45
 #. ($QueueObj->Name())
@@ -2347,11 +2347,11 @@
 #: html/Admin/Queues/Scrip.html:54
 #. ($QueueObj->Name)
 msgid "Modify a scrip for queue %1"
-msgstr ""
+msgstr "Muokkaa työjonon %1 toimintoa"
 
 #: html/Admin/Global/Scrip.html:48
 msgid "Modify a scrip which applies to all queues"
-msgstr ""
+msgstr "Muokkaa toimintoa, jota sovelletaan kaikkiin työjonoihin"
 
 #: NOT FOUND IN SOURCE
 msgid "Modify dates for # %1"
@@ -2360,20 +2360,20 @@
 #: html/Ticket/ModifyDates.html:25 html/Ticket/ModifyDates.html:29
 #. ($TicketObj->Id)
 msgid "Modify dates for #%1"
-msgstr "Muokkaa työpyynnön #%1 päiviä"
+msgstr "Muokkaa tapauksen #%1 päiviä"
 
 #: html/Ticket/ModifyDates.html:35
 #. ($TicketObj->Id)
 msgid "Modify dates for ticket # %1"
-msgstr "Muokkaa työpyynnön #%1 päiviä"
+msgstr "Muokkaa tapauksen #%1 päiviä"
 
 #: html/Admin/Global/GroupRights.html:25 html/Admin/Global/GroupRights.html:28 html/Admin/Global/index.html:56
 msgid "Modify global group rights"
-msgstr "Muokkaa ryhmien globaaleja oikeuksia"
+msgstr "Muokkaa ryhmien yleisiä oikeuksia"
 
 #: html/Admin/Global/GroupRights.html:33
 msgid "Modify global group rights."
-msgstr "Muokkaa ryhmien globaaleja oikeuksia."
+msgstr "Muokkaa ryhmien yleisiä oikeuksia."
 
 #: NOT FOUND IN SOURCE
 msgid "Modify global rights for groups"
@@ -2385,19 +2385,19 @@
 
 #: NOT FOUND IN SOURCE
 msgid "Modify global scrips"
-msgstr "Muokkaa globaaleja lappuja"
+msgstr "Muokkaa yleisiä toimintoja"
 
 #: html/Admin/Global/UserRights.html:25 html/Admin/Global/UserRights.html:28 html/Admin/Global/index.html:60
 msgid "Modify global user rights"
-msgstr ""
+msgstr "Muokkaa yleisiä käyttäjien oikeuksia"
 
 #: html/Admin/Global/UserRights.html:33
 msgid "Modify global user rights."
-msgstr "Muokkaa käyttäjien globaaleja oikeuksia."
+msgstr "Muokkaa käyttäjien yleisiä oikeuksia."
 
 #: lib/RT/Group_Overlay.pm:146
 msgid "Modify group metadata or delete group"
-msgstr ""
+msgstr "Muokkaa ryhmän metatietoja tai poista ryhmä"
 
 #: html/Admin/Groups/GroupRights.html:25 html/Admin/Groups/GroupRights.html:29 html/Admin/Groups/GroupRights.html:35
 #. ($GroupObj->Name)
@@ -2411,11 +2411,11 @@
 
 #: lib/RT/Group_Overlay.pm:148
 msgid "Modify membership roster for this group"
-msgstr ""
+msgstr "Muokkaa tämän ryhmän jäsenlistaa"
 
 #: lib/RT/System.pm:61
 msgid "Modify one's own RT account"
-msgstr ""
+msgstr "Muokkaa omaa RT-tunnustasi"
 
 #: html/Admin/Queues/People.html:25 html/Admin/Queues/People.html:29
 #. ($QueueObj->Name)
@@ -2426,16 +2426,16 @@
 #. ($Ticket->id)
 #. ($Ticket->Id)
 msgid "Modify people related to ticket #%1"
-msgstr "Muokkaa työpyyntöön %1 liittyviä käyttäjiä"
+msgstr "Muokkaa tapaukseen %1 liittyviä käyttäjiä"
 
 #: html/Admin/Queues/Scrips.html:44
 #. ($QueueObj->Name)
 msgid "Modify scrips for queue %1"
-msgstr "Muokkaa työjonoon %1 liittyviä lappuja"
+msgstr "Muokkaa työjonoon %1 liittyviä toimintoja"
 
 #: html/Admin/Global/Scrips.html:44 html/Admin/Global/index.html:42
 msgid "Modify scrips which apply to all queues"
-msgstr ""
+msgstr "Muokkaa toimintoja, joita sovelletaan kaikkiin työjonoihin"
 
 #: html/Admin/Global/Template.html:25 html/Admin/Global/Template.html:30 html/Admin/Global/Template.html:81 html/Admin/Queues/Template.html:78
 #. (loc($TemplateObj->Name()))
@@ -2445,16 +2445,16 @@
 
 #: html/Admin/Global/Templates.html:44
 msgid "Modify templates which apply to all queues"
-msgstr ""
+msgstr "Muokkaaa pohjia, joita sovelletaan kaikkiin työjonoihin"
 
 #: html/Admin/Groups/Modify.html:87 html/User/Groups/Modify.html:86
 #. ($Group->Name)
 msgid "Modify the group %1"
-msgstr "Muokkaa työjonoa %1"
+msgstr "Muokkaa ryhmää %1"
 
 #: lib/RT/Queue_Overlay.pm:71
 msgid "Modify the queue watchers"
-msgstr ""
+msgstr "Muokkaa työjonon tarkkailjoita"
 
 #: html/Admin/Users/Modify.html:236
 #. ($UserObj->Name)
@@ -2464,16 +2464,16 @@
 #: html/Ticket/ModifyAll.html:37
 #. ($Ticket->Id)
 msgid "Modify ticket # %1"
-msgstr "Muokkaa työpyyntöä #%1"
+msgstr "Muokkaa tapausta #%1"
 
 #: html/Ticket/Modify.html:25 html/Ticket/Modify.html:28 html/Ticket/Modify.html:34
 #. ($TicketObj->Id)
 msgid "Modify ticket #%1"
-msgstr "Muokkaa työpyyntöä #%1"
+msgstr "Muokkaa tapausta #%1"
 
 #: lib/RT/Queue_Overlay.pm:88
 msgid "Modify tickets"
-msgstr ""
+msgstr "Muokkaa tapauksia"
 
 #: html/Admin/Groups/UserRights.html:25 html/Admin/Groups/UserRights.html:29 html/Admin/Groups/UserRights.html:35
 #. ($GroupObj->Name)
@@ -2487,7 +2487,7 @@
 
 #: NOT FOUND IN SOURCE
 msgid "Modify watchers for queue '%1'"
-msgstr "Muokkaa työpyynnön %1 katselijoita"
+msgstr "Muokkaa tapauksen %1 seuraajia"
 
 #: lib/RT/Queue_Overlay.pm:70
 msgid "ModifyACL"
@@ -2528,11 +2528,11 @@
 
 #: html/Admin/Elements/EditCustomFields:61
 msgid "Move down"
-msgstr ""
+msgstr "Siirrä alas"
 
 #: html/Admin/Elements/EditCustomFields:53
 msgid "Move up"
-msgstr ""
+msgstr "Siirrä ylös"
 
 #: html/Admin/Elements/SelectSingleOrMultiple:27
 msgid "Multiple"
@@ -2544,11 +2544,11 @@
 
 #: NOT FOUND IN SOURCE
 msgid "My Approvals"
-msgstr ""
+msgstr "Hyväksyntäni"
 
 #: html/Approvals/index.html:25 html/Approvals/index.html:26
 msgid "My approvals"
-msgstr ""
+msgstr "Hyväksyntäni"
 
 #: html/Admin/Elements/AddCustomFieldValue:26 html/Admin/Elements/EditCustomField:32 html/Admin/Elements/ModifyTemplate:28 html/Admin/Elements/ModifyUser:30 html/Admin/Groups/Modify.html:44 html/Elements/SelectGroups:26 html/Elements/SelectUsers:28 html/User/Groups/Modify.html:44
 msgid "Name"
@@ -2560,11 +2560,11 @@
 
 #: NOT FOUND IN SOURCE
 msgid "Need approval from system administrator"
-msgstr ""
+msgstr "Tarvitsee järjestelmän ylläpitäjän hyväksynnän"
 
 #: html/Ticket/Elements/ShowDates:52
 msgid "Never"
-msgstr ""
+msgstr "Ei ikinä"
 
 #: html/Elements/Quicksearch:30
 msgid "New"
@@ -2584,7 +2584,7 @@
 
 #: html/Ticket/Elements/Tabs:36
 msgid "New Search"
-msgstr ""
+msgstr "Uusi haku"
 
 #: html/Admin/Global/CustomField.html:41 html/Admin/Global/CustomFields.html:39 html/Admin/Queues/CustomField.html:52 html/Admin/Queues/CustomFields.html:40
 msgid "New custom field"
@@ -2592,7 +2592,7 @@
 
 #: html/Admin/Elements/GroupTabs:54 html/User/Elements/GroupTabs:52
 msgid "New group"
-msgstr ""
+msgstr "Uusi ryhmä"
 
 #: html/SelfService/Prefs.html:32
 msgid "New password"
@@ -2604,11 +2604,11 @@
 
 #: html/Admin/Elements/QueueTabs:70
 msgid "New queue"
-msgstr ""
+msgstr "Uusi työjono"
 
 #: html/SelfService/Elements/Tabs:63
 msgid "New request"
-msgstr "Uusi työpyyntö"
+msgstr "Uusi tapaus"
 
 #: html/Admin/Elements/SelectRights:42
 msgid "New rights"
@@ -2616,7 +2616,7 @@
 
 #: html/Admin/Global/Scrip.html:40 html/Admin/Global/Scrips.html:39 html/Admin/Queues/Scrip.html:43 html/Admin/Queues/Scrips.html:53
 msgid "New scrip"
-msgstr ""
+msgstr "Uusi toiminto"
 
 #: NOT FOUND IN SOURCE
 msgid "New search"
@@ -2624,15 +2624,15 @@
 
 #: html/Admin/Global/Template.html:60 html/Admin/Global/Templates.html:39 html/Admin/Queues/Template.html:58 html/Admin/Queues/Templates.html:46
 msgid "New template"
-msgstr ""
+msgstr "Uusi pohja"
 
 #: lib/RT/Ticket_Overlay.pm:2771
 msgid "New ticket doesn't exist"
-msgstr "Uutta työpyyntöä ei löydy"
+msgstr "Uutta tapausta ei löydy"
 
 #: html/Admin/Elements/UserTabs:52
 msgid "New user"
-msgstr ""
+msgstr "Uusi käyttäjä"
 
 #: html/Admin/Elements/CreateUserCalled:26
 msgid "New user called"
@@ -2684,11 +2684,11 @@
 
 #: bin/rt-commit-handler:764
 msgid "No Ticket specified. Aborting ticket "
-msgstr "Työpyyntöä ei määritelty. Poistutaan työpyynnöstä"
+msgstr "Tapausta ei määritelty. Perutaan tapaus "
 
 #: NOT FOUND IN SOURCE
 msgid "No Ticket specified. Aborting ticket modifications\\n\\n"
-msgstr "Työpyyntöä ei määritelty. Poistutaan työpyynnön muokkauksesta\\n\\n"
+msgstr "Tapausta ei määritelty. Poistutaan tapauksen muokkauksesta\\n\\n"
 
 #: html/Approvals/Elements/Approve:47
 msgid "No action"
@@ -2704,7 +2704,7 @@
 
 #: html/Elements/ViewUser:36 html/Ticket/Elements/ShowRequestor:45
 msgid "No comment entered about this user"
-msgstr "Tälle käyttäjälle ei ole annettu kommentteja"
+msgstr "Käyttäjälle ei ole annettu kommentteja"
 
 #: lib/RT/Ticket_Overlay.pm:2189 lib/RT/Ticket_Overlay.pm:2257
 msgid "No correspondence attached"
@@ -2725,12 +2725,12 @@
 
 #: lib/RT/Queue_Overlay.pm:259
 msgid "No permission to create queues"
-msgstr "Ei oikeutta luoda kyselyitä"
+msgstr "Ei oikeutta luoda työjonoja"
 
 #: lib/RT/Ticket_Overlay.pm:341
 #. ($QueueObj->Name)
 msgid "No permission to create tickets in the queue '%1'"
-msgstr ""
+msgstr "Ei oikeutta luoda tapauksia työjonoon '%1'"
 
 #: lib/RT/User_Overlay.pm:151
 msgid "No permission to create users"
@@ -2738,11 +2738,11 @@
 
 #: html/SelfService/Display.html:174
 msgid "No permission to display that ticket"
-msgstr "Ei oikeutta tarkastella tätä työpyyntöä"
+msgstr "Ei oikeutta tarkastella tätä tapausta"
 
 #: html/SelfService/Update.html:55
 msgid "No permission to view update ticket"
-msgstr "Ei oikeutta päivittää tätä työpyyntöä"
+msgstr "Ei oikeutta päivittää tätä tapausta"
 
 #: lib/RT/Queue_Overlay.pm:675 lib/RT/Ticket_Overlay.pm:1488
 msgid "No principal specified"
@@ -2750,35 +2750,35 @@
 
 #: html/Admin/Queues/People.html:154 html/Admin/Queues/People.html:164
 msgid "No principals selected."
-msgstr "Johtajia ei ole valittu."
+msgstr "Toimeksiantajia ei ole valittu."
 
 #: html/Admin/Queues/index.html:35
 msgid "No queues matching search criteria found."
-msgstr "Yhtään hakukriteerit täyttävää työpyyntöä ei löytynyt."
+msgstr "Yhtään hakukriteerit täyttävää tapausta ei löytynyt."
 
 #: html/Admin/Elements/SelectRights:81
 msgid "No rights found"
-msgstr ""
+msgstr "Oikeuksia ei löytynyt"
 
 #: html/Admin/Elements/SelectRights:33
 msgid "No rights granted."
-msgstr "Ei oikeuksia"
+msgstr "Ei myönnettyjä oikeuksia."
 
 #: html/Search/Bulk.html:149
 msgid "No search to operate on."
-msgstr "Ei hakua jonka kanssa työskennellä"
+msgstr "Ei työstettävää hakua"
 
 #: NOT FOUND IN SOURCE
 msgid "No ticket id specified"
-msgstr "Työpyynnön numeroa ei ole määritelty"
+msgstr "Tapauksen numeroa ei ole määritelty"
 
 #: lib/RT/Transaction_Overlay.pm:480 lib/RT/Transaction_Overlay.pm:518
 msgid "No transaction type specified"
-msgstr "Toiminnon tyyppiä ei ole määritelty"
+msgstr "Tapahtuman tyyppiä ei ole määritelty"
 
 #: NOT FOUND IN SOURCE
 msgid "No user or email address specified"
-msgstr ""
+msgstr "Käyttäjää tai sähköpostiosoitetta ei ole määritelty"
 
 #: html/Admin/Users/index.html:36
 msgid "No users matching search criteria found."
@@ -2786,7 +2786,7 @@
 
 #: bin/rt-commit-handler:644
 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 cvs käsittelijä irrottautuu. Ole hyvä ja ota yhteyttä RT:n ylläpitäjään.\\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/Interface/Web.pm:859
 msgid "No value sent to _Set!\\n"
@@ -2794,15 +2794,15 @@
 
 #: html/Search/Elements/TicketRow:37
 msgid "Nobody"
-msgstr ""
+msgstr "Ei kukaan"
 
 #: lib/RT/Interface/Web.pm:864
 msgid "Nonexistant field?"
-msgstr ""
+msgstr "Olematon kenttä?"
 
 #: html/Elements/Login:99
 msgid "Not logged in"
-msgstr ""
+msgstr "Sisäänkirjautumaton"
 
 #: html/Elements/Header:59 html/SelfService/Elements/Header:58
 msgid "Not logged in."
@@ -2814,15 +2814,15 @@
 
 #: html/NoAuth/Reminder.html:27
 msgid "Not yet implemented."
-msgstr "Ei vielä implementoitu."
+msgstr "Ei vielä toteutettu."
 
 #: html/Admin/Groups/Rights.html:25
 msgid "Not yet implemented...."
-msgstr "Ei vielä implementoitu..."
+msgstr "Ei vielä toteutettu..."
 
 #: html/Approvals/Elements/Approve:50
 msgid "Notes"
-msgstr ""
+msgstr "Merkintöjä"
 
 #: lib/RT/User_Overlay.pm:642
 msgid "Notification could not be sent"
@@ -2882,7 +2882,7 @@
 
 #: NOT FOUND IN SOURCE
 msgid "November"
-msgstr ""
+msgstr "marraskuu"
 
 #: lib/RT/Record.pm:157
 msgid "Object could not be created"
@@ -2898,7 +2898,7 @@
 
 #: NOT FOUND IN SOURCE
 msgid "October"
-msgstr ""
+msgstr "lokakuu"
 
 #: html/Elements/SelectDateRelation:35
 msgid "On"
@@ -2939,12 +2939,12 @@
 #: html/Approvals/Elements/PendingMyApproval:50
 #. ("<input size='15' value='".( $created_after->Unix >0 && $created_after->ISO)."' name='CreatedAfter'>")
 msgid "Only show approvals for requests created after %1"
-msgstr ""
+msgstr "Näytä vain pyynnöt, jotka on luotu jälkeen %1"
 
 #: html/Approvals/Elements/PendingMyApproval:48
 #. ("<input size='15' value='".($created_before->Unix > 0 &&$created_before->ISO)."' name='CreatedBefore'>")
 msgid "Only show approvals for requests created before %1"
-msgstr ""
+msgstr "Näytä vain pyynnöt, jotka on luotu ennen %1"
 
 #: html/Elements/Quicksearch:31
 msgid "Open"
@@ -2956,19 +2956,19 @@
 
 #: html/SelfService/Elements/Tabs:57
 msgid "Open requests"
-msgstr "Avoimet työpyynnöt"
+msgstr "Avoimet tapaukset"
 
 #: html/Admin/Users/Prefs.html:41
 msgid "Open tickets (from listing) in a new window"
-msgstr "Avoimet työpyynnöt (listasta) uudessa ikkunassa"
+msgstr "Avoimet tapaukset (listasta) uudessa ikkunassa"
 
 #: html/Admin/Users/Prefs.html:40
 msgid "Open tickets (from listing) in another window"
-msgstr "Avoimet työpyynnöt (listasta) toisessa ikkunassa"
+msgstr "Avoimet tapaukset (listasta) toisessa ikkunassa"
 
 #: etc/initialdata:133
 msgid "Open tickets on correspondence"
-msgstr ""
+msgstr "Avaa tapaukset, kun esiintyy kirjeenvaihtoa"
 
 #: html/Search/Elements/PickRestriction:101
 msgid "Ordering and sorting"
@@ -2976,12 +2976,12 @@
 
 #: html/Admin/Elements/ModifyUser:46 html/Admin/Users/Modify.html:117 html/Elements/SelectUsers:29 html/User/Prefs.html:86
 msgid "Organization"
-msgstr "Organisaatio"
+msgstr "Laitos"
 
 #: html/Approvals/Elements/Approve:34
 #. ($approving->Id, $approving->Subject)
 msgid "Originating ticket: #%1"
-msgstr ""
+msgstr "Alkuperäinen tapaus: #%1"
 
 #: html/Admin/Elements/ModifyQueue:55 html/Admin/Queues/Modify.html:69
 msgid "Over time, priority moves toward"
@@ -2989,7 +2989,7 @@
 
 #: lib/RT/Queue_Overlay.pm:87
 msgid "Own tickets"
-msgstr ""
+msgstr "Omat tapaukset"
 
 #: lib/RT/Queue_Overlay.pm:87
 msgid "OwnTicket"
@@ -3002,16 +3002,16 @@
 #: lib/RT/Ticket_Overlay.pm:3004
 #. ($OldOwnerObj->Name,  $NewOwnerObj->Name)
 msgid "Owner changed from %1 to %2"
-msgstr ""
+msgstr "Omistaja vaihdettu tunnuksesta %1 tunnukseen %2"
 
 #: lib/RT/Transaction_Overlay.pm:584
 #. ($Old->Name , $New->Name)
 msgid "Owner forcibly changed from %1 to %2"
-msgstr "Omistaja pakottamalla muutettu arvosta %1 arvoon %2"
+msgstr "Omistaja pakolla vaihdettu tunnuksesta %1 tunnukseen %2"
 
 #: html/Search/Elements/PickRestriction:31
 msgid "Owner is"
-msgstr "Omistaja on"
+msgstr "Omistaja"
 
 #: html/Admin/Users/Modify.html:174 html/User/Prefs.html:56
 msgid "Pager"
@@ -3019,7 +3019,7 @@
 
 #: html/Admin/Elements/ModifyUser:74
 msgid "PagerPhone"
-msgstr "Hakulaite puhelin"
+msgstr "Hakulaite-puhelin"
 
 #: html/Ticket/Create.html:182 html/Ticket/Elements/EditLinks:127 html/Ticket/Elements/EditLinks:58 html/Ticket/Elements/ShowLinks:43
 msgid "Parents"
@@ -3031,7 +3031,7 @@
 
 #: html/NoAuth/Reminder.html:25
 msgid "Password Reminder"
-msgstr "Salasanan muistuttaja"
+msgstr "Salasanan muistutus"
 
 #: lib/RT/User_Overlay.pm:168 lib/RT/User_Overlay.pm:860
 msgid "Password too short"
@@ -3056,7 +3056,7 @@
 
 #: html/User/Elements/Tabs:35
 msgid "Personal Groups"
-msgstr ""
+msgstr "Omat ryhmät"
 
 #: html/User/Groups/index.html:30 html/User/Groups/index.html:40
 msgid "Personal groups"
@@ -3101,7 +3101,7 @@
 #: lib/RT/ACE_Overlay.pm:133 lib/RT/ACE_Overlay.pm:208 lib/RT/ACE_Overlay.pm:552
 #. ($args{'PrincipalId'})
 msgid "Principal %1 not found."
-msgstr ""
+msgstr "Toimeksiantajaa %1 ei löytynyt"
 
 #: html/Search/Elements/PickRestriction:54 html/SelfService/Display.html:76 html/Ticket/Create.html:154 html/Ticket/Elements/EditBasics:54 html/Ticket/Elements/ShowBasics:39 lib/RT/Tickets_Overlay.pm:1042
 msgid "Priority"
@@ -3113,20 +3113,20 @@
 
 #: etc/initialdata:25
 msgid "Privileged"
-msgstr ""
+msgstr "Erioikeutettu"
 
 #: html/Admin/Users/Modify.html:271 html/User/Prefs.html:163
 #. (loc_fuzzy($msg))
 msgid "Privileged status: %1"
-msgstr "Etuoikeutuksen tila: &1"
+msgstr "Erioikeutuksen tila: &1"
 
 #: html/Admin/Users/index.html:62
 msgid "Privileged users"
-msgstr "Etuoikeutetut käyttäjät"
+msgstr "Erioikeutetut käyttäjät"
 
 #: etc/initialdata:23 etc/initialdata:29 etc/initialdata:35 etc/initialdata:59
 msgid "Pseudogroup for internal use"
-msgstr ""
+msgstr "Valeryhmä sisäiseen käyttöön"
 
 #: html/Elements/MyRequests:30 html/Elements/MyTickets:30 html/Elements/Quicksearch:29 html/Search/Elements/PickRestriction:46 html/SelfService/Create.html:35 html/SelfService/Display.html:68 html/Ticket/Create.html:38 html/Ticket/Elements/EditBasics:64 html/Ticket/Elements/ShowBasics:43 html/User/Elements/DelegateRights:80 lib/RT/Tickets_Overlay.pm:883
 msgid "Queue"
@@ -3136,7 +3136,7 @@
 #. ($Queue)
 #. ($id)
 msgid "Queue %1 not found"
-msgstr ""
+msgstr "Työjonoa %1 ei löytynyt"
 
 #: NOT FOUND IN SOURCE
 msgid "Queue '%1' not found\\n"
@@ -3152,7 +3152,7 @@
 
 #: NOT FOUND IN SOURCE
 msgid "Queue Scrips"
-msgstr "Työjonon laput"
+msgstr "Työjonon toiminnot"
 
 #: lib/RT/Queue_Overlay.pm:263
 msgid "Queue already exists"
@@ -3172,7 +3172,7 @@
 
 #: NOT FOUND IN SOURCE
 msgid "Queue is not specified."
-msgstr ""
+msgstr "Työjonoa ei määritelty"
 
 #: html/SelfService/Display.html:129
 msgid "Queue not found"
@@ -3195,7 +3195,7 @@
 #: html/Elements/Footer:32
 #. ($RT::VERSION)
 msgid "RT %1 from <a href=\"http://bestpractical.com\">Best Practical Solutions, LLC</a>."
-msgstr "RT %1, tekijä <a href=\"http://bestpractical.com\">Best Practical Solutions, LLC</a>."
+msgstr "RT %1, tekijä: <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"
@@ -3235,11 +3235,11 @@
 
 #: html/SelfService/Closed.html:25
 msgid "RT Self Service / Closed Tickets"
-msgstr "RT Itsepalvelu / Suljetut työpyynnöt"
+msgstr "RT Itsepalvelu / Suljetut tapaukset"
 
 #: html/index.html:25 html/index.html:28
 msgid "RT at a glance"
-msgstr ""
+msgstr "RT yhdellä silmäyksellä"
 
 #: NOT FOUND IN SOURCE
 msgid "RT couldn't authenticate you"
@@ -3260,7 +3260,7 @@
 #: html/Elements/PageLayout:26
 #. ($RT::rtname)
 msgid "RT for %1"
-msgstr ""
+msgstr "%1: RT"
 
 #: NOT FOUND IN SOURCE
 msgid "RT for %1: %2"
@@ -3285,7 +3285,7 @@
 
 #: 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:n sähköpostiohjaus moodi vaatii PGP tunnistamista. Et allekirjoittanut (PGP) viestiä tai allekirjoitustasi ei pystytty varmistamaan."
+msgstr "RT:n sähköpostiohjaustila vaatii PGP-tunnistamista. Et allekirjoittanut (PGP) viestiä tai allekirjoitustasi ei pystytty vahvistamaan."
 
 #: html/Admin/Users/Modify.html:58 html/Admin/Users/Prefs.html:52 html/User/Prefs.html:44
 msgid "Real Name"
@@ -3342,7 +3342,7 @@
 
 #: lib/RT/Queue_Overlay.pm:85
 msgid "Reply to tickets"
-msgstr ""
+msgstr "Vastaa tapauksiin"
 
 #: lib/RT/Queue_Overlay.pm:85
 msgid "ReplyToTicket"
@@ -3358,7 +3358,7 @@
 
 #: NOT FOUND IN SOURCE
 msgid "Requestor(s)"
-msgstr ""
+msgstr "Tilaajat"
 
 #: NOT FOUND IN SOURCE
 msgid "RequestorAddresses"
@@ -3370,7 +3370,7 @@
 
 #: html/Admin/Elements/ModifyQueue:61 html/Admin/Queues/Modify.html:75
 msgid "Requests should be due in"
-msgstr "Työpyyntö tulisi suorittaa mennessä"
+msgstr "Tapaus tulisi suorittaa mennessä"
 
 #: html/Elements/Submit:62
 msgid "Reset"
@@ -3378,7 +3378,7 @@
 
 #: html/Admin/Users/Modify.html:159 html/User/Prefs.html:50
 msgid "Residence"
-msgstr "Asuinpaikka"
+msgstr "Koti"
 
 #: html/Ticket/Elements/Tabs:132
 msgid "Resolve"
@@ -3387,7 +3387,7 @@
 #: html/Ticket/Update.html:133
 #. ($Ticket->id, $Ticket->Subject)
 msgid "Resolve ticket #%1 (%2)"
-msgstr ""
+msgstr "Ratkaise tapaus #%1 (%2)"
 
 #: etc/initialdata:302 html/Elements/SelectDateType:28 lib/RT/Ticket_Overlay.pm:1170
 msgid "Resolved"
@@ -3403,11 +3403,11 @@
 
 #: html/Search/Elements/PickRestriction:105
 msgid "Results per page"
-msgstr "Tulosta sivulle"
+msgstr "Tuloksia sivulle: "
 
 #: html/Admin/Elements/ModifyUser:33 html/Admin/Users/Modify.html:100 html/User/Prefs.html:72
 msgid "Retype Password"
-msgstr "Varmista salasana"
+msgstr "Vahvista salasana"
 
 #: NOT FOUND IN SOURCE
 msgid "Right %1 not found for %2  %3 in scope %4 (%5)\\n"
@@ -3419,7 +3419,7 @@
 
 #: lib/RT/ACE_Overlay.pm:303
 msgid "Right Granted"
-msgstr "Oikeus delegoitu"
+msgstr "Oikeus myönnetty"
 
 #: lib/RT/ACE_Overlay.pm:161
 msgid "Right Loaded"
@@ -3427,7 +3427,7 @@
 
 #: lib/RT/ACE_Overlay.pm:678 lib/RT/ACE_Overlay.pm:693
 msgid "Right could not be revoked"
-msgstr "Oikeutta ei voitu peruuttaa"
+msgstr "Oikeutta ei voitu perua"
 
 #: html/User/Delegation.html:64
 msgid "Right not found"
@@ -3439,7 +3439,7 @@
 
 #: lib/RT/ACE_Overlay.pm:689
 msgid "Right revoked"
-msgstr "Oikeus peruutettu"
+msgstr "Oikeus peruttu"
 
 #: html/Admin/Elements/UserTabs:41
 msgid "Rights"
@@ -3448,12 +3448,12 @@
 #: lib/RT/Interface/Web.pm:758
 #. ($object_type)
 msgid "Rights could not be granted for %1"
-msgstr ""
+msgstr "Oikeuksia ei voitu myöntää: %1"
 
 #: lib/RT/Interface/Web.pm:791
 #. ($object_type)
 msgid "Rights could not be revoked for %1"
-msgstr ""
+msgstr "Oikeuksia ei voitu perua: %1"
 
 #: html/Admin/Global/GroupRights.html:51 html/Admin/Queues/GroupRights.html:52
 msgid "Roles"
@@ -3478,27 +3478,27 @@
 #: html/Admin/Global/Scrip.html:49
 #. ($ARGS{'id'})
 msgid "Scrip #%1"
-msgstr ""
+msgstr "Toiminto #%1"
 
 #: lib/RT/Scrip_Overlay.pm:176
 msgid "Scrip Created"
-msgstr "Lappu luotu"
+msgstr "Toiminto luotu"
 
 #: html/Admin/Elements/EditScrips:84
 msgid "Scrip deleted"
-msgstr ""
+msgstr "Toiminto poistettu"
 
 #: html/Admin/Elements/QueueTabs:46 html/Admin/Elements/SystemTabs:33 html/Admin/Global/index.html:41
 msgid "Scrips"
-msgstr "Laput"
+msgstr "Toiminnot"
 
 #: NOT FOUND IN SOURCE
 msgid "Scrips for %1\\n"
-msgstr "Laput työjonolle %1\\n"
+msgstr "Toiminnot työjonolle %1\\n"
 
 #: html/Admin/Queues/Scrips.html:33
 msgid "Scrips which apply to all queues"
-msgstr ""
+msgstr "Toiminnot, joita sovelletaan kaikkiin työjonoihin"
 
 #: html/Elements/SimpleSearch:27 html/Search/Elements/PickRestriction:126 html/Ticket/Elements/Tabs:159
 msgid "Search"
@@ -3538,31 +3538,31 @@
 
 #: html/Admin/Elements/GroupTabs:52 html/User/Elements/GroupTabs:50
 msgid "Select group"
-msgstr ""
+msgstr "Valitse ryhmä"
 
 #: lib/RT/CustomField_Overlay.pm:355
 msgid "Select multiple values"
-msgstr ""
+msgstr "Valitse useita arvoja"
 
 #: lib/RT/CustomField_Overlay.pm:352
 msgid "Select one value"
-msgstr ""
+msgstr "Valitse yksi arvo"
 
 #: html/Admin/Elements/QueueTabs:67
 msgid "Select queue"
-msgstr ""
+msgstr "Valitse työjono"
 
 #: html/Admin/Global/Scrip.html:37 html/Admin/Global/Scrips.html:36 html/Admin/Queues/Scrip.html:40 html/Admin/Queues/Scrips.html:50
 msgid "Select scrip"
-msgstr ""
+msgstr "Valitse toiminto"
 
 #: html/Admin/Global/Template.html:57 html/Admin/Global/Templates.html:36 html/Admin/Queues/Template.html:55
 msgid "Select template"
-msgstr ""
+msgstr "Valitse pohja"
 
 #: html/Admin/Elements/UserTabs:49
 msgid "Select user"
-msgstr ""
+msgstr "Valitse käyttäjä"
 
 #: lib/RT/CustomField_Overlay.pm:36
 msgid "SelectMultiple"
@@ -3610,7 +3610,7 @@
 
 #: etc/initialdata:83 etc/initialdata:87
 msgid "Sends mail to the owner"
-msgstr ""
+msgstr "Lähettää postia omistajalle"
 
 #: lib/RT/Date.pm:419
 msgid "Sep."
@@ -3618,7 +3618,7 @@
 
 #: NOT FOUND IN SOURCE
 msgid "September"
-msgstr ""
+msgstr "syyskuu"
 
 #: NOT FOUND IN SOURCE
 msgid "Show Results"
@@ -3650,11 +3650,11 @@
 
 #: lib/RT/Queue_Overlay.pm:81
 msgid "Show ticket private commentary"
-msgstr ""
+msgstr "Näytä tapauksen kommentointi"
 
 #: lib/RT/Queue_Overlay.pm:79
 msgid "Show ticket summaries"
-msgstr ""
+msgstr "Näytä tapausten yhteenvedot"
 
 #: lib/RT/Queue_Overlay.pm:69
 msgid "ShowACL"
@@ -3711,7 +3711,7 @@
 
 #: html/Admin/Elements/AddCustomFieldValue:25
 msgid "SortOrder"
-msgstr "Lajittelujärjestyt"
+msgstr "Lajittelujärjestys"
 
 #: NOT FOUND IN SOURCE
 msgid "Stalled"
@@ -3727,7 +3727,7 @@
 
 #: NOT FOUND IN SOURCE
 msgid "Started date '%1' could not be parsed"
-msgstr "Aloitettu -aikaa '%1' ei pystytty tulkitsemaan"
+msgstr "Aloittamisaikaa '%1' ei pystytty tulkitsemaan"
 
 #: html/Elements/SelectDateType:31 html/Ticket/Create.html:166 html/Ticket/Elements/EditDates:27 html/Ticket/Elements/ShowDates:31
 msgid "Starts"
@@ -3739,7 +3739,7 @@
 
 #: NOT FOUND IN SOURCE
 msgid "Starts date '%1' could not be parsed"
-msgstr "Alkaa -aikaa '%1' ei pystytty tulkitsemaan"
+msgstr "Alkamisaikaa '%1' ei pystytty tulkitsemaan"
 
 #: html/Admin/Elements/ModifyUser:82 html/Admin/Users/Modify.html:138 html/User/Prefs.html:94
 msgid "State"
@@ -3778,7 +3778,7 @@
 #: docs/design_docs/string-extraction-guide.txt:89 lib/RT/Transaction_Overlay.pm:611
 #. ($self->Data)
 msgid "Subject changed to %1"
-msgstr ""
+msgstr "Otsikko vaihdettu: %1"
 
 #: html/Elements/Submit:59
 msgid "Submit"
@@ -3790,7 +3790,7 @@
 
 #: lib/RT/Group_Overlay.pm:749
 msgid "Succeeded"
-msgstr ""
+msgstr "Onnistui"
 
 #: lib/RT/Date.pm:394
 msgid "Sun."
@@ -3802,11 +3802,11 @@
 
 #: html/User/Elements/DelegateRights:77
 msgid "System"
-msgstr ""
+msgstr "Järjestelmä"
 
 #: html/Admin/Elements/SelectRights:81 lib/RT/ACE_Overlay.pm:567 lib/RT/Interface/Web.pm:757 lib/RT/Interface/Web.pm:790
 msgid "System Error"
-msgstr "Systeemivirhe"
+msgstr "Järjestelmävirhe"
 
 #: NOT FOUND IN SOURCE
 msgid "System Error. Right not granted."
@@ -3818,11 +3818,11 @@
 
 #: lib/RT/ACE_Overlay.pm:616
 msgid "System error. Right not delegated."
-msgstr "Systeemivirhe. Oikeutta ei delegoitu."
+msgstr "Järjestelmävirhe. Oikeutta ei delegoitu."
 
 #: lib/RT/ACE_Overlay.pm:146 lib/RT/ACE_Overlay.pm:223 lib/RT/ACE_Overlay.pm:306 lib/RT/ACE_Overlay.pm:898
 msgid "System error. Right not granted."
-msgstr "Systeemivirhe. Oikeutta ei luovutettu."
+msgstr "Järjestelmävirhe. Oikeutta ei luovutettu."
 
 #: NOT FOUND IN SOURCE
 msgid "System error. Unable to grant rights."
@@ -3830,7 +3830,7 @@
 
 #: html/Admin/Global/GroupRights.html:35 html/Admin/Groups/GroupRights.html:37 html/Admin/Queues/GroupRights.html:36
 msgid "System groups"
-msgstr "Systeemiryhmät"
+msgstr "Järjestelmäryhmät"
 
 #: etc/initialdata:41 etc/initialdata:47 etc/initialdata:53
 msgid "SystemRolegroup for internal use"
@@ -3838,7 +3838,7 @@
 
 #: lib/RT/CurrentUser.pm:320
 msgid "TEST_STRING"
-msgstr "TESTI_STRINGI"
+msgstr "TESTIMERKKIJONO"
 
 #: html/Ticket/Elements/Tabs:143
 msgid "Take"
@@ -3855,11 +3855,11 @@
 #: html/Admin/Global/Template.html:91 html/Admin/Queues/Template.html:90
 #. ($TemplateObj->Id())
 msgid "Template #%1"
-msgstr ""
+msgstr "Pohja #%1"
 
 #: html/Admin/Elements/EditTemplates:89
 msgid "Template deleted"
-msgstr ""
+msgstr "Pohja poistettu"
 
 #: lib/RT/Scrip_Overlay.pm:153
 msgid "Template not found"
@@ -3896,30 +3896,30 @@
 #: lib/RT/Queue_Overlay.pm:633
 #. ($args{'Type'})
 msgid "That principal is already a %1 for this queue"
-msgstr "Tämä toimeksiantaja on jo %1 tälle työjonolle"
+msgstr "Toimeksiantaja on jo %1 tälle työjonolle"
 
 #: lib/RT/Ticket_Overlay.pm:1434
 #. ($self->loc($args{'Type'}))
 msgid "That principal is already a %1 for this ticket"
-msgstr "Tämä toimeksiantaja on jo %1 tälle työpyynnölle"
+msgstr "Toimeksiantaja on jo %1 tälle tapaukselle"
 
 #: lib/RT/Queue_Overlay.pm:732
 #. ($args{'Type'})
 msgid "That principal is not a %1 for this queue"
-msgstr "Tämä toimeksiantaja ei ole %1 tälle työjonolle"
+msgstr "Toimeksiantaja ei ole %1 tälle työjonolle"
 
 #: lib/RT/Ticket_Overlay.pm:1551
 #. ($args{'Type'})
 msgid "That principal is not a %1 for this ticket"
-msgstr "Tämä toimeksiantaja ei ole %1 tälle työpyynnölle"
+msgstr "Toimeksiantaja ei ole %1 tälle tapaukselle"
 
 #: lib/RT/Ticket_Overlay.pm:1882
 msgid "That queue does not exist"
-msgstr "Tätä työjonoa ei ole olemassa"
+msgstr "Työjonoa ei ole olemassa"
 
 #: lib/RT/Ticket_Overlay.pm:3143
 msgid "That ticket has unresolved dependencies"
-msgstr "Tämä työpyyntö sisältää ei-päätettyjä riippuvuuksia"
+msgstr "Tapaus sisältää päättämättömiä riippuvuuksia"
 
 #: lib/RT/ACE_Overlay.pm:288 lib/RT/ACE_Overlay.pm:597
 msgid "That user already has that right"
@@ -3927,7 +3927,7 @@
 
 #: lib/RT/Ticket_Overlay.pm:2952
 msgid "That user already owns that ticket"
-msgstr "Käyttäjä omistaa jo tämän työpyynnön"
+msgstr "Käyttäjä omistaa jo tämän tapauksen"
 
 #: lib/RT/Ticket_Overlay.pm:2918
 msgid "That user does not exist"
@@ -3935,19 +3935,19 @@
 
 #: lib/RT/User_Overlay.pm:315
 msgid "That user is already privileged"
-msgstr "Tämä käyttäjä on jo etuoikeutettu"
+msgstr "Käyttäjä on jo erioikeutettu"
 
 #: lib/RT/User_Overlay.pm:332
 msgid "That user is already unprivileged"
-msgstr "Tämä käyttäjä on jo ei-etuoikeutettu"
+msgstr "Käyttäjä on jo erioikeudeton"
 
 #: lib/RT/User_Overlay.pm:327
 msgid "That user is now privileged"
-msgstr "Tämä käyttäjä on nyt etuoikeutettu"
+msgstr "Käyttäjä on nyt erioikeutettu"
 
 #: lib/RT/User_Overlay.pm:344
 msgid "That user is now unprivileged"
-msgstr "Tämä käyttäjä on nyt ei-etuoikeutettu"
+msgstr "Käyttäjä on nyt erioikeudeton"
 
 #: NOT FOUND IN SOURCE
 msgid "That user is now unprivilegedileged"
@@ -3955,7 +3955,7 @@
 
 #: lib/RT/Ticket_Overlay.pm:2944
 msgid "That user may not own tickets in that queue"
-msgstr "Käyttäjä ei voi omistaa työpyyntöjä tuossa työjonossa"
+msgstr "Käyttäjä ei voi omistaa tapauksia tuossa työjonossa"
 
 #: lib/RT/Link_Overlay.pm:206
 msgid "That's not a numerical id"
@@ -3987,15 +3987,15 @@
 
 #: lib/RT/Interface/Web.pm:861
 msgid "The new value has been set."
-msgstr ""
+msgstr "Uusi arvo asetettu."
 
 #: lib/RT/ACE_Overlay.pm:86
 msgid "The owner of a ticket"
-msgstr ""
+msgstr "Tapauksen omistaja"
 
 #: lib/RT/ACE_Overlay.pm:87
 msgid "The requestor of a ticket"
-msgstr ""
+msgstr "Tapauksen tilaaja"
 
 #: html/Admin/Elements/EditUserComments:26
 msgid "These comments aren't generally visible to the user"
@@ -4003,7 +4003,7 @@
 
 #: NOT FOUND IN SOURCE
 msgid "This ticket %1 %2 (%3)\\n"
-msgstr "Tämä työpyyntö %1 %2 (%3)\\n"
+msgstr "Tämä tapaus %1 %2 (%3)\\n"
 
 #: bin/rt-crontool:189
 msgid "This tool allows the user to run arbitrary perl modules from within RT."
@@ -4011,16 +4011,16 @@
 
 #: lib/RT/Transaction_Overlay.pm:253
 msgid "This transaction appears to have no content"
-msgstr "Tämä toiminto ei näytä sisältävän mitään"
+msgstr "Tämä tapahtuma ei näytä sisältävän mitään"
 
 #: html/Ticket/Elements/ShowRequestor:47
 #. ($rows)
 msgid "This user's %1 highest priority tickets"
-msgstr ""
+msgstr "Käyttäjän %1 tärkeintä tapausta"
 
 #: NOT FOUND IN SOURCE
 msgid "This user's 25 highest priority tickets"
-msgstr "Tämän käyttäjän 25 korkeimman prioriteetin työpyyntöä"
+msgstr "Käyttäjän 25 tärkeintä tapausta"
 
 #: lib/RT/Date.pm:391
 msgid "Thu."
@@ -4028,7 +4028,7 @@
 
 #: NOT FOUND IN SOURCE
 msgid "Ticket # %1  %2"
-msgstr "Työpyyntö # %1  %2"
+msgstr "Tapaus # %1  %2"
 
 #: NOT FOUND IN SOURCE
 msgid "Ticket # %1 Jumbo update: %2"
@@ -4037,36 +4037,36 @@
 #: html/Ticket/ModifyAll.html:25 html/Ticket/ModifyAll.html:29
 #. ($Ticket->Id, $Ticket->Subject)
 msgid "Ticket #%1 Jumbo update: %2"
-msgstr "Työpyyntö #%1 Jumbo päivitys: %2"
+msgstr "Tapauksen #%1 jättipäivitys: %2"
 
 #: html/Approvals/Elements/ShowDependency:46
 #. ($link->BaseObj->Id, $link->BaseObj->Subject)
 msgid "Ticket #%1: %2"
-msgstr ""
+msgstr "Tapaus #%1: %2"
 
 #: lib/RT/Ticket_Overlay.pm:608
 #. ($self->Id, $QueueObj->Name)
 msgid "Ticket %1 created in queue '%2'"
-msgstr "Työpyyntö %1 luotu työjonoon '%2'"
+msgstr "Tapaus %1 luotu työjonoon '%2'"
 
 #: bin/rt-commit-handler:760
 #. ($Ticket->Id)
 msgid "Ticket %1 loaded\\n"
-msgstr "Työpyyntö %1 ladattu\\n"
+msgstr "Tapaus %1 ladattu\\n"
 
 #: html/Search/Bulk.html:181
 #. ($Ticket->Id,$_)
 msgid "Ticket %1: %2"
-msgstr "Työpyyntö %1: %2"
+msgstr "Tapaus %1: %2"
 
 #: html/Ticket/History.html:25 html/Ticket/History.html:28
 #. ($Ticket->Id, $Ticket->Subject)
 msgid "Ticket History # %1 %2"
-msgstr "Työpyynnön historia # %1 %2"
+msgstr "Tapauksen historia # %1 %2"
 
 #: html/SelfService/Display.html:34
 msgid "Ticket Id"
-msgstr "Työpyynnön numero"
+msgstr "Tapauksen numero"
 
 #: etc/initialdata:303
 msgid "Ticket Resolved"
@@ -4074,35 +4074,35 @@
 
 #: html/Search/Elements/PickRestriction:63
 msgid "Ticket attachment"
-msgstr "Työpyynnön liite"
+msgstr "Tapauksen liitteen"
 
 #: lib/RT/Tickets_Overlay.pm:1166
 msgid "Ticket content"
-msgstr "Työpyynnön sisältö"
+msgstr "Tapauksen sisältö"
 
 #: lib/RT/Tickets_Overlay.pm:1212
 msgid "Ticket content type"
-msgstr "Työpyynnön sisällön tyyppi"
+msgstr "Tapauksen sisällön tyyppi"
 
 #: lib/RT/Ticket_Overlay.pm:495 lib/RT/Ticket_Overlay.pm:597
 msgid "Ticket could not be created due to an internal error"
-msgstr ""
+msgstr "Tapausta ei voitu luoda sisäisestä virheestä johtuen"
 
 #: lib/RT/Transaction_Overlay.pm:522
 msgid "Ticket created"
-msgstr "Työpyyntö luotu"
+msgstr "Tapaus luotu"
 
 #: NOT FOUND IN SOURCE
 msgid "Ticket creation failed"
-msgstr "Työpyynnön luonti epäonnistui"
+msgstr "Tapauksen luonti epäonnistui"
 
 #: lib/RT/Transaction_Overlay.pm:527
 msgid "Ticket deleted"
-msgstr "Työpyyntö poistettu"
+msgstr "Tapaus poistettu"
 
 #: html/REST/1.0/modify:29 html/REST/1.0/update:34
 msgid "Ticket id not found"
-msgstr ""
+msgstr "Tapauksen numeroa ei löytynyt"
 
 #: NOT FOUND IN SOURCE
 msgid "Ticket killed"
@@ -4110,19 +4110,19 @@
 
 #: html/REST/1.0/modify:36 html/REST/1.0/update:41
 msgid "Ticket not found"
-msgstr ""
+msgstr "Tapausta ei löydy"
 
 #: etc/initialdata:289
 msgid "Ticket status changed"
-msgstr ""
+msgstr "Tapauksen tila vaihdettu"
 
 #: html/Ticket/Update.html:39
 msgid "Ticket watchers"
-msgstr "Työpyynnön tarkkailijat"
+msgstr "Tapauksen tarkkailijat"
 
 #: html/Elements/Tabs:49
 msgid "Tickets"
-msgstr ""
+msgstr "Tapaukset"
 
 #: lib/RT/Tickets_Overlay.pm:1383
 #. ($self->loc($args{'TYPE'}), ($args{'BASE'} || $args{'TICKET'}))
@@ -4137,7 +4137,7 @@
 #: html/Elements/ViewUser:26
 #. ($name)
 msgid "Tickets from %1"
-msgstr "Työpyynnöt %1"
+msgstr "Tapaukset %1"
 
 #: html/Approvals/Elements/ShowDependency:27
 msgid "Tickets which depend on this approval:"
@@ -4190,11 +4190,11 @@
 #: lib/RT/Transaction_Overlay.pm:642
 #. ($self->Data)
 msgid "Transaction %1 purged"
-msgstr "Toiminto %1 puhdistettu"
+msgstr "Tapahtuma %1 puhdistettu"
 
 #: lib/RT/Transaction_Overlay.pm:177
 msgid "Transaction Created"
-msgstr "Toiminto luotu"
+msgstr "Tapahtuma luotu"
 
 #: lib/RT/Transaction_Overlay.pm:89
 msgid "Transaction->Create couldn't, as you didn't specify a ticket id"
@@ -4202,7 +4202,7 @@
 
 #: lib/RT/Transaction_Overlay.pm:701
 msgid "Transactions are immutable"
-msgstr "Toiminnot ovat muuttumattomia"
+msgstr "Tapahtumat ovat muuttumattomia"
 
 #: NOT FOUND IN SOURCE
 msgid "Trying to delete a right: %1"
@@ -4231,7 +4231,7 @@
 #: lib/RT/Attachment_Overlay.pm:265
 #. ($self->ContentEncoding)
 msgid "Unknown ContentEncoding %1"
-msgstr "Tuntematon sisällön enkoodaus %1"
+msgstr "Tuntematon sisällön koodaus %1"
 
 #: html/Elements/SelectResultsPerPage:37
 msgid "Unlimited"
@@ -4239,7 +4239,7 @@
 
 #: etc/initialdata:32
 msgid "Unprivileged"
-msgstr ""
+msgstr "Erioikeudeton"
 
 #: lib/RT/Transaction_Overlay.pm:571
 msgid "Untaken"
@@ -4259,7 +4259,7 @@
 
 #: html/Search/Listing.html:61
 msgid "Update all these tickets at once"
-msgstr "Päivitä kaikki nämä työpyynnöt kerralla"
+msgstr "Päivitä kaikki nämä tapaukset kerralla"
 
 #: html/Admin/Users/Prefs.html:49
 msgid "Update email"
@@ -4275,7 +4275,7 @@
 
 #: html/Search/Bulk.html:81
 msgid "Update selected tickets"
-msgstr "Päivitä valitut työpyynnöt"
+msgstr "Päivitä valitut tapaukset"
 
 #: html/Admin/Users/Prefs.html:36
 msgid "Update signature"
@@ -4283,22 +4283,22 @@
 
 #: html/Ticket/ModifyAll.html:63
 msgid "Update ticket"
-msgstr "Päivitä työpyyntö"
+msgstr "Päivitä tapaus"
 
 #: html/SelfService/Update.html:25 html/SelfService/Update.html:27
 #. ($Ticket->id)
 msgid "Update ticket # %1"
-msgstr "Päivitä työpyyntö # %1"
+msgstr "Päivitä tapaus # %1"
 
 #: html/SelfService/Update.html:50
 #. ($Ticket->id)
 msgid "Update ticket #%1"
-msgstr "Päivitä työpyyntö #%1"
+msgstr "Päivitä tapaus #%1"
 
 #: html/Ticket/Update.html:135
 #. ($Ticket->id, $Ticket->Subject)
 msgid "Update ticket #%1 (%2)"
-msgstr ""
+msgstr "Päivitä tapaus #%1 (%2)"
 
 #: lib/RT/Interface/Web.pm:373
 msgid "Update type was neither correspondence nor comment."
@@ -4330,11 +4330,11 @@
 
 #: html/Admin/Users/Prefs.html:59
 msgid "User ID"
-msgstr "Käyttäjän tunnus"
+msgstr "Käyttäjätunnus"
 
 #: html/Elements/SelectUsers:26
 msgid "User Id"
-msgstr "Käyttäjän tunnus"
+msgstr "Käyttäjätunnus"
 
 #: html/Admin/Elements/GroupTabs:47 html/Admin/Elements/QueueTabs:60 html/Admin/Elements/SystemTabs:47 html/Admin/Global/index.html:59
 msgid "User Rights"
@@ -4375,7 +4375,7 @@
 
 #: html/Search/Elements/PickRestriction:51
 msgid "ValueOfQueue"
-msgstr "Työpyynnon arvo"
+msgstr "Tapauksen arvo"
 
 #: html/Admin/Elements/EditCustomField:40
 msgid "Values"
@@ -4399,7 +4399,7 @@
 
 #: html/Admin/Elements/ModifyUser:56
 msgid "WebEncoding"
-msgstr "Web Enkoodaus"
+msgstr "Web-koodaus"
 
 #: lib/RT/Date.pm:390
 msgid "Wed."
@@ -4467,24 +4467,24 @@
 
 #: lib/RT/Ticket_Overlay.pm:3056
 msgid "You already own this ticket"
-msgstr "Omistat jo tämän työpyynnön"
+msgstr "Omistat jo tämän tapauksen"
 
 #: html/autohandler:121
 msgid "You are not an authorized user"
-msgstr "Et ole autorisoitu käyttäjä"
+msgstr "Et ole valtuutettu käyttäjä"
 
 #: lib/RT/Ticket_Overlay.pm:2930
 msgid "You can only reassign tickets that you own or that are unowned"
-msgstr "Voit palauttaa vain työpyyntöjä jotka omistat itse tai jotka ovat ilman omistajaa"
+msgstr "Voit palauttaa vain tapauksia, jotka omistat itse tai jotka ovat ilman omistajaa"
 
 #: NOT FOUND IN SOURCE
 msgid "You don't have permission to view that ticket.\\n"
-msgstr "Sinulla ei ole oikeutta tarkastella tätä työpyyntöä.\\n"
+msgstr "Sinulla ei ole valtuuksia tarkastella tätä tapausta.\\n"
 
 #: docs/design_docs/string-extraction-guide.txt:47
 #. ($num, $queue)
 msgid "You found %1 tickets in queue %2"
-msgstr "Löysit %1 työpyyntöä työjonosta %2"
+msgstr "Löysit %1 tapausta työjonosta %2"
 
 #: html/NoAuth/Logout.html:31 html/REST/1.0/logout:25
 msgid "You have been logged out of RT."
@@ -4492,11 +4492,11 @@
 
 #: html/SelfService/Display.html:134
 msgid "You have no permission to create tickets in that queue."
-msgstr "Sinulla ei ole oikeutta luoda työpyyntöjä tähän työjonoon."
+msgstr "Sinulla ei ole valtuuksia luoda tapauksia tähän työjonoon."
 
 #: lib/RT/Ticket_Overlay.pm:1895
 msgid "You may not create requests in that queue."
-msgstr "Et ehkä voi luoda työpyyntöjä tuohon työjonoon."
+msgstr "Et voi luoda tapauksia tuohon työjonoon."
 
 #: html/NoAuth/Logout.html:36
 msgid "You're welcome to login again"
@@ -4505,7 +4505,7 @@
 #: html/SelfService/Elements/MyRequests:25
 #. ($friendly_status)
 msgid "Your %1 requests"
-msgstr "Sinun %1 työpyyntöäsi"
+msgstr "Sinun %1 tapaustasi"
 
 #: NOT FOUND IN SOURCE
 msgid "Your RT administrator has misconfigured the mail aliases which invoke RT"
@@ -4550,15 +4550,15 @@
 
 #: html/Elements/SelectAttachmentField:26
 msgid "content"
-msgstr ""
+msgstr "sisältö"
 
 #: html/Elements/SelectAttachmentField:27
 msgid "content-type"
-msgstr ""
+msgstr "sisällön tyyppi"
 
 #: lib/RT/Ticket_Overlay.pm:2282
 msgid "correspondence (probably) not sent"
-msgstr "kirjeenvaihtoa (luultavasti) ei ole asetettu"
+msgstr "kirjeenvaihtoa (luultavasti) ei ole lähetetty"
 
 #: lib/RT/Ticket_Overlay.pm:2292
 msgid "correspondence sent"
@@ -4582,7 +4582,7 @@
 
 #: html/Search/Elements/PickRestriction:68
 msgid "does not match"
-msgstr "ei täsmää"
+msgstr "ei sisällä"
 
 #: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectMatch:35
 msgid "doesn't contain"
@@ -4598,11 +4598,11 @@
 
 #: html/Elements/SelectAttachmentField:28
 msgid "filename"
-msgstr ""
+msgstr "tiedostonimi"
 
 #: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectEqualityOperator:38
 msgid "greater than"
-msgstr "suurempi kuin"
+msgstr "on suurempi kuin"
 
 #: lib/RT/Group_Overlay.pm:194
 #. ($self->Name)
@@ -4611,7 +4611,7 @@
 
 #: lib/RT/Date.pm:315
 msgid "hours"
-msgstr "tunnit"
+msgstr "tuntia"
 
 #: NOT FOUND IN SOURCE
 msgid "id"
@@ -4627,7 +4627,7 @@
 
 #: html/Elements/SelectCustomFieldOperator:38 html/Elements/SelectEqualityOperator:38
 msgid "less than"
-msgstr "vähemmän kuin"
+msgstr "on pienempi kuin"
 
 #: html/Search/Elements/PickRestriction:67
 msgid "matches"
@@ -4663,7 +4663,7 @@
 
 #: html/Elements/SelectEqualityOperator:38
 msgid "not equal to"
-msgstr "eri suuri kuin"
+msgstr "on erisuuri kuin"
 
 #: NOT FOUND IN SOURCE
 msgid "notlike"
@@ -4702,12 +4702,12 @@
 #: lib/RT/Group_Overlay.pm:202
 #. ($self->Type)
 msgid "system %1"
-msgstr "systeemi %1"
+msgstr "järjestelmä %1"
 
 #: lib/RT/Group_Overlay.pm:213
 #. ($self->Type)
 msgid "system group '%1'"
-msgstr "systeemiryhmä '%1'"
+msgstr "järjestelmäryhmä '%1'"
 
 #: html/Elements/Error:42 html/SelfService/Error.html:42
 msgid "the calling component did not specify why"
@@ -4716,20 +4716,20 @@
 #: lib/RT/Group_Overlay.pm:210
 #. ($self->Instance, $self->Type)
 msgid "ticket #%1 %2"
-msgstr "työpyyntö #%1 %2"
+msgstr "tapaus #%1 %2"
 
 #: NOT FOUND IN SOURCE
 msgid "true"
-msgstr ""
+msgstr "tosi"
 
 #: lib/RT/Group_Overlay.pm:216
 #. ($self->Id)
 msgid "undescribed group %1"
-msgstr ""
+msgstr "kuvailematon ryhmä %1"
 
 #: NOT FOUND IN SOURCE
 msgid "undescripbed group %1"
-msgstr "kuvalematon ryhmä %1"
+msgstr "kuvailematon ryhmä %1"
 
 #: lib/RT/Group_Overlay.pm:191
 #. ($user->Object->Name)

Modified: rt/branches/rt-3.3/lib/RT/I18N/zh_cn.po
==============================================================================
--- rt/branches/rt-3.3/lib/RT/I18N/zh_cn.po	(original)
+++ rt/branches/rt-3.3/lib/RT/I18N/zh_cn.po	Fri Apr  2 08:43:44 2004
@@ -16,7 +16,7 @@
 msgstr "#%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
-#. ($Ticket->Id, $Ticket->Subject)
+#. ($TicketObj->Id, $TicketObj->Subject)
 #. ($Ticket->id, $Ticket->Subject)
 #. ($ticket->Id, $ticket->Subject)
 #. ($link->BaseObj->Id, $link->BaseObj->Subject)
@@ -40,7 +40,7 @@
 msgid "%1 %2"
 msgstr "%1 %2"
 
-#: lib/RT/Tickets_Overlay.pm:790
+#: lib/RT/Tickets_Overlay.pm:831
 #. ($args{'FIELD'}, $args{'OPERATOR'}, $args{'VALUE'})
 msgid "%1 %2 %3"
 msgstr "%1 %2 %3"
@@ -50,11 +50,11 @@
 msgid "%1 %2 %3 %4:%5:%6 %7"
 msgstr "%7-%2-%3 %4:%5:%6 %1"
 
-#: lib/RT/Ticket_Overlay.pm:3588 lib/RT/Transaction_Overlay.pm:514 lib/RT/Transaction_Overlay.pm:557 lib/RT/Transaction_Vendor.pm:19
+#: lib/RT/Ticket_Overlay.pm:3600 lib/RT/Transaction_Overlay.pm:514 lib/RT/Transaction_Overlay.pm:557 lib/RT/Transaction_Vendor.pm:26
+#. ($field, $new_value)
 #. ($cf->Name, $new_value->Content)
 #. ($field, $self->NewValue)
 #. ($self->Field, $principal->Object->Name)
-#. ($field, $new_value)
 msgid "%1 %2 added"
 msgstr "%2 已新增为 %1"
 
@@ -63,18 +63,18 @@
 msgid "%1 %2 ago"
 msgstr "%1 %2 之前"
 
-#: lib/RT/Ticket_Overlay.pm:3594 lib/RT/Transaction_Overlay.pm:521 lib/RT/Transaction_Vendor.pm:25
+#: lib/RT/Ticket_Overlay.pm:3606 lib/RT/Transaction_Overlay.pm:521 lib/RT/Transaction_Vendor.pm:32
+#. ($field, $old_value, $new_value)
 #. ($cf->Name, $old_value, $new_value->Content)
 #. ($field, $self->OldValue, $self->NewValue)
-#. ($field, $old_value, $new_value)
 msgid "%1 %2 changed to %3"
 msgstr "%1 已从 %2 改为 %3"
 
-#: lib/RT/Ticket_Overlay.pm:3591 lib/RT/Transaction_Overlay.pm:517 lib/RT/Transaction_Overlay.pm:563 lib/RT/Transaction_Vendor.pm:22
+#: lib/RT/Ticket_Overlay.pm:3603 lib/RT/Transaction_Overlay.pm:517 lib/RT/Transaction_Overlay.pm:563 lib/RT/Transaction_Vendor.pm:29
+#. ($field, $old_value)
 #. ($cf->Name, $old_value)
 #. ($field, $self->OldValue)
 #. ($self->Field, $principal->Object->Name)
-#. ($field, $old_value)
 msgid "%1 %2 deleted"
 msgstr "%2 已自 %1 删除"
 
@@ -129,12 +129,12 @@
 msgid "%1 ScripAction loaded"
 msgstr "加载手续 %1"
 
-#: html/Edit/Elements/Page:49
+#: html/Edit/Elements/Page:47
 #. (scalar $count)
 msgid "%1 Total"
 msgstr "共 %1 笔"
 
-#: lib/RT/Ticket_Overlay.pm:3621
+#: lib/RT/Ticket_Overlay.pm:3633
 #. ($args{'Value'}, $cf->Name)
 msgid "%1 added as a value for %2"
 msgstr "新增 %1 作为 %2 的值"
@@ -163,7 +163,7 @@
 msgid "%1 by %2"
 msgstr "%1 (%2)"
 
-#: lib/RT/Transaction_Overlay.pm:484 lib/RT/Transaction_Overlay.pm:649 lib/RT/Transaction_Overlay.pm:658 lib/RT/Transaction_Overlay.pm:661
+#: lib/RT/Transaction_Overlay.pm:484 lib/RT/Transaction_Overlay.pm:652 lib/RT/Transaction_Overlay.pm:661 lib/RT/Transaction_Overlay.pm:664
 #. ($self->Field , ( $self->OldValue || $no_value ) ,  $self->NewValue)
 #. ($self->Field , $q1->Name , $q2->Name)
 #. ($self->Field, $t2->AsString, $t1->AsString)
@@ -171,7 +171,7 @@
 msgid "%1 changed from %2 to %3"
 msgstr "%1 的值从 %2 改为 %3"
 
-#: lib/RT/Interface/Web.pm:953
+#: lib/RT/Interface/Web.pm:955
 msgid "%1 could not be set to %2."
 msgstr "无法将 %1 设定为 %2。"
 
@@ -179,17 +179,17 @@
 msgid "%1 couldn't init a transaction (%2)\\n"
 msgstr "%1 无法初始更新 (%2)\\n"
 
-#: lib/RT/Ticket_Overlay.pm:2880
+#: lib/RT/Ticket_Overlay.pm:2888
 #. ($self)
 msgid "%1 couldn't set status to resolved. RT's Database may be inconsistent."
 msgstr "%1 无法将现况设成已解决。RT 数据库内容可能不一致。"
 
-#: html/Elements/MyTickets:24 html/Work/Elements/MyTickets:9
+#: html/Elements/MyTickets:24
 #. ($rows)
 msgid "%1 highest priority tickets I own..."
 msgstr "前 %1 份待处理申请单..."
 
-#: html/Elements/MyRequests:24 html/Work/Elements/MyRequests:9
+#: html/Elements/MyRequests:24
 #. ($rows)
 msgid "%1 highest priority tickets I requested..."
 msgstr "前 %1 份送出的申请单..."
@@ -209,12 +209,12 @@
 msgid "%1 is no longer a %2 for this queue."
 msgstr "%1 已不再是此表单的 %2。"
 
-#: lib/RT/Ticket_Overlay.pm:1596
+#: lib/RT/Ticket_Overlay.pm:1602
 #. ($principal->Object->Name, $args{'Type'})
 msgid "%1 is no longer a %2 for this ticket."
 msgstr "%1 已不再是此申请单的 %2。"
 
-#: lib/RT/Ticket_Overlay.pm:3677
+#: lib/RT/Ticket_Overlay.pm:3689
 #. ($args{'Value'}, $cf->Name)
 msgid "%1 is no longer a value for custom field %2"
 msgstr "%1 已不再是自订字段 %2 的值。"
@@ -232,6 +232,16 @@
 msgid "%1 not shown"
 msgstr "没有显示 %1"
 
+#: html/Work/Elements/MyTickets:9
+#. ($rows)
+msgid "%1 recent tickets I own..."
+msgstr "最新 %1 份待处理申请单..."
+
+#: html/Work/Elements/MyRequests:9
+#. ($rows)
+msgid "%1 recent tickets I requested..."
+msgstr "最新 %1 份送出的申请单..."
+
 #: NOT FOUND IN SOURCE
 msgid "%1 result(s) found"
 msgstr "找到 %1 项结果"
@@ -267,17 +277,17 @@
 msgid "%1 will stall a [local] BASE if it's dependent [or member] of a linked up request."
 msgstr "如果 %1 起始申请单依赖于某个链接,或是某个链接的成员,它将会被延宕。"
 
-#: lib/RT/Transaction_Overlay.pm:382 lib/RT/Transaction_Vendor.pm:37
+#: lib/RT/Transaction_Overlay.pm:382
 #. ($self)
 msgid "%1: no attachment specified"
 msgstr "%1:未指定附件"
 
-#: html/Ticket/Elements/ShowTransaction:100 html/Work/Tickets/Elements/ShowTransaction:158
+#: html/Ticket/Elements/ShowTransaction:108 html/Work/Tickets/Elements/ShowTransaction:169
 #. ($size)
 msgid "%1b"
 msgstr "%1 字节"
 
-#: html/Ticket/Elements/ShowTransaction:97 html/Work/Tickets/Elements/ShowTransaction:155
+#: html/Ticket/Elements/ShowTransaction:105 html/Work/Tickets/Elements/ShowTransaction:166
 #. (int($size/102.4)/10)
 msgid "%1k"
 msgstr "%1k 字节"
@@ -286,7 +296,7 @@
 msgid "%quant(%1,result) found"
 msgstr "找到 %1 项结果"
 
-#: lib/RT/Ticket_Overlay.pm:1185
+#: lib/RT/Ticket_Overlay.pm:1190
 #. ($args{'Status'})
 msgid "'%1' is an invalid value for status"
 msgstr "'%1' 不是一个合法的状态值"
@@ -345,7 +355,7 @@
 msgid "(No workflows)"
 msgstr "没有流程"
 
-#: html/Ticket/Update.html:83 html/Work/Tickets/Update.html:56
+#: html/Ticket/Update.html:83 html/Work/Tickets/Update.html:57
 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>更改后续的收件者名单。)"
 
@@ -369,7 +379,11 @@
 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/Ticket/Elements/EditCustomFieldEntries:35 html/Work/Tickets/Elements/EditCustomFieldEntries:43 html/Work/Tickets/Elements/ShowCustomFieldEntries:14
+#: html/Work/Delegates/index.html:50
+msgid "(default delegate)"
+msgstr "(预设代理人)"
+
+#: html/Ticket/Elements/EditCustomFieldEntries:35 html/Work/Tickets/Elements/EditCustomFieldEntries:47 html/Work/Tickets/Elements/ShowCustomFieldEntries:14
 msgid "(delete)"
 msgstr "(删除)"
 
@@ -385,7 +399,7 @@
 msgid "(no name listed)"
 msgstr "(没有列出姓名)"
 
-#: html/Elements/MyRequests:42 html/Elements/MyTickets:44 html/Work/Elements/MyApprovals:37 html/Work/Elements/MyRequests:43 html/Work/Elements/MyTickets:52
+#: html/Elements/MyRequests:42 html/Elements/MyTickets:44 html/Work/Elements/MyApprovals:37 html/Work/Elements/MyRequests:47 html/Work/Elements/MyTickets:56
 msgid "(no subject)"
 msgstr "(没有主题)"
 
@@ -397,11 +411,11 @@
 msgid "(only one ticket)"
 msgstr "(仅能指定一份申请单)"
 
-#: html/Elements/MyRequests:51 html/Elements/MyTickets:54 html/Work/Elements/List:17 html/Work/Elements/MyRequests:53 html/Work/Elements/MyTickets:67 html/Work/Tickets/Elements/ShowBasics:52
+#: html/Elements/MyRequests:51 html/Elements/MyTickets:54 html/Work/Elements/List:21 html/Work/Elements/MyRequests:61 html/Work/Elements/MyTickets:75 html/Work/Tickets/Elements/ShowBasics:52
 msgid "(pending approval)"
 msgstr "(等待签核)"
 
-#: html/Elements/MyRequests:53 html/Elements/MyTickets:56 html/Work/Elements/MyRequests:55 html/Work/Elements/MyTickets:69
+#: html/Elements/MyRequests:53 html/Elements/MyTickets:56 html/Work/Elements/MyRequests:63 html/Work/Elements/MyTickets:77
 msgid "(pending other tickets)"
 msgstr "(等待其它申请单)"
 
@@ -409,14 +423,18 @@
 msgid "(requestor's group)"
 msgstr "(申请人所属)"
 
-#: html/Admin/Users/Modify.html:49 html/Edit/Users/Info:26
+#: html/Admin/Users/Modify.html:49 html/Edit/Users/Info:34
 msgid "(required)"
 msgstr "(必填)"
 
-#: html/Ticket/Elements/ShowTransaction:103 html/Work/Tickets/Elements/ShowTransaction:44
+#: html/Ticket/Elements/ShowTransaction:111 html/Work/Tickets/Elements/ShowTransaction:44
 msgid "(untitled)"
 msgstr "(未命名)"
 
+#: html/Work/Tickets/Elements/ShowHints:5
+msgid "*"
+msgstr "★"
+
 #: NOT FOUND IN SOURCE
 msgid ":"
 msgstr ":"
@@ -458,7 +476,7 @@
 msgid "ACE not found"
 msgstr "找不到 ACE 设定"
 
-#: lib/RT/ACE_Overlay.pm:830
+#: lib/RT/ACE_Overlay.pm:831
 msgid "ACEs can only be created and deleted."
 msgstr "祇能新增或删除 ACE 设定。"
 
@@ -470,6 +488,10 @@
 msgid "Aborting to avoid unintended ticket modifications.\\n"
 msgstr "离开以免不小心更改到申请单。\\n"
 
+#: html/Edit/Users/Info:66 html/Work/Preferences/Info:108
+msgid "About Me"
+msgstr "个人信息"
+
 #: html/User/Elements/Tabs:31
 msgid "About me"
 msgstr "个人信息"
@@ -499,7 +521,7 @@
 msgid "Action prepared..."
 msgstr "动作准备完毕..."
 
-#: html/Work/Elements/List:13 html/Work/Elements/SelectSearch:25 html/Work/Tickets/Create.html:27 html/Work/Tickets/Elements/ShowBasics:12
+#: html/Work/Elements/List:17 html/Work/Elements/SelectSearch:30 html/Work/Tickets/Create.html:27 html/Work/Tickets/Elements/ShowBasics:12
 msgid "Activated Date"
 msgstr "申请激活时间"
 
@@ -580,7 +602,7 @@
 msgid "Added principal as a %1 for this queue"
 msgstr "单位已新增为此表单的 %1"
 
-#: lib/RT/Ticket_Overlay.pm:1480
+#: lib/RT/Ticket_Overlay.pm:1486
 #. ($self->loc($args{'Type'}))
 msgid "Added principal as a %1 for this ticket"
 msgstr "单位已新增为此申请单的 %1"
@@ -589,11 +611,11 @@
 msgid "Additional Hints"
 msgstr "额外提示"
 
-#: html/Admin/Elements/ModifyUser:75 html/Admin/Users/Modify.html:121 html/User/Prefs.html:114 html/Work/Preferences/Info:79
+#: html/Admin/Elements/ModifyUser:75 html/Admin/Users/Modify.html:121 html/User/Prefs.html:114 html/Work/Preferences/Info:82
 msgid "Address1"
 msgstr "住址"
 
-#: html/Admin/Elements/ModifyUser:77 html/Admin/Users/Modify.html:126 html/User/Prefs.html:118 html/Work/Preferences/Info:81
+#: html/Admin/Elements/ModifyUser:77 html/Admin/Users/Modify.html:126 html/User/Prefs.html:118 html/Work/Preferences/Info:84
 msgid "Address2"
 msgstr "住址(续)"
 
@@ -665,7 +687,7 @@
 msgid "AdminCustomFields"
 msgstr "管理自订字段"
 
-#: lib/RT/Group_Overlay.pm:145
+#: lib/RT/Group_Overlay.pm:146
 msgid "AdminGroup"
 msgstr "管理群组"
 
@@ -673,7 +695,7 @@
 msgid "AdminGroupDescription"
 msgstr "管理群组描述"
 
-#: lib/RT/Group_Overlay.pm:147
+#: lib/RT/Group_Overlay.pm:148
 msgid "AdminGroupMembership"
 msgstr "管理群组成员"
 
@@ -733,7 +755,7 @@
 msgid "Alias for"
 msgstr "相当于"
 
-#: html/Work/Delegates/index.html:13 html/Work/Elements/SelectSearch:11 html/Work/Queues/Select.html:14 html/Work/Queues/index.html:13
+#: html/Work/Delegates/index.html:14 html/Work/Elements/SelectSearch:16 html/Work/Queues/Select.html:14 html/Work/Queues/index.html:14
 msgid "All"
 msgstr "全部"
 
@@ -810,7 +832,7 @@
 msgid "Approval Due"
 msgstr "签核时限"
 
-#: html/Work/Approvals/Elements/Approve:37
+#: html/Work/Approvals/Elements/Approve:43
 msgid "Approval Notes"
 msgstr "签核意见"
 
@@ -838,7 +860,7 @@
 msgid "Approval diagram"
 msgstr "签核流程"
 
-#: html/Approvals/Elements/Approve:43 html/Work/Approvals/Elements/Approve:29
+#: html/Approvals/Elements/Approve:43
 msgid "Approve"
 msgstr "核准"
 
@@ -890,11 +912,11 @@
 msgid "Attachment '%1' could not be loaded"
 msgstr "无法加载附件 '%1'"
 
-#: lib/RT/Transaction_Overlay.pm:390 lib/RT/Transaction_Vendor.pm:50
+#: lib/RT/Transaction_Overlay.pm:390
 msgid "Attachment created"
 msgstr "附件新增完毕"
 
-#: lib/RT/Tickets_Overlay.pm:1208
+#: lib/RT/Tickets_Overlay.pm:1250
 msgid "Attachment filename"
 msgstr "附件档名"
 
@@ -902,6 +924,10 @@
 msgid "Attachments"
 msgstr "附件"
 
+#: lib/RT/Ticket_Overlay.pm:1222
+msgid "Attributes"
+msgstr "属性"
+
 #: NOT FOUND IN SOURCE
 msgid "Aug"
 msgstr "八月"
@@ -946,7 +972,7 @@
 msgid "Back to Homepage"
 msgstr "回到首页"
 
-#: html/Work/Elements/BackButton:2 html/Work/Search/Bulk.html:101
+#: html/Work/Approvals/Update.html:7 html/Work/Elements/BackButton:2 html/Work/Search/Bulk.html:101
 msgid "Back to Previous"
 msgstr "回上页"
 
@@ -967,11 +993,15 @@
 msgid "Bad transaction number for attachment. %1 should be %2\\n"
 msgstr "附件的处理号码错误。%1 应为 %2\\n"
 
-#: html/Admin/Elements/GroupTabs:38 html/Admin/Elements/QueueTabs:38 html/Admin/Elements/UserTabs:37 html/Edit/Global/autohandler:6 html/Edit/Queues/autohandler:21 html/Edit/Users/index.html:94 html/Ticket/Elements/Tabs:89 html/User/Elements/GroupTabs:37
+#: html/Admin/Elements/GroupTabs:38 html/Admin/Elements/QueueTabs:38 html/Admin/Elements/UserTabs:37 html/Edit/Global/autohandler:6 html/Edit/Queues/autohandler:23 html/Edit/Users/index.html:94 html/Ticket/Elements/Tabs:95 html/User/Elements/GroupTabs:37
 msgid "Basics"
 msgstr "基本信息"
 
-#: html/Ticket/Update.html:81 html/Work/Tickets/Update.html:53
+#: html/Work/Approvals/index.html:9
+msgid "Batch Approval"
+msgstr "批次签核"
+
+#: html/Ticket/Update.html:81 html/Work/Tickets/Update.html:54
 msgid "Bcc"
 msgstr "密件副本"
 
@@ -979,7 +1009,7 @@
 msgid "Be sure to save your changes"
 msgstr "请别忘了储存修改。"
 
-#: html/Elements/SelectDateRelation:33 lib/RT/CurrentUser.pm:320
+#: html/Elements/SelectDateRelation:33 lib/RT/CurrentUser.pm:363
 msgid "Before"
 msgstr "早于"
 
@@ -1019,7 +1049,7 @@
 msgid "Business Unit:"
 msgstr "事业部:"
 
-#: lib/RT/User_Overlay.pm:1529
+#: lib/RT/User_Overlay.pm:1539
 msgid "Can not modify system users"
 msgstr "无法更改系统使用者"
 
@@ -1027,7 +1057,7 @@
 msgid "Can this principal see this queue"
 msgstr "该单位是否能查阅此表单"
 
-#: lib/RT/CustomField_Overlay.pm:205
+#: lib/RT/CustomField_Overlay.pm:212
 msgid "Can't add a custom field value without a name"
 msgstr "不能新增没有名称的自订字段值"
 
@@ -1035,11 +1065,11 @@
 msgid "Can't link a ticket to itself"
 msgstr "申请单不能链接自己。"
 
-#: lib/RT/Ticket_Overlay.pm:2857
+#: lib/RT/Ticket_Overlay.pm:2865
 msgid "Can't merge into a merged ticket. You should never get this error"
 msgstr "不能整合进已整合过的申请单。这个错误不该发生。"
 
-#: lib/RT/Ticket_Overlay.pm:2659 lib/RT/Ticket_Overlay.pm:2738
+#: lib/RT/Ticket_Overlay.pm:2667 lib/RT/Ticket_Overlay.pm:2746
 msgid "Can't specifiy both base and target"
 msgstr "不能同时指定起始申请单与目的申请单"
 
@@ -1047,11 +1077,16 @@
 msgid "Cancel"
 msgstr "取消"
 
-#: html/autohandler:126
+#: html/autohandler:133
 #. ($msg)
 msgid "Cannot create user: %1"
 msgstr "无法新增使用者:%1"
 
+#: html/autohandler:187
+#. ($auth_created - time)
+msgid "Cannot login: Your system clock differs from server's by %1 seconds!"
+msgstr "您的系统时钟和服务器相差 %1 秒,无法登入!"
+
 #: NOT FOUND IN SOURCE
 msgid "Card No."
 msgstr "卡号"
@@ -1100,7 +1135,7 @@
 msgid "Children"
 msgstr "子申请单"
 
-#: html/Edit/Elements/PickUsers:21 html/Edit/Global/UserRight/List:8 html/Edit/Global/UserRight/Top:19
+#: html/Edit/Elements/PickUsers:22 html/Edit/Global/UserRight/List:8 html/Edit/Global/UserRight/Top:19
 msgid "Chinese Name"
 msgstr "中文姓名"
 
@@ -1108,7 +1143,7 @@
 msgid "Chinese/English"
 msgstr "中英文"
 
-#: html/Admin/Elements/ModifyUser:79 html/Admin/Users/Modify.html:131 html/User/Prefs.html:122 html/Work/Preferences/Info:83
+#: html/Admin/Elements/ModifyUser:79 html/Admin/Users/Modify.html:131 html/User/Prefs.html:122 html/Work/Preferences/Info:86
 msgid "City"
 msgstr "所在城市"
 
@@ -1128,7 +1163,7 @@
 msgid "Closed tickets"
 msgstr "已解决的申请单"
 
-#: html/Admin/Elements/ModifyTemplateAsWorkflow:181 html/Edit/Global/Workflow/Action:54 html/Edit/Global/Workflow/Condition:52
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:181 html/Edit/Global/Workflow/Action:55 html/Edit/Global/Workflow/Condition:53 html/Edit/Global/Workflow/Owner.html:115
 msgid "Code"
 msgstr "执行程序码"
 
@@ -1136,7 +1171,7 @@
 msgid "Command not understood!\\n"
 msgstr "指令无法辨识!\\n"
 
-#: html/Ticket/Elements/ShowTransaction:178 html/Ticket/Elements/Tabs:152 html/Work/Search/Bulk.html:89 html/Work/Tickets/Display.html:60 html/Work/Tickets/Elements/ShowTransaction:118 html/Work/Tickets/Elements/ShowTransaction:32
+#: html/Ticket/Elements/ShowTransaction:189 html/Ticket/Elements/Tabs:158 html/Work/Search/Bulk.html:89 html/Work/Tickets/Display.html:61 html/Work/Tickets/Elements/ShowTransaction:119 html/Work/Tickets/Elements/ShowTransaction:32
 msgid "Comment"
 msgstr "评论"
 
@@ -1173,7 +1208,7 @@
 msgid "Comments about %1"
 msgstr "对 %1 的评论"
 
-#: html/Admin/Users/Modify.html:184 html/Edit/Users/Info:46 html/Ticket/Elements/ShowRequestor:43
+#: html/Admin/Users/Modify.html:184 html/Edit/Users/Info:90 html/Ticket/Elements/ShowRequestor:43
 msgid "Comments about this user"
 msgstr "使用者描述"
 
@@ -1225,7 +1260,7 @@
 msgid "Confirm Password"
 msgstr "口令确认"
 
-#: html/Work/Approvals/Display.html:25 html/Work/Tickets/Create.html:154 html/Work/Tickets/Create.html:168 html/Work/Tickets/Update.html:77
+#: html/Work/Approvals/Elements/Actions:6 html/Work/Tickets/Create.html:153 html/Work/Tickets/Create.html:167 html/Work/Tickets/Update.html:81
 msgid "Confirm Submit"
 msgstr "确定送出"
 
@@ -1273,7 +1308,7 @@
 msgid "Correspondence not recorded"
 msgstr "未纪录申请单回复"
 
-#: lib/RT/Ticket_Overlay.pm:3608
+#: lib/RT/Ticket_Overlay.pm:3620
 msgid "Could not add new custom field value for ticket. "
 msgstr "不能新增自订字段的值 "
 
@@ -1281,7 +1316,7 @@
 msgid "Could not add new custom field value for ticket. %1 "
 msgstr "不能新增自订字段的值。%1 "
 
-#: lib/RT/Ticket_Overlay.pm:3108 lib/RT/Ticket_Overlay.pm:3116 lib/RT/Ticket_Overlay.pm:3133
+#: lib/RT/Ticket_Overlay.pm:3116 lib/RT/Ticket_Overlay.pm:3124 lib/RT/Ticket_Overlay.pm:3141
 msgid "Could not change owner. "
 msgstr "不能更改承办人。 "
 
@@ -1300,7 +1335,7 @@
 msgid "Could not create Template"
 msgstr "无法建立通知模板"
 
-#: html/User/Groups/Modify.html:76 lib/RT/Group_Overlay.pm:471 lib/RT/Group_Overlay.pm:478
+#: html/User/Groups/Modify.html:76 lib/RT/Group_Overlay.pm:473 lib/RT/Group_Overlay.pm:480
 msgid "Could not create group"
 msgstr "无法新增群组"
 
@@ -1314,7 +1349,7 @@
 msgid "Could not create template: %1"
 msgstr "无法新增模板:%1"
 
-#: lib/RT/Ticket_Overlay.pm:1118 lib/RT/Ticket_Overlay.pm:353
+#: lib/RT/Ticket_Overlay.pm:1123 lib/RT/Ticket_Overlay.pm:358
 msgid "Could not create ticket. Queue not set"
 msgstr "无法新增申请单。尚未指定表单。"
 
@@ -1339,11 +1374,11 @@
 msgid "Could not find group %1."
 msgstr "找不到群组 %1。"
 
-#: lib/RT/Queue_Overlay.pm:621 lib/RT/Ticket_Overlay.pm:1448
+#: lib/RT/Queue_Overlay.pm:621 lib/RT/Ticket_Overlay.pm:1454
 msgid "Could not find or create that user"
 msgstr "找不到或无法新增该名使用者"
 
-#: lib/RT/Queue_Overlay.pm:682 lib/RT/Ticket_Overlay.pm:1527
+#: lib/RT/Queue_Overlay.pm:682 lib/RT/Ticket_Overlay.pm:1533
 msgid "Could not find that principal"
 msgstr "找不到该单位"
 
@@ -1360,7 +1395,7 @@
 msgid "Could not make that principal a %1 for this queue"
 msgstr "无法将该单位设为此表单的 %1。"
 
-#: lib/RT/Ticket_Overlay.pm:1469
+#: lib/RT/Ticket_Overlay.pm:1475
 #. ($self->loc($args{'Type'}))
 msgid "Could not make that principal a %1 for this ticket"
 msgstr "无法将该单位设为此申请单的 %1。"
@@ -1370,16 +1405,16 @@
 msgid "Could not remove that principal as a %1 for this queue"
 msgstr "无法将单位 %1 从表单移除。"
 
-#: lib/RT/Ticket_Overlay.pm:1585
+#: lib/RT/Ticket_Overlay.pm:1591
 #. ($args{'Type'})
 msgid "Could not remove that principal as a %1 for this ticket"
 msgstr "无法将单位 %1 从申请单移除。"
 
-#: lib/RT/Group_Overlay.pm:982
+#: lib/RT/Group_Overlay.pm:976
 msgid "Couldn't add member to group"
 msgstr "无法新增成员至群组"
 
-#: lib/RT/Ticket_Overlay.pm:3618 lib/RT/Ticket_Overlay.pm:3674
+#: lib/RT/Ticket_Overlay.pm:3630 lib/RT/Ticket_Overlay.pm:3686
 #. ($Msg)
 msgid "Couldn't create a transaction: %1"
 msgstr "无法新增更动报告"
@@ -1392,15 +1427,15 @@
 msgid "Couldn't find group\\n"
 msgstr "找不到群组\\n"
 
-#: lib/RT/Interface/Web.pm:962
+#: lib/RT/Interface/Web.pm:964
 msgid "Couldn't find row"
 msgstr "找不到此列数据"
 
-#: lib/RT/Group_Overlay.pm:956
+#: lib/RT/Group_Overlay.pm:950
 msgid "Couldn't find that principal"
 msgstr "找不到该单位"
 
-#: lib/RT/CustomField_Overlay.pm:239
+#: lib/RT/CustomField_Overlay.pm:246
 msgid "Couldn't find that value"
 msgstr "找不到该值"
 
@@ -1429,7 +1464,7 @@
 msgid "Couldn't load Scrips."
 msgstr "无法加载手续。"
 
-#: html/Admin/Groups/GroupRights.html:87 html/Admin/Groups/UserRights.html:74 html/Edit/Global/GroupRight/Add.html:55 html/Edit/Global/GroupRight/Add.html:60 html/Edit/Global/UserRight/Add.html:25 html/Edit/Global/UserRight/Add.html:30 html/Edit/Groups/Member:120 html/Edit/Groups/Members/Add.html:43 html/Edit/Rights/index.html:58 html/Edit/Rights/index.html:63
+#: html/Admin/Groups/GroupRights.html:87 html/Admin/Groups/UserRights.html:74 html/Edit/Global/GroupRight/Add.html:55 html/Edit/Global/GroupRight/Add.html:60 html/Edit/Global/UserRight/Add.html:25 html/Edit/Global/UserRight/Add.html:30 html/Edit/Groups/Member:121 html/Edit/Groups/Members/Add.html:44 html/Edit/Rights/index.html:58 html/Edit/Rights/index.html:63
 #. ($ObjectGroup)
 #. ($Report)
 #. ($Group)
@@ -1437,7 +1472,7 @@
 msgid "Couldn't load group %1"
 msgstr "无法加载手续 %1"
 
-#: lib/RT/Link_Overlay.pm:174 lib/RT/Link_Overlay.pm:183 lib/RT/Link_Overlay.pm:210
+#: lib/RT/Link_Overlay.pm:175 lib/RT/Link_Overlay.pm:184 lib/RT/Link_Overlay.pm:211
 msgid "Couldn't load link"
 msgstr "无法加载链接。"
 
@@ -1465,12 +1500,12 @@
 msgid "Couldn't load that user (%1)"
 msgstr "无法加载该名使用者(%1)"
 
-#: html/SelfService/Display.html:114
+#: html/SelfService/Display.html:116
 #. ($id)
 msgid "Couldn't load ticket '%1'"
 msgstr "无法加载申请单 '%1'"
 
-#: html/Admin/Elements/ModifyUser:85 html/Admin/Users/Modify.html:148 html/User/Prefs.html:134 html/Work/Preferences/Info:89
+#: html/Admin/Elements/ModifyUser:85 html/Admin/Users/Modify.html:148 html/User/Prefs.html:134 html/Work/Preferences/Info:92
 msgid "Country"
 msgstr "国家"
 
@@ -1624,7 +1659,7 @@
 msgid "CreateTicket"
 msgstr "新增申请单"
 
-#: html/Elements/SelectDateType:25 html/Ticket/Elements/ShowDates:27 lib/RT/Ticket_Overlay.pm:1212
+#: html/Elements/SelectDateType:25 html/Ticket/Elements/ShowDates:27 lib/RT/Ticket_Overlay.pm:1217
 msgid "Created"
 msgstr "新增日"
 
@@ -1703,7 +1738,7 @@
 msgid "Custom Field #%1"
 msgstr "自订字段 #%1"
 
-#: html/Admin/Elements/QueueTabs:52 html/Admin/Elements/SystemTabs:39 html/Admin/Global/index.html:49 html/Edit/Global/autohandler:7 html/Edit/Queues/autohandler:22 html/Ticket/Elements/ShowSummary:35
+#: html/Admin/Elements/QueueTabs:52 html/Admin/Elements/SystemTabs:39 html/Admin/Global/index.html:49 html/Edit/Global/autohandler:7 html/Edit/Queues/autohandler:24 html/Ticket/Elements/ShowSummary:35
 msgid "Custom Fields"
 msgstr "自订字段"
 
@@ -1723,22 +1758,22 @@
 msgid "Custom condition"
 msgstr "自订条件"
 
-#: lib/RT/Tickets_Overlay.pm:1637
+#: 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:1632
+#: lib/RT/Tickets_Overlay.pm:1688
 #. ($CF->Name)
 msgid "Custom field %1 has a value."
 msgstr "自订字段 %1 已有值"
 
-#: lib/RT/Tickets_Overlay.pm:1629
+#: lib/RT/Tickets_Overlay.pm:1685
 #. ($CF->Name)
 msgid "Custom field %1 has no value."
 msgstr "自订字段 %1 没有值"
 
-#: lib/RT/Ticket_Overlay.pm:3510
+#: lib/RT/Ticket_Overlay.pm:3522
 #. ($args{'Field'})
 msgid "Custom field %1 not found"
 msgstr "找不到自订字段 %1"
@@ -1747,11 +1782,11 @@
 msgid "Custom field deleted"
 msgstr "自订字段已删除"
 
-#: lib/RT/Ticket_Overlay.pm:3660
+#: lib/RT/Ticket_Overlay.pm:3672
 msgid "Custom field not found"
 msgstr "找不到自订字段"
 
-#: lib/RT/CustomField_Overlay.pm:349
+#: lib/RT/CustomField_Overlay.pm:356
 #. ($args{'Content'}, $self->Name)
 msgid "Custom field value %1 could not be found for custom field %2"
 msgstr "无法从自订字段 %2 中找到 %1 这个字段值"
@@ -1760,19 +1795,19 @@
 msgid "Custom field value changed from %1 to %2"
 msgstr "自订字段值从 %1 改为 %2"
 
-#: lib/RT/CustomField_Overlay.pm:249
+#: lib/RT/CustomField_Overlay.pm:256
 msgid "Custom field value could not be deleted"
 msgstr "无法删除自订字段值"
 
-#: lib/RT/CustomField_Overlay.pm:355
+#: lib/RT/CustomField_Overlay.pm:362
 msgid "Custom field value could not be found"
 msgstr "找不到自订字段值"
 
-#: lib/RT/CustomField_Overlay.pm:247 lib/RT/CustomField_Overlay.pm:357
+#: lib/RT/CustomField_Overlay.pm:254 lib/RT/CustomField_Overlay.pm:364
 msgid "Custom field value deleted"
 msgstr "自订字段值删除成功"
 
-#: html/Admin/Elements/ModifyTemplateAsWorkflow:145 html/Edit/Global/Workflow/Owner.html:90 lib/RT/Transaction_Overlay.pm:505 lib/RT/Transaction_Vendor.pm:5
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:145 html/Edit/Global/Workflow/Owner.html:98 lib/RT/Transaction_Overlay.pm:505 lib/RT/Transaction_Vendor.pm:5
 msgid "CustomField"
 msgstr "自订字段"
 
@@ -1792,7 +1827,7 @@
 msgid "Date of Departure"
 msgstr "出发日期"
 
-#: html/SelfService/Display.html:38 html/Ticket/Create.html:160 html/Ticket/Elements/ShowSummary:54 html/Ticket/Elements/Tabs:92 html/Ticket/ModifyAll.html:43 html/Work/Tickets/Elements/ShowTransaction:17
+#: html/SelfService/Display.html:38 html/Ticket/Create.html:160 html/Ticket/Elements/ShowSummary:54 html/Ticket/Elements/Tabs:98 html/Ticket/ModifyAll.html:43 html/Work/Tickets/Elements/ShowTransaction:17
 msgid "Dates"
 msgstr "日期"
 
@@ -1877,7 +1912,7 @@
 msgid "Delegated Type"
 msgstr "代理表单种类"
 
-#: html/Edit/Users/index.html:98 html/Work/Delegates/Info:31 html/Work/Delegates/List:8 html/Work/Elements/Tab:41 html/Work/Overview/Info:28
+#: html/Edit/Users/index.html:98 html/Work/Delegates/Info:31 html/Work/Delegates/List:8 html/Work/Elements/Tab:42 html/Work/Overview/Info:28
 msgid "Delegates"
 msgstr "代理人"
 
@@ -1957,7 +1992,7 @@
 msgid "Deleting this object would violate referential integrity. That's bad."
 msgstr "删除此对象会违反参考完整性"
 
-#: html/Approvals/Elements/Approve:44 html/Work/Approvals/Elements/Approve:32
+#: html/Approvals/Elements/Approve:44
 msgid "Deny"
 msgstr "驳回"
 
@@ -2006,7 +2041,7 @@
 msgid "Dependency by %1 added"
 msgstr "已加入可接续处理的申请单 %1"
 
-#: lib/RT/Transaction_Overlay.pm:622
+#: lib/RT/Transaction_Overlay.pm:625
 #. ($value)
 msgid "Dependency by %1 deleted"
 msgstr "已移除可接续处理的申请单 %1"
@@ -2016,7 +2051,7 @@
 msgid "Dependency on %1 added"
 msgstr "已加入需先处理的申请单 %1"
 
-#: lib/RT/Transaction_Overlay.pm:619
+#: lib/RT/Transaction_Overlay.pm:622
 #. ($value)
 msgid "Dependency on %1 deleted"
 msgstr "已移除需先处理的申请单 %1"
@@ -2049,7 +2084,7 @@
 msgid "Description:"
 msgstr "描述:"
 
-#: html/Work/Tickets/Create.html:132 html/Work/Tickets/Create.html:84 html/Work/Tickets/Elements/EditCustomFields:13 html/Work/Tickets/Elements/EditCustomFields:61 html/Work/Tickets/Elements/ShowCustomFields:14 html/Work/Tickets/Elements/ShowCustomFields:53
+#: html/Work/Tickets/Create.html:131 html/Work/Tickets/Create.html:84 html/Work/Tickets/Elements/EditCustomFields:13 html/Work/Tickets/Elements/EditCustomFields:61 html/Work/Tickets/Elements/ShowCustomFields:14 html/Work/Tickets/Elements/ShowCustomFields:53
 msgid "Details"
 msgstr "细节"
 
@@ -2065,11 +2100,11 @@
 msgid "Disability Type"
 msgstr "残障类别"
 
-#: html/Edit/Global/GroupRight/List:9 html/Edit/Global/GroupRight/Top:16 html/Edit/Groups/List:11 html/Edit/Groups/Top:19 html/Edit/Queues/Basic/Top:69 html/Edit/Queues/List:15 html/Edit/Queues/List:27 html/Work/Delegates/Info:48 html/Work/Delegates/Info:53 html/Work/Delegates/List:12 html/Work/Overview/Info:42
+#: html/Edit/Global/GroupRight/List:9 html/Edit/Global/GroupRight/Top:16 html/Edit/Groups/List:17 html/Edit/Groups/Top:19 html/Edit/Queues/Basic/Top:69 html/Edit/Queues/List:15 html/Edit/Queues/List:27 html/Work/Delegates/Info:48 html/Work/Delegates/Info:53 html/Work/Delegates/List:12 html/Work/Overview/Info:42
 msgid "Disabled"
 msgstr "停用"
 
-#: html/Ticket/Elements/Tabs:84
+#: html/Ticket/Elements/Tabs:90
 msgid "Display"
 msgstr "显示内容"
 
@@ -2101,7 +2136,7 @@
 msgid "Don't refresh this page."
 msgstr "不更新此页面。"
 
-#: html/Search/Elements/PickRestriction:113 html/Work/Search/PickRestriction:101
+#: html/Search/Elements/PickRestriction:114 html/Work/Search/PickRestriction:101
 msgid "Don't show search results"
 msgstr "不显示查询结果"
 
@@ -2109,7 +2144,7 @@
 msgid "Down"
 msgstr "下一页"
 
-#: html/Ticket/Elements/ShowTransaction:103
+#: html/Ticket/Elements/ShowTransaction:111
 msgid "Download"
 msgstr "下载"
 
@@ -2117,7 +2152,7 @@
 msgid "Dr."
 msgstr "博士"
 
-#: html/Elements/SelectDateType:31 html/Ticket/Create.html:166 html/Ticket/Elements/EditDates:44 html/Ticket/Elements/ShowDates:43 html/Work/Tickets/Elements/EditBasics:54 lib/RT/Ticket_Overlay.pm:1216
+#: html/Elements/SelectDateType:31 html/Ticket/Create.html:166 html/Ticket/Elements/EditDates:44 html/Ticket/Elements/ShowDates:43 html/Work/Tickets/Elements/EditBasics:54 lib/RT/Ticket_Overlay.pm:1221
 msgid "Due"
 msgstr "到期日"
 
@@ -2134,7 +2169,7 @@
 msgid "ERROR: Couldn't load ticket '%1': %2.\\n"
 msgstr "无法加载申请单 '%1':%2.\\n"
 
-#: html/Work/Tickets/Update.html:47
+#: html/Work/Tickets/Update.html:48
 msgid "Edit"
 msgstr "编辑"
 
@@ -2236,7 +2271,7 @@
 msgid "EffectiveId"
 msgstr "有效编号"
 
-#: lib/RT/Ticket_Overlay.pm:2673 lib/RT/Ticket_Overlay.pm:2751
+#: lib/RT/Ticket_Overlay.pm:2681 lib/RT/Ticket_Overlay.pm:2759
 msgid "Either base or target must be specified"
 msgstr "需要指定起始申请单或目的申请单"
 
@@ -2321,7 +2356,7 @@
 msgid "English Name"
 msgstr "英文姓名"
 
-#: lib/RT/CustomField_Overlay.pm:427
+#: lib/RT/CustomField_Overlay.pm:434
 msgid "Enter multiple values"
 msgstr "键入多重项目"
 
@@ -2329,7 +2364,7 @@
 msgid "Enter one or more conditions below to search for users"
 msgstr "输入下列单一或复式条件,查询用户数据"
 
-#: lib/RT/CustomField_Overlay.pm:424
+#: lib/RT/CustomField_Overlay.pm:431
 msgid "Enter one value"
 msgstr "键入单一项目"
 
@@ -2385,14 +2420,18 @@
 msgid "Error in parameters to Queue->DelWatcher"
 msgstr "表单->删除视察员的参数有误"
 
-#: lib/RT/Ticket_Overlay.pm:1401
+#: lib/RT/Ticket_Overlay.pm:1407
 msgid "Error in parameters to Ticket->AddWatcher"
 msgstr "申请单->新增视察员的参数有误"
 
-#: lib/RT/Ticket_Overlay.pm:1558
+#: lib/RT/Ticket_Overlay.pm:1564
 msgid "Error in parameters to Ticket->DelWatcher"
 msgstr "申请单->删除视察员的参数有误"
 
+#: bin/rt-crontool:209
+msgid "Escalate tickets"
+msgstr "调整申请单优先等级"
+
 #: etc/initialdata:20
 msgid "Everyone"
 msgstr "所有人"
@@ -2433,7 +2472,7 @@
 msgid "ExternalURL"
 msgstr "外部接口网址"
 
-#: html/Admin/Users/Modify.html:72 html/Edit/Users/Info:41
+#: html/Admin/Users/Modify.html:72 html/Edit/Users/Info:85
 msgid "Extra info"
 msgstr "备注"
 
@@ -2480,9 +2519,9 @@
 
 #: html/Edit/Global/CustomField/List:5 html/Edit/Global/CustomField/Top:9
 msgid "Field Type"
-msgstr "字段属性"
+msgstr "字段类别"
 
-#: html/Edit/Elements/PickUsers:52 html/Edit/Users/Add.html:47
+#: html/Edit/Elements/PickUsers:60 html/Edit/Users/Add.html:47
 msgid "Filter"
 msgstr "筛选"
 
@@ -2490,7 +2529,7 @@
 msgid "Filter people"
 msgstr "对象筛选"
 
-#: html/Edit/Elements/PickUsers:68 html/Edit/Users/Add.html:63 html/Work/Tickets/Cc:42
+#: html/Edit/Elements/PickUsers:76 html/Edit/Users/Add.html:63 html/Work/Tickets/Cc:42
 msgid "Filtered list:"
 msgstr "筛选列表:"
 
@@ -2498,11 +2537,11 @@
 msgid "Fin"
 msgstr "最终"
 
-#: html/Ticket/Create.html:154 html/Ticket/Elements/EditBasics:58 html/Work/Tickets/Elements/EditBasics:52 lib/RT/Tickets_Overlay.pm:1110
+#: html/Ticket/Create.html:154 html/Ticket/Elements/EditBasics:58 html/Work/Tickets/Elements/EditBasics:52 lib/RT/Tickets_Overlay.pm:1152
 msgid "Final Priority"
 msgstr "最终顺位"
 
-#: lib/RT/Ticket_Overlay.pm:1207
+#: lib/RT/Ticket_Overlay.pm:1212
 msgid "FinalPriority"
 msgstr "最终顺位"
 
@@ -2534,7 +2573,7 @@
 msgid "Finish Approval"
 msgstr "签核完毕"
 
-#: html/Ticket/Elements/Tabs:57
+#: html/Ticket/Elements/Tabs:63
 msgid "First"
 msgstr "第一项"
 
@@ -2579,7 +2618,7 @@
 msgid "Found %quant(%1,ticket)"
 msgstr "找到 %1 张申请单"
 
-#: lib/RT/Interface/Web.pm:964
+#: lib/RT/Interface/Web.pm:966
 msgid "Found Object"
 msgstr "已找到对象"
 
@@ -2713,7 +2752,7 @@
 msgid "Group Admin"
 msgstr "群组管理员"
 
-#: html/Edit/Global/GroupRight/List:5 html/Edit/Global/GroupRight/Top:20 html/Edit/Groups/List:7
+#: html/Edit/Global/GroupRight/List:5 html/Edit/Global/GroupRight/Top:20 html/Edit/Groups/List:8
 msgid "Group Description"
 msgstr "群组描述"
 
@@ -2725,7 +2764,7 @@
 msgid "Group Members"
 msgstr "群组成员"
 
-#: html/Edit/Elements/PickUsers:28 html/Edit/Global/GroupRight/List:4 html/Edit/Global/GroupRight/Top:10 html/Edit/Groups/List:6 html/Edit/Groups/Top:7 html/Edit/Queues/Basic/Add.html:15 html/Edit/Users/Add.html:29 html/Edit/Users/Group:10 html/Edit/Users/Search.html:43 html/Work/Delegates/Add.html:15 html/Work/Tickets/Cc:24
+#: html/Edit/Elements/PickUsers:30 html/Edit/Global/GroupRight/List:4 html/Edit/Global/GroupRight/Top:10 html/Edit/Groups/List:6 html/Edit/Groups/Top:7 html/Edit/Queues/Basic/Add.html:15 html/Edit/Users/Add.html:29 html/Edit/Users/Group:10 html/Edit/Users/Search.html:43 html/Work/Approvals/Add.html:16 html/Work/Delegates/Add.html:16 html/Work/Tickets/Cc:24
 msgid "Group Name"
 msgstr "群组名称"
 
@@ -2733,7 +2772,7 @@
 msgid "Group Name:"
 msgstr "群组名称:"
 
-#: html/Admin/Elements/GroupTabs:44 html/Admin/Elements/QueueTabs:56 html/Admin/Elements/SystemTabs:43 html/Admin/Global/index.html:54 html/Edit/Global/autohandler:12 html/Edit/Queues/autohandler:27 html/Edit/Users/Group:11 html/Edit/Users/index.html:96
+#: html/Admin/Elements/GroupTabs:44 html/Admin/Elements/QueueTabs:56 html/Admin/Elements/SystemTabs:43 html/Admin/Global/index.html:54 html/Edit/Global/autohandler:12 html/Edit/Queues/autohandler:29 html/Edit/Users/Group:11 html/Edit/Users/index.html:96
 msgid "Group Rights"
 msgstr "群组权限"
 
@@ -2745,11 +2784,11 @@
 msgid "Group Setup"
 msgstr "群组设定"
 
-#: html/Edit/Global/GroupRight/List:8 html/Edit/Global/GroupRight/Top:14 html/Edit/Groups/List:10 html/Edit/Groups/Top:15
+#: html/Edit/Global/GroupRight/List:8 html/Edit/Global/GroupRight/Top:14 html/Edit/Groups/List:16 html/Edit/Groups/Top:15
 msgid "Group Status"
 msgstr "群组状态"
 
-#: lib/RT/Group_Overlay.pm:962
+#: lib/RT/Group_Overlay.pm:956
 msgid "Group already has member"
 msgstr "群组内已有此成员"
 
@@ -2762,7 +2801,7 @@
 msgid "Group could not be created: %1"
 msgstr "无法新增群组:%1"
 
-#: lib/RT/Group_Overlay.pm:494
+#: lib/RT/Group_Overlay.pm:496
 msgid "Group created"
 msgstr "群组新增完毕"
 
@@ -2770,11 +2809,11 @@
 msgid "Group created: %1"
 msgstr "群组 %1 新增完毕"
 
-#: lib/RT/Group_Overlay.pm:1134
+#: lib/RT/Group_Overlay.pm:1128
 msgid "Group has no such member"
 msgstr "群组没有这个成员"
 
-#: lib/RT/Group_Overlay.pm:942 lib/RT/Queue_Overlay.pm:628 lib/RT/Queue_Overlay.pm:688 lib/RT/Ticket_Overlay.pm:1455 lib/RT/Ticket_Overlay.pm:1533
+#: lib/RT/Group_Overlay.pm:936 lib/RT/Queue_Overlay.pm:628 lib/RT/Queue_Overlay.pm:688 lib/RT/Ticket_Overlay.pm:1461 lib/RT/Ticket_Overlay.pm:1539
 msgid "Group not found"
 msgstr "找不到群组"
 
@@ -2798,7 +2837,7 @@
 msgid "Group with Queue Rights"
 msgstr "拥有表单权限群组"
 
-#: html/Edit/Global/Workflow/Owner.html:70
+#: html/Edit/Global/Workflow/Owner.html:78
 msgid "Group's"
 msgstr "群组之"
 
@@ -2810,7 +2849,7 @@
 msgid "Groups"
 msgstr "群组"
 
-#: lib/RT/Group_Overlay.pm:968
+#: lib/RT/Group_Overlay.pm:962
 msgid "Groups can't be members of their members"
 msgstr "不能将群组设为群组内成员"
 
@@ -2818,10 +2857,14 @@
 msgid "Groups with Global Rights"
 msgstr "拥有全域权限群组"
 
-#: html/Edit/Global/GroupRight/List:6 html/Edit/Global/GroupRight/Top:22 html/Edit/Groups/List:8
+#: html/Edit/Global/GroupRight/List:6 html/Edit/Global/GroupRight/Top:22 html/Edit/Groups/List:10
 msgid "HRMSDefined"
 msgstr "组织架构"
 
+#: html/Edit/Global/CustomField/Top:57
+msgid "HTML Attributes"
+msgstr "HTML 属性"
+
 #: NOT FOUND IN SOURCE
 msgid "Health Insurance"
 msgstr "健保补助身份"
@@ -2843,11 +2886,11 @@
 msgid "Help Desks"
 msgstr "各项业务窗口"
 
-#: html/Edit/Global/CustomField/SelectWritable:9 html/Edit/Queues/Basic/Top:80
+#: html/Edit/Global/CustomField/SelectWritable:7 html/Edit/Queues/Basic/Top:80
 msgid "Hidden"
 msgstr "隐藏"
 
-#: html/Ticket/Elements/ShowHistory:29 html/Ticket/Elements/Tabs:87 html/Work/Tickets/Elements/ShowHistory:8
+#: html/Ticket/Elements/ShowHistory:29 html/Ticket/Elements/Tabs:93 html/Work/Tickets/Elements/ShowHistory:8
 msgid "History"
 msgstr "纪录"
 
@@ -2863,7 +2906,7 @@
 msgid "Hotel Expense"
 msgstr "住宿费"
 
-#: lib/RT/Base.pm:75
+#: lib/RT/Base.pm:86
 #. (6)
 msgid "I have %quant(%1,concrete mixer)."
 msgstr "我有 %quant(%1,份固体搅拌器)。"
@@ -2876,7 +2919,7 @@
 msgid "ID Type"
 msgstr "身分类别"
 
-#: html/Ticket/Elements/ShowBasics:26 lib/RT/Tickets_Overlay.pm:1037
+#: html/Ticket/Elements/ShowBasics:26 lib/RT/Tickets_Overlay.pm:1079
 msgid "Id"
 msgstr "编号"
 
@@ -2896,11 +2939,11 @@
 msgid "If you've updated anything above, be sure to"
 msgstr "若您已更新以上数据,请记得按一下"
 
-#: lib/RT/Interface/Web.pm:956
+#: lib/RT/Interface/Web.pm:958
 msgid "Illegal value for %1"
 msgstr "%1 的值错误"
 
-#: lib/RT/Interface/Web.pm:959
+#: lib/RT/Interface/Web.pm:961
 msgid "Immutable field"
 msgstr "此字段值不可更动"
 
@@ -2924,15 +2967,15 @@
 msgid "Indirect Employee"
 msgstr "直接/间接员工"
 
-#: lib/RT/Tickets_Overlay.pm:1086
+#: lib/RT/Tickets_Overlay.pm:1128
 msgid "Initial Priority"
 msgstr "初始优先顺位"
 
-#: lib/RT/Ticket_Overlay.pm:1206 lib/RT/Ticket_Overlay.pm:1208
+#: lib/RT/Ticket_Overlay.pm:1211 lib/RT/Ticket_Overlay.pm:1213
 msgid "InitialPriority"
 msgstr "初始优先顺位"
 
-#: lib/RT/ScripAction_Overlay.pm:105
+#: lib/RT/ScripAction_Overlay.pm:105 lib/RT/Workflow.pm:190
 msgid "Input error"
 msgstr "输入错误"
 
@@ -2940,16 +2983,16 @@
 msgid "Interest noted"
 msgstr "登记成功"
 
-#: lib/RT/Ticket_Overlay.pm:3913
+#: lib/RT/Ticket_Overlay.pm:3931
 msgid "Internal Error"
 msgstr "内部错误"
 
-#: lib/RT/Record.pm:142
+#: lib/RT/Record.pm:143
 #. ($id->{error_message})
 msgid "Internal Error: %1"
 msgstr "内部错误:%1"
 
-#: lib/RT/Group_Overlay.pm:641
+#: lib/RT/Group_Overlay.pm:643
 msgid "Invalid Group Type"
 msgstr "错误的群组类别"
 
@@ -2961,11 +3004,11 @@
 msgid "Invalid Type"
 msgstr "错误的类型"
 
-#: lib/RT/Interface/Web.pm:961
+#: lib/RT/Interface/Web.pm:963
 msgid "Invalid data"
 msgstr "错误的数据"
 
-#: lib/RT/Ticket_Overlay.pm:463
+#: lib/RT/Ticket_Overlay.pm:468
 msgid "Invalid owner. Defaulting to 'nobody'."
 msgstr "错误的承办人。改为预设承办人「nobody」。"
 
@@ -2977,16 +3020,16 @@
 msgid "Invalid right"
 msgstr "错误的权限"
 
-#: lib/RT/Record.pm:117
+#: lib/RT/Record.pm:118
 #. ($key)
 msgid "Invalid value for %1"
 msgstr "%1 的值错误"
 
-#: lib/RT/Ticket_Overlay.pm:3517
+#: lib/RT/Ticket_Overlay.pm:3529
 msgid "Invalid value for custom field"
 msgstr "错误的自订字段值"
 
-#: lib/RT/Ticket_Overlay.pm:365
+#: lib/RT/Ticket_Overlay.pm:370
 msgid "Invalid value for status"
 msgstr "错误的状态值"
 
@@ -3034,7 +3077,7 @@
 msgid "Job"
 msgstr "职称"
 
-#: lib/RT/Group_Overlay.pm:148
+#: lib/RT/Group_Overlay.pm:149
 msgid "Join or leave this group"
 msgstr "加入或离开此群组"
 
@@ -3050,7 +3093,7 @@
 msgid "July"
 msgstr "七月"
 
-#: html/Ticket/Elements/Tabs:98
+#: html/Ticket/Elements/Tabs:104
 msgid "Jumbo"
 msgstr "全部信息"
 
@@ -3090,11 +3133,11 @@
 msgid "Lang"
 msgstr "使用语言"
 
-#: html/User/Prefs.html:54 html/Work/Preferences/Info:29
+#: html/User/Prefs.html:54 html/Work/Preferences/Info:32
 msgid "Language"
 msgstr "语言"
 
-#: html/Ticket/Elements/Tabs:72
+#: html/Ticket/Elements/Tabs:78
 msgid "Last"
 msgstr "上次更新"
 
@@ -3122,11 +3165,11 @@
 msgid "Left"
 msgstr "剩馀时间"
 
-#: html/Admin/Users/Modify.html:82 html/Edit/Users/Info:62
+#: html/Admin/Users/Modify.html:82 html/Edit/Users/Info:107
 msgid "Let this user access RT"
 msgstr "允许这名使用者登入"
 
-#: html/Admin/Users/Modify.html:86 html/Edit/Users/Info:68
+#: html/Admin/Users/Modify.html:86 html/Edit/Users/Info:113
 msgid "Let this user be granted rights"
 msgstr "内部成员(具有个人权限)"
 
@@ -3142,25 +3185,25 @@
 msgid "Link a Queue"
 msgstr "申请表单连结"
 
-#: lib/RT/Ticket_Overlay.pm:2765
+#: lib/RT/Ticket_Overlay.pm:2773
 msgid "Link already exists"
 msgstr "此链接已存在"
 
-#: lib/RT/Ticket_Overlay.pm:2777
+#: lib/RT/Ticket_Overlay.pm:2785
 msgid "Link could not be created"
 msgstr "无法新增链接"
 
-#: lib/RT/Ticket_Overlay.pm:2785 lib/RT/Ticket_Overlay.pm:2797
+#: lib/RT/Ticket_Overlay.pm:2793 lib/RT/Ticket_Overlay.pm:2805
 #. ($TransString)
 msgid "Link created (%1)"
 msgstr "链接(%1)新增完毕"
 
-#: lib/RT/Ticket_Overlay.pm:2698
+#: lib/RT/Ticket_Overlay.pm:2706
 #. ($TransString)
 msgid "Link deleted (%1)"
 msgstr "链接(%1)删除完毕"
 
-#: lib/RT/Ticket_Overlay.pm:2704
+#: lib/RT/Ticket_Overlay.pm:2712
 msgid "Link not found"
 msgstr "找不到链接"
 
@@ -3173,7 +3216,7 @@
 msgid "Link ticket %1"
 msgstr "链接申请单 %1"
 
-#: html/Ticket/Elements/Tabs:96
+#: html/Ticket/Elements/Tabs:102
 msgid "Links"
 msgstr "链接"
 
@@ -3181,7 +3224,7 @@
 msgid "List All Users"
 msgstr "列出所有用户数据"
 
-#: html/Admin/Users/Modify.html:113 html/User/Prefs.html:107 html/Work/Preferences/Info:75
+#: html/Admin/Users/Modify.html:113 html/User/Prefs.html:107 html/Work/Preferences/Info:78
 msgid "Location"
 msgstr "位置"
 
@@ -3203,7 +3246,7 @@
 msgid "Logged in as %1"
 msgstr "使用者:%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
+#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:35 html/Elements/Login:44 html/Elements/Login:60 lib/RT/StyleGuide.pod:777
 msgid "Login"
 msgstr "登入"
 
@@ -3312,20 +3355,20 @@
 msgid "Member %1 added"
 msgstr "成员 %1 新增完毕"
 
-#: lib/RT/Transaction_Overlay.pm:635
+#: lib/RT/Transaction_Overlay.pm:638
 #. ($value)
 msgid "Member %1 deleted"
 msgstr "成员 %1 删除完毕"
 
-#: lib/RT/Group_Overlay.pm:979
+#: lib/RT/Group_Overlay.pm:973
 msgid "Member added"
 msgstr "新增成员完毕"
 
-#: lib/RT/Group_Overlay.pm:1141
+#: lib/RT/Group_Overlay.pm:1135
 msgid "Member deleted"
 msgstr "成员已删除"
 
-#: lib/RT/Group_Overlay.pm:1145
+#: lib/RT/Group_Overlay.pm:1139
 msgid "Member not deleted"
 msgstr "成员未删除"
 
@@ -3333,7 +3376,7 @@
 msgid "Member of"
 msgstr "隶属于"
 
-#: html/Work/Preferences/index.html:19
+#: html/Edit/Users/Info:23 html/Work/Preferences/index.html:19
 msgid "Member since"
 msgstr "注册日期"
 
@@ -3350,16 +3393,16 @@
 msgid "Membership in %1 added"
 msgstr "所属群组 %1 加入完毕"
 
-#: lib/RT/Transaction_Overlay.pm:632
+#: lib/RT/Transaction_Overlay.pm:635
 #. ($value)
 msgid "Membership in %1 deleted"
 msgstr "所属群组 %1 移除完毕"
 
-#: lib/RT/Ticket_Overlay.pm:2954
+#: lib/RT/Ticket_Overlay.pm:2962
 msgid "Merge Successful"
 msgstr "整合完毕"
 
-#: lib/RT/Ticket_Overlay.pm:2874
+#: lib/RT/Ticket_Overlay.pm:2882
 msgid "Merge failed. Couldn't set EffectiveId"
 msgstr "整合失败。无法设定 EffectiveId"
 
@@ -3367,11 +3410,16 @@
 msgid "Merge into"
 msgstr "整合进"
 
+#: lib/RT/Transaction_Overlay.pm:601
+#. ($value)
+msgid "Merged into %1"
+msgstr "已整合进 %1"
+
 #: html/Search/Bulk.html:137 html/Ticket/Update.html:100
 msgid "Message"
 msgstr "讯息"
 
-#: html/Ticket/Elements/ShowTransaction:80
+#: html/Ticket/Elements/ShowTransaction:88
 msgid "Message body not shown because it is too large or is not plain text."
 msgstr "信件内文不是纯文字,因此无法显示。"
 
@@ -3379,11 +3427,15 @@
 msgid "Misc. Expense"
 msgstr "杂费"
 
-#: lib/RT/Interface/Web.pm:963
+#: lib/RT/Interface/Web.pm:965
 msgid "Missing a primary key?: %1"
 msgstr "缺少主键值?(%1)"
 
-#: html/Admin/Users/Modify.html:168 html/User/Prefs.html:71 html/Work/Preferences/Info:38
+#: html/Work/Tickets/Create.html:180
+msgid "Missing mandatory fields"
+msgstr "缺少必填字段"
+
+#: html/Admin/Users/Modify.html:168 html/User/Prefs.html:71 html/Work/Preferences/Info:41
 msgid "Mobile"
 msgstr "行动电话"
 
@@ -3479,7 +3531,7 @@
 msgid "Modify global user rights."
 msgstr "更改全域设定的使用者权限。"
 
-#: lib/RT/Group_Overlay.pm:145
+#: lib/RT/Group_Overlay.pm:146
 msgid "Modify group metadata or delete group"
 msgstr "更改群组数据及删除群组"
 
@@ -3493,7 +3545,7 @@
 msgid "Modify group rights for queue %1"
 msgstr "更改表单 %1 的群组权限"
 
-#: lib/RT/Group_Overlay.pm:147
+#: lib/RT/Group_Overlay.pm:148
 msgid "Modify membership roster for this group"
 msgstr "更改此群组的成员名单"
 
@@ -3587,7 +3639,7 @@
 msgid "ModifyACL"
 msgstr "更改权限清单"
 
-#: lib/RT/Group_Overlay.pm:148
+#: lib/RT/Group_Overlay.pm:149
 msgid "ModifyOwnMembership"
 msgstr "更改自己是否属于某群组"
 
@@ -3657,15 +3709,15 @@
 msgid "My %1 tickets"
 msgstr "我的 %1 申请单"
 
-#: html/Work/Elements/Tab:37
+#: html/Work/Elements/Tab:38
 msgid "My Approvals"
 msgstr "表单签核"
 
-#: html/Work/Elements/Tab:35
+#: html/Work/Elements/Tab:36
 msgid "My Requests"
 msgstr "表单申请追踪"
 
-#: html/Work/Elements/Tab:39
+#: html/Work/Elements/Tab:40
 msgid "My Tickets"
 msgstr "表单处理"
 
@@ -3697,7 +3749,7 @@
 msgid "New"
 msgstr "新建立"
 
-#: html/Admin/Elements/ModifyUser:31 html/Admin/Users/Modify.html:92 html/Edit/Users/Info:33 html/User/Prefs.html:87 html/Work/Preferences/Info:49
+#: html/Admin/Elements/ModifyUser:31 html/Admin/Users/Modify.html:92 html/Edit/Users/Info:46 html/User/Prefs.html:87 html/Work/Preferences/Info:52
 msgid "New Password"
 msgstr "新的口令"
 
@@ -3709,7 +3761,7 @@
 msgid "New Relationships"
 msgstr "新增关系"
 
-#: html/Work/Elements/Tab:33
+#: html/Work/Elements/Tab:34
 msgid "New Request"
 msgstr "表单申请"
 
@@ -3765,7 +3817,7 @@
 msgid "New ticket"
 msgstr "提出申请单"
 
-#: lib/RT/Ticket_Overlay.pm:2841
+#: lib/RT/Ticket_Overlay.pm:2849
 msgid "New ticket doesn't exist"
 msgstr "没有新申请单"
 
@@ -3789,7 +3841,7 @@
 msgid "New workflow"
 msgstr "新增流程"
 
-#: html/Ticket/Elements/Tabs:68
+#: html/Ticket/Elements/Tabs:74
 msgid "Next"
 msgstr "下一项"
 
@@ -3801,7 +3853,7 @@
 msgid "NickName"
 msgstr "昵称"
 
-#: html/Admin/Users/Modify.html:62 html/User/Prefs.html:50 html/Work/Preferences/Info:26
+#: html/Admin/Users/Modify.html:62 html/User/Prefs.html:50 html/Work/Preferences/Info:29
 msgid "Nickname"
 msgstr "昵称"
 
@@ -3845,11 +3897,11 @@
 msgid "No Workflow"
 msgstr "没有流程"
 
-#: html/Approvals/Elements/Approve:45 html/Work/Approvals/Elements/Approve:35
+#: html/Approvals/Elements/Approve:45
 msgid "No action"
 msgstr "暂不处理"
 
-#: lib/RT/Interface/Web.pm:958
+#: lib/RT/Interface/Web.pm:960
 msgid "No column specified"
 msgstr "未指定字段"
 
@@ -3861,7 +3913,7 @@
 msgid "No comment entered about this user"
 msgstr "没有对这名使用者的评论"
 
-#: lib/RT/Ticket_Overlay.pm:2229 lib/RT/Ticket_Overlay.pm:2299
+#: lib/RT/Ticket_Overlay.pm:2237 lib/RT/Ticket_Overlay.pm:2307
 msgid "No correspondence attached"
 msgstr "没有附上申请单回复"
 
@@ -3870,7 +3922,7 @@
 msgid "No description for %1"
 msgstr "没有对 %1 的描述"
 
-#: lib/RT/Users_Overlay.pm:149
+#: lib/RT/Users_Overlay.pm:163
 msgid "No group specified"
 msgstr "未指定群组"
 
@@ -3882,7 +3934,7 @@
 msgid "No permission to create queues"
 msgstr "没有新增表单的权限"
 
-#: lib/RT/Ticket_Overlay.pm:361
+#: lib/RT/Ticket_Overlay.pm:366
 #. ($QueueObj->Name)
 msgid "No permission to create tickets in the queue '%1'"
 msgstr "没有在表单 '%1' 新增申请单的权限"
@@ -3891,7 +3943,7 @@
 msgid "No permission to create users"
 msgstr "没有新增使用者的权限"
 
-#: html/SelfService/Display.html:123
+#: html/SelfService/Display.html:125
 msgid "No permission to display that ticket"
 msgstr "没有显示该申请单的权限"
 
@@ -3899,7 +3951,7 @@
 msgid "No permission to view update ticket"
 msgstr "没有检视申请单更新的权限"
 
-#: lib/RT/Queue_Overlay.pm:675 lib/RT/Ticket_Overlay.pm:1514
+#: lib/RT/Queue_Overlay.pm:675 lib/RT/Ticket_Overlay.pm:1520
 msgid "No principal specified"
 msgstr "未指定单位"
 
@@ -3947,7 +3999,7 @@
 msgid "No valid RT user found. RT cvs handler disengaged. Please consult your RT administrator.\\n"
 msgstr "找不到合格的 RT 使用者。RT cvs 处理器已停用。请向 RT 管理者询问。\\n"
 
-#: lib/RT/Interface/Web.pm:955
+#: lib/RT/Interface/Web.pm:957
 msgid "No value sent to _Set!\\n"
 msgstr "_Set 没有收到任何值!\\n"
 
@@ -3955,7 +4007,7 @@
 msgid "Nobody"
 msgstr "没有人"
 
-#: lib/RT/Interface/Web.pm:960
+#: lib/RT/Interface/Web.pm:962
 msgid "Nonexistant field?"
 msgstr "字段不存在?"
 
@@ -4083,11 +4135,11 @@
 msgid "OK"
 msgstr "确定"
 
-#: lib/RT/Record.pm:156
+#: lib/RT/Record.pm:157
 msgid "Object could not be created"
 msgstr "无法新增对象"
 
-#: lib/RT/Record.pm:175
+#: lib/RT/Record.pm:181
 msgid "Object created"
 msgstr "对象新增完毕"
 
@@ -4115,7 +4167,7 @@
 msgid "On"
 msgstr "等于"
 
-#: html/Edit/Global/CustomField/Top:68
+#: html/Edit/Global/CustomField/Top:71
 msgid "On Change"
 msgstr "更改申请单时"
 
@@ -4127,7 +4179,7 @@
 msgid "On Correspond"
 msgstr "回复申请单时"
 
-#: etc/initialdata:137 html/Edit/Global/CustomField/Top:57
+#: etc/initialdata:137 html/Edit/Global/CustomField/Top:69
 msgid "On Create"
 msgstr "新增申请单时"
 
@@ -4161,11 +4213,11 @@
 msgid "Only show approvals for requests created before %1"
 msgstr "仅显示 %1 之前新增的申请单"
 
-#: html/Edit/Global/GroupRight/List:9 html/Edit/Global/GroupRight/Top:16 html/Edit/Groups/List:11 html/Edit/Groups/Top:18 html/Edit/Queues/Basic/Top:68 html/Edit/Queues/List:15 html/Edit/Queues/List:27 html/Elements/Quicksearch:30 html/Work/Delegates/Info:48 html/Work/Delegates/Info:51 html/Work/Delegates/List:12 html/Work/Elements/Quicksearch:16 html/Work/Overview/Info:41 html/Work/Tickets/Display.html:51
+#: html/Edit/Global/GroupRight/List:9 html/Edit/Global/GroupRight/Top:16 html/Edit/Groups/List:17 html/Edit/Groups/Top:18 html/Edit/Queues/Basic/Top:68 html/Edit/Queues/List:15 html/Edit/Queues/List:27 html/Elements/Quicksearch:30 html/Work/Delegates/Info:48 html/Work/Delegates/Info:51 html/Work/Delegates/List:12 html/Work/Elements/Quicksearch:16 html/Work/Overview/Info:41 html/Work/Tickets/Display.html:51
 msgid "Open"
 msgstr "开启"
 
-#: html/Ticket/Elements/Tabs:135
+#: html/Ticket/Elements/Tabs:141
 msgid "Open it"
 msgstr "开启"
 
@@ -4201,11 +4253,11 @@
 msgid "Option Name"
 msgstr "选项名称"
 
-#: html/Search/Elements/PickRestriction:100 html/Work/Search/PickRestriction:87
+#: html/Search/Elements/PickRestriction:101 html/Work/Search/PickRestriction:87
 msgid "Ordering and sorting"
 msgstr "顺序与排序方式"
 
-#: html/Admin/Elements/ModifyUser:45 html/Admin/Users/Modify.html:116 html/Edit/Elements/SelectUsers:7 html/Edit/Global/Basic/Top:55 html/Elements/SelectUsers:28 html/User/Prefs.html:110 html/Work/Preferences/Info:77
+#: html/Admin/Elements/ModifyUser:45 html/Admin/Users/Modify.html:116 html/Edit/Elements/SelectUsers:7 html/Edit/Global/Basic/Top:55 html/Elements/SelectUsers:28 html/User/Prefs.html:110 html/Work/Preferences/Info:80
 msgid "Organization"
 msgstr "组织名称"
 
@@ -4218,7 +4270,7 @@
 msgid "Originating ticket: #%1"
 msgstr "原申请单:#%1"
 
-#: html/Edit/Elements/PickUsers:111 html/Edit/Users/Add.html:106 html/Work/Tickets/Cc:80
+#: html/Edit/Elements/PickUsers:119 html/Edit/Users/Add.html:106 html/Work/Tickets/Cc:80
 msgid "Other comma-delimited email addresses"
 msgstr "其它e-mail帐号 (仅e-mail通知;多笔帐号请用逗号','区隔)"
 
@@ -4239,7 +4291,7 @@
 msgid "OverrideGlobalACL status %1"
 msgstr "取代全域权限 %1"
 
-#: html/Work/Elements/Tab:31
+#: html/Work/Elements/Tab:32
 msgid "Overview"
 msgstr "总览"
 
@@ -4251,7 +4303,7 @@
 msgid "OwnTicket"
 msgstr "承办申请单"
 
-#: etc/initialdata:38 html/Admin/Elements/ModifyTemplateAsWorkflow:141 html/Edit/Global/Workflow/Owner.html:19 html/Edit/Queues/Basic/Top:51 html/Edit/Queues/Basic/Top:59 html/Elements/MyRequests:31 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:62 html/Work/Elements/MyRequests:19 html/Work/Elements/Quicksearch:18 html/Work/Tickets/Elements/EditPeople:28 html/Work/Tickets/Elements/ShowBasics:21 html/Work/Tickets/Update.html:27 lib/RT/ACE_Overlay.pm:85 lib/RT/Tickets_Overlay.pm:1263
+#: etc/initialdata:38 html/Admin/Elements/ModifyTemplateAsWorkflow:141 html/Edit/Global/Workflow/Owner.html:19 html/Edit/Queues/Basic/Top:51 html/Edit/Queues/Basic/Top:59 html/Elements/MyRequests:31 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:62 html/Work/Elements/MyRequests:23 html/Work/Elements/Quicksearch:18 html/Work/Tickets/Elements/EditPeople:28 html/Work/Tickets/Elements/ShowBasics:21 html/Work/Tickets/Update.html:27 lib/RT/ACE_Overlay.pm:85 lib/RT/Tickets_Overlay.pm:1305
 msgid "Owner"
 msgstr "承办人"
 
@@ -4268,15 +4320,15 @@
 msgid "Owner is"
 msgstr "承办人"
 
-#: html/Work/Elements/List:27 html/Work/Queues/List:8 html/Work/Tickets/Create.html:55 html/Work/Tickets/Elements/ShowBasics:60
+#: html/Work/Elements/List:31 html/Work/Queues/List:9 html/Work/Tickets/Create.html:55 html/Work/Tickets/Elements/ShowBasics:60
 msgid "Owner's Phone"
 msgstr "承办人电话"
 
-#: html/Edit/Elements/Page:40
+#: html/Edit/Elements/Page:38
 msgid "Page #"
 msgstr " "
 
-#: html/Admin/Users/Modify.html:173 html/User/Prefs.html:75 html/Work/Preferences/Info:40
+#: html/Admin/Users/Modify.html:173 html/User/Prefs.html:75 html/Work/Preferences/Info:43
 msgid "Pager"
 msgstr "呼叫器"
 
@@ -4284,7 +4336,7 @@
 msgid "PagerPhone"
 msgstr "呼叫器号码"
 
-#: html/Edit/Global/Workflow/Action:75 html/Edit/Global/Workflow/Condition:65
+#: html/Edit/Global/Workflow/Action:76 html/Edit/Global/Workflow/Condition:66
 msgid "Parameter"
 msgstr "呼叫参数"
 
@@ -4300,7 +4352,7 @@
 msgid "Park Space"
 msgstr "停车位申请"
 
-#: html/Elements/Login:52 html/User/Prefs.html:83 html/Work/Preferences/Info:46
+#: html/Elements/Login:55 html/User/Prefs.html:83 html/Work/Preferences/Info:49
 msgid "Password"
 msgstr "口令"
 
@@ -4312,7 +4364,7 @@
 msgid "Password too short"
 msgstr "口令太短"
 
-#: html/Admin/Users/Modify.html:292 html/User/Prefs.html:209 html/Work/Preferences/Info:173
+#: html/Admin/Users/Modify.html:292 html/User/Prefs.html:212 html/Work/Preferences/Info:177
 #. (loc_fuzzy($msg))
 msgid "Password: %1"
 msgstr "口令:%1"
@@ -4321,7 +4373,7 @@
 msgid "Passwords do not match."
 msgstr "口令确认失败。"
 
-#: html/User/Prefs.html:211 html/Work/Preferences/Info:175
+#: html/User/Prefs.html:214 html/Work/Preferences/Info:179
 msgid "Passwords do not match. Your password has not been changed"
 msgstr "口令确认失败。您的口令并未改变。"
 
@@ -4333,7 +4385,7 @@
 msgid "Pending Approval"
 msgstr "等待签核"
 
-#: html/Ticket/Elements/ShowSummary:44 html/Ticket/Elements/Tabs:95 html/Ticket/ModifyAll.html:50
+#: html/Ticket/Elements/ShowSummary:44 html/Ticket/Elements/Tabs:101 html/Ticket/ModifyAll.html:50
 msgid "People"
 msgstr "人员"
 
@@ -4345,7 +4397,7 @@
 msgid "Perform a user-defined action"
 msgstr "执行使用者自订的动作"
 
-#: 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/CurrentUser.pm:82 lib/RT/CurrentUser.pm:91 lib/RT/CustomField_Overlay.pm:100 lib/RT/CustomField_Overlay.pm:201 lib/RT/CustomField_Overlay.pm:233 lib/RT/CustomField_Overlay.pm:511 lib/RT/CustomField_Overlay.pm:90 lib/RT/Group_Overlay.pm:1096 lib/RT/Group_Overlay.pm:1100 lib/RT/Group_Overlay.pm:1109 lib/RT/Group_Overlay.pm:1160 lib/RT/Group_Overlay.pm:1164 lib/RT/Group_Overlay.pm:1170 lib/RT/Group_Overlay.pm:423 lib/RT/Group_Overlay.pm:515 lib/RT/Group_Overlay.pm:593 lib/RT/Group_Overlay.pm:601 lib/RT/Group_Overlay.pm:698 lib/RT/Group_Overlay.pm:702 lib/RT/Group_Overlay.pm:708 lib/RT/Group_Overlay.pm:901 lib/RT/Group_Overlay.pm:905 lib/RT/Group_Overlay.pm:918 lib/RT/Queue_Overlay.pm:540 lib/RT/Queue_Overlay.pm:550 lib/RT/Queue_Overlay.pm:564 lib/RT/Queue_Overlay.pm:699 lib/RT/Queue_Overlay.pm:708 lib/RT/Queue_Overlay.pm:721 lib/RT/Queue_Overlay.pm:934 lib/RT/Scrip_Overlay.pm:125 lib/RT/Scrip_Overlay.pm:136 lib/RT/Scrip_Overlay.pm:201 lib/RT/Scrip_Overlay.pm:441 lib/RT/Template_Overlay.pm:284 lib/RT/Template_Overlay.pm:87 lib/RT/Template_Overlay.pm:93 lib/RT/Ticket_Overlay.pm:1386 lib/RT/Ticket_Overlay.pm:1396 lib/RT/Ticket_Overlay.pm:1410 lib/RT/Ticket_Overlay.pm:1544 lib/RT/Ticket_Overlay.pm:1553 lib/RT/Ticket_Overlay.pm:1566 lib/RT/Ticket_Overlay.pm:1915 lib/RT/Ticket_Overlay.pm:2053 lib/RT/Ticket_Overlay.pm:2217 lib/RT/Ticket_Overlay.pm:2286 lib/RT/Ticket_Overlay.pm:2647 lib/RT/Ticket_Overlay.pm:2728 lib/RT/Ticket_Overlay.pm:2832 lib/RT/Ticket_Overlay.pm:2847 lib/RT/Ticket_Overlay.pm:3046 lib/RT/Ticket_Overlay.pm:3056 lib/RT/Ticket_Overlay.pm:3061 lib/RT/Ticket_Overlay.pm:3284 lib/RT/Ticket_Overlay.pm:3288 lib/RT/Ticket_Overlay.pm:3487 lib/RT/Ticket_Overlay.pm:3649 lib/RT/Ticket_Overlay.pm:3701 lib/RT/Ticket_Overlay.pm:3907 lib/RT/Transaction_Overlay.pm:415 lib/RT/Transaction_Overlay.pm:422 lib/RT/Transaction_Overlay.pm:451 lib/RT/Transaction_Overlay.pm:458 lib/RT/User_Overlay.pm:1084 lib/RT/User_Overlay.pm:1532 lib/RT/User_Overlay.pm:692 lib/RT/User_Overlay.pm:727 lib/RT/User_Overlay.pm:983
+#: lib/RT/ACE_Overlay.pm:230 lib/RT/ACE_Overlay.pm:236 lib/RT/ACE_Overlay.pm:563 lib/RT/ACE_Overlay.pm:573 lib/RT/ACE_Overlay.pm:583 lib/RT/ACE_Overlay.pm:648 lib/RT/CurrentUser.pm:82 lib/RT/CurrentUser.pm:91 lib/RT/CustomField_Overlay.pm:100 lib/RT/CustomField_Overlay.pm:208 lib/RT/CustomField_Overlay.pm:240 lib/RT/CustomField_Overlay.pm:518 lib/RT/CustomField_Overlay.pm:90 lib/RT/Group_Overlay.pm:1090 lib/RT/Group_Overlay.pm:1094 lib/RT/Group_Overlay.pm:1103 lib/RT/Group_Overlay.pm:1154 lib/RT/Group_Overlay.pm:1158 lib/RT/Group_Overlay.pm:1164 lib/RT/Group_Overlay.pm:424 lib/RT/Group_Overlay.pm:517 lib/RT/Group_Overlay.pm:595 lib/RT/Group_Overlay.pm:603 lib/RT/Group_Overlay.pm:700 lib/RT/Group_Overlay.pm:704 lib/RT/Group_Overlay.pm:710 lib/RT/Group_Overlay.pm:895 lib/RT/Group_Overlay.pm:899 lib/RT/Group_Overlay.pm:912 lib/RT/Queue_Overlay.pm:540 lib/RT/Queue_Overlay.pm:550 lib/RT/Queue_Overlay.pm:564 lib/RT/Queue_Overlay.pm:699 lib/RT/Queue_Overlay.pm:708 lib/RT/Queue_Overlay.pm:721 lib/RT/Queue_Overlay.pm:934 lib/RT/Scrip_Overlay.pm:125 lib/RT/Scrip_Overlay.pm:136 lib/RT/Scrip_Overlay.pm:201 lib/RT/Scrip_Overlay.pm:441 lib/RT/Template_Overlay.pm:284 lib/RT/Template_Overlay.pm:87 lib/RT/Template_Overlay.pm:93 lib/RT/Ticket_Overlay.pm:1392 lib/RT/Ticket_Overlay.pm:1402 lib/RT/Ticket_Overlay.pm:1416 lib/RT/Ticket_Overlay.pm:1550 lib/RT/Ticket_Overlay.pm:1559 lib/RT/Ticket_Overlay.pm:1572 lib/RT/Ticket_Overlay.pm:1923 lib/RT/Ticket_Overlay.pm:2061 lib/RT/Ticket_Overlay.pm:2225 lib/RT/Ticket_Overlay.pm:2294 lib/RT/Ticket_Overlay.pm:2655 lib/RT/Ticket_Overlay.pm:2736 lib/RT/Ticket_Overlay.pm:2840 lib/RT/Ticket_Overlay.pm:2855 lib/RT/Ticket_Overlay.pm:3054 lib/RT/Ticket_Overlay.pm:3064 lib/RT/Ticket_Overlay.pm:3069 lib/RT/Ticket_Overlay.pm:3292 lib/RT/Ticket_Overlay.pm:3296 lib/RT/Ticket_Overlay.pm:3499 lib/RT/Ticket_Overlay.pm:3661 lib/RT/Ticket_Overlay.pm:3713 lib/RT/Ticket_Overlay.pm:3925 lib/RT/Transaction_Overlay.pm:415 lib/RT/Transaction_Overlay.pm:422 lib/RT/Transaction_Overlay.pm:451 lib/RT/Transaction_Overlay.pm:458 lib/RT/User_Overlay.pm:1094 lib/RT/User_Overlay.pm:1542 lib/RT/User_Overlay.pm:692 lib/RT/User_Overlay.pm:727 lib/RT/User_Overlay.pm:983
 msgid "Permission Denied"
 msgstr "权限不足"
 
@@ -4365,6 +4417,10 @@
 msgid "Personal Groups"
 msgstr "代理人群组"
 
+#: html/Edit/Users/Info:55 html/Work/Preferences/Info:27
+msgid "Personal Homepage"
+msgstr "个人首页"
+
 #: NOT FOUND IN SOURCE
 msgid "Personal Todo"
 msgstr "私人待办事项"
@@ -4377,7 +4433,7 @@
 msgid "Personal groups:"
 msgstr "代理人群组:"
 
-#: html/Work/Preferences/Info:24
+#: NOT FOUND IN SOURCE
 msgid "PersonalHomepage"
 msgstr "个人首页"
 
@@ -4405,11 +4461,11 @@
 msgid "Phone number"
 msgstr "电话号码"
 
-#: html/Admin/Users/Modify.html:155 html/User/Prefs.html:60 html/Work/Preferences/Info:32
+#: html/Admin/Users/Modify.html:155 html/User/Prefs.html:60 html/Work/Preferences/Info:35
 msgid "Phone numbers"
 msgstr "电话号码"
 
-#: html/Edit/Queues/Basic/Add.html:3 html/Edit/Queues/Basic/Top:55 html/Edit/Users/Add.html:3 html/Work/Delegates/Add.html:3 html/Work/Delegates/Info:34 html/Work/Tickets/ModifyPeople.html:2
+#: html/Edit/Queues/Basic/Add.html:3 html/Edit/Queues/Basic/Top:55 html/Edit/Users/Add.html:3 html/Work/Approvals/Add.html:3 html/Work/Delegates/Add.html:3 html/Work/Delegates/Info:34 html/Work/Tickets/ModifyPeople.html:2
 msgid "Pick"
 msgstr "挑选"
 
@@ -4421,7 +4477,7 @@
 msgid "Placeholder"
 msgstr "尚未完工"
 
-#: html/Edit/Elements/PickUsers:31 html/Edit/Elements/PickUsers:44 html/Edit/Elements/SelectCustomFieldType:3 html/Work/Elements/SelectOwner:3 html/Work/Tickets/Elements/EditCustomField:187 html/Work/Tickets/Elements/EditCustomFieldEntry:24 html/Work/Tickets/Elements/EditCustomFieldEntry:35
+#: html/Edit/Elements/PickUsers:33 html/Edit/Elements/PickUsers:51 html/Edit/Elements/SelectCustomFieldType:3 html/Work/Elements/SelectOwner:3 html/Work/Tickets/Elements/EditCustomField:199 html/Work/Tickets/Elements/EditCustomFieldEntry:42 html/Work/Tickets/Elements/EditCustomFieldEntry:57
 msgid "Please Select"
 msgstr "请选择"
 
@@ -4457,7 +4513,7 @@
 msgid "Position Level"
 msgstr "职等"
 
-#: html/Edit/Elements/PickUsers:41 html/Edit/Global/UserRight/List:13 html/Edit/Global/UserRight/Top:23 html/Edit/Queues/Basic/Add.html:26 html/Edit/Users/Add.html:41 html/Work/Delegates/Add.html:26 html/Work/Delegates/Info:84 html/Work/Overview/Info:66
+#: html/Edit/Elements/PickUsers:48 html/Edit/Global/UserRight/List:13 html/Edit/Global/UserRight/Top:23 html/Edit/Queues/Basic/Add.html:26 html/Edit/Users/Add.html:41 html/Work/Approvals/Add.html:27 html/Work/Delegates/Add.html:27 html/Work/Delegates/Info:84 html/Work/Overview/Info:66
 msgid "Position Name"
 msgstr "职务名称"
 
@@ -4473,7 +4529,7 @@
 msgid "Pref"
 msgstr "偏好"
 
-#: html/Edit/Elements/104Top:26 html/Elements/Header:51 html/Elements/Tabs:52 html/SelfService/Elements/Tabs:50 html/SelfService/Prefs.html:24 html/User/Prefs.html:24 html/User/Prefs.html:27 html/Work/Elements/Tab:43
+#: html/Edit/Elements/104Top:26 html/Elements/Header:51 html/Elements/Tabs:52 html/SelfService/Elements/Tabs:50 html/SelfService/Prefs.html:24 html/User/Prefs.html:24 html/User/Prefs.html:27 html/Work/Elements/Tab:44
 msgid "Preferences"
 msgstr "偏好"
 
@@ -4485,7 +4541,7 @@
 msgid "Prepare Stubbed"
 msgstr "预备动作完毕"
 
-#: html/Ticket/Elements/Tabs:60
+#: html/Ticket/Elements/Tabs:66
 msgid "Prev"
 msgstr "上一项"
 
@@ -4497,12 +4553,12 @@
 msgid "Pri"
 msgstr "优先顺位"
 
-#: lib/RT/ACE_Overlay.pm:132 lib/RT/ACE_Overlay.pm:207 lib/RT/ACE_Overlay.pm:551
+#: lib/RT/ACE_Overlay.pm:132 lib/RT/ACE_Overlay.pm:207 lib/RT/ACE_Overlay.pm:552
 #. ($args{'PrincipalId'})
 msgid "Principal %1 not found."
 msgstr "找不到单位 %1。"
 
-#: html/Search/Elements/PickRestriction:53 html/Ticket/Create.html:153 html/Ticket/Elements/EditBasics:53 html/Ticket/Elements/ShowBasics:38 html/Work/Search/PickRestriction:34 html/Work/Tickets/Elements/EditBasics:41 lib/RT/Tickets_Overlay.pm:1061
+#: html/Search/Elements/PickRestriction:54 html/Ticket/Create.html:153 html/Ticket/Elements/EditBasics:53 html/Ticket/Elements/ShowBasics:38 html/Work/Search/PickRestriction:34 html/Work/Tickets/Elements/EditBasics:41 lib/RT/Tickets_Overlay.pm:1103
 msgid "Priority"
 msgstr "优先顺位"
 
@@ -4514,7 +4570,7 @@
 msgid "Privileged"
 msgstr "内部成员"
 
-#: html/Admin/Users/Modify.html:272 html/User/Prefs.html:200 html/Work/Preferences/Info:164
+#: html/Admin/Users/Modify.html:272 html/User/Prefs.html:203 html/Work/Preferences/Info:168
 #. (loc_fuzzy($msg))
 msgid "Privileged status: %1"
 msgstr "内部成员状态:%1"
@@ -4523,10 +4579,14 @@
 msgid "Privileged users"
 msgstr "内部成员"
 
-#: html/Work/Elements/SelectSearch:16
+#: html/Work/Elements/SelectSearch:21
 msgid "Process Status"
 msgstr "处理状态"
 
+#: html/Work/Elements/MyRequests:18 html/Work/Elements/MyTickets:18
+msgid "Project"
+msgstr "项目"
+
 #: html/Edit/Queues/List:10
 msgid "Project Name"
 msgstr "项目名称"
@@ -4539,7 +4599,7 @@
 msgid "Public Description"
 msgstr "公开说明"
 
-#: html/Work/Preferences/Info:70
+#: html/Edit/Users/Info:76 html/Work/Preferences/Info:73
 msgid "Public Info"
 msgstr "公开信息"
 
@@ -4555,7 +4615,7 @@
 msgid "Query"
 msgstr "查询"
 
-#: html/Admin/Elements/ModifyTemplateAsWorkflow:166 html/Elements/MyRequests:29 html/Elements/MyTickets:29 html/Elements/Quicksearch:28 html/Search/Elements/PickRestriction:45 html/SelfService/Create.html:32 html/Ticket/Create.html:37 html/Ticket/Elements/EditBasics:63 html/Ticket/Elements/ShowBasics:42 html/User/Elements/DelegateRights:79 html/Work/Elements/MyApprovals:10 html/Work/Elements/MyRequests:17 html/Work/Elements/MyTickets:17 html/Work/Elements/Quicksearch:14 html/Work/Search/PickRestriction:26 html/Work/Tickets/Elements/EditBasics:16 lib/RT/Tickets_Overlay.pm:902
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:166 html/Elements/MyRequests:29 html/Elements/MyTickets:29 html/Elements/Quicksearch:28 html/Search/Elements/PickRestriction:46 html/SelfService/Create.html:32 html/Ticket/Create.html:37 html/Ticket/Elements/EditBasics:63 html/Ticket/Elements/ShowBasics:42 html/User/Elements/DelegateRights:79 html/Work/Elements/MyApprovals:10 html/Work/Elements/MyRequests:20 html/Work/Elements/MyTickets:20 html/Work/Elements/Quicksearch:14 html/Work/Search/PickRestriction:26 html/Work/Tickets/Elements/EditBasics:16 lib/RT/Tickets_Overlay.pm:944
 msgid "Queue"
 msgstr "表单"
 
@@ -4577,7 +4637,7 @@
 msgid "Queue Name"
 msgstr "表单名称"
 
-#: html/Edit/Queues/List:22 html/Work/Elements/List:25 html/Work/Queues/List:7 html/Work/Tickets/Create.html:34 html/Work/Tickets/Elements/ShowBasics:19
+#: html/Edit/Queues/List:22 html/Work/Elements/List:29 html/Work/Queues/List:8 html/Work/Tickets/Create.html:34 html/Work/Tickets/Elements/ShowBasics:19
 msgid "Queue Owner"
 msgstr "业务承办人"
 
@@ -4605,7 +4665,7 @@
 msgid "Queue could not be created"
 msgstr "无法新增表单"
 
-#: html/Edit/Queues/autohandler:8 html/Ticket/Create.html:208 html/Work/Tickets/Create.html:180
+#: html/Edit/Queues/autohandler:8 html/Ticket/Create.html:208 html/Work/Tickets/Create.html:186
 msgid "Queue could not be loaded."
 msgstr "无法加载表单"
 
@@ -4617,7 +4677,7 @@
 msgid "Queue is not specified."
 msgstr "未指定表单。"
 
-#: html/SelfService/Display.html:70 lib/RT/CustomField_Overlay.pm:97
+#: html/SelfService/Display.html:72 lib/RT/CustomField_Overlay.pm:97
 msgid "Queue not found"
 msgstr "找不到表单"
 
@@ -4725,7 +4785,7 @@
 msgid "RT has proccessed your commands"
 msgstr "RT 已执行您的命令"
 
-#: html/Elements/Login:94
+#: html/Elements/Login:100
 #. ('2003')
 msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse at 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 版权所有 1996-%1 Jesse Vincent &lt;jesse at bestpractical.com&gt;。<br>本软体依 <a href=\"http://www.gnu.org/copyleft/gpl.html\">GNU 通用公共授权第二版</a> 散布。"
@@ -4758,7 +4818,7 @@
 msgid "RT_System"
 msgstr "系统讯息"
 
-#: html/Edit/Global/CustomField/SelectWritable:7
+#: html/Edit/Global/CustomField/SelectWritable:6
 msgid "Read Only"
 msgstr "只读"
 
@@ -4770,7 +4830,7 @@
 msgid "RealName"
 msgstr "真实姓名"
 
-#: html/Work/Approvals/Display.html:30 html/Work/Tickets/Update.html:81
+#: html/Work/Approvals/Elements/Actions:11
 msgid "Really reject this ticket?"
 msgstr "您确定要驳回这张申请单吗?"
 
@@ -4779,7 +4839,7 @@
 msgid "Reference by %1 added"
 msgstr "已加入 %1 为参考本申请单"
 
-#: lib/RT/Transaction_Overlay.pm:629
+#: lib/RT/Transaction_Overlay.pm:632
 #. ($value)
 msgid "Reference by %1 deleted"
 msgstr "已移除 %1 为参考本申请单"
@@ -4789,7 +4849,7 @@
 msgid "Reference to %1 added"
 msgstr "已加入参考申请单 %1"
 
-#: lib/RT/Transaction_Overlay.pm:626
+#: lib/RT/Transaction_Overlay.pm:629
 #. ($value)
 msgid "Reference to %1 deleted"
 msgstr "已移除参考申请单 %1"
@@ -4843,7 +4903,7 @@
 msgid "Remove Requestor"
 msgstr "移除申请人"
 
-#: html/Ticket/Elements/ShowTransaction:172 html/Ticket/Elements/Tabs:121 html/Work/Tickets/Display.html:54 html/Work/Tickets/Elements/ShowTransaction:115
+#: html/Ticket/Elements/ShowTransaction:183 html/Ticket/Elements/Tabs:127 html/Work/Tickets/Display.html:54 html/Work/Tickets/Elements/ShowTransaction:116
 msgid "Reply"
 msgstr "回复"
 
@@ -4863,15 +4923,11 @@
 msgid "Reported on"
 msgstr "到职日期"
 
-#: etc/initialdata:44 html/Ticket/Update.html:39 html/Work/Elements/List:21 html/Work/Elements/MyApprovals:12 html/Work/Elements/MyTickets:20 html/Work/Elements/SelectSearch:31 html/Work/Tickets/Elements/ShowBasics:62 lib/RT/ACE_Overlay.pm:86
+#: etc/initialdata:44 html/Ticket/Update.html:39 html/Work/Elements/List:25 html/Work/Elements/MyApprovals:12 html/Work/Elements/MyTickets:24 html/Work/Elements/SelectSearch:36 html/Work/Tickets/Elements/ShowBasics:62 lib/RT/ACE_Overlay.pm:86
 msgid "Requestor"
 msgstr "申请人"
 
-#: html/Edit/Global/Workflow/Owner.html:44
-msgid "Requestor Group's"
-msgstr "申请人所属群组之"
-
-#: html/Search/Elements/PickRestriction:37 html/Work/Search/PickRestriction:17
+#: html/Work/Search/PickRestriction:17
 msgid "Requestor email address"
 msgstr "申请人电子邮件信箱地址"
 
@@ -4879,7 +4935,11 @@
 msgid "Requestor's"
 msgstr "申请人所属之第上"
 
-#: html/Work/Elements/List:23
+#: html/Edit/Global/Workflow/Owner.html:44
+msgid "Requestor's Dept."
+msgstr "申请人所属部门之"
+
+#: html/Work/Elements/List:27
 msgid "Requestor's Phone"
 msgstr "申请人电话"
 
@@ -4903,7 +4963,7 @@
 msgid "Reset"
 msgstr "重设"
 
-#: html/Admin/Users/Modify.html:158 html/User/Prefs.html:63 html/Work/Preferences/Info:34
+#: html/Admin/Users/Modify.html:158 html/User/Prefs.html:63 html/Work/Preferences/Info:37
 msgid "Residence"
 msgstr "住处"
 
@@ -4911,16 +4971,16 @@
 msgid "Resolution"
 msgstr "解决状态"
 
-#: html/Ticket/Elements/Tabs:131 html/Work/Tickets/Display.html:57
+#: html/Ticket/Elements/Tabs:137 html/Work/Tickets/Display.html:57
 msgid "Resolve"
 msgstr "解决"
 
 #: html/Ticket/Update.html:137
-#. ($Ticket->id, $Ticket->Subject)
+#. ($TicketObj->id, $TicketObj->Subject)
 msgid "Resolve ticket #%1 (%2)"
 msgstr "解决申请单 #%1 (%2)"
 
-#: etc/initialdata:308 html/Elements/SelectDateType:27 lib/RT/Ticket_Overlay.pm:1215
+#: etc/initialdata:308 html/Elements/SelectDateType:27 lib/RT/Ticket_Overlay.pm:1220
 msgid "Resolved"
 msgstr "已解决"
 
@@ -4936,11 +4996,11 @@
 msgid "Results"
 msgstr "结果"
 
-#: html/Search/Elements/PickRestriction:104 html/Work/Search/PickRestriction:90
+#: html/Search/Elements/PickRestriction:105 html/Work/Search/PickRestriction:90
 msgid "Results per page"
 msgstr "每页列出几笔结果"
 
-#: html/Admin/Elements/ModifyUser:32 html/Admin/Users/Modify.html:99 html/User/Prefs.html:94 html/Work/Preferences/Info:56
+#: html/Admin/Elements/ModifyUser:32 html/Admin/Users/Modify.html:99 html/User/Prefs.html:94 html/Work/Preferences/Info:59
 msgid "Retype Password"
 msgstr "再次输入口令"
 
@@ -4948,11 +5008,11 @@
 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:612
+#: lib/RT/ACE_Overlay.pm:613
 msgid "Right Delegated"
 msgstr "权限代理完毕"
 
-#: lib/RT/ACE_Overlay.pm:302
+#: lib/RT/ACE_Overlay.pm:303
 msgid "Right Granted"
 msgstr "权限设定完毕"
 
@@ -4960,7 +5020,7 @@
 msgid "Right Loaded"
 msgstr "权限加载完毕"
 
-#: lib/RT/ACE_Overlay.pm:677 lib/RT/ACE_Overlay.pm:692
+#: lib/RT/ACE_Overlay.pm:678 lib/RT/ACE_Overlay.pm:693
 msgid "Right could not be revoked"
 msgstr "无法撤消权限"
 
@@ -4968,11 +5028,11 @@
 msgid "Right not found"
 msgstr "找不到权限"
 
-#: lib/RT/ACE_Overlay.pm:542 lib/RT/ACE_Overlay.pm:637
+#: lib/RT/ACE_Overlay.pm:543 lib/RT/ACE_Overlay.pm:638
 msgid "Right not loaded."
 msgstr "权限并未加载。"
 
-#: lib/RT/ACE_Overlay.pm:688
+#: lib/RT/ACE_Overlay.pm:689
 msgid "Right revoked"
 msgstr "权限撤消完毕"
 
@@ -4980,12 +5040,12 @@
 msgid "Rights"
 msgstr "权限及代理人"
 
-#: lib/RT/Interface/Web.pm:857
+#: lib/RT/Interface/Web.pm:859
 #. ($object_type)
 msgid "Rights could not be granted for %1"
 msgstr "无法将权限赋予 %1"
 
-#: lib/RT/Interface/Web.pm:887
+#: lib/RT/Interface/Web.pm:889
 #. ($object_type)
 msgid "Rights could not be revoked for %1"
 msgstr "无法撤消 %1 的权限"
@@ -4998,7 +5058,7 @@
 msgid "Role Name"
 msgstr "角色名称"
 
-#: html/Admin/Global/GroupRights.html:50 html/Admin/Queues/GroupRights.html:52 html/Edit/Global/Workflow/Owner.html:55 html/Edit/Global/Workflow/Owner.html:81 html/Edit/Groups/Member:24
+#: html/Admin/Global/GroupRights.html:50 html/Admin/Queues/GroupRights.html:52 html/Edit/Global/Workflow/Owner.html:55 html/Edit/Global/Workflow/Owner.html:89 html/Edit/Groups/Member:24
 msgid "Roles"
 msgstr "角色"
 
@@ -5072,7 +5132,7 @@
 msgid "Scrips"
 msgstr "手续"
 
-#: html/Edit/Global/autohandler:9 html/Edit/Queues/autohandler:24
+#: html/Edit/Global/autohandler:9 html/Edit/Queues/autohandler:26
 msgid "Scrips "
 msgstr "讯息通知"
 
@@ -5084,7 +5144,7 @@
 msgid "Scrips which apply to all queues"
 msgstr "适用于所有表单的手续"
 
-#: html/Edit/Elements/104Buttons:86 html/Elements/SimpleSearch:26 html/Search/Elements/PickRestriction:125 html/Ticket/Elements/Tabs:158 html/Work/Elements/Tab:45 html/Work/Search/PickRestriction:108
+#: html/Edit/Elements/104Buttons:86 html/Elements/SimpleSearch:26 html/Search/Elements/PickRestriction:126 html/Ticket/Elements/Tabs:164 html/Work/Elements/Tab:46 html/Work/Search/PickRestriction:108
 msgid "Search"
 msgstr "查询"
 
@@ -5140,11 +5200,11 @@
 msgid "Select group"
 msgstr "选择群组"
 
-#: lib/RT/CustomField_Overlay.pm:421
+#: lib/RT/CustomField_Overlay.pm:428
 msgid "Select multiple values"
 msgstr "选择多重项目"
 
-#: lib/RT/CustomField_Overlay.pm:418
+#: lib/RT/CustomField_Overlay.pm:425
 msgid "Select one value"
 msgstr "选择单一项目"
 
@@ -5180,7 +5240,7 @@
 msgid "SelectSingle"
 msgstr "单一选项"
 
-#: html/Edit/Elements/PickUsers:87 html/Edit/Users/Add.html:78
+#: html/Edit/Elements/PickUsers:95 html/Edit/Users/Add.html:78
 msgid "Selected users:"
 msgstr "新增对象:"
 
@@ -5308,7 +5368,7 @@
 msgid "Sign up as a ticket or queue AdminCc"
 msgstr "登记成为管理员副本收件人"
 
-#: html/Admin/Elements/ModifyUser:38 html/Admin/Users/Modify.html:190 html/Admin/Users/Prefs.html:31 html/Edit/Users/Info:52 html/User/Prefs.html:148 html/Work/Preferences/Info:113
+#: html/Admin/Elements/ModifyUser:38 html/Admin/Users/Modify.html:190 html/Admin/Users/Prefs.html:31 html/Edit/Users/Info:96 html/User/Prefs.html:148 html/Work/Preferences/Info:116
 msgid "Signature"
 msgstr "签名档"
 
@@ -5332,7 +5392,7 @@
 msgid "Sort key"
 msgstr "排序方式"
 
-#: html/Search/Elements/PickRestriction:108 html/Work/Search/PickRestriction:95
+#: html/Search/Elements/PickRestriction:109 html/Work/Search/PickRestriction:95
 msgid "Sort results by"
 msgstr "结果排序方式"
 
@@ -5344,11 +5404,11 @@
 msgid "Stage"
 msgstr "关卡"
 
-#: html/Edit/Global/Workflow/Top:8
+#: html/Edit/Global/Workflow/Top:11
 msgid "Stage Action"
 msgstr "关卡运行动作"
 
-#: html/Edit/Global/Workflow/Top:5
+#: html/Edit/Global/Workflow/Top:7
 msgid "Stage Condition"
 msgstr "关卡运行条件"
 
@@ -5380,11 +5440,11 @@
 msgid "Starts date '%1' could not be parsed"
 msgstr "无法解读起始日期 '%1"
 
-#: html/Admin/Elements/ModifyUser:81 html/Admin/Users/Modify.html:137 html/User/Prefs.html:126 html/Work/Preferences/Info:85
+#: html/Admin/Elements/ModifyUser:81 html/Admin/Users/Modify.html:137 html/User/Prefs.html:126 html/Work/Preferences/Info:88
 msgid "State"
 msgstr "州"
 
-#: html/Elements/MyRequests:30 html/Elements/MyTickets:30 html/Search/Elements/PickRestriction:73 html/SelfService/Elements/MyRequests:28 html/SelfService/Update.html:30 html/Ticket/Create.html:41 html/Ticket/Elements/EditBasics:37 html/Ticket/Elements/ShowBasics:30 html/Ticket/Update.html:59 html/Work/Elements/List:15 html/Work/Elements/MyRequests:18 html/Work/Elements/MyTickets:18 html/Work/Search/PickRestriction:54 html/Work/Tickets/Elements/EditBasics:19 html/Work/Tickets/Update.html:22 lib/RT/Ticket_Overlay.pm:1209 lib/RT/Tickets_Overlay.pm:927
+#: html/Elements/MyRequests:30 html/Elements/MyTickets:30 html/Search/Elements/PickRestriction:74 html/SelfService/Elements/MyRequests:28 html/SelfService/Update.html:30 html/Ticket/Create.html:41 html/Ticket/Elements/EditBasics:37 html/Ticket/Elements/ShowBasics:30 html/Ticket/Update.html:59 html/Work/Elements/List:19 html/Work/Elements/MyRequests:22 html/Work/Elements/MyTickets:22 html/Work/Search/PickRestriction:54 html/Work/Tickets/Elements/EditBasics:19 html/Work/Tickets/Update.html:22 lib/RT/Ticket_Overlay.pm:1214 lib/RT/Tickets_Overlay.pm:969
 msgid "Status"
 msgstr "现况"
 
@@ -5401,7 +5461,7 @@
 msgid "StatusChange"
 msgstr "现况改变时"
 
-#: html/Ticket/Elements/Tabs:146
+#: html/Ticket/Elements/Tabs:152
 msgid "Steal"
 msgstr "强制更换承办人"
 
@@ -5422,7 +5482,7 @@
 msgid "Subgroup"
 msgstr "子群组"
 
-#: html/Elements/MyRequests:28 html/Elements/MyTickets:28 html/Search/Bulk.html:135 html/Search/Elements/PickRestriction:42 html/SelfService/Create.html:56 html/SelfService/Elements/MyRequests:27 html/SelfService/Update.html:31 html/Ticket/Create.html:83 html/Ticket/Elements/EditBasics:27 html/Ticket/ModifyAll.html:78 html/Ticket/Update.html:75 html/Work/Elements/MyApprovals:9 html/Work/Elements/MyRequests:16 html/Work/Elements/MyTickets:16 html/Work/Search/Bulk.html:87 html/Work/Search/PickRestriction:22 html/Work/Tickets/Elements/AddSubject:8 html/Work/Tickets/Elements/EditBasics:8 html/Work/Tickets/Elements/ShowBasics:36 html/Work/Tickets/Elements/ShowSubject:8 lib/RT/Ticket_Overlay.pm:1205 lib/RT/Tickets_Overlay.pm:1006
+#: html/Elements/MyRequests:28 html/Elements/MyTickets:28 html/Search/Bulk.html:135 html/Search/Elements/PickRestriction:43 html/SelfService/Create.html:56 html/SelfService/Elements/MyRequests:27 html/SelfService/Update.html:31 html/Ticket/Create.html:83 html/Ticket/Elements/EditBasics:27 html/Ticket/ModifyAll.html:78 html/Ticket/Update.html:75 html/Work/Elements/List:15 html/Work/Elements/MyApprovals:9 html/Work/Elements/MyRequests:16 html/Work/Elements/MyTickets:16 html/Work/Search/Bulk.html:87 html/Work/Search/PickRestriction:22 html/Work/Tickets/Elements/AddSubject:8 html/Work/Tickets/Elements/EditBasics:8 html/Work/Tickets/Elements/ShowBasics:36 html/Work/Tickets/Elements/ShowSubject:8 lib/RT/Ticket_Overlay.pm:1210 lib/RT/Tickets_Overlay.pm:1048
 msgid "Subject"
 msgstr "主题"
 
@@ -5431,7 +5491,7 @@
 msgid "Subject changed to %1"
 msgstr "标题已改为 %1"
 
-#: html/Edit/Users/Info:71 html/Elements/Submit:58 html/Work/Search/Bulk.html:103
+#: html/Edit/Users/Info:116 html/Elements/Submit:58 html/Work/Search/Bulk.html:103
 msgid "Submit"
 msgstr "送出"
 
@@ -5439,7 +5499,7 @@
 msgid "Submit Workflow"
 msgstr "送出流程"
 
-#: lib/RT/Group_Overlay.pm:746
+#: lib/RT/Group_Overlay.pm:748
 msgid "Succeeded"
 msgstr "设定成功"
 
@@ -5475,7 +5535,7 @@
 msgid "System Defined"
 msgstr "系统定义"
 
-#: html/Admin/Elements/SelectRights:81 lib/RT/ACE_Overlay.pm:566 lib/RT/Interface/Web.pm:856 lib/RT/Interface/Web.pm:886
+#: html/Admin/Elements/SelectRights:81 lib/RT/ACE_Overlay.pm:567 lib/RT/Interface/Web.pm:858 lib/RT/Interface/Web.pm:888
 msgid "System Error"
 msgstr "系统错误"
 
@@ -5491,11 +5551,11 @@
 msgid "System Rights"
 msgstr "系统权限"
 
-#: lib/RT/ACE_Overlay.pm:615
+#: lib/RT/ACE_Overlay.pm:616
 msgid "System error. Right not delegated."
 msgstr "系统错误。权限代理失败。"
 
-#: lib/RT/ACE_Overlay.pm:145 lib/RT/ACE_Overlay.pm:222 lib/RT/ACE_Overlay.pm:305 lib/RT/ACE_Overlay.pm:897
+#: lib/RT/ACE_Overlay.pm:145 lib/RT/ACE_Overlay.pm:222 lib/RT/ACE_Overlay.pm:306 lib/RT/ACE_Overlay.pm:898
 msgid "System error. Right not granted."
 msgstr "系统错误。设定权限失败。"
 
@@ -5515,7 +5575,7 @@
 msgid "SystemRolegroup for internal use"
 msgstr "内部使用的系统角色群组"
 
-#: lib/RT/CurrentUser.pm:318
+#: lib/RT/CurrentUser.pm:361
 msgid "TEST_STRING"
 msgstr "TEST_STRING"
 
@@ -5523,7 +5583,7 @@
 msgid "TabbedUI"
 msgstr "页签接口"
 
-#: html/Ticket/Elements/Tabs:142
+#: html/Ticket/Elements/Tabs:148
 msgid "Take"
 msgstr "受理"
 
@@ -5572,7 +5632,7 @@
 msgid "Template not found\\n"
 msgstr "找不到模板\\n"
 
-#: lib/RT/Template_Overlay.pm:359
+#: lib/RT/Template_Overlay.pm:360
 msgid "Template parsed"
 msgstr "模板剖析完毕"
 
@@ -5580,7 +5640,7 @@
 msgid "Templates"
 msgstr "模板"
 
-#: html/Edit/Global/autohandler:8 html/Edit/Queues/autohandler:23
+#: html/Edit/Global/autohandler:8 html/Edit/Queues/autohandler:25
 msgid "Templates "
 msgstr "通知模板"
 
@@ -5588,19 +5648,19 @@
 msgid "Templates for %1\\n"
 msgstr "找不到 %1 的模板\\n"
 
-#: lib/RT/Interface/Web.pm:954
+#: lib/RT/Interface/Web.pm:956
 msgid "That is already the current value"
 msgstr "已经是目前字段的值"
 
-#: lib/RT/CustomField_Overlay.pm:242
+#: lib/RT/CustomField_Overlay.pm:249
 msgid "That is not a value for this custom field"
 msgstr "这不是该自订字段的值"
 
-#: lib/RT/Ticket_Overlay.pm:1926
+#: lib/RT/Ticket_Overlay.pm:1934
 msgid "That is the same value"
 msgstr "同样的值"
 
-#: lib/RT/ACE_Overlay.pm:287 lib/RT/ACE_Overlay.pm:596
+#: lib/RT/ACE_Overlay.pm:287 lib/RT/ACE_Overlay.pm:597
 msgid "That principal already has that right"
 msgstr "这项单位已经拥有该权限"
 
@@ -5609,7 +5669,7 @@
 msgid "That principal is already a %1 for this queue"
 msgstr "这项单位已经是这个表单的 %1"
 
-#: lib/RT/Ticket_Overlay.pm:1460
+#: lib/RT/Ticket_Overlay.pm:1466
 #. ($self->loc($args{'Type'}))
 msgid "That principal is already a %1 for this ticket"
 msgstr "这项单位已经是这份申请单的 %1"
@@ -5619,16 +5679,16 @@
 msgid "That principal is not a %1 for this queue"
 msgstr "这项单位不是这个表单的 %1"
 
-#: lib/RT/Ticket_Overlay.pm:1577
+#: lib/RT/Ticket_Overlay.pm:1583
 #. ($args{'Type'})
 msgid "That principal is not a %1 for this ticket"
 msgstr "这项单位不是这份申请单的 %1"
 
-#: lib/RT/Ticket_Overlay.pm:1922
+#: lib/RT/Ticket_Overlay.pm:1930
 msgid "That queue does not exist"
 msgstr "此表单不存在"
 
-#: lib/RT/Ticket_Overlay.pm:3293
+#: lib/RT/Ticket_Overlay.pm:3301
 msgid "That ticket has unresolved dependencies"
 msgstr "这份申请单有尚未解决的附属申请单"
 
@@ -5636,11 +5696,11 @@
 msgid "That user already has that right"
 msgstr "使用者已具有该项权限"
 
-#: lib/RT/Ticket_Overlay.pm:3097
+#: lib/RT/Ticket_Overlay.pm:3105
 msgid "That user already owns that ticket"
 msgstr "该使用者已经承办这份申请单"
 
-#: lib/RT/Ticket_Overlay.pm:3069
+#: lib/RT/Ticket_Overlay.pm:3077
 msgid "That user does not exist"
 msgstr "使用者不存在"
 
@@ -5664,11 +5724,11 @@
 msgid "That user is now unprivilegedileged"
 msgstr "这名使用者已加入非内部成员群组"
 
-#: lib/RT/Ticket_Overlay.pm:3090
+#: lib/RT/Ticket_Overlay.pm:3098
 msgid "That user may not own tickets in that queue"
 msgstr "使用者可能没有承办表单里的申请单"
 
-#: lib/RT/Link_Overlay.pm:205
+#: lib/RT/Link_Overlay.pm:206
 msgid "That's not a numerical id"
 msgstr "这不是一个数字编号"
 
@@ -5684,7 +5744,7 @@
 msgid "The administrative CC of a ticket"
 msgstr "申请单的管理员副本收件人"
 
-#: lib/RT/Ticket_Overlay.pm:2255
+#: lib/RT/Ticket_Overlay.pm:2263
 msgid "The comment has been recorded"
 msgstr "评论已被纪录"
 
@@ -5696,7 +5756,7 @@
 msgid "The following commands were not proccessed:\\n\\n"
 msgstr "以下命令未被执行:\\n\\n"
 
-#: lib/RT/Interface/Web.pm:957
+#: lib/RT/Interface/Web.pm:959
 msgid "The new value has been set."
 msgstr "新的字段值设定完成。"
 
@@ -5767,7 +5827,7 @@
 msgid "Ticket #%1: %2"
 msgstr "申请单 #%1: %2"
 
-#: lib/RT/Ticket_Overlay.pm:632 lib/RT/Ticket_Overlay.pm:653
+#: lib/RT/Ticket_Overlay.pm:637 lib/RT/Ticket_Overlay.pm:658
 #. ($self->Id, $QueueObj->Name)
 msgid "Ticket %1 created in queue '%2'"
 msgstr "申请单 #%1 成功新增于 '%2' 表单"
@@ -5782,7 +5842,7 @@
 msgid "Ticket %1: %2"
 msgstr "申请单 %1:%2"
 
-#: html/Edit/Queues/Basic/Top:30 html/Edit/Queues/List:30 html/Work/Queues/List:9
+#: html/Edit/Queues/Basic/Top:30 html/Edit/Queues/List:30 html/Work/Queues/List:10
 msgid "Ticket Due"
 msgstr "表单处理期限"
 
@@ -5795,7 +5855,7 @@
 msgid "Ticket ID"
 msgstr "单号"
 
-#: NOT FOUND IN SOURCE
+#: html/Work/Elements/SelectSearch:6
 msgid "Ticket Id"
 msgstr "申请单编号"
 
@@ -5807,23 +5867,23 @@
 msgid "Ticket Resolved"
 msgstr "申请单已解决"
 
-#: html/Edit/Queues/Basic/Top:20 html/Edit/Queues/Category/List:6 html/Edit/Queues/Category/Top:7 html/Edit/Queues/List:21 html/Work/Delegates/List:7 html/Work/Delegates/index.html:11 html/Work/Elements/List:12 html/Work/Elements/SelectSearch:9 html/Work/Queues/List:6 html/Work/Queues/Select.html:12 html/Work/Queues/index.html:11 html/Work/Tickets/Create.html:43 html/Work/Tickets/Elements/ShowBasics:34
+#: html/Edit/Queues/Basic/Top:20 html/Edit/Queues/Category/List:6 html/Edit/Queues/Category/Top:7 html/Edit/Queues/List:21 html/Work/Delegates/List:7 html/Work/Delegates/index.html:12 html/Work/Elements/List:13 html/Work/Queues/Select.html:12 html/Work/Queues/index.html:12 html/Work/Tickets/Elements/ShowBasics:34
 msgid "Ticket Type"
 msgstr "表单种类"
 
-#: html/Search/Elements/PickRestriction:62 html/Work/Search/PickRestriction:43
+#: html/Search/Elements/PickRestriction:63 html/Work/Search/PickRestriction:43
 msgid "Ticket attachment"
 msgstr "申请单附件"
 
-#: lib/RT/Tickets_Overlay.pm:1185
+#: lib/RT/Tickets_Overlay.pm:1227
 msgid "Ticket content"
 msgstr "申请单内容"
 
-#: lib/RT/Tickets_Overlay.pm:1231
+#: lib/RT/Tickets_Overlay.pm:1273
 msgid "Ticket content type"
 msgstr "申请单内容类别"
 
-#: lib/RT/Ticket_Overlay.pm:520 lib/RT/Ticket_Overlay.pm:529 lib/RT/Ticket_Overlay.pm:539 lib/RT/Ticket_Overlay.pm:642
+#: lib/RT/Ticket_Overlay.pm:525 lib/RT/Ticket_Overlay.pm:534 lib/RT/Ticket_Overlay.pm:544 lib/RT/Ticket_Overlay.pm:647
 msgid "Ticket could not be created due to an internal error"
 msgstr "内部错误,无法新增申请单"
 
@@ -5863,12 +5923,12 @@
 msgid "Tickets"
 msgstr "申请单"
 
-#: lib/RT/Tickets_Overlay.pm:1402
+#: lib/RT/Tickets_Overlay.pm:1451
 #. ($self->loc($args{'TYPE'}), ($args{'BASE'} || $args{'TICKET'}))
 msgid "Tickets %1 %2"
 msgstr "申请单 %1 %2"
 
-#: lib/RT/Tickets_Overlay.pm:1367
+#: lib/RT/Tickets_Overlay.pm:1409
 #. ($self->loc($args{'TYPE'}), ($args{'TARGET'} || $args{'TICKET'}))
 msgid "Tickets %1 by %2"
 msgstr "申请单 %1 (%2)"
@@ -5898,7 +5958,7 @@
 msgid "Time Worked"
 msgstr "处理时间"
 
-#: lib/RT/Tickets_Overlay.pm:1158
+#: lib/RT/Tickets_Overlay.pm:1200
 msgid "Time left"
 msgstr "剩馀时间"
 
@@ -5906,7 +5966,7 @@
 msgid "Time to display"
 msgstr "显示时间"
 
-#: lib/RT/Tickets_Overlay.pm:1134
+#: lib/RT/Tickets_Overlay.pm:1176
 msgid "Time worked"
 msgstr "已处理时间"
 
@@ -5914,7 +5974,7 @@
 msgid "TimeLeft"
 msgstr "剩馀时间"
 
-#: lib/RT/Ticket_Overlay.pm:1210
+#: lib/RT/Ticket_Overlay.pm:1215
 msgid "TimeWorked"
 msgstr "已处理时间"
 
@@ -5926,11 +5986,11 @@
 msgid "To generate a diff of this commit:\\n"
 msgstr "产生这次更动的差异档:\\n"
 
-#: lib/RT/Ticket_Overlay.pm:1213
+#: lib/RT/Ticket_Overlay.pm:1218
 msgid "Told"
 msgstr "告知日期"
 
-#: html/Edit/Elements/Page:47
+#: html/Edit/Elements/Page:45
 msgid "Total"
 msgstr "页"
 
@@ -5938,7 +5998,7 @@
 msgid "Transaction"
 msgstr "更动"
 
-#: lib/RT/Transaction_Overlay.pm:666
+#: lib/RT/Transaction_Overlay.pm:669
 #. ($self->Data)
 msgid "Transaction %1 purged"
 msgstr "清除更动报告 %1"
@@ -5959,10 +6019,14 @@
 msgid "TransactionCreate"
 msgstr "新增更动时"
 
-#: lib/RT/Transaction_Overlay.pm:721
+#: lib/RT/Transaction_Overlay.pm:724
 msgid "Transactions are immutable"
 msgstr "不可更改更动报告"
 
+#: html/Work/Approvals/Elements/Approve:52
+msgid "Transfer to"
+msgstr "移交给"
+
 #: NOT FOUND IN SOURCE
 msgid "Trying to delete a right: %1"
 msgstr "试图删除某项权限:%1"
@@ -5975,7 +6039,7 @@
 msgid "Tue."
 msgstr "星期二"
 
-#: html/Admin/Elements/EditCustomField:43 html/Admin/Elements/ModifyTemplateAsWorkflow:135 html/Ticket/Elements/AddWatchers:32 html/Ticket/Elements/AddWatchers:43 html/Ticket/Elements/AddWatchers:53 lib/RT/Ticket_Overlay.pm:1211 lib/RT/Tickets_Overlay.pm:978
+#: html/Admin/Elements/EditCustomField:43 html/Admin/Elements/ModifyTemplateAsWorkflow:135 html/Ticket/Elements/AddWatchers:32 html/Ticket/Elements/AddWatchers:43 html/Ticket/Elements/AddWatchers:53 lib/RT/Ticket_Overlay.pm:1216 lib/RT/Tickets_Overlay.pm:1020
 msgid "Type"
 msgstr "类别"
 
@@ -5991,7 +6055,7 @@
 msgid "UnixUsername"
 msgstr "外部系统登入帐号"
 
-#: lib/RT/Attachment_Overlay.pm:281 lib/RT/Attachment_Overlay.pm:313
+#: lib/RT/Attachment_Overlay.pm:283 lib/RT/Attachment_Overlay.pm:315
 #. ($self->ContentEncoding)
 msgid "Unknown ContentEncoding %1"
 msgstr "不可解的内容文字编码方式 %1"
@@ -6012,7 +6076,7 @@
 msgid "Up"
 msgstr "上一页"
 
-#: html/Elements/MyTickets:63 html/Search/Bulk.html:32 html/Work/Elements/MyTickets:83 html/Work/Search/Bulk.html:10 html/Work/Tickets/Elements/EditCustomFieldEntries:63
+#: html/Elements/MyTickets:63 html/Search/Bulk.html:32 html/Work/Elements/MyTickets:91 html/Work/Search/Bulk.html:10 html/Work/Tickets/Elements/EditCustomFieldEntries:72
 msgid "Update"
 msgstr "处理"
 
@@ -6036,7 +6100,7 @@
 msgid "Update name"
 msgstr "更新帐号"
 
-#: lib/RT/Interface/Web.pm:467
+#: lib/RT/Interface/Web.pm:469
 msgid "Update not recorded."
 msgstr "更新未被记录"
 
@@ -6062,19 +6126,19 @@
 msgstr "更新申请单 #%1"
 
 #: html/Ticket/Update.html:139
-#. ($Ticket->id, $Ticket->Subject)
+#. ($TicketObj->id, $TicketObj->Subject)
 msgid "Update ticket #%1 (%2)"
 msgstr "更新申请单 #%1 (%2)"
 
-#: lib/RT/Interface/Web.pm:465
+#: lib/RT/Interface/Web.pm:467
 msgid "Update type was neither correspondence nor comment."
 msgstr "更新的内容并非申请单回复也不是评论"
 
-#: html/Elements/SelectDateType:32 html/Ticket/Elements/ShowDates:51 lib/RT/Ticket_Overlay.pm:1214
+#: html/Elements/SelectDateType:32 html/Ticket/Elements/ShowDates:51 lib/RT/Ticket_Overlay.pm:1219
 msgid "Updated"
 msgstr "前次更新"
 
-#: html/Work/Preferences/index.html:15
+#: html/Work/Preferences/index.html:15 html/Work/Tickets/Elements/ShowTransaction:11
 msgid "User"
 msgstr "使用者"
 
@@ -6106,11 +6170,11 @@
 msgid "User Id"
 msgstr "使用者 ID"
 
-#: html/Edit/Elements/PickUsers:12 html/Edit/Global/UserRight/List:7 html/Edit/Global/UserRight/Top:9 html/Edit/Users/Add.html:13 html/Edit/Users/Search.html:23 html/Work/Delegates/Info:60 html/Work/Tickets/Cc:10
+#: html/Edit/Elements/PickUsers:13 html/Edit/Global/UserRight/List:7 html/Edit/Global/UserRight/Top:9 html/Edit/Users/Add.html:13 html/Edit/Users/Search.html:23 html/Work/Delegates/Info:60 html/Work/Tickets/Cc:10
 msgid "User Number"
 msgstr "员工编号"
 
-#: html/Admin/Elements/GroupTabs:46 html/Admin/Elements/QueueTabs:59 html/Admin/Elements/SystemTabs:46 html/Admin/Global/index.html:58 html/Edit/Global/autohandler:11 html/Edit/Queues/autohandler:26
+#: html/Admin/Elements/GroupTabs:46 html/Admin/Elements/QueueTabs:59 html/Admin/Elements/SystemTabs:46 html/Admin/Global/index.html:58 html/Edit/Global/autohandler:11 html/Edit/Queues/autohandler:28
 msgid "User Rights"
 msgstr "使用者权限"
 
@@ -6159,15 +6223,15 @@
 msgid "User view"
 msgstr "使用者私人数据"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Elements/PickUsers:38 html/Edit/Global/Workflow/Owner.html:48 html/Edit/Global/Workflow/Owner.html:73 html/Edit/Global/Workflow/Owner.html:82
 msgid "UserDefined"
 msgstr "使用者自定"
 
-#: html/Admin/Users/Modify.html:47 html/Elements/Login:51 html/Ticket/Elements/AddWatchers:34
+#: html/Admin/Users/Modify.html:47 html/Elements/Login:54 html/Ticket/Elements/AddWatchers:34
 msgid "Username"
 msgstr "帐号"
 
-#: 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/Edit/Groups/Admin:9 html/User/Groups/Members.html:57 html/Work/Tickets/Elements/ShowTransaction:11
+#: 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/Edit/Groups/Admin:9 html/User/Groups/Members.html:57
 msgid "Users"
 msgstr "使用者"
 
@@ -6259,7 +6323,7 @@
 msgid "Whenever correspondence comes in"
 msgstr "当回复送达时"
 
-#: html/Admin/Users/Modify.html:163 html/User/Prefs.html:67 html/Work/Preferences/Info:36
+#: html/Admin/Users/Modify.html:163 html/User/Prefs.html:67 html/Work/Preferences/Info:39
 msgid "Work"
 msgstr "公司"
 
@@ -6288,7 +6352,7 @@
 msgid "Workflow deleted"
 msgstr "流程已删除"
 
-#: html/Edit/Global/autohandler:10 html/Edit/Queues/autohandler:25
+#: html/Edit/Global/autohandler:10 html/Edit/Queues/autohandler:27
 msgid "Workflows"
 msgstr "流程"
 
@@ -6296,7 +6360,7 @@
 msgid "Writable"
 msgstr "可读写"
 
-#: html/autohandler:144
+#: html/autohandler:151
 msgid "XXX CHANGEME You are not an authorized user"
 msgstr "XXX CHANGEME 您是未经授权的使用者"
 
@@ -6304,19 +6368,19 @@
 msgid "Yes"
 msgstr "是"
 
-#: lib/RT/Ticket_Overlay.pm:3200
+#: lib/RT/Ticket_Overlay.pm:3208
 msgid "You already own this ticket"
 msgstr "您已是这份申请单的承办人"
 
-#: html/autohandler:136
+#: html/autohandler:143
 msgid "You are not an authorized user"
 msgstr "您不是被授权的使用者"
 
-#: html/Ticket/Elements/ShowTransaction:81
+#: html/Ticket/Elements/ShowTransaction:89
 msgid "You can access it with the Download button on the right."
 msgstr "您可以按右方的「下载」键来取得。"
 
-#: lib/RT/Ticket_Overlay.pm:3082
+#: lib/RT/Ticket_Overlay.pm:3090
 msgid "You can only reassign tickets that you own or that are unowned"
 msgstr "祇能重新指派您所承办或是没有承办人的申请单"
 
@@ -6333,11 +6397,11 @@
 msgid "You have been logged out of RT."
 msgstr "您已注销 RT。"
 
-#: html/SelfService/Display.html:77
+#: html/SelfService/Display.html:79
 msgid "You have no permission to create tickets in that queue."
 msgstr "您没有在该表单新增申请单的权限。"
 
-#: lib/RT/Ticket_Overlay.pm:1935
+#: lib/RT/Ticket_Overlay.pm:1943
 msgid "You may not create requests in that queue."
 msgstr "您不能在该表单中提出申请。"
 
@@ -6377,11 +6441,11 @@
 msgid "Your request was rejected."
 msgstr "您的申请单已被驳回。"
 
-#: html/autohandler:170
+#: html/autohandler:196
 msgid "Your username or password is incorrect"
 msgstr "您的帐号或口令有误"
 
-#: html/Admin/Elements/ModifyUser:83 html/Admin/Users/Modify.html:143 html/User/Prefs.html:130 html/Work/Preferences/Info:87
+#: html/Admin/Elements/ModifyUser:83 html/Admin/Users/Modify.html:143 html/User/Prefs.html:130 html/Work/Preferences/Info:90
 msgid "Zip"
 msgstr "邮政编码"
 
@@ -6422,11 +6486,11 @@
 msgid "content-type"
 msgstr "类型"
 
-#: lib/RT/Ticket_Overlay.pm:2326
+#: lib/RT/Ticket_Overlay.pm:2334
 msgid "correspondence (probably) not sent"
 msgstr "申请单回复(可能)未送出"
 
-#: lib/RT/Ticket_Overlay.pm:2336
+#: lib/RT/Ticket_Overlay.pm:2344
 msgid "correspondence sent"
 msgstr "申请单回复已送出"
 
@@ -6434,7 +6498,7 @@
 msgid "critical"
 msgstr "严重"
 
-#: html/Admin/Elements/ModifyQueue:62 html/Admin/Queues/Modify.html:76 html/Edit/Queues/Basic/Top:34 html/Edit/Queues/List:32 html/Work/Queues/List:11 lib/RT/Date.pm:319
+#: html/Admin/Elements/ModifyQueue:62 html/Admin/Queues/Modify.html:76 html/Edit/Queues/Basic/Top:34 html/Edit/Queues/List:32 html/Work/Queues/List:12 lib/RT/Date.pm:319
 msgid "days"
 msgstr "天"
 
@@ -6454,7 +6518,7 @@
 msgid "deleted"
 msgstr "已删除"
 
-#: html/Search/Elements/PickRestriction:67 html/Work/Search/PickRestriction:47
+#: html/Search/Elements/PickRestriction:68 html/Work/Search/PickRestriction:47
 msgid "does not match"
 msgstr "不符合"
 
@@ -6462,6 +6526,10 @@
 msgid "doesn't contain"
 msgstr "不包含"
 
+#: html/Search/Elements/PickRestriction:38
+msgid "email address"
+msgstr "电子邮件信箱"
+
 #: NOT FOUND IN SOURCE
 msgid "emergency"
 msgstr "危难"
@@ -6486,7 +6554,7 @@
 msgid "greater than"
 msgstr "大于"
 
-#: lib/RT/Group_Overlay.pm:193
+#: lib/RT/Group_Overlay.pm:194
 #. ($self->Name)
 msgid "group '%1'"
 msgstr "群组 '%1'"
@@ -6503,11 +6571,11 @@
 msgid "info"
 msgstr "信息"
 
-#: html/Elements/SelectBoolean:31 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:35 html/Search/Elements/PickRestriction:46 html/Search/Elements/PickRestriction:75 html/Search/Elements/PickRestriction:87 html/Work/Search/PickRestriction:27 html/Work/Search/PickRestriction:56 html/Work/Search/PickRestriction:75
+#: html/Elements/SelectBoolean:31 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:35 html/Search/Elements/PickRestriction:47 html/Search/Elements/PickRestriction:76 html/Search/Elements/PickRestriction:88 html/Work/Search/PickRestriction:27 html/Work/Search/PickRestriction:56 html/Work/Search/PickRestriction:75
 msgid "is"
 msgstr "是"
 
-#: html/Elements/SelectBoolean:35 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:36 html/Search/Elements/PickRestriction:47 html/Search/Elements/PickRestriction:76 html/Search/Elements/PickRestriction:88 html/Work/Search/PickRestriction:28 html/Work/Search/PickRestriction:57 html/Work/Search/PickRestriction:76
+#: html/Elements/SelectBoolean:35 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:36 html/Search/Elements/PickRestriction:48 html/Search/Elements/PickRestriction:77 html/Search/Elements/PickRestriction:89 html/Work/Search/PickRestriction:28 html/Work/Search/PickRestriction:57 html/Work/Search/PickRestriction:76
 msgid "isn't"
 msgstr "不是"
 
@@ -6516,10 +6584,10 @@
 msgstr "小于"
 
 #: html/Edit/Global/Workflow/Owner.html:35
-msgid "level Admins"
+msgid "level Admin"
 msgstr "层主管"
 
-#: html/Search/Elements/PickRestriction:66 html/Work/Search/PickRestriction:46
+#: html/Search/Elements/PickRestriction:67 html/Work/Search/PickRestriction:46
 msgid "matches"
 msgstr "符合"
 
@@ -6551,7 +6619,7 @@
 msgid "no value"
 msgstr "没有值"
 
-#: html/Admin/Elements/EditQueueWatchers:26 html/Edit/Groups/Member:40 html/Edit/Groups/Members/Add.html:17 html/Edit/Groups/Members/List:8 html/Edit/Queues/List:32 html/Ticket/Elements/EditWatchers:27 html/Work/Delegates/Info:37 html/Work/Delegates/Info:48 html/Work/Overview/Info:31 html/Work/Queues/List:11 html/Work/Tickets/Elements/EditWatchers:5 html/Work/Tickets/Elements/ShowAttachments:30 html/Work/Tickets/Elements/ShowBasics:27
+#: html/Admin/Elements/EditQueueWatchers:26 html/Edit/Groups/Member:40 html/Edit/Groups/Members/Add.html:17 html/Edit/Groups/Members/List:8 html/Edit/Queues/List:32 html/Ticket/Elements/EditWatchers:27 html/Work/Delegates/Info:37 html/Work/Delegates/Info:48 html/Work/Overview/Info:31 html/Work/Queues/List:12 html/Work/Tickets/Elements/EditWatchers:5 html/Work/Tickets/Elements/ShowAttachments:30 html/Work/Tickets/Elements/ShowBasics:27
 msgid "none"
 msgstr "无"
 
@@ -6567,11 +6635,11 @@
 msgid "notlike"
 msgstr "不符合"
 
-#: html/Edit/Elements/PickUsers:17 html/Edit/Users/Add.html:18 html/Edit/Users/Search.html:28 html/Work/Tickets/Cc:15
+#: html/Edit/Elements/PickUsers:18 html/Edit/Users/Add.html:18 html/Edit/Users/Search.html:28 html/Work/Tickets/Cc:15
 msgid "number"
 msgstr "号"
 
-#: html/SelfService/Elements/MyRequests:60 lib/RT/Queue_Overlay.pm:58
+#: html/SelfService/Elements/MyRequests:61 lib/RT/Queue_Overlay.pm:58
 msgid "open"
 msgstr "开启"
 
@@ -6579,12 +6647,12 @@
 msgid "opened"
 msgstr "已开启"
 
-#: lib/RT/Group_Overlay.pm:198
+#: lib/RT/Group_Overlay.pm:199
 #. ($self->Name, $user->Name)
 msgid "personal group '%1' for user '%2'"
 msgstr "使用者「%2」的「%1」代理人群组"
 
-#: lib/RT/Group_Overlay.pm:206
+#: lib/RT/Group_Overlay.pm:207
 #. ($queue->Name, $self->Type)
 msgid "queue %1 %2"
 msgstr "表单 %1 %2"
@@ -6609,12 +6677,12 @@
 msgid "stalled"
 msgstr "延宕"
 
-#: lib/RT/Group_Overlay.pm:201
+#: lib/RT/Group_Overlay.pm:202
 #. ($self->Type)
 msgid "system %1"
 msgstr "系统 %1"
 
-#: lib/RT/Group_Overlay.pm:212
+#: lib/RT/Group_Overlay.pm:213
 #. ($self->Type)
 msgid "system group '%1'"
 msgstr "系统群组 '%1'"
@@ -6628,16 +6696,16 @@
 msgid "ticket #%1"
 msgstr "申请单 #%1"
 
-#: lib/RT/Group_Overlay.pm:209
+#: lib/RT/Group_Overlay.pm:210
 #. ($self->Instance, $self->Type)
 msgid "ticket #%1 %2"
 msgstr "申请单 #%1 %2"
 
-#: html/Work/Elements/SelectSearch:28
+#: html/Work/Elements/SelectSearch:33
 msgid "till"
 msgstr "至"
 
-#: html/Edit/Elements/PickUsers:15 html/Edit/Global/Workflow/Condition:31 html/Edit/Users/Add.html:16 html/Edit/Users/Search.html:26 html/Work/Tickets/Cc:13
+#: html/Edit/Elements/PickUsers:16 html/Edit/Global/Workflow/Condition:31 html/Edit/Users/Add.html:16 html/Edit/Users/Search.html:26 html/Work/Tickets/Cc:13
 msgid "to"
 msgstr "到"
 
@@ -6645,7 +6713,7 @@
 msgid "true"
 msgstr "真"
 
-#: lib/RT/Group_Overlay.pm:215
+#: lib/RT/Group_Overlay.pm:216
 #. ($self->Id)
 msgid "undescribed group %1"
 msgstr "没有描述的群组 %1"
@@ -6654,7 +6722,7 @@
 msgid "unresolved"
 msgstr "未处理"
 
-#: lib/RT/Group_Overlay.pm:190
+#: lib/RT/Group_Overlay.pm:191
 #. ($user->Object->Name)
 msgid "user %1"
 msgstr "使用者 %1"

Modified: rt/branches/rt-3.3/lib/RT/I18N/zh_tw.po
==============================================================================
--- rt/branches/rt-3.3/lib/RT/I18N/zh_tw.po	(original)
+++ rt/branches/rt-3.3/lib/RT/I18N/zh_tw.po	Fri Apr  2 08:43:44 2004
@@ -7,7 +7,7 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: NOT FOUND IN SOURCE
+#: html/Elements/MyRequests:27 html/Elements/MyTickets:27 html/Work/Elements/MyApprovals:8 html/Work/Elements/MyRequests:15 html/Work/Elements/MyTickets:15
 msgid "#"
 msgstr "#"
 
@@ -16,10 +16,10 @@
 msgstr "#%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)
-#. ($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"
 
@@ -40,7 +40,7 @@
 msgid "%1 %2"
 msgstr "%1 %2"
 
-#: lib/RT/Tickets_Overlay.pm:835
+#: lib/RT/Tickets_Overlay.pm:831
 #. ($args{'FIELD'}, $args{'OPERATOR'}, $args{'VALUE'})
 msgid "%1 %2 %3"
 msgstr "%1 %2 %3"
@@ -50,7 +50,8 @@
 msgid "%1 %2 %3 %4:%5:%6 %7"
 msgstr "%7-%2-%3 %4:%5:%6 %1"
 
-#: lib/RT/Record.pm:826 lib/RT/Transaction_Overlay.pm:551 lib/RT/Transaction_Overlay.pm:594
+#: lib/RT/Ticket_Overlay.pm:3600 lib/RT/Transaction_Overlay.pm:514 lib/RT/Transaction_Overlay.pm:557 lib/RT/Transaction_Vendor.pm:26
+#. ($field, $new_value)
 #. ($cf->Name, $new_value->Content)
 #. ($field, $self->NewValue)
 #. ($self->Field, $principal->Object->Name)
@@ -62,26 +63,28 @@
 msgid "%1 %2 ago"
 msgstr "%1 %2 之前"
 
-#: lib/RT/Record.pm:832 lib/RT/Transaction_Overlay.pm:558
+#: lib/RT/Ticket_Overlay.pm:3606 lib/RT/Transaction_Overlay.pm:521 lib/RT/Transaction_Vendor.pm:32
+#. ($field, $old_value, $new_value)
 #. ($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:829 lib/RT/Transaction_Overlay.pm:554 lib/RT/Transaction_Overlay.pm:600
+#: lib/RT/Ticket_Overlay.pm:3603 lib/RT/Transaction_Overlay.pm:517 lib/RT/Transaction_Overlay.pm:563 lib/RT/Transaction_Vendor.pm:29
+#. ($field, $old_value)
 #. ($cf->Name, $old_value)
 #. ($field, $self->OldValue)
 #. ($self->Field, $principal->Object->Name)
 msgid "%1 %2 deleted"
 msgstr "%2 已自 %1 刪除"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:157
+#. ($depth_str, $role_str, $group_str)
 msgid "%1 %2 of group %3"
 msgstr "%3 群組的 %1 %2"
 
-#: html/Admin/Elements/EditScrips:43 html/Admin/Elements/ListGlobalScrips:27 html/Ticket/Elements/PreviewScrips:63
+#: html/Admin/Elements/EditScrips:43 html/Admin/Elements/ListGlobalScrips:27
 #. (loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name))
-#. ($scrip->ConditionObj->Name, $scrip->ActionObj->Name, $scrip->TemplateObj->Name)
 msgid "%1 %2 with template %3"
 msgstr "條件:%1 | 動作:%2 | 範本:%3"
 
@@ -89,7 +92,8 @@
 msgid "%1 (%2) %3 this ticket\\n"
 msgstr "%1 (%2) %3 這份申請單\\n"
 
-#: NOT FOUND IN SOURCE
+#: html/Search/Listing.html:56 html/Work/Search/index.html:28
+#. (($session{'tickets'}->FirstRow+1), ($session{'tickets'}->FirstRow() + $session{'tickets'}->RowsPerPage()  ))
 msgid "%1 - %2 shown"
 msgstr "顯示第 %1 - %2 筆"
 
@@ -120,16 +124,17 @@
 msgid "%1 - Specify the search module you want to use"
 msgstr "%1 - 指定欲使用的查詢模組"
 
-#: lib/RT/ScripAction_Overlay.pm:114
+#: lib/RT/ScripAction_Overlay.pm:122
 #. ($self->Id)
 msgid "%1 ScripAction loaded"
 msgstr "載入手續 %1"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Elements/Page:47
+#. (scalar $count)
 msgid "%1 Total"
 msgstr "共 %1 筆"
 
-#: lib/RT/Record.pm:861
+#: lib/RT/Ticket_Overlay.pm:3633
 #. ($args{'Value'}, $cf->Name)
 msgid "%1 added as a value for %2"
 msgstr "新增 %1 作為 %2 的值"
@@ -152,13 +157,13 @@
 msgid "%1 appears to be a local object, but can't be found in the database"
 msgstr "%1 看來是個本地物件,卻不在資料庫裡"
 
-#: html/Ticket/Elements/ShowDates:52 lib/RT/Transaction_Overlay.pm:467
+#: html/Ticket/Elements/ShowDates:52 lib/RT/Transaction_Overlay.pm:430
 #. ($self->BriefDescription , $self->CreatorObj->Name)
 #. ($Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)
 msgid "%1 by %2"
 msgstr "%1 (%2)"
 
-#: lib/RT/Transaction_Overlay.pm:521 lib/RT/Transaction_Overlay.pm:686 lib/RT/Transaction_Overlay.pm:695 lib/RT/Transaction_Overlay.pm:698
+#: lib/RT/Transaction_Overlay.pm:484 lib/RT/Transaction_Overlay.pm:652 lib/RT/Transaction_Overlay.pm:661 lib/RT/Transaction_Overlay.pm:664
 #. ($self->Field , ( $self->OldValue || $no_value ) ,  $self->NewValue)
 #. ($self->Field , $q1->Name , $q2->Name)
 #. ($self->Field, $t2->AsString, $t1->AsString)
@@ -166,7 +171,7 @@
 msgid "%1 changed from %2 to %3"
 msgstr "%1 的值從 %2 改為 %3"
 
-#: lib/RT/Interface/Web.pm:953
+#: lib/RT/Interface/Web.pm:955
 msgid "%1 could not be set to %2."
 msgstr "無法將 %1 設定為 %2。"
 
@@ -174,26 +179,23 @@
 msgid "%1 couldn't init a transaction (%2)\\n"
 msgstr "%1 無法初始更新 (%2)\\n"
 
-#: lib/RT/Ticket_Overlay.pm:2993
+#: lib/RT/Ticket_Overlay.pm:2888
 #. ($self)
 msgid "%1 couldn't set status to resolved. RT's Database may be inconsistent."
 msgstr "%1 無法將現況設成已解決。RT 資料庫內容可能不一致。"
 
 #: html/Elements/MyTickets:24
 #. ($rows)
-msgid "%1 highest priority tickets I own"
-msgstr "前 %1 份待處理申請單"
-
-#: NOT FOUND IN SOURCE
 msgid "%1 highest priority tickets I own..."
 msgstr "前 %1 份待處理申請單..."
 
-#: html/Elements/MyTickets:26
+#: html/Elements/MyRequests:24
 #. ($rows)
 msgid "%1 highest priority tickets I requested..."
 msgstr "前 %1 份送出的申請單..."
 
-#: NOT FOUND IN SOURCE
+#: html/Work/Elements/MyApprovals:5
+#. ($rows)
 msgid "%1 highest priority tickets pending my approval..."
 msgstr "前 %1 份待簽核申請單..."
 
@@ -202,16 +204,17 @@
 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:751
+#: lib/RT/Queue_Overlay.pm:743
 #. ($principal->Object->Name, $args{'Type'})
 msgid "%1 is no longer a %2 for this queue."
 msgstr "%1 已不再是此表單的 %2。"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:1602
+#. ($principal->Object->Name, $args{'Type'})
 msgid "%1 is no longer a %2 for this ticket."
 msgstr "%1 已不再是此申請單的 %2。"
 
-#: lib/RT/Record.pm:923
+#: lib/RT/Ticket_Overlay.pm:3689
 #. ($args{'Value'}, $cf->Name)
 msgid "%1 is no longer a value for custom field %2"
 msgstr "%1 已不再是自訂欄位 %2 的值。"
@@ -220,25 +223,24 @@
 msgid "%1 isn't a valid Queue id."
 msgstr "%1 不是一個合法的表單編號。"
 
-#: html/Ticket/Elements/ShowBasics:36 html/Ticket/Elements/ShowBasics:42 html/Ticket/Elements/ShowBasics:47
-#. ($Ticket->TimeEstimated)
-#. ($Ticket->TimeWorked)
-#. ($Ticket->TimeLeft)
+#: html/Ticket/Elements/ShowBasics:35
+#. ($TimeWorked)
 msgid "%1 min"
 msgstr "%1 分鐘"
 
-#: html/Elements/MyRequests:25
-#. ($rows)
-msgid "%1 newest unowned tickets..."
-msgstr "前 %1 份無人承辦的申請單"
-
 #: NOT FOUND IN SOURCE
 msgid "%1 not shown"
 msgstr "沒有顯示 %1"
 
-#: lib/RT/CustomField_Overlay.pm:701
-msgid "%1 objects"
-msgstr "%1物件"
+#: html/Work/Elements/MyTickets:9
+#. ($rows)
+msgid "%1 recent tickets I own..."
+msgstr "最新 %1 份待處理申請單..."
+
+#: html/Work/Elements/MyRequests:9
+#. ($rows)
+msgid "%1 recent tickets I requested..."
+msgstr "最新 %1 份送出的申請單..."
 
 #: NOT FOUND IN SOURCE
 msgid "%1 result(s) found"
@@ -270,35 +272,22 @@
 msgid "%1 will resolve all members of a resolved group ticket."
 msgstr "%1 會解決在已解決群組裡成員的申請單。"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Action/StallDependent.pm:40
+#. (ref $self)
 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:702
-msgid "%1's %2 objects"
-msgstr "%1內的%2物件"
-
-#: lib/RT/CustomField_Overlay.pm:703
-msgid "%1's %2's %3 objects"
-msgstr "%1的%2內的%3物件"
-
-#: 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:419
+#: lib/RT/Transaction_Overlay.pm:382
 #. ($self)
 msgid "%1: no attachment specified"
 msgstr "%1:未指定附件"
 
-#: html/Scope/Elements/ShowTransaction:90 html/Ticket/Elements/ShowTransaction:95
+#: html/Ticket/Elements/ShowTransaction:108 html/Work/Tickets/Elements/ShowTransaction:169
 #. ($size)
 msgid "%1b"
 msgstr "%1 位元組"
 
-#: html/Scope/Elements/ShowTransaction:87 html/Ticket/Elements/ShowTransaction:92
+#: html/Ticket/Elements/ShowTransaction:105 html/Work/Tickets/Elements/ShowTransaction:166
 #. (int($size/102.4)/10)
 msgid "%1k"
 msgstr "%1k 位元組"
@@ -307,7 +296,7 @@
 msgid "%quant(%1,result) found"
 msgstr "找到 %1 項結果"
 
-#: lib/RT/Ticket_Overlay.pm:1186
+#: lib/RT/Ticket_Overlay.pm:1190
 #. ($args{'Status'})
 msgid "'%1' is an invalid value for status"
 msgstr "'%1' 不是一個合法的狀態值"
@@ -324,7 +313,7 @@
 msgid "(Check box to delete scrip)"
 msgstr "(點選欲刪除的手續)"
 
-#: html/Admin/Elements/EditCustomFieldValues:28 html/Admin/Elements/EditQueueWatchers:28 html/Admin/Elements/EditScrips:34 html/Admin/Elements/EditTemplates:35 html/Admin/Groups/Members.html:51 html/Ticket/Elements/EditLinks:32 html/Ticket/Elements/EditPeople:45 html/User/Groups/Members.html:54
+#: html/Admin/Elements/EditCustomFieldValues:24 html/Admin/Elements/EditQueueWatchers:28 html/Admin/Elements/EditScrips:34 html/Admin/Elements/EditTemplates:35 html/Admin/Elements/EditWorkflows:36 html/Admin/Groups/Members.html:51 html/Ticket/Elements/EditLinks:32 html/Ticket/Elements/EditPeople:45 html/User/Groups/Members.html:54 html/Work/Tickets/Elements/EditLinks:20 html/Work/Tickets/Elements/EditPeople:36
 msgid "(Check box to delete)"
 msgstr "(點選欲刪除的項目)"
 
@@ -332,14 +321,6 @@
 msgid "(Check boxes to delete)"
 msgstr "(點選欲刪除的項目)"
 
-#: html/Ticket/Elements/PreviewScrips:59
-msgid "(Check boxes to disable notifications to the listed recipients)"
-msgstr ""
-
-#: html/Ticket/Elements/PreviewScrips:50
-msgid "(Check boxes to enable notifications to the listed recipients)"
-msgstr ""
-
 #: html/Ticket/Create.html:178
 msgid "(Enter ticket ids or URLs, seperated with spaces)"
 msgstr "(鍵入申請單編號或網址,以空白分隔)"
@@ -354,7 +335,7 @@
 msgid "(No Value)"
 msgstr "(沒有值)"
 
-#: html/Admin/Elements/ListGlobalCustomFields:31 html/Admin/Elements/PickCustomFields:25
+#: html/Admin/Elements/EditCustomFields:32 html/Admin/Elements/ListGlobalCustomFields:31
 msgid "(No custom fields)"
 msgstr "(沒有自訂欄位)"
 
@@ -370,11 +351,11 @@
 msgid "(No templates)"
 msgstr "沒有範本"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/EditWorkflows:31
 msgid "(No workflows)"
 msgstr "沒有流程"
 
-#: html/Ticket/Update.html:61
+#: html/Ticket/Update.html:83 html/Work/Tickets/Update.html:57
 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>更改後續的收件者名單。)"
 
@@ -386,7 +367,7 @@
 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:57
+#: html/Ticket/Update.html:79
 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>更改後續的收件者名單。)"
 
@@ -398,62 +379,62 @@
 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>更改後續的收件者名單。)"
 
-#: NOT FOUND IN SOURCE
+#: html/Work/Delegates/index.html:50
+msgid "(default delegate)"
+msgstr "(預設代理人)"
+
+#: html/Ticket/Elements/EditCustomFieldEntries:35 html/Work/Tickets/Elements/EditCustomFieldEntries:47 html/Work/Tickets/Elements/ShowCustomFieldEntries:14
 msgid "(delete)"
 msgstr "(刪除)"
 
-#: html/Admin/Groups/index.html:38 html/User/Groups/index.html:32
+#: html/Admin/Groups/index.html:32 html/User/Groups/index.html:32
 msgid "(empty)"
 msgstr "(空白)"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Elements/Index:87 html/Edit/Global/CustomField/index.html:116 html/Edit/Global/Scrip/index.html:111 html/Edit/Global/Template/index.html:106
 msgid "(new)"
 msgstr "(新增)"
 
-#: html/Admin/Users/index.html:40
+#: html/Admin/Users/index.html:38
 msgid "(no name listed)"
 msgstr "(沒有列出姓名)"
 
-#: NOT FOUND IN SOURCE
+#: html/Elements/MyRequests:42 html/Elements/MyTickets:44 html/Work/Elements/MyApprovals:37 html/Work/Elements/MyRequests:47 html/Work/Elements/MyTickets:56
 msgid "(no subject)"
 msgstr "(沒有主題)"
 
-#: html/Admin/Elements/SelectRights:47 html/Elements/EditCustomField:60 html/Elements/EditCustomFieldSelect:39 html/Elements/SelectCustomFieldValue:29 html/Ticket/Elements/EditCustomField:64 html/Ticket/Elements/ShowCustomFields:35 lib/RT/Transaction_Overlay.pm:520
+#: html/Admin/Elements/SelectRights:47 html/Elements/SelectCustomFieldValue:29 html/Ticket/Elements/EditCustomField:64 html/Ticket/Elements/EditCustomFieldValues:52 html/Ticket/Elements/ShowCustomFields:35 html/Work/Elements/EditCustomFieldValues:50 html/Work/Elements/EditCustomFields:32 html/Work/Tickets/Elements/EditCustomFieldValues:33 lib/RT/Transaction_Overlay.pm:483
 msgid "(no value)"
 msgstr "(無)"
 
-#: html/Admin/Elements/EditCustomFieldValues:25
-msgid "(no values)"
-msgstr ""
-
-#: html/Ticket/Elements/BulkLinks:27 html/Ticket/Elements/EditLinks:98
+#: html/Ticket/Elements/BulkLinks:27 html/Ticket/Elements/EditLinks:98 html/Work/Search/BulkLinks:3 html/Work/Tickets/Elements/EditLinks:102
 msgid "(only one ticket)"
 msgstr "(僅能指定一份申請單)"
 
-#: html/Elements/TicketList:88
+#: html/Elements/MyRequests:51 html/Elements/MyTickets:54 html/Work/Elements/List:21 html/Work/Elements/MyRequests:61 html/Work/Elements/MyTickets:75 html/Work/Tickets/Elements/ShowBasics:52
 msgid "(pending approval)"
 msgstr "(等待簽核)"
 
-#: html/Elements/TicketList:91
-msgid "(pending other Collection)"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
+#: html/Elements/MyRequests:53 html/Elements/MyTickets:56 html/Work/Elements/MyRequests:63 html/Work/Elements/MyTickets:77
 msgid "(pending other tickets)"
 msgstr "(等待其他申請單)"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:246
 msgid "(requestor's group)"
 msgstr "(申請人所屬)"
 
-#: html/Admin/Users/Modify.html:49
+#: html/Admin/Users/Modify.html:49 html/Edit/Users/Info:34
 msgid "(required)"
 msgstr "(必填)"
 
-#: html/Scope/Elements/ShowTransaction:93 html/Ticket/Elements/ShowTransaction:98
+#: html/Ticket/Elements/ShowTransaction:111 html/Work/Tickets/Elements/ShowTransaction:44
 msgid "(untitled)"
 msgstr "(未命名)"
 
+#: html/Work/Tickets/Elements/ShowHints:5
+msgid "*"
+msgstr "★"
+
 #: NOT FOUND IN SOURCE
 msgid ":"
 msgstr ":"
@@ -466,15 +447,7 @@
 msgid "<% $_ %>"
 msgstr "<% $_ %>"
 
-#: html/Search/Elements/SelectLinks:26
-msgid "<%$_%>"
-msgstr ""
-
-#: 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:25 lib/RT/StyleGuide.pod:767
+#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:25 html/Work/Elements/104Header:43 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"
@@ -503,7 +476,7 @@
 msgid "ACE not found"
 msgstr "找不到 ACE 設定"
 
-#: lib/RT/ACE_Overlay.pm:830
+#: lib/RT/ACE_Overlay.pm:831
 msgid "ACEs can only be created and deleted."
 msgstr "祇能新增或刪除 ACE 設定。"
 
@@ -515,11 +488,15 @@
 msgid "Aborting to avoid unintended ticket modifications.\\n"
 msgstr "離開以免不小心更改到申請單。\\n"
 
+#: html/Edit/Users/Info:66 html/Work/Preferences/Info:108
+msgid "About Me"
+msgstr "個人資訊"
+
 #: html/User/Elements/Tabs:31
 msgid "About me"
 msgstr "個人資訊"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Users/System:12
 msgid "Access Right"
 msgstr "系統使用登錄權限"
 
@@ -527,7 +504,7 @@
 msgid "Access control"
 msgstr "存取權限"
 
-#: html/Admin/Elements/EditScrip:56
+#: html/Admin/Elements/EditScrip:56 html/Work/Tickets/Elements/ShowTransaction:21
 msgid "Action"
 msgstr "動作"
 
@@ -544,39 +521,35 @@
 msgid "Action prepared..."
 msgstr "動作準備完畢..."
 
-#: NOT FOUND IN SOURCE
+#: html/Work/Elements/List:17 html/Work/Elements/SelectSearch:30 html/Work/Tickets/Create.html:27 html/Work/Tickets/Elements/ShowBasics:12
 msgid "Activated Date"
 msgstr "申請啟動時間"
 
-#: html/Search/Build.html:39
+#: html/Edit/Elements/104Buttons:82 html/Edit/Elements/ListButtons:7
 msgid "Add"
 msgstr "新增"
 
-#: html/Search/Bulk.html:93
+#: html/Search/Bulk.html:95 html/Work/Search/Bulk.html:74
 msgid "Add AdminCc"
 msgstr "新增管理員副本收件人"
 
-#: html/Search/Bulk.html:89
+#: html/Search/Bulk.html:91 html/Work/Search/Bulk.html:68
 msgid "Add Cc"
 msgstr "新增副本收件人"
 
-#: html/Search/Elements/PickCriteria:24
-msgid "Add Criteria"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
+#: html/Ticket/Elements/EditCustomFieldEntries:71 html/Work/Tickets/Elements/ShowCustomFieldEntries:50
 msgid "Add Entry"
 msgstr "新增列"
 
-#: html/Scope/Update.html:78 html/Ticket/Create.html:113 html/Ticket/Update.html:76
+#: html/Ticket/Create.html:113 html/Ticket/Update.html:98 html/Work/Tickets/Elements/AddAttachments:23
 msgid "Add More Files"
 msgstr "新增更多附件"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:112 html/Admin/Elements/ModifyTemplateAsWorkflow:45
 msgid "Add Next State"
 msgstr "新增下一項關卡"
 
-#: html/Search/Bulk.html:85
+#: html/Search/Bulk.html:87 html/Work/Search/Bulk.html:62
 msgid "Add Requestor"
 msgstr "新增申請人"
 
@@ -608,7 +581,7 @@
 msgid "Add a scrip which will apply to all queues"
 msgstr "新增一道用於所有表單的手續"
 
-#: html/Search/Bulk.html:125
+#: html/Search/Bulk.html:127 html/Work/Search/Bulk.html:80
 msgid "Add comments or replies to selected tickets"
 msgstr "新增評論或回覆到指定的申請單"
 
@@ -624,25 +597,25 @@
 msgid "AddNextState"
 msgstr "新增下一項關卡"
 
-#: lib/RT/Queue_Overlay.pm:651
+#: lib/RT/Queue_Overlay.pm:643
 #. ($args{'Type'})
 msgid "Added principal as a %1 for this queue"
 msgstr "單位已新增為此表單的 %1"
 
-#: lib/RT/Ticket_Overlay.pm:1481
+#: lib/RT/Ticket_Overlay.pm:1486
 #. ($self->loc($args{'Type'}))
 msgid "Added principal as a %1 for this ticket"
 msgstr "單位已新增為此申請單的 %1"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/CustomField/Top:52
 msgid "Additional Hints"
 msgstr "額外提示"
 
-#: html/Admin/Elements/ModifyUser:75 html/Admin/Users/Modify.html:121 html/User/Prefs.html:114
+#: html/Admin/Elements/ModifyUser:75 html/Admin/Users/Modify.html:121 html/User/Prefs.html:114 html/Work/Preferences/Info:82
 msgid "Address1"
 msgstr "住址"
 
-#: html/Admin/Elements/ModifyUser:77 html/Admin/Users/Modify.html:126 html/User/Prefs.html:118
+#: html/Admin/Elements/ModifyUser:77 html/Admin/Users/Modify.html:126 html/User/Prefs.html:118 html/Work/Preferences/Info:84
 msgid "Address2"
 msgstr "住址(續)"
 
@@ -650,7 +623,7 @@
 msgid "Adjust Blinking Rate"
 msgstr "調整閃爍速度快慢"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Queues/List:12
 msgid "Admin"
 msgstr "管理員"
 
@@ -686,11 +659,11 @@
 msgid "Admin/Groups"
 msgstr "管理/群組"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Queues/Modify.html:24 html/Admin/Queues/Modify.html:28
 msgid "Admin/Queue/Basics"
 msgstr "管理/表單/基本資訊"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Basic/Top:65
 msgid "AdminAddress"
 msgstr "管理員 Email"
 
@@ -698,7 +671,7 @@
 msgid "AdminAllPersonalGroups"
 msgstr "管理所有代理人群組"
 
-#: etc/initialdata:56 html/Ticket/Elements/ShowPeople:38 lib/RT/ACE_Overlay.pm:88
+#: etc/initialdata:56 html/Admin/Elements/ModifyTemplateAsWorkflow:155 html/Ticket/Elements/ShowPeople:38 html/Ticket/Update.html:49 html/Work/Tickets/Elements/ShowLinks:11 lib/RT/ACE_Overlay.pm:88
 msgid "AdminCc"
 msgstr "管理員副本"
 
@@ -710,15 +683,11 @@
 msgid "AdminCorrespondence"
 msgstr "管理員回覆"
 
-#: lib/RT/CustomField_Overlay.pm:46
-msgid "AdminCustomField"
-msgstr ""
-
 #: lib/RT/Queue_Overlay.pm:71
 msgid "AdminCustomFields"
 msgstr "管理自訂欄位"
 
-#: lib/RT/Group_Overlay.pm:145
+#: lib/RT/Group_Overlay.pm:146
 msgid "AdminGroup"
 msgstr "管理群組"
 
@@ -726,7 +695,7 @@
 msgid "AdminGroupDescription"
 msgstr "管理群組描述"
 
-#: lib/RT/Group_Overlay.pm:147
+#: lib/RT/Group_Overlay.pm:148
 msgid "AdminGroupMembership"
 msgstr "管理群組成員"
 
@@ -758,18 +727,14 @@
 msgid "Administrative"
 msgstr "行政類"
 
-#: html/Admin/Queues/People.html:47 html/Ticket/Elements/EditPeople:53
+#: html/Admin/Queues/People.html:47 html/Ticket/Elements/EditPeople:53 html/Work/Tickets/Elements/EditPeople:44
 msgid "Administrative Cc"
 msgstr "管理員副本"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:233
 msgid "Admins"
 msgstr "主管"
 
-#: html/Ticket/Elements/Tabs:174
-msgid "Advanced"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Advanced Search"
 msgstr "進階查詢"
@@ -782,15 +747,15 @@
 msgid "Age"
 msgstr "經歷時間"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:172 html/Edit/Global/Workflow/Action:35
 msgid "Alias"
 msgstr "執行其他流程"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:175
 msgid "Alias for"
 msgstr "相當於"
 
-#: NOT FOUND IN SOURCE
+#: html/Work/Delegates/index.html:14 html/Work/Elements/SelectSearch:16 html/Work/Queues/Select.html:14 html/Work/Queues/index.html:14
 msgid "All"
 msgstr "全部"
 
@@ -798,11 +763,11 @@
 msgid "All Approvals Passed"
 msgstr "完成全部簽核"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Workflow/Condition:16
 msgid "All Condition"
 msgstr "所有條件"
 
-#: html/Admin/Elements/EditCustomFields:69
+#: html/Admin/Elements/EditCustomFields:94
 msgid "All Custom Fields"
 msgstr "所有自訂欄位"
 
@@ -830,23 +795,15 @@
 msgid "Amount"
 msgstr "數額"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Workflow/Condition:13
 msgid "Any Condition"
 msgstr "任意條件"
 
-#: html/Admin/CustomFields/Modify.html:27
-msgid "Applies to"
-msgstr "適用於"
-
-#: html/Search/Edit.html:39
-msgid "Apply"
-msgstr "套用"
-
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Scrip/List:10 html/Edit/Global/Scrip/Top:86
 msgid "Apply Template"
 msgstr "引用範本"
 
-#: html/Elements/Tabs:55
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:138 html/Elements/Tabs:55 html/Work/Approvals/Elements/Approve:6
 msgid "Approval"
 msgstr "簽核"
 
@@ -867,7 +824,7 @@
 msgid "Approval #%1: Notes recorded"
 msgstr "簽核單 #%1:記錄完畢"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:123
 msgid "Approval Details"
 msgstr "簽核細節"
 
@@ -875,7 +832,7 @@
 msgid "Approval Due"
 msgstr "簽核時限"
 
-#: NOT FOUND IN SOURCE
+#: html/Work/Approvals/Elements/Approve:43
 msgid "Approval Notes"
 msgstr "簽核意見"
 
@@ -891,7 +848,7 @@
 msgid "Approval Result"
 msgstr "簽核結果"
 
-#: NOT FOUND IN SOURCE
+#: html/Work/Approvals/Elements/Approve:25
 msgid "Approval Status"
 msgstr "核准結果"
 
@@ -899,7 +856,7 @@
 msgid "Approval Type"
 msgstr "簽核種類"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:25
 msgid "Approval diagram"
 msgstr "簽核流程"
 
@@ -907,15 +864,15 @@
 msgid "Approve"
 msgstr "核准"
 
-#: NOT FOUND IN SOURCE
+#: html/Work/Approvals/Elements/Approve:21 html/Work/Elements/List:9
 msgid "Approver"
 msgstr "簽核人"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Workflow/Action:25 html/Edit/Global/Workflow/Owner.html:10
 msgid "Approver Setting"
 msgstr "執行簽核人設定"
 
-#: etc/initialdata:486 etc/upgrade/2.1.71:148
+#: etc/initialdata:486 etc/upgrade/2.1.71:148 html/Edit/Elements/CreateApprovalsQueue:122
 msgid "Approver's notes: %1"
 msgstr "簽核備註:%1"
 
@@ -931,7 +888,7 @@
 msgid "April"
 msgstr "四月"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Elements/104Buttons:24
 msgid "Are you sure to delete checked items?"
 msgstr "您確定要刪除?"
 
@@ -939,23 +896,15 @@
 msgid "Ascending"
 msgstr "遞增"
 
-#: lib/RT/Queue_Overlay.pm:71
-msgid "Assign and remove custom fields"
-msgstr ""
-
-#: html/Admin/Elements/EditCustomFields:47
-msgid "Associated Custom Fields (uncheck to unassociate)"
-msgstr "選用的自訂欄位 (取消勾選將解除該欄位)"
-
-#: html/Scope/Update.html:78 html/Search/Bulk.html:134 html/SelfService/Update.html:47 html/Ticket/ModifyAll.html:82 html/Ticket/Update.html:76
+#: html/Search/Bulk.html:136 html/SelfService/Update.html:47 html/Ticket/ModifyAll.html:82 html/Ticket/Update.html:98 html/Work/Search/Bulk.html:88
 msgid "Attach"
 msgstr "附件"
 
-#: html/SelfService/Create.html:64 html/Ticket/Create.html:109
+#: html/SelfService/Create.html:64 html/Ticket/Create.html:109 html/Work/Tickets/Elements/AddAttachments:19
 msgid "Attach file"
 msgstr "附加檔案"
 
-#: html/Scope/Update.html:67 html/SelfService/Update.html:36 html/Ticket/Create.html:97 html/Ticket/Update.html:65
+#: html/SelfService/Update.html:36 html/Ticket/Create.html:97 html/Ticket/Update.html:87 html/Work/Tickets/Elements/AddAttachments:7 html/Work/Tickets/Elements/ShowAttachments:9
 msgid "Attached file"
 msgstr "現有附件"
 
@@ -963,21 +912,21 @@
 msgid "Attachment '%1' could not be loaded"
 msgstr "無法載入附件 '%1'"
 
-#: lib/RT/Transaction_Overlay.pm:427
+#: lib/RT/Transaction_Overlay.pm:390
 msgid "Attachment created"
 msgstr "附件新增完畢"
 
-#: lib/RT/Tickets_Overlay.pm:1253
+#: lib/RT/Tickets_Overlay.pm:1250
 msgid "Attachment filename"
 msgstr "附件檔名"
 
-#: html/Ticket/Elements/ShowAttachments:25
+#: html/Ticket/Elements/ShowAttachments:25 html/Work/Tickets/Elements/ShowTransaction:37
 msgid "Attachments"
 msgstr "附件"
 
-#: lib/RT/Attributes_Overlay.pm:158
-msgid "Attribute Deleted"
-msgstr ""
+#: lib/RT/Ticket_Overlay.pm:1222
+msgid "Attributes"
+msgstr "屬性"
 
 #: NOT FOUND IN SOURCE
 msgid "Aug"
@@ -1015,11 +964,7 @@
 msgid "AutoreplyToRequestors"
 msgstr "自動對申請人回覆"
 
-#: html/Search/Elements/EditFormat:4
-msgid "Available Columns"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
+#: html/Edit/Rights/index.html:17
 msgid "Available Rights:"
 msgstr "權限項目列表:"
 
@@ -1027,7 +972,7 @@
 msgid "Back to Homepage"
 msgstr "回到首頁"
 
-#: NOT FOUND IN SOURCE
+#: html/Work/Approvals/Update.html:7 html/Work/Elements/BackButton:2 html/Work/Search/Bulk.html:101
 msgid "Back to Previous"
 msgstr "回上頁"
 
@@ -1048,23 +993,27 @@
 msgid "Bad transaction number for attachment. %1 should be %2\\n"
 msgstr "附件的處理號碼錯誤。%1 應為 %2\\n"
 
-#: html/Admin/Elements/CustomFieldTabs:19 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
+#: html/Admin/Elements/GroupTabs:38 html/Admin/Elements/QueueTabs:38 html/Admin/Elements/UserTabs:37 html/Edit/Global/autohandler:6 html/Edit/Queues/autohandler:23 html/Edit/Users/index.html:94 html/Ticket/Elements/Tabs:95 html/User/Elements/GroupTabs:37
 msgid "Basics"
 msgstr "基本資訊"
 
-#: html/Scope/Update.html:63 html/Ticket/Update.html:59
+#: html/Work/Approvals/index.html:9
+msgid "Batch Approval"
+msgstr "批次簽核"
+
+#: html/Ticket/Update.html:81 html/Work/Tickets/Update.html:54
 msgid "Bcc"
 msgstr "密件副本"
 
-#: html/Admin/CustomFields/GroupRights.html:61 html/Admin/CustomFields/UserRights.html:47 html/Admin/Elements/EditScrip:95 html/Admin/Global/GroupRights.html:84 html/Admin/Global/Template.html:45 html/Admin/Global/UserRights.html:53 html/Admin/Groups/GroupRights.html:72 html/Admin/Groups/Members.html:80 html/Admin/Groups/Modify.html:65 html/Admin/Groups/UserRights.html:54 html/Admin/Queues/GroupRights.html:85 html/Admin/Queues/Template.html:44 html/Admin/Queues/UserRights.html:53 html/User/Groups/Modify.html:55
+#: html/Admin/Elements/EditScrip:95 html/Admin/Global/GroupRights.html:84 html/Admin/Global/Template.html:45 html/Admin/Global/UserRights.html:53 html/Admin/Global/Workflow.html:46 html/Admin/Groups/GroupRights.html:72 html/Admin/Groups/Members.html:80 html/Admin/Groups/Modify.html:55 html/Admin/Groups/UserRights.html:54 html/Admin/Queues/GroupRights.html:85 html/Admin/Queues/Template.html:44 html/Admin/Queues/UserRights.html:53 html/Admin/Queues/Workflow.html:44 html/User/Groups/Modify.html:55
 msgid "Be sure to save your changes"
 msgstr "請別忘了儲存修改。"
 
-#: html/Elements/SelectDateRelation:33 lib/RT/CurrentUser.pm:322
+#: html/Elements/SelectDateRelation:33 lib/RT/CurrentUser.pm:363
 msgid "Before"
 msgstr "早於"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:44
 msgid "Begin Approval"
 msgstr "開始簽核"
 
@@ -1072,10 +1021,6 @@
 msgid "Begin From "
 msgstr "起始日"
 
-#: lib/RT/CustomField_Overlay.pm:38
-msgid "Binary"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Birthday"
 msgstr "生日"
@@ -1084,11 +1029,11 @@
 msgid "Blank"
 msgstr "空白範本"
 
-#: NOT FOUND IN SOURCE
+#: html/Search/Listing.html:78 html/Work/Search/index.html:53
 msgid "Bookmarkable URL for this search"
 msgstr "將查詢結果轉為可放入書籤的網址"
 
-#: html/Scope/Elements/ShowHistory:38 html/Scope/Elements/ShowHistory:44 html/Ticket/Elements/ShowHistory:38 html/Ticket/Elements/ShowHistory:44
+#: html/Ticket/Elements/ShowHistory:38 html/Ticket/Elements/ShowHistory:44
 msgid "Brief headers"
 msgstr "精簡標頭檔"
 
@@ -1104,51 +1049,44 @@
 msgid "Business Unit:"
 msgstr "事業部:"
 
-#: lib/RT/User_Overlay.pm:1479
+#: lib/RT/User_Overlay.pm:1539
 msgid "Can not modify system users"
 msgstr "無法更改系統使用者"
 
-#: lib/RT/CustomField_Overlay.pm:45
-msgid "Can this principal see this custom field"
-msgstr ""
-
 #: lib/RT/Queue_Overlay.pm:66
 msgid "Can this principal see this queue"
 msgstr "該單位是否能查閱此表單"
 
-#: lib/RT/CustomField_Overlay.pm:256
+#: lib/RT/CustomField_Overlay.pm:212
 msgid "Can't add a custom field value without a name"
 msgstr "不能新增沒有名稱的自訂欄位值"
 
-#: html/Search/Build.html:1011
-msgid "Can't find a saved search to work with"
-msgstr ""
-
 #: lib/RT/Link_Overlay.pm:131
 msgid "Can't link a ticket to itself"
 msgstr "申請單不能鏈結自己。"
 
-#: lib/RT/Ticket_Overlay.pm:2970
+#: lib/RT/Ticket_Overlay.pm:2865
 msgid "Can't merge into a merged ticket. You should never get this error"
 msgstr "不能整合進已整合過的申請單。這個錯誤不該發生。"
 
-#: html/Search/Build.html:1021
-msgid "Can't save this search"
-msgstr ""
-
-#: lib/RT/Ticket_Overlay.pm:2772 lib/RT/Ticket_Overlay.pm:2851
+#: lib/RT/Ticket_Overlay.pm:2667 lib/RT/Ticket_Overlay.pm:2746
 msgid "Can't specifiy both base and target"
 msgstr "不能同時指定起始申請單與目的申請單"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Elements/PopFooter:8
 msgid "Cancel"
 msgstr "取消"
 
-#: html/autohandler:132
+#: html/autohandler:133
 #. ($msg)
 msgid "Cannot create user: %1"
 msgstr "無法新增使用者:%1"
 
+#: html/autohandler:187
+#. ($auth_created - time)
+msgid "Cannot login: Your system clock differs from server's by %1 seconds!"
+msgstr "您的系統時鐘和伺服器相差 %1 秒,無法登入!"
+
 #: NOT FOUND IN SOURCE
 msgid "Card No."
 msgstr "卡號"
@@ -1161,7 +1099,7 @@
 msgid "Category"
 msgstr "分類"
 
-#: etc/initialdata:50 html/Admin/Queues/People.html:43 html/Scope/Update.html:61 html/SelfService/Create.html:48 html/Ticket/Create.html:63 html/Ticket/Elements/EditPeople:50 html/Ticket/Elements/ShowPeople:34 html/Ticket/Update.html:54 lib/RT/ACE_Overlay.pm:87
+#: 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:44 html/Ticket/Update.html:76 html/Work/Tickets/Elements/EditPeople:41 html/Work/Tickets/Elements/ShowLinks:6 html/Work/Tickets/Update.html:43 lib/RT/ACE_Overlay.pm:87
 msgid "Cc"
 msgstr "副本"
 
@@ -1181,11 +1119,11 @@
 msgid "Change password"
 msgstr "更改密碼"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Basic/Top:79
 msgid "ChangeOwnerUI"
 msgstr "可否選擇表單承辦人"
 
-#: html/Scope/Update.html:70 html/SelfService/Update.html:39 html/Ticket/Create.html:100 html/Ticket/Update.html:68
+#: html/SelfService/Update.html:39 html/Ticket/Create.html:100 html/Ticket/Elements/EditCustomFieldEntries:35 html/Ticket/Update.html:90 html/Work/Tickets/Elements/ShowCustomFieldEntries:14
 msgid "Check box to delete"
 msgstr "選擇欲刪除的項目"
 
@@ -1193,11 +1131,11 @@
 msgid "Check box to revoke right"
 msgstr "選擇欲撤消的權利"
 
-#: html/Ticket/Create.html:183 html/Ticket/Elements/BulkLinks:42 html/Ticket/Elements/EditLinks:113 html/Ticket/Elements/EditLinks:63 html/Ticket/Elements/ShowLinks:56
+#: html/Ticket/Create.html:183 html/Ticket/Elements/BulkLinks:42 html/Ticket/Elements/EditLinks:113 html/Ticket/Elements/EditLinks:63 html/Ticket/Elements/ShowLinks:56 html/Work/Search/BulkLinks:18 html/Work/Tickets/Elements/EditLinks:117 html/Work/Tickets/Elements/EditLinks:56 html/Work/Tickets/Elements/ShowMembers:4
 msgid "Children"
 msgstr "子申請單"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Elements/PickUsers:22 html/Edit/Global/UserRight/List:8 html/Edit/Global/UserRight/Top:19
 msgid "Chinese Name"
 msgstr "中文姓名"
 
@@ -1205,11 +1143,11 @@
 msgid "Chinese/English"
 msgstr "中英文"
 
-#: html/Admin/Elements/ModifyUser:79 html/Admin/Users/Modify.html:131 html/User/Prefs.html:122
+#: html/Admin/Elements/ModifyUser:79 html/Admin/Users/Modify.html:131 html/User/Prefs.html:122 html/Work/Preferences/Info:86
 msgid "City"
 msgstr "所在城市"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Elements/104Top:30
 msgid "ClassicUI"
 msgstr "傳統介面"
 
@@ -1225,7 +1163,7 @@
 msgid "Closed tickets"
 msgstr "已解決的申請單"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:181 html/Edit/Global/Workflow/Action:55 html/Edit/Global/Workflow/Condition:53 html/Edit/Global/Workflow/Owner.html:115
 msgid "Code"
 msgstr "執行程式碼"
 
@@ -1233,7 +1171,7 @@
 msgid "Command not understood!\\n"
 msgstr "指令無法辨識!\\n"
 
-#: html/Scope/Elements/ShowTransaction:167 html/Ticket/Elements/ShowTransaction:211 html/Ticket/Elements/Tabs:154
+#: html/Ticket/Elements/ShowTransaction:189 html/Ticket/Elements/Tabs:158 html/Work/Search/Bulk.html:89 html/Work/Tickets/Display.html:61 html/Work/Tickets/Elements/ShowTransaction:119 html/Work/Tickets/Elements/ShowTransaction:32
 msgid "Comment"
 msgstr "評論"
 
@@ -1253,15 +1191,15 @@
 msgid "CommentOnTicket"
 msgstr "評論申請單"
 
-#: html/Admin/Elements/ModifyUser:34
+#: html/Admin/Elements/ModifyUser:34 html/Work/Tickets/Elements/AddContent:7
 msgid "Comments"
 msgstr "評論"
 
-#: html/Scope/Update.html:53 html/Ticket/ModifyAll.html:69 html/Ticket/Update.html:46
+#: html/Ticket/ModifyAll.html:69 html/Ticket/Update.html:68 html/Work/Tickets/Update.html:35
 msgid "Comments (Not sent to requestors)"
 msgstr "評論(不送給申請人)"
 
-#: html/Search/Bulk.html:129
+#: html/Search/Bulk.html:131 html/Work/Search/Bulk.html:83
 msgid "Comments (not sent to requestors)"
 msgstr "評論(不送給申請人)"
 
@@ -1270,19 +1208,19 @@
 msgid "Comments about %1"
 msgstr "對 %1 的評論"
 
-#: html/Admin/Users/Modify.html:199 html/Ticket/Elements/ShowRequestor:43
+#: html/Admin/Users/Modify.html:184 html/Edit/Users/Info:90 html/Ticket/Elements/ShowRequestor:43
 msgid "Comments about this user"
 msgstr "使用者描述"
 
-#: lib/RT/Transaction_Overlay.pm:538
+#: lib/RT/Transaction_Overlay.pm:501
 msgid "Comments added"
 msgstr "新增評論完畢"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Elements/PopFooter:4 html/Edit/Elements/PopFooter:6
 msgid "Commit"
 msgstr "確認"
 
-#: lib/RT/Action/Generic.pm:149
+#: lib/RT/Action/Generic.pm:139
 msgid "Commit Stubbed"
 msgstr "消除更動完畢"
 
@@ -1290,7 +1228,7 @@
 msgid "Company Name"
 msgstr "公司名稱"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Basic/Top:85
 msgid "CompanySpecific"
 msgstr "各公司獨立顯示"
 
@@ -1298,7 +1236,7 @@
 msgid "Compile Restrictions"
 msgstr "設定查詢條件"
 
-#: html/Admin/Elements/EditScrip:40
+#: html/Admin/Elements/EditScrip:40 html/Admin/Elements/ModifyTemplateAsWorkflow:127
 msgid "Condition"
 msgstr "條件"
 
@@ -1310,7 +1248,7 @@
 msgid "Condition not found"
 msgstr "未找到符合的現況"
 
-#: html/Elements/Tabs:49
+#: html/Edit/Global/GroupRight/Top:26 html/Edit/Global/UserRight/Top:45 html/Edit/Groups/Member:56 html/Elements/Tabs:49
 msgid "Configuration"
 msgstr "設定"
 
@@ -1322,7 +1260,7 @@
 msgid "Confirm Password"
 msgstr "密碼確認"
 
-#: NOT FOUND IN SOURCE
+#: html/Work/Approvals/Elements/Actions:6 html/Work/Tickets/Create.html:153 html/Work/Tickets/Create.html:167 html/Work/Tickets/Update.html:81
 msgid "Confirm Submit"
 msgstr "確定送出"
 
@@ -1338,19 +1276,15 @@
 msgid "Contacted date '%1' could not be parsed"
 msgstr "無法解讀聯絡日期 '%1'"
 
-#: html/Admin/Elements/ModifyTemplate:43 html/Elements/SelectAttachmentField:26 html/Ticket/ModifyAll.html:86
+#: html/Admin/Elements/ModifyTemplate:43 html/Admin/Elements/ModifyTemplateAsWorkflow:200 html/Ticket/ModifyAll.html:86
 msgid "Content"
 msgstr "內容"
 
-#: html/Elements/SelectAttachmentField:27
-msgid "Content-Type"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Coould not create group"
 msgstr "無法新增群組"
 
-#: html/Search/Elements/EditSearches:15
+#: html/Edit/Elements/104Buttons:85
 msgid "Copy"
 msgstr "複製"
 
@@ -1366,7 +1300,7 @@
 msgid "Correspondence Address"
 msgstr "申請單回覆地址"
 
-#: lib/RT/Transaction_Overlay.pm:534
+#: lib/RT/Transaction_Overlay.pm:497
 msgid "Correspondence added"
 msgstr "新增申請單回覆"
 
@@ -1374,7 +1308,7 @@
 msgid "Correspondence not recorded"
 msgstr "未紀錄申請單回覆"
 
-#: lib/RT/Record.pm:848
+#: lib/RT/Ticket_Overlay.pm:3620
 msgid "Could not add new custom field value for ticket. "
 msgstr "不能新增自訂欄位的值 "
 
@@ -1382,20 +1316,22 @@
 msgid "Could not add new custom field value for ticket. %1 "
 msgstr "不能新增自訂欄位的值。%1 "
 
-#: lib/RT/Ticket_Overlay.pm:3221 lib/RT/Ticket_Overlay.pm:3229 lib/RT/Ticket_Overlay.pm:3246
+#: lib/RT/Ticket_Overlay.pm:3116 lib/RT/Ticket_Overlay.pm:3124 lib/RT/Ticket_Overlay.pm:3141
 msgid "Could not change owner. "
 msgstr "不能更改承辦人。 "
 
-#: html/Admin/CustomFields/Modify.html:73 html/Admin/Elements/EditCustomField:84
+#: html/Admin/Elements/EditCustomField:84 html/Admin/Elements/EditCustomFields:164 html/Edit/Global/CustomField/index.html:120
 #. ($msg)
 msgid "Could not create CustomField"
 msgstr "無法新增自訂欄位"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Workflow/index.html:126
+#. ($msg)
 msgid "Could not create Scrip"
 msgstr "無法建立訊息通知"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Template/index.html:110
+#. ($msg)
 msgid "Could not create Template"
 msgstr "無法建立通知範本"
 
@@ -1403,7 +1339,8 @@
 msgid "Could not create group"
 msgstr "無法新增群組"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Elements/Index:89
+#. ($msg)
 msgid "Could not create item"
 msgstr "無法新增項目"
 
@@ -1412,11 +1349,11 @@
 msgid "Could not create template: %1"
 msgstr "無法新增範本:%1"
 
-#: lib/RT/Ticket_Overlay.pm:1119 lib/RT/Ticket_Overlay.pm:354
+#: lib/RT/Ticket_Overlay.pm:1123 lib/RT/Ticket_Overlay.pm:358
 msgid "Could not create ticket. Queue not set"
 msgstr "無法新增申請單。尚未指定表單。"
 
-#: lib/RT/User_Overlay.pm:219 lib/RT/User_Overlay.pm:232 lib/RT/User_Overlay.pm:250 lib/RT/User_Overlay.pm:436
+#: lib/RT/User_Overlay.pm:271 lib/RT/User_Overlay.pm:284 lib/RT/User_Overlay.pm:302 lib/RT/User_Overlay.pm:488
 msgid "Could not create user"
 msgstr "無法新增使用者"
 
@@ -1424,7 +1361,8 @@
 msgid "Could not create watcher for requestor"
 msgstr "無法為申請人新增視察員"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/ModifyWorkflow:219 html/Admin/Global/Workflow.html:75 html/Admin/Queues/Workflow.html:71
+#. ($msg)
 msgid "Could not create workflow: %1"
 msgstr "無法新增流程:%1"
 
@@ -1436,11 +1374,11 @@
 msgid "Could not find group %1."
 msgstr "找不到群組 %1。"
 
-#: lib/RT/Queue_Overlay.pm:629 lib/RT/Ticket_Overlay.pm:1449
+#: lib/RT/Queue_Overlay.pm:621 lib/RT/Ticket_Overlay.pm:1454
 msgid "Could not find or create that user"
 msgstr "找不到或無法新增該名使用者"
 
-#: lib/RT/Queue_Overlay.pm:690 lib/RT/Ticket_Overlay.pm:1530
+#: lib/RT/Queue_Overlay.pm:682 lib/RT/Ticket_Overlay.pm:1533
 msgid "Could not find that principal"
 msgstr "找不到該單位"
 
@@ -1452,30 +1390,31 @@
 msgid "Could not load group"
 msgstr "無法載入群組"
 
-#: lib/RT/Queue_Overlay.pm:649
+#: lib/RT/Queue_Overlay.pm:641
 #. ($args{'Type'})
 msgid "Could not make that principal a %1 for this queue"
 msgstr "無法將該單位設為此表單的 %1。"
 
-#: lib/RT/Ticket_Overlay.pm:1470
+#: lib/RT/Ticket_Overlay.pm:1475
 #. ($self->loc($args{'Type'}))
 msgid "Could not make that principal a %1 for this ticket"
 msgstr "無法將該單位設為此申請單的 %1。"
 
-#: lib/RT/Queue_Overlay.pm:748
+#: lib/RT/Queue_Overlay.pm:740
 #. ($args{'Type'})
 msgid "Could not remove that principal as a %1 for this queue"
 msgstr "無法將單位 %1 從表單移除。"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:1591
+#. ($args{'Type'})
 msgid "Could not remove that principal as a %1 for this ticket"
 msgstr "無法將單位 %1 從申請單移除。"
 
-#: lib/RT/Group_Overlay.pm:984
+#: lib/RT/Group_Overlay.pm:976
 msgid "Couldn't add member to group"
 msgstr "無法新增成員至群組"
 
-#: lib/RT/Record.pm:858 lib/RT/Record.pm:920
+#: lib/RT/Ticket_Overlay.pm:3630 lib/RT/Ticket_Overlay.pm:3686
 #. ($Msg)
 msgid "Couldn't create a transaction: %1"
 msgstr "無法新增更動報告"
@@ -1488,15 +1427,15 @@
 msgid "Couldn't find group\\n"
 msgstr "找不到群組\\n"
 
-#: lib/RT/Interface/Web.pm:962
+#: lib/RT/Interface/Web.pm:964
 msgid "Couldn't find row"
 msgstr "找不到此列資料"
 
-#: lib/RT/Group_Overlay.pm:958
+#: lib/RT/Group_Overlay.pm:950
 msgid "Couldn't find that principal"
 msgstr "找不到該單位"
 
-#: lib/RT/CustomField_Overlay.pm:290
+#: lib/RT/CustomField_Overlay.pm:246
 msgid "Couldn't find that value"
 msgstr "找不到該值"
 
@@ -1508,21 +1447,11 @@
 msgid "Couldn't find user\\n"
 msgstr "找不到使用者\\n"
 
-#: lib/RT/CurrentUser.pm:109
+#: lib/RT/CurrentUser.pm:111
 #. ($self->Id)
 msgid "Couldn't load %1 from the users database.\\n"
 msgstr "無法從使用者資料庫載入 %1。\\n"
 
-#: html/Admin/CustomFields/UserRights.html:122
-#. ($id)
-msgid "Couldn't load Class %1"
-msgstr ""
-
-#: html/Admin/CustomFields/GroupRights.html:77
-#. ($id)
-msgid "Couldn't load CustomField %1"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Couldn't load KeywordSelects."
 msgstr "無法載入 KeywordSelects。"
@@ -1535,26 +1464,25 @@
 msgid "Couldn't load Scrips."
 msgstr "無法載入手續。"
 
-#: html/Admin/Groups/GroupRights.html:87 html/Admin/Groups/UserRights.html:74
+#: html/Admin/Groups/GroupRights.html:87 html/Admin/Groups/UserRights.html:74 html/Edit/Global/GroupRight/Add.html:55 html/Edit/Global/GroupRight/Add.html:60 html/Edit/Global/UserRight/Add.html:25 html/Edit/Global/UserRight/Add.html:30 html/Edit/Groups/Member:121 html/Edit/Groups/Members/Add.html:44 html/Edit/Rights/index.html:58 html/Edit/Rights/index.html:63
+#. ($ObjectGroup)
+#. ($Report)
+#. ($Group)
 #. ($id)
 msgid "Couldn't load group %1"
 msgstr "無法載入手續 %1"
 
-#: lib/RT/Link_Overlay.pm:174 lib/RT/Link_Overlay.pm:183 lib/RT/Link_Overlay.pm:210
+#: lib/RT/Link_Overlay.pm:175 lib/RT/Link_Overlay.pm:184 lib/RT/Link_Overlay.pm:211
 msgid "Couldn't load link"
 msgstr "無法載入鏈結。"
 
-#: html/Admin/Elements/ObjectCustomFields:47
-#. ($id)
-msgid "Couldn't load object %1"
-msgstr ""
-
-#: html/Admin/Queues/People.html:120
+#: 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:100 html/Admin/Queues/UserRights.html:71
+#: html/Admin/Queues/GroupRights.html:100 html/Admin/Queues/UserRights.html:71 html/Edit/Global/GroupRight/Add.html:51 html/Edit/Global/GroupRight/index.html:82 html/Edit/Global/GroupRight/index.html:87 html/Edit/Global/UserRight/Add.html:21 html/Edit/Global/UserRight/index.html:83 html/Edit/Global/UserRight/index.html:88 html/Edit/Rights/index.html:54
+#. ($Queue)
 #. ($id)
 msgid "Couldn't load queue %1"
 msgstr "無法載入表單 %1"
@@ -1572,20 +1500,20 @@
 msgid "Couldn't load that user (%1)"
 msgstr "無法載入該名使用者(%1)"
 
-#: html/SelfService/Display.html:114
+#: html/SelfService/Display.html:116
 #. ($id)
 msgid "Couldn't load ticket '%1'"
 msgstr "無法載入申請單 '%1'"
 
-#: html/Admin/Elements/ModifyUser:85 html/Admin/Users/Modify.html:148 html/User/Prefs.html:134
+#: html/Admin/Elements/ModifyUser:85 html/Admin/Users/Modify.html:148 html/User/Prefs.html:134 html/Work/Preferences/Info:92
 msgid "Country"
 msgstr "國家"
 
-#: html/Admin/Elements/CreateUserCalled:25 html/Elements/QuickCreate:23 html/Projects/Elements/OverviewEntry:60 html/Ticket/Create.html:134 html/Ticket/Create.html:195
+#: html/Admin/Elements/CreateUserCalled:25 html/Edit/Elements/PopHeader:33 html/Edit/Global/GroupRight/Add.html:19 html/Ticket/Create.html:134 html/Ticket/Create.html:195
 msgid "Create"
 msgstr "新增"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Groups/MemberGroups/Add.html:17
 msgid "Create Subgroup:"
 msgstr "新增子群組:"
 
@@ -1597,7 +1525,7 @@
 msgid "Create User:"
 msgstr "新增成員:"
 
-#: html/Admin/CustomFields/Modify.html:63 html/Admin/Elements/EditCustomField:74
+#: html/Admin/Elements/EditCustomField:74
 msgid "Create a CustomField"
 msgstr "新增自訂欄位"
 
@@ -1622,7 +1550,7 @@
 msgid "Create a new global scrip"
 msgstr "新增全域手續"
 
-#: html/Admin/Groups/Modify.html:102 html/Admin/Groups/Modify.html:76
+#: html/Admin/Groups/Modify.html:66 html/Admin/Groups/Modify.html:92
 msgid "Create a new group"
 msgstr "新增群組"
 
@@ -1646,7 +1574,7 @@
 msgid "Create a new ticket"
 msgstr "新增申請單"
 
-#: html/Admin/Users/Modify.html:228 html/Admin/Users/Modify.html:257
+#: html/Admin/Users/Modify.html:213 html/Admin/Users/Modify.html:242
 msgid "Create a new user"
 msgstr "新增使用者"
 
@@ -1679,7 +1607,7 @@
 msgid "Create a ticket"
 msgstr "提出申請單"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/ModifyWorkflow:206 html/Admin/Global/Workflow.html:69 html/Admin/Queues/Workflow.html:64
 msgid "Create a workflow"
 msgstr "新增流程"
 
@@ -1707,7 +1635,7 @@
 msgid "Create tickets in this queue"
 msgstr "在此表單中新增申請單"
 
-#: lib/RT/CustomField_Overlay.pm:46
+#: lib/RT/Queue_Overlay.pm:71
 msgid "Create, delete and modify custom fields"
 msgstr "新增、刪除及更改自訂欄位"
 
@@ -1731,11 +1659,11 @@
 msgid "CreateTicket"
 msgstr "新增申請單"
 
-#: html/Elements/SelectDateType:25 html/Ticket/Elements/ShowDates:27 lib/RT/Ticket_Overlay.pm:1213
+#: html/Elements/SelectDateType:25 html/Ticket/Elements/ShowDates:27 lib/RT/Ticket_Overlay.pm:1217
 msgid "Created"
 msgstr "新增日"
 
-#: html/Admin/CustomFields/Modify.html:75 html/Admin/Elements/EditCustomField:87
+#: html/Admin/Elements/EditCustomField:87
 #. ($CustomFieldObj->Name())
 msgid "Created CustomField %1"
 msgstr "自訂欄位 %1 新增成功"
@@ -1744,14 +1672,11 @@
 msgid "Created template %1"
 msgstr "範本 %1 新增成功"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/ModifyWorkflow:221
+#. (loc( $WorkflowObj->Name() ))
 msgid "Created workflow %1"
 msgstr "流程 %1 新增成功"
 
-#: html/Search/Elements/PickBasics:115
-msgid "Creator"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Currency"
 msgstr "幣別"
@@ -1764,15 +1689,15 @@
 msgid "Current Custom Fields"
 msgstr "現有自訂欄位"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Groups/MemberGroups/Add.html:14
 msgid "Current Groups:"
 msgstr "現有群組列表:"
 
-#: html/Ticket/Elements/EditLinks:27
+#: html/Ticket/Elements/EditLinks:27 html/Work/Tickets/Elements/EditLinks:10
 msgid "Current Relationships"
 msgstr "現有關係"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Rights/index.html:20
 msgid "Current Rights:"
 msgstr "現有權限:"
 
@@ -1780,7 +1705,7 @@
 msgid "Current Scrips"
 msgstr "現有手續"
 
-#: NOT FOUND IN SOURCE
+#: html/Work/Tickets/Create.html:49 html/Work/Tickets/Elements/ShowBasics:47
 msgid "Current Status"
 msgstr "目前狀態"
 
@@ -1788,7 +1713,7 @@
 msgid "Current Templates"
 msgstr "現有範本"
 
-#: NOT FOUND IN SOURCE
+#: html/Work/Tickets/Elements/EditPeople:9
 msgid "Current Watchers"
 msgstr "現有視察員"
 
@@ -1800,11 +1725,11 @@
 msgid "Current rights"
 msgstr "現有權限"
 
-#: html/Search/Listing.html:51
+#: html/Search/Listing.html:70 html/Work/Search/index.html:42
 msgid "Current search criteria"
 msgstr "現有查詢條件"
 
-#: html/Admin/Queues/People.html:40 html/Ticket/Elements/EditPeople:44
+#: html/Admin/Queues/People.html:40 html/Ticket/Elements/EditPeople:44 html/Work/Tickets/Elements/EditPeople:32
 msgid "Current watchers"
 msgstr "現有視察員"
 
@@ -1813,60 +1738,55 @@
 msgid "Custom Field #%1"
 msgstr "自訂欄位 #%1"
 
-#: html/Admin/Elements/GroupTabs:57 html/Admin/Elements/QueueTabs:52 html/Admin/Elements/QueueTabs:72 html/Admin/Elements/SystemTabs:39 html/Admin/Elements/Tabs:40 html/Admin/Elements/UserTabs:60 html/Admin/Global/index.html:49 html/Admin/Users/Modify.html:183 html/Admin/index.html:37 html/Scope/Elements/ShowSummary:34 html/Ticket/Elements/ShowSummary:35
+#: html/Admin/Elements/QueueTabs:52 html/Admin/Elements/SystemTabs:39 html/Admin/Global/index.html:49 html/Edit/Global/autohandler:7 html/Edit/Queues/autohandler:24 html/Ticket/Elements/ShowSummary:35
 msgid "Custom Fields"
 msgstr "自訂欄位"
 
-#: html/Admin/CustomFields/index.html:14
-#. ($lookup)
-msgid "Custom Fields of %1"
-msgstr "「%1」的自訂欄位"
-
 #: NOT FOUND IN SOURCE
 msgid "Custom Fields which apply to all queues"
 msgstr "適用於所有表單的自訂欄位"
 
-#: html/Admin/Elements/EditScrip:72
+#: html/Admin/Elements/EditScrip:72 html/Edit/Global/Scrip/Top:69
 msgid "Custom action cleanup code"
 msgstr "動作後執行程式"
 
-#: html/Admin/Elements/EditScrip:64
+#: html/Admin/Elements/EditScrip:64 html/Edit/Global/Scrip/Top:62
 msgid "Custom action preparation code"
 msgstr "動作前執行程式"
 
-#: html/Admin/Elements/EditScrip:48
+#: html/Admin/Elements/EditScrip:48 html/Edit/Global/Scrip/Top:35 html/Edit/Global/Scrip/Top:61
 msgid "Custom condition"
 msgstr "自訂條件"
 
-#: lib/RT/Tickets_Overlay.pm:1696
+#: 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:1691
+#: lib/RT/Tickets_Overlay.pm:1688
 #. ($CF->Name)
 msgid "Custom field %1 has a value."
 msgstr "自訂欄位 %1 已有值"
 
-#: lib/RT/Tickets_Overlay.pm:1688
+#: lib/RT/Tickets_Overlay.pm:1685
 #. ($CF->Name)
 msgid "Custom field %1 has no value."
 msgstr "自訂欄位 %1 沒有值"
 
-#: lib/RT/Record.pm:746
+#: lib/RT/Ticket_Overlay.pm:3522
 #. ($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/Record.pm:902
+#: lib/RT/Ticket_Overlay.pm:3672
 msgid "Custom field not found"
 msgstr "找不到自訂欄位"
 
-#: lib/RT/CustomField_Overlay.pm:406 lib/RT/CustomField_Overlay.pm:826
+#: lib/RT/CustomField_Overlay.pm:356
 #. ($args{'Content'}, $self->Name)
 msgid "Custom field value %1 could not be found for custom field %2"
 msgstr "無法從自訂欄位 %2 中找到 %1 這個欄位值"
@@ -1875,19 +1795,19 @@
 msgid "Custom field value changed from %1 to %2"
 msgstr "自訂欄位值從 %1 改為 %2"
 
-#: lib/RT/CustomField_Overlay.pm:300
+#: lib/RT/CustomField_Overlay.pm:256
 msgid "Custom field value could not be deleted"
 msgstr "無法刪除自訂欄位值"
 
-#: lib/RT/CustomField_Overlay.pm:412 lib/RT/CustomField_Overlay.pm:832
+#: lib/RT/CustomField_Overlay.pm:362
 msgid "Custom field value could not be found"
 msgstr "找不到自訂欄位值"
 
-#: lib/RT/CustomField_Overlay.pm:298 lib/RT/CustomField_Overlay.pm:414 lib/RT/CustomField_Overlay.pm:834
+#: lib/RT/CustomField_Overlay.pm:254 lib/RT/CustomField_Overlay.pm:364
 msgid "Custom field value deleted"
 msgstr "自訂欄位值刪除成功"
 
-#: html/Elements/SelectGroups:29 html/Elements/SelectUsers:29 lib/RT/Transaction_Overlay.pm:542
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:145 html/Edit/Global/Workflow/Owner.html:98 lib/RT/Transaction_Overlay.pm:505 lib/RT/Transaction_Vendor.pm:5
 msgid "CustomField"
 msgstr "自訂欄位"
 
@@ -1895,11 +1815,11 @@
 msgid "Data error"
 msgstr "資料錯誤"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Basic/Top:77
 msgid "DatabaseBindRemote"
 msgstr "容許外部連線"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Basic/Top:75
 msgid "DatabaseName"
 msgstr "MySQL資料庫"
 
@@ -1907,7 +1827,7 @@
 msgid "Date of Departure"
 msgstr "出發日期"
 
-#: html/Scope/Elements/ShowSummary:51 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
+#: html/SelfService/Display.html:38 html/Ticket/Create.html:160 html/Ticket/Elements/ShowSummary:54 html/Ticket/Elements/Tabs:98 html/Ticket/ModifyAll.html:43 html/Work/Tickets/Elements/ShowTransaction:17
 msgid "Dates"
 msgstr "日期"
 
@@ -1935,7 +1855,7 @@
 msgid "Default Autoresponse template"
 msgstr "預設自動回應範本"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/CustomField/Top:46
 msgid "Default Value"
 msgstr "預設值"
 
@@ -1955,7 +1875,7 @@
 msgid "Default transaction template"
 msgstr "預設更動範本"
 
-#: lib/RT/Transaction_Overlay.pm:528
+#: lib/RT/Transaction_Overlay.pm:491
 #. ($type, $self->Field, $self->OldValue, $self->NewValue)
 msgid "Default: %1/%2 changed from %3 to %4"
 msgstr "預設:%1/%2 已自 %3 改為 %4"
@@ -1992,7 +1912,7 @@
 msgid "Delegated Type"
 msgstr "代理表單種類"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Users/index.html:98 html/Work/Delegates/Info:31 html/Work/Delegates/List:8 html/Work/Elements/Tab:42 html/Work/Overview/Info:28
 msgid "Delegates"
 msgstr "代理人"
 
@@ -2000,7 +1920,7 @@
 msgid "Delegates Enabled Status"
 msgstr "代理啟動狀態"
 
-#: NOT FOUND IN SOURCE
+#: html/Work/Delegates/Info:18 html/Work/Overview/Info:18
 msgid "Delegates Info"
 msgstr "代理人資訊"
 
@@ -2020,7 +1940,7 @@
 msgid "Delegates Setting"
 msgstr "代理人設定"
 
-#: NOT FOUND IN SOURCE
+#: html/Work/Delegates/Info:46 html/Work/Delegates/List:11 html/Work/Overview/Info:39
 msgid "Delegates Status"
 msgstr "代理狀態"
 
@@ -2036,7 +1956,7 @@
 msgid "Delegation Rights"
 msgstr "代理人權限"
 
-#: html/Admin/Elements/EditScrips:53 html/Search/Elements/EditFormat:70 html/Search/Elements/EditSearches:14
+#: html/Admin/Elements/EditScrips:53 html/Admin/Elements/ModifyTemplateAsWorkflow:113 html/Edit/Elements/104Buttons:84 html/Work/Search/index.html:48 html/Work/Search/index.html:48
 msgid "Delete"
 msgstr "刪除"
 
@@ -2052,7 +1972,7 @@
 msgid "DeleteTicket"
 msgstr "刪除申請單"
 
-#: lib/RT/Transaction_Overlay.pm:173
+#: lib/RT/Transaction_Overlay.pm:136
 msgid "Deleting this object could break referential integrity"
 msgstr "刪除此物件可能破壞參考完整性"
 
@@ -2060,7 +1980,7 @@
 msgid "Deleting this object would break referential integrity"
 msgstr "刪除此物件可能破壞參考完整性"
 
-#: lib/RT/User_Overlay.pm:452
+#: lib/RT/User_Overlay.pm:504
 msgid "Deleting this object would violate referential integrity"
 msgstr "刪除此物件會違反參考完整性"
 
@@ -2080,11 +2000,11 @@
 msgid "Department"
 msgstr "部門"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/UserRight/List:12 html/Edit/Global/UserRight/Top:13
 msgid "Department ID"
 msgstr "部門代碼"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/UserRight/List:11 html/Edit/Global/UserRight/Top:49 html/Work/Delegates/Info:78 html/Work/Overview/Info:60
 msgid "Department Name"
 msgstr "部門名稱"
 
@@ -2108,7 +2028,7 @@
 msgid "Departure Until"
 msgstr "差旅截止日"
 
-#: html/Ticket/Create.html:181 html/Ticket/Elements/BulkLinks:34 html/Ticket/Elements/EditLinks:105 html/Ticket/Elements/EditLinks:44 html/Ticket/Elements/ShowDependencies:31 html/Ticket/Elements/ShowLinks:36
+#: html/Ticket/Create.html:181 html/Ticket/Elements/BulkLinks:34 html/Ticket/Elements/EditLinks:105 html/Ticket/Elements/EditLinks:44 html/Ticket/Elements/ShowDependencies:31 html/Ticket/Elements/ShowLinks:36 html/Work/Search/BulkLinks:10 html/Work/Tickets/Elements/EditLinks:109 html/Work/Tickets/Elements/EditLinks:34 html/Work/Tickets/Elements/ShowLinks:21
 msgid "Depended on by"
 msgstr "可接續處理的申請單"
 
@@ -2116,27 +2036,27 @@
 msgid "Dependencies: \\n"
 msgstr "附屬性:\\n"
 
-#: lib/RT/Transaction_Overlay.pm:622
+#: lib/RT/Transaction_Overlay.pm:585
 #. ($value)
 msgid "Dependency by %1 added"
 msgstr "已加入可接續處理的申請單 %1"
 
-#: lib/RT/Transaction_Overlay.pm:659
+#: lib/RT/Transaction_Overlay.pm:625
 #. ($value)
 msgid "Dependency by %1 deleted"
 msgstr "已移除可接續處理的申請單 %1"
 
-#: lib/RT/Transaction_Overlay.pm:619
+#: lib/RT/Transaction_Overlay.pm:582
 #. ($value)
 msgid "Dependency on %1 added"
 msgstr "已加入需先處理的申請單 %1"
 
-#: lib/RT/Transaction_Overlay.pm:656
+#: lib/RT/Transaction_Overlay.pm:622
 #. ($value)
 msgid "Dependency on %1 deleted"
 msgstr "已移除需先處理的申請單 %1"
 
-#: html/Elements/SelectLinkType:26 html/Ticket/Create.html:180 html/Ticket/Elements/BulkLinks:30 html/Ticket/Elements/EditLinks:101 html/Ticket/Elements/EditLinks:35 html/Ticket/Elements/ShowDependencies:24 html/Ticket/Elements/ShowLinks:26
+#: html/Elements/SelectLinkType:26 html/Ticket/Create.html:180 html/Ticket/Elements/BulkLinks:30 html/Ticket/Elements/EditLinks:101 html/Ticket/Elements/EditLinks:35 html/Ticket/Elements/ShowDependencies:24 html/Ticket/Elements/ShowLinks:26 html/Work/Search/BulkLinks:6 html/Work/Tickets/Elements/EditLinks:105 html/Work/Tickets/Elements/EditLinks:23 html/Work/Tickets/Elements/ShowLinks:16
 msgid "Depends on"
 msgstr "需先處理"
 
@@ -2152,7 +2072,7 @@
 msgid "Describe the issue below"
 msgstr "在以下欄位描述主題"
 
-#: html/Admin/CustomFields/Modify.html:15 html/Admin/Elements/AddCustomFieldValue:35 html/Admin/Elements/EditCustomField:38 html/Admin/Elements/EditCustomFieldValues:34 html/Admin/Elements/EditScrip:33 html/Admin/Elements/ModifyQueue:35 html/Admin/Elements/ModifyTemplate:35 html/Admin/Groups/Modify.html:49 html/Admin/Queues/Modify.html:47 html/Search/Elements/EditSearches:9 html/User/Groups/Modify.html:48
+#: html/Admin/Elements/AddCustomFieldValue:35 html/Admin/Elements/EditCustomField:38 html/Admin/Elements/EditScrip:33 html/Admin/Elements/ModifyQueue:35 html/Admin/Elements/ModifyTemplate:35 html/Admin/Elements/ModifyTemplateAsWorkflow:192 html/Admin/Groups/Modify.html:48 html/Admin/Queues/Modify.html:47 html/Edit/Elements/SelectQueues:4 html/Edit/Global/Workflow/Action:13 html/Elements/SelectGroups:26 html/User/Groups/Modify.html:48
 msgid "Description"
 msgstr "描述"
 
@@ -2164,7 +2084,7 @@
 msgid "Description:"
 msgstr "描述:"
 
-#: NOT FOUND IN SOURCE
+#: html/Work/Tickets/Create.html:131 html/Work/Tickets/Create.html:84 html/Work/Tickets/Elements/EditCustomFields:13 html/Work/Tickets/Elements/EditCustomFields:61 html/Work/Tickets/Elements/ShowCustomFields:14 html/Work/Tickets/Elements/ShowCustomFields:53
 msgid "Details"
 msgstr "細節"
 
@@ -2180,11 +2100,11 @@
 msgid "Disability Type"
 msgstr "殘障類別"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/GroupRight/List:9 html/Edit/Global/GroupRight/Top:16 html/Edit/Groups/List:17 html/Edit/Groups/Top:19 html/Edit/Queues/Basic/Top:69 html/Edit/Queues/List:15 html/Edit/Queues/List:27 html/Work/Delegates/Info:48 html/Work/Delegates/Info:53 html/Work/Delegates/List:12 html/Work/Overview/Info:42
 msgid "Disabled"
 msgstr "停用"
 
-#: html/Ticket/Elements/Tabs:86
+#: html/Ticket/Elements/Tabs:90
 msgid "Display"
 msgstr "顯示內容"
 
@@ -2192,10 +2112,6 @@
 msgid "Display Access Control List"
 msgstr "顯示權限控制清單"
 
-#: html/Search/Elements/DisplayOptions:25
-msgid "Display Columns"
-msgstr ""
-
 #: lib/RT/Queue_Overlay.pm:74
 msgid "Display Scrip templates for this queue"
 msgstr "顯示此表單的範本"
@@ -2204,14 +2120,10 @@
 msgid "Display Scrips for this queue"
 msgstr "顯示此表單的手續"
 
-#: html/Scope/Elements/ShowHistory:34 html/Ticket/Elements/ShowHistory:34
+#: html/Ticket/Elements/ShowHistory:34
 msgid "Display mode"
 msgstr "顯示模式"
 
-#: lib/RT/Group_Overlay.pm:150
-msgid "Display saved searches for this group"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Display ticket #%1"
 msgstr "顯示第%1號申請單"
@@ -2224,27 +2136,23 @@
 msgid "Don't refresh this page."
 msgstr "不更新此頁面。"
 
-#: html/Search/Elements/PickRestriction:114
+#: html/Search/Elements/PickRestriction:114 html/Work/Search/PickRestriction:101
 msgid "Don't show search results"
 msgstr "不顯示查詢結果"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Elements/Page:19 html/Edit/Elements/Page:21
 msgid "Down"
 msgstr "下一頁"
 
-#: html/Scope/Elements/ShowTransaction:93 html/Ticket/Elements/ShowTransaction:98
+#: html/Ticket/Elements/ShowTransaction:111
 msgid "Download"
 msgstr "下載"
 
-#: html/Admin/Groups/index.html:42 html/Admin/Users/index.html:44
-msgid "Download as a tab-delimited file"
-msgstr "下載以 Tab 分隔的資料檔"
-
 #: NOT FOUND IN SOURCE
 msgid "Dr."
 msgstr "博士"
 
-#: html/Elements/SelectDateType:31 html/Projects/Overview.html:15 html/Ticket/Create.html:166 html/Ticket/Elements/EditDates:44 html/Ticket/Elements/ShowDates:43 lib/RT/Ticket_Overlay.pm:1217
+#: html/Elements/SelectDateType:31 html/Ticket/Create.html:166 html/Ticket/Elements/EditDates:44 html/Ticket/Elements/ShowDates:43 html/Work/Tickets/Elements/EditBasics:54 lib/RT/Ticket_Overlay.pm:1221
 msgid "Due"
 msgstr "到期日"
 
@@ -2261,16 +2169,16 @@
 msgid "ERROR: Couldn't load ticket '%1': %2.\\n"
 msgstr "無法載入申請單 '%1':%2.\\n"
 
-#: html/Projects/Elements/OverviewEntry:34
+#: html/Work/Tickets/Update.html:48
 msgid "Edit"
 msgstr "編輯"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:132
 msgid "Edit Conditions"
 msgstr "編輯前置條件"
 
-#: html/Admin/Elements/ObjectCustomFields:49
-#. ($Object->Name)
+#: html/Admin/Queues/CustomFields.html:45
+#. ($Queue->Name)
 msgid "Edit Custom Fields for %1"
 msgstr "編輯 %1 的自訂欄位"
 
@@ -2278,11 +2186,11 @@
 msgid "Edit Custom Fields for queue %1"
 msgstr "編輯表單 %1 的自訂欄位"
 
-#: html/Search/Bulk.html:141 html/Ticket/ModifyLinks.html:35
+#: html/Search/Bulk.html:143 html/Ticket/ModifyLinks.html:35 html/Work/Search/Bulk.html:93
 msgid "Edit Relationships"
 msgstr "編輯申請單關係"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Groups/MemberGroups/Add.html:3 html/Edit/Groups/MemberGroups/index.html:22
 msgid "Edit Subgroups"
 msgstr "新增/維護子群組"
 
@@ -2291,7 +2199,8 @@
 msgid "Edit Templates for queue %1"
 msgstr "編輯表單 %1 的範本"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Queues/Workflows.html:42
+#. ($QueueObj->Name)
 msgid "Edit Workflows for queue %1"
 msgstr "編輯表單 %1 的流程"
 
@@ -2299,10 +2208,6 @@
 msgid "Edit keywords"
 msgstr "編輯關鍵字"
 
-#: lib/RT/Group_Overlay.pm:149
-msgid "Edit saved searches for this group"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Edit scrips"
 msgstr "編輯手續"
@@ -2323,13 +2228,9 @@
 msgid "Edit workflows for %1"
 msgstr "編輯 %1 的流程"
 
-#: lib/RT/Group_Overlay.pm:149
-msgid "EditSavedSearches"
-msgstr ""
-
 #: html/Admin/Elements/ModifyQueue:24 html/Admin/Queues/Modify.html:118
-#. ($QueueObj->Id)
 #. ($QueueObj->Name)
+#. ($QueueObj->Id)
 msgid "Editing Configuration for queue %1"
 msgstr "編輯表單 %1 的設定"
 
@@ -2338,7 +2239,7 @@
 msgid "Editing Configuration for user %1"
 msgstr "編輯使用者 %1 的設定"
 
-#: html/Admin/CustomFields/Modify.html:79 html/Admin/Elements/EditCustomField:90
+#: html/Admin/Elements/EditCustomField:90
 #. ($CustomFieldObj->Name())
 msgid "Editing CustomField %1"
 msgstr "編輯自訂欄位 %1"
@@ -2357,7 +2258,8 @@
 msgid "Editing template %1"
 msgstr "編輯範本 %1"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/ModifyWorkflow:238
+#. (loc( $WorkflowObj->Name() ))
 msgid "Editing workflow %1"
 msgstr "編輯流程 %1"
 
@@ -2369,19 +2271,19 @@
 msgid "EffectiveId"
 msgstr "有效編號"
 
-#: lib/RT/Ticket_Overlay.pm:2786 lib/RT/Ticket_Overlay.pm:2864
+#: lib/RT/Ticket_Overlay.pm:2681 lib/RT/Ticket_Overlay.pm:2759
 msgid "Either base or target must be specified"
 msgstr "需要指定起始申請單或目的申請單"
 
-#: html/Admin/Users/Modify.html:52 html/Admin/Users/Prefs.html:45 html/Ticket/Elements/AddWatchers:55 html/User/Prefs.html:43
+#: html/Admin/Users/Modify.html:52 html/Admin/Users/Prefs.html:45 html/Edit/Elements/SelectUsers:4 html/Edit/Users/List:7 html/Elements/SelectUsers:26 html/Ticket/Elements/AddWatchers:55 html/User/Prefs.html:43 html/Work/Delegates/Info:96 html/Work/Overview/Info:78
 msgid "Email"
 msgstr "電子郵件信箱"
 
-#: NOT FOUND IN SOURCE
+#: html/Work/Preferences/Info:16
 msgid "Email Address"
 msgstr "電子郵件信箱"
 
-#: lib/RT/User_Overlay.pm:199
+#: lib/RT/User_Overlay.pm:251
 msgid "Email address in use"
 msgstr "此電子郵件信箱已被使用"
 
@@ -2409,11 +2311,11 @@
 msgid "Enable Delegates"
 msgstr "代理啟動"
 
-#: html/Admin/CustomFields/Modify.html:37 html/Admin/Elements/EditCustomField:50
+#: html/Admin/Elements/EditCustomField:50
 msgid "Enabled (Unchecking this box disables this custom field)"
 msgstr "啟用(取消勾選將停用此自訂欄位)"
 
-#: html/Admin/Groups/Modify.html:62 html/User/Groups/Modify.html:52
+#: html/Admin/Groups/Modify.html:52 html/User/Groups/Modify.html:52
 msgid "Enabled (Unchecking this box disables this group)"
 msgstr "啟用(取消勾選將停用此群組)"
 
@@ -2421,11 +2323,11 @@
 msgid "Enabled (Unchecking this box disables this queue)"
 msgstr "啟用(取消勾選將停用此表單)"
 
-#: html/Admin/Elements/EditCustomFields:72
+#: html/Admin/Elements/EditCustomFields:97
 msgid "Enabled Custom Fields"
 msgstr "已啟用的自訂欄位"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Queues/Basic/Top:74 html/Edit/Queues/List:17 html/Edit/Queues/List:29
 msgid "Enabled Date"
 msgstr "啟用日期"
 
@@ -2437,20 +2339,15 @@
 msgid "Enabled Queues"
 msgstr "已啟用的表單"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Queues/Basic/Top:65 html/Edit/Queues/List:13 html/Edit/Queues/List:25
 msgid "Enabled Status"
 msgstr "啟用狀態"
 
-#: html/Admin/Elements/EditCustomField:106 html/Admin/Groups/Modify.html:127 html/Admin/Users/Modify.html:300 html/User/Groups/Modify.html:116
+#: html/Admin/Elements/EditCustomField:106 html/Admin/Groups/Modify.html:116 html/Admin/Queues/Modify.html:140 html/Admin/Users/Modify.html:284 html/User/Groups/Modify.html:116
 #. (loc_fuzzy($msg))
 msgid "Enabled status %1"
 msgstr "啟用狀態 %1"
 
-#: html/Admin/CustomFields/Modify.html:97 html/Admin/Queues/Modify.html:140
-#. (loc_fuzzy($msg))
-msgid "Enabled status: %1"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "End of Trial"
 msgstr "試用期滿日"
@@ -2459,31 +2356,27 @@
 msgid "English Name"
 msgstr "英文姓名"
 
-#: lib/RT/CustomField_Overlay.pm:476
+#: lib/RT/CustomField_Overlay.pm:434
 msgid "Enter multiple values"
-msgstr "鍵入多個項目"
+msgstr "鍵入多重項目"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Users/Search.html:15
 msgid "Enter one or more conditions below to search for users"
 msgstr "輸入下列單一或複式條件,查詢用戶資料"
 
-#: lib/RT/CustomField_Overlay.pm:477
+#: lib/RT/CustomField_Overlay.pm:431
 msgid "Enter one value"
 msgstr "鍵入單一項目"
 
-#: html/Search/Bulk.html:142 html/Ticket/Elements/EditLinks:94
+#: html/Search/Bulk.html:144 html/Ticket/Elements/EditLinks:94 html/Work/Search/Bulk.html:95 html/Work/Tickets/Elements/EditLinks:98
 msgid "Enter tickets or URIs to link tickets to. Seperate multiple entries with spaces."
 msgstr "輸入申請單可鏈結到的申請單編號或網址。以空白隔開。"
 
-#: lib/RT/CustomField_Overlay.pm:478
-msgid "Enter up to %1 values"
-msgstr "鍵入最多 %1 個項目"
-
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Vendor.pm:20
 msgid "EntryBoolean"
 msgstr "是非填表"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Vendor.pm:17
 msgid "EntryDate"
 msgstr "日期填表"
 
@@ -2491,7 +2384,7 @@
 msgid "EntryExternal"
 msgstr "系統填表"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Vendor.pm:16
 msgid "EntryFreeform"
 msgstr "輸入填表"
 
@@ -2499,15 +2392,15 @@
 msgid "EntryMultiple"
 msgstr "多選填表"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Vendor.pm:19
 msgid "EntryNumber"
 msgstr "數值填表"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Vendor.pm:15
 msgid "EntrySelect"
 msgstr "單選填表"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Vendor.pm:18
 msgid "EntryTime"
 msgstr "時間填表"
 
@@ -2519,15 +2412,15 @@
 msgid "Error adding watcher"
 msgstr "新增視察員失敗"
 
-#: lib/RT/Queue_Overlay.pm:563
+#: lib/RT/Queue_Overlay.pm:555
 msgid "Error in parameters to Queue->AddWatcher"
 msgstr "表單->新增視察員的參數有誤"
 
-#: lib/RT/Queue_Overlay.pm:721
+#: lib/RT/Queue_Overlay.pm:713
 msgid "Error in parameters to Queue->DelWatcher"
 msgstr "表單->刪除視察員的參數有誤"
 
-#: lib/RT/Ticket_Overlay.pm:1402
+#: lib/RT/Ticket_Overlay.pm:1407
 msgid "Error in parameters to Ticket->AddWatcher"
 msgstr "申請單->新增視察員的參數有誤"
 
@@ -2537,15 +2430,7 @@
 
 #: bin/rt-crontool:209
 msgid "Escalate tickets"
-msgstr ""
-
-#: html/Projects/Overview.html:17
-msgid "Estimate"
-msgstr ""
-
-#: html/Ticket/Elements/ShowBasics:35
-msgid "Estimated"
-msgstr ""
+msgstr "調整申請單優先等級"
 
 #: etc/initialdata:20
 msgid "Everyone"
@@ -2559,7 +2444,7 @@
 msgid "Existing user renamed from %1 to %2"
 msgstr "現有使用者 %1 已改名為 %2"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Elements/104Buttons:88
 msgid "Export"
 msgstr "匯出"
 
@@ -2571,31 +2456,31 @@
 msgid "ExternalContactInfoId"
 msgstr "外部聯絡方式帳號"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Basic/Top:69
 msgid "ExternalDatabaseDSN"
 msgstr "外部資料庫連結字串"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Basic/Top:73
 msgid "ExternalDatabasePass"
 msgstr "外部資料庫密碼"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Basic/Top:71
 msgid "ExternalDatabaseUser"
 msgstr "外部資料庫用戶"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Basic/Top:67
 msgid "ExternalURL"
 msgstr "外部介面網址"
 
-#: html/Admin/Users/Modify.html:72
+#: html/Admin/Users/Modify.html:72 html/Edit/Users/Info:85
 msgid "Extra info"
 msgstr "備註"
 
-#: lib/RT/User_Overlay.pm:316
+#: lib/RT/User_Overlay.pm:368
 msgid "Failed to find 'Privileged' users pseudogroup."
 msgstr "找不到「內部成員」虛擬群組的使用者。"
 
-#: lib/RT/User_Overlay.pm:323
+#: lib/RT/User_Overlay.pm:375
 msgid "Failed to find 'Unprivileged' users pseudogroup"
 msgstr "找不到「非內部成員」虛擬群組的使用者。"
 
@@ -2620,47 +2505,31 @@
 msgid "Female"
 msgstr "女"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/CustomField/Info:14
 msgid "Field Content:"
 msgstr "欄位內容:"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/CustomField/List:7 html/Edit/Global/CustomField/Top:20
 msgid "Field Description"
 msgstr "欄位描述"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/CustomField/List:6 html/Edit/Global/CustomField/Top:14
 msgid "Field Name"
 msgstr "欄位名稱"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/CustomField/List:5 html/Edit/Global/CustomField/Top:9
 msgid "Field Type"
-msgstr "欄位屬性"
-
-#: html/Elements/SelectAttachmentField:28
-msgid "Filename"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:481
-msgid "Fill in multiple text areas"
-msgstr "填入多個文字方塊"
-
-#: lib/RT/CustomField_Overlay.pm:482
-msgid "Fill in one text area"
-msgstr "填入單一文字方塊"
-
-#: lib/RT/CustomField_Overlay.pm:483
-msgid "Fill in up to %1 text areas"
-msgstr "填入最多 %1 個文字方塊"
+msgstr "欄位類別"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Elements/PickUsers:60 html/Edit/Users/Add.html:47
 msgid "Filter"
 msgstr "篩選"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Elements/PickUsers:6 html/Edit/Users/Add.html:7 html/Work/Tickets/Cc:4
 msgid "Filter people"
 msgstr "對象篩選"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Elements/PickUsers:76 html/Edit/Users/Add.html:63 html/Work/Tickets/Cc:42
 msgid "Filtered list:"
 msgstr "篩選列表:"
 
@@ -2668,11 +2537,11 @@
 msgid "Fin"
 msgstr "最終"
 
-#: html/Search/Elements/PickBasics:60 html/Ticket/Create.html:154 html/Ticket/Elements/EditBasics:57 lib/RT/Tickets_Overlay.pm:1155
+#: html/Ticket/Create.html:154 html/Ticket/Elements/EditBasics:58 html/Work/Tickets/Elements/EditBasics:52 lib/RT/Tickets_Overlay.pm:1152
 msgid "Final Priority"
 msgstr "最終順位"
 
-#: lib/RT/Ticket_Overlay.pm:1208
+#: lib/RT/Ticket_Overlay.pm:1212
 msgid "FinalPriority"
 msgstr "最終順位"
 
@@ -2680,39 +2549,39 @@
 msgid "Financial Department:"
 msgstr "財務部:"
 
-#: html/Admin/Groups/index.html:47 html/Admin/Queues/People.html:60 html/Ticket/Elements/EditPeople:33
-msgid "Find groups whose"
+#: html/Admin/Queues/People.html:60 html/Ticket/Elements/EditPeople:33 html/Work/Tickets/Elements/EditPeople:18
+msgid "Find group whose"
 msgstr "尋找群組的"
 
 #: NOT FOUND IN SOURCE
 msgid "Find new/open tickets"
 msgstr "尋找/開啟申請單"
 
-#: html/Admin/Queues/People.html:56 html/Admin/Users/index.html:50 html/Ticket/Elements/EditPeople:29
+#: html/Admin/Queues/People.html:56 html/Admin/Users/index.html:45 html/Edit/Users/Top:6 html/Ticket/Elements/EditPeople:29 html/Work/Tickets/Elements/EditPeople:14
 msgid "Find people whose"
 msgstr "尋找人員的"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Queues/Top:6
 msgid "Find queues whose"
 msgstr "尋找表單的"
 
-#: html/Search/Listing.html:73 html/Search/Results.html:59
+#: html/Search/Listing.html:107 html/Work/Search/index.html:88
 msgid "Find tickets"
 msgstr "尋找申請單"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:118
 msgid "Finish Approval"
 msgstr "簽核完畢"
 
-#: html/Ticket/Elements/Tabs:59
+#: html/Ticket/Elements/Tabs:63
 msgid "First"
 msgstr "第一項"
 
-#: NOT FOUND IN SOURCE
+#: html/Search/Listing.html:40 html/Work/Search/index.html:17
 msgid "First page"
 msgstr "第一頁"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Workflow/Owner.html:30
 msgid "First-"
 msgstr "一"
 
@@ -2736,36 +2605,32 @@
 msgid "Foo!"
 msgstr "甲!"
 
-#: html/Search/Bulk.html:84
+#: html/Search/Bulk.html:86 html/Work/Search/Bulk.html:55
 msgid "Force change"
 msgstr "強制更換"
 
-#: NOT FOUND IN SOURCE
+#: html/Work/Elements/104Header:89
 msgid "Form Processing"
 msgstr "電子表單作業區"
 
-#: html/Search/Listing.html:71 html/Search/Results.html:57
+#: html/Search/Listing.html:105 html/Work/Search/index.html:86
 #. ($ticketcount)
 msgid "Found %quant(%1,ticket)"
 msgstr "找到 %1 張申請單"
 
-#: lib/RT/Interface/Web.pm:964
+#: lib/RT/Interface/Web.pm:966
 msgid "Found Object"
 msgstr "已找到物件"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Workflow/Owner.html:33
 msgid "Fourth-"
 msgstr "四"
 
-#: lib/RT/CustomField_Overlay.pm:34
-msgid "Freeform"
-msgstr ""
-
 #: html/Admin/Elements/ModifyUser:43
 msgid "FreeformContactInfo"
 msgstr "聯絡方式"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Vendor.pm:11
 msgid "FreeformDate"
 msgstr "日期輸入"
 
@@ -2773,23 +2638,23 @@
 msgid "FreeformExternal"
 msgstr "系統欄位"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Overlay.pm:37
 msgid "FreeformMultiple"
 msgstr "多重輸入"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Vendor.pm:13
 msgid "FreeformNumber"
 msgstr "數值輸入"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Vendor.pm:14
 msgid "FreeformPassword"
 msgstr "密碼輸入"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Overlay.pm:36
 msgid "FreeformSingle"
 msgstr "單一輸入"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Vendor.pm:12
 msgid "FreeformTime"
 msgstr "時間輸入"
 
@@ -2801,7 +2666,7 @@
 msgid "Fri."
 msgstr "星期五"
 
-#: html/Scope/Elements/ShowHistory:40 html/Scope/Elements/ShowHistory:50 html/Ticket/Elements/ShowHistory:40 html/Ticket/Elements/ShowHistory:50
+#: html/Ticket/Elements/ShowHistory:40 html/Ticket/Elements/ShowHistory:50
 msgid "Full headers"
 msgstr "完整標頭檔"
 
@@ -2817,12 +2682,12 @@
 msgid "Getting the current user from a pgp sig\\n"
 msgstr "取得目前使用者的 pgp 簽章\\n"
 
-#: lib/RT/Transaction_Overlay.pm:588
+#: lib/RT/Transaction_Overlay.pm:551
 #. ($New->Name)
 msgid "Given to %1"
 msgstr "交予 %1"
 
-#: html/Admin/Elements/Tabs:43 html/Admin/index.html:40
+#: html/Admin/Elements/Tabs:40 html/Admin/index.html:37
 msgid "Global"
 msgstr "全域設定"
 
@@ -2830,15 +2695,11 @@
 msgid "Global Approval"
 msgstr "全域簽核"
 
-#: html/Admin/Elements/EditCustomFields:44
-msgid "Global Custom Fields"
-msgstr "全域自訂欄位"
-
 #: NOT FOUND IN SOURCE
 msgid "Global Keyword Selections"
 msgstr "全域關鍵字選取"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Users/System:24
 msgid "Global Rights:"
 msgstr "擁有全域權限列表:"
 
@@ -2846,11 +2707,11 @@
 msgid "Global Scrips"
 msgstr "全域手續"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Elements/Tab:40
 msgid "Global Setup"
 msgstr "全域設定"
 
-#: html/Admin/Elements/SelectTemplate:37
+#: html/Admin/Elements/SelectTemplate:37 html/Edit/Elements/SelectTemplate:11
 #. (loc($Template->Name))
 msgid "Global template: %1"
 msgstr "全域範本:%1"
@@ -2859,11 +2720,7 @@
 msgid "GlobalApproval"
 msgstr "全域簽核"
 
-#: html/Scope/Search.html:139
-msgid "Go"
-msgstr "執行"
-
-#: html/Admin/Elements/EditCustomFields:35 html/Admin/Groups/index.html:48 html/Admin/Queues/People.html:58 html/Admin/Queues/People.html:62 html/Admin/Queues/index.html:43 html/Admin/Users/index.html:53 html/Ticket/Elements/EditPeople:31 html/Ticket/Elements/EditPeople:35 html/index.html:43
+#: html/Admin/Elements/EditCustomFields:73 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/Work/Tickets/Elements/EditPeople:16 html/Work/Tickets/Elements/EditPeople:20 html/index.html:40
 msgid "Go!"
 msgstr "執行"
 
@@ -2871,15 +2728,15 @@
 msgid "Good pgp sig from %1\\n"
 msgstr "%1 的 pgp 簽章是正確的\\n"
 
-#: NOT FOUND IN SOURCE
+#: html/Search/Listing.html:49
 msgid "Goto page"
 msgstr "到頁面"
 
-#: html/Elements/GotoTicket:24 html/SelfService/Elements/GotoTicket:24
+#: html/Elements/GotoTicket:24 html/SelfService/Elements/GotoTicket:24 html/Work/Elements/104Header:49
 msgid "Goto ticket"
 msgstr "跳到申請單"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:224
 msgid "Grand"
 msgstr "上"
 
@@ -2895,7 +2752,7 @@
 msgid "Group Admin"
 msgstr "群組管理員"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/GroupRight/List:5 html/Edit/Global/GroupRight/Top:20 html/Edit/Groups/List:8
 msgid "Group Description"
 msgstr "群組描述"
 
@@ -2907,7 +2764,7 @@
 msgid "Group Members"
 msgstr "群組成員"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Elements/PickUsers:30 html/Edit/Global/GroupRight/List:4 html/Edit/Global/GroupRight/Top:10 html/Edit/Groups/List:6 html/Edit/Groups/Top:7 html/Edit/Queues/Basic/Add.html:15 html/Edit/Users/Add.html:29 html/Edit/Users/Group:10 html/Edit/Users/Search.html:43 html/Work/Approvals/Add.html:16 html/Work/Delegates/Add.html:16 html/Work/Tickets/Cc:24
 msgid "Group Name"
 msgstr "群組名稱"
 
@@ -2915,7 +2772,7 @@
 msgid "Group Name:"
 msgstr "群組名稱:"
 
-#: html/Admin/Elements/CustomFieldTabs:23 html/Admin/Elements/GroupTabs:44 html/Admin/Elements/QueueTabs:56 html/Admin/Elements/SystemTabs:43 html/Admin/Global/index.html:54
+#: html/Admin/Elements/GroupTabs:44 html/Admin/Elements/QueueTabs:56 html/Admin/Elements/SystemTabs:43 html/Admin/Global/index.html:54 html/Edit/Global/autohandler:12 html/Edit/Queues/autohandler:29 html/Edit/Users/Group:11 html/Edit/Users/index.html:96
 msgid "Group Rights"
 msgstr "群組權限"
 
@@ -2923,15 +2780,15 @@
 msgid "Group Rights:"
 msgstr "擁有群組權限列表:"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Elements/Tab:36
 msgid "Group Setup"
 msgstr "群組設定"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/GroupRight/List:8 html/Edit/Global/GroupRight/Top:14 html/Edit/Groups/List:16 html/Edit/Groups/Top:15
 msgid "Group Status"
 msgstr "群組狀態"
 
-#: lib/RT/Group_Overlay.pm:964
+#: lib/RT/Group_Overlay.pm:956
 msgid "Group already has member"
 msgstr "群組內已有此成員"
 
@@ -2939,7 +2796,7 @@
 msgid "Group could not be created."
 msgstr "無法新增群組"
 
-#: html/Admin/Groups/Modify.html:86
+#: html/Admin/Groups/Modify.html:76
 #. ($create_msg)
 msgid "Group could not be created: %1"
 msgstr "無法新增群組:%1"
@@ -2952,11 +2809,11 @@
 msgid "Group created: %1"
 msgstr "群組 %1 新增完畢"
 
-#: lib/RT/Group_Overlay.pm:1136
+#: lib/RT/Group_Overlay.pm:1128
 msgid "Group has no such member"
 msgstr "群組沒有這個成員"
 
-#: lib/RT/Group_Overlay.pm:944 lib/RT/Queue_Overlay.pm:636 lib/RT/Queue_Overlay.pm:696 lib/RT/Ticket_Overlay.pm:1456 lib/RT/Ticket_Overlay.pm:1536
+#: lib/RT/Group_Overlay.pm:936 lib/RT/Queue_Overlay.pm:628 lib/RT/Queue_Overlay.pm:688 lib/RT/Ticket_Overlay.pm:1461 lib/RT/Ticket_Overlay.pm:1539
 msgid "Group not found"
 msgstr "找不到群組"
 
@@ -2980,7 +2837,7 @@
 msgid "Group with Queue Rights"
 msgstr "擁有表單權限群組"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Workflow/Owner.html:78
 msgid "Group's"
 msgstr "群組之"
 
@@ -2988,30 +2845,26 @@
 msgid "Group:"
 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/Users/Memberships.html:31 html/Admin/index.html:31 html/User/Groups/Members.html:66
+#: 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/Edit/Global/GroupRight/Add.html:16 html/Edit/Groups/Admin:12 html/User/Groups/Members.html:66
 msgid "Groups"
 msgstr "群組"
 
-#: lib/RT/Group_Overlay.pm:970
+#: lib/RT/Group_Overlay.pm:962
 msgid "Groups can't be members of their members"
 msgstr "不能將群組設為群組內成員"
 
-#: html/Admin/Groups/index.html:57
-msgid "Groups matching search criteria"
-msgstr "符合查詢條件的群組"
-
-#: html/Ticket/Elements/ShowRequestor:53
-msgid "Groups this user belongs to"
-msgstr "此使用者所屬的群組"
-
 #: NOT FOUND IN SOURCE
 msgid "Groups with Global Rights"
 msgstr "擁有全域權限群組"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/GroupRight/List:6 html/Edit/Global/GroupRight/Top:22 html/Edit/Groups/List:10
 msgid "HRMSDefined"
 msgstr "組織架構"
 
+#: html/Edit/Global/CustomField/Top:57
+msgid "HTML Attributes"
+msgstr "HTML 屬性"
+
 #: NOT FOUND IN SOURCE
 msgid "Health Insurance"
 msgstr "健保補助身份"
@@ -3025,7 +2878,7 @@
 msgid "Hello, %1"
 msgstr "嗨,%1"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Elements/104Top:28
 msgid "Help"
 msgstr "說明"
 
@@ -3033,29 +2886,19 @@
 msgid "Help Desks"
 msgstr "各項業務窗口"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/CustomField/SelectWritable:7 html/Edit/Queues/Basic/Top:80
 msgid "Hidden"
 msgstr "隱藏"
 
-#: html/Admin/Elements/GroupTabs:48 html/Admin/Elements/UserTabs:43 html/Scope/Elements/ShowHistory:29 html/Ticket/Elements/ShowHistory:29 html/Ticket/Elements/Tabs:89
+#: html/Ticket/Elements/ShowHistory:29 html/Ticket/Elements/Tabs:93 html/Work/Tickets/Elements/ShowHistory:8
 msgid "History"
 msgstr "紀錄"
 
-#: html/Admin/Groups/History.html:40
-#. ($GroupObj->Name)
-msgid "History of the group %1"
-msgstr "群組 %1 的紀錄"
-
-#: html/Admin/Users/History.html:40
-#. ($UserObj->Name)
-msgid "History of the user %1"
-msgstr "使用者 %1 的紀錄"
-
 #: html/Admin/Elements/ModifyUser:67
 msgid "HomePhone"
 msgstr "住處電話"
 
-#: html/Elements/Tabs:43
+#: html/Edit/Elements/104Top:15 html/Edit/Elements/104Top:24 html/Edit/Elements/EDOMHeader:9 html/Elements/Tabs:43
 msgid "Homepage"
 msgstr "主頁"
 
@@ -3076,15 +2919,15 @@
 msgid "ID Type"
 msgstr "身分類別"
 
-#: html/Search/Elements/PickBasics:104 html/Ticket/Elements/ShowBasics:26 lib/RT/Tickets_Overlay.pm:1082
+#: html/Ticket/Elements/ShowBasics:26 lib/RT/Tickets_Overlay.pm:1079
 msgid "Id"
 msgstr "編號"
 
-#: html/Admin/Users/Modify.html:43 html/User/Prefs.html:38
+#: html/Admin/Users/Modify.html:43 html/User/Prefs.html:38 html/Work/Preferences/Info:14
 msgid "Identity"
 msgstr "身份"
 
-#: etc/initialdata:411 etc/upgrade/2.1.71:86
+#: etc/initialdata:411 etc/upgrade/2.1.71:86 html/Edit/Elements/CreateApprovalsQueue:58
 msgid "If an approval is rejected, reject the original and delete pending approvals"
 msgstr "若簽核單遭到駁回,則連帶駁回原申請單,並刪除其他相關的待簽核事項"
 
@@ -3096,31 +2939,27 @@
 msgid "If you've updated anything above, be sure to"
 msgstr "若您已更新以上資料,請記得按一下"
 
-#: lib/RT/Interface/Web.pm:956
+#: lib/RT/Interface/Web.pm:958
 msgid "Illegal value for %1"
 msgstr "%1 的值錯誤"
 
-#: lib/RT/CustomField_Overlay.pm:37
-msgid "Image"
-msgstr "圖片"
-
-#: lib/RT/Interface/Web.pm:959
+#: lib/RT/Interface/Web.pm:961
 msgid "Immutable field"
 msgstr "此欄位值不可更動"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Elements/104Buttons:87 html/Edit/Global/Workflow/Import.html:2
 msgid "Import"
 msgstr "匯入"
 
-#: html/Admin/Elements/EditCustomFields:34
+#: html/Admin/Elements/EditCustomFields:72
 msgid "Include disabled custom fields in listing."
 msgstr "列出停用的自訂欄位"
 
-#: html/Admin/Queues/index.html:42
+#: html/Admin/Queues/index.html:42 html/Edit/Queues/Top:9
 msgid "Include disabled queues in listing."
 msgstr "列出停用的表單"
 
-#: html/Admin/Users/index.html:51
+#: html/Admin/Users/index.html:46 html/Edit/Users/Search.html:62 html/Edit/Users/Top:9
 msgid "Include disabled users in search."
 msgstr "列出停用的使用者"
 
@@ -3128,15 +2967,15 @@
 msgid "Indirect Employee"
 msgstr "直接/間接員工"
 
-#: html/Search/Elements/PickBasics:59 lib/RT/Tickets_Overlay.pm:1131
+#: lib/RT/Tickets_Overlay.pm:1128
 msgid "Initial Priority"
 msgstr "初始優先順位"
 
-#: lib/RT/Ticket_Overlay.pm:1207 lib/RT/Ticket_Overlay.pm:1209
+#: lib/RT/Ticket_Overlay.pm:1211 lib/RT/Ticket_Overlay.pm:1213
 msgid "InitialPriority"
 msgstr "初始優先順位"
 
-#: lib/RT/ScripAction_Overlay.pm:97
+#: lib/RT/ScripAction_Overlay.pm:105 lib/RT/Workflow.pm:190
 msgid "Input error"
 msgstr "輸入錯誤"
 
@@ -3144,11 +2983,11 @@
 msgid "Interest noted"
 msgstr "登記成功"
 
-#: lib/RT/Ticket_Overlay.pm:3670
+#: lib/RT/Ticket_Overlay.pm:3931
 msgid "Internal Error"
 msgstr "內部錯誤"
 
-#: lib/RT/Record.pm:186
+#: lib/RT/Record.pm:143
 #. ($id->{error_message})
 msgid "Internal Error: %1"
 msgstr "內部錯誤:%1"
@@ -3165,11 +3004,11 @@
 msgid "Invalid Type"
 msgstr "錯誤的類型"
 
-#: lib/RT/Interface/Web.pm:961
+#: lib/RT/Interface/Web.pm:963
 msgid "Invalid data"
 msgstr "錯誤的資料"
 
-#: lib/RT/Ticket_Overlay.pm:464
+#: lib/RT/Ticket_Overlay.pm:468
 msgid "Invalid owner. Defaulting to 'nobody'."
 msgstr "錯誤的承辦人。改為預設承辦人「nobody」。"
 
@@ -3181,16 +3020,16 @@
 msgid "Invalid right"
 msgstr "錯誤的權限"
 
-#: lib/RT/Record.pm:161
+#: lib/RT/Record.pm:118
 #. ($key)
 msgid "Invalid value for %1"
 msgstr "%1 的值錯誤"
 
-#: lib/RT/Record.pm:753
+#: lib/RT/Ticket_Overlay.pm:3529
 msgid "Invalid value for custom field"
 msgstr "錯誤的自訂欄位值"
 
-#: lib/RT/Ticket_Overlay.pm:366
+#: lib/RT/Ticket_Overlay.pm:370
 msgid "Invalid value for status"
 msgstr "錯誤的狀態值"
 
@@ -3238,7 +3077,7 @@
 msgid "Job"
 msgstr "職稱"
 
-#: lib/RT/Group_Overlay.pm:148
+#: lib/RT/Group_Overlay.pm:149
 msgid "Join or leave this group"
 msgstr "加入或離開此群組"
 
@@ -3254,7 +3093,7 @@
 msgid "July"
 msgstr "七月"
 
-#: html/Ticket/Elements/Tabs:100
+#: html/Ticket/Elements/Tabs:104
 msgid "Jumbo"
 msgstr "全部資訊"
 
@@ -3274,19 +3113,19 @@
 msgid "Keyword"
 msgstr "關鍵字"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Vendor.pm:23
 msgid "LabelAttachments"
 msgstr "附件標籤"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Vendor.pm:24
 msgid "LabelContent"
 msgstr "內容標籤"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Vendor.pm:22
 msgid "LabelSubject"
 msgstr "主題標籤"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/CustomField_Vendor.pm:21
 msgid "LabelURL"
 msgstr "鏈結標籤"
 
@@ -3294,15 +3133,15 @@
 msgid "Lang"
 msgstr "使用語言"
 
-#: html/User/Prefs.html:54
+#: html/User/Prefs.html:54 html/Work/Preferences/Info:32
 msgid "Language"
 msgstr "語言"
 
-#: html/Ticket/Elements/Tabs:74
+#: html/Ticket/Elements/Tabs:78
 msgid "Last"
 msgstr "上次更新"
 
-#: html/Ticket/Elements/EditDates:37 html/Ticket/Elements/ShowDates:39
+#: html/Ticket/Elements/EditDates:37 html/Ticket/Elements/ShowDates:39 html/Work/Tickets/Elements/EditBasics:44
 msgid "Last Contact"
 msgstr "上次聯絡"
 
@@ -3310,7 +3149,7 @@
 msgid "Last Contacted"
 msgstr "上次聯絡日期"
 
-#: html/Search/Elements/TicketHeader:40
+#: html/Search/Elements/TicketHeader:40 html/Work/Search/TicketHeader:19
 msgid "Last Notified"
 msgstr "上次通知"
 
@@ -3322,19 +3161,15 @@
 msgid "LastUpdated"
 msgstr "上次更新"
 
-#: html/Search/Elements/PickBasics:116
-msgid "LastUpdatedBy"
-msgstr ""
-
-#: html/Projects/Overview.html:18 html/Ticket/Elements/ShowBasics:46
+#: NOT FOUND IN SOURCE
 msgid "Left"
 msgstr "剩餘時間"
 
-#: html/Admin/Users/Modify.html:82
+#: html/Admin/Users/Modify.html:82 html/Edit/Users/Info:107
 msgid "Let this user access RT"
 msgstr "允許這名使用者登入"
 
-#: html/Admin/Users/Modify.html:86
+#: html/Admin/Users/Modify.html:86 html/Edit/Users/Info:113
 msgid "Let this user be granted rights"
 msgstr "內部成員(具有個人權限)"
 
@@ -3346,29 +3181,29 @@
 msgid "Limiting queue to %1 %2"
 msgstr "限制表單為 %1 到 %2"
 
-#: NOT FOUND IN SOURCE
+#: html/Work/Queues/Select.html:4
 msgid "Link a Queue"
 msgstr "申請表單連結"
 
-#: lib/RT/Ticket_Overlay.pm:2878
+#: lib/RT/Ticket_Overlay.pm:2773
 msgid "Link already exists"
 msgstr "此鏈結已存在"
 
-#: lib/RT/Ticket_Overlay.pm:2890
+#: lib/RT/Ticket_Overlay.pm:2785
 msgid "Link could not be created"
 msgstr "無法新增鏈結"
 
-#: lib/RT/Ticket_Overlay.pm:2898 lib/RT/Ticket_Overlay.pm:2910
+#: lib/RT/Ticket_Overlay.pm:2793 lib/RT/Ticket_Overlay.pm:2805
 #. ($TransString)
 msgid "Link created (%1)"
 msgstr "鏈結(%1)新增完畢"
 
-#: lib/RT/Ticket_Overlay.pm:2811
+#: lib/RT/Ticket_Overlay.pm:2706
 #. ($TransString)
 msgid "Link deleted (%1)"
 msgstr "鏈結(%1)刪除完畢"
 
-#: lib/RT/Ticket_Overlay.pm:2817
+#: lib/RT/Ticket_Overlay.pm:2712
 msgid "Link not found"
 msgstr "找不到鏈結"
 
@@ -3381,23 +3216,15 @@
 msgid "Link ticket %1"
 msgstr "鏈結申請單 %1"
 
-#: html/Ticket/Elements/Tabs:98
+#: html/Ticket/Elements/Tabs:102
 msgid "Links"
 msgstr "鏈結"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Users/Search.html:11
 msgid "List All Users"
 msgstr "列出所有用戶資料"
 
-#: html/Search/Elements/EditSearches:23
-msgid "Load"
-msgstr ""
-
-#: html/Search/Elements/EditSearches:21
-msgid "Load saved search:"
-msgstr ""
-
-#: html/Admin/Users/Modify.html:113 html/User/Prefs.html:107
+#: html/Admin/Users/Modify.html:113 html/User/Prefs.html:107 html/Work/Preferences/Info:78
 msgid "Location"
 msgstr "位置"
 
@@ -3406,24 +3233,24 @@
 msgid "Log directory %1 not found or couldn't be written.\\n RT can't run."
 msgstr "登入目錄 %1 找不到或無法寫入\\n。無法執行 RT。"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Basic/Top:57
 msgid "LogToFile"
 msgstr "紀錄等級"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Basic/Top:59
 msgid "LogToFileNamed"
 msgstr "紀錄檔名"
 
-#: html/Elements/Header:69
+#: html/Elements/Header:57
 #. ("<b>".$session{'CurrentUser'}->Name."</b>")
 msgid "Logged in as %1"
 msgstr "使用者:%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
+#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:35 html/Elements/Login:44 html/Elements/Login:60 lib/RT/StyleGuide.pod:777
 msgid "Login"
 msgstr "登入"
 
-#: html/Elements/Header:66
+#: html/Edit/Elements/104Top:17 html/Edit/Elements/104Top:17 html/Edit/Elements/104Top:32 html/Elements/Header:54
 msgid "Logout"
 msgstr "登出"
 
@@ -3431,47 +3258,43 @@
 msgid "Long-term contractor"
 msgstr "長期契約員工"
 
-#: lib/RT/CustomField_Overlay.pm:721
-msgid "Lookup type mismatch"
-msgstr ""
-
-#: html/Search/Bulk.html:83
+#: html/Search/Bulk.html:85 html/Work/Search/Bulk.html:54
 msgid "Make Owner"
 msgstr "新增承辦人"
 
-#: html/Search/Bulk.html:107
+#: html/Search/Bulk.html:109 html/Work/Search/Bulk.html:63
 msgid "Make Status"
 msgstr "新增現況"
 
-#: html/Search/Bulk.html:115
+#: html/Search/Bulk.html:117 html/Work/Search/Bulk.html:75
 msgid "Make date Due"
 msgstr "新增到期日"
 
-#: html/Search/Bulk.html:117
+#: html/Search/Bulk.html:119 html/Work/Search/Bulk.html:78
 msgid "Make date Resolved"
 msgstr "新增解決日期"
 
-#: html/Search/Bulk.html:111
+#: html/Search/Bulk.html:113 html/Work/Search/Bulk.html:69
 msgid "Make date Started"
 msgstr "新增實際起始日期"
 
-#: html/Search/Bulk.html:109
+#: html/Search/Bulk.html:111 html/Work/Search/Bulk.html:66
 msgid "Make date Starts"
 msgstr "新增應起始日期"
 
-#: html/Search/Bulk.html:113
+#: html/Search/Bulk.html:115 html/Work/Search/Bulk.html:72
 msgid "Make date Told"
 msgstr "新增報告日期"
 
-#: html/Search/Bulk.html:103
+#: html/Search/Bulk.html:105 html/Work/Search/Bulk.html:57
 msgid "Make priority"
 msgstr "新增優先順位"
 
-#: html/Search/Bulk.html:105
+#: html/Search/Bulk.html:107 html/Work/Search/Bulk.html:60
 msgid "Make queue"
 msgstr "新增表單"
 
-#: html/Search/Bulk.html:101
+#: html/Search/Bulk.html:103 html/Work/Search/Bulk.html:59
 msgid "Make subject"
 msgstr "新增主題"
 
@@ -3479,15 +3302,11 @@
 msgid "Male"
 msgstr "男"
 
-#: html/Admin/index.html:38
-msgid "Manage custom fields and custom field values"
-msgstr "管理自訂欄位及欄位值"
-
 #: html/Admin/index.html:32
 msgid "Manage groups and group membership"
 msgstr "管理群組及所屬成員"
 
-#: html/Admin/index.html:41
+#: html/Admin/index.html:38
 msgid "Manage properties and configuration which apply to all queues"
 msgstr "管理適用於所有表單的屬性與設定"
 
@@ -3519,7 +3338,7 @@
 msgid "Marketing Department"
 msgstr "行銷部"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/CustomField/Top:63
 msgid "Match Pattern"
 msgstr "符合樣式"
 
@@ -3531,25 +3350,25 @@
 msgid "May."
 msgstr "05"
 
-#: lib/RT/Transaction_Overlay.pm:635
+#: lib/RT/Transaction_Overlay.pm:598
 #. ($value)
 msgid "Member %1 added"
 msgstr "成員 %1 新增完畢"
 
-#: lib/RT/Transaction_Overlay.pm:672
+#: lib/RT/Transaction_Overlay.pm:638
 #. ($value)
 msgid "Member %1 deleted"
 msgstr "成員 %1 刪除完畢"
 
-#: lib/RT/Group_Overlay.pm:981
+#: lib/RT/Group_Overlay.pm:973
 msgid "Member added"
 msgstr "新增成員完畢"
 
-#: lib/RT/Group_Overlay.pm:1143
+#: lib/RT/Group_Overlay.pm:1135
 msgid "Member deleted"
 msgstr "成員已刪除"
 
-#: lib/RT/Group_Overlay.pm:1147
+#: lib/RT/Group_Overlay.pm:1139
 msgid "Member not deleted"
 msgstr "成員未刪除"
 
@@ -3557,7 +3376,7 @@
 msgid "Member of"
 msgstr "隸屬於"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Users/Info:23 html/Work/Preferences/index.html:19
 msgid "Member since"
 msgstr "註冊日期"
 
@@ -3565,70 +3384,58 @@
 msgid "MemberOf"
 msgstr "隸屬於"
 
-#: html/Admin/Elements/GroupTabs:41 html/User/Elements/GroupTabs:41
+#: html/Admin/Elements/GroupTabs:41 html/Admin/Elements/ModifyTemplateAsWorkflow:232 html/User/Elements/GroupTabs:41
 msgid "Members"
 msgstr "成員"
 
-#: lib/RT/Transaction_Overlay.pm:632
+#: lib/RT/Transaction_Overlay.pm:595
 #. ($value)
 msgid "Membership in %1 added"
 msgstr "所屬群組 %1 加入完畢"
 
-#: lib/RT/Transaction_Overlay.pm:669
+#: lib/RT/Transaction_Overlay.pm:635
 #. ($value)
 msgid "Membership in %1 deleted"
 msgstr "所屬群組 %1 移除完畢"
 
-#: html/Admin/Elements/UserTabs:40
-msgid "Memberships"
-msgstr "所屬群組"
-
-#: html/Admin/Users/Memberships.html:38
-#. ($UserObj->Name)
-msgid "Memberships of the user %1"
-msgstr "使用者 %1 的所屬群組"
-
-#: lib/RT/Ticket_Overlay.pm:3067
+#: lib/RT/Ticket_Overlay.pm:2962
 msgid "Merge Successful"
 msgstr "整合完畢"
 
-#: lib/RT/Ticket_Overlay.pm:2987
+#: lib/RT/Ticket_Overlay.pm:2882
 msgid "Merge failed. Couldn't set EffectiveId"
 msgstr "整合失敗。無法設定 EffectiveId"
 
-#: html/Ticket/Elements/BulkLinks:26 html/Ticket/Elements/EditLinks:97
+#: html/Ticket/Elements/BulkLinks:26 html/Ticket/Elements/EditLinks:97 html/Work/Search/BulkLinks:2 html/Work/Tickets/Elements/EditLinks:101
 msgid "Merge into"
 msgstr "整合進"
 
-#: html/Search/Bulk.html:135 html/Ticket/Update.html:78
+#: lib/RT/Transaction_Overlay.pm:601
+#. ($value)
+msgid "Merged into %1"
+msgstr "已整合進 %1"
+
+#: html/Search/Bulk.html:137 html/Ticket/Update.html:100
 msgid "Message"
 msgstr "訊息"
 
-#: html/Ticket/Elements/ShowTransaction:75
+#: html/Ticket/Elements/ShowTransaction:88
 msgid "Message body not shown because it is too large or is not plain text."
 msgstr "信件內文不是純文字,因此無法顯示。"
 
-#: lib/RT/Ticket_Overlay.pm:2446
-msgid "Message could not be recorded"
-msgstr ""
-
-#: html/Ticket/Elements/PreviewScrips:58
-msgid "Message recipients"
-msgstr ""
-
-#: lib/RT/Ticket_Overlay.pm:2449
-msgid "Message recorded"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Misc. Expense"
 msgstr "雜費"
 
-#: lib/RT/Interface/Web.pm:963
+#: lib/RT/Interface/Web.pm:965
 msgid "Missing a primary key?: %1"
 msgstr "缺少主鍵值?(%1)"
 
-#: html/Admin/Users/Modify.html:168 html/User/Prefs.html:71
+#: html/Work/Tickets/Create.html:180
+msgid "Missing mandatory fields"
+msgstr "缺少必填欄位"
+
+#: html/Admin/Users/Modify.html:168 html/User/Prefs.html:71 html/Work/Preferences/Info:41
 msgid "Mobile"
 msgstr "行動電話"
 
@@ -3640,11 +3447,6 @@
 msgid "Modify Access Control List"
 msgstr "更改權限控制清單"
 
-#: html/Admin/Elements/ObjectCustomFields:50
-#. (loc($Types))
-msgid "Modify Custom Fields which apply to all %1"
-msgstr "更改適用於所有%1的自訂欄位"
-
 #: html/Admin/Global/CustomFields.html:43 html/Admin/Global/index.html:50
 msgid "Modify Custom Fields which apply to all queues"
 msgstr "更改適用於所有表單的自訂欄位"
@@ -3729,15 +3531,10 @@
 msgid "Modify global user rights."
 msgstr "更改全域設定的使用者權限。"
 
-#: lib/RT/Group_Overlay.pm:145
+#: lib/RT/Group_Overlay.pm:146
 msgid "Modify group metadata or delete group"
 msgstr "更改群組資料及刪除群組"
 
-#: html/Admin/CustomFields/GroupRights.html:134
-#. ($CustomFieldObj->Name)
-msgid "Modify group rights for custom field %1"
-msgstr "更改自訂欄位 %1 的群組權限"
-
 #: 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"
@@ -3748,7 +3545,7 @@
 msgid "Modify group rights for queue %1"
 msgstr "更改表單 %1 的群組權限"
 
-#: lib/RT/Group_Overlay.pm:147
+#: lib/RT/Group_Overlay.pm:148
 msgid "Modify membership roster for this group"
 msgstr "更改此群組的成員名單"
 
@@ -3777,8 +3574,8 @@
 msgstr "更改適用於所有表單的手續"
 
 #: html/Admin/Global/Template.html:24 html/Admin/Global/Template.html:29 html/Admin/Global/Template.html:80 html/Admin/Queues/Template.html:77
-#. ($TemplateObj->id)
 #. (loc($TemplateObj->Name()))
+#. ($TemplateObj->id)
 msgid "Modify template %1"
 msgstr "更改範本 %1"
 
@@ -3786,7 +3583,7 @@
 msgid "Modify templates which apply to all queues"
 msgstr "更改適用於所有表單的範本"
 
-#: html/Admin/Groups/Modify.html:96 html/User/Groups/Modify.html:85
+#: html/Admin/Groups/Modify.html:86 html/User/Groups/Modify.html:85
 #. ($Group->Name)
 msgid "Modify the group %1"
 msgstr "更改群組 %1"
@@ -3795,7 +3592,7 @@
 msgid "Modify the queue watchers"
 msgstr "更改表單視察員"
 
-#: html/Admin/Users/Modify.html:252
+#: html/Admin/Users/Modify.html:237
 #. ($UserObj->Name)
 msgid "Modify the user %1"
 msgstr "更改使用者 %1"
@@ -3814,11 +3611,6 @@
 msgid "Modify tickets"
 msgstr "更改申請單"
 
-#: html/Admin/CustomFields/UserRights.html:130
-#. ($CustomFieldObj->Name)
-msgid "Modify user rights for custom field %1"
-msgstr "更改自訂欄位 %1 的使用者權限"
-
 #: 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"
@@ -3833,11 +3625,13 @@
 msgid "Modify watchers for queue '%1'"
 msgstr "更改 '%1' 的視察員"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/Workflow.html:25 html/Admin/Global/Workflow.html:30 html/Admin/Global/Workflow.html:81 html/Admin/Queues/Workflow.html:77
+#. (loc($WorkflowObj->Name()))
+#. ($WorkflowObj->id)
 msgid "Modify workflow %1"
 msgstr "更改流程 %1"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/Workflows.html:44
 msgid "Modify workflows which apply to all queues"
 msgstr "更改適用於所有表單的流程"
 
@@ -3845,7 +3639,7 @@
 msgid "ModifyACL"
 msgstr "更改權限清單"
 
-#: lib/RT/Group_Overlay.pm:148
+#: lib/RT/Group_Overlay.pm:149
 msgid "ModifyOwnMembership"
 msgstr "更改自己是否屬於某群組"
 
@@ -3877,7 +3671,7 @@
 msgid "Mon."
 msgstr "星期一"
 
-#: NOT FOUND IN SOURCE
+#: html/Work/Elements/MyRequests:11 html/Work/Elements/MyTickets:11
 msgid "More"
 msgstr "更多"
 
@@ -3890,19 +3684,15 @@
 msgid "Morning Shift"
 msgstr "早班"
 
-#: html/Projects/Elements/OverviewEntry:11
-msgid "Move"
-msgstr "移動"
-
-#: NOT FOUND IN SOURCE
+#: html/Edit/Elements/ListButtons:16
 msgid "Move All"
 msgstr "全移"
 
-#: html/Admin/Elements/PickCustomFields:62
+#: html/Admin/Elements/EditCustomFields:60
 msgid "Move down"
 msgstr "下移"
 
-#: html/Admin/Elements/PickCustomFields:54
+#: html/Admin/Elements/EditCustomFields:52
 msgid "Move up"
 msgstr "上移"
 
@@ -3910,7 +3700,7 @@
 msgid "Multiple"
 msgstr "多重"
 
-#: lib/RT/User_Overlay.pm:190
+#: lib/RT/User_Overlay.pm:242
 msgid "Must specify 'Name' attribute"
 msgstr "必須指定 'Name' 的屬性"
 
@@ -3919,15 +3709,15 @@
 msgid "My %1 tickets"
 msgstr "我的 %1 申請單"
 
-#: NOT FOUND IN SOURCE
+#: html/Work/Elements/Tab:38
 msgid "My Approvals"
 msgstr "表單簽核"
 
-#: NOT FOUND IN SOURCE
+#: html/Work/Elements/Tab:36
 msgid "My Requests"
 msgstr "表單申請追蹤"
 
-#: NOT FOUND IN SOURCE
+#: html/Work/Elements/Tab:40
 msgid "My Tickets"
 msgstr "表單處理"
 
@@ -3935,15 +3725,11 @@
 msgid "My approvals"
 msgstr "表單簽核"
 
-#: 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:12 html/Admin/Elements/AddCustomFieldValue:31 html/Admin/Elements/EditCustomField:33 html/Admin/Elements/EditCustomFieldValues:33 html/Admin/Elements/ModifyTemplate:27 html/Admin/Elements/ModifyUser:29 html/Admin/Groups/Modify.html:43 html/User/Groups/Modify.html:43
+#: html/Admin/Elements/AddCustomFieldValue:31 html/Admin/Elements/EditCustomField:33 html/Admin/Elements/ModifyTemplate:27 html/Admin/Elements/ModifyTemplateAsWorkflow:185 html/Admin/Elements/ModifyUser:29 html/Admin/Groups/Modify.html:43 html/Edit/Elements/SelectQueues:3 html/Edit/Queues/List:8 html/Edit/Users/Add.html:22 html/Edit/Users/List:5 html/Edit/Users/Search.html:31 html/Elements/SelectGroups:25 html/Elements/SelectUsers:27 html/User/Groups/Modify.html:43 html/Work/Tickets/Cc:18
 msgid "Name"
 msgstr "名稱"
 
-#: lib/RT/User_Overlay.pm:197
+#: lib/RT/User_Overlay.pm:249
 msgid "Name in use"
 msgstr "帳號已有人使用"
 
@@ -3959,43 +3745,39 @@
 msgid "Never"
 msgstr "從未更動"
 
-#: html/Elements/Quicksearch:29
+#: html/Elements/Quicksearch:29 html/Work/Elements/Quicksearch:15 html/Work/Tickets/Create.html:53
 msgid "New"
 msgstr "新建立"
 
-#: html/Admin/Elements/ModifyUser:31 html/Admin/Users/Modify.html:92 html/User/Prefs.html:87
+#: html/Admin/Elements/ModifyUser:31 html/Admin/Users/Modify.html:92 html/Edit/Users/Info:46 html/User/Prefs.html:87 html/Work/Preferences/Info:52
 msgid "New Password"
 msgstr "新的密碼"
 
-#: etc/initialdata:317 etc/upgrade/2.1.71:16
+#: etc/initialdata:317 etc/upgrade/2.1.71:16 html/Edit/Elements/CreateApprovalsQueue:21
 msgid "New Pending Approval"
 msgstr "新的待簽核事項"
 
-#: html/Ticket/Elements/Tabs:168
-msgid "New Query"
-msgstr "新增查詢"
-
-#: html/Ticket/Elements/EditLinks:93
+#: html/Ticket/Elements/EditLinks:93 html/Work/Tickets/Elements/EditLinks:12
 msgid "New Relationships"
 msgstr "新增關係"
 
-#: NOT FOUND IN SOURCE
+#: html/Work/Elements/Tab:34
 msgid "New Request"
 msgstr "表單申請"
 
-#: NOT FOUND IN SOURCE
+#: html/Ticket/Elements/Tabs:35
 msgid "New Search"
 msgstr "新增查詢"
 
-#: NOT FOUND IN SOURCE
+#: html/Work/Tickets/Elements/EditPeople:7
 msgid "New Watchers"
 msgstr "新增視察員"
 
-#: html/Admin/Elements/CustomFieldTabs:40 html/Admin/Global/CustomField.html:40 html/Admin/Global/CustomFields.html:38 html/Admin/Queues/CustomField.html:51
+#: 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:55 html/User/Elements/GroupTabs:51
+#: html/Admin/Elements/GroupTabs:53 html/User/Elements/GroupTabs:51
 msgid "New group"
 msgstr "新增群組"
 
@@ -4003,7 +3785,7 @@
 msgid "New password"
 msgstr "新的密碼"
 
-#: lib/RT/User_Overlay.pm:717
+#: lib/RT/User_Overlay.pm:769
 msgid "New password notification sent"
 msgstr "送出新密碼通知"
 
@@ -4023,7 +3805,7 @@
 msgid "New scrip"
 msgstr "新增手續"
 
-#: NOT FOUND IN SOURCE
+#: html/Work/Search/index.html:62
 msgid "New search"
 msgstr "重新查詢"
 
@@ -4035,11 +3817,11 @@
 msgid "New ticket"
 msgstr "提出申請單"
 
-#: lib/RT/Ticket_Overlay.pm:2954
+#: lib/RT/Ticket_Overlay.pm:2849
 msgid "New ticket doesn't exist"
 msgstr "沒有新申請單"
 
-#: html/Admin/Elements/UserTabs:57
+#: html/Admin/Elements/UserTabs:51
 msgid "New user"
 msgstr "新增使用者"
 
@@ -4055,23 +3837,23 @@
 msgid "New window setting"
 msgstr "更新視窗設定"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/Workflow.html:60 html/Admin/Global/Workflows.html:39 html/Admin/Queues/Workflow.html:57 html/Admin/Queues/Workflows.html:50
 msgid "New workflow"
 msgstr "新增流程"
 
-#: html/Ticket/Elements/Tabs:70
+#: html/Ticket/Elements/Tabs:74
 msgid "Next"
 msgstr "下一項"
 
-#: html/Elements/TicketList:48
-msgid "Next Page"
+#: html/Search/Listing.html:47 html/Work/Search/index.html:24
+msgid "Next page"
 msgstr "下一頁"
 
 #: html/Admin/Elements/ModifyUser:49
 msgid "NickName"
 msgstr "暱稱"
 
-#: html/Admin/Users/Modify.html:62 html/User/Prefs.html:50
+#: html/Admin/Users/Modify.html:62 html/User/Prefs.html:50 html/Work/Preferences/Info:29
 msgid "Nickname"
 msgstr "暱稱"
 
@@ -4079,30 +3861,18 @@
 msgid "Night Shift"
 msgstr "小夜班"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Basic/Top:27 html/Edit/Queues/Basic/Top:83
 msgid "No"
 msgstr "否"
 
-#: html/Admin/CustomFields/UserRights.html:118
-msgid "No Class defined"
-msgstr "尚未定義物件類別"
-
-#: html/Admin/CustomFields/Modify.html:78 html/Admin/Elements/EditCustomField:89
+#: html/Admin/Elements/EditCustomField:89 html/Admin/Elements/EditCustomFields:103
 msgid "No CustomField"
 msgstr "無自訂欄位"
 
-#: html/Admin/CustomFields/GroupRights.html:73
-msgid "No CustomField defined"
-msgstr "尚未定義自訂欄位"
-
 #: html/Admin/Groups/GroupRights.html:83 html/Admin/Groups/UserRights.html:70
 msgid "No Group defined"
 msgstr "尚未定義群組"
 
-#: lib/RT/Tickets_Overlay_SQL.pm:463
-msgid "No Query"
-msgstr ""
-
 #: html/Admin/Queues/GroupRights.html:96 html/Admin/Queues/UserRights.html:67
 msgid "No Queue defined"
 msgstr "沒有定義好的表單"
@@ -4123,7 +3893,7 @@
 msgid "No Ticket specified. Aborting ticket modifications\\n\\n"
 msgstr "未指定申請單。退出申請單更改\\n\\n"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/ModifyWorkflow:237 html/Admin/Global/Workflow.html:79 html/Admin/Queues/Workflow.html:75
 msgid "No Workflow"
 msgstr "沒有流程"
 
@@ -4131,7 +3901,7 @@
 msgid "No action"
 msgstr "暫不處理"
 
-#: lib/RT/Interface/Web.pm:958
+#: lib/RT/Interface/Web.pm:960
 msgid "No column specified"
 msgstr "未指定欄位"
 
@@ -4143,11 +3913,11 @@
 msgid "No comment entered about this user"
 msgstr "沒有對這名使用者的評論"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:2237 lib/RT/Ticket_Overlay.pm:2307
 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
+#: lib/RT/Action/Generic.pm:149 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 的描述"
@@ -4156,15 +3926,7 @@
 msgid "No group specified"
 msgstr "未指定群組"
 
-#: html/Admin/Groups/index.html:33
-msgid "No groups matching search criteria found."
-msgstr "找不到符合查詢條件的群組。"
-
-#: lib/RT/Ticket_Overlay.pm:2407
-msgid "No message attached"
-msgstr ""
-
-#: lib/RT/User_Overlay.pm:935
+#: lib/RT/User_Overlay.pm:987
 msgid "No password set"
 msgstr "沒有設定密碼"
 
@@ -4172,16 +3934,16 @@
 msgid "No permission to create queues"
 msgstr "沒有新增表單的權限"
 
-#: lib/RT/Ticket_Overlay.pm:362
+#: lib/RT/Ticket_Overlay.pm:366
 #. ($QueueObj->Name)
 msgid "No permission to create tickets in the queue '%1'"
 msgstr "沒有在表單 '%1' 新增申請單的權限"
 
-#: lib/RT/User_Overlay.pm:156
+#: lib/RT/User_Overlay.pm:208
 msgid "No permission to create users"
 msgstr "沒有新增使用者的權限"
 
-#: html/SelfService/Display.html:123
+#: html/SelfService/Display.html:125
 msgid "No permission to display that ticket"
 msgstr "沒有顯示該申請單的權限"
 
@@ -4189,7 +3951,7 @@
 msgid "No permission to view update ticket"
 msgstr "沒有檢視申請單更新的權限"
 
-#: lib/RT/Queue_Overlay.pm:683 lib/RT/Ticket_Overlay.pm:1515
+#: lib/RT/Queue_Overlay.pm:675 lib/RT/Ticket_Overlay.pm:1520
 msgid "No principal specified"
 msgstr "未指定單位"
 
@@ -4213,19 +3975,15 @@
 msgid "No rights granted."
 msgstr "沒有選定權限"
 
-#: html/Search/Bulk.html:162
+#: html/Search/Bulk.html:160 html/Work/Search/Bulk.html:117
 msgid "No search to operate on."
 msgstr "沒有要進行的查詢"
 
-#: html/Elements/TicketList:76
-msgid "No subject"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "No ticket id specified"
 msgstr "未指定申請單編號"
 
-#: lib/RT/Transaction_Overlay.pm:464 lib/RT/Transaction_Overlay.pm:502
+#: lib/RT/Transaction_Overlay.pm:427 lib/RT/Transaction_Overlay.pm:465
 msgid "No transaction type specified"
 msgstr "未指定更動報告類別"
 
@@ -4241,15 +3999,15 @@
 msgid "No valid RT user found. RT cvs handler disengaged. Please consult your RT administrator.\\n"
 msgstr "找不到合格的 RT 使用者。RT cvs 處理器已停用。請向 RT 管理者詢問。\\n"
 
-#: lib/RT/Interface/Web.pm:955
+#: lib/RT/Interface/Web.pm:957
 msgid "No value sent to _Set!\\n"
 msgstr "_Set 沒有收到任何值!\\n"
 
-#: html/Elements/QuickCreate:16
+#: html/Search/Elements/TicketRow:36 html/Work/Search/TicketRow:9
 msgid "Nobody"
 msgstr "沒有人"
 
-#: lib/RT/Interface/Web.pm:960
+#: lib/RT/Interface/Web.pm:962
 msgid "Nonexistant field?"
 msgstr "欄位不存在?"
 
@@ -4265,7 +4023,7 @@
 msgid "Not logged in"
 msgstr "尚未登入"
 
-#: html/Elements/Header:71
+#: html/Elements/Header:59
 msgid "Not logged in."
 msgstr "尚未登入"
 
@@ -4281,7 +4039,7 @@
 msgid "Not yet implemented...."
 msgstr "尚未完工..."
 
-#: html/Approvals/Elements/Approve:48
+#: html/Approvals/Elements/Approve:48 html/Work/Tickets/Elements/AddContent:9
 msgid "Notes"
 msgstr "備註"
 
@@ -4289,7 +4047,7 @@
 msgid "Notes:"
 msgstr "備註:"
 
-#: lib/RT/User_Overlay.pm:720
+#: lib/RT/User_Overlay.pm:772
 msgid "Notification could not be sent"
 msgstr "無法送出通知"
 
@@ -4329,7 +4087,7 @@
 msgid "Notify Owner of their ticket has been approved by some approver"
 msgstr "通知承辦人申請單已完成某項簽核"
 
-#: etc/initialdata:319 etc/upgrade/2.1.71:17
+#: etc/initialdata:319 etc/upgrade/2.1.71:17 html/Edit/Elements/CreateApprovalsQueue:22
 msgid "Notify Owners and AdminCcs of new items pending their approval"
 msgstr "整理待簽核事項,通知承辦人及管理員副本收件人"
 
@@ -4353,7 +4111,7 @@
 msgid "Notify Requestors, Ccs and AdminCcs as Comment"
 msgstr "以評論方式通知申請人、副本及管理員副本收件人"
 
-#: NOT FOUND IN SOURCE
+#: html/Work/Tickets/Cc:55
 msgid "Notify people:"
 msgstr "通知對象"
 
@@ -4369,31 +4127,22 @@
 msgid "November"
 msgstr "十一月"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Basic/Top:83
 msgid "OIN104"
 msgstr "104eHRMS 介面"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Workflow/Export.html:30 html/Work/Copyright.html:23
 msgid "OK"
 msgstr "確定"
 
-#: lib/RT/Record.pm:200
+#: lib/RT/Record.pm:157
 msgid "Object could not be created"
 msgstr "無法新增物件"
 
-#: lib/RT/Record.pm:219
+#: lib/RT/Record.pm:181
 msgid "Object created"
 msgstr "物件新增完畢"
 
-#: html/Admin/Elements/ObjectCustomFields:41
-#. ($ObjectType)
-msgid "Object of type %1 cannot take custom fields"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:746
-msgid "Object type mismatch"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Occupation Status"
 msgstr "在職狀態"
@@ -4418,7 +4167,7 @@
 msgid "On"
 msgstr "等於"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/CustomField/Top:71
 msgid "On Change"
 msgstr "更改申請單時"
 
@@ -4430,7 +4179,7 @@
 msgid "On Correspond"
 msgstr "回覆申請單時"
 
-#: etc/initialdata:137
+#: etc/initialdata:137 html/Edit/Global/CustomField/Top:69
 msgid "On Create"
 msgstr "新增申請單時"
 
@@ -4464,11 +4213,11 @@
 msgid "Only show approvals for requests created before %1"
 msgstr "僅顯示 %1 之前新增的申請單"
 
-#: html/Elements/Quicksearch:30
+#: html/Edit/Global/GroupRight/List:9 html/Edit/Global/GroupRight/Top:16 html/Edit/Groups/List:17 html/Edit/Groups/Top:18 html/Edit/Queues/Basic/Top:68 html/Edit/Queues/List:15 html/Edit/Queues/List:27 html/Elements/Quicksearch:30 html/Work/Delegates/Info:48 html/Work/Delegates/Info:51 html/Work/Delegates/List:12 html/Work/Elements/Quicksearch:16 html/Work/Overview/Info:41 html/Work/Tickets/Display.html:51
 msgid "Open"
 msgstr "開啟"
 
-#: html/Ticket/Elements/Tabs:137
+#: html/Ticket/Elements/Tabs:141
 msgid "Open it"
 msgstr "開啟"
 
@@ -4496,23 +4245,19 @@
 msgid "Opinion"
 msgstr "意見"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/CustomField/Info:35
 msgid "Option Description"
 msgstr "選項描述"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/CustomField/Info:29
 msgid "Option Name"
 msgstr "選項名稱"
 
-#: html/Search/Elements/DisplayOptions:35
-msgid "Order by"
-msgstr ""
-
-#: html/Search/Elements/PickRestriction:101
+#: html/Search/Elements/PickRestriction:101 html/Work/Search/PickRestriction:87
 msgid "Ordering and sorting"
 msgstr "順序與排序方式"
 
-#: html/Admin/Elements/ModifyUser:45 html/Admin/Users/Modify.html:116 html/User/Prefs.html:110
+#: html/Admin/Elements/ModifyUser:45 html/Admin/Users/Modify.html:116 html/Edit/Elements/SelectUsers:7 html/Edit/Global/Basic/Top:55 html/Elements/SelectUsers:28 html/User/Prefs.html:110 html/Work/Preferences/Info:80
 msgid "Organization"
 msgstr "組織名稱"
 
@@ -4525,11 +4270,11 @@
 msgid "Originating ticket: #%1"
 msgstr "原申請單:#%1"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Elements/PickUsers:119 html/Edit/Users/Add.html:106 html/Work/Tickets/Cc:80
 msgid "Other comma-delimited email addresses"
 msgstr "其他e-mail帳號 (僅e-mail通知;多筆帳號請用逗號','區隔)"
 
-#: html/Admin/Elements/ModifyQueue:54 html/Admin/Queues/Modify.html:68
+#: html/Admin/Elements/ModifyQueue:54 html/Admin/Queues/Modify.html:68 html/Edit/Queues/Basic/Top:44
 msgid "Over time, priority moves toward"
 msgstr "優先順位隨時間增加調整為"
 
@@ -4537,15 +4282,16 @@
 msgid "Override current custom fields with fields from %1"
 msgstr "以 %1 表單的自訂欄位取代現有欄位"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/CheckOverrideGlobalACL:25
 msgid "Override global rights"
 msgstr "取代全域權限"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/CheckOverrideGlobalACL:36
+#. (loc_fuzzy($msg))
 msgid "OverrideGlobalACL status %1"
 msgstr "取代全域權限 %1"
 
-#: NOT FOUND IN SOURCE
+#: html/Work/Elements/Tab:32
 msgid "Overview"
 msgstr "總覽"
 
@@ -4557,7 +4303,7 @@
 msgid "OwnTicket"
 msgstr "承辦申請單"
 
-#: etc/initialdata:38 html/Elements/QuickCreate:13 html/Projects/Overview.html:13 html/Scope/Update.html:47 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:1308
+#: etc/initialdata:38 html/Admin/Elements/ModifyTemplateAsWorkflow:141 html/Edit/Global/Workflow/Owner.html:19 html/Edit/Queues/Basic/Top:51 html/Edit/Queues/Basic/Top:59 html/Elements/MyRequests:31 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:62 html/Work/Elements/MyRequests:23 html/Work/Elements/Quicksearch:18 html/Work/Tickets/Elements/EditPeople:28 html/Work/Tickets/Elements/ShowBasics:21 html/Work/Tickets/Update.html:27 lib/RT/ACE_Overlay.pm:85 lib/RT/Tickets_Overlay.pm:1305
 msgid "Owner"
 msgstr "承辦人"
 
@@ -4565,29 +4311,24 @@
 msgid "Owner changed from %1 to %2"
 msgstr "承辦人已從 %1 改為 %2"
 
-#: lib/RT/Transaction_Overlay.pm:576
+#: lib/RT/Transaction_Overlay.pm:539
 #. ($Old->Name , $New->Name)
 msgid "Owner forcibly changed from %1 to %2"
 msgstr "強制將承辦人從 %1 改為 %2"
 
-#: html/Search/Elements/PickRestriction:30
+#: html/Search/Elements/PickRestriction:30 html/Work/Search/PickRestriction:10
 msgid "Owner is"
 msgstr "承辦人"
 
-#: NOT FOUND IN SOURCE
+#: html/Work/Elements/List:31 html/Work/Queues/List:9 html/Work/Tickets/Create.html:55 html/Work/Tickets/Elements/ShowBasics:60
 msgid "Owner's Phone"
 msgstr "承辦人電話"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Elements/Page:38
 msgid "Page #"
 msgstr " "
 
-#: html/Elements/TicketList:43
-#. ($Page, int($TotalFound/$Rows))
-msgid "Page %1 of %2"
-msgstr "第 %1 / %2 頁"
-
-#: html/Admin/Users/Modify.html:173 html/User/Prefs.html:75
+#: html/Admin/Users/Modify.html:173 html/User/Prefs.html:75 html/Work/Preferences/Info:43
 msgid "Pager"
 msgstr "呼叫器"
 
@@ -4595,15 +4336,15 @@
 msgid "PagerPhone"
 msgstr "呼叫器號碼"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Workflow/Action:76 html/Edit/Global/Workflow/Condition:66
 msgid "Parameter"
 msgstr "呼叫參數"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:225
 msgid "Parent"
 msgstr "上級"
 
-#: html/Ticket/Create.html:182 html/Ticket/Elements/BulkLinks:38 html/Ticket/Elements/EditLinks:109 html/Ticket/Elements/EditLinks:54 html/Ticket/Elements/ShowLinks:46
+#: html/Ticket/Create.html:182 html/Ticket/Elements/BulkLinks:38 html/Ticket/Elements/EditLinks:109 html/Ticket/Elements/EditLinks:54 html/Ticket/Elements/ShowLinks:46 html/Work/Search/BulkLinks:14 html/Work/Tickets/Elements/EditLinks:113 html/Work/Tickets/Elements/EditLinks:45 html/Work/Tickets/Elements/ShowLinks:26
 msgid "Parents"
 msgstr "母申請單"
 
@@ -4611,7 +4352,7 @@
 msgid "Park Space"
 msgstr "停車位申請"
 
-#: html/Elements/Login:52 html/User/Prefs.html:83
+#: html/Elements/Login:55 html/User/Prefs.html:83 html/Work/Preferences/Info:49
 msgid "Password"
 msgstr "密碼"
 
@@ -4619,20 +4360,20 @@
 msgid "Password Reminder"
 msgstr "密碼提示"
 
-#: lib/RT/User_Overlay.pm:178 lib/RT/User_Overlay.pm:938
+#: lib/RT/User_Overlay.pm:230 lib/RT/User_Overlay.pm:990
 msgid "Password too short"
 msgstr "密碼太短"
 
-#: html/Admin/Users/Modify.html:308 html/User/Prefs.html:209
+#: html/Admin/Users/Modify.html:292 html/User/Prefs.html:212 html/Work/Preferences/Info:177
 #. (loc_fuzzy($msg))
 msgid "Password: %1"
 msgstr "密碼:%1"
 
-#: html/Admin/Users/Modify.html:310
+#: html/Admin/Users/Modify.html:294
 msgid "Passwords do not match."
 msgstr "密碼確認失敗。"
 
-#: html/User/Prefs.html:211
+#: html/User/Prefs.html:214 html/Work/Preferences/Info:179
 msgid "Passwords do not match. Your password has not been changed"
 msgstr "密碼確認失敗。您的密碼並未改變。"
 
@@ -4644,7 +4385,7 @@
 msgid "Pending Approval"
 msgstr "等待簽核"
 
-#: html/Scope/Elements/ShowSummary:42 html/Ticket/Elements/ShowSummary:44 html/Ticket/Elements/Tabs:97 html/Ticket/ModifyAll.html:50
+#: html/Ticket/Elements/ShowSummary:44 html/Ticket/Elements/Tabs:101 html/Ticket/ModifyAll.html:50
 msgid "People"
 msgstr "人員"
 
@@ -4656,11 +4397,11 @@
 msgid "Perform a user-defined action"
 msgstr "執行使用者自訂的動作"
 
-#: 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:134 lib/RT/Attribute_Overlay.pm:140 lib/RT/Attribute_Overlay.pm:376 lib/RT/Attribute_Overlay.pm:385 lib/RT/Attribute_Overlay.pm:398 lib/RT/CurrentUser.pm:80 lib/RT/CurrentUser.pm:89 lib/RT/CustomField_Overlay.pm:113 lib/RT/CustomField_Overlay.pm:124 lib/RT/CustomField_Overlay.pm:252 lib/RT/CustomField_Overlay.pm:284 lib/RT/CustomField_Overlay.pm:604 lib/RT/CustomField_Overlay.pm:725 lib/RT/CustomField_Overlay.pm:750 lib/RT/Group_Overlay.pm:1098 lib/RT/Group_Overlay.pm:1102 lib/RT/Group_Overlay.pm:1111 lib/RT/Group_Overlay.pm:1169 lib/RT/Group_Overlay.pm:1173 lib/RT/Group_Overlay.pm:1179 lib/RT/Group_Overlay.pm:425 lib/RT/Group_Overlay.pm:517 lib/RT/Group_Overlay.pm:595 lib/RT/Group_Overlay.pm:603 lib/RT/Group_Overlay.pm:700 lib/RT/Group_Overlay.pm:704 lib/RT/Group_Overlay.pm:710 lib/RT/Group_Overlay.pm:903 lib/RT/Group_Overlay.pm:907 lib/RT/Group_Overlay.pm:920 lib/RT/Queue_Overlay.pm:548 lib/RT/Queue_Overlay.pm:558 lib/RT/Queue_Overlay.pm:572 lib/RT/Queue_Overlay.pm:707 lib/RT/Queue_Overlay.pm:716 lib/RT/Queue_Overlay.pm:729 lib/RT/Queue_Overlay.pm:942 lib/RT/Record.pm:723 lib/RT/Record.pm:891 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:1387 lib/RT/Ticket_Overlay.pm:1397 lib/RT/Ticket_Overlay.pm:1411 lib/RT/Ticket_Overlay.pm:1548 lib/RT/Ticket_Overlay.pm:1558 lib/RT/Ticket_Overlay.pm:1572 lib/RT/Ticket_Overlay.pm:1689 lib/RT/Ticket_Overlay.pm:2007 lib/RT/Ticket_Overlay.pm:2145 lib/RT/Ticket_Overlay.pm:2313 lib/RT/Ticket_Overlay.pm:2360 lib/RT/Ticket_Overlay.pm:2760 lib/RT/Ticket_Overlay.pm:2841 lib/RT/Ticket_Overlay.pm:2945 lib/RT/Ticket_Overlay.pm:2960 lib/RT/Ticket_Overlay.pm:3159 lib/RT/Ticket_Overlay.pm:3169 lib/RT/Ticket_Overlay.pm:3174 lib/RT/Ticket_Overlay.pm:3397 lib/RT/Ticket_Overlay.pm:3401 lib/RT/Ticket_Overlay.pm:3542 lib/RT/Ticket_Overlay.pm:3664 lib/RT/Transaction_Overlay.pm:452 lib/RT/Transaction_Overlay.pm:459 lib/RT/Transaction_Overlay.pm:488 lib/RT/Transaction_Overlay.pm:495 lib/RT/User_Overlay.pm:1032 lib/RT/User_Overlay.pm:1482 lib/RT/User_Overlay.pm:640 lib/RT/User_Overlay.pm:675 lib/RT/User_Overlay.pm:931
+#: lib/RT/ACE_Overlay.pm:230 lib/RT/ACE_Overlay.pm:236 lib/RT/ACE_Overlay.pm:563 lib/RT/ACE_Overlay.pm:573 lib/RT/ACE_Overlay.pm:583 lib/RT/ACE_Overlay.pm:648 lib/RT/CurrentUser.pm:82 lib/RT/CurrentUser.pm:91 lib/RT/CustomField_Overlay.pm:100 lib/RT/CustomField_Overlay.pm:208 lib/RT/CustomField_Overlay.pm:240 lib/RT/CustomField_Overlay.pm:518 lib/RT/CustomField_Overlay.pm:90 lib/RT/Group_Overlay.pm:1090 lib/RT/Group_Overlay.pm:1094 lib/RT/Group_Overlay.pm:1103 lib/RT/Group_Overlay.pm:1154 lib/RT/Group_Overlay.pm:1158 lib/RT/Group_Overlay.pm:1164 lib/RT/Group_Overlay.pm:424 lib/RT/Group_Overlay.pm:517 lib/RT/Group_Overlay.pm:595 lib/RT/Group_Overlay.pm:603 lib/RT/Group_Overlay.pm:700 lib/RT/Group_Overlay.pm:704 lib/RT/Group_Overlay.pm:710 lib/RT/Group_Overlay.pm:895 lib/RT/Group_Overlay.pm:899 lib/RT/Group_Overlay.pm:912 lib/RT/Queue_Overlay.pm:540 lib/RT/Queue_Overlay.pm:550 lib/RT/Queue_Overlay.pm:564 lib/RT/Queue_Overlay.pm:699 lib/RT/Queue_Overlay.pm:708 lib/RT/Queue_Overlay.pm:721 lib/RT/Queue_Overlay.pm:934 lib/RT/Scrip_Overlay.pm:125 lib/RT/Scrip_Overlay.pm:136 lib/RT/Scrip_Overlay.pm:201 lib/RT/Scrip_Overlay.pm:441 lib/RT/Template_Overlay.pm:284 lib/RT/Template_Overlay.pm:87 lib/RT/Template_Overlay.pm:93 lib/RT/Ticket_Overlay.pm:1392 lib/RT/Ticket_Overlay.pm:1402 lib/RT/Ticket_Overlay.pm:1416 lib/RT/Ticket_Overlay.pm:1550 lib/RT/Ticket_Overlay.pm:1559 lib/RT/Ticket_Overlay.pm:1572 lib/RT/Ticket_Overlay.pm:1923 lib/RT/Ticket_Overlay.pm:2061 lib/RT/Ticket_Overlay.pm:2225 lib/RT/Ticket_Overlay.pm:2294 lib/RT/Ticket_Overlay.pm:2655 lib/RT/Ticket_Overlay.pm:2736 lib/RT/Ticket_Overlay.pm:2840 lib/RT/Ticket_Overlay.pm:2855 lib/RT/Ticket_Overlay.pm:3054 lib/RT/Ticket_Overlay.pm:3064 lib/RT/Ticket_Overlay.pm:3069 lib/RT/Ticket_Overlay.pm:3292 lib/RT/Ticket_Overlay.pm:3296 lib/RT/Ticket_Overlay.pm:3499 lib/RT/Ticket_Overlay.pm:3661 lib/RT/Ticket_Overlay.pm:3713 lib/RT/Ticket_Overlay.pm:3925 lib/RT/Transaction_Overlay.pm:415 lib/RT/Transaction_Overlay.pm:422 lib/RT/Transaction_Overlay.pm:451 lib/RT/Transaction_Overlay.pm:458 lib/RT/User_Overlay.pm:1094 lib/RT/User_Overlay.pm:1542 lib/RT/User_Overlay.pm:692 lib/RT/User_Overlay.pm:727 lib/RT/User_Overlay.pm:983
 msgid "Permission Denied"
 msgstr "權限不足"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Rights/index.html:3
 msgid "Permission Settings"
 msgstr "權限設定"
 
@@ -4676,6 +4417,10 @@
 msgid "Personal Groups"
 msgstr "代理人群組"
 
+#: html/Edit/Users/Info:55 html/Work/Preferences/Info:27
+msgid "Personal Homepage"
+msgstr "個人首頁"
+
 #: NOT FOUND IN SOURCE
 msgid "Personal Todo"
 msgstr "私人待辦事項"
@@ -4712,15 +4457,15 @@
 msgid "Phone"
 msgstr "電話"
 
-#: NOT FOUND IN SOURCE
+#: html/Work/Delegates/Info:90 html/Work/Overview/Info:72
 msgid "Phone number"
 msgstr "電話號碼"
 
-#: html/Admin/Users/Modify.html:155 html/User/Prefs.html:60
+#: html/Admin/Users/Modify.html:155 html/User/Prefs.html:60 html/Work/Preferences/Info:35
 msgid "Phone numbers"
 msgstr "電話號碼"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Queues/Basic/Add.html:3 html/Edit/Queues/Basic/Top:55 html/Edit/Users/Add.html:3 html/Work/Approvals/Add.html:3 html/Work/Delegates/Add.html:3 html/Work/Delegates/Info:34 html/Work/Tickets/ModifyPeople.html:2
 msgid "Pick"
 msgstr "挑選"
 
@@ -4732,11 +4477,11 @@
 msgid "Placeholder"
 msgstr "尚未完工"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Elements/PickUsers:33 html/Edit/Elements/PickUsers:51 html/Edit/Elements/SelectCustomFieldType:3 html/Work/Elements/SelectOwner:3 html/Work/Tickets/Elements/EditCustomField:199 html/Work/Tickets/Elements/EditCustomFieldEntry:42 html/Work/Tickets/Elements/EditCustomFieldEntry:57
 msgid "Please Select"
 msgstr "請選擇"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Elements/104Buttons:30
 msgid "Please check items to be deleted first."
 msgstr "請先選中要刪除的對象"
 
@@ -4768,11 +4513,11 @@
 msgid "Position Level"
 msgstr "職等"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Elements/PickUsers:48 html/Edit/Global/UserRight/List:13 html/Edit/Global/UserRight/Top:23 html/Edit/Queues/Basic/Add.html:26 html/Edit/Users/Add.html:41 html/Work/Approvals/Add.html:27 html/Work/Delegates/Add.html:27 html/Work/Delegates/Info:84 html/Work/Overview/Info:66
 msgid "Position Name"
 msgstr "職務名稱"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/UserRight/List:14 html/Edit/Global/UserRight/Top:33
 msgid "Position Number"
 msgstr "職務代碼"
 
@@ -4784,7 +4529,7 @@
 msgid "Pref"
 msgstr "偏好"
 
-#: html/Elements/Header:63 html/Elements/Tabs:52 html/SelfService/Elements/Tabs:50 html/SelfService/Prefs.html:24 html/User/Prefs.html:24 html/User/Prefs.html:27
+#: html/Edit/Elements/104Top:26 html/Elements/Header:51 html/Elements/Tabs:52 html/SelfService/Elements/Tabs:50 html/SelfService/Prefs.html:24 html/User/Prefs.html:24 html/User/Prefs.html:27 html/Work/Elements/Tab:44
 msgid "Preferences"
 msgstr "偏好"
 
@@ -4792,28 +4537,28 @@
 msgid "Prefs"
 msgstr "個人資訊"
 
-#: lib/RT/Action/Generic.pm:169
+#: lib/RT/Action/Generic.pm:159
 msgid "Prepare Stubbed"
 msgstr "預備動作完畢"
 
-#: html/Ticket/Elements/Tabs:62
+#: html/Ticket/Elements/Tabs:66
 msgid "Prev"
 msgstr "上一項"
 
-#: html/Elements/TicketList:45
-msgid "Previous Page"
+#: html/Search/Listing.html:43 html/Work/Search/index.html:20
+msgid "Previous page"
 msgstr "前一頁"
 
 #: 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
+#: lib/RT/ACE_Overlay.pm:132 lib/RT/ACE_Overlay.pm:207 lib/RT/ACE_Overlay.pm:552
 #. ($args{'PrincipalId'})
 msgid "Principal %1 not found."
 msgstr "找不到單位 %1。"
 
-#: html/Projects/Overview.html:16 html/Search/Elements/PickBasics:58 html/Search/Elements/PickRestriction:54 html/Ticket/Create.html:153 html/Ticket/Elements/EditBasics:52 html/Ticket/Elements/ShowBasics:50 lib/RT/Tickets_Overlay.pm:1106
+#: html/Search/Elements/PickRestriction:54 html/Ticket/Create.html:153 html/Ticket/Elements/EditBasics:53 html/Ticket/Elements/ShowBasics:38 html/Work/Search/PickRestriction:34 html/Work/Tickets/Elements/EditBasics:41 lib/RT/Tickets_Overlay.pm:1103
 msgid "Priority"
 msgstr "優先順位"
 
@@ -4821,48 +4566,44 @@
 msgid "Priority starts at"
 msgstr "優先順位起始值"
 
-#: html/Search/Elements/EditSearches:3
-msgid "Privacy:"
-msgstr ""
-
 #: etc/initialdata:25
 msgid "Privileged"
 msgstr "內部成員"
 
-#: html/Admin/Users/Modify.html:288 html/User/Prefs.html:200
+#: html/Admin/Users/Modify.html:272 html/User/Prefs.html:203 html/Work/Preferences/Info:168
 #. (loc_fuzzy($msg))
 msgid "Privileged status: %1"
 msgstr "內部成員狀態:%1"
 
-#: html/Admin/Users/index.html:82
+#: html/Admin/Users/index.html:61
 msgid "Privileged users"
 msgstr "內部成員"
 
-#: NOT FOUND IN SOURCE
+#: html/Work/Elements/SelectSearch:21
 msgid "Process Status"
 msgstr "處理狀態"
 
-#: NOT FOUND IN SOURCE
+#: html/Work/Elements/MyRequests:18 html/Work/Elements/MyTickets:18
+msgid "Project"
+msgstr "專案"
+
+#: html/Edit/Queues/List:10
 msgid "Project Name"
 msgstr "專案名稱"
 
-#: html/Projects/Elements/Tabs:28
-msgid "Projects"
-msgstr ""
-
 #: etc/initialdata:23 etc/initialdata:29 etc/initialdata:35 etc/initialdata:59
 msgid "Pseudogroup for internal use"
 msgstr "內部用的虛擬群組"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Queues/List:11
 msgid "Public Description"
 msgstr "公開說明"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Users/Info:76 html/Work/Preferences/Info:73
 msgid "Public Info"
 msgstr "公開資訊"
 
-#: NOT FOUND IN SOURCE
+#: html/Work/Elements/104Header:88
 msgid "Public Service"
 msgstr "公共事務區"
 
@@ -4870,21 +4611,17 @@
 msgid "Purging stale data: %1"
 msgstr "移除過期資料: %1"
 
-#: html/Search/Build.html:42
+#: html/Edit/Users/Search.html:4
 msgid "Query"
 msgstr "查詢"
 
-#: html/Search/Build.html:77 html/Ticket/Elements/Tabs:171
-msgid "Query Builder"
-msgstr ""
-
-#: html/Elements/QuickCreate:10 html/Elements/Quicksearch:28 html/Search/Elements/PickBasics:94 html/Search/Elements/PickRestriction:46 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:947
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:166 html/Elements/MyRequests:29 html/Elements/MyTickets:29 html/Elements/Quicksearch:28 html/Search/Elements/PickRestriction:46 html/SelfService/Create.html:32 html/Ticket/Create.html:37 html/Ticket/Elements/EditBasics:63 html/Ticket/Elements/ShowBasics:42 html/User/Elements/DelegateRights:79 html/Work/Elements/MyApprovals:10 html/Work/Elements/MyRequests:20 html/Work/Elements/MyTickets:20 html/Work/Elements/Quicksearch:14 html/Work/Search/PickRestriction:26 html/Work/Tickets/Elements/EditBasics:16 lib/RT/Tickets_Overlay.pm:944
 msgid "Queue"
 msgstr "表單"
 
-#: html/Admin/Queues/CustomField.html:41 html/Admin/Queues/Scrip.html:49 html/Admin/Queues/Scrips.html:47 html/Admin/Queues/Templates.html:43
-#. ($id)
+#: html/Admin/Queues/CustomField.html:41 html/Admin/Queues/Scrip.html:49 html/Admin/Queues/Scrips.html:47 html/Admin/Queues/Templates.html:43 html/Admin/Queues/Workflows.html:44
 #. ($Queue)
+#. ($id)
 msgid "Queue %1 not found"
 msgstr "找不到表單 %1"
 
@@ -4896,19 +4633,19 @@
 msgid "Queue Keyword Selections"
 msgstr "表單關鍵字選取"
 
-#: html/Admin/Elements/ModifyQueue:30 html/Admin/Queues/Modify.html:42
+#: html/Admin/Elements/ModifyQueue:30 html/Admin/Queues/Modify.html:42 html/Edit/Queues/Basic/Top:13 html/Edit/Queues/Basic/index.html:36 html/Edit/Queues/Global:21 html/Edit/Queues/List:20 html/Edit/Users/Queue:10 html/Work/Delegates/List:6 html/Work/Elements/List:11 html/Work/Queues/List:5 html/Work/Tickets/Create.html:21 html/Work/Tickets/Elements/ShowBasics:6
 msgid "Queue Name"
 msgstr "表單名稱"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Queues/List:22 html/Work/Elements/List:29 html/Work/Queues/List:8 html/Work/Tickets/Create.html:34 html/Work/Tickets/Elements/ShowBasics:19
 msgid "Queue Owner"
 msgstr "業務承辦人"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Queues/Basic/Top:38
 msgid "Queue Priority"
 msgstr "優先等級"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/GroupRight/Top:24 html/Edit/Global/UserRight/Top:43 html/Edit/Users/Queue:11 html/Edit/Users/index.html:97
 msgid "Queue Rights"
 msgstr "表單權限"
 
@@ -4916,7 +4653,7 @@
 msgid "Queue Scrips"
 msgstr "表單手續"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Elements/Tab:38
 msgid "Queue Setup"
 msgstr "表單設定"
 
@@ -4928,7 +4665,7 @@
 msgid "Queue could not be created"
 msgstr "無法新增表單"
 
-#: html/Ticket/Create.html:208
+#: html/Edit/Queues/autohandler:8 html/Ticket/Create.html:208 html/Work/Tickets/Create.html:186
 msgid "Queue could not be loaded."
 msgstr "無法載入表單"
 
@@ -4936,11 +4673,11 @@
 msgid "Queue created"
 msgstr "表單新增完畢"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/ModifyWorkflow:32
 msgid "Queue is not specified."
 msgstr "未指定表單。"
 
-#: html/SelfService/Display.html:70 lib/RT/CustomField_Overlay.pm:121
+#: html/SelfService/Display.html:72 lib/RT/CustomField_Overlay.pm:97
 msgid "Queue not found"
 msgstr "找不到表單"
 
@@ -4948,7 +4685,7 @@
 msgid "Queues"
 msgstr "表單"
 
-#: NOT FOUND IN SOURCE
+#: html/Work/Elements/Quicksearch:10
 msgid "Quick Search"
 msgstr "表單現況"
 
@@ -4956,14 +4693,6 @@
 msgid "Quick search"
 msgstr "表單一覽"
 
-#: html/Elements/QuickCreate:1
-msgid "Quick ticket creation"
-msgstr ""
-
-#: html/Search/Listing.html:47 html/Search/Results.html:46
-msgid "RSS"
-msgstr "RSS"
-
 #: html/Elements/Login:44
 #. ($RT::VERSION)
 msgid "RT %1"
@@ -5043,7 +4772,7 @@
 msgid "RT couldn't validate this PGP signature. \\n"
 msgstr "RT 無法確認這個 PGP 簽章。\\n"
 
-#: html/Elements/PageLayout:85
+#: html/Edit/Elements/104Header:7 html/Edit/Elements/104Top:20 html/Elements/PageLayout:85 html/Work/Elements/104Header:7
 #. ($RT::rtname)
 msgid "RT for %1"
 msgstr "%1 專用流程系統"
@@ -5056,7 +4785,7 @@
 msgid "RT has proccessed your commands"
 msgstr "RT 已執行您的命令"
 
-#: html/Elements/Login:94
+#: html/Elements/Login:100
 #. ('2003')
 msgid "RT is &copy; Copyright 1996-%1 Jesse Vincent &lt;jesse at 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 版權所有 1996-%1 Jesse Vincent &lt;jesse at bestpractical.com&gt;。<br>本軟體依 <a href=\"http://www.gnu.org/copyleft/gpl.html\">GNU 通用公共授權第二版</a> 散佈。"
@@ -5085,15 +4814,15 @@
 msgid "RT::Ticket-Role"
 msgstr "申請單運行角色"
 
-#: NOT FOUND IN SOURCE
+#: html/Work/Tickets/Elements/ShowTransaction:14
 msgid "RT_System"
 msgstr "系統訊息"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/CustomField/SelectWritable:6
 msgid "Read Only"
 msgstr "唯讀"
 
-#: html/Admin/Users/Modify.html:57 html/Admin/Users/Prefs.html:51 html/User/Prefs.html:47
+#: html/Admin/Users/Modify.html:57 html/Admin/Users/Prefs.html:51 html/Edit/Elements/SelectUsers:5 html/Edit/Users/List:6 html/User/Prefs.html:47 html/Work/Preferences/Info:18
 msgid "Real Name"
 msgstr "真實姓名"
 
@@ -5101,35 +4830,35 @@
 msgid "RealName"
 msgstr "真實姓名"
 
-#: NOT FOUND IN SOURCE
+#: html/Work/Approvals/Elements/Actions:11
 msgid "Really reject this ticket?"
 msgstr "您確定要駁回這張申請單嗎?"
 
-#: lib/RT/Transaction_Overlay.pm:629
+#: lib/RT/Transaction_Overlay.pm:592
 #. ($value)
 msgid "Reference by %1 added"
 msgstr "已加入 %1 為參考本申請單"
 
-#: lib/RT/Transaction_Overlay.pm:666
+#: lib/RT/Transaction_Overlay.pm:632
 #. ($value)
 msgid "Reference by %1 deleted"
 msgstr "已移除 %1 為參考本申請單"
 
-#: lib/RT/Transaction_Overlay.pm:626
+#: lib/RT/Transaction_Overlay.pm:589
 #. ($value)
 msgid "Reference to %1 added"
 msgstr "已加入參考申請單 %1"
 
-#: lib/RT/Transaction_Overlay.pm:663
+#: lib/RT/Transaction_Overlay.pm:629
 #. ($value)
 msgid "Reference to %1 deleted"
 msgstr "已移除參考申請單 %1"
 
-#: html/Ticket/Create.html:185 html/Ticket/Elements/BulkLinks:50 html/Ticket/Elements/EditLinks:121 html/Ticket/Elements/EditLinks:81 html/Ticket/Elements/ShowLinks:70
+#: html/Ticket/Create.html:185 html/Ticket/Elements/BulkLinks:50 html/Ticket/Elements/EditLinks:121 html/Ticket/Elements/EditLinks:81 html/Ticket/Elements/ShowLinks:70 html/Work/Search/BulkLinks:26 html/Work/Tickets/Elements/EditLinks:125 html/Work/Tickets/Elements/EditLinks:81 html/Work/Tickets/Elements/ShowLinks:38
 msgid "Referred to by"
 msgstr "被參考"
 
-#: html/Elements/SelectLinkType:27 html/Ticket/Create.html:184 html/Ticket/Elements/BulkLinks:46 html/Ticket/Elements/EditLinks:117 html/Ticket/Elements/EditLinks:72 html/Ticket/Elements/ShowLinks:60
+#: html/Elements/SelectLinkType:27 html/Ticket/Create.html:184 html/Ticket/Elements/BulkLinks:46 html/Ticket/Elements/EditLinks:117 html/Ticket/Elements/EditLinks:72 html/Ticket/Elements/ShowLinks:60 html/Work/Search/BulkLinks:22 html/Work/Tickets/Elements/EditLinks:121 html/Work/Tickets/Elements/EditLinks:67 html/Work/Tickets/Elements/ShowLinks:33
 msgid "Refers to"
 msgstr "參考"
 
@@ -5141,11 +4870,11 @@
 msgid "Refine"
 msgstr "在結果範圍內查詢"
 
-#: html/Search/Elements/PickRestriction:26
+#: html/Search/Elements/PickRestriction:26 html/Work/Search/PickRestriction:7
 msgid "Refine search"
 msgstr "調整查詢條件"
 
-#: NOT FOUND IN SOURCE
+#: html/Work/Overview/index.html:12
 msgid "Refresh"
 msgstr "更新"
 
@@ -5154,27 +4883,27 @@
 msgid "Refresh this page every %1 minutes."
 msgstr "每 %1 分鐘更新頁面"
 
-#: html/Scope/Elements/ShowSummary:57 html/Ticket/Create.html:174 html/Ticket/Elements/ShowSummary:61 html/Ticket/ModifyAll.html:56
+#: html/Ticket/Create.html:174 html/Ticket/Elements/ShowSummary:61 html/Ticket/ModifyAll.html:56
 msgid "Relationships"
 msgstr "關係"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Elements/ListButtons:13
 msgid "Remove"
 msgstr "移除"
 
-#: html/Search/Bulk.html:95
+#: html/Search/Bulk.html:97 html/Work/Search/Bulk.html:77
 msgid "Remove AdminCc"
 msgstr "移除管理員副本"
 
-#: html/Search/Bulk.html:91
+#: html/Search/Bulk.html:93 html/Work/Search/Bulk.html:71
 msgid "Remove Cc"
 msgstr "移除副本"
 
-#: html/Search/Bulk.html:87
+#: html/Search/Bulk.html:89 html/Work/Search/Bulk.html:65
 msgid "Remove Requestor"
 msgstr "移除申請人"
 
-#: html/Scope/Elements/ShowTransaction:161 html/Ticket/Elements/ShowTransaction:201 html/Ticket/Elements/Tabs:123
+#: html/Ticket/Elements/ShowTransaction:183 html/Ticket/Elements/Tabs:127 html/Work/Tickets/Display.html:54 html/Work/Tickets/Elements/ShowTransaction:116
 msgid "Reply"
 msgstr "回覆"
 
@@ -5194,23 +4923,23 @@
 msgid "Reported on"
 msgstr "到職日期"
 
-#: etc/initialdata:44 lib/RT/ACE_Overlay.pm:86
+#: etc/initialdata:44 html/Ticket/Update.html:39 html/Work/Elements/List:25 html/Work/Elements/MyApprovals:12 html/Work/Elements/MyTickets:24 html/Work/Elements/SelectSearch:36 html/Work/Tickets/Elements/ShowBasics:62 lib/RT/ACE_Overlay.pm:86
 msgid "Requestor"
 msgstr "申請人"
 
-#: NOT FOUND IN SOURCE
-msgid "Requestor Group's"
-msgstr "申請人所屬群組之"
-
-#: NOT FOUND IN SOURCE
+#: html/Work/Search/PickRestriction:17
 msgid "Requestor email address"
 msgstr "申請人電子郵件信箱位址"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Workflow/Owner.html:28
 msgid "Requestor's"
 msgstr "申請人所屬之第上"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Workflow/Owner.html:44
+msgid "Requestor's Dept."
+msgstr "申請人所屬部門之"
+
+#: html/Work/Elements/List:27
 msgid "Requestor's Phone"
 msgstr "申請人電話"
 
@@ -5222,7 +4951,7 @@
 msgid "RequestorAddresses"
 msgstr "申請人地址"
 
-#: html/SelfService/Create.html:40 html/Ticket/Create.html:55 html/Ticket/Elements/EditPeople:47 html/Ticket/Elements/ShowPeople:30
+#: html/SelfService/Create.html:40 html/Ticket/Create.html:55 html/Ticket/Elements/EditPeople:47 html/Ticket/Elements/ShowPeople:30 html/Work/Tickets/Elements/EditPeople:38
 msgid "Requestors"
 msgstr "申請人"
 
@@ -5230,16 +4959,11 @@
 msgid "Requests should be due in"
 msgstr "申請單處理期限"
 
-#: lib/RT/Attribute_Overlay.pm:122
-#. ('Object')
-msgid "Required parameter '%1' not specified"
-msgstr ""
-
 #: html/Elements/Submit:61
 msgid "Reset"
 msgstr "重設"
 
-#: html/Admin/Users/Modify.html:158 html/User/Prefs.html:63
+#: html/Admin/Users/Modify.html:158 html/User/Prefs.html:63 html/Work/Preferences/Info:37
 msgid "Residence"
 msgstr "住處"
 
@@ -5247,21 +4971,20 @@
 msgid "Resolution"
 msgstr "解決狀態"
 
-#: html/Ticket/Elements/Tabs:133
+#: html/Ticket/Elements/Tabs:137 html/Work/Tickets/Display.html:57
 msgid "Resolve"
 msgstr "解決"
 
-#: html/Scope/Update.html:120 html/Ticket/Update.html:115
-#. ($Ticket->id, $Ticket->Subject)
+#: html/Ticket/Update.html:137
 #. ($TicketObj->id, $TicketObj->Subject)
 msgid "Resolve ticket #%1 (%2)"
 msgstr "解決申請單 #%1 (%2)"
 
-#: etc/initialdata:308 html/Elements/SelectDateType:27 lib/RT/Ticket_Overlay.pm:1216
+#: etc/initialdata:308 html/Elements/SelectDateType:27 lib/RT/Ticket_Overlay.pm:1220
 msgid "Resolved"
 msgstr "已解決"
 
-#: html/Scope/Update.html:56 html/Search/Bulk.html:130 html/Ticket/ModifyAll.html:72 html/Ticket/Update.html:49
+#: html/Search/Bulk.html:132 html/Ticket/ModifyAll.html:72 html/Ticket/Update.html:71 html/Work/Search/Bulk.html:84 html/Work/Tickets/Update.html:38
 msgid "Response to requestors"
 msgstr "回覆申請人"
 
@@ -5269,31 +4992,27 @@
 msgid "Responsibility Type"
 msgstr "責任區分"
 
-#: html/Elements/ListActions:25 html/Search/Elements/NewListActions:25
+#: html/Elements/ListActions:25
 msgid "Results"
 msgstr "結果"
 
-#: html/Search/Elements/PickRestriction:105
+#: html/Search/Elements/PickRestriction:105 html/Work/Search/PickRestriction:90
 msgid "Results per page"
 msgstr "每頁列出幾筆結果"
 
-#: html/Admin/Elements/ModifyUser:32 html/Admin/Users/Modify.html:99 html/User/Prefs.html:94
+#: html/Admin/Elements/ModifyUser:32 html/Admin/Users/Modify.html:99 html/User/Prefs.html:94 html/Work/Preferences/Info:59
 msgid "Retype Password"
 msgstr "再次輸入密碼"
 
-#: html/Search/Elements/EditSearches:13
-msgid "Revert"
-msgstr "還原"
-
 #: NOT FOUND IN SOURCE
 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:612
+#: lib/RT/ACE_Overlay.pm:613
 msgid "Right Delegated"
 msgstr "權限代理完畢"
 
-#: lib/RT/ACE_Overlay.pm:302
+#: lib/RT/ACE_Overlay.pm:303
 msgid "Right Granted"
 msgstr "權限設定完畢"
 
@@ -5301,7 +5020,7 @@
 msgid "Right Loaded"
 msgstr "權限載入完畢"
 
-#: lib/RT/ACE_Overlay.pm:677 lib/RT/ACE_Overlay.pm:692
+#: lib/RT/ACE_Overlay.pm:678 lib/RT/ACE_Overlay.pm:693
 msgid "Right could not be revoked"
 msgstr "無法撤消權限"
 
@@ -5309,37 +5028,37 @@
 msgid "Right not found"
 msgstr "找不到權限"
 
-#: lib/RT/ACE_Overlay.pm:542 lib/RT/ACE_Overlay.pm:637
+#: lib/RT/ACE_Overlay.pm:543 lib/RT/ACE_Overlay.pm:638
 msgid "Right not loaded."
 msgstr "權限並未載入。"
 
-#: lib/RT/ACE_Overlay.pm:688
+#: lib/RT/ACE_Overlay.pm:689
 msgid "Right revoked"
 msgstr "權限撤消完畢"
 
-#: html/Admin/Elements/UserTabs:46
+#: html/Admin/Elements/UserTabs:40
 msgid "Rights"
 msgstr "權限及代理人"
 
-#: html/Admin/CustomFields/GroupRights.html:99 lib/RT/Interface/Web.pm:857
+#: lib/RT/Interface/Web.pm:859
 #. ($object_type)
 msgid "Rights could not be granted for %1"
 msgstr "無法將權限賦予 %1"
 
-#: html/Admin/CustomFields/GroupRights.html:126 lib/RT/Interface/Web.pm:887
+#: lib/RT/Interface/Web.pm:889
 #. ($object_type)
 msgid "Rights could not be revoked for %1"
 msgstr "無法撤消 %1 的權限"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Groups/Member:54 html/Edit/Groups/Members/List:10
 msgid "Role Members"
 msgstr "角色成員"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Groups/Member:37 html/Edit/Groups/Members/Add.html:13 html/Edit/Groups/Members/List:7 html/Edit/Groups/Roles/List:4 html/Edit/Groups/Roles/Top:7
 msgid "Role Name"
 msgstr "角色名稱"
 
-#: html/Admin/Global/GroupRights.html:50 html/Admin/Queues/GroupRights.html:52
+#: html/Admin/Global/GroupRights.html:50 html/Admin/Queues/GroupRights.html:52 html/Edit/Global/Workflow/Owner.html:55 html/Edit/Global/Workflow/Owner.html:89 html/Edit/Groups/Member:24
 msgid "Roles"
 msgstr "角色"
 
@@ -5347,23 +5066,19 @@
 msgid "RootApproval"
 msgstr "交由系統管理員簽核"
 
-#: html/Search/Elements/DisplayOptions:50
-msgid "Rows per page"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Workflow/Action:23
 msgid "Run Approval"
 msgstr "簽核執行"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Basic/Top:81
 msgid "SMTPDebug"
 msgstr "SMTP 偵錯紀錄"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Basic/Top:63
 msgid "SMTPFrom"
 msgstr "SMTP 寄件位址"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Basic/Top:61
 msgid "SMTPServer"
 msgstr "SMTP 伺服器"
 
@@ -5375,7 +5090,7 @@
 msgid "Sat."
 msgstr "星期六"
 
-#: html/Projects/Elements/OverviewEntry:19 html/Search/Elements/EditSearches:19
+#: html/Edit/Elements/104Buttons:83 html/Work/Preferences/index.html:33 html/Work/Tickets/Elements/EditBasics:63 html/Work/Tickets/Elements/EditLinks:133 html/Work/Tickets/Elements/EditPeople:51
 msgid "Save"
 msgstr "儲存"
 
@@ -5383,25 +5098,21 @@
 msgid "Save Changes"
 msgstr "儲存更改"
 
-#: html/Ticket/Elements/PreviewScrips:83
+#: NOT FOUND IN SOURCE
 msgid "Save changes"
 msgstr "儲存更改"
 
-#: html/Search/Elements/EditSearches:1
-msgid "Saved searches"
-msgstr ""
-
 #: html/Admin/Global/Scrip.html:48 html/Admin/Queues/Scrip.html:54
-#. ($ARGS{'id'})
 #. ($QueueObj->id)
+#. ($ARGS{'id'})
 msgid "Scrip #%1"
 msgstr "手續 #%1"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Scrip/List:9 html/Edit/Global/Scrip/Top:41
 msgid "Scrip Action"
 msgstr "訊息通知動作"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Scrip/List:8 html/Edit/Global/Scrip/Top:15
 msgid "Scrip Condition"
 msgstr "訊息通知條件"
 
@@ -5409,7 +5120,7 @@
 msgid "Scrip Created"
 msgstr "手續新增完畢"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Scrip/List:7 html/Edit/Global/Scrip/Top:9
 msgid "Scrip Name"
 msgstr "訊息名稱"
 
@@ -5421,7 +5132,7 @@
 msgid "Scrips"
 msgstr "手續"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/autohandler:9 html/Edit/Queues/autohandler:26
 msgid "Scrips "
 msgstr "訊息通知"
 
@@ -5433,7 +5144,7 @@
 msgid "Scrips which apply to all queues"
 msgstr "適用於所有表單的手續"
 
-#: html/Elements/SimpleSearch:26 html/Search/Elements/DisplayOptions:59 html/Search/Elements/PickRestriction:126
+#: html/Edit/Elements/104Buttons:86 html/Elements/SimpleSearch:26 html/Search/Elements/PickRestriction:126 html/Ticket/Elements/Tabs:164 html/Work/Elements/Tab:46 html/Work/Search/PickRestriction:108
 msgid "Search"
 msgstr "查詢"
 
@@ -5445,11 +5156,7 @@
 msgid "Search for approvals"
 msgstr "簽核單查詢"
 
-#: html/Search/Build.html:163
-msgid "Searches can't be associated with that kind of object"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Workflow/Owner.html:31
 msgid "Second-"
 msgstr "二"
 
@@ -5461,27 +5168,15 @@
 msgid "Security:"
 msgstr "安全性:"
 
-#: lib/RT/CustomField_Overlay.pm:45
-msgid "SeeCustomField"
-msgstr ""
-
 #: lib/RT/Queue_Overlay.pm:66
 msgid "SeeQueue"
 msgstr "查閱表單"
 
-#: lib/RT/CustomField_Overlay.pm:35
-msgid "Select"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
+#: html/Edit/Elements/ListButtons:10
 msgid "Select All"
 msgstr "全選"
 
-#: html/Admin/CustomFields/index.html:1 html/Admin/CustomFields/index.html:4
-msgid "Select a Custom Field"
-msgstr ""
-
-#: html/Admin/Groups/index.html:53
+#: html/Admin/Groups/index.html:39
 msgid "Select a group"
 msgstr "選擇群組"
 
@@ -5489,7 +5184,7 @@
 msgid "Select a queue"
 msgstr "選擇表單"
 
-#: NOT FOUND IN SOURCE
+#: html/Work/Queues/Select.html:8
 msgid "Select a queue to link to"
 msgstr "請選擇欲連結表單"
 
@@ -5497,19 +5192,19 @@
 msgid "Select a user"
 msgstr "選擇使用者"
 
-#: html/Admin/Elements/CustomFieldTabs:37 html/Admin/Global/CustomField.html:37 html/Admin/Global/CustomFields.html:35
+#: html/Admin/Global/CustomField.html:37 html/Admin/Global/CustomFields.html:35
 msgid "Select custom field"
 msgstr "選擇自訂欄位"
 
-#: html/Admin/Elements/GroupTabs:53 html/User/Elements/GroupTabs:49
+#: html/Admin/Elements/GroupTabs:51 html/User/Elements/GroupTabs:49
 msgid "Select group"
 msgstr "選擇群組"
 
-#: lib/RT/CustomField_Overlay.pm:471
+#: lib/RT/CustomField_Overlay.pm:428
 msgid "Select multiple values"
-msgstr "選擇多個項目"
+msgstr "選擇多重項目"
 
-#: lib/RT/CustomField_Overlay.pm:472
+#: lib/RT/CustomField_Overlay.pm:425
 msgid "Select one value"
 msgstr "選擇單一項目"
 
@@ -5525,15 +5220,11 @@
 msgid "Select template"
 msgstr "選擇範本"
 
-#: lib/RT/CustomField_Overlay.pm:473
-msgid "Select up to %1 values"
-msgstr ""
-
-#: html/Admin/Elements/UserTabs:54
+#: html/Admin/Elements/UserTabs:48
 msgid "Select user"
 msgstr "選擇使用者"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/Workflow.html:57 html/Admin/Global/Workflows.html:36 html/Admin/Queues/Workflow.html:54 html/Admin/Queues/Workflows.html:47
 msgid "Select workflow"
 msgstr "選擇流程"
 
@@ -5541,15 +5232,15 @@
 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 "單一選項"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Elements/PickUsers:95 html/Edit/Users/Add.html:78
 msgid "Selected users:"
 msgstr "新增對象:"
 
@@ -5613,15 +5304,7 @@
 msgid "Shift Type"
 msgstr "班別屬性"
 
-#: html/Ticket/Elements/ShowTransaction:181
-msgid "Show"
-msgstr ""
-
-#: html/Search/Elements/EditFormat:11
-msgid "Show Columns"
-msgstr ""
-
-#: html/Ticket/Elements/Tabs:177
+#: NOT FOUND IN SOURCE
 msgid "Show Results"
 msgstr "顯示結果"
 
@@ -5661,10 +5344,6 @@
 msgid "ShowACL"
 msgstr "顯示權限清單"
 
-#: lib/RT/Group_Overlay.pm:150
-msgid "ShowSavedSearches"
-msgstr ""
-
 #: lib/RT/Queue_Overlay.pm:77
 msgid "ShowScrips"
 msgstr "顯示手續"
@@ -5689,7 +5368,7 @@
 msgid "Sign up as a ticket or queue AdminCc"
 msgstr "登記成為管理員副本收件人"
 
-#: html/Admin/Elements/ModifyUser:38 html/Admin/Users/Modify.html:205 html/Admin/Users/Prefs.html:31 html/User/Prefs.html:148
+#: html/Admin/Elements/ModifyUser:38 html/Admin/Users/Modify.html:190 html/Admin/Users/Prefs.html:31 html/Edit/Users/Info:96 html/User/Prefs.html:148 html/Work/Preferences/Info:116
 msgid "Signature"
 msgstr "簽名檔"
 
@@ -5701,11 +5380,11 @@
 msgid "Single"
 msgstr "單一"
 
-#: html/Elements/Header:62
+#: html/Edit/Elements/104Top:21 html/Elements/Header:50
 msgid "Skip Menu"
 msgstr "略過選單"
 
-#: html/Admin/Elements/AddCustomFieldValue:27 html/Admin/Elements/EditCustomFieldValues:32
+#: html/Admin/Elements/AddCustomFieldValue:27
 msgid "Sort"
 msgstr "順序"
 
@@ -5713,7 +5392,7 @@
 msgid "Sort key"
 msgstr "排序方式"
 
-#: html/Search/Elements/PickRestriction:109
+#: html/Search/Elements/PickRestriction:109 html/Work/Search/PickRestriction:95
 msgid "Sort results by"
 msgstr "結果排序方式"
 
@@ -5721,23 +5400,19 @@
 msgid "SortOrder"
 msgstr "排序順序"
 
-#: html/Ticket/Elements/PreviewScrips:49
-msgid "Squelched message recipients"
-msgstr ""
-
-#: html/Admin/Elements/EditScrip:80
+#: html/Admin/Elements/EditScrip:80 html/Edit/Global/Scrip/Top:75 html/Work/Elements/List:8 html/Work/Elements/MyApprovals:11
 msgid "Stage"
 msgstr "關卡"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Workflow/Top:11
 msgid "Stage Action"
 msgstr "關卡運行動作"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Workflow/Top:7
 msgid "Stage Condition"
 msgstr "關卡運行條件"
 
-#: NOT FOUND IN SOURCE
+#: html/Work/Elements/Quicksearch:17
 msgid "Stalled"
 msgstr "延宕"
 
@@ -5745,7 +5420,7 @@
 msgid "Start page"
 msgstr "首頁"
 
-#: html/Elements/SelectDateType:26 html/Ticket/Elements/EditDates:31 html/Ticket/Elements/ShowDates:35
+#: html/Elements/SelectDateType:26 html/Ticket/Elements/EditDates:31 html/Ticket/Elements/ShowDates:35 html/Work/Tickets/Elements/EditBasics:35
 msgid "Started"
 msgstr "實際起始日"
 
@@ -5753,7 +5428,7 @@
 msgid "Started date '%1' could not be parsed"
 msgstr "無法解讀起始日期 '%1"
 
-#: html/Elements/SelectDateType:30 html/Ticket/Create.html:165 html/Ticket/Elements/EditDates:26 html/Ticket/Elements/ShowDates:31
+#: html/Elements/SelectDateType:30 html/Ticket/Create.html:165 html/Ticket/Elements/EditDates:26 html/Ticket/Elements/ShowDates:31 html/Work/Tickets/Elements/EditBasics:26
 msgid "Starts"
 msgstr "應起始日"
 
@@ -5765,11 +5440,11 @@
 msgid "Starts date '%1' could not be parsed"
 msgstr "無法解讀起始日期 '%1"
 
-#: html/Admin/Elements/ModifyUser:81 html/Admin/Users/Modify.html:137 html/User/Prefs.html:126
+#: html/Admin/Elements/ModifyUser:81 html/Admin/Users/Modify.html:137 html/User/Prefs.html:126 html/Work/Preferences/Info:88
 msgid "State"
 msgstr "州"
 
-#: html/Projects/Overview.html:14 html/Scope/Update.html:44 html/Search/Elements/PickBasics:77 html/Search/Elements/PickRestriction:74 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:1210 lib/RT/Tickets_Overlay.pm:972
+#: html/Elements/MyRequests:30 html/Elements/MyTickets:30 html/Search/Elements/PickRestriction:74 html/SelfService/Elements/MyRequests:28 html/SelfService/Update.html:30 html/Ticket/Create.html:41 html/Ticket/Elements/EditBasics:37 html/Ticket/Elements/ShowBasics:30 html/Ticket/Update.html:59 html/Work/Elements/List:19 html/Work/Elements/MyRequests:22 html/Work/Elements/MyTickets:22 html/Work/Search/PickRestriction:54 html/Work/Tickets/Elements/EditBasics:19 html/Work/Tickets/Update.html:22 lib/RT/Ticket_Overlay.pm:1214 lib/RT/Tickets_Overlay.pm:969
 msgid "Status"
 msgstr "現況"
 
@@ -5777,7 +5452,7 @@
 msgid "Status Change"
 msgstr "現況改變時"
 
-#: lib/RT/Transaction_Overlay.pm:514
+#: lib/RT/Transaction_Overlay.pm:477
 #. ($self->loc($self->OldValue), $self->loc($self->NewValue))
 msgid "Status changed from %1 to %2"
 msgstr "現況從 %1 改為 %2"
@@ -5786,7 +5461,7 @@
 msgid "StatusChange"
 msgstr "現況改變時"
 
-#: html/Ticket/Elements/Tabs:148
+#: html/Ticket/Elements/Tabs:152
 msgid "Steal"
 msgstr "強制更換承辦人"
 
@@ -5798,25 +5473,25 @@
 msgid "StealTicket"
 msgstr "強制承辦申請單"
 
-#: lib/RT/Transaction_Overlay.pm:582
+#: lib/RT/Transaction_Overlay.pm:545
 #. ($Old->Name)
 msgid "Stolen from %1 "
 msgstr "承辦人從 %1 強制更換"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Groups/Member:68
 msgid "Subgroup"
 msgstr "子群組"
 
-#: html/Elements/QuickCreate:7 html/Elements/SelectAttachmentField:25 html/Scope/Update.html:60 html/Search/Bulk.html:133 html/Search/Elements/PickRestriction:43 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:53 lib/RT/Ticket_Overlay.pm:1206 lib/RT/Tickets_Overlay.pm:1051
+#: html/Elements/MyRequests:28 html/Elements/MyTickets:28 html/Search/Bulk.html:135 html/Search/Elements/PickRestriction:43 html/SelfService/Create.html:56 html/SelfService/Elements/MyRequests:27 html/SelfService/Update.html:31 html/Ticket/Create.html:83 html/Ticket/Elements/EditBasics:27 html/Ticket/ModifyAll.html:78 html/Ticket/Update.html:75 html/Work/Elements/List:15 html/Work/Elements/MyApprovals:9 html/Work/Elements/MyRequests:16 html/Work/Elements/MyTickets:16 html/Work/Search/Bulk.html:87 html/Work/Search/PickRestriction:22 html/Work/Tickets/Elements/AddSubject:8 html/Work/Tickets/Elements/EditBasics:8 html/Work/Tickets/Elements/ShowBasics:36 html/Work/Tickets/Elements/ShowSubject:8 lib/RT/Ticket_Overlay.pm:1210 lib/RT/Tickets_Overlay.pm:1048
 msgid "Subject"
 msgstr "主題"
 
-#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/StyleGuide.pod:795 lib/RT/Transaction_Overlay.pm:604
+#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/StyleGuide.pod:795 lib/RT/Transaction_Overlay.pm:567
 #. ($self->Data)
 msgid "Subject changed to %1"
 msgstr "標題已改為 %1"
 
-#: html/Elements/Submit:58
+#: html/Edit/Users/Info:116 html/Elements/Submit:58 html/Work/Search/Bulk.html:103
 msgid "Submit"
 msgstr "送出"
 
@@ -5836,15 +5511,15 @@
 msgid "Sun."
 msgstr "星期日"
 
-#: lib/RT/System.pm:53
+#: html/Edit/Users/System:17 lib/RT/System.pm:53
 msgid "SuperUser"
 msgstr "系統管理員"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Basic/Top:29
 msgid "Sync now"
 msgstr "執行同步"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Basic/Top:87
 msgid "Sync104HRMS"
 msgstr "自動同步104HRMS"
 
@@ -5856,11 +5531,11 @@
 msgid "System"
 msgstr "系統"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Scrip/Top:18 html/Edit/Global/Scrip/Top:44
 msgid "System Defined"
 msgstr "系統定義"
 
-#: html/Admin/CustomFields/GroupRights.html:125 html/Admin/CustomFields/GroupRights.html:98 html/Admin/CustomFields/UserRights.html:101 html/Admin/CustomFields/UserRights.html:71 html/Admin/Elements/SelectRights:81 lib/RT/ACE_Overlay.pm:566 lib/RT/Interface/Web.pm:856 lib/RT/Interface/Web.pm:886
+#: html/Admin/Elements/SelectRights:81 lib/RT/ACE_Overlay.pm:567 lib/RT/Interface/Web.pm:858 lib/RT/Interface/Web.pm:888
 msgid "System Error"
 msgstr "系統錯誤"
 
@@ -5872,15 +5547,15 @@
 msgid "System Error. right not granted"
 msgstr "系統錯誤。設定權限失敗。"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Users/index.html:95
 msgid "System Rights"
 msgstr "系統權限"
 
-#: lib/RT/ACE_Overlay.pm:615
+#: lib/RT/ACE_Overlay.pm:616
 msgid "System error. Right not delegated."
 msgstr "系統錯誤。權限代理失敗。"
 
-#: lib/RT/ACE_Overlay.pm:145 lib/RT/ACE_Overlay.pm:222 lib/RT/ACE_Overlay.pm:305 lib/RT/ACE_Overlay.pm:897
+#: lib/RT/ACE_Overlay.pm:145 lib/RT/ACE_Overlay.pm:222 lib/RT/ACE_Overlay.pm:306 lib/RT/ACE_Overlay.pm:898
 msgid "System error. Right not granted."
 msgstr "系統錯誤。設定權限失敗。"
 
@@ -5888,7 +5563,7 @@
 msgid "System error. Unable to grant rights."
 msgstr "系統錯誤。無法設定權限。"
 
-#: html/Admin/CustomFields/GroupRights.html:28 html/Admin/Global/GroupRights.html:34 html/Admin/Groups/GroupRights.html:36 html/Admin/Queues/GroupRights.html:35
+#: html/Admin/Global/GroupRights.html:34 html/Admin/Groups/GroupRights.html:36 html/Admin/Queues/GroupRights.html:35
 msgid "System groups"
 msgstr "系統群組"
 
@@ -5900,7 +5575,7 @@
 msgid "SystemRolegroup for internal use"
 msgstr "內部使用的系統角色群組"
 
-#: lib/RT/CurrentUser.pm:320
+#: lib/RT/CurrentUser.pm:361
 msgid "TEST_STRING"
 msgstr "TEST_STRING"
 
@@ -5908,7 +5583,7 @@
 msgid "TabbedUI"
 msgstr "頁籤介面"
 
-#: html/Elements/MyRequests:27 html/Ticket/Elements/Tabs:144
+#: html/Ticket/Elements/Tabs:148
 msgid "Take"
 msgstr "受理"
 
@@ -5920,14 +5595,10 @@
 msgid "TakeTicket"
 msgstr "自行承辦申請單"
 
-#: lib/RT/Transaction_Overlay.pm:567
+#: lib/RT/Transaction_Overlay.pm:530
 msgid "Taken"
 msgstr "已受理"
 
-#: html/Projects/Overview.html:12
-msgid "Task"
-msgstr ""
-
 #: html/Admin/Elements/EditScrip:88
 msgid "Template"
 msgstr "範本"
@@ -5937,15 +5608,15 @@
 msgid "Template #%1"
 msgstr "範本 #%1"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Template/List:9 html/Edit/Global/Template/Top:17
 msgid "Template Content"
 msgstr "通知範本內容"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Template/List:8 html/Edit/Global/Template/Top:13
 msgid "Template Description"
 msgstr "通知範本描述"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Template/List:7 html/Edit/Global/Template/Top:9
 msgid "Template Name"
 msgstr "通知範本名稱"
 
@@ -5961,7 +5632,7 @@
 msgid "Template not found\\n"
 msgstr "找不到範本\\n"
 
-#: lib/RT/Template_Overlay.pm:359
+#: lib/RT/Template_Overlay.pm:360
 msgid "Template parsed"
 msgstr "範本剖析完畢"
 
@@ -5969,7 +5640,7 @@
 msgid "Templates"
 msgstr "範本"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/autohandler:8 html/Edit/Queues/autohandler:25
 msgid "Templates "
 msgstr "通知範本"
 
@@ -5977,50 +5648,47 @@
 msgid "Templates for %1\\n"
 msgstr "找不到 %1 的範本\\n"
 
-#: lib/RT/CustomField_Overlay.pm:36
-msgid "Text"
-msgstr ""
-
-#: lib/RT/CustomField_Overlay.pm:732 lib/RT/Interface/Web.pm:954
+#: lib/RT/Interface/Web.pm:956
 msgid "That is already the current value"
 msgstr "已經是目前欄位的值"
 
-#: lib/RT/CustomField_Overlay.pm:293
+#: lib/RT/CustomField_Overlay.pm:249
 msgid "That is not a value for this custom field"
 msgstr "這不是該自訂欄位的值"
 
-#: lib/RT/Ticket_Overlay.pm:2018
+#: lib/RT/Ticket_Overlay.pm:1934
 msgid "That is the same value"
 msgstr "同樣的值"
 
-#: lib/RT/ACE_Overlay.pm:287 lib/RT/ACE_Overlay.pm:596
+#: lib/RT/ACE_Overlay.pm:287 lib/RT/ACE_Overlay.pm:597
 msgid "That principal already has that right"
 msgstr "這項單位已經擁有該權限"
 
-#: lib/RT/Queue_Overlay.pm:641
+#: lib/RT/Queue_Overlay.pm:633
 #. ($args{'Type'})
 msgid "That principal is already a %1 for this queue"
 msgstr "這項單位已經是這個表單的 %1"
 
-#: lib/RT/Ticket_Overlay.pm:1461
+#: lib/RT/Ticket_Overlay.pm:1466
 #. ($self->loc($args{'Type'}))
 msgid "That principal is already a %1 for this ticket"
 msgstr "這項單位已經是這份申請單的 %1"
 
-#: lib/RT/Queue_Overlay.pm:740
+#: lib/RT/Queue_Overlay.pm:732
 #. ($args{'Type'})
 msgid "That principal is not a %1 for this queue"
 msgstr "這項單位不是這個表單的 %1"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:1583
+#. ($args{'Type'})
 msgid "That principal is not a %1 for this ticket"
 msgstr "這項單位不是這份申請單的 %1"
 
-#: lib/RT/Ticket_Overlay.pm:2014
+#: lib/RT/Ticket_Overlay.pm:1930
 msgid "That queue does not exist"
 msgstr "此表單不存在"
 
-#: lib/RT/Ticket_Overlay.pm:3406
+#: lib/RT/Ticket_Overlay.pm:3301
 msgid "That ticket has unresolved dependencies"
 msgstr "這份申請單有尚未解決的附屬申請單"
 
@@ -6028,27 +5696,27 @@
 msgid "That user already has that right"
 msgstr "使用者已具有該項權限"
 
-#: lib/RT/Ticket_Overlay.pm:3210
+#: lib/RT/Ticket_Overlay.pm:3105
 msgid "That user already owns that ticket"
 msgstr "該使用者已經承辦這份申請單"
 
-#: lib/RT/Ticket_Overlay.pm:3182
+#: lib/RT/Ticket_Overlay.pm:3077
 msgid "That user does not exist"
 msgstr "使用者不存在"
 
-#: lib/RT/User_Overlay.pm:329
+#: lib/RT/User_Overlay.pm:381
 msgid "That user is already privileged"
 msgstr "這名使用者已經是內部成員"
 
-#: lib/RT/User_Overlay.pm:350
+#: lib/RT/User_Overlay.pm:402
 msgid "That user is already unprivileged"
 msgstr "這名使用者屬於非內部成員群組"
 
-#: lib/RT/User_Overlay.pm:342
+#: lib/RT/User_Overlay.pm:394
 msgid "That user is now privileged"
 msgstr "使用者加入內部成員群組完畢"
 
-#: lib/RT/User_Overlay.pm:363
+#: lib/RT/User_Overlay.pm:415
 msgid "That user is now unprivileged"
 msgstr "這名使用者已加入非內部成員群組"
 
@@ -6056,15 +5724,15 @@
 msgid "That user is now unprivilegedileged"
 msgstr "這名使用者已加入非內部成員群組"
 
-#: lib/RT/Ticket_Overlay.pm:3203
+#: lib/RT/Ticket_Overlay.pm:3098
 msgid "That user may not own tickets in that queue"
 msgstr "使用者可能沒有承辦表單裡的申請單"
 
-#: lib/RT/Link_Overlay.pm:205
+#: lib/RT/Link_Overlay.pm:206
 msgid "That's not a numerical id"
 msgstr "這不是一個數字編號"
 
-#: html/Scope/Elements/ShowSummary:27 html/SelfService/Display.html:31 html/Ticket/Create.html:149 html/Ticket/Elements/ShowSummary:27
+#: html/SelfService/Display.html:31 html/Ticket/Create.html:149 html/Ticket/Elements/ShowSummary:27
 msgid "The Basics"
 msgstr "基本資訊"
 
@@ -6076,7 +5744,7 @@
 msgid "The administrative CC of a ticket"
 msgstr "申請單的管理員副本收件人"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:2263
 msgid "The comment has been recorded"
 msgstr "評論已被紀錄"
 
@@ -6088,7 +5756,7 @@
 msgid "The following commands were not proccessed:\\n\\n"
 msgstr "以下命令未被執行:\\n\\n"
 
-#: lib/RT/Interface/Web.pm:957
+#: lib/RT/Interface/Web.pm:959
 msgid "The new value has been set."
 msgstr "新的欄位值設定完成。"
 
@@ -6104,14 +5772,10 @@
 msgid "These comments aren't generally visible to the user"
 msgstr "該使用者不會看見這些評論"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Workflow/Owner.html:32
 msgid "Third-"
 msgstr "三"
 
-#: lib/RT/CustomField_Overlay.pm:757
-msgid "This custom field does not apply to that object"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "This ticket %1 %2 (%3)\\n"
 msgstr "申請單 %1 %2 (%3)\\n"
@@ -6120,7 +5784,7 @@
 msgid "This tool allows the user to run arbitrary perl modules from within RT."
 msgstr "此工具程式會讓使用者經由 RT 執行任意命令。"
 
-#: lib/RT/Transaction_Overlay.pm:237
+#: lib/RT/Transaction_Overlay.pm:200
 msgid "This transaction appears to have no content"
 msgstr "此項更動報告沒有內容"
 
@@ -6141,7 +5805,7 @@
 msgid "Thu."
 msgstr "星期四"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/ModifyTemplateAsWorkflow:163 html/Edit/Global/Workflow/Condition:24
 msgid "Ticket"
 msgstr "申請單"
 
@@ -6163,7 +5827,7 @@
 msgid "Ticket #%1: %2"
 msgstr "申請單 #%1: %2"
 
-#: lib/RT/Ticket_Overlay.pm:633 lib/RT/Ticket_Overlay.pm:654
+#: lib/RT/Ticket_Overlay.pm:637 lib/RT/Ticket_Overlay.pm:658
 #. ($self->Id, $QueueObj->Name)
 msgid "Ticket %1 created in queue '%2'"
 msgstr "申請單 #%1 成功新增於 '%2' 表單"
@@ -6173,12 +5837,12 @@
 msgid "Ticket %1 loaded\\n"
 msgstr "載入申請單 %1\\n"
 
-#: html/Search/Bulk.html:215
+#: html/Search/Bulk.html:213 html/Work/Search/Bulk.html:169
 #. ($Ticket->Id,$_)
 msgid "Ticket %1: %2"
 msgstr "申請單 %1:%2"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Queues/Basic/Top:30 html/Edit/Queues/List:30 html/Work/Queues/List:10
 msgid "Ticket Due"
 msgstr "表單處理期限"
 
@@ -6187,11 +5851,11 @@
 msgid "Ticket History # %1 %2"
 msgstr "申請單處理紀錄 # %1 %2"
 
-#: NOT FOUND IN SOURCE
+#: html/Work/Elements/List:6
 msgid "Ticket ID"
 msgstr "單號"
 
-#: NOT FOUND IN SOURCE
+#: html/Work/Elements/SelectSearch:6
 msgid "Ticket Id"
 msgstr "申請單編號"
 
@@ -6203,27 +5867,27 @@
 msgid "Ticket Resolved"
 msgstr "申請單已解決"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Queues/Basic/Top:20 html/Edit/Queues/Category/List:6 html/Edit/Queues/Category/Top:7 html/Edit/Queues/List:21 html/Work/Delegates/List:7 html/Work/Delegates/index.html:12 html/Work/Elements/List:13 html/Work/Queues/Select.html:12 html/Work/Queues/index.html:12 html/Work/Tickets/Elements/ShowBasics:34
 msgid "Ticket Type"
 msgstr "表單種類"
 
-#: html/Search/Elements/PickRestriction:63
+#: html/Search/Elements/PickRestriction:63 html/Work/Search/PickRestriction:43
 msgid "Ticket attachment"
 msgstr "申請單附件"
 
-#: lib/RT/Tickets_Overlay.pm:1230
+#: lib/RT/Tickets_Overlay.pm:1227
 msgid "Ticket content"
 msgstr "申請單內容"
 
-#: lib/RT/Tickets_Overlay.pm:1276
+#: lib/RT/Tickets_Overlay.pm:1273
 msgid "Ticket content type"
 msgstr "申請單內容類別"
 
-#: lib/RT/Ticket_Overlay.pm:521 lib/RT/Ticket_Overlay.pm:530 lib/RT/Ticket_Overlay.pm:540 lib/RT/Ticket_Overlay.pm:643
+#: lib/RT/Ticket_Overlay.pm:525 lib/RT/Ticket_Overlay.pm:534 lib/RT/Ticket_Overlay.pm:544 lib/RT/Ticket_Overlay.pm:647
 msgid "Ticket could not be created due to an internal error"
 msgstr "內部錯誤,無法新增申請單"
 
-#: lib/RT/Transaction_Overlay.pm:506
+#: lib/RT/Transaction_Overlay.pm:469
 msgid "Ticket created"
 msgstr "申請單新增完畢"
 
@@ -6231,7 +5895,7 @@
 msgid "Ticket creation failed"
 msgstr "申請單新增失敗"
 
-#: lib/RT/Transaction_Overlay.pm:511
+#: lib/RT/Transaction_Overlay.pm:474
 msgid "Ticket deleted"
 msgstr "申請單刪除完畢"
 
@@ -6243,10 +5907,6 @@
 msgid "Ticket killed"
 msgstr "申請單刪除完畢"
 
-#: html/Ticket/Display.html:33
-msgid "Ticket metadata"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "Ticket not found"
 msgstr "找不到申請單"
@@ -6255,7 +5915,7 @@
 msgid "Ticket status changed"
 msgstr "申請單現況已改變"
 
-#: NOT FOUND IN SOURCE
+#: html/Ticket/Update.html:38
 msgid "Ticket watchers"
 msgstr "申請單視察員"
 
@@ -6263,12 +5923,12 @@
 msgid "Tickets"
 msgstr "申請單"
 
-#: lib/RT/Tickets_Overlay.pm:1454
+#: lib/RT/Tickets_Overlay.pm:1451
 #. ($self->loc($args{'TYPE'}), ($args{'BASE'} || $args{'TICKET'}))
 msgid "Tickets %1 %2"
 msgstr "申請單 %1 %2"
 
-#: lib/RT/Tickets_Overlay.pm:1412
+#: lib/RT/Tickets_Overlay.pm:1409
 #. ($self->loc($args{'TYPE'}), ($args{'TARGET'} || $args{'TICKET'}))
 msgid "Tickets %1 by %2"
 msgstr "申請單 %1 (%2)"
@@ -6290,19 +5950,15 @@
 msgid "Tickets which depend on this approval:"
 msgstr "批准之後,可接續處理:"
 
-#: html/Search/Elements/PickBasics:69 html/Ticket/Elements/EditBasics:39
-msgid "Time Estimated"
-msgstr ""
-
-#: html/Search/Elements/PickBasics:70 html/Ticket/Create.html:156 html/Ticket/Elements/EditBasics:47
+#: html/Ticket/Create.html:156 html/Ticket/Elements/EditBasics:47 html/Work/Tickets/Elements/EditBasics:32
 msgid "Time Left"
 msgstr "剩餘時間"
 
-#: html/Search/Elements/PickBasics:68 html/Ticket/Create.html:155 html/Ticket/Elements/EditBasics:43
+#: html/Ticket/Create.html:155 html/Ticket/Elements/EditBasics:42 html/Work/Tickets/Elements/EditBasics:24
 msgid "Time Worked"
 msgstr "處理時間"
 
-#: lib/RT/Tickets_Overlay.pm:1203
+#: lib/RT/Tickets_Overlay.pm:1200
 msgid "Time left"
 msgstr "剩餘時間"
 
@@ -6310,7 +5966,7 @@
 msgid "Time to display"
 msgstr "顯示時間"
 
-#: lib/RT/Tickets_Overlay.pm:1179
+#: lib/RT/Tickets_Overlay.pm:1176
 msgid "Time worked"
 msgstr "已處理時間"
 
@@ -6318,7 +5974,7 @@
 msgid "TimeLeft"
 msgstr "剩餘時間"
 
-#: lib/RT/Ticket_Overlay.pm:1211
+#: lib/RT/Ticket_Overlay.pm:1215
 msgid "TimeWorked"
 msgstr "已處理時間"
 
@@ -6330,15 +5986,11 @@
 msgid "To generate a diff of this commit:\\n"
 msgstr "產生這次更動的差異檔:\\n"
 
-#: lib/RT/Ticket_Overlay.pm:1214
+#: lib/RT/Ticket_Overlay.pm:1218
 msgid "Told"
 msgstr "告知日期"
 
-#: html/Admin/Elements/Tabs:46
-msgid "Tools"
-msgstr "工具"
-
-#: NOT FOUND IN SOURCE
+#: html/Edit/Elements/Page:45
 msgid "Total"
 msgstr "頁"
 
@@ -6346,23 +5998,19 @@
 msgid "Transaction"
 msgstr "更動"
 
-#: lib/RT/Transaction_Overlay.pm:703
+#: lib/RT/Transaction_Overlay.pm:669
 #. ($self->Data)
 msgid "Transaction %1 purged"
 msgstr "清除更動報告 %1"
 
-#: lib/RT/Transaction_Overlay.pm:147
+#: lib/RT/Transaction_Overlay.pm:126
 msgid "Transaction Created"
 msgstr "更動報告已新增"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Transaction_Overlay.pm:90
 msgid "Transaction->Create couldn't, as you didn't specify a ticket id"
 msgstr "未指定申請單編號,無法新增更動"
 
-#: lib/RT/Transaction_Overlay.pm:98
-msgid "Transaction->Create couldn't, as you didn't specify an object id"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "TransactionBatch"
 msgstr "批次更動時"
@@ -6371,10 +6019,14 @@
 msgid "TransactionCreate"
 msgstr "新增更動時"
 
-#: lib/RT/Transaction_Overlay.pm:758
+#: lib/RT/Transaction_Overlay.pm:724
 msgid "Transactions are immutable"
 msgstr "不可更改更動報告"
 
+#: html/Work/Approvals/Elements/Approve:52
+msgid "Transfer to"
+msgstr "移交給"
+
 #: NOT FOUND IN SOURCE
 msgid "Trying to delete a right: %1"
 msgstr "試圖刪除某項權限:%1"
@@ -6387,14 +6039,10 @@
 msgid "Tue."
 msgstr "星期二"
 
-#: html/Admin/CustomFields/Modify.html:20 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:1212 lib/RT/Tickets_Overlay.pm:1023
+#: html/Admin/Elements/EditCustomField:43 html/Admin/Elements/ModifyTemplateAsWorkflow:135 html/Ticket/Elements/AddWatchers:32 html/Ticket/Elements/AddWatchers:43 html/Ticket/Elements/AddWatchers:53 lib/RT/Ticket_Overlay.pm:1216 lib/RT/Tickets_Overlay.pm:1020
 msgid "Type"
 msgstr "類別"
 
-#: html/Admin/Elements/EditCustomFields:49
-msgid "Unassociated Custom Fields (check to associate)"
-msgstr "未選用的自訂欄位 (勾選將選用該欄位)"
-
 #: lib/RT/ScripCondition_Overlay.pm:103
 msgid "Unimplemented"
 msgstr "尚無實作"
@@ -6407,7 +6055,7 @@
 msgid "UnixUsername"
 msgstr "外部系統登入帳號"
 
-#: lib/RT/Attachment_Overlay.pm:285 lib/RT/Attachment_Overlay.pm:317
+#: lib/RT/Attachment_Overlay.pm:283 lib/RT/Attachment_Overlay.pm:315
 #. ($self->ContentEncoding)
 msgid "Unknown ContentEncoding %1"
 msgstr "不可解的內容文字編碼方式 %1"
@@ -6416,27 +6064,19 @@
 msgid "Unlimited"
 msgstr "全數顯示"
 
-#: html/Search/Elements/SelectSearchesForObjects:15
-msgid "Unnamed search"
-msgstr ""
-
 #: etc/initialdata:32
 msgid "Unprivileged"
 msgstr "非內部成員"
 
-#: lib/RT/Transaction_Overlay.pm:563
+#: lib/RT/Transaction_Overlay.pm:526
 msgid "Untaken"
 msgstr "未被受理"
 
-#: html/Search/Build.html:1014 html/Search/Build.html:169 html/Search/Build.html:175
-msgid "Untitled search"
-msgstr ""
-
-#: NOT FOUND IN SOURCE
+#: html/Edit/Elements/Page:13 html/Edit/Elements/Page:15
 msgid "Up"
 msgstr "上一頁"
 
-#: html/Search/Bulk.html:32
+#: html/Elements/MyTickets:63 html/Search/Bulk.html:32 html/Work/Elements/MyTickets:91 html/Work/Search/Bulk.html:10 html/Work/Tickets/Elements/EditCustomFieldEntries:72
 msgid "Update"
 msgstr "處理"
 
@@ -6444,11 +6084,11 @@
 msgid "Update ID"
 msgstr "更新編號"
 
-#: html/Scope/Update.html:50 html/Search/Bulk.html:127 html/Ticket/ModifyAll.html:65 html/Ticket/Update.html:43
+#: html/Search/Bulk.html:129 html/Ticket/ModifyAll.html:65 html/Ticket/Update.html:65 html/Work/Search/Bulk.html:81 html/Work/Tickets/Update.html:32
 msgid "Update Type"
 msgstr "更新類別"
 
-#: html/Search/Listing.html:45 html/Search/Results.html:44
+#: html/Search/Listing.html:60 html/Work/Search/index.html:32
 msgid "Update all these tickets at once"
 msgstr "整批更新申請單"
 
@@ -6460,11 +6100,11 @@
 msgid "Update name"
 msgstr "更新帳號"
 
-#: lib/RT/Interface/Web.pm:467
+#: lib/RT/Interface/Web.pm:469
 msgid "Update not recorded."
 msgstr "更新未被記錄"
 
-#: html/Search/Bulk.html:78
+#: html/Search/Bulk.html:80 html/Work/Search/Bulk.html:52
 msgid "Update selected tickets"
 msgstr "更新選擇的申請單"
 
@@ -6485,45 +6125,20 @@
 msgid "Update ticket #%1"
 msgstr "更新申請單 #%1"
 
-#: html/Scope/Update.html:122 html/Ticket/Update.html:117
-#. ($Ticket->id, $Ticket->Subject)
+#: html/Ticket/Update.html:139
 #. ($TicketObj->id, $TicketObj->Subject)
 msgid "Update ticket #%1 (%2)"
 msgstr "更新申請單 #%1 (%2)"
 
-#: lib/RT/Interface/Web.pm:465
+#: lib/RT/Interface/Web.pm:467
 msgid "Update type was neither correspondence nor comment."
 msgstr "更新的內容並非申請單回覆也不是評論"
 
-#: html/Elements/SelectDateType:32 html/Ticket/Elements/ShowDates:51 lib/RT/Ticket_Overlay.pm:1215
+#: html/Elements/SelectDateType:32 html/Ticket/Elements/ShowDates:51 lib/RT/Ticket_Overlay.pm:1219
 msgid "Updated"
 msgstr "前次更新"
 
-#: lib/RT/CustomField_Overlay.pm:491
-msgid "Upload multiple files"
-msgstr "上傳多份檔案"
-
-#: lib/RT/CustomField_Overlay.pm:486
-msgid "Upload multiple images"
-msgstr "上傳多張圖片"
-
-#: lib/RT/CustomField_Overlay.pm:492
-msgid "Upload one files"
-msgstr "上傳單一檔案"
-
-#: lib/RT/CustomField_Overlay.pm:487
-msgid "Upload one image"
-msgstr "上傳單一圖片"
-
-#: lib/RT/CustomField_Overlay.pm:493
-msgid "Upload up to %1 files"
-msgstr "上傳最多 %1 份檔案"
-
-#: lib/RT/CustomField_Overlay.pm:488
-msgid "Upload up to %1 images"
-msgstr "上傳最多 %1 張圖片"
-
-#: NOT FOUND IN SOURCE
+#: html/Work/Preferences/index.html:15 html/Work/Tickets/Elements/ShowTransaction:11
 msgid "User"
 msgstr "使用者"
 
@@ -6551,19 +6166,19 @@
 msgid "User ID"
 msgstr "使用者 ID"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Elements/SelectUsers:3 html/Elements/SelectUsers:25
 msgid "User Id"
 msgstr "使用者 ID"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Elements/PickUsers:13 html/Edit/Global/UserRight/List:7 html/Edit/Global/UserRight/Top:9 html/Edit/Users/Add.html:13 html/Edit/Users/Search.html:23 html/Work/Delegates/Info:60 html/Work/Tickets/Cc:10
 msgid "User Number"
 msgstr "員工編號"
 
-#: html/Admin/Elements/CustomFieldTabs:27 html/Admin/Elements/GroupTabs:46 html/Admin/Elements/QueueTabs:59 html/Admin/Elements/SystemTabs:46 html/Admin/Global/index.html:58
+#: html/Admin/Elements/GroupTabs:46 html/Admin/Elements/QueueTabs:59 html/Admin/Elements/SystemTabs:46 html/Admin/Global/index.html:58 html/Edit/Global/autohandler:11 html/Edit/Queues/autohandler:28
 msgid "User Rights"
 msgstr "使用者權限"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Elements/Tab:34
 msgid "User Setup"
 msgstr "使用者設定"
 
@@ -6571,17 +6186,12 @@
 msgid "User Shift"
 msgstr "員工班別"
 
-#: lib/RT/Interface/Web.pm:1257
-#. ($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:240
+#: html/Admin/Users/Modify.html:225
 #. ($msg)
 msgid "User could not be created: %1"
 msgstr "無法新增使用者:%1"
 
-#: lib/RT/User_Overlay.pm:274
+#: lib/RT/User_Overlay.pm:326
 msgid "User created"
 msgstr "使用者新增完畢"
 
@@ -6593,11 +6203,11 @@
 msgid "User created: %1 (%2)"
 msgstr "使用者 %1 (%2) 新增完畢"
 
-#: html/Admin/CustomFields/GroupRights.html:44 html/Admin/Global/GroupRights.html:66 html/Admin/Groups/GroupRights.html:53 html/Admin/Queues/GroupRights.html:68
+#: 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:528 lib/RT/User_Overlay.pm:545
+#: lib/RT/User_Overlay.pm:580 lib/RT/User_Overlay.pm:597
 msgid "User loaded"
 msgstr "已載入使用者"
 
@@ -6613,35 +6223,27 @@
 msgid "User view"
 msgstr "使用者私人資料"
 
-#: html/Admin/Groups/index.html:74
-msgid "User-defined groups"
-msgstr "使用者自定群組"
-
-#: NOT FOUND IN SOURCE
+#: html/Edit/Elements/PickUsers:38 html/Edit/Global/Workflow/Owner.html:48 html/Edit/Global/Workflow/Owner.html:73 html/Edit/Global/Workflow/Owner.html:82
 msgid "UserDefined"
 msgstr "使用者自定"
 
-#: html/Admin/Users/Modify.html:47 html/Elements/Login:51 html/Ticket/Elements/AddWatchers:34
+#: html/Admin/Users/Modify.html:47 html/Elements/Login:54 html/Ticket/Elements/AddWatchers:34
 msgid "Username"
 msgstr "帳號"
 
-#: 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
+#: 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/Edit/Groups/Admin:9 html/User/Groups/Members.html:57
 msgid "Users"
 msgstr "使用者"
 
-#: html/Admin/Users/index.html:65
+#: html/Admin/Users/index.html:64
 msgid "Users matching search criteria"
 msgstr "符合查詢條件的使用者"
 
-#: lib/RT/Tickets_Overlay_SQL.pm:505
-msgid "Valid Query"
-msgstr ""
-
 #: NOT FOUND IN SOURCE
 msgid "ValueOfQueue"
 msgstr "選擇表單"
 
-#: html/Admin/CustomFields/Modify.html:43 html/Admin/Elements/EditCustomField:56
+#: html/Admin/Elements/EditCustomField:56
 msgid "Values"
 msgstr "欄位值"
 
@@ -6657,7 +6259,7 @@
 msgid "Watcher loaded"
 msgstr "成功載入視察員資訊"
 
-#: html/Admin/Elements/QueueTabs:41
+#: html/Admin/Elements/QueueTabs:41 html/Edit/Elements/SelectQueues:5
 msgid "Watchers"
 msgstr "視察員"
 
@@ -6673,11 +6275,11 @@
 msgid "Wed."
 msgstr "星期三"
 
-#: etc/initialdata:503 etc/upgrade/2.1.71:161
+#: etc/initialdata:503 etc/upgrade/2.1.71:161 html/Edit/Elements/CreateApprovalsQueue:135
 msgid "When a ticket has been approved by all approvers, add correspondence to the original ticket"
 msgstr "當申請單通過所有簽核後,將此訊息回覆到原申請單"
 
-#: etc/initialdata:467 etc/upgrade/2.1.71:135
+#: etc/initialdata:467 etc/upgrade/2.1.71:135 html/Edit/Elements/CreateApprovalsQueue:107
 msgid "When a ticket has been approved by any approver, add correspondence to the original ticket"
 msgstr "當申請單通過某項簽核後,將此訊息回覆到原申請單"
 
@@ -6685,7 +6287,7 @@
 msgid "When a ticket is created"
 msgstr "新增申請單時"
 
-#: etc/initialdata:400 etc/upgrade/2.1.71:79
+#: etc/initialdata:400 etc/upgrade/2.1.71:79 html/Edit/Elements/CreateApprovalsQueue:51
 msgid "When an approval ticket is created, notify the Owner and AdminCc of the item awaiting their approval"
 msgstr "簽核單新增之後,通知應受理的承辦人及管理員副本收件人"
 
@@ -6721,7 +6323,7 @@
 msgid "Whenever correspondence comes in"
 msgstr "當回覆送達時"
 
-#: html/Admin/Users/Modify.html:163 html/User/Prefs.html:67
+#: html/Admin/Users/Modify.html:163 html/User/Prefs.html:67 html/Work/Preferences/Info:39
 msgid "Work"
 msgstr "公司"
 
@@ -6729,55 +6331,56 @@
 msgid "WorkPhone"
 msgstr "公司電話"
 
-#: html/Scope/Update.html:49 html/Ticket/Elements/ShowBasics:41 html/Ticket/Update.html:42
+#: html/Ticket/Elements/ShowBasics:34 html/Ticket/Update.html:64
 msgid "Worked"
 msgstr "處理時間"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Global/Workflow.html:91 html/Admin/Queues/Workflow.html:89
+#. ($WorkflowObj->Id())
 msgid "Workflow #%1"
 msgstr "流程 #%1"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Workflow/List:15
 msgid "Workflow Begin"
 msgstr "流程開始"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Workflow/List:20
 msgid "Workflow End"
 msgstr "流程結束"
 
-#: NOT FOUND IN SOURCE
+#: html/Admin/Elements/EditWorkflows:90
 msgid "Workflow deleted"
 msgstr "流程已刪除"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/autohandler:10 html/Edit/Queues/autohandler:27
 msgid "Workflows"
 msgstr "流程"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/CustomField/SelectWritable:5
 msgid "Writable"
 msgstr "可讀寫"
 
-#: html/autohandler:150
+#: html/autohandler:151
 msgid "XXX CHANGEME You are not an authorized user"
 msgstr "XXX CHANGEME 您是未經授權的使用者"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Basic/Top:25 html/Edit/Queues/Basic/Top:82
 msgid "Yes"
 msgstr "是"
 
-#: lib/RT/Ticket_Overlay.pm:3313
+#: lib/RT/Ticket_Overlay.pm:3208
 msgid "You already own this ticket"
 msgstr "您已是這份申請單的承辦人"
 
-#: html/autohandler:142
+#: html/autohandler:143
 msgid "You are not an authorized user"
 msgstr "您不是被授權的使用者"
 
-#: html/Ticket/Elements/ShowTransaction:76
+#: html/Ticket/Elements/ShowTransaction:89
 msgid "You can access it with the Download button on the right."
 msgstr "您可以按右方的「下載」鍵來取得。"
 
-#: lib/RT/Ticket_Overlay.pm:3195
+#: lib/RT/Ticket_Overlay.pm:3090
 msgid "You can only reassign tickets that you own or that are unowned"
 msgstr "祇能重新指派您所承辦或是沒有承辦人的申請單"
 
@@ -6794,15 +6397,15 @@
 msgid "You have been logged out of RT."
 msgstr "您已登出 RT。"
 
-#: html/SelfService/Display.html:77
+#: html/SelfService/Display.html:79
 msgid "You have no permission to create tickets in that queue."
 msgstr "您沒有在該表單新增申請單的權限。"
 
-#: lib/RT/Ticket_Overlay.pm:2027
+#: lib/RT/Ticket_Overlay.pm:1943
 msgid "You may not create requests in that queue."
 msgstr "您不能在該表單中提出申請。"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Basic/Top:42
 msgid "You need to restart the Request Tracker service for saved changes to take effect."
 msgstr "您必須重新啟動 Request Tracker 服務,儲存的更動纔會生效。"
 
@@ -6818,11 +6421,11 @@
 msgid "Your RT administrator has misconfigured the mail aliases which invoke RT"
 msgstr "RT 管理員可能設錯了由 RT 寄出的郵件收件人標頭檔"
 
-#: etc/initialdata:484 etc/upgrade/2.1.71:146
+#: etc/initialdata:484 etc/upgrade/2.1.71:146 html/Edit/Elements/CreateApprovalsQueue:119
 msgid "Your request has been approved by %1. Other approvals may still be pending."
 msgstr "申請單已由 %1 批准。可能還有其他待簽核的步驟。"
 
-#: etc/initialdata:522 etc/upgrade/2.1.71:180
+#: etc/initialdata:522 etc/upgrade/2.1.71:180 html/Edit/Elements/CreateApprovalsQueue:154
 msgid "Your request has been approved."
 msgstr "您的申請單已完成簽核程序。"
 
@@ -6834,15 +6437,15 @@
 msgid "Your request was rejected by %1."
 msgstr "您的申請單已被 %1 駁回。"
 
-#: etc/initialdata:427 etc/upgrade/2.1.71:101
+#: etc/initialdata:427 etc/upgrade/2.1.71:101 html/Edit/Elements/CreateApprovalsQueue:73
 msgid "Your request was rejected."
 msgstr "您的申請單已被駁回。"
 
-#: html/autohandler:176
+#: html/autohandler:196
 msgid "Your username or password is incorrect"
 msgstr "您的帳號或密碼有誤"
 
-#: html/Admin/Elements/ModifyUser:83 html/Admin/Users/Modify.html:143 html/User/Prefs.html:130
+#: html/Admin/Elements/ModifyUser:83 html/Admin/Users/Modify.html:143 html/User/Prefs.html:130 html/Work/Preferences/Info:90
 msgid "Zip"
 msgstr "郵遞區號"
 
@@ -6875,19 +6478,19 @@
 msgid "contains"
 msgstr "包含"
 
-#: NOT FOUND IN SOURCE
+#: html/Elements/SelectAttachmentField:25
 msgid "content"
 msgstr "內容"
 
-#: NOT FOUND IN SOURCE
+#: html/Elements/SelectAttachmentField:26
 msgid "content-type"
 msgstr "類型"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:2334
 msgid "correspondence (probably) not sent"
 msgstr "申請單回覆(可能)未送出"
 
-#: NOT FOUND IN SOURCE
+#: lib/RT/Ticket_Overlay.pm:2344
 msgid "correspondence sent"
 msgstr "申請單回覆已送出"
 
@@ -6895,7 +6498,7 @@
 msgid "critical"
 msgstr "嚴重"
 
-#: html/Admin/Elements/ModifyQueue:62 html/Admin/Queues/Modify.html:76 lib/RT/Date.pm:319
+#: html/Admin/Elements/ModifyQueue:62 html/Admin/Queues/Modify.html:76 html/Edit/Queues/Basic/Top:34 html/Edit/Queues/List:32 html/Work/Queues/List:12 lib/RT/Date.pm:319
 msgid "days"
 msgstr "天"
 
@@ -6907,7 +6510,7 @@
 msgid "debug"
 msgstr "偵錯"
 
-#: NOT FOUND IN SOURCE
+#: html/Search/Listing.html:74
 msgid "delete"
 msgstr "刪除"
 
@@ -6915,7 +6518,7 @@
 msgid "deleted"
 msgstr "已刪除"
 
-#: html/Search/Elements/PickBasics:33 html/Search/Elements/PickRestriction:68
+#: html/Search/Elements/PickRestriction:68 html/Work/Search/PickRestriction:47
 msgid "does not match"
 msgstr "不符合"
 
@@ -6925,7 +6528,7 @@
 
 #: html/Search/Elements/PickRestriction:38
 msgid "email address"
-msgstr ""
+msgstr "電子郵件信箱"
 
 #: NOT FOUND IN SOURCE
 msgid "emergency"
@@ -6943,7 +6546,7 @@
 msgid "false"
 msgstr "假"
 
-#: NOT FOUND IN SOURCE
+#: html/Elements/SelectAttachmentField:27
 msgid "filename"
 msgstr "檔名"
 
@@ -6951,7 +6554,7 @@
 msgid "greater than"
 msgstr "大於"
 
-#: lib/RT/Group_Overlay.pm:195
+#: lib/RT/Group_Overlay.pm:194
 #. ($self->Name)
 msgid "group '%1'"
 msgstr "群組 '%1'"
@@ -6968,11 +6571,11 @@
 msgid "info"
 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:31 html/Search/Elements/PickRestriction:47 html/Search/Elements/PickRestriction:76 html/Search/Elements/PickRestriction:88
+#: html/Elements/SelectBoolean:31 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:35 html/Search/Elements/PickRestriction:47 html/Search/Elements/PickRestriction:76 html/Search/Elements/PickRestriction:88 html/Work/Search/PickRestriction:27 html/Work/Search/PickRestriction:56 html/Work/Search/PickRestriction:75
 msgid "is"
 msgstr "是"
 
-#: 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:32 html/Search/Elements/PickRestriction:48 html/Search/Elements/PickRestriction:77 html/Search/Elements/PickRestriction:89
+#: html/Elements/SelectBoolean:35 html/Elements/SelectCustomFieldOperator:37 html/Elements/SelectMatch:36 html/Search/Elements/PickRestriction:48 html/Search/Elements/PickRestriction:77 html/Search/Elements/PickRestriction:89 html/Work/Search/PickRestriction:28 html/Work/Search/PickRestriction:57 html/Work/Search/PickRestriction:76
 msgid "isn't"
 msgstr "不是"
 
@@ -6980,11 +6583,11 @@
 msgid "less than"
 msgstr "小於"
 
-#: NOT FOUND IN SOURCE
-msgid "level Admins"
+#: html/Edit/Global/Workflow/Owner.html:35
+msgid "level Admin"
 msgstr "層主管"
 
-#: html/Search/Elements/PickBasics:32 html/Search/Elements/PickRestriction:67
+#: html/Search/Elements/PickRestriction:67 html/Work/Search/PickRestriction:46
 msgid "matches"
 msgstr "符合"
 
@@ -6992,7 +6595,7 @@
 msgid "min"
 msgstr "分"
 
-#: html/Scope/Update.html:49 html/Ticket/Update.html:42
+#: html/Ticket/Update.html:64
 msgid "minutes"
 msgstr "分鐘"
 
@@ -7008,7 +6611,7 @@
 msgid "new"
 msgstr "新建立"
 
-#: html/Admin/Elements/PickCustomFields:44
+#: html/Admin/Elements/EditCustomFields:42
 msgid "no name"
 msgstr "沒有名稱"
 
@@ -7016,7 +6619,7 @@
 msgid "no value"
 msgstr "沒有值"
 
-#: html/Admin/Elements/EditQueueWatchers:26 html/Ticket/Elements/EditWatchers:27
+#: html/Admin/Elements/EditQueueWatchers:26 html/Edit/Groups/Member:40 html/Edit/Groups/Members/Add.html:17 html/Edit/Groups/Members/List:8 html/Edit/Queues/List:32 html/Ticket/Elements/EditWatchers:27 html/Work/Delegates/Info:37 html/Work/Delegates/Info:48 html/Work/Overview/Info:31 html/Work/Queues/List:12 html/Work/Tickets/Elements/EditWatchers:5 html/Work/Tickets/Elements/ShowAttachments:30 html/Work/Tickets/Elements/ShowBasics:27
 msgid "none"
 msgstr "無"
 
@@ -7032,7 +6635,7 @@
 msgid "notlike"
 msgstr "不符合"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Elements/PickUsers:18 html/Edit/Users/Add.html:18 html/Edit/Users/Search.html:28 html/Work/Tickets/Cc:15
 msgid "number"
 msgstr "號"
 
@@ -7044,12 +6647,12 @@
 msgid "opened"
 msgstr "已開啟"
 
-#: lib/RT/Group_Overlay.pm:200
+#: lib/RT/Group_Overlay.pm:199
 #. ($self->Name, $user->Name)
 msgid "personal group '%1' for user '%2'"
 msgstr "使用者「%2」的「%1」代理人群組"
 
-#: lib/RT/Group_Overlay.pm:208
+#: lib/RT/Group_Overlay.pm:207
 #. ($queue->Name, $self->Type)
 msgid "queue %1 %2"
 msgstr "表單 %1 %2"
@@ -7062,7 +6665,7 @@
 msgid "resolved"
 msgstr "已處理"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Global/Basic/Top:53
 msgid "rtname"
 msgstr "伺服器名稱"
 
@@ -7070,20 +6673,16 @@
 msgid "sec"
 msgstr "秒"
 
-#: html/Search/Listing.html:46 html/Search/Results.html:45
-msgid "spreadsheet"
-msgstr ""
-
 #: lib/RT/Queue_Overlay.pm:59
 msgid "stalled"
 msgstr "延宕"
 
-#: lib/RT/Group_Overlay.pm:203
+#: lib/RT/Group_Overlay.pm:202
 #. ($self->Type)
 msgid "system %1"
 msgstr "系統 %1"
 
-#: lib/RT/Group_Overlay.pm:214
+#: lib/RT/Group_Overlay.pm:213
 #. ($self->Type)
 msgid "system group '%1'"
 msgstr "系統群組 '%1'"
@@ -7097,16 +6696,16 @@
 msgid "ticket #%1"
 msgstr "申請單 #%1"
 
-#: lib/RT/Group_Overlay.pm:211
+#: lib/RT/Group_Overlay.pm:210
 #. ($self->Instance, $self->Type)
 msgid "ticket #%1 %2"
 msgstr "申請單 #%1 %2"
 
-#: NOT FOUND IN SOURCE
+#: html/Work/Elements/SelectSearch:33
 msgid "till"
 msgstr "至"
 
-#: NOT FOUND IN SOURCE
+#: html/Edit/Elements/PickUsers:16 html/Edit/Global/Workflow/Condition:31 html/Edit/Users/Add.html:16 html/Edit/Users/Search.html:26 html/Work/Tickets/Cc:13
 msgid "to"
 msgstr "到"
 
@@ -7114,7 +6713,7 @@
 msgid "true"
 msgstr "真"
 
-#: lib/RT/Group_Overlay.pm:217
+#: lib/RT/Group_Overlay.pm:216
 #. ($self->Id)
 msgid "undescribed group %1"
 msgstr "沒有描述的群組 %1"
@@ -7123,7 +6722,7 @@
 msgid "unresolved"
 msgstr "未處理"
 
-#: lib/RT/Group_Overlay.pm:192
+#: lib/RT/Group_Overlay.pm:191
 #. ($user->Object->Name)
 msgid "user %1"
 msgstr "使用者 %1"
@@ -7143,4 +6742,20 @@
 #: lib/RT/Date.pm:331
 msgid "years"
 msgstr "年"
+
+#: lib/RT/Date.pm:331
+msgid "View log"
+msgstr "檢視紀錄檔"
+
+#: html/Todo.html:134
+msgid "Done"
+msgstr "完成"
+
+#: html/Elements/Tabs:123
+msgid "Todo"
+msgstr "待辦事項"
+
+#: html/Elements/Tabs:123
+msgid "Out of range"
+msgstr "期限外"
 

Modified: rt/branches/rt-3.3/lib/RT/Interface/Web.pm
==============================================================================
--- rt/branches/rt-3.3/lib/RT/Interface/Web.pm	(original)
+++ rt/branches/rt-3.3/lib/RT/Interface/Web.pm	Fri Apr  2 08:43:44 2004
@@ -1419,6 +1419,29 @@
     my $Ticket  = $args{'TicketObj'};
     my $ARGSRef = $args{'ARGSRef'};
 
+    my (@results) = ProcessRecordLinks(RecordObj => $Ticket,
+				       ARGSRef => $ARGSRef);
+
+    #Merge if we need to
+    if ( $ARGSRef->{ $Ticket->Id . "-MergeInto" } ) {
+        my ( $val, $msg ) =
+          $Ticket->MergeInto( $ARGSRef->{ $Ticket->Id . "-MergeInto" } );
+        push @results, $msg;
+    }
+
+    return (@results);
+}
+
+# }}}
+
+sub ProcessRecordLinks {
+    my %args = ( RecordObj => undef,
+                 ARGSRef   => undef,
+                 @_ );
+
+    my $Record  = $args{'RecordObj'};
+    my $ARGSRef = $args{'ARGSRef'};
+
     my (@results);
 
     # Delete links that are gone gone gone.
@@ -1430,7 +1453,7 @@
 
             push @results,
               "Trying to delete: Base: $base Target: $target  Type $type";
-            my ( $val, $msg ) = $Ticket->DeleteLink( Base   => $base,
+            my ( $val, $msg ) = $Record->DeleteLink( Base   => $base,
                                                      Type   => $type,
                                                      Target => $target );
 
@@ -1443,18 +1466,18 @@
     my @linktypes = qw( DependsOn MemberOf RefersTo );
 
     foreach my $linktype (@linktypes) {
-        if ( $ARGSRef->{ $Ticket->Id . "-$linktype" } ) {
-            for my $luri ( split ( / /, $ARGSRef->{ $Ticket->Id . "-$linktype" } ) ) {
+        if ( $ARGSRef->{ $Record->Id . "-$linktype" } ) {
+            for my $luri ( split ( / /, $ARGSRef->{ $Record->Id . "-$linktype" } ) ) {
                 $luri =~ s/\s*$//;    # Strip trailing whitespace
-                my ( $val, $msg ) = $Ticket->AddLink( Target => $luri,
+                my ( $val, $msg ) = $Record->AddLink( Target => $luri,
                                                       Type   => $linktype );
                 push @results, $msg;
             }
         }
-        if ( $ARGSRef->{ "$linktype-" . $Ticket->Id } ) {
+        if ( $ARGSRef->{ "$linktype-" . $Record->Id } ) {
 
-            for my $luri ( split ( / /, $ARGSRef->{ "$linktype-" . $Ticket->Id } ) ) {
-                my ( $val, $msg ) = $Ticket->AddLink( Base => $luri,
+            for my $luri ( split ( / /, $ARGSRef->{ "$linktype-" . $Record->Id } ) ) {
+                my ( $val, $msg ) = $Record->AddLink( Base => $luri,
                                                       Type => $linktype );
 
                 push @results, $msg;
@@ -1462,17 +1485,8 @@
         } 
     }
 
-    #Merge if we need to
-    if ( $ARGSRef->{ $Ticket->Id . "-MergeInto" } ) {
-        my ( $val, $msg ) =
-          $Ticket->MergeInto( $ARGSRef->{ $Ticket->Id . "-MergeInto" } );
-        push @results, $msg;
-    }
-
     return (@results);
 }
-
-# }}}
 
 eval "require RT::Interface::Web_Vendor";
 die $@ if ($@ && $@ !~ qr{^Can't locate RT/Interface/Web_Vendor.pm});

Modified: rt/branches/rt-3.3/lib/RT/Queue_Overlay.pm
==============================================================================
--- rt/branches/rt-3.3/lib/RT/Queue_Overlay.pm	(original)
+++ rt/branches/rt-3.3/lib/RT/Queue_Overlay.pm	Fri Apr  2 08:43:44 2004
@@ -102,6 +102,39 @@
 }
     
 
+sub AddLink {
+    my $self = shift;
+    my %args = ( Target => '',
+                 Base   => '',
+                 Type   => '',
+                 Silent => undef,
+                 @_ );
+
+    unless ( $self->CurrentUserHasRight('ModifyQueue') ) {
+        return ( 0, $self->loc("Permission Denied") );
+    }
+
+    return $self->SUPER::_AddLink(%args);
+}
+
+sub DeleteLink {
+    my $self = shift;
+    my %args = (
+        Base   => undef,
+        Target => undef,
+        Type   => undef,
+        @_
+    );
+
+    #check acls
+    unless ( $self->CurrentUserHasRight('ModifyQueue') ) {
+        $RT::Logger->debug("No permission to delete links\n");
+        return ( 0, $self->loc('Permission Denied'))
+    }
+
+    return $self->SUPER::_DeleteLink(%args);
+}
+
 =head2 AvailableRights
 
 Returns a hash of available rights for this object. The keys are the right names and the values are a description of what the rights do

Modified: rt/branches/rt-3.3/lib/RT/Ticket_Overlay.pm
==============================================================================
--- rt/branches/rt-3.3/lib/RT/Ticket_Overlay.pm	(original)
+++ rt/branches/rt-3.3/lib/RT/Ticket_Overlay.pm	Fri Apr  2 08:43:44 2004
@@ -85,8 +85,8 @@
 
 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);
@@ -120,6 +120,7 @@
 use RT::Links;
 use RT::Date;
 use RT::CustomFields;
+use RT::TicketCustomFieldValues;
 use RT::Tickets;
 use RT::URI::fsck_com_rt;
 use RT::URI;
@@ -157,6 +158,8 @@
                    Mode => 'Target', },
     DependedOnBy => { Type => 'DependsOn',
                       Mode => 'Base', },
+    MergedInto => { Type => 'MergedInto',
+                   Mode => 'Target', },
 
 );
 
@@ -175,11 +178,16 @@
                 Target => 'ReferredToBy', },
     DependsOn => { Base => 'DependsOn',
                    Target => 'DependedOnBy', },
+    MergedInto => { Base => 'MergedInto',
+                   Target => 'MergedInto', },
 
 );
 
 # }}}
 
+sub LINKTYPEMAP   { return \%LINKTYPEMAP   }
+sub LINKDIRMAP   { return \%LINKDIRMAP   }
+
 # {{{ sub Load
 
 =head2 Load
@@ -211,8 +219,8 @@
     if ( $id =~ /^\d+$/ ) {
         my $ticketid = $self->LoadById($id);
 
-        unless ($ticketid) {
-            $RT::Logger->debug("$self tried to load a bogus ticket: $id\n");
+        unless ($self->Id) {
+            $RT::Logger->crit("$self tried to load a bogus ticket: $id\n");
             return (undef);
         }
     }
@@ -514,9 +522,9 @@
     }
 
 
-    my $id = $self->SUPER::Create( %params);
+    my ($id,$ticket_message) = $self->SUPER::Create( %params);
     unless ($id) {
-        $RT::Logger->crit( "Couldn't create a ticket");
+        $RT::Logger->crit( "Couldn't create a ticket: " . $ticket_message);
         $RT::Handle->Rollback();
         return ( 0, 0, $self->loc( "Ticket could not be created due to an internal error") );
     }
@@ -630,7 +638,6 @@
 
 
         if ( $self->Id && $Trans ) {
-	    $TransObj->UpdateCustomFields( ARGSRef => \%args );
             $ErrStr = $self->loc( "Ticket [_1] created in queue '[_2]'", $self->Id, $QueueObj->Name );
             $ErrStr = join ( "\n", $ErrStr, @non_fatal_errors );
 
@@ -1838,6 +1845,8 @@
 Returns true if the specified principal (or the one corresponding to the
 specified address) is a member of the group Type for this ticket.
 
+XX TODO: This should be Memoized. 
+
 =cut
 
 sub IsWatcher {
@@ -2454,254 +2463,6 @@
 
 # }}}
 
-# {{{ Routines dealing with Links and Relations between tickets
-
-# {{{ Link Collections
-
-# {{{ sub Members
-
-=head2 Members
-
-  This returns an RT::Links object which references all the tickets 
-which are 'MembersOf' this ticket
-
-=cut
-
-sub Members {
-    my $self = shift;
-    return ( $self->_Links( 'Target', 'MemberOf' ) );
-}
-
-# }}}
-
-# {{{ sub MemberOf
-
-=head2 MemberOf
-
-  This returns an RT::Links object which references all the tickets that this
-ticket is a 'MemberOf'
-
-=cut
-
-sub MemberOf {
-    my $self = shift;
-    return ( $self->_Links( 'Base', 'MemberOf' ) );
-}
-
-# }}}
-
-# {{{ RefersTo
-
-=head2 RefersTo
-
-  This returns an RT::Links object which shows all references for which this ticket is a base
-
-=cut
-
-sub RefersTo {
-    my $self = shift;
-    return ( $self->_Links( 'Base', 'RefersTo' ) );
-}
-
-# }}}
-
-# {{{ ReferredToBy
-
-=head2 ReferredToBy
-
-  This returns an RT::Links object which shows all references for which this ticket is a target
-
-=cut
-
-sub ReferredToBy {
-    my $self = shift;
-    return ( $self->_Links( 'Target', 'RefersTo' ) );
-}
-
-# }}}
-
-# {{{ DependedOnBy
-
-=head2 DependedOnBy
-
-  This returns an RT::Links object which references all the tickets that depend on this one
-
-=cut
-
-sub DependedOnBy {
-    my $self = shift;
-    return ( $self->_Links( 'Target', 'DependsOn' ) );
-}
-
-# }}}
-
-
-
-=head2 HasUnresolvedDependencies
-
-  Takes a paramhash of Type (default to '__any').  Returns true if
-$self->UnresolvedDependencies returns an object with one or more members
-of that type.  Returns false otherwise
-
-
-=begin testing
-
-my $t1 = RT::Ticket->new($RT::SystemUser);
-my ($id, $trans, $msg) = $t1->Create(Subject => 'DepTest1', Queue => 'general');
-ok($id, "Created dep test 1 - $msg");
-
-my $t2 = RT::Ticket->new($RT::SystemUser);
-my ($id2, $trans, $msg2) = $t2->Create(Subject => 'DepTest2', Queue => 'general');
-ok($id2, "Created dep test 2 - $msg2");
-my $t3 = RT::Ticket->new($RT::SystemUser);
-my ($id3, $trans, $msg3) = $t3->Create(Subject => 'DepTest3', Queue => 'general', Type => 'approval');
-ok($id3, "Created dep test 3 - $msg3");
-my ($addid, $addmsg);
-ok (($addid, $addmsg) =$t1->AddLink( Type => 'DependsOn', Target => $t2->id));
-ok ($addid, $addmsg);
-ok (($addid, $addmsg) =$t1->AddLink( Type => 'DependsOn', Target => $t3->id));
-
-ok ($addid, $addmsg);
-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");
-ok (!$t2->HasUnresolvedDependencies, "Ticket ".$t2->Id." has no unresolved deps");
-;
-
-my ($rid, $rmsg)= $t1->Resolve();
-ok(!$rid, $rmsg);
-ok($t2->Resolve);
-($rid, $rmsg)= $t1->Resolve();
-ok(!$rid, $rmsg);
-ok($t3->Resolve);
-($rid, $rmsg)= $t1->Resolve();
-ok($rid, $rmsg);
-
-
-=end testing
-
-=cut
-
-sub HasUnresolvedDependencies {
-    my $self = shift;
-    my %args = (
-        Type   => undef,
-        @_
-    );
-
-    my $deps = $self->UnresolvedDependencies;
-
-    if ($args{Type}) {
-        $deps->Limit( FIELD => 'Type', 
-              OPERATOR => '=',
-              VALUE => $args{Type}); 
-    }
-    else {
-	    $deps->IgnoreType;
-    }
-
-    if ($deps->Count > 0) {
-        return 1;
-    }
-    else {
-        return (undef);
-    }
-}
-
-
-# {{{ UnresolvedDependencies 
-
-=head2 UnresolvedDependencies
-
-Returns an RT::Tickets object of tickets which this ticket depends on
-and which have a status of new, open or stalled. (That list comes from
-RT::Queue->ActiveStatusArray
-
-=cut
-
-
-sub UnresolvedDependencies {
-    my $self = shift;
-    my $deps = RT::Tickets->new($self->CurrentUser);
-
-    my @live_statuses = RT::Queue->ActiveStatusArray();
-    foreach my $status (@live_statuses) {
-        $deps->LimitStatus(VALUE => $status);
-    }
-    $deps->LimitDependedOnBy($self->Id);
-
-    return($deps);
-
-}
-
-# }}}
-
-# {{{ AllDependedOnBy
-
-=head2 AllDependedOnBy
-
-Returns an array of RT::Ticket objects which (directly or indirectly)
-depends on this ticket; takes an optional 'Type' argument in the param
-hash, which will limit returned tickets to that type, as well as cause
-tickets with that type to serve as 'leaf' nodes that stops the recursive
-dependency search.
-
-=cut
-
-sub AllDependedOnBy {
-    my $self = shift;
-    my $dep = $self->DependedOnBy;
-    my %args = (
-        Type   => undef,
-	_found => {},
-	_top   => 1,
-        @_
-    );
-
-    while (my $link = $dep->Next()) {
-	next unless ($link->BaseURI->IsLocal());
-	next if $args{_found}{$link->BaseObj->Id};
-
-	if (!$args{Type}) {
-	    $args{_found}{$link->BaseObj->Id} = $link->BaseObj;
-	    $link->BaseObj->AllDependedOnBy( %args, _top => 0 );
-	}
-	elsif ($link->BaseObj->Type eq $args{Type}) {
-	    $args{_found}{$link->BaseObj->Id} = $link->BaseObj;
-	}
-	else {
-	    $link->BaseObj->AllDependedOnBy( %args, _top => 0 );
-	}
-    }
-
-    if ($args{_top}) {
-	return map { $args{_found}{$_} } sort keys %{$args{_found}};
-    }
-    else {
-	return 1;
-    }
-}
-
-# }}}
-
-# {{{ DependsOn
-
-=head2 DependsOn
-
-  This returns an RT::Links object which references all the tickets that this ticket depends on
-
-=cut
-
-sub DependsOn {
-    my $self = shift;
-    return ( $self->_Links( 'Base', 'DependsOn' ) );
-}
-
-# }}}
-
-
-
-
 # {{{ sub _Links 
 
 sub _Links {
@@ -2738,8 +2499,6 @@
 
 # }}}
 
-# }}}
-
 # {{{ sub DeleteLink 
 
 =head2 DeleteLink
@@ -2766,43 +2525,25 @@
 
     }
 
-    #we want one of base and target. we don't care which
-    #but we only want _one_
+    my ($val, $Msg) = $self->SUPER::_DeleteLink(%args);
 
-    my $direction;
-    my $remote_link;
-
-    if ( $args{'Base'} and $args{'Target'} ) {
-        $RT::Logger->debug("$self ->_DeleteLink. got both Base and Target\n");
-        return ( 0, $self->loc("Can't specifiy both base and target") );
+    if ( !$val ) {
+        $RT::Logger->debug("Couldn't find that link\n");
+        return ( 0, $Msg );
     }
-    elsif ( $args{'Base'} ) {
-        $args{'Target'} = $self->URI();
+
+    my ($direction, $remote_link);
+
+    if ( $args{'Base'} ) {
 	$remote_link = $args{'Base'};
     	$direction = 'Target';
     }
     elsif ( $args{'Target'} ) {
-        $args{'Base'} = $self->URI();
 	$remote_link = $args{'Target'};
         $direction='Base';
     }
-    else {
-        $RT::Logger->debug("$self: Base or Target must be specified\n");
-        return ( 0, $self->loc('Either base or target must be specified') );
-    }
-
-    my $link = new RT::Link( $self->CurrentUser );
-    $RT::Logger->debug( "Trying to load link: " . $args{'Base'} . " " . $args{'Type'} . " " . $args{'Target'} . "\n" );
-
-
-    $link->LoadByParams( Base=> $args{'Base'}, Type=> $args{'Type'}, Target=>  $args{'Target'} );
-    #it's a real link. 
-    if ( $link->id ) {
 
-        my $linkid = $link->id;
-        $link->Delete();
-
-        my $TransString = "Ticket $args{'Base'} no longer $args{Type} ticket $args{'Target'}.";
+    if ( $val ) {
 	my $remote_uri = RT::URI->new( $RT::SystemUser );
     	$remote_uri->FromURI( $remote_link );
 
@@ -2813,13 +2554,7 @@
             TimeTaken => 0
         );
 
-        return ( $Trans, $self->loc("Link deleted ([_1])", $TransString));
-    }
-
-    #if it's not a link we can find
-    else {
-        $RT::Logger->debug("Couldn't find that link\n");
-        return ( 0, $self->loc("Link not found") );
+        return ( $Trans, $Msg );
     }
 }
 
@@ -2847,74 +2582,36 @@
         return ( 0, $self->loc("Permission Denied") );
     }
 
-    # Remote_link is the URI of the object that is not this ticket
-    my $remote_link;
-    my $direction;
+    my ($val, $Msg) = $self->SUPER::_AddLink(%args);
 
-    if ( $args{'Base'} and $args{'Target'} ) {
-        $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'} ) {
-        $args{'Target'} = $self->URI();
-        $remote_link    = $args{'Base'};
-        $direction      = 'Target';
+    if (!$val) {
+	return ($val, $Msg);
     }
-    elsif ( $args{'Target'} ) {
-        $args{'Base'} = $self->URI();
+
+    my ($direction, $remote_link);
+    if ( $args{'Target'} ) {
         $remote_link  = $args{'Target'};
         $direction    = 'Base';
+    } elsif ( $args{'Base'} ) {
+        $remote_link  = $args{'Base'};
+        $direction    = 'Target';
     }
-    else {
-        return ( 0, $self->loc('Either base or target must be specified') );
-    }
-
-    # If the base isn't a URI, make it a URI. 
-    # If the target isn't a URI, make it a URI. 
-
-    # {{{ Check if the link already exists - we don't want duplicates
-    use RT::Link;
-    my $old_link = RT::Link->new( $self->CurrentUser );
-    $old_link->LoadByParams( Base   => $args{'Base'},
-                             Type   => $args{'Type'},
-                             Target => $args{'Target'} );
-    if ( $old_link->Id ) {
-        $RT::Logger->debug("$self Somebody tried to duplicate a link");
-        return ( $old_link->id, $self->loc("Link already exists"), 0 );
-    }
-
-    # }}}
-
-    # Storing the link in the DB.
-    my $link = RT::Link->new( $self->CurrentUser );
-    my ($linkid, $linkmsg) = $link->Create( Target => $args{Target},
-                                  Base   => $args{Base},
-                                  Type   => $args{Type} );
-
-    unless ($linkid) {
-        $RT::Logger->error("Link could not be created: ".$linkmsg);
-        return ( 0, $self->loc("Link could not be created") );
-    }
-
-    my $TransString =
-      "Ticket $args{'Base'} $args{Type} ticket $args{'Target'}.";
 
     # Don't write the transaction if we're doing this on create
     if ( $args{'Silent'} ) {
-        return ( 1, $self->loc( "Link created ([_1])", $TransString ) );
+        return ( 1, $Msg );
     }
     else {
 	my $remote_uri = RT::URI->new( $RT::SystemUser );
     	$remote_uri->FromURI( $remote_link );
 
         #Write the transaction
-        my ( $Trans, $Msg, $TransObj ) = $self->_NewTransaction(
-                                                         Type  => 'AddLink',
-                                                         Field => $LINKDIRMAP{$args{'Type'}}->{$direction},
-							                             NewValue =>  $remote_uri->URI || $remote_link,
-                                                         TimeTaken => 0 );
-        return ( $Trans, $self->loc( "Link created ([_1])", $TransString ) );
+        my ( $Trans, $Msg, $TransObj ) = 
+	    $self->_NewTransaction(Type  => 'AddLink',
+				   Field => $LINKDIRMAP{$args{'Type'}}->{$direction},
+				   NewValue =>  $remote_uri->URI || $remote_link,
+				   TimeTaken => 0 );
+        return ( $Trans, $Msg );
     }
 
 }
@@ -3122,9 +2819,9 @@
 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 => 'Ticket', VALUE => '1');
@@ -3354,14 +3051,14 @@
 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);
 
@@ -3513,6 +3210,282 @@
 
 # }}}
 
+# {{{ 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);
+    } else {
+        $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);
+    $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 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 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 );
+    }
+    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 ($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
@@ -3567,6 +3540,113 @@
 
 # }}}
 
+# {{{ 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
@@ -3820,63 +3900,6 @@
 # }}}
 
 # }}}
-
-# {{{ 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 => 'ObjectId',
-            ALIAS2 => $tickets,
-            FIELD2 => 'id'
-        );
-        $transactions->Limit(
-            ALIAS => $tickets,
-            FIELD => 'EffectiveId',
-            VALUE => $self->id()
-        );
-	$transactions->Limit(
-	    FIELD    => 'ObjectType',
-	    VALUE    => ref($self),
-	);
-
-        # if the user may not see comments do not return them
-        unless ( $self->CurrentUserHasRight('ShowTicketComments') ) {
-            $transactions->Limit(
-                FIELD    => 'Type',
-                OPERATOR => '!=',
-                VALUE    => "Comment"
-            );
-        }
-    }
-
-    return ($transactions);
-}
-
-# }}}
-
-sub TransactionCustomFields {
-    my $self = shift;
-    return $self->QueueObj->TicketTransactionCustomFields;
-}
-
-sub _LookupTypes {
-    "RT::Queue-RT::Ticket";
-}
 
 1;
 

Modified: rt/branches/rt-3.3/lib/RT/Tickets_Overlay.pm
==============================================================================
--- rt/branches/rt-3.3/lib/RT/Tickets_Overlay.pm	(original)
+++ rt/branches/rt-3.3/lib/RT/Tickets_Overlay.pm	Fri Apr  2 08:43:44 2004
@@ -298,12 +298,13 @@
   die "Incorrect Meta Data for $field"
     unless (defined $meta->[1] and defined $meta->[2]);
 
-  my $LinkAlias = $sb->NewAlias ('Links');
+  $sb->{_sql_linkalias} = $sb->NewAlias ('Links')
+    unless defined $sb->{_sql_linkalias};
 
   $sb->_OpenParen();
 
   $sb->_SQLLimit(
-	     ALIAS => $LinkAlias,
+	     ALIAS => $sb->{_sql_linkalias},
 	     FIELD =>   'Type',
 	     OPERATOR => '=',
 	     VALUE => $meta->[2],
@@ -314,7 +315,7 @@
     my $matchfield = ( $value  =~ /^(\d+)$/ ? "LocalTarget" : "Target" );
 
     $sb->_SQLLimit(
-	       ALIAS => $LinkAlias,
+	       ALIAS => $sb->{_sql_linkalias},
 	       ENTRYAGGREGATOR => 'AND',
 	       FIELD =>   $matchfield,
 	       OPERATOR => '=',
@@ -322,14 +323,14 @@
 	      );
 
     #If we're searching on target, join the base to ticket.id
-    $sb->Join( ALIAS1 => 'main', FIELD1 => $sb->{'primary_key'},
-	       ALIAS2 => $LinkAlias,	 FIELD2 => 'LocalBase');
+    $sb->_SQLJoin( ALIAS1 => 'main', FIELD1 => $sb->{'primary_key'},
+	       ALIAS2 => $sb->{_sql_linkalias},	 FIELD2 => 'LocalBase');
 
   } elsif ( $meta->[1] eq "From" ) {
     my $matchfield = ( $value  =~ /^(\d+)$/ ? "LocalBase" : "Base" );
 
     $sb->_SQLLimit(
-	       ALIAS => $LinkAlias,
+	       ALIAS => $sb->{_sql_linkalias},
 	       ENTRYAGGREGATOR => 'AND',
 	       FIELD =>   $matchfield,
 	       OPERATOR => '=',
@@ -337,8 +338,8 @@
 	      );
 
     #If we're searching on base, join the target to ticket.id
-    $sb->Join( ALIAS1 => 'main',     FIELD1 => $sb->{'primary_key'},
-	       ALIAS2 => $LinkAlias, FIELD2 => 'LocalTarget');
+    $sb->_SQLJoin( ALIAS1 => 'main',     FIELD1 => $sb->{'primary_key'},
+	       ALIAS2 => $sb->{_sql_linkalias}, FIELD2 => 'LocalTarget');
 
   } else {
     die "Invalid link direction '$meta->[1]' for $field\n";
@@ -467,11 +468,11 @@
   $sb->_OpenParen;
 
   # Join Transactions To Attachments
-  $sb->Join( ALIAS1 => $sb->{_sql_trattachalias}, FIELD1 => 'TransactionId',
+  $sb->_SQLJoin( ALIAS1 => $sb->{_sql_trattachalias}, FIELD1 => 'TransactionId',
 	     ALIAS2 => $sb->{_sql_transalias}, FIELD2 => 'id');
 
   # Join Transactions to Tickets
-  $sb->Join( ALIAS1 => 'main', FIELD1 => $sb->{'primary_key'}, # UGH!
+  $sb->_SQLJoin( ALIAS1 => 'main', FIELD1 => $sb->{'primary_key'}, # UGH!
 	     ALIAS2 => $sb->{_sql_transalias}, FIELD2 => 'Ticket');
 
   my $d = new RT::Date( $sb->CurrentUser );
@@ -542,11 +543,11 @@
   $sb->_OpenParen;
 
   # Join Transactions To Attachments
-  $sb->Join( ALIAS1 => $sb->{_sql_trattachalias}, FIELD1 => 'TransactionId',
+  $sb->_SQLJoin( ALIAS1 => $sb->{_sql_trattachalias}, FIELD1 => 'TransactionId',
 	     ALIAS2 => $sb->{_sql_transalias}, FIELD2 => 'id');
 
   # Join Transactions to Tickets
-  $sb->Join( ALIAS1 => 'main', FIELD1 => $sb->{'primary_key'}, # UGH!
+  $sb->_SQLJoin( ALIAS1 => 'main', FIELD1 => $sb->{'primary_key'}, # UGH!
 	     ALIAS2 => $sb->{_sql_transalias}, FIELD2 => 'Ticket');
 
   #Search for the right field
@@ -620,7 +621,7 @@
 		   VALUE => 'RT::Ticket-Role',
 		   ENTRYAGGREGATOR => 'AND');
 
-  $self->Join(ALIAS1 => $groups, FIELD1 => 'Instance',
+  $self->_SQLJoin(ALIAS1 => $groups, FIELD1 => 'Instance',
 	      ALIAS2 => 'main',   FIELD2 => 'id');
   # }}}
 
@@ -635,10 +636,10 @@
 		     ENTRYAGGREGATOR => 'AND');
   }
 
-  $self->Join (ALIAS1 => $groups,  FIELD1 => 'id',
+  $self->_SQLJoin (ALIAS1 => $groups,  FIELD1 => 'id',
 	       ALIAS2 => $groupmembers, FIELD2 => 'GroupId');
 
-  $self->Join( ALIAS1 => $groupmembers, FIELD1 => 'MemberId',
+  $self->_SQLJoin( ALIAS1 => $groupmembers, FIELD1 => 'MemberId',
 	       ALIAS2 => $users, FIELD2 => 'id');
 
  $self->_CloseParen;
@@ -781,7 +782,7 @@
 			OPERATOR => '=',
 			VALUE =>    $restriction->{'TARGET'} );
     #If we're searching on target, join the base to ticket.id
-    $self->Join( ALIAS1 => 'main', FIELD1 => $self->{'primary_key'},
+    $self->_SQLJoin( ALIAS1 => 'main', FIELD1 => $self->{'primary_key'},
 		 ALIAS2 => $LinkAlias,
 		 FIELD2 => 'LocalBase');
   }
@@ -802,7 +803,7 @@
 			OPERATOR => '=',
 			VALUE =>    $restriction->{'BASE'} );
     #If we're searching on base, join the target to ticket.id
-    $self->Join( ALIAS1 => 'main', FIELD1 => $self->{'primary_key'},
+    $self->_SQLJoin( ALIAS1 => 'main', FIELD1 => $self->{'primary_key'},
 		 ALIAS2 => $LinkAlias,
 		 FIELD2 => 'LocalTarget')
   }
@@ -869,7 +870,7 @@
     $TicketCFs = $self->{_sql_keywordalias}{$cfid};
   } else {
     $TicketCFs = $self->{_sql_keywordalias}{$cfid} =
-      $self->Join( TYPE   => 'left',
+      $self->_SQLJoin( TYPE   => 'left',
 		   ALIAS1 => 'main',
 		   FIELD1 => 'id',
 		   TABLE2 => 'ObjectCustomFieldValues',

Modified: rt/branches/rt-3.3/lib/RT/Tickets_Overlay_SQL.pm
==============================================================================
--- rt/branches/rt-3.3/lib/RT/Tickets_Overlay_SQL.pm	(original)
+++ rt/branches/rt-3.3/lib/RT/Tickets_Overlay_SQL.pm	Fri Apr  2 08:43:44 2004
@@ -48,6 +48,7 @@
   $self->{'_sql_subclause'}     = "a";
   $self->{'_sql_first'}         = 0;
   $self->{'_sql_opstack'}       = [''];
+  $self->{'_sql_linkalias'}    = undef;
   $self->{'_sql_transalias'}    = undef;
   $self->{'_sql_trattachalias'} = undef;
   $self->{'_sql_keywordalias'}  = undef;
@@ -63,8 +64,18 @@
   # All SQL stuff goes into one SB subclause so we can deal with all
   # the aggregation
   my $this = shift;
+
   $this->SUPER::Limit(@_,
                       SUBCLAUSE => 'ticketsql');
+}
+
+sub _SQLJoin {
+  # All SQL stuff goes into one SB subclause so we can deal with all
+  # the aggregation
+  my $this = shift;
+
+  $this->SUPER::Join(@_,
+		     SUBCLAUSE => 'ticketsql');
 }
 
 # Helpers

Modified: rt/branches/rt-3.3/lib/RT/Transactions_Overlay.pm
==============================================================================
--- rt/branches/rt-3.3/lib/RT/Transactions_Overlay.pm	(original)
+++ rt/branches/rt-3.3/lib/RT/Transactions_Overlay.pm	Fri Apr  2 08:43:44 2004
@@ -86,6 +86,33 @@
 
 }
 
+# {{{ sub Next
+sub Next {
+    my $self = shift;
+ 	
+    my $Transaction = $self->SUPER::Next();
+    if ((defined($Transaction)) and (ref($Transaction))) {
+	if ($Transaction->__Value('Type') =~ /^Comment/ && 
+	    $Transaction->TicketObj->CurrentUserHasRight('ShowTicketComments')) {
+	    return($Transaction);
+	} elsif ($Transaction->__Value('Type') !~ /^Comment/ && 
+		 $Transaction->TicketObj->CurrentUserHasRight('ShowTicket')) {
+	    return($Transaction);
+	}
+
+	#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);
+    }	
+}
+# }}}
+
 =head2 example methods
 
   Queue RT::Queue or Queue Id

Modified: rt/branches/rt-3.3/lib/RT/URI.pm
==============================================================================
--- rt/branches/rt-3.3/lib/RT/URI.pm	(original)
+++ rt/branches/rt-3.3/lib/RT/URI.pm	Fri Apr  2 08:43:44 2004
@@ -104,12 +104,12 @@
 
     return undef unless ($uri);
 
-	my $scheme;
-	# Special case: integers passed in as URIs must be ticket ids
-	if ($uri =~ /^(\d+)$/) {
-		$scheme = "fsck.com-rt";
-	} elsif ($uri =~ /^((?:\w|\.|-)+?):/) {
-         $scheme = $1;
+    my $scheme;
+    # Special case: integers passed in as URIs must be ticket ids
+    if ($uri =~ /^(\d+)$/) {
+	$scheme = "fsck.com-rt";
+    } elsif ($uri =~ /^((?:\w|\.|-)+?):/) {
+	$scheme = $1;
     }
     else {
         $RT::Logger->warning("$self Could not determine a URI scheme for $uri");



More information about the Rt-commit mailing list