Index: trac/locale/messages.pot
===================================================================
--- trac/locale/messages.pot	(revision 6706)
+++ trac/locale/messages.pot	(working copy)
@@ -8,14 +8,14 @@
 msgstr ""
 "Project-Id-Version: Trac 0.11\n"
 "Report-Msgid-Bugs-To: trac-dev@googlegroups.com\n"
-"POT-Creation-Date: 2008-01-30 09:20+0100\n"
+"POT-Creation-Date: 2008-03-18 17:13+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.0dev-r343\n"
+"Generated-By: Babel 1.0dev-r358\n"
 
 #: trac/about.py:43 trac/templates/about.html:9 trac/templates/about.html:26
 msgid "About Trac"
@@ -43,64 +43,64 @@
 msgid "Bad request"
 msgstr ""
 
-#: trac/attachment.py:397
+#: trac/attachment.py:381
 #, python-format
 msgid "Back to %(parent)s"
 msgstr ""
 
-#: trac/attachment.py:469
+#: trac/attachment.py:473
 msgid " attached to "
 msgstr ""
 
-#: trac/attachment.py:506
+#: trac/attachment.py:512
 #, python-format
 msgid "Attachment '%(id)s' in %(parent)s"
 msgstr ""
 
-#: trac/attachment.py:509
+#: trac/attachment.py:515
 #, python-format
 msgid "Attachments of %(parent)s"
 msgstr ""
 
-#: trac/attachment.py:522 trac/attachment.py:545 trac/admin/web_ui.py:396
-#: trac/admin/web_ui.py:399 trac/admin/web_ui.py:403
+#: trac/attachment.py:528 trac/attachment.py:551 trac/admin/web_ui.py:397
+#: trac/admin/web_ui.py:400 trac/admin/web_ui.py:404
 msgid "No file uploaded"
 msgstr ""
 
-#: trac/attachment.py:530
+#: trac/attachment.py:536
 msgid "Can't upload empty file"
 msgstr ""
 
-#: trac/attachment.py:535
+#: trac/attachment.py:541
 #, python-format
 msgid "Maximum attachment size: %(num)s bytes"
 msgstr ""
 
-#: trac/attachment.py:536
+#: trac/attachment.py:542
 msgid "Upload failed"
 msgstr ""
 
-#: trac/attachment.py:557
+#: trac/attachment.py:563
 #, python-format
 msgid "Attachment field %(field)s is invalid: %(message)s"
 msgstr ""
 
-#: trac/attachment.py:561
+#: trac/attachment.py:567
 #, python-format
 msgid "Invalid attachment: %(message)s"
 msgstr ""
 
-#: trac/attachment.py:595
+#: trac/attachment.py:601
 #, python-format
 msgid "%(attachment)s (delete)"
 msgstr ""
 
-#: trac/attachment.py:659 trac/versioncontrol/web_ui/browser.py:504
+#: trac/attachment.py:663 trac/versioncontrol/web_ui/browser.py:510
 #: trac/wiki/web_ui.py:63
 msgid "Plain Text"
 msgstr ""
 
-#: trac/attachment.py:665 trac/versioncontrol/web_ui/browser.py:509
+#: trac/attachment.py:669 trac/versioncontrol/web_ui/browser.py:515
 msgid "Original Format"
 msgstr ""
 
@@ -131,20 +131,20 @@
 "Run \"trac-admin %(path)s upgrade\""
 msgstr ""
 
-#: trac/notification.py:214
+#: trac/notification.py:216
 #, python-format
 msgid "Invalid email encoding setting: %s"
 msgstr ""
 
-#: trac/notification.py:246
+#: trac/notification.py:248
 msgid "Header length is too short"
 msgstr ""
 
-#: trac/notification.py:316
+#: trac/notification.py:318
 msgid "TLS enabled but server does not support TLS"
 msgstr ""
 
-#: trac/notification.py:388
+#: trac/notification.py:390
 msgid "Ticket contains non-Ascii chars. Please change encoding setting"
 msgstr ""
 
@@ -167,121 +167,126 @@
 msgid "%(name)s is not a valid action."
 msgstr ""
 
-#: trac/resource.py:325
+#: trac/resource.py:329
 #, python-format
 msgid " at version %(version)s"
 msgstr ""
 
-#: trac/admin/web_ui.py:65
+#: trac/admin/console.py:1127
+#, python-format
+msgid "hotcopy can't overwrite existing '%(dest)s'"
+msgstr ""
+
+#: trac/admin/web_ui.py:66
 msgid "Admin"
 msgstr ""
 
-#: trac/admin/web_ui.py:66 trac/admin/templates/admin.html:16
+#: trac/admin/web_ui.py:67 trac/admin/templates/admin.html:16
 msgid "Administration"
 msgstr ""
 
-#: trac/admin/web_ui.py:82
+#: trac/admin/web_ui.py:83
 msgid "No administration panels available"
 msgstr ""
 
-#: trac/admin/web_ui.py:104
+#: trac/admin/web_ui.py:105
 msgid "Unknown administration panel"
 msgstr ""
 
-#: trac/admin/web_ui.py:179 trac/admin/web_ui.py:206 trac/admin/web_ui.py:295
-#: trac/admin/web_ui.py:372 trac/prefs/web_ui.py:82
+#: trac/admin/web_ui.py:180 trac/admin/web_ui.py:207 trac/admin/web_ui.py:296
+#: trac/admin/web_ui.py:373 trac/prefs/web_ui.py:82
 #: trac/prefs/templates/prefs_general.html:9
 msgid "General"
 msgstr ""
 
-#: trac/admin/web_ui.py:179 trac/admin/templates/admin_basics.html:13
+#: trac/admin/web_ui.py:180 trac/admin/templates/admin_basics.html:13
 msgid "Basic Settings"
 msgstr ""
 
-#: trac/admin/web_ui.py:206 trac/admin/templates/admin_logging.html:9
+#: trac/admin/web_ui.py:207 trac/admin/templates/admin_logging.html:9
 #: trac/admin/templates/admin_logging.html:21
 msgid "Logging"
 msgstr ""
 
