[Rt-commit] r4198 - in rt/branches/CHALDEA-EXPERIMENTAL: . etc
html/Elements html/Elements/CollectionAsTable html/NoAuth
lib/RT lib/RT/I18N lib/RT/Interface lib/t/regression
jesse at bestpractical.com
jesse at bestpractical.com
Wed Nov 30 16:31:52 EST 2005
Author: jesse
Date: Wed Nov 30 16:31:49 2005
New Revision: 4198
Modified:
rt/branches/CHALDEA-EXPERIMENTAL/ (props changed)
rt/branches/CHALDEA-EXPERIMENTAL/etc/RT_Config.pm.in
rt/branches/CHALDEA-EXPERIMENTAL/html/Elements/Callback
rt/branches/CHALDEA-EXPERIMENTAL/html/Elements/CollectionAsTable/Row
rt/branches/CHALDEA-EXPERIMENTAL/html/Elements/QueryString
rt/branches/CHALDEA-EXPERIMENTAL/html/NoAuth/webrt.css
rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/CustomFieldValues.pm
rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/EmailParser.pm
rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/I18N/fr.po
rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/I18N/ja.po
rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Interface/Email.pm
rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Record.pm
rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Ticket_Overlay.pm
rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Tickets_Overlay.pm
rt/branches/CHALDEA-EXPERIMENTAL/lib/t/regression/09record_cf_api.t
Log:
r19615 at truegrounds: jesse | 2005-11-30 16:09:54 -0500
r19572 at truegrounds: jesse | 2005-11-30 15:37:26 -0500
r19547 at truegrounds: jesse | 2005-11-29 18:54:41 -0500
r18901 at truegrounds (orig r4074): alexmv | 2005-11-14 13:52:00 -0500
r7140 at zoq-fot-pik: chmrr | 2005-11-14 13:51:14 -0500
* Better bounce handling, from Abhijit Menon-Sen <ams at oryx.com>
r18905 at truegrounds (orig r4077): alexmv | 2005-11-14 14:20:49 -0500
r7146 at zoq-fot-pik: chmrr | 2005-11-14 14:20:03 -0500
RT-Ticket: 7090
RT-Status: resolved
RT-Update: correspond
* New Japanese .po, from Daisuke Maki <daisuke at wafu.ne.jp>
r18940 at truegrounds (orig r4079): alexmv | 2005-11-14 14:52:57 -0500
r7148 at zoq-fot-pik: chmrr | 2005-11-14 14:51:58 -0500
RT-Ticket: 6559
RT-Status: resolved
RT-Update: correspond
* Tests from Todd Chapman for loading CF from a wrong queue
r18941 at truegrounds (orig r4080): alexmv | 2005-11-14 14:55:17 -0500
r7152 at zoq-fot-pik: chmrr | 2005-11-14 14:54:43 -0500
* Restore rightful .po headers on new french translation
r18942 at truegrounds (orig r4081): alexmv | 2005-11-14 14:59:42 -0500
r7155 at zoq-fot-pik: chmrr | 2005-11-14 14:59:06 -0500
RT-Ticket: 7020
RT-Status: resolved
RT-Update: correspond
* Actually make use of 'style' if it is provided; thanks to Kelly
F. Hickel <kfh at mqsoftware.com>
r18944 at truegrounds (orig r4083): alexmv | 2005-11-14 15:43:24 -0500
r7159 at zoq-fot-pik: chmrr | 2005-11-14 15:42:48 -0500
RT-Ticket: 6457
RT-Status: resolved
RT-Update: correspond
* Typo in Ticket_Overlay.pm, found by Todd Chapman <todd at chaka.net>
r18945 at truegrounds (orig r4084): alexmv | 2005-11-14 15:51:27 -0500
r7161 at zoq-fot-pik: chmrr | 2005-11-14 15:50:56 -0500
RT-Ticket: 6458
RT-Status: resolved
RT-Update: correspond
* Removed extra return argument from _AddLink, thanks to Todd Chapman
<todd at chaka.net>
r18946 at truegrounds (orig r4085): alexmv | 2005-11-14 16:30:12 -0500
r7163 at zoq-fot-pik: chmrr | 2005-11-14 16:29:36 -0500
RT-Ticket: 6507
RT-Status: resolved
RT-Update: correspond
* Standardize fonts to "Verdana, Arial, Helvetica, sans-serif";
variant of patch from Maxime Henrion <mux at FreeBSD.org>
r18947 at truegrounds (orig r4086): alexmv | 2005-11-14 16:49:33 -0500
r7165 at zoq-fot-pik: chmrr | 2005-11-14 16:49:07 -0500
RT-Ticket: 7131
RT-Status: resolved
RT-Update: correspond
* The $RT::rtname regex should be case insensitive for matching
subjects; thanks to Phil Smith III <psmith at levanta.com> for the
catch
r18948 at truegrounds (orig r4087): ruz | 2005-11-14 16:50:12 -0500
* fix: really hide hidden paths from callbacks
* fix: fetch data from the %cache by one key when store data with other
r18950 at truegrounds (orig r4089): ruz | 2005-11-14 16:57:36 -0500
* revert back mysql.schema, commited by accident
r18951 at truegrounds (orig r4090): ruz | 2005-11-14 17:02:36 -0500
* /Elements/QueryString now supports ARRAY refs, this allow us to handle
multiple arguments with the same name, this behaviour is consistent with
how HTML::Mason handle arguments
r18953 at truegrounds (orig r4092): alexmv | 2005-11-14 17:35:40 -0500
r7175 at zoq-fot-pik: chmrr | 2005-11-14 17:35:03 -0500
RT-Ticket: 7010
RT-Status: resolved
RT-Update: correspond
* Treat our email addresses as case-insensitive
r18957 at truegrounds (orig r4096): alexmv | 2005-11-14 18:34:44 -0500
r7182 at zoq-fot-pik: chmrr | 2005-11-14 18:34:13 -0500
RT-Ticket: 6994
RT-Status: resolved
RT-Update: correspond
* Sort custom vield values by SortOrder, then *Name*, then id; patch
from Troy Davis <troy at nack.net>
r18992 at truegrounds (orig r4120): robert | 2005-11-19 22:52:28 -0500
r4186 at bear: rspier | 2005-11-19 19:51:38 -0800
typo fix: s/load/Load/
Modified: rt/branches/CHALDEA-EXPERIMENTAL/etc/RT_Config.pm.in
==============================================================================
--- rt/branches/CHALDEA-EXPERIMENTAL/etc/RT_Config.pm.in (original)
+++ rt/branches/CHALDEA-EXPERIMENTAL/etc/RT_Config.pm.in Wed Nov 30 16:31:49 2005
@@ -35,16 +35,16 @@
# token matching and that you should use only "non-capturing" parenthesis
# grouping. For example:
#
-# Set($EmailSubjectTagRegex, qr/(?:example.com|example.org)/ );
+# Set($EmailSubjectTagRegex, qr/(?:example.com|example.org)/i );
#
# and NOT
#
-# Set($EmailSubjectTagRegex, qr/(example.com|example.org)/ );
+# Set($EmailSubjectTagRegex, qr/(example.com|example.org)/i );
#
# This setting would make RT behave exactly as it does without the
# setting enabled.
#
-# Set($EmailSubjectTagRegex, qr/\Q$rtname\E/ );
+# Set($EmailSubjectTagRegex, qr/\Q$rtname\E/i );
@@ -210,6 +210,11 @@
# These options are good for most sendmail wrappers and workalikes
Set($SendmailArguments , "-oi -t");
+# $SendmailBounceArguments defines what flags to pass to $Sendmail
+# assuming RT needs to send an error (ie. bounce).
+
+Set($SendmailBounceArguments , '-f "<>"');
+
# These arguments are good for sendmail brand sendmail 8 and newer
#Set($SendmailArguments,"-oi -t -ODeliveryMode=b -OErrorMode=m");
Modified: rt/branches/CHALDEA-EXPERIMENTAL/html/Elements/Callback
==============================================================================
--- rt/branches/CHALDEA-EXPERIMENTAL/html/Elements/Callback (original)
+++ rt/branches/CHALDEA-EXPERIMENTAL/html/Elements/Callback Wed Nov 30 16:31:49 2005
@@ -68,14 +68,14 @@
push @$callbacks,
# Skip backup files, files without a leading package name,
# and files we've already seen
- grep { !/^\.|~$/
+ grep { !/\/\.|~$/
and $_ ne "/Callbacks/$Page/$_CallbackName"
and not $seen{$_}++ }
$m->interp->resolver->glob_path($path, $root);
}
$m->notes($CacheKey => $callbacks);
- $cache{$Page,$_CallbackName} = $callbacks if !$RT::DevelMode;
+ $cache{$CacheKey} = $callbacks if !$RT::DevelMode;
}
my @rv;
Modified: rt/branches/CHALDEA-EXPERIMENTAL/html/Elements/CollectionAsTable/Row
==============================================================================
--- rt/branches/CHALDEA-EXPERIMENTAL/html/Elements/CollectionAsTable/Row (original)
+++ rt/branches/CHALDEA-EXPERIMENTAL/html/Elements/CollectionAsTable/Row Wed Nov 30 16:31:49 2005
@@ -71,6 +71,7 @@
$item++;
$m->out('<td class="collection-as-table" ');
$m->out( 'align="' . $column->{align} . '"' ) if ( $column->{align} );
+ $m->out( 'style="' . $column->{style} . '"' ) if ( $column->{style} );
$m->out('>');
foreach my $subcol ( @{ $column->{output} } ) {
if ( $subcol =~ /^__(.*?)__$/o ) {
Modified: rt/branches/CHALDEA-EXPERIMENTAL/html/Elements/QueryString
==============================================================================
--- rt/branches/CHALDEA-EXPERIMENTAL/html/Elements/QueryString (original)
+++ rt/branches/CHALDEA-EXPERIMENTAL/html/Elements/QueryString Wed Nov 30 16:31:49 2005
@@ -45,13 +45,17 @@
%# END BPS TAGGED BLOCK }}}
<%init>
my @params;
-while ( (my $key, my $value) = each %ARGS ){
+while ( my ($key, $value) = each %ARGS ){
+ if( UNIVERSAL::isa( $value, 'ARRAY' ) ) {
+ push @params, map $key."=".$m->interp->apply_escapes($_,'u'), @$value;
+ } else {
if (ref $value eq "ARRAY") {
push @params, $key."=".$m->interp->apply_escapes($_, 'u')
for @{$value};
} else {
push @params, $key."=".$m->interp->apply_escapes($value,'u');
}
+ }
}
return(join('&', at params));
</%init>
Modified: rt/branches/CHALDEA-EXPERIMENTAL/html/NoAuth/webrt.css
==============================================================================
--- rt/branches/CHALDEA-EXPERIMENTAL/html/NoAuth/webrt.css (original)
+++ rt/branches/CHALDEA-EXPERIMENTAL/html/NoAuth/webrt.css Wed Nov 30 16:31:49 2005
@@ -74,37 +74,37 @@
%# This modification sets a different class name for each level, allowing
%# style sheet control over the formats.
-a.topnav-0 { font-family: Verdana, sans-serif;
+a.topnav-0 { font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 16px;
font-weight: normal;
color: #FFFFFF;
text-decoration: none;
white-space: nowrap}
-a.topnav-1 { font-family: Verdana, sans-serif;
+a.topnav-1 { font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 14px;
font-weight: normal;
color: #FFFFFF;
text-decoration: none;
white-space: nowrap}
-a.topnav-2 { font-family: Verdana, sans-serif;
+a.topnav-2 { font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 12px;
font-weight: normal;
color: #FFFFFF;
text-decoration: none;
white-space: nowrap}
-a.topnav-3 { font-family: Verdana, sans-serif;
+a.topnav-3 { font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 11px;
font-weight: normal;
color: #FFFFFF;
text-decoration: none;
white-space: nowrap}
-a.topnav-4 { font-family: Verdana, sans-serif;
+a.topnav-4 { font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 11px;
font-weight: normal;
color: #FFFFFF;
text-decoration: none;
white-space: nowrap}
-a.topnav-5 { font-family: Verdana, sans-serif;
+a.topnav-5 { font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 11px;
font-weight: normal;
color: #FFFFFF;
@@ -183,37 +183,37 @@
%# This modification sets a different class name for each level, allowing
%# style sheet control over the formats
-a.currenttopnav-0 { font-family: Verdana, sans-serif;
+a.currenttopnav-0 { font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 16px;
font-weight: bold;
color: #FFFF66;
text-decoration: none;
white-space: nowrap}
-a.currenttopnav-1 { font-family: Verdana, sans-serif;
+a.currenttopnav-1 { font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 14px;
font-weight: bold;
color: #FFFF66;
text-decoration: none;
white-space: nowrap}
-a.currenttopnav-2 { font-family: Verdana, sans-serif;
+a.currenttopnav-2 { font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 12px;
font-weight: normal;
color: #FFFF66;
text-decoration: none;
white-space: nowrap}
-a.currenttopnav-3 { font-family: Verdana, sans-serif;
+a.currenttopnav-3 { font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 11px;
font-weight: normal;
color: #FFFF66;
text-decoration: none;
white-space: nowrap}
-a.currenttopnav-4 { font-family: Verdana, sans-serif;
+a.currenttopnav-4 { font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 11px;
font-weight: normal;
color: #FFFF66;
text-decoration: none;
white-space: nowrap}
-a.currenttopnav-5 { font-family: Verdana, sans-serif;
+a.currenttopnav-5 { font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 11px;
font-weight: normal;
color: #FFFF66;
@@ -457,7 +457,7 @@
BODY {
color: #000;
background: #FFFFFF;
- font-family: "Helvetica", sans-serif;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
margin-top: 0px;
margin-bottom: 0px;
margin-left: 0px;
@@ -480,7 +480,7 @@
H1, H2, H3 {
margin-top: 0.2em;
color: #336699;
- font-family: "Helvetica", sans-serif;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
clear: both;
}
Modified: rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/CustomFieldValues.pm
==============================================================================
--- rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/CustomFieldValues.pm (original)
+++ rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/CustomFieldValues.pm Wed Nov 30 16:31:49 2005
@@ -81,17 +81,18 @@
$self->{'table'} = 'CustomFieldValues';
$self->{'primary_key'} = 'id';
-
-
- # By default, order by SortOrder
- $self->OrderByCols(
- { ALIAS => 'main',
- FIELD => 'SortOrder',
- ORDER => 'ASC' },
- { ALIAS => 'main',
- FIELD => 'id',
- ORDER => 'ASC' },
- );
+ # By default, order by SortOrder
+ $self->OrderByCols(
+ { ALIAS => 'main',
+ FIELD => 'SortOrder',
+ ORDER => 'ASC' },
+ { ALIAS => 'main',
+ FIELD => 'Name',
+ ORDER => 'ASC' },
+ { ALIAS => 'main',
+ FIELD => 'id',
+ ORDER => 'ASC' },
+ );
return ( $self->SUPER::_Init(@_) );
}
Modified: rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/EmailParser.pm
==============================================================================
--- rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/EmailParser.pm (original)
+++ rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/EmailParser.pm Wed Nov 30 16:31:49 2005
@@ -435,7 +435,7 @@
# Example: the following rule would tell RT not to Cc
# "tickets at noc.example.com"
if ( defined($RT::RTAddressRegexp) &&
- $address =~ /$RT::RTAddressRegexp/ ) {
+ $address =~ /$RT::RTAddressRegexp/i ) {
return(1);
} else {
return (undef);
Modified: rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/I18N/fr.po
==============================================================================
--- rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/I18N/fr.po (original)
+++ rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/I18N/fr.po Wed Nov 30 16:31:49 2005
@@ -2,11 +2,11 @@
# jfenal <jfenal at free.fr>, 2005.
msgid ""
msgstr ""
-"Project-Id-Version: fr\n"
+"Project-Id-Version: RT 3.4.x\n"
"POT-Creation-Date: 2002-05-02 11:36+0800\n"
"PO-Revision-Date: 2005-10-28 01:54+0200\n"
"Last-Translator: jfenal <jfenal at free.fr>\n"
-"Language-Team: <fr at li.org>\n"
+"Language-Team: rt-devel <rt-devel at lists.fsck.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Modified: rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/I18N/ja.po
==============================================================================
--- rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/I18N/ja.po (original)
+++ rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/I18N/ja.po Wed Nov 30 16:31:49 2005
@@ -1,10 +1,9 @@
-#
msgid ""
msgstr ""
"Project-Id-Version: RT 3.4.x\n"
"POT-Creation-Date: 2002-05-02 11:36+0800\n"
-"PO-Revision-Date: 2005-10-03 13:49-0400\n"
-"Last-Translator: Jesse Vincent <jesse at bestpractical.com>\n"
+"PO-Revision-Date: 2005-10-20 02:00+0800\n"
+"Last-Translator: Daisuke Maki <daisuke at wafu.ne.jp>\n"
"Language-Team: rt-devel <rt-devel at lists.fsck.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
@@ -177,7 +176,7 @@
#. ($self->BriefDescription , $self->CreatorObj->Name)
#. ($Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)
msgid "%1 by %2"
-msgstr "%2による%1"
+msgstr "%1 (%2)"
#: lib/RT/Transaction_Overlay.pm:777 lib/RT/Transaction_Overlay.pm:786 lib/RT/Transaction_Overlay.pm:789
#. ($self->Field , $q1->Name , $q2->Name)
@@ -197,12 +196,12 @@
#: NOT FOUND IN SOURCE
msgid "%1 couldn't init a transaction (%2)\\n"
-msgstr "%1はトランザクションをはじめることができませんでした(%2)\\n"
+msgstr "%1はトランザクションを開始することができませんでした(%2)\\n"
#: lib/RT/Ticket_Overlay.pm:2743
#. ($self)
msgid "%1 couldn't set status to resolved. RT's Database may be inconsistent."
-msgstr "%1は分解するステータスを設定できませんでした。RTのデータベースに一貫性がない可能性があります。"
+msgstr "%1を解決状態に設定できませんでした。RTのデータベースに一貫性がない可能性があります。"
#: lib/RT/Transaction_Overlay.pm:560
#. ($obj_type)
@@ -217,7 +216,7 @@
#: html/Elements/MyTickets:47
#. ($rows)
msgid "%1 highest priority tickets I own"
-msgstr ""
+msgstr "優先度の高いチケット%1件"
#: bin/rt-crontool:186
#. ($0)
@@ -253,7 +252,7 @@
#: html/Elements/MyRequests:47
#. ($rows)
msgid "%1 newest unowned tickets"
-msgstr ""
+msgstr "担当されていないチケット%1件"
#: NOT FOUND IN SOURCE
msgid "%1 not shown"
@@ -283,7 +282,7 @@
#: lib/RT/Action/ResolveMembers.pm:63
#. (ref $self)
msgid "%1 will resolve all members of a resolved group ticket."
-msgstr "%1は分解されたグループチケットのすべてのメンバーを分解します。"
+msgstr "%1はグループチケットのすべてのメンバーを解決状態にします。"
#: NOT FOUND IN SOURCE
msgid "%1 will stall a [local] BASE if it's dependent [or member] of a linked up request."
@@ -306,7 +305,7 @@
#: lib/RT/Transaction_Overlay.pm:470
#. ($self)
msgid "%1: no attachment specified"
-msgstr "%1:アタッチメントが特定できません"
+msgstr "%1:アタッチメントが指定されていません"
#: html/Ticket/Elements/ShowTransactionAttachments:78
#. ($size)
@@ -435,20 +434,12 @@
#: html/Admin/Users/Modify.html:71
msgid "(required)"
-msgstr "（必要です）"
+msgstr "（必須項目です）"
#: html/Ticket/Elements/ShowTransactionAttachments:82
msgid "(untitled)"
msgstr ""
-#: NOT FOUND IN SOURCE
-msgid "25 highest priority tickets I own..."
-msgstr "私が所有している25の最も重要な優先権"
-
-#: NOT FOUND IN SOURCE
-msgid "25 highest priority tickets I requested..."
-msgstr "私がリクエストした25の最も重要な優先権"
-
#: html/Ticket/Elements/ShowBasics:53
msgid "<% $Ticket->Status%>"
msgstr ""
@@ -468,7 +459,7 @@
#: docs/design_docs/string-extraction-guide.txt:54 html/Elements/CreateTicket:47 lib/RT/StyleGuide.pod:787
#. ($m->scomp('/Elements/SelectNewTicketQueue'))
msgid "<input type=\"submit\" value=\"New ticket in\"> %1"
-msgstr "<input type=\"submit\" value=\"新しいチケット\"> %1"
+msgstr "<input type=\"submit\" value=\"新規作成\"> %1"
#: etc/initialdata:218
msgid "A blank template"
@@ -545,7 +536,7 @@
#: html/Search/Bulk.html:106
msgid "Add Requestor"
-msgstr "リクエストする人をを追加する"
+msgstr "作成者をを追加する"
#: html/Admin/Elements/AddCustomFieldValue:46
msgid "Add Value"
@@ -675,7 +666,7 @@
#: html/Elements/SelectDateRelation:57
msgid "After"
-msgstr "後"
+msgstr "が以下より後である"
#: html/Search/Elements/PickCriteria:52
msgid "Aggregator"
@@ -744,7 +735,7 @@
#: lib/RT/Date.pm:440
msgid "Apr."
-msgstr "四月"
+msgstr "4月"
#: html/Elements/SelectSortOrder:56 html/Search/Elements/DisplayOptions:73
msgid "Ascending"
@@ -793,7 +784,7 @@
#: lib/RT/Date.pm:444
msgid "Aug."
-msgstr "八月"
+msgstr "8月"
#: NOT FOUND IN SOURCE
msgid "AuthSystem"
@@ -837,7 +828,7 @@
#: html/Elements/SelectDateRelation:55 lib/RT/CurrentUser.pm:360
msgid "Before"
-msgstr "前"
+msgstr "が以下より前である"
#: html/Elements/Header:80
msgid "Best Practical Solutions, LLC corporate logo"
@@ -902,7 +893,7 @@
#: lib/RT/Record.pm:1266 lib/RT/Record.pm:1344
msgid "Can't specifiy both base and target"
-msgstr "ベースとターゲットを特定できません"
+msgstr "ベースとターゲット両方を指定する事はできません"
#: html/autohandler:148
#. ($msg)
@@ -930,8 +921,9 @@
msgstr "権利を無効にするチェックボックス"
#: html/Elements/EditLinks:146 html/Elements/EditLinks:85 html/Elements/ShowLinks:78 html/Ticket/Create.html:214 html/Ticket/Elements/BulkLinks:64
+# XXX - I can't come up with a good translation yet. leave as is in English
msgid "Children"
-msgstr "子供"
+msgstr ""
#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:141
msgid "City"
@@ -943,7 +935,7 @@
#: html/Ticket/Elements/ShowDates:68
msgid "Closed"
-msgstr ""
+msgstr "解決日時"
#: NOT FOUND IN SOURCE
msgid "Closed requests"
@@ -1080,7 +1072,7 @@
#: lib/RT/Ticket_Overlay.pm:3004 lib/RT/Ticket_Overlay.pm:3012 lib/RT/Ticket_Overlay.pm:3029
msgid "Could not change owner. "
-msgstr "オーナー変更ができませんでした"
+msgstr "担当者変更ができませんでした"
#: html/Admin/CustomFields/Modify.html:119
#. ($msg)
@@ -1392,7 +1384,7 @@
#: html/Elements/SelectDateType:47 html/Ticket/Elements/ShowDates:48 lib/RT/Ticket_Overlay.pm:1145
msgid "Created"
-msgstr "作成しました"
+msgstr "作成日時"
#: html/Admin/CustomFields/Modify.html:121 html/Admin/Elements/EditCustomField:117
#. ($CustomFieldObj->Name())
@@ -1502,7 +1494,7 @@
#: lib/RT/Date.pm:448
msgid "Dec."
-msgstr "十二月"
+msgstr "12月"
#: etc/initialdata:222
msgid "Default Autoresponse template"
@@ -1595,7 +1587,7 @@
#: html/Elements/EditLinks:138 html/Elements/EditLinks:66 html/Elements/ShowLinks:58 html/Ticket/Create.html:212 html/Ticket/Elements/BulkLinks:56 html/Ticket/Elements/ShowDependencies:53
msgid "Depended on by"
-msgstr "次のもの次第である"
+msgstr "依存されているチケット"
#: NOT FOUND IN SOURCE
msgid "Dependencies: \\n"
@@ -1623,15 +1615,15 @@
#: html/Elements/EditLinks:134 html/Elements/EditLinks:57 html/Elements/SelectLinkType:48 html/Elements/ShowLinks:48 html/Ticket/Create.html:211 html/Ticket/Elements/BulkLinks:52 html/Ticket/Elements/ShowDependencies:46
msgid "Depends on"
-msgstr "による"
+msgstr "依存しているチケット"
#: html/Elements/SelectSortOrder:56 html/Search/Elements/DisplayOptions:78
msgid "Descending"
-msgstr "降順する"
+msgstr "降順"
#: html/SelfService/Create.html:100 html/Ticket/Create.html:149
msgid "Describe the issue below"
-msgstr "下の問題点を表す"
+msgstr "チケットの本文を以下に書き込んでください"
#: html/Admin/CustomFields/Modify.html:61 html/Admin/Elements/AddCustomFieldValue:57 html/Admin/Elements/EditCustomField:60 html/Admin/Elements/EditCustomFieldValues:56 html/Admin/Elements/EditScrip:56 html/Admin/Elements/ModifyTemplate:57 html/Admin/Groups/Modify.html:71 html/Admin/Queues/Modify.html:69 html/Search/Elements/EditSearches:56 html/User/Groups/Modify.html:70
msgid "Description"
@@ -1687,7 +1679,7 @@
#: html/Elements/Refresh:51
msgid "Don't refresh this page."
-msgstr "このページを更新しないでください"
+msgstr "ページを定期的に更新しない"
#: html/Ticket/Elements/ShowTransactionAttachments:82
msgid "Download"
@@ -1699,7 +1691,7 @@
#: html/Elements/SelectDateType:53 html/Ticket/Create.html:197 html/Ticket/Elements/EditDates:66 html/Ticket/Elements/ShowDates:64 lib/RT/Ticket_Overlay.pm:1149
msgid "Due"
-msgstr "期限切れ"
+msgstr "終了予定日時"
#: NOT FOUND IN SOURCE
msgid "Due date '%1' could not be parsed"
@@ -1793,7 +1785,7 @@
#: lib/RT/Record.pm:1281 lib/RT/Record.pm:1358
msgid "Either base or target must be specified"
-msgstr "ベースもしくはターゲットを特定しなければなりません"
+msgstr "ベースもしくはターゲットを指定しなければなりません"
#: html/Admin/Users/Modify.html:74 html/Ticket/Elements/AddWatchers:77 html/User/Prefs.html:65
msgid "Email"
@@ -1941,7 +1933,7 @@
#: lib/RT/Date.pm:438
msgid "Feb."
-msgstr "二月"
+msgstr "2月"
#: html/Elements/SelectAttachmentField:50
msgid "Filename"
@@ -2137,7 +2129,7 @@
#: NOT FOUND IN SOURCE
msgid "Group not specified.\\n"
-msgstr "グループが特定できません。\\n"
+msgstr "グループが指定されていません。\\n"
#: html/Admin/Elements/GlobalCustomFieldTabs:59 html/Admin/Elements/SelectNewGroupMembers:56 html/Admin/Elements/Tabs:56 html/Admin/Global/CustomFields/index.html:69 html/Admin/Groups/Members.html:85 html/Admin/Queues/People.html:104 html/Admin/Users/Memberships.html:53 html/Admin/index.html:67 html/User/Groups/Members.html:88 lib/RT/CustomField_Overlay.pm:1088
msgid "Groups"
@@ -2162,11 +2154,11 @@
#: docs/design_docs/string-extraction-guide.txt:40 lib/RT/StyleGuide.pod:773
#. ($name)
msgid "Hello, %1"
-msgstr "こんにちは、%1"
+msgstr "こんにちは、%1さん"
#: html/Admin/Elements/GroupTabs:70 html/Admin/Elements/UserTabs:64 html/Ticket/Elements/ShowHistory:51 html/Ticket/Elements/Tabs:111
msgid "History"
-msgstr "ヒストリー"
+msgstr "更新履歴"
#: html/Admin/Groups/History.html:62
#. ($GroupObj->Name)
@@ -2180,11 +2172,11 @@
#: NOT FOUND IN SOURCE
msgid "HomePhone"
-msgstr "自宅の電話"
+msgstr "電話（自宅）"
#: html/Elements/Tabs:65
msgid "Homepage"
-msgstr "ホームページ"
+msgstr "ホーム"
#: lib/RT/Base.pm:110
#. (6)
@@ -2205,7 +2197,7 @@
#: html/Admin/Users/Modify.html:65 html/User/Prefs.html:60
msgid "Identity"
-msgstr "身分証明書"
+msgstr "基本情報"
#: etc/initialdata:429
msgid "If an approval is rejected, reject the original and delete pending approvals"
@@ -2225,7 +2217,7 @@
#: html/Admin/Queues/People.html:126 html/Ticket/Modify.html:60 html/Ticket/ModifyAll.html:128 html/Ticket/ModifyPeople.html:59
msgid "If you've updated anything above, be sure to"
-msgstr "上の何かをアップデートしたなら、次のことを確認してください"
+msgstr "変更を反映するにはボタンを推してください"
#: lib/RT/Record.pm:933
msgid "Illegal value for %1"
@@ -2290,7 +2282,7 @@
#: NOT FOUND IN SOURCE
msgid "Invalid owner. Defaulting to 'nobody'."
-msgstr "無効なオーナーです。 '誰でもない'に初期設定します."
+msgstr "無効な担当者です。 '誰でもない'に初期設定します."
#: lib/RT/Scrip_Overlay.pm:158 lib/RT/Template_Overlay.pm:276
msgid "Invalid queue"
@@ -2331,7 +2323,7 @@
#: lib/RT/Date.pm:437
msgid "Jan."
-msgstr "一月"
+msgstr "1月"
#: lib/RT/Group_Overlay.pm:174
msgid "Join or leave this group"
@@ -2339,15 +2331,15 @@
#: lib/RT/Date.pm:443
msgid "Jul."
-msgstr "七月"
+msgstr "7月"
#: html/Ticket/Elements/Tabs:122
msgid "Jumbo"
-msgstr "大きい"
+msgstr "総合"
#: lib/RT/Date.pm:442
msgid "Jun."
-msgstr "六月"
+msgstr "6月"
#: NOT FOUND IN SOURCE
msgid "Keyword"
@@ -2371,7 +2363,7 @@
#: html/Ticket/Elements/EditDates:59 html/Ticket/Elements/ShowDates:60
msgid "Last Contact"
-msgstr "最後のコンタクト"
+msgstr "最終更新日時"
#: html/Elements/SelectDateType:50
msgid "Last Contacted"
@@ -2379,7 +2371,7 @@
#: html/Elements/SelectDateType:51
msgid "Last Updated"
-msgstr "最後にアップデートした"
+msgstr "最終更新日時"
#: html/Search/Elements/PickBasics:103
msgid "LastUpdatedBy"
@@ -2387,7 +2379,7 @@
#: html/Ticket/Elements/ShowBasics:68
msgid "Left"
-msgstr "残った"
+msgstr "残り時間"
#: html/Admin/Users/Modify.html:109
msgid "Let this user access RT"
@@ -2399,7 +2391,7 @@
#: NOT FOUND IN SOURCE
msgid "Limiting owner to %1 %2"
-msgstr "オーナーを%1 %2に制限します"
+msgstr "担当者を%1 %2に制限します"
#: NOT FOUND IN SOURCE
msgid "Limiting queue to %1 %2"
@@ -2463,7 +2455,7 @@
#: html/Admin/Users/Modify.html:138 html/User/Prefs.html:126
msgid "Location"
-msgstr "場所"
+msgstr "住所"
#: lib/RT.pm:212
#. ($RT::LogDir)
@@ -2473,7 +2465,7 @@
#: html/Elements/Header:94
#. ("<b>".$session{'CurrentUser'}->Name."</b>")
msgid "Logged in as %1"
-msgstr "%1としてサインする"
+msgstr "\"%1\"でログインしています"
#: docs/design_docs/string-extraction-guide.txt:71 html/Elements/Login:57 html/Elements/Login:66 html/Elements/Login:76 lib/RT/StyleGuide.pod:797
msgid "Login"
@@ -2489,7 +2481,7 @@
#: html/Search/Bulk.html:104
msgid "Make Owner"
-msgstr "オーナーを決める"
+msgstr "担当者を決める"
#: html/Search/Bulk.html:128
msgid "Make Status"
@@ -2553,11 +2545,11 @@
#: lib/RT/Date.pm:439
msgid "Mar."
-msgstr "三月"
+msgstr "3月"
#: lib/RT/Date.pm:441
msgid "May."
-msgstr "五月"
+msgstr "5月"
#: lib/RT/Transaction_Overlay.pm:720
#. ($value)
@@ -2915,7 +2907,7 @@
#: lib/RT/User_Overlay.pm:227
msgid "Must specify 'Name' attribute"
-msgstr "'名前'の属性を特定してください"
+msgstr "'名前'の属性を指定してください"
#: html/SelfService/Elements/MyRequests:70
#. ($friendly_status)
@@ -3076,11 +3068,11 @@
#: NOT FOUND IN SOURCE
msgid "No Ticket specified. Aborting ticket "
-msgstr "チケットが特定できません。チケットを終了します"
+msgstr "チケットが指定されていません。"
#: NOT FOUND IN SOURCE
msgid "No Ticket specified. Aborting ticket modifications\\n\\n"
-msgstr "チケットが特定できません。チケットの修正を終了します\\n\\n"
+msgstr "チケットが指定されていません。チケットの修正を終了します\\n\\n"
#: html/Approvals/Elements/Approve:67
msgid "No action"
@@ -3109,7 +3101,7 @@
#: lib/RT/Users_Overlay.pm:185
msgid "No group specified"
-msgstr "グループが特定できません"
+msgstr "グループが指定されていません"
#: html/Admin/Groups/index.html:52
msgid "No groups matching search criteria found."
@@ -3146,7 +3138,7 @@
#: lib/RT/Queue_Overlay.pm:792 lib/RT/Ticket_Overlay.pm:1450
msgid "No principal specified"
-msgstr "責任者が特定できません"
+msgstr "責任者が指定されていません"
#: html/Admin/Queues/People.html:175 html/Admin/Queues/People.html:185
msgid "No principals selected."
@@ -3178,11 +3170,11 @@
#: NOT FOUND IN SOURCE
msgid "No ticket id specified"
-msgstr "チケットIDが特定できません"
+msgstr "チケットIDが指定されていません"
#: lib/RT/Transaction_Overlay.pm:517 lib/RT/Transaction_Overlay.pm:554
msgid "No transaction type specified"
-msgstr "トランザクションタイプが特定できません"
+msgstr "トランザクションタイプが指定されていません"
#: html/Admin/Users/index.html:55
msgid "No users matching search criteria found."
@@ -3206,19 +3198,19 @@
#: html/Elements/Header:96
msgid "Not logged in."
-msgstr "ログインできません"
+msgstr "ログインしていません"
#: lib/RT/Date.pm:393
msgid "Not set"
-msgstr "セットできません"
+msgstr "未指定"
#: html/NoAuth/Reminder.html:48
msgid "Not yet implemented."
-msgstr "まだ実行できません"
+msgstr "未実装"
#: NOT FOUND IN SOURCE
msgid "Not yet implemented...."
-msgstr "まだ実行できません。。。"
+msgstr "未実装..."
#: html/Approvals/Elements/Approve:70
msgid "Notes"
@@ -3332,7 +3324,7 @@
#: lib/RT/Date.pm:446
msgid "Oct."
-msgstr "十月"
+msgstr "10月"
#: html/Tools/Elements/Tabs:53
msgid "Offline"
@@ -3348,7 +3340,7 @@
#: html/Elements/SelectDateRelation:56
msgid "On"
-msgstr "に"
+msgstr "が以下である"
#: etc/initialdata:163
msgid "On Comment"
@@ -3398,7 +3390,7 @@
#: html/Elements/Quicksearch:52
msgid "Open"
-msgstr "開く"
+msgstr "着手済み"
#: html/Ticket/Elements/Tabs:159
msgid "Open it"
@@ -3463,7 +3455,7 @@
#: etc/initialdata:38 html/Elements/QuickCreate:58 html/Search/Elements/PickBasics:101 html/SelfService/Elements/MyRequests:51 html/Ticket/Create.html:69 html/Ticket/Elements/EditPeople:64 html/Ticket/Elements/EditPeople:65 html/Ticket/Elements/ShowPeople:48 html/Ticket/Update.html:62 lib/RT/ACE_Overlay.pm:111 lib/RT/Tickets_Overlay.pm:1734
msgid "Owner"
-msgstr "オーナー"
+msgstr "担当者"
#: lib/RT/Ticket_Overlay.pm:495
msgid "Owner could not be set."
@@ -3472,11 +3464,11 @@
#: lib/RT/Transaction_Overlay.pm:661
#. ($Old->Name , $New->Name)
msgid "Owner forcibly changed from %1 to %2"
-msgstr "オーナーは強制的に%1から%2を変更しました"
+msgstr "担当者は強制的に%1から%2を変更しました"
#: NOT FOUND IN SOURCE
msgid "Owner is"
-msgstr "オーナーは"
+msgstr "担当者は"
#: html/Elements/TicketList:78
#. ($Page, int($TotalFound/$Rows)+$oddRows)
@@ -3492,8 +3484,9 @@
msgstr "ポケットベル電話"
#: html/Elements/EditLinks:142 html/Elements/EditLinks:76 html/Elements/ShowLinks:68 html/Ticket/Create.html:213 html/Ticket/Elements/BulkLinks:60
+# XXX - I can't come up with a good translation yet. leave as is in English
msgid "Parents"
-msgstr "両親"
+msgstr ""
#: html/Elements/Login:74 html/User/Prefs.html:105
msgid "Password"
@@ -3538,8 +3531,10 @@
msgstr ""
#: html/Ticket/Elements/ShowSummary:66 html/Ticket/Elements/Tabs:119 html/Ticket/ModifyAll.html:72
+# XXX - this is not really a good translation... but much better than
+# "人々" (daisuke)
msgid "People"
-msgstr "人々"
+msgstr "担当者等"
#: etc/initialdata:133
msgid "Perform a user-defined action"
@@ -3599,7 +3594,7 @@
#: NOT FOUND IN SOURCE
msgid "Pri"
-msgstr "優先権"
+msgstr "優先度"
#: lib/RT/ACE_Overlay.pm:158 lib/RT/ACE_Overlay.pm:240 lib/RT/ACE_Overlay.pm:570
#. ($args{'PrincipalId'})
@@ -3608,7 +3603,7 @@
#: html/Search/Elements/PickBasics:160 html/Ticket/Create.html:184 html/Ticket/Elements/EditBasics:74 html/Ticket/Elements/ShowBasics:72 lib/RT/Tickets_Overlay.pm:1518
msgid "Priority"
-msgstr "優先権"
+msgstr "優先度"
#: html/Admin/Queues/Modify.html:86
msgid "Priority starts at"
@@ -3691,11 +3686,11 @@
#: html/Elements/Quicksearch:46
msgid "Quick search"
-msgstr ""
+msgstr "簡易検索"
#: html/Elements/QuickCreate:46
msgid "Quick ticket creation"
-msgstr ""
+msgstr "チケット新規作成"
#: html/Search/Results.html:83
msgid "RSS"
@@ -3765,7 +3760,7 @@
#: NOT FOUND IN SOURCE
msgid "RT couldn't find requestor via its external database lookup"
-msgstr "RTは外部のデータベースルックアップを使ってリクエストする人を見つけることができませんでした"
+msgstr "RTは外部のデータベースルックアップを使って作成者を見つけることができませんでした"
#: NOT FOUND IN SOURCE
msgid "RT couldn't find the queue: %1"
@@ -3834,11 +3829,11 @@
#: html/Elements/EditLinks:103 html/Elements/EditLinks:154 html/Elements/ShowLinks:92 html/Ticket/Create.html:216 html/Ticket/Elements/BulkLinks:72
msgid "Referred to by"
-msgstr "次のものによって参照した"
+msgstr "参照されているチケット"
#: html/Elements/EditLinks:150 html/Elements/EditLinks:94 html/Elements/SelectLinkType:49 html/Elements/ShowLinks:82 html/Ticket/Create.html:215 html/Ticket/Elements/BulkLinks:68
msgid "Refers to"
-msgstr "参照する"
+msgstr "参照しているチケット"
#: NOT FOUND IN SOURCE
msgid "Refine"
@@ -3851,7 +3846,7 @@
#: html/Elements/Refresh:57
#. ($value/60)
msgid "Refresh this page every %1 minutes."
-msgstr "このページを%1分おきに更新してください"
+msgstr "ページを%1分おきに更新する"
#: html/Search/Bulk.html:116
msgid "Remove AdminCc"
@@ -3863,7 +3858,7 @@
#: html/Search/Bulk.html:108
msgid "Remove Requestor"
-msgstr "リクエストする人を削除する"
+msgstr "作成者を削除する"
#: html/Ticket/Elements/ShowTransaction:171 html/Ticket/Elements/Tabs:145
msgid "Reply"
@@ -3871,7 +3866,7 @@
#: html/Admin/Queues/Modify.html:72
msgid "Reply Address"
-msgstr ""
+msgstr "返信アドレス"
#: html/Search/Bulk.html:151 html/Ticket/ModifyAll.html:94 html/Ticket/Update.html:76
msgid "Reply to requestors"
@@ -3887,15 +3882,15 @@
#: etc/initialdata:44 lib/RT/ACE_Overlay.pm:112
msgid "Requestor"
-msgstr "リクエストする人"
+msgstr "作成者"
#: NOT FOUND IN SOURCE
msgid "Requestor email address"
-msgstr "リクエストする人のEメールアドレス"
+msgstr "作成者のEメールアドレス"
#: html/SelfService/Create.html:63 html/Ticket/Create.html:77 html/Ticket/Elements/EditPeople:69 html/Ticket/Elements/ShowPeople:52
msgid "Requestors"
-msgstr "リクエストする人"
+msgstr "作成者"
#: html/Admin/Queues/Modify.html:96
msgid "Requests should be due in"
@@ -3916,7 +3911,7 @@
#: html/Ticket/Elements/Tabs:155
msgid "Resolve"
-msgstr "分解する"
+msgstr "解決済みにする"
#: html/Ticket/Update.html:154
#. ($TicketObj->id, $TicketObj->Subject)
@@ -3925,11 +3920,11 @@
#: etc/initialdata:323 html/Elements/SelectDateType:49 lib/RT/Ticket_Overlay.pm:1148
msgid "Resolved"
-msgstr "分解した"
+msgstr "解決済み"
#: NOT FOUND IN SOURCE
msgid "Response to requestors"
-msgstr "リクエストする人に返答する"
+msgstr "作成者に返答する"
#: html/Elements/ListActions:47 html/Search/Elements/NewListActions:47
msgid "Results"
@@ -4015,7 +4010,7 @@
#: html/User/Prefs.html:179
msgid "Save Preferences"
-msgstr ""
+msgstr "変更を保存する"
#: html/Ticket/Elements/PreviewScrips:124
msgid "Save changes"
@@ -4244,7 +4239,7 @@
#: lib/RT/Date.pm:445
msgid "Sep."
-msgstr "九月"
+msgstr "9月"
#: html/Ticket/Elements/ShowTransaction:150
msgid "Show"
@@ -4384,7 +4379,7 @@
#: html/Elements/SelectDateType:52 html/Ticket/Create.html:196 html/Ticket/Elements/EditDates:48 html/Ticket/Elements/ShowDates:52
msgid "Starts"
-msgstr "開始する"
+msgstr "開始予定日時"
#: NOT FOUND IN SOURCE
msgid "Starts By"
@@ -4396,11 +4391,11 @@
#: html/Admin/Users/Modify.html:162 html/User/Prefs.html:145
msgid "State"
-msgstr "状態"
+msgstr "都道府県"
#: html/Search/Elements/PickBasics:87 html/SelfService/Elements/MyRequests:50 html/SelfService/Update.html:57 html/Ticket/Create.html:63 html/Ticket/Elements/EditBasics:53 html/Ticket/Elements/ShowBasics:52 html/Ticket/Update.html:59 lib/RT/Ticket_Overlay.pm:1142 lib/RT/Tickets_Overlay.pm:1378
msgid "Status"
-msgstr "ステータス"
+msgstr "状態"
#: etc/initialdata:309
msgid "Status Change"
@@ -4412,7 +4407,7 @@
#: html/Ticket/Elements/Tabs:170
msgid "Steal"
-msgstr "盗用する"
+msgstr "担当者変更"
#: lib/RT/Queue_Overlay.pm:118
msgid "Steal tickets"
@@ -4425,7 +4420,7 @@
#: lib/RT/Transaction_Overlay.pm:667
#. ($Old->Name)
msgid "Stolen from %1"
-msgstr "%1から盗用した"
+msgstr "%1から担当者を変更しました"
#: NOT FOUND IN SOURCE
msgid "Stolen from %1 "
@@ -4437,7 +4432,7 @@
#: html/Elements/QuickCreate:52 html/Elements/SelectAttachmentField:47 html/Search/Bulk.html:154 html/SelfService/Create.html:79 html/SelfService/Elements/MyRequests:49 html/SelfService/Update.html:65 html/Ticket/Create.html:105 html/Ticket/Elements/EditBasics:48 html/Ticket/ModifyAll.html:100 html/Ticket/Update.html:80 lib/RT/Ticket_Overlay.pm:1138 lib/RT/Tickets_Overlay.pm:1460
msgid "Subject"
-msgstr "サブジェクト"
+msgstr "件名"
#: docs/design_docs/string-extraction-guide.txt:89 lib/RT/StyleGuide.pod:815 lib/RT/Transaction_Overlay.pm:689
#. ($self->Data)
@@ -4502,8 +4497,9 @@
msgstr "テスト＿ストリング"
#: html/Elements/MyRequests:50 html/Search/Elements/EditFormat:72 html/Ticket/Elements/Tabs:166
+# XXX - what the...
msgid "Take"
-msgstr "とる"
+msgstr "担当する"
#: lib/RT/Queue_Overlay.pm:116
msgid "Take tickets"
@@ -4591,7 +4587,7 @@
#: lib/RT/Ticket_Overlay.pm:3189
msgid "That ticket has unresolved dependencies"
-msgstr "そのチケットは従属物をすでに分解しました"
+msgstr "未解決の依存関係が存在します"
#: NOT FOUND IN SOURCE
msgid "That user already has that right"
@@ -4713,7 +4709,7 @@
#: html/Ticket/ModifyAll.html:46 html/Ticket/ModifyAll.html:50
#. ($Ticket->Id, $Ticket->Subject)
msgid "Ticket #%1 Jumbo update: %2"
-msgstr "チケット #%1 大きいアップデート: %2"
+msgstr "チケット #%1 更新（総合ビュー）: %2"
#: html/Approvals/Elements/ShowDependency:67
#. ($link->BaseObj->Id, $link->BaseObj->Subject)
@@ -4792,7 +4788,7 @@
#: html/Ticket/Display.html:55
msgid "Ticket metadata"
-msgstr ""
+msgstr "チケット情報"
#: etc/initialdata:310
msgid "Ticket status changed"
@@ -4825,15 +4821,15 @@
#: html/Search/Elements/PickBasics:149 html/Ticket/Create.html:187 html/Ticket/Elements/EditBasics:69
msgid "Time Left"
-msgstr "時間が残っています"
+msgstr "残り時間"
#: html/Search/Elements/PickBasics:147 html/Ticket/Create.html:186 html/Ticket/Elements/EditBasics:65
msgid "Time Worked"
-msgstr "使った時間"
+msgstr "作業時間"
#: lib/RT/Tickets_Overlay.pm:1619
msgid "Time left"
-msgstr "残っている時間"
+msgstr "残り時間"
#: html/Elements/Footer:71
msgid "Time to display"
@@ -5027,7 +5023,7 @@
#: html/Elements/SelectDateType:54 html/Ticket/Elements/ShowDates:72 lib/RT/Ticket_Overlay.pm:1147
msgid "Updated"
-msgstr "アップデートしました"
+msgstr "最終更新日時"
#: html/Tools/Offline.html:95
msgid "Upload"
@@ -5246,23 +5242,23 @@
#: NOT FOUND IN SOURCE
msgid "WorkPhone"
-msgstr "仕事先の電話"
+msgstr "電話(仕事）"
#: html/Ticket/Elements/ShowBasics:63 html/Ticket/Update.html:64
msgid "Worked"
-msgstr "Worked"
+msgstr "累積作業時間"
#: lib/RT/Ticket_Overlay.pm:3096
msgid "You already own this ticket"
-msgstr "あなたはすでにこのチケットを所有しています"
+msgstr "すでにこのチケットを担当しています"
#: html/autohandler:158 html/autohandler:166
msgid "You are not an authorized user"
-msgstr "あなたは認証されたユーザーではありません"
+msgstr "認証されていません。"
#: lib/RT/Ticket_Overlay.pm:2978
msgid "You can only reassign tickets that you own or that are unowned"
-msgstr "あなたは所有、または所有されていないチケットのみを止めることができます"
+msgstr "自分が担当しているチケットか、担当者のいないチケットしか変更する事ができません。"
#: NOT FOUND IN SOURCE
msgid "You don't have permission to view that ticket.\\n"
@@ -5271,23 +5267,23 @@
#: docs/design_docs/string-extraction-guide.txt:47 lib/RT/StyleGuide.pod:780
#. ($num, $queue)
msgid "You found %1 tickets in queue %2"
-msgstr "あなたは%2でチケット%1を見つけました"
+msgstr "キュー%2で%1件のチケットがヒットしました"
#: html/NoAuth/Logout.html:52
msgid "You have been logged out of RT."
-msgstr "あなたはRTからログアウトしたままです"
+msgstr "RTからログアウトしました"
#: html/SelfService/Display.html:109
msgid "You have no permission to create tickets in that queue."
-msgstr "あなたはこのキューでチケット作成の許可がありません"
+msgstr "指定ののキューでチケット作成の許可がありません"
#: lib/RT/Ticket_Overlay.pm:1964
msgid "You may not create requests in that queue."
-msgstr "あなたはこのキューでリクエストの作成ができるでしょう"
+msgstr "指定のキューでリクエストの作成ができません"
#: html/NoAuth/Logout.html:56
msgid "You're welcome to login again"
-msgstr "ぜひまたログインしてください"
+msgstr "トップページ"
#: NOT FOUND IN SOURCE
msgid "Your %1 requests"
@@ -5340,7 +5336,7 @@
#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:55
msgid "contains"
-msgstr "含む"
+msgstr "が以下を含む"
#: NOT FOUND IN SOURCE
msgid "correspondence (probably) not sent"
@@ -5360,7 +5356,7 @@
#: lib/RT/Queue_Overlay.pm:88
msgid "deleted"
-msgstr "削除された"
+msgstr "削除"
#: html/Search/Elements/PickBasics:128
msgid "does not belong to"
@@ -5372,7 +5368,7 @@
#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:56
msgid "doesn't contain"
-msgstr "含みません"
+msgstr "が以下を含まない"
#: html/Elements/SelectEqualityOperator:59
msgid "equal to"
@@ -5421,15 +5417,15 @@
#: html/Elements/SelectBoolean:53 html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:57 html/Search/Elements/PickBasics:175 html/Search/Elements/PickBasics:74 html/Search/Elements/PickBasics:90 html/Search/Elements/PickCFs:53
msgid "is"
-msgstr "です"
+msgstr "が以下である"
#: html/Elements/SelectBoolean:57 html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectMatch:58 html/Search/Elements/PickBasics:176 html/Search/Elements/PickBasics:75 html/Search/Elements/PickBasics:91 html/Search/Elements/PickCFs:54
msgid "isn't"
-msgstr "でない"
+msgstr "が以下ではない"
#: html/Elements/SelectCustomFieldOperator:59 html/Elements/SelectEqualityOperator:59
msgid "less than"
-msgstr "より少ない"
+msgstr "より小さい"
#: html/Search/Elements/PickBasics:60
msgid "matches"
@@ -5437,7 +5433,7 @@
#: lib/RT/Date.pm:334
msgid "min"
-msgstr "最低"
+msgstr "分"
#: html/Ticket/Update.html:64
msgid "minutes"
@@ -5453,7 +5449,7 @@
#: lib/RT/Queue_Overlay.pm:83
msgid "new"
-msgstr "新しい"
+msgstr "新規"
#: html/Admin/Elements/PickCustomFields:64 html/Admin/Elements/PickObjects:63
msgid "no name"
@@ -5473,7 +5469,7 @@
#: html/SelfService/Elements/MyRequests:83 lib/RT/Queue_Overlay.pm:84
msgid "open"
-msgstr "開く"
+msgstr "着手"
#: lib/RT/Group_Overlay.pm:227
#. ($self->Name, $user->Name)
@@ -5487,11 +5483,11 @@
#: lib/RT/Queue_Overlay.pm:87
msgid "rejected"
-msgstr "拒否されました"
+msgstr "拒否"
#: lib/RT/Queue_Overlay.pm:86
msgid "resolved"
-msgstr "分解されました"
+msgstr "解決済み"
#: lib/RT/Date.pm:330
msgid "sec"
@@ -5507,7 +5503,7 @@
#: lib/RT/Queue_Overlay.pm:85
msgid "stalled"
-msgstr "止まりました"
+msgstr "保留"
#: lib/RT/Group_Overlay.pm:230
#. ($self->Type)
@@ -5554,3 +5550,7 @@
msgid "years"
msgstr "年"
+#: share/html/Elements/Quicksearch, et al
+msgid "New"
+msgstr "新規"
+
Modified: rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Interface/Email.pm
==============================================================================
--- rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Interface/Email.pm (original)
+++ rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Interface/Email.pm Wed Nov 30 16:31:49 2005
@@ -68,6 +68,7 @@
&CheckForLoops
&CheckForSuspiciousSender
&CheckForAutoGenerated
+ &CheckForBounce
&MailError
&ParseCcAddressesFromHead
&ParseSenderAddressFromHead
@@ -171,6 +172,16 @@
# }}}
+# {{{ sub CheckForBounce
+sub CheckForBounce {
+ my $head = shift;
+
+ my $ReturnPath = $head->get("Return-path") || "" ;
+ return ($ReturnPath =~ /<>/);
+}
+
+# }}}
+
# {{{ IsRTAddress
=head2 IsRTAddress ADDRESS
@@ -187,7 +198,7 @@
# Example: the following rule would tell RT not to Cc
# "tickets at noc.example.com"
if ( defined($RT::RTAddressRegexp) &&
- $address =~ /$RT::RTAddressRegexp/ ) {
+ $address =~ /$RT::RTAddressRegexp/i ) {
return(1);
} else {
return (undef);
@@ -250,7 +261,7 @@
}
if ($RT::MailCommand eq 'sendmailpipe') {
- open (MAIL, "|$RT::SendmailPath $RT::SendmailArguments") || return(0);
+ open (MAIL, "|$RT::SendmailPath $RT::SendmailBounceArguments $RT::SendmailArguments") || return(0);
print MAIL $entity->as_string;
close(MAIL);
}
@@ -378,7 +389,8 @@
=head2 ParseErrorsToAddressFromHead
Takes a MIME::Header object. Return a single value : user at host
-of the From (evaluated in order of Errors-To:,Reply-To:, From:, Sender)
+of the From (evaluated in order of Return-path:,Errors-To:,Reply-To:,
+From:, Sender)
=cut
@@ -386,7 +398,7 @@
my $head = shift;
#Figure out who's sending this message.
- foreach my $header ('Errors-To' , 'Reply-To', 'From', 'Sender' ) {
+ foreach my $header ('Return-path', 'Errors-To' , 'Reply-To', 'From', 'Sender' ) {
# If there's a header of that name
my $headerobj = $head->get($header);
if ($headerobj) {
@@ -436,7 +448,7 @@
my $Subject = shift;
my $id;
- my $test_name = $RT::EmailSubjectTagRegex || qr/\Q$RT::rtname\E/;
+ my $test_name = $RT::EmailSubjectTagRegex || qr/\Q$RT::rtname\E/i;
if ( $Subject =~ s/\[$test_name\s+\#(\d+)\s*\]//i ) {
my $id = $1;
@@ -655,6 +667,8 @@
# }}}
# {{{ Lets check for mail loops of various sorts.
+ my $IsBounce = CheckForBounce($head);
+
my $IsAutoGenerated = CheckForAutoGenerated($head);
my $IsSuspiciousSender = CheckForSuspiciousSender($head);
@@ -665,7 +679,7 @@
#If the message is autogenerated, we need to know, so we can not
# send mail to the sender
- if ( $IsSuspiciousSender || $IsAutoGenerated || $IsALoop ) {
+ if ( $IsBounce || $IsSuspiciousSender || $IsAutoGenerated || $IsALoop ) {
$SquelchReplies = 1;
$ErrorsTo = $RT::OwnerEmail;
}
Modified: rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Record.pm
==============================================================================
--- rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Record.pm (original)
+++ rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Record.pm Wed Nov 30 16:31:49 2005
@@ -1297,7 +1297,7 @@
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 );
+ return ( $old_link->id, $self->loc("Link already exists") );
}
# }}}
Modified: rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Ticket_Overlay.pm
==============================================================================
--- rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Ticket_Overlay.pm (original)
+++ rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Ticket_Overlay.pm Wed Nov 30 16:31:49 2005
@@ -751,7 +751,7 @@
$RT::Handle->Commit();
$ErrStr = $self->loc( "Ticket [_1] created in queue '[_2]'", $self->Id, $QueueObj->Name );
$ErrStr = join( "\n", $ErrStr, @non_fatal_errors );
- return ( $self->Id, $0, $ErrStr );
+ return ( $self->Id, 0, $ErrStr );
}
}
Modified: rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Tickets_Overlay.pm
==============================================================================
--- rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Tickets_Overlay.pm (original)
+++ rt/branches/CHALDEA-EXPERIMENTAL/lib/RT/Tickets_Overlay.pm Wed Nov 30 16:31:49 2005
@@ -2307,7 +2307,7 @@
my $q = "";
if ( $CF->Queue ) {
my $qo = new RT::Queue( $self->CurrentUser );
- $qo->load( $CF->Queue );
+ $qo->Load( $CF->Queue );
$q = $qo->Name;
}
Modified: rt/branches/CHALDEA-EXPERIMENTAL/lib/t/regression/09record_cf_api.t
==============================================================================
--- rt/branches/CHALDEA-EXPERIMENTAL/lib/t/regression/09record_cf_api.t (original)
+++ rt/branches/CHALDEA-EXPERIMENTAL/lib/t/regression/09record_cf_api.t Wed Nov 30 16:31:49 2005
@@ -2,7 +2,7 @@
use strict;
use warnings FATAL => 'all';
-use Test::More tests => 131;
+use Test::More tests => 133;
use RT;
RT::LoadConfig();
@@ -21,6 +21,9 @@
$queue->Create( Name => 'RecordCustomFields-'.$$ );
ok ($queue->id, "Created the queue");
+my $queue2 = RT::Queue->new( $RT::SystemUser );
+$queue2->Create( Name => 'RecordCustomFields2' );
+
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Create(
Queue => $queue->Id,
@@ -51,6 +54,11 @@
$global_cf3->AddValue( Name => 'RecordCustomFieldValues31' );
$global_cf3->AddValue( Name => 'RecordCustomFieldValues32' );
+my $local_cf4 = RT::CustomField->new( $RT::SystemUser );
+$local_cf4->Create( Name => 'RecordCustomFields4', Type => 'SelectSingle', Queue => $queue2->id );
+$local_cf4->AddValue( Name => 'RecordCustomFieldValues41' );
+$local_cf4->AddValue( Name => 'RecordCustomFieldValues42' );
+
my @custom_fields = ($local_cf1, $local_cf2, $global_cf3);
@@ -178,6 +186,14 @@
# lets test cycle via CF object reference
$test_add_delete_cycle->( sub { return $_[0] } );
+$ticket->AddCustomFieldValue( Field => $local_cf2->id , Value => 'Baz' );
+$ticket->AddCustomFieldValue( Field => $global_cf3->id , Value => 'Baz' );
+# now if we ask for cf values on RecordCustomFields4 we should not get any
+$cfvs = $ticket->CustomFieldValues( 'RecordCustomFields4' );
+is( $cfvs->Count, 0, "No custom field values for non-Queue cf" );
+is( $ticket->FirstCustomFieldValue( 'RecordCustomFields4' ), undef, "No first custom field value for non-Queue cf" );
+
+
#SKIP: {
# skip "TODO: should we add CF values to objects via CF Name?", 48;
# names are not unique
More information about the Rt-commit
mailing list