diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index 84de004d..a19b0fa3 100644
Binary files a/locale/en/LC_MESSAGES/django.mo and b/locale/en/LC_MESSAGES/django.mo differ
diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 1224df93..c6551521 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-26 00:38+0000\n"
+"POT-Creation-Date: 2009-12-16 09:17+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME Submit a Ticket
\n"
"\n"
@@ -797,13 +906,14 @@ msgid ""
"descriptive a title and description as possible.
Unless otherwise stated, all fields are required. Please provide as " +"descriptive a title and description as possible.
\n" +"\n" +"Note: Editing a ticket does not send an e-mail " +"to the ticket owner or submitter. No new details should be entered, this " +"form should only be used to fix incorrect details or clean up the submission." +"
" +msgstr "" + +#: templates/helpdesk/edit_ticket.html:28 +msgid "Save Changes" +msgstr "" + #: templates/helpdesk/email_ignore_add.html:3 #: templates/helpdesk/email_ignore_add.html:23 msgid "Ignore E-Mail Address" @@ -885,7 +1024,7 @@ msgid "" "\n" "Are you sure you wish to stop removing this email address (%" "(email_address)s) and allow their e-mails to automatically create " -"tickets in your system? You can re-add this e-mail address at any time.\n" +"tickets in your system? You can re-add this e-mail address at any time.
\n" msgstr "" #: templates/helpdesk/email_ignore_del.html:11 @@ -920,7 +1059,21 @@ msgid "Queues" msgstr "" #: templates/helpdesk/email_ignore_list.html:13 -msgid "Delete" +msgid "Keep in mailbox?" +msgstr "" + +#: templates/helpdesk/email_ignore_list.html:21 +msgid "All" +msgstr "" + +#: templates/helpdesk/email_ignore_list.html:22 +msgid "Keep" +msgstr "" + +#: templates/helpdesk/email_ignore_list.html:29 +msgid "" +"Note: If the 'Keep' option is not selected, emails sent " +"from that address will be deleted permanently." msgstr "" #: templates/helpdesk/kb_category.html:4 @@ -1019,70 +1172,87 @@ msgstr "" msgid "Powered by Jutda HelpDesk." msgstr "" -#: templates/helpdesk/public_homepage.html:13 +#: templates/helpdesk/public_homepage.html:4 #: templates/helpdesk/public_view_form.html:4 #: templates/helpdesk/public_view_ticket.html:2 msgid "View a Ticket" msgstr "" -#: templates/helpdesk/public_homepage.html:18 +#: templates/helpdesk/public_homepage.html:9 #: templates/helpdesk/public_view_form.html:12 msgid "Ticket" msgstr "" -#: templates/helpdesk/public_homepage.html:21 +#: templates/helpdesk/public_homepage.html:12 #: templates/helpdesk/public_view_form.html:15 msgid "Your E-mail Address" msgstr "" -#: templates/helpdesk/public_homepage.html:25 +#: templates/helpdesk/public_homepage.html:16 #: templates/helpdesk/public_view_form.html:19 msgid "View Ticket" msgstr "" -#: templates/helpdesk/public_homepage.html:29 +#: templates/helpdesk/public_homepage.html:20 msgid "Submit a Ticket" msgstr "" -#: templates/helpdesk/public_homepage.html:31 +#: templates/helpdesk/public_homepage.html:22 msgid "" "All fields are required. Please provide as descriptive a title and " "description as possible." msgstr "" +#: templates/helpdesk/public_spam.html:4 +msgid "Unable To Open Ticket" +msgstr "" + +#: templates/helpdesk/public_spam.html:6 +msgid "" +"Sorry, but there has been an error trying to submit your ticket.
\n" +"\n" +"Our system has marked your submission as spam, so we are " +"unable to save it. If this is not spam, please press back and re-type your " +"message. Be careful to avoid sounding 'spammy', and if you have heaps of " +"links please try removing them if possible.
\n" +"\n" +"We are sorry for any inconvenience, however this check is required to " +"avoid our helpdesk resources being overloaded by spammers.
\n" +msgstr "" + #: templates/helpdesk/public_view_form.html:8 msgid "Error:" msgstr "" -#: templates/helpdesk/public_view_ticket.html:16 +#: templates/helpdesk/public_view_ticket.html:8 #, python-format msgid "Queue: %(queue_name)s" msgstr "" -#: templates/helpdesk/public_view_ticket.html:19 -#: templates/helpdesk/ticket.html:52 +#: templates/helpdesk/public_view_ticket.html:11 +#: templates/helpdesk/ticket.html:50 msgid "Submitted On" msgstr "" -#: templates/helpdesk/public_view_ticket.html:41 -#: templates/helpdesk/ticket.html:79 +#: templates/helpdesk/public_view_ticket.html:40 +#: templates/helpdesk/ticket.html:90 msgid "Accept" msgstr "" -#: templates/helpdesk/public_view_ticket.html:41 -#: templates/helpdesk/ticket.html:79 +#: templates/helpdesk/public_view_ticket.html:40 +#: templates/helpdesk/ticket.html:90 msgid "Accept and Close" msgstr "" -#: templates/helpdesk/public_view_ticket.html:50 -#: templates/helpdesk/ticket.html:88 +#: templates/helpdesk/public_view_ticket.html:49 +#: templates/helpdesk/ticket.html:99 msgid "Follow-Ups" msgstr "" -#: templates/helpdesk/public_view_ticket.html:58 +#: templates/helpdesk/public_view_ticket.html:57 +#: templates/helpdesk/ticket.html:107 #, python-format -msgid "" -"Changed %(change.field)s from %(change.old_value)s to %(change.new_value)s." +msgid "Changed %(field)s from %(old_value)s to %(new_value)s." msgstr "" #: templates/helpdesk/report_index.html:3 @@ -1211,178 +1381,273 @@ msgstr "" msgid "View Ticket Details" msgstr "" -#: templates/helpdesk/ticket.html:36 +#: templates/helpdesk/ticket.html:34 msgid "Attach another File" msgstr "" -#: templates/helpdesk/ticket.html:36 templates/helpdesk/ticket.html.py:173 +#: templates/helpdesk/ticket.html:34 templates/helpdesk/ticket.html.py:188 msgid "Add Another File" msgstr "" -#: templates/helpdesk/ticket.html:48 +#: templates/helpdesk/ticket.html:46 msgid "Unhold" msgstr "" -#: templates/helpdesk/ticket.html:48 +#: templates/helpdesk/ticket.html:46 msgid "Hold" msgstr "" -#: templates/helpdesk/ticket.html:49 +#: templates/helpdesk/ticket.html:47 #, python-format msgid "Queue: %(queue)s" msgstr "" -#: templates/helpdesk/ticket.html:57 +#: templates/helpdesk/ticket.html:55 msgid "Assigned To" msgstr "" -#: templates/helpdesk/ticket.html:63 +#: templates/helpdesk/ticket.html:61 msgid "Ignore" msgstr "" -#: templates/helpdesk/ticket.html:92 +#: templates/helpdesk/ticket.html:70 +msgid "Copies To" +msgstr "" + +#: templates/helpdesk/ticket.html:71 +msgid "Manage" +msgstr "" + +#: templates/helpdesk/ticket.html:103 msgid "Private" msgstr "" -#: templates/helpdesk/ticket.html:96 -#, python-format -msgid "Changed %(field)s from %(old_value)s to %(new_value)s." -msgstr "" - -#: templates/helpdesk/ticket.html:107 +#: templates/helpdesk/ticket.html:118 msgid "Respond to this ticket" msgstr "" -#: templates/helpdesk/ticket.html:113 +#: templates/helpdesk/ticket.html:124 msgid "Use a Pre-set Reply" msgstr "" -#: templates/helpdesk/ticket.html:115 +#: templates/helpdesk/ticket.html:126 msgid "" "Selecting a pre-set reply will over-write your comment below. You can then " "modify the pre-set reply to your liking before saving this update." msgstr "" -#: templates/helpdesk/ticket.html:117 +#: templates/helpdesk/ticket.html:128 msgid "Comment / Resolution" msgstr "" -#: templates/helpdesk/ticket.html:119 +#: templates/helpdesk/ticket.html:130 msgid "" "You can insert ticket and queue details in your message. For more " "information, see the context help page." msgstr "" -#: templates/helpdesk/ticket.html:142 +#: templates/helpdesk/ticket.html:153 msgid "Is this update public?" msgstr "" -#: templates/helpdesk/ticket.html:144 +#: templates/helpdesk/ticket.html:155 msgid "" "If this is public, the submitter will be e-mailed your comment or resolution." msgstr "" -#: templates/helpdesk/ticket.html:147 +#: templates/helpdesk/ticket.html:158 msgid "Change Further Details »" msgstr "" -#: templates/helpdesk/ticket.html:156 templates/helpdesk/ticket_list.html:29 -#: templates/helpdesk/ticket_list.html:44 -#: templates/helpdesk/ticket_list.html:116 +#: templates/helpdesk/ticket.html:167 templates/helpdesk/ticket_list.html:53 +#: templates/helpdesk/ticket_list.html:84 +#: templates/helpdesk/ticket_list.html:183 msgid "Owner" msgstr "" -#: templates/helpdesk/ticket.html:157 +#: templates/helpdesk/ticket.html:168 msgid "Unassign" msgstr "" -#: templates/helpdesk/ticket.html:166 +#: templates/helpdesk/ticket.html:181 msgid "Attach File(s) »" msgstr "" -#: templates/helpdesk/ticket.html:172 +#: templates/helpdesk/ticket.html:187 msgid "Attach a File" msgstr "" -#: templates/helpdesk/ticket.html:180 +#: templates/helpdesk/ticket.html:195 msgid "Update This Ticket" msgstr "" +#: templates/helpdesk/ticket_cc_add.html:3 +msgid "Add Ticket CC" +msgstr "" + +#: templates/helpdesk/ticket_cc_add.html:5 +msgid "" +"\n" +"To automatically send an email to a user or e-mail address when this " +"ticket is updated, select the user or enter an e-mail address below.
" +msgstr "" + +#: templates/helpdesk/ticket_cc_add.html:21 +msgid "Save Ticket CC" +msgstr "" + +#: templates/helpdesk/ticket_cc_del.html:3 +msgid "Delete Ticket CC" +msgstr "" + +#: templates/helpdesk/ticket_cc_del.html:5 +#, python-format +msgid "" +"\n" +"Are you sure you wish to delete this email address (%(email_address)" +"s) from the CC list for this ticket? They will stop receiving updates." +"p>\n" +msgstr "" + +#: templates/helpdesk/ticket_cc_del.html:11 +msgid "" +"
\n" +"\n" +"\n" msgstr "" -"\n" +"\n" "\n" -"\n" +"\n" #: templates/helpdesk/email_ignore_list.html:3 #: templates/helpdesk/email_ignore_list.html:12 -#, fuzzy msgid "Ignored E-Mail Addresses" -msgstr "Ваш E-Mail Адрес" +msgstr "Игнорируемые адреса E-mail" #: templates/helpdesk/email_ignore_list.html:5 msgid "" @@ -1008,20 +1170,38 @@ msgid "" "incoming e-mail processor. You can add a new e-mail address " "to the list or delete any of the items below as required." msgstr "" +"\n" +"Следующие адреса E-mail в настоящее время игнорируются обработчиком " +"входящей почты. Вы можете добавить в список новый адрес E-" +"mail или удалить любые перечисленные ниже на свое усмотрение.
" #: templates/helpdesk/email_ignore_list.html:13 msgid "Date Added" +msgstr "Дата добавления" + +#: templates/helpdesk/email_ignore_list.html:13 +msgid "Queues" +msgstr "Очереди" + +#: templates/helpdesk/email_ignore_list.html:13 +msgid "Keep in mailbox?" msgstr "" -#: templates/helpdesk/email_ignore_list.html:13 -#, fuzzy -msgid "Queues" -msgstr "Очередь" +#: templates/helpdesk/email_ignore_list.html:21 +msgid "All" +msgstr "" -#: templates/helpdesk/email_ignore_list.html:13 -#, fuzzy -msgid "Delete" -msgstr "Удалить Талон" +#: templates/helpdesk/email_ignore_list.html:22 +msgid "Keep" +msgstr "" + +#: templates/helpdesk/email_ignore_list.html:29 +msgid "" +"Note: If the 'Keep' option is not selected, emails sent " +"from that address will be deleted permanently." +msgstr "" #: templates/helpdesk/kb_category.html:4 #: templates/helpdesk/kb_category.html:11 @@ -1127,34 +1307,34 @@ msgstr "Войти" #: templates/helpdesk/public_base.html:22 msgid "Powered by Jutda HelpDesk." -msgstr "" +msgstr "Работает на Jutda Helpdesk." -#: templates/helpdesk/public_homepage.html:13 +#: templates/helpdesk/public_homepage.html:4 #: templates/helpdesk/public_view_form.html:4 #: templates/helpdesk/public_view_ticket.html:2 msgid "View a Ticket" msgstr "Просмотреть Талон" -#: templates/helpdesk/public_homepage.html:18 +#: templates/helpdesk/public_homepage.html:9 #: templates/helpdesk/public_view_form.html:12 msgid "Ticket" msgstr "Талон" -#: templates/helpdesk/public_homepage.html:21 +#: templates/helpdesk/public_homepage.html:12 #: templates/helpdesk/public_view_form.html:15 msgid "Your E-mail Address" msgstr "Ваш Эдрес Электронной Почты" -#: templates/helpdesk/public_homepage.html:25 +#: templates/helpdesk/public_homepage.html:16 #: templates/helpdesk/public_view_form.html:19 msgid "View Ticket" msgstr "Просмотреть Талон" -#: templates/helpdesk/public_homepage.html:29 +#: templates/helpdesk/public_homepage.html:20 msgid "Submit a Ticket" msgstr "Отправить Талон" -#: templates/helpdesk/public_homepage.html:31 +#: templates/helpdesk/public_homepage.html:22 msgid "" "All fields are required. Please provide as descriptive a title and " "description as possible." @@ -1162,41 +1342,58 @@ msgstr "" "Все поля являются обязательными для заполнения. Пожалуйста, представьте, " "заголовок и описание, настолько подробными насколько это возможно." +#: templates/helpdesk/public_spam.html:4 +#, fuzzy +msgid "Unable To Open Ticket" +msgstr "Все открытые талоны" + +#: templates/helpdesk/public_spam.html:6 +msgid "" +"Sorry, but there has been an error trying to submit your ticket.
\n" +"\n" +"Our system has marked your submission as spam, so we are " +"unable to save it. If this is not spam, please press back and re-type your " +"message. Be careful to avoid sounding 'spammy', and if you have heaps of " +"links please try removing them if possible.
\n" +"\n" +"We are sorry for any inconvenience, however this check is required to " +"avoid our helpdesk resources being overloaded by spammers.
\n" +msgstr "" + #: templates/helpdesk/public_view_form.html:8 msgid "Error:" msgstr "Ошибка:" -#: templates/helpdesk/public_view_ticket.html:16 +#: templates/helpdesk/public_view_ticket.html:8 #, python-format msgid "Queue: %(queue_name)s" msgstr "Очередь: %(queue_name)s" -#: templates/helpdesk/public_view_ticket.html:19 -#: templates/helpdesk/ticket.html:52 +#: templates/helpdesk/public_view_ticket.html:11 +#: templates/helpdesk/ticket.html:50 msgid "Submitted On" msgstr "Отправлен В" -#: templates/helpdesk/public_view_ticket.html:41 -#: templates/helpdesk/ticket.html:79 +#: templates/helpdesk/public_view_ticket.html:40 +#: templates/helpdesk/ticket.html:90 msgid "Accept" msgstr "Принять" -#: templates/helpdesk/public_view_ticket.html:41 -#: templates/helpdesk/ticket.html:79 +#: templates/helpdesk/public_view_ticket.html:40 +#: templates/helpdesk/ticket.html:90 msgid "Accept and Close" msgstr "Принять и Закрыть" -#: templates/helpdesk/public_view_ticket.html:50 -#: templates/helpdesk/ticket.html:88 +#: templates/helpdesk/public_view_ticket.html:49 +#: templates/helpdesk/ticket.html:99 msgid "Follow-Ups" msgstr "Наблюдатели" -#: templates/helpdesk/public_view_ticket.html:58 +#: templates/helpdesk/public_view_ticket.html:57 +#: templates/helpdesk/ticket.html:107 #, python-format -msgid "" -"Changed %(change.field)s from %(change.old_value)s to %(change.new_value)s." -msgstr "" -"Изменено %(change.field)s с %(change.old_value)s на %(change.new_value)s." +msgid "Changed %(field)s from %(old_value)s to %(new_value)s." +msgstr "Изменено %(field)s с %(old_value)s на %(new_value)s." #: templates/helpdesk/report_index.html:3 #: templates/helpdesk/report_output.html:3 @@ -1300,6 +1497,10 @@ msgid "" "manage the staff who utilise a particular queue, this may be used to view " "new tickets coming into that queue." msgstr "" +"Эти ленты RSS позволят Вам видеть сводку по Вашим собственным или всем " +"талонам, для любой очереди в Справочной. Например, если Вы управляете " +"персоналом, использующим определенную очередь, можно использовать ленту RSS " +"для просмотра новых талонов этой очереди." #: templates/helpdesk/rss_list.html:22 msgid "Per-Queue Feeds" @@ -1314,9 +1515,8 @@ msgid "Open Tickets" msgstr "Открытые Талоны" #: templates/helpdesk/system_settings.html:3 -#, fuzzy msgid "Change System Settings" -msgstr "Изменить Настройки Пользователя" +msgstr "Изменить системные настройки" #: templates/helpdesk/system_settings.html:5 msgid "" @@ -1325,100 +1525,106 @@ msgid "" "\n" "The following items can be maintained by you or other superusers:
" msgstr "" +"\n" +"h2>Системные настройки\n" +"\n" +"Следующие задачи можете выполнить Вы и другие суперпользователи:
" #: templates/helpdesk/system_settings.html:11 -#, fuzzy msgid "E-Mail Ignore list" -msgstr "Порт Электронный Почты" +msgstr "Список игнорируемых E-mail" #: templates/helpdesk/system_settings.html:12 msgid "Maintain Queues" -msgstr "" +msgstr "Поддержка очередей" #: templates/helpdesk/system_settings.html:13 -#, fuzzy msgid "Maintain Pre-Set Replies" -msgstr "Использовать предопределённые ответы" +msgstr "Поддержка предопределённых ответов" #: templates/helpdesk/system_settings.html:14 -#, fuzzy msgid "Maintain Knowledgebase Categories" -msgstr "Категории Базы Знаний" +msgstr "Поддержка категорий Базы знаний" #: templates/helpdesk/system_settings.html:15 -#, fuzzy msgid "Maintain Knowledgebase Items" -msgstr "База Знаний: %(item)s" +msgstr "Поддержка статей Базы знаний" #: templates/helpdesk/system_settings.html:16 msgid "Maintain E-Mail Templates" -msgstr "" +msgstr "Поддержка шаблонов E-mail" #: templates/helpdesk/system_settings.html:17 msgid "Maintain Users" -msgstr "" +msgstr "Поддержка пользователей" #: templates/helpdesk/ticket.html:2 msgid "View Ticket Details" msgstr "Просмотреть Талон" -#: templates/helpdesk/ticket.html:36 +#: templates/helpdesk/ticket.html:34 msgid "Attach another File" msgstr "Прикрепить Другой Файл" -#: templates/helpdesk/ticket.html:36 templates/helpdesk/ticket.html.py:173 +#: templates/helpdesk/ticket.html:34 templates/helpdesk/ticket.html.py:188 msgid "Add Another File" msgstr "Добавить Другой Файл" -#: templates/helpdesk/ticket.html:48 +#: templates/helpdesk/ticket.html:46 msgid "Unhold" msgstr "Снять с удержания" -#: templates/helpdesk/ticket.html:48 +#: templates/helpdesk/ticket.html:46 msgid "Hold" msgstr "Удерживать" -#: templates/helpdesk/ticket.html:49 +#: templates/helpdesk/ticket.html:47 #, python-format msgid "Queue: %(queue)s" msgstr "Очередь: %(queue)s" -#: templates/helpdesk/ticket.html:57 +#: templates/helpdesk/ticket.html:55 msgid "Assigned To" msgstr "Назначен " -#: templates/helpdesk/ticket.html:63 +#: templates/helpdesk/ticket.html:61 msgid "Ignore" +msgstr "Игнорировать" + +#: templates/helpdesk/ticket.html:70 +msgid "Copies To" msgstr "" -#: templates/helpdesk/ticket.html:92 +#: templates/helpdesk/ticket.html:71 +msgid "Manage" +msgstr "" + +#: templates/helpdesk/ticket.html:103 msgid "Private" msgstr "Приватный" -#: templates/helpdesk/ticket.html:96 -#, python-format -msgid "Changed %(field)s from %(old_value)s to %(new_value)s." -msgstr "Изменено %(field)s с %(old_value)s на %(new_value)s." - -#: templates/helpdesk/ticket.html:107 +#: templates/helpdesk/ticket.html:118 msgid "Respond to this ticket" msgstr "Ответить на этот талон" -#: templates/helpdesk/ticket.html:113 +#: templates/helpdesk/ticket.html:124 msgid "Use a Pre-set Reply" msgstr "Использовать предопределённые ответы" -#: templates/helpdesk/ticket.html:115 +#: templates/helpdesk/ticket.html:126 msgid "" "Selecting a pre-set reply will over-write your comment below. You can then " "modify the pre-set reply to your liking before saving this update." msgstr "" +"Выбор предопределенного ответа перезапишет Ваш комментарий. После чего (до " +"сохранения этого обновления) можно исправить предопределенный ответ по " +"своему усмотрению." -#: templates/helpdesk/ticket.html:117 +#: templates/helpdesk/ticket.html:128 msgid "Comment / Resolution" msgstr "Комментарий / Решение" -#: templates/helpdesk/ticket.html:119 +#: templates/helpdesk/ticket.html:130 msgid "" "You can insert ticket and queue details in your message. For more " "information, see the context help page." @@ -1427,97 +1633,202 @@ msgstr "" "дополнительной информации смотрите Страница " "помощи про Контекст." -#: templates/helpdesk/ticket.html:142 +#: templates/helpdesk/ticket.html:153 msgid "Is this update public?" msgstr "Это публичный талон?" -#: templates/helpdesk/ticket.html:144 +#: templates/helpdesk/ticket.html:155 msgid "" "If this is public, the submitter will be e-mailed your comment or resolution." msgstr "" "Если это публичный, отправитель получит по электронной почте ваш комментарий " "или решение." -#: templates/helpdesk/ticket.html:147 +#: templates/helpdesk/ticket.html:158 msgid "Change Further Details »" msgstr "Изменить дополнительную информацию »" -#: templates/helpdesk/ticket.html:156 templates/helpdesk/ticket_list.html:29 -#: templates/helpdesk/ticket_list.html:44 -#: templates/helpdesk/ticket_list.html:116 +#: templates/helpdesk/ticket.html:167 templates/helpdesk/ticket_list.html:53 +#: templates/helpdesk/ticket_list.html:84 +#: templates/helpdesk/ticket_list.html:183 msgid "Owner" msgstr "Владелец" -#: templates/helpdesk/ticket.html:157 +#: templates/helpdesk/ticket.html:168 msgid "Unassign" msgstr "Не назначен" -#: templates/helpdesk/ticket.html:166 +#: templates/helpdesk/ticket.html:181 msgid "Attach File(s) »" msgstr "Прикрепить Файл(ы) »" -#: templates/helpdesk/ticket.html:172 +#: templates/helpdesk/ticket.html:187 msgid "Attach a File" msgstr "Прикрепить файл" -#: templates/helpdesk/ticket.html:180 +#: templates/helpdesk/ticket.html:195 msgid "Update This Ticket" msgstr "Обновить Этот Талон" +#: templates/helpdesk/ticket_cc_add.html:3 +#, fuzzy +msgid "Add Ticket CC" +msgstr "Обновлённый CC Адрес Талона" + +#: templates/helpdesk/ticket_cc_add.html:5 +msgid "" +"\n" +"To automatically send an email to a user or e-mail address when this " +"ticket is updated, select the user or enter an e-mail address below.
" +msgstr "" + +#: templates/helpdesk/ticket_cc_add.html:21 +#, fuzzy +msgid "Save Ticket CC" +msgstr "Новый Талон" + +#: templates/helpdesk/ticket_cc_del.html:3 +#, fuzzy +msgid "Delete Ticket CC" +msgstr "Удалить Талон" + +#: templates/helpdesk/ticket_cc_del.html:5 +#, fuzzy, python-format +msgid "" +"\n" +"Are you sure you wish to delete this email address (%(email_address)" +"s) from the CC list for this ticket? They will stop receiving updates." +"p>\n" +msgstr "" +"\n" +"
Вы уверены что хотите удалить этот талон (%(ticket_title)s)? Все " +"следы талона, включая слежения, вложенные файлы и одновления будут " +"безвозвратно удалены.
\n" + +#: templates/helpdesk/ticket_cc_del.html:11 +#, fuzzy +msgid "" +"\n" +"\n" +"\n" + +#: templates/helpdesk/ticket_cc_list.html:3 +#, fuzzy +msgid "Ticket CC Settings" +msgstr "Список Талонов" + +#: templates/helpdesk/ticket_cc_list.html:5 +#, fuzzy, python-format +msgid "" +"\n" +"The following people will receive an e-mail whenever %" +"(ticket_title)s is updated. Some people can also view or edit the " +"ticket via the public ticket views.
\n" +"\n" +"You can add a new e-mail address to the list or delete " +"any of the items below as required.
" +msgstr "" +"\n" +"Следующие адреса E-mail в настоящее время игнорируются обработчиком " +"входящей почты. Вы можете добавить в список новый адрес E-" +"mail или удалить любые перечисленные ниже на свое усмотрение.
" + +#: templates/helpdesk/ticket_cc_list.html:14 +#, fuzzy +msgid "Ticket CC List" +msgstr "Список Талонов" + +#: templates/helpdesk/ticket_cc_list.html:15 +msgid "View?" +msgstr "" + +#: templates/helpdesk/ticket_cc_list.html:15 +#, fuzzy +msgid "Update?" +msgstr "Обновлено" + +#: templates/helpdesk/ticket_cc_list.html:29 +#, python-format +msgid "Return to %(ticket_title)s" +msgstr "" + #: templates/helpdesk/ticket_list.html:2 msgid "Ticket Listing" msgstr "Список Талонов" -#: templates/helpdesk/ticket_list.html:26 +#: templates/helpdesk/ticket_list.html:49 msgid "Change Query" msgstr "Изменить Запрос" -#: templates/helpdesk/ticket_list.html:28 +#: templates/helpdesk/ticket_list.html:52 msgid "Sorting" msgstr "Сортировка" -#: templates/helpdesk/ticket_list.html:32 -#: templates/helpdesk/ticket_list.html:71 +#: templates/helpdesk/ticket_list.html:56 +#: templates/helpdesk/ticket_list.html:127 msgid "Keywords" msgstr "Ключевые Слова" -#: templates/helpdesk/ticket_list.html:52 +#: templates/helpdesk/ticket_list.html:94 msgid "Owner(s)" msgstr "Владелец(ы)" -#: templates/helpdesk/ticket_list.html:58 +#: templates/helpdesk/ticket_list.html:107 msgid "Queue(s)" msgstr "Очередь(и)" -#: templates/helpdesk/ticket_list.html:64 +#: templates/helpdesk/ticket_list.html:113 msgid "Status(es)" msgstr "Статус(ы)" -#: templates/helpdesk/ticket_list.html:76 +#: templates/helpdesk/ticket_list.html:120 +msgid "Tag(s)" +msgstr "" + +#: templates/helpdesk/ticket_list.html:132 msgid "Apply Filter" msgstr "Применить Фильтр" -#: templates/helpdesk/ticket_list.html:81 -#: templates/helpdesk/ticket_list.html:96 +#: templates/helpdesk/ticket_list.html:138 +#: templates/helpdesk/ticket_list.html:153 msgid "Save Query" msgstr "Сохранить Запрос" -#: templates/helpdesk/ticket_list.html:87 +#: templates/helpdesk/ticket_list.html:144 msgid "" "This name appears in the drop-down list of saved queries. If you share your " "query, other users will see this name, so choose something clear and " "descriptive!" msgstr "" +"Это название появится в выпадающем списке сохраненных запросов. Если вы " +"дадите доступ к своему запросу другим пользователям, они увидят это " +"название, так что выберите что-нибудь четкое, информативное!" -#: templates/helpdesk/ticket_list.html:89 +#: templates/helpdesk/ticket_list.html:146 msgid "Shared?" msgstr "Общие?" -#: templates/helpdesk/ticket_list.html:90 +#: templates/helpdesk/ticket_list.html:147 msgid "Yes, share this query with other users." msgstr "Да, поделится этим запросом с другими пользователями." -#: templates/helpdesk/ticket_list.html:91 +#: templates/helpdesk/ticket_list.html:148 msgid "" "If you share this query, it will be visible by all other logged-in " "users." @@ -1525,22 +1836,35 @@ msgstr "" "Если вы поделитесь этим запросом, его смогут видеть все вошедьшие " "пользователи." -#: templates/helpdesk/ticket_list.html:103 +#: templates/helpdesk/ticket_list.html:160 msgid "Use Saved Query" msgstr "Использовать Сохранённый Запрос" -#: templates/helpdesk/ticket_list.html:105 +#: templates/helpdesk/ticket_list.html:162 msgid "Query" msgstr "Запрос" -#: templates/helpdesk/ticket_list.html:110 +#: templates/helpdesk/ticket_list.html:167 msgid "Run Query" msgstr "выполнить Запрос" -#: templates/helpdesk/ticket_list.html:128 +#: templates/helpdesk/ticket_list.html:197 msgid "No Tickets Match Your Selection" msgstr "Талонов Соответствующих Вашему Запросов не Найдено" +#: templates/helpdesk/ticket_list.html:203 +msgid "Previous" +msgstr "" + +#: templates/helpdesk/ticket_list.html:207 +#, python-format +msgid "Page %(ticket_num)s of %(num_pages)s." +msgstr "" + +#: templates/helpdesk/ticket_list.html:211 +msgid "Next" +msgstr "" + #: templates/helpdesk/user_settings.html:3 msgid "Change User Settings" msgstr "Изменить Настройки Пользователя" @@ -1585,7 +1909,7 @@ msgstr "" #: templates/registration/login.html:2 msgid "Helpdesk Login" -msgstr "" +msgstr "Вход в Справочную" #: templates/registration/login.html:5 templates/registration/login.html:17 msgid "Login" @@ -1616,12 +1940,12 @@ msgstr "Пароль" #: views/feeds.py:35 #, python-format msgid "Helpdesk: Open Tickets in queue %(queue)s for %(username)s" -msgstr "" +msgstr "Справочная: открытые талоны в очереди %(queue)s для %(username)s" #: views/feeds.py:40 #, python-format msgid "Helpdesk: Open Tickets for %(username)s" -msgstr "" +msgstr "Справочная: открытые талоны для %(username)s" #: views/feeds.py:46 #, python-format @@ -1631,11 +1955,11 @@ msgstr "Открыть и Переоткрыть Талоны в Очереди #: views/feeds.py:51 #, python-format msgid "Open and Reopened Tickets for %(username)s" -msgstr "Открыть и Переоткрыть Талоны для %(username)s" +msgstr "Открыть и переоткрыть талоны для %(username)s" #: views/feeds.py:98 msgid "Helpdesk: Unassigned Tickets" -msgstr "" +msgstr "Справочная: неназначенные талоны" #: views/feeds.py:99 msgid "Unassigned Open and Reopened tickets" @@ -1643,46 +1967,87 @@ msgstr "Не назначеные Открытые и Переоткрытые #: views/feeds.py:124 msgid "Helpdesk: Recent Followups" -msgstr "" +msgstr "Справочная: недавние дополнения" #: views/feeds.py:125 msgid "" "Recent FollowUps, such as e-mail replies, comments, attachments and " "resolutions" msgstr "" +"Недавние дополнения, такие как ответы на E-mail, комментарии, прикрепленные " +"файлы и решения" #: views/feeds.py:142 #, python-format msgid "Helpdesk: Open Tickets in queue %(queue)s" -msgstr "" +msgstr "Справочная: открытые талоны в очереди %(queue)s" #: views/feeds.py:147 #, python-format msgid "Open and Reopened Tickets in queue %(queue)s" msgstr "Открыть и Переоткрыть Талоны в Очереди %(queue)s" -#: views/public.py:68 +#: views/public.py:80 msgid "Invalid ticket ID or e-mail address. Please try again." msgstr "" -"Не верный ID талона или адрес электронной почты, Пожалуйста попробуйте ещё." +"Неверный ID талона или адрес электронной почты, Пожалуйста попробуйте ещё." -#: views/staff.py:116 +#: views/public.py:93 +#, fuzzy +msgid "Submitter accepted resolution and closed ticket" +msgstr "Принять решение и закрыть талон" + +#: views/staff.py:121 msgid "Accepted resolution and closed ticket" msgstr "Принять решение и закрыть талон" -#: views/staff.py:158 +#: views/staff.py:139 +msgid "Sorry, you need to login to do that." +msgstr "" + +#: views/staff.py:172 #, python-format msgid "Assigned to %(username)s" msgstr "Назначено %(username)s" -#: views/staff.py:180 +#: views/staff.py:194 msgid "Updated" msgstr "Обновлено" -#: views/staff.py:433 +#: views/staff.py:358 +#, fuzzy, python-format +msgid "Assigned to %(username)s in bulk update" +msgstr "Назначено %(username)s" + +#: views/staff.py:363 +#, fuzzy +msgid "Unassigned in bulk update" +msgstr "Не Назначеные Талоны" + +#: views/staff.py:368 views/staff.py:373 +msgid "Closed in bulk update" +msgstr "" + +#: views/staff.py:568 +msgid "" +"Note: Your keyword search is case sensitive because of " +"your database. This means the search will not be accurate. " +"By switching to a different database system you will gain better searching! " +"For more information, read the Django Documentation on string " +"matching in SQLite." +msgstr "" + +#: views/staff.py:672 msgid "Ticket taken off hold" msgstr "Удержание талона снято" -#: views/staff.py:436 +#: views/staff.py:675 msgid "Ticket placed on hold" msgstr "Талон удерживается" + +#~ msgid "" +#~ "Changed %(change.field)s from %(change.old_value)s to %(change.new_value)" +#~ "s." +#~ msgstr "" +#~ "Изменено %(change.field)s с %(change.old_value)s на %(change.new_value)s."