-#: trac/admin/web_ui.py:215 trac/ticket/templates/milestone_delete.html:29
+#: trac/admin/web_ui.py:216 trac/ticket/templates/milestone_delete.html:29
 #: trac/ticket/templates/milestone_edit.html:73
 msgid "None"
 msgstr ""
 
-#: trac/admin/web_ui.py:216
+#: trac/admin/web_ui.py:217
 msgid "Console"
 msgstr ""
 
-#: trac/admin/web_ui.py:218 trac/templates/attachment.html:20
+#: trac/admin/web_ui.py:219 trac/templates/attachment.html:20
 #: trac/templates/attachment.html:81 trac/versioncontrol/api.py:105
 msgid "File"
 msgstr ""
 
-#: trac/admin/web_ui.py:220
+#: trac/admin/web_ui.py:221
 msgid "Syslog"
 msgstr ""
 
-#: trac/admin/web_ui.py:222
+#: trac/admin/web_ui.py:223
 msgid "Windows event log"
 msgstr ""
 
-#: trac/admin/web_ui.py:236
+#: trac/admin/web_ui.py:237
 #, python-format
 msgid "Unknown log type %(type)s"
 msgstr ""
 
-#: trac/admin/web_ui.py:237
+#: trac/admin/web_ui.py:238
 msgid "Invalid log type"
 msgstr ""
 
-#: trac/admin/web_ui.py:248
+#: trac/admin/web_ui.py:249
 #, python-format
 msgid "Unknown log level %(level)s"
 msgstr ""
 
-#: trac/admin/web_ui.py:249
+#: trac/admin/web_ui.py:250
 msgid "Invalid log level"
 msgstr ""
 
-#: trac/admin/web_ui.py:265
+#: trac/admin/web_ui.py:266
 msgid "You must specify a log file"
 msgstr ""
 
-#: trac/admin/web_ui.py:266
+#: trac/admin/web_ui.py:267
 msgid "Missing field"
 msgstr ""
 
-#: trac/admin/web_ui.py:295 trac/admin/templates/admin_perms.html:9
+#: trac/admin/web_ui.py:296 trac/admin/templates/admin_perms.html:9
 msgid "Permissions"
 msgstr ""
 
-#: trac/admin/web_ui.py:308
+#: trac/admin/web_ui.py:309
 msgid "All upper-cased tokens are reserved for permission names"
 msgstr ""
 
-#: trac/admin/web_ui.py:315
+#: trac/admin/web_ui.py:316
 msgid "Unknown action"
 msgstr ""
 
-#: trac/admin/web_ui.py:322
+#: trac/admin/web_ui.py:323
 #, python-format
 msgid "Permission \"%(action)s\" was already granted to \"%(subject)s\""
 msgstr ""
 
-#: trac/admin/web_ui.py:336
+#: trac/admin/web_ui.py:337
 #, python-format
 msgid "\"%(subject)s\" was already added to group \"%(group)s\""
 msgstr ""
 
-#: trac/admin/web_ui.py:372 trac/admin/templates/admin_plugins.html:9
+#: trac/admin/web_ui.py:373 trac/admin/templates/admin_plugins.html:9
 msgid "Plugins"
 msgstr ""
 
-#: trac/admin/web_ui.py:406
+#: trac/admin/web_ui.py:407
 msgid "Uploaded file is not a Python source file or egg"
 msgstr ""
 
-#: trac/admin/web_ui.py:411
+#: trac/admin/web_ui.py:412
 #, python-format
 msgid "Plugin %(name)s already installed"
 msgstr ""
@@ -336,12 +341,29 @@
 msgstr ""
 
 #: trac/admin/templates/admin_components.html:42
-msgid ""
-"Description (you may use\n"
-"                [1:WikiFormatting]\n"
-"                here):"
+#: trac/admin/templates/admin_milestones.html:55
+#: trac/admin/templates/admin_versions.html:35
+#: trac/ticket/templates/milestone_edit.html:82
+msgid "Description (you may use"
 msgstr ""
 
+#: trac/admin/templates/admin_components.html:44
+#: trac/admin/templates/admin_milestones.html:56
+#: trac/admin/templates/admin_versions.html:36
+#: trac/ticket/templates/milestone_edit.html:83
+#: trac/ticket/templates/report_edit.html:26
+#: trac/ticket/templates/ticket.html:260 trac/wiki/templates/wiki_edit.html:88
+msgid "WikiFormatting"
+msgstr ""
+
+#: trac/admin/templates/admin_components.html:44
+#: trac/admin/templates/admin_milestones.html:56
+#: trac/admin/templates/admin_versions.html:36
+#: trac/ticket/templates/milestone_edit.html:83
+#: trac/ticket/templates/ticket.html:260
+msgid "here):"
+msgstr ""
+
 #: trac/admin/templates/admin_components.html:64
 msgid "Add Component:"
 msgstr ""
@@ -350,7 +372,7 @@
 #: trac/admin/templates/admin_enums.html:47
 #: trac/admin/templates/admin_milestones.html:100
 #: trac/admin/templates/admin_versions.html:77 trac/templates/about.html:66
-#: trac/templates/error.html:158
+#: trac/templates/error.html:162
 msgid "Name"
 msgstr ""
 
@@ -427,7 +449,7 @@
 msgid "directory of the project environment ("
 msgstr ""
 
-#: trac/admin/templates/admin_milestones.html:10 trac/ticket/roadmap.py:501
+#: trac/admin/templates/admin_milestones.html:10 trac/ticket/roadmap.py:504
 msgid "Milestones"
 msgstr ""
 
@@ -460,12 +482,6 @@
 msgid "Completed:"
 msgstr ""
 
-#: trac/admin/templates/admin_milestones.html:55
-#: trac/admin/templates/admin_versions.html:35
-#: trac/ticket/templates/milestone_edit.html:82
-msgid "Description (you may use [1:WikiFormatting] here):"
-msgstr ""
-
 #: trac/admin/templates/admin_milestones.html:75
 msgid "Add Milestone:"
 msgstr ""
@@ -493,7 +509,7 @@
 msgid "Subject"
 msgstr ""
 
-#: trac/admin/templates/admin_perms.html:16 trac/ticket/templates/query.html:61
+#: trac/admin/templates/admin_perms.html:16 trac/ticket/templates/query.html:64
 msgid "or"
 msgstr ""
 
@@ -631,11 +647,11 @@
 "for syntax highlighting."
 msgstr ""
 
-#: trac/mimeview/rst.py:56
+#: trac/mimeview/rst.py:60
 msgid "Docutils not found"
 msgstr ""
 
-#: trac/mimeview/rst.py:58
+#: trac/mimeview/rst.py:62
 #, python-format
 msgid "Docutils version >= %(version)s required, %(found)s found"
 msgstr ""
@@ -707,48 +723,48 @@
 "      multiple computers and web browsers."
 msgstr ""
 
-#: trac/prefs/templates/prefs_datetime.html:17
+#: trac/prefs/templates/prefs_datetime.html:15
 msgid "Time zone:"
 msgstr ""
 
-#: trac/prefs/templates/prefs_datetime.html:19
+#: trac/prefs/templates/prefs_datetime.html:17
 msgid "Default time zone"
 msgstr ""
 
-#: trac/prefs/templates/prefs_datetime.html:25
+#: trac/prefs/templates/prefs_datetime.html:24
 msgid ""
 "Configuring your time zone will result in all\n"
 "      dates and times displayed on this site to use your time zone\n"
 "      instead of that of the server."
 msgstr ""
 
-#: trac/prefs/templates/prefs_datetime.html:29
+#: trac/prefs/templates/prefs_datetime.html:28
 msgid "Example: The current time is"
 msgstr ""
 
-#: trac/prefs/templates/prefs_datetime.html:30
+#: trac/prefs/templates/prefs_datetime.html:29
 msgid "(UTC)."
 msgstr ""
 
-#: trac/prefs/templates/prefs_datetime.html:31
+#: trac/prefs/templates/prefs_datetime.html:30
 msgid "In"
 msgstr ""
 
-#: trac/prefs/templates/prefs_datetime.html:32
+#: trac/prefs/templates/prefs_datetime.html:31
 msgid "time zone"
 msgstr ""
 
-#: trac/prefs/templates/prefs_datetime.html:32
+#: trac/prefs/templates/prefs_datetime.html:31
 msgid ", this would be displayed as"
 msgstr ""
 
-#: trac/prefs/templates/prefs_datetime.html:36
+#: trac/prefs/templates/prefs_datetime.html:35
 msgid ""
 "Note: Universal Co-ordinated Time (UTC) is also known as Greenwich Mean "
 "Time (GMT)."
 msgstr ""
 
-#: trac/prefs/templates/prefs_datetime.html:37
+#: trac/prefs/templates/prefs_datetime.html:36
 msgid ""
 "A positive offset is used to indicate a timezone at the east of "
 "Greenwhich, i.e. ahead of Universal Time."
@@ -799,17 +815,17 @@
 msgid "Pygments Theme"
 msgstr ""
 
-#: trac/prefs/templates/prefs_pygments.html:34
+#: trac/prefs/templates/prefs_pygments.html:36
 msgid ""
 "The Pygments syntax highlighter can be used with\n"
 "      different coloring themes."
 msgstr ""
 
-#: trac/prefs/templates/prefs_pygments.html:36
+#: trac/prefs/templates/prefs_pygments.html:38
 msgid "Theme:"
 msgstr ""
 
-#: trac/prefs/templates/prefs_pygments.html:41
+#: trac/prefs/templates/prefs_pygments.html:43
 msgid "Preview:"
 msgstr ""
 
@@ -865,7 +881,7 @@
 #: trac/ticket/templates/milestone_delete.html:38
 #: trac/ticket/templates/milestone_edit.html:95
 #: trac/ticket/templates/milestone_view.html:89
-#: trac/ticket/templates/query.html:234
+#: trac/ticket/templates/query.html:237
 #: trac/ticket/templates/report_delete.html:26
 #: trac/ticket/templates/report_edit.html:49
 #: trac/ticket/templates/report_view.html:162
@@ -874,6 +890,7 @@
 #: trac/versioncontrol/templates/browser.html:142
 #: trac/versioncontrol/templates/diff_form.html:62
 #: trac/versioncontrol/templates/revisionlog.html:169
+#: trac/wiki/templates/wiki_edit.html:88
 msgid "Note:"
 msgstr ""
 
@@ -881,7 +898,7 @@
 #: trac/ticket/templates/milestone_delete.html:38
 #: trac/ticket/templates/milestone_edit.html:95
 #: trac/ticket/templates/milestone_view.html:89
-#: trac/ticket/templates/query.html:234
+#: trac/ticket/templates/query.html:237
 #: trac/ticket/templates/report_delete.html:26
 #: trac/ticket/templates/report_edit.html:49
 #: trac/ticket/templates/report_view.html:162
@@ -890,6 +907,7 @@
 #: trac/versioncontrol/templates/browser.html:142
 #: trac/versioncontrol/templates/diff_form.html:62
 #: trac/versioncontrol/templates/revisionlog.html:169
+#: trac/wiki/templates/wiki_edit.html:88
 msgid "See"
 msgstr ""
 
@@ -959,7 +977,7 @@
 msgid "Section"
 msgstr ""
 
-#: trac/templates/about.html:67 trac/templates/error.html:158
+#: trac/templates/about.html:67 trac/templates/error.html:162
 msgid "Value"
 msgstr ""
 
@@ -1049,10 +1067,11 @@
 
 #: trac/templates/diff_view.html:19 trac/templates/diff_view.html:22
 #: trac/timeline/templates/timeline.html:20
+#: trac/wiki/templates/wiki_edit.html:88
 msgid "and"
 msgstr ""
 
-#: trac/templates/diff_view.html:22 trac/ticket/web_ui.py:697
+#: trac/templates/diff_view.html:22 trac/ticket/web_ui.py:699
 #: trac/ticket/templates/ticket.html:97
 msgid "Initial Version"
 msgstr ""
@@ -1103,101 +1122,101 @@
 msgid "Removed"
 msgstr ""
 
-#: trac/templates/diff_view.html:61 trac/ticket/query.py:483
+#: trac/templates/diff_view.html:61 trac/ticket/query.py:486
 #: trac/versioncontrol/templates/changeset.html:157
 #: trac/versioncontrol/templates/revisionlog.html:76
 msgid "Modified"
 msgstr ""
 
-#: trac/templates/error.html:57
+#: trac/templates/error.html:60
 msgid ""
 "==== How to Reproduce ====\n"
 "\n"
 "While doing a"
 msgstr ""
 
-#: trac/templates/error.html:60
+#: trac/templates/error.html:64
 msgid "operation on `"
 msgstr ""
 
-#: trac/templates/error.html:60
+#: trac/templates/error.html:64
 msgid ""
 "`, Trac issued an internal error.\n"
 "\n"
 "''(please provide additional details here)''"
 msgstr ""
 
-#: trac/templates/error.html:64
+#: trac/templates/error.html:68
 msgid ""
 "Request parameters:\n"
 "{{{"
 msgstr ""
 
-#: trac/templates/error.html:69
+#: trac/templates/error.html:73
 msgid "==== System Information ===="
 msgstr ""
 
-#: trac/templates/error.html:72
+#: trac/templates/error.html:76
 msgid ""
 "==== Python Traceback ====\n"
 "{{{"
 msgstr ""
 
-#: trac/templates/error.html:95
+#: trac/templates/error.html:99
 msgid "Oops…"
 msgstr ""
 
-#: trac/templates/error.html:97
+#: trac/templates/error.html:101
 msgid "Trac detected an internal error:"
 msgstr ""
 
-#: trac/templates/error.html:102
+#: trac/templates/error.html:106
 msgid ""
 "There was an internal error in Trac. It is recommended\n"
 "              that you inform your local"
 msgstr ""
 
-#: trac/templates/error.html:104
+#: trac/templates/error.html:108
 msgid ""
 "Trac\n"
 "              administrator"
 msgstr ""
 
-#: trac/templates/error.html:105
+#: trac/templates/error.html:109
 msgid ""
 "and give him all the information he needs to\n"
 "              reproduce the issue."
 msgstr ""
 
-#: trac/templates/error.html:110
+#: trac/templates/error.html:114
 msgid "To that end, you could"
 msgstr ""
 
-#: trac/templates/error.html:110
+#: trac/templates/error.html:114
 msgid ""
 "a ticket at this\n"
 "                  site."
 msgstr ""
 
-#: trac/templates/error.html:114
+#: trac/templates/error.html:118
 msgid "The action that triggered the error was:"
 msgstr ""
 
-#: trac/templates/error.html:120
+#: trac/templates/error.html:124
 msgid ""
 "If you think this should work you can reproduce the problem,\n"
 "              you should consider reporting this to the Trac team."
 msgstr ""
 
-#: trac/templates/error.html:122
+#: trac/templates/error.html:126
 msgid "Before you do that, though, please first try"
 msgstr ""
 
-#: trac/templates/error.html:124
+#: trac/templates/error.html:128
 msgid "searching"
 msgstr ""
 
-#: trac/templates/error.html:124
+#: trac/templates/error.html:128
 msgid ""
 "for similar issues, as it is quite likely that this problem\n"
 "                has been reported before. For questions about "
@@ -1205,19 +1224,19 @@
 "                and configuration of Trac, please try the"
 msgstr ""
 
-#: trac/templates/error.html:128
+#: trac/templates/error.html:132
 msgid "mailing list"
 msgstr ""
 
-#: trac/templates/error.html:128
+#: trac/templates/error.html:132
 msgid "instead of filing a ticket."
 msgstr ""
 
-#: trac/templates/error.html:132
+#: trac/templates/error.html:136
 msgid "Otherwise, please"
 msgstr ""
 
-#: trac/templates/error.html:132
+#: trac/templates/error.html:136
 msgid ""
 "a new ticket at\n"
 "                the Trac project site, where you can describe the problem"
@@ -1225,49 +1244,49 @@
 "                explain how to reproduce it."
 msgstr ""
 
-#: trac/templates/error.html:137
+#: trac/templates/error.html:141
 msgid "Python Traceback"
 msgstr ""
 
-#: trac/templates/error.html:138
+#: trac/templates/error.html:142
 msgid "Most recent call last:"
 msgstr ""
 
-#: trac/templates/error.html:143 trac/templates/error.html:170
+#: trac/templates/error.html:147 trac/templates/error.html:174
 msgid "File \""
 msgstr ""
 
-#: trac/templates/error.html:143
+#: trac/templates/error.html:147
 msgid ""
 "\",\n"
 "                        line"
 msgstr ""
 
-#: trac/templates/error.html:144 trac/templates/error.html:170
+#: trac/templates/error.html:148 trac/templates/error.html:174
 msgid ", in"
 msgstr ""
 
-#: trac/templates/error.html:148
+#: trac/templates/error.html:152
 msgid "Code fragment:"
 msgstr ""
 
-#: trac/templates/error.html:156
+#: trac/templates/error.html:160
 msgid "Local variables:"
 msgstr ""
 
-#: trac/templates/error.html:170
+#: trac/templates/error.html:174
 msgid "\", line"
 msgstr ""
 
-#: trac/templates/error.html:176
+#: trac/templates/error.html:180
 msgid "System Information:"
 msgstr ""
 
-#: trac/templates/error.html:188
+#: trac/templates/error.html:192
 msgid "TracGuide"
 msgstr ""
 
-#: trac/templates/error.html:188
+#: trac/templates/error.html:192
 msgid "— The Trac User and Administration Guide"
 msgstr ""
 
@@ -1436,7 +1455,7 @@
 msgid ") - added by"
 msgstr ""
 
-#: trac/templates/macros.html:174 trac/ticket/templates/query_results.html:68
+#: trac/templates/macros.html:174 trac/ticket/templates/query_results.html:70
 msgid "ago."
 msgstr ""
 
@@ -1460,23 +1479,23 @@
 msgid "No component selected"
 msgstr ""
 
-#: trac/ticket/admin.py:146 trac/ticket/roadmap.py:630
+#: trac/ticket/admin.py:148 trac/ticket/roadmap.py:633
 msgid "Completion date may not be in the future"
 msgstr ""
 
