Menu
▾
▴
bugzilla-ru-commit — Bugzilla-ru commit notification channel
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
(51) |
Mar
(29) |
Apr
(37) |
May
(11) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(60) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(4) |
| 2010 |
Jan
(2) |
Feb
|
Mar
(5) |
Apr
(4) |
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Vitaly F. <fed...@us...> - 2005-11-06 01:19:09
|
Update of /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/account/prefs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25826/account/prefs Modified Files: Tag: BUGZILLA-2_20 email.html.tmpl Log Message: 'Flags' and 'flag types' translation revised Updated to Bugzilla 2.20 where appropriate Index: email.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/account/prefs/email.html.tmpl,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -u -d -r1.5.2.1 -r1.5.2.2 --- email.html.tmpl 1 Nov 2005 19:54:41 -0000 1.5.2.1 +++ email.html.tmpl 6 Nov 2005 01:18:52 -0000 1.5.2.2 @@ -86,7 +86,7 @@ value="1" [% " checked" IF mail.${constants.REL_ANY}.${constants.EVT_FLAG_REQUESTED} %]> - <label for="[% prefname %]">óÏÏÂÝÁÔØ ÍÎÅ, ËÏÇÄÁ ËÔÏ-ÔÏ ÐÒÏÓÉÔ ÍÅÎÑ ÕÓÔÁÎÏ×ÉÔØ ÆÌÁÇ</label> + <label for="[% prefname %]">óÏÏÂÝÁÔØ ÍÎÅ, ËÏÇÄÁ ËÔÏ-ÔÏ ÚÁÐÒÁÛÉ×ÁÅÔ ÍÏÅÇÏ ÓÏÇÌÁÓÏ×ÁÎÉÑ</label> <br> </td> </tr> @@ -98,7 +98,7 @@ value="1" [% " checked" IF mail.${constants.REL_ANY}.${constants.EVT_REQUESTED_FLAG} %]> - <label for="[% prefname %]">óÏÏÂÝÁÔØ ÍÎÅ, ËÏÇÄÁ ËÔÏ-ÔÏ ÕÓÔÁÎÁ×ÌÉ×ÁÅÔ ÆÌÁÇ, ËÏÔÏÒÙÊ Ñ ÚÁÐÒÏÓÉÌ</label> + <label for="[% prefname %]">óÏÏÂÝÁÔØ ÍÎÅ, ËÏÇÄÁ ËÔÏ-ÔÏ ÄÁÅÔ ÚÁÐÒÏÛÅÎÎÏÅ ÍÎÏÊ ÓÏÇÌÁÓÏ×ÁÎÉÅ</label> <br> </td> </tr> |
|
From: Vitaly F. <fed...@us...> - 2005-11-06 01:19:09
|
Update of /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/attachment In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25826/attachment Modified Files: Tag: BUGZILLA-2_20 create.html.tmpl list.html.tmpl show-multiple.html.tmpl Log Message: 'Flags' and 'flag types' translation revised Updated to Bugzilla 2.20 where appropriate Index: create.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/attachment/create.html.tmpl,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -u -d -r1.3.2.1 -r1.3.2.2 --- create.html.tmpl 1 Nov 2005 19:54:41 -0000 1.3.2.1 +++ create.html.tmpl 6 Nov 2005 01:18:53 -0000 1.3.2.2 @@ -168,7 +168,7 @@ </td> </tr> <tr> - <th><label for="comment">Comment:</label></th> + <th><label for="comment">ëÏÍÍÅÎÔÁÒÉÊ:</label></th> <td> <em>(ÄÏÐÏÌÎÉÔÅÌØÎÏ) äÏÂÁ×ØÔÅ ËÏÍÍÅÎÔÁÒÉÊ ÄÌÑ ÜÔÏÇÏ ÐÒÉÌÏÖÅÎÉÑ Ë [% terms.bug_dat %].</em><br> <textarea wrap="soft" id="commment" name="comment" rows="6" cols="80"></textarea> Index: list.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/attachment/list.html.tmpl,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -u -d -r1.4.2.1 -r1.4.2.2 --- list.html.tmpl 1 Nov 2005 19:54:41 -0000 1.4.2.1 +++ list.html.tmpl 6 Nov 2005 01:18:53 -0000 1.4.2.2 @@ -30,7 +30,7 @@ <th bgcolor="#cccccc" align="left">óÏÚÄÁÎÏ</th> <th bgcolor="#cccccc" align="left">òÁÚÍÅÒ</th> [% IF show_attachment_flags %] - <th bgcolor="#cccccc" align="left">æÌÁÇÉ</th> + <th bgcolor="#cccccc" align="left">óÏÇÌÁÓÏ×ÁÎÉÑ</th> [% END %] <th bgcolor="#cccccc" align="left">äÅÊÓÔ×ÉÑ</th> </tr> @@ -56,7 +56,7 @@ [% IF show_attachment_flags %] <td valign="top"> [% IF attachment.flags.size == 0 %] - <i>none</i> + <i>ÎÅÔ</i> [% ELSE %] [% FOREACH flag = attachment.flags %] [% IF flag.setter %] Index: show-multiple.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/attachment/show-multiple.html.tmpl,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -u -d -r1.3.2.1 -r1.3.2.2 --- show-multiple.html.tmpl 1 Nov 2005 19:54:41 -0000 1.3.2.1 +++ show-multiple.html.tmpl 6 Nov 2005 01:18:53 -0000 1.3.2.2 @@ -65,7 +65,7 @@ <td valign="top"> [% IF a.flags.size == 0 %] - <i>ÎÅÔ ÆÌÁÇÏ×</i> + <i>ÓÏÇÌÁÓÏ×ÁÎÉÊ ÎÅÔ</i> [% ELSE %] [% FOREACH flag = a.flags %] [% IF flag.setter %] |
|
From: Vitaly F. <fed...@us...> - 2005-11-05 10:07:04
|
Update of /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/reports In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9009 Added Files: create-chart.html.tmpl duplicates.rdf.tmpl edit-series.html.tmpl menu.html.tmpl report-bar.png.tmpl report-line.png.tmpl report-pie.png.tmpl report-simple.html.tmpl report-table.csv.tmpl report-table.html.tmpl report.csv.tmpl report.html.tmpl series-common.html.tmpl series.html.tmpl Log Message: Updated to Bugzilla 2.20 --- NEW FILE: report-pie.png.tmpl --- [%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of # the License at http://www.mozilla.org/MPL/ # # Software distributed under the License is distributed on an "AS # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. # # The Original Code is the Bugzilla Bug Tracking System. # # The Initial Developer of the Original Code is Netscape Communications # Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All # Rights Reserved. # # Contributor(s): Gervase Markham <ge...@ge...> #%] [% PROCESS "global/field-descs.none.tmpl" %] [% col_field_disp = field_descs.$col_field || col_field %] [% IF col_field == 'bug_status' %] [% FOR i IN [ 0 .. data.0.0.max ] %] [% data.0.0.$i = status_descs.${data.0.0.$i} %] [% END %] [% END %] [% IF col_field == 'resolution' %] [% FOR i IN [ 0 .. data.0.0.max ] %] [% data.0.0.$i = resolution_descs.${data.0.0.$i} %] [% END %] [% END %] [% FILTER null; USE graph = GD.Graph.pie(width, height); graph.set(title => col_field_disp, pie_height => 20, suppress_angle => 2, start_angle => 180); graph.plot(data.0).png | stdout(1); END; -%] --- NEW FILE: report-line.png.tmpl --- [%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of # the License at http://www.mozilla.org/MPL/ # # Software distributed under the License is distributed on an "AS # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. # # The Original Code is the Bugzilla Bug Tracking System. # # The Initial Developer of the Original Code is Netscape Communications # Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All # Rights Reserved. # # Contributor(s): Gervase Markham <ge...@ge...> #%] [% PROCESS global/variables.none.tmpl %] [% y_label = "$terms.Bugs" %] [% PROCESS "global/field-descs.none.tmpl" %] [% col_field_disp = field_descs.$col_field || col_field %] [% IF col_field == 'bug_status' %] [% FOR i IN [ 0 .. data.0.0.max ] %] [% data.0.0.$i = status_descs.${data.0.0.$i} %] [% END %] [% END %] [% IF col_field == 'resolution' %] [% FOR i IN [ 0 .. data.0.0.max ] %] [% data.0.0.$i = resolution_descs.${data.0.0.$i} %] [% END %] [% END %] [% IF row_field == 'bug_status' %] [% FOR i IN [ 0 .. row_names.max ] %] [% row_names.$i = status_descs.${row_names.$i} %] [% END %] [% END %] [% IF row_field == 'resolution' %] [% FOR i IN [ 0 .. row_names.max ] %] [% row_names.$i = resolution_descs.${row_names.$i} %] [% END %] [% END %] [% IF cumulate %] [% USE graph = GD.Graph.area(width, height) %] [% graph.set(cumulate => "true") %] [% ELSE %] [% USE graph = GD.Graph.lines(width, height) %] [% END %] [% FILTER null; graph.set(x_label => col_field_disp, y_label => y_label, y_tick_number => 8, x_label_position => 0.5, x_labels_vertical => x_labels_vertical, legend_placement => "RT", line_width => 2, dclrs => ["lred", "lgreen", "lblue", "lyellow", "lpurple", "lorange", "black", "green", "blue", "dpink", "lbrown", "gray", "red", "dpurple", "gold", "marine"]); # Workaround for the fact that set_legend won't take row_names directly, # because row_names is an array reference rather than an array. graph.set_legend(row_names.0, row_names.1, row_names.2, row_names.3, row_names.4, row_names.5, row_names.6, row_names.7, row_names.8, row_names.9, row_names.10, row_names.11, row_names.12, row_names.13, row_names.14, row_names.15); graph.plot(data.0).png | stdout(1); END; -%] --- NEW FILE: report.html.tmpl --- [%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of # the License at http://www.mozilla.org/MPL/ # # Software distributed under the License is distributed on an "AS # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. # # The Original Code is the Bugzilla Bug Tracking System. # # The Initial Developer of the Original Code is Netscape Communications # Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All # Rights Reserved. # # Contributor(s): Gervase Markham <ge...@ge...> # # Russian translation: Vitaly Fedrushkov <fed...@us...> #%] [%# INTERFACE: # col_field: string. Name of the field being plotted as columns. # row_field: string. Name of the field being plotted as rows. # tbl_field: string. Name of the field being plotted as tables. # tbl_names: array. List of values for the field being plotted as tables. # time: integer. Seconds since the epoch. # data: <depends on format>. Data to plot. # format: string. Format of the individual reports. # width: integer. For image charts, height of the image. # height: integer. For image charts, width of the image. # switchbase: string. Base URL for format switching. # cumulate: boolean. For bar/line charts, whether to cumulate data sets. #%] [% DEFAULT width = 600 height = 350 %] [% IF min_width AND width < min_width %] [% width = min_width %] [% END %] [%# We ignore row_field for pie charts %] [% IF format == "pie" %] [% row_field = "" %] [% END %] [% PROCESS "global/field-descs.none.tmpl" %] [% tbl_field_disp = field_descs.$tbl_field || tbl_field %] [% col_field_disp = field_descs.$col_field || col_field %] [% row_field_disp = field_descs.$row_field || row_field %] [% title = BLOCK %] ïÔÞÅÔ: [% IF tbl_field %] [% tbl_field_disp FILTER html %] [% END %] [% " / " IF tbl_field AND (col_field OR row_field) %] [% IF row_field %] [% row_field_disp FILTER html %] [% END %] [% " / " IF col_field AND row_field %] [% col_field_disp FILTER html %] [% END %] [% PROCESS global/header.html.tmpl style = " .t1 { background-color: #ffffff } /* white */ .t2 { background-color: #dfefff } /* light blue */ .t3 { background-color: #dddddd } /* grey */ .t4 { background-color: #c3d3ed } /* darker blue */ .ttotal { background-color: #cfffdf } /* light green */ " h3 = time2str("%Y-%m-%d %H:%M:%S", time) %] [% IF debug %] <p>[% query FILTER html %]</p> [% END %] <div align="center"> [% FOREACH tbl = tbl_names %] [% IF tbl == "-total-" %] [% tbl_disp = "÷ÓÅÇÏ" %] [% ELSE %] [% tbl_disp = tbl %] [% END %] [% IF format == "table" %] [% PROCESS "reports/report-table.html.tmpl" %] [% ELSE %] [% IF tbl %] <h2>[% tbl_disp FILTER html %]</h2> [% END %] [% imageurl = BLOCK %]report.cgi?[% imagebase %]&format= [% format FILTER url_quote %]&ctype=png&action=plot& [% IF tbl_field %] [% IF tbl != "-total-" %] [% tbl_field FILTER url_quote %]=[% tbl FILTER url_quote %]& [% ELSE %] [% FOREACH tblname = tbl_names %] [% IF tblname != "-total-" %] [% tbl_field FILTER url_quote %]=[% tblname FILTER url_quote %]& [% END %] [% END %] [% END %] [% END %]width=[% width %]&height=[% height %] [% END %] <img alt="äÉÁÇÒÁÍÍÁ" src="[% imageurl %]" width="[% width %]" height="[% height %]"> [% END %] <br> [% END %] <table> <tr> <td> [% formats = [ { name => "pie", description => "ëÒÕÇÏ×ÁÑ" }, { name => "bar", description => "çÉÓÔÏÇÒÁÍÍÁ" }, { name => "line", description => "çÒÁÆÉË" }, { name => "table", description => "ôÁÂÌÉÃÁ" } ] %] [% formaturl = "report.cgi?$switchbase&width=$width&height=$height" _ "&action=wrap" %] [% FOREACH other_format = formats %] [% NEXT IF other_format.name == "pie" AND row_field AND col_field %] [% UNLESS other_format.name == format %] <a href="[% formaturl %]&format=[% other_format.name %]"> [% END %] [% other_format.description FILTER html %] [% "</a>" UNLESS other_format.name == format %] | [% END %] <a href="[% formaturl %]&ctype=csv&format=table">CSV</a> </td> [% IF format != "table" %] <td> </td> [% sizeurl = BLOCK %]report.cgi? [% switchbase %]&action=wrap&format= [% format FILTER html %][% END %] <td align="center"> <a href="[% sizeurl %]&width=[% width %]&height= [% height + 100 %]">äÌÉÎÎÅÅ</a><br> <a href="[% sizeurl %]&width=[% width - 100 %]&height= [% height %]">õÖÅ</a> * <a href="[% sizeurl %]&width=[% width + 100 %]&height= [% height %]">ûÉÒÅ</a> <br> <a href="[% sizeurl %]&width=[% width %]&height= [% height - 100 %]">ëÏÒÏÞÅ</a><br> </td> [% END %] <tr> </table> <p> [% IF format == "table" %] <a href="query.cgi?[% switchbase %]&format=report-table">ðÁÒÁÍÅÔÒÙ ÏÔÞÅÔÁ</a> [% ELSE %] <a href="query.cgi?[% switchbase %]&chart_format= [% format %]&format=report-graph&cumulate=[% cumulate %]"> ðÁÒÁÍÅÔÒÙ ÄÉÁÇÒÁÍÍÙ </a> [% END %] </p> </div> [% PROCESS global/footer.html.tmpl %] --- NEW FILE: report-table.html.tmpl --- [%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of # the License at http://www.mozilla.org/MPL/ # # Software distributed under the License is distributed on an "AS # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. # # The Original Code is the Bugzilla Bug Tracking System. # # The Initial Developer of the Original Code is Netscape Communications # Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All # Rights Reserved. # # Contributor(s): Gervase Markham <ge...@ge...> # <rd...@ca...> # # Russian translation: Vitaly Fedrushkov <fed...@us...> #%] [%# INTERFACE: # buglistbase: The base query for this table, in URL form # col_field: string. Name of the field being plotted as columns. # row_field: string. Name of the field being plotted as rows. # tbl_field: string. Name of the field being plotted as tables. # col_names: array. List of values for the field being plotted as columns. # row_names: array. List of values for the field being plotted as rows. # data: <depends on format>. Data to plot. Only data.$tbl is accessed. # tbl: Name of a hash in data which is the table to be plotted. #%] [% PROCESS "global/field-descs.none.tmpl" %] [% col_field_disp = field_descs.$col_field || col_field %] [% row_field_disp = field_descs.$row_field || row_field %] [% IF tbl == "-total-" %] [% urlbase = BLOCK %]buglist.cgi?[% buglistbase %] [% "&$tbl_vals" IF tbl_vals %][% END %] [% ELSE %] [% urlbase = BLOCK %]buglist.cgi?[% buglistbase %]& [% tbl_field FILTER url_quote %]=[% tbl FILTER url_quote %][% END %] [% END %] <table> [% IF tbl_field %] <tr> <td> </td> <td align="center"> <h2>[% tbl_disp FILTER html %]</h2> </td> </tr> [% END %] <tr> <td> </td> <td align="center"> <strong>[% col_field_disp FILTER html %]</strong> </td> </tr> <tr> <td valign="middle"> <strong>[% row_field_disp FILTER html %]</strong> </td> <td> [% classes = [ [ "t1", "t2" ] , [ "t3", "t4" ] ] %] [% col_idx = 0 %] [% row_idx = 0 %] [% grand_total = 0 %] <table border="1"> [% IF col_field %] <tr> <td class="[% classes.$row_idx.$col_idx %]"> </td> [% FOREACH col = col_names %] [% col_totals.$col = 0 %] [% NEXT IF col == "" %] [% col_idx = 1 - col_idx %] <td class="[% classes.$row_idx.$col_idx %]"> [% IF col_field == 'bug_status' %] [% status_descs.$col FILTER html FILTER replace('^ $',' ') %] [% ELSIF col_field == 'resolution' %] [% resolution_descs.$col FILTER html FILTER replace('^ $',' ') %] [% ELSE %] [% col FILTER html FILTER replace('^ $',' ') %] [% END %] </td> [% END %] <td class="ttotal"> Total </td> </tr> [% END %] [% FOREACH row = row_names %] [% row_total = 0 %] [% row_idx = 1 - row_idx %] <tr> <td class="[% classes.$row_idx.$col_idx %]" align="right"> [% IF row_field == 'bug_status' %] [% status_descs.$row FILTER html FILTER replace('^ $',' ') %] [% ELSIF row_field == 'resolution' %] [% resolution_descs.$row FILTER html FILTER replace('^ $',' ') %] [% ELSE %] [% row FILTER html FILTER replace('^ $',' ') %] [% END %] </td> [% FOREACH col = col_names %] [% row_total = row_total + data.$tbl.$col.$row %] [% NEXT IF col == "" %] [% col_totals.$col = col_totals.$col + data.$tbl.$col.$row %] [% col_idx = 1 - col_idx %] <td class="[% classes.$row_idx.$col_idx %]" align="center"> [% IF data.$tbl.$col.$row AND data.$tbl.$col.$row > 0 %] <a href="[% urlbase %]& [% row_field FILTER url_quote %]=[% row FILTER url_quote %]& [% col_field FILTER url_quote %]=[% col FILTER url_quote %]"> [% data.$tbl.$col.$row %]</a> [% ELSE %] . [% END %] </td> [% END %] <td class="ttotal" align="right"> <a href="[% urlbase %]& [% row_field FILTER url_quote %]=[% row FILTER url_quote %] [% "&$col_vals" IF col_vals %]"> [% row_total %]</a> [% grand_total = grand_total + row_total %] </td> </tr> [% END %] <tr> [% row_idx = 1 - row_idx %] <td class="ttotal"> éÔÏÇÏ </td> [% FOREACH col = col_names %] [% NEXT IF col == "" %] <td class="ttotal" align="center"> <a href="[% urlbase %]& [% col_field FILTER url_quote %]=[% col FILTER url_quote %] [% "&$row_vals" IF row_vals %]"> [% col_totals.$col %]</a> <strong> </td> [% END %] <td class="ttotal" align="right"> <strong> <a href="[% urlbase %] [% "&$row_vals" IF row_vals %] [% "&$col_vals" IF col_vals %]">[% grand_total %]</a> </strong> </td> </tr> </table> </td> </tr> </table> --- NEW FILE: create-chart.html.tmpl --- [%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of # the License at http://www.mozilla.org/MPL/ # # Software distributed under the License is distributed on an "AS # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. # # The Original Code is the Bugzilla Bug Tracking System. # # The Initial Developer of the Original Code is Netscape Communications # Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All # Rights Reserved. # # Contributor(s): Gervase Markham <ge...@ge...> #%] [%# INTERFACE: # chart: Chart object representing the currently assembled chart. # category: hash (keyed by category) of hashes (keyed by subcategory) of # hashes (keyed by name), with value being the series_id of the # series. Contains details of all series the user can see. #%] [% PROCESS global/header.html.tmpl title = "Create Chart" %] [% PROCESS "reports/series-common.html.tmpl" donames = 1 %] <script type="text/javascript"> [%# This function takes necessary action on selection of a subcategory %] function subcatSelected() { var cat = document.chartform.category.value; var subcat = document.chartform.subcategory.value; var names = series[cat][subcat]; var namewidget = document.chartform.name; namewidget.options.length = 0; var i = 0; for (x in names) { namewidget.options[i] = new Option(x, names[x]); i++; } namewidget.options[0].selected = true; checkNewState(); } </script> [% gttext = "Grand Total" %] <form method="get" action="chart.cgi" name="chartform"> <table cellpadding="2" cellspacing="2" border="0"> [% IF NOT category OR category.size == 0 %] <tr> <td> <i>No data sets exist, or none are visible to you.</i> </td> </tr> [% ELSE %] <tr> <th>Category:</th> <th></th> <th>Sub-category:</th> <th></th> <th>Name:</th> <th><br> </th> </tr> <tr> [% PROCESS series_select sel = { name => 'category', size => 5, onchange = "catSelected(); subcatSelected();" } %] <td> <noscript> <input type="submit" name="action-assemble" value="Update -->"> </noscript> </td> [% PROCESS series_select sel = { name => 'subcategory', size => 5, onchange = "subcatSelected()" } %] <td> <noscript> <input type="submit" name="action-assemble" value="Update -->"> </noscript> </td> <td align="left"> <label for="name" accesskey="N"> <select name="name" id="name" style="width: 15em" size="5" multiple="multiple" [%+ "disabled=\"disabled\"" UNLESS name.keys.size %]> [% FOREACH x = name.keys.sort %] <option value="[% name.$x FILTER html %]"> [% x FILTER html %]</option> [% END %] [% UNLESS name.keys.size %] <option value="" disabled="disabled"></option> [% END %] </select> </label> </td> <td align="center" valign="middle"> <input type="submit" name="action-add" value="Add To List"><br> </td> </tr> [% END %] </table> <script type="text/javascript"> document.chartform.category[0].selected = true; document.chartform.subcategory.disabled = ''; document.chartform.name.disabled = ''; catSelected(); subcatSelected(); </script> <h3>List Of Data Sets To Plot</h3> [% IF chart.lines.size > 0 %] <table cellspacing="2" cellpadding="2"> <tr> <th style="width: 5em;">Select</th> <th>Label</th> <th></th> <th>Data Set</th> <th></th> </tr> [%# The external loop has two counters; one which keeps track of where we # are in the old labels array, and one which keeps track of the new # indexes for the form elements. They are different if chart.lines has # empty slots in it. #%] [% labelidx = 0 %] [% newidx = 0 %] [% FOREACH line = chart.lines %] [% IF NOT line %] [%# chart.lines has an empty slot, so chart.labels will too. We # increment labelidx only to keep the labels in sync with the data. #%] [% labelidx = labelidx + 1 %] [% NEXT %] [% END %] [% FOREACH series = line %] <tr> [% IF loop.first %] <td align="center" rowspan="[% line.size %]"> <input type="checkbox" value="1" name="select[% newidx %]"> </td> <td rowspan="[% line.size %]"> <input type="text" size="20" name="label[% newidx %]" value="[% (chart.labels.$labelidx OR series.name) FILTER html %]"> </td> [% END %] <td> [% "{" IF line.size > 1 %] </td> <td> [% series.category FILTER html %] / [%+ series.subcategory FILTER html %] / [%+ series.name FILTER html %] <input type="hidden" name="line[% newidx %]" value="[% series.series_id %]"> </td> <td align="center"> [% IF user.id == series.creator OR UserInGroup("admin") %] <a href="chart.cgi?action=edit&series_id= [% series.series_id %]">Edit</a> | [% END %] <a href="buglist.cgi?cmdtype=dorem&namedcmd= [% series.category FILTER url_quote %]%20/%20 [% series.subcategory FILTER url_quote %]%20/%20 [% series.name FILTER url_quote -%]&series_id= [% series.series_id %]&remaction=runseries">Run Search</a> </td> </tr> [% END %] [% labelidx = labelidx + 1 %] [% newidx = newidx + 1 %] [% END %] [% IF chart.gt %] <tr> <td align="center"> <input type="checkbox" value="1" name="select65536"> <input type="hidden" value="1" name="gt"> </td> <td> <input type="text" size="20" name="labelgt" value="[% (chart.labelgt OR gttext) FILTER html %]"> </td> <td></td> <td> <i>[% gttext FILTER html %]</i> </td> <td></td> </tr> [% END %] <tr> <td colspan="6"> </td> </tr> <tr> <td valign="bottom" style="text-align: center;"> <input type="submit" name="action-sum" value="Sum" style="width: 5em;"><br> <input type="submit" name="action-remove" value="Remove" style="width: 5em;"> </td> <td style="text-align: right; vertical-align: bottom;"> <b>Cumulate:</b> <input type="checkbox" name="cumulate" value="1" [% " checked" IF chart.cumulate %]> </td> <td></td> <td valign="bottom"> <b>Date Range:</b> <input type="text" size="12" name="datefrom" value="[% time2str("%Y-%m-%d", chart.datefrom) IF chart.datefrom%]"> <b>to</b> <input type="text" size="12" name="dateto" value="[% time2str("%Y-%m-%d", chart.dateto) IF chart.dateto %]"> </td> <td style="text-align: right" valign="bottom"> <input type="submit" name="action-wrap" value="Chart This List"> </td> </tr> </table> [% ELSE %] <p><i>None</i></p> [% END %] </form> [% IF UserInGroup('editbugs') %] <h3><a href="query.cgi?format=create-series">Create New Data Set</a></h3> [% END %] [% PROCESS global/footer.html.tmpl %] --- NEW FILE: report.csv.tmpl --- [%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of # the License at http://www.mozilla.org/MPL/ # # Software distributed under the License is distributed on an "AS # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. # # The Original Code is the Bugzilla Bug Tracking System. # # The Initial Developer of the Original Code is Netscape Communications # Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All # Rights Reserved. # # Contributor(s): Gervase Markham <ge...@ge...> #%] [% PROCESS "global/field-descs.none.tmpl" %] [% FOREACH tbl = tbl_names %] [% PROCESS "reports/report-table.csv.tmpl" %] [% END %] --- NEW FILE: menu.html.tmpl --- [%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of # the License at http://www.mozilla.org/MPL/ # # Software distributed under the License is distributed on an "AS # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. # # The Original Code is the Bugzilla Bug Tracking System. # # The Initial Developer of the Original Code is Netscape Communications # Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All # Rights Reserved. # # Contributor(s): Gervase Markham <ge...@ge...> # # Russian translation: Vitaly Fedrushkov <fed...@us...> #%] [%# INTERFACE: # This template has no interface. It's a list of the available report # types in Bugzilla. #%] [% PROCESS global/variables.none.tmpl %] [% PROCESS global/header.html.tmpl title = "ðÏÄÇÏÔÏ×ËÁ ÏÔÞÅÔÏ× É ÄÉÁÇÒÁÍÍ" %] <p> [% terms.Bugzilla %] ÐÏÚ×ÏÌÑÅÔ ÁÎÁÌÉÚÉÒÏ×ÁÔØ ÓÏÓÔÏÑÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ [% terms.bugs_gen %] ÎÅÓËÏÌØËÉÍÉ ÓÐÏÓÏÂÁÍÉ. </p> <h2>ôÅËÕÝÅÅ ÓÏÓÔÏÑÎÉÅ</h2> <ul> <li> <strong><a href="query.cgi">ðÏÉÓË</a></strong> - ÐÒÏÓÍÏÔÒ ÓÐÉÓËÏ× [% terms.bugs_gen %]. </li> <li> <strong> <a href="query.cgi?format=report-table">ïÔÞÅÔÙ</a> </strong> - ÔÁÂÌÉÃÙ ËÏÌÉÞÅÓÔ×Á [% terms.bugs_gen %] × 1, 2 ÉÌÉ 3 ÉÚÍÅÒÅÎÉÑÈ, × ÆÏÒÍÁÔÅ HTML ÉÌÉ CSV. </li> <li> <strong> <a href="query.cgi?format=report-graph">äÉÁÇÒÁÍÍÙ</a> </strong> - ÇÒÁÆÉËÉ, ÇÉÓÔÏÇÒÁÍÍÙ É ËÒÕÇÏ×ÙÅ ÄÉÁÇÒÁÍÍÙ. </li> </ul> <h2>äÉÎÁÍÉËÁ ÉÚÍÅÎÅÎÉÊ</h2> <ul> <li> <strong><a href="reports.cgi">óÔÁÒÙÊ ÓÐÏÓÏÂ</a></strong> - ÇÒÁÆÉËÉ ÓÏÓÔÏÑÎÉÊ É ÒÅÛÅÎÉÊ [% terms.bugs_gen %] ×ÄÏÌØ ÏÓÉ ×ÒÅÍÅÎÉ, ÄÌÑ ËÁÖÄÏÇÏ ÐÒÏÄÕËÔÁ. </li> [% IF UserInGroup(Param("chartgroup")) %] <li> <strong><a href="chart.cgi">îÏ×ÙÊ ÓÐÏÓÏÂ</a></strong> - ÒÅÚÕÌØÔÁÔ ÌÀÂÏÇÏ ÕÓÌÏ×ÉÑ ÏÔÂÏÒÁ ×Ï ×ÒÅÍÅÎÉ. çÏÒÚÁÄÏ ÂÏÌÅÅ ÍÏÝÎÙÊ ÉÎÓÔÒÕÍÅÎÔ. </li> [% END %] </ul> [% PROCESS global/footer.html.tmpl %] --- NEW FILE: report-simple.html.tmpl --- [%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of # the License at http://www.mozilla.org/MPL/ # # Software distributed under the License is distributed on an "AS # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. # # The Original Code is the Bugzilla Bug Tracking System. # # Contributor(s): Alan Starr (alanjstr) # # Russian translation: Vitaly Fedrushkov <fed...@us...> #%] [%# INTERFACE: # You need to fulfill the interface to report-table.html.tmpl. #%] [% PROCESS global/variables.none.tmpl %] <html> [% title = "óÐÉÓÏË $terms.bugs_gen" %] <head> <title>[% title FILTER html %]</title> </head> <body> [% PROCESS "reports/report-table.html.tmpl" %] </body> </html> --- NEW FILE: series.html.tmpl --- [%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of # the License at http://www.mozilla.org/MPL/ # # Software distributed under the License is distributed on an "AS # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. # # The Original Code is the Bugzilla Bug Tracking System. # # The Initial Developer of the Original Code is Netscape Communications # Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All # Rights Reserved. # # Contributor(s): Gervase Markham <ge...@ge...> # # Russian translation: Vitaly Fedrushkov <fed...@us...> #%] [%# INTERFACE: # default: hash. Defaults for category, subcategory, name etc. # button_name: string. What the button will say. # category: hash (keyed by category) of hashes (keyed by subcategory) of # hashes (keyed by name), with value being the series_id of the # series. Contains details of all series the user can see. #%] [% PROCESS "reports/series-common.html.tmpl" newtext = "îÏ×ÁÑ ÓÅÒÉÑ" %] <table cellpadding="2" cellspacing="2" border="0" style="text-align: left; margin-left: 20px"> <tbody> <tr> <th>ëÁÔÅÇÏÒÉÑ:</th> <th></th> <th>ðÏÄËÁÔÅÇÏÒÉÑ:</th> <th>éÍÑ:</th> <td></td> </tr> <tr> [% PROCESS series_select sel = { name => 'category', size => 5, onchange => "catSelected()" } %] <td> <noscript> <input type="submit" name="action-edit" value="ïÂÎÏ×ÉÔØ -->"> </noscript> </td> [% PROCESS series_select sel = { name => 'subcategory', size => 5, onchange => "checkNewState()" } %] <td valign="top" name="name"> <input type="text" name="name" maxlength="64" value="[% default.name.0 FILTER html %]" size="25"> </td> <td valign="top"> <span style="font-weight: bold;">÷ÙÐÏÌÎÑÔØ ËÁÖÄÙÅ</span> <input type="text" size="2" name="frequency" value="[% (default.frequency.0 OR 7) FILTER html %]"> <span style="font-weight: bold;"> ÄÎÅÊ</span><br> [%# Change 'admin' here and in Series.pm, or remove the check completely, if you want to change who can make series public. %] [% IF UserInGroup('admin') %] <input type="checkbox" name="public" [% "checked='checked'" IF default.public.0 %]> <span style="font-weight: bold;">òÅÚÕÌØÔÁÔ ÄÏÓÔÕÐÅÎ ×ÓÅÍ<br> (Ó ÕÞÅÔÏÍ ÐÒÁ× ÄÏÓÔÕÐÁ)</span> [% END %] </td> </tr> <tr> <td> <input type="text" style="width: 100%" name="newcategory" maxlength="64" value="[% default.newcategory.0 FILTER html %]"> </td> <td></td> <td> <input type="text" style="width: 100%" name="newsubcategory" maxlength="64" value="[% default.newsubcategory.0 FILTER html %]"> </td> <td></td> <td> <input type="submit" name="submit-button" value="[% button_name FILTER html %]"> </td> </tr> </tbody> </table> --- NEW FILE: duplicates.rdf.tmpl --- [% template_version = "1....@bu..." %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of # the License at http://www.mozilla.org/MPL/ # # Software distributed under the License is distributed on an "AS # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. # # The Original Code is the Bugzilla Bug Tracking System. # # The Initial Developer of the Original Code is Netscape Communications # Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All # Rights Reserved. # # Contributor(s): Myk Melez <my...@mo...> #%] <?xml version="1.0"?> <!-- [% template_version %] --> <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:bz="http://www.bugzilla.org/rdf#" xmlns:nc="http://home.netscape.com/NC-rdf#"> <bz:duplicates_report rdf:about="[% Param('urlbase') %]data/duplicates.rdf"> <bz:bugs> <Seq> [% FOREACH bug = bugs %] <li> <bz:bug rdf:about="[% Param('urlbase') %]show_bug.cgi?id=[% bug.id %]"> <bz:id nc:parseType="Integer">[% bug.id %]</bz:id> <bz:resolution>[% bug.resolution FILTER html %]</bz:resolution> <bz:duplicate_count nc:parseType="Integer">[% bug.count %]</bz:duplicate_count> <bz:duplicate_delta nc:parseType="Integer">[% bug.delta %]</bz:duplicate_delta> <bz:component>[% bug.component FILTER html %]</bz:component> <bz:severity>[% bug.bug_severity FILTER html %]</bz:severity> <bz:os>[% bug.op_sys FILTER html %]</bz:os> <bz:target_milestone>[% bug.target_milestone FILTER html %]</bz:target_milestone> <bz:summary>[% bug.short_desc FILTER html %]</bz:summary> </bz:bug> </li> [% END %] </Seq> </bz:bugs> </bz:duplicates_report> </RDF> --- NEW FILE: report-table.csv.tmpl --- [%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of # the License at http://www.mozilla.org/MPL/ # # Software distributed under the License is distributed on an "AS # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. # # The Original Code is the Bugzilla Bug Tracking System. # # The Initial Developer of the Original Code is Netscape Communications # Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All # Rights Reserved. # # Contributor(s): Gervase Markham <ge...@ge...> #%] [%# INTERFACE: # See report-table.html.tmpl. #%] [% PROCESS global/variables.none.tmpl %] [% colsepchar = user.settings.csv_colsepchar.value %] [% num_bugs = BLOCK %]Number of [% terms.bugs %][% END %] [% tbl_field_disp = field_descs.$tbl_field || tbl_field %] [% col_field_disp = field_descs.$col_field || col_field %] [% row_field_disp = field_descs.$row_field || row_field %] [% IF tbl_field %] [% tbl_field_disp FILTER csv %]: [% tbl FILTER csv %] [% END %] [% IF row_field %] [% row_field_disp FILTER csv %] [% END %] [% " / " IF col_field AND row_field %] [% col_field_disp FILTER csv %] [% IF col_field -%] [% FOREACH col = col_names -%] [% colsepchar %] [% IF col_field == 'bug_status' %] [% status_descs.$col FILTER csv -%] [% ELSIF col_field == 'resolution' %] [% resolution_descs.$col FILTER csv -%] [% ELSE %] [% col FILTER csv -%] [% END %] [% END -%] [% ELSE -%] [% colsepchar %][% num_bugs %] [% END %] [% FOREACH row = row_names %] [% IF row_field == 'bug_status' %] [% status_descs.$row FILTER csv -%] [% ELSIF row_field == 'resolution' %] [% resolution_descs.$row FILTER csv -%] [% ELSE %] [% row FILTER csv -%] [% END %] [% FOREACH col = col_names %] [% colsepchar %] [% IF data.$tbl AND data.$tbl.$col AND data.$tbl.$col.$row %] [% data.$tbl.$col.$row -%] [% ELSE %] [% -%]0 [% END %] [% END %] [% END %] --- NEW FILE: series-common.html.tmpl --- [%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of # the License at http://www.mozilla.org/MPL/ # # Software distributed under the License is distributed on an "AS # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. # # The Original Code is the Bugzilla Bug Tracking System. # # The Initial Developer of the Original Code is Netscape Communications # Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All # Rights Reserved. # # Contributor(s): Gervase Markham <ge...@ge...> #%] [%# INTERFACE: # donames: boolean. True if we have a multi-select for names as well as # categories and subcategories. # category: hash (keyed by category) of hashes (keyed by subcategory) of # hashes (keyed by name), with value being the series_id of the # series. Contains details of all series the user can see. #%] [% subcategory = category.${default.category} %] [% name = subcategory.${default.subcategory} %] <script type="text/javascript"> [%# This structure holds details of the series the user can select from. %] var series = { [% FOREACH c = category.keys.sort %] "[%+ c FILTER js %]" : { [% FOREACH s = category.$c.keys.sort %] "[%+ s FILTER js %]" : { [% IF donames %] [% FOREACH n = category.$c.$s.keys.sort %] "[% n FILTER js %]": [% category.$c.$s.$n FILTER js %][% ", " UNLESS loop.last %] [% END %] [% END %] }[% ", " UNLESS loop.last %] [% END %] }[% ", " UNLESS loop.last %] [% END %] }; [%# Should attempt to preserve selection across invocations @@@ %] [%# This function takes necessary action on selection of a category %] function catSelected() { var cat = document.chartform.category.value; var subcats = series[cat]; var subcatwidget = document.chartform.subcategory; subcatwidget.options.length = 0; var i = 0; for (x in subcats) { subcatwidget.options[i] = new Option(x, x); i++; } [% IF newtext %] subcatwidget.options[i] = new Option("[% newtext FILTER js %]", ""); [% END %] subcatwidget.options[0].selected = true; if (document.chartform.action[1]) { [%# On the query form, select the right radio button. %] document.chartform.action[1].checked = true; } checkNewState(); } [%# This function updates the disabled state of the two "new" textboxes %] function checkNewState() { var fm = document.chartform; if (fm.newcategory) { fm.newcategory.disabled = (fm.category.value != "" || fm.action[1] && fm.action[1].checked == false); fm.newsubcategory.disabled = (fm.subcategory.value != "" || fm.action[1] && fm.action[1].checked == false); } } </script> [%###########################################################################%] [%# Block for SELECT fields - pinched from search/form.html.tmpl #%] [%###########################################################################%] [% BLOCK series_select %] <td align="left"> <label for="[% sel.name %]" accesskey="[% sel.accesskey %]"> <select name="[% sel.name %]" id="[% sel.name %]" size="[% sel.size %]" style="width: 15em" [%+ "disabled=\"disabled\"" UNLESS ${sel.name}.keys.size || newtext %] [%+ "onchange=\"$sel.onchange\"" IF sel.onchange %]> [% FOREACH x = ${sel.name}.keys.sort %] <option value="[% x FILTER html %]" [% " selected" IF default.${sel.name} == x %]> [% x FILTER html %]</option> [% END %] [% IF newtext %] <option value="">[% newtext FILTER html %]</option> [% ELSIF NOT ${sel.name}.keys.size %] <option value="" disabled="disabled"></option> [% END %] </select> </label> </td> [% END %] --- NEW FILE: report-bar.png.tmpl --- [%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of # the License at http://www.mozilla.org/MPL/ # # Software distributed under the License is distributed on an "AS # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. # # The Original Code is the Bugzilla Bug Tracking System. # # The Initial Developer of the Original Code is Netscape Communications # Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All # Rights Reserved. # # Contributor(s): Gervase Markham <ge...@ge...> #%] [% PROCESS global/variables.none.tmpl %] [% y_label = "$terms.Bugs" %] [% PROCESS "global/field-descs.none.tmpl" %] [% col_field_disp = field_descs.$col_field || col_field %] [% IF col_field == 'bug_status' %] [% FOR i IN [ 0 .. data.0.0.max ] %] [% data.0.0.$i = status_descs.${data.0.0.$i} %] [% END %] [% END %] [% IF col_field == 'resolution' %] [% FOR i IN [ 0 .. data.0.0.max ] %] [% data.0.0.$i = resolution_descs.${data.0.0.$i} %] [% END %] [% END %] [% IF row_field == 'bug_status' %] [% FOR i IN [ 0 .. row_names.max ] %] [% row_names.$i = status_descs.${row_names.$i} %] [% END %] [% END %] [% IF row_field == 'resolution' %] [% FOR i IN [ 0 .. row_names.max ] %] [% row_names.$i = resolution_descs.${row_names.$i} %] [% END %] [% END %] [% FILTER null; USE graph = GD.Graph.bars(width, height); graph.set(x_label => col_field_disp, y_label => y_label, y_tick_number => 8, y_number_format => "%d", x_label_position => 0.5, x_labels_vertical => x_labels_vertical, bar_spacing => 8, shadow_depth => 4, shadowclr => 'dred', show_values => 1, legend_placement => "RT"); graph.set(cumulate => "true", show_values => 0) IF cumulate; # Workaround for the fact that set_legend won't take row_names directly, # because row_names is an array reference rather than an array. graph.set_legend(row_names.0, row_names.1, row_names.2, row_names.3, row_names.4, row_names.5, row_names.6, row_names.7, row_names.8, row_names.9, row_names.10, row_names.11, row_names.12, row_names.13, row_names.14, row_names.15); graph.plot(data.0).png | stdout(1); END; -%] --- NEW FILE: edit-series.html.tmpl --- [%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of # the License at http://www.mozilla.org/MPL/ # # Software distributed under the License is distributed on an "AS # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. # # The Original Code is the Bugzilla Bug Tracking System. # # The Initial Developer of the Original Code is Netscape Communications # Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All # Rights Reserved. # # Contributor(s): Gervase Markham <ge...@ge...> # # Russian translation: Vitaly Fedrushkov <fed...@us...> #%] [% title = "òÅÄÁËÔÉÒÏ×ÁÎÉÅ ÓÅÒÉÉ" %] [% h2 = BLOCK %] [% default.category FILTER html %] / [%+ default.subcategory FILTER html %] / [%+ default.name FILTER html %] [% END %] [% PROCESS global/header.html.tmpl %] [% IF changes_saved %] <p> <font color="red"> óÅÒÉÑ ÄÁÎÎÙÈ ÏÂÎÏ×ÌÅÎÁ. </font> </p> [% END %] <form method="get" action="chart.cgi" name="chartform"> [% PROCESS reports/series.html.tmpl button_name = "éÚÍÅÎÉÔØ ÎÁÂÏÒ ÄÁÎÎÙÈ" %] <input type="hidden" name="action" value="alter"> [% IF default.series_id %] <input type="hidden" name="series_id" value="[% default.series_id %]"> [% END %] </form> <p> <b>ðÏÄÇÏÔÏ×ÉÌ</b>: [% IF creator.email %] <a href="mailto:[% creator.email FILTER html %]"> [% creator.email FILTER html %]</a> [% ELSE %] (óÏÚÄÁÎÏ [% terms.Bugzilla %] Á×ÔÏÍÁÔÉÞÅÓËÉ.) [% END %] </p> <p>ðÒÉÍÅÞÁÎÉÅ: ÉÚÍÅÎÅÎÉÅ ÕÓÌÏ×ÉÊ ÏÔÂÏÒÁ ÄÌÑ ÜÔÏÇÏ ÎÁÂÏÒÁ ÄÁÎÎÙÈ × ÔÅËÕÝÅÊ ×ÅÒÓÉÉ ÎÅ×ÏÚÍÏÖÎÏ. </p> <p> <a href="query.cgi?[% default.query FILTER html %]">õÓÌÏ×ÉÑ ÏÔÂÏÒÁ ÓÅÒÉÉ</a> | <a href="buglist.cgi?cmdtype=dorem&namedcmd= [% default.category FILTER url_quote %]- [% default.subcategory FILTER url_quote %]- [% default.name FILTER url_quote %]&remaction=runseries&series_id= [% default.series_id %]">÷ÙÐÏÌÎÉÔØ ÏÔÂÏÒ</a> </p> [% PROCESS global/footer.html.tmpl %] |
|
From: Vitaly F. <fed...@us...> - 2005-11-05 09:20:59
|
Update of /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/list In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1354/list Modified Files: Tag: BUGZILLA-2_20 change-columns.html.tmpl edit-multiple.html.tmpl list-simple.html.tmpl list.csv.tmpl list.html.tmpl list.ics.tmpl quips.html.tmpl server-push.html.tmpl table.html.tmpl Log Message: Updated to Bugzilla 2.20 Index: list-simple.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/list/list-simple.html.tmpl,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -d -r1.5 -r1.5.2.1 --- list-simple.html.tmpl 20 Apr 2005 14:22:39 -0000 1.5 +++ list-simple.html.tmpl 5 Nov 2005 09:20:41 -0000 1.5.2.1 @@ -17,6 +17,8 @@ # Rights Reserved. # # Contributor(s): Myk Melez <my...@mo...> + # + # Russian translation: Dmitry Pupkov <dp...@mc...> #%] [%# INTERFACE: @@ -42,7 +44,7 @@ <head> <title>[% title %]</title> <base href="[% Param("urlbase") %]"> - <link href="css/buglist.css" rel="stylesheet" type="text/css"> + <link href="skins/standard/buglist.css" rel="stylesheet" type="text/css"> </head> <body> Index: list.csv.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/list/list.csv.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -d -r1.1 -r1.1.2.1 --- list.csv.tmpl 22 Feb 2005 13:10:02 -0000 1.1 +++ list.csv.tmpl 5 Nov 2005 09:20:41 -0000 1.1.2.1 @@ -21,16 +21,24 @@ #%] [% PROCESS global/variables.none.tmpl %] +[% USE date %] -bug_id, +[% colsepchar = user.settings.csv_colsepchar.value %] + +bug_id [% FOREACH column = displaycolumns %] - [% column FILTER csv %], + [% colsepchar %][% column FILTER csv %] [% END %] [% FOREACH bug = bugs %] - [% bug.bug_id %], + [% bug.bug_id %] [% FOREACH column = displaycolumns %] - [% bug.$column FILTER csv %], + [% colsepchar %] + [% IF column == "opendate" OR column == "changeddate" %] + [% rawcolumn = column.replace("date", "time") %] + [% bug.$column = date.format(bug.$rawcolumn, "%Y-%m-%d %H:%M:%S") %] + [% END %] + [% bug.$column FILTER csv %] [% END %] [% END %] Index: list.ics.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/list/list.ics.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -d -r1.1 -r1.1.2.1 --- list.ics.tmpl 22 Feb 2005 13:10:02 -0000 1.1 +++ list.ics.tmpl 5 Nov 2005 09:20:41 -0000 1.1.2.1 @@ -18,7 +18,7 @@ # # Contributor(s): William Jon McCann <mc...@jh...> #%] -[% PROCESS global/variables.none.tmpl %] +[% PROCESS global/variables.none.tmpl %][% USE date %] BEGIN:VCALENDAR CALSCALE:GREGORIAN [%+ PROCESS ics_prodid +%] @@ -32,7 +32,7 @@ [%+ PROCESS ics_status bug_status = bug.bug_status +%] [%+ PROCESS ics_dtstamp +%] [% IF bug.changeddate %] -[%+ bug.changeddate FILTER ics('LAST-MODIFIED') +%] +[%+ date.format(bug.changedtime,"%Y%m%dT%H%M%SZ") FILTER ics('LAST-MODIFIED') +%] [% END %] [% IF bug.percentage_complete %] [%+ bug.percentage_complete FILTER format('%d') FILTER ics('PERCENT-COMPLETE') +%] @@ -66,11 +66,11 @@ [% END %] [% BLOCK ics_dtstart %] - [% bug.opendate FILTER ics('DTSTART') %] + [% date.format(bug.opentime,"%Y%m%dT%H%M%SZ") FILTER ics('DTSTART') %] [% END %] [% BLOCK ics_dtstamp %] - [% currenttime FILTER ics('DTSTAMP') %] + [% date.format(date.now,"%Y%m%dT%H%M%SZ") FILTER ics('DTSTAMP') %] [% END %] [% BLOCK ics_status %] Index: list.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/list/list.html.tmpl,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -d -r1.6 -r1.6.2.1 --- list.html.tmpl 20 Apr 2005 14:22:39 -0000 1.6 +++ list.html.tmpl 5 Nov 2005 09:20:41 -0000 1.6.2.1 @@ -17,6 +17,8 @@ # Rights Reserved. # # Contributor(s): Myk Melez <my...@mo...> + # + # Russian translation: Dmitry Pupkov <dp...@mc...> #%] [%# INTERFACE: @@ -36,7 +38,7 @@ [% title = title _ ": " _ searchname %] [% END %] -[% style_urls = [ "css/buglist.css" ] %] +[% style_urls = [ "skins/standard/buglist.css" ] %] [% qorder = order FILTER url_quote IF order %] [% message = "buglist_sorted_by_relevance" IF sorted_by_relevance %] @@ -48,17 +50,22 @@ [% PROCESS global/header.html.tmpl title = title style = style + rsslink = "buglist.cgi?$urlquerypart&ctype=rss" %] <div align="center"> - <b>[% time2str("%a %b %e %T %Z %Y", currenttime) %]</b><br> + [% IF Param('timezone') %] + <b>[% time2str("%a %b %e %Y %T %Z", currenttime, Param('timezone')) %]</b><br> + [% ELSE %] + <b>[% time2str("%a %b %e %Y %T", currenttime) %]</b><br> + [% END %] [% IF debug %] <p>[% query FILTER html %]</p> [% END %] - [% IF Param('enablequips') != 'off' %] - [% DEFAULT quip = "$terms.Bugzilla ÄÏÂÁ×ÌÑÅÔ ÓÀÄÁ ÐÒÏÉÚ×ÏÌØÎÕÀ ÃÉÔÁÔÕ, ÎÏ, Ë ÓÏÖÁÌÅÎÉÅ, ÓÅÊÞÁÓ ËÏÐÉÌËÁ ÉÚÒÅÞÅÎÉÊ ÐÕÓÔÁÑ!" %] + [% IF user.settings.display_quips.value == 'on' %] + [% DEFAULT quip = "$terms.Bugzilla ÄÏÂÁ×ÌÑÅÔ ÓÀÄÁ ÐÒÏÉÚ×ÏÌØÎÕÀ ÃÉÔÁÔÕ, ÎÏ Õ×Ù, ÓÅÊÞÁÓ ÓÂÏÒÎÉË ÃÉÔÁÔ ÐÕÓÔ!" %] <a href="quips.cgi"><i>[% quip FILTER html %]</i></a> [% END %] @@ -67,7 +74,7 @@ [% IF toolong %] <h2> òÁÚÍÅÒ ÓÐÉÓËÁ ÓÌÉÛËÏÍ ×ÅÌÉË ÄÌÑ [% terms.Bugzilla %]; ËÎÏÐËÉ ÎÁ×ÉÇÁÃÉÉ - ÎÁ ÓÔÒÁÎÉÃÁÈ ÎÅËÏÔÏÒÙÈ [% terms.bugs_gen %] ÏÔËÌÀÞÅÎÙ. + ÎÁ ÓÔÒÁÎÉÃÁÈ ÏÔÄÅÌØÎÙÈ [% terms.bugs_gen %] ÏÔËÌÀÞÅÎÙ. </h2> [% END %] @@ -103,7 +110,7 @@ [% IF bugs.size == 0 %] [% terms.zeroSearchResults %]. [% ELSIF bugs.size == 1 %] - ïÄÎÁ [% terms.bug %] ÎÁÊÄÅÎÁ. + îÁÊÄÅÎÁ ÏÄÎÁ [% terms.bug %]. [% ELSE %] îÁÊÄÅÎÏ [% terms.bugs_gen %]: [% bugs.size %]. [% END %] @@ -124,15 +131,24 @@ [%# Navigation Bar #%] [%############################################################################%] -<p> <table> <tr> [% IF bugs.size > 0 %] <td valign="middle"> - <form method="post" action="long_list.cgi"> - <input type="hidden" name="buglist" value="[% buglist %]"> - <input type="submit" value="ðÏÄÒÏÂÎÏ"> + <form method="post" action="show_bug.cgi"> + [% FOREACH id = buglist %] + <input type="hidden" name="id" value="[% id FILTER html %]"> + [% END %] + <input type="hidden" name="format" value="multiple"> + <input type="submit" value=" ðÏÄÒÏÂÎÏ "> </form> + + [% IF UserInGroup(Param('timetrackinggroup')) %] + <form method="post" action="summarize_time.cgi"> + <input type="hidden" name="id" value="[% buglist_joined FILTER html %]"> + <input type="submit" value="ó×ÏÄËÁ ×ÒÅÍÅÎÉ"> + </form> + [% END %] </td> <td> </td> @@ -141,6 +157,8 @@ <a href="buglist.cgi? [% urlquerypart FILTER html %]&ctype=csv">CSV</a> | <a href="buglist.cgi? + [% urlquerypart FILTER html %]&ctype=rss">RSS</a> | + <a href="buglist.cgi? [% urlquerypart FILTER html %]&ctype=ics">iCalendar</a> | <a href="colchange.cgi? [% urlquerypart FILTER html %]">æÏÒÍÁÔ ×Ù×ÏÄÁ</a> | @@ -154,8 +172,11 @@ [% IF bugowners %] <a href="mailto: - [% bugowners FILTER html %]">ïÔÐÒÁ×ÉÔØ ÓÏÏÂÝÅÎÉÑ ÏÔ×ÅÔÓÔ×ÅÎÎÙÍ ÚÁ [% terms.bugs_gen %]</a> | + [% bugowners FILTER html %]">ïÔÐÒÁ×ÉÔØ ÓÏÏÂÝÅÎÉÑ ÉÓÐÏÌÎÉÔÅÌÑÍ [% terms.bugs_gen %]</a> | [% END %] + + [%# Links to more things users can do with this bug list. %] + [% Hook.process("links") %] </td> [% END %] @@ -164,14 +185,14 @@ <a href="query.cgi?[% urlquerypart FILTER html %] [% IF editqueryname != '' %]&known_name= [% editqueryname FILTER url_quote %] - [% END %]">éÚÍÅÎÉÔØ ÚÁÐÒÏÓ</a> + [% END %]">éÚÍÅÎÉÔØ ÏÔÂÏÒ</a> </td> [% IF searchtype == "saved" %] <td valign="middle" nowrap="nowrap"> | <a href="buglist.cgi?cmdtype=dorem&remaction=forget&namedcmd= - [% searchname FILTER url_quote %]">õÄÁÌÉÔØ ÚÁÐÒÏÓ ' + [% searchname FILTER url_quote %]">õÄÁÌÉÔØ ÏÔÂÏÒ ' [% searchname FILTER html %]'</a> </td> [% ELSE %] @@ -179,7 +200,7 @@ <td valign="middle"> <form method="get" action="buglist.cgi"> - <input type="submit" value="úÁÐÏÍÎÉÔØ ÚÁÐÒÏÓ"> ËÁË + <input type="submit" value="úÁÐÏÍÎÉÔØ ÏÔÂÏÒ"> ËÁË <input type="hidden" name="newquery" value="[% urlquerypart FILTER html %]"> <input type="hidden" name="cmdtype" value="doit"> @@ -191,7 +212,6 @@ [% END %] </tr> </table> -</p> [%############################################################################%] @@ -199,4 +219,3 @@ [%############################################################################%] [% PROCESS global/footer.html.tmpl %] - Index: quips.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/list/quips.html.tmpl,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -d -r1.6 -r1.6.2.1 --- quips.html.tmpl 20 Apr 2005 14:22:39 -0000 1.6 +++ quips.html.tmpl 5 Nov 2005 09:20:41 -0000 1.6.2.1 @@ -17,13 +17,16 @@ # Rights Reserved. # # Contributor(s): Gervase Markham <ge...@ge...> + # + # Russian translation: Dmitry Pupkov <dp...@mc...> #%] [%# INTERFACE: # added_quip: string. Defined if the CGI added a quip data before # displaying anything; if defined, its value is that quip. # show_quips: boolean. True if we are showing the entire quip list. - # quips: list of strings. Defined iff show_quips is true. List of all quips. + # quips: list of strings. Defined if and only if show_quips is true. + # List of all quips. #%] [% PROCESS global/variables.none.tmpl %] @@ -53,26 +56,36 @@ [% END %] [% IF approved or unapproved %] - <p>[% approved.size %] ÃÉÔÁÔ ÐÏÄÔ×ÅÒÖÄÅÎÏ É [% unapproved.size %] ÃÉÔÁÔ ÏÔ×ÅÒÇÎÕÔÏ</p> + <p>[% approved.size %] ÃÉÔÁÔ ÒÁÚÒÅÛÅÎÏ É [% unapproved.size %] ÃÉÔÁÔ ÚÁÐÒÅÝÅÎÏ</p> [% END %] + <p> [% terms.Bugzilla %] ×ÙÂÉÒÁÅÔ ÓÌÕÞÁÊÎÕÀ ÃÉÔÁÔÕ ÉÚ ËÏÐÉÌËÕ × ËÁÖÄÙÊ - ÓÐÉÓÏË [% terms.bugs_gen %]. ÷Ù ÍÏÖÅÔÅ ÄÏÂÁ×ÌÑÔØ Ó×ÏÉ Ó×ÏÉ ÉÚÒÅÞÅÎÉÑ. îÁÐÉÛÉÔÅ ÞÔÏ-ÎÉÂÕÄØ - ÍÕÄÒÏÅ, ÏÓÔÒÏÕÍÎÏÅ ÉÌÉ ÐÒÏÓÔÏ ÓÍÅÛÎÏÅ (ÐÏÖÁÌÕÊÓÔÁ, ÎÅ ÐÉÛÉÔÅ ÇÒÕÂÏÓÔÅÊ É ÎÅÐÒÉÓÔÏÊÎÏÓÔÅÊ) - É ÎÁÖÍÉÔÅ ÐÅÄÁÌØ. - [% IF Param("enablequips") == "approved" AND !user.groups.admin %] - ÷ÁÛÁ ÃÉÔÁÔÁ ÂÕÄÅÔ ÄÏÂÁ×ÌÅÎÁ × ËÏÐÉÌËÕ ÐÏÓÌÅ ÐÏÄÔ×ÅÒÖÄÅÎÉÑ. - [% END %] + ÓÐÉÓÏË [% terms.bugs_gen %]. </p> -<form method="post" action="quips.cgi"> - <input type="hidden" name="action" value="add"> - <input size="80" name="quip"> +[% IF Param("quip_list_entry_control") != "closed" %] <p> - <input type="submit" value="äÏÂÁ×ÉÔØ × ËÏÐÉÌËÕ"> + ÷Ù ÍÏÖÅÔÅ ÄÏÂÁ×ÌÑÔØ Ó×ÏÉ Ó×ÏÉ ÉÚÒÅÞÅÎÉÑ. îÁÐÉÛÉÔÅ ÞÔÏ-ÎÉÂÕÄØ ÍÕÄÒÏÅ, + ÏÓÔÒÏÕÍÎÏÅ ÉÌÉ ÐÒÏÓÔÏ ÓÍÅÛÎÏÅ (ÐÏÖÁÌÕÊÓÔÁ, ÎÅ ÐÉÛÉÔÅ ÇÒÕÂÏÓÔÅÊ É ÎÅÐÒÉÓÔÏÊÎÏÓÔÅÊ) + É ÎÁÖÍÉÔÅ ÐÅÄÁÌØ. + [% IF Param("quip_list_entry_control") == "moderated" AND !user.groups.admin %] + ÷ÁÛÁ ÃÉÔÁÔÁ ÂÕÄÅÔ ÄÏÂÁ×ÌÅÎÁ × ËÏÐÉÌËÕ ÐÏÓÌÅ ÐÏÄÔ×ÅÒÖÄÅÎÉÑ. + [% END %] </p> -</form> + + <form method="post" action="quips.cgi"> + <input type="hidden" name="action" value="add"> + <input size="80" name="quip"> + <p> + <input type="submit" value="äÏÂÁ×ÉÔØ"> + </p> + </form> +[% ELSE %] + <p>äÏÂÁ×ÌÅÎÉÅ ÃÉÔÁÔ × ÄÁÎÎÙÊ ÍÏÍÅÎÔ ÚÁÐÒÅÝÅÎÏ. + </p> +[% END %] [% IF show_quips %] [% IF !UserInGroup('admin') %] @@ -88,18 +101,18 @@ [% ELSE %] <h2>òÅÄÁËÔÉÒÏ×ÁÔØ ÓÕÝÅÓÔ×ÕÀÝÉÅ ÃÉÔÁÔÙ:</h2> <p> - <strong>ðÒÉÍÅÞÁÎÉÅ:</strong> ôÏÌØËÏ ÐÏÄÔ×ÅÒÖÄÅÎÎÙÅ ÃÉÔÁÔÙ ÂÕÄÕÔ ÐÏËÁÚÁÎÙ - åÓÌÉ × ÎÁÓÔÒÏÊËÁÈ ÆÌÁÇ enablequips ÕÓÔÁÎÏ×ÌÅÎ × <q>on</q>, ××ÅÄ£ÎÎÙÅ ÃÉÔÁÔÙ ÂÕÄÕÔ - Á×ÔÏÍÁÔÉÞÅÓËÉ ÐÏÄÔ×ÅÒÖÄÅÎÙ + <strong>ðÒÉÍÅÞÁÎÉÅ:</strong> ôÏÌØËÏ ÒÁÚÒÅÛÅÎÎÙÅ ÃÉÔÁÔÙ ÂÕÄÕÔ ÐÏËÁÚÁÎÙ. + åÓÌÉ × ÎÁÓÔÒÏÊËÁÈ ÓÉÓÔÅÍÙ ÐÁÒÁÍÅÔÒ 'quip_list_entry_control' ÕÓÔÁÎÏ×ÌÅÎ + × <q>open</q>, ××ÅÄ£ÎÎÙÅ ÃÉÔÁÔÙ ÂÕÄÕÔ Á×ÔÏÍÁÔÉÞÅÓËÉ ÒÁÚÒÅÛÅÎÙ. </p> <form name="editform" method="post" action="quips.cgi"> - <input type="hidden" name="action" value="ÐÏÄÔ×ÅÒÄÉÔØ"> + <input type="hidden" name="action" value="ÒÁÚÒÅÛÉÔØ"> <table border="1"> <thead><tr> <th>ãÉÔÁÔÁ</th> <th>á×ÔÏÒ</th> <th>äÅÊÓÔ×ÉÅ</th> - <th>ðÏÄÔ×ÅÒÄÉÔØ</th> + <th>òÁÚÒÅÛÅÎÉÅ</th> </tr></thead><tbody> [% FOREACH quipid = quipids %] <tr> @@ -107,7 +120,7 @@ <td> [% userid = quips.$quipid.userid %] [% users.$userid FILTER html %] - [% "Unknown" IF NOT users.$userid %] + [% "îÅÉÚ×ÅÓÔÅÎ" IF NOT users.$userid %] </td> <td> <a href="quips.cgi?action=delete&quipid=[% quipid FILTER uri%]"> @@ -123,7 +136,7 @@ [% END %] </tbody> </table> - <script type="text/javascript" language="JavaScript"><!-- + <script type="text/javascript"><!-- var numelements = document.forms.editform.elements.length; function SetCheckboxes(value) { var item; @@ -133,12 +146,12 @@ } } document.write(' <input type="button" name="uncheck_all" ' - +'value="óÎÑÔØ ÐÏÍÅÔËÕ ÓÏ ×ÓÅÈ" onclick="SetCheckboxes(false);">'); + +'value="úÁÐÒÅÔÉÔØ ×ÓÅ" onclick="SetCheckboxes(false);">'); document.write(' <input type="button" name="check_all" ' - +'value="ðÏÍÅÔÉÔØ ×ÓÅ" onclick="SetCheckboxes(true);">'); + +'value="òÁÚÒÅÛÉÔØ ×ÓÅ" onclick="SetCheckboxes(true);">'); //--></script> - <input type="submit" value="ïÂÎÏ×ÉÔØ"> + <input type="submit" value="óÏÈÒÁÎÉÔØ"> </form> <br> [% END %] @@ -147,7 +160,7 @@ ìÀÂÉÔÅÌÉ ÍÕÄÒÏÓÔÅÊ × ÂÏÌØÛÏÍ ËÏÌÉÞÅÓÔ×Å ÍÏÇÕÔ <a href="quips.cgi?action=show">ÐÏÓÍÏÔÒÅÔØ [% IF UserInGroup('admin') %] - É ÏÔÒÅÄÁËÔÉÒÏ×ÁÔØ + É ÉÚÍÅÎÉÔØ [% END %] ×ÅÓØ ÓÐÉÓÏË ÃÉÔÁÔ</a>. </p> Index: table.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/list/table.html.tmpl,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -d -r1.6 -r1.6.2.1 --- table.html.tmpl 20 Apr 2005 14:22:39 -0000 1.6 +++ table.html.tmpl 5 Nov 2005 09:20:41 -0000 1.6.2.1 @@ -17,6 +17,8 @@ # Rights Reserved. # # Contributor(s): Myk Melez <my...@mo...> + # + # Russian translation: Dmitry Pupkov <dp...@mc...> #%] [%############################################################################%] @@ -43,14 +45,14 @@ "bug_severity" => { maxlength => 3 , title => "óÅÒ" } , "priority" => { maxlength => 3 , title => "ðÒÔ" } , "rep_platform" => { maxlength => 3 , title => "ðÌÆ" } , - "bug_status" => { maxlength => 4 } , + "bug_status" => { maxlength => 8 } , "assigned_to" => { maxlength => 30 , ellipsis => "..." } , "assigned_to_realname" => { maxlength => 20 , ellipsis => "..." } , "reporter" => { maxlength => 30 , ellipsis => "..." } , "reporter_realname" => { maxlength => 20 , ellipsis => "..." } , - "qa_contact" => { maxlength => 30 , ellipsis => "..." , title => "ëÏÎÔÒÏÌØ ËÁÞÅÓÔ×Á" } , - "qa_contact_realname" => { maxlength => 20 , ellipsis => "..." , title => "ëÏÎÔÒÏÌØ ËÁÞÅÓÔ×Á" } , - "resolution" => { maxlength => 4 } , + "qa_contact" => { maxlength => 30 , ellipsis => "..." , title => "ðÒÉÅÍËÁ" } , + "qa_contact_realname" => { maxlength => 20 , ellipsis => "..." , title => "ðÒÉÅÍËÁ" } , + "resolution" => { maxlength => 8 } , "short_desc" => { wrap => 1 } , "short_short_desc" => { maxlength => 60 , ellipsis => "..." , wrap => 1 } , "status_whiteboard" => { title => "úÁÍÅÔËÉ" , wrap => 1 } , @@ -58,7 +60,7 @@ "product" => { maxlength => 8 } , "version" => { maxlength => 5 , title => "÷ÅÒÓÉÑ" } , "op_sys" => { maxlength => 4 } , - "target_milestone" => { title => "ðÌÁÎÉÒÕÅÔÓÑ Ë" } , + "target_milestone" => { title => "úÁÐÌÁÎÉÒÏ×ÁÎÏ" } , "percentage_complete" => { format_value => "%d %%" } , } %] @@ -159,8 +161,9 @@ bz_[% bug.priority FILTER css_class_quote -%] bz_[% bug.bug_status FILTER css_class_quote -%] [%+ "bz_$bug.resolution" FILTER css_class_quote IF bug.resolution -%] - [%+ "bz_secure" IF bug.isingroups -%] - [%+ count % 2 == 1 ? "bz_odd" : "bz_even" -%] + [%+ "bz_secure" IF bug.secure_mode -%] + [%+ "bz_secure_mode_$bug.secure_mode" FILTER css_class_quote IF bug.secure_mode -%] + [%+ count % 2 == 1 ? "bz_row_odd" : "bz_row_even" -%] "> @@ -175,18 +178,20 @@ </td> [% FOREACH column = displaycolumns %] - <td> - [% '<nobr>' IF NOT abbrev.$column.wrap %] + <td [% 'style="white-space: nowrap"' IF NOT abbrev.$column.wrap %]> [% IF abbrev.$column.format_value %] [%- bug.$column FILTER format(abbrev.$column.format_value) FILTER html -%] [% ELSIF column == 'actual_time' || column == 'remaining_time' || column == 'estimated_time' %] [% PROCESS formattimeunit time_unit=bug.$column %] + [% ELSIF column == 'bug_status' %] + [%- status_descs.${bug.$column}.truncate(abbrev.$column.maxlength, abbrev.$column.ellipsis) FILTER html %] + [% ELSIF column == 'resolution' %] + [%- resolution_descs.${bug.$column}.truncate(abbrev.$column.maxlength, abbrev.$column.ellipsis) FILTER html %] [% ELSE %] [%- bug.$column.truncate(abbrev.$column.maxlength, abbrev.$column.ellipsis) FILTER html -%] [% END %] - [%- '</nobr>' IF NOT abbrev.$column.wrap %] </td> [% END %] Index: change-columns.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/list/change-columns.html.tmpl,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -d -r1.8 -r1.8.2.1 --- change-columns.html.tmpl 20 Apr 2005 14:33:45 -0000 1.8 +++ change-columns.html.tmpl 5 Nov 2005 09:20:41 -0000 1.8.2.1 @@ -1,9 +1,9 @@ -<!-- 1....@bu... --> +[%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of # the License at http://www.mozilla.org/MPL/ - # + # # Software distributed under the License is distributed on an "AS # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing @@ -18,7 +18,7 @@ # # Contributor(s): Dave Lawrence <dk...@re...> # - # Russian translation: Vitaly Fedrushkov <fed...@us...> + # Russian translation: Dmitry Pupkov <dp...@mc...> #%] [% PROCESS global/variables.none.tmpl %] @@ -35,11 +35,10 @@ [% PROCESS "global/field-descs.none.tmpl" %] [% field_descs.short_short_desc = "ïÐÉÓÁÎÉÅ (ÐÅÒ×ÙÅ 60 ÓÉÍ×ÏÌÏ×)" %] [% field_descs.short_desc = "ðÏÌÎÏÅ ÏÐÉÓÁÎÉÅ" %] -[% field_descs.assigned_to_realname = "ðÏÌÎÏÅ ÉÍÑ ÏÔ×ÅÔÓÔ×ÅÎÎÏÇÏ" %] +[% field_descs.assigned_to_realname = "ðÏÌÎÏÅ ÉÍÑ ÉÓÐÏÌÎÉÔÅÌÑ" %] [% field_descs.reporter_realname = "ðÏÌÎÏÅ ÉÍÑ ÉÎÉÃÉÁÔÏÒÁ" %] -[% field_descs.qa_contact_realname = "ëÏÎÔÒÏÌØ ëÁÞÅÓÔ×Á" %] +[% field_descs.qa_contact_realname = "ðÏÌÎÏÅ ÉÍÑ ÏÔ×ÅÔÓÔ×ÅÎÎÏÇÏ ÚÁ ÐÒÉÅÍËÕ" %] - <form action="colchange.cgi"> <input type="hidden" name="rememberedquery" value="[% buffer FILTER html %]"> [% FOREACH column = masterlist %] @@ -50,7 +49,7 @@ </label> <br> [% END %] - + <p> <input id="nosplitheader" type="radio" name="splitheader" value="0" [% "checked='checked'" IF NOT splitheader %]> @@ -58,24 +57,24 @@ óÔÁÎÄÁÒÔÎÁÑ ÛÁÐËÁ </label> <br> - + <input id="splitheader" type="radio" name="splitheader" value="1" [% "checked='checked'" IF splitheader %]> <label for="splitheader"> ëÏÍÐÁËÔÎÁÑ ÛÁÐËÁ </label> </p> - + <p> <input type="submit" value="éÚÍÅÎÉÔØ ÐÏÌÑ"> </p> </form> - + <form action="colchange.cgi"> <input type="hidden" name="rememberedquery" value="[% buffer FILTER html %]"> <input type="hidden" name="resetit" value="1"> <input type="submit" value="÷ÅÒÎÕÔØ ÓÔÁÎÄÁÒÔÎÙÅ ÚÎÁÞÅÎÉÑ [% terms.Bugzilla %]"> </form> - + [% PROCESS global/footer.html.tmpl %] Index: edit-multiple.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/list/edit-multiple.html.tmpl,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -d -r1.6 -r1.6.2.1 --- edit-multiple.html.tmpl 20 Apr 2005 14:22:39 -0000 1.6 +++ edit-multiple.html.tmpl 5 Nov 2005 09:20:41 -0000 1.6.2.1 @@ -17,6 +17,9 @@ # Rights Reserved. # # Contributor(s): Myk Melez <my...@mo...> + # + # Russian translation: Dmitry Pupkov <dp...@mc...> + # Vitaly Fedrushkov <fed...@us...> #%] [% PROCESS global/variables.none.tmpl %] @@ -24,7 +27,7 @@ [% dontchange = "--ÎÅ_ÉÚÍÅÎÑÔØ--" %] <input type="hidden" name="dontchange" value="[% dontchange FILTER html %]"> -<script type="text/javascript" language="JavaScript"> +<script type="text/javascript"> var numelements = document.forms.changeform.elements.length; function SetCheckboxes(value) { var item; @@ -39,15 +42,14 @@ <hr> -<p><font size="-1"> - äÌÑ ÇÒÕÐÐÏ×ÏÇÏ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ [% terms.bugs_gen %]: - <ol> - <li>ïÔÍÅÔØÔÅ [% terms.bugs %] × ÓÐÉÓËÅ Ó×ÅÒÈÕ.</li> - <li>÷×ÅÄÉÔÅ ÉÚÍÅÎÅÎÉÑ × ÐÒÅÄÌÁÇÁÅÍÏÊ ÆÏÒÍÅ. - ðÒÉ ÎÅÏÂÈÏÄÉÍÏÓÔÉ ÄÏÂÁ×ØÔÅ ËÏÍÍÅÎÔÁÒÉÊ.</li> - <li>îÁÖÍÉÔÅ ËÎÏÐËÕ <em>óÏÈÒÁÎÉÔØ</em> button.</li> - </ol> -</font></p> +<p style="font-size:smaller"> + äÌÑ ÇÒÕÐÐÏ×ÏÇÏ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ [% terms.bugs_gen %]:</p> +<ol style="font-size:smaller"> + <li>ïÔÍÅÔØÔÅ [% terms.bugs %] × ÓÐÉÓËÅ Ó×ÅÒÈÕ.</li> + <li>÷×ÅÄÉÔÅ ÉÚÍÅÎÅÎÉÑ × ÐÒÅÄÌÁÇÁÅÍÏÊ ÆÏÒÍÅ. + ðÒÉ ÎÅÏÂÈÏÄÉÍÏÓÔÉ ÄÏÂÁ×ØÔÅ ËÏÍÍÅÎÔÁÒÉÊ.</li> + <li>îÁÖÍÉÔÅ ËÎÏÐËÕ <em>óÏÈÒÁÎÉÔØ</em>.</li> +</ol> <table id="form"> <tr> @@ -110,7 +112,7 @@ [% IF Param("usetargetmilestone") %] <tr> - <th><label for="target_milestone">ðÌÁÎÉÒÕÅÔÓÑ Ë:</label></th> + <th><label for="target_milestone">úÁÐÌÁÎÉÒÏ×ÁÎÏ:</label></th> <td colspan="3"> [% PROCESS selectmenu menuname = "target_milestone" menuitems = targetmilestones %] @@ -120,7 +122,7 @@ [% IF UserInGroup(Param("timetrackinggroup")) %] <tr> - <th><label for="estimated_time">ðÒÏÛÌÏ ÞÁÓÏ×:</label></th> + <th><label for="estimated_time">ðÅÒ×ÏÎÁÞÁÌØÎÁÑ ÏÃÅÎËÁ:</label></th> <td> <input id="estimated_time" name="estimated_time" @@ -139,7 +141,7 @@ [% IF Param("useqacontact") %] <tr> - <th><label for="qa_contact">ëÏÎÔÒÏÌØ ËÁÞÅÓÔ×Á:</label></th> + <th><label for="qa_contact">ðÒÉÅÍËÁ:</label></th> <td colspan="3"> <input id="qa_contact" name="qa_contact" @@ -185,7 +187,7 @@ </table> <label for="comment"><b>ëÏÍÍÅÎÔÁÒÉÊ:</b></label><br> -<textarea id="comment" name="comment" rows="5" cols="80" wrap="hard"></textarea><br> +<textarea id="comment" name="comment" rows="5" cols="80"></textarea><br> [% IF groups.size > 0 %] @@ -229,7 +231,7 @@ </table> [% IF foundinactive %] - <font size="-1">(ðÒÉÍÅÞÁÎÉÅ: äÏÂÁ×ÌÅÎÉÅ [% terms.bugs_gen %] × [% FILTER inactive %]ÚÁÐÒÅÝÅÎÎÙÅ ÇÒÕÐÐÙ [% END %] ÎÅ×ÏÚÍÏÖÎÏ)</font><br> + <font size="-1">(ðÒÉÍÅÞÁÎÉÅ: äÏÂÁ×ÌÅÎÉÅ [% terms.bugs_gen %] × [% FILTER inactive %]ÚÁËÒÙÔÙÅ ÇÒÕÐÐÙ [% END %] ÎÅ×ÏÚÍÏÖÎÏ)</font><br> [% END %] [% END %] @@ -244,7 +246,7 @@ [% knum = knum + 1 %] <input id="knob-confirm" type="radio" name="knob" value="confirm"> <label for="knob-confirm"> - ðÏÄÔ×ÅÒÄÉÔØ [% terms.bugs_gen %] (ÐÅÒÅ×ÅÓÔÉ × ÓÏÓÔÏÑÎÉÅ <b>îÏ×ÁÑ (NEW)</b>) + ðÏÄÔ×ÅÒÄÉÔØ [% terms.bugs_acc %] (ÐÅÒÅ×ÅÓÔÉ × ÓÏÓÔÏÑÎÉÅ <b>[% status_descs.NEW FILTER html %]</b>) </label><br> [% END %] @@ -254,23 +256,23 @@ [% knum = knum + 1 %] <input id="knob-accept" type="radio" name="knob" value="accept"> <label for="knob-accept"> - ðÒÉÎÑÔØ [% terms.bugs_gen %] (ðÅÒÅ×ÅÓÔÉ × ÓÏÓÔÏÑÎÉÅ <b>ðÒÉÎÑÔÏ (ASSIGNED)</b>) + ðÒÉÎÑÔØ [% terms.bugs_acc %] (ðÅÒÅ×ÅÓÔÉ × ÓÏÓÔÏÑÎÉÅ <b>[% status_descs.ASSIGNED FILTER html %]</b>) </label><br> [% knum = knum + 1 %] <input id="knob-clearresolution" type="radio" name="knob" value="clearresolution"> - <label for="knob-clearresolution">ïÞÉÓÔÉÔØ ÒÅÚÕÌØÔÁÔ</label><br> + <label for="knob-clearresolution">ïÔÍÅÎÉÔØ ÒÅÚÕÌØÔÁÔ</label><br> [% knum = knum + 1 %] <input id="knob-resolve" type="radio" name="knob" value="resolve"> <label for="knob-resolve"> - ðÒÉÎÑÔØ [% terms.bugs %], ÕÓÔÁÎÏ×ÉÔØ <a href="page.cgi?id=fields.html#resolution">ÒÅÚÕÌØÔÁÔ</a> × + ðÒÉÎÑÔØ ÒÅÛÅÎÉÅ, ÕÓÔÁÎÏ×ÉÔØ <a href="page.cgi?id=fields.html#resolution">ÒÅÚÕÌØÔÁÔ</a> × </label> <select name="resolution" onchange="document.forms.changeform.knob[[% knum %]].checked=true"> [% FOREACH resolution = resolutions %] [% NEXT IF !resolution %] <option value="[% resolution FILTER html %]" [% 'selected="selected"' IF resolution == "FIXED" %]> - [% resolution FILTER html %] + [% resolution_descs.$resolution FILTER html %] </option> [% END %] </select><br> @@ -281,32 +283,34 @@ [% IF !bugstatuses.containsany(openstates) %] [% knum = knum + 1 %] <input id="knob-reopen" type="radio" name="knob" value="reopen"> - <label for="knob-reopen">úÁÎÏ×Ï ÏÔËÒÙÔØ [% terms.bugs_acc %]</label><br> + <label for="knob-reopen">ðÏ×ÔÏÒÎÏ ÏÔËÒÙÔØ [% terms.bugs_acc %]</label><br> [% END %] [% IF bugstatuses.size == 1 %] [% IF bugstatuses.contains('RESOLVED') %] [% knum = knum + 1 %] <input id="knob-verify" type="radio" name="knob" value="verify"> - <label for="knob-verify">ðÏÄÔ×ÅÒÄÁÉÔØ ÒÅÚÕÌØÔÁÔ [% terms.bugs_gen %] <b>(VERIFIED)</b></label><br> + <label for="knob-verify">ðÏÄÔ×ÅÒÄÉÔØ ÒÅÚÕÌØÔÁÔ [% terms.bugs_gen %] <b>[% status_descs.VERIFIED FILTER html %]</b></label><br> [% END %] [% END %] [% IF !bugstatuses.containsany(openstates) AND !bugstatuses.contains('CLOSED') %] [% knum = knum + 1 %] <input id="knob-close" type="radio" name="knob" value="close"> - <label for="knob-close">úÁËÒÙÔØ [% terms.bugs_acc %] <b>(CLOSED)</b></label><br> + <label for="knob-close">úÁËÒÙÔØ [% terms.bugs_acc %] <b>[% status_descs.CLOSED FILTER html %]</b></label><br> [% END %] [% knum = knum + 1 %] <input id="knob-reassign" type="radio" name="knob" value="reassign"> <label for="knob-reassign"><a href="page.cgi?id=fields.html#assigned_to"> - ðÅÒÅÄÁÔØ</a> [% terms.bugs_acc %] to + ðÅÒÅÄÁÔØ</a> [% terms.bugs_acc %] </label> -<input name="assigned_to" - value="[% user.login FILTER html %]" - onchange="document.forms.changeform.knob[[% knum %]].checked = true;" - size="32"><br> +[% INCLUDE global/userselect.html.tmpl + name => "assigned_to" + value => user.login + size => 32 + onchange => "document.forms.changeform.knob[$knum].checked=true;" +%]<br> [% knum = knum + 1 %] <input id="knob-reassignbycomponent" @@ -319,11 +323,10 @@ <input type="submit" value="óÏÈÒÁÎÉÔØ"> -[% IF ismover %] +[% IF Param('move-enabled') && user.is_mover %] <input type="submit" name="action" value="[% Param('move-button-text') %]"> [% END %] - [%############################################################################%] [%# Select Menu Block #%] [%############################################################################%] Index: server-push.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/list/server-push.html.tmpl,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -d -r1.5 -r1.5.2.1 --- server-push.html.tmpl 20 Apr 2005 14:22:39 -0000 1.5 +++ server-push.html.tmpl 5 Nov 2005 09:20:41 -0000 1.5.2.1 @@ -1,4 +1,4 @@ -<!-- 1....@bu... --> +[%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of @@ -18,7 +18,7 @@ # # Contributor(s): Myk Melez <my...@mo...> # - # Russian translation: Vitaly Fedrushkov <fed...@us...> + # Russian translation: Dmitry Pupkov <dp...@mc...> #%] [%# INTERFACE: |
|
From: Vitaly F. <fed...@us...> - 2005-11-05 09:20:59
|
Update of /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/reports In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1354/reports Modified Files: Tag: BUGZILLA-2_20 components.html.tmpl duplicates-simple.html.tmpl duplicates-table.html.tmpl duplicates.html.tmpl keywords.html.tmpl Added Files: chart.csv.tmpl chart.html.tmpl chart.png.tmpl Log Message: Updated to Bugzilla 2.20 Index: duplicates.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/reports/duplicates.html.tmpl,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -u -d -r1.3 -r1.3.4.1 --- duplicates.html.tmpl 14 Aug 2003 20:34:49 -0000 1.3 +++ duplicates.html.tmpl 5 Nov 2005 09:20:42 -0000 1.3.4.1 @@ -1,4 +1,4 @@ -<!-- 1....@bu... --> +[%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of @@ -23,25 +23,29 @@ [%# INTERFACE: # products: list of strings. The products this user can see. - # + # # sortby: string. the column on which we are sorting the buglist. # reverse: boolean. True if we are reversing the current sort. # maxrows: integer. Max number of rows to display. # changedsince: integer. The number of days ago for the changedsince column. - # openonly: boolean. True if we are only showing open bugs. - # product: string. Restrict to this product only. + # openonly: boolean. True if we are only showing open bugs. + # query_products: list of strings. The set of products we check for dups. # # Additionally, you need to fulfill the interface to # duplicates-table.html.tmpl. #%] - + +[% PROCESS global/variables.none.tmpl %] + [% IF product %] - [% title = "îÁÉÂÏÌÅÅ ÞÁÓÔÙÅ ÏÛÉÂËÉ ÐÒÏÄÕËÔÁ $product" %] + [% title = "îÁÉÂÏÌÅÅ ÞÁÓÔÙÅ $terms.bugs ÄÌÑ ${query_products.join(', ')}" %] [% ELSE %] - [% title = "îÁÉÂÏÌÅÅ ÞÁÓÔÙÅ ÏÛÉÂËÉ" %] + [% title = "îÁÉÂÏÌÅÅ ÞÁÓÔÙÅ $terms.bugs" %] [% END%] -[% PROCESS global/header.html.tmpl %] +[% PROCESS global/header.html.tmpl + style = ".resolved { background-color: #d9d9d9; color: #000000; }" +%] <p> <a href="#explanation">ðÏÑÓÎÅÎÉÑ Ë ÏÔÞÅÔÕ</a> @@ -51,9 +55,6 @@ [% PROCESS "reports/duplicates-table.html.tmpl" %] -<br> -<br> - [%# *** Parameters *** %] [% bug_ids_string = vis_bug_ids.join(',') %] @@ -61,21 +62,21 @@ <h3><a name="params">éÚÍÅÎÉÔØ ÐÁÒÁÍÅÔÒÙ</a></h3> <form method="get" action="duplicates.cgi"> - <input type="hidden" name="sortby" value="[% sortby FILTER html%]"> + <input type="hidden" name="sortby" value="[% sortby FILTER html %]"> <input type="hidden" name="reverse" value="[% reverse %]"> <input type="hidden" name="bug_id" value="[% bug_ids_string %]"> <table> <tr> - <td>óÏÒÔÉÒÏ×ËÁ É ÆÉÌØÔÒ ÐÒÉÍÅÎÑÀÔÑÓ Ë:</td> + <td>óÏÒÔÉÒÏ×ËÁ É ÆÉÌØÔÒ ÐÒÉÍÅÎÑÀÔÓÑ Ë:</td> <td> - <input type="radio" name="sortvisible" id="entirelist" value="0" - [% "checked" IF NOT sortvisible %]> + <input type="radio" name="sortvisible" id="entirelist" value="0" + [% "checked" IF NOT sortvisible %]> <label for="entirelist"> ×ÓÅÍÕ ÓÐÉÓËÕ </label> - <br> - <input type="radio" name="sortvisible" id="visiblelist" value="1" - [% "checked" IF sortvisible %]> + <br> + <input type="radio" name="sortvisible" id="visiblelist" value="1" + [% "checked" IF sortvisible %]> <label for="visiblelist"> ÏÔÏÂÒÁÖÁÅÍÏÊ ÞÁÓÔÉ </label> @@ -85,7 +86,8 @@ <select name="product" size="5" multiple="multiple"> [% FOREACH p = products %] <option name="[% p FILTER html %]" - [% " selected" IF product == p %]>[% p FILTER html %]</option> + [% " selected" IF lsearch(query_products, p) != -1 %] + >[% p FILTER html %]</option> [% END %] </select> </td> @@ -108,12 +110,12 @@ <tr> <td> <label for="openonly"> - ôÏÌØËÏ ÎÅÚÁËÒÙÔÙÅ ÏÛÉÂËÉ: + ôÏÌØËÏ ÎÅÚÁËÒÙÔÙÅ [% terms.bugs %]: </label> </td> <td> - <input type="checkbox" name="openonly" id="openonly" value="1" - [% "checked" IF openonly %]> + <input type="checkbox" name="openonly" id="openonly" value="1" + [% "checked" IF openonly %]> </td> </tr> @@ -125,33 +127,33 @@ <form method="post" action="buglist.cgi"> <input type="hidden" name="bug_id" value="[% bug_ids_string %]"> <input type="hidden" name="order" value="Reuse same sort as last time"> - óÆÏÒÍÉÒÏ×ÁÔØ ÎÏ×ÙÊ <input type="submit" value="ÓÐÉÓÏË"> ÏÛÉÂÏË. + óÆÏÒÍÉÒÏ×ÁÔØ ÎÏ×ÙÊ <input type="submit" value="ÓÐÉÓÏË [% terms.bugs_gen %]">. (ðÏÒÑÄÏË ÓÏÒÔÉÒÏ×ËÉ ÍÏÖÅÔ ÉÚÍÅÎÉÔØÓÑ.) </form> <hr> <b> - <a name="explanation">þÔÏ ÔÁËÏÅ "ÎÁÉÂÏÌÅÅ ÞÁÓÔÙÅ ÏÛÉÂËÉ"?</a> + <a name="explanation">þÔÏ ÔÁËÏÅ "ÎÁÉÂÏÌÅÅ ÞÁÓÔÙÅ [% terms.bugs %]"?</a> </b> -[%# FIXME-ru: English text here directly mentions Mozilla.%] <blockquote> - óÐÉÓÏË ÎÁÉÂÏÌÅÅ ÞÁÓÔÙÈ ÏÛÉÂÏË ÐÅÒÅÞÉÓÌÑÅÔ ÎÅÚÁËÒÙÔÙÅ ÏÛÉÂËÉ, ËÏÔÏÒÙÅ - ÒÅÇÉÓÔÒÉÒÕÀÔÓÑ ÎÁÉÂÏÌÅÅ ÞÁÓÔÏ. áÎÁÌÉÚ ÂÁÚÙ ÄÁÎÎÙÈ ×ÙÐÏÌÎÑÅÔÓÑ ËÁÖÄÙÅ - ÓÕÔËÉ ÐÏÄÓÞÅÔÏÍ ÐÒÑÍÙÈ É ËÏÓ×ÅÎÎÙÈ ÄÕÂÌÅÊ ËÁÖÄÏÊ ÏÛÉÂËÉ. üÔÉ ÄÁÎÎÙÅ - ÄÏÌÖÎÙ ÓÐÏÓÏÂÓÔ×Ï×ÁÔØ ÕÍÅÎØÛÅÎÉÀ ËÏÌÉÞÅÓÔ×Á ÐÏ×ÔÏÒÎÏ ÒÅÇÉÓÔÒÉÒÕÅÍÙÈ - ÏÛÉÂÏË É ÐÏ×ÙÛÅÎÉÀ ÐÒÏÉÚ×ÏÄÉÔÅÌØÎÏÓÔÉ ÒÁÚÒÁÂÏÔÞÉËÏ×. + óÐÉÓÏË ÎÁÉÂÏÌÅÅ ÞÁÓÔÙÈ [% terms.bugs_gen %] ÐÅÒÅÞÉÓÌÑÅÔ ÎÅÚÁËÒÙÔÙÅ + [% terms.bugs %], ËÏÔÏÒÙÅ ÒÅÇÉÓÔÒÉÒÕÀÔÓÑ ÎÁÉÂÏÌÅÅ ÞÁÓÔÏ. áÎÁÌÉÚ ÂÁÚÙ + ÄÁÎÎÙÈ ×ÙÐÏÌÎÑÅÔÓÑ ËÁÖÄÙÅ ÓÕÔËÉ ÐÏÄÓÞÅÔÏÍ ÐÒÑÍÙÈ É ËÏÓ×ÅÎÎÙÈ ÄÕÂÌÅÊ + ËÁÖÄÏÊ [% terms.bug_gen %]. üÔÉ ÄÁÎÎÙÅ ÄÏÌÖÎÙ ÓÐÏÓÏÂÓÔ×Ï×ÁÔØ ÕÍÅÎØÛÅÎÉÀ + ËÏÌÉÞÅÓÔ×Á ÐÏ×ÔÏÒÎÏ ÒÅÇÉÓÔÒÉÒÕÅÍÙÈ [% terms.bugs_gen %] É ÐÏ×ÙÛÅÎÉÀ + ÐÒÏÉÚ×ÏÄÉÔÅÌØÎÏÓÔÉ ÒÁÚÒÁÂÏÔÞÉËÏ×. </blockquote> <b>ëÁË ÐÏÌØÚÏ×ÁÔØÓÑ ÓÐÉÓËÏÍ?</b> <ul> - <li>éÚÕÞÉÔÅ ÓÐÉÓÏË ÎÁÉÂÏÌÅÅ ÞÁÓÔÙÈ ÏÛÉÂÏË.</li> + <li>éÚÕÞÉÔÅ ÓÐÉÓÏË ÎÁÉÂÏÌÅÅ ÞÁÓÔÙÈ [% terms.bugs_gen %].</li> <li>åÓÌÉ ÐÒÏÂÌÅÍÁ ÕÐÏÍÑÎÕÔÁ × ÎÅÍ:</li> <ul> - <li>÷ÙÂÅÒÉÔÅ ÎÏÍÅÒ ÏÛÉÂËÉ ÄÌÑ ÐÏÄÔ×ÅÒÖÄÅÎÉÑ ÆÁËÔÁ ÅÅ ÏÂÎÁÒÕÖÅÎÉÑ, ÐÒÉ + <li>÷ÙÂÅÒÉÔÅ ÎÏÍÅÒ [% terms.bug_gen %] ÄÌÑ ÐÏÄÔ×ÅÒÖÄÅÎÉÑ ÆÁËÔÁ ÅÅ ÏÂÎÁÒÕÖÅÎÉÑ, ÐÒÉ ÎÅÏÂÈÏÄÉÍÏÓÔÉ ÄÏÂÁ×ØÔÅ ËÏÍÍÅÎÔÁÒÉÉ. éÌÉ ÐÒÏÓÔÏ ÐÒÏÄÏÌÖÁÊÔÅ ÔÅÓÔÉÒÏ×ÁÎÉÅ. </li> </ul> @@ -164,7 +166,7 @@ <li>åÓÌÉ ÐÒÏÂÌÅÍÁ ÕÖÅ ÏÐÉÓÁÎÁ, ÄÏÂÁ×ØÔÅ ËÏÍÍÅÎÔÁÒÉÊ Ó ÄÏÐÏÌÎÉÔÅÌØÎÙÍÉ ÄÁÎÎÙÍÉ ÐÏ ÐÒÏÂÌÅÍÅ, ËÏÔÏÒÙÅ ×Ù ÓÏÂÒÁÌÉ.</li> <li>åÓÌÉ ÏÐÉÓÁÎÉÅ ÐÒÏÂÌÅÍÙ ÎÅ ÎÁÊÄÅÎÏ, ÐÅÒÅÈÏÄÉÔÅ Ë - <a href="enter_bug.cgi">ÆÏÒÍÅ ÒÅÇÉÓÔÒÁÃÉÉ ÏÛÉÂËÉ</a>.</li> + <a href="enter_bug.cgi">ÆÏÒÍÅ ÒÅÇÉÓÔÒÁÃÉÉ [% terms.bug_gen %]</a>.</li> </ul> </ul> Index: duplicates-table.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/reports/duplicates-table.html.tmpl,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -u -d -r1.2 -r1.2.4.1 --- duplicates-table.html.tmpl 2 Dec 2002 03:57:03 -0000 1.2 +++ duplicates-table.html.tmpl 5 Nov 2005 09:20:42 -0000 1.2.4.1 @@ -1,4 +1,4 @@ -<!-- 1....@bu... --> +[%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of @@ -32,113 +32,120 @@ # target_milestone: string. The bug's TM. # short_desc: string. The bug's summary. # bug_status: string. The bug's status. - # + # resolution: string. The bug's resolution, if any. + # # bug_ids: list of integers. May be empty. The IDs of the bugs in $bugs. - # + # # sortby: string. the column on which we are sorting the buglist. # reverse: boolean. True if we are reversing the current sort. # maxrows: integer. Max number of rows to display. # changedsince: integer. The number of days ago for the changedsince column. - # openonly: boolean. True if we are only showing open bugs. - # product: string. Restrict to this product only. + # openonly: boolean. True if we are only showing open bugs. + # query_products: list of strings. Restrict to these products only. #%] - + +[% PROCESS global/variables.none.tmpl %] + [%# *** Column Headers *** %] -<table border> - <tr bgcolor="#CCCCCC"> - [% FOREACH column = [ { name => "id", description => "ïÛÉÂËÁ" }, - { name => "count", description => "ëÏÌ-×Ï<br>ÄÕÂÌÅÊ" }, - { name => "delta", - description => "éÚÍÅÎÅÎÉÑ ÚÁ<br>$changedsince ÄÎÅÊ" }, - { name => "component", description => "ëÏÍÐÏÎÅÎÔ" }, - { name => "bug_severity", description => "óÅÒØÅÚÎÏÓÔØ" }, - { name => "op_sys", description => "ïó" }, - { name => "target_milestone", - description => "ðÌÁÎÉÒÕÅÔÓÑ Ë" }, - { name => "short_desc", description => "áÎÎÏÔÁÃÉÑ" } ] - %] - - [%# Small hack to keep delta column out if we don't need it %] - [% NEXT IF column.name == "delta" AND NOT dobefore %] +[% IF bug_ids.size > 0 %] + <table border> + <tr bgcolor="#CCCCCC"> + [% FOREACH column = [ { name => "id", description => "$terms.Bug" }, + { name => "count", description => "ëÏÌ-×Ï<br>ÄÕÂÌÅÊ" }, + { name => "delta", + description => "éÚÍÅÎÅÎÉÑ ÚÁ<br>$changedsince ÄÎÅÊ" }, + { name => "component", description => "ëÏÍÐÏÎÅÎÔ" }, + { name => "bug_severity", description => "óÅÒØÅÚÎÏÓÔØ" }, + { name => "op_sys", description => "ïó" }, + { name => "target_milestone", + description => "úÁÐÌÁÎÉÒÏ×ÁÎÏ" }, + { name => "short_desc", description => "áÎÎÏÔÁÃÉÑ" } ] + %] - <td> - <center> - <b> - [% bug_ids_string = bug_ids.join(',') %] - <a href="duplicates.cgi?sortby=[% column.name %] - [% IF sortby == column.name %] - [% "&reverse=1" IF NOT reverse %] - [% ELSE %] - [%-# Some columns start off reversed %] - [% "&reverse=1" IF column.name.match('delta|count') %] - [% END %] - [% "&maxrows=$maxrows" IF maxrows %] - [% "&changedsince=$changedsince" IF changedsince %] - [% "&openonly=1" IF openonly %] - [% "&product=$product" IF product %] - [% "&format=$format" IF format %] - [% "&bug_id=$bug_ids_string&sortvisible=1" IF sortvisible %]"> - [% column.description %]</a> - </b> - </center> - </td> - [% END %] - </tr> - -[% IF NOT sortby %] - [% sortby = "count"; reverse = "1" %] -[% END %] + [%# Small hack to keep delta column out if we don't need it %] + [% NEXT IF column.name == "delta" AND NOT dobefore %] -[% IF sortby == "id" OR sortby == "count" OR sortby == "delta" %] - [%# Numeric sort %] - [% sortedbugs = bugs.nsort(sortby) %] -[% ELSE %] - [% sortedbugs = bugs.sort(sortby) %] -[% END %] + <td> + <center> + <b> + [% bug_ids_string = bug_ids.join(',') %] + <a href="duplicates.cgi?sortby=[% column.name %] + [% IF sortby == column.name %] + [% "&reverse=1" IF NOT reverse %] + [% ELSE %] + [%-# Some columns start off reversed %] + [% "&reverse=1" IF column.name.match('delta|count') %] + [% END %] + [% "&maxrows=$maxrows" IF maxrows %] + [% "&changedsince=$changedsince" IF changedsince %] + [% "&openonly=1" IF openonly %] + [% FOREACH p = query_products %]&product=[% p FILTER html %][% END %] + [% IF format %]&format=[% format FILTER html %][% END %] + [% "&bug_id=$bug_ids_string&sortvisible=1" + IF sortvisible %]"> + [% column.description %]</a> + </b> + </center> + </td> + [% END %] + </tr> -[% IF reverse %] - [% bugs = sortedbugs.reverse %] -[% ELSE %] - [% bugs = sortedbugs %] -[% END %] + [% IF NOT sortby %] + [% sortby = "count"; reverse = "1" %] + [% END %] -[%# *** Buglist *** %] + [% IF sortby == "id" OR sortby == "count" OR sortby == "delta" %] + [%# Numeric sort %] + [% sortedbugs = bugs.nsort(sortby) %] + [% ELSE %] + [% sortedbugs = bugs.sort(sortby) %] + [% END %] -[%# We need to keep track of the bug IDs we are actually displaying, because - # if the user decides to sort the visible list, we need to know what that - # list actually is. %] -[% vis_bug_ids = [] %] + [% IF reverse %] + [% bugs = sortedbugs.reverse %] + [% ELSE %] + [% bugs = sortedbugs %] + [% END %] -[% FOREACH bug = bugs %] - [% LAST IF loop.index() >= maxrows %] - [% vis_bug_ids.push(bug.id) %] + [%# *** Buglist *** %] - <tr> - <td> - <center> - [% "<strike>" IF bug.resolution != "" %] - <a href="show_bug.cgi?id=[% bug.id %]">[% bug.id %]</a> - [% "</strike>" IF bug.resolution != "" %] - </center> - </td> + [%# We need to keep track of the bug IDs we are actually displaying, because + # if the user decides to sort the visible list, we need to know what that + # list actually is. %] + [% vis_bug_ids = [] %] - <td> - <center> - [% bug.count %] - </center> - </td> + [% FOREACH bug = bugs %] + [% LAST IF loop.index() >= maxrows %] + [% vis_bug_ids.push(bug.id) %] - [% IF dobefore %] - <td><center>[% bug.delta %]</center></td> - [% END %] + <tr [% "class='resolved'" IF bug.resolution != "" %]> + <td> + <center> + [% isclosed = bug.resolution != "" %] + <a href="show_bug.cgi?id=[% bug.id %]">[% bug.id FILTER closed(isclosed) %]</a> + </center> + </td> - <td>[% bug.component %]</td> - <td><center>[% bug.bug_severity %]</center></td> - <td><center>[% bug.op_sys %]</center></td> - <td><center>[% bug.target_milestone %]</center></td> - <td>[% bug.short_desc FILTER html %]</td> - </tr> -[% END %] + <td> + <center> + [% bug.count %] + </center> + </td> -</table> + [% IF dobefore %] + <td><center>[% bug.delta %]</center></td> + [% END %] + + <td>[% bug.component FILTER html %]</td> + <td><center>[% bug.bug_severity FILTER html %]</center></td> + <td><center>[% bug.op_sys FILTER html %]</center></td> + <td><center>[% bug.target_milestone FILTER html %]</center></td> + <td>[% bug.short_desc FILTER html %]</td> + </tr> + [% END %] + + </table> +[% ELSE %] + <h3>äÕÂÌÉÒÏ×ÁÎÎÙÈ [% terms.bugs_gen %] ÎÅ ÎÁÊÄÅÎÏ.</h3> +[% END %] --- NEW FILE: chart.csv.tmpl --- [%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of # the License at http://www.mozilla.org/MPL/ # # Software distributed under the License is distributed on an "AS # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. # # The Original Code is the Bugzilla Bug Tracking System. # # The Initial Developer of the Original Code is Netscape Communications # Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All # Rights Reserved. # # Contributor(s): Gervase Markham <ge...@ge...> # # Russian translation: Vitaly Fedrushkov <fed...@us...> #%] [% colsepchar = user.settings.csv_colsepchar.value %] [% data = chart.data %] äÁÔÁ\óÅÒÉÑ [% FOREACH label = chart.labels %] [% colsepchar %][% label FILTER csv %] [% END %] [%# The data, which is in the correct format for GD, is conceptually the wrong # way round for CSV output. So, we need to invert it here, which is why # these loops aren't just plain FOREACH. #%] [% i = 0 %] [% WHILE i < data.0.size %] [% j = 0 %] [% WHILE j < data.size %] [% IF j > 0 %] [% colsepchar %] [% END %] [% data.$j.$i %] [% j = j + 1 %] [% END %] [% i = i + 1 %] [% END %] --- NEW FILE: chart.html.tmpl --- [%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of # the License at http://www.mozilla.org/MPL/ # # Software distributed under the License is distributed on an "AS # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. # # The Original Code is the Bugzilla Bug Tracking System. # # The Initial Developer of the Original Code is Netscape Communications # Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All # Rights Reserved. # # Contributor(s): Gervase Markham <ge...@ge...> # # Russian translation: Vitaly Fedrushkov <fed...@us...> #%] [%# INTERFACE: #%] [% DEFAULT width = 600 height = 350 %] [% PROCESS global/header.html.tmpl title = "äÉÁÇÒÁÍÍÁ" h3 = time2str("%Y-%m-%d %H:%M:%S", time) %] <div align="center"> [% imageurl = BLOCK %]chart.cgi? [% imagebase FILTER html %]&ctype=png&action=plot&width= [% width %]&height=[% height -%] [% END %] <img alt="äÉÁÇÒÁÍÍÁ" src="[% imageurl %]" width="[% width %]" height="[% height %]"> <p> [% sizeurl = BLOCK %]chart.cgi? [% imagebase FILTER html %]&action=wrap [% END %] <a href="[% sizeurl %]&width=[% width %]&height= [% height + 100 %]">äÌÉÎÎÅÅ</a><br> <a href="[% sizeurl %]&width=[% width - 100 %]&height= [% height %]">õÖÅ</a> * <a href="[% sizeurl %]&width=[% width + 100 %]&height= [% height %]">ûÉÒÅ</a> <br> <a href="[% sizeurl %]&width=[% width %]&height= [% height - 100 %]">ëÏÒÏÞÅ</a><br> </p> <p> <a href="chart.cgi? [% imagebase FILTER html %]&ctype=csv&action=plot">CSV</a> | <a href="chart.cgi?[% imagebase FILTER html %]&action=assemble">ðÁÒÁÍÅÔÒÙ ÄÉÁÇÒÁÍÍÙ</a> </p> </div> [% PROCESS global/footer.html.tmpl %] Index: components.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/reports/components.html.tmpl,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -u -d -r1.2 -r1.2.4.1 --- components.html.tmpl 2 Dec 2002 03:57:02 -0000 1.2 +++ components.html.tmpl 5 Nov 2005 09:20:42 -0000 1.2.4.1 @@ -1,4 +1,4 @@ -<!-- 1....@bu... --> +[%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of @@ -26,8 +26,8 @@ # components: List of hashes. May be empty. Each hash has four members: # name: string. Name of the component. # description: string. Description of the component. May contain HTML. - # initialowner: string. Component's initial owner. - # initialqacontact: string. Component's initial QA contact. + # initialowner: string. Component's default assignee. + # initialqacontact: string. Component's default QA contact. #%] [% filtered_product = product FILTER html %] @@ -47,9 +47,9 @@ <table> <tr> <th align="left">ëÏÍÐÏÎÅÎÔ</th> - <th align="left">÷ÌÁÄÅÌÅÃ</th> + <th align="left">éÓÐÏÌÎÉÔÅÌØ</th> [% IF Param("useqacontact") %] - <th align="left">ëÏÎÔÒÏÌØ ËÁÞÅÓÔ×Á</th> + <th align="left">ðÒÉÅÍËÁ</th> [% END %] </tr> @@ -81,13 +81,15 @@ <a name="[% comp.name FILTER html %]">[% comp.name FILTER html %]</a> </td> <td> - <a href="mailto:[% comp.initialowner %][% Param('emailsuffix') %]"> + <a href="mailto:[% comp.initialowner FILTER html %] + [% Param('emailsuffix') %]"> [% comp.initialowner FILTER html %]</a> </td> [% IF Param("useqacontact") %] <td> - <a href="mailto:[% comp.initialqacontact %][% Param('emailsuffix') %]"> - [% comp.initialqacontact %]</a> + <a href="mailto:[% comp.initialqacontact FILTER html %] + [% Param('emailsuffix') %]"> + [% comp.initialqacontact FILTER html %]</a> </td> [% END %] </tr> Index: keywords.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/reports/keywords.html.tmpl,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -u -d -r1.2 -r1.2.4.1 --- keywords.html.tmpl 2 Dec 2002 03:57:03 -0000 1.2 +++ keywords.html.tmpl 5 Nov 2005 09:20:42 -0000 1.2.4.1 @@ -1,4 +1,4 @@ -<!-- 1....@bu... --> +[%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of @@ -29,6 +29,8 @@ # caneditkeywords: boolean. True if this user can edit keywords %] +[% PROCESS global/variables.none.tmpl %] + [% PROCESS global/header.html.tmpl title = "ëÌÀÞÅ×ÙÅ ÓÌÏ×Á" %] @@ -38,15 +40,15 @@ [% IF loop.index != 0 %] </table> [% END %] - + <table border="1" cellpadding="4" cellspacing="0"> <tr bgcolor="#6666FF"> <th align="left">óÌÏ×Ï</th> <th align="left">úÎÁÞÅÎÉÅ</th> - <th align="left">ïÛÉÂËÉ</th> + <th align="left">[% terms.Bugs %]</th> </tr> - [% END %] - + [% END %] + <tr> <th> <a name="[% keyword.name FILTER html %]"> --- NEW FILE: chart.png.tmpl --- [%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of # the License at http://www.mozilla.org/MPL/ # # Software distributed under the License is distributed on an "AS # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. # # The Original Code is the Bugzilla Bug Tracking System. # # The Initial Developer of the Original Code is Netscape Communications # Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All # Rights Reserved. # # Contributor(s): Gervase Markham <ge...@ge...> # # Russian translation: Vitaly Fedrushkov <fed...@us...> #%] [% PROCESS global/variables.none.tmpl %] [% y_label = "$terms.Bugs" %] [% x_label = "äÁÔÁ" %] [% IF chart.cumulate %] [% USE graph = GD.Graph.area(width, height) %] [% graph.set(cumulate => "true") %] [% ELSE %] [% USE graph = GD.Graph.lines(width, height) %] [% END %] [% FILTER null; x_label_skip = (30 * chart.data.0.size / width); graph.set(x_label => x_label, y_label => y_label, y_tick_number => 8, x_label_position => 0.5, x_labels_vertical => 1, x_label_skip => x_label_skip, legend_placement => "RT", line_width => 2, dclrs => ["lred", "lgreen", "lblue", "lyellow", "lpurple", "lorange", "black", "green", "blue", "dpink", "lbrown", "gray", "red", "dpurple", "gold", "marine"]); # Workaround for the fact that set_legend won't take chart.labels directly, # because chart.labels is an array reference rather than an array. graph.set_legend(chart.labels.0, chart.labels.1, chart.labels.2, chart.labels.3, chart.labels.4, chart.labels.5, chart.labels.6, chart.labels.7, chart.labels.8, chart.labels.9, chart.labels.10, chart.labels.11, chart.labels.12, chart.labels.13, chart.labels.14, chart.labels.15); graph.plot(chart.data).png | stdout(1); END; -%] Index: duplicates-simple.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/reports/duplicates-simple.html.tmpl,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -u -d -r1.2 -r1.2.4.1 --- duplicates-simple.html.tmpl 2 Dec 2002 03:57:03 -0000 1.2 +++ duplicates-simple.html.tmpl 5 Nov 2005 09:20:42 -0000 1.2.4.1 @@ -1,4 +1,4 @@ -<!-- 1....@bu... --> +[%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of @@ -24,17 +24,19 @@ [%# INTERFACE: # You need to fulfill the interface to duplicates-table.html.tmpl. #%] - + +[% PROCESS global/variables.none.tmpl %] + <html> [% IF product %] - [% title = "îÁÉÂÏÌÅÅ ÞÁÓÔÙÅ ÏÛÉÂËÉ ÐÒÏÄÕËÔÁ $product" %] + [% title = "îÁÉÂÏÌÅÅ ÞÁÓÔÙÅ $terms.bugs ÐÒÏÄÕËÔÁ $product" %] [% ELSE %] - [% title = "îÁÉÂÏÌÅÅ ÞÁÓÔÙÅ ÏÛÉÂËÉ" %] + [% title = "îÁÉÂÏÌÅÅ ÞÁÓÔÙÅ $terms.bugs" %] [% END%] <head> - <title>[% title %]</title> + <title>[% title FILTER html %]</title> </head> <body> |
|
From: Vitaly F. <fed...@us...> - 2005-11-05 09:20:50
|
Update of /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/bug/votes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1354/bug/votes Modified Files: Tag: BUGZILLA-2_20 delete-all.html.tmpl list-for-bug.html.tmpl list-for-user.html.tmpl Log Message: Updated to Bugzilla 2.20 Index: list-for-bug.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/bug/votes/list-for-bug.html.tmpl,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -u -d -r1.2 -r1.2.4.1 --- list-for-bug.html.tmpl 2 Dec 2002 03:57:02 -0000 1.2 +++ list-for-bug.html.tmpl 5 Nov 2005 09:20:41 -0000 1.2.4.1 @@ -1,4 +1,4 @@ -<!-- 1....@bu... --> +[%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of @@ -26,12 +26,14 @@ # users: list of hashes. May be empty. Each hash has two members: # name: string. The login name of the user whose vote is attached # count: integer. The number of times that user has votes for this bug. - # total: integer. The total number of votes for this bug. + # total: integer. The total number of votes for this bug. #%] - + +[% PROCESS global/variables.none.tmpl %] + [% PROCESS global/header.html.tmpl title = "òÅÚÕÌØÔÁÔÙ ÇÏÌÏÓÏ×ÁÎÉÑ" - h2 = "ïÛÉÂËÁ <a href=\"show_bug.cgi?id=$bug_id\">$bug_id</a>" + h2 = "$terms.Bug <a href=\"show_bug.cgi?id=$bug_id\">$bug_id</a>" %] <table cellspacing="4"> Index: list-for-user.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/bug/votes/list-for-user.html.tmpl,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -u -d -r1.2 -r1.2.4.1 --- list-for-user.html.tmpl 2 Dec 2002 03:57:02 -0000 1.2 +++ list-for-user.html.tmpl 5 Nov 2005 09:20:41 -0000 1.2.4.1 @@ -1,4 +1,4 @@ -<!-- 1....@bu... --> +[%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of @@ -21,12 +21,45 @@ # Russian translation: Vitaly Fedrushkov <fed...@us...> #%] -[% PROCESS global/header.html.tmpl - title = "òÅÚÕÌØÔÁÔÙ ÇÏÌÏÓÏ×ÁÎÉÑ" - h2 = voting_user.name - %] +[%# INTERFACE: + # voting_user: hash containing a 'login' field + # + # products: list of hashes containing details of products relating to + # voting: + # name: name of product + # bugs: list of bugs the user has voted for + # onevoteonly: one or more votes allowed per bug? + # total: users current vote count for the product + # maxvotes: max votes allowed for a user in this product + # maxperbug: max votes per bug allowed for a user in this product + # + # bug_id: number; if the user is voting for a bug, this is the bug id + # + # canedit: boolean; Should the votes be presented in a form, or readonly? + #%] -[% canedit = 1 IF voting_user.login == user.login %] +[% PROCESS global/variables.none.tmpl %] + +[% IF !header_done %] + [% h2 = voting_user.login FILTER html %] + [% IF canedit %] + [% title = "éÚÍÅÎÉÔØ ÇÏÌÏÓÁ" %] + [% IF bug_id %] + [%# We .select and .focus the input so it works for textbox and + checkbox %] + [% onload = "document.forms['voting_form'].bug_" _ bug_id _ + ".select();document.forms['voting_form'].bug_" _ bug_id _ + ".focus()" %] + [% END %] + [% ELSE %] + [% title = "òÅÚÕÌØÔÁÔÙ ÇÏÌÏÓÏ×ÁÎÉÑ" %] + [% END %] + [% PROCESS global/header.html.tmpl + style_urls = [ "skins/standard/voting.css" ] + %] +[% ELSE %] + <hr> +[% END %] [% IF votes_recorded %] <p> @@ -39,17 +72,24 @@ [% END %] [% IF products.size %] - <form action="votes.cgi"> + <form name="voting_form" method="post" action="votes.cgi"> <input type="hidden" name="action" value="vote"> <table cellspacing="4"> <tr> <td></td> - <th>ïÛÉÂËÁ</th> - <th>áÎÎÏÔÁÃÉÑ</th> <th>ðÏÄÁÎÏ ÇÏÌÏÓÏ×</th> + <th>[% terms.Bug %]</th> + <th>áÎÎÏÔÁÃÉÑ</th> </tr> + [% onevoteproduct = 0 %] + [% multivoteproduct = 0 %] [% FOREACH product = products %] + [% IF product.onevoteonly %] + [% onevoteproduct = 1 %] + [% ELSE %] + [% multivoteproduct = 1 %] + [% END %] <tr> <th>[% product.name FILTER html %]</th> <td></td> @@ -58,38 +98,39 @@ <td> <font size="-1"> (ðÒÉÍÅÞÁÎÉÅ: ÍÁËÓÉÍÁÌØÎÏÅ ËÏÌÉÞÅÓÔ×Ï ÇÏÌÏÓÏ× ÐÏ ËÁÖÄÏÊ - ÏÛÉÂËÅ ÄÌÑ ÜÔÏÇÏ ÐÒÏÄÕËÔÁ -- [% product.maxperbug %].) + [% terms.bug_dat %] ÄÌÑ ÜÔÏÇÏ ÐÒÏÄÕËÔÁ -- [% product.maxperbug %].) </font> </td> [% END %] </tr> [% FOREACH bug = product.bugs %] - <tr> - <td></td> - <td> - [% "<strike>" IF NOT bug.opened %] - <a href="show_bug.cgi?id=[% bug.id %]"> - [% bug.id %]</a> - [% "</strike>" IF NOT bug.opened %] - </td> - <td> - <a href="votes.cgi?action=show_bug&bug_id=[% bug.id %]"> - [% bug.summary FILTER html %] - </a> - </td> - <td align="right"> + <tr [% IF bug.id == bug_id && canedit %] + class="bz_bug_being_voted_on" [% END %]> + <td>[% IF bug.id == bug_id && canedit %]÷×ÅÄÉÔÅ ÎÏ×ÏÅ ËÏÌÉÞÅÓÔ×Ï ÇÏÌÏÓÏ× → + [%- END %]</td> + <td align="right"><a name="vote_[% bug.id %]"> [% IF canedit %] [% IF product.onevoteonly %] <input type="checkbox" name="[% bug.id %]" value="1" - [% " checked" IF bug.count %]> + [% " checked" IF bug.count %] id="bug_[% bug.id %]"> [% ELSE %] - <input name="[% bug.id %]" value="[% bug.count %]" - size="2"> + <input name="[% bug.id %]" value="[% bug.count %]" + size="2" id="bug_[% bug.id %]"> [% END %] [% ELSE %] [% bug.count %] [% END %] + </a></td> + <td align="right"> + [% isclosed = !bug.opened %] + <a href="show_bug.cgi?id=[% bug.id %]"> + [% bug.id FILTER closed(isclosed) %]</a> + </td> + <td> + <a href="votes.cgi?action=show_bug&bug_id=[% bug.id %]"> + [% bug.summary FILTER html %] + </a> </td> </tr> [% END %] @@ -109,23 +150,30 @@ <input type="submit" value="ðÒÏÇÏÌÏÓÏ×ÁÔØ"> <br> <br> - þÔÏÂÙ ÉÚÍÅÎÉÔØ Ó×ÏÊ ÇÏÌÏÓ, ××ÅÄÉÔÅ ËÏÌÉÞÅÓÔ×Ï ÇÏÌÏÓÏ× (ÎÏÌØ -- - ÄÌÑ ÏÔÚÙ×Á ×ÓÅÈ ÇÏÌÏÓÏ×) ÉÌÉ ÉÚÍÅÎÉÔÅ ÏÔÍÅÔËÕ, ÚÁÔÅÍ ÎÁÖÍÉÔÅ - <b>ðÒÏÇÏÌÏÓÏ×ÁÔØ</b>. - [% END %] + þÔÏÂÙ ÉÚÍÅÎÉÔØ Ó×ÏÊ ÇÏÌÏÓ, + [% IF multivoteproduct %] + ××ÅÄÉÔÅ ËÏÌÉÞÅÓÔ×Ï ÇÏÌÏÓÏ× (ÎÏÌØ -- ÄÌÑ ÏÔÚÙ×Á ×ÓÅÈ ÇÏÌÏÓÏ×) + [% " ÉÌÉ " IF onevoteproduct %] + [% END %] + [% IF onevoteproduct %] + ÉÚÍÅÎÉÔÅ ÏÔÍÅÔËÕ + [% END %] + ÚÁÔÅÍ ÎÁÖÍÉÔÅ <b>ðÒÏÇÏÌÏÓÏ×ÁÔØ</b>. + [% END %] </form> [% ELSE %] <p> [% IF canedit %] - ÷Ù ÎÅ ÐÏÄÁ×ÁÌÉ ÇÏÌÏÓÏ× ÚÁ ÏÛÉÂËÉ. + ÷Ù ÎÅ ÇÏÌÏÓÏ×ÁÌÉ [% ELSE %] - ðÏÌØÚÏ×ÁÔÅÌØ ÎÅ ÐÏÄÁ×ÁÌ ÇÏÌÏÓÏ× ÚÁ ÏÛÉÂËÉ. + ðÏÌØÚÏ×ÁÔÅÌØ ÎÅ ÇÏÌÏÓÏ×ÁÌ [% END %] + ÚÁ [% terms.bugs %]. </p> [% END %] <p> - <a href="votehelp.html">óÐÒÁ×ËÁ: ÐÒÁ×ÉÌÁ ÇÏÌÏÓÏ×ÁÎÉÑ</a>. + <a href="page.cgi?id=voting.html">óÐÒÁ×ËÁ: ÐÒÁ×ÉÌÁ ÇÏÌÏÓÏ×ÁÎÉÑ</a>. </p> [% PROCESS global/footer.html.tmpl %] Index: delete-all.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/bug/votes/delete-all.html.tmpl,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -u -d -r1.2 -r1.2.4.1 --- delete-all.html.tmpl 2 Dec 2002 03:57:02 -0000 1.2 +++ delete-all.html.tmpl 5 Nov 2005 09:20:41 -0000 1.2.4.1 @@ -1,4 +1,4 @@ -<!-- 1....@bu... --> +[%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of @@ -22,16 +22,18 @@ #%] [%# INTERFACE: - # This template has no interface. + # This template has no interface. #%] - + +[% PROCESS global/variables.none.tmpl %] + [% PROCESS global/header.html.tmpl title = "ïÔÏÚ×ÁÔØ ×ÁÛÉ ÇÏÌÏÓÁ?" %] <p> ÷Ù ÓÏÂÉÒÁÅÔÅÓØ ÏÔÏÚ×ÁÔØ ×ÓÅ ×ÁÛÉ ÇÏÌÏÓÁ. ÷Ù Õ×ÅÒÅÎÙ, ÞÔÏ ÓÌÅÄÕÅÔ ÕÄÁÌÉÔØ - ÒÅÚÕÌØÔÁÔÙ ×ÁÛÅÇÏ ÇÏÌÏÓÏ×ÁÎÉÑ ÐÏ ×ÓÅÍ ÏÛÉÂËÁÍ? + ÒÅÚÕÌØÔÁÔÙ ×ÁÛÅÇÏ ÇÏÌÏÓÏ×ÁÎÉÑ ÐÏ ×ÓÅÍ [% terms.bugs_dat %]? </p> <form action="votes.cgi" method="post"> @@ -45,7 +47,7 @@ îÅÔ, ×ÅÒÎÕÔØÓÑ Ë ÐÒÏÓÍÏÔÒÕ ÇÏÌÏÓÏ× </p> <p> - <input type="submit" value="ðÒÉÍÅÎÉÔØ"> + <input type="submit" value="óÏÈÒÁÎÉÔØ"> </p> </form> |
|
From: Vitaly F. <fed...@us...> - 2005-11-05 09:20:50
|
Update of /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/pages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1354/pages Modified Files: Tag: BUGZILLA-2_20 fields.html.tmpl linked.html.tmpl voting.html.tmpl Log Message: Updated to Bugzilla 2.20 Index: linked.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/pages/linked.html.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -d -r1.1 -r1.1.2.1 --- linked.html.tmpl 21 Apr 2005 10:17:40 -0000 1.1 +++ linked.html.tmpl 5 Nov 2005 09:20:41 -0000 1.1.2.1 @@ -22,19 +22,19 @@ # Russian translation: Ilya Shevchik <il...@us...> #%] -[% INCLUDE global/header.html.tmpl title = "÷ÁÛ Ó×ÑÚÁÎÎÙÊ ÔÅËÓÔ" %] +[% INCLUDE global/header.html.tmpl title = "÷ÁÛ ÔÅËÓÔ ÓÏ ÓÓÙÌËÁÍÉ" %] [% USE Bugzilla %] [% cgi = Bugzilla.cgi %] <p> - óËÏÐÉÒÕÊÔÅ ÔÅËÓÔ ÎÉÖÅ: + óËÏÐÉÒÕÊÔÅ ÔÅËÓÔ É ×ÓÔÁ×ØÔÅ ÓÀÄÁ: </p> <hr> <p> <pre> -[%- cgi.param("text") FILTER quoteUrls FILTER html -%] +[%- cgi.param("text") FILTER wrap_comment FILTER quoteUrls FILTER html -%] </pre> </p> @@ -42,7 +42,7 @@ <p> åÓÌÉ ×Ù ÒÁÚÍÅÓÔÉÔÅ ÜÔÏ × ÔÅÇÁÈ <tt><pre></tt>, - ÔÅËÓÔ ÐÅÒÅÓÔÁÎÅÔ ÎÁÐÏÍÉÎÁÔØ ÜÔÏ: + ÔÅËÓÔ ÂÕÄÅÔ ×ÙÇÌÑÄÅÔØ ÔÁË: </p> <hr> Index: voting.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/pages/voting.html.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -d -r1.1 -r1.1.2.1 --- voting.html.tmpl 22 Apr 2005 02:22:22 -0000 1.1 +++ voting.html.tmpl 5 Nov 2005 09:20:41 -0000 1.1.2.1 @@ -25,46 +25,47 @@ [% PROCESS global/variables.none.tmpl %] [% INCLUDE global/header.html.tmpl title = "çÏÌÏÓÏ×ÁÎÉÅ" %] -<p>÷ ÓÉÓÔÅÍÅ [% terms.Bugzilla %] ÉÍÅÅÔÓÑ Ó×ÏÊÓÔ×Ï "ÇÏÌÏÓÏ×ÁÎÉÅ". ëÁÖÄÙÊ -ÐÒÏÄÕËÔ ÐÏÚ×ÏÌÑÅÔ ÐÏÌØÚÏ×ÁÔÅÌÑÍ ÉÍÅÔØ ÏÐÒÅÄÅÎÎÏÅ ÞÉÓÌÏ ÇÏÌÏÓÏ×. (îÅËÏÔÏÒÙÅ -ÐÒÏÄÕËÔÙ ÎÅ ÐÏÚ×ÏÌÑÀÔ ÜÔÏÇÏ, É ÜÔÏ ÏÚÎÁÞÁÅÔ, ÞÔÏ ×Ù ÎÅ ÍÏÖÅÔÅ ÇÏÌÏÓÏ×ÁÔØ × -ÜÔÉÈ ÐÒÏÄÕËÔÁÈ.) ðÏÓÒÅÄÓÔ×ÏÍ ÇÏÌÏÓÏ×ÁÎÉÑ ×Ù ÕËÁÚÙ×ÁÅÔÅ ÉÓÐÒÁ×ÌÅÎÉÅ ËÁËÉÈ -[% terms.bugs_gen %], ÐÏ ×ÁÛÅÍÕ ÍÎÅÎÉÀ, Ñ×ÌÑÅÔÓÑ ÎÁÉÂÏÌÅÅ ×ÁÖÎÙÍ.</p> +<p>÷ ÓÉÓÔÅÍÅ [% terms.Bugzilla %] ÉÍÅÅÔÓÑ ÆÕÎËÃÉÑ "ÇÏÌÏÓÏ×ÁÎÉÅ". +ëÁÖÄÙÊ ÐÒÏÄÕËÔ ÄÁÅÔ ÐÏÌØÚÏ×ÁÔÅÌÀ ÏÐÒÅÄÅÎÎÏÅ ÞÉÓÌÏ ÇÏÌÏÓÏ×. äÌÑ +ÎÅËÏÔÏÒÙÈ ÐÒÏÄÕËÔÏ× ÜÔÁ ×ÏÚÍÏÖÎÏÓÔØ ÍÏÖÅÔ ÂÙÔØ ÏÔËÌÀÞÅÎÁ. ðÕÔÅÍ +ÇÏÌÏÓÏ×ÁÎÉÑ ×Ù ÓÏÏÂÝÁÅÔÅ ËÁËÉÅ [% terms.bugs %], ÐÏ ×ÁÛÅÍÕ ÍÎÅÎÉÀ, +Ñ×ÌÑÀÔÓÑ ÎÁÉÂÏÌÅÅ ÁËÔÕÁÌØÎÙÍÉ.</p> -<p>÷ ÚÁ×ÉÓÉÍÏÓÔÉ ÏÔ ÔÏÇÏ, ËÁË ÁÄÍÉÎÉÓÔÒÁÔÏÒ ÓËÏÎÆÉÇÕÒÉÒÏ×ÁÌ ÒÅÌÅ×ÁÎÔÎÙÊ -ÐÒÏÄÕËÔ, ×ÁÍ, ×ÏÚÍÏÖÎÏ, ÂÕÄÅÔ ÐÒÅÄÏÓÔÁ×ÌÅÎÁ ×ÏÚÍÏÖÎÏÓÔØ ÇÏÌÏÓÏ×ÁÔØ ÚÁ ÏÄÎÕ É -ÔÕ ÖÅ [% terms.bug_acc %] ÂÏÌÅÅ ÏÄÎÏÇÏ ÒÁÚÁ. îÏ ÐÏÍÎÉÔÅ, ÞÉÓÌÏ ÇÏÌÏÓÏ× -ËÏÎÅÞÎÏ! éÔÁË, ×Ù ÍÏÖÅÔÅ ÌÉÂÏ ÇÏÌÏÓÏ×ÁÔØ ÐÏÎÅÍÎÏÇÕ ÚÁ ÂÏÌØÛÏÅ ËÏÌÉÞÅÓÔ×Ï -[% terms.bugs_gen %], ÌÉÂÏ ÏÔÄÁÔØ ÂÏÌØÛÏÅ ÞÉÓÌÏ ÇÏÌÏÓÏ× ÚÁ ÎÅÓËÏÌØËÏ [% terms.bugs_gen %]. +<p>ðÒÉ ÎÁÓÔÒÏÊËÅ ÐÒÏÄÕËÔÁ ÍÏÖÅÔ ÂÙÔØ ÐÒÅÄÏÓÔÁ×ÌÅÎÁ ×ÏÚÍÏÖÎÏÓÔØ +ÇÏÌÏÓÏ×ÁÔØ ÚÁ ÏÄÎÕ É ÔÕ ÖÅ [% terms.bug_acc %] ÂÏÌÅÅ ÏÄÎÏÇÏ ÒÁÚÁ. îÏ +ÐÏÍÎÉÔÅ, ÞÉÓÌÏ ÇÏÌÏÓÏ× ÏÇÒÁÎÉÞÅÎÏ! ÷Ù ÍÏÖÅÔÅ ÌÉÂÏ ÇÏÌÏÓÏ×ÁÔØ +ÐÏÎÅÍÎÏÇÕ ÚÁ ÂÏÌØÛÏÅ ËÏÌÉÞÅÓÔ×Ï [% terms.bugs_gen %], ÌÉÂÏ ÏÔÄÁÔØ +ÂÏÌØÛÏÅ ÞÉÓÌÏ ÇÏÌÏÓÏ× ÚÁ ÎÅÓËÏÌØËÏ [% terms.bugs_gen %]. </p> -<p>þÔÏÂÙ ÓÍÏÔÒÅÔØ ÎÁ ÇÏÌÏÓÏ×ÁÎÉÅ:</p> +<p>ðÒÏÓÍÏÔÒ ÒÅÚÕÌØÔÁÔÏ× ÇÏÌÏÓÏ×ÁÎÉÑ:</p> <ul> - <li>éÄÉÔÅ ÎÁ ÓÔÒÁÎÉÃÕ ÚÁÐÒÏÓÏ×. óÄÅÌÁÊÔÅ ÎÏÒÍÁÌØÎÙÊ ÚÁÐÒÏÓ, ÎÏ ÕËÁÖÉÔÅ 1 × - ÐÏÌÅ "ëÁË ÍÉÎÉÍÕÍ ___ ÇÏÌÏÓÏ×". ÷ ÒÅÚÕÌØÔÁÔÅ ×Ù Õ×ÉÄÉÔÅ ÜÌÅÍÅÎÔÙ, ËÏÔÏÒÙÅ - ÓÏÏÔ×ÅÔÓÔ×ÕÀÔ ×ÁÛÅÍÕ ÚÁÐÒÏÓÕ É ÉÍÅÀÔ, ÐÏ ËÒÁÊÎÅÊ ÍÅÒÅ, ÏÄÉÎ ÇÏÌÏÓ.</li> + <li>ðÅÒÅÊÄÉÔÅ ÎÁ ÓÔÒÁÎÉÃÕ ÐÏÉÓËÁ. óÄÅÌÁÊÔÅ ÏÔÂÏÒ, ÕËÁÚÁ× 1 × ÐÏÌÅ + "îÅ ÍÅÎÅÅ ___ ÇÏÌÏÓÏ×". ÷Ù ÐÏÌÕÞÉÔÅ ÐÅÒÅÞÅÎØ [% terms.bugs_gen %], + ËÏÔÏÒÙÅ ÓÏÏÔ×ÅÔÓÔ×ÕÀÔ ÕÓÌÏ×ÉÑÍ ÏÔÂÏÒÁ É ÐÒÉ ÜÔÏÍ ÉÍÅÀÔ ËÁË ÍÉÎÉÍÕÍ + ÏÄÉÎ ÇÏÌÏÓ.</li> </ul> <p>þÔÏÂÙ ÐÒÏÇÏÌÏÓÏ×ÁÔØ ÚÁ [% terms.bug_acc %]:</p> <ul> - <li>úÁÎÅÓÉÔÅ ÒÁÓÓÍÁÔÒÉ×ÁÅÍÕÀ [% terms.bug_acc %].</li> + <li>ðÅÒÅÊÄÉÔÅ Ë ÎÕÖÎÏÊ [% terms.bug_acc %].</li> - <li>îÁÖÍÉÔÅ ÎÁ ÓÓÙÌËÕ "çÏÌÏÓÏ×ÁÔØ ÚÁ ÜÔÕ [% terms.bug_acc %]" ËÏÔÏÒÁÑ - ÒÁÓÐÏÌÏÖÅÎÁ ×ÙÛÅ ÐÏÌÑ "òÁÓ×ÅÒÎÕÔÙÅ ËÏÍÍÅÎÔÁÒÉÉ". (åÓÌÉ ÔÁËÏÊ ÓÓÙÌËÉ ÎÅÔ, + <li>îÁÖÍÉÔÅ ÎÁ ÓÓÙÌËÕ "çÏÌÏÓÏ×ÁÔØ ÚÁ ÜÔÕ [% terms.bug_acc %]", + ËÏÔÏÒÁÑ ÒÁÓÐÏÌÏÖÅÎÁ ×ÙÛÅ ÐÏÌÑ "ëÏÍÍÅÎÔÁÒÉÉ". (åÓÌÉ ÔÁËÏÊ ÓÓÙÌËÉ ÎÅÔ, ÚÎÁÞÉÔ ÄÌÑ ÜÔÏÇÏ ÐÒÏÄÕËÔÁ ÇÏÌÏÓÏ×ÁÎÉÅ ÎÅ ÒÁÚÒÅÛÅÎÏ.)</li> <li>õËÁÖÉÔÅ ÓËÏÌØËÏ ÇÏÌÏÓÏ× ×Ù ÈÏÔÉÔÅ ÐÏÄÁÔØ ÚÁ ÜÔÕ [% terms.bug_acc %]. îÁ ÜÔÏÊ ÓÔÒÁÎÉÃÅ ÔÁËÖÅ ×ÉÄÎÏ, ÓËÏÌØËÏ ÇÏÌÏÓÏ× ×Ù ÏÔÄÁÌÉ ÚÁ ÐÒÏÞÉÅ - [% terms.bugs_acc %], ÔÁË ÞÔÏ ÍÏÖÅÔÅ ÐÏ×ÔÏÒÎÏ ÂÁÌÁÎÓÉÒÏ×ÁÔØ ×ÁÛÉ ÇÏÌÏÓÁ ÐÏ + [% terms.bugs_acc %], ÔÁË ÞÔÏ ÍÏÖÅÔÅ ÉÚÍÅÎÑÔØ ×ÁÛ ×ÙÂÏÒ ÐÏ ÍÅÒÅ ÎÅÏÂÈÏÄÉÍÏÓÔÉ.</li> </ul> -<p>÷Ù Á×ÔÏÍÁÔÉÞÅÓËÉ ÐÏÌÕÞÉÔÅ ÐÉÓØÍÏ, ÉÚ×ÅÝÁÀÝÅÅ ×ÁÓ Ï ÔÏÍ, ËÁËÉÅ ÉÚÍÅÎÅÎÉÑ -ÐÒÏÉÚÏÛÌÉ Ó [% terms.bugs_abl %] ÚÁ ËÏÔÏÒÙÅ ×Ù ÇÏÌÏÓÏ×ÁÌÉ.</p> +<p>÷Ù ÂÕÄÅÔÅ ÐÏÌÕÞÁÔØ ÐÏ ÜÌÅËÔÒÏÎÎÏÊ ÐÏÞÔÅ ÏÐÏ×ÅÝÅÎÉÑ Ï ÉÚÍÅÎÅÎÉÑÈ ÓÏÓÔÏÑÎÉÑ + [% terms.bugs_gen %], ÚÁ ËÏÔÏÒÙÅ ×Ù ÇÏÌÏÓÏ×ÁÌÉ.</p> -<p>÷Ù ÍÏÖÅÔÅ Õ×ÉÄÅÔØ Ó×ÏÉ ÇÏÌÏÓÁ × ÌÀÂÏÅ ×ÒÅÍÑ ËÌÉËÎÕ× ÐÏ ÓÓÙÌËÅ +<p>÷Ù ÍÏÖÅÔÅ Õ×ÉÄÅÔØ Ó×ÏÉ ÇÏÌÏÓÁ × ÌÀÂÏÅ ×ÒÅÍÑ ÎÁÖÁ× ÎÁ ÓÓÙÌËÕ "<a href="votes.cgi?action=show_user">íÏÉ ÇÏÌÏÓÁ</a>" × ÐÏÄ×ÁÌÅ ÓÔÒÁÎÉÃÙ.</p> [% INCLUDE global/footer.html.tmpl %] Index: fields.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/pages/fields.html.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -d -r1.3 -r1.3.2.1 --- fields.html.tmpl 2 Mar 2005 07:50:53 -0000 1.3 +++ fields.html.tmpl 5 Nov 2005 09:20:41 -0000 1.3.2.1 @@ -18,10 +18,12 @@ # # Contributor(s): Terry Weissman <te...@mo...> # Gervase Markham <ge...@ge...> + # # Russian translation: Ilya Shevchik <il...@us...> #%] [% PROCESS global/variables.none.tmpl %] +[% PROCESS "global/field-descs.none.tmpl" %] [% INCLUDE global/header.html.tmpl title = "öÉÚÎÅÎÎÙÊ ÃÉËÌ $terms.bugs_gen" %] <p> @@ -56,51 +58,50 @@ <td> <dl> <dt> - <b>UNCONFIRMED (îåðïäô÷åòöäåîîáñ)</b> + <b>[% status_descs.UNCONFIRMED FILTER html %]</b> </dt> <dd> üÔÁ [% terms.bug %] ÎÅÄÁ×ÎÏ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎÁ × ÂÁÚÅ ÄÁÎÎÙÈ. - îÉËÔÏ ÎÅ ÐÒÏ×ÅÒÑÌ, ÞÔÏ ÜÔÁ [% terms.bug %] ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÉÍÅÅÔ ÍÅÓÔÏ. - ðÏÌØÚÏ×ÁÔÅÌÉ Ó ÐÒÁ×ÏÍ "canconfirm" ÍÏÇÕÔ ÐÏÄÔ×ÅÒÄÉÔØ - [% terms.bug_acc %] É ÉÚÍÅÎÉÔØ ÅÅ ÓÏÓÔÏÑÎÉÅ ÎÁ <b>NEW (îï÷áñ)</b>. + îÉËÔÏ ÎÅ ÐÒÏ×ÅÒÑÌ, ÞÔÏ ÐÒÏÂÌÅÍÁ ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÉÍÅÅÔ ÍÅÓÔÏ. + ðÏÌØÚÏ×ÁÔÅÌÉ Ó ÐÒÁ×ÏÍ "canconfirm" ÍÏÇÕÔ ÐÏÄÔ×ÅÒÄÉÔØ [% terms.bug_acc %] + É ÉÚÍÅÎÉÔØ ÅÅ ÓÏÓÔÏÑÎÉÅ ÎÁ <b>[% status_descs.NEW FILTER html %]</b>. ôÁËÖÅ ÓÉÔÕÁÃÉÑ, Ó×ÑÚÁÎÎÁÑ Ó ÜÔÏÊ [% terms.bug_abl %], ÍÏÖÅÔ ÂÙÔØ ÒÅÛÅÎÁ ÎÅÍÅÄÌÅÎÎÏ É [% terms.bug_obj %] ÍÏÖÅÔ ÂÙÔØ ÐÒÉÓ×ÏÅÎ ÓÔÁÔÕÓ - <b>RESOLVED (òåûåîîáñ)</b>. + <b>[% status_descs.RESOLVED FILTER html %]</b>. </dd> <dt> - <b>NEW (îï÷áñ)</b> + <b>[% status_descs.NEW FILTER html %]</b> </dt> <dd> üÔÁ [% terms.bug %] ÂÙÌÁ ÎÅÄÁ×ÎÏ ÄÏÂÁ×ÌÅÎÁ Ë ÓÐÉÓËÕ - [% terms.bugs_gen %] É ÄÏÌÖÎÁ ÂÙÔØ ÏÂÒÁÂÏÔÁÎÁ. [% terms.Bugs %] × - ÔÁËÏÍ ÓÏÓÔÏÑÎÉÉ ÍÏÇÕÔ ÂÙÔØ ÐÒÉÎÑÔÙ É ÓÔÁÔØ <b>ASSIGNED (îáúîáþåîîùíé)</b>, - ÍÏÇÕÔ ÂÙÔØ ÐÅÒÅÄÁÎÎÙ ÄÒÕÇÏÍÕ ÉÎÖÅÎÅÒÕ É ÏÓÔÁÔØÓÑ <b>NEW (îï÷ùíé)</b>, - ÉÌÉ ÍÏÇÕÔ ÂÙÔØ ÒÅÛÅÎÙ É ÓÔÁÔØ <b>RESOLVED (òåûåîîùíé)</b>. + [% terms.bugs_gen %] ÉÓÐÏÌÎÉÔÅÌÑ É ÄÏÌÖÎÁ ÂÙÔØ ÏÂÒÁÂÏÔÁÎÁ. [% terms.Bug %] × + ÔÁËÏÍ ÓÏÓÔÏÑÎÉÉ ÍÏÖÅÔ ÂÙÔØ ÐÒÉÎÑÔÁ É ÓÔÁÔØ <b>[% status_descs.ASSIGNED FILTER html %]</b>, + ÍÏÖÅÔ ÂÙÔØ ÐÅÒÅÄÁÎÁ ÄÒÕÇÏÍÕ ÉÓÐÏÌÎÉÔÅÌÀ É ÏÓÔÁÎÅÔÓÑ <b>[% status_descs.NEW FILTER html %]</b>, + ÉÌÉ ÍÏÖÅÔ ÂÙÔØ ÒÅÛÅÎÁ É ÐÏÌÕÞÉÔ ÓÏÓÔÏÑÎÉÅ <b>[% status_descs.RESOLVED FILTER html %]</b>. </dd> -<!-- FIX ME: assignee's list - What is it? ðÒÉÎÑÔÙÊ ÓÐÉÓÏË?--> <dt> - <b>ASSIGNED (îáúîáþåîîáñ)</b> + <b>[% status_descs.ASSIGNED FILTER html %]</b> </dt> <dd> üÔÁ [% terms.bug %] ÅÝÅ ÎÅ ÒÅÛÅÎÁ, ÎÏ ÕÖÅ ÐÅÒÅÄÁÎÁ ËÏÎËÒÅÔÎÏÍÕ - ÉÎÖÅÎÅÒÕ. éÚ ÜÔÏÇÏ ÓÏÓÔÏÑÎÉÑ [% terms.bugs %] ÍÏÇÕÔ ÂÙÔØ ÐÅÒÅÄÁÎÙ - ÄÒÕÇÏÍÕ ÉÎÖÅÎÅÒÕ É ÓÄÅÌÁÔØÓÑ <b>NEW (îï÷ùíé)</b>, ÉÌÉ ÍÏÇÕÔ ÂÙÔØ - ÒÅÛÅÎÙ É ÓÔÁÔØ <b>RESOLVED (òåûåîîùíé)</b>. + ÉÓÐÏÌÎÉÔÅÌÀ. éÚ ÜÔÏÇÏ ÓÏÓÔÏÑÎÉÑ [% terms.bug %] ÍÏÖÅÔ ÂÙÔØ ÐÅÒÅÄÁÎÁ + ÄÒÕÇÏÍÕ ÉÓÐÏÌÎÉÔÅÌÀ É ×ÅÒÎÕÔØÓÑ × ÓÏÓÔÏÑÎÉÅ <b>[% status_descs.NEW FILTER html %]</b>, + ÉÌÉ ÍÏÖÅÔ ÂÙÔØ ÒÅÛÅÎÁ É ÐÏÌÕÞÉÔ ÓÏÓÔÏÑÎÉÅ <b>[% status_descs.RESOLVED FILTER html %]</b>. </dd> <dt> - <b>REOPENED (ðï÷ôïòîáñ)</b> + <b>[% status_descs.REOPENED FILTER html %]</b> </dt> <dd> - üÔÁ [% terms.bug %] ÂÙÌÁ ËÏÇÄÁ-ÔÏ ÒÅÛÅÎÁ, ÎÏ ÒÅÛÅÎÉÅ ÓÏÞÌÉ - ÎÅÐÒÁ×ÉÌØÎÙÍ. îÁÐÒÉÍÅÒ, [% terms.bug %] Ó ÒÅÛÅÎÉÅÍ - <b>WORKSFORME (îå÷ïóðòïéú÷ïäéíáñ)</b> - ÍÏÖÅÔ ÓÔÁÔØ <b>REOPENED (ðï÷ôïòîïê)</b>, ÅÓÌÉ ÐÏÑ×ÉÔÓÑ ÂÏÌØÛÅ + üÔÁ [% terms.bug %] ÂÙÌÁ ËÏÇÄÁ-ÔÏ ÒÅÛÅÎÁ, ÎÏ ÒÅÛÅÎÉÅ ÓÏÞÔÅÎÏ + ÎÅ×ÅÒÎÙÍ. îÁÐÒÉÍÅÒ, [% terms.bug %] Ó ÒÅÛÅÎÉÅÍ + <b>[% status_descs.WORKSFORME FILTER html %]</b> + ÍÏÖÅÔ ÓÔÁÔØ <b>[% status_descs.REOPENED FILTER html %]</b>, ÅÓÌÉ ÐÏÑ×ÉÔÓÑ ÂÏÌØÛÅ ÉÎÆÏÒÍÁÃÉÉ Ï ÔÏÍ, ËÁË ×ÏÓÐÒÏÉÚ×ÅÓÔÉ [% terms.bug_acc %]. éÚ ÜÔÏÇÏ - ÓÏÓÔÏÑÎÉÑ [% terms.bug %] ÍÏÖÅÔ ÓÔÁÔØ - <b>ASSIGNED (îáúîáþåîîá)</b> ÉÌÉ <b>RESOLVED (òåûåîá)</b>. + ÓÏÓÔÏÑÎÉÑ [% terms.bug %] ÍÏÖÅÔ ÐÅÒÅÊÔÉ × ÓÏÓÔÏÑÎÉÅ + <b>[% status_descs.ASSIGNED FILTER html %]</b> ÉÌÉ <b>[% status_descs.RESOLVED FILTER html %]</b>. </dd> </dl> </td> @@ -120,33 +121,33 @@ <td> <dl> <dt> - <b>RESOLVED (òåûåîîáñ)</b> + <b>[% status_descs.RESOLVED FILTER html %]</b> </dt> <dd> - òÅÛÅÎÉÅ ÐÒÉÎÑÔÏ É ÏÖÉÄÁÅÔ ÐÒÏ×ÅÒËÉ ÓÌÕÖÂÏÊ ËÏÎÔÒÏÌÑ ËÁÞÅÓÔ×Á. + òÅÛÅÎÉÅ ÐÒÉÎÑÔÏ É ÏÖÉÄÁÅÔ ÐÒÉÅÍËÉ. ïÔÓÀÄÁ [% terms.bug %] ÍÏÖÅÔ ÂÙÔØ ÏÔËÒÙÔÁ ×ÎÏ×Ø É ÐÏÌÕÞÉÔØ - ÓÔÁÔÕÓ <b>REOPENED (ðï÷ôïòîáñ)</b>, ÍÏÖÅÔ ÂÙÔØ ÐÅÒÅ×ÅÄÅÎÁ × - ÓÏÓÔÏÑÎÉÅ <b>VERIFIED (ðòéîñôá)</b>, ÉÌÉ ÐÒÏÓÔÏ ÚÁËÒÙÔÁ É - ÐÏÍÅÞÅÎÁ ËÁË <b>CLOSED (úáëòùôáñ)</b>. + ÓÔÁÔÕÓ <b>[% status_descs.REOPENED FILTER html %]</b>, ÍÏÖÅÔ ÂÙÔØ ÐÅÒÅ×ÅÄÅÎÁ × + ÓÏÓÔÏÑÎÉÅ <b>[% status_descs.VERIFIED FILTER html %]</b>, ÉÌÉ ÐÒÏÓÔÏ ÚÁËÒÙÔÁ É + ÐÏÍÅÞÅÎÁ ËÁË <b>[% status_descs.CLOSED FILTER html %]</b>. </dd> <dt> - <b>VERIFIED (ðòéîñôá)</b> + <b>[% status_descs.VERIFIED FILTER html %]</b> </dt> <dd> - óÌÕÖÂÁ ËÏÎÔÒÏÌÑ ËÁÞÅÓÔ×Á ÒÁÓÓÍÏÔÒÅÌÁ [% terms.bug_acc %] É ÐÒÉÎÑÔÏÅ - ÒÅÛÅÎÉÅ É ÓÏÇÌÁÓÉÌÁÓØ Ó ÎÉÍ. [% terms.Bug %] ÏÓÔÁÅÔÓÑ × ÜÔÏÍ ÓÏÓÔÏÑÎÉÉ - ÄÏ ÔÅÈ ÐÏÒ, ÐÏËÁ ÎÅ ×ÙÊÄÅÔ ×ÅÒÓÉÑ ÐÒÏÄÕËÔÁ Ó ÉÓÐÒÁ×ÌÅÎÉÑÍÉ, É Ó ÜÔÏÇÏ - ÍÏÍÅÎÔÁ ÓÔÁÎÏ×ÉÔÓÑ <b>CLOSED (úáëòùôïê)</b>. + ðÒÉÎÑÔÏÅ ÒÅÛÅÎÉÅ ÐÏÄÔ×ÅÒÖÄÅÎÏ ÏÔ×ÅÓÔ×ÅÎÎÙÍ ÚÁ ÐÒÉÅÍËÕ [% terms.bug_gen %]. + [% terms.Bug %] ÏÓÔÁÅÔÓÑ × ÜÔÏÍ ÓÏÓÔÏÑÎÉÉ ÄÏ ÔÅÈ ÐÏÒ, ÐÏËÁ ÉÚÍÅÎÅÎÉÑ + ÎÅ ÄÏÊÄÕÔ ÄÏ ÐÏÌØÚÏ×ÁÔÅÌÅÊ, É Ó ÜÔÏÇÏ + ÍÏÍÅÎÔÁ ÓÔÁÎÏ×ÉÔÓÑ <b>[% status_descs.CLOSED FILTER html %]</b>. </dd> <dt> - <b>CLOSED (úáëòùôáñ)</b> + <b>[% status_descs.CLOSED FILTER html %]</b> </dt> <dd> - [% terms.Bug_acc %] ÓÞÉÔÁÀÔ ÍÅÒÔ×ÏÊ, ÐÒÉÎÑÔÏÅ ÒÅÛÅÎÉÅ ÐÒÁ×ÉÌØÎÙÍ. + [% terms.Bug_acc %] ÓÞÉÔÁÅÔÓÑ ÚÁ×ÅÒÛÅÎÎÏÊ, Á ÐÒÉÎÑÔÏÅ ÒÅÛÅÎÉÅ -- ÐÒÁ×ÉÌØÎÙÍ. ÷ÏÚÏÂÎÏ×ÌÅÎÉÅ ÒÁÂÏÔÙ ÎÁÄ [% terms.bug_abl %] ×ÏÚÍÏÖÎÏ ÌÉÛØ ÐÏÓÌÅ - ÐÅÒÅ×ÏÄÁ [% terms.bug_gen %] × ÓÏÓÔÏÑÎÉÅ <b>REOPENED (ðï÷ôïòîáñ)</b>. + ÐÅÒÅ×ÏÄÁ [% terms.bug_gen %] × ÓÏÓÔÏÑÎÉÅ <b>[% status_descs.REOPENED FILTER html %]</b>. </dd> </dl> </td> @@ -154,72 +155,69 @@ <td> <dl> <dt> - <b>FIXED (éóðòá÷ìåîï)</b> + <b>[% resolution_descs.FIXED FILTER html %]</b> </dt> <dd> - éÓÐÒÁ×ÌÅÎÉÑ ×ÎÅÓÅÎÙ × ÐÒÏÇÒÁÍÍÕ É ÐÒÏÔÅÓÔÉÒÏ×ÁÎÙ. + îÅÏÂÈÏÄÉÍÙÅ ÉÚÍÅÎÅÎÉÑ ×ÎÅÓÅÎÙ É ÐÒÏÔÅÓÔÉÒÏ×ÁÎÙ. </dd> -<!-- FIX ME: into the tree - îÅÐÏÎÑÔÎÏ Ï ËÁËÏÍ ÄÅÒÅ×Å ÉÄÅÔ ÒÅÞØ--> <dt> - <b>INVALID (ïûéâïþîï)</b> + <b>[% resolution_descs.INVALID FILTER html %]</b> </dt> <dd> - ïÐÉÓÙ×ÁÅÍÁÑ ÐÒÏÂÌÅÍÁ ÎÅ Ñ×ÌÑÅÔÓÑ [% terms.bug_abl %]. + [% terms.Bug %] ÐÏ ÏÐÉÓÁÎÉÀ ÎÅ Ñ×ÌÑÅÔÓÑ ÐÒÏÂÌÅÍÏÊ ÉÌÉ ÏÆÏÒÍÌÅÎÁ ÎÅ×ÅÒÎÏ. </dd> <dt> - <b>WONTFIX (ïôëáúáîï)</b> + <b>[% resolution_descs.WONTFIX FILTER html %]</b> </dt> <dd> - ïÐÉÓÙ×ÁÅÍÁÑ ÐÒÏÂÌÅÍÁ ÐÒÉÚÎÁÎÁ [% terms.bug_abl %], É × ÅÅ ÉÓÐÒÁ×ÌÅÎÉÉ - ÏÔËÁÚÁÎÏ. + ïÐÉÓÙ×ÁÅÍÁÑ ÐÒÏÂÌÅÍÁ ÐÒÉÚÎÁÎÁ, ÎÏ × ÅÅ ÉÓÐÒÁ×ÌÅÎÉÉ ÏÔËÁÚÁÎÏ. </dd> [%# This is not necessary for English templates, but useful for localisers. %] <dt> - <b>LATER (ïôìïöåîï)</b> + <b>[% resolution_descs.LATER FILTER html %]</b> </dt> <dd> - ïÐÉÓÙ×ÁÅÍÁÑ ÐÒÏÂÌÅÍÁ ÐÒÉÚÎÁÎÁ [% terms.bug_abl %], ËÏÔÏÒÁÑ ÎÅ - ÐÏÄÌÅÖÉÔ ÉÓÐÒÁ×ÌÅÎÉÀ × ÔÅËÕÝÅÊ ×ÅÒÓÉÉ ÐÒÏÄÕËÔÁ. + ïÐÉÓÙ×ÁÅÍÁÑ ÐÒÏÂÌÅÍÁ ÐÒÉÚÎÁÎÁ, ÎÏ ÎÅ ÐÏÄÌÅÖÉÔ ÉÓÐÒÁ×ÌÅÎÉÀ × + ÔÅËÕÝÅÊ ×ÅÒÓÉÉ ÐÒÏÄÕËÔÁ. </dd> <dt> - <b>REMIND (÷ ïöéäáîéé)</b> + <b>[% resolution_descs.REMIND FILTER html %]</b> </dt> <dd> - ïÐÉÓÙ×ÁÅÍÁÑ ÐÒÏÂÌÅÍÁ ÐÒÉÚÎÁÎÁ [% terms.bug_abl %], ËÏÔÏÒÁÑ ÎÅ - ÚÁÐÌÁÎÉÒÏ×ÁÎÁ Ë ÉÓÐÒÁ×ÌÅÎÉÀ × ÔÅËÕÝÅÊ ×ÅÒÓÉÉ ÐÒÏÄÕËÔÁ, ÎÏ ÜÔÏ - ÒÅÛÅÎÉÅ ÎÅ ÏËÏÎÞÁÔÅÌØÎÏÅ. + ïÐÉÓÙ×ÁÅÍÁÑ ÐÒÏÂÌÅÍÁ ÐÒÉÚÎÁÎÁ, ÎÏ ÒÁÂÏÔÙ ÎÅ ÚÁÐÌÁÎÉÒÏ×ÁÎÙ + × ÔÅËÕÝÅÊ ×ÅÒÓÉÉ ÐÒÏÄÕËÔÁ. òÅÛÅÎÉÅ ÎÅ ÏËÏÎÞÁÔÅÌØÎÏÅ. </dd> [%# The end of an insert. %] <dt> - <b>DUPLICATE (ðï÷ôïò)</b> + <b>[% resolution_descs.DUPLICATE FILTER html %]</b> </dt> <dd> - ðÏ×ÔÏÒÎÁÑ ÒÅÇÉÓÔÒÁÃÉÑ ÏÐÉÓÁÎÎÏÊ ÒÁÎÅÅ [% terms.bug_gen %]. - ôÒÅÂÕÅÔÓÑ ÕËÁÚÁÎÉÅ ÎÏÍÅÒÁ ÉÓÈÏÄÎÏÊ [% terms.bug_gen %], - ËÏÔÏÒÙÊ ÂÕÄÅÔ ÄÏÂÁ×ÌÅÎ × ÏÐÉÓÁÎÉÅ. + ðÏ×ÔÏÒÎÁÑ ÒÅÇÉÓÔÒÁÃÉÑ ÓÕÝÅÓÔ×ÕÀÝÅÊ [% terms.bug_gen %]. + ðÒÉ ÐÒÉÎÑÔÉÉ ÔÁËÏÇÏ ÒÅÛÅÎÉÑ ÔÒÅÂÕÅÔÓÑ ÕËÁÚÁÎÉÅ ÎÏÍÅÒÁ ÉÓÈÏÄÎÏÊ + [% terms.bug_gen %], ËÏÔÏÒÙÊ ÂÕÄÅÔ ÄÏÂÁ×ÌÅÎ × ÏÐÉÓÁÎÉÅ. </dd> <dt> - <b>WORKSFORME (îå÷ïóðòïéú÷ïäéíï)</b> + <b>[% resolution_descs.WORKSFORME FILTER html %]</b> </dt> <dd> - ÷ÓÅ ÐÏÐÙÔËÉ ×ÏÓÐÒÏÉÚ×ÅÓÔÉ [% terms.bug_acc %] ÂÙÌÉ ÂÅÚÕÓÐÅÛÎÙ, - ÁÎÁÌÉÚ ËÏÄÁ ÎÅ ÐÏÚ×ÏÌÉÌ ÐÏÎÑÔØ ×ÏÚÍÏÖÎÙÅ ÐÒÉÞÉÎÙ ÐÏÑ×ÌÅÎÉÑ + ÷ÓÅ ÐÏÐÙÔËÉ ×ÏÓÐÒÏÉÚ×ÅÓÔÉ ÐÒÏÂÌÅÍÕ ÂÙÌÉ ÂÅÚÕÓÐÅÛÎÙ, + ÁÎÁÌÉÚ ÎÅ ÐÏÚ×ÏÌÉÌ ÐÏÎÑÔØ ×ÏÚÍÏÖÎÙÅ ÐÒÉÞÉÎÙ ÐÏÑ×ÌÅÎÉÑ ÏÐÉÓÁÎÎÏÊ ÐÒÏÂÌÅÍÙ. ðÒÉ ÐÏÌÕÞÅÎÉÉ ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÉÎÆÏÒÍÁÃÉÉ, [% terms.bug_acc %] ÓÌÅÄÕÅÔ ÏÔËÒÙÔØ ÐÏ×ÔÏÒÎÏ, ÄÏ ÔÅÈ ÐÏÒ ÒÁÂÏÔÙ ÎÁÄ [% terms.bug_abl %] ÐÒÅËÒÁÝÅÎÙ. </dd> <dt> - <b>MOVED (ðåòåíåýåîï)</b> + <b>[% resolution_descs.MOVED FILTER html %]</b> </dt> <dd> - ðÒÏÂÌÅÍÁ ÏÔÎÏÓÉÔÓÑ Ë ÒÏÄÓÔ×ÅÎÎÏÍÕ ÐÒÏÄÕËÔÕ, [% terms.bugs %] + ðÒÏÂÌÅÍÁ ÏÔÎÏÓÉÔÓÑ Ë ÄÒÕÇÏÍÕ ÐÒÏÄÕËÔÕ, [% terms.bugs %] ËÏÔÏÒÏÇÏ ÏÔÓÌÅÖÉ×ÁÀÔÓÑ × ÄÒÕÇÏÊ ÂÁÚÅ ÄÁÎÎÙÈ. [% terms.Bug %] ÐÅÒÅÎÅÓÅÎÁ × ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÕÀ ÂÁÚÕ ÄÁÎÎÙÈ. </dd> @@ -229,19 +227,19 @@ </table> <h2><a name="bug_severity">óÅÒØÅÚÎÏÓÔØ</a></h2> -üÔÏ ÐÏÌÅ ÏÐÉÓÙ×ÁÅÔ ÐÏÓÌÅÄÓÔ×ÉÑ [% terms.bug_gen %]. +üÔÏ ÐÏÌÅ ÏÐÉÓÙ×ÁÅÔ ÓÔÅÐÅÎØ ×ÌÉÑÎÉÑ ÐÒÏÂÌÅÍÙ. <table> <tr> <th>Blocker</th> - <td>âÌÏËÉÒÕÅÔ ÒÁÂÏÔÙ ÐÏ ÒÁÚÒÁÂÏÔËÅ É/ÉÌÉ ÔÅÓÔÉÏÒÏ×ÁÎÉÀ</td> + <td>âÌÏËÉÒÕÅÔ ÄÁÌØÎÅÊÛÉÅ ÒÁÂÏÔÙ ÐÏ ÒÁÚÒÁÂÏÔËÅ É/ÉÌÉ ÔÅÓÔÉÒÏ×ÁÎÉÀ</td> </tr> <tr> <th>Critical</th> - <td>ëÒÁÈ ÐÒÏÇÒÁÍÍÙ, ÐÏÔÅÒÑ ÄÁÎÎÙÈ, ÓÅÒØÅÚÎÁÑ ÕÔÅÞËÁ ÒÅÓÕÒÓÏ×</td> + <td>á×ÁÒÉÑ ÐÒÏÇÒÁÍÍÙ, ÐÏÔÅÒÑ ÄÁÎÎÙÈ, ÓÅÒØÅÚÎÁÑ ÕÔÅÞËÁ ÒÅÓÕÒÓÏ×</td> </tr> <tr> @@ -299,7 +297,7 @@ <h2><a name="op_sys">ïÐÅÒÁÃÉÏÎÎÁÑ ÓÉÓÔÅÍÁ</a></h2> ïÐÅÒÁÃÉÏÎÎÁÑ ÓÉÓÔÅÍÁ, × ËÏÔÏÒÏÊ ÐÒÏÑ×ÌÑÅÔÓÑ [% terms.bug %]. äÏÐÕÓÔÉÍÙÅ -ÚÎÁÞÅÎÉÑ: (ÐÅÒÅÞÉÓÌÅÎÏ ÄÁÌÅËÏ ÎÅ ×ÓÅ -- ÐÒÉÍ. ÐÅÒÅ×.) +ÚÎÁÞÅÎÉÑ: <ul> <li>÷ÓÅ ([% terms.bug %] ×ÏÓÐÒÏÉÚ×ÏÄÉÍÁ ÎÁ ÌÀÂÏÊ ÐÌÁÔÆÏÒÍÅ)</li> @@ -313,19 +311,20 @@ úÁÍÅÔÉÍ, ÞÔÏ ÏÐÅÒÁÃÉÏÎÎÁÑ ÓÉÓÔÅÍÁ ÏÂÙÞÎÏ ÐÏÄÒÁÚÕÍÅ×ÁÅÔ ÐÌÁÔÆÏÒÍÕ, ÎÏ ÎÅ ×ÓÅÇÄÁ. îÁÐÒÉÍÅÒ, Linux ÍÏÖÅÔ ÒÁÂÏÔÁÔØ ÎÁ IBM PC, Macintosh É ÄÒÕÇÉÈ ÐÌÁÔÆÏÒÍÁÈ. -<h2><a name="assigned_to">ïÔ×ÅÔÓÔ×ÅÎÎÙÊ</a></h2> +<h2><a name="assigned_to">éÓÐÏÌÎÉÔÅÌØ</a></h2> <p> -ìÉÃÏ, ÏÔ×ÅÔÓÔ×ÅÎÎÏÅ ÚÁ ÉÓÐÒÁ×ÌÅÎÉÅ [% terms.bug_gen %]. ÷ÓÑËÉÊ ÒÁÚ, ËÏÇÄÁ ÜÔÏ +ìÉÃÏ, ÏÔ×ÅÔÓÔ×ÅÎÎÏÅ ÚÁ ÒÁÂÏÔÙ ÐÏ [% terms.bug_gen %]. ÷ÓÑËÉÊ ÒÁÚ, ËÏÇÄÁ ÜÔÏ ÐÏÌÅ ÍÅÎÑÅÔÓÑ, ÓÏÓÔÏÑÎÉÅ [% terms.bug_gen %] ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ × -<b>NEW (îï÷áñ)</b>, ÞÔÏÂÙ ÏÂÌÅÇÞÉÔØ ÐÏÉÓË ×ÎÏ×Ø ÎÁÚÎÁÞÅÎÎÙÈ +<b>[% status_descs.NEW FILTER html %]</b>, ÞÔÏÂÙ ÏÂÌÅÇÞÉÔØ ÐÏÉÓË ×ÎÏ×Ø ÎÁÚÎÁÞÅÎÎÙÈ [% terms.bugs_gen %].</p> <p> -ðÏ ÕÍÏÌÞÁÎÉÀ, ÄÌÑ ÚÁÐÒÏÓÏ× × ÐÏÌÅ ÓÏÓÔÏÑÎÉÅ ×ËÌÀÞÅÎÙ ÚÎÁÞÅÎÉÑ <b>NEW (îï÷áñ)</b>, -<b>ASSIGNED (îáúîáþåîîáñ)</b> É <b>REOPENED (ðï÷ôïòîáñ)</b>. +ðÏ ÕÍÏÌÞÁÎÉÀ ÄÌÑ ÏÔÂÏÒÁ ×ËÌÀÞÅÎÙ ÚÎÁÞÅÎÉÑ [% status_descs.NEW FILTER html %], +[% descs.bug_status_descs.ASSIGNED FILTER html %] É +[% status_descs.REOPENED FILTER html %]. ðÒÉ ÐÏÉÓËÅ [% terms.bugs_gen %], ÐÏ ËÏÔÏÒÙÍ ÕÖÅ ÐÏÌÕÞÅÎÙ ÒÅÛÅÎÉÑ, ÎÅ ÚÁÂÙ×ÁÊÔÅ -ÕÓÔÁÎÏ×ÉÔØ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÅ ÚÎÁÞÅÎÉÑ × ÐÏÌÅ ÓÏÓÔÏÑÎÉÅ. +×ÙÂÒÁÔØ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÅ ÚÎÁÞÅÎÉÑ × ÐÏÌÅ ÓÏÓÔÏÑÎÉÑ. </p> [% INCLUDE global/footer.html.tmpl %] |
|
From: Vitaly F. <fed...@us...> - 2005-11-05 09:20:50
|
Update of /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/bug/process In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1354/bug/process Modified Files: Tag: BUGZILLA-2_20 confirm-duplicate.html.tmpl midair.html.tmpl verify-new-product.html.tmpl Log Message: Updated to Bugzilla 2.20 Index: verify-new-product.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/bug/process/verify-new-product.html.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -d -r1.3 -r1.3.2.1 --- verify-new-product.html.tmpl 26 Feb 2005 17:42:53 -0000 1.3 +++ verify-new-product.html.tmpl 5 Nov 2005 09:20:41 -0000 1.3.2.1 @@ -17,13 +17,12 @@ # Rights Reserved. # # Contributor(s): Myk Melez <my...@mo...> + # # Russian translation: Vitaly Fedrushkov <fed...@us...> # Dmitry Pupkov <dp...@mc...> #%] [%# INTERFACE: - # form: hash; the form values submitted to the script - # mform: hash; the form multi-values submitted to the script # verify_fields: boolean; whether or not to verify # the version, component, and target milestone fields # versions: array; versions for the new product. @@ -37,9 +36,14 @@ # the target milestone field #%] +[%# The global Bugzilla->cgi object is used to obtain form variable values. %] +[% USE Bugzilla %] +[% cgi = Bugzilla.cgi %] + [% PROCESS global/variables.none.tmpl %] -[% PROCESS global/header.html.tmpl %] +[% PROCESS global/header.html.tmpl + title = 'éÚÍÅÎÅÎÉÑ ÐÒÉ ÓÍÅÎÅ ÐÒÏÄÕËÔÁ...' %] <form action="process_bug.cgi" method="post"> @@ -48,35 +52,35 @@ [%# Verify the version, component, and target milestone fields. %] [% IF verify_fields %] - <h3>Verify Version, Component[% ", Target Milestone" IF use_target_milestone %]</h3> + <h3>ðÏÄÔ×ÅÒÄÉÔÅ ×ÅÒÓÉÀ, ËÏÍÐÏÎÅÎÔ [% ", ÐÌÁÎ" IF use_target_milestone %]</h3> <p> [% IF use_target_milestone %] - You are moving the [% terms.bug %](s) to the product - <b>[% form.product FILTER html %]</b>, - and the version, component, and/or target milestone fields are no longer - correct. Please set the correct version, component, and target milestone now: + ÷Ù ÐÅÒÅÍÅÝÁÅÔÅ [% terms.bug_acc %] × ÐÒÏÄÕËÔ + <b>[% cgi.param("product") FILTER html %]</b>, + × ÒÅÚÕÌØÔÁÔÅ ×ÅÒÓÉÑ, ËÏÍÐÏÎÅÎÔ É ÐÌÁÎ ÄÏÌÖÎÙ ÂÙÔØ ÐÒÉ×ÅÄÅÎÙ + × ÓÏÏÔ×ÅÔÓÔ×ÉÅ. õÓÔÁÎÏ×ÉÔÅ ÚÎÁÞÅÎÉÑ ÄÌÑ ÎÏ×ÏÇÏ ÐÒÏÄÕËÔÁ: [% ELSE %] - You are moving the [% terms.bug %](s) to the product - <b>[% form.product FILTER html %]</b>, - and the version and component fields are no longer correct. - Please set the correct version and component now: + ÷Ù ÐÅÒÅÍÅÝÁÅÔÅ [% terms.bug_acc %] × ÐÒÏÄÕËÔ + <b>[% cgi.param("product") FILTER html %]</b>, + × ÒÅÚÕÌØÔÁÔÅ ×ÅÒÓÉÑ É ËÏÍÐÏÎÅÎÔ ÄÏÌÖÎÙ ÂÙÔØ ÐÒÉ×ÅÄÅÎÙ + × ÓÏÏÔ×ÅÔÓÔ×ÉÅ. õÓÔÁÎÏ×ÉÔÅ ÚÎÁÞÅÎÉÑ ÄÌÑ ÎÏ×ÏÇÏ ÐÒÏÄÕËÔÁ: [% END %] <p> <table> <tr> <td> - <b>Version:</b><br> + <b>÷ÅÒÓÉÑ:</b><br> [% PROCESS "global/select-menu.html.tmpl" name="version" options=versions default=defaults.version %] </td> <td> - <b>Component:</b><br> + <b>ëÏÍÐÏÎÅÎÔ:</b><br> [% PROCESS "global/select-menu.html.tmpl" name="component" options=components default=defaults.component %] </td> [% IF use_target_milestone %] <td> - <b>Target Milestone:</b><br> + <b>úÁÐÌÁÎÉÒÏ×ÁÎÏ:</b><br> [% PROCESS "global/select-menu.html.tmpl" name="target_milestone" options=milestones default=defaults.target_milestone %] </td> [% END %] @@ -86,25 +90,25 @@ [% END %] [% IF verify_bug_group %] - <h3>Verify [% terms.Bug %] Group</h3> + <h3>ðÏÄÔ×ÅÒÄÉÔÅ ÐÒÁ×Á ÄÏÓÔÕÐÁ</h3> <p> - Do you want to add the [% terms.bug %] to its new product's default groups (if any)? + äÏÂÁ×ÉÔØ [% terms.bug_acc %] Ë ÇÒÕÐÐÅ ÄÏÓÔÕÐÁ ÎÏ×ÏÇÏ ÐÒÏÄÕËÔÁ? </p> <p> - <input type="radio" name="addtonewgroup" value="no"><b>no</b><br> - <input type="radio" name="addtonewgroup" value="yes"><b>yes</b><br> + <input type="radio" name="addtonewgroup" value="no"><b>ÎÅÔ</b><br> + <input type="radio" name="addtonewgroup" value="yes"><b>ÄÁ</b><br> <input type="radio" name="addtonewgroup" value="yesifinold" checked="checked"> - <b>yes, but only if the [% terms.bug %] was in any of its old product's default groups</b><br> + <b>ÄÁ, ÔÏÌØËÏ ÅÓÌÉ [% terms.bug %] ÐÒÉÎÁÄÌÅÖÁÌÁ ÇÒÕÐÐÅ ÄÏÓÔÕÐÁ ÓÔÁÒÏÇÏ ÐÒÏÄÕËÔÁ</b><br> </p> [% END %] -<input type="submit" value="Commit"> +<input type="submit" value="óÏÈÒÁÎÉÔØ"> </form> <hr> -<a href="query.cgi">Cancel and Return to the Search Page</a> +<a href="query.cgi">ïÔÍÅÎÉÔØ É ×ÅÒÎÕÔØÓÑ Ë ÓÔÒÁÎÉÃÅ ÐÏÉÓËÁ</a> [% PROCESS global/footer.html.tmpl %] Index: midair.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/bug/process/midair.html.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -d -r1.3 -r1.3.2.1 --- midair.html.tmpl 26 Feb 2005 17:42:53 -0000 1.3 +++ midair.html.tmpl 5 Nov 2005 09:20:41 -0000 1.3.2.1 @@ -17,13 +17,12 @@ # Rights Reserved. # # Contributor(s): Myk Melez <my...@mo...> + # # Russian translation: Vitaly Fedrushkov <fed...@us...> # Dmitry Pupkov <dp...@mc...> #%] [%# INTERFACE: - # form: hash; the form values submitted to the script - # mform: hash; the form multi-values submitted to the script # operations: array; bug activity since the user last displayed the bug form, # used by bug/activity/table.html.tmpl to display recent changes that will # be overwritten if the user submits these changes. See that template @@ -36,6 +35,10 @@ # bug_id: number; the ID of the bug being changed. #%] +[%# The global Bugzilla->cgi object is used to obtain form variable values. %] +[% USE Bugzilla %] +[% cgi = Bugzilla.cgi %] + [% PROCESS global/variables.none.tmpl %] [% UNLESS header_done %] @@ -45,10 +48,8 @@ <h1>ïÂÎÁÒÕÖÅÎ ËÏÎÆÌÉËÔ ÄÏÓÔÕÐÁ!</h1> <p> -<!-- FIXME: ÍÏÖÅÔ ÂÙÔØ ÎÅÍÎÏÇÏ ÐÏ-ÄÒÕÇÏÍÕ ÐÅÒÅ×ÅÓÔÉ? --> - óÏÄÅÒÖÉÍÏÅ [% terms.bug_gen %] ÉÚÍÅÎÉÌÏÓØ ×Ï ×ÒÅÍÑ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ. ó×ÏÄËÁ ÉÚÍÅÎÅÎÉÊ: -<!-- Someone else has made changes to this [% terms.bug %] at the same time you were trying to. - The changes made were: --> + óÏÄÅÒÖÉÍÏÅ [% terms.bug_gen %] ÉÚÍÅÎÅÎÏ ÄÒÕÇÉÍ ÐÏÌØÚÏ×ÁÔÅÌÅÍ ×Ï ×ÒÅÍÑ + ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ. ó×ÏÄËÁ ÉÚÍÅÎÅÎÉÊ: </p> <p> @@ -65,6 +66,11 @@ [% END %] <p> + ÷ÁÛ ËÏÍÍÅÎÔÁÒÉÊ:<br> + <blockquote><pre>[% cgi.param("comment") FILTER html %]</pre></blockquote> +</p> + +<p> ÷ÏÚÍÏÖÎÙÅ ×ÁÒÉÁÎÔÙ: </p> @@ -74,11 +80,11 @@ [% PROCESS "global/hidden-fields.html.tmpl" exclude="^Bugzilla_(login|password)$" %] <input type="submit" value="óÏÈÒÁÎÉÔØ ÉÚÍÅÎÅÎÉÑ"> ÷ÓÅ ÐÅÒÅÞÉÓÌÅÎÎÙÅ ÉÚÍÅÎÅÎÉÑ ÂÕÄÕÔ ÐÏÔÅÒÑÎÙ - [% ", ÚÁ ÉÓËÌÀÞÅÎÉÅÍ ËÏÍÍÅÎÔÁÒÉÅ×" IF comments.size > start_at %]. + [% ", ËÒÏÍÅ ÄÏÂÁ×ÌÅÎÎÙÈ ËÏÍÍÅÎÔÁÒÉÅ×" IF comments.size > start_at %]. </form> </li> <li> - <a href="show_bug.cgi?id=[% bug_id %]">ïÔÍÅÎÉÔØ ÉÚÍÅÎÅÎÉÑ, + <a href="show_bug.cgi?id=[% bug_id %]">ïÔÍÅÎÉÔØ ÍÏÉ ÉÚÍÅÎÅÎÉÑ, ×ÅÒÎÕÔØÓÑ Ë [% terms.bug_dat %] [%+ bug_id %]</a> </li> </ul> Index: confirm-duplicate.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/bug/process/confirm-duplicate.html.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -d -r1.3 -r1.3.2.1 --- confirm-duplicate.html.tmpl 26 Feb 2005 17:42:53 -0000 1.3 +++ confirm-duplicate.html.tmpl 5 Nov 2005 09:20:41 -0000 1.3.2.1 @@ -17,13 +17,12 @@ # Rights Reserved. # # Contributor(s): Myk Melez <my...@mo...> + # # Russian translation: Vitaly Fedrushkov <fed...@us...> # Dmitry Pupkov <dp...@mc...> #%] [%# INTERFACE: - # form: hash; the form values submitted to the script - # mform: hash; the form multi-values submitted to the script # original_bug_id: number; the bug number for the bug # against which a bug is being duped # duplicate_bug_id: number; the bug number for the bug @@ -34,13 +33,13 @@ [% PROCESS global/variables.none.tmpl %] -[% PROCESS global/header.html.tmpl title="Duplicate Warning" %] +[% PROCESS global/header.html.tmpl title="ðÒÅÄÕÐÒÅÖÄÅÎÉÅ Ï ÄÕÂÌÉÒÏ×ÁÎÉÉ" %] <p> ðÒÉ ÐÒÉÚÎÁÎÉÉ [% terms.bug_gen %] ÄÕÂÌÉËÁÔÏÍ ÓÕÝÅÓÔ×ÕÀÝÅÊ, ÅÅ ÉÎÉÃÉÁÔÏÒ ÄÏÂÁ×ÌÑÅÔÓÑ × ÞÉÓÌÏ ÐÏÄÐÉÓÞÉËÏ× ÏÒÉÇÉÎÁÌÁ. îÁÓÔÒÏÊËÉ ÄÏÓÔÕÐÁ Ë - ÏÒÉÇÉÎÁÌÕ [% terms.bug_gen %] [% original_bug_id %] ÔÁËÏ×Ù, ÞÔÏ ÉÎÉÃÉÁÔÏÒ - ÄÕÂÌÉËÁÔÁ ÎÅ ÉÍÅÅÔ ÄÏÓÔÕÐÁ Ë ÎÅÊ. + ÏÒÉÇÉÎÁÌÕ -- [% terms.bug_dat %] [% original_bug_id %] -- ÔÁËÏ×Ù, + ÞÔÏ ÉÎÉÃÉÁÔÏÒ ÄÕÂÌÉËÁÔÁ ÎÅ ÉÍÅÅÔ ÄÏÓÔÕÐÁ Ë ÎÅÊ. </p> <p> @@ -65,14 +64,14 @@ </p> <p> <input type="radio" name="confirm_add_duplicate" value="0" checked="checked"> - îÅÔ, ÎÅ ÐÏÐÉÓÙ×ÁÔØ ÉÎÉÃÉÁÔÏÒÁ ÎÁ [% terms.bug_acc %] + îÅÔ, ÎÅ ÐÏÄÐÉÓÙ×ÁÔØ ÉÎÉÃÉÁÔÏÒÁ ÎÁ [% terms.bug_acc %] [%+ original_bug_id %] </p> <p> <a href="show_bug.cgi?id=[% duplicate_bug_id %]">ïÔÍÅÎÉÔØ ÉÚÍÅÎÅÎÉÑ É ×ÅÒÎÕÔØÓÑ Ë [% terms.bug_dat %] [%+ duplicate_bug_id %]</a> <p> - <input type="submit" value="ðÒÉÍÅÎÉÔØ"> + <input type="submit" value="óÏÈÒÁÎÉÔØ"> </p> </form> |
|
From: Vitaly F. <fed...@us...> - 2005-11-05 09:20:50
|
Update of /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/search In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1354/search Modified Files: Tag: BUGZILLA-2_20 search-specific.html.tmpl Log Message: Updated to Bugzilla 2.20 Index: search-specific.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/search/search-specific.html.tmpl,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -d -r1.2.2.1 -r1.2.2.2 --- search-specific.html.tmpl 1 Nov 2005 19:54:42 -0000 1.2.2.1 +++ search-specific.html.tmpl 5 Nov 2005 09:20:42 -0000 1.2.2.2 @@ -39,7 +39,7 @@ [% PROCESS search/tabs.html.tmpl %] <p> -ðÏÉÓË ËÏÎËÒÅÔÎÏÊ [% terms.bug_gen %] ÐÏ ÈÁÒÁËÔÅÒÎÙÍ ÓÌÏ×ÁÍ. +ðÏÉÓË ËÏÎËÒÅÔÎÏÊ [% terms.bug_gen %] ÐÏ ÈÁÒÁËÔÅÒÎÙÍ ÓÌÏ×ÁÍ. [% terms.Bugzilla %] ÂÕÄÅÔ ÉÓËÁÔØ [% terms.bugs %], × ÏÐÉÓÁÎÉÑÈ É ËÏÍÍÅÎÔÁÒÉÑÈ ËÏÔÏÒÙÈ ×ÓÔÒÅÞÁÅÔÓÑ ÄÁÎÎÙÅ ÓÌÏ×Á. óÏÒÔÉÒÏ×ËÁ ÂÕÄÅÔ ÐÒÏÉÚ×ÅÄÅÎÁ ÐÏ ÓÔÅÐÅÎÉ ÓÏÏÔ×ÅÔÓÔ×ÉÑ. @@ -118,7 +118,7 @@ <tr> <td></td> <td> - <input type="submit" value="Search"> + <input type="submit" value="îÁÊÔÉ"> </td> </tr> </table> |
|
From: Vitaly F. <fed...@us...> - 2005-11-05 09:20:00
|
Update of /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/bug In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1231 Modified Files: Tag: BUGZILLA-2_20 knob.html.tmpl Log Message: Minor grammar fixes Index: knob.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/bug/knob.html.tmpl,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -u -d -r1.3.2.1 -r1.3.2.2 --- knob.html.tmpl 1 Nov 2005 23:35:29 -0000 1.3.2.1 +++ knob.html.tmpl 5 Nov 2005 09:19:52 -0000 1.3.2.2 @@ -51,8 +51,8 @@ && (!bug.isunconfirmed || bug.user.canconfirm) %] <input type="radio" id="knob-accept" name="knob" value="accept"> <label for="knob-accept"> - ðÒÉÎÑÔØ [% terms.bug %] ( - [% IF bug.isunconfirmed %]ÐÏÄÔ×ÅÒÄÉÔØ [% terms.bug %] É [% END %]ÕÓÔÁÎÏ×ÉÔØ + ðÒÉÎÑÔØ [% terms.bug_acc %] ( + [% IF bug.isunconfirmed %]ÐÏÄÔ×ÅÒÄÉÔØ [% terms.bug_acc %] É [% END %]ÕÓÔÁÎÏ×ÉÔØ ÓÏÓÔÏÑÎÉÅ <b>[% status_descs.ASSIGNED FILTER html %]</b>) </label> <br> @@ -74,7 +74,7 @@ <input type="radio" id="knob-resolve" name="knob" value="resolve"> <label for="knob-resolve"> ðÒÉÎÑÔØ ÒÅÛÅÎÉÅ: ÕÓÔÁÎÏ×ÉÔØ - <a href="page.cgi?id=fields.html#resolution">ÒÅÚÕÌØÔÁÔ</a> × + <a href="page.cgi?id=fields.html#resolution">ÒÅÚÕÌØÔÁÔ</a> </label> <select name="resolution" onchange="document.changeform.knob[[% knum %]].checked=true"> @@ -99,7 +99,7 @@ <input type="radio" id="knob-reassign" name="knob" value="reassign"> <label for="knob-reassign"> <a href="page.cgi?id=fields.html#assigned_to">ðÅÒÅÄÁÔØ</a> - [% terms.bug %] + [% terms.bug_acc %] </label> [% safe_assigned_to = FILTER js; bug.assigned_to.login; END %] [% INCLUDE global/userselect.html.tmpl @@ -122,7 +122,7 @@ <input type="radio" id="knob-reassign-cmp" name="knob" value="reassignbycomponent"> <label for="knob-reassign-cmp"> - ðÅÒÅÄÁÔØ [% terms.bug %] ÉÓÐÏÌÎÉÔÅÌÀ + ðÅÒÅÄÁÔØ [% terms.bug_acc %] ÉÓÐÏÌÎÉÔÅÌÀ [% " É ÏÔ×ÅÔÓÔ×ÅÎÎÏÍÕ ÚÁ ÐÒÉÅÍËÕ" IF Param('useqacontact') %] ÄÁÎÎÏÊ ËÏÍÐÏÎÅÎÔÙ </label> @@ -130,7 +130,7 @@ [% IF bug.isunconfirmed && bug.user.canconfirm %] <input type="checkbox" id="compconfirm" name="compconfirm"> <label for="compconfirm"> - É ÐÏÄÔ×ÅÒÄÉÔØ [% terms.bug_gen %] (ÕÓÔÁÎÏ×ÉÔØ ÓÏÓÔÏÑÎÉÅ <b>[% status_descs.NEW FILTER html %]</b>) + É ÐÏÄÔ×ÅÒÄÉÔØ [% terms.bug_acc %] (ÕÓÔÁÎÏ×ÉÔØ ÓÏÓÔÏÑÎÉÅ <b>[% status_descs.NEW FILTER html %]</b>) </label> <br> [% END %] @@ -174,7 +174,7 @@ | <a href="show_bug.cgi?format=multiple&id=[% bug.bug_id %]">÷ÅÒÓÉÑ ÄÌÑ ÐÅÞÁÔÉ</a> | - <a href="enter_bug.cgi?cloned_bug_id=[% bug.bug_id %]">òÁÚÍÎÏÖÉÔØ [% terms.bug_dat %]</a> + <a href="enter_bug.cgi?cloned_bug_id=[% bug.bug_id %]">òÁÚÍÎÏÖÉÔØ [% terms.bug_acc %]</a> [%# Links to more things users can do with this bug. %] [% Hook.process("links") %] |
|
From: Vitaly F. <fed...@us...> - 2005-11-03 09:07:17
|
Update of /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/bug In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16793 Modified Files: Tag: BUGZILLA-2_20 show-multiple.html.tmpl Log Message: Ubbalanced PROCESS fixed Index: show-multiple.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/bug/show-multiple.html.tmpl,v retrieving revision 1.3.4.1 retrieving revision 1.3.4.2 diff -u -d -r1.3.4.1 -r1.3.4.2 --- show-multiple.html.tmpl 1 Nov 2005 23:35:29 -0000 1.3.4.1 +++ show-multiple.html.tmpl 3 Nov 2005 09:07:09 -0000 1.3.4.2 @@ -25,7 +25,6 @@ [% PROCESS global/variables.none.tmpl %] [% PROCESS global/header.html.tmpl - title = "[% PROCESS global/header.html.tmpl title = "ðÏÄÒÏÂÎÙÊ ÓÐÉÓÏË $terms.bugs_gen" style_urls = [ "skins/standard/show_multiple.css" ] %] |
|
From: Vitaly F. <fed...@us...> - 2005-11-03 02:09:58
|
Update of /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/bug/process In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12137 Modified Files: Tag: BUGZILLA-2_20 bugmail.html.tmpl results.html.tmpl Log Message: Updated to Bugzilla 2.20 Index: bugmail.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/bug/process/bugmail.html.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -d -r1.3 -r1.3.2.1 --- bugmail.html.tmpl 20 Apr 2005 14:20:05 -0000 1.3 +++ bugmail.html.tmpl 3 Nov 2005 02:09:49 -0000 1.3.2.1 @@ -18,6 +18,7 @@ # # Contributor(s): Bradley Baetz <bb...@st...> # J. Paul Reed <pr...@si...> + # # Russian translation: Dmitry Pupkov <dp...@mc...> #%] @@ -42,7 +43,7 @@ [% mail = SendBugMail(mailing_bugid, mailrecipients) %] [% PROCESS emails - description = "Email ÏÔÐÒÁ×ÌÅÎ" + description = "ïÐÏ×ÅÝÅÎÉÅ ÏÔÐÒÁ×ÌÅÎÏ" names = mail.sent %] <br> @@ -52,10 +53,8 @@ %] <br> <center> -<!-- If you wish to tweak the kinds of mail [% terms.Bugzilla %] sends you, you can - <a href="userprefs.cgi?tab=email">change your preferences</a>. --> - ÷Ù ÔÁË ÖÅ ÍÏÖÅÔÅ ÎÁÓÔÒÏÉÔØ, ËÁËÉÅ ÜÌÅËÔÒÏÎÎÙÅ ÐÉÓØÍÁ ×Ù ÈÏÔÉÔÅ ÐÏÌÕÞÁÔØ ÏÔ [% terms.Bugzilla %] - × <a href="userprefs.cgi?tab=email">ÎÁÓÔÒÏÊËÁÈ</a>. + ÷Ù ÔÁË ÖÅ ÍÏÖÅÔÅ ÎÁÓÔÒÏÉÔØ, ËÁËÉÅ ÏÐÏ×ÅÝÅÎÉÑ ×Ù ÈÏÔÉÔÅ ÐÏÌÕÞÁÔØ ÏÔ [% terms.Bugzilla %] + × <a href="userprefs.cgi?tab=email">ÐÁÒÁÍÅÔÒÁÈ</a>. </center> Index: results.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/bug/process/results.html.tmpl,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -d -r1.4 -r1.4.2.1 --- results.html.tmpl 14 Mar 2005 11:42:10 -0000 1.4 +++ results.html.tmpl 3 Nov 2005 02:09:50 -0000 1.4.2.1 @@ -17,6 +17,7 @@ # Rights Reserved. # # Contributor(s): Myk Melez <my...@mo...> + # # Russian translation: Vitaly Fedrushkov <fed...@us...> # Dmitry Pupkov <dp...@mc...> #%] @@ -47,6 +48,14 @@ 'votes' => "$terms.Bug $id ÐÏÄÔ×ÅÒÖÄÅÎÁ ÐÏ ÉÔÏÇÁÍ ÇÏÌÏÓÏ×ÁÎÉÑ" , 'created' => "$terms.Bug $id ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎÁ × ÂÁÚÅ ÄÁÎÎÙÈ" , } + + linktext = { + 'bug' => "÷ÅÒÎÕÔØÓÑ Ë $terms.bug_dat $id" , + 'dupe' => "ðÅÒÅÊÔÉ Ë $terms.bug_dat $id" , + 'dep' => "ðÅÒÅÊÔÉ Ë $terms.bug_dat $id" , + 'votes' => "ðÅÒÅÊÔÉ Ë $terms.bug_dat $id" , + 'created' => "ðÅÒÅÊÔÉ Ë $terms.bug_dat $id" , + } %] <table border="1"> @@ -56,7 +65,9 @@ [% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = id %] </td> <td> - <a href="show_bug.cgi?id=[% id %]">÷ÅÒÎÕÔØÓÑ Ë [% terms.bug_dat %]# [% id %]</a> + <a href="show_bug.cgi?id=[% id %]">[% linktext.$type %]</a> + [%# Links to more information about the changed bug. %] + [% Hook.process("links") %] </td> </tr> </table> |
|
From: Vitaly F. <fed...@us...> - 2005-11-03 01:53:27
|
Update of /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/bug/create In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10055 Modified Files: Tag: BUGZILLA-2_20 create.html.tmpl Log Message: Param('maintainer') html-filtered Index: create.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/bug/create/create.html.tmpl,v retrieving revision 1.11.2.1 retrieving revision 1.11.2.2 diff -u -d -r1.11.2.1 -r1.11.2.2 --- create.html.tmpl 1 Nov 2005 23:35:29 -0000 1.11.2.1 +++ create.html.tmpl 3 Nov 2005 01:53:16 -0000 1.11.2.2 @@ -417,7 +417,7 @@ ÷ÁÛÉ ÏÐÅÒÁÃÉÏÎÎÁÑ ÓÉÓÔÅÍÁ É ÐÌÁÔÆÏÒÍÁ ÏÐÒÅÄÅÌÅÎÙ [% END %] Á×ÔÏÍÁÔÉÞÅÓËÉ. åÓÌÉ ÜÔÉ ÚÎÁÞÅÎÉÑ ÎÅ×ÅÒÎÙ, ÐÏÖÁÌÕÊÓÔÁ, ÓÏÏÂÝÉÔÅ - [%+ Param('maintainer') %]. + [%+ Param('maintainer') FILTER html %]. </td> </tr> [% END %] |
|
From: Vitaly F. <fed...@us...> - 2005-11-03 01:51:16
|
Update of /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/global In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9793 Modified Files: Tag: BUGZILLA-2_20 messages.html.tmpl Log Message: Unbalanced IFs fixed Index: messages.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/global/messages.html.tmpl,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -d -r1.2.2.1 -r1.2.2.2 --- messages.html.tmpl 1 Nov 2005 19:54:42 -0000 1.2.2.1 +++ messages.html.tmpl 3 Nov 2005 01:51:01 -0000 1.2.2.2 @@ -99,7 +99,7 @@ [% title = "õÞÅÔÎÁÑ ÚÁÐÉÓØ $otheruser.login ÕÄÁÌÅÎÁ" %] õÞÅÔÎÁÑ ÚÁÐÉÓØ [% otheruser.login FILTER html %] ÕÓÐÅÛÎÏ ÕÄÁÌÅÎÁ. - [% IF message_tag == "buglist_adding_field" %] + [% ELSIF message_tag == "buglist_adding_field" %] [% title = "äÏÂÁ×ÌÑÅÍ ÐÏÌÅ × ÆÏÒÍÕ ÐÏÉÓËÁ..." %] [% link = "÷ÙÂÅÒÉÔÅ ÜÔÕ ÓÓÙÌËÕ ÅÓÌÉ ÓÔÒÁÎÉÃÁ ÎÅ ÏÂÎÏ×ÉÌÁÓØ Á×ÔÏÍÁÔÉÞÅÓËÉ." %] |
|
From: Vitaly F. <fed...@us...> - 2005-11-01 23:35:45
|
Update of /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/bug/create In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31892/template/ru/default/bug/create Modified Files: Tag: BUGZILLA-2_20 comment-guided.txt.tmpl create-guided.html.tmpl create.html.tmpl created.html.tmpl make-template.html.tmpl user-message.html.tmpl Removed Files: Tag: BUGZILLA-2_20 comment.txt.tmpl Log Message: Updated to Bugzilla-2.20 Index: comment-guided.txt.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/bug/create/comment-guided.txt.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -d -r1.1 -r1.1.2.1 --- comment-guided.txt.tmpl 26 Feb 2005 13:02:49 -0000 1.1 +++ comment-guided.txt.tmpl 1 Nov 2005 23:35:29 -0000 1.1.2.1 @@ -17,34 +17,41 @@ # Rights Reserved. # # Contributor(s): Gervase Markham <ge...@ge...> + # + # Russian translation: Vitaly Fedrushkov <fed...@us...> #%] [%# INTERFACE: - # form: hash. This is the $::FORM variable from a bug submission (i.e. the - # fields on a template from enter_bug.cgi.) It can be used to pull out - # various custom fields and format an initial Description entry from them. + # This template has no interface. + # + # Form variables from a bug submission (i.e. the fields on a template from + # enter_bug.cgi) can be access via Bugzilla.cgi.param. It can be used to + # pull out various custom fields and format an initial Description entry + # from them. #%] [% USE Bugzilla %] -User-Agent: [%+ Bugzilla.cgi.user_agent() %] -Build Identifier: [%+ form.buildid %] +[% cgi = Bugzilla.cgi %] +User-Agent: [%+ cgi.user_agent() %] +Build Identifier: [%+ cgi.param("buildid") %] -[%+ form.comment IF form.comment %] +[%+ cgi.param("comment") IF cgi.param("comment") %] -[%+ IF form.reproducible != "Choose one..." -%] -Reproducible: [%+ form.reproducible %] -[% END -%] +[%+ IF cgi.param("reproducible") != "÷ÙÂÅÒÉÔÅ..." -%] +÷ÏÓÐÒÏÉÚ×ÏÄÉÍÏÓÔØ: [%+ cgi.param("reproducible") %] +[% END %] -[%# I can't make TT check for "1.\n2.\n3." so this is not conditional. -%] -Steps to Reproduce: -[%+ form.reproduce_steps %] +[% IF !(cgi.param("reproduce_steps").match('^1\.\s+2\.\s+3\.\s+$') || cgi.param("reproduce_steps").match('^\s+$')) %] +ðÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ: +[%+ cgi.param("reproduce_steps") %] +[% END %] -[% IF form.actual_results -%] -Actual Results: -[%+ form.actual_results %] +[% IF cgi.param("actual_results") -%] +ðÏÌÕÞÅÎÎÙÊ ÒÅÚÕÌØÔÁÔ: +[%+ cgi.param("actual_results") %] [% END %] -[% IF form.expected_results %] -Expected Results: -[%+ form.expected_results %] +[% IF cgi.param("expected_results") %] +ïÖÉÄÁÅÍÙÊ ÒÅÚÕÌØÔÁÔ: +[%+ cgi.param("expected_results") %] [% END %] -[%+ form.additional_info %] +[%+ cgi.param("additional_info") %] --- comment.txt.tmpl DELETED --- Index: created.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/bug/create/created.html.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -d -r1.3 -r1.3.2.1 --- created.html.tmpl 26 Feb 2005 13:02:49 -0000 1.3 +++ created.html.tmpl 1 Nov 2005 23:35:29 -0000 1.3.2.1 @@ -17,6 +17,22 @@ # Rights Reserved. # # Contributor(s): Gervase Markham <ge...@ge...> + # + # Russian translation: Vitaly Fedrushkov <fed...@us...> + #%] + +[%# INTERFACE: + # id: number; the ID of the bug that was created. + # sentmail: array of hash; bugs for which BugMail should be sent, contains: + # type: string; type of change for this bug, either 'created' if this bug + # was created or 'dep' if it was added as a dependent/blocker + # id: integer; the ID of the bug + # mailrecipients: hash; contains the BugMail recipients, for details on + # this contents, see template bug/process/bugmail.html.tmpl + # bug: object; Bugzilla::Bug object of the bug that was created (used in + # template bug/edit.html.tmpl + # bug_list: array of integers; sorted bug list (used in template + # bug/navigate.html.tmpl) #%] [% PROCESS global/variables.none.tmpl %] @@ -32,6 +48,7 @@ type = item.type id = item.id mail = item.mail + mailrecipients = mailrecipients %] [% END %] Index: create-guided.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/bug/create/create-guided.html.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -d -r1.1 -r1.1.2.1 --- create-guided.html.tmpl 28 Feb 2005 08:23:15 -0000 1.1 +++ create-guided.html.tmpl 1 Nov 2005 23:35:29 -0000 1.1.2.1 @@ -18,6 +18,8 @@ # # Contributor(s): Gervase Markham <ge...@ge...> # Christine Begle <cb...@mo...> + # + # Russian translation: Vitaly Fedrushkov <fed...@us...> #%] [%# INTERFACE: @@ -30,17 +32,18 @@ [% cgi = Bugzilla.cgi %] [% PROCESS global/header.html.tmpl - title = "Enter $terms.ABug" + title = "òÅÇÉÓÔÒÁÃÉÑ $terms.bug_gen" onload = "PutDescription()" %] <p> <font color="red"> - This is a template used on mozilla.org - it, along with the - comment-guided.txt.tmpl template, are included as a demo of what it's - possible to do with custom templates in general, and custom [% terms.bug %] - entry templates in particular. You will need to alter the text of this - template if you want to use it on your [% terms.Bugzilla %] installation. + üÔÏ ÛÁÂÌÏÎ ÉÓÐÏÌØÚÕÅÔÓÑ ÎÁ mozilla.org. üÔÏÔ ÛÁÂÌÏÎ, Á ÔÁËÖÅ + comment-guided.txt.tmpl, ËÏÔÏÒÙÊ ÆÏÒÍÁÔÉÒÕÅÔ ÒÅÚÕÌØÔÁÔ ÚÁÐÏÌÎÅÎÉÑ + ÆÏÒÍÙ ÄÌÑ ÐÅÒÅÎÏÓÁ × ÂÁÚÕ ÄÁÎÎÙÈ, ×ËÌÀÞÅÎÙ × ÐÏÓÔÁ×ËÕ ÄÌÑ ÄÅÍÏÎÓÔÒÁÃÉÉ + ×ÏÚÍÏÖÎÏÓÔÅÊ ÎÁÓÔÒÏÊËÉ ÛÁÂÌÏÎÏ×. ðÏÓËÏÌØËÕ ÂÏÌØÛÁÑ ÞÁÓÔØ ÔÅËÓÔÁ + ÓÐÅÃÉÆÉÞÎÁ ÄÌÑ mozilla.org, ÒÅËÏÍÅÎÄÕÅÔÓÑ ÉÓÐÒÁ×ÉÔØ ÆÏÒÍÕ ÄÌÑ ×ÁÛÅÊ + ÓÉÓÔÅÍÙ [% terms.Bugzilla %]. </font> </p> @@ -65,24 +68,7 @@ } </script> -[%# Browser sniff to try and reduce the incidence of 4.x and NS 6/7 bugs %] - -[% IF cgi.user_agent("Mozilla/4") AND NOT cgi.user_agent("compatible") %] - <div style="background-color: lightgrey; - border: 1px solid black; - padding: 2px"> - <font color="#990000"> - <b> - Note: This is a tool for reporting [% terms.bugs %] in software from - mozilla.org. Use Netscape's - <a href="http://help.netscape.com/forms/bug-client.html">[% terms.bug %] - reporting form</a> to report [% terms.bugs %] with Netscape products - like Navigator 4.x. Netscape products have a blue and black N in the - top right hand corner. - </b> - </font> - </div> -[% END %] +[%# Browser sniff to try and reduce the incidence of Netscape 6/7 bugs %] [% IF cgi.user_agent('Netscape(\d)') %] [% matches = cgi.user_agent().match('Netscape(\d)') %] @@ -91,114 +77,105 @@ padding: 2px"> <font color="#990000"> <b> - You are using Netscape [% matches.0 %]. - Report [% terms.bugs %] with this browser to the + ÷Ù ÉÓÐÏÌØÚÕÅÔÅ Netscape [% matches.0 %]. + [% terms.Bugs %] ÐÏ ÜÔÏÍÕ ÐÒÏÄÕËÔÕ ÓÌÅÄÕÅÔ ÒÅÇÉÓÔÒÉÒÏ×ÁÔØ × <a href="http://home.netscape.com/browsers/[% matches.0 %]/feedback/index.html"> - Netscape [% matches.0 %] Feedback Center.</a> + ÓÌÕÖÂÅ ÐÏÄÄÅÒÖËÉ Netscape [% matches.0 %].</a> </b> </font> - This form is only for reporting [% terms.bugs %] in the Mozilla web browser - and other products from mozilla.org. To report [% terms.abug %] you find - in Netscape [% matches.0 %] with this form, you must reproduce it first in - a recent build of + äÁÎÎÁÑ ÓÔÒÁÎÉÃÁ ÐÒÅÄÎÁÚÎÁÞÅÎÁ ÄÌÑ ÒÅÇÉÓÔÒÁÃÉÉ [% terms.bugs_gen %] Mozilla É ÄÒÕÇÉÈ ÐÒÏÄÕËÔÏ× mozilla.org. + þÔÏÂÙ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÔØ [% terms.bug_acc %], ÏÂÎÁÒÕÖÅÎÎÕÀ × Netscape [% matches.0 %], + ÷ÁÍ ÓÌÅÄÕÅÔ ÐÏ×ÔÏÒÉÔØ ÅÅ × ÔÅËÕÝÅÊ ×ÅÒÓÉÉ <a href="http://ftp.mozilla.org/pub/mozilla.org/mozilla/nightly/latest/">Mozilla</a>, - <a href="http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-trunk/">Firefox</a> or + <a href="http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-trunk/">Firefox</a>, +<a href="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/latest-trunk/">Thunderbird</a> ÉÌÉ <a href="http://ftp.mozilla.org/pub/mozilla.org/camino/nightly/latest/">Camino</a> - to make sure the problem hasn't been fixed already. + ÞÔÏÂÙ ÕÂÅÄÉÔØÓÑ, ÞÔÏ ÐÒÏÂÌÅÍÁ ×ÓÅ ÅÝÅ ÉÍÅÅÔ ÍÅÓÔÏ. </div> [% END %] -<p> - This form prompts you for the information required to - file a good [% terms.bug %] report (or enhancement request.) - It may seem lengthy, but developers need all this information - to understand and reproduce the [% terms.bug %], which is the first step towards - fixing it. Please note that <strong>we do not accept [% terms.bug %] reports by - email</strong> - please do not email developers or mozilla.org staff - with [% terms.bug %] reports. <font color="red">Also, please do not - file [% terms.bugs %] on browser/email software older than two weeks - first, - download a newer build of - <a href="http://ftp.mozilla.org/pub/mozilla.org/mozilla/nightly/latest/">Mozilla</a>, - <a href="http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-trunk/">Firefox</a>, - <a href="http://ftp.mozilla.org/pub/mozilla.org/camino/nightly/latest/">Camino</a> - or - <a href="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/">Thunderbird</a> - and check that the problem is still present. - </font> -</p> +[% IF cgi.user_agent('Gecko/') %] + [% matches = cgi.user_agent().match('Gecko/(\d+)') %] + +[% END %] + +<!-- @@@ Need UA checking here --> <a name="step1"></a> -<h3>Step 1 - search for your [% terms.bug %]</h3> +<h3>ûÁÇ 1 ÉÚ 3 - ÐÏÉÓË [% terms.bug_gen %] ÓÒÅÄÉ ÕÖÅ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎÎÙÈ</h3> <p> - Please see if your [% terms.bug %] has already been reported. - <font color="red">Please don't skip this step.</font> - 50% of the [% terms.bugs %] filed in - [%+ terms.Bugzilla %] are duplicates, and this wastes a lot of our QA engineers' time. + <font color="red">ðÏÖÁÌÕÊÓÔÁ, ÎÅ ÐÒÏÐÕÓËÁÊÔÅ ÜÔÏÔ ÛÁÇ -- ÚÎÁÞÉÔÅÌØÎÁÑ ÞÁÓÔØ ×ÎÏ×Ø ××ÏÄÉÍÙÈ + [% terms.bugs_gen %] ÕÖÅ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎÁ ÒÁÎÅÅ.</font> + ðÒÏ×ÅÒØÔÅ ÓÐÉÓËÉ ÞÁÓÔÏ ÒÅÇÉÓÔÒÉÒÕÅÍÙÈ [% terms.bugs %]: </p> -[%# Stop NS 4.x and all v.3 browsers from getting <iframe> code %] -[% IF (cgi.user_agent("Mozilla/4") - AND NOT cgi.user_agent("compatible")) - OR (cgi.user_agent("Mozilla/[123]")) %] - <p> - Visit the <a href="duplicates.cgi">most-frequently-reported [% terms.bugs %] page</a> - and see if your [% terms.bug %] is there. If not, go to the - <a href="query.cgi?format=modern">search page</a> - and search [% terms.Bugzilla %] by entering two or - three of the main words having to do with your [% terms.bug %] in the top box. - For example: <tt><b>pop3 mail</b></tt> or <tt><b>copy paste</b></tt>. - </p> +[%# Include other products if sensible %] +[% IF product == "Firefox" %] + [% productstring = "product=Mozilla%20Application%20Suite&product=Firefox" %] +[% ELSIF product == "Thunderbird" %] + [% productstring = "product=Mozilla%20Application%20Suite&product=Thunderbird" %] [% ELSE %] - <p> - Check the list of most-frequently-reported [% terms.bugs %] below. - If your [% terms.bug %] isn't there, search [% terms.Bugzilla %] by entering two or - three of the main words having to do with your [% terms.bug %] in this box. - For example: <tt><b>pop3 mail</b></tt> or <tt><b>copy paste</b></tt>. + [% productstring = BLOCK %]product=[% product FILTER url_quote %][% END %] +[% END %] + +<p> + <a href="duplicates.cgi?[% productstring %]&format=simple" target="somebugs">100 ÎÁÉÂÏÌÅÅ ÞÁÓÔÙÈ</a> (Ó ÓÁÍÏÇÏ ÎÁÞÁÌÁ) | + <a href="duplicates.cgi?[% productstring %]&format=simple&sortby=delta&reverse=1&maxrows=100&changedsince=14" target="somebugs">îÁÉÂÏÌÅÅ ÞÁÓÔÙÅ ÚÁ ÐÏÓÌÅÄÎÉÅ Ä×Å ÎÅÄÅÌÉ</a> +</p> + +<iframe name="somebugs" width="100%" height="80%" + style="border: 2px black solid" + src="duplicates.cgi?[% productstring %]&format=simple"> +</iframe> + +<p> + åÓÌÉ ×ÁÛÅÊ [% terms.bug_gen %] ÔÁÍ ÎÅÔ, ×ÙÐÏÌÎÉÔÅ ÐÏÉÓË × [% terms.Bugzilla %] + ÐÏ ÎÅÓËÏÌØËÉÍ ËÌÀÞÅ×ÙÍ ÓÌÏ×ÁÍ, ÉÍÅÀÝÉÍ ÏÔÎÏÛÅÎÉÅ Ë [% terms.bug_dat %]. + îÁÐÒÉÍÅÒ: <tt><b>ÐÏÞÔÁ pop3</b></tt> ÉÌÉ <tt><b>ËÏÐÉÒÏ×ÁÔØ ×ÓÔÁ×ÉÔØ</b></tt>. + òÅÚÕÌØÔÁÔ ÂÕÄÅÔ ÐÒÅÄÓÔÁ×ÌÅÎ ×ÙÛÅ. </p> +[%# All bugs opened inside the past six months %] <form action="buglist.cgi" method="get" target="somebugs"> <input type="hidden" name="format" value="simple"> <input type="hidden" name="order" value="relevance desc"> - <input type="hidden" name="bug_status" value="__open__"> + <input type="hidden" name="bug_status" value="__all__"> <input type="hidden" name="product" value="[% product FILTER html %]"> + [% IF product == "Firefox" OR + product == "Thunderbird" OR + product == "Mozilla Application Suite" OR + product == "Camino" %] + <input type="hidden" name="product" value="Core"> + <input type="hidden" name="product" value="Toolkit"> + <input type="hidden" name="product" value="PSM"> + <input type="hidden" name="product" value="NSPR"> + <input type="hidden" name="product" value="NSS"> + [% END %] + <input type="hidden" name="chfieldfrom" value="-6m"> + <input type="hidden" name="chfieldto" value="Now"> + <input type="hidden" name="chfield" value="[Bug creation]"> <input type="text" name="content" size="40"> <input type="submit" value="Search"> </form> - <iframe name="somebugs" width="100%" height="80%" - style="border: 2px black solid" - src="duplicates.cgi?product=[% product FILTER uri %]&format=simple"> - </iframe> -[% END %] - +[%# FIXME-ru: ÚÁ×ÅÒÛÉÔØ %] <p> Look through the search results. If you get the - <tt><b>Zarro Boogs</b></tt> message, [% terms.Bugzilla %] found no [% terms.bugs %] that - match. Check for typos, or add fewer or different keywords. -</p> - -<p> - If you find [% terms.abug %] that looks the same as yours, you can add - useful comments to that [% terms.bug %], but please don't open a new one. - Please don't add comments like "please fix this [% terms.bug %]" - this - tends to annoy engineers and slow, rather than speed, the fixing of it. -</p> - -<p> - If you find [% terms.bugs %] similar to yours, read them and note which component - they are in. You should file your [% terms.bug %] in that same component. + <tt><b>[% terms.zeroSearchResults %]</b></tt> message, [% terms.Bugzilla %] + found no [% terms.bugs %] that + match. Check for typing mistakes, or try fewer or different keywords. + If you find [% terms.abug %] that looks the same as yours, please add + any useful extra information you have to it, rather than opening a new one. </p> <a name="step2"></a> -<h3>Step 2 - give information</h3> +<h3>Step 2 of 3 - give information</h3> <p> - If you're pretty certain that your [% terms.bug %] isn't in there already, then - please try to complete this form as accurately as you - can. The more you can tell us, the better our chance of being able - to understand and reproduce your [% terms.bug %]. + If you've tried a few searches and your [% terms.bug %] really isn't in + there, tell us all about it. </p> <form method="post" action="post_bug.cgi"> @@ -212,7 +189,7 @@ <table valign="top" cellpadding="5" cellspacing="5" border="0"> <tr bgcolor="[% tablecolour %]"> - <td align="right" valign="middle"> + <td align="right" valign="top"> <b>Product</b> </td> <td valign="top"> @@ -222,19 +199,10 @@ </tr> <tr> - <td align="right" valign="middle"> + <td align="right" valign="top"> <b>Component</b> </td> <td valign="top"> - <p> - The area where the problem occurs. - To pick the right component, you could use the same one as - similar [% terms.bugs %] you found in your search, or read the full list of - <a href="describecomponents.cgi?product= - [% product FILTER url_quote %]">component - descriptions</a> if you need more help. - </p> - <table border="0" cellpadding="0" cellspacing="0"> <tr> <td valign="top"> @@ -251,7 +219,7 @@ <td valign="top" width="100%"> <div id="description" style="color: green; margin-left: 10px; height: 5em; overflow: auto;"> - <script type="text/javascript" language="JavaScript"> + <script type="text/javascript"> if ((document.getElementById) && (document.body.innerHTML)) { document.write("\ Select a component to see its description here."); @@ -261,6 +229,15 @@ </td> </tr> </table> + + <p> + The area where the problem occurs. + To pick the right component, you could use the same one as + similar [% terms.bugs %] you found in your search, or read the full list of + <a target="_blank" href="describecomponents.cgi?product= + [% product FILTER url_quote %]">component + descriptions</a> (opens in new window) if you need more help. + </p> </td> </tr> @@ -269,7 +246,7 @@ [% rep_platform = [ "PC", "Macintosh", "All", "Other" ] %] <tr bgcolor="[% tablecolour %]"> - <td align="right" valign="middle"> + <td align="right" valign="top"> <b>Hardware Platform</b> </td> <td valign="top"> @@ -282,7 +259,7 @@ "Linux", "All", "other" ] %] <tr> - <td align="right" valign="middle"> + <td align="right" valign="top"> <b>Operating System</b> </td> <td valign="top"> @@ -294,46 +271,46 @@ [% buildid = cgi.user_agent() IF matches %] <tr bgcolor="[% tablecolour %]"> - <td align="right" valign="middle"> + <td align="right" valign="top"> <b>Build Identifier<br>(User Agent)</b> </td> <td valign="top"> + <input type="text" size="80" name="buildid" value="[% buildid %]"> <p> - If reporting [% terms.abug %] in Mozilla, + This identifies exactly the version of the product you were using. + If reporting [% terms.abug %] in Mozilla or Firefox, this is the line beginning <tt>"Mozilla/5.0"</tt> in - <tt>Help | About Mozilla</tt>. - It identifies exactly the version of Mozilla you were using. - If you are using the problem copy of Mozilla, this will be - filled in correctly for you already. - If Mozilla won't start, just enter the URL of the directory you + <tt>Help | About</tt>. + If you are using the problematic software to file the bug, this + field will already be filled in correctly. + If the product won't start, just enter the complete URL you downloaded it from. </p> - <input type="text" size="80" name="buildid" value="[% buildid %]"> </td> </tr> <tr> - <td align="right" valign="middle"> + <td align="right" valign="top"> <b>URL</b> </td> <td valign="top"> + <input type="text" size="80" name="bug_file_loc" value="http://"> <p> URL that demonstrates the problem you are seeing (optional.) - <b>IMPORTANT</b>: If you are filing [% terms.abug %] about a broken web page, - please read the - <a href="http://www.mozilla.org/docs/web-developer/faq.html">Mozilla - Web Developer FAQ</a>, which explains how we handle old or - badly-coded web pages. + <!-- + <b>IMPORTANT</b>: problems with broken web pages go + <a href="http://write-this-webtool/">in this form instead</a>. + --> </p> - <input type="text" size="80" name="bug_file_loc" value="http://"> </td> </tr> <tr bgcolor="[% tablecolour %]"> - <td align="right" valign="middle"> + <td align="right" valign="top"> <b>Summary</b> </td> <td valign="top"> + <input type="text" size="80" name="short_desc" id="short_desc"> <p> A sentence which summarises the problem. Please be descriptive and use lots of keywords. @@ -348,51 +325,46 @@ crash if I close the mail window while checking for new POP mail </tt> </p> - <input type="text" size="80" name="short_desc" id="short_desc"> </td> </tr> <tr> - <td align="right" valign="middle"> + <td align="right" valign="top"> <b>Details</b> </td> <td valign="top"> + <textarea rows="6" cols="80" name="comment"></textarea> <p> Expand on the Summary. Please be as specific as possible about what is wrong. </p> <p> <tt> - <font color="#990000">Bad example</font>: This page looks wrong in - Mozilla. Other browsers display it correctly. You suck! + <font color="#990000">Bad example</font>: Mozilla crashed. + You suck! </tt> <br> <tt> - <font color="#009900">Good example</font>: In the - page at http://www.foo.com/, text in the first column should be - fully justified -- text should be aligned with both the left and - right margins. In Mozilla, the text is only left-justified. + <font color="#009900">Good example</font>: After a crash which + happened when I was sorting in the Bookmark Manager,<br> all of my + top-level bookmark folders beginning with the letters Q to Z are + no longer present. </tt> </p> - <textarea rows="6" cols="80" name="comment" - wrap="hard"></textarea> </td> </tr> <tr bgcolor="[% tablecolour %]"> - <td align="right" valign="middle"> + <td align="right" valign="top"> <b>Reproducibility</b> </td> <td valign="top"> - <p> - How often can you reproduce the problem? - </p> <select name="reproducible"> <option name="AlwaysReproducible" value="Always"> - Every time. + Happens every time. </option> <option name="Sometimes" value="Sometimes"> - Sometimes, but not always. + Happens sometimes, but not always. </option> <option name="DidntTry" value="Didn't try"> Haven't tried to reproduce it. @@ -405,53 +377,52 @@ </tr> <tr> - <td align="right" valign="middle"> + <td align="right" valign="top"> <b>Steps to Reproduce</b> </td> <td valign="top"> - <p> - Describe how to reproduce the problem, step by - step. Include any special setup steps. - </p> -<textarea rows="4" cols="80" name="reproduce_steps" wrap="hard"> +<textarea rows="4" cols="80" name="reproduce_steps"> 1. 2. 3. </textarea> + <p> + Describe how to reproduce the problem, step by + step. Include any special setup steps. + </p> </td> </tr> <tr bgcolor="[% tablecolour %]"> - <td valign="middle" align="right"> + <td valign="top" align="right"> <b>Actual Results</b> </td> <td valign="top"> + <textarea rows="4" cols="80" name="actual_results"></textarea> <p> What happened after you performed the steps above? </p> - <textarea rows="4" cols="80" name="actual_results" - wrap="hard"></textarea> </td> </tr> <tr> - <td valign="middle" align="right"> + <td valign="top" align="right"> <b>Expected Results</b> </td> <td valign="top"> + <textarea rows="4" cols="80" name="expected_results"></textarea> <p> What should the software have done instead? </p> - <textarea rows="4" cols="80" name="expected_results" - wrap="hard"></textarea> </td> </tr> <tr bgcolor="[% tablecolour %]"> - <td valign="middle" align="right"> + <td valign="top" align="right"> <b>Additional Information</b> </td> <td valign="top"> + <textarea rows="8" cols="80" name="additional_info"></textarea> <p> Add any additional information you feel may be relevant to this [% terms.bug %], such as the <b>theme</b> you were @@ -470,25 +441,15 @@ which the software crashed (e.g., <tt>Application Violation in gkhtml.dll</tt>). </p> - <textarea rows="8" cols="80" name="additional_info" - wrap="hard"></textarea> </td> </tr> <tr> - <td valign="middle" align="right"> + <td valign="top" align="right"> <b>Severity</b> </td> <td valign="top"> - <p> - How serious the problem is. Also, if your [% terms.bug %] is a request for a new - feature or enhancement, say so here. - </p> <select name="bug_severity"> - <option name="blocker" value="blocker"> - Blocker: This [% terms.bug %] prevents Mozilla developers from - testing or developing the software. - </option> <option name="critical" value="critical"> Critical: The software crashes, hangs, or causes you to lose data. @@ -510,13 +471,17 @@ Enhancement: Request for new feature or enhancement. </option> </select> + <p> + Say how serious the problem is, or if your [% terms.bug %] is a + request for a new feature. + </p> </td> </tr> </table> <a name="step3"></a> -<h3>Step 3 - submit the [% terms.bug %]</h3> +<h3>Step 3 of 3 - submit the [% terms.bug %] report</h3> <p> <input type="submit" value=" Submit [% terms.Bug %] Report " @@ -528,7 +493,15 @@ <p> That's it! Thanks very much. You'll be notified by email about any - progress that is made on fixing your [% terms.bug %]. + progress that is made on fixing your [% terms.bug %]. + +<p> + Please be warned + that we get a lot of [% terms.bug %] reports filed - it may take quite a + while to get around to yours. You can help the process by making sure your + [%+ terms.bug %] is + complete and easy to understand, and by quickly replying to any questions + which may arrive by email. </p> </form> Index: create.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/bug/create/create.html.tmpl,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -u -d -r1.11 -r1.11.2.1 --- create.html.tmpl 28 Feb 2005 09:45:50 -0000 1.11 +++ create.html.tmpl 1 Nov 2005 23:35:29 -0000 1.11.2.1 @@ -17,14 +17,17 @@ # Rights Reserved. # # Contributor(s): Gervase Markham <ge...@ge...> - # Ville Skytta <vil...@ik...> + # Ville Skyttä <vil...@ik...> # Shane H. W. Travis <tr...@se...> + # # Russian translation: Vitaly Fedrushkov <fed...@us...> # Dmitry Pupkov <dp...@mc...> #%] [% PROCESS global/variables.none.tmpl %] +[% PROCESS "global/field-descs.none.tmpl" %] +[% product_name = product FILTER html %] [% PROCESS global/header.html.tmpl title = "òÅÇÉÓÔÒÁÃÉÑ ÎÏ×ÏÊ $terms.bug_gen" h2 = "úÄÅÓØ ×Ù ÍÏÖÅÔÅ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÔØ ÎÏ×ÕÀ $terms.bug_acc × ${terms.Bugzilla}." @@ -32,23 +35,37 @@ %] [% USE Bugzilla %] -<script type="text/javascript" language="JavaScript"> +<script type="text/javascript"> <!-- -var default_owners = new Array([% component_.size %]); +var initialowners = new Array([% component_.size %]); +var last_initialowner; var components = new Array([% component_.size %]); +[% IF Param("useqacontact") %] + var initialqacontacts = new Array([% component_.size %]); + var last_initialqacontact; +[% END %] [% count = 0 %] [%- FOREACH c = component_ %] components[[% count %]] = "[% c.name FILTER js %]"; - default_owners[[% count %]] = "[% c.default_login FILTER js %]"; + initialowners[[% count %]] = "[% c.initialowner FILTER js %]"; + [% IF Param("useqacontact") %] + initialqacontacts[[% count %]] = "[% c.initialqacontact FILTER js %]"; + [% END %] [% count = count + 1 %] [%- END %] -var last_default_owner; + function set_assign_to() { // Based on the selected component, fill the "Assign To:" field - // with the default component owner. + // with the default component owner, and the the "QA Contact:" field + // with the default QA Contact. var form = document.Create; var assigned_to = form.assigned_to.value; + +[% IF Param("useqacontact") %] + var qa_contact = form.qa_contact.value; +[% END %] + var index = -1; if (form.component.type == 'select-one') { index = form.component.selectedIndex; @@ -57,14 +74,23 @@ index = 0; } if (index != -1) { - var owner = default_owners[index]; + var owner = initialowners[index]; var component = components[index]; - if (assigned_to == last_default_owner + if (assigned_to == last_initialowner || assigned_to == owner || assigned_to == '') { form.assigned_to.value = owner; - last_default_owner = owner; + last_initialowner = owner; } + [% IF Param("useqacontact") %] + var contact = initialqacontacts[index]; + if (qa_contact == last_initialqacontact + || qa_contact == contact + || qa_contact == '') { + form.qa_contact.value = contact; + last_initialqacontact = contact; + } + [% END %] } } --> @@ -160,6 +186,14 @@ [% INCLUDE select %] </tr> + [% IF Param('usetargetmilestone') && Param('letsubmitterchoosemilestone') %] + <tr> + [% sel = { description => 'úÁÐÌÁÎÉÒÏ×ÁÎÏ', name => 'target_milestone' } %] + [% INCLUDE select %] + <td colspan="2"></td> + </tr> + [% END %] + <tr> <td> </td> <td colspan="3"></td> @@ -170,7 +204,7 @@ <input type="hidden" name="bug_status" value="[% default.bug_status FILTER html %]"> <td align="right" valign="top"><strong>îÁÞÁÌØÎÏÅ ÓÏÓÔÏÑÎÉÅ:</strong></td> - <td valign="top">[% default.bug_status FILTER html %]</td> + <td valign="top">[% status_descs.${default.bug_status} FILTER html %]</td> [% ELSE %] [% sel = { description => 'îÁÞÁÌØÎÏÅ ÓÏÓÔÏÑÎÉÅ', name => 'bug_status' } %] [% INCLUDE select %] @@ -181,20 +215,47 @@ <tr> <td align="right"> <strong> - <a href="page.cgi?id=fields.html#assigned_to">ïÔ×ÅÔÓÔ×ÅÎÎÙÊ</a>: + <a href="page.cgi?id=fields.html#assigned_to">éÓÐÏÌÎÉÔÅÌØ</a>: </strong> </td> <td colspan="3"> - <input name="assigned_to" size="32" - value="[% assigned_to FILTER html %]"> - <noscript>(ðÏ ÕÍÏÌÞÁÎÉÀ -- ÏÔ×ÅÔÓÔ×ÅÎÎÙÊ ÚÁ ËÏÍÐÏÎÅÎÔ)</noscript> + [% INCLUDE global/userselect.html.tmpl + name => "assigned_to" + value => assigned_to + disabled => assigned_to_disabled + size => 32 + emptyok => 1 + %] + <noscript>(ðÏ ÕÍÏÌÞÁÎÉÀ -- ÏÔ×ÅÔÓÔ×ÅÎÎÙÊ ÉÓÐÏÌÎÉÔÅÌØ ËÏÍÐÏÎÅÎÔÙ)</noscript> </td> </tr> +[% IF Param("useqacontact") %] + <tr> + <td align="right"><strong>ðÒÉÅÍËÁ:</strong></td> + <td colspan="3"> + [% INCLUDE global/userselect.html.tmpl + name => "qa_contact" + value => qa_contact + disabled => qa_contact_disabled + size => 32 + emptyok => 1 + %] + <noscript>(ðÏ ÕÍÏÌÞÁÎÉÀ -- ÏÔ×ÅÔÓÔ×ÅÎÎÙÊ ÚÁ ÐÒÉÅÍËÕ ËÏÍÐÏÎÅÎÔÙ)</noscript> + </td> + </tr> +[% END %] + <tr> <td align="right"><strong>ðÏÄÐÉÓËÁ:</strong></td> <td colspan="3"> - <input name="cc" size="45" value="[% cc FILTER html %]"> + [% INCLUDE global/userselect.html.tmpl + name => "cc" + value => cc + disabled => cc_disabled + size => 45 + multiple => 5 + %] </td> </tr> @@ -205,11 +266,18 @@ [% IF UserInGroup(Param('timetrackinggroup')) %] <tr> - <td align="right"><strong>ðÒÉÂÌÉÚÉÔÅÌØÎÏ ÞÁÓÏ×:</strong></td> + <td align="right"><strong>ïÃÅÎËÁ ÔÒÕÄÏÅÍËÏÓÔÉ:</strong></td> <td colspan="3"> <input name="estimated_time" size="6" maxlength="6" value="0.0"> </td> </tr> + <tr> + <td align="right"><strong>óÒÏË:</strong></td> + <td colspan="3"> + <input name="deadline" size="10" maxlength="10" value="[% deadline FILTER html %]"> + <small>(çççç-íí-ää)</small> + </td> + </tr> <tr> <td> </td> @@ -232,9 +300,14 @@ </td> </tr> - <tr><td align="right" valign="top"><strong>ëÏÍÍÅÎÔÁÒÉÉ:</strong></td> + <tr><td align="right" valign="top"><strong>ïÐÉÓÁÎÉÅ:</strong></td> <td colspan="3"> - <textarea wrap="hard" name="comment" rows="10" cols="80"> + <textarea name="comment" rows="10" cols="80"> + [% IF cloned_bug_id %] ++++ äÁÎÎÁÑ [% terms.bug %] ÓÏÚÄÁÎÁ ÒÁÚÍÎÏÖÅÎÉÅÍ [% terms.bug_gen %] [% cloned_bug_id %] +++ + + + [% END %] [% comment FILTER html %]</textarea> <br> </td> @@ -248,9 +321,7 @@ <input type="checkbox" id="commentprivacy" name="commentprivacy" [% " checked=\"checked\"" IF commentprivacy %]> <label for="commentprivacy"> - Initial Description is Private -<!-- FIXME: dpupkov: Don't know how to translate - ðÅÒ×ÏÎÁÞÁÌØÎÏÅ ÏÐÉÓÁÎÉÅ ÎÅ Ñ×ÌÑÅÔÓÑ ÏÂÝÅÄÏÓÔÕÐÎÙÍ--> + ïÐÉÓÁÎÉÅ [% terms.bug_gen %] ËÏÎÆÉÄÅÎÃÉÁÌØÎÏ </label> </td> </tr> @@ -267,7 +338,7 @@ </strong> </td> <td colspan="3"> - <input name="keywords" size="60" value="[% keywords FILTER html %]"> (ÄÏÐÏÌÎÉÔÅÌØÎÏ) + <input name="keywords" size="60" value="[% keywords FILTER html %]"> (ÎÅÏÂÑÚÁÔÅÌØÎÏ) </td> </tr> [% END %] @@ -317,6 +388,9 @@ </td> </tr> + [%# Form controls for entering additional data about the bug being created. %] + [% Hook.process("form") %] + <tr> <td></td> <td colspan="3"> @@ -326,19 +400,25 @@ return false; } return true;"> <input type="submit" name="maketemplate" - value="óÏÈÒÁÎÉÔØ × ËÁÞÅÓÔ×Å ÛÁÂÌÏÎÁ"> + value="óÏÈÒÁÎÉÔØ × ËÁÞÅÓÔ×Å ÏÂÒÁÚÃÁ"> </td> </tr> -[% IF Param('usebrowserinfo') %] +[% UNLESS (Param('defaultplatform') && Param('defaultopsys')) %] <tr> <td></td> <td colspan="3"> <br> - ÷ÁÛÉ ÐÌÁÔÆÏÒÍÁ É ÏÐÅÒÁÃÉÏÎÎÁÑ ÓÉÓÔÅÍÁ ÏÐÒÅÄÅÌÅÎÙ Á×ÔÏÍÁÔÉÞÅÓËÉ. - åÓÌÉ ÜÔÉ ÚÎÁÞÅÎÉÑ ÎÅ×ÅÒÎÙ, ÐÏÖÁÌÕÊÓÔÁ, ÓÏÏÂÝÉÔÅ - <a href="mailto:[% Param('maintainer') %]">[% Param('maintainer') %]</a>. - </td> + [% IF Param('defaultplatform') %] + ÷ÁÛÁ ÏÐÅÒÁÃÉÏÎÎÁÑ ÓÉÓÔÅÍÁ ÏÐÒÅÄÅÌÅÎÁ + [% ELSIF Param('defaultopsys') %] + ÷ÁÛÁ ÐÌÁÔÆÏÒÍÁ ÏÐÒÅÄÅÌÅÎÁ + [% ELSE %] + ÷ÁÛÉ ÏÐÅÒÁÃÉÏÎÎÁÑ ÓÉÓÔÅÍÁ É ÐÌÁÔÆÏÒÍÁ ÏÐÒÅÄÅÌÅÎÙ + [% END %] + Á×ÔÏÍÁÔÉÞÅÓËÉ. åÓÌÉ ÜÔÉ ÚÎÁÞÅÎÉÑ ÎÅ×ÅÒÎÙ, ÐÏÖÁÌÕÊÓÔÁ, ÓÏÏÂÝÉÔÅ + [%+ Param('maintainer') %]. + </td> </tr> [% END %] @@ -346,6 +426,9 @@ <input type="hidden" name="form_name" value="enter_bug"> </form> +[%# Links or content with more information about the bug being created. %] +[% Hook.process("end") %] + [% PROCESS global/footer.html.tmpl %] [%############################################################################%] @@ -366,9 +449,13 @@ <select name="[% sel.name %]"> [%- FOREACH x = ${sel.name} %] <option value="[% x FILTER html %]" - [% " selected=\"selected\"" IF x == default.${sel.name} %]>[% x FILTER html -%] - </option> - [%- END %] + [% " selected=\"selected\"" IF x == default.${sel.name} %]> + [% IF sel.name == "bug_status" %] + [% status_descs.$x FILTER html %] + [% ELSE %] + [% x FILTER html %] + [% END %]</option> + [% END %] </select> </td> [% END %] Index: user-message.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/bug/create/user-message.html.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -d -r1.3 -r1.3.2.1 --- user-message.html.tmpl 26 Feb 2005 13:02:49 -0000 1.3 +++ user-message.html.tmpl 1 Nov 2005 23:35:29 -0000 1.3.2.1 @@ -17,6 +17,8 @@ # Rights Reserved. # # Contributor(s): Matthew Tuck <ma...@ch...> + # + # Russian translation: Vitaly Fedrushkov <fed...@us...> #%] [%# Migration note: this file corresponds to the old Param Index: make-template.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/bug/create/make-template.html.tmpl,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -d -r1.4 -r1.4.2.1 --- make-template.html.tmpl 26 Feb 2005 13:02:49 -0000 1.4 +++ make-template.html.tmpl 1 Nov 2005 23:35:29 -0000 1.4.2.1 @@ -17,6 +17,8 @@ # Rights Reserved. # # Contributor(s): Gervase Markham <ge...@ge...> + # + # Russian translation: Vitaly Fedrushkov <fed...@us...> #%] [% PROCESS global/variables.none.tmpl %] @@ -28,7 +30,7 @@ <p> äÏÂÁ×ØÔÅ <a href="enter_bug.cgi?[% url FILTER html %]">ÜÔÕ ÓÓÙÌËÕ</a> -× ÉÚÂÒÁÎÎÏÅ. ðÅÒÅÈÏÄ ÐÏ ÜÔÏÊ ÓÓÙÌËÅ ×ÙÚÏ×ÅÔ ÆÏÒÍÕ ÒÅÇÉÓÔÒÁÃÉÉ ÏÛÉÂËÉ +× ÉÚÂÒÁÎÎÏÅ. ðÅÒÅÈÏÄ ÐÏ ÜÔÏÊ ÓÓÙÌËÅ ×ÙÚÏ×ÅÔ ÆÏÒÍÕ ÒÅÇÉÓÔÒÁÃÉÉ [% terms.bug_gen %] Ó ÚÁÐÏÌÎÅÎÎÙÍÉ ÐÏÌÑÍÉ. </p> |
|
From: Vitaly F. <fed...@us...> - 2005-11-01 23:35:45
|
Update of /cvsroot/bugzilla-ru/bugzilla-ru In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31892 Modified Files: Tag: BUGZILLA-2_20 README-ru Log Message: Updated to Bugzilla-2.20 Index: README-ru =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/README-ru,v retrieving revision 1.2.4.1 retrieving revision 1.2.4.2 diff -u -d -r1.2.4.1 -r1.2.4.2 --- README-ru 1 Nov 2005 19:54:40 -0000 1.2.4.1 +++ README-ru 1 Nov 2005 23:35:29 -0000 1.2.4.2 @@ -17,7 +17,7 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=koi8-r -÷ÓÅ ÛÁÂÌÏÎÙ ÏÔÎÏÓÑÔÓÑ Ë ×ÅÒÓÉÉ 2.16.3. +÷ÓÅ ÛÁÂÌÏÎÙ ÏÔÎÏÓÑÔÓÑ Ë ×ÅÒÓÉÉ 2.20 TODO ~~~~ @@ -34,6 +34,8 @@ o îÁÐÉÓÁÔØ ÌÉÎËÉÆÉËÁÔÏÒÙ (ÒÅÇÕÌÑÒÎÙÅ ×ÙÒÁÖÅÎÉÑ ÄÌÑ ÇÉÐÅÒÓÓÙÌÏË). + o òÁÚÏÂÒÁÔØÓÑ Ó ÇÏÒÑÞÉÍÉ ËÌÁ×ÉÛÁÍÉ (ÓÅÊÞÁÓ ÏÎÉ ÏÔ ÁÎÇÌÉÊÓËÉÈ ÔÅÒÍÉÎÏ×). + o éÓÐÙÔÁÔØ ×ÓÅ ÎÁ ÌÏËÁÌÉÚÏ×ÁÎÎÏÊ ×ÅÒÓÉÉ Apache. (http://apache.lexa.ru/) äÏÂÉÔØÓÑ ÈÒÁÎÅÎÉÑ ÄÁÎÎÙÈ × ÂÁÚÅ × ÏÄÎÏÊ ËÏÄÉÒÏ×ËÅ ÎÅÚÁ×ÉÓÉÍÏ ÏÔ ËÌÉÅÎÔÁ. @@ -42,8 +44,6 @@ ÄÌÑ ÌÏËÁÌÉÚÏ×ÁÎÎÏÇÏ Apache É ÍÎÏÇÏÑÚÙÞÎÙÈ ÓÁÊÔÏ×. o ðÒÏÂÌÅÍÙ ÌÏËÁÌÉÚÁÃÉÉ × ËÏÄÅ. üÔÉÍ ÚÁÎÉÍÁÀÔÓÑ × ÏÓÎÏ×ÎÏÍ ÐÒÏÅËÔÅ. - îÁÉÂÏÌÅÅ ÉÎÔÅÒÅÓÎÏ ÐÒÅÄÓÔÁ×ÌÅÎÉÅ ÎÁÚ×ÁÎÉÊ ÓÏÓÔÏÑÎÉÊ ÐÒÉ ÓÏÈÒÁÎÅÎÉÉ - × ÂÁÚÅ ÄÁÎÎÙÈ ÓÔÁÎÄÁÒÔÎÙÈ ÚÎÁÞÅÎÉÊ. ìÀÂÁÑ ÐÏÍÏÝØ × ÒÅÁÌÉÚÁÃÉÉ ÐÒÏÅËÔÁ ÂÕÄÅÔ Ó ÂÌÁÇÏÄÁÒÎÏÓÔØÀ ÐÒÉÎÑÔÁ. |
|
From: Vitaly F. <fed...@us...> - 2005-11-01 23:35:44
|
Update of /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/bug In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31892/template/ru/default/bug Modified Files: Tag: BUGZILLA-2_20 choose.html.tmpl comments.html.tmpl dependency-graph.html.tmpl dependency-tree.html.tmpl edit.html.tmpl knob.html.tmpl navigate.html.tmpl show-multiple.html.tmpl Removed Files: Tag: BUGZILLA-2_20 choose-xml.html.tmpl show.xml.tmpl time.html.tmpl Log Message: Updated to Bugzilla-2.20 Index: dependency-tree.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/bug/dependency-tree.html.tmpl,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -u -d -r1.2 -r1.2.4.1 --- dependency-tree.html.tmpl 2 Dec 2002 03:57:02 -0000 1.2 +++ dependency-tree.html.tmpl 1 Nov 2005 23:35:29 -0000 1.2.4.1 @@ -1,9 +1,9 @@ -<!-- 1....@bu... --> +[%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of # the License at http://www.mozilla.org/MPL/ - # + # # Software distributed under the License is distributed on an "AS # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing @@ -17,22 +17,30 @@ # Rights Reserved. # # Contributor(s): Tobias Burnus <bu...@ne...> - # Ville Skyttä <vil...@ik...> + # Ville Skyttä <vil...@ik...> # Myk Melez <my...@mo...> # # Russian translation: Vitaly Fedrushkov <fed...@us...> #%] +[% PROCESS global/variables.none.tmpl %] + [% PROCESS global/header.html.tmpl title = "äÅÒÅ×Ï ÚÁ×ÉÓÉÍÏÓÔÅÊ ÏÛÉÂËÉ ÎÏÍÅÒ $bugid" h1 = "äÅÒÅ×Ï ÚÁ×ÉÓÉÍÏÓÔÅÊ <a href=\"show_bug.cgi?id=$bugid\">ÏÛÉÂËÉ ÎÏÍÅÒ $bugid</a>" - style = "strike { background-color: #d9d9d9; color: #000000; }" %] [% PROCESS depthControlToolbar %] [%# Display the tree of bugs that this bug depends on. %] -<h3>[% hide_resolved ? "îÅÚÁËÒÙÔÙÅ Ï" : "ï" %]ÛÉÂËÉ, ÏÔ ËÏÔÏÒÙÈ ÚÁ×ÉÓÉÔ <a href="show_bug.cgi?id=[% bugid %]">ÏÛÉÂËÁ ÎÏÍÅÒ [% bugid %]</a></h3> +<h3> + [% IF hide_resolved %] + îÅÚÁËÒÙÔÙÅ [% terms.bugs %], + [% ELSE %] + [% terms.Bugs %], + [% END %] + ÏÔ ËÏÔÏÒÙÈ ÚÁ×ÉÓÉÔ <a href="show_bug.cgi?id=[% bugid %]">[% terms.bug %] [%+ bugid %]</a> + </h3> [% IF dependson_ids.size > 0 %] ( [% IF maxdepth -%]äÏ ÕÒÏ×ÎÑ [% maxdepth %] ×ËÌÀÞÉÔÅÌØÎÏ | [% END %] @@ -47,7 +55,14 @@ [% END %] [%# Display the tree of bugs that this bug blocks. %] -<h3>[% hide_resolved ? "îÅÚÁËÒÙÔÙÅ Ï" : "ï" %]ÛÉÂËÉ, ËÏÔÏÒÙÅ ÚÁ×ÉÓÑÔ ÏÔ<a href="show_bug.cgi?id=[% bugid %]">ÏÛÉÂËÉ ÎÏÍÅÒ [% bugid %]</a></h3> +<h3> + [% IF hide_resolved %] + îÅÚÁËÒÙÔÙÅ [% terms.bugs %], + [% ELSE %] + [% terms.Bugs %], + [% END %] + ËÏÔÏÒÙÅ ÚÁ×ÉÓÑÔ ÏÔ <a href="show_bug.cgi?id=[% bugid %]">[% terms.bug_gen %] [%+ bugid %]</a> + </h3> [% IF blocked_ids.size > 0 %] ( [% IF maxdepth -%]äÏ ÕÒÏ×ÎÑ [% maxdepth %] ×ËÌÀÞÉÔÅÌØÎÏ | [% END %] @@ -76,17 +91,20 @@ [% FOREACH dep_id = tree.$bug_id.dependencies %] [% dep = tree.$dep_id %] <li> - [% "<strike>" IF !dep.open %] - <a href="show_bug.cgi?id=[% dep_id %]">[% dep_id %] + [% "<script>document.write('<a href=\"#\" class=\"toggle\" onclick=\"listToggle(event); return false\">[-]</a>')</script>" + IF dep.dependencies.size > 0 && !dep.seen %] + [% isclosed = !dep.open %] + [% FILTER closed(isclosed) %] + <a href="show_bug.cgi?id=[% dep_id %]">[% dep_id %] [[% IF dep.milestone %][% dep.milestone FILTER html %], [% END %] - [% dep.assignee_email FILTER html %]] - + [% dep.assignee_email FILTER html %]] - [% IF dep.seen %] - <i>ïÛÉÂËÁ ÐÏËÁÚÁÎÁ ÒÁÎÅÅ.</i></a> + <i>[% terms.Bug %] ÐÏËÁÚÁÎÁ ÒÁÎÅÅ.</i></a> [% ELSE %] - [% dep.summary FILTER html %].</a> + [%+ dep.summary FILTER html %].</a> [% END %] - [% "</strike>" IF !dep.open %] - [% INCLUDE display_tree bug_id=dep_id + [% END %] + [% INCLUDE display_tree bug_id=dep_id IF dep.dependencies.size > 0 && !dep.seen %] </li> [% END %] @@ -97,20 +115,55 @@ [%# Block for depth control toolbar #%] [%###########################################################################%] + <script type="text/javascript"> +if (!Node) { + /* MSIE doesn't define Node, so provide a compatibility array */ + var Node = { TEXT_NODE: 3, }; +} + +function toggleDisplay(node) +{ + var display = node.style.display; + if (display == "none") { + node.style.display = + ("oldDisplay" in node) ? node.oldDisplay : "block"; + return true; + } + + node.oldDisplay = display; + node.style.display = "none"; + return false; +} + +function listToggle(event) +{ + var node = event.target; + if (node.nodeType == Node.TEXT_NODE) + node = node.parentNode; + var toggle = node.nextSibling; + while (toggle && toggle.tagName != "UL") + toggle = toggle.nextSibling; + if (toggle) { + node.firstChild.data = toggleDisplay(toggle) ? "[-]" : "[+]"; + } +} + + </script> [% BLOCK depthControlToolbar %] <table cellpadding="3" border="0" cellspacing="0" bgcolor="#d0d0d0"> <tr> [%# Hide/show resolved button Swaps text depending on the state of hide_resolved %] <td align="center"> - <form method="get" action="showdependencytree.cgi" + <form method="get" action="showdependencytree.cgi" style="display: inline; margin: 0px;"> <input name="id" type="hidden" value="[% bugid %]"> [% IF maxdepth %] <input name="maxdepth" type="hidden" value="[% maxdepth %]"> [% END %] <input type="hidden" name="hide_resolved" value="[% hide_resolved ? 0 : 1 %]"> - <input type="submit" value="[% hide_resolved ? "ðÏËÁÚÁÔØ" : "óËÒÙÔØ" %] ÒÅÛÅÎÎÙÅ"> + <input type="submit" + value="[% IF hide_resolved %]ðÏËÁÚÁÔØ[% ELSE %]óËÒÙÔØ[% END %] ÚÁ×ÅÒÛÅÎÎÙÅ"> </form> </td> @@ -126,9 +179,8 @@ <form method="get" action="showdependencytree.cgi" style="display: inline; margin: 0px;"> [%# set to one form %] - <input type="submit" value=" 1 " [% - realdepth < 2 || maxdepth == 1 ? "disabled" : "" - %]> + <input type="submit" value=" 1 " + [% "disabled" IF realdepth < 2 || maxdepth == 1 %]> <input name="id" type="hidden" value="[% bugid %]"> <input name="maxdepth" type="hidden" value="1"> <input name="hide_resolved" type="hidden" value="[% hide_resolved %]"> @@ -136,65 +188,64 @@ </td> <td> - <form method="get" action="showdependencytree.cgi" + <form method="get" action="showdependencytree.cgi" style="display: inline; margin: 0px;"> - [%# Minus one form + [%# Minus one form Allow subtracting only when realdepth and maxdepth > 1 %] <input name="id" type="hidden" value="[% bugid %]"> - <input name="maxdepth" type="hidden" value="[% - maxdepth == 1 ? 1 + <input name="maxdepth" type="hidden" value="[% + maxdepth == 1 ? 1 : ( maxdepth ? maxdepth - 1 : realdepth - 1 ) %]"> <input name="hide_resolved" type="hidden" value="[% hide_resolved %]"> - <input type="submit" value=" < " [% - realdepth < 2 || ( maxdepth && maxdepth < 2 ) ? "disabled" : "" - %]> + <input type="submit" value=" < " + [% "disabled" IF realdepth < 2 || ( maxdepth && maxdepth < 2 ) %]> </form> </td> <td> - <form method="get" action="showdependencytree.cgi" + <form method="get" action="showdependencytree.cgi" style="display: inline; margin: 0px;"> [%# Limit entry form: the button can not do anything when total depth is less than two, so disable it %] - <input name="maxdepth" size="4" maxlength="4" value="[% + <input name="maxdepth" size="4" maxlength="4" value="[% maxdepth > 0 && maxdepth <= realdepth ? maxdepth : "" %]"> <input name="id" type="hidden" value="[% bugid %]"> <input name="hide_resolved" type="hidden" value="[% hide_resolved %]"> <noscript> - <input type="submit" value="ðÒÉÍÅÎÉÔØ" [% realdepth < 2 ? "disabled" : "" %]> + <input type="submit" value="õÓÔÁÎÏ×ÉÔØ" [% "disabled" IF realdepth < 2 %]> </noscript> </form> </td> <td> - <form method="get" action="showdependencytree.cgi" + <form method="get" action="showdependencytree.cgi" style="display: inline; margin: 0px;"> - [%# plus one form + [%# plus one form Disable button if total depth < 2, or if depth set to unlimited %] <input name="id" type="hidden" value="[% bugid %]"> [% IF maxdepth %] <input name="maxdepth" type="hidden" value="[% maxdepth + 1 %]"> [% END %] <input name="hide_resolved" type="hidden" value="[% hide_resolved %]"> - <input type="submit" value=" > " [% - realdepth < 2 || ! maxdepth || maxdepth >= realdepth ? - "disabled" : "" - %]> + <input type="submit" value=" > " + [% "disabled" IF realdepth < 2 || !maxdepth || maxdepth >= realdepth %] + %]> </form> </td> <td> - <form method="get" action="showdependencytree.cgi" + <form method="get" action="showdependencytree.cgi" style="display: inline; margin: 0px;"> [%# Unlimited button %] <input name="id" type="hidden" value="[% bugid %]"> <input name="hide_resolved" type="hidden" value="[% hide_resolved %]"> - <input type="submit" value=" ÷ÓÅ " - [% maxdepth == 0 || maxdepth == realdepth ? "disabled" : "" %]> + <input type="submit" value=" ÷ÓÅ " + [% "disabled" IF maxdepth == 0 || maxdepth == realdepth %]> </form> </td> </tr> </table> + [% END %] Index: edit.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/bug/edit.html.tmpl,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -u -d -r1.9 -r1.9.2.1 --- edit.html.tmpl 24 Mar 2005 17:57:32 -0000 1.9 +++ edit.html.tmpl 1 Nov 2005 23:35:29 -0000 1.9.2.1 @@ -18,15 +18,18 @@ # # Contributor(s): Gervase Markham <ge...@ge...> # Vaskin Kissoyan <vki...@ya...> + # # Russian translation: Vitaly Fedrushkov <fed...@us...> # Dmitry Pupkov <dp...@mc...> #%] [% PROCESS global/variables.none.tmpl %] +[% PROCESS "global/field-descs.none.tmpl" %] + [% PROCESS bug/time.html.tmpl %] - <script type="text/javascript" language="JavaScript"> + <script type="text/javascript"> <!-- /* Outputs a link to call replyToComment(); used to reduce HTML output */ @@ -34,7 +37,7 @@ /* XXX this should really be updated to use the DOM Core's * createElement, but finding a container isn't trivial */ document.write('[<a href="#add_comment" onclick="replyToComment(' + - id + ');">ÏÔ×ÅÔ<' + '/a>]'); + id + ');">ÏÔ×ÅÔÉÔØ<' + '/a>]'); } /* Adds the reply text to the `comment' textarea */ @@ -99,8 +102,9 @@ // subtracts time spent from remaining time var new_time; + // prevent negative values if work_time > fRemainingTime new_time = - fRemainingTime - document.changeform.work_time.value; + Math.max(fRemainingTime - document.changeform.work_time.value, 0.0); // get upto 2 decimal places document.changeform.remaining_time.value = Math.round(new_time * 100)/100; @@ -124,254 +128,315 @@ [%# *** Hardware Reporter Product OS AddCC *** %] - <table cellspacing="1" cellpadding="1" border="0"> + <table> + <tr> - <td align="right"> - <b>[% terms.Bug %] #:</b> - </td> - <td> - <a href="[% Param('urlbase') %]show_bug.cgi?id=[% bug.bug_id %]"> - [% bug.bug_id %]</a> - [% IF Param("usebugaliases") %] -<!-- <label title="a name for the [% terms.bug %] that can be used in place of its ID number, f.e. when adding it to a list of dependencies"> --> - <label title="ðÓÅ×ÄÏÎÉÍ ÄÌÑ [% terms.bug_gen %], ËÏÔÏÒÙÊ ×Ù ÍÏÖÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ ×ÍÅÓÔÏ ÎÏÍÅÒÁ, ÎÁÐÒÉÍÅÒ, ËÏÇÄÁ ÄÏÂÁ×ÌÑÅÔÅ × ÓÐÉÓÏË ÚÁ×ÉÓÉÍÏÓÔÅÊ"> - <b>ÐÓÅ×ÄÏÎÉÍ:</b> - <input name="alias" value="[% bug.alias FILTER html %]" size="20" maxlength="20"> - </label> - [% END %] - </td> + <td valign="top"> + <table cellspacing="1" cellpadding="1"> + + <tr> + <td align="right"> + [% IF Param('useclassification') %] + [% IF bug.classification_id != "1" %] + <b>[[% bug.classification FILTER html %]]</b> + [% END %] + [% END %] + <b>[% terms.Bug %]#:</b> + </td> + <td> + <a href="[% Param('urlbase') %]show_bug.cgi?id=[% bug.bug_id %]"> + [% bug.bug_id %]</a> + [% IF Param("usebugaliases") %] + <label for="alias" title="ÉÍÑ [% terms.bug_gen %], ËÏÔÏÒÏÅ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎÏ ×ÍÅÓÔÏ ÎÏÍÅÒÁ × ÓÓÙÌËÁÈ"> + <b>ÉÍÑ:</b> + <input id="alias" name="alias" value="[% bug.alias FILTER html %]" size="20" maxlength="20"> + </label> + [% END %] + </td> + </tr> - <td> </td> + <tr> + <td align="right"> + <b>ðÒÏÄÕËÔ:</b> + </td> + [% PROCESS select selname => "product" accesskey => "p" %] + </tr> - <td align="right"> -<!-- <b><u>ð</u>ÌÁÔÆÏÒÍÁ:</b>--> - <b> - <a href="page.cgi?id=fields.html#rep_platform">ðÌÁÔÆÏÒÍÁ</a>: - </b> - </td> - [% PROCESS select selname => "rep_platform" accesskey => "h" %] + [%# *** Component Version CC Priority Severity AssignedTo Milestone *** %] - <td align="right"> - <b>éÎÉÃÉÁÔÏÒ:</b> - </td> - <td> - <a href="mailto:[% bug.reporter.email FILTER html %]"> - [% bug.reporter.identity FILTER html %]</a> - </td> - </tr> + <tr> + <td align="right"> + <b> + <a href="describecomponents.cgi?product=[% bug.product FILTER url_quote %]"> + ëÏÍÐÏÎÅÎÔ</a>: + </b> + </td> + [% PROCESS select selname => "component" accesskey => "m" %] + </tr> - <tr> - <td align="right"> - <b><u>ð</u>ÒÏÄÕËÔ:</b> - </td> - [% PROCESS select selname => "product" accesskey => "p" %] + <tr> + <td align="right"> + <b> + <a href="page.cgi?id=fields.html#status">óÏÓÔÏÑÎÉÅ</a>: + </b> + </td> + <td>[% status_descs.${bug.bug_status} FILTER html %]</td> + </tr> - <td align="right"> -<!-- <b><u>ï</u>ó:</b>--> - <b> - <a href="page.cgi?id=fields.html#op_sys">ïó</a>: - </b> - </td> - [% PROCESS select selname => "op_sys" accesskey => "o" %] + <tr> + <td align="right"> + <b> + <a href="page.cgi?id=fields.html#resolution">òÅÛÅÎÉÅ</a>: + </b> + </td> + <td> + [% resolution_descs.${bug.resolution} FILTER html %] + [% IF bug.resolution == "DUPLICATE" %] + [% terms.bug_gen %] [%+ "${bug.dup_id}" FILTER bug_link(bug.dup_id) %] + [% END %] + </td> + </tr> - <td align="right"> - <b><u>ä</u>ÏÂÁ×ÉÔØ × nÏÄÐÉÓËÕ:</b> - </td> - <td> - <input name="newcc" size="30" value="" accesskey="a"> - </td> - </tr> + <tr> + <td align="right"> + <b> + <a href="page.cgi?id=fields.html#assigned_to">éÓÐÏÌÎÉÔÅÌØ</a>: + </b> + </td> + <td>[% bug.assigned_to.identity FILTER html %]</td> + </tr> -[%# *** Component Version CC Priority Severity AssignedTo Milestone *** %] + </table> - <tr> - <td align="right"> - <b> - <a href="describecomponents.cgi?product=[% bug.product FILTER url_quote %]"> - ëÏ<u>Í</u>ÐÏÎÅÎÔ</a>: - </b> </td> - [% PROCESS select selname => "component" accesskey => "m" %] + <td valign="top"> - <td align="right"> - <b>÷ÅÒÓÉÑ:</b> - </td> - [% PROCESS select selname => "version" %] + <table cellspacing="1" cellpadding="1"> - <td rowspan="4" align="right" valign="top"> - <b>ðÏÄÐÉÓÞÉËÉ:</b> - </td> - <td rowspan="4" valign="top"> - [% IF bug.cc %] - <select name="cc" multiple="multiple" size="5"> - [% FOREACH c = bug.cc %] - <option value="[% c FILTER html %]">[% c FILTER html %]</option> - [% END %] - </select> - <br> - <input type="checkbox" name="removecc">õÄÁÌÉÔØ ×ÙÂÒÁÎÎÙÈ ÐÏÄÐÉÓÞÉËÏ× - <br> - [% ELSE %] - <input type="hidden" name="cc" value=""> - [% END %] - </td> - </tr> + <tr> + <td align="right"> + <b>ðÌÁÔÆÏÒÍÁ:</b> + </td> + [% PROCESS select selname => "rep_platform" accesskey => "h" %] + </tr> - <tr> - <td align="right"> - <b> - <a href="page.cgi?id=fields.html#status">óÏÓÔÏÑÎÉÅ</a>: - </b> - </td> - <td>[% bug.bug_status FILTER html %]</td> - <td> </td> + <tr> + <td align="right"> + <b>ïó:</b> + </td> + [% PROCESS select selname => "op_sys" accesskey => "o" %] + </tr> - <td align="right"> - <b><a href="page.cgi?id=fields.html#priority">ðÒ<u>É</u>ÏÒÉÔÅÔ</a>:</b> - </td> - [% PROCESS select selname => "priority" accesskey => "i" %] - </tr> + <tr> + <td align="right"> + <b>÷ÅÒÓÉÑ:</b> + </td> + [% PROCESS select selname => "version" accesskey => "v" %] + </tr> - <tr> - <td align="right"> - <b> - <a href="page.cgi?id=fields.html#resolution">òÅÛÅÎÉÅ</a>: - </b> - </td> - <td> - [% bug.resolution FILTER html %] - [% IF bug.resolution == "DUPLICATE" %] - of [% terms.bug %] [%+ "${bug.dup_id}" FILTER bug_link(bug.dup_id) %] - [% END %] - </td> - <td> </td> + <tr> + <td align="right"> + <b><a href="page.cgi?id=fields.html#priority">ðÒÉÏÒÉÔÅÔ</a>:</b> + </td> + [% PROCESS select selname => "priority" accesskey => "i" %] + </tr> - <td align="right"> - <b><a href="page.cgi?id=fields.html#bug_severity">óÅÒØÅÚÎÏÓÔØ</a>:</b> - </td> - [% PROCESS select selname = "bug_severity" %] + <tr> + <td align="right"> + <b><a href="page.cgi?id=fields.html#bug_severity">óÅÒØÅÚÎÏÓÔØ</a>:</b> + </td> + [% PROCESS select selname = "bug_severity" accesskey => "e" %] + </tr> - </tr> + [% IF Param("usetargetmilestone") && bug.target_milestone %] + <tr> + <td align="right"> + <b> + [% IF bug.milestoneurl %] + <a href="[% bug.milestoneurl FILTER html %]"> + [% END %] + úÁÐÌÁÎÉÒÏ×ÁÎÏ[% "</a>" IF bug.milestoneurl %]: + </b> + </td> + [% PROCESS select selname = "target_milestone" accesskey => "t" %] + </tr> + [% END %] - <tr> - <td align="right"> - <b> - <a href="page.cgi?id=fields.html#assigned_to">ïÔ×ÅÔÓÔ×ÅÎÎÙÊ</a>: - </b> + </table> </td> - <td>[% bug.assigned_to.identity FILTER html %]</td> - <td> </td> - [% IF Param("usetargetmilestone") && bug.target_milestone %] - <td align="right"> - <b> - [% IF bug.milestoneurl %] - <a href="[% bug.milestoneurl FILTER html %]"> - [% END %] - ðÌÁÎÉÒÕÅÔÓÑ Ë[% "</a>" IF bug.milestoneurl %]: - </b> - </td> - [% PROCESS select selname = "target_milestone" %] - [% ELSE %] - <td colspan="3"> </td> - [% END %] - </tr> + <td valign="top"> -[%# *** QAContact URL Requests Summary Whiteboard Keywords *** %] + <table cellpadding="1" cellspacing="1"> - [% IF Param('useqacontact') %] - <tr> - <td align="right"> - <b><u>ë</u>ÏÎÔÒÏÌØ ËÁÞÅÓÔ×Á:</b> - </td> - <td colspan="7"> - <input name="qa_contact" accesskey="q" - value="[% bug.qa_contact.login FILTER html %]" size="60"> - </td> - </tr> - [% END %] + <tr> + <td align="right"> + <b>éÎÉÃÉÁÔÏÒ:</b> + </td> + <td> + <a href="mailto:[% bug.reporter.email FILTER html %]"> + [% bug.reporter.identity FILTER html %]</a> + </td> + </tr> - <tr> - <td align="right"> - <b> - [% IF bug.bug_file_loc - AND NOT bug.bug_file_loc.match("^(javascript|data)") %] - <a href="[% bug.bug_file_loc FILTER html %]"><u>U</u>RL</a>: - [% ELSE %] - <u>U</u>RL: - [% END %] - </b> - </td> - <td colspan="5"> - <input name="bug_file_loc" accesskey="u" - value="[% bug.bug_file_loc FILTER html %]" size="60"> - </td> - <td rowspan="4" colspan="2" valign="top"> - [% IF bug.flag_types.size > 0 %] - [% PROCESS "flag/list.html.tmpl" - flag_types = bug.flag_types - any_flags_requesteeble = bug.any_flags_requesteeble %] - [% END %] - </td> - </tr> + <tr> + <td align="right" valign="top"> + <b>ðÏÄÐÉÓÁÔØ:</b> + </td> + <td> + [% INCLUDE global/userselect.html.tmpl + name => "newcc" + value => "" + accesskey => "a" + size => 30 + multiple => 5 + %] + </td> + </tr> - <tr> - <td align="right"> - <b><u>á</u>ÎÎÏÔÁÃÉÑ:</b> - </td> - <td colspan="5"> - <input name="short_desc" accesskey="s" - value="[% bug.short_desc FILTER html %]" size="60"> - </td> - </tr> + <tr> + <td align="right" valign="top"> + <b>ðÏÄÐÉÓÞÉËÉ:</b> + </td> + <td valign="top"> + [% IF bug.cc %] + <select name="cc" multiple="multiple" size="5"> + [% FOREACH c = bug.cc %] + <option value="[% c FILTER html %]">[% c FILTER html %]</option> + [% END %] + </select> + <br> + <input type="checkbox" name="removecc">ïÔÍÅÎÉÔØ ÐÏÄÐÉÓËÕ ÕËÁÚÁÎÎÙÈ ÐÏÌØÚÏ×ÁÔÅÌÅÊ + <br> + [% ELSE %] + <input type="hidden" name="cc" value=""> + [% END %] + </td> + </tr> + + </table> - [% IF Param('usestatuswhiteboard') %] - <tr> - <td align="right"> - <b> <u>ú</u>ÁÍÅÔËÉ:</b> </td> - <td colspan="5"> - <input name="status_whiteboard" accesskey="w" - value="[% bug.status_whiteboard FILTER html %]" size="60"> + </tr> + + <tr> + <td colspan="2"> + <table cellspacing="1" cellpadding="1"> + + [%# *** QAContact URL Requests Summary Whiteboard Keywords *** %] + + [% IF Param('useqacontact') %] + <tr> + <td align="right"> + <b>ðÒÉÅÍËÁ:</b> + </td> + <td colspan="7"> + [% INCLUDE global/userselect.html.tmpl + name => "qa_contact" + value => bug.qa_contact.login + accesskey => "q" + size => 60 + emptyok => 1 + %] + </td> + </tr> + [% END %] + + <tr> + <td align="right"> + <b> + [% IF bug.bug_file_loc + AND NOT bug.bug_file_loc.match("^(javascript|data)") %] + <a href="[% bug.bug_file_loc FILTER html %]">óÓÙÌËÁ</a>: + [% ELSE %] + óÓÙÌËÁ: + [% END %] + </b> + </td> + <td colspan="5"> + <input name="bug_file_loc" accesskey="u" + value="[% bug.bug_file_loc FILTER html %]" size="60"> + </td> + </tr> + + <tr> + <td align="right"> + <b>áÎÎÏÔÁÃÉÑ:</b> + </td> + <td colspan="5"> + <input name="short_desc" accesskey="s" + value="[% bug.short_desc FILTER html %]" size="60"> + </td> + </tr> + + [% IF Param('usestatuswhiteboard') %] + <tr> + <td align="right"> + <b>úÁÍÅÔËÉ:</b> + </td> + <td colspan="5"> + <input name="status_whiteboard" accesskey="w" + value="[% bug.status_whiteboard FILTER html %]" size="60"> + </td> + </tr> + [% END %] + + [% IF bug.use_keywords %] + <tr> + <td align="right"> + <b> + <a href="describekeywords.cgi">ëÌÀÞÅ×ÙÅ ÓÌÏ×Á</a>: + </b> + <td colspan="5"> + <input name="keywords" accesskey="k" + value="[% bug.keywords.join(', ') FILTER html %]" size="60"> + </td> + </tr> + [% END %] + + </table> </td> - </tr> - [% END %] - [% IF bug.use_keywords %] - <tr> - <td align="right"> - <b> - <a href="describekeywords.cgi"><u>ë</u>ÌÀÞÅ×ÙÅ ÓÌÏ×Á</a>: - </b> - <td colspan="5"> - <input name="keywords" accesskey="k" - value="[% bug.keywords.join(', ') FILTER html %]" size="60"> + <td valign="top"> + <table cellspacing="1" cellpadding="1"> + <tr> + <td colspan="2" valign="top"> + [% IF bug.flag_types.size > 0 %] + [% PROCESS "flag/list.html.tmpl" + flag_types = bug.flag_types + any_flags_requesteeble = bug.any_flags_requesteeble %] + [% END %] + </td> + </tr> + </table> </td> </tr> - [% END %] </table> -<!-- FIXME# to translte... --> + [% IF UserInGroup(Param('timetrackinggroup')) %] <br> <table cellspacing="0" cellpadding="4" border="1"> <tr> <th align="center" bgcolor="#cccccc"> - Orig. Est. + ðÅÒ×ÏÎÁÞÁÌØÎÁÑ ÏÃÅÎËÁ </th> <th align="center" bgcolor="#cccccc"> - Current Est. + ôÅËÕÝÁÑ ÏÃÅÎËÁ </th> <th align="center" bgcolor="#cccccc"> - Hours Worked + ïÔÒÁÂÏÔÁÎÏ </th> <th align="center" bgcolor="#cccccc"> - Hours Left + ïÓÔÁÌÏÓØ </th> <th align="center" bgcolor="#cccccc"> - %Complete + % ÚÁ×ÅÒÛÅÎÉÑ </th> <th align="center" bgcolor="#cccccc"> - Gain + ïÔËÌÏÎÅÎÉÅ + </th> + <th align="center" bgcolor="#cccccc"> + óÒÏË </th> </tr> <tr> @@ -403,6 +468,17 @@ <td align="center"> [% PROCESS formattimeunit time_unit=bug.estimated_time - (bug.actual_time + bug.remaining_time) %] </td> + <td align="center"> + <input name="deadline" value="[% bug.deadline %]" + size="10" maxlength="10"><br /> + <small>(çççç-íí-ää)</small> + </td> + </tr> + <tr> + <td colspan="6" align="right"> + <a href="summarize_time.cgi?id=[% bug.bug_id %]&do_depends=1"> + áÎÁÌÉÚ ÔÒÕÄÏÚÁÔÒÁÔ (Ó ÕÞÅÔÏÍ ÚÁ×ÉÓÉÍÏÓÔÅÊ [% terms.bugs_gen %])</a> + </td> </tr> </table> [% END %] @@ -420,7 +496,7 @@ <table> <tr> - [% PROCESS dependencies + [% PROCESS dependencies accesskey = "d" dep = { title => "ÚÁ×ÉÓÉÔ ÏÔ", fieldname => "dependson" } %] <td rowspan="2"> <a href="showdependencytree.cgi?id=[% bug.bug_id %]">ðÏËÁÚÁÔØ ÄÅÒÅ×Ï @@ -429,14 +505,14 @@ [% IF Param('webdotbase') %] <br> <a href="showdependencygraph.cgi?id=[% bug.bug_id %]">ðÏËÁÚÁÔØ - ÓÈÅÍÕ ÚÁ×ÉÓÉÍÏÓÔÅÊ</a> + ÄÉÁÇÒÁÍÍÕ ÚÁ×ÉÓÉÍÏÓÔÅÊ</a> [% END %] </td> </tr> <tr> [% PROCESS dependencies accesskey = "b" - dep = { title => "<u>Â</u>ÌÏËÉÒÕÅÔ", fieldname => "blocked" } %] + dep = { title => "ÂÌÏËÉÒÕÅÔ", fieldname => "blocked" } %] </tr> </table> @@ -450,7 +526,7 @@ [% bug.votes %] <a href="votes.cgi?action=show_bug&bug_id=[% bug.bug_id %]">ðÏËÁÚÁÔØ ÒÅÚÕÌØÔÁÔÙ ÄÌÑ [% terms.bug_gen %]</a> - <a href="votes.cgi?action=show_user&bug_id=[% bug.bug_id %]"> + <a href="votes.cgi?action=show_user&bug_id=[% bug.bug_id %]#vote_[% bug.bug_id %]"> ðÒÏÇÏÌÏÓÏ×ÁÔØ ÚÁ ÜÔÕ [% terms.bug_acc %]</a> </td> </tr> @@ -460,15 +536,23 @@ [%# *** Comments Groups *** %] <br> - <b><u>ë</u>ÏÍÍÅÎÔÁÒÉÉ:</b> + <b>ëÏÍÍÅÎÔÁÒÉÉ:</b> [% IF Param("insidergroup") && UserInGroup(Param("insidergroup")) %] <input type="checkbox" name="commentprivacy" value="1" - id="newcommentprivacy"> Private + id="newcommentprivacy"> ëÏÎÆÉÄÅÎÃÉÁÌØÎÏ [% END %] <br> <a name="add_comment"></a> - <textarea wrap="hard" name="comment" id="comment" rows="10" cols="80" + <textarea name="comment" id="comment" rows="10" cols="80" accesskey="c"></textarea> + + [% IF NOT bug.cc || NOT bug.cc.contains(user.login) %] + <br> + <label for="addselfcc"> + <input type="checkbox" id="addselfcc" name="addselfcc"> + äÏÂÁ×ÉÔØ × ÐÏÄÐÉÓËÕ [% user.login FILTER html %] + </label> + [% END %] <br> [% IF bug.groups.size > 0 %] @@ -512,9 +596,9 @@ <b>ëÒÏÍÅ ÔÏÇÏ, ÏÂÌÁÄÁÔÅÌÉ ÕËÁÚÁÎÎÙÈ ÒÏÌÅÊ ×ÓÅÇÄÁ ÉÍÅÀÔ ÄÏÓÔÕÐ Ë [% terms.bug_dat %]:</b> <br> <small> - (ïÔ×ÅÔÓÔ×ÅÎÎÙÊ + (éÓÐÏÌÎÉÔÅÌØ [% IF (Param('useqacontact')) %] - É ËÏÎÔÒÏÌÅÒ ËÁÞÅÓÔ×Á + É ÏÔ×ÅÔÓÔ×ÅÎÎÙÊ ÚÁ ÐÒÉÅÍËÕ [% END %] ×ÓÅÇÄÁ ÉÍÅÀÔ ÄÏÓÔÕÐ Ë [% terms.bug_dat %]. äÁÎÎÁÑ ÎÁÓÔÒÏÊËÁ ÄÅÊÓÔ×ÕÅÔ, ÅÓÌÉ ×ÉÄÉÍÏÓÔØ [% terms.bug_gen %] ÏÇÒÁÎÉÞÅÎÁ ÎÅËÏÔÏÒÏÊ ÇÒÕÐÐÏÊ.) @@ -535,19 +619,6 @@ [%# *** Additional Comments *** %] <hr> -<table> - <tr> - <td align="left"> - <b><a name="c0" href="#c0">ïÐÉÓÁÎÉÅ</a>:</b> <script - type="text/javascript" language="JavaScript"><!-- - addReplyLink(0); - //--></script> - </td> - <td align="right" width="100%"> - ïÔËÒÙÔÁ: [% bug.creation_ts FILTER time %] - </td> - </tr> -</table> [% PROCESS bug/comments.html.tmpl comments = bug.longdescs Index: choose.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/bug/choose.html.tmpl,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -u -d -r1.2 -r1.2.4.1 --- choose.html.tmpl 2 Dec 2002 03:57:02 -0000 1.2 +++ choose.html.tmpl 1 Nov 2005 23:35:29 -0000 1.2.4.1 @@ -1,4 +1,4 @@ -<!-- 1....@bu... --> +[%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of @@ -21,15 +21,15 @@ # Russian translation: Vitaly Fedrushkov <fed...@us...> #%] -[% UNLESS header_done %] - [% PROCESS global/header.html.tmpl - title = "ðÏÉÓË ÐÏ ÎÏÍÅÒÕ" - %] -[% END %] +[% PROCESS global/variables.none.tmpl %] + +[% PROCESS global/header.html.tmpl + title = "ðÏÉÓË ÐÏ ÎÏÍÅÒÕ $terms.bug_gen" + %] <form method="get" action="show_bug.cgi"> <p> - ðÏÉÓË ËÏÎËÒÅÔÎÏÊ ÏÛÉÂËÉ ÐÏ ÎÏÍÅÒÕ: + ðÏÉÓË ËÏÎËÒÅÔÎÏÊ [% terms.bug_gen %] ÐÏ ÎÏÍÅÒÕ: <input name="id" size="6"> <input type="submit" value="îÁÊÔÉ"> </p> --- choose-xml.html.tmpl DELETED --- --- time.html.tmpl DELETED --- Index: dependency-graph.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/bug/dependency-graph.html.tmpl,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -d -r1.5 -r1.5.2.1 --- dependency-graph.html.tmpl 4 Mar 2005 15:41:18 -0000 1.5 +++ dependency-graph.html.tmpl 1 Nov 2005 23:35:29 -0000 1.5.2.1 @@ -17,6 +17,7 @@ # Rights Reserved. # # Contributor(s): Gervase Markham <ge...@ge...> + # # Russian translation: Vitaly Fedrushkov <fed...@us...> # Dmitry Pupkov <dp...@mc...> #%] @@ -68,7 +69,7 @@ <table> <tr> <td> - [% terms.Bug %] ÎÏÍÅÒ: + îÏÍÅÒÁ [% terms.bugs_gen %]: <input name="id" value="[% bug_id %]"> </td> </tr> --- show.xml.tmpl DELETED --- Index: navigate.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/bug/navigate.html.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -d -r1.3 -r1.3.2.1 --- navigate.html.tmpl 10 Mar 2005 11:31:04 -0000 1.3 +++ navigate.html.tmpl 1 Nov 2005 23:35:29 -0000 1.3.2.1 @@ -17,6 +17,7 @@ # Rights Reserved. # # Contributor(s): Gervase Markham <ge...@ge...> + # # Russian translation: Vitaly Fedrushkov <fed...@us...> # Dmitry Pupkov <dp...@mc...> #%] @@ -30,8 +31,10 @@ ([% this_bug_idx + 1 %] ÉÚ [% bug_list.size %]) [% END %] +[% IF this_bug_idx != -1 %] <a href="show_bug.cgi?id=[% bug_list.first %]">ðÅÒ×ÁÑ</a> <a href="show_bug.cgi?id=[% bug_list.last %]">ðÏÓÌÅÄÎÑÑ</a> +[% END %] [% IF bug.bug_id %] [% IF this_bug_idx != -1 %] @@ -56,6 +59,15 @@ [% END %] <a href="buglist.cgi?regetlastlist=1">ðÏËÁÚÁÔØ ÓÐÉÓÏË</a> +[% ELSE %] + [%# Either !bug_list || bug_list.size <= 0 %] + [%# With no list, don't show link to search results %] + <i><font color="#777777">ðÅÒ×ÁÑ</font></i> + <i><font color="#777777">ðÏÓÌÅÄÎÑÑ</font></i> + <i><font color="#777777">ðÒÅÄÙÄÕÝÁÑ</font></i> + <i><font color="#777777">óÌÅÄÕÀÝÁÑ</font></i> + + <i><font color="#777777">òÅÚÕÌØÔÁÔ ÐÏÉÓËÁ ÐÕÓÔ</font></i> [% END %] <a href="query.cgi">ðÏÉÓË</a> Index: comments.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/bug/comments.html.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -d -r1.3 -r1.3.2.1 --- comments.html.tmpl 10 Mar 2005 11:41:46 -0000 1.3 +++ comments.html.tmpl 1 Nov 2005 23:35:29 -0000 1.3.2.1 @@ -3,38 +3,67 @@ # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of # the License at http://www.mozilla.org/MPL/ - # + # # Software distributed under the License is distributed on an "AS # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. - # + # # The Original Code is the Bugzilla Bug Tracking System. - # + # # The Initial Developer of the Original Code is Netscape Communications # Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All # Rights Reserved. - # + # # Contributor(s): Gervase Markham <ge...@ge...> + # Max Kanat-Alexander <mk...@bu...> + # Shane H. W. Travis <tr...@se...> + # # Russian translation: Vitaly Fedrushkov <fed...@us...> # Dmitry Pupkov <dp...@mc...> # #%] +[% PROCESS bug/time.html.tmpl %] + [% DEFAULT start_at = 0 mode = "show" %] -[% count = 0 %] [% isinsider = Param("insidergroup") && UserInGroup(Param("insidergroup")) %] +[% sort_order = user.settings.comment_sort_order.value %] + +[%# NOTE: (start_at > 0) means we came here from a midair collision, + # in which case we don't care what the user's preference is. + %] +[% IF (start_at > 0) %] + [% sort_order = "oldest_to_newest" %] +[% END %] + + +[%# Set up the variables as needed, depending on the sort order %] +[% IF sort_order == "oldest_to_newest" %] + [% count = 0 %] + [% description = 0 %] + [% increment = 1 %] +[% ELSE %] + [% increment = -1 %] + [% IF sort_order == "newest_to_oldest" %] + [% count = comments.size - 1 %] + [% description = 0 %] + [% ELSIF sort_order == "newest_to_oldest_desc_first" %] + [% count = comments.size %] + [% description = comments.size %] + [% END %] +[% END %] + + [% FOREACH comment = comments %] [% IF count >= start_at %] [% PROCESS a_comment %] [% END %] - [% count = count + 1 %] + [% count = count + increment %] [% END %] -[% PROCESS bug/time.html.tmpl %] - [%# Note: this template is used in multiple places; if you use this hook, # make sure you are aware of this fact. #%] @@ -46,8 +75,23 @@ [% BLOCK a_comment %] [% IF NOT comment.isprivate || isinsider %] - <div [% "class=\"bz_private\"" IF comment.isprivate %]> - [% IF count > 0 %] + <div [% "class=\"bz_private\" " IF comment.isprivate %] + [% "class=\"bz_comment_hilite\" " IF marks.$count %]> + [% IF count == description %] + <table> + <tr> + <td align="left"> + <b><a name="c0" href="#c0">ïÐÉÓÁÎÉÅ</a>:</b> <script + type="text/javascript"><!-- + addReplyLink(0); + //--></script> + </td> + <td align="left" width="30%"> + <b>äÁÔÁ ÏÔËÒÙÔÉÑ:</b> [% bug.creation_ts FILTER time %] + </td> + </tr> + </table> + [% ELSE %] <br> <span class="bz_comment"> ------- <i> ëÏÍÍÅÎÔÁÒÉÊ @@ -57,7 +101,7 @@ [%+ comment.time FILTER time %] </i> [% IF mode == "edit" %] - <script type="text/javascript" language="JavaScript"><!-- + <script type="text/javascript"><!-- addReplyLink([% count %]); //--></script> [% END %] ------- @@ -71,22 +115,26 @@ <input type="hidden" name="when-[% count %]" value="[% comment.when %]"> <input type="checkbox" name="isprivate-[% count %]" value="1" id="isprivate-[% count %]" - [% " checked=\"checked\"" IF comment.isprivate %]> þÁÓÔÎÙÅ <!-- FIXME: private --> + [% " checked=\"checked\"" IF comment.isprivate %]> ëÏÎÆÉÄÅÎÃÉÁÌØÎÏ </i> [% END %] [% IF UserInGroup(Param('timetrackinggroup')) && (comment.work_time > 0 || comment.work_time < 0) %] <br> - äÏÐÏÌÎÉÔÅÌØÎÏÅ ×ÒÅÍÑ ÒÁÂÏÔÙ: -<!--FIXME: Additional hours worked: --> + ïÔÒÁÂÏÔÁÎÎÏÅ ×ÒÅÍÑ: [% PROCESS formattimeunit time_unit=comment.work_time %] [% END %] [%# Don't indent the <pre> block, since then the spaces are displayed in the # generated HTML #%] +[% IF comment.already_wrapped %] + [% wrapped_comment = comment.body %] +[% ELSE %] + [% wrapped_comment = comment.body FILTER wrap_comment %] +[% END %] <pre[% ' id="comment_text_' _ count _ '"' IF mode == "edit" %]> - [%- comment.body FILTER quoteUrls -%] + [%- wrapped_comment FILTER quoteUrls -%] </pre> </div> [% END %] Index: show-multiple.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/bug/show-multiple.html.tmpl,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -u -d -r1.3 -r1.3.4.1 --- show-multiple.html.tmpl 14 Aug 2003 20:34:49 -0000 1.3 +++ show-multiple.html.tmpl 1 Nov 2005 23:35:29 -0000 1.3.4.1 @@ -1,4 +1,4 @@ -<!-- 1....@bu... --> +[%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of @@ -22,10 +22,14 @@ # Russian translation: Vitaly Fedrushkov <fed...@us...> #%] -[% PROCESS global/header.html.tmpl - title = "ðÏÄÒÏÂÎÙÊ ÓÐÉÓÏË ÏÛÉÂÏË" -%] +[% PROCESS global/variables.none.tmpl %] +[% PROCESS global/header.html.tmpl + title = "[% PROCESS global/header.html.tmpl + title = "ðÏÄÒÏÂÎÙÊ ÓÐÉÓÏË $terms.bugs_gen" + style_urls = [ "skins/standard/show_multiple.css" ] +%] +[% PROCESS bug/time.html.tmpl %] [% IF bugs.first %] [% FOREACH bug = bugs %] [% PROCESS bug_display %] @@ -36,6 +40,7 @@ </p> [% END %] + [% PROCESS global/footer.html.tmpl %] @@ -44,10 +49,9 @@ [%###########################################################################%] [% BLOCK bug_display %] - <img src="1x1.gif" width="1" height="80" align="left"> <div align="center"> <b> - <font ="+3">ïÛÉÂËÁ [% bug.bug_id %] - [% bug.short_desc FILTER html %]</font> + <font size="+3">[% terms.Bug %] [%+ bug.bug_id %] - [% bug.short_desc FILTER html %]</font> </b> </div> @@ -56,15 +60,24 @@ <td> <b>îÏÍÅÒ:</b> <a href="show_bug.cgi?id=[% bug.bug_id %]">[% bug.bug_id %]</a> + [% IF Param("usebugaliases") AND bug.alias %] + ([% bug.alias FILTER html %]) + [% END %] </td> - [% PROCESS cell attr = { description => "ðÒÏÄÕËÔ", - name => "product" } %] - [% PROCESS cell attr = { description => "÷ÅÒÓÉÑ", + <td> + <b> ðÒÏÄÕËÔ: </b> + [% IF Param("useclassification") %] + [[% bug.classification FILTER html %]] + [% END %] + [% bug.product FILTER html %] + </td> + + [% PROCESS cell attr = { description => "÷ÅÒÓÉÑ", name => "version" } %] [% PROCESS cell attr = { description => "ðÌÁÔÆÏÒÍÁ", name => "rep_platform" } %] </tr> - + <tr> [% PROCESS cell attr = { description => "ïó", name => "op_sys" } %] @@ -75,47 +88,58 @@ [% PROCESS cell attr = { description => "ðÒÉÏÒÉÔÅÔ", name => "priority" } %] </tr> - + <tr> [% PROCESS cell attr = { description => "òÅÛÅÎÉÅ", name => "resolution" } %] - [% PROCESS cell attr = { description => "ïÔ×ÅÔÓÔ×ÅÎÎÙÊ", - name => "assigned_to" } %] - [% PROCESS cell attr = { description => "éÎÉÃÉÁÔÏÒ", - name => "reporter" } %] + <td> + <b>éÓÐÏÌÎÉÔÅÌØ:</b> + [% bug.assigned_to.login FILTER html %] + </td> + <td> + <b>éÎÉÃÉÁÔÏÒ:</b> + [% bug.reporter.login FILTER html %] + </td> [% IF Param('useqacontact') %] - [% PROCESS cell attr = { description => "ëÏÎÔÒÏÌØ ËÁÞÅÓÔ×Á", - name => "qa_contact" } %] + <td> + <b>ðÒÉÅÍËÁ:</b> + [% bug.qa_contact.login FILTER html %] + </td> [% END %] </tr> - + <tr> <td colspan="2"> - <b>ëÏÍÐÏÎÅÎÔ:</b> - [% bug.component %] + <b>ëÏÍÐÏÎÅÎÔÁ:</b> + [% bug.component FILTER html %] </td> - + <td colspan="2"> [% IF Param('usetargetmilestone') %] - <b>ðÌÁÎÉÒÕÅÔÓÑ Ë:</b> + <b>úÁÐÌÁÎÉÒÏ×ÁÎÏ:</b> [% bug.target_milestone FILTER html %] [% END %] </td> </tr> - + <tr> <td colspan="4"> - <b>óÓÙÌËÁ (URL):</b> - <a href="[% bug.bug_file_loc FILTER html %]"> - [% bug.bug_file_loc FILTER html %]</a> + <b>óÓÙÌËÁ:</b> + [% IF bug.bug_file_loc + AND NOT bug.bug_file_loc.match("^(javascript|data)") %] + <a href="[% bug.bug_file_loc FILTER html %]"> + [% bug.bug_file_loc FILTER html %]</a> + [% ELSE %] + [% bug.bug_file_loc FILTER html %] + [% END %] </tr> - + <tr> <td colspan="4"> <b>áÎÎÏÔÁÃÉÑ:</b> [% bug.short_desc FILTER html %] </td> </tr> - + [% IF use_keywords %] <tr> <td colspan="4"> @@ -133,16 +157,45 @@ </tr> [% END %] + [% IF UserInGroup(Param("timetrackinggroup")) %] + <tr> + <td colspan="4"> + <b>ðÅÒ×ÏÎÁÞÁÌØÎÁÑ ÏÃÅÎËÁ:</b> + [% PROCESS formattimeunit time_unit=bug.estimated_time %] + + <b>ôÅËÕÝÁÑ ÏÃÅÎËÁ:</b> + [% PROCESS formattimeunit + time_unit=(bug.remaining_time + bug.actual_time) %] + + <b>ïÔÒÁÂÏÔÁÎÏ:</b> + [% PROCESS formattimeunit time_unit=bug.actual_time %] + <b>ïÓÔÁÌÏÓØ:</b> + [% PROCESS formattimeunit time_unit=bug.remaining_time %] + + <b>ðÒÏÃÅÎÔ ÚÁ×ÅÒÛÅÎÉÑ:</b> + [% PROCESS calculatepercentage act=bug.actual_time + rem=bug.remaining_time %] + <b>ïÔËÌÏÎÅÎÉÅ</b> + [% PROCESS formattimeunit + time_unit=bug.estimated_time - (bug.actual_time + bug.remaining_time) %] + + <b>óÒÏË:</b> + [% bug.deadline %] + </td> + </tr> + [% END %] + <tr> <td colspan="4"> - <b>ëÏÍÍÅÎÔÁÒÉÉ:</b> + <b>äÁÔÁ ÏÔËÒÙÔÉÑ:</b> + [% bug.creation_ts FILTER time %] </td> </tr> </table> - [% PROCESS bug/comments.html.tmpl - comments = bug.comments %] - + [% PROCESS bug/comments.html.tmpl + comments = bug.longdescs %] + <hr> [% END %] @@ -153,7 +206,7 @@ [% BLOCK cell %] <td> - <b>[% attr.description%]:</b> + <b>[% attr.description FILTER html %]:</b> [% bug.${attr.name} FILTER html %] </td> [% END %] Index: knob.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/bug/knob.html.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -d -r1.3 -r1.3.2.1 --- knob.html.tmpl 10 Mar 2005 11:56:30 -0000 1.3 +++ knob.html.tmpl 1 Nov 2005 23:35:29 -0000 1.3.2.1 @@ -18,7 +18,9 @@ # # Contributor(s): Gervase Markham <ge...@ge...> # Vaskin Kissoyan <vki...@ya...> + # # Russian translation: Ilya Shevchik <il...@us...> + # Vitaly Fedrushkov <fed...@us...> #%] [% PROCESS global/variables.none.tmpl %] @@ -39,25 +41,26 @@ [% IF bug.isunconfirmed && bug.user.canconfirm %] <input type="radio" id="knob-confirm" name="knob" value="confirm"> <label for="knob-confirm"> - ðÏÄÔ×ÅÒÄÉÔØ [% terms.bug_acc %] (ÉÚÍÅÎÉÔØ ÓÏÓÔÏÑÎÉÅ ÎÁ <b>NEW</b>) + ðÏÄÔ×ÅÒÄÉÔØ [% terms.bug_acc %] (ÕÓÔÁÎÏ×ÉÔØ ÓÏÓÔÏÑÎÉÅ <b>[% status_descs.NEW FILTER html %]</b>) </label> <br> [% knum = knum + 1 %] [% END %] - [% IF bug.user.canedit %] - [% IF bug.isopened %] - [% IF bug.bug_status != "ASSIGNED" && bug.user.canconfirm %] - <input type="radio" id="knob-accept" name="knob" value="accept"> - <label for="knob-accept"> - ðÒÉÎÑÔØ [% terms.bug_acc %] ( - [% IF bug.isunconfirmed %]ÐÏÄÔ×ÅÒÄÉÔØ [% terms.bug_acc %], - [% END %]ÉÚÍÅÎÉÔØ ÓÏÓÔÏÑÎÉÅ ÎÁ <b>ASSIGNED</b>) - </label> - <br> - [% knum = knum + 1 %] - [% END %] + [% IF bug.isopened && bug.bug_status != "ASSIGNED" && bug.user.canedit + && (!bug.isunconfirmed || bug.user.canconfirm) %] + <input type="radio" id="knob-accept" name="knob" value="accept"> + <label for="knob-accept"> + ðÒÉÎÑÔØ [% terms.bug %] ( + [% IF bug.isunconfirmed %]ÐÏÄÔ×ÅÒÄÉÔØ [% terms.bug %] É [% END %]ÕÓÔÁÎÏ×ÉÔØ + ÓÏÓÔÏÑÎÉÅ <b>[% status_descs.ASSIGNED FILTER html %]</b>) + </label> + <br> + [% knum = knum + 1 %] + [% END %] + [% IF bug.user.canedit || bug.user.isreporter %] + [% IF bug.isopened %] [% IF bug.resolution %] <input type="radio" id="knob-clear" name="knob" value="clearresolution"> <label for="knob-clear"> @@ -76,7 +79,7 @@ <select name="resolution" onchange="document.changeform.knob[[% knum %]].checked=true"> [% FOREACH r = bug.choices.resolution %] - <option value="[% r FILTER html %]">[% r FILTER html %]</option> + <option value="[% r FILTER html %]">[% resolution_descs.${r} FILTER html %]</option> [% END %] </select> <br> @@ -84,7 +87,7 @@ <input type="radio" id="knob-duplicate" name="knob" value="duplicate"> <label for="knob-duplicate"> - ðÒÉÎÑÔØ ÒÅÛÅÎÉÅ: ÜÔÁ [% terms.bug %] ÄÕÂÌÉÒÕÅÔ [% terms.bug_acc %] # + ðÒÉÎÑÔØ ÒÅÛÅÎÉÅ: ÜÔÁ [% terms.bug %] ÄÕÂÌÉÒÕÅÔ [% terms.bug_acc %] </label> <input name="dup_id" size="6" onchange="if (this.value != '') @@ -92,42 +95,47 @@ <br> [% knum = knum + 1 %] - <input type="radio" id="knob-reassign" name="knob" value="reassign"> - <label for="knob-reassign"> - <a href="page.cgi?id=fields.html#assigned_to">ðÅÒÅÄÁÔØ</a> - [% terms.bug_acc %] - </label> - <input name="assigned_to" size="32" - onchange="if ((this.value != '[% bug.assigned_to.login FILTER js FILTER html %]') && - (this.value != '')) { - document.changeform.knob[[% knum %]].checked=true; - }" - value="[% bug.assigned_to.login FILTER html %]"> - <br> - [% IF bug.isunconfirmed && bug.user.canconfirm %] - <input type="checkbox" id="andconfirm" name="andconfirm"> - <label for="andconfirm"> - É ÐÏÄÔ×ÅÒÄÉÔØ [% terms.bug_acc %] (ÉÚÍÅÎÉÔØ ÓÏÓÔÏÑÎÎÉÅ ÎÁ <b>NEW</b>) + [% IF bug.user.canedit %] + <input type="radio" id="knob-reassign" name="knob" value="reassign"> + <label for="knob-reassign"> + <a href="page.cgi?id=fields.html#assigned_to">ðÅÒÅÄÁÔØ</a> + [% terms.bug %] </label> + [% safe_assigned_to = FILTER js; bug.assigned_to.login; END %] + [% INCLUDE global/userselect.html.tmpl + name => "assigned_to" + value => bug.assigned_to.login + size => 32 + onchange => "if ((this.value != '$safe_assigned_to') && (this.value != '')) { + document.changeform.knob[$knum].checked=true; + }" + %] <br> - [% END %] - [% knum = knum + 1 %] + [% IF bug.isunconfirmed && bug.user.canconfirm %] + <input type="checkbox" id="andconfirm" name="andconfirm"> + <label for="andconfirm"> + É ÐÏÄÔ×ÅÒÄÉÔØ [% terms.bug_gen %] (ÕÓÔÁÎÏ×ÉÔØ ÓÏÓÔÏÑÎÉÅ <b>[% status_descs.NEW FILTER html %]</b>) + </label> + <br> + [% END %] + [% knum = knum + 1 %] - <input type="radio" id="knob-reassign-cmp" name="knob" value="reassignbycomponent"> - <label for="knob-reassign-cmp"> - ðÅÒÅÄÁÔØ [% terms.bug_acc %] ÏÔ×ÅÔÓÔ×ÅÎÎÏÍÕ ÚÁ ËÏÍÐÏÎÅÎÔÕ - [% " (É ÉÎÖÅÎÅÒÕ ËÏÎÔÒÏÌÑ ËÁÞÅÓÔ×Á " IF Param('useqacontact') %] - ×ÙÂÒÁÎÎÏÊ ËÏÍÐÏÎÅÎÔÙ) - </label> - <br> - [% IF bug.isunconfirmed && bug.user.canconfirm %] - <input type="checkbox" id="compconfirm" name="compconfirm"> - <label for="compconfirm"> - É ÐÏÄÔ×ÅÒÄÉÔØ [% terms.bug_acc %] (ÉÚÍÅÎÉÔØ ÓÏÓÔÏÑÎÉÅ × <b>NEW</b>) + <input type="radio" id="knob-reassign-cmp" name="knob" value="reassignbycomponent"> + <label for="knob-reassign-cmp"> + ðÅÒÅÄÁÔØ [% terms.bug %] ÉÓÐÏÌÎÉÔÅÌÀ + [% " É ÏÔ×ÅÔÓÔ×ÅÎÎÏÍÕ ÚÁ ÐÒÉÅÍËÕ" IF Param('useqacontact') %] + ÄÁÎÎÏÊ ËÏÍÐÏÎÅÎÔÙ </label> <br> + [% IF bug.isunconfirmed && bug.user.canconfirm %] + <input type="checkbox" id="compconfirm" name="compconfirm"> + <label for="compconfirm"> + É ÐÏÄÔ×ÅÒÄÉÔØ [% terms.bug_gen %] (ÕÓÔÁÎÏ×ÉÔØ ÓÏÓÔÏÑÎÉÅ <b>[% status_descs.NEW FILTER html %]</b>) + </label> + <br> + [% END %] + [% knum = knum + 1 %] [% END %] - [% knum = knum + 1 %] [% ELSE %] [% IF bug.resolution != "MOVED" || (bug.resolution == "MOVED" && bug.user.canmove) %] @@ -141,7 +149,7 @@ [% IF bug.bug_status == "RESOLVED" %] <input type="radio" id="knob-verify" name="knob" value="verify"> <label for="knob-verify"> - ðÏÄÔ×ÅÒÄÉÔØ ÒÅÚÕÌØÔÁÔ (<b>VERIFIED</b>) + ðÏÄÔ×ÅÒÄÉÔØ ÒÅÚÕÌØÔÁÔ (<b>[% status_descs.VERIFIED FILTER html %]</b>) </label> <br> [% knum = knum + 1 %] @@ -149,7 +157,7 @@ [% IF bug.bug_status != "CLOSED" %] <input type="radio" id="knob-close" name="knob" value="close"> <label for="knob-close"> - úÁËÒÙÔØ ÔÅÍÕ (<b>CLOSED</b>) + úÁËÒÙÔØ [% terms.bug_gen %] (<b>[% status_descs.CLOSED FILTER html %]</b>) </label> <br> [% knum = knum + 1 %] @@ -162,9 +170,14 @@ <p> <font size="+1"> <b> - <a href="show_activity.cgi?id=[% bug.bug_id %]">éÓÔÏÒÉÑ [% terms.Bug_gen %]</a> + <a href="show_activity.cgi?id=[% bug.bug_id %]">éÓÔÏÒÉÑ [% terms.bug_gen %]</a> | - <a href="long_list.cgi?buglist=[% bug.bug_id %]">÷ÅÒÓÉÑ ÄÌÑ ÐÅÞÁÔÉ</a> + <a href="show_bug.cgi?format=multiple&id=[% bug.bug_id %]">÷ÅÒÓÉÑ ÄÌÑ ÐÅÞÁÔÉ</a> + | + <a href="enter_bug.cgi?cloned_bug_id=[% bug.bug_id %]">òÁÚÍÎÏÖÉÔØ [% terms.bug_dat %]</a> + + [%# Links to more things users can do with this bug. %] + [% Hook.process("links") %] </b> </font> |
|
From: Vitaly F. <fed...@us...> - 2005-11-01 23:35:44
|
Update of /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/bug/activity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31892/template/ru/default/bug/activity Modified Files: Tag: BUGZILLA-2_20 table.html.tmpl Log Message: Updated to Bugzilla-2.20 Index: table.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/bug/activity/table.html.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -d -r1.3 -r1.3.2.1 --- table.html.tmpl 24 Feb 2005 23:44:12 -0000 1.3 +++ table.html.tmpl 1 Nov 2005 23:35:29 -0000 1.3.2.1 @@ -17,6 +17,7 @@ # Rights Reserved. # # Contributor(s): Gervase Markham <ge...@ge...> + # # Russian translation: Vitaly Fedrushkov <fed...@us...> # Dmitry Pupkov <dp...@mc...> #%] @@ -36,6 +37,7 @@ #%] [% PROCESS global/variables.none.tmpl %] +[% PROCESS "global/field-descs.none.tmpl" %] [% PROCESS bug/time.html.tmpl %] @@ -83,6 +85,10 @@ change.fieldname == 'remaining_time' || change.fieldname == 'work_time' %] [% PROCESS formattimeunit time_unit=change.removed %] + [% ELSIF change.fieldname == 'bug_status' %] + [% status_descs.${change.removed} FILTER html %] + [% ELSIF change.fieldname == 'resolution' %] + [% resolution_descs.${change.removed} FILTER html %] [% ELSE %] [% change.removed FILTER html %] [% END %] @@ -96,6 +102,10 @@ change.fieldname == 'remaining_time' || change.fieldname == 'work_time' %] [% PROCESS formattimeunit time_unit=change.added %] + [% ELSIF change.fieldname == 'bug_status' %] + [% status_descs.${change.added} FILTER html %] + [% ELSIF change.fieldname == 'resolution' %] + [% resolution_descs.${change.added} FILTER html %] [% ELSE %] [% change.added FILTER html %] [% END %] |
|
From: Vitaly F. <fed...@us...> - 2005-11-01 20:00:07
|
Update of /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/account/auth In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14527 Added Files: ldap-error.html.tmpl login-small.html.tmpl Log Message: Updated to Bugzilla-2.20 --- NEW FILE: login-small.html.tmpl --- [%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of # the License at http://www.mozilla.org/MPL/ # # Software distributed under the License is distributed on an "AS # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. # # The Original Code is the Bugzilla Bug Tracking System. # # The Initial Developer of the Original Code is Netscape Communications # Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All # Rights Reserved. # # Contributor(s): Jacob Steenhagen <ja...@bu...> # # Russian translation: Vitaly Fedrushkov <fed...@us...> #%] [% PROCESS global/variables.none.tmpl %] <form name="login" action="[% cgi.script_name FILTER html %]" method="POST"> <table> <tr> <td align="right"><b>ðÏÌØÚÏ×ÁÔÅÌØ:</b></td> <td><input size="20" name="Bugzilla_login"></td> </tr> <tr> <td align="right"><b>ðÁÒÏÌØ:</b></td> <td><input type="password" size="20" name="Bugzilla_password"></td> </tr> [% IF Param('rememberlogin') == 'defaulton' || Param('rememberlogin') == 'defaultoff' %] <tr> <td> </td> <td> <input type="checkbox" name="Bugzilla_remember" value="on" [% "checked" IF Param('rememberlogin') == "defaulton" %]> úÁÐÏÍÎÉÔØ ÒÅÇÉÓÔÒÁÃÉÏÎÎÙÅ ÄÁÎÎÙÅ </td> </tr> [% END %] [% IF Param('loginnetmask') < 32 %] <tr> <td align="right"> <b> îÁ ×ÒÅÍÑ ÜÔÏÇÏ ÓÅÁÎÓÁ ÒÁÚÒÅÛÉÔØ ÒÁÂÏÔÕ<br> ÔÏÌØËÏ Ó ÔÅËÕÝÅÇÏ ÁÄÒÅÓÁ IP: </b> </td> <td> <input type="checkbox" name="Bugzilla_restrictlogin" checked="checked"> (éÓÐÏÌØÚÕÅÔÓÑ ÄÌÑ ÂÏÌØÛÅÊ ÂÅÚÏÐÁÓÎÏÓÔÉ) </td> </tr> [% END %] <tr> <td><input type="submit" name="GoAheadAndLogIn" value="÷ÏÊÔÉ"></td> [%# For now, password change requests only apply to the DB # verification method #%] [% IF has_db != 0 %] <td>[ <a href="index.cgi?GoAheadAndLogIn=1#forgot">óÍÅÎÉÔØ ÐÁÒÏÌØ</a> ]</td> [% END %] </tr> </table> </form> --- NEW FILE: ldap-error.html.tmpl --- [%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of # the License at http://www.mozilla.org/MPL/ # # Software distributed under the License is distributed on an "AS # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. # # The Original Code is the Bugzilla Bug Tracking System. # # The Initial Developer of the Original Code is Netscape Communications # Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All # Rights Reserved. # # Contributor(s): Bradley Baetz <bb...@ac...> # # Russian translation: Vitaly Fedrushkov <fed...@us...> #%] [%# INTERFACE: # auth_err_tag: string. The tag for the error # info: hash. Additional variables which may be used when printing details # of the error. #%] [% PROCESS global/variables.none.tmpl %] [% SWITCH auth_err_tag %] [% CASE "cannot_retreive_attr" %] îÅ ÂÙÌ ÎÁÊÄÅÎ ÕËÁÚÁÎÎÙÊ ÁÔÒÉÂÕÔ LDAP ([% info.attr FILTER html %]). [% CASE "connect_failed" %] ÷Ï ×ÒÅÍÑ ÐÏÐÙÔËÉ ÓÏÅÄÉÎÉÔØÓÑ Ó ÓÅÒ×ÅÒÏÍ LDAP ÐÒÏÉÚÏÛÌÁ ÏÛÉÂËÁ. [% IF info.errstr %] ðÏÄÒÏÂÎÅÅ: <tt>[% info.errstr FILTER html %]</tt>. [% END %] [% CASE "no_userid" %] äÌÑ ×ÁÓ × [% terms.Bugzilla %] ÂÙÌÁ ÓÏÚÄÁÎÁ ÎÏ×ÁÑ ÕÞÅÔÎÁÑ ÚÁÐÉÓØ, ÎÏ ×ÁÛ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ ÎÅ ÂÙÌ ÎÁÊÄÅÎ. [% CASE "server_not_defined" %] îÅ ÕËÁÚÁÎ ÓÅÒ×ÅÒ LDAP ÄÌÑ ×ÙÐÏÌÎÅÎÉÑ ÁÕÔÅÎÔÉÆÉËÁÃÉÉ. [% CASE %] îÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ ×Ï ×ÒÅÍÑ ×ÙÐÏÌÎÅÎÉÑ ÁÕÔÅÎÔÉÆÉËÁÃÉÉ: <tt>[% auth_err_tag FILTER html %]</tt> [% END %] |
Update of /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/search In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13194/template/ru/default/search Modified Files: Tag: BUGZILLA-2_20 boolean-charts.html.tmpl form.html.tmpl knob.html.tmpl search-advanced.html.tmpl search-create-series.html.tmpl search-help.html.tmpl search-report-graph.html.tmpl search-report-table.html.tmpl search-specific.html.tmpl tabs.html.tmpl Removed Files: Tag: BUGZILLA-2_20 search-report-select.html.tmpl search.html.tmpl Log Message: Updated to Bugzilla-2.20 --- search.html.tmpl DELETED --- Index: search-report-graph.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/search/search-report-graph.html.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -d -r1.1 -r1.1.2.1 --- search-report-graph.html.tmpl 20 Apr 2005 14:29:17 -0000 1.1 +++ search-report-graph.html.tmpl 1 Nov 2005 19:54:42 -0000 1.1.2.1 @@ -17,6 +17,8 @@ # Rights Reserved. # # Contributor(s): Gervase Markham <ge...@ge...> + # + # Russian translation: Vitaly Fedrushkov <fed...@us...> #%] [%# INTERFACE: @@ -26,16 +28,22 @@ [% PROCESS global/variables.none.tmpl %] +[% js_data = BLOCK %] +var queryform = "reportform" +[% END %] + [% PROCESS global/header.html.tmpl - title = "Generate Graphical Report" - onload = "selectProduct(document.forms['reportform']);chartTypeChanged()" + title = "ðÏÓÔÒÏÅÎÉÅ ÄÉÁÇÒÁÍÍÙ" + onload = "doOnSelectProduct(0); chartTypeChanged()" + javascript = js_data + javascript_urls = [ "js/productform.js" ] %] [% PROCESS "search/search-report-select.html.tmpl" %] <p> - Choose one or more fields as your axes, and then refine your set of - [% terms.bugs %] using the rest of the form. + ÷ÙÂÅÒÉÔÅ ÐÏÌÑ ÄÌÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ × ËÁÞÅÓÔ×Å ÏÓÅÊ ËÏÏÒÄÉÎÁÔ, ÚÁÔÅÍ + ÕÔÏÞÎÉÔÅ ËÒÉÔÅÒÉÉ ×ÙÂÏÒÁ [% terms.bugs %]. </p> <script type="text/javascript"><!-- @@ -55,41 +63,41 @@ // --> </script> -[% button_name = "Generate Report" %] +[% button_name = "ðÏÓÔÒÏÉÔØ" %] <form method="get" action="report.cgi" name="reportform"> <table align="center"> <tr> <td valign="middle"> - <b>Vertical Axis:</b><br> - <noscript><small>(not for pie charts)</small><br></noscript> + <b>÷ÅÒÔÉËÁÌØÎÁÑ ÏÓØ:</b><br> + <noscript><small>(ËÒÏÍÅ ËÒÕÇÏ×ÙÈ ÄÉÁÇÒÁÍÍ)</small><br></noscript> [% PROCESS select name = 'y_axis_field' %]<br> <br> - <b>Plot Data Sets:</b><br> + <b>ïÔÏÂÒÁÖÁÔØ ÎÁÂÏÒÙ ÄÁÎÎÙÈ:</b><br> <input type="radio" name="cumulate" value="0" [% " checked" IF default.cumulate.0 != "1" %]> - Individually<br> + éÎÄÉ×ÉÄÕÁÌØÎÏ<br> <input type="radio" name="cumulate" value="1" [% " checked" IF default.cumulate.0 == "1" %]> - Summed + óÕÍÍÁÒÎÏ </td> <td width="150" height="150"> <table border="1" width="100%" height="100%"> <tr> <td align="center" valign="middle"> - <b>Multiple Images:</b><br> + <b>îÅÓËÏÌØËÏ ÄÉÁÇÒÁÍÍ:</b><br> [% PROCESS select name = 'z_axis_field' %] </td> </tr> </table> </td> <td rowspan="2"> - <b>Format:</b><br> + <b>÷ÉÄ:</b><br> [% chart_formats = [ - { name => "line", description => "Line Graph" }, - { name => "bar", description => "Bar Chart" }, - { name => "pie", description => "Pie Chart" } ] %] + { name => "line", description => "çÒÁÆÉË" }, + { name => "bar", description => "çÉÓÔÏÇÒÁÍÍÁ" }, + { name => "pie", description => "ëÒÕÇÏ×ÁÑ ÄÉÁÇÒÁÍÍÁ" } ] %] [% default.chart_format.0 = default.chart_format.0 || "bar" %] [% FOREACH chart_format = chart_formats %] @@ -106,9 +114,9 @@ <td> </td> <td align="left"> - <b>Horizontal Axis:</b> + <b>çÏÒÉÚÏÎÔÁÌØÎÁÑ ÏÓØ:</b> [% PROCESS select name = 'x_axis_field' %]<br> - <label for="x_labels_vertical"><b>Vertical labels:</b></label> + <label for="x_labels_vertical"><b>ðÏÄÐÉÓÉ ×ÅÒÔÉËÁÌØÎÏ:</b></label> <input type="checkbox" name="x_labels_vertical" id="x_labels_vertical" value="1" [% " checked" IF default.x_labels_vertical.0 == "1" %]> Index: tabs.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/search/tabs.html.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -d -r1.2 -r1.2.2.1 --- tabs.html.tmpl 2 May 2005 03:28:40 -0000 1.2 +++ tabs.html.tmpl 1 Nov 2005 19:54:42 -0000 1.2.2.1 @@ -18,6 +18,7 @@ # # Contributor(s): Gervase Markham <ge...@ge...> # Myk Melez <my...@mo...> + # # Russian translation: Dmitry Pupkov <dp...@mc...> #%] Index: search-help.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/search/search-help.html.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -d -r1.2 -r1.2.2.1 --- search-help.html.tmpl 2 May 2005 03:29:13 -0000 1.2 +++ search-help.html.tmpl 1 Nov 2005 19:54:42 -0000 1.2.2.1 @@ -26,16 +26,22 @@ html => "òÅÖÉÍ ÐÏÉÓËÁ ÐÏ ÁÎÎÏÔÁÃÉÉ" }, { id => "short_desc", html => "áÎÎÏÔÁÃÉÑ $terms.bug_gen -- ËÒÁÔËÏÅ ÏÐÉÓÁÎÉÅ ÓÏÄÅÒÖÁÎÉÑ $terms.bug_gen" }, +{ id => "classification", + html => "$terms.Bugs ÏÔÎÏÓÑÔÓÑ Ë òÁÚÄÅÌÁÍ, ðÒÏÄÕËÔÁÍ É ÉÈ ëÏÍÐÏÎÅÎÔÁÍ.<br> + òÁÚÄÅÌÙ -- ÐÅÒ×ÙÊ ÕÒÏ×ÅÎØ ÄÅÌÅÎÉÑ." }, { id => "product", - html => "$terms.Bugs ÒÁÚÄÅÌÅÎÙ ÎÁ ËÁÔÅÇÏÒÉÉ ÐÏ ðÒÏÄÕËÔÁÍ É ÉÈ ëÏÍÐÏÎÅÎÔÁÍ.<br> + html => Param('useclassification') ? + "$terms.Bugs ÒÁÚÄÅÌÅÎÙ ÎÁ ËÁÔÅÇÏÒÉÉ ÐÏ ðÒÏÄÕËÔÁÍ É ÉÈ ëÏÍÐÏÎÅÎÔÁÍ.<br> + ÷ÙÂÅÒÉÔÅ òÁÚÄÅÌ ÄÌÑ ÓÕÖÅÎÉÑ ÓÐÉÓËÁ ÐÒÏÄÕËÔÏ×." : + "$terms.Bugs ÒÁÚÄÅÌÅÎÙ ÎÁ ËÁÔÅÇÏÒÉÉ ÐÏ ðÒÏÄÕËÔÁÍ É ÉÈ ëÏÍÐÏÎÅÎÔÁÍ.<br> ðÒÏÄÕËÔÙ -- ÐÅÒ×ÙÊ ÕÒÏ×ÅÎØ ÄÅÌÅÎÉÑ." }, { id => "component", html => "ëÏÍÐÏÎÅÎÔÙ -- ËÁÔÅÇÏÒÉÉ ×ÔÏÒÏÇÏ ÕÒÏ×ÎÑ; ËÁÖÄÁÑ ÐÒÉÎÁÄÌÅÖÉÔ ÏÐÒÅÄÅÌÅÎÎÏÍÕ ÐÒÏÄÕËÔÕ.<br> ÷ÙÂÅÒÉÔÅ ÐÒÏÄÕËÔ ÄÌÑ ÓÕÖÅÎÉÑ ÓÐÉÓËÁ ËÏÍÐÏÎÅÎÔÏ×." }, { id => "version", - html => "ðÏÌÅ ÷ÅÒÓÉÑ ÏÐÒÅÄÅÌÑÅÔ ×ÅÒÓÉÀ ÐÒÏÇÒÁÍÍÙ, Ë ËÏÔÏÒÏÊ ÏÔÎÏÓÉÔÓÑ $terms.bug" }, + html => "ðÏÌÅ ÷ÅÒÓÉÑ ÏÐÒÅÄÅÌÑÅÔ ×ÅÒÓÉÀ ÐÒÏÄÕËÔÁ, Ë ËÏÔÏÒÏÊ ÏÔÎÏÓÉÔÓÑ $terms.bug" }, { id => "target_milestone", - html => "ðÏÌÅ \"ðÌÁÎÉÒÕÅÔÓÑ Ë\" ÏÐÒÅÄÅÌÑÅÔ ËÏÇÄÁ ÏÔ×ÅÔÓÔ×ÅÎÎÙÊ <br> + html => "ðÏÌÅ \"úÁÐÌÁÎÉÒÏ×ÁÎÏ\" ÏÐÒÅÄÅÌÑÅÔ ËÏÇÄÁ ÉÓÐÏÌÎÉÔÅÌØ <br> ÚÁ $terms.bug_acc ÒÁÓÓÞÉÔÙ×ÁÅÔ ÒÅÛÉÔØ ÐÒÏÂÌÅÍÕ." }, { id => "long_desc", html => "ðÏÌØÚÏ×ÁÔÅÌÉ $terms.Bugzilla ÄÏÂÁ×ÌÑÀÔ Ë $terms.bugs_dat Ó×ÏÉ ÐÒÉÍÅÞÁÎÉÑ.<br> @@ -61,11 +67,11 @@ html => "$terms.Bug ÍÏÖÅÔ ÂÙÔØ × ÌÀÂÏÍ ÉÚ ÏÐÒÅÄÅÌÅÎÎÙÈ ÓÏÓÔÏÑÎÉÊ." }, { id => "resolution", html => "åÓÌÉ $terms.bug × ÚÁ×ÅÒÛÅÎÎÏÍ ÓÏÓÔÏÑÎÉÉ,<br> - $terms.bug_dat ÐÒÉÓ×ÏÅÎ ÎÅËÏÔÏÒÙÊ ×ÉÄ ÒÅÛÅÎÉÑ." }, + $terms.bug_dat ÐÒÉÓ×ÏÅÎ ÎÅËÏÔÏÒÙÊ ÒÅÚÕÌØÔÁÔ." }, { id => "bug_severity", html => "óÔÅÐÅÎØ ÓÅÒØÅÚÎÏÓÔÉ $terms.bug_gen ." }, { id => "priority", - html => "ðÒÉÏÒÉÔÅÔ, ÎÁÚÎÁÞÅÎÎÙÊ $terms.bug_dat ÏÔ×ÅÔÓÔ×ÅÎÎÙÍ." }, + html => "ðÒÉÏÒÉÔÅÔ, ÎÁÚÎÁÞÅÎÎÙÊ $terms.bug_dat ÉÓÐÏÌÎÉÔÅÌÅÍ." }, { id => "rep_platform", html => "áÐÐÁÒÁÔÎÁÑ ÐÌÁÔÆÏÒÍÁ, Ë ËÏÔÏÒÏÊ ÏÔÎÏÓÉÔÓÑ $terms.bug ." }, { id => "op_sys", Index: boolean-charts.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/search/boolean-charts.html.tmpl,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -d -r1.4 -r1.4.2.1 --- boolean-charts.html.tmpl 2 May 2005 03:15:01 -0000 1.4 +++ boolean-charts.html.tmpl 1 Nov 2005 19:54:42 -0000 1.4.2.1 @@ -17,6 +17,7 @@ # Rights Reserved. # # Contributor(s): Gervase Markham <ge...@ge...> + # # Russian translation: Vitaly Fedrushkov <fed...@us...> # Dmitry Pupkov <dp...@mc...> #%] @@ -29,8 +30,9 @@ { name => "substring", description => "ÓÏÄÅÒÖÉÔ ÔÅËÓÔ × ÌÀÂÏÍ ÒÅÇÉÓÔÒÅ" }, { name => "casesubstring", description => "ÓÏÄÅÒÖÉÔ ÔÅËÓÔ × ÔÏÞÎÏÓÔÉ" }, { name => "notsubstring", description => "ÎÅ ÓÏÄÅÒÖÉÔ ÔÅËÓÔÁ" }, - { name => "allwordssubstr", description => "ÓÏÄÅÒÖÉÔ ×ÓÅ ÓÌÏ×Á (ÓÔÒÏËÉ)" }, { name => "anywordssubstr", description => "ÓÏÄÅÒÖÉÔ ÌÀÂÏÅ ÉÚ ÓÌÏ× (ÓÔÒÏË)" }, + { name => "allwordssubstr", description => "ÓÏÄÅÒÖÉÔ ×ÓÅ ÓÌÏ×Á (ÓÔÒÏËÉ)" }, + { name => "nowordssubstr", description => "ÎÅ ÓÏÄÅÒÖÉÔ ÎÉ ÏÄÎÏÇÏ ÉÚ ÓÌÏ×" }, { name => "regexp", description => "ÓÏÏÔ×ÅÓÔ×ÕÅÔ ÍÁÓËÅ" }, { name => "notregexp", description => "ÎÅ ÓÏÏÔ×ÅÓÔ×ÕÅÔ ÍÁÓËÅ" }, { name => "lessthan", description => "ÍÅÎØÛÅ ÞÅÍ" }, @@ -42,7 +44,7 @@ { name => "changedafter", description => "ÉÚÍÅÎÅÎÏ ÐÏÓÌÅ" }, { name => "changedfrom", description => "ÉÚÍÅÎÅÎÏ Ó" }, { name => "changedto", description => "ÉÚÍÅÎÅÎÏ ÎÁ" }, - { name => "changedby", description => "ÉÚÍÅÎÅÎÏ Á×ÔÏÒÏÍ" }, + { name => "changedby", description => "ÉÚÍÅÎÅÎÏ ÐÏÌØÚÏ×ÁÔÅÌÅÍ" }, { name => "matches", description => "ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ ÒÅÇÕÌÑÒÎÏÍÕ ×ÙÒÁÖÅÎÉÀ" } ] %] <p> @@ -58,7 +60,17 @@ [% FOREACH chart = default.charts %] [% chartnum = loop.count - 1 %] <table> - [% FOREACH row = chart %] + <tr> + <td> + <input type="checkbox" id="negate[% chartnum FILTER html %]" + name="negate[% chartnum FILTER html %]" value="1" + [% "checked" IF chart.negate %]> + <label for="negate[% chartnum FILTER html %]"> + ëÒÏÍÅ (ÉÓËÌÀÞÉÔØ ÐÏ ÜÔÏÍÕ ÕÓÌÏ×ÉÀ) + </label> + </td> + </tr> + [% FOREACH row = chart.rows %] [% rownum = loop.count - 1 %] <tr> [% FOREACH col = row %] Index: search-advanced.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/search/search-advanced.html.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -d -r1.2 -r1.2.2.1 --- search-advanced.html.tmpl 2 May 2005 03:37:24 -0000 1.2 +++ search-advanced.html.tmpl 1 Nov 2005 19:54:42 -0000 1.2.2.1 @@ -32,17 +32,26 @@ [% USE Bugzilla %] [% cgi = Bugzilla.cgi %] + +[% js_data = BLOCK %] +var queryform = "queryform" +[% END %] + [% PROCESS global/header.html.tmpl title = "ðÏÉÓË $terms.bugs_gen" h1 = "" - onload = "selectProduct(document.forms['queryform']);initHelp();" + onload = "doOnSelectProduct(0); initHelp();" + javascript = js_data + javascript_urls = [ "js/productform.js" ] style = "td.selected_tab { border-width: 2px 2px 0px; border-style: solid; + border-color: black; } td.unselected_tab, td.spacer { border-width: 0px 0px 2px 0px; border-style: solid; + border-color: black; } dl.bug_changes dt { margin-top: 15px; Index: search-create-series.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/search/search-create-series.html.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -d -r1.1 -r1.1.2.1 --- search-create-series.html.tmpl 20 Apr 2005 14:29:17 -0000 1.1 +++ search-create-series.html.tmpl 1 Nov 2005 19:54:42 -0000 1.1.2.1 @@ -27,9 +27,15 @@ [% PROCESS global/variables.none.tmpl %] +[% js_data = BLOCK %] + var queryform = "chartform"; +[% END %] + [% PROCESS global/header.html.tmpl title = "Create New Data Set" onload = "selectProduct(document.forms['chartform']);" + javascript = js_data + javascript_urls = [ "js/productform.js" ] %] <form method="get" action="chart.cgi" name="chartform"> @@ -47,7 +53,7 @@ button_name = "Create Data Set" %] <input type="hidden" name="action" value="create"> -<script language="JavaScript" type="text/javascript"> +<script type="text/javascript"> document.chartform.category[0].selected = true; catSelected(); checkNewState(); Index: search-specific.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/search/search-specific.html.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -d -r1.2 -r1.2.2.1 --- search-specific.html.tmpl 3 May 2005 11:42:04 -0000 1.2 +++ search-specific.html.tmpl 1 Nov 2005 19:54:42 -0000 1.2.2.1 @@ -17,13 +17,14 @@ # Rights Reserved. # # Contributor(s): Myk Melez <my...@mo...> + # # Russian translation: Dmitry Pupkov <dp...@mc...> #%] [% PROCESS global/variables.none.tmpl %] [% PROCESS global/header.html.tmpl - title = "ðÏÉÓË ËÏÎËÒÅÔÎÏÊ ÐÒÏÂÌÅÍÙ" + title = "ðÏÉÓË "_ terms.bug_gen h1 = "" style = "td.selected_tab { border-width: 2px 2px 0px; @@ -37,24 +38,16 @@ [% PROCESS search/tabs.html.tmpl %] -<p> -ðÏÉÓË ËÏÎËÒÅÔÎÏÊ [% terms.bug_gen %] ÐÏ ÓÌÏ×ÁÍ, ËÏÔÏÒÙÅ ÅÅ ÏÐÉÓÙ×ÁÀÔ. -[% terms.Bugzilla %] ÂÕÄÅÔ ÉÓËÁÔØ [% terms.bugs %], × ÏÐÉÓÁÎÉÑÈ É ËÏÍÍÅÎÔÁÒÉÑÈ -Ë ËÏÔÏÒÙÍ ×ÓÔÒÅÞÁÅÔÓÑ ÄÁÎÎÙÅ ÓÌÏ×Á. óÏÒÔÉÒÏ×ËÁ ÂÕÄÅÔ ÐÒÏÉÚ×ÅÄÅÎÁ ÐÏ ÒÅÌÅ×ÁÎÔÎÏÓÔÉ. - -<!-- Find a specific [% terms.bug %] by entering words that describe it. -[% terms.Bugzilla %] will search [% terms.bug %] descriptions and comments -for those words and return a list of matching [% terms.bugs %] sorted -by relevance. --> +<p> +ðÏÉÓË ËÏÎËÒÅÔÎÏÊ [% terms.bug_gen %] ÐÏ ÈÁÒÁËÔÅÒÎÙÍ ÓÌÏ×ÁÍ. +[% terms.Bugzilla %] ÂÕÄÅÔ ÉÓËÁÔØ [% terms.bugs %], × ÏÐÉÓÁÎÉÑÈ É +ËÏÍÍÅÎÔÁÒÉÑÈ ËÏÔÏÒÙÈ ×ÓÔÒÅÞÁÅÔÓÑ ÄÁÎÎÙÅ ÓÌÏ×Á. óÏÒÔÉÒÏ×ËÁ ÂÕÄÅÔ +ÐÒÏÉÚ×ÅÄÅÎÁ ÐÏ ÓÔÅÐÅÎÉ ÓÏÏÔ×ÅÔÓÔ×ÉÑ. </p> <p> - -îÁÐÒÉÍÅÒ, ÅÓÌÉ [% terms.bug %] ËÏÔÏÒÕÀ ×Ù ÉÝÅÔÅ - ÐÁÄÅÎÉÅ ÂÒÁÕÚÅÒÁ ÐÒÉ ÄÏÓÔÕÐÅ Ë -ÚÁÝÉÝÅÎÎÏÊ ÓÔÒÁÎÉÃÅ Ó Flash-ÁÎÉÍÁÃÉÅÊ, ×Ù ÍÏÖÅÔÅ ÉÓËÁÔØ "ÂÒÁÕÚÅÒ flash SSL". -<!-- -For example, if the [% terms.bug %] you are looking for is a browser crash when you go to a secure web site with an embedded Flash animation, you might search -for "crash secure SSL flash". --> +îÁÐÒÉÍÅÒ, ÄÌÑ ÐÏÉÓËÁ ÉÎÆÏÒÍÁÃÉÉ Ï Á×ÁÒÉÉ ÂÒÏÕÚÅÒÁ ÐÒÉ ÄÏÓÔÕÐÅ Ë +ÚÁÝÉÝÅÎÎÏÊ ÓÔÒÁÎÉÃÅ Ó Flash-ÁÎÉÍÁÃÉÅÊ, ××ÅÄÉÔÅ "ÂÒÏÕÚÅÒ flash SSL". </p> <form name="queryform" method="get" action="buglist.cgi"> @@ -64,21 +57,20 @@ <table> <tr> <td align="right" valign="baseline"> - <b><label for="bug_status">óÔÁÔÕÓ:</label></b> + <b><label for="bug_status">óÏÓÔÏÑÎÉÅ:</label></b> </td> <td> <select name="bug_status" id="bug_status"> -<!-- [% FOREACH s = ['open', 'closed', 'all'] %] - <option value="__[% s %]__" - [% " selected" IF default.bug_status.0 == "__${s}__" %]> - [% s %] + [% statuses = [ { name = 'open', label = "ïÔËÒÙÔÙÅ" }, + { name = 'closed', label = "úÁ×ÅÒÛÅÎÎÙÅ" }, + { name = 'all', label = "÷ÓÅ" } ] %] + [% FOREACH status = statuses %] + <option value="__[% status.name %]__" + [% " selected" IF default.bug_status.0 == "__${status.name}__" %]> + [% status.label FILTER html %] </option> - [% END %] --> - <option value="__open__">ÏÔËÒÙÔÙÅ</option> - <option value="__closed__">ÚÁËÒÙÔÙÅ</option> - <option value="__all__">×ÓÅ</option> - </select> - + [% END %] + </select> </td> </tr> <tr> @@ -88,10 +80,24 @@ <td> <select name="product" id="product"> <option value="">÷ÓÅ</option> - [% FOREACH p = product %] - <option value="[% p.name FILTER html %]" - [% " selected" IF lsearch(default.product, p.name) != -1 %]> - [% p.name FILTER html %]</option> + [% IF Param('useclassification') %] + [% FOREACH c = classification %] + <optgroup label="[% c.name FILTER html %]"> + [% FOREACH p = c.products %] + <option value="[% p FILTER html %]" + [% " selected" IF lsearch(default.product, p) != -1 %]> + [% p FILTER html %] + </option> + [% END %] + </optgroup> + [% END %] + [% ELSE %] + [% FOREACH p = product %] + <option value="[% p.name FILTER html %]" + [% " selected" IF lsearch(default.product, p.name) != -1 %]> + [% p.name FILTER html %] + </option> + [% END %] [% END %] </select> </td> @@ -103,7 +109,7 @@ <td> <input name="content" size="40" id="content" value="[% default.content.0 FILTER html %]"> - <script language="JavaScript" type="text/javascript"> <!-- + <script type="text/javascript"> <!-- document.forms['queryform'].content.focus(); // --> </script> @@ -113,10 +119,6 @@ <td></td> <td> <input type="submit" value="Search"> - [% IF known_name %] - <input type="hidden" name="query_based_on" - value="[% known_name FILTER html %]"> - [% END %] </td> </tr> </table> Index: search-report-table.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/search/search-report-table.html.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -d -r1.1 -r1.1.2.1 --- search-report-table.html.tmpl 20 Apr 2005 14:29:17 -0000 1.1 +++ search-report-table.html.tmpl 1 Nov 2005 19:54:42 -0000 1.1.2.1 @@ -17,6 +17,8 @@ # Rights Reserved. # # Contributor(s): Gervase Markham <ge...@ge...> + # + # Russian translation: Vitaly Fedrushkov <fed...@us...> #%] [%# INTERFACE: @@ -26,19 +28,25 @@ [% PROCESS global/variables.none.tmpl %] +[% js_data = BLOCK %] +var queryform = "reportform" +[% END %] + [% PROCESS global/header.html.tmpl - title = "Generate Tabular Report" - onload = "selectProduct(document.forms['reportform']);" + title = "æÏÒÍÉÒÏ×ÁÎÉÅ ÏÔÞÅÔÁ" + onload = "doOnSelectProduct(0)" + javascript = js_data + javascript_urls = [ "js/productform.js" ] %] [% PROCESS "search/search-report-select.html.tmpl" %] <p> - Choose one or more fields as your axes, and then refine your set of - [% terms.bugs %] using the rest of the form. + ÷ÙÂÅÒÉÔÅ ÐÏÌÑ ÄÌÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ × ËÁÞÅÓÔ×Å ÓÔÒÏË É ËÏÌÏÎÏË ÔÁÂÌÉÃÙ, + ÚÁÔÅÍ ÕÔÏÞÎÉÔÅ ËÒÉÔÅÒÉÉ ×ÙÂÏÒÁ [% terms.bugs %]. </p> -[% button_name = "Generate Report" %] +[% button_name = "óÆÏÒÍÉÒÏ×ÁÔØ ÏÔÞÅÔ" %] <form method="get" action="report.cgi" name="reportform"> @@ -47,21 +55,21 @@ <td> </td> <td align="center"> - <b>Horizontal Axis:</b> + <b>ëÏÌÏÎËÉ:</b> [% PROCESS select name = 'x_axis_field' %] </td> </tr> <tr> <td valign="middle" align="center"> - <b>Vertical Axis:</b><br> + <b>óÔÒÏËÉ:</b><br> [% PROCESS select name = 'y_axis_field' %] </td> <td width="150" height="150"> <table border="1" width="100%" height="100%"> <tr> <td align="center" valign="middle"> - <b>Multiple Tables:</b><br> + <b>óÔÒÁÎÉÃÙ:</b><br> [% PROCESS select name = 'z_axis_field' %] </td> </tr> Index: form.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/search/form.html.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -d -r1.3 -r1.3.2.1 --- form.html.tmpl 3 Mar 2005 06:44:19 -0000 1.3 +++ form.html.tmpl 1 Nov 2005 19:54:42 -0000 1.3.2.1 @@ -24,27 +24,40 @@ # Ilya Shevchik <il...@us...> #%] -[% PROCESS global/variables.none.tmpl %] - - [%# Note: use Template comments and not JS ones here, to avoid bloating - what we actually send to the browser %] - -<script language="JavaScript" type="text/javascript"> <!-- +<script type="text/javascript"> var first_load = true; [%# is this the first time we load the page? %] var last_sel = new Array(); [%# caches last selection %] +[% IF Param('useclassification') %] +var useclassification = true; +var prods = new Array(); +[% ELSE %] +var useclassification = false; +[% END %] var cpts = new Array(); var vers = new Array(); [% IF Param('usetargetmilestone') %] var tms = new Array(); [% END %] +[%# Create an array of products, indexed by the classification #%] + +[% nclass = 0 %] +[% FOREACH c = classification %] + prods[[% nclass FILTER js %]] = [ + [%- FOREACH item = c.products %]'[% item FILTER js %]'[% ", " UNLESS loop.last %] [%- END -%] ]; + [% nclass = nclass+1 %] +[% END %] + [%# Create three arrays of components, versions and target milestones, indexed # numerically according to the product they refer to. #%] [% n = 0 %] [% FOREACH p = product %] + [% IF Param('useclassification') %] + prods['[% p.name FILTER js %]'] = [% n %] + [% END %] cpts[[% n %]] = [ [%- FOREACH item = p.components %]'[% item FILTER js %]'[% ", " UNLESS loop.last %] [%- END -%] ]; vers[[% n %]] = [ @@ -56,271 +69,37 @@ [% n = n+1 %] [% END %] -[%# updateSelect(array, sel, target, merging) - # - # Adds to the target select object all elements in array that - # correspond to the elements selected in source. - # - array should be a array of arrays, indexed by number. the - # array should contain the elements that correspond to that - # product. - # - sel is a list of selected items, either whole or a diff - # depending on merging. - # - target should be the target select object. - # - merging (boolean) determines if we are mergine in a diff or - # substituting the whole selection. a diff is used to optimize adding - # selections. - # - # Example (compsel is a select form control) - # - # var components = Array(); - # components[1] = [ 'ComponentA', 'ComponentB' ]; - # components[2] = [ 'ComponentC', 'ComponentD' ]; - # source = [ 2 ]; - # updateSelect(components, source, compsel, 0, 0); - # - # would clear compsel and add 'ComponentC' and 'ComponentD' to it. - # - %] - -function updateSelect(array, sel, target, merging) { - - var i, item; - - [%# If we have no versions/components/milestones %] - if (array.length < 1) { - target.options.length = 0; - return false; - } - - if (merging) { - [%# array merging/sorting in the case of multiple selections %] - [%# merge in the current options with the first selection %] - item = merge_arrays(array[sel[0]], target.options, 1); - - [%# merge the rest of the selection with the results %] - for (i = 1 ; i < sel.length ; i++) { - item = merge_arrays(array[sel[i]], item, 0); - } - } else if ( sel.length > 1 ) { - [%# here we micro-optimize for two arrays to avoid merging with a - null array %] - item = merge_arrays(array[sel[0]],array[sel[1]], 0); - - [%# merge the arrays. not very good for multiple selections. %] - for (i = 2; i < sel.length; i++) { - item = merge_arrays(item, array[sel[i]], 0); - } - } else { [%# single item in selection, just get me the list %] - item = array[sel[0]]; - } - - [%# clear select %] - target.options.length = 0; - - [%# load elements of list into select %] - for (i = 0; i < item.length; i++) { - target.options[i] = new Option(item[i], item[i]); - } - return true; -} - -[%# Returns elements in a that are not in b. - # NOT A REAL DIFF: does not check the reverse. - # - a,b: arrays of values to be compare. %] -function fake_diff_array(a, b) { - var newsel = new Array(); - var found = false; - - [%# do a boring array diff to see who's new %] - for (var ia in a) { - for (var ib in b) { - if (a[ia] == b[ib]) { - found = true; - } - } - if (!found) { - newsel[newsel.length] = a[ia]; - } - found = false; - } - return newsel; -} - -[%# takes two arrays and sorts them by string, returning a new, sorted - # array. the merge removes dupes, too. - # - a, b: arrays to be merge. - # - b_is_select: if true, then b is actually an optionitem and as - # such we need to use item.value on it. %] -function merge_arrays(a, b, b_is_select) { - var pos_a = 0; - var pos_b = 0; - var ret = new Array(); - var bitem, aitem; - - [%# iterate through both arrays and add the larger item to the return - list. remove dupes, too. Use toLowerCase to provide - case-insensitivity. %] - while ((pos_a < a.length) && (pos_b < b.length)) { - if (b_is_select) { - bitem = b[pos_b].value; - } else { - bitem = b[pos_b]; - } - aitem = a[pos_a]; - - [%# smaller item in list a %] - if (aitem.toLowerCase() < bitem.toLowerCase()) { - ret[ret.length] = aitem; - pos_a++; +/* + * doOnSelectProduct determines which selection should get updated + * + * - selectmode = 0 - init + * selectmode = 1 - classification selected + * selectmode = 2 - product selected + * + * globals: + * queryform - string holding the name of the selection form + */ +function doOnSelectProduct(selectmode) { + var f = document.forms[queryform]; + milestone = (typeof(f.target_milestone) == "undefined" ? + null : f.target_milestone); + if (selectmode == 0) { + if (useclassification) { + selectClassification(f.classification, f.product, f.component, f.version, milestone); } else { - [%# smaller item in list b %] - if (aitem.toLowerCase() > bitem.toLowerCase()) { - ret[ret.length] = bitem; - pos_b++; - } else { - [%# list contents are equal, inc both counters. %] - ret[ret.length] = aitem; - pos_a++; - pos_b++; - } - } - } - - [%# catch leftovers here. these sections are ugly code-copying. %] - if (pos_a < a.length) { - for (; pos_a < a.length ; pos_a++) { - ret[ret.length] = a[pos_a]; - } - } - - if (pos_b < b.length) { - for (; pos_b < b.length; pos_b++) { - if (b_is_select) { - bitem = b[pos_b].value; - } else { - bitem = b[pos_b]; - } - ret[ret.length] = bitem; - } - } - return ret; -} - -[%# Returns an array of indexes or values from a select form control. - # - control: select control from which to find selections - # - findall: boolean, store all options when true or just the selected - # indexes - # - want_values: boolean; we store values when true and indexes when - # false %] -function get_selection(control, findall, want_values) { - var ret = new Array(); - - if ((!findall) && (control.selectedIndex == -1)) { - return ret; - } - - for (var i=0; i<control.length; i++) { - if (findall || control.options[i].selected) { - ret[ret.length] = want_values ? control.options[i].value : i; - } - } - return ret; -} - -[%# Selects items in control that have index defined in sel - # - control: SELECT control to be restored - # - selnames: array of indexes in select form control %] -function restoreSelection(control, selnames) { - [%# right. this sucks. but I see no way to avoid going through the - # list and comparing to the contents of the control. %] - for (var j=0; j < selnames.length; j++) { - for (var i=0; i < control.options.length; i++) { - if (control.options[i].value == selnames[j]) { - control.options[i].selected = true; - } + selectProduct(f.product, f.component, f.version, milestone); } + } else if (selectmode == 1) { + selectClassification(f.classification, f.product, f.component, f.version, milestone); + } else { + selectProduct(f.product, f.component, f.version, milestone); } } -[%# selectProduct reads the selection from f.product and updates - # f.version, component and target_milestone accordingly. - # - f: a form containing product, component, varsion and - # target_milestone select boxes. - # globals (3vil!): - # - cpts, vers, tms: array of arrays, indexed by product name. the - # subarrays contain a list of names to be fed to the respective - # selectboxes. For bugzilla, these are generated with perl code - # at page start. - # - first_load: boolean, specifying if it is the first time we load - # the query page. - # - last_sel: saves our last selection list so we know what has - # changed, and optimize for additions. %] -function selectProduct(f) { - [%# this is to avoid handling events that occur before the form - itself is ready, which could happen in buggy browsers. %] - if ((!f) || (!f.product)) { - return; - } - - [%# if this is the first load and nothing is selected, no need to - merge and sort all components; perl gives it to us sorted. %] - if ((first_load) && (f.product.selectedIndex == -1)) { - first_load = false; - return; - } - - [%# turn first_load off. this is tricky, since it seems to be - redundant with the above clause. It's not: if when we first load - the page there is _one_ element selected, it won't fall into that - clause, and first_load will remain 1. Then, if we unselect that - item, selectProduct will be called but the clause will be valid - (since selectedIndex == -1), and we will return - incorrectly - - without merge/sorting. %] - first_load = false; - - [%# - sel keeps the array of products we are selected. - - merging says if it is a full list or just a list of products that - were added to the current selection. %] - var merging = false; - var sel = Array(); - - [%# if nothing selected, pick all %] - var findall = f.product.selectedIndex == -1; - sel = get_selection(f.product, findall, false); - if (!findall) { - [%# save sel for the next invocation of selectProduct() %] - var tmp = sel; - - [%# this is an optimization: if we have just added products to an - existing selection, no need to clear the form controls and add - everybody again; just merge the new ones with the existing - options. %] - if ((last_sel.length > 0) && (last_sel.length < sel.length)) { - sel = fake_diff_array(sel, last_sel); - merging = true; - } - last_sel = tmp; - } - [%# save original options selected %] - var saved_cpts = get_selection(f.component, false, true); - var saved_vers = get_selection(f.version, false, true); - [% IF Param('usetargetmilestone') %] - var saved_tms = get_selection(f.target_milestone, false, true); - [% END %] +</script> - [%# do the actual fill/update, reselect originally selected options %] - updateSelect(cpts, sel, f.component, merging); - restoreSelection(f.component, saved_cpts); - updateSelect(vers, sel, f.version, merging); - restoreSelection(f.version, saved_vers); - [% IF Param('usetargetmilestone') %] - updateSelect(tms, sel, f.target_milestone, merging); - restoreSelection(f.target_milestone, saved_tms); - [% END %] -} -// --> -</script> +[% PROCESS global/variables.none.tmpl %] [% query_variants = [ { value => "allwordssubstr", description => "ÓÏÄÅÒÖÉÔ ×ÓÅ ÓÌÏ×Á (ÓÔÒÏËÉ)" }, @@ -329,8 +108,8 @@ { value => "casesubstring", description => "ÓÏÄÅÒÖÉÔ ÔÅËÓÔ × ÔÏÞÎÏÓÔÉ" }, { value => "allwords", description => "ÓÏÄÅÒÖÉÔ ×ÓÅ ÓÌÏ×Á" }, { value => "anywords", description => "ÓÏÄÅÒÖÉÔ ÌÀÂÏÅ ÉÚ ÓÌÏ×" }, - { value => "regexp", description => "ÓÏÏÔ×ÅÓÔ×ÕÅÔ ÍÁÓËÅ" }, - { value => "notregexp", description => "ÎÅ ÓÏÏÔ×ÅÓÔ×ÕÅÔ ÍÁÓËÅ" } ] %] + { value => "regexp", description => "ÓÏÏÔ×ÅÓÔ×ÕÅÔ ÒÅÇÕÌÑÒÎÏÍÕ ×ÙÒÁÖÅÎÉÀ" }, + { value => "notregexp", description => "ÎÅ ÓÏÏÔ×ÅÓÔ×ÕÅÔ ÒÅÇÕÌÑÒÎÏÍÕ ×ÙÒÁÖÅÎÉÀ" } ] %] [% PROCESS "global/field-descs.none.tmpl" %] @@ -354,8 +133,8 @@ <td> <input name="short_desc" size="40" accesskey="s" value="[% default.short_desc.0 FILTER html %]"> - <script language="JavaScript" type="text/javascript"> <!-- - document.forms['queryform'].short_desc.focus(); + <script type="text/javascript"> <!-- + document.forms[queryform].short_desc.focus(); // --> </script> </td> @@ -366,12 +145,35 @@ </td> </tr> -[%# *** Product Component Version Target *** %] - +[%# *** Classification Product Component Version Target *** %] <tr> <td colspan="4"> <table> <tr> + [% IF Param('useclassification') %] + <td valign="top"> + <table> + <tr valign="bottom"> + <th align="left"><u>òÁÚÄÅÌ:</th> + </tr> + <tr valign="top"> + <td align="left"> + <label for="classification"> + <select name="classification" multiple="multiple" size="5" id="classification" + onchange="doOnSelectProduct(1);"> + [% FOREACH cat = classification %] + <option value="[% cat.name FILTER html %]" + [% " selected" IF lsearch(default.classification, cat.name) != -1 %]> + [% cat.name FILTER html %] + </option> + [% END %] + </select> + </label> + </td> + </tr> + </table> + </td> + [% END %] <td valign="top"> <table> <tr valign="bottom"> @@ -382,7 +184,7 @@ <td align="left"> <label for="product" accesskey="p"> <select name="product" multiple="multiple" size="5" id="product" - onchange="selectProduct(this.form);"> + onchange="doOnSelectProduct(2);"> [% FOREACH p = product %] <option value="[% p.name FILTER html %]" [% " selected" IF lsearch(default.product, p.name) != -1 %]> @@ -435,7 +237,7 @@ <td valign="top"> <table> <tr valign="bottom"> - <th align="left">ðÌÁÎÉÒÕÅÔÓÑ Ë:</th> + <th align="left">úÁÐÌÁÎÉÒÏ×ÁÎÏ:</th> </tr> <tr valign="top"> [% PROCESS select sel = { name => 'target_milestone', @@ -505,6 +307,25 @@ </td> </tr> [% END %] + + [%# Deadline %] + [% IF UserInGroup(Param("timetrackinggroup")) %] + <tr> + <th align="right"> + óÒÏË: + </th> + <td> + Ó + <input name="deadlinefrom" size="10" maxlength="10" accesskey="l"> + ÐÏ + <input name="deadlineto" size="10" maxlength="10"> + </td> + <td> + <small>(çççç-íí-ää)</small> + </td> + </tr> + [% END %] + </table> <hr> @@ -516,7 +337,7 @@ <td> <table> <tr> -<!-- ðÏÚ×ÏÌÉÌ ÓÅÂÅ ÄÏÂÁ×ÉÔØ href'Ù. üÔÏÇÏ × ÁÎÇÌ. ÛÁÂÌÏÎÁÈ ÎÅÔ. --> + [%# ðÏÚ×ÏÌÉÌ ÓÅÂÅ ÄÏÂÁ×ÉÔØ href'Ù. üÔÏÇÏ × ÁÎÇÌ. ÛÁÂÌÏÎÁÈ ÎÅÔ. %] <th align="left"><a href="page.cgi?id=fields.html#status">óÏÓÔÏÑÎÉÅ</a>:</th> </tr> <tr valign="top"> @@ -624,7 +445,7 @@ id="emailassigned_to[% n %]" value="1" [% " checked" IF default.emailassigned_to.$n %]> <label for="emailassigned_to[% n %]"> - ÏÔ×ÅÔÓÔ×ÅÎÎÙÊ + ÉÓÐÏÌÎÉÔÅÌØ </label> </td> </tr> @@ -645,7 +466,7 @@ id="emailqa_contact[% n %]" value="1" [% " checked" IF default.emailqa_contact.$n %]> <label for="emailqa_contact[% n %]"> - ËÏÎÔÒÏÌØ ËÁÞÅÓÔ×Á + ÐÒÉÅÍËÁ </label> </td> </tr> @@ -676,8 +497,8 @@ [% FOREACH qv = [ { name => "substring", description => "ÓÏÄÅÒÖÉÔ" }, { name => "exact", description => "ÒÁ×ÅÎ" }, - { name => "regexp", description => "ÓÏÏÔ×ÅÓÔ×ÕÅÔ ÍÁÓËÅ" }, - { name => "notregexp", description => "ÎÅ ÓÏÏÔ×ÅÓÔ×ÕÅÔ ÍÁÓËÅ" } ] %] + { name => "regexp", description => "ÓÏÏÔ×ÅÓÔ×ÕÅÔ ÒÅÇÕÌÑÒÎÏÍÕ ×ÙÒÁÖÅÎÉÀ" }, + { name => "notregexp", description => "ÎÅ ÓÏÏÔ×ÅÓÔ×ÕÅÔ ÒÅÇÕÌÑÒÎÏÍÕ ×ÙÒÁÖÅÎÉÀ" } ] %] <option value="[% qv.name %]" [% " selected" IF default.emailtype.$n == qv.name %]>[% qv.description %]</option> @@ -779,7 +600,13 @@ [% FOREACH name = ${sel.name} %] <option value="[% name FILTER html %]" [% " selected" IF lsearch(default.${sel.name}, name) != -1 %]> - [% name FILTER html %]</option> + [% IF sel.name == "bug_status" %] + [% status_descs.${name} FILTER html %]</option> + [% ELSIF sel.name == "resolution" %] + [% resolution_descs.${name} FILTER html %]</option> + [% ELSE %] + [% name FILTER html %]</option> + [% END %] [% END %] </select> </label> --- search-report-select.html.tmpl DELETED --- Index: knob.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/search/knob.html.tmpl,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -d -r1.5 -r1.5.2.1 --- knob.html.tmpl 2 May 2005 04:22:09 -0000 1.5 +++ knob.html.tmpl 1 Nov 2005 19:54:42 -0000 1.5.2.1 @@ -15,7 +15,7 @@ # Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All # Rights Reserved. - # + # # Contributor(s): Gervase Markham <ge...@ge...> # Tobias Burnus <bu...@ne...> # Jouni Heikniemi <jo...@he...> @@ -26,11 +26,12 @@ [%# INTERFACE: # (incomplete!) # ... - # known_name: string. Possibly known stored name for the query being + # known_name: string. Possibly known stored name for the query being # edited. This value is just passed through in a # hidden field. #%] - + + [% PROCESS global/variables.none.tmpl %] [%# This is not necessary for English templates, but useful for localisers. %] |
|
From: Vitaly F. <fed...@us...> - 2005-11-01 19:54:51
|
Update of /cvsroot/bugzilla-ru/bugzilla-ru In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13194 Modified Files: Tag: BUGZILLA-2_20 README-ru Log Message: Updated to Bugzilla-2.20 Index: README-ru =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/README-ru,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -u -d -r1.2 -r1.2.4.1 --- README-ru 14 Aug 2003 20:34:48 -0000 1.2 +++ README-ru 1 Nov 2005 19:54:40 -0000 1.2.4.1 @@ -32,6 +32,8 @@ o îÅÒÅÛÅÎÎÙÅ ÐÒÏÂÌÅÍÙ ÌÏËÁÌÉÚÁÃÉÉ × ÛÁÂÌÏÎÁÈ. ïÂÏÚÎÁÞÅÎÙ ËÏÍÍÅÎÔÁÒÉÑÍÉ Ó ËÌÀÞÅ×ÙÍ ÓÌÏ×ÏÍ FIXME-ru. + o îÁÐÉÓÁÔØ ÌÉÎËÉÆÉËÁÔÏÒÙ (ÒÅÇÕÌÑÒÎÙÅ ×ÙÒÁÖÅÎÉÑ ÄÌÑ ÇÉÐÅÒÓÓÙÌÏË). + o éÓÐÙÔÁÔØ ×ÓÅ ÎÁ ÌÏËÁÌÉÚÏ×ÁÎÎÏÊ ×ÅÒÓÉÉ Apache. (http://apache.lexa.ru/) äÏÂÉÔØÓÑ ÈÒÁÎÅÎÉÑ ÄÁÎÎÙÈ × ÂÁÚÅ × ÏÄÎÏÊ ËÏÄÉÒÏ×ËÅ ÎÅÚÁ×ÉÓÉÍÏ ÏÔ ËÌÉÅÎÔÁ. |
|
From: Vitaly F. <fed...@us...> - 2005-11-01 19:54:51
|
Update of /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13194/template/ru/default Modified Files: Tag: BUGZILLA-2_20 filterexceptions.pl index.html.tmpl sidebar.xul.tmpl Log Message: Updated to Bugzilla-2.20 Index: sidebar.xul.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/sidebar.xul.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -d -r1.2 -r1.2.2.1 --- sidebar.xul.tmpl 27 Feb 2005 18:24:57 -0000 1.2 +++ sidebar.xul.tmpl 1 Nov 2005 19:54:40 -0000 1.2.2.1 @@ -29,7 +29,7 @@ <?xml version="1.0"?> <!-- [% template_version %] --> <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> -<?xml-stylesheet href="[% Param('urlbase') %]css/panel.css" type="text/css"?> +<?xml-stylesheet href="[% Param('urlbase') %]skins/standard/panel.css" type="text/css"?> <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml" @@ -74,10 +74,10 @@ <box orient="vertical" flex="1"> <text class="text-link" onclick="load_relative_url('query.cgi')" value="ÐÏÉÓË"/> <text class="text-link" onclick="load_relative_url('report.cgi')" value="ÏÔÞÅÔÙ"/> - <text class="text-link" onclick="load_relative_url('enter_bug.cgi')" value="ÎÏ×ÁÑ [% terms.bug %]"/> + <text class="text-link" onclick="load_relative_url('enter_bug.cgi')" value="ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÔØ [% terms.bug_acc %]"/> <separator class="thin"/> -[% IF user %] +[% IF user.id %] <text class="text-link" onclick="load_relative_url('userprefs.cgi')" value="ÐÁÒÁÍÅÔÒÙ"/> [%- IF user.groups.tweakparams %] <text class="text-link" onclick="load_relative_url('editparams.cgi')" value="ÎÁÓÔÒÏÊËÉ ÓÉÓÔÅÍÙ"/> @@ -97,7 +97,9 @@ [%- IF user.groups.tweakparams %] <text class="text-link" onclick="load_relative_url('sanitycheck.cgi')" value="ÐÒÏ×ÅÒËÁ ÓÉÓÔÅÍÙ"/> [%- END %] + [%- IF user.get_flag('can_logout') %] <text class="text-link" onclick="load_relative_url('relogin.cgi')" value="ÚÁ×ÅÒÛÅÎÉÅ ÓÅÁÎÓÁ [% user.login FILTER html %]"/> + [%- END %] <separator class="thin"/> [%- IF user.showmybugslink %] [% filtered_username = user.login FILTER url_quote %] @@ -113,7 +115,7 @@ [% ELSE %] <text class="text-link" onclick="load_relative_url('createaccount.cgi')" value="ÒÅÇÉÓÔÒÁÃÉÑ"/> - <text class="text-link" onclick="load_relative_url('query.cgi?GoAheadAndLogIn=1')" value="ÎÁÞÁÔØ ÓÅÁÎÓ"/> + <text class="text-link" onclick="load_relative_url('index.cgi?GoAheadAndLogIn=1')" value="ÎÁÞÁÔØ ÓÅÁÎÓ"/> [% END %] </box> Index: filterexceptions.pl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/filterexceptions.pl,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -u -d -r1.1 -r1.1.4.1 --- filterexceptions.pl 14 Aug 2003 20:34:48 -0000 1.1 +++ filterexceptions.pl 1 Nov 2005 19:54:40 -0000 1.1.4.1 @@ -30,39 +30,49 @@ # Values always used for numbers - [% (i|j|k|n|count) %] # Params - [% Param(... # Safe functions - [% (time2str|GetBugLink)... -# Safe vmethods - [% foo.size %] +# Safe vmethods - [% foo.size %] [% foo.length %] +# [% foo.push() %] # TT loop variables - [% loop.count %] # Already-filtered stuff - [% wibble FILTER html %] -# where the filter is one of html|csv|js|url_quote|quoteUrls|time|uri|xml - -# Key: -# -# "#": directive should be filtered, but not doing so is not a security hole -# The plan is to come back and add filtering for all those marked "#" after -# the security release. -# -# "# Email": as above; but noting that it's an email address. -# Other sorts of comments denote cleanups noticed while doing this work; -# they should be fixed in the very short term. +# where the filter is one of html|csv|js|url_quote|quoteUrls|time|uri|xml|none %::safe = ( +'whine/schedule.html.tmpl' => [ + 'event.key', + 'query.id', + 'query.sort', + 'schedule.id', + 'option.0', + 'option.1', +], + +'whine/mail.html.tmpl' => [ + 'bug.bug_id', +], + 'sidebar.xul.tmpl' => [ 'template_version', ], +'flag/list.html.tmpl' => [ + 'flag.id', + 'flag.status', + 'type.id', +], + 'search/boolean-charts.html.tmpl' => [ - '"field${chartnum}-${rownum}-${colnum}"', - '"value${chartnum}-${rownum}-${colnum}"', - '"type${chartnum}-${rownum}-${colnum}"', - 'field.name', - 'field.description', - 'type.name', - 'type.description', - '"${chartnum}-${rownum}-${newor}"', - '"${chartnum}-${newand}-0"', + '"field${chartnum}-${rownum}-${colnum}"', + '"value${chartnum}-${rownum}-${colnum}"', + '"type${chartnum}-${rownum}-${colnum}"', + 'field.name', + 'field.description', + 'type.name', + 'type.description', + '"${chartnum}-${rownum}-${newor}"', + '"${chartnum}-${newand}-0"', 'newchart', - '$jsmagic', # + 'jsmagic', ], 'search/form.html.tmpl' => [ @@ -71,141 +81,235 @@ 'qv.description', 'field.name', 'field.description', + 'field.accesskey', 'sel.name', - 'button_name', # + 'sel.accesskey', ], -'search/knob.html.tmpl' => [ - 'button_name', # +'search/search-specific.html.tmpl' => [ + 'status.name', ], -'reports/components.html.tmpl' => [ - 'numcols', - 'numcols - 1', - 'comp.description', - 'comp.initialowner', # email address - 'comp.initialqacontact', # email address +'search/tabs.html.tmpl' => [ + 'tab.name', + 'tab.description', ], -'reports/duplicates-simple.html.tmpl' => [ - 'title', # +'request/queue.html.tmpl' => [ + 'column_headers.$group_field', + 'column_headers.$column', + 'request.status', + 'request.bug_id', + 'request.attach_id', +], + +'reports/components.html.tmpl' => [ + 'numcols', + 'comp.description', ], 'reports/duplicates-table.html.tmpl' => [ - '"&maxrows=$maxrows" IF maxrows', - '"&changedsince=$changedsince" IF changedsince', - '"&product=$product" IF product', # - '"&format=$format" IF format', # - '"&bug_id=$bug_ids_string&sortvisible=1" IF sortvisible', - 'column.name', + '"&maxrows=$maxrows" IF maxrows', + '"&changedsince=$changedsince" IF changedsince', + '"&bug_id=$bug_ids_string&sortvisible=1" + IF sortvisible', + 'column.name', 'column.description', - 'vis_bug_ids.push(bug.id)', - 'bug.id', - 'bug.count', - 'bug.delta', - 'bug.component', # - 'bug.bug_severity', # - 'bug.op_sys', # - 'bug.target_milestone', # + 'bug.id', + 'bug.count', + 'bug.delta', ], 'reports/duplicates.html.tmpl' => [ - 'bug_ids_string', + 'bug_ids_string', 'maxrows', 'changedsince', 'reverse', ], 'reports/keywords.html.tmpl' => [ - 'keyword.description', - 'keyword.bugcount', + 'keyword.description', + 'keyword.bugcount', +], + +'reports/report-table.csv.tmpl' => [ + 'num_bugs', + 'data.$tbl.$col.$row', + 'colsepchar', +], + +'reports/report-table.html.tmpl' => [ + 'buglistbase', + '"&$tbl_vals" IF tbl_vals', + '"&$col_vals" IF col_vals', + '"&$row_vals" IF row_vals', + 'classes.$row_idx.$col_idx', + 'urlbase', + 'data.$tbl.$col.$row', + 'row_total', + 'col_totals.$col', + 'grand_total', +], + +'reports/report.html.tmpl' => [ + 'imagebase', + 'width', + 'height', + 'imageurl', + 'formaturl', + 'other_format.name', + 'sizeurl', + 'switchbase', + 'format', + 'cumulate', +], + +'reports/duplicates.rdf.tmpl' => [ + 'template_version', + 'bug.id', + 'bug.count', + 'bug.delta', +], + +'reports/chart.html.tmpl' => [ + 'width', + 'height', + 'imageurl', + 'sizeurl', + 'height + 100', + 'height - 100', + 'width + 100', + 'width - 100', +], + +'reports/series-common.html.tmpl' => [ + 'sel.name', + 'sel.accesskey', + '"onchange=\"$sel.onchange\"" IF sel.onchange', +], + +'reports/chart.csv.tmpl' => [ + 'data.$j.$i', + 'colsepchar', +], + +'reports/create-chart.html.tmpl' => [ + 'series.series_id', + 'newidx', +], + +'reports/edit-series.html.tmpl' => [ + 'default.series_id', ], 'list/change-columns.html.tmpl' => [ - 'column', - 'desc.${column}', # + 'column', ], 'list/edit-multiple.html.tmpl' => [ - 'group.bit', + 'group.id', 'group.description', - 'group.description FILTER strike', - 'knum', - 'menuname', - 'selected IF resolution == "FIXED"', # -], - -'list/list-rdf.rdf.tmpl' => [ - 'template_version', - 'bug.id', - 'column', + 'group.description FILTER inactive', + 'knum', + 'menuname', ], 'list/list-simple.html.tmpl' => [ - 'title', + 'title', ], -'list/list.html.tmpl' => [ - 'currenttime', # - 'buglist', - 'bugowners', # email address +'list/list.rdf.tmpl' => [ + 'template_version', + 'bug.bug_id', + 'column', ], 'list/table.html.tmpl' => [ - 'id', - 'splitheader ? 2 : 1', - 'abbrev.$id.title || column.title', # 'tableheader', - 'bug.severity', # - 'bug.priority', # - 'bug.id', + 'bug.bug_id', + 'abbrev.$id.title || field_descs.$id || column.title', ], -'global/choose-product.html.tmpl' => [ - 'target', - 'proddesc.$p', +'list/list.csv.tmpl' => [ + 'bug.bug_id', + 'colsepchar', ], -'global/code-error.html.tmpl' => [ - 'error', +'list/list.js.tmpl' => [ + 'bug.bug_id', ], -'global/footer.html.tmpl' => [ - 'CALL SyncAnyPendingShadowChanges() IF SyncAnyPendingShadowChanges', +'global/help.html.tmpl' => [ + 'h.id', + 'h.html', +], + +'global/banner.html.tmpl' => [ + 'VERSION', +], + +'global/choose-classification.html.tmpl' => [ + 'classdesc.$p', +], + +'global/choose-product.html.tmpl' => [ + 'target', + 'proddesc.$p', ], +# You are not permitted to add any values here. Everything in this file should +# be filtered unless there's an extremely good reason why not, in which case, +# use the "none" dummy filter. +'global/code-error.html.tmpl' => [ +], + 'global/header.html.tmpl' => [ - 'header_html', - 'javascript', - 'style', - 'style_url', - 'bgcolor', + 'javascript', + 'style', 'onload', 'h1', 'h2', - 'message', + 'h3', + 'message', ], -'global/hidden-fields.html.tmpl' => [ - 'mvalue | html | html_linebreak', # Need to eliminate | usage - 'field.value | html | html_linebreak', +'global/messages.html.tmpl' => [ + 'message_tag', + 'series.frequency * 2', ], 'global/select-menu.html.tmpl' => [ 'options', + 'size', ], 'global/useful-links.html.tmpl' => [ - 'user.login', # Email address + 'email', ], +# You are not permitted to add any values here. Everything in this file should +# be filtered unless there's an extremely good reason why not, in which case, +# use the "none" dummy filter. 'global/user-error.html.tmpl' => [ - 'error', # can contain HTML in 2.16.x +], + +'global/confirm-user-match.html.tmpl' => [ + 'script', + 'fields.${field_name}.flag_type.name', +], + +'global/site-navigation.html.tmpl' => [ + 'bug_list.first', + 'bug_list.$prev_bug', + 'bug_list.$next_bug', + 'bug_list.last', + 'bug.bug_id', + 'bug.votes', ], 'bug/comments.html.tmpl' => [ - 'comment.time', - 'quoteUrls(comment.body)', + 'comment.isprivate', + 'comment.when', ], 'bug/dependency-graph.html.tmpl' => [ @@ -216,192 +320,351 @@ ], 'bug/dependency-tree.html.tmpl' => [ - 'hide_resolved ? "Open b" : "B"', 'bugid', 'maxdepth', 'dependson_ids.join(",")', - 'blocked_ids.join(",")', - 'dep_id', - 'hide_resolved ? 0 : 1', - 'hide_resolved ? "Show" : "Hide"', - 'realdepth < 2 || maxdepth == 1 ? "disabled" : ""', - 'hide_resolved', - 'realdepth < 2 ? "disabled" : ""', - 'maxdepth + 1', - 'maxdepth == 0 || maxdepth == realdepth ? "disabled" : ""', - 'realdepth < 2 || ( maxdepth && maxdepth < 2 ) ? "disabled" : ""', + 'blocked_ids.join(",")', + 'dep_id', + 'hide_resolved', + 'maxdepth + 1', 'maxdepth > 0 && maxdepth <= realdepth ? maxdepth : ""', - 'maxdepth == 1 ? 1 + 'maxdepth == 1 ? 1 : ( maxdepth ? maxdepth - 1 : realdepth - 1 )', - 'realdepth < 2 || ! maxdepth || maxdepth >= realdepth ? - "disabled" : ""', ], 'bug/edit.html.tmpl' => [ - 'bug.delta_ts', - 'bug.bug_id', - 'bug.votes', - 'group.bit', - 'group.description', - 'knum', - 'dep.title', - 'dep.fieldname', - 'bug.${dep.fieldname}.join(\', \')', + 'bug.deadline', + 'bug.remaining_time', + 'bug.delta_ts', + 'bug.bug_id', + 'bug.votes', + 'group.bit', + 'group.description', + 'dep.title', + 'dep.fieldname', + 'accesskey', + 'bug.${dep.fieldname}.join(\', \')', 'selname', - 'bug.longdesclength', - 'bug.creation_ts', + 'depbug FILTER bug_link(depbug)', + '"${bug.dup_id}" FILTER bug_link(bug.dup_id)', +], + +'bug/knob.html.tmpl' => [ + 'bug.bug_id', + 'knum', ], 'bug/navigate.html.tmpl' => [ - 'this_bug_idx + 1', - 'bug_list.first', - 'bug_list.last', - 'bug_list.$prev_bug', - 'bug_list.$next_bug', + 'bug_list.first', + 'bug_list.last', + 'bug_list.$prev_bug', + 'bug_list.$next_bug', ], 'bug/show-multiple.html.tmpl' => [ - 'bug.bug_id', - 'bug.component', # - 'attr.description', # + 'bug.bug_id', + 'bug.deadline', +], + +'bug/show.xml.tmpl' => [ + 'VERSION', + 'a.attachid', + 'field', +], + +'bug/summarize-time.html.tmpl' => [ + 'global.grand_total FILTER format("%.2f")', + 'subtotal FILTER format("%.2f")', + 'work_time FILTER format("%.2f")', + 'global.total FILTER format("%.2f")', +], + + +'bug/time.html.tmpl' => [ + 'time_unit FILTER format(\'%.1f\')', + 'time_unit FILTER format(\'%.2f\')', + '(act / (act + rem)) * 100 + FILTER format("%d")', ], 'bug/votes/list-for-bug.html.tmpl' => [ - 'voter.count', - 'total', + 'voter.count', + 'total', ], 'bug/votes/list-for-user.html.tmpl' => [ - 'product.maxperbug', - 'bug.id', - 'bug.count', - 'product.total', - 'product.maxvotes', + 'product.maxperbug', + 'bug.id', + 'bug.count', + 'product.total', + 'product.maxvotes', ], -# h2 = voting_user.name # Email 'bug/process/confirm-duplicate.html.tmpl' => [ - 'original_bug_id', - 'duplicate_bug_id', + 'original_bug_id', + 'duplicate_bug_id', ], 'bug/process/midair.html.tmpl' => [ - 'bug_id', + 'bug_id', ], 'bug/process/next.html.tmpl' => [ - 'next_id', + 'bug.bug_id', ], 'bug/process/results.html.tmpl' => [ - 'title.$type', - 'id', - 'mail', -], - -'bug/process/verify-new-product.html.tmpl' => [ - 'form.product', # + 'title.$type', + 'id', + 'linktext.$type', ], 'bug/create/create.html.tmpl' => [ - 'default.bug_status', # 'g.bit', 'g.description', 'sel.name', 'sel.description', + 'cloned_bug_id' +], + +'bug/create/create-guided.html.tmpl' => [ + 'matches.0', + 'tablecolour', + 'buildid', + 'sel', + 'productstring', ], 'bug/activity/show.html.tmpl' => [ - 'bug_id', + 'bug_id', ], 'bug/activity/table.html.tmpl' => [ - 'operation.who', # Email - 'operation.when', - 'change.attachid', - 'change.field', + 'change.attachid', + 'change.field', ], 'attachment/create.html.tmpl' => [ - 'bugid', - 'attachment.id', + 'bugid', + 'attachment.id', ], 'attachment/created.html.tmpl' => [ - 'attachid', - 'bugid', - 'contenttype', - 'mailresults', + 'attachid', + 'bugid', + 'contenttype', ], 'attachment/edit.html.tmpl' => [ - 'attachid', - 'bugid', - 'def.id', - 'a', + 'attachid', + 'bugid', + 'a', ], 'attachment/list.html.tmpl' => [ - 'attachment.attachid', - 'attachment.date', + 'attachment.attachid', + 'flag.status', 'bugid', ], 'attachment/show-multiple.html.tmpl' => [ - 'a.attachid', - 'a.date', + 'a.attachid', + 'flag.status' ], 'attachment/updated.html.tmpl' => [ + 'attachid', + 'bugid', +], + +'attachment/diff-header.html.tmpl' => [ 'attachid', + 'id', 'bugid', - 'mailresults', + 'oldid', + 'newid', + 'style', + 'javascript', + 'patch.id', ], -'admin/attachstatus/create.html.tmpl' => [ - 'id', +'attachment/diff-file.html.tmpl' => [ + 'lxr_prefix', + 'file.minus_lines', + 'file.plus_lines', + 'bonsai_prefix', + 'section.old_start', + 'section_num' ], -'admin/attachstatus/delete.html.tmpl' => [ - 'attachcount', - 'id', - 'name', +'admin/table.html.tmpl' => [ + 'link_uri', + 'c.content' ], -'admin/attachstatus/edit.html.tmpl' => [ - 'id', - 'sortkey', +'admin/classifications/del.html.tmpl' => [ + 'description', ], -'admin/attachstatus/list.html.tmpl' => [ - 'statusdef.sortkey', - 'statusdef.id', - 'statusdef.attachcount', +'admin/classifications/edit.html.tmpl' => [ + 'description', ], -'account/prefs/account.html.tmpl' => [ - 'login_change_date', # +'admin/classifications/reclassify.html.tmpl' => [ + 'description', +], + +'admin/classifications/select.html.tmpl' => [ + 'cl.description', +], + +'admin/products/groupcontrol/confirm-edit.html.tmpl' => [ + 'group.count', +], + +'admin/products/groupcontrol/edit.html.tmpl' => [ + 'filt_classification', + 'filt_product', + 'group.bugcount', + 'group.id', + 'const.CONTROLMAPNA', + 'const.CONTROLMAPSHOWN', + 'const.CONTROLMAPDEFAULT', + 'const.CONTROLMAPMANDATORY', +], + +'admin/products/list.html.tmpl' => [ + 'classification_url_part', +], + +'admin/products/confirm-delete.html.tmpl' => [ + 'classification_url_part', + 'bug_count', +], + +'admin/products/footer.html.tmpl' => [ + 'classification_url_part', + 'classification_text', +], + +'admin/keywords/edit.html.tmpl' => [ + 'keyword_id', + 'bug_count', +], + +'admin/keywords/confirm-delete.html.tmpl' => [ + 'keyword_id', + 'bug_count', +], + +'admin/flag-type/confirm-delete.html.tmpl' => [ + 'flag_count', + 'flag_type.id', +], + +'admin/flag-type/edit.html.tmpl' => [ + 'action', + 'type.id', + 'type.target_type', + 'type.sortkey || 1', + 'typeLabelLowerPlural', + 'typeLabelLowerSingular', +], + +'admin/flag-type/list.html.tmpl' => [ + 'type.id', + 'type.flag_count', +], + + +'admin/components/confirm-delete.html.tmpl' => [ + 'bug_count' +], + +'admin/components/deleted.html.tmpl' => [ + 'deleted_bug_count' +], + +'admin/users/confirm-delete.html.tmpl' => [ + 'andstring', + 'responsibilityterms.$responsibility', + 'reporter', + 'assignee_or_qa', + 'cc', + 'flags.requestee', + 'flags.setter', + 'longdescs', + 'namedqueries', + 'votes', + 'series', + 'watch.watched', + 'watch.watcher', + 'whine_events', + 'whine_schedules', + 'otheruser.id' +], + +'admin/users/edit.html.tmpl' => [ + 'otheruser.id', + 'group.id', + 'perms.directbless', + 'perms.directmember', +], + +'admin/components/edit.html.tmpl' => [ + 'bug_count' +], + +'admin/components/list.html.tmpl' => [ + 'cgi.query_string' +], + +'admin/components/select-product.html.tmpl' => [ + 'cgi.query_string' +], + +'admin/milestones/confirm-delete.html.tmpl' => [ + 'bug_count' +], + +'admin/milestones/deleted.html.tmpl' => [ + 'bug_count' +], + +'admin/versions/confirm-delete.html.tmpl' => [ + 'bug_count' +], + +'admin/settings/edit.html.tmpl' => [ + 'name', + 'checkbox_name' +], + +'account/login.html.tmpl' => [ + 'target', ], 'account/prefs/email.html.tmpl' => [ - 'watchedusers', # Email - 'useqacontact ? \'5\' : \'4\'', - 'role', - 'reason.name', - 'reason.description', + 'relationship.id', + 'event.id', + 'prefname', ], 'account/prefs/permissions.html.tmpl' => [ - 'bit_description', + 'bit_description.name', + 'bit_description.desc', ], 'account/prefs/prefs.html.tmpl' => [ - 'tab.name', - 'tab.description', - 'changes_saved', - 'current_tab.name', - 'current_tab.description', - 'current_tab.description FILTER lower', + 'tab.name', + 'tab.description', + 'current_tab.name', + 'current_tab.description', +], + +'account/prefs/settings.html.tmpl' => [ + 'name', + 'default_name' ], ); Index: index.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/index.html.tmpl,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -d -r1.5 -r1.5.2.1 --- index.html.tmpl 27 Feb 2005 18:26:11 -0000 1.5 +++ index.html.tmpl 1 Nov 2005 19:54:40 -0000 1.5.2.1 @@ -19,6 +19,7 @@ # # Contributor(s): Terry Weissman <te...@mo...> # Jacob Steenhagen <ja...@bu...> + # Vitaly Harisov <vi...@ra...> # # Russian translation: Vitaly Fedrushkov <fed...@us...> #%] @@ -32,10 +33,11 @@ [% title = BLOCK %] [% terms.Bugzilla %]: ÇÌÁ×ÎÁÑ ÓÔÒÁÎÉÃÁ [% END %] +[% style_urls = [ "skins/standard/index.css" ] %] [% PROCESS global/header.html.tmpl %] -<script type="text/javascript" language="JavaScript"> +<script type="text/javascript"> <!-- function addSidebar() { if ((typeof window.sidebar == "object") && (typeof window.sidebar.addPanel == "function")) @@ -49,52 +51,56 @@ { var rv = window.confirm ("÷ÁÛ ÂÒÏÕÚÅÒ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÎÁÓÔÒÁÉ×ÁÅÍÙÅ ÂÏËÏ×ÙÅ ÐÁÎÅÌÉ. " + "ïÂÎÏ×ÉÔØ ÓÅÊÞÁÓ?"); if (rv) - document.location.href = "http://www.mozilla.org/binaries.html"; + document.location.href = "http://www.mozilla.org/"; } } //--> </script> -<table width="100%"><tr> - <td> +<div id="page-index"> + <div class="intro"></div> + <p>úÄÅÓØ ÓÌÅÄÏ×ÁÌÏ ÂÙ ÎÁÐÉÓÁÔØ ÍÎÏÇÏ ÓÌÏ× Ï ÔÏÍ, ÄÌÑ ÞÅÇÏ ÓÌÕÖÉÔ [% terms.Bugzilla %].</p> - îÁ ÓÁÍÏÍ ÄÅÌÅ ×ÓÅ ÇÏÒÁÚÄÏ ÐÒÏÝÅ: - <p> - <!--<a href="query.cgi">ðÏÉÓË ÏÔÞÅÔÏ× Ï [% terms.bug_loc_pl %]</a><br>--> - <!--ðÏËÁ ÎÅ ×ÉÖÕ ÎÅÏÂÈÏÄÉÍÏÓÔÉ × ÎÏ×ÏÊ variable --> - <a href="query.cgi">ðÏÉÓË ÏÔÞÅÔÏ× Ï [% terms.bugs_obj %]</a><br> - <a href="enter_bug.cgi">÷×ÏÄ ÎÏ×ÏÇÏ ÏÔÞÅÔÁ</a><br> - <a href="report.cgi">óÔÁÔÉÓÔÉÞÅÓËÉÅ ÏÔÞÅÔÙ É ÄÉÁÇÒÁÍÍÙ</a><br> - </p><p> + <p>îÁ ÓÁÍÏÍ ÄÅÌÅ ×ÓÅ ÇÏÒÁÚÄÏ ÐÒÏÝÅ:</p> + <ul> + <li id="query"><a href="query.cgi">îÁÊÔÉ [% terms.bug_acc %] × ÂÁÚÅ ÄÁÎÎÙÈ</a></li> + <li id="enter-bug"><a href="enter_bug.cgi">úÁÒÅÇÉÓÔÒÉÒÏ×ÁÔØ [% terms.bug_acc %]</a></li> + <li id="report"><a href="report.cgi">óÔÁÔÉÓÔÉÞÅÓËÉÅ ÏÔÞÅÔÙ É ÄÉÁÇÒÁÍÍÙ</a></li> [% IF user.id %] - <a href="userprefs.cgi">éÚÍÅÎÉÔØ ÐÁÒÏÌØ ÉÌÉ ÎÁÓÔÒÏÊËÉ</a><br> - <a href="relogin.cgi">úÁ×ÅÒÛÉÔØ ÓÅÁÎÓ [% user.login FILTER html %]</a><br> + <li id="userprefs"><a href="userprefs.cgi">éÚÍÅÎÉÔØ ÐÁÒÏÌØ ÉÌÉ ÎÁÓÔÒÏÊËÉ</a></li> + [% IF user.get_flag('can_logout') %] + <li id="logout"><a href="relogin.cgi">úÁ×ÅÒÛÉÔØ ÓÅÁÎÓ [% user.login FILTER html %]</a></li> + [% END %] [% ELSE %] - <a href="query.cgi?GoAheadAndLogIn=1">îÁÞÁÔØ ÓÅÁÎÓ</a><br> + [% PROCESS "account/auth/login-small.html.tmpl" %] [% IF Param('createemailregexp') %] - <a href="createaccount.cgi">òÅÇÉÓÔÒÁÃÉÑ ÎÏ×ÏÇÏ ÐÏÌØÚÏ×ÁÔÅÌÑ [% terms.Bugzilla %]</a><br> + <li id="account"><a href="createaccount.cgi">òÅÇÉÓÔÒÁÃÉÑ ÎÏ×ÏÇÏ ÐÏÌØÚÏ×ÁÔÅÌÑ [% terms.Bugzilla %]</a></li> [% END %] [% END %] - </p><p> - <a href="javascript:addSidebar()">äÏÂÁ×ÉÔØ ÎÁ ÐÁÎÅÌØ</a> (ôÒÅÂÕÅÔÓÑ Mozilla ÉÌÉ Netscape 6)<br> - </p> - <form name="f" action="show_bug.cgi" method="get" + <li id="sidebar"><a href="javascript:addSidebar()">äÏÂÁ×ÉÔØ ÎÁ ÂÏËÏ×ÕÀ ÐÁÎÅÌØ</a> (ôÒÅÂÕÅÔÓÑ Mozilla Firefox ÉÌÉ Netscape 6)</li> + + [%# List items of links to more things users can do on this installation. %] + [% Hook.process("links") %] + + </ul> + + <form id="show-bug" name="f" action="show_bug.cgi" method="get" onsubmit="QuickSearch(f.id.value); return false;"> - <p> - ÷×ÅÄÉÔÅ ÎÏÍÅÒ [% terms.abug_gen %] ÉÌÉ ÔÅËÓÔ ÄÌÑ ÐÏÉÓËÁ:<br> - <input type="text" name="id"> - <input type="submit" value="îÁÊÔÉ"> - <a href="quicksearch.html">[óÐÒÁ×ËÁ]</a> - </p> + <div> + <p>÷×ÅÄÉÔÅ ÎÏÍÅÒ [% terms.abug_gen %] ÉÌÉ ÔÅËÓÔ ÄÌÑ ÐÏÉÓËÁ:</p> + <input id="text" type="text" name="id"> + <input id="show" type="submit" value="îÁÊÔÉ"> + <a href="quicksearch.html">[óÐÒÁ×ËÁ]</a> + </div> </form> - </td> - <td align="right"><img src="ant.jpg" width="329" height="220" border="2" alt="ant.jpg [8.5k]"></td> -</tr></table> -<script type="text/javascript" language="JavaScript" src="localconfig.js"></script> -<script type="text/javascript" language="JavaScript" src="quicksearch.js"></script> + <div class="outro"></div> +</div> + +<script type="text/javascript" src="localconfig.js"></script> +<script type="text/javascript" src="quicksearch.js"></script> <script type="text/javascript"> <!-- document.forms['f'].id.focus(); |
Update of /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/global In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13194/template/ru/default/global Modified Files: Tag: BUGZILLA-2_20 choose-product.html.tmpl code-error.html.tmpl confirm-user-match.html.tmpl field-descs.none.tmpl messages.html.tmpl site-navigation.html.tmpl useful-links.html.tmpl user-error.html.tmpl variables.none.tmpl Removed Files: Tag: BUGZILLA-2_20 footer.html.tmpl header.html.tmpl help-header.html.tmpl help.html.tmpl hidden-fields.html.tmpl initialize.none.tmpl select-menu.html.tmpl Log Message: Updated to Bugzilla-2.20 Index: messages.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/global/messages.html.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -d -r1.2 -r1.2.2.1 --- messages.html.tmpl 22 Feb 2005 04:43:11 -0000 1.2 +++ messages.html.tmpl 1 Nov 2005 19:54:42 -0000 1.2.2.1 @@ -17,6 +17,7 @@ # Rights Reserved. # # Contributor(s): Gervase Markham <ge...@ge...> + # Max Kanat-Alexander <mk...@bu...> # # Russian translation: Vitaly Fedrushkov <fed...@us...> #%] @@ -27,9 +28,77 @@ [% PROCESS global/variables.none.tmpl %] +[% PROCESS "global/field-descs.none.tmpl" %] + [% message_tag = message %] [% message = BLOCK %] + [% IF message_tag == "account_created" %] + [% title = "õÞÅÔÎÁÑ ÚÁÐÉÓØ $otheruser.login ÓÏÚÄÁÎÁ" %] + îÏ×ÁÑ ÕÞÅÔÎÁÑ ÚÁÐÉÓØ [% otheruser.login FILTER html %] ÓÏÚÄÁÎÁ ÕÓÐÅÛÎÏ. + [% IF groups.size %] + ðÒÏ×ÅÒØÔÅ É ÉÚÍÅÎÉÔÅ ÐÒÉ ÎÅÏÂÈÏÄÉÍÏÓÔÉ ÐÒÉÎÁÄÌÅÖÎÏÓÔØ Ë ÇÒÕÐÐÁÍ. + [% END %] + + [% ELSIF message_tag == "account_updated" %] + [% IF changed_fields.size + + groups_added_to.size + groups_removed_from.size + + groups_granted_rights_to_bless.size + groups_denied_rights_to_bless.size %] + [% title = "õÞÅÔÎÁÑ ÚÁÐÉÓØ $loginold ÉÚÍÅÎÅÎÁ" %] + ÷ÙÐÏÌÎÅÎÙ ÓÌÅÄÕÀÝÉÅ ÉÚÍÅÎÅÎÉÑ ÕÞÅÔÎÏÊ ÚÁÐÉÓÉ + [%+ loginold FILTER html %]: + <ul> + [% FOREACH field = changed_fields %] + <li> + [% IF field == 'login_name' %] + áÄÒÅÓ ÜÌÅËÔÒÏÎÎÏÊ ÐÏÞÔÙ [% otheruser.login FILTER html %]. + [% ELSIF field == 'realname' %] + éÚÍÅÎÅÎÏ ÉÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ. + [% ELSIF field == 'cryptpassword' %] + õÓÔÁÎÏ×ÌÅÎ ÎÏ×ÙÊ ÐÁÒÏÌØ. + [% ELSIF field == 'disabledtext' %] + éÚÍÅÎÅÎÏ ÓÏÏÂÝÅÎÉÅ Ï ÂÌÏËÉÒÏ×ËÅ. + [% END %] + </li> + [% END %] + [% IF groups_added_to.size %] + <li> + õÞÅÔÎÁÑ ÚÁÐÉÓØ ÄÏÂÁ×ÌÅÎÁ × + [% groups_added_to.size > 1 ? 'ÇÒÕÐÐÙ' : 'ÇÒÕÐÐÕ' %] + [%+ groups_added_to.join(', ') FILTER html %]. + </li> + [% END %] + [% IF groups_removed_from.size %] + <li> + õÞÅÔÎÁÑ ÚÁÐÉÓØ ÉÓËÌÀÞÅÎÁ ÉÚ + [% groups_added_to.size > 1 ? 'ÇÒÕÐÐ' : 'ÇÒÕÐÐÙ' %] + [%+ groups_removed_from.join(', ') FILTER html %]. + </li> + [% END %] + [% IF groups_granted_rights_to_bless.size %] + <li> + õÞÅÔÎÏÊ ÚÁÐÉÓÉ ÄÅÌÅÇÉÒÏ×ÁÎÏ ÕÐÒÁ×ÌÅÎÉÅ + [% groups_added_to.size > 1 ? 'ÇÒÕÐÐÁÍÉ' : 'ÇÒÕÐÐÏÊ' %] + [%+ groups_granted_rights_to_bless.join(', ') FILTER html %]. + </li> + [% END %] + [% IF groups_denied_rights_to_bless.size %] + <li> + õ ÕÞÅÔÎÏÊ ÚÁÐÉÓÉ ÏÔÏÚ×ÁÎÏ ÕÐÒÁ×ÌÅÎÉÅ + [% groups_added_to.size > 1 ? 'ÇÒÕÐÐÁÍÉ' : 'ÇÒÕÐÐÏÊ' %] + [%+ groups_denied_rights_to_bless.join(', ') FILTER html %]. + </li> + [% END %] + </ul> + [% ELSE %] + [% title = "õÞÅÔÎÁÑ ÚÁÐÉÓØ $otheruser.login ÎÅ ÉÚÍÅÎÅÎÁ" %] + îÉËÁËÉÈ ÉÚÍÅÎÅÎÉÊ ÕÞÅÔÎÏÊ ÚÁÐÉÓÉ [%+ otheruser.login FILTER html %] ÎÅ ÕËÁÚÁÎÏ. + [% END %] + + [% ELSIF message_tag == "account_deleted" %] + [% title = "õÞÅÔÎÁÑ ÚÁÐÉÓØ $otheruser.login ÕÄÁÌÅÎÁ" %] + õÞÅÔÎÁÑ ÚÁÐÉÓØ [% otheruser.login FILTER html %] ÕÓÐÅÛÎÏ ÕÄÁÌÅÎÁ. + [% IF message_tag == "buglist_adding_field" %] [% title = "äÏÂÁ×ÌÑÅÍ ÐÏÌÅ × ÆÏÒÍÕ ÐÏÉÓËÁ..." %] [% link = "÷ÙÂÅÒÉÔÅ ÜÔÕ ÓÓÙÌËÕ ÅÓÌÉ ÓÔÒÁÎÉÃÁ ÎÅ ÏÂÎÏ×ÉÌÁÓØ Á×ÔÏÍÁÔÉÞÅÓËÉ." %] @@ -56,8 +125,11 @@ [% ELSIF message_tag == "buglist_sorted_by_relevance" %] [% terms.Bugs %] × ÄÁÎÎÏÍ ÓÐÉÓËÅ ÏÔÓÏÒÔÉÒÏ×ÁÎÙ ÐÏ ÓÏÏÔ×ÅÔÓÔ×ÉÀ, - ÎÁÞÉÎÁÑ Ó ÎÁÉÂÏÌÅÅ ÐÏÄÈÏÄÑÝÉÈ[% terms.bugs %]. ïÔÏÂÒÁÎÏ ÎÅ ÂÏÌÅÅ - 200 ÎÁÉÂÏÌÅÅ ÐÏÄÈÏÄÑÝÉÈ [%+ terms.bugs_gen %]. + ÎÁÞÉÎÁÑ Ó ÎÁÉÂÏÌÅÅ ÐÏÄÈÏÄÑÝÉÈ[% terms.bugs %]. + [% IF bugs.size == constants.FULLTEXT_BUGLIST_LIMIT %] + ïÔÏÂÒÁÎÏ ÎÅ ÂÏÌÅÅ [% constants.FULLTEXT_BUGLIST_LIMIT FILTER html %] + ÎÁÉÂÏÌÅÅ ÐÏÄÈÏÄÑÝÉÈ [% terms.bugs_gen %]. + [% END %] [% ELSIF message_tag == "change_columns" %] [% title = "éÚÍÅÎÅÎÉÅ ÓÐÉÓËÁ ËÏÌÏÎÏË" %] @@ -84,7 +156,7 @@ [% ELSIF message_tag == "logged_out" %] [% title = "÷ÙÈÏÄ ÉÚ ÓÉÓÔÅÍÙ" %] - [% url = "query.cgi?GoAheadAndLogIn=1" %] + [% url = "index.cgi?GoAheadAndLogIn=1" %] [% link = "÷ÏÊÔÉ ÚÁÎÏ×Ï." %] <b>ðÁÒÁÍÅÔÒÙ ÒÅÇÉÓÔÒÁÃÉÉ ÕÄÁÌÅÎÙ</b>. Cookie Ó ÄÁÎÎÙÍÉ ÒÅÇÉÓÔÒÁÃÉÉ ÐÏÌØÚÏ×ÁÔÅÌÑ ÕÄÁÌÅÎ. ðÒÉ ÓÌÅÄÕÀÝÅÍ @@ -141,6 +213,10 @@ ðÒÏÄÕËÔ <em>[% product FILTER html %]</em> ÎÅ ÓÕÝÅÓÔ×ÕÅÔ ÌÉÂÏ ÏÔÓÕÔÓÔ×ÕÀÔ ÐÒÁ×Á ÄÏÓÔÕÐÁ Ë ÎÅÍÕ. óÐÉÓÏË ÄÏÓÔÕÐÎÙÈ ÐÒÏÄÕËÔÏ×: + [% ELSIF message_tag == "remaining_time_zeroed" %] + ðÏÌÅ [% field_descs.remaining_time FILTER html %] ÏÂÎÕÌÅÎÏ + Á×ÔÏÍÁÔÉÞÅÓËÉ ÐÒÉ ÚÁËÒÙÔÉÉ [% terms.bug_gen %]. + [% ELSIF message_tag == "series_created" %] [% title = "óÅÒÉÑ ÄÁÎÎÙÈ ÓÏÚÄÁÎÁ" %] óÅÒÉÑ <em>[% series.category FILTER html %] / @@ -154,8 +230,18 @@ <a href="query.cgi?format=create-series">ÓÏÚÄÁÊÔÅ ÎÏ×ÕÀ ÓÅÒÉÀ</a>. [% ELSIF message_tag == "shutdown" %] - [% title = "$terms.Bugzilla ÏÓÔÁÎÏ×ÌÅÎ." %] + [% title = "óÉÓÔÅÍÁ $terms.Bugzilla ÏÓÔÁÎÏ×ÌÅÎÁ." %] [% Param("shutdownhtml") %] + [% IF userid %] + <p>÷ ÃÅÌÑÈ ÂÅÚÏÐÁÓÎÏÓÔÉ ÐÒÏÉÚ×ÅÄÅÎ Á×ÔÏÍÁÔÉÞÅÓËÉÊ ×ÙÈÏÄ ÉÚ ÓÉÓÔÅÍÙ. + äÁÎÎÙÅ Á×ÔÏÍÁÔÉÞÅÓËÏÊ ÒÅÇÉÓÔÒÁÃÉÉ × ÓÉÓÔÅÍÅ ÕÄÁÌÅÎÙ. + [% END %] + + [% ELSIF message_tag == "user_match_failed" %] + ÷×ÅÄÅÎÎÏÅ ÉÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ ÎÅÉÚ×ÅÓÔÎÏ, ÐÏÌÅ [% match_field FILTER html %] ÏÞÉÝÅÎÏ. + + [% ELSIF message_tag == "user_match_multiple" %] + ÷×ÅÄÅÎÎÏÅ ÉÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ ÎÅÏÄÎÏÚÎÁÞÎÏ, ÐÏÌÅ [% match_field FILTER html %] ÏÞÉÝÅÎÏ. [% ELSE %] [%# Give sensible error if error functions are used incorrectly. Index: field-descs.none.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/global/field-descs.none.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -d -r1.2 -r1.2.2.1 --- field-descs.none.tmpl 22 Feb 2005 04:40:23 -0000 1.2 +++ field-descs.none.tmpl 1 Nov 2005 19:54:42 -0000 1.2.2.1 @@ -25,7 +25,8 @@ [% PROCESS global/variables.none.tmpl %] -[% field_descs = { "[Bug creation]" => "[óÏÚÄÁÎÉÅ $terms.bug_gen]", +[% field_descs = { "[Bug creation]" => "[òÅÇÉÓÔÒÁÃÉÑ $terms.bug_gen]", + "actual_time" => "ôÒÕÄÏÚÁÔÒÁÔÙ" "alias" => "áÌÉÁÓ", "assigned_to" => "ïÔ×ÅÔÓÔ×ÅÎÎÙÊ", "blocked" => "âÌÏËÉÒÕÅÔ", @@ -35,17 +36,19 @@ "bug_status" => "óÏÓÔÏÑÎÉÅ", "changeddate" => "äÁÔÁ ÐÏÓÌÅÄÎÅÇÏ ÉÚÍÅÎÅÎÉÑ", "cc" => "ðÏÄÐÉÓÞÉËÉ", + "classification" => "òÁÚÄÅÌ", "cclist_accessible" => "óÐÉÓÏË ÐÏÄÐÉÓÞÉËÏ×?", "component_id" => "ëÏÄ ËÏÍÐÏÎÅÎÔÁ", "component" => "ëÏÍÐÏÎÅÎÔ", - "creation_ts" => "÷ÒÅÍÑ ÓÏÚÄÁÎÉÑ $terms.bug_gen", + "creation_ts" => "÷ÒÅÍÑ ÒÅÇÉÓÔÒÁÃÉÉ $terms.bug_gen", + "deadline" => "óÒÏË", "delta_ts" => "÷ÒÅÍÑ ÐÏÓÌÅÄÎÅÇÏ ÉÚÍÅÎÅÎÉÑ", "dependson" => "úÁ×ÉÓÉÍÏÓÔÉ", "dup_id" => "ðÏ×ÔÏÒÎÁÑ", "estimated_time" => "ïÃÅÎËÁ ×ÒÅÍÅÎÉ", "everconfirmed" => "ðÏÄÔ×ÅÒÖÄÅÎÁ?", "groupset" => "Groupset", -# FIXME: ÐÏËÁ ÎÅ ÐÏÎÑÌ +# FIXME-ru: ÐÏËÁ ÎÅ ÐÏÎÑÌ "keywords" => "ëÌÀÞÅ×ÙÅ ÓÌÏ×Á", "newcc" => "ðÏÄÐÉÓÞÉËÉ", "op_sys" => "ïó", @@ -54,15 +57,38 @@ "priority" => "ðÒÉÏÒÉÔÅÔ", "product_id" => "ëÏÄ ÐÒÏÄÕËÔÁ", "product" => "ðÒÏÄÕËÔ", - "qa_contact" => "ëÏÎÔÒÏÌØ ËÁÞÅÓÔ×Á", + "qa_contact" => "ðÒÉÅÍËÁ", "remaining_time" => "ïÓÔÁÌÏÓØ ×ÒÅÍÅÎÉ", "rep_platform" => "ðÌÁÔÆÏÒÍÁ", "reporter" => "éÎÉÃÉÁÔÏÒ", "reporter_accessible" => "éÎÉÃÉÁÔÏÒ ÄÏÓÔÕÐÅÎ?", "resolution" => "òÅÛÅÎÉÅ", + "setting" => "îÁÓÔÒÏÊËÁ", + "settings" => "îÁÓÔÒÏÊËÉ", "short_desc" => "ïÐÉÓÁÎÉÅ", "status_whiteboard" => "úÁÍÅÔËÉ", - "target_milestone" => "ðÌÁÎÉÒÕÅÔÓÑ Ë", + "target_milestone" => "úÁÐÌÁÎÉÒÏ×ÁÎÏ", "version" => "÷ÅÒÓÉÑ", "votes" => "çÏÌÏÓÁ", "work_time" => "ïÔÒÁÂÏÔÁÎÏ ×ÒÅÍÅÎÉ"} %] + +[% status_descs = { "UNCONFIRMED" => "îÅÐÏÄÔ×ÅÒÖÄÅÎÎÁÑ", + "NEW" => "îÏ×ÁÑ", + "ASSIGNED" => "îÁÚÎÁÞÅÎÁ", + "REOPENED" => "ðÏ×ÔÏÒÎÁÑ", + "RESOLVED" => "òÅÛÅÎÁ", + "VERIFIED" => "ðÒÉÎÑÔÁ", + "CLOSED" => "úÁËÒÙÔÁ" } %] + +[% resolution_descs = { "FIXED" => "éÓÐÒÁ×ÌÅÎÁ", + "INVALID" => "áÎÎÕÌÉÒÏ×ÁÎÁ", + "WONTFIX" => "ïÔËÁÚÁÎÏ", + "LATER" => "ïÔÌÏÖÅÎÁ", + "REMIND" => "ðÅÒÅÎÅÓÅÎÁ", + "DUPLICATE" => "äÕÂÌÉÒÕÀÝÁÑ", + "WORKSFORME" => "îÅ×ÏÓÐÒÏÉÚ×ÏÄÉÍÁÑ", + "MOVED" => "ðÅÒÅÍÅÝÅÎÁ", + "---" => "---", + " " => " " } %] + +[% Hook.process("end") %] Index: user-error.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/global/user-error.html.tmpl,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -d -r1.6 -r1.6.2.1 --- user-error.html.tmpl 2 May 2005 03:12:38 -0000 1.6 +++ user-error.html.tmpl 1 Nov 2005 19:54:42 -0000 1.6.2.1 @@ -17,12 +17,13 @@ # Rights Reserved. # # Contributor(s): Gervase Markham <ge...@ge...> + # Frédéric Buclin <Lp...@gm...> # # Russian translation: Vitaly Fedrushkov <fed...@us...> #%] [%# INTERFACE: - # header_done: boolean. True if the header has already been printed. + # header_done: boolean. True if the Bugzilla header has already been printed. # error: string. The tag of the error, or the error message to be displayed # (deprecated). May contain HTML if it's an error message. #%] @@ -32,6 +33,12 @@ # # Note that you must explicitly filter every single template variable # in this file; if you do not wish to change it, use the "none" filter. + # + # Extension- or custom-specific error handling can be easily added + # via hooks: just place your <extension>-errors.html.tmpl into + # template/en/extension/hook/global/user-error.html.tmpl/errors/ + # Note: be aware of uniqueness of error string parameter value, since + # nobody can guarantee the hook files processing order in the future #%] [% PROCESS global/variables.none.tmpl %] @@ -80,6 +87,10 @@ [% bug_link FILTER none %] ÕÖÅ ÉÍÅÅÔ ÉÍÑ <em>[% alias FILTER html %]</em>. ÷ÙÂÅÒÉÔÅ ÄÒÕÇÏÅ ÉÍÑ. + [% ELSIF error == "alias_not_defined" %] + [% title = "éÍÑ ÎÅ ÕËÁÚÁÎÏ" %] + ÷Ù ÎÅ ÕËÁÚÁÌÉ ÉÍÑ ÄÌÑ [% terms.bug_dat %]. + [% ELSIF error == "alias_is_numeric" %] [% title = "þÉÓÌÏ ×ÍÅÓÔÏ ÉÍÅÎÉ" %] ðÏÐÙÔËÁ ÄÁÔØ [% terms.bug_dat %] ÉÍÑ <em>[% alias FILTER html %]</em>. @@ -97,13 +108,83 @@ ÐÏÌØÚÏ×ÁÔÅÌÅÊ ÓÒÅÄÓÔ×ÁÍÉ [% terms.Bugzilla %]. äÌÑ ÒÅÇÉÓÔÒÁÃÉÉ ÐÏÌØÚÏ×ÁÔÅÌÑ ÏÂÒÁÔÉÔÅÓØ Ë ÁÄÍÉÎÉÓÔÒÁÔÏÒÕ ÓÉÓÔÅÍÙ. - [% ELSIF error == "authorization_failure" %] - [% title = "ïÔËÁÚÁÎÏ × ÄÏÓÔÕÐÅ" %] - îÅÔ ÄÏÓÔÕÐÁ Ë [% action FILTER html %]. - [% ELSIF error == "attachment_access_denied" %] - [% title = "äÏÓÔÕÐ ÚÁÐÒÅÝÅÎ" %] - äÏÓÔÕÐ Ë ÐÒÉÌÏÖÅÎÉÀ ÚÁÐÒÅÝÅÎ. + [% ELSIF error == "auth_failure" %] + [% title = "Authorization Required" %] + Sorry, + [% IF group %] + you aren't a member of the '[% group FILTER html %]' group, + [% END %] + + [% IF reason %] + [% IF group %] and [% END %] + [% IF reason == "cant_bless" %] + you don't have permissions to put people in or out of any group, + [% ELSIF reason == "not_visible" %] + there are visibility restrictions on certain user groups, + [% END %] + [% END %] + + [% IF group || reason %] and so [% END %] you are not authorized to + [% IF action == "access" %] + access + [% ELSIF action == "add" %] + add new + [% ELSIF action == "modify" %] + modify + [% ELSIF action == "delete" %] + delete + [% ELSIF action == "edit" %] + add, modify or delete + [% ELSIF action == "run" %] + run + [% ELSIF action == "schedule" %] + schedule + [% ELSIF action == "use" %] + use + [% END %] + + [% IF object == "attachment" %] + this attachment + [% ELSIF object == "charts" %] + the "New Charts" feature + [% ELSIF object == "classifications" %] + classifications + [% ELSIF object == "components" %] + components + [% ELSIF object == "flagtypes" %] + flag types + [% ELSIF object == "groups" %] + groups + [% ELSIF object == "keywords" %] + keywords + [% ELSIF object == "milestones" %] + milestones + [% ELSIF object == "multiple_bugs" %] + multiple [% terms.bugs %] at once + [% ELSIF object == "parameters" %] + parameters + [% ELSIF object == "products" %] + products + [% ELSIF object == "quips" %] + quips + [% ELSIF object == "reports" %] + whine reports + [% ELSIF object == "sanity_check" %] + a sanity check + [% ELSIF object == "timetracking_summaries" %] + time-tracking summary reports + [% ELSIF object == "user" %] + the user you specified + [% ELSIF object == "users" %] + users + [% ELSIF object == "versions" %] + versions + [% END %]. + + [% ELSIF error == "attachment_removed" %] + [% title = "Attachment Removed" %] + The attachment you are attempting to access has been removed. [% ELSIF error == "bug_access_denied" %] [% title = "äÏÓÔÕÐ ÚÁÐÒÅÝÅÎ" %] @@ -139,6 +220,104 @@ [% title = "ðÒÅ×ÙÛÅÎÁ ÍÁËÓÉÍÁÌØÎÁÑ ÄÌÉÎÁ ËÏÍÍÅÎÔÁÒÉÑ" %] íÁËÓÉÍÁÌØÎÁÑ ÄÌÉÎÁ ËÏÍÍÅÎÔÁÒÉÑ -- 65 535 ÓÉÍ×ÏÌÏ×. + [% ELSIF error == "auth_classification_not_enabled" %] + [% title = "Classification Not Enabled" %] + Sorry, classification is not enabled. + + [% ELSIF error == "classification_not_specified" %] + [% title = "You Must Supply A Classification Name" %] + You must enter a classification name. + + [% ELSIF error == "classification_already_exists" %] + [% title = "Classification Already Exists" %] + A classification with the name '[% name FILTER html %]' already exists. + + [% ELSIF error == "classification_doesnt_exist" %] + [% title = "Classification Does Not Exist" %] + The classification '[% name FILTER html %]' does not exist. + + [% ELSIF error == "classification_doesnt_exist_for_product" %] + [% title = "Classification Does Not Exist For Product" %] + The classification '[% classification FILTER html %]' does not exist + for product '[% product FILTER html %]'. + + [% ELSIF error == "classification_not_deletable" %] + [% title = "Default Classification Can Not Be Deleted" %] + You can not delete the default classification + + [% ELSIF error == "classification_has_products" %] + Sorry, there are products for this classification. You + must reassign those products to another classification before you + can delete this one. + + [% ELSIF error == "cant_delete_default_classification" %] + Sorry, but you can not delete the default classification, + '[% name FILTER html %]'. + + [% ELSIF error == "component_already_exists" %] + [% title = "Component Already Exists" %] + A component with the name '[% name FILTER html %]' already exists. + + [% ELSIF error == "component_blank_description" %] + [% title = "Blank Component Description Not Allowed" %] + You must enter a non-blank description for component '[% name FILTER html %]'. + + [% ELSIF error == "component_blank_name" %] + [% title = "Blank Component Name Not Allowed" %] + You must enter a name for this new component. + + [% ELSIF error == "component_has_bugs" %] + [% title = BLOCK %]Component has [% terms.Bugs %][% END %] + There are [% nb FILTER html %] [%+ terms.bugs %] entered for this component! + You must reassign those [% terms.bugs %] to another component before you + can delete this one. + + [% ELSIF error == "component_must_have_a_name" %] + [% title = "Blank Component Name Not Allowed" %] + You cannot delete the component name for component '[% name FILTER html %]'. + + [% ELSIF error == "component_cant_del_description" %] + [% title = "Blank Component Description Not Allowed" %] + You cannot delete the component description for + component '[% name FILTER html %]'. + + [% ELSIF error == "component_name_too_long" %] + [% title = "Component Name Is Too Long" %] + The name of a component is limited to 64 characters. + '[% name FILTER html %]' is too long ([% name.size %] characters). + + [% ELSIF error == "component_need_initialowner" %] + [% title = "Component Requires Default Assignee" %] + You must enter a default assignee for component '[% name FILTER html %]'. + + [% ELSIF error == "component_need_valid_initialowner" %] + [% title = "Component Requires A Valid Default Assignee" %] + You must use an existing [% terms.Bugzilla %] account as the default assignee for + component '[% name FILTER html %]'. + + [% ELSIF error == "component_need_valid_initialqacontact" %] + [% title = "Component Requires A Valid Default QA Contact" %] + You must use an existing [% terms.Bugzilla %] account as default QA contact for + component '[% name FILTER html %]'. + + [% ELSIF error == "product_not_specified" %] + [% title = "No Product Specified" %] + No product specified when trying to edit components, milestones or + versions. + + [% ELSIF error == "component_not_specified" %] + [% title = "No Component Specified" %] + No component specified when trying to edit components. + + [% ELSIF error == "component_not_valid" %] + [% title = "Specified Component Does Not Exist" %] + The component '[% name FILTER html %]' for product + '[% product FILTER html %]' does not exist. + + [% ELSIF error == "product_doesnt_exist" %] + [% title = "Specified Product Does Not Exist" %] + The product '[% product FILTER html %]' does not exist. + [% ELSIF error == "dependency_loop_multi" %] [% title = "ïÂÎÁÒÕÖÅÎÁ ÃÉËÌÉÞÅÓËÁÑ ÚÁ×ÉÓÉÍÏÓÔØ" %] óÌÅÄÕÀÝÉÅ [% terms.bugs %]ÎÅ ÍÏÇÕÔ ÏÄÎÏ×ÒÅÍÅÎÎÏ ÚÁ×ÉÓÅÔØ ÏÔ ÄÁÎÎÏÊ @@ -153,9 +332,26 @@ [% title = "ôÒÅÂÕÅÔÓÑ ÏÐÉÓÁÎÉÅ terms.bug_gen" %] îÅ ÕËÁÚÁÎÏ ÏÐÉÓÁÎÉÅ [% terms.bug_gen %]. - [% ELSIF error == "dupe_of_self_disallowed" %] - [% title = "$terms.Bug ÎÅ ÍÏÖÅÔ ÂÙÔØ ÐÒÉÚÎÁÎÁ ÐÏ×ÔÏÒÏÍ" %] - [% terms.Bug %] ÎÅ ÍÏÖÅÔ ÂÙÔØ ÐÒÉÚÎÁÎÁ ÐÏ×ÔÏÒÏÍ ÓÅÂÑ ÓÁÍÏÊ. + [% ELSIF error == "dupe_entry_found" %] + [% title = "Already marked as duplicate" %] + This [% terms.bug %] has already been marked as a duplicate + of [% terms.bug %] [%+ dupe_of FILTER html %]. + + [% ELSIF error == "dupe_not_allowed" %] + [% title = "Cannot mark $terms.bugs as duplicates" %] + You cannot mark [% terms.bugs %] as duplicates when + changing several [% terms.bugs %] at once. + + [% ELSIF error == "dupe_loop_detected" %] + [% title = "Loop detected among duplicates" %] + You cannot mark [% terms.bug %] [%+ bug_id FILTER html %] as + a duplicate of + [% IF dupe_of == bug_id %] + itself + [% ELSE %] + [%+ terms.bug %] [%+ dupe_of FILTER html %], because it + would create a duplicate loop + [% END %]. [% ELSIF error == "email_change_in_progress" %] [% title = "éÚÍÅÎÅÎÉÅ ÁÄÒÅÓÁ ÕÖÅ ÚÁÐÒÏÛÅÎÏ" %] @@ -165,14 +361,65 @@ [% title = "ïÛÉÂËÁ ÐÏÄÔ×ÅÒÖÄÅÎÉÑ ÁÄÒÅÓÁ" %] ïÛÉÂËÁ ÐÏÄÔ×ÅÒÖÄÅÎÉÑ ÁÄÒÅÓÁ ÜÌÅËÔÒÏÎÎÏÊ ÐÏÞÔÙ. + [% ELSIF error == "empty_group_description" %] + [% title = "The group description can not be empty" %] + You must enter a description for the group. + + [% ELSIF error == "empty_group_name" %] + [% title = "The group name can not be empty" %] + You must enter a name for the group. + [% ELSIF error == "entry_access_denied" %] [% title = "äÏÓÔÕÐ ÚÁÐÒÅÝÅÎ" %] ïÔÓÕÔÓÔ×ÕÀÔ ÎÅÏÂÈÏÄÉÍÙÅ ÐÒÁ×Á ÄÏÓÔÕÐÁ ÄÌÑ ÄÏÂÁ×ÌÅÎÉÑ [% terms.bug_gen %] ÄÌÑ ÐÒÏÄÕËÔÁ [% product FILTER html %]. + [% ELSIF error == "fieldname_invalid" %] + [% title = "Specified Field Does Not Exist" %] + The field '[% field FILTER html %]' does not exist or + cannot be edited with this interface. + + [% ELSIF error == "fieldname_not_specified" %] + [% title = "Field Name Not Specified" %] + No field name specified when trying to edit field values. + + [% ELSIF error == "fieldvalue_already_exists" %] + [% title = "Field Value Already Exists" %] + The value '[% value FILTER html %]' already exists for the + '[%- field FILTER html %]' field. + + [% ELSIF error == "fieldvalue_doesnt_exist" %] + [% title = "Specified Field Value Does Not Exist" %] + The value '[% value FILTER html %]' does not exist for + the '[% field FILTER html %]' field. + + [% ELSIF error == "fieldvalue_name_too_long" %] + [% title = "Field Value Is Too Long" %] + The value of a field is limited to 60 characters. + '[% value FILTER html %]' is too long ([% value.length %] characters). + + [% ELSIF error == "fieldvalue_not_specified" %] + [% title = "Field Value Not Specified" %] + No field value specified when trying to edit a field value. + + [% ELSIF error == "fieldvalue_sortkey_invalid" %] + [% title = "Invalid Field Value Sortkey" %] + The sortkey '[% sortkey FILTER html %]' for the '[% name FILTER html %]' + field is not a valid (positive) number. + + [% ELSIF error == "fieldvalue_still_has_bugs" %] + [% title = "You Cannot Delete This Field Value" %] + You cannot delete the value '[% value FILTER html %]' from the + '[% field FILTER html%]' field, because there are still + [% count FILTER html %] [% terms.bugs %] using it. + + [% ELSIF error == "fieldvalue_undefined" %] + [% title = "Undefined Value Not Allowed" %] + You must specify a value. + [% ELSIF error == "file_not_specified" %] [% title = "æÁÊÌ ÎÅ ÕËÁÚÁÎ" %] - îÅ ÕËÁÚÁÎÏ ÉÍÑ ÆÁÊÌÑ ÐÒÉÌÏÖÅÎÉÑ. + îÅ ÕËÁÚÁÎÏ ÉÍÑ ÆÁÊÌÁ ÐÒÉÌÏÖÅÎÉÑ. [% ELSIF error == "file_too_large" %] [% title = "æÁÊÌ ÓÌÉÛËÏÍ ×ÅÌÉË" %] @@ -225,6 +472,15 @@ éÍÑ <em>[% name FILTER html %]</em> ÄÏÌÖÎÏ ÉÍÅÔØ ÄÌÉÎÕ 1-50 ÓÉÍ×ÏÌÏ× É ÎÅ ÍÏÖÅÔ ÓÏÄÅÒÖÁÔØ ÐÒÏÂÅÌÏ× ÉÌÉ ÚÁÐÑÔÙÈ. + [% ELSIF error == "flag_update_denied" %] + [% title = "Flag Modification Denied" %] + You tried to [% IF status == "+" %] grant [% ELSIF status == "-" %] deny + [% ELSIF status == "X" %] clear [% ELSE %] request [% END %] + <code>[% name FILTER html %] + [% IF status == "X" %][% old_status FILTER html %][% END %]</code>. + + Only a sufficiently empowered user can make this change. + [% ELSIF error == "format_not_found" %] [% title = "æÏÒÍÁÔ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ" %] úÁÐÒÏÛÅÎÎÙÊ ÆÏÒÍÁÔ <em>[% format FILTER html %]</em> ÎÅ ÏÐÒÅÄÅÌÅÎ @@ -235,6 +491,24 @@ ëÌÀÞ ÓÏÒÔÉÒÏ×ËÉ ÄÏÌÖÅÎ ÂÙÔØ ÃÅÌÙÍ ÞÉÓÌÏÍ ÏÔ 0 ÄÏ 32767 ×ËÌÀÞÉÔÅÌØÎÏ. úÎÁÞÅÎÉÅ <em>[% sortkey FILTER html %]</em> ÎÅÄÏÐÕÓÔÉÍÏ. + [% ELSIF error == "group_exists" %] + [% title = "The group already exists" %] + The group [% name FILTER html %] already exists. + + [% ELSIF error == "group_not_specified" %] + [% title = "Group not specified" %] + No group was specified. + + [% ELSIF error == "system_group_not_deletable" %] + [% title = "System Groups not deletable" %] + <em>[% name FILTER html %]</em> is a system group. + This group cannot be deleted. + + [% ELSIF error == "group_unknown" %] + [% title = "Unknown Group" %] + The group [% name FILTER html %] does not exist. Please specify + a valid group name. Create it first if necessary! + [% ELSIF error == "illegal_at_least_x_votes" %] [% title = "îÅÄÏÐÕÓÔÉÍÏÅ ÚÎÁÞÅÎÉÅ ÐÏÉÓËÁ" %] ðÏÌÅ <em>îÅ ÍÅÎÅÅ ___ ÇÏÌÏÓÏ×</em> ÄÏÌÖÎÏ ÓÏÄÅÒÖÁÔØ ÃÅÌÏÅ ÞÉÓÌÏ. @@ -259,8 +533,13 @@ <strong>[% field_descs.$field FILTER html %]</strong>. óÔÁÒÏÅ ÚÎÁÞÅÎÉÅ: <em>[% oldvalue FILTER html %]</em>. îÏ×ÏÅ ÚÎÁÞÅÎÉÅ: <em>[% newvalue FILTER html %]</em>. - îÅÄÏÓÔÁÔÏÞÎÏ ÐÒÁ×: ÉÚÍÅÎÉÔØ ÐÏÌÅ ÍÏÇÕÔ ÔÏÌØËÏ ÏÔ×ÅÔÓÔ×ÅÎÎÙÊ, - ÉÎÉÃÉÁÔÏÒ [% terms.bug_gen %], ÉÌÉ ÐÏÌØÚÏ×ÁÔÅÌØ Ó ÐÏÌÎÙÍ ÄÏÓÔÕÐÏÍ. + îÅÄÏÓÔÁÔÏÞÎÏ ÐÒÁ×: ÉÚÍÅÎÉÔØ ÐÏÌÅ ÍÏÇÕÔ ÔÏÌØËÏ + [% IF privs < 3 %] + ÉÓÐÏÌÎÉÔÅÌØ + [% IF privs < 2 %] ÉÌÉ ÉÎÉÃÉÁÔÏÒ [% END %] + [% terms.bug_gen %] ÉÌÉ + [% END %] + ÐÏÌØÚÏ×ÁÔÅÌØ Ó ÐÏÌÎÙÍ ÄÏÓÔÕÐÏÍ. [% ELSIF error == "illegal_changed_in_last_x_days" %] [% title = "îÅÄÏÐÕÓÔÉÍÏÅ ÚÎÁÞÅÎÉÅ ÐÏÉÓËÁ" %] @@ -270,6 +549,9 @@ [% ELSIF error == "illegal_date" %] [% title = "Illegal Date" %] '<tt>[% date FILTER html %]</tt>' is not a legal date. + [% IF format %] + Please use the format '<tt>[% format FILTER html %]</tt>'. + [% END %] [% ELSIF error == "illegal_email_address" %] [% title = "Invalid Email Address" %] @@ -314,11 +596,6 @@ [% ELSIF error == "insufficient_data_points" %] We don't have enough data points to make a graph (yet). - [% ELSIF error == "insufficient_privs_for_multi" %] - [% title = "Insufficient Privileges" %] - Sorry, you do not have sufficient privileges to edit multiple - [% terms.bugs %]. - [% ELSIF error == "invalid_attach_id" %] [% title = "Invalid Attachment ID" %] The attachment id [% attach_id FILTER html %] is invalid. @@ -332,7 +609,7 @@ [% IF bug_id %] '[% bug_id FILTER html %]' is not a valid [% terms.bug %] number [% IF Param("usebugaliases") %] - nor an alias to [% terms.abug %] number + nor an alias to [% terms.abug %] [% END %]. [% ELSE %] [% IF field %] @@ -363,6 +640,10 @@ The context [% context FILTER html %] is invalid (must be a number, "file" or "patch"). + [% ELSIF error == "invalid_field_name" %] + [% title = "Invalid Field Name" %] + The field "[% name FILTER html %]" is invalid. + [% ELSIF error == "invalid_format" %] [% title = "Invalid Format" %] The format "[% format FILTER html %]" is invalid (must be one of @@ -371,6 +652,14 @@ [% END %] ). + [% ELSIF error == "invalid_group_ID" %] + [% title = "Invalid group ID" %] + The group you specified doesn't exist. + + [% ELSIF error == "invalid_group_name" %] + [% title = "Invalid group name" %] + The group you specified, [% name FILTER html %], is not valid here. + [% ELSIF error == "invalid_maxrows" %] [% title = "Invalid Max Rows" %] The maximum number of rows, '[% maxrows FILTER html %]', must be @@ -379,7 +668,11 @@ [% ELSIF error == "invalid_product_name" %] [% title = "Invalid Product Name" %] The product name '[% product FILTER html %]' is invalid or does not exist. - + + [% ELSIF error == "invalid_regexp" %] + [% title = "Invalid regular expression" %] + The regular expression you entered is invalid. + [% ELSIF error == "invalid_username" %] [% title = "Invalid Username" %] The name <tt>[% name FILTER html %]</tt> is not a valid username. @@ -390,11 +683,6 @@ [% title = "Invalid Username Or Password" %] The username or password you entered is not valid. - [% ELSIF error == "keyword_access_denied" %] - [% title = "Access Denied" %] - Sorry, you aren't a member of the 'editkeywords' group, and so - you aren't allowed to add, modify or delete keywords. - [% ELSIF error == "keyword_already_exists" %] [% title = "Keyword Already Exists" %] A keyword with the name [% name FILTER html %] already exists. @@ -411,10 +699,47 @@ [% title = "Invalid Keyword Name" %] You may not use commas or whitespace in a keyword name. + [% ELSIF error == "local_file_too_large" %] + [% title = "Local File Too Large" %] + Local file uploads must not exceed + [% Param('maxlocalattachment') %] MB in size. + [% ELSIF error == "login_needed_for_password_change" %] [% title = "Login Name Required" %] You must enter a login name when requesting to change your password. + [% ELSIF error == "login_required_for_pronoun" %] + [% title = "Login Name Required" %] + You must enter a login name when using your login as a pronoun. + + [% ELSIF error == "milestone_already_exists" %] + [% title = "Milestone Already Exists" %] + The milestone '[% name FILTER html %]' already exists for product ' + [%- product FILTER html %]'. + + [% ELSIF error == "milestone_blank_name" %] + [% title = "Blank Milestone Name Not Allowed" %] + You must enter a name for this milestone. + + [% ELSIF error == "milestone_is_default" %] + [% title = "Default milestone not deletable" %] + Sorry, but [% name FILTER html %] is the default milestone for + product '[% product FILTER html %]', and so it can not be deleted. + + [% ELSIF error == "milestone_name_too_long" %] + [% title = "Milestone Name Is Too Long" %] + The name of a milestone is limited to 20 characters. + '[% name FILTER html %]' is too long ([% name.length %] characters). + + [% ELSIF error == "milestone_not_specified" %] + [% title = "No Milestone Specified" %] + No milestone specified when trying to edit milestones. + + [% ELSIF error == "milestone_not_valid" %] + [% title = "Specified Milestone Does Not Exist" %] + The milestone '[% milestone FILTER html %]' for product + '[% product FILTER html %]' does not exist. + [% ELSIF error == "milestone_required" %] [% title = "Milestone Required" %] You must determine a target milestone for [% terms.bug %] @@ -422,6 +747,12 @@ if you are going to accept it. Part of accepting [% terms.abug %] is giving an estimate of when it will be fixed. + [% ELSIF error == "milestone_sortkey_invalid" %] + [% title = "Invalid Milestone Sortkey" %] + The sortkey '[% sortkey FILTER html %]' for milestone ' + [% name FILTER html %]' is not in the range -32768 ≤ sortkey + ≤ 32767. + [% ELSIF error == "misarranged_dates" %] [% title = "Misarranged Dates" %] Your start date ([% datefrom FILTER html %]) is after @@ -434,7 +765,20 @@ [% ELSIF error == "missing_category" %] [% title = "Missing Category" %] You did not specify a category for this series. - + + [% ELSIF error == "missing_component" %] + [% title = "Missing Component" %] + Sorry, the product <em>[% product FILTER html %]</em> + has to have at least one component in order for you to + enter [% terms.abug %] into it.<p> + [% IF UserInGroup("editcomponents") %] + <a href="editcomponents.cgi?action=add&product=[% product FILTER url_quote %]">Create + a new component</a>. + [% ELSE %] + Please contact [% Param("maintainer") %] and ask them + to add a component to this product. + [% END %] + [% ELSIF error == "missing_content_type" %] [% title = "Missing Content-Type" %] You asked [% terms.Bugzilla %] to auto-detect the content type, but @@ -451,7 +795,7 @@ [% title = "Missing Cookie" %] Sorry, I seem to have lost the cookie that recorded the results of your last search. I'm afraid you will have to start - again on the <a href="query.cgi">search page</a>. + again from the <a href="query.cgi">search page</a>. [% ELSIF error == "missing_datasets" %] [% title = "No Datasets Selected" %] @@ -483,23 +827,27 @@ [% title = "Missing Subcategory" %] You did not specify a subcategory for this series. + [% ELSIF error == "missing_version" %] + [% title = "Missing Version" %] + Sorry, the product <em>[% product FILTER html %]</em> + has to have at least one version in order for you to + enter [% terms.abug %] into it.<p> + [% IF UserInGroup("editcomponents") %] + <a href="editversions.cgi?action=add&product=[% product FILTER url_quote %]">Create + a new version</a>. + [% ELSE %] + Please contact [% Param("maintainer") %] and ask them + to add a version to this product. + [% END %] + [% ELSIF error == "need_component" %] [% title = "Component Required" %] - You must specify a component to help determine the new owner of these + You must specify a component to help determine the new assignee of these [% terms.bugs %]. - [% ELSIF error == "need_numeric_value" %] - [% title = "Numeric Value Required" %] - Hours requires a numeric value. - - [% ELSIF error == "need_positive_number" %] - [% title = "Positive Number Required" %] - The <em>[% field_descs.$field FILTER html %]</em> field requires a positive - number. - [% ELSIF error == "need_product" %] [% title = "Product Required" %] - You must specify a product to help determine the new owner of these [% terms.bugs %]. + You must specify a product to help determine the new assignee of these [% terms.bugs %]. [% ELSIF error == "need_quip" %] [% title = "Quip Required" %] @@ -522,20 +870,6 @@ You cannot change the component for a list of [% terms.bugs %] covering more than one product. - [% ELSIF error == "no_components" %] - [% title = "îÅÔ ËÏÍÐÏÎÅÎÔÏ×" %] - Sorry; × ÄÁÎÎÏÍ ÐÒÏÄÕËÔÅ ÎÅ ÄÏÂÁ×ÌÅÎÏ ÎÉ ÏÄÎÏÇÏ ËÏÍÐÏÎÅÎÔÁ. - þÔÏÂÙ ÄÏÂÁ×ÉÔØ [% terms.bug__acc %] ÎÅÏÂÈÏÄÉÍÏ ÓÎÁÞÁÌÁ ÄÏÂÁ×ÉÔØ ËÏÍÐÏÎÅÎÔÙ. - Sorry; there needs to be at least one component for this product in order - to create a new [% terms.bug %]. - [% IF UserInGroup("editcomponents") %] - <a href="editcomponents.cgi?product=[% product FILTER url_quote %]">óÏÚÄÁÔØ - ÎÏ×ÙÊ ËÏÍÐÏÎÅÎÔ</a>. - [% ELSE %] - ðÏÖÁÌÕÊÓÔÁ, Ó×ÑÖÉÔÅÓØ Ó [% Param("maintainer") %] É ÐÅÒÅÄÁÊÔÅ ÅÍÕ - ÉÍÑ ÐÒÏÄÕËÔÁ, × ËÏÔÏÒÏÍ ×Ù ÐÙÔÁÌÉÓØ ÓÏÚÄÁÔØ ÎÏ×ÕÀ [% terms.bug_acc %]. - [% END %] - [% ELSIF error == "no_dupe_stats" %] [% title = "Cannot Find Duplicate Statistics" %] There are no duplicate statistics for today ([% today FILTER html %]) @@ -557,11 +891,6 @@ and an error occurred opening yesterday's dupes file: [% error_msg FILTER html %]. - [% ELSIF error == "no_html_in_quips" %] - [% title = "No HTML In Quips" %] - Sorry - for security reasons, support for HTML tags has been turned off - in quips. - [% ELSIF error == "no_new_quips" %] [% title = "No New Quips" %] This site does not permit the addition of new quips. @@ -575,6 +904,28 @@ Either no products have been defined to enter [% terms.bugs %] against or you have not been given access to any. + [% ELSIF error == "no_valid_action" %] + [% title = "No valid action specified" %] + Cannot edit [% field_descs.$field FILTER html %]: no valid action was specified. + + [% ELSIF error == "number_not_numeric" %] + [% title = "Numeric Value Required" %] + The value '[% num FILTER html %]' in the + <em>[% field_descs.$field FILTER html %]</em> field + is not a numeric value. + + [% ELSIF error == "number_too_large" %] + [% title = "Number Too Large" %] + The value '[% num FILTER html %]' in the + <em>[% field_descs.$field FILTER html %]</em> field + is more than the maximum allowable value of '[% max_num FILTER html %]'. + + [% ELSIF error == "number_too_small" %] + [% title = "Number Too Small" %] + The value '[% num FILTER html %]' + in the <em>[% field_descs.$field FILTER html %]</em> field + is less than the minimum allowable value of '[% min_num FILTER html %]'. + [% ELSIF error == "old_password_incorrect" %] [% title = "Incorrect Old Password" %] You did not enter your old password correctly. @@ -583,6 +934,10 @@ [% title = "Old Password Required" %] You must enter your old password to change your email address. + [% ELSIF error == "password_change_requests_not_allowed" %] + [% title = "Password Change Requests Not Allowed" %] + The system is not configured to allow password change requests. + [% ELSIF error == "passwords_dont_match" %] [% title = "Passwords Don't Match" %] The two passwords you entered did not match. @@ -604,27 +959,34 @@ Patches cannot be more than [% Param('maxpatchsize') %] KB in size. Try breaking your patch into several pieces. + [% ELSIF error == "product_disabled" %] + [% title = BLOCK %]Product closed for [% terms.Bugs %] Entry[% END %] + Sorry, entering [% terms.bugs %] into the + product <em>[% product FILTER html %]</em> has been disabled. + [% ELSIF error == "product_edit_denied" %] [% title = "Product Edit Access Denied" %] You are not permitted to edit [% terms.bugs %] in product [% product FILTER html %]. + [% ELSIF error == "product_has_bugs" %] + [% title = BLOCK %]Product has [% terms.Bugs %][% END %] + There are [% nb FILTER html %] [%+ terms.bugs %] entered for this product! + You must reassign those [% terms.bugs %] to another product before you + can delete this one. + [% ELSIF error == "query_name_missing" %] [% title = "No Search Name Specified" %] You must enter a name for your search. - [% ELSIF error == "quips_disabled" %] - [% title = "Quips Disabled" %] - Quips are disabled. - - [% ELSIF error == "quips_edit_denied" %] - [% title = "Permission Denied" %] - You do not have permission to edit quips. + [% ELSIF error == "query_name_too_long" %] + [% title = "Query Name Too Long" %] + The name of the query must be less than 64 characters long. [% ELSIF error == "reassign_to_empty" %] [% title = "Illegal Reassignment" %] To reassign [% terms.abug %], you must provide an address for - the new owner. If you did not intentionally clear out the + the new assignee. If you did not intentionally clear out the "Reassign [% terms.bug %] to" field, [% Param("browserbugmessage") %] [% ELSIF error == "report_access_denied" %] @@ -633,8 +995,8 @@ [% ELSIF error == "require_component" %] [% title = "Component Needed" %] - You must choose a component to file this [% terms.bug %] in. If necessary, - just guess. + To file this [% terms.bug %], you must first choose a component. + If necessary, just guess. [% ELSIF error == "require_new_password" %] [% title = "New Password Needed" %] @@ -644,14 +1006,11 @@ [% title = "Summary Needed" %] You must enter a summary for this [% terms.bug %]. - [% ELSIF error == "resolving_remaining_time" %] - [% title = "Trying to Resolve with Hours Remaining" %] - You cannot resolve [% terms.abug %] with hours still remaining. Set - Remaining Hours to zero if you want to resolve the [% terms.bug %]. - - [% ELSIF error == "sanity_check_access_denied" %] - [% title = "Access Denied" %] - You do not have the permissions necessary to run a sanity check. + [% ELSIF error == "saved_search_used_by_whines" %] + [% title = "Saved Search In Use" %] + The saved search <em>[% search_name FILTER html %]</em> is being used + by <a href="editwhines.cgi">Whining events</a> with the following subjects: + [%+ subjects FILTER html %] [% ELSIF error == "search_content_without_matches" %] [% title = "Illegal Search" %] @@ -728,6 +1087,49 @@ [% title = "Unknown Tab" %] <code>[% current_tab_name FILTER html %]</code> is not a legal tab name. + [% ELSIF error == "version_already_exists" %] + [% title = "Version Already Exists" %] + The version '[% name FILTER html %]' already exists for product ' + [%- product FILTER html %]'. + + [% ELSIF error == "version_blank_name" %] + [% title = "Blank Version Name Not Allowed" %] + You must enter a name for this version. + + [% ELSIF error == "version_has_bugs" %] + [% title = BLOCK %]Version has [% terms.Bugs %][% END %] + There are [% nb FILTER html %] [%+ terms.bugs %] associated with this + version! You must reassign those [% terms.bugs %] to another version + before you can delete this one. + + [% ELSIF error == "version_name_too_long" %] + [% title = "Version Name Is Too Long" %] + The name of a version is limited to 20 characters. + '[% name FILTER html %]' is too long ([% name.length %] characters). + + [% ELSIF error == "version_not_specified" %] + [% title = "No Version Specified" %] + No version specified when trying to edit versions. + + [% ELSIF error == "version_not_valid" %] + [% title = "Specified Version Does Not Exist" %] + The version '[% version FILTER html %]' for product + '[% product FILTER html %]' does not exist. + + [% ELSIF error == "users_deletion_disabled" %] + [% title = "Deletion not activated" %] + Sorry, the deletion of user accounts is not allowed. + + [% ELSIF error == "user_has_responsibility" %] + [% title = "Can't Delete User Account" %] + The user you want to delete is set up for roles as default [% terms.bug %] + assignee or QA contact for at least one component. + For this reason, you cannot delete the account at this time. + + [% ELSIF error == "user_login_required" %] + [% title = "Login Name Required" %] + You must enter a login name for the new user. + [% ELSIF error == "votes_must_be_nonnegative" %] [% title = "Votes Must Be Non-negative" %] Only use non-negative numbers for your [% terms.bug %] votes. @@ -754,10 +1156,18 @@ The file you are trying to attach is empty! [% ELSE %] - [% title = "Error string not found" %] - The user error string <code>[% error FILTER html %]</code> was not found. - Please send email to [% Param("maintainer") %] describing the steps taken - to obtain this message. + + [%# Try to find hooked error messages %] + [% error_message = Hook.process("errors") %] + + [% IF not error_message %] + [% title = "Error string not found" %] + The user error string <code>[% error FILTER html %]</code> was not found. + Please send email to [% Param("maintainer") %] describing the steps taken + to obtain this message. + [% ELSE %] + [% error_message FILTER none %] + [% END %] [% END %] [% END %] @@ -785,7 +1195,8 @@ [% USE Bugzilla %] [% namedcmd = Bugzilla.cgi.param("namedcmd") %] -[% IF namedcmd AND error != "missing_query" %] +[% IF namedcmd AND error != "missing_query" + AND error != "saved_search_used_by_whines" %] <p> ôÁË ÖÅ ×Ù ÍÏÖÅÔÅ <a href="buglist.cgi?cmdtype=dorem&remaction=forget&namedcmd= --- initialize.none.tmpl DELETED --- --- header.html.tmpl DELETED --- Index: confirm-user-match.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/global/confirm-user-match.html.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -d -r1.1 -r1.1.2.1 --- confirm-user-match.html.tmpl 16 Feb 2005 21:04:56 -0000 1.1 +++ confirm-user-match.html.tmpl 1 Nov 2005 19:54:42 -0000 1.1.2.1 @@ -23,8 +23,6 @@ #%] [%# INTERFACE: - # form: hash; the form values submitted to the script - # mform: hash; the form multi-values submitted to the script # fields: hash/record; the fields being matched, each of which has: # type: single|multi: whether or not the user can select multiple matches # flag_type: for flag requestee fields, the type of flag being requested @@ -56,10 +54,10 @@ ïÄÎÏ ÉÌÉ ÎÅÓËÏÌØËÏ ÉÍÅÎ É/ÉÌÉ ÁÄÒÅÓÏ× ÜÌÅËÔÒÏÎÎÏÊ ÐÏÞÔÙ, ÕËÁÚÁÎÎÙÈ ÎÁ ÐÒÅÄÙÄÕÝÅÊ ÓÔÒÁÎÉÃÅ, ÄÏÐÕÓËÁÀÔ ÎÅÏÄÎÏÚÎÁÞÎÙÊ ×ÙÂÏÒ. ðÏÖÁÌÕÊÓÔÁ, ×ÙÂÅÒÉÔÅ ÐÏÌØÚÏ×ÁÔÅÌÅÊ ÉÚ ÐÒÅÄÌÁÇÁÅÍÏÇÏ ÓÐÉÓËÁ, ÉÌÉ - ×ÅÒÎÉÔÅÓØ ÎÁ ÐÒÅÄÙÄÕÝÕÀ ÓÔÒÁÎÉÃÕ É ÕÔÏÞÎÉÔÅ ÷ÁÛ ×ÙÂÏÒ. + ×ÅÒÎÉÔÅÓØ ÎÁ ÐÒÅÄÙÄÕÝÕÀ ÓÔÒÁÎÉÃÕ É ÕÔÏÞÎÉÔÅ ×ÁÛ ×ÙÂÏÒ. </p> [% ELSE %] - [% PROCESS global/header.html.tmpl title="Match Failed" %] + [% PROCESS global/header.html.tmpl title="ðÏÌØÚÏ×ÁÔÅÌØ ÎÅ ÎÁÊÄÅÎ" %] <p> ïÄÎÏ ÉÌÉ ÎÅÓËÏÌØËÏ ÉÍÅÎ É/ÉÌÉ ÁÄÒÅÓÏ× ÜÌÅËÔÒÏÎÎÏÊ ÐÏÞÔÙ, ÕËÁÚÁÎÎÙÈ ÎÁ ÐÒÅÄÙÄÕÝÅÊ ÓÔÒÁÎÉÃÅ, ÎÅ ÎÁÊÄÅÎÙ. ðÏÖÁÌÕÊÓÔÁ, @@ -93,16 +91,6 @@ </font> ðÏÖÁÌÕÊÓÔÁ, ×ÅÒÎÉÔÅÓØ ÎÁ ÐÒÅÄÙÄÕÝÕÀ ÓÔÒÁÎÉÃÕ É ÕËÁÖÉÔÅ ÉÍÑ ÉÌÉ ÁÄÒÅÓ ÂÏÌÅÅ ÔÏÞÎÏ. - [% ELSIF fields.${field.key}.type == 'single' %] - ×ÁÒÉÁÎÔÙ:<br> - <select name="[% field.key FILTER html %]" - id="[% field.key FILTER html %]"> - [% FOREACH match = query.value.users %] - <option value="[% match.login FILTER html %]"> - [%- match.identity FILTER html -%] - </option> - [% END %] - </select> [% ELSE %] [% IF query.value.status == 'trunc' %] ËÏÌÉÞÅÓÔ×Ï ÎÁÊÄÅÎÎÙÈ ÐÏÌØÚÏ×ÁÔÅÌÅÊ ÂÏÌØÛÅ ÄÏÐÕÓÔÉÍÏÇÏ @@ -112,10 +100,12 @@ [% END %] <select name="[% field.key FILTER html %]" id="[% field.key FILTER html %]" - [% IF query.value.users.size > 5 %] - multiple="multiple" size="5"> - [% ELSE %] - multiple="multiple" size="[% query.value.users.size %]"> + [% IF fields.${field.key}.type == 'multi' %] + [% IF query.value.users.size > 5 %] + multiple="multiple" size="5"> + [% ELSE %] + multiple="multiple" size="[% query.value.users.size %]"> + [% END %] [% END %] [% FOREACH match = query.value.users %] <option value="[% match.login FILTER html %]"> Index: site-navigation.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/global/site-navigation.html.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -d -r1.1 -r1.1.2.1 --- site-navigation.html.tmpl 20 Feb 2005 10:22:51 -0000 1.1 +++ site-navigation.html.tmpl 1 Nov 2005 19:54:42 -0000 1.1.2.1 @@ -18,6 +18,8 @@ # # Contributor(s): Toms Baugis <tom...@ti...> # Gervase Markham <ge...@ge...> + # + # Russian translation: Vitaly Fedrushkov <fed...@us...> #%] [%# INTERFACE: @@ -37,18 +39,23 @@ [% IF bug && bug_list && bug_list.size > 0 %] <link rel="Up" href="buglist.cgi?regetlastlist=1"> + <link rel="First" href="show_bug.cgi?id=[% bug_list.first %]"> + <link rel="Last" href="show_bug.cgi?id=[% bug_list.last %]"> + [% current_bug_idx = lsearch(bug_list, bug.bug_id) %] - [% IF current_bug_idx > 0 %] - <link rel="First" href="show_bug.cgi?id=[% bug_list.first %]"> - [% prev_bug = current_bug_idx - 1 %] - <link rel="Prev" href="show_bug.cgi?id=[% bug_list.$prev_bug %]"> - [% END %] + [% IF current_bug_idx != -1 %] + + [% IF current_bug_idx > 0 %] + [% prev_bug = current_bug_idx - 1 %] + <link rel="Prev" href="show_bug.cgi?id=[% bug_list.$prev_bug %]"> + [% END %] + + [% IF current_bug_idx + 1 < bug_list.size %] + [% next_bug = current_bug_idx + 1 %] + <link rel="Next" href="show_bug.cgi?id=[% bug_list.$next_bug %]"> + [% END %] - [% IF current_bug_idx + 1 < bug_list.size %] - [% next_bug = current_bug_idx + 1 %] - <link rel="Next" href="show_bug.cgi?id=[% bug_list.$next_bug %]"> - <link rel="Last" href="show_bug.cgi?id=[% bug_list.last %]"> [% END %] [% END %] @@ -68,14 +75,14 @@ <link rel="Show" title="éÓÔÏÒÉÑ [% terms.bug_gen %]" href="show_activity.cgi?id=[% bug.bug_id %]"> <link rel="Show" title="÷ÅÒÓÉÑ ÄÌÑ ÐÅÞÁÔÉ" - href="long_list.cgi?buglist=[% bug.bug_id %]"> + href="show_bug.cgi?format=multiple&id=[% bug.bug_id %]"> [% END %] [%# *** Saved Searches *** %] [% IF user.showmybugslink %] [% user_login = user.login FILTER url_quote %] - <link rel="Saved Searches" title="íÏÉ [% terms.bugs %]" + <link rel="õÓÌÏ×ÉÑ ÏÔÂÏÒÁ" title="My [% terms.Bugs %]" href="[% Param('mybugstemplate').replace('%userid%', user_login) %]"> [% END %] @@ -99,6 +106,8 @@ href="editgroups.cgi">' IF user.groups.creategroups %] [% '<link rel="Administration" title="ëÌÀÞÅ×ÙÅ ÓÌÏ×Á" href="editkeywords.cgi">' IF user.groups.editkeywords %] + [% '<link rel="Administration" title="ïÐÏ×ÅÝÅÎÉÑ" + href="editwhines.cgi">' IF user.groups.bz_canusewhines %] [% '<link rel="Administration" title="ðÒÏ×ÅÒËÁ ÓÉÓÔÅÍÙ" href="sanitycheck.cgi">' IF user.groups.tweakparams %] [% END %] --- help.html.tmpl DELETED --- --- footer.html.tmpl DELETED --- Index: variables.none.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/global/variables.none.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -d -r1.2 -r1.2.2.1 --- variables.none.tmpl 23 Feb 2005 17:52:09 -0000 1.2 +++ variables.none.tmpl 1 Nov 2005 19:54:42 -0000 1.2.2.1 @@ -30,6 +30,19 @@ # Remember to PROCESS rather than INCLUDE this template. #%] +[%# Note on changing terms: + # Changing this will not affect "linkification" of your new terms. + # This means if you change "bug" to "problem", then if you have + # "problem 3" in a comment, it won't become a clickable URL. + # To have that feature, you must edit the quoteUrls function in + # globals.pl (in the base Bugzilla directory). + # Change the line: + # my $bug_re = qr/bug\s*\#?\s*(\d+)/i; + # to something like: + # my $bug_re = qr/(?:bug|problem)\s*\#?\s*(\d+)/i; + # (here "problem" was used instead of bug - substitute as needed!). + #%] + [% terms = { "bug" => "ÏÛÉÂËÁ", "bug_gen" => "ÏÛÉÂËÉ", --- help-header.html.tmpl DELETED --- Index: choose-product.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/global/choose-product.html.tmpl,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -d -r1.4 -r1.4.2.1 --- choose-product.html.tmpl 16 Feb 2005 18:01:12 -0000 1.4 +++ choose-product.html.tmpl 1 Nov 2005 19:54:41 -0000 1.4.2.1 @@ -29,7 +29,7 @@ [% PROCESS global/variables.none.tmpl %] [% IF target == "enter_bug.cgi" %] - [% title = "÷×ÏÄ $terms.bug_gen" %] + [% title = "òÅÇÉÓÔÒÁÃÉÑ $terms.bug_gen" %] [% h2 = BLOCK %]ðÒÅÖÄÅ ×ÓÅÇÏ, ×ÙÂÅÒÉÔÅ ÐÒÏÄÕËÔ, Ë ËÏÔÏÒÏÍÕ ÏÔÎÏÓÉÔÓÑ [% terms.abug %]. [% END %] [% ELSIF target == "describecomponents.cgi" %] [% title = "ïÐÉÓÁÎÉÅ ËÏÍÐÏÎÅÎÔÏ× $terms.Bugzilla" %] @@ -44,8 +44,9 @@ [% FOREACH p = proddesc.keys.sort %] <tr> <th align="right" valign="top"> - <a href="[% target %]?product=[% p FILTER url_quote %] - [% IF format %]&format=[% format FILTER url_quote %][% END %]"> + <a href="[% target %]?product=[% p FILTER url_quote -%] + [%- IF cloned_bug_id %]&cloned_bug_id=[% cloned_bug_id FILTER url_quote %][% END -%] + [%- IF format %]&format=[% format FILTER url_quote %][% END %]"> [% p FILTER html %]</a>: </th> --- select-menu.html.tmpl DELETED --- Index: code-error.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/global/code-error.html.tmpl,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -d -r1.5 -r1.5.2.1 --- code-error.html.tmpl 22 Feb 2005 04:40:23 -0000 1.5 +++ code-error.html.tmpl 1 Nov 2005 19:54:42 -0000 1.5.2.1 @@ -45,7 +45,7 @@ ÐÅÒÅÍÅÎÎÏÊ <em>action</em>. [% ELSIF error == "attachment_already_obsolete" %] - ðÒÉÌÏÖÅÎÉÅ #[% attachid FILTER html %] ([% description FILTER html %]) + ðÒÉÌÏÖÅÎÉÅ #[% attach_id FILTER html %] ([% description FILTER html %]) ÕÖÅ ÎÅ ÁËÔÕÁÌØÎÏ. [% ELSIF error == "auth_err" %] @@ -60,9 +60,13 @@ ÐÒÏÃÅÄÕÒÏÊ ÒÅÇÉÓÔÒÁÃÉÉ. [% ELSIF error == "bad_page_cgi_id" %] - [% title = "îÅÄÏÐÕÓÔÉÍÁÑ ÓÔÒÁÎÉÃÁ ID" %] + [% title = "îÅÄÏÐÕÓÔÉÍÙÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÓÔÒÁÎÉÃÙ" %] îÅÄÏÐÕÓÔÉÍÙÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÓÔÒÁÎÉÃÙ: ID <code>[% page_id FILTER html %]</code>. + [% ELSIF error == "bad_arg" %] + îÅÄÏÐÕÓÔÉÍÙÊ ÁÒÇÕÍÅÎÔ <code>[% argument FILTER html %]</code> + ÐÒÉ ×ÙÚÏ×Å ÆÕÎËÃÉÉ <code>[% function FILTER html %]</code>. + [% ELSIF error == "bug_error" %] ÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ [% bug.error FILTER html %] ÐÒÉ ÏÂÒÁÝÅÎÉÉ Ë [% terms.bug_dat %] [%+ bug.bug_id FILTER html %] . @@ -84,6 +88,9 @@ äÌÑ ÒÁÂÏÔÙ ÄÉÁÇÒÁÍÍ ÔÒÅÂÕÅÔÓÑ ÕÓÔÁÎÏ×ËÁ ÍÏÄÕÌÑ Perl Chart::Lines. äÌÑ ÐÏÌÕÞÅÎÉÑ ÉÎÓÔÒÕËÃÉÉ ÐÏ ÕÓÔÁÎÏ×ËÅ ÚÁÐÕÓÔÉÔÅ checksetup.pl. + [% ELSIF error == "cookies_need_value" %] + äÌÑ cookie ÄÏÌÖÎÏ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎÏ ÚÎÁÞÅÎÉÅ. + [% ELSIF error == "field_type_mismatch" %] ðÏÌÅ <code>[% field FILTER html %]</code> ÎÅ ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ ÔÉÐÕ <code>[% type FILTER html %]</code>. @@ -105,9 +112,6 @@ ðÏÐÙÔËÁ ÄÏÂÁ×ÉÔØ [% terms.bug_acc %] × ÎÅÁËÔÉ×ÎÕÀ ÇÒÕÐÐÕ, ÂÉÔ '[% bit FILTER html %]'. - [% ELSIF error == "bad_arg" %] - îÅÄÏÐÕÓÔÉÍÙÊ ÁÒÇÕÍÅÎÔ <code>[% argument FILTER html %]</code> - ÐÒÉ ×ÙÚÏ×Å ÆÕÎËÃÉÉ <code>[% function FILTER html %]</code>. [% ELSIF error == "invalid_attach_id_to_obsolete" %] îÅÄÏÐÕÓÔÉÍÙÊ ÎÏÍÅÒ ÐÒÉÌÏÖÅÎÉÑ [% attach_id FILTER html %] ÐÒÉ @@ -132,12 +136,26 @@ [% ELSIF error == "invalid_dimensions" %] [% title = "îÅÄÏÐÕÓÔÉÍÙÅ ÒÁÚÍÅÒÙ" %] ÷ÙÓÏÔÁ ÉÌÉ ÛÉÒÉÎÁ ÍÏÇÕÔ ÂÙÔØ ÚÁÄÁÎÙ ÔÏÌØËÏ ÐÏÌÏÖÉÔÅÌØÎÙÍ ÞÉÓÌÏÍ. - + + [% ELSIF error == "invalid_flag_association" %] + [% title = "îÅÄÏÐÕÓÔÉÍÁÑ ÐÒÉÎÁÄÌÅÖÎÏÓÔØ ÆÌÁÇÁ" %] + æÌÁÇ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÓÏÐÏÓÔÁ×ÌÅÎ + [% IF attach_id %] + ÐÒÉÌÏÖÅÎÉÀ [% attach_id FILTER html %]. + [% ELSE %] + [%+ terms.bug_dat %] [%+ bug_id FILTER html %]. + [% END %] + + [% ELSIF error == "invalid_isactive_flag" %] + [% title = "îÅÄÏÐÕÓÔÉÍÙÊ ÆÌÁÇ ÄÅÊÓÔ×ÉÑ" %] + îÅ×ÅÒÎÏ ÕÓÔÁÎÏ×ÌÅÎ ÆÌÁÇ ÄÅÊÓÔ×ÉÑ. ÷ÏÚÍÏÖÎÁ ×ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ + [% terms.Bugzilla %] ÉÌÉ ÏÛÉÂËÁ × ×ÁÛÅÍ ÂÒÏÕÚÅÒÅ. + [% ELSIF error == "invalid_series_id" %] [% title = "îÅÄÏÐÕÓÔÉÍÁÑ ÓÅÒÉÑ" %] îÅÄÏÐÕÓÔÉÍÙÊ ËÏÄ ÓÅÒÉÉ [% series_id FILTER html %]. ÷ÏÚÍÏÖÎÏ, ÓÅÒÉÑ ÄÁÎÎÙÈ ÕÄÁÌÅÎÁ. - + [% ELSIF error == "mismatched_bug_ids_on_obsolete" %] ðÒÉÌÏÖÅÎÉÅ [% attach_id FILTER html %] ([% description FILTER html %]) Ñ×ÌÑÅÔÓÑ ÞÁÓÔØÀ [% terms.bug_gen %] [%+ attach_bug_id FILTER html %]. @@ -146,7 +164,21 @@ [% ELSIF error == "flag_nonexistent" %] æÌÁÇ Ó ËÏÄÏÍ ID #[% id FILTER html %] ÎÅ ÓÕÝÅÓÔ×ÕÅÔ. - + + [% ELSIF error == "flags_not_available" %] + [% title = "éÚÍÅÎÅÎÉÅ ÆÌÁÇÏ× ÎÅÄÏÐÕÓÔÉÍÏ" %] + [% IF type == "b" %] + æÌÁÇÉ ÎÅ ÍÏÇÕÔ ÂÙÔØ ÉÚÍÅÎÅÎÙ ÐÒÉ ÇÒÕÐÐÏ×ÏÍ + ÒÅÄÁËÔÉÒÏ×ÁÎÉÉ [% terms.bugs_gen %]. + [% ELSE %] + éÚÍÅÎÅÎÉÅ ÓÏÓÔÏÑÎÉÑ ÆÌÁÇÏ× ÐÒÉ ÄÏÂÁ×ÌÅÎÉÉ ÐÒÉÌÏÖÅÎÉÑ + ÎÅÄÏÐÕÓÔÉÍÏ. + [% END %] + + [% ELSIF error == "flag_requestee_disabled" %] + [% title = "æÌÁÇ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÚÁÐÒÏÛÅÎ" %] + æÌÁÇ <em>[% name FILTER html %]</em> ÎÅ ÍÏÖÅÔ ÂÙÔØ ÚÁÐÒÏÛÅÎ. + [% ELSIF error == "flag_status_invalid" %] óÏÓÔÏÑÎÉÅ ÆÌÁÇÁ <em>[% status FILTER html %]</em> [% IF id %] @@ -165,6 +197,10 @@ ôÉÐ ÆÌÁÇÁ ID <em>[% id FILTER html %]</em> ÎÅ Ñ×ÌÑÅÔÓÑ ÐÏÌÏÖÉÔÅÌØÎÙÍ ÞÉÓÌÏÍ. + [% ELSIF error == "flag_type_inactive" %] + [% title = "ôÉÐ ÆÌÁÇÁ ÏÔËÌÀÞÅÎ" %] + äÁÎÎÙÊ ÔÉÐ ÆÌÁÇÁ ÏÔËÌÀÞÅÎ, ÓÏÚÄÁÎÉÅ ÆÌÁÇÏ× ÜÔÏÇÏ ÔÉÐÁ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ. + [% ELSIF error == "flag_type_nonexistent" %] ôÉÐ ÆÌÁÇÁ ID <em>[% id FILTER html %]</em> ÎÅ ÓÕÝÅÓÔ×ÕÅÔ. @@ -180,6 +216,10 @@ [% ELSIF error == "invalid_keyword_id" %] ëÌÀÞÅ×ÏÅ ÓÌÏ×Ï Ó ËÏÄÏÍ ID <em>[% id FILTER html %]</em> ÎÅ ÎÁÊÄÅÎÏ. + + [% ELSIF error == "invalid_user_id" %] + [% title = "îÅ×ÅÒÎÁÑ ÕÞÅÔÎÁÑ ÚÁÐÉÓØ" %] + õÞÅÔÎÏÊ ÚÁÐÉÓÉ <em>[% userid FILTER html %]</em> ÎÅ ÓÕÝÅÓÔ×ÕÅÔ. [% ELSIF error == "missing_bug_id" %] îÅ ÚÁÄÁÎ ÎÏÍÅÒ [% terms.bug_gen %]. @@ -191,8 +231,8 @@ [%+ series.name FILTER html %]. [% ELSIF error == "no_y_axis_defined" %] - ðÒÉ ÓÏÚÄÁÎÉÉ ÏÔÞÅÔÁ ÎÅ ÕËÁÚÁÎÁ ÏÓØ Y. ïÓØ X ÍÏÖÎÏ ÎÅ ÕËÁÚÙ×ÁÔØ, - ÎÏ ×ÙÂÏÒ ÏÓÉ Y ÏÂÑÚÁÔÅÌÅÎ. + ðÒÉ ÓÏÚÄÁÎÉÉ ÏÔÞÅÔÁ ÎÅ ×ÙÂÒÁÎÁ ×ÅÒÔÉËÁÌØÎÁÑ ÏÓØ. çÏÒÉÚÏÎÔÁÌØÎÕÀ ÏÓØ ÍÏÖÎÏ ÎÅ ÕËÁÚÙ×ÁÔØ, + ÎÏ ×ÙÂÏÒ ×ÅÒÔÉËÁÌØÎÏÊ ÏÓÉ ÏÂÑÚÁÔÅÌÅÎ. [% ELSIF error == "need_quipid" %] îÅ ÕËÁÚÁÎ ËÏÄ ÃÉÔÁÔÙ. @@ -204,9 +244,22 @@ <em>[% val FILTER html %]</em> ÎÅ Ñ×ÌÑÅÔÓÑ ÄÏÐÕÓÔÉÍÙÍ ÚÎÁÞÅÎÉÅÍ ÄÌÑ [%+ IF fld == "x" %]ÇÏÒÉÚÏÎÔÁÌØÎÏÊ ÏÓÉ [%+ ELSIF fld == "y" %]×ÅÒÔÉËÁÌØÎÏÊ ÏÓÉ - [%+ ELSIF fld == "z" %]ÎÅÓËÏÌØËÉÈ ÔÁÂÌÉà ÉÌÉ ÄÉÁÇÒÁÍÍ + [%+ ELSIF fld == "z" %]ÎÅÓËÏÌØËÉÈ ÄÉÁÇÒÁÍÍ ÉÌÉ ÓÔÒÁÎÉà [%+ ELSE %]ÏÓÉ[% END %]. + [% ELSIF error == "setting_info_invalid" %] + ðÒÉ ÓÏÚÄÁÎÉÉ ÎÏ×ÏÊ ÎÁÓÔÒÏÊËÉ ÔÒÅÂÕÅÔÓÑ ÕËÁÚÁÔØ ÎÁÚ×ÁÎÉÅ, ÓÐÉÓÏË ÚÎÁÞÅÎÉÊ + Ó ËÌÀÞÁÍÉ ÓÏÒÔÉÒÏ×ËÉ É ÚÎÁÞÅÎÉÅ ÐÏ ÕÍÏÌÞÁÎÉÀ. + + [% ELSIF error == "setting_name_invalid" %] + éÍÑ ÎÁÓÔÒÏÊËÉ <em>[% name FILTER html %]</em> ÎÅÄÏÐÕÓÔÉÍÏ. + éÍÅÎÁ ÎÁÓÔÒÏÅË ÄÏÌÖÎÙ ÎÁÞÉÎÁÔØÓÑ Ó ÌÁÔÉÎÓËÏÊ ÂÕË×Ù, ÓÏÄÅÒÖÁÔØ ÔÏÌØËÏ ÂÕË×Ù, + ÃÉÆÒÙ ÉÌÉ ÓÉÍ×ÏÌÙ '_', '-', '.', ':'. + + [% ELSIF error == "setting_value_invalid" %] + úÎÁÞÅÎÉÅ "<code>[% value FILTER html %]</code>" ÎÅ ×ÈÏÄÉÔ × ÓÐÉÓÏË ÄÏÐÕÓÔÉÍÙÈ + ÚÎÁÞÅÎÉÊ ÎÁÓÔÒÏÊËÉ <em>[% name FILTER html %]</em>. + [% ELSIF error == "token_generation_error" %] óÅÒØÅÚÎÁÑ ÏÛÉÂËÁ ÇÅÎÅÒÁÃÉÉ ÎÏÍÅÒÁ ÖÅÔÏÎÁ. @@ -221,7 +274,7 @@ [%# Useful message if browser did not select show_bug radio button %] [% IF field == "knob" %] ðÒÏ×ÅÒØÔÅ ×ÙÂÏÒ ×ÁÒÉÁÎÔÁ × ÐÏÌÅ "Leave as...". - [%# FIXME ËÁË ÅÇÏ ÔÁÍ?? %] + [%# FIXME-ru: ËÁË ÅÇÏ ÔÁÍ?? %] [% END %] [% ELSIF error == "unknown_action" %] @@ -231,6 +284,25 @@ äÅÊÓÔ×ÉÅ ÎÅ ÚÁÄÁÎÏ. [% END %] + [% ELSIF error == "nested_transaction" %] + ðÏÐÙÔËÁ ÎÁÞÁÔØ ÎÏ×ÕÀ ÔÒÁÎÚÁËÃÉÀ ÄÏ ÚÁ×ÅÒÛÅÎÉÑ ÐÒÅÄÙÄÕÝÅÊ. + + [% ELSIF error == "not_in_transaction" %] + ðÏÐÙÔËÁ ÚÁ×ÅÒÛÅÎÉÑ ÎÅÎÁÞÁÔÏÊ ÔÒÁÎÚÁËÃÉÉ. + + [% ELSIF error == "already_locked" %] + ðÏÐÙÔËÁ ÐÏ×ÔÏÒÎÏÊ ÂÌÏËÉÒÏ×ËÉ ÔÁÂÌÉÃÙ ÂÅÚ ÏÓ×ÏÂÏÖÄÅÎÉÑ ÐÒÅÄÙÄÕÝÅÊ: + <p>òÁÎÅÅ ÚÁÂÌÏËÉÒÏ×ÁÎÙ ÔÁÂÌÉÃÙ:<br>[% current FILTER html %] + <p>úÁÐÒÏÛÅÎÁ ÂÌÏËÉÒÏ×ËÁ:<br>[% new FILTER html %] + + [% ELSIF error == "no_matching_lock" %] + ðÏÐÙÔËÁ ÓÎÑÔÉÑ ÎÅÕÓÔÁÎÏ×ÌÅÎÎÏÊ ÂÌÏËÉÒÏ×ËÉ. + + [% ELSIF error == "comma_operator_deprecated" %] + [% title = "÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ ÇÅÎÅÒÁÔÏÒÁ ÚÁÐÒÏÓÏ× SQL" %] + ÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ × ËÏÄÅ ÇÅÎÅÒÁÔÏÒÁ ÚÁÐÒÏÓÏ× SQL, + ÓÏÚÄÁÎÉÅ ÚÁÐÒÏÓÁ Ó ÎÅÑ×ÎÙÍ JOIN. + [% ELSE %] [% title = "÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ" %]... [truncated message content] |
|
From: Vitaly F. <fed...@us...> - 2005-11-01 19:54:50
|
Update of /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/account/prefs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13194/template/ru/default/account/prefs Modified Files: Tag: BUGZILLA-2_20 account.html.tmpl email.html.tmpl footer.html.tmpl permissions.html.tmpl prefs.html.tmpl saved-searches.html.tmpl Log Message: Updated to Bugzilla-2.20 Index: saved-searches.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/account/prefs/saved-searches.html.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -d -r1.1 -r1.1.2.1 --- saved-searches.html.tmpl 25 Feb 2005 07:39:46 -0000 1.1 +++ saved-searches.html.tmpl 1 Nov 2005 19:54:41 -0000 1.1.2.1 @@ -19,34 +19,35 @@ # Contributor(s): Gervase Markham <ge...@ge...> # # Russian translation: Ilya Shevchik <il...@us...> + # Vitaly Fedrushkov <fed...@us...> #%] -<p>÷Ù ÓÏÈÒÁÎÉÌÉ ÓÌÅÄÕÀÝÉÅ ÚÁÐÒÏÓÙ:</p> +<p>óÏÈÒÁÎÅÎÎÙÅ ÕÓÌÏ×ÉÑ ÏÔÂÏÒÁ:</p> <blockquote> <table border="1" cellpadding="3"> <tr> <th> - úÁÐÒÏÓ + õÓÌÏ×ÉÅ </th> <th> - éÓÐÏÌÎÉÔØ + ïÔÏÂÒÁÔØ </th> <th> - òÅÄÁËÔÉÒÏ×ÁÔØ + éÚÍÅÎÉÔØ </th> <th> - úÁÂÙÔØ + õÄÁÌÉÔØ </th> <th> ðÏËÁÚÙ×ÁÔØ ×ÎÉÚÕ ÓÔÒÁÎÉÃÙ </th> </tr> <tr> - <td>íÏÉ ÏÛÉÂËÉ</td> + <td>íÏÉ [% terms.bugs %]</td> <td> [% filtered_username = user.login FILTER url_quote %] - <a href="[% Param('mybugstemplate').replace('%userid%', filtered_username) %]">éÓÐÏÌÎÉÔØ</a> + <a href="[% Param('mybugstemplate').replace('%userid%', filtered_username) %]">ïÔÏÂÒÁÔØ</a> </td> <td> @@ -65,14 +66,18 @@ <tr> <td>[% q.name FILTER html %]</td> <td> - <a href="buglist.cgi?[% q.query FILTER html %]">éÓÐÏÌÎÉÔØ</a> + <a href="buglist.cgi?[% q.query FILTER html %]">ïÔÏÂÒÁÔØ</a> </td> <td> - <a href="query.cgi?[% q.query FILTER html %]&known_name=[% q.name FILTER url_quote %]">òÅÄÁËÔÉÒÏ×ÁÔØ</a> + <a href="query.cgi?[% q.query FILTER html %]&known_name=[% q.name FILTER url_quote %]">éÚÍÅÎÉÔØ</a> </td> <td> - <a href="buglist.cgi?cmdtype=dorem&remaction=forget&namedcmd= - [% q.name FILTER html %]">úÁÂÙÔØ</a> + [% IF q.usedinwhine %] + éÓÐÏÌØÚÕÅÔÓÑ × <a href="editwhines.cgi">ÐÒÅÄÕÐÒÅÖÄÅÎÉÑÈ</a> + [% ELSE %] + <a href="buglist.cgi?cmdtype=dorem&remaction=forget&namedcmd= + [% q.name FILTER html %]">õÄÁÌÉÔØ</a> + [% END %] </td> <td align="center"> <input type="checkbox" Index: footer.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/account/prefs/footer.html.tmpl,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -d -r1.4 -r1.4.2.1 --- footer.html.tmpl 18 Apr 2005 12:59:08 -0000 1.4 +++ footer.html.tmpl 1 Nov 2005 19:54:41 -0000 1.4.2.1 @@ -47,7 +47,7 @@ [% IF queries.size %] [% FOREACH query = queries %] <tr> - <th align="right">óÏÈÒÁÎÅÎÎÙÊ ÚÁÐÒÏÓ '[% query.name FILTER html %]':</th> + <th align="right">õÓÌÏ×ÉÅ ÏÔÂÏÒÁ '[% query.name FILTER html %]':</th> <td> <select name="query-[% loop.index %]"> <option value="0">ÐÏËÁÚÙ×ÁÔØ ÔÏÌØËÏ × ÆÏÒÍÅ ÐÏÉÓËÁ</option> @@ -67,8 +67,8 @@ <tr> <td colspan="4"> <br> - óÏÚÄÁ× × <a href="query.cgi">ÆÏÒÍÅ ÐÏÉÓËÁ</a> ÓÏÈÒÁÎÅÎÎÙÅ - ÚÁÐÒÏÓÙ, ÍÏÖÎÏ ÐÅÒÅÊÔÉ ÎÁ ÜÔÕ ÓÔÒÁÎÉÃÕ ÎÁÓÔÒÏÊËÉ É ×ËÌÀÞÉÔØ + óÏÚÄÁ× × <a href="query.cgi">ÆÏÒÍÅ ÐÏÉÓËÁ</a> ÈÒÁÎÉÍÙÅ ÕÓÌÏ×ÉÑ + ÏÔÂÏÒÁ, ÍÏÖÎÏ ÐÅÒÅÊÔÉ ÎÁ ÜÔÕ ÓÔÒÁÎÉÃÕ ÎÁÓÔÒÏÊËÉ É ×ËÌÀÞÉÔØ ÎÅËÏÔÏÒÙÅ ÉÚ ÎÉÈ × ÐÏÄ×ÁÌ ËÁÖÄÏÊ ÓÔÒÁÎÉÃÙ [% terms.Bugzilla %]. <br> <br> Index: account.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/account/prefs/account.html.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -d -r1.3 -r1.3.2.1 --- account.html.tmpl 18 Apr 2005 12:30:43 -0000 1.3 +++ account.html.tmpl 1 Nov 2005 19:54:41 -0000 1.3.2.1 @@ -16,9 +16,9 @@ # Copyright (C) 1998 Netscape Communications Corporation. All # Rights Reserved. # - # Russian translation: Vitaly Fedrushkov <fed...@us...> - # # Contributor(s): Gervase Markham <ge...@ge...> + # + # Russian translation: Vitaly Fedrushkov <fed...@us...> #%] [%# INTERFACE: Index: permissions.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/account/prefs/permissions.html.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -d -r1.3 -r1.3.2.1 --- permissions.html.tmpl 25 Feb 2005 06:27:24 -0000 1.3 +++ permissions.html.tmpl 1 Nov 2005 19:54:41 -0000 1.3.2.1 @@ -1,4 +1,4 @@ -<!-- 1....@bu... --> +[%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of Index: email.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/account/prefs/email.html.tmpl,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -d -r1.5 -r1.5.2.1 --- email.html.tmpl 18 Apr 2005 12:51:22 -0000 1.5 +++ email.html.tmpl 1 Nov 2005 19:54:41 -0000 1.5.2.1 @@ -26,11 +26,13 @@ [%# INTERFACE: # watchedusers: string. # Comma-separated list of email addresses this user watches. + # watchers: array. + # Array of users watching this user's account. # excludeself: boolean. # True if user is not receiving self-generated mail. - # <rolename>: Multiple hashes, one for each rolename (e.g. owner; see - # below), keyed by reasonname (e.g. comments; again, see - # below). The value is a boolean - true if the user is + # <rolename>: Multiple hashes, one for each rolename (e.g. assignee; see + # below), keyed by reasonname (e.g. comments; again, see + # below). The value is a boolean - true if the user is # receiving mail for that reason when in that role. # Also references the 'supportwatchers' Param. #%] @@ -40,42 +42,32 @@ [% useqacontact = Param('useqacontact') %] [% usevotes = Param('usevotes') %] -<table> - [% IF Param('supportwatchers') %] - <tr> - <td colspan="4"> - <hr> - </td> - </tr> - - <tr> - <td colspan="4"> - åÓÌÉ ×Ù ×ÒÅÍÅÎÎÏ ÚÁÍÅÝÁÅÔÅ ÄÒÕÇÏÇÏ ÐÏÌØÚÏ×ÁÔÅÌÑ ÉÌÉ ÏÔ×ÅÞÁÅÔÅ - ÚÁ ËÏÎÔÒÏÌØ ËÁÞÅÓÔ×Á, Bugzilla ÍÏÖÅÔ ÄÕÂÌÉÒÏ×ÁÔØ ×ÁÍ ×ÓÅ ÓÏÏÂÝÅÎÉÑ, - ÎÁÐÒÁ×ÌÑÅÍÙÅ ÐÏÌØÚÏ×ÁÔÅÌÀ. ðÅÒÅÞÉÓÌÉÔÅ ÞÅÒÅÚ ÚÁÐÑÔÕÀ ÁÄÒÅÓÁ - ÐÏÌØÚÏ×ÁÔÅÌÅÊ, ÓÏÏÂÝÅÎÉÑ ËÏÔÏÒÙÈ ÎÅÏÂÈÏÄÉÍÏ ÄÕÂÌÉÒÏ×ÁÔØ. - </td> - </tr> +<p> + åÓÌÉ ×Ù ÎÅ ÈÏÔÉÔÅ ÐÏÌÕÞÁÔØ ÏÐÏ×ÅÝÅÎÉÅ Ï ÎÅÚÎÁÞÉÔÅÌØÎÙÈ ÉÚÍÅÎÅÎÉÑÈ + ÓÏÓÔÏÑÎÉÑ [% terms.bugs_gen %], ÉÚÍÅÎÉÔÅ ÎÁÓÔÒÏÊËÉ ÆÉÌØÔÒÁÃÉÉ + ÎÅËÏÔÏÒÙÈ (ÉÌÉ ×ÓÅÈ) ÓÏÏÂÝÅÎÉÊ: +</p> - <tr> - <th align="right">äÕÂÌÉÒÏ×ÁÔØ ÍÎÅ ÓÏÏÂÝÅÎÉÑ ÐÏÌØÚÏ×ÁÔÅÌÅÊ:</th> - <td> - <input size="35" name="watchedusers" - value="[% watchedusers FILTER html %]"> - </td> - </tr> - [% END %] +<script type="text/javascript"> +<!-- +function SetCheckboxes(setting) { + for (var count = 0; count < document.userprefsform.elements.length; count++) { + var theinput = document.userprefsform.elements[count]; + if (theinput.type == "checkbox" && !theinput.disabled) { + if (theinput.name.match("neg")) { + theinput.checked = false; + } + else { + theinput.checked = setting; + } + } + } +} - <tr> - <td colspan="2"> - <p> - åÓÌÉ ×Ù ÎÅ ÈÏÔÉÔÅ ÐÏÌÕÞÁÔØ ÏÐÏ×ÅÝÅÎÉÅ Ï ÎÅÚÎÁÞÉÔÅÌØÎÙÈ - ÉÚÍÅÎÅÎÉÑÈ ÓÏÓÔÏÑÎÉÑ [% terms.bug_gen %], ÉÚÍÅÎÉÔÅ ÎÁÓÔÒÏÊËÉ ÆÉÌØÔÒÁÃÉÉ - ÎÅËÏÔÏÒÙÈ (ÉÌÉ ×ÓÅÈ) ÓÏÏÂÝÅÎÉÊ: - </p> - </td> - </tr> -</table> +document.write('<input type="button" value="òÁÚÒÅÛÉÔØ ×ÓÅ ÐÉÓØÍÁ" onclick="SetCheckboxes(true); return false;">\n'); +document.write('<input type="button" value="úÁÐÒÅÔÉÔØ ×ÓÅ ÐÉÓØÍÁ" onclick="SetCheckboxes(false); return false;">\n'); +// --> +</script> <hr> @@ -89,132 +81,210 @@ <tr> <td width="150"></td> <td> - <input type="checkbox" name="ExcludeSelf" id="ExcludeSelf" value="on" - [% " checked" IF excludeself %]> - <label for="ExcludeSelf"> - ïÐÏ×ÅÝÁÔØ ÔÏÌØËÏ Ï ÉÚÍÅÎÅÎÉÑÈ, ×ÙÐÏÌÎÅÎÎÙÈ ÄÒÕÇÉÍÉ - ÐÏÌØÚÏ×ÁÔÅÌÑÍÉ</label> - <br> - </td> - </tr> - <tr> - <td width="150"></td> - <td> - <input type="checkbox" name="FlagRequestee" id="FlagRequestee" value="on" - [% " checked" IF FlagRequestee %]> - <label for="FlagRequestee">óÏÏÂÝÁÔØ ÍÎÅ, ËÏÇÄÁ ËÔÏ-ÔÏ ÐÒÏÓÉÔ ÍÅÎÑ ÕÓÔÁÎÏ×ÉÔØ ÆÌÁÇ</label> -<!-- FIXME: I don't understand --> + [% prefname = "email-$constants.REL_ANY-$constants.EVT_FLAG_REQUESTED" %] + <input type="checkbox" name="[% prefname %]" id="[% prefname %]" + value="1" + [% " checked" IF + mail.${constants.REL_ANY}.${constants.EVT_FLAG_REQUESTED} %]> + <label for="[% prefname %]">óÏÏÂÝÁÔØ ÍÎÅ, ËÏÇÄÁ ËÔÏ-ÔÏ ÐÒÏÓÉÔ ÍÅÎÑ ÕÓÔÁÎÏ×ÉÔØ ÆÌÁÇ</label> <br> </td> </tr> <tr> <td width="150"></td> <td> - <input type="checkbox" name="FlagRequester" id="FlagRequester" value="on" - [% " checked" IF FlagRequester %]> - <label for="FlagRequester">óÏÏÂÝÁÔØ ÍÎÅ, ËÏÇÄÁ ËÔÏ-ÔÏ ÕÓÔÁÎÁ×ÌÉ×ÁÅÔ ÆÌÁÇ, ËÏÔÏÒÙÊ Ñ ÚÁÐÒÏÓÉÌ</label> -<!-- FIXME: I don't understand --> + [% prefname = "email-$constants.REL_ANY-$constants.EVT_REQUESTED_FLAG" %] + <input type="checkbox" name="[% prefname %]" id="[% prefname %]" + value="1" + [% " checked" IF + mail.${constants.REL_ANY}.${constants.EVT_REQUESTED_FLAG} %]> + <label for="[% prefname %]">óÏÏÂÝÁÔØ ÍÎÅ, ËÏÇÄÁ ËÔÏ-ÔÏ ÕÓÔÁÎÁ×ÌÉ×ÁÅÔ ÆÌÁÇ, ËÏÔÏÒÙÊ Ñ ÚÁÐÒÏÓÉÌ</label> <br> </td> </tr> </table> -<noscript>åÓÌÉ ÂÙ Õ ×ÁÓ ÂÙÌ ÁËÔÉ×ÅÎ Javascript, ×Ù ÍÏÇÌÉ ÂÙ ×ËÌÀÞÉÔØ/×ÙËÌÀÞÉÔØ ×ÓÅ ÏÄÎÉÍ ËÌÉËÏÍ.<br></noscript> -<script type="text/javascript"> -<!-- -function SetCheckboxes(setting) { - for (var count = 0; count < document.userprefsform.elements.length; count++) { - var theinput = document.userprefsform.elements[count]; - if (theinput.type == "checkbox") { - if (theinput.name == "ExcludeSelf") { - theinput.checked = false; - } - else { - theinput.checked = setting; - } - } - } -} -document.write('<input type="button" value="òÁÚÒÅÛÉÔØ ×ÓÅ ÐÉÓØÍÁ" onclick="SetCheckboxes(true); return false;">\n'); -document.write('<input type="button" value="úÁÐÒÅÔÉÔØ ×ÓÅ ÐÉÓØÍÁ" onclick="SetCheckboxes(false); return false;">\n'); -// --> -</script> <hr> <b>ðÁÒÁÍÅÔÒÙ ÏÔÄÅÌØÎÙÈ ÉÚÍÅÎÅÎÉÊ/ÒÏÌÅÊ:</b> <br> <br> -<table width="100%" border="1"> +[% events = [ + { id = constants.EVT_ADDED_REMOVED, + description = "ÉÚÍÅÎÅÎÉÉ ÍÏÅÊ ÒÏÌÉ × ÜÔÏÊ ÏÛÉÂËÅ" }, + { id = constants.EVT_OPENED_CLOSED, + description = "ÐÒÉÎÑÔÉÉ ÉÌÉ ÏÔÍÅÎÅ ÒÅÛÅÎÉÑ" }, + { id = constants.EVT_PROJ_MANAGEMENT, + description = "ÉÚÍÅÎÅÎÉÉ ÐÒÉÏÒÉÔÅÔÁ, ÓÏÓÔÏÑÎÉÑ, ÓÅÒØÅÚÎÏÓÔÉ É/ÉÌÉ ÓÒÏËÏ×" }, + { id = constants.EVT_COMMENT, + description = "ÄÏÂÁ×ÌÅÎÉÉ ËÏÍÍÅÎÔÁÒÉÅ×" }, + { id = constants.EVT_ATTACHMENT, + description = "ÄÏÂÁ×ÌÅÎÉÉ ÐÒÉÌÏÖÅÎÉÊ" }, + { id = constants.EVT_ATTACHMENT_DATA, + description = "ÉÚÍÅÎÅÎÉÉ ÐÒÉÌÏÖÅÎÉÊ" }, + { id = constants.EVT_KEYWORD, + description = "ÉÚÍÅÎÅÎÉÉ ËÌÀÞÅ×ÙÈ ÓÌÏ×" }, + { id = constants.EVT_CC, + description = "ÉÚÍÅÎÅÎÉÉ ÐÏÄÐÉÓÞÉËÏ×" }, + { id = constants.EVT_OTHER, + description = "ÐÒÏÞÉÈ ÉÚÍÅÎÅÎÉÑÈ" }, +] %] + + +[%# FIXME-ru: ÚÁ×ÉÓÉÔ ÏÔ ÒÏÄÁ $terms.bug #%] + +[% neg_events = [ + { id = constants.EVT_UNCONFIRMED, + description = "ÐÒÉÓ×ÏÅÎÉÑ $terms.bug_dat ÓÔÁÔÕÓÁ ÎÅÐÏÄÔ×ÅÒÖÄÅÎÎÏÊ" }, + { id = constants.EVT_CHANGED_BY_ME, + description = "ÍÏÉÈ ÓÏÂÓÔ×ÅÎÎÙÈ ÉÚÍÅÎÅÎÉÊ" }, +] %] + +[% relationships = [ + { id = constants.REL_ASSIGNEE, + description = "éÓÐÏÌÎÉÔÅÌØ" }, + { id = constants.REL_QA, + description = "ðÒÉÅÍÝÉË" }, + { id = constants.REL_REPORTER, + description = "éÎÉÃÉÁÔÏÒ" }, + { id = constants.REL_CC, + description = "ðÏÄÐÉÓÞÉË" }, + { id = constants.REL_VOTER, + description = "çÏÌÏÓÕÀÝÉÊ" }, +] %] + +<table class="bz_emailprefs" border="1"> <tr> - <td colspan="[% (useqacontact AND usevotes) ? '5' : ((useqacontact OR usevotes) ? '4' : '3') %]" align="center" width="50%"> + <td colspan="[% (useqacontact AND usevotes) ? '5' : + ((useqacontact OR usevotes) ? '4' : '3') %]" + align="center" width="50%"> <b>ëÏÇÄÁ Ñ:</b> </td> - <td rowspan="2" width="50%"> + <td rowspan="2" width="40%"> <b>ñ ÄÏÌÖÅÎ ÐÏÌÕÞÁÔØ ÏÐÏ×ÅÝÅÎÉÑ Ï:</b> </td> </tr> <tr> - <td align="center" width="10%"> - <b>éÎÉÃÉÁÔÏÒ ÏÛÉÂËÉ</b> - </td> - <td align="center" width="10%"> - <b>ïÔ×ÅÔÓÔ×ÅÎÎÙÊ</b> - </td> - [% IF useqacontact %] - <td align="center" width="10%"> - <b>ëÏÎÔÒÏÌØ ËÁÞÅÓÔ×Á</b> - </td> + [% FOREACH relationship = relationships %] + [% NEXT IF (relationship.id == constants.REL_QA AND NOT useqacontact) OR + (relationship.id == constants.REL_VOTER AND NOT usevotes) %] + <th align="center" width="9%"> + [% relationship.description FILTER html %] + </th> [% END %] - <td align="center" width="10%"> - <b>ðÏÄÐÉÓÞÉË</b> - </td> - [% IF usevotes %] - <td align="center" width="10%"> - <b>çÏÌÏÓÕÀÝÉÊ</b> + </tr> + + [% FOREACH event = events %] + [% count = loop.count() %] + <tr class="bz_row_[% count % 2 == 1 ? "odd" : "even" %]"> + [% FOREACH relationship = relationships %] + [% NEXT IF (relationship.id == constants.REL_QA AND NOT useqacontact) OR + (relationship.id == constants.REL_VOTER AND NOT usevotes) %] + <td align="center"> + <input type="checkbox" + name="email-[% relationship.id %]-[% event.id %]" + value="1" + [%# The combinations don't always make sense; disable a couple %] + [% IF event.id == constants.EVT_ADDED_REMOVED AND + (relationship.id == constants.REL_REPORTER OR + relationship.id == constants.REL_VOTER) %] + disabled + [% ELSIF mail.${relationship.id}.${event.id} %] + checked + [% END %]> + </td> + [% END %] + <td> + [% event.description FILTER html %] </td> - [% END %] + </tr> + [% END %] + + <tr> + <td colspan="[% (useqacontact AND usevotes) ? '5' : + ((useqacontact OR usevotes) ? '4' : '3') %]" + align="center" width="50%"> + + </td> + <td width="40%"> + <b>ËÒÏÍÅ ÓÌÕÞÁÅ×:</b> + </td> </tr> -[% bugLabelLower = BLOCK %] -[% terms.bug_abl %] -[% END %] - - [% FOREACH reason = [ - { name = 'Removeme', - description = 'ÉÚÍÅÎÅÎÉÉ ÒÏÌÉ × ÜÔÏÊ ÏÛÉÂËÅ' }, - { name = 'Comments', - description = 'ÄÏÂÁ×ÌÅÎÉÉ ËÏÍÍÅÎÔÁÒÉÅ×' }, - { name = 'Attachments', - description = 'ÄÏÂÁ×ÌÅÎÉÉ ÐÒÉÌÏÖÅÎÉÊ' }, - { name = 'Status', - description = 'ÉÚÍÅÎÅÎÉÉ ÐÒÉÏÒÉÔÅÔÁ, ÓÏÓÔÏÑÎÉÑ, ÓÅÒØÅÚÎÏÓÔÉ É/ÉÌÉ ÓÒÏËÏ×' }, - { name = 'Resolved', - description = 'ÐÒÉÎÑÔÉÉ ÉÌÉ ÕÔ×ÅÒÖÄÅÎÉÉ ÒÅÛÅÎÉÑ' }, - { name = 'Keywords', - description = 'ÉÚÍÅÎÅÎÉÉ ËÌÀÞÅ×ÙÈ ÓÌÏ×' }, - { name = 'CC', - description = 'ÉÚÍÅÎÅÎÉÉ ÐÏÄÐÉÓÞÉËÏ×' }, - { name = 'Other', - description = 'ÐÒÏÞÉÈ ÉÚÍÅÎÅÎÉÑÈ' } - { name = 'Unconfirmed', - description = "ÐÏÌÕÞÅÎÉÉ ${bugLabelLower} ÓÔÁÔÕÓÁ ÎÅÐÏÄÔ×ÅÒÖÄÅÎÎÏÊ" }, - ] %] - <tr> - [% FOREACH role = [ "Reporter", "Owner", "QAcontact", "CClist", "Voter" ] - %] - [% NEXT IF role == "QAcontact" AND NOT useqacontact %] - [% NEXT IF role == "Voter" AND NOT usevotes %] + [% FOREACH event = neg_events %] + [% count = loop.count() %] + <tr class="bz_row_[% count % 2 == 1 ? "odd" : "even" %]"> + [% FOREACH relationship = relationships %] + [% NEXT IF (relationship.id == constants.REL_QA AND NOT useqacontact) OR + (relationship.id == constants.REL_VOTER AND NOT usevotes) %] <td align="center"> - <input type="checkbox" name="email[% role %][% reason.name %]" value="on" - [% " checked" IF $role.${reason.name} %]> + <input type="checkbox" + name="neg-email-[% relationship.id %]-[% event.id %]" + value="1" + [% " checked" IF NOT mail.${relationship.id}.${event.id} %]> </td> [% END %] <td> - [% reason.description %] + [% event.description FILTER html %] </td> </tr> [% END %] + </table> +[%# Add hidden form fields for fields not used %] +[% FOREACH event = events %] + [% FOREACH relationship = relationships %] + [% IF (relationship.id == constants.REL_QA AND NOT useqacontact) OR + (relationship.id == constants.REL_VOTER AND NOT usevotes) %] + <input type="hidden" + name="email-[% relationship.id %]-[% event.id %]" + value="[% mail.${relationship.id}.${event.id} ? "1" : "0" %]"> + [% END %] + [% END %] +[% END %] + +[% FOREACH event = neg_events %] + [% FOREACH relationship = relationships %] + [% IF (relationship.id == constants.REL_QA AND NOT useqacontact) OR + (relationship.id == constants.REL_VOTER AND NOT usevotes) %] + <input type="hidden" + name="neg-email-[% relationship.id %]-[% event.id %]" + value="[% mail.${relationship.id}.${event.id} ? "0" : "1" %]"> + [% END %] + [% END %] +[% END %] + +[% IF Param('supportwatchers') %] +<hr> +<b>äÕÂÌÉÒÏ×ÁÎÉÅ ÏÐÏ×ÅÝÅÎÉÊ</b> + +<p> +äÕÂÌÉÒÏ×ÁÎÉÅ ÏÐÏ×ÅÝÅÎÉÊ ÐÏÌÅÚÎÏ, ËÏÇÄÁ ×Ù ÚÁÍÅÝÁÅÔÅ ÄÒÕÇÉÈ +ÐÏÌØÚÏ×ÁÔÅÌÅÊ ÉÌÉ ÏÔ×ÅÞÁÅÔÅ ÚÁ ÐÒÉÅÍËÕ. óÏÏÂÝÅÎÉÑ ÏÔÐÒÁ×ÌÑÀÔÓÑ × +ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó <u>×ÁÛÉÍÉ</u> ÎÁÓÔÒÏÊËÁÍÉ ÎÏ Ó ÕÞÅÔÏÍ <u>ÉÈ</u> ÒÏÌÅÊ +ÐÏ ÏÔÎÏÛÅÎÉÀ Ë [% terms.bug_gen %]. ðÅÒÅÞÉÓÌÉÔÅ ÞÅÒÅÚ ÚÁÐÑÔÕÀ ÁÄÒÅÓÁ +ÐÏÌØÚÏ×ÁÔÅÌÅÊ, ÏÐÏ×ÅÝÅÎÉÑ ËÏÔÏÒÙÈ ÎÅÏÂÈÏÄÉÍÏ ÄÕÂÌÉÒÏ×ÁÔØ. +</p> + +<p>äÕÂÌÉÒÏ×ÁÔØ ÍÎÅ ÏÐÏ×ÅÝÅÎÉÑ ÐÏÌØÚÏ×ÁÔÅÌÅÊ: + <input size="60" name="watchedusers" + value="[% watchedusers FILTER html %]"> +</p> + +<p>÷ÁÛÉ ÏÐÏ×ÅÝÅÎÉÑ ÐÏÓÔÕÐÁÀÔ ÐÏÌØÚÏ×ÁÔÅÌÑÍ:<br> + [% IF watchers.size %] + [% FOREACH watcher = watchers %] + [% watcher FILTER html %] <br> + [% END %] + [% ELSE %] + <i>îÉËÏÍÕ</i> + [% END %] +</p> + +[% END %] + +<hr> + <br> Index: prefs.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/account/prefs/prefs.html.tmpl,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -d -r1.5 -r1.5.2.1 --- prefs.html.tmpl 25 Feb 2005 07:32:01 -0000 1.5 +++ prefs.html.tmpl 1 Nov 2005 19:54:41 -0000 1.5.2.1 @@ -1,4 +1,4 @@ -<!-- 1....@bu... --> +[%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of @@ -38,25 +38,29 @@ [% filtered_login = user.login FILTER html %] [% PROCESS global/header.html.tmpl - title = "ðÁÒÁÍÅÔÒÙ ÐÏÌØÚÏ×ÁÔÅÌÑ" + title = "User Preferences" h2 = filtered_login style = "td.selected_tab { border-width: 2px 2px 0px; border-style: solid; + border-color: black; } td.unselected_tab, td.spacer { border-width: 0px 0px 2px 0px; border-style: solid; + border-color: black; }" %] [% tabs = [ { name => "account", description => "õÞÅÔÎÁÑ ÚÁÐÉÓØ", saveable => "1" }, + { name => "settings", description => "ïÂÝÉÅ ÐÁÒÁÍÅÔÒÙ", + saveable => "1" }, { name => "email", description => "üÌÅËÔÒÏÎÎÁÑ ÐÏÞÔÁ", saveable => "1" }, - { name => "saved-searches", description => "óÏÈÒÁÎÅÎÎÙÅ ÐÏÉÓËÏ×ÙÅ ÚÁÐÒÏÓÙ", + { name => "saved-searches", description => "õÓÌÏ×ÉÑ ÏÔÂÏÒÁ", saveable => "1" }, - { name => "permissions", description => "ðÒÁ×Á", + { name => "permissions", description => "òÁÚÒÅÛÅÎÉÑ", saveable => "0" } ] %] <center> |
|
From: Vitaly F. <fed...@us...> - 2005-11-01 19:54:50
|
Update of /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/attachment In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13194/template/ru/default/attachment Modified Files: Tag: BUGZILLA-2_20 choose.html.tmpl content-types.html.tmpl create.html.tmpl created.html.tmpl diff-file.html.tmpl diff-header.html.tmpl edit.html.tmpl list.html.tmpl show-multiple.html.tmpl updated.html.tmpl Removed Files: Tag: BUGZILLA-2_20 diff-footer.html.tmpl Log Message: Updated to Bugzilla-2.20 Index: content-types.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/attachment/content-types.html.tmpl,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -d -r1.4 -r1.4.2.1 --- content-types.html.tmpl 20 Apr 2005 14:15:56 -0000 1.4 +++ content-types.html.tmpl 1 Nov 2005 19:54:41 -0000 1.4.2.1 @@ -17,13 +17,15 @@ # Rights Reserved. # # Contributor(s): Myk Melez <my...@mo...> + # # Russian translation: Vitaly Fedrushkov <fed...@us...> # Dmitry Pupkov <dp...@mc...> #%] <option value="text/plain">ÐÒÏÓÔÏÊ ÔÅËÓÔ (text/plain)</option> <option value="text/html">HTML ÆÁÊÌ (text/html)</option> - <option value="image/gif">GIF ËÁÒÔÉÎËÁ (image/gif)</option> - <option value="image/jpeg">JPEG ËÁÒÔÉÎËÁ (image/jpeg)</option> - <option value="image/png">PNG ËÁÒÔÉÎËÁ (image/png)</option> + <option value="application/xml">XML (application/xml)</option> + <option value="image/gif">ÉÚÏÂÒÁÖÅÎÉÅ GIF (image/gif)</option> + <option value="image/jpeg">ÉÚÏÂÒÁÖÅÎÉÅ JPEG (image/jpeg)</option> + <option value="image/png">ÉÚÏÂÒÁÖÅÎÉÅ PNG (image/png)</option> <option value="application/octet-stream">ÉÓÐÏÌÎÑÅÍÙÊ ÆÁÊÌ (application/octet-stream)</option> Index: edit.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/attachment/edit.html.tmpl,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -d -r1.4 -r1.4.2.1 --- edit.html.tmpl 20 Apr 2005 14:15:57 -0000 1.4 +++ edit.html.tmpl 1 Nov 2005 19:54:41 -0000 1.4.2.1 @@ -42,7 +42,7 @@ " %] -<script type="application/x-javascript" language="JavaScript"> +<script type="text/javascript"> <!-- var prev_mode = 'raw'; var current_mode = 'raw'; @@ -215,7 +215,7 @@ <input type="text" size="20" name="filename" value="[% filename FILTER html %]"><br> <b>òÁÚÍÅÒ: </b>[% datasize FILTER unitconvert %]<br> - <b>MIME - ÔÉÐ:</b><br> + <b>ôÉÐ ÆÁÊÌÁ:</b><br> <input type="text" size="20" name="contenttypeentry" value="[% contenttype FILTER html %]"><br> <input type="checkbox" id="ispatch" name="ispatch" value="1" @@ -223,7 +223,7 @@ <label for="ispatch">ÐÁÔÞ</label> <input type="checkbox" id="isobsolete" name="isobsolete" value="1" [% 'checked="checked"' IF isobsolete %]> - <label for="isobsolete">obsolete</label><br> + <label for="isobsolete">ÎÅÁËÔÕÁÌØÎÏ</label><br> [% IF (Param("insidergroup") && UserInGroup(Param("insidergroup"))) %] <input type="checkbox" name="isprivate" value="1"[% " checked" IF isprivate %]> ÚÁËÒÙÔÏ<br><br> [% ELSE %]<br> @@ -238,10 +238,10 @@ <textarea name="comment" rows="5" cols="25" wrap="soft"></textarea><br> </div> - <input type="submit" value="éÚÍÅÎÉÔØ"><br><br> + <input type="submit" value="óÏÈÒÁÎÉÔØ"><br><br> <strong>äÅÊÓÔ×ÉÅ:</strong> <a href="attachment.cgi?id=[% attachid %]">ðÒÏÓÍÏÔÒÅÔØ</a> [% IF ispatch && patchviewerinstalled %] - | <a href="attachment.cgi?id=[% attachid %]&action=diff">éÚÍÅÎÅÎÉÅ</a> + | <a href="attachment.cgi?id=[% attachid %]&action=diff">óÒÁ×ÎÉÔØ</a> [% END %] </small> </td> @@ -250,16 +250,16 @@ <td width="75%"> <textarea id="editFrame" name="comment" style="height: 400px; width: 100%; display: none;" cols="80" wrap="soft"></textarea> <iframe id="viewFrame" src="attachment.cgi?id=[% attachid %]" style="height: 400px; width: 100%;"> - <b> ÷Ù ÎÅ ÍÏÖÅÔÅ ÏÄÎÏ×ÒÅÍÅÎÎÏ ÒÅÄÁËÔÉÒÏ×ÁÔØ É ÐÒÏÓÍÁÔÒÉ×ÁÔØ ÓÏÏÂÝÅÎÉÑ, ÐÏÔÏÍÕ ÞÔÏ ×ÁÛ ÂÒÁÕÚÅÒ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ IFAME + <b> ÷Ù ÎÅ ÍÏÖÅÔÅ ÏÄÎÏ×ÒÅÍÅÎÎÏ ÒÅÄÁËÔÉÒÏ×ÁÔØ É ÐÒÏÓÍÁÔÒÉ×ÁÔØ ÓÏÏÂÝÅÎÉÑ, ÐÏÔÏÍÕ ÞÔÏ ×ÁÛ ÂÒÁÕÚÅÒ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ IFRAME. <a href="attachment.cgi?id=[% attachid %]">ðÒÏÓÍÏÔÒÅÔØ ÐÒÉÌÏÖÅÎÉÅ ÎÁ ÏÔÄÅÌØÎÏÊ ÓÔÒÁÎÉÃÅ</a>.</b> </iframe> - <script type="application/x-javascript" language="JavaScript"> + <script type="text/javascript"> <!-- if (typeof document.getElementById == "function") { [% IF patchviewerinstalled %] document.write('<iframe id="viewDiffFrame" style="height: 400px; width: 100%; display: none;"></iframe>'); [% END %] - document.write('<button type="button" id="editButton" onclick="editAsComment();">òÅÄÁËÔÉÒÏ×ÁÔØ ÐÒÉÌÏÖÅÎÉÅ × ×ÉÄÅ ÉÓÈÏÄÎÉËÏ×</button>'); + document.write('<button type="button" id="editButton" onclick="editAsComment();">òÅÄÁËÔÉÒÏ×ÁÔØ ÐÒÉÌÏÖÅÎÉÅ ËÁË ÔÅËÓÔ</button>'); document.write('<button type="button" id="undoEditButton" onclick="undoEditAsComment();" style="display: none;">Undo Edit As Comment</button>'); document.write('<button type="button" id="redoEditButton" onclick="redoEditAsComment();" style="display: none;">Redo Edit As Comment</button>'); [% IF patchviewerinstalled %] @@ -273,12 +273,12 @@ [% ELSE %] <td id="noview" width="50%"> <p><b> - ÷Ù ÎÅ ÍÏÖÅÔÅ ÐÒÏÓÍÏÔÒÔØ ÄÁÎÎÏÅ ÐÒÉÌÏÖÅÎÉÅ × ×ÁÛÅÍ ÂÒÁÕÚÅÒÅ, ÐÏÔÏÍÕ ÞÔÏ - ×ÁÛ ÂÒÁÕÚÅÒ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÄÁÎÎÙÊ ÔÉÐ ÐÒÉÌÏÖÅÎÉÑ + ðÒÏÓÍÏÔÒ ÐÒÉÌÏÖÅÎÉÑ ÎÅ×ÏÚÍÏÖÅÎ, ÐÏÔÏÍÕ ÞÔÏ + ×ÁÛ ÂÒÏÕÚÅÒ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÔÉÐ ÆÁÊÌÏ× ([% contenttype FILTER html %]). </b></p> <p><b> - <a href="attachment.cgi?id=[% attachid %]">óËÏÐÉÒÏ×ÁÔØ ÐÒÉÌÏÖÅÎÉÅ Ë ÓÅÂÅ ÎÁ ËÏÍÐØÀÔÅÒ</a>. + <a href="attachment.cgi?id=[% attachid %]">úÁÇÒÕÚÉÔØ ÐÒÉÌÏÖÅÎÉÅ</a>. </b></p> </td> [% END %] --- diff-footer.html.tmpl DELETED --- Index: diff-file.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/attachment/diff-file.html.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -d -r1.1 -r1.1.2.1 --- diff-file.html.tmpl 10 Mar 2005 13:51:47 -0000 1.1 +++ diff-file.html.tmpl 1 Nov 2005 19:54:41 -0000 1.1.2.1 @@ -42,14 +42,16 @@ [% END %] [% END %] </td></tr></thead><tbody class="[% collapsed ? 'file_collapse' : 'file' %]"> -<script type="application/x-javascript" language="JavaScript"> +<script type="text/javascript"> incremental_restore() </script> [% section_num = 0 %] [% FOREACH section = sections %] [% section_num = section_num + 1 %] - <tr><th class="section_head" colspan="2"> + <tr><th colspan="2" class="section_head"> + <table cellpadding="0" cellspacing="0"> + <tr><th width="95%" align="left"> [% IF file.is_add %] Added [% ELSIF file.is_remove %] @@ -63,15 +65,19 @@ <a href="[% bonsai_prefix %]#[% section.old_start %]"> [% END %] [% IF section.old_lines > 1 %] - Lines [% section.old_start %]-[% section.old_start + section.old_lines - 1 %] + Lines [% section.old_start %]-[% section.old_start + + section.old_lines - 1 %] [% ELSE %] - Line [% section.old_start %] + Line [% section.old_start %] [% END %] [% IF bonsai_prefix %] </a> [% END %] + [% section.func_info FILTER html IF section.func_info %] [% END %] - (<a name="[% file.filename FILTER html %]_sec[% section_num %]" href="#[% file.filename FILTER html %]_sec[% section_num %]">Link Here</a>) + </th><th> + <a name="[% file.filename FILTER html %]_sec[% section_num %]" href="#[% file.filename FILTER html %]_sec[% section_num %]">Link Here</a> + </th></tr></table> </th></tr> [% FOREACH group = section.groups %] [% IF group.context %] Index: list.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/attachment/list.html.tmpl,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -d -r1.4 -r1.4.2.1 --- list.html.tmpl 20 Apr 2005 14:15:57 -0000 1.4 +++ list.html.tmpl 1 Nov 2005 19:54:41 -0000 1.4.2.1 @@ -17,6 +17,7 @@ # Rights Reserved. # # Contributor(s): Myk Melez <my...@mo...> + # # Russian translation: Vitaly Fedrushkov <fed...@us...> # Dmitry Pupkov <dp...@mc...> #%] @@ -25,7 +26,7 @@ <table cellspacing="0" cellpadding="4" border="1"> <tr> <th bgcolor="#cccccc" align="left">ðÒÉÌÏÖÅÎÉÅ</th> - <th bgcolor="#cccccc" align="left">ôÉÐ äÁÎÎÙÈ</th> + <th bgcolor="#cccccc" align="left">ôÉÐ ÄÁÎÎÙÈ</th> <th bgcolor="#cccccc" align="left">óÏÚÄÁÎÏ</th> <th bgcolor="#cccccc" align="left">òÁÚÍÅÒ</th> [% IF show_attachment_flags %] @@ -61,28 +62,24 @@ [% IF flag.setter %] [% flag.setter.nick FILTER html %]: [% END %] - [%+ flag.type.name FILTER html %][% flag.status %] + [%+ flag.type.name FILTER html FILTER no_break %][% flag.status %] [%+ IF flag.status == "?" && flag.requestee %] ([% flag.requestee.nick FILTER html %]) [% END %]<br> + [% END %] [% END %] - [% END %] - </td> - [% END %] - - <td valign="top"> - [% IF attachment.canedit %] - <a href="attachment.cgi?id=[% attachment.attachid %]&action=edit">òÅÄÁËÔÉÒÏ×ÁÔØ</a> + </td> [% END %] - [% IF attachment.ispatch && patchviewerinstalled %] - [% IF attachment.canedit %] - | + + <td valign="top"> + <a href="attachment.cgi?id=[% attachment.attachid %]&action=edit">éÚÍÅÎÉÔØ</a> + [% IF attachment.ispatch && patchviewerinstalled %] + | <a href="attachment.cgi?id=[% attachment.attachid %]&action=diff">óÒÁ×ÎÉÔØ</a> [% END %] - <a href="attachment.cgi?id=[% attachment.attachid %]&action=diff">éÚÍÅÎÅÎÉÅ</a> - [% END %] - </td> - </tr> - [% END %] + [% Hook.process("action") %] + </td> + </tr> + [% END %] [% END %] <tr> Index: diff-header.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/attachment/diff-header.html.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -d -r1.2 -r1.2.2.1 --- diff-header.html.tmpl 20 Apr 2005 14:15:56 -0000 1.2 +++ diff-header.html.tmpl 1 Nov 2005 19:54:41 -0000 1.2.2.1 @@ -17,8 +17,6 @@ # Rights Reserved. # # Contributor(s): John Keiser <jk...@ne...> - # Russian translation: Vitaly Fedrushkov <fed...@us...> - # Dmitry Pupkov <dp...@mc...> #%] [%# Define strings that will serve as the title and header of this page %] @@ -29,7 +27,7 @@ [% IF attachid %] Attachment #[% attachid %] for [% terms.bug %] #[% bugid %] [% ELSE %] -Interdiff of #[% oldid %] and #[% newid %] for #[% terms.bug %] #[% bugid %] +Interdiff of #[% oldid %] and #[% newid %] for [% terms.bug %] #[% bugid %] [% END %] [% END %] @@ -83,7 +81,6 @@ tbody.file pre:empty { display: block; - height: 1em; } .changed { @@ -231,7 +228,7 @@ <style type="text/css"> [% style %] </style> - <script type="text/javascript" language="JavaScript"> + <script type="text/javascript"> <!-- [% javascript %] --> Index: choose.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/attachment/choose.html.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -d -r1.1 -r1.1.2.1 --- choose.html.tmpl 20 Apr 2005 14:35:25 -0000 1.1 +++ choose.html.tmpl 1 Nov 2005 19:54:41 -0000 1.1.2.1 @@ -22,10 +22,11 @@ [% PROCESS global/variables.none.tmpl %] [% PROCESS global/header.html.tmpl - title = "Locate attachment" + title = "Locate attachment", + onload = "document.forms['choose-id'].id.focus()" %] -<form method="get" action="attachment.cgi"> +<form name="choose-id" method="get" action="attachment.cgi"> <p>Access an attachment by entering its ID into the form below:</p> <p>Attachment ID: <input name="id" size="6"> <button name="action" value="edit"> Edit </button> Index: updated.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/attachment/updated.html.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -d -r1.3 -r1.3.2.1 --- updated.html.tmpl 20 Apr 2005 14:15:57 -0000 1.3 +++ updated.html.tmpl 1 Nov 2005 19:54:41 -0000 1.3.2.1 @@ -18,6 +18,7 @@ # # Contributor(s): Myk Melez <my...@mo...> # Gervase Markham <ge...@ge...> + # # Russian translation: Vitaly Fedrushkov <fed...@us...> # Dmitry Pupkov <dp...@mc...> #%] Index: create.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/attachment/create.html.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -d -r1.3 -r1.3.2.1 --- create.html.tmpl 20 Apr 2005 14:15:56 -0000 1.3 +++ create.html.tmpl 1 Nov 2005 19:54:41 -0000 1.3.2.1 @@ -17,6 +17,7 @@ # Rights Reserved. # # Contributor(s): Myk Melez <my...@mo...> + # # Russian translation: Vitaly Fedrushkov <fed...@us...> # Dmitry Pupkov <dp...@mc...> #%] @@ -45,6 +46,12 @@ vertical-align: baseline; padding-bottom: 5px; } + + table#flags th, table#flags td { + text-align: left; + vertical-align: baseline; + font-size: small; + } " onload="setContentTypeDisabledState();" %] @@ -55,17 +62,30 @@ <table class="attachment_entry"> <tr> - <th>æÁÊÌ:</th> + <th><label for="data">æÁÊÌ:</label></th> <td> <em>÷×ÅÄÉÔÅ ÐÕÔØ Ë ÆÁÊÌÕ ÎÁ ×ÁÛÅÍ ËÏÍÐØÀÔÅÒÅ.</em><br> - <input type="file" name="data" size="50" value="÷ÙÂÒÁÔØ"> + <input type="file" id="data" name="data" size="50"> </td> </tr> + [% IF Param("maxlocalattachment") %] <tr> - <th>ïÐÉÓÁÎÉÅ:</th> + <th>âÏÌØÛÏÊ ÆÁÊÌ:</th> + <td> + <input type="checkbox" id="bigfile" + name="bigfile" value="bigfile"> + <label for="bigfile"> + ÂÏÌØÛÏÊ ÆÁÊÌ ÈÒÁÎÉÔÓÑ ÏÔÄÅÌØÎÏ ÏÔ ÂÁÚÙ ÄÁÎÎÙÈ É ÍÏÖÅÔ ÂÙÔØ + ÕÄÁÌÅÎ ÁÄÍÉÎÉÓÔÒÁÔÏÒÏÍ. + </label> + </td> + </tr> + [% END %] + <tr> + <th><label for="description">ïÐÉÓÁÎÉÅ:</label></th> <td> <em>ëÒÁÔËÏ ÏÐÉÛÉÔÅ ÐÒÉÌÏÖÅÎÉÅ.</em><br> - <input type="text" name="description" size="60" maxlength="200"> + <input type="text" id="description" name="description" size="60" maxlength="200"> </td> </tr> <tr> @@ -101,19 +121,18 @@ </tr> [% IF (Param("insidergroup") && UserInGroup(Param("insidergroup"))) %] <tr> - <th>âÅÚÏÐÁÓÔÎÏÓÔØ:</th> + <th>âÅÚÏÐÁÓÎÏÓÔØ:</th> <td> - <em>ïÔÍÅÔØÔÅ, ÅÓÌÉ ÐÒÉÌÏÖÅÎÉÅ ÎÅ Ñ×ÌÑÅÔÓÑ ÏÂÝÅÄÏÓÔÕÐÎÙÍ (ÚÁËÒÙÔÙÍ).</em><br> + <em>ïÔÍÅÔØÔÅ, ÅÓÌÉ ÐÒÉÌÏÖÅÎÉÅ ÎÅ Ñ×ÌÑÅÔÓÑ ÏÂÝÅÄÏÓÔÕÐÎÙÍ.</em><br> <input type="checkbox" name="isprivate" id="isprivate" value="1"> <label for="isprivate">úÁËÒÙÔÏÅ</label> </td> </tr> [% END %] <tr> - <th>ïÂÎÏ×ÌÅÎÉÑ:</th> + <th>úÁÍÅÎÑÅÔ:</th> <td> - <em>(ÄÏÐÏÌÎÉÔÅÌØÎÏ) ÷ÙÂÅÒÉÔÅ ÐÒÉÌÏÖÅÎÉÑ Ë [% terms.bug_dat %], ËÏÔÏÒÙÅ ×Ù ÏÂÎÏ×ÌÑÅÔÅ. -(Check each existing attachment made obsolete by your new attachment.)</em><br> + <em>(ÎÅÏÂÑÚÁÔÅÌØÎÏ) õËÁÖÉÔÅ ÐÒÉÌÏÖÅÎÉÑ Ë [% terms.bug_dat %], ËÏÔÏÒÙÅ ÚÁÍÅÎÅÎÙ ÜÔÉÍ.</em><br> [% IF attachments.size %] [% FOREACH attachment = attachments %] [% IF ((attachment.isprivate == 0) || (Param("insidergroup") @@ -131,31 +150,39 @@ [% IF (user.id != bugassignee_id) AND user.groups.editbugs %] <tr> - <th>éÚÍÅÎÅÎÉÅ ÏÔ×ÅÔÓÔ×ÅÎÎÏÇÏ:</th> + <th>éÚÍÅÎÅÎÉÅ ÉÓÐÏÌÎÉÔÅÌÑ:</th> <td> - <em>åÓÌÉ ×Ù ÈÏÔÉÔÅ ÓÔÁÔØ ÏÔ×ÅÔÓÔ×ÅÎÎÙÍ ÚÁ ÜÔÕ [% terms.bug_acc %] , - ÐÏÓÔÁ×ØÔÅ ÇÁÌÏÞËÕ ÚÄÅÓØ.</em><br> + <em>åÓÌÉ ×Ù ÈÏÔÉÔÅ ÓÔÁÔØ ÉÓÐÏÌÎÉÔÅÌÅÍ [% terms.bug_gen %], + ×ÙÂÅÒÉÔÅ ÜÔÏÔ ×ÁÒÉÁÎÔ.</em><br> <input type="checkbox" id="takebug" name="takebug" value="1"> - <label for="takebug">×ÚÑÔØ [% terms.bug_acc %]</label> + <label for="takebug">×ÚÑÔØ [% terms.bug_acc %] ÎÁ ÓÅÂÑ</label> </td> </tr> [% END %] <tr> - <th>ëÏÍÍÅÎÔÁÒÉÊ:</th> + <td> </td> + <td> + [% IF flag_types.size > 0 %] + [% PROCESS "flag/list.html.tmpl" bug_id=bugid attach_id=attachid %]<br> + [% END %] + </td> + </tr> + <tr> + <th><label for="comment">Comment:</label></th> <td> <em>(ÄÏÐÏÌÎÉÔÅÌØÎÏ) äÏÂÁ×ØÔÅ ËÏÍÍÅÎÔÁÒÉÊ ÄÌÑ ÜÔÏÇÏ ÐÒÉÌÏÖÅÎÉÑ Ë [% terms.bug_dat %].</em><br> - <textarea wrap="soft" name="comment" rows="6" cols="80"></textarea> + <textarea wrap="soft" id="commment" name="comment" rows="6" cols="80"></textarea> </td> </tr> <tr> <th> </th> - <td><input type="submit" value="ðÏÄÔ×ÅÒÄÉÔØ ÓÏÚÄÁÎÉÅ"></td> + <td><input type="submit" value="óÏÈÒÁÎÉÔØ"></td> </tr> </table> </form> -<script language="JavaScript" type="text/javascript"> +<script type="text/javascript"> <!-- function setContentTypeDisabledState() { @@ -175,6 +202,3 @@ </script> [% PROCESS global/footer.html.tmpl %] - - - Index: show-multiple.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/attachment/show-multiple.html.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -d -r1.3 -r1.3.2.1 --- show-multiple.html.tmpl 20 Apr 2005 14:15:57 -0000 1.3 +++ show-multiple.html.tmpl 1 Nov 2005 19:54:41 -0000 1.3.2.1 @@ -17,6 +17,7 @@ # Rights Reserved. # # Contributor(s): Myk Melez <my...@mo...> + # # Russian translation: Vitaly Fedrushkov <fed...@us...> # Dmitry Pupkov <dp...@mc...> #%] @@ -80,21 +81,22 @@ </td> <td valign="top"> - <a href="attachment.cgi?id=[% a.attachid %]&action=edit">òÅÄÁËÔÉÒÏ×ÁÔØ</a> + <a href="attachment.cgi?id=[% a.attachid %]&action=edit">éÚÍÅÎÉÔØ</a> </td> </tr> </table> [% IF a.isviewable %] <iframe src="attachment.cgi?id=[% a.attachid %]&action=view" width="75%" height="350"> - <b>÷Ù ÎÅ ÍÏÖÅÔÅ ÐÒÏÓÍÏÔÒÅÔØ ÐÒÉÌÏÖÅÎÉÑ ÎÁ ÜÔÏÊ ÓÔÒÁÎÉÃÅ, ÐÏÔÏÍÕ ÞÔÏ ×ÁÛ ÂÒÁÕÚÅÒ ÎÅ - ÐÏÄÄÅÒÖÉ×ÁÅÔ IFRAMEs - <a href="attachment.cgi?id=[% a.attachid %]&action=view">ðÒÏÓÍÏÔÒÅÔØ ÐÒÉÌÏÖÅÎÉÅ × ÎÏ×ÏÊ ÓÔÒÁÎÉÃÅ</a>.</b> + <b>ðÒÏÓÍÏÔÒ ÎÁ ÜÔÏÊ ÓÔÒÁÎÉÃÅ ÎÅ×ÏÚÍÏÖÅÎ, ÐÏÔÏÍÕ ÞÔÏ ×ÁÛ ÂÒÏÕÚÅÒ ÎÅ + ÐÏÄÄÅÒÖÉ×ÁÅÔ IFRAME. + <a href="attachment.cgi?id=[% a.attachid %]&action=view">ðÒÏÓÍÏÔÒÅÔØ ÐÒÉÌÏÖÅÎÉÅ ÎÁ ÏÔÄÅÌØÎÏÊ ÓÔÒÁÎÉÃÅ</a>.</b> </iframe> [% ELSE %] <p><b> - ðÒÉÌÏÖÅÎÉÅ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÐÒÏÓÍÏÔÒÅÎÏ, ÔÁË ËÁË ÅÇÏ MIME ÔÉÐ ÎÅ Ñ×ÌÅÔÓÑ text/*, image/* ÉÌÉ application/vnd.mozilla.*. - <a href="attachment.cgi?id=[% a.attachid %]&action=view">óËÁÞÁÔØ ÐÒÉÌÏÖÅÎÉÅ Ë ÓÅÂÅ ÎÁ ËÏÍÐØÀÔÅÒ</a>. + ðÒÉÌÏÖÅÎÉÅ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÐÒÏÓÍÏÔÒÅÎÏ, ÔÁË ËÁË ÅÇÏ ÔÉÐ ÄÁÎÎÙÈ ÎÅ + Ñ×ÌÅÔÓÑ ÔÅËÓÔÏÍ ÉÌÉ ÉÚÏÂÒÁÖÅÎÉÅÍ. + <a href="attachment.cgi?id=[% a.attachid %]&action=view">úÁÇÒÕÚÉÔØ ÐÒÉÌÏÖÅÎÉÅ</a>. </b></p> [% END %] </div> Index: created.html.tmpl =================================================================== RCS file: /cvsroot/bugzilla-ru/bugzilla-ru/template/ru/default/attachment/created.html.tmpl,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -d -r1.4 -r1.4.2.1 --- created.html.tmpl 20 Apr 2005 14:15:56 -0000 1.4 +++ created.html.tmpl 1 Nov 2005 19:54:41 -0000 1.4.2.1 @@ -17,6 +17,7 @@ # Rights Reserved. # # Contributor(s): Myk Melez <my...@mo...> + # # Russian translation: Vitaly Fedrushkov <fed...@us...> # Dmitry Pupkov <dp...@mc...> #%] @@ -49,7 +50,7 @@ [% IF contenttypemethod == 'autodetect' %] <p> - <b>ðÒÉÍÅÞÁÎÉÅ:</b> [% terms.Bugzilla %] Á×ÔÏÍÁÔÉÞÅÓËÉ ÏÐÒÅÄÌÉÌÁ ÔÉÐ + <b>ðÒÉÍÅÞÁÎÉÅ:</b> [% terms.Bugzilla %] Á×ÔÏÍÁÔÉÞÅÓËÉ ÏÐÒÅÄÅÌÉÌÁ ÔÉÐ <em>[% contenttype %]</em> ÐÒÉÌÏÖÅÎÉÑ. ÷Ù ÍÏÖÅÔÅ ÉÚÍÅÎÉÔØ ÔÉÐ ÐÒÉÌÏÖÅÎÉÑ <a href="attachment.cgi?id=[% attachid %]&action=edit">ÚÄÅÓØ</a>. </p> |
