[Rt-commit] r6550 - in rt/branches/3.6-EXPERIMENTAL-LONDRES: .
html/Admin/Elements html/Admin/Global html/NoAuth/js lib/RT
lib/RT/I18N
jesse at bestpractical.com
jesse at bestpractical.com
Fri Dec 1 13:20:40 EST 2006
Author: jesse
Date: Fri Dec 1 13:20:39 2006
New Revision: 6550
Modified:
rt/branches/3.6-EXPERIMENTAL-LONDRES/ (props changed)
rt/branches/3.6-EXPERIMENTAL-LONDRES/html/Admin/Elements/EditScrip
rt/branches/3.6-EXPERIMENTAL-LONDRES/html/Admin/Global/Scrip.html
rt/branches/3.6-EXPERIMENTAL-LONDRES/html/Admin/Queues/Scrip.html
rt/branches/3.6-EXPERIMENTAL-LONDRES/html/NoAuth/js/ahah.js
rt/branches/3.6-EXPERIMENTAL-LONDRES/lib/RT/I18N/pl.po
rt/branches/3.6-EXPERIMENTAL-LONDRES/lib/RT/I18N/ru.po
rt/branches/3.6-EXPERIMENTAL-LONDRES/lib/RT/Scrip_Overlay.pm
rt/branches/3.6-EXPERIMENTAL-LONDRES/lib/RT/Template_Overlay.pm
Log:
* Merge from trunk
Modified: rt/branches/3.6-EXPERIMENTAL-LONDRES/html/Admin/Elements/EditScrip
==============================================================================
--- rt/branches/3.6-EXPERIMENTAL-LONDRES/html/Admin/Elements/EditScrip (original)
+++ rt/branches/3.6-EXPERIMENTAL-LONDRES/html/Admin/Elements/EditScrip Fri Dec 1 13:20:39 2006
@@ -44,150 +44,95 @@
%#
%# END BPS TAGGED BLOCK }}}
<& /Elements/ListActions, actions => \@actions &>
-
<form method="post" action="Scrip.html">
-<input type="hidden" class="hidden" name="id" value="<%$id%>" />
-<input type="hidden" class="hidden" name="Queue" value="<%$Queue%>" />
+<input type="hidden" class="hidden" name="id" value="<% $id %>" />
+<input type="hidden" class="hidden" name="Queue" value="<% $Queue %>" />
+
<&| /Widgets/TitleBox, title => loc('Scrip Fields') &>
<table>
-<tr>
-<td align="right">
-<&|/l&>Description</&>:
-</td>
-<td>
-<input name="Scrip-<%$id%>-Description" value="<%$scrip->Description%>" />
-</tr>
-<tr>
-<td align="right">
-<&|/l&>Condition</&>:
-</td>
-<td>
-<& /Admin/Elements/SelectScripCondition, Name => "Scrip-$id-ScripCondition", Default => $scrip->ConditionObj->Id &><br />
-</td>
-</tr>
-<tr>
-<td align="right">
-<&|/l&>Action</&>:
-</td>
-<td>
-<& /Admin/Elements/SelectScripAction, Name => "Scrip-$id-ScripAction", Default => $scrip->ActionObj->Id &>
-</td>
-</tr>
-<tr>
-<td align="right">
-<&|/l&>Template</&>:
-</td>
-<td>
-<& /Admin/Elements/SelectTemplate, Name => "Scrip-$id-Template", Default => $scrip->TemplateObj->Id, Queue => $Queue &>
-</td>
-</tr>
-<tr>
-<td align="right">
-<&|/l&>Stage</&>:
-</td>
-<td>
-<& /Admin/Elements/SelectStage, Name => "Scrip-$id-Stage", Default => $scrip->Stage &>
-</td>
-</tr>
+
+<tr><td align="right"><&|/l&>Description</&>:</td><td>
+<input name="Scrip-<% $id %>-Description" value="<% $ARGS{"Scrip-$id-Description"} || $scrip->Description %>" />
+</td></tr>
+
+<tr><td align="right"><&|/l&>Condition</&>:</td><td>
+<& /Admin/Elements/SelectScripCondition,
+ Name => "Scrip-$id-ScripCondition",
+ Default => $ARGS{"Scrip-$id-ScripCondition"} || $scrip->ConditionObj->Id,
+&></td></tr>
+
+<tr><td align="right"><&|/l&>Action</&>:</td><td>
+<& /Admin/Elements/SelectScripAction,
+ Name => "Scrip-$id-ScripAction",
+ Default => $ARGS{"Scrip-$id-ScripAction"} || $scrip->ActionObj->Id,
+&></td></tr>
+
+<tr><td align="right"><&|/l&>Template</&>:</td><td>
+<& /Admin/Elements/SelectTemplate,
+ Name => "Scrip-$id-Template",
+ Default => $ARGS{"Scrip-$id-Template"} || $scrip->TemplateObj->Id,
+ Queue => $Queue,
+&></td></tr>
+
+<tr><td align="right"><&|/l&>Stage</&>:</td><td>
+<& /Admin/Elements/SelectStage,
+ Name => "Scrip-$id-Stage",
+ Default => $ARGS{"Scrip-$id-Stage"} || $scrip->Stage,
+&></td></tr>
+
</table>
</&>
-<& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
-<br />
+<& /Elements/Submit,
+ Label => $SubmitLabel,
+ Caption => loc("Be sure to save your changes"),
+ Reset => 1,
+&><br />
+
<&| /Widgets/TitleBox, title => loc('User Defined conditions and actions') &>
<table>
-<tr>
-<td colspan="2">
+<tr><td colspan="2">
<i><&|/l&>(Use these fields when you choose 'User Defined' for a condition or action)</&></i>
-</td>
-</tr>
-<tr>
-<td class="labeltop">
-<&|/l&>Custom condition</&>:
-</td>
-<td>
-<textarea cols="80" rows="5" name="Scrip-<%$id%>-CustomIsApplicableCode"><%$scrip->CustomIsApplicableCode%></textarea>
-</td>
-</tr>
-<tr>
-<td class="labeltop">
-<&|/l&>Custom action preparation code</&>:
-</td>
-<td>
-<textarea cols="80" rows="5" name="Scrip-<%$id%>-CustomPrepareCode"><%$scrip->CustomPrepareCode%></textarea>
-</td>
-</tr>
-<tr>
-<td class="labeltop">
-<&|/l&>Custom action cleanup code</&>:
-</td>
-<td>
-<textarea cols="80" rows="5" name="Scrip-<%$id%>-CustomCommitCode"><%$scrip->CustomCommitCode%></textarea>
-</td>
-</tr>
+</td></tr>
+
+<tr><td class="labeltop"><&|/l&>Custom condition</&>:</td><td>
+<textarea cols="80" rows="5" name="Scrip-<% $id %>-CustomIsApplicableCode"><% $ARGS{"Scrip-$id-CustomIsApplicableCode"} || $scrip->CustomIsApplicableCode %></textarea>
+</td></tr>
+
+<tr><td class="labeltop"><&|/l&>Custom action preparation code</&>:</td><td>
+<textarea cols="80" rows="5" name="Scrip-<% $id %>-CustomPrepareCode"><% $ARGS{"Scrip-$id-CustomPrepareCode"} || $scrip->CustomPrepareCode %></textarea>
+</td></tr>
+
+<tr><td class="labeltop"><&|/l&>Custom action cleanup code</&>:</td><td>
+<textarea cols="80" rows="5" name="Scrip-<% $id %>-CustomCommitCode"><% $ARGS{"Scrip-$id-CustomCommitCode"} || $scrip->CustomCommitCode %></textarea>
+</td></tr>
+
</table>
</&>
-<& /Elements/Submit, Label => loc('Create'), Reset => 1 &>
+<& /Elements/Submit, Label => $SubmitLabel, Reset => 1 &>
</form>
<%init>
-my (@actions);
-
-my $scrip = new RT::Scrip($session{'CurrentUser'});
+my (@actions, $SubmitLabel);
-if ( $id eq 'new' ) {
+my $scrip = RT::Scrip->new( $session{'CurrentUser'} );
- my ( $retval, $msg ) = $scrip->Create(
- Queue => $Queue,
- ScripAction => $ARGS{"Scrip-new-ScripAction"},
- ScripCondition => $ARGS{"Scrip-new-ScripCondition"},
- Template => $ARGS{"Scrip-new-Template"},
- Description => $ARGS{"Scrip-new-Description"},
- CustomPrepareCode => $ARGS{"Scrip-new-CustomPrepareCode"},
- CustomCommitCode => $ARGS{"Scrip-new-CustomCommitCode"},
- CustomIsApplicableCode => $ARGS{"Scrip-new-CustomIsApplicableCode"},
- );
- if ( defined $retval ) {
- push @actions, $msg;
- $id = $scrip->id;
- }
- else {
- Abort( $msg);
- }
-}
-elsif ($id) {
- my ($val,$msg) =$scrip->Load($id);
- if ($val) {
- $id = $scrip->id;
- } else {
- Abort ($msg);
+if ( $id ) {
+ $scrip->Load( $id );
+ unless ( $id = $scrip->id ) {
+ push @actions, loc("Couldn't load scrip #[_1]", $id);
}
- my @attribs = qw (
- Queue
- ScripAction
- ScripCondition
- Template
- Stage
- Description
- CustomPrepareCode
- CustomCommitCode
- CustomIsApplicableCode
- );
- my @results = UpdateRecordObject( AttributesRef => \@attribs,
- AttributePrefix => 'Scrip-'.$scrip->Id,
- Object => $scrip,
- ARGSRef => \%ARGS );
- push (@actions, @results);
+ $SubmitLabel = loc('Update');
}
-elsif ($ARGS{'create'}) {
+unless ( $id ) {
$id = 'new';
+ $SubmitLabel = loc('Create');
}
-# }}}
</%init>
<%ARGS>
@@ -195,3 +140,42 @@
$title => undef
$Queue => 0
</%ARGS>
+
+<%METHOD Process>
+<%ARGS>
+$id => undef
+$Queue => undef
+</%ARGS>
+<%INIT>
+return ($id) unless $id;
+
+my $scrip = RT::Scrip->new( $session{'CurrentUser'} );
+if ( $id eq 'new' ) {
+ return $scrip->Create(
+ Queue => $Queue,
+ ScripAction => $ARGS{"Scrip-new-ScripAction"},
+ ScripCondition => $ARGS{"Scrip-new-ScripCondition"},
+ Template => $ARGS{"Scrip-new-Template"},
+ Description => $ARGS{"Scrip-new-Description"},
+ CustomPrepareCode => $ARGS{"Scrip-new-CustomPrepareCode"},
+ CustomCommitCode => $ARGS{"Scrip-new-CustomCommitCode"},
+ CustomIsApplicableCode => $ARGS{"Scrip-new-CustomIsApplicableCode"},
+ );
+}
+else {
+ $scrip->Load( $id );
+ return (undef, loc("Couldn't load scrip #[_1]", $id))
+ unless $scrip->id;
+
+ my @attribs = qw(Queue ScripAction ScripCondition Template Stage
+ Description CustomPrepareCode CustomCommitCode CustomIsApplicableCode);
+ my @results = UpdateRecordObject(
+ AttributesRef => \@attribs,
+ AttributePrefix => 'Scrip-'.$scrip->Id,
+ Object => $scrip,
+ ARGSRef => \%ARGS
+ );
+ return ($scrip->id, @results);
+}
+</%INIT>
+</%METHOD>
Modified: rt/branches/3.6-EXPERIMENTAL-LONDRES/html/Admin/Global/Scrip.html
==============================================================================
--- rt/branches/3.6-EXPERIMENTAL-LONDRES/html/Admin/Global/Scrip.html (original)
+++ rt/branches/3.6-EXPERIMENTAL-LONDRES/html/Admin/Global/Scrip.html Fri Dec 1 13:20:39 2006
@@ -43,33 +43,40 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-<& /Admin/Elements/Header, Title => $title &>
+<& /Admin/Elements/Header, Title => $title &>
<& /Admin/Elements/SystemTabs,
current_tab => 'Admin/Global/Scrips.html',
current_subtab => $current_subtab,
subtabs => $subtabs,
Title => $title &>
-<& /Admin/Elements/EditScrip, title => $title, %ARGS &>
+<& /Elements/ListActions, actions => \@results &>
+<& /Admin/Elements/EditScrip, title => $title, %ARGS, id => $id &>
<%init>
-my ($title, $current_subtab);
my $subtabs = {
- A => { title => loc('Select scrip'),
- path => "Admin/Global/Scrips.html",
- },
- B => { title => loc('New scrip'),
- path => "Admin/Global/Scrip.html?create=1&Queue=0",
- separator => 1,
- }
- };
+ A => {
+ title => loc('Select scrip'),
+ path => "Admin/Global/Scrips.html",
+ },
+ B => {
+ title => loc('New scrip'),
+ path => "Admin/Global/Scrip.html?create=1&Queue=0",
+ separator => 1,
+ },
+};
+
+my $scrip = RT::Scrip->new( $session{'CurrentUser'} );
+my ($id, @results) = $m->comp( '/Admin/Elements/EditScrip:Process', %ARGS );
-if ($ARGS{'id'}) {
- $current_subtab = "Admin/Global/Scrip.html?id=".$ARGS{'id'}."&Queue=0";
+my ($title, $current_subtab);
+if ( $id ) {
+ $current_subtab = "Admin/Global/Scrip.html?id=$id&Queue=0";
$title = loc("Modify a scrip which applies to all queues");
- $subtabs->{"C"} = { title => loc('Scrip #[_1]', $ARGS{'id'}),
- path => "Admin/Global/Scrip.html?id=".$ARGS{'id'}."&Queue=0"
- }
+ $subtabs->{"C"} = {
+ title => loc('Scrip #[_1]', $id),
+ path => "Admin/Global/Scrip.html?id=$id&Queue=0",
+ };
}
else {
$current_subtab = "Admin/Global/Scrip.html?create=1&Queue=0";
Modified: rt/branches/3.6-EXPERIMENTAL-LONDRES/html/Admin/Queues/Scrip.html
==============================================================================
--- rt/branches/3.6-EXPERIMENTAL-LONDRES/html/Admin/Queues/Scrip.html (original)
+++ rt/branches/3.6-EXPERIMENTAL-LONDRES/html/Admin/Queues/Scrip.html Fri Dec 1 13:20:39 2006
@@ -1,38 +1,38 @@
%# BEGIN BPS TAGGED BLOCK {{{
-%#
+%#
%# COPYRIGHT:
-%#
-%# This software is Copyright (c) 1996-2006 Best Practical Solutions, LLC
+%#
+%# This software is Copyright (c) 1996-2006 Best Practical Solutions, LLC
%# <jesse at bestpractical.com>
-%#
+%#
%# (Except where explicitly superseded by other copyright notices)
-%#
-%#
+%#
+%#
%# LICENSE:
-%#
+%#
%# This work is made available to you under the terms of Version 2 of
%# the GNU General Public License. A copy of that license should have
%# been provided with this software, but in any event can be snarfed
%# from www.gnu.org.
-%#
+%#
%# This work is distributed in the hope that it will be useful, but
%# WITHOUT ANY WARRANTY; without even the implied warranty of
%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
%# General Public License for more details.
-%#
+%#
%# You should have received a copy of the GNU General Public License
%# along with this program; if not, write to the Free Software
%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%#
-%#
+%#
+%#
%# CONTRIBUTION SUBMISSION POLICY:
-%#
+%#
%# (The following paragraph is not intended to limit the rights granted
%# to you to modify and distribute this software under the terms of
%# the GNU General Public License and is only of importance to you if
%# you choose to contribute your changes and enhancements to the
%# community by submitting them to Best Practical Solutions, LLC.)
-%#
+%#
%# By intentionally submitting any modifications, corrections or
%# derivatives to this work, or any other work intended for use with
%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
@@ -41,49 +41,58 @@
%# royalty-free, perpetual, license to use, copy, create derivative
%# works based on those contributions, and sublicense and distribute
%# those contributions and any derivatives thereof.
-%#
+%#
%# END BPS TAGGED BLOCK }}}
<& /Admin/Elements/Header, Title => $title &>
-<& /Admin/Elements/QueueTabs, id => $QueueObj->Id,
- QueueObj => $QueueObj,
- current_tab => 'Admin/Queues/Scrips.html?id='.$QueueObj->id,
- current_subtab => $current_subtab,
- subtabs => $subtabs,
+<& /Admin/Elements/QueueTabs, id => $QueueObj->Id,
+ QueueObj => $QueueObj,
+ current_tab => 'Admin/Queues/Scrips.html?id='.$QueueObj->id,
+ current_subtab => $current_subtab,
+ subtabs => $subtabs,
Title => $title &>
-<& /Admin/Elements/EditScrip, title => $title, %ARGS &>
+<& /Elements/ListActions, actions => \@results &>
+<& /Admin/Elements/EditScrip, title => $title, %ARGS, id => $id &>
+
<%init>
-my $QueueObj = new RT::Queue($session{'CurrentUser'});
-$QueueObj->Load($Queue);
+my $QueueObj = RT::Queue->new( $session{'CurrentUser'} );
+$QueueObj->Load( $Queue );
+unless( $QueueObj->id ) {
+ Abort(loc("Queue [_1] not found", $id));
+}
my ($title, $current_subtab);
-my $subtabs = {
- A => { title => loc('Select scrip'),
- path => "Admin/Queues/Scrips.html?id=".$QueueObj->id,
- },
- B => { title => loc('New scrip'),
- path => "Admin/Queues/Scrip.html?create=1&Queue=".$QueueObj->id,
- separator => 1,
- },
- };
+my $subtabs = {
+ A => {
+ title => loc('Select scrip'),
+ path => "Admin/Queues/Scrips.html?id=".$QueueObj->id,
+ },
+ B => {
+ title => loc('New scrip'),
+ path => "Admin/Queues/Scrip.html?create=1&Queue=".$QueueObj->id,
+ separator => 1,
+ },
+};
-unless($QueueObj->id) {
- Abort(loc("Queue [_1] not found",$id));
-}
-if ($id) {
- $current_subtab = "Admin/Queues/Scrip.html?id=".$id."&Queue=".$QueueObj->id;
+my $scrip = RT::Scrip->new( $session{'CurrentUser'} );
+($id, my @results) = $m->comp( '/Admin/Elements/EditScrip:Process', %ARGS );
+
+if ( $id ) {
+ $current_subtab = "Admin/Queues/Scrip.html?id=$id&Queue=". $QueueObj->id;
$title = loc("Modify a scrip for queue [_1]", $QueueObj->Name);
- $subtabs->{"C"} = { title => loc("Scrip #[_1]",$id),
- path => "Admin/Queues/Scrip.html?id=$id&Queue=".$QueueObj->id };
+ $subtabs->{"C"} = {
+ title => loc("Scrip #[_1]",$id),
+ path => "Admin/Queues/Scrip.html?id=$id&Queue=".$QueueObj->id
+ };
} else {
$current_subtab = "Admin/Queues/Scrip.html?create=1&Queue=".$QueueObj->id;
$title = loc("Create a scrip for queue [_1]", $QueueObj->Name);
}
-
+
</%init>
<%ARGS>
-$id => undef
+$id => undef
$Queue => undef
</%ARGS>
Modified: rt/branches/3.6-EXPERIMENTAL-LONDRES/html/NoAuth/js/ahah.js
==============================================================================
--- rt/branches/3.6-EXPERIMENTAL-LONDRES/html/NoAuth/js/ahah.js (original)
+++ rt/branches/3.6-EXPERIMENTAL-LONDRES/html/NoAuth/js/ahah.js Fri Dec 1 13:20:39 2006
@@ -48,7 +48,7 @@
*/
// Fetched from http://www.opendarwin.org/~drernie/src/ahah.js
function ahah(url, target, delay) {
- document.getElementById(target).innerHTML = 'Loading <a href="'+url+'">'+url +'</a>...';
+ // document.getElementById(target).innerHTML = 'Loading <a href="'+url+'">'+url +'</a>...';
if (window.XMLHttpRequest) {
req = new XMLHttpRequest();
} else if (window.ActiveXObject) {
Modified: rt/branches/3.6-EXPERIMENTAL-LONDRES/lib/RT/I18N/pl.po
==============================================================================
--- rt/branches/3.6-EXPERIMENTAL-LONDRES/lib/RT/I18N/pl.po (original)
+++ rt/branches/3.6-EXPERIMENTAL-LONDRES/lib/RT/I18N/pl.po Fri Dec 1 13:20:39 2006
@@ -216,12 +216,12 @@
#: lib/RT/Transaction_Overlay.pm:558
#. ($obj_type)
msgid "%1 created"
-msgstr "%1 crĂŠĂŠ(e)"
+msgstr ""
#: lib/RT/Transaction_Overlay.pm:563
#. ($obj_type)
msgid "%1 deleted"
-msgstr "%1 supprimĂŠ(e)"
+msgstr ""
#: html/Search/Chart:71
#. ($Query, $PrimaryGroupBy)
@@ -310,7 +310,7 @@
#: NOT FOUND IN SOURCE
msgid "%1 was created without a CurrentUser\\n"
-msgstr "%1 a ĂŠtĂŠ crĂŠĂŠ sans utilisateur courant\\n"
+msgstr ""
#: lib/RT/Action/ResolveMembers.pm:63
#. (ref $self)
@@ -404,7 +404,7 @@
#: NOT FOUND IN SOURCE
msgid "(No Value)"
-msgstr "(Non renseignĂŠ)"
+msgstr ""
#: html/Admin/Elements/EditCustomFields:74 html/Admin/Elements/ListGlobalCustomFields:53
msgid "(No custom fields)"
@@ -424,7 +424,7 @@
#: html/Admin/Elements/PickCustomFields:47 html/Admin/Elements/PickObjects:47
msgid "(None)"
-msgstr "(Aucun)"
+msgstr "(Brak)"
#: 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 receive future updates.)"
@@ -578,19 +578,19 @@
#: NOT FOUND IN SOURCE
msgid "ACE Deleted"
-msgstr "ACE SupprimĂŠ"
+msgstr ""
#: NOT FOUND IN SOURCE
msgid "ACE Loaded"
-msgstr "ACE ChargĂŠ"
+msgstr ""
#: NOT FOUND IN SOURCE
msgid "ACE could not be deleted"
-msgstr "l'ACE n'a pu ĂŞtre supprimĂŠ"
+msgstr ""
#: NOT FOUND IN SOURCE
msgid "ACE could not be found"
-msgstr "l'ACE n'a pu ĂŞtre trouvĂŠ"
+msgstr ""
#: lib/RT/ACE_Overlay.pm:175 lib/RT/Principal_Overlay.pm:219
msgid "ACE not found"
@@ -663,7 +663,7 @@
#: NOT FOUND IN SOURCE
msgid "Add Next State"
-msgstr "Ajouter ĂŠtape suivant"
+msgstr ""
#: html/Search/Bulk.html:84
msgid "Add Requestor"
@@ -675,7 +675,7 @@
#: NOT FOUND IN SOURCE
msgid "Add a keyword selection to this queue"
-msgstr "Ajouter une sĂŠlection de mots clĂŠ Ă cette queue"
+msgstr ""
#: NOT FOUND IN SOURCE
msgid "Add a new a global scrip"
@@ -877,11 +877,11 @@
#: html/Search/Elements/EditQuery:56
msgid "And/Or"
-msgstr ""
+msgstr "I/Lub"
#: html/Admin/CustomFields/Modify.html:73 html/Admin/Elements/CustomFieldTabs:83
msgid "Applies to"
-msgstr "S'applique Ă "
+msgstr "Zastosuj do: "
#: html/Search/Edit.html:64
msgid "Apply"
@@ -974,11 +974,11 @@
#: lib/RT/Queue_Overlay.pm:97
msgid "Assign and remove custom fields"
-msgstr "Fixer et supprimer les champs personnalisĂŠs"
+msgstr ""
#: lib/RT/Queue_Overlay.pm:97
msgid "AssignCustomFields"
-msgstr "FixerChampsPersonnalisĂŠs"
+msgstr ""
#: html/Search/Bulk.html:142 html/SelfService/Update.html:87 html/Ticket/ModifyAll.html:115 html/Ticket/Update.html:116
msgid "Attach"
@@ -1173,7 +1173,7 @@
#: html/Elements/Submit:78
msgid "Check All"
-msgstr "Tout vĂŠrifier"
+msgstr "Zaznacz wszystko"
#: html/SelfService/Update.html:78 html/Ticket/Create.html:133 html/Ticket/Update.html:97
msgid "Check box to delete"
@@ -1213,7 +1213,7 @@
#: html/Elements/Submit:80
msgid "Clear All"
-msgstr "Tout effacer"
+msgstr "Odznacz wszystko"
#: html/Helpers/CalPopup.html:6
msgid "Close window"
@@ -1341,7 +1341,7 @@
#: NOT FOUND IN SOURCE
msgid "Coould not create group"
-msgstr "Le groupe n'a pas pu ĂŞtre crĂŠĂŠ"
+msgstr ""
#: html/Search/Elements/EditSearches:64
msgid "Copy"
@@ -1369,7 +1369,7 @@
#: NOT FOUND IN SOURCE
msgid "Could not add new custom field value for ticket. %1 "
-msgstr "La valeur de champ personnalisĂŠ n'a pas pu ĂŞtre ajoutĂŠe. %1"
+msgstr ""
#: lib/RT/Record.pm:1707
msgid "Could not add new custom field value. "
@@ -1413,7 +1413,7 @@
#: NOT FOUND IN SOURCE
msgid "Could not create watcher for requestor"
-msgstr "L'observateur n'a pas pu ĂŞtre crĂŠe pour le demandeur"
+msgstr ""
#: NOT FOUND IN SOURCE
msgid "Could not find a ticket with id %1"
@@ -1437,7 +1437,7 @@
#: html/Admin/CustomFields/Objects.html:69
msgid "Could not load CustomField %1"
-msgstr "Impossible de charger le champ personnalisĂŠ %1"
+msgstr ""
#: html/Admin/Groups/Members.html:112 html/User/Groups/Members.html:111 html/User/Groups/Modify.html:103
msgid "Could not load group"
@@ -1506,7 +1506,7 @@
#: NOT FOUND IN SOURCE
msgid "Couldn't find that watcher"
-msgstr "L'observateur n'a pas pu ĂŞtre trouvĂŠ"
+msgstr ""
#: NOT FOUND IN SOURCE
msgid "Couldn't find user\\n"
@@ -1529,7 +1529,7 @@
#: NOT FOUND IN SOURCE
msgid "Couldn't load KeywordSelects."
-msgstr "KeywordSelects n'a pas pu ĂŞtre chargĂŠ"
+msgstr ""
#: NOT FOUND IN SOURCE
msgid "Couldn't load RT config file '%1' %2"
@@ -1694,11 +1694,11 @@
#: NOT FOUND IN SOURCE
msgid "Create failed: %1 / %2 / %3 "
-msgstr "Echec Ă la crĂŠation de: %1 / %2 / %3"
+msgstr ""
#: NOT FOUND IN SOURCE
msgid "Create failed: %1/%2/%3"
-msgstr "Echec Ă la crĂŠation de: %1/%2/%3"
+msgstr ""
#: etc/initialdata:137
msgid "Create new tickets based on this scrip's template"
@@ -1816,7 +1816,7 @@
#: html/Admin/CustomFields/index.html:60
#. ($lookup)
msgid "Custom Fields for %1"
-msgstr "Champs personnalisĂŠs pour %1"
+msgstr ""
#: html/Admin/Elements/EditScrip:123
msgid "Custom action cleanup code"
@@ -1836,7 +1836,7 @@
#: NOT FOUND IN SOURCE
msgid "Custom field %1 does not apply to this object"
-msgstr "Le champ personnalisĂŠ %1 ne s'applique pas Ă cet objet"
+msgstr ""
#: lib/RT/Tickets_Overlay.pm:2411
#. ($CF->Name)
@@ -1892,7 +1892,7 @@
#: NOT FOUND IN SOURCE
msgid "Data error"
-msgstr "Erreur de donnĂŠes"
+msgstr ""
#: html/SelfService/Display.html:61 html/Ticket/Create.html:202 html/Ticket/Elements/ShowSummary:81 html/Ticket/Elements/Tabs:116 html/Ticket/ModifyAll.html:65
msgid "Dates"
@@ -2009,11 +2009,11 @@
#: NOT FOUND IN SOURCE
msgid "Deleting this object would violate referential integrity."
-msgstr "Effacer cet objet violerait l'intĂŠgritĂŠ rĂŠfĂŠrentielle"
+msgstr ""
#: NOT FOUND IN SOURCE
msgid "Deleting this object would violate referential integrity. That's bad."
-msgstr "Effacer cet objet violerait l'intĂŠgritĂŠ rĂŠfĂŠrentielle, c'est serait facheux!"
+msgstr ""
#: html/Approvals/Elements/Approve:69
msgid "Deny"
@@ -2129,7 +2129,7 @@
#: html/Admin/Groups/index.html:61 html/Admin/Users/index.html:64
msgid "Download as a tab-delimited file"
-msgstr "TĂŠlĂŠcharger en tant que fichier dĂŠlimitĂŠ par tabulations"
+msgstr "Pobierz jako listę [dane każdego użytkownika/grupy w jednej linii, odzielone tabulatorem]"
#: html/Elements/SelectDateType:53 html/Ticket/Create.html:208 html/Ticket/Elements/EditDates:66 html/Ticket/Elements/Reminders:88 html/Ticket/Elements/ShowDates:64 lib/RT/Ticket_Overlay.pm:1150
msgid "Due"
@@ -2174,7 +2174,7 @@
#: html/Admin/Global/CustomFields/Queue-Tickets.html:9 html/Admin/Global/CustomFields/Queue-Transactions.html:9
msgid "Edit Custom Fields for tickets in all queues"
-msgstr ""
+msgstr "Edycja zdefiniowanych przez użytkownia pól dla zgłoszeń we wszystkich kolejkach"
#: html/Search/Bulk.html:188 html/Ticket/ModifyLinks.html:57
msgid "Edit Links"
@@ -2199,7 +2199,7 @@
#: NOT FOUND IN SOURCE
msgid "Edit keywords"
-msgstr "Modifier les mots clĂ"
+msgstr ""
#: lib/RT/Group_Overlay.pm:167
msgid "Edit saved searches for this group"
@@ -2349,7 +2349,7 @@
#: NOT FOUND IN SOURCE
msgid "Error adding watcher"
-msgstr "Erreur Ă l'ajout de l'observateur"
+msgstr ""
#: lib/RT/Queue_Overlay.pm:673
msgid "Error in parameters to Queue->AddWatcher"
@@ -2496,7 +2496,7 @@
#: html/Admin/Groups/index.html:72 html/Admin/Queues/People.html:82 html/Ticket/Elements/EditPeople:55
msgid "Find groups whose"
-msgstr "Trouver les groupes dont"
+msgstr "Wyszukaj grupy, których:"
#: NOT FOUND IN SOURCE
msgid "Find new/open tickets"
@@ -2590,11 +2590,11 @@
#: html/Admin/Elements/EditCustomFields:55
msgid "Global Custom Fields"
-msgstr "Champs personnalisĂŠs globaux"
+msgstr ""
#: NOT FOUND IN SOURCE
msgid "Global Keyword Selections"
-msgstr "Mots clĂŠ globaux"
+msgstr ""
#: NOT FOUND IN SOURCE
msgid "Global Scrips"
@@ -2651,7 +2651,7 @@
#: NOT FOUND IN SOURCE
msgid "Group could not be created."
-msgstr "Le groupe n'a pas pu ĂŞtre crĂŠĂŠ"
+msgstr ""
#: html/Admin/Groups/Modify.html:109
#. ($create_msg)
@@ -2688,11 +2688,11 @@
#: html/Admin/Groups/index.html:82
msgid "Groups matching search criteria"
-msgstr "Groupes correspondant au critère de recherche"
+msgstr ""
#: html/Ticket/Elements/ShowRequestor:77
msgid "Groups this user belongs to"
-msgstr "Cette utilisateur appartient aux groupes"
+msgstr ""
#: lib/RT/Interface/CLI.pm:94 lib/RT/Interface/CLI.pm:94
msgid "Hello!"
@@ -2838,7 +2838,7 @@
#: NOT FOUND IN SOURCE
msgid "Interest noted"
-msgstr "Votre intĂŠret est notĂŠ"
+msgstr ""
#: lib/RT/Ticket_Overlay.pm:3448
msgid "Internal Error"
@@ -3098,7 +3098,7 @@
#: lib/RT/CustomField_Overlay.pm:931
msgid "Lookup type mismatch"
-msgstr "Faire attention aux types diffĂŠrents"
+msgstr ""
#: html/Search/Bulk.html:82
msgid "Make Owner"
@@ -3146,7 +3146,7 @@
#: html/Admin/index.html:78
msgid "Manage custom fields and custom field values"
-msgstr "GĂŠrer les champs personnalisĂŠs et leur valeurs"
+msgstr "Administracja polami zdefiniowanymi przez użytkownika "
#: html/Admin/index.html:69
msgid "Manage groups and group membership"
@@ -3318,7 +3318,7 @@
#: html/Admin/Elements/ObjectCustomFields:98
#. (loc(lc($Types)))
msgid "Modify Custom Fields which apply to all %1"
-msgstr "Modifier les champs personnalisĂŠs qui s'appliquent Ă tous les %1"
+msgstr ""
#: NOT FOUND IN SOURCE
msgid "Modify Custom Fields which apply to all queues"
@@ -3346,7 +3346,7 @@
#: NOT FOUND IN SOURCE
msgid "Modify System ACLS"
-msgstr "Modifier ACLs système"
+msgstr ""
#: NOT FOUND IN SOURCE
msgid "Modify Template %1"
@@ -3381,11 +3381,11 @@
#: html/Admin/CustomFields/Objects.html:90
#. ($CF->Name)
msgid "Modify associated objects for %1"
-msgstr "Modifier les objets associĂŠs Ă %1"
+msgstr ""
#: NOT FOUND IN SOURCE
msgid "Modify dates for # %1"
-msgstr "Modifier les dates pur n°%1"
+msgstr ""
#: html/Ticket/ModifyDates.html:46 html/Ticket/ModifyDates.html:50
#. ($TicketObj->Id)
@@ -3399,7 +3399,7 @@
#: html/Admin/Elements/GlobalCustomFieldTabs:65 html/Admin/Global/index.html:72
msgid "Modify global custom fields"
-msgstr ""
+msgstr "Modyfikuj globalne pola definiowane przez użytkownika"
#: html/Admin/Elements/GlobalCustomFieldTabs:70 html/Admin/Global/GroupRights.html:46 html/Admin/Global/GroupRights.html:49 html/Admin/Global/index.html:77
msgid "Modify global group rights"
@@ -3517,7 +3517,7 @@
#: html/Admin/CustomFields/UserRights.html:157
#. ($CustomFieldObj->Name)
msgid "Modify user rights for custom field %1"
-msgstr "Modifier les droits utilisateurs pour le champ personnalisĂŠ %1"
+msgstr ""
#: html/Admin/Groups/UserRights.html:46 html/Admin/Groups/UserRights.html:50 html/Admin/Groups/UserRights.html:56
#. ($GroupObj->Name)
@@ -3576,7 +3576,7 @@
#: NOT FOUND IN SOURCE
msgid "Move"
-msgstr "DĂŠplacer"
+msgstr ""
#: html/Admin/Elements/PickCustomFields:83
msgid "Move down"
@@ -3830,7 +3830,7 @@
#: html/Admin/Groups/index.html:52
msgid "No groups matching search criteria found."
-msgstr "Aucun groupe trouvÊ d'après le critère de recherche."
+msgstr ""
#: lib/RT/Ticket_Overlay.pm:2359
msgid "No message attached"
@@ -3903,7 +3903,7 @@
#: NOT FOUND IN SOURCE
msgid "No user or email address specified"
-msgstr "Aucun utilisateur ou adresse email spĂŠcifiĂŠ"
+msgstr ""
#: html/Admin/Users/index.html:55
msgid "No users matching search criteria found."
@@ -4053,7 +4053,7 @@
#. ($ObjectType)
#. ($LookupType)
msgid "Object of type %1 cannot take custom fields"
-msgstr "Les objets de type %1 ne peuvent avoir de champs personnalisĂŠs"
+msgstr ""
#: lib/RT/CustomField_Overlay.pm:966
msgid "Object type mismatch"
@@ -4193,7 +4193,6 @@
#: lib/RT/Transaction_Overlay.pm:609
msgid "Outgoing email about a comment recorded"
-msgstr "Mail sortant suite Ă l'enregistrement d'un commentaire"
msgstr "Zarejestrowano wychodzącą wiadomość o komentarzu"
#: lib/RT/Transaction_Overlay.pm:613
@@ -4430,7 +4429,7 @@
#: NOT FOUND IN SOURCE
msgid "Queue Keyword Selections"
-msgstr "SĂŠlection des mots clĂŠ de queue"
+msgstr ""
#: html/Admin/Queues/Modify.html:64
msgid "Queue Name"
@@ -4539,7 +4538,7 @@
#: NOT FOUND IN SOURCE
msgid "RT Recieved mail (%1) from itself."
-msgstr "RT a reçu du courrier (%1) de lui même"
+msgstr ""
#: NOT FOUND IN SOURCE
msgid "RT Self Service"
@@ -4547,7 +4546,7 @@
#: NOT FOUND IN SOURCE
msgid "RT Self Service / Closed Tickets"
-msgstr "RT Self Service / Tickets rĂŠsolus"
+msgstr ""
#: html/Admin/Tools/Configuration.html:73
msgid "RT Variables"
@@ -4604,7 +4603,7 @@
#: NOT FOUND IN SOURCE
msgid "RT is © Copyright 1996-2002 Jesse Vincent <jesse at bestpractical.com>. It is distributed under <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 of the GNU General Public License.</a>"
-msgstr "RT est © Copyright 1996-2002 Jesse Vincent <jesse at bestpractical.com>. DistribuĂŠ sous <a href=\"http://www.gnu.org/copyleft/gpl.html\">Version 2 de la licence gĂŠnĂŠrale GNU.</a>"
+msgstr ""
#: NOT FOUND IN SOURCE
msgid "RT thinks this message may be a bounce"
@@ -5014,7 +5013,7 @@
#: NOT FOUND IN SOURCE
msgid "Searches can't be associated with that kind of object"
-msgstr "Les recherches ne peuvent ĂŞtre associĂŠes Ă ce type d'objet"
+msgstr ""
#: html/Search/Simple.html:59
msgid "Searching the full text of every ticket can take a long time, but if you need to do it, you can search for any word in full ticket history for any word by typing <b>fulltext:<i>word</i></b>."
@@ -5031,7 +5030,7 @@
#: lib/RT/CustomField_Overlay.pm:105
msgid "See custom fields"
-msgstr "Voir les champs personnalisĂŠs"
+msgstr ""
#: lib/RT/Queue_Overlay.pm:107
msgid "See exact outgoing email messages and their recipeients"
@@ -5111,7 +5110,7 @@
#: html/Admin/Global/CustomFields/index.html:83
msgid "Select custom fields for transactions on tickets in all queues"
-msgstr ""
+msgstr "Wybór pól zdefiniowanych przez użytkownika dla zgłoszeń we wszystkich kolejkach"
#: html/Admin/Elements/GroupTabs:75 html/User/Elements/GroupTabs:71
msgid "Select group"
@@ -5159,11 +5158,11 @@
#: html/Admin/Elements/EditCustomFields:58
msgid "Selected Custom Fields"
-msgstr "Champs personnalisĂŠs sĂŠlectionnĂŠs"
+msgstr "Zaznaczone pola"
#: html/Admin/CustomFields/Objects.html:59
msgid "Selected objects"
-msgstr "Objets sĂŠlectionnĂŠs"
+msgstr ""
#: html/Widgets/SelectionBox:210
msgid "Selections modified. Please save your changes"
@@ -5505,11 +5504,11 @@
#: NOT FOUND IN SOURCE
msgid "System Error. Right not granted."
-msgstr "Erreur Système. Droit non dÊlÊguÊ."
+msgstr ""
#: NOT FOUND IN SOURCE
msgid "System Error. right not granted"
-msgstr "Erreur Système. Droit non dÊlÊguÊ"
+msgstr ""
#: lib/RT/Transaction_Overlay.pm:215 lib/RT/Transaction_Overlay.pm:221
#. ($msg)
@@ -5530,7 +5529,7 @@
#: NOT FOUND IN SOURCE
msgid "System error. Unable to grant rights."
-msgstr "Erreur Système. Imposible de dÊlÊguer les droits"
+msgstr ""
#: html/Admin/CustomFields/GroupRights.html:58 html/Admin/Global/GroupRights.html:56 html/Admin/Groups/GroupRights.html:58 html/Admin/Queues/GroupRights.html:57
msgid "System groups"
@@ -5562,7 +5561,7 @@
#: NOT FOUND IN SOURCE
msgid "Task"
-msgstr "Tâche"
+msgstr ""
#: html/Admin/Elements/EditScrip:79 html/Tools/Offline.html:78
msgid "Template"
@@ -5730,7 +5729,7 @@
#: lib/RT/CustomField_Overlay.pm:977
msgid "This custom field does not apply to that object"
-msgstr "Ce champ personnalisĂŠ ne s'applique pas Ă cet objet"
+msgstr ""
#: html/Admin/Tools/Configuration.html:50
msgid "This feature is only available to system administrators"
@@ -5806,7 +5805,7 @@
#: html/Admin/Elements/QueueTabs:74
msgid "Ticket Custom Fields"
-msgstr "Champs personnalisĂŠs du ticket"
+msgstr ""
#: html/Ticket/History.html:46 html/Ticket/History.html:49
#. ($Ticket->Id, $Ticket->Subject)
@@ -5823,7 +5822,7 @@
#: html/Admin/Elements/GlobalCustomFieldTabs:69 html/Admin/Global/CustomFields/index.html:81 lib/RT/CustomField_Overlay.pm:1205
msgid "Ticket Transactions"
-msgstr "Transactions du ticket"
+msgstr ""
#: NOT FOUND IN SOURCE
msgid "Ticket attachment"
@@ -5859,7 +5858,7 @@
#: NOT FOUND IN SOURCE
msgid "Ticket killed"
-msgstr "Ticket effacĂŠ"
+msgstr ""
#: html/Ticket/Display.html:55
msgid "Ticket metadata"
@@ -5994,7 +5993,7 @@
#: html/Admin/Elements/QueueTabs:78
msgid "Transaction Custom Fields"
-msgstr "Champs personnalisĂŠes de la transaction"
+msgstr ""
#: NOT FOUND IN SOURCE
msgid "Transaction->Create couldn't, as you didn't specify a ticket id"
@@ -6002,7 +6001,7 @@
#: lib/RT/Transaction_Overlay.pm:125
msgid "Transaction->Create couldn't, as you didn't specify an object type and id"
-msgstr "Transation->Create a ĂŠchouĂŠ car vous n'avez pas spĂŠcifiĂŠ de type d'objet et d'id"
+msgstr ""
#: lib/RT/Transaction_Overlay.pm:857
msgid "Transactions are immutable"
@@ -6060,11 +6059,11 @@
#: html/Admin/Elements/EditCustomFields:60
msgid "Unselected Custom Fields"
-msgstr "Champs personnalisĂŠs non sĂŠlectionnĂŠs"
+msgstr "Niezaznaczone Pola"
#: html/Admin/CustomFields/Objects.html:61
msgid "Unselected objects"
-msgstr "Objets non sĂŠlectionnĂŠs"
+msgstr ""
#: lib/RT/Transaction_Overlay.pm:646
msgid "Untaken"
@@ -6232,7 +6231,7 @@
#: lib/RT/Interface/Web.pm:1284
#. ($CustomFieldObj->Name, $class, $Object->id)
msgid "User asked for an unknown update type for custom field %1 for %2 object #%3"
-msgstr "L'utilisateur a demandĂŠ un type de mise Ă jour non connu pour le champ personnalisĂŠ %1 de l'objet %2Â%3"
+msgstr ""
#: html/Admin/Users/Modify.html:290
#. ($msg)
@@ -6261,7 +6260,7 @@
#: html/Admin/Groups/index.html:99
msgid "User-defined groups"
-msgstr "Groupe dĂŠfinis par l'utilisateur"
+msgstr "Grupy zdefiniowane przez użytkownika"
#: html/Admin/Users/Modify.html:69 html/Elements/Login:90 html/Ticket/Elements/AddWatchers:56
msgid "Username"
@@ -6301,7 +6300,7 @@
#: NOT FOUND IN SOURCE
msgid "Watcher loaded"
-msgstr "Observateur chargĂŠ"
+msgstr ""
#: html/Admin/Elements/QueueTabs:63
msgid "Watchers"
@@ -6531,7 +6530,7 @@
#: NOT FOUND IN SOURCE
msgid "dead"
-msgstr "effacĂŠ"
+msgstr ""
#: NOT FOUND IN SOURCE
msgid "delete"
Modified: rt/branches/3.6-EXPERIMENTAL-LONDRES/lib/RT/I18N/ru.po
==============================================================================
--- rt/branches/3.6-EXPERIMENTAL-LONDRES/lib/RT/I18N/ru.po (original)
+++ rt/branches/3.6-EXPERIMENTAL-LONDRES/lib/RT/I18N/ru.po Fri Dec 1 13:20:39 2006
@@ -1,16 +1,18 @@
# translation of Request Tracker en.po to Russian
-# Andrew Kornilov <hiddenman at tpway.com>, 2004, 2005.
+# Andrew Kornilov <akornilov at gmail.com>, 2004, 2005, 2006.
#
#
msgid ""
msgstr ""
-"Last-Translator: Andrew Kornilov <hiddenman at tpway.com>\n"
-"PO-Revision-Date: 2005-09-25 22:16+0300\n"
+"Project-Id-Version: RT 3.6.x\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: (null)\n"
+"PO-Revision-Date: 2006-06-24 19:52+0300\n"
+"Last-Translator: Andrew Kornilov <akornilov at gmail.com>\n"
"Language-Team: rt-devel <rt-devel at lists.fsck.com>\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Project-Id-Version: RT 3.5.x\n"
"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit"
#: NOT FOUND IN SOURCE
msgid "#"
@@ -89,7 +91,7 @@
#: html/Ticket/Elements/ShowAttachments:72
#. ($rev->CreatedAsString, $size, $rev->CreatorObj->Name)
msgid "%1 (%2) by %3"
-msgstr ""
+msgstr "%1 (%2) от %3"
#: html/SelfService/Update.html:60 html/Ticket/Elements/EditBasics:104 html/Ticket/Update.html:61 html/Ticket/Update.html:63 html/Tools/MyDay.html:65
#. (loc($DefaultStatus))
@@ -207,7 +209,7 @@
#: html/Search/Chart:71
#. ($Query, $PrimaryGroupBy)
msgid "%1 grouped by %2"
-msgstr ""
+msgstr "%1 сгрупированные по %2"
#: etc/initialdata:593
msgid "%1 highest priority tickets I own"
@@ -300,7 +302,7 @@
#: lib/RT/CustomField_Overlay.pm:894
msgid "%1's %2's %3 objects"
-msgstr ""
+msgstr "%1 %2 %3 объектов"
#: html/Search/Elements/SearchPrivacy:52 html/Search/Elements/SelectSearchObject:55 html/Search/Elements/SelectSearchesForObjects:56
#. ($object->Name)
@@ -371,13 +373,13 @@
#: NOT FOUND IN SOURCE
msgid "(If left blank, will default to %1"
-msgstr "(Если пустое, то по-умолчанию равно %1"
+msgstr "(Если не заполнено, то по умолчанию равно %1"
#: html/Admin/Queues/Modify.html:75 html/Admin/Queues/Modify.html:81
#. ($RT::CorrespondAddress)
#. ($RT::CommentAddress)
msgid "(If left blank, will default to %1)"
-msgstr ""
+msgstr "(Если не заполнено, то по умолчанию равно %1)"
#: NOT FOUND IN SOURCE
msgid "(No Value)"
@@ -405,43 +407,43 @@
#: 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 receive future updates.)"
-msgstr "(Отправить скрытую копию сообщения об этом обновлении на эти адреса [разделяются запятой]. Список получателей, которые в дальнейшем будут получать скрытые копии сообщения об обновлениях, <b>не</b> будет изменен.)"
+msgstr "(Отправить скрытую копию сообщения об этом изменении на эти адреса [разделяются запятой]. Список получателей, которые в дальнейшем будут получать скрытые копии сообщения об изменениях, <b>не</b> будет изменен.)"
#: NOT FOUND IN SOURCE
msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
-msgstr "(Отправить скрытую копию сообщения об этом обновлении на эти адреса [разделяются запятой]. Список получателей, которые в дальнейшем будут получать скрытые копии сообщения об обновлениях, <b>не</b> будет изменен.)"
+msgstr "(Отправить скрытую копию сообщения об этом изменении на эти адреса [разделяются запятой]. Список получателей, которые в дальнейшем будут получать скрытые копии сообщения об изменениях, <b>не</b> будет изменен.)"
#: html/Ticket/Update.html:90
msgid "(Sends a blind carbon-copy of this update to a comma-delimited list of email addresses. Does <strong>not</strong> change who will receive future updates.)"
-msgstr ""
+msgstr "(Отправить скрытую копию сообщения об этом изменении на эти адреса [разделяются запятой]. Список получателей, которые в дальнейшем будут получать скрытые копии сообщения об изменениях, <b>не</b> будет изменен.)"
#: NOT FOUND IN SOURCE
msgid "(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <b>will</b> receive future updates.)"
-msgstr "(Отправить копию сообщения об этом обновлении на эти адреса [разделяются запятой]. Эти получатели в дальнейшем <b>будут</b> получать копии сообщения об обновлениях.)"
+msgstr "(Отправить копию сообщения об этом изменении на эти адреса [разделяются запятой]. Эти получатели в дальнейшем <b>будут</b> получать копии сообщения об изменениях.)"
#: html/Ticket/Create.html:102
msgid "(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <strong>will</strong> receive future updates.)"
-msgstr ""
+msgstr "(Отправить копию сообщения об этом изменении на эти адреса [разделяются запятой]. Эти получатели в дальнейшем <b>будут</b> получать копии сообщения об изменениях.)"
#: NOT FOUND IN SOURCE
msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will receive future updates.)"
-msgstr "(Отправить копию сообщения об этом обновлении на эти адреса [разделяются запятой]. Список получателей, которые в дальнейшем будут получать копии сообщения об обновлениях, <b>не</b> будет изменен.)"
+msgstr "(Отправить копию сообщения об этом изменении на эти адреса [разделяются запятой]. Список получателей, которые в дальнейшем будут получать копии сообщения об изменениях, <b>не</b> будет изменен.)"
#: NOT FOUND IN SOURCE
msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <b>not</b> change who will recieve future updates.)"
-msgstr "(Отправить копию сообщения об этом обновлении на эти адреса [разделяются запятой]. Список получателей, которые в дальнейшем будут получать копии сообщения об обновлениях, <b>не</b> будет изменен.)"
+msgstr "(Отправить копию сообщения об этом изменении на эти адреса [разделяются запятой]. Список получателей, которые в дальнейшем будут получать копии сообщения об изменении, <b>не</b> будет изменен.)"
#: html/Ticket/Update.html:86
msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. Does <strong>not</strong> change who will receive future updates.)"
-msgstr ""
+msgstr "(Отправить копию сообщения об этом изменении на эти адреса [разделяются запятой]. Список получателей, которые в дальнейшем будут получать копии сообщения об изменениях, <b>не</b> будет изменен.)"
#: NOT FOUND IN SOURCE
msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <b>will</b> receive future updates.)"
-msgstr "(Отправить копию сообщения об этом обновлении на эти адреса [разделяются запятой]. Эти получатели в дальнейшем <b>будут</b> получать копии сообщения об обновлениях.)"
+msgstr "(Отправить копию сообщения об этом изменении на эти адреса [разделяются запятой]. Эти получатели в дальнейшем <b>будут</b> получать копии сообщения об изменениях.)"
#: html/Ticket/Create.html:92
msgid "(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <strong>will</strong> receive future updates.)"
-msgstr ""
+msgstr "(Отправить копию сообщения об этом изменении на эти адреса [разделяются запятой]. Эти получатели в дальнейшем <b>будут</b> получать копии сообщения об изменениях.)"
#: html/Admin/Elements/EditScrip:102
msgid "(Use these fields when you choose 'User Defined' for a condition or action)"
@@ -505,7 +507,7 @@
#: html/Ticket/Elements/Reminders:88
msgid "(yyyy/mm/dd)"
-msgstr ""
+msgstr "(гггг/мм/дд)"
#: html/Elements/EditCustomFieldSelect:58
msgid "-"
@@ -538,7 +540,7 @@
#: html/Elements/CreateTicket:47
#. ($m->scomp('/Elements/SelectNewTicketQueue'))
msgid "<input type=\"submit\" class=\"button\" value=\"New ticket in\" /> %1"
-msgstr ""
+msgstr "<input type=\"submit\" class=\"button\" value=\"Создать заявку в\" /> %1"
#: docs/design_docs/string-extraction-guide.txt:54 lib/RT/StyleGuide.pod:787
#. ($m->scomp('/Elements/SelectNewTicketQueue'))
@@ -551,7 +553,7 @@
#: html/Admin/Users/Modify.html:360
msgid "A password was not set, so user won't be able to login."
-msgstr ""
+msgstr "Пароль не был установлен, поэтому пользователь не сможет зайти в систему."
#: NOT FOUND IN SOURCE
msgid "ACE could not be deleted"
@@ -579,7 +581,7 @@
#: html/User/Elements/Tabs:53
msgid "About me"
-msgstr "Обо мне"
+msgstr "Личные настройки"
#: html/Admin/Users/Modify.html:106
msgid "Access control"
@@ -596,11 +598,11 @@
#: NOT FOUND IN SOURCE
msgid "Action committed."
-msgstr "Действие принято."
+msgstr "Действие зафиксировано."
#: bin/rt-crontool:148
msgid "Action committed.\\n"
-msgstr ""
+msgstr "Действие зафиксировано.\\n"
#: bin/rt-crontool:144
msgid "Action prepared..."
@@ -668,7 +670,7 @@
#: html/Search/Build.html:109 html/Search/Build.html:94
msgid "Add and Search"
-msgstr ""
+msgstr "Добавить и начать поиск"
#: html/Search/Bulk.html:124
msgid "Add comments or replies to selected tickets"
@@ -684,11 +686,11 @@
#: html/Search/Build.html:85
msgid "Add these terms to your search"
-msgstr ""
+msgstr "Добавить эти условия в ваш запрос"
#: html/Search/Bulk.html:158
msgid "Add values"
-msgstr ""
+msgstr "Добавить значения"
# Manual merge by Andrew Kornilov <andy at eva.dp.ua>
#: lib/RT/CustomField_Overlay.pm:108
@@ -823,7 +825,7 @@
#: html/Search/Elements/PickCriteria:52
msgid "Aggregator"
-msgstr ""
+msgstr "Агрегатор"
#: NOT FOUND IN SOURCE
msgid "Alias"
@@ -920,7 +922,7 @@
#: html/Search/Elements/DisplayOptions:81
msgid "Asc"
-msgstr ""
+msgstr "По позрастанию"
#: html/Elements/SelectSortOrder:56
msgid "Ascending"
@@ -993,7 +995,7 @@
#: html/Widgets/SelectionBox:186
msgid "Available"
-msgstr ""
+msgstr "Доступно"
#: NOT FOUND IN SOURCE
msgid "Available Columns"
@@ -1065,11 +1067,11 @@
#: html/Ticket/Elements/Tabs:220
msgid "Bulk Update"
-msgstr ""
+msgstr "Множественное изменение"
#: NOT FOUND IN SOURCE
msgid "Bulk ticket update"
-msgstr "Множественное обновление заявки"
+msgstr "Множественное изменение заявки"
#: lib/RT/User_Overlay.pm:1790
msgid "Can not modify system users"
@@ -1115,7 +1117,7 @@
#: html/Admin/Elements/AddCustomFieldValue:62 html/Admin/Elements/EditCustomFieldValues:58
msgid "Category"
-msgstr ""
+msgstr "Категория"
#: etc/initialdata:50 html/Admin/Queues/People.html:65 html/SelfService/Create.html:71 html/Ticket/Create.html:87 html/Ticket/Elements/EditPeople:72 html/Ticket/Elements/ShowPeople:56 html/Ticket/Update.html:83 lib/RT/ACE_Overlay.pm:113
msgid "Cc"
@@ -1143,7 +1145,7 @@
#: html/NoAuth/js/util.js:157
msgid "Choose a date"
-msgstr ""
+msgstr "Выберите дату"
#: html/Admin/Users/Modify.html:156 html/User/Prefs.html:141
msgid "City"
@@ -1155,7 +1157,7 @@
#: html/Helpers/CalPopup.html:6
msgid "Close window"
-msgstr ""
+msgstr "Закрыть окно"
#: html/Ticket/Elements/ShowDates:68
msgid "Closed"
@@ -1179,15 +1181,15 @@
#: lib/RT/CustomField_Overlay.pm:89
msgid "Combobox: Select or enter multiple values"
-msgstr ""
+msgstr "Комбинированный список: Выберите или введите несколько значений"
#: lib/RT/CustomField_Overlay.pm:90
msgid "Combobox: Select or enter one value"
-msgstr ""
+msgstr "Комбинированный список: Выберите или введите одно значение"
#: lib/RT/CustomField_Overlay.pm:91
msgid "Combobox: Select or enter up to %1 values"
-msgstr ""
+msgstr "Комбинированный список: Выберите или введите до %1 значений"
#: NOT FOUND IN SOURCE
msgid "Command not understood!\\n"
@@ -1521,12 +1523,12 @@
#: lib/RT/Ticket_Overlay.pm:2590
#. ($args{'Base'})
msgid "Couldn't resolve base '%1' into a URI."
-msgstr ""
+msgstr "Невозможно преобразовать базу '%1' в URI."
#: lib/RT/Ticket_Overlay.pm:2589
#. ($args{'Target'})
msgid "Couldn't resolve target '%1' into a URI."
-msgstr ""
+msgstr "Невозможно преобразовать цель '%1' в URI."
#: html/Admin/Users/Modify.html:173 html/User/Prefs.html:153
msgid "Country"
@@ -1685,7 +1687,7 @@
#: html/Tools/Reports/Elements/Tabs:63
msgid "Created in a date range"
-msgstr ""
+msgstr "Создано за промежуток времени"
#: NOT FOUND IN SOURCE
msgid "Created template %1"
@@ -1693,7 +1695,7 @@
#: html/Tools/Reports/CreatedByDates.html:7
msgid "Created tickets in period, grouped by status"
-msgstr ""
+msgstr "Создано заявок за период, с группировкой по статусу"
#: html/Search/Elements/PickBasics:102
msgid "Creator"
@@ -1721,7 +1723,7 @@
#: html/Search/Elements/EditQuery:47
msgid "Current search"
-msgstr ""
+msgstr "Текущий запрос"
#: NOT FOUND IN SOURCE
msgid "Current search criteria"
@@ -1814,7 +1816,7 @@
#: html/Prefs/MyRT.html:70 html/Prefs/Quicksearch.html:70 html/Prefs/Search.html:75
msgid "Customize"
-msgstr ""
+msgstr "Настроить"
#: NOT FOUND IN SOURCE
msgid "Data error"
@@ -1851,6 +1853,7 @@
#: etc/initialdata:296
msgid "Default admin comment template"
msgstr "Шаблон административного комментария по умолчанию"
+""
#: etc/initialdata:275
msgid "Default admin correspondence template"
@@ -1907,7 +1910,7 @@
#: html/Search/Bulk.html:159
msgid "Delete values"
-msgstr ""
+msgstr "Удалить значения"
#: lib/RT/Queue_Overlay.pm:115
msgid "DeleteTicket"
@@ -1979,7 +1982,7 @@
#: html/Search/Elements/DisplayOptions:86
msgid "Desc"
-msgstr ""
+msgstr "По убыванию"
#: html/Elements/SelectSortOrder:56
msgid "Descending"
@@ -2079,7 +2082,7 @@
#: html/Search/Bulk.html:149
msgid "Edit Custom Fields"
-msgstr ""
+msgstr "Редактировать Дополнительные Поля"
#: html/Admin/Elements/ObjectCustomFields:92 html/Admin/Queues/CustomFields.html:64 html/Admin/Users/CustomFields.html:64
#. ($Object->Name)
@@ -2112,7 +2115,7 @@
#: html/Ticket/Elements/Tabs:207
msgid "Edit Search"
-msgstr ""
+msgstr "Редактировать запрос"
#: html/Admin/Queues/Templates.html:63
#. ($QueueObj->Name)
@@ -2365,7 +2368,7 @@
#: html/Admin/CustomFields/Modify.html:107 html/Admin/CustomFields/Modify.html:118
msgid "Fill in this field with a URL."
-msgstr ""
+msgstr "Введите в этом поле URL."
#: lib/RT/CustomField_Overlay.pm:71
msgid "Fill in up to %1 text areas"
@@ -2389,11 +2392,11 @@
#: NOT FOUND IN SOURCE
msgid "Find group whose"
-msgstr "Найти группы, которые"
+msgstr "Найти группы, у которых"
#: html/Admin/Groups/index.html:72 html/Admin/Queues/People.html:82 html/Ticket/Elements/EditPeople:55
msgid "Find groups whose"
-msgstr "Найти группы, которые"
+msgstr "Найти группы, у которых"
#: NOT FOUND IN SOURCE
msgid "Find new/open tickets"
@@ -2604,7 +2607,7 @@
#: html/Elements/SelectTimeUnits:48
msgid "Hours"
-msgstr ""
+msgstr "Часов"
#: lib/RT/Base.pm:119
#. (6)
@@ -2677,7 +2680,7 @@
#: html/Admin/CustomFields/Modify.html:113
msgid "Include page"
-msgstr "Незавершенный запрос"
+msgstr "Вставить страницу"
#: html/Search/Build.html:426
msgid "Incomplete Query"
@@ -2703,7 +2706,7 @@
#. ($self->FriendlyPattern)
#. ($CF->FriendlyPattern)
msgid "Input must match %1"
-msgstr ""
+msgstr "Ввод должен соответствовать %1"
#: lib/RT/Ticket_Overlay.pm:3448
msgid "Internal Error"
@@ -2737,7 +2740,7 @@
#: lib/RT/CustomField_Overlay.pm:207 lib/RT/CustomField_Overlay.pm:677
#. ($msg)
msgid "Invalid pattern: %1"
-msgstr ""
+msgstr "Недопустимый образец: %1"
#: lib/RT/Scrip_Overlay.pm:158 lib/RT/Template_Overlay.pm:244
msgid "Invalid queue"
@@ -2850,15 +2853,15 @@
#: html/Elements/SelectDateType:51
msgid "Last Updated"
-msgstr "Последнее обновление"
+msgstr "Последнее изменение"
#: NOT FOUND IN SOURCE
msgid "LastUpdated"
-msgstr "Последнее обновление"
+msgstr "Последнее изменение"
#: html/Search/Elements/PickBasics:103
msgid "LastUpdatedBy"
-msgstr "Последний раз обновлено"
+msgstr "Последний раз изменено"
#: html/Ticket/Elements/ShowBasics:68
msgid "Left"
@@ -2917,7 +2920,7 @@
#: html/Admin/CustomFields/Modify.html:102
msgid "Link values to"
-msgstr ""
+msgstr "Связать значения с"
#: html/Ticket/Create.html:215 html/Ticket/Elements/ShowSummary:87 html/Ticket/Elements/Tabs:120 html/Ticket/ModifyAll.html:78
msgid "Links"
@@ -3149,7 +3152,7 @@
#: html/Elements/SelectTimeUnits:47
msgid "Minutes"
-msgstr "Несовпадающие скобки"
+msgstr "Минут"
#: html/Search/Build.html:430
msgid "Mismatched parentheses"
@@ -3550,7 +3553,7 @@
#: html/Ticket/Elements/Reminders:73
msgid "New reminder:"
-msgstr ""
+msgstr "Новое напоминание:"
#: NOT FOUND IN SOURCE
msgid "New request"
@@ -3720,7 +3723,7 @@
#: html/SelfService/Update.html:117
msgid "No permission to view update ticket"
-msgstr "Нет прав для просмотра обновлений этой заявки"
+msgstr "Нет прав для просмотра изменений этой заявки"
#: lib/RT/Queue_Overlay.pm:796 lib/RT/Ticket_Overlay.pm:1460
msgid "No principal specified"
@@ -3900,7 +3903,7 @@
#: lib/RT/Record.pm:124
msgid "Object could not be deleted"
-msgstr "Объект не может быть удален"
+msgstr "Невозможно удалить объект"
#: lib/RT/Record.pm:342
msgid "Object created"
@@ -3947,7 +3950,7 @@
#: lib/RT/Transaction_Overlay.pm:313
#. ($self->CreatedAsString(), $self->CreatorObj->Name())
msgid "On %1, %2 wrote:"
-msgstr ""
+msgstr "%1, %2 писал:"
#: etc/initialdata:163
msgid "On Comment"
@@ -3997,7 +4000,7 @@
#: html/Admin/CustomFields/index.html:75
msgid "Only show custom fields for:"
-msgstr ""
+msgstr "Показывать дополнительные поля только для:"
#: NOT FOUND IN SOURCE
msgid "Open"
@@ -4009,11 +4012,11 @@
#: NOT FOUND IN SOURCE
msgid "Open requests"
-msgstr "Открыть запросы"
+msgstr "Открытые запросы"
#: html/SelfService/Elements/Tabs:75
msgid "Open tickets"
-msgstr "Открыть заявки"
+msgstr "Открытые заявки"
#: NOT FOUND IN SOURCE
msgid "Open tickets (from listing) in a new window"
@@ -4029,7 +4032,7 @@
#: html/Prefs/MyRT.html:62
msgid "Options"
-msgstr ""
+msgstr "Параметры"
#: html/Search/Elements/DisplayOptions:59
msgid "Order by"
@@ -4133,7 +4136,7 @@
#: lib/RT/User_Overlay.pm:1045
msgid "Password set"
-msgstr ""
+msgstr "Пароль установлен"
#: NOT FOUND IN SOURCE
msgid "Password too short"
@@ -4146,7 +4149,7 @@
#: lib/RT/User_Overlay.pm:1031
msgid "Password: Permission Denied"
-msgstr ""
+msgstr "Пароль: доступ запрещен"
#: html/Admin/Users/Modify.html:353
msgid "Passwords do not match."
@@ -4174,11 +4177,11 @@
#: lib/RT/Template_Overlay.pm:238 lib/RT/Template_Overlay.pm:247
msgid "Permission denied"
-msgstr ""
+msgstr "Доступ запрещен"
#: lib/RT/Template_Overlay.pm:372
msgid "Permissions denied"
-msgstr ""
+msgstr "Доступы запрещены"
#: html/User/Elements/Tabs:56
msgid "Personal Groups"
@@ -4326,11 +4329,11 @@
#: html/Elements/MyAdminQueues:46
msgid "Queues I administer"
-msgstr ""
+msgstr "Очереди, которыми вы управляете"
#: html/Elements/MySupportQueues:46
msgid "Queues I'm an AdminCc for"
-msgstr ""
+msgstr "Очереди, для которых вы являетесь Административной Копией"
#: html/Elements/Quicksearch:47 html/Prefs/Elements/Tabs:58 html/Prefs/Quicksearch.html:70
msgid "Quick search"
@@ -4411,11 +4414,11 @@
#: html/Admin/CustomFields/Modify.html:117
msgid "RT can include content from another web service when showing this custom field."
-msgstr ""
+msgstr "RT может добавлять содержимое другого ресурса сети, когда отображает это дополнительное поле."
#: html/Admin/CustomFields/Modify.html:106
msgid "RT can make this custom field's values into hyperlinks to another service."
-msgstr ""
+msgstr "RT может преобразовывать значения этого дополнительного поля в гиперссылки на другой сервис."
#: NOT FOUND IN SOURCE
msgid "RT couldn't authenticate you"
@@ -4468,7 +4471,7 @@
#: html/Search/Simple.html:60
msgid "RT will look for anything else you enter in ticket subjects."
-msgstr ""
+msgstr "Всё остальное, что вы введёте, RT будет искать в темах заявок."
#: NOT FOUND IN SOURCE
msgid "RT will process this message as if it were unsigned.\\n"
@@ -4476,7 +4479,7 @@
#: html/Admin/CustomFields/Modify.html:108 html/Admin/CustomFields/Modify.html:119
msgid "RT will replace <tt>__id__</tt> and <tt>__CustomField__</tt> with the record id and custom field value, respectively"
-msgstr ""
+msgstr "RT заменит <tt>__id__</tt> и <tt>__CustomField__</tt> идентификатором записи и значением дополнительного поля соответственно"
#: 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."
@@ -4542,31 +4545,31 @@
#: lib/RT/Transaction_Overlay.pm:798
#. ($ticket->Subject)
msgid "Reminder '%1' added"
-msgstr ""
+msgstr "Напоминание '%1' добавлено"
#: lib/RT/Transaction_Overlay.pm:811
#. ($ticket->Subject)
msgid "Reminder '%1' completed"
-msgstr ""
+msgstr "Напоминание '%1' завершено"
#: lib/RT/Transaction_Overlay.pm:804
#. ($ticket->Subject)
msgid "Reminder '%1' reopened"
-msgstr ""
+msgstr "Напоминание '%1' открыто заново"
#: html/Ticket/Reminders.html:46
#. ($Ticket->Id)
msgid "Reminder ticket #%1"
-msgstr ""
+msgstr "Заявка напоминания #%1"
#: html/Elements/MyReminders:49 html/Ticket/Elements/ShowSummary:73 html/Ticket/Elements/Tabs:122 html/Ticket/Reminders.html:52
msgid "Reminders"
-msgstr ""
+msgstr "Напоминания"
#: html/Ticket/Reminders.html:50
#. ($Ticket->Id)
msgid "Reminders for ticket #%1"
-msgstr ""
+msgstr "Напоминания для заявки #%1"
#: html/Search/Bulk.html:94
msgid "Remove AdminCc"
@@ -4602,7 +4605,7 @@
#: html/Tools/Elements/Tabs:59 html/Tools/Reports/index.html:1 html/Tools/Reports/index.html:2
msgid "Reports"
-msgstr ""
+msgstr "Отчёты"
#: etc/initialdata:44 lib/RT/ACE_Overlay.pm:112
msgid "Requestor"
@@ -4648,7 +4651,7 @@
#: html/Ticket/Update.html:156
#. ($TicketObj->id, $TicketObj->Subject)
msgid "Resolve ticket #%1 (%2)"
-msgstr "Решить заявка #%1 (%2)"
+msgstr "Решить заявку #%1 (%2)"
#: etc/initialdata:323 html/Elements/SelectDateType:49 lib/RT/Ticket_Overlay.pm:1149
msgid "Resolved"
@@ -4656,19 +4659,19 @@
#: html/Tools/Reports/Elements/Tabs:55
msgid "Resolved by owner"
-msgstr ""
+msgstr "Решено ответственным"
#: html/Tools/Reports/Elements/Tabs:59
msgid "Resolved in date range"
-msgstr ""
+msgstr "Решено в промежутке времени"
#: html/Tools/Reports/ResolvedByDates.html:7
msgid "Resolved tickets in period, grouped by owner"
-msgstr ""
+msgstr "Решено заявок за период, с группировкой по ответственному"
#: html/Tools/Reports/ResolvedByOwner.html:5
msgid "Resolved tickets, grouped by owner"
-msgstr ""
+msgstr "Решено заявок, с группировкой по ответственному"
#: NOT FOUND IN SOURCE
msgid "Response to requestors"
@@ -4688,7 +4691,7 @@
#: html/Search/Elements/EditSearches:61
msgid "Revert"
-msgstr "Обратить"
+msgstr "Откатить"
#: NOT FOUND IN SOURCE
msgid "Right %1 not found for %2 %3 in scope %4 (%5)\\n"
@@ -4742,7 +4745,7 @@
#: html/Prefs/MyRT.html:64
msgid "Rows per box"
-msgstr ""
+msgstr "Строк для отображения"
#: html/Search/Elements/DisplayOptions:93
msgid "Rows per page"
@@ -4818,7 +4821,7 @@
#: html/Prefs/SearchOptions.html:47 html/Prefs/SearchOptions.html:50
msgid "Search Preferences"
-msgstr "Ошибка загрузки атрибута запроса"
+msgstr "Параметры поиска"
#: lib/RT/SavedSearch.pm:116
msgid "Search attribute load failure"
@@ -4830,30 +4833,29 @@
#: html/Search/Simple.html:69
msgid "Search for tickets"
-msgstr ""
+msgstr "Поиск заявок"
#: html/Search/Simple.html:57
msgid "Search for tickets. Enter <strong>id</strong> numbers, <strong>queues</strong> by name,
Owners by <strong>username</strong> and Requestors by <strong>email address</strong>.
RT will look for anything else you enter in ticket bodies and attachments."
-msgstr ""
+msgstr "Поиск заявок. Введите номер <strong>идентификатора</strong>, имя <strong>очереди</strong>,
+имя <strong>ответственного</strong>, email-адрес <strong>автора заявки</strong>.
+Всё остальное, что вы введёте, RT будет искать в тексте и вложениях заявок."
-Owners by <strong>username</strong> and Requestors by <strong>email address</strong>.
-RT will look for anything else you enter in ticket bodies and attachments."
-msgstr ""
#: html/User/Elements/Tabs:62
msgid "Search options"
-msgstr ""
+msgstr "Параметры поиска"
#: html/Search/Chart.html:7
#. ($PrimaryGroupBy)
msgid "Search results grouped by %1"
-msgstr ""
+msgstr "Группировать результаты поиска по %1"
#: lib/RT/SavedSearch.pm:194
#. ($msg)
msgid "Search update: %1"
-msgstr "Обновление запроса: %1"
+msgstr "Изменение запроса: %1"
#: NOT FOUND IN SOURCE
msgid "Searches can't be associated with that kind of object"
@@ -4861,7 +4863,7 @@
#: html/Search/Simple.html:59
msgid "Searching the full text of every ticket can take a long time, but if you need to do it, you can search for any word in full ticket history for any word by typing <b>fulltext:<i>word</i></b>."
-msgstr ""
+msgstr "Полнотекстовый поиск по каждой заявке может занять длительное время, но если он необходим вам, вы можете искать любое слово по всей истории заявки, введя <b>fulltext:<i>слово</i></b>."
#: bin/rt-crontool:213
msgid "Security:"
@@ -4870,7 +4872,7 @@
#: html/Elements/ShowCustomFields:76
#. ('<a href="'.$Value->IncludeContentForValue.'">' . $Value->IncludeContentForValue."</a>")
msgid "See also: %1"
-msgstr ""
+msgstr "Смотрите также: %1"
#: lib/RT/CustomField_Overlay.pm:105
msgid "See custom fields"
@@ -4966,7 +4968,7 @@
#: html/Prefs/Quicksearch.html:53
msgid "Select queues to be displayed on the \"RT at a glance\" page"
-msgstr ""
+msgstr "Выберите очереди, которые будут отображаться на странице \"Обзор RT\""
#: html/Admin/Global/Scrip.html:58 html/Admin/Global/Scrips.html:57 html/Admin/Queues/Scrip.html:61 html/Admin/Queues/Scrips.html:73
msgid "Select scrip"
@@ -5002,7 +5004,7 @@
#: html/Widgets/SelectionBox:210
msgid "Selections modified. Please save your changes"
-msgstr ""
+msgstr "Выбор изменён. Пожалуйста, сохраните ваши изменения"
#: NOT FOUND IN SOURCE
msgid "Self Service"
@@ -5166,7 +5168,7 @@
#: html/Elements/Tabs:68
msgid "Simple Search"
-msgstr ""
+msgstr "Простой поиск"
#: html/Admin/Elements/SelectSingleOrMultiple:47
msgid "Single"
@@ -5186,7 +5188,7 @@
#: html/Admin/CustomFields/Modify.html:120
msgid "Some browsers may only load content from the same domain as your RT server."
-msgstr ""
+msgstr "Некотороые обозреватели могут загружать содержимое только с такого же домена, как у сервера RT."
#: html/Admin/Elements/AddCustomFieldValue:49 html/Admin/Elements/EditCustomFieldValues:54
msgid "Sort"
@@ -5278,8 +5280,8 @@
#: lib/RT/Transaction_Overlay.pm:665
#. ($Old->Name)
-msgid "Stolen from %1 "
-msgstr ""
+msgid "Stolen from %1"
+msgstr "Ответственный переназначен с %1"
#: NOT FOUND IN SOURCE
msgid "Stolen from %1 "
@@ -5430,7 +5432,7 @@
#: lib/RT/Template_Overlay.pm:391
msgid "Template parsing error"
-msgstr ""
+msgstr "Ошибка обработки шаблона"
#: html/Admin/Elements/QueueTabs:70 html/Admin/Elements/SystemTabs:57 html/Admin/Global/index.html:66
msgid "Templates"
@@ -5723,11 +5725,11 @@
#: lib/RT/Search/FromSQL.pm:83
#. (ref $self)
msgid "TicketSQL search module"
-msgstr ""
+msgstr "Модуль поиска TicketSQL"
#: html/Admin/Elements/GlobalCustomFieldTabs:64 html/Admin/Global/CustomFields/index.html:75 html/Elements/Tabs:71 html/Search/Elements/Chart:52 lib/RT/CustomField_Overlay.pm:1204
msgid "Tickets"
-msgstr "Поиск заявки"
+msgstr "Расширенный поиск"
#: NOT FOUND IN SOURCE
msgid "Tickets %1 %2"
@@ -5739,11 +5741,11 @@
#: html/Tools/Reports/CreatedByDates.html:41
msgid "Tickets created after"
-msgstr ""
+msgstr "Заявки, созданные после"
#: html/Tools/Reports/CreatedByDates.html:43
msgid "Tickets created before"
-msgstr ""
+msgstr "Заявки, созданные до"
#: NOT FOUND IN SOURCE
msgid "Tickets from %1"
@@ -5751,11 +5753,11 @@
#: html/Tools/Reports/ResolvedByDates.html:42
msgid "Tickets resolved after"
-msgstr ""
+msgstr "Заявки, решённые после"
#: html/Tools/Reports/ResolvedByDates.html:44
msgid "Tickets resolved before"
-msgstr ""
+msgstr "Заявки, решённые до"
#: html/Approvals/Elements/ShowDependency:48
msgid "Tickets which depend on this approval:"
@@ -5779,7 +5781,7 @@
#: html/Elements/Footer:52
msgid "Time to display"
-msgstr "Время для показа"
+msgstr "Время генерации страницы"
#: lib/RT/Tickets_Overlay.pm:1853
msgid "Time worked"
@@ -5799,11 +5801,11 @@
#: NOT FOUND IN SOURCE
msgid "To generate a diff of this commit:"
-msgstr "Для генерации изменений этого коммита:"
+msgstr "Для генерации изменений этой фиксации:"
#: NOT FOUND IN SOURCE
msgid "To generate a diff of this commit:\\n"
-msgstr "Для генерации изменений этого коммита:\\n"
+msgstr "Для генерации изменений этой фиксации:\\n"
#: html/Elements/Footer:63
#. ('<a href="mailto:sales at bestpractical.com">sales at bestpractical.com</a>')
@@ -5820,7 +5822,7 @@
#: html/Search/Elements/Chart:73
msgid "Total"
-msgstr ""
+msgstr "Всего"
#: etc/initialdata:252
msgid "Transaction"
@@ -5915,23 +5917,23 @@
#: html/Elements/RT__Ticket/ColumnMap:300 html/Search/Bulk.html:193 html/Search/Bulk.html:75
msgid "Update"
-msgstr "Обновить"
+msgstr "Изменить"
#: NOT FOUND IN SOURCE
msgid "Update All"
-msgstr "Обновить все"
+msgstr "Изменить все"
#: NOT FOUND IN SOURCE
msgid "Update ID"
-msgstr "Обновить идентификатор"
+msgstr "Изменить идентификатор"
#: html/Ticket/Update.html:135
msgid "Update Ticket"
-msgstr "Обновить заявку"
+msgstr "Изменить заявку"
#: html/Search/Bulk.html:126 html/Ticket/ModifyAll.html:87 html/Ticket/Update.html:72
msgid "Update Type"
-msgstr "Обновить тип"
+msgstr "Изменить тип"
#: NOT FOUND IN SOURCE
msgid "Update all these tickets at once"
@@ -5939,53 +5941,53 @@
#: NOT FOUND IN SOURCE
msgid "Update email"
-msgstr "Обновить e-mail"
+msgstr "Изменить e-mail"
#: html/Search/Bulk.html:200 html/Search/Results.html:78
msgid "Update multiple tickets"
-msgstr "Обновить несколько заявок"
+msgstr "Изменить несколько заявок"
#: NOT FOUND IN SOURCE
msgid "Update name"
-msgstr "Обновить имя"
+msgstr "Изменить имя"
#: lib/RT/Action/CreateTickets.pm:750 lib/RT/Interface/Web.pm:524
msgid "Update not recorded."
-msgstr "Обновление не записано."
+msgstr "Изменение не записано."
#: NOT FOUND IN SOURCE
msgid "Update selected tickets"
-msgstr "Обновить выбранные заявки"
+msgstr "Изменить выбранные заявки"
#: NOT FOUND IN SOURCE
msgid "Update signature"
-msgstr "Обновить подпись"
+msgstr "Изменить подпись"
#: html/Ticket/ModifyAll.html:84
msgid "Update ticket"
-msgstr "Обновить заявку"
+msgstr "Изменить заявку"
#: NOT FOUND IN SOURCE
msgid "Update ticket # %1"
-msgstr "Обновление заявки # %1"
+msgstr "Изменение заявки # %1"
#: html/SelfService/Update.html:112 html/SelfService/Update.html:47
#. ($Ticket->id)
msgid "Update ticket #%1"
-msgstr "Обновление заявки #%1"
+msgstr "Изменение заявки #%1"
#: html/Ticket/Update.html:158
#. ($TicketObj->id, $TicketObj->Subject)
msgid "Update ticket #%1 (%2)"
-msgstr "Обновление заявки #%1 (%2)"
+msgstr "Изменение заявки #%1 (%2)"
#: lib/RT/Action/CreateTickets.pm:748 lib/RT/Interface/Web.pm:523
msgid "Update type was neither correspondence nor comment."
-msgstr "Обновление не было ни сообщением, ни комментарием."
+msgstr "Изменение не было ни сообщением, ни комментарием."
#: html/Elements/SelectDateType:54 html/Ticket/Elements/ShowDates:72 lib/RT/CustomField_Overlay.pm:1282 lib/RT/Ticket_Overlay.pm:1148
msgid "Updated"
-msgstr "Обновлена"
+msgstr "Изменена"
#: html/Tools/Offline.html:93
msgid "Upload"
@@ -6067,7 +6069,7 @@
#: lib/RT/Interface/Web.pm:1284
#. ($CustomFieldObj->Name, $class, $Object->id)
msgid "User asked for an unknown update type for custom field %1 for %2 object #%3"
-msgstr "Пользователь запросил обновление неизвестного типа для дополнительного поля %1 для объекта %2 #%3"
+msgstr "Пользователь запросил изменение неизвестного типа для дополнительного поля %1 для объекта %2 #%3"
#: html/Admin/Users/Modify.html:290
#. ($msg)
@@ -6116,7 +6118,7 @@
#: html/Admin/CustomFields/Modify.html:80
msgid "Validation"
-msgstr ""
+msgstr "Проверка корректности"
#: NOT FOUND IN SOURCE
msgid "ValueOfQueue"
@@ -6244,7 +6246,7 @@
#: html/Prefs/Search.html:56
msgid "You can also edit the predefined search itself"
-msgstr ""
+msgstr "Вы также можете редактировать предварительно заданный запрос"
#: lib/RT/Ticket_Overlay.pm:2967
msgid "You can only reassign tickets that you own or that are unowned"
@@ -6432,7 +6434,7 @@
#: html/Search/Results.html:88
#. ($m->scomp('Elements/SelectGroupBy', Name => 'PrimaryGroupBy'))
msgid "grouped by %1"
-msgstr ""
+msgstr "сгруппировано по %1"
#: lib/RT/Date.pm:338
msgid "hours"
@@ -6539,11 +6541,11 @@
#: html/Search/Results.html:89
#. ($m->scomp('Elements/SelectChartType', Name => 'ChartStyle'))
msgid "style: %1"
-msgstr ""
+msgstr "стиль: %1"
#: html/Prefs/MyRT.html:80
msgid "summary rows"
-msgstr ""
+msgstr "строки сводной информации"
#: lib/RT/Group_Overlay.pm:222
#. ($self->Type)
Modified: rt/branches/3.6-EXPERIMENTAL-LONDRES/lib/RT/Scrip_Overlay.pm
==============================================================================
--- rt/branches/3.6-EXPERIMENTAL-LONDRES/lib/RT/Scrip_Overlay.pm (original)
+++ rt/branches/3.6-EXPERIMENTAL-LONDRES/lib/RT/Scrip_Overlay.pm Fri Dec 1 13:20:39 2006
@@ -139,10 +139,10 @@
CustomPrepareCode => undef,
CustomCommitCode => undef,
CustomIsApplicableCode => undef,
+ @_
+ );
- @_ );
-
- if ( !$args{'Queue'} ) {
+ unless ( $args{'Queue'} ) {
unless ( $self->CurrentUser->HasRight( Object => $RT::System,
Right => 'ModifyScrips' )
) {
@@ -151,9 +151,9 @@
$args{'Queue'} = 0; # avoid undef sneaking in
}
else {
- my $QueueObj = new RT::Queue( $self->CurrentUser );
+ my $QueueObj = RT::Queue->new( $self->CurrentUser );
$QueueObj->Load( $args{'Queue'} );
- unless ( $QueueObj->id() ) {
+ unless ( $QueueObj->id ) {
return ( 0, $self->loc('Invalid queue') );
}
unless ( $QueueObj->CurrentUserHasRight('ModifyScrips') ) {
@@ -165,28 +165,28 @@
#TODO +++ validate input
require RT::ScripAction;
- my $action = new RT::ScripAction( $self->CurrentUser );
- if ( $args{'ScripAction'} ) {
- $action->Load( $args{'ScripAction'} );
- }
+ return ( 0, $self->loc("Action is mandatory argument") )
+ unless $args{'ScripAction'};
+ my $action = RT::ScripAction->new( $self->CurrentUser );
+ $action->Load( $args{'ScripAction'} );
return ( 0, $self->loc( "Action [_1] not found", $args{'ScripAction'} ) )
- unless $action->Id;
+ unless $action->Id;
require RT::Template;
- my $template = new RT::Template( $self->CurrentUser );
- if ( $args{'Template'} ) {
- $template->Load( $args{'Template'} );
- }
- return ( 0, $self->loc('Template not found') ) unless $template->Id;
+ return ( 0, $self->loc("Template is mandatory argument") )
+ unless $args{'Template'};
+ my $template = RT::Template->new( $self->CurrentUser );
+ $template->Load( $args{'Template'} );
+ return ( 0, $self->loc('Template not found') )
+ unless $template->Id;
require RT::ScripCondition;
- my $condition = new RT::ScripCondition( $self->CurrentUser );
- if ( $args{'ScripCondition'} ) {
- $condition->Load( $args{'ScripCondition'} );
- }
- unless ( $condition->Id ) {
- return ( 0, $self->loc('Condition not found') );
- }
+ return ( 0, $self->loc("Condition is mandatory argument") )
+ unless $args{'ScripCondition'};
+ my $condition = RT::ScripCondition->new( $self->CurrentUser );
+ $condition->Load( $args{'ScripCondition'} );
+ return ( 0, $self->loc('Condition not found') )
+ unless $condition->Id;
my ( $id, $msg ) = $self->SUPER::Create(
Queue => $args{'Queue'},
@@ -198,9 +198,8 @@
CustomPrepareCode => $args{'CustomPrepareCode'},
CustomCommitCode => $args{'CustomCommitCode'},
CustomIsApplicableCode => $args{'CustomIsApplicableCode'},
-
);
- if ($id) {
+ if ( $id ) {
return ( $id, $self->loc('Scrip Created') );
}
else {
@@ -595,15 +594,17 @@
Principal => undef,
@_ );
- if ( ( defined $self->SUPER::_Value('Queue') )
- and ( $self->SUPER::_Value('Queue') != 0 ) ) {
- return ( $args{'Principal'}->HasRight( Right => $args{'Right'},
- Object => $self->QueueObj ) );
-
+ if ( $self->SUPER::_Value('Queue') ) {
+ return $args{'Principal'}->HasRight(
+ Right => $args{'Right'},
+ Object => $self->QueueObj
+ );
}
else {
- return ( $args{'Principal'}
- ->HasRight( Object => $RT::System, Right => $args{'Right'} ) );
+ return $args{'Principal'}->HasRight(
+ Object => $RT::System,
+ Right => $args{'Right'},
+ );
}
}
Modified: rt/branches/3.6-EXPERIMENTAL-LONDRES/lib/RT/Template_Overlay.pm
==============================================================================
--- rt/branches/3.6-EXPERIMENTAL-LONDRES/lib/RT/Template_Overlay.pm (original)
+++ rt/branches/3.6-EXPERIMENTAL-LONDRES/lib/RT/Template_Overlay.pm Fri Dec 1 13:20:39 2006
@@ -171,7 +171,7 @@
=head2 LoadGlobalTemplate NAME
-Load the global tempalte with the name NAME
+Load the global template with the name NAME
=cut
More information about the Rt-commit
mailing list