-#: trac/ticket/admin.py:174
+#: trac/ticket/admin.py:176
 msgid "No milestone selected"
 msgstr ""
 
-#: trac/ticket/admin.py:247
+#: trac/ticket/admin.py:249
 msgid "No version selected"
 msgstr ""
 
-#: trac/ticket/admin.py:319
+#: trac/ticket/admin.py:321
 msgid "No enum selected"
 msgstr ""
 
-#: trac/ticket/admin.py:345
+#: trac/ticket/admin.py:348
 msgid "Order numbers must be unique"
 msgstr ""
 
@@ -1490,116 +1509,120 @@
 msgid "Ticket #%(shortname)s"
 msgstr ""
 
-#: trac/ticket/default_workflow.py:203
+#: trac/ticket/default_workflow.py:219
+msgid "Current state no longer exists"
+msgstr ""
+
+#: trac/ticket/default_workflow.py:221
 msgid "The ticket will be disowned"
 msgstr ""
 
-#: trac/ticket/default_workflow.py:222 trac/ticket/default_workflow.py:231
+#: trac/ticket/default_workflow.py:240 trac/ticket/default_workflow.py:249
 msgid "The owner will change"
 msgstr ""
 
-#: trac/ticket/default_workflow.py:225 trac/ticket/default_workflow.py:233
+#: trac/ticket/default_workflow.py:243 trac/ticket/default_workflow.py:251
 #, python-format
 msgid "The owner will change to %s"
 msgstr ""
 
-#: trac/ticket/default_workflow.py:227
+#: trac/ticket/default_workflow.py:245
 msgid "to "
 msgstr ""
 
-#: trac/ticket/default_workflow.py:244
+#: trac/ticket/default_workflow.py:262
 #, python-format
 msgid "The resolution will be set to %s"
 msgstr ""
 
-#: trac/ticket/default_workflow.py:254
+#: trac/ticket/default_workflow.py:272
 msgid "The resolution will be set"
 msgstr ""
 
-#: trac/ticket/default_workflow.py:259
+#: trac/ticket/default_workflow.py:277
 #, python-format
 msgid "Next status will be '%s'"
 msgstr ""
 
-#: trac/ticket/model.py:355
+#: trac/ticket/model.py:357
 #, python-format
 msgid "%(type)s %(name)s does not exist."
 msgstr ""
 
-#: trac/ticket/model.py:499
+#: trac/ticket/model.py:501
 #, python-format
 msgid "Component %(name)s does not exist."
 msgstr ""
 
-#: trac/ticket/model.py:732
+#: trac/ticket/model.py:731
 #, python-format
 msgid "Version %(name)s does not exist."
 msgstr ""
 
-#: trac/ticket/query.py:484
+#: trac/ticket/query.py:487
 msgid "Created"
 msgstr ""
 
-#: trac/ticket/query.py:487 trac/ticket/web_ui.py:535
+#: trac/ticket/query.py:490 trac/ticket/web_ui.py:533
 msgid "Ticket"
 msgstr ""
 
-#: trac/ticket/query.py:503
+#: trac/ticket/query.py:506
 msgid "contains"
 msgstr ""
 
-#: trac/ticket/query.py:504
+#: trac/ticket/query.py:507
 msgid "doesn't contain"
 msgstr ""
 
-#: trac/ticket/query.py:505
+#: trac/ticket/query.py:508
 msgid "begins with"
 msgstr ""
 
-#: trac/ticket/query.py:506
+#: trac/ticket/query.py:509
 msgid "ends with"
 msgstr ""
 
-#: trac/ticket/query.py:507 trac/ticket/query.py:511
+#: trac/ticket/query.py:510 trac/ticket/query.py:514
 msgid "is"
 msgstr ""
 
-#: trac/ticket/query.py:508 trac/ticket/query.py:512
+#: trac/ticket/query.py:511 trac/ticket/query.py:515
 msgid "is not"
 msgstr ""
 
-#: trac/ticket/query.py:560 trac/ticket/report.py:438 trac/ticket/web_ui.py:113
-#: trac/timeline/web_ui.py:184 trac/versioncontrol/web_ui/log.py:241
+#: trac/ticket/query.py:564 trac/ticket/report.py:440 trac/ticket/web_ui.py:113
+#: trac/timeline/web_ui.py:190 trac/versioncontrol/web_ui/log.py:241
 msgid "RSS Feed"
 msgstr ""
 
-#: trac/ticket/query.py:562 trac/ticket/report.py:441 trac/ticket/web_ui.py:109
+#: trac/ticket/query.py:566 trac/ticket/report.py:443 trac/ticket/web_ui.py:109
 msgid "Comma-delimited Text"
 msgstr ""
 
-#: trac/ticket/query.py:564 trac/ticket/report.py:443 trac/ticket/web_ui.py:111
+#: trac/ticket/query.py:568 trac/ticket/report.py:445 trac/ticket/web_ui.py:111
 msgid "Tab-delimited Text"
 msgstr ""
 
-#: trac/ticket/query.py:586 trac/ticket/report.py:53
+#: trac/ticket/query.py:590 trac/ticket/report.py:53
 msgid "View Tickets"
 msgstr ""
 
-#: trac/ticket/query.py:753 trac/ticket/query.py:764 trac/ticket/report.py:111
+#: trac/ticket/query.py:757 trac/ticket/query.py:768 trac/ticket/report.py:111
 msgid "Custom Query"
 msgstr ""
 
-#: trac/ticket/query.py:763 trac/ticket/report.py:101 trac/ticket/report.py:102
+#: trac/ticket/query.py:767 trac/ticket/report.py:101 trac/ticket/report.py:102
 #: trac/ticket/report.py:104 trac/ticket/report.py:221
 msgid "Available Reports"
 msgstr ""
 
-#: trac/ticket/query.py:848
+#: trac/ticket/query.py:852
 #, python-format
 msgid "[Error: %(error)s]"
 msgstr ""
 
-#: trac/ticket/query.py:964
+#: trac/ticket/query.py:968
 msgid "No results"
 msgstr ""
 
@@ -1647,60 +1670,60 @@
 msgid "Report execution failed: %(error)s"
 msgstr ""
 
-#: trac/ticket/report.py:445
+#: trac/ticket/report.py:447
 msgid "SQL Query"
 msgstr ""
 
-#: trac/ticket/report.py:451
+#: trac/ticket/report.py:453
 #, python-format
 msgid "Report %(num)s has no SQL query."
 msgstr ""
 
-#: trac/ticket/report.py:486
+#: trac/ticket/report.py:488
 #, python-format
 msgid "Dynamic variable '%(name)s' not defined."
 msgstr ""
 
-#: trac/ticket/roadmap.py:211
+#: trac/ticket/roadmap.py:213
 #, python-format
 msgid ""
 "'%(group1)s' and '%(group2)s' milestone groups both are declared to be "
 "\"catch-all\" groups. Please check your configuration."
 msgstr ""
 
-#: trac/ticket/roadmap.py:227
+#: trac/ticket/roadmap.py:229
 #, python-format
 msgid ""
 "'%(groupname)s' milestone group reused status '%(status)s' already taken "
 "by other groups. Please check your configuration."
 msgstr ""
 
-#: trac/ticket/roadmap.py:305 trac/ticket/roadmap.py:416
-#: trac/ticket/roadmap.py:547 trac/ticket/templates/roadmap.html:10
+#: trac/ticket/roadmap.py:308 trac/ticket/roadmap.py:419
+#: trac/ticket/roadmap.py:550 trac/ticket/templates/roadmap.html:10
 #: trac/ticket/templates/roadmap.html:17
 msgid "Roadmap"
 msgstr ""
 
-#: trac/ticket/roadmap.py:347
+#: trac/ticket/roadmap.py:350
 msgid "iCalendar"
 msgstr ""
 
-#: trac/ticket/roadmap.py:425 trac/ticket/roadmap.py:799
+#: trac/ticket/roadmap.py:428 trac/ticket/roadmap.py:802
 #, python-format
 msgid "Milestone %(name)s"
 msgstr ""
 
-#: trac/ticket/roadmap.py:445
+#: trac/ticket/roadmap.py:448
 #, python-format
 msgid "Ticket #%(num)s: %(summary)s"
 msgstr ""
 
-#: trac/ticket/roadmap.py:619
+#: trac/ticket/roadmap.py:622
 #, python-format
 msgid "Milestone \"%(name)s\" already exists, please choose another name"
 msgstr ""
 
-#: trac/ticket/roadmap.py:624
+#: trac/ticket/roadmap.py:627
 msgid "You must provide a name for the milestone."
 msgstr ""
 
@@ -1708,120 +1731,120 @@
 msgid "New Ticket"
 msgstr ""
 
-#: trac/ticket/web_ui.py:158
-msgid "id can't be set for a new ticket request."
-msgstr ""
-
-#: trac/ticket/web_ui.py:208
+#: trac/ticket/web_ui.py:207
 msgid "Ticket changes"
 msgstr ""
 
-#: trac/ticket/web_ui.py:210
+#: trac/ticket/web_ui.py:209
 msgid "Ticket details"
 msgstr ""
 
-#: trac/ticket/web_ui.py:441
+#: trac/ticket/web_ui.py:439
 #, python-format
 msgid "Invalid action \"%(name)s\""
 msgstr ""
 
-#: trac/ticket/web_ui.py:535
+#: trac/ticket/web_ui.py:533
 msgid "Back to Query"
 msgstr ""
 
-#: trac/ticket/web_ui.py:613 trac/ticket/web_ui.py:760
+#: trac/ticket/web_ui.py:611 trac/ticket/web_ui.py:761
 msgid "Ticket History"
 msgstr ""
 
-#: trac/ticket/web_ui.py:661
+#: trac/ticket/web_ui.py:656
 msgid "No differences to show"
 msgstr ""
 
-#: trac/ticket/web_ui.py:695 trac/ticket/web_ui.py:750
-#: trac/ticket/web_ui.py:758 trac/wiki/web_ui.py:346 trac/wiki/web_ui.py:352
+#: trac/ticket/web_ui.py:696 trac/ticket/web_ui.py:751
+#: trac/ticket/web_ui.py:759 trac/wiki/web_ui.py:346 trac/wiki/web_ui.py:352
 #: trac/wiki/web_ui.py:498 trac/wiki/web_ui.py:506
 #, python-format
 msgid "Version %(num)s"
 msgstr ""
 
-#: trac/ticket/web_ui.py:760 trac/versioncontrol/web_ui/changeset.py:342
+#: trac/ticket/web_ui.py:699
+msgid "initial"
+msgstr ""
+
+#: trac/ticket/web_ui.py:761 trac/versioncontrol/web_ui/changeset.py:342
 #: trac/wiki/web_ui.py:365
 msgid "Change"
 msgstr ""
 
-#: trac/ticket/web_ui.py:765
+#: trac/ticket/web_ui.py:766
 msgid "Ticket Diff"
 msgstr ""
 
-#: trac/ticket/web_ui.py:832
+#: trac/ticket/web_ui.py:833
 msgid "No permission to change ticket fields."
 msgstr ""
 
-#: trac/ticket/web_ui.py:839
+#: trac/ticket/web_ui.py:840
 msgid "No permissions to change ticket fields."
 msgstr ""
 
-#: trac/ticket/web_ui.py:848
+#: trac/ticket/web_ui.py:849
 msgid "No permissions to add a comment."
 msgstr ""
 
-#: trac/ticket/web_ui.py:854
+#: trac/ticket/web_ui.py:855
 msgid ""
 "Sorry, can not save your changes. This ticket has been modified by "
 "someone else since you started"
 msgstr ""
 
-#: trac/ticket/web_ui.py:861
+#: trac/ticket/web_ui.py:862
 msgid "Tickets must contain a summary."
 msgstr ""
 
-#: trac/ticket/web_ui.py:884
+#: trac/ticket/web_ui.py:885
 #, python-format
 msgid "Ticket description is too long (must be less than %(num)s characters)"
 msgstr ""
 
-#: trac/ticket/web_ui.py:899
+#: trac/ticket/web_ui.py:900
 msgid "Invalid comment threading identifier"
 msgstr ""
 
-#: trac/ticket/web_ui.py:906
+#: trac/ticket/web_ui.py:907
 #, python-format
 msgid "The ticket field '%(field)s' is invalid: %(message)s"
 msgstr ""
 
-#: trac/ticket/web_ui.py:1032
+#: trac/ticket/web_ui.py:1033
 msgid "Open"
 msgstr ""
 
-#: trac/ticket/web_ui.py:1033
+#: trac/ticket/web_ui.py:1034
 msgid "Closed"
 msgstr ""
 
-#: trac/ticket/web_ui.py:1048
+#: trac/ticket/web_ui.py:1049
 msgid "Add to Cc"
 msgstr ""
 
-#: trac/ticket/web_ui.py:1049
+#: trac/ticket/web_ui.py:1050
 msgid "Remove from Cc"
 msgstr ""
 
-#: trac/ticket/web_ui.py:1050
+#: trac/ticket/web_ui.py:1051
 msgid "Add/Remove from Cc"
 msgstr ""
 
-#: trac/ticket/web_ui.py:1051
+#: trac/ticket/web_ui.py:1052
 msgid "<Author field>"
 msgstr ""
 
-#: trac/ticket/web_ui.py:1066 trac/ticket/templates/query.html:90
+#: trac/ticket/web_ui.py:1067 trac/ticket/templates/query.html:93
 msgid "yes"
 msgstr ""
 
-#: trac/ticket/web_ui.py:1066 trac/ticket/templates/query.html:93
+#: trac/ticket/web_ui.py:1067 trac/ticket/templates/query.html:96
 msgid "no"
 msgstr ""
 
-#: trac/ticket/web_ui.py:1234 trac/versioncontrol/templates/changeset.html:130
+#: trac/ticket/web_ui.py:1237 trac/versioncontrol/templates/changeset.html:130
 msgid "modified"
 msgstr ""
 
@@ -1912,68 +1935,68 @@
 msgid "by"
 msgstr ""
 
-#: trac/ticket/templates/query.html:25
+#: trac/ticket/templates/query.html:28
 #: trac/ticket/templates/query_results.html:22
 #: trac/ticket/templates/report_view.html:46
 msgid "match"
 msgstr ""
 
-#: trac/ticket/templates/query.html:38
+#: trac/ticket/templates/query.html:41
 msgid "Filters"
 msgstr ""
 
-#: trac/ticket/templates/query.html:39
+#: trac/ticket/templates/query.html:42
 msgid "Query filters"
 msgstr ""
 
-#: trac/ticket/templates/query.html:114
+#: trac/ticket/templates/query.html:117
 msgid "Add filter"
 msgstr ""
 
-#: trac/ticket/templates/query.html:134
+#: trac/ticket/templates/query.html:137
 msgid "Columns"
 msgstr ""
 
-#: trac/ticket/templates/query.html:148
+#: trac/ticket/templates/query.html:151
 msgid "Group results by"
 msgstr ""
 
-#: trac/ticket/templates/query.html:158
+#: trac/ticket/templates/query.html:161
 msgid "descending"
 msgstr ""
 
-#: trac/ticket/templates/query.html:162
+#: trac/ticket/templates/query.html:165
 msgid "Show under each result:"
 msgstr ""
 
-#: trac/ticket/templates/query.html:218
+#: trac/ticket/templates/query.html:221
 #, python-format
 msgid "Save updated query in report {%(id)s}"
 msgstr ""
 
-#: trac/ticket/templates/query.html:218
+#: trac/ticket/templates/query.html:221
 msgid "Create new report from current query"
 msgstr ""
 
-#: trac/ticket/templates/query.html:234
+#: trac/ticket/templates/query.html:237
 #: trac/ticket/templates/report_edit.html:36
 msgid "TracQuery"
 msgstr ""
 
-#: trac/ticket/templates/query.html:234
+#: trac/ticket/templates/query.html:237
 msgid "for help on using queries."
 msgstr ""
 
-#: trac/ticket/templates/query_results.html:51
 #: trac/ticket/templates/query_results.html:53
+#: trac/ticket/templates/query_results.html:55
 msgid "View ticket"
 msgstr ""
 
-#: trac/ticket/templates/query_results.html:67
+#: trac/ticket/templates/query_results.html:69
 msgid "Reported by"
 msgstr ""
 
-#: trac/ticket/templates/query_results.html:74
+#: trac/ticket/templates/query_results.html:76
 msgid "(this ticket)"
 msgstr ""
 
@@ -1998,9 +2021,13 @@
 msgstr ""
 
 #: trac/ticket/templates/report_edit.html:25
-msgid "Description: (you may use [1:WikiFormatting] here)"
+msgid "Description: (you may use"
 msgstr ""
 
+#: trac/ticket/templates/report_edit.html:26
+msgid "here)"
+msgstr ""
+
 #: trac/ticket/templates/report_edit.html:34
 msgid "Error:"
 msgstr ""
@@ -2147,10 +2174,7 @@
 msgstr ""
 
 #: trac/ticket/templates/ticket.html:259
-msgid ""
-"Comment (you may use\n"
-"              [1:WikiFormatting]\n"
-"              here):"
+msgid "Comment (you may use"
 msgstr ""
 
 #: trac/ticket/templates/ticket.html:272
@@ -2193,20 +2217,20 @@
 "Ticket URL: <"
 msgstr ""
 
-#: trac/timeline/web_ui.py:72 trac/timeline/templates/timeline.html:10
+#: trac/timeline/web_ui.py:76 trac/timeline/templates/timeline.html:10
 #: trac/timeline/templates/timeline.html:16
 msgid "Timeline"
 msgstr ""
 
-#: trac/timeline/web_ui.py:196
+#: trac/timeline/web_ui.py:202
 msgid "Previous period"
 msgstr ""
 
-#: trac/timeline/web_ui.py:202
+#: trac/timeline/web_ui.py:208
 msgid "Next period"
 msgstr ""
 
-#: trac/timeline/web_ui.py:263
+#: trac/timeline/web_ui.py:269
 #, python-format
 msgid "%(date)s in Timeline"
 msgstr ""
@@ -2295,23 +2319,23 @@
 msgid "Subversion >= 1.0 required: Found %(version)s"
 msgstr ""
 
-#: trac/versioncontrol/svn_fs.py:364
+#: trac/versioncontrol/svn_fs.py:369
 msgid "No svn:externals configured in trac.ini"
 msgstr ""
 
-#: trac/versioncontrol/svn_fs.py:388
+#: trac/versioncontrol/svn_fs.py:393
 #, python-format
 msgid "%(path)s does not appear to be a Subversion repository."
 msgstr ""
 
-#: trac/versioncontrol/svn_fs.py:638
+#: trac/versioncontrol/svn_fs.py:650
 #, python-format
 msgid ""
 "Diff mismatch: Base is a %(oldnode)s (%(oldpath)s in revision %(oldrev)s)"
 " and Target is a %(newnode)s (%(newpath)s in revision %(newrev)s)."
 msgstr ""
 
-#: trac/versioncontrol/svn_fs.py:786
+#: trac/versioncontrol/svn_fs.py:798
 #, python-format
 msgid "svn blame failed: %(error)s"
 msgstr ""
@@ -2330,12 +2354,12 @@
 
 #: trac/versioncontrol/templates/browser.html:82
 #: trac/versioncontrol/templates/revisionlog.html:92
-#: trac/versioncontrol/web_ui/browser.py:615
+#: trac/versioncontrol/web_ui/browser.py:621
 msgid "Rev"
 msgstr ""
 
 #: trac/versioncontrol/templates/browser.html:84
-#: trac/versioncontrol/web_ui/browser.py:367 trac/wiki/web_ui.py:531
+#: trac/versioncontrol/web_ui/browser.py:373 trac/wiki/web_ui.py:531
 msgid "Last Change"
 msgstr ""
 
@@ -2377,6 +2401,7 @@
 #: trac/versioncontrol/templates/changeset.html:22
 #: trac/versioncontrol/templates/changeset.html:32
 #: trac/versioncontrol/templates/changeset.html:34
+#: trac/versioncontrol/templates/changeset.html:36
 msgid "Show full changeset"
 msgstr ""
 
@@ -2586,44 +2611,44 @@
 msgid "Browse Source"
 msgstr ""
 
-#: trac/versioncontrol/web_ui/browser.py:344
+#: trac/versioncontrol/web_ui/browser.py:345
 #: trac/versioncontrol/web_ui/changeset.py:240
 msgid "Invalid Changeset Number"
 msgstr ""
 
-#: trac/versioncontrol/web_ui/browser.py:350
+#: trac/versioncontrol/web_ui/browser.py:351
 #: trac/versioncontrol/web_ui/log.py:98
 msgid "Parent directory"
 msgstr ""
 
-#: trac/versioncontrol/web_ui/browser.py:371
+#: trac/versioncontrol/web_ui/browser.py:377
 msgid "Normal"
 msgstr ""
 
-#: trac/versioncontrol/web_ui/browser.py:372
+#: trac/versioncontrol/web_ui/browser.py:378
 msgid "View file without annotations"
 msgstr ""
 
-#: trac/versioncontrol/web_ui/browser.py:376
+#: trac/versioncontrol/web_ui/browser.py:382
 msgid "Annotate"
 msgstr ""
 
-#: trac/versioncontrol/web_ui/browser.py:377
+#: trac/versioncontrol/web_ui/browser.py:383
 msgid ""
 "Annotate each line with the last changed revision (this can be time "
 "consuming...)"
 msgstr ""
 
-#: trac/versioncontrol/web_ui/browser.py:384
+#: trac/versioncontrol/web_ui/browser.py:389
 msgid "Revision Log"
 msgstr ""
 
-#: trac/versioncontrol/web_ui/browser.py:449
+#: trac/versioncontrol/web_ui/browser.py:455
 #: trac/versioncontrol/web_ui/changeset.py:334
 msgid "Zip Archive"
 msgstr ""
 
-#: trac/versioncontrol/web_ui/browser.py:615
+#: trac/versioncontrol/web_ui/browser.py:621
 msgid "Revision in which the line changed"
 msgstr ""
 
@@ -2662,11 +2687,11 @@
 msgid "Show the %(range)s differences restricted to %(path)s"
 msgstr ""
 
-#: trac/versioncontrol/web_ui/changeset.py:765
+#: trac/versioncontrol/web_ui/changeset.py:766
 msgid "Repository checkins"
 msgstr ""
 
-#: trac/versioncontrol/web_ui/changeset.py:937
+#: trac/versioncontrol/web_ui/changeset.py:938
 msgid "Changesets"
 msgstr ""
 
@@ -2698,12 +2723,12 @@
 msgid "Older Revisions"
 msgstr ""
 
-#: trac/web/chrome.py:150 trac/web/chrome.py:158
+#: trac/web/chrome.py:154 trac/web/chrome.py:162
 #, python-format
 msgid "Previous %(label)s"
 msgstr ""
 
-#: trac/web/chrome.py:170 trac/web/chrome.py:177
+#: trac/web/chrome.py:174 trac/web/chrome.py:181
 #, python-format
 msgid "Next %(label)s"
 msgstr ""
@@ -2722,12 +2747,12 @@
 msgid "Can't view %(link)s:"
 msgstr ""
 
-#: trac/wiki/macros.py:464
+#: trac/wiki/macros.py:467
 #, python-format
 msgid "Error: Can't get description for macro %(name)s"
 msgstr ""
 
-#: trac/wiki/macros.py:547
+#: trac/wiki/macros.py:550
 msgid "Table of Contents"
 msgstr ""
 
@@ -2875,12 +2900,14 @@
 msgid "Adjust edit area height:"
 msgstr ""
 
-#: trac/wiki/templates/wiki_edit.html:87
-msgid ""
-"[1:Note:] See [2:WikiFormatting] and\n"
-"          [3:TracWiki] for help on editing wiki content."
+#: trac/wiki/templates/wiki_edit.html:89
+msgid "TracWiki"
 msgstr ""
 
+#: trac/wiki/templates/wiki_edit.html:89
+msgid "for help on editing wiki content."
+msgstr ""
+
 #: trac/wiki/templates/wiki_edit.html:92
 msgid "Change information"
 msgstr ""