Commits

Christian Boos  committed 7aa914b

l10n/en_GB: Mikael Relbe verified it and completed it to 100%, thanks!

See #7417.

  • Participants
  • Parent commits 3d4cd16

Comments (0)

Files changed (1)

File trac/locale/en_GB/LC_MESSAGES/messages.po

 "Project-Id-Version: Trac 0.12\n"
 "Report-Msgid-Bugs-To: trac-dev@googlegroups.com\n"
 "POT-Creation-Date: 2008-06-28 15:16+0200\n"
-"PO-Revision-Date: 2009-04-05 12:31+0200\n"
-"Last-Translator: David Lodge <dave@cirt.net>\n"
+"PO-Revision-Date: 2010-04-27 22:46+0200\n"
+"Last-Translator: Mikael Relbe <mikael@relbe.se>\n"
 "Language-Team: en_GB <trac-dev@googlegroups.com>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.4\n"
-
-#: trac/about.py:43 trac/templates/about.html:9 trac/templates/about.html:28
+"Generated-By: Babel 0.9.5\n"
+
+#: tracopt/mimeview/php.py:97
+msgid ""
+"You appear to be using the PHP CGI binary. Trac requires the CLI version "
+"for syntax highlighting."
+msgstr ""
+"You appear to be using the PHP CGI binary. Trac requires the CLI version "
+"for syntax highlighting."
+
+#: tracopt/ticket/deleter.py:69 tracopt/ticket/deleter.py:82
+#: tracopt/ticket/templates/ticket_delete.html:19
+#: trac/ticket/templates/report_list.html:35
+msgid "Delete"
+msgstr "Delete"
+
+#: tracopt/ticket/deleter.py:70 tracopt/ticket/templates/ticket_delete.html:39
+msgid "Delete ticket"
+msgstr "Delete ticket"
+
+#: tracopt/ticket/deleter.py:83
+#, python-format
+msgid "Delete comment %(num)s"
+msgstr "Delete comment %(num)s"
+
+#: tracopt/ticket/deleter.py:130
+#, python-format
+msgid "The ticket #%(id)s has been deleted."
+msgstr "The ticket #%(id)s has been deleted."
+
+#: tracopt/ticket/deleter.py:137
+#, python-format
+msgid "The ticket comment %(num)s on ticket #%(id)s has been deleted."
+msgstr "The ticket comment %(num)s on ticket #%(id)s has been deleted."
+
+#: tracopt/ticket/deleter.py:156
+#, python-format
+msgid "Comment %(num)s not found"
+msgstr "Comment %(num)s not found"
+
+#: tracopt/ticket/templates/ticket_delete.html:11
+msgid "Delete Ticket #"
+msgstr "Delete ticket #"
+
+#: tracopt/ticket/templates/ticket_delete.html:12
+#: tracopt/ticket/templates/ticket_delete.html:45
+#: tracopt/ticket/templates/ticket_delete.html:69
+msgid "Delete comment"
+msgstr "Delete comment"
+
+#: tracopt/ticket/templates/ticket_delete.html:12
+#: tracopt/ticket/templates/ticket_delete.html:45
+msgid "on Ticket #"
+msgstr "on Ticket #"
+
+#: tracopt/ticket/templates/ticket_delete.html:20
+#: trac/ticket/templates/ticket.html:84
+msgid "Ticket #"
+msgstr "Ticket #"
+
+#: tracopt/ticket/templates/ticket_delete.html:32
+msgid "Are you sure you want to delete this ticket?"
+msgstr "Are you sure you want to delete this ticket?"
+
+#: tracopt/ticket/templates/ticket_delete.html:32
+msgid "(comments:"
+msgstr "(comments:"
+
+#: tracopt/ticket/templates/ticket_delete.html:33
+msgid ""
+",\n"
+"                attachments:"
+msgstr ", attachments:"
+
+#: tracopt/ticket/templates/ticket_delete.html:34
+#: tracopt/ticket/templates/ticket_delete.html:64
+#: trac/templates/attachment.html:70 trac/wiki/templates/wiki_delete.html:46
+msgid "This is an irreversible operation."
+msgstr "This is an irreversible operation."
+
+#: tracopt/ticket/templates/ticket_delete.html:38
+#: tracopt/ticket/templates/ticket_delete.html:68
+#: trac/admin/templates/admin_components.html:55
+#: trac/admin/templates/admin_enums.html:24
+#: trac/admin/templates/admin_milestones.html:68
+#: trac/admin/templates/admin_versions.html:45
+#: trac/templates/attachment.html:63 trac/templates/attachment.html:76
+#: trac/ticket/templates/milestone_delete.html:40
+#: trac/ticket/templates/milestone_edit.html:94
+#: trac/ticket/templates/report_delete.html:21
+#: trac/ticket/templates/report_edit.html:44
+#: trac/ticket/templates/ticket_change.html:49
+#: trac/versioncontrol/templates/admin_repositories.html:84
+#: trac/wiki/templates/wiki_delete.html:50
+#: trac/wiki/templates/wiki_edit.html:80
+#: trac/wiki/templates/wiki_edit_form.html:77
+#: trac/wiki/templates/wiki_rename.html:32
+msgid "Cancel"
+msgstr "Cancel"
+
+#: tracopt/ticket/templates/ticket_delete.html:52
+msgid "comment:"
+msgstr "comment:"
+
+#: tracopt/ticket/templates/ticket_delete.html:54
+#: trac/ticket/templates/ticket.html:142
+#, python-format
+msgid "Changed %(date)s ago by %(author)s"
+msgstr "Changed %(date)s ago by %(author)s"
+
+#: tracopt/ticket/templates/ticket_delete.html:64
+msgid "Are you sure you want to delete this ticket comment?"
+msgstr "Are you sure you want to delete this ticket comment?"
+
+#: trac/about.py:47 trac/templates/about.html:10 trac/templates/about.html:29
 msgid "About Trac"
 msgstr "About Trac"
 
-#: trac/attachment.py:149
+#: trac/attachment.py:151
 #, python-format
 msgid "Attachment '%(title)s' does not exist."
 msgstr "Attachment '%(title)s' does not exist."
 
-#: trac/attachment.py:150
+#: trac/attachment.py:152
 msgid "Invalid Attachment"
 msgstr "Invalid Attachment"
 
 msgid "Could not delete attachment"
 msgstr "Could not delete attachment"
 
-#: trac/attachment.py:298
+#: trac/attachment.py:208
+#, python-format
+msgid ""
+"Cannot reparent attachment \"%(att)s\" as it already exists in "
+"%(realm)s:%(id)s"
+msgstr ""
+"Cannot reparent attachment \"%(att)s\" as it already exists in "
+"%(realm)s:%(id)s"
+
+#: trac/attachment.py:227
+#, python-format
+msgid "Could not reparent attachment %(name)s"
+msgstr "Could not reparent attachment %(name)s"
+
+#: trac/attachment.py:344
 #, python-format
 msgid "Attachment '%(filename)s' not found"
 msgstr "Attachment '%(filename)s' not found"
 
-#: trac/attachment.py:372
+#: trac/attachment.py:418
 msgid "Bad request"
 msgstr "Bad request"
 
-#: trac/attachment.py:389
+#: trac/attachment.py:435
 #, python-format
 msgid "Back to %(parent)s"
 msgstr "Back to %(parent)s"
 
-#: trac/attachment.py:481
-msgid " attached to "
-msgstr " attached to "
-
-#: trac/attachment.py:542
+#: trac/attachment.py:528
+#, python-format
+msgid "%(attachment)s attached to %(resource)s"
+msgstr "%(attachment)s attached to %(resource)s"
+
+#: trac/attachment.py:585
+#, python-format
+msgid "Unparented attachment %(id)s"
+msgstr "Unparented attachment %(id)s"
+
+#: trac/attachment.py:593
 #, python-format
 msgid "Attachment '%(id)s' in %(parent)s"
 msgstr "Attachment '%(id)s' in %(parent)s"
 
-#: trac/attachment.py:545
+#: trac/attachment.py:596
 #, python-format
 msgid "Attachments of %(parent)s"
 msgstr "Attachments of %(parent)s"
 
-#: trac/attachment.py:558 trac/attachment.py:581 trac/admin/web_ui.py:407
-#: trac/admin/web_ui.py:410 trac/admin/web_ui.py:414
+#: trac/attachment.py:609 trac/attachment.py:632 trac/admin/web_ui.py:425
+#: trac/admin/web_ui.py:428 trac/admin/web_ui.py:432
 msgid "No file uploaded"
 msgstr "No file uploaded"
 
-#: trac/attachment.py:566
+#: trac/attachment.py:617
 msgid "Can't upload empty file"
 msgstr "Can't upload empty file"
 
-#: trac/attachment.py:571
+#: trac/attachment.py:622
 #, python-format
 msgid "Maximum attachment size: %(num)s bytes"
 msgstr "Maximum attachment size: %(num)s bytes"
 
-#: trac/attachment.py:572
+#: trac/attachment.py:623
 msgid "Upload failed"
 msgstr "Upload failed"
 
-#: trac/attachment.py:593
+#: trac/attachment.py:644
 #, python-format
 msgid "Attachment field %(field)s is invalid: %(message)s"
 msgstr "Attachment field %(field)s is invalid: %(message)s"
 
-#: trac/attachment.py:597
+#: trac/attachment.py:648
 #, python-format
 msgid "Invalid attachment: %(message)s"
 msgstr "Invalid attachment: %(message)s"
 
-#: trac/attachment.py:631
+#: trac/attachment.py:659
+#, python-format
+msgid ""
+"You don't have permission to replace the attachment %(name)s. You can "
+"only replace your own attachments. Replacing other's attachments requires"
+" ATTACHMENT_DELETE permission."
+msgstr ""
+"You don't have permission to replace the attachment %(name)s. You can "
+"only replace your own attachments. Replacing other's attachments requires"
+" ATTACHMENT_DELETE permission."
+
+#: trac/attachment.py:691
 #, python-format
 msgid "%(attachment)s (delete)"
 msgstr "%(attachment)s (delete)"
 
-#: trac/attachment.py:693 trac/versioncontrol/web_ui/browser.py:510
-#: trac/wiki/web_ui.py:70
+#: trac/attachment.py:752 trac/versioncontrol/web_ui/browser.py:637
+#: trac/wiki/web_ui.py:68
 msgid "Plain Text"
-msgstr "Plain Text"
-
-#: trac/attachment.py:699 trac/versioncontrol/web_ui/browser.py:515
+msgstr "Plain text"
+
+#: trac/attachment.py:758 trac/versioncontrol/web_ui/browser.py:643
 msgid "Original Format"
-msgstr "Original Format"
-
-#: trac/attachment.py:831
+msgstr "Original format"
+
+#: trac/attachment.py:800 trac/attachment.py:806
+#: trac/templates/list_of_attachments.html:20
+#: trac/templates/list_of_attachments.html:21
+#: trac/ticket/templates/ticket_change.html:21
+#: trac/ticket/templates/ticket_change.html:22
+msgid "Download"
+msgstr "Download"
+
+#: trac/attachment.py:900
 #, python-format
 msgid "Invalid resource identifier '%(id)s'"
-msgstr ""
-
-#: trac/attachment.py:867 trac/admin/templates/admin_components.html:80
-#: 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:68
-#: trac/templates/error.html:167 trac/ticket/admin.py:181
-#: trac/ticket/admin.py:356 trac/ticket/admin.py:509
+msgstr "Invalid resource identifier '%(id)s'"
+
+#: trac/attachment.py:936 trac/admin/templates/admin_components.html:80
+#: trac/admin/templates/admin_enums.html:48
+#: trac/admin/templates/admin_milestones.html:104
+#: trac/admin/templates/admin_versions.html:77 trac/templates/about.html:84
+#: trac/templates/error.html:185 trac/ticket/admin.py:209
+#: trac/ticket/admin.py:400 trac/ticket/admin.py:559
+#: trac/versioncontrol/admin.py:110
+#: trac/versioncontrol/templates/admin_repositories.html:125
+#: trac/web/session.py:314
 msgid "Name"
 msgstr "Name"
 
-#: trac/attachment.py:867
+#: trac/attachment.py:936
 msgid "Size"
-msgstr ""
-
-#: trac/attachment.py:867 trac/templates/history_view.html:28
-#: trac/versioncontrol/templates/revisionlog.html:95
+msgstr "Size"
+
+#: trac/attachment.py:936 trac/templates/history_view.html:29
+#: trac/ticket/templates/ticket.html:360
+#: trac/versioncontrol/templates/revisionlog.html:96
 msgid "Author"
 msgstr "Author"
 
-#: trac/attachment.py:867 trac/templates/history_view.html:27
-#: trac/versioncontrol/templates/revisionlog.html:94
+#: trac/attachment.py:936 trac/templates/history_view.html:28
 msgid "Date"
 msgstr "Date"
 
-#: trac/attachment.py:868 trac/templates/attachment.html:86
-#: trac/ticket/api.py:233 trac/ticket/templates/ticket.html:170
+#: trac/attachment.py:937 trac/templates/attachment.html:93
+#: trac/ticket/api.py:289 trac/ticket/templates/ticket_box.html:60
 msgid "Description"
 msgstr "Description"
 
-#: trac/attachment.py:893 trac/wiki/admin.py:74
-#, fuzzy, python-format
+#: trac/attachment.py:962 trac/wiki/admin.py:104
+#, python-format
 msgid "File '%(name)s' exists"
-msgstr "File '%(name)s' exists."
-
-#: trac/env.py:421
-msgid "Can only backup sqlite databases"
-msgstr "Can only back up sqlite databases"
-
-#: trac/env.py:506
+msgstr "File '%(name)s' exists"
+
+#: trac/config.py:403
+#, python-format
+msgid "[%(section)s] %(entry)s: expected integer, got %(value)s"
+msgstr "[%(section)s] %(entry)s: expected integer, got %(value)s"
+
+#: trac/config.py:421
+#, python-format
+msgid "[%(section)s] %(entry)s: expected float, got %(value)s"
+msgstr "[%(section)s] %(entry)s: expected float, got %(value)s"
+
+#: trac/config.py:605
+#, python-format
+msgid "[%(section)s] %(entry)s: expected one of (%(choices)s), got %(value)s"
+msgstr "[%(section)s] %(entry)s: expected one of (%(choices)s), got %(value)s"
+
+#: trac/env.py:587
 msgid "Database newer than Trac version"
 msgstr "Database newer than Trac version"
 
-#: trac/env.py:518
+#: trac/env.py:601
 #, python-format
 msgid "No upgrade module for version %(num)i (%(version)s.py)"
 msgstr "No upgrade module for version %(num)i (%(version)s.py)"
 
-#: trac/env.py:563
+#: trac/env.py:646
 msgid ""
 "Missing environment variable \"TRAC_ENV\". Trac requires this variable to"
 " point to a valid Trac environment."
 "Missing environment variable \"TRAC_ENV\". Trac requires this variable to"
 " point to a valid Trac environment."
 
-#: trac/env.py:597
+#: trac/env.py:678
 #, python-format
 msgid ""
 "The Trac Environment needs to be upgraded.\n"
 "\n"
 "Run \"trac-admin %(path)s upgrade\""
 
-#: trac/env.py:631
+#: trac/env.py:712
 msgid "Copying resources from:"
-msgstr ""
-
-#: trac/env.py:647
+msgstr "Copying resources from:"
+
+#: trac/env.py:728
 msgid "Creating scripts."
-msgstr ""
-
-#: trac/env.py:664
+msgstr "Creating scripts."
+
+#: trac/env.py:743
 #, python-format
 msgid "hotcopy can't overwrite existing '%(dest)s'"
 msgstr "hotcopy can't overwrite existing '%(dest)s'"
 
-#: trac/env.py:674
+#: trac/env.py:753
 #, python-format
 msgid "Hotcopying %(src)s to %(dst)s ..."
-msgstr ""
-
-#: trac/env.py:689
+msgstr "Hotcopying %(src)s to %(dst)s ..."
+
+#: trac/env.py:768
 msgid "The following errors happened while copying the environment:"
-msgstr ""
-
-#: trac/env.py:700
+msgstr "The following errors happened while copying the environment:"
+
+#: trac/env.py:779
 msgid "Hotcopy done."
-msgstr ""
-
-#: trac/env.py:705 trac/admin/api.py:126
-#, fuzzy
+msgstr "Hotcopy done."
+
+#: trac/env.py:784 trac/admin/api.py:125
 msgid "Invalid arguments"
 msgstr "Invalid arguments"
 
-#: trac/env.py:708
+#: trac/env.py:787
 msgid "Database is up to date, no upgrade necessary."
-msgstr ""
-
-#: trac/env.py:716
+msgstr "Database is up to date, no upgrade necessary."
+
+#: trac/env.py:795
 #, python-format
 msgid ""
 "Backup failed with '%(msg)s'.\n"
 "Use '--no-backup' to upgrade without doing a backup."
 msgstr ""
-
-#: trac/env.py:721
+"Backup failed with '%(msg)s'.\n"
+"Use '--no-backup' to upgrade without doing a backup."
+
+#: trac/env.py:809
+msgid ""
+"Warning: the wiki-macros directory in the environment is non-empty, but "
+"Trac\n"
+"doesn't load plugins from there anymore. Please remove it by hand."
+msgstr ""
+"Warning: the wiki-macros directory in the environment is non-empty, but "
+"Trac\n"
+"doesn't load plugins from there anymore. Please remove it by hand."
+
+#: trac/env.py:820
+#, python-format
+msgid ""
+"Error while removing wiki-macros: %(err)s\n"
+"Trac doesn't load plugins from wiki-macros anymore. Please remove it by "
+"hand."
+msgstr ""
+"Error while removing wiki-macros: %(err)s\n"
+"Trac doesn't load plugins from wiki-macros anymore. Please remove it by "
+"hand."
+
+#: trac/env.py:822
 msgid "Upgrade done."
-msgstr ""
+msgstr "Upgrade done."
 
 #: trac/notification.py:155
 msgid "TLS enabled but server does not support TLS"
 msgstr "TLS enabled but server does not support TLS"
 
-#: trac/notification.py:309
+#: trac/notification.py:303
 #, python-format
 msgid "Invalid email encoding setting: %s"
 msgstr "Invalid email encoding setting: %s"
 
-#: trac/notification.py:335
+#: trac/notification.py:329
 msgid "Header length is too short"
 msgstr "Header length is too short"
 
-#: trac/notification.py:464
-msgid "Ticket contains non-ASCII chars. Please change encoding setting"
-msgstr "Ticket contains non-ASCII characters. Please change encoding setting"
-
-#: trac/perm.py:49
+#: trac/perm.py:48
 #, python-format
 msgid "%(perm)s privileges are required to perform this operation on %(resource)s"
 msgstr "%(perm)s privileges are required to perform this operation on %(resource)s"
 
-#: trac/perm.py:51
+#: trac/perm.py:50
 #, python-format
 msgid "%(perm)s privileges are required to perform this operation"
 msgstr "%(perm)s privileges are required to perform this operation"
 
-#: trac/perm.py:54
+#: trac/perm.py:55
 msgid "Insufficient privileges to perform this operation."
 msgstr "Insufficient privileges to perform this operation."
 
-#: trac/perm.py:320
+#: trac/perm.py:333
 #, python-format
 msgid "%(name)s is not a valid action."
 msgstr "%(name)s is not a valid action."
 
-#: trac/perm.py:616
-#, fuzzy
+#: trac/perm.py:642
 msgid "User"
 msgstr "User"
 
-#: trac/perm.py:616 trac/admin/templates/admin_perms.html:69
-#: trac/ticket/templates/ticket.html:376
+#: trac/perm.py:642 trac/admin/templates/admin_perms.html:69
+#: trac/ticket/templates/ticket.html:338
 msgid "Action"
 msgstr "Action"
 
-#: trac/perm.py:618
-#, fuzzy
+#: trac/perm.py:644
 msgid "Available actions:"
 msgstr "Available actions:"
 
-#: trac/perm.py:631
+#: trac/perm.py:657
 msgid "Group names must be in lower case and actions in upper case"
-msgstr ""
-
-#: trac/resource.py:328
-#, python-format
-msgid " at version %(version)s"
-msgstr " at version %(version)s"
-
-#: trac/admin/api.py:130
-#, fuzzy
+msgstr "Group names must be in lower case and actions in upper case"
+
+#: trac/resource.py:326
+#, python-format
+msgid "%(name)s at version %(version)s"
+msgstr "%(name)s at version %(version)s"
+
+#: trac/admin/api.py:129 trac/admin/console.py:254
 msgid "Command not found"
 msgstr "Command not found"
 
-#: trac/admin/console.py:81 trac/ticket/templates/report_edit.html:34
+#: trac/admin/console.py:111 trac/ticket/templates/report_edit.html:34
 msgid "Error:"
 msgstr "Error:"
 
-#: trac/admin/console.py:99
+#: trac/admin/console.py:130
 #, python-format
 msgid ""
 "Welcome to trac-admin %(version)s\n"
 "Type:  '?' or 'help' for help on commands.\n"
 "        "
 msgstr ""
-
-#: trac/admin/console.py:131
-msgid "Failed to open environment."
-msgstr ""
-
-#: trac/admin/console.py:198
-msgid "Completion error:"
-msgstr ""
-
-#: trac/admin/console.py:249
+"Welcome to trac-admin %(version)s\n"
+"Interactive Trac administration console.\n"
+"Copyright (c) 2003-2010Edgewall Software\n"
+"\n"
+"Type:  '?' or 'help' for help on commands.\n"
+"        "
+
+#: trac/admin/console.py:164
+#, python-format
+msgid "Failed to open environment: %(err)s"
+msgstr "Failed to open environment: %(err)s"
+
+#: trac/admin/console.py:234
+#, python-format
+msgid "Completion error: %(err)s"
+msgstr "Completion error: %(err)s"
+
+#: trac/admin/console.py:287
 #, python-format
 msgid "No documentation found for '%(cmd)s'"
-msgstr ""
-
-#: trac/admin/console.py:251
+msgstr "No documentation found for '%(cmd)s'"
+
+#: trac/admin/console.py:289
 #, python-format
 msgid "trac-admin - The Trac Administration Console %(version)s"
-msgstr ""
-
-#: trac/admin/console.py:255
+msgstr "trac-admin - The Trac Administration Console %(version)s"
+
+#: trac/admin/console.py:293
 msgid "Usage: trac-admin </path/to/projenv> [command [subcommand] [option ...]]\n"
-msgstr ""
-
-#: trac/admin/console.py:258
+msgstr "Usage: trac-admin </path/to/projenv> [command [subcommand] [option ...]]\n"
+
+#: trac/admin/console.py:296
 msgid "Invoking trac-admin without command starts interactive mode.\n"
-msgstr ""
-
-#: trac/admin/console.py:296
+msgstr "Invoking trac-admin without command starts interactive mode.\n"
+
+#: trac/admin/console.py:336
 #, python-format
 msgid "Creating a new Trac environment at %(envname)s"
-msgstr ""
-
-#: trac/admin/console.py:298
+msgstr "Creating a new Trac environment at %(envname)s"
+
+#: trac/admin/console.py:338
 msgid ""
 "\n"
 "Trac will first ask a few questions about your environment \n"
 " Please enter the name of your project.\n"
 " This name will be used in page titles and descriptions.\n"
 msgstr ""
-
-#: trac/admin/console.py:306
+"\n"
+"Trac will first ask a few questions about your environment \n"
+"in order to initialise and prepare the project database.\n"
+"\n"
+" Please enter the name of your project.\n"
+" This name will be used in page titles and descriptions.\n"
+
+#: trac/admin/console.py:346
 #, python-format
 msgid "Project Name [%(default)s]> "
-msgstr ""
-
-#: trac/admin/console.py:308
+msgstr "Project name [%(default)s]> "
+
+#: trac/admin/console.py:348
 msgid ""
 " \n"
 " Please specify the connection string for the database to use.\n"
 " PostgreSQL database (check the Trac documentation for the exact\n"
 " connection string syntax).\n"
 msgstr ""
-
-#: trac/admin/console.py:316
-#, fuzzy, python-format
+" \n"
+" Please specify the connection string for the database to use.\n"
+" By default, a local SQLite database is created in the environment\n"
+" directory. It is also possible to use an already existing\n"
+" PostgreSQL database (check the Trac documentation for the exact\n"
+" connection string syntax).\n"
+
+#: trac/admin/console.py:356
+#, python-format
 msgid "Database connection string [%(default)s]> "
 msgstr "Database connection string [%(default)s]> "
 
-#: trac/admin/console.py:318
-msgid ""
-" \n"
-" Please specify the type of version control system,\n"
-" By default, it will be svn.\n"
-"\n"
-" If you don't want to use Trac with version control integration,\n"
-" choose the default here and don't specify a repository directory.\n"
-" in the next question.\n"
-msgstr ""
-
-#: trac/admin/console.py:327
-#, fuzzy, python-format
-msgid "Repository type [%(default)s]> "
-msgstr "Repository type [%(default)s]> "
-
-#: trac/admin/console.py:329
-msgid ""
-"\n"
-" Please specify the absolute path to the version control\n"
-" repository, or leave it blank to use Trac without a repository.\n"
-" You can also set the repository location later.\n"
-msgstr ""
-
-#: trac/admin/console.py:334
-msgid "Path to repository [/path/to/repos]> "
-msgstr ""
-
-#: trac/admin/console.py:341
+#: trac/admin/console.py:363
 #, python-format
 msgid "Initenv for '%(env)s' failed."
-msgstr ""
+msgstr "Initenv for '%(env)s' failed."
+
+#: trac/admin/console.py:366
+msgid "Does an environment already exist?"
+msgstr "Does an environment already exist?"
 
 #: trac/admin/console.py:370
+msgid "Directory exists and is not empty."
+msgstr "Directory exists and is not empty."
+
+#: trac/admin/console.py:398
 msgid "Creating and Initializing Project"
-msgstr ""
-
-#: trac/admin/console.py:389
+msgstr "Creating and Initializing Project"
+
+#: trac/admin/console.py:415
+msgid "Failed to create environment."
+msgstr "Failed to create environment."
+
+#: trac/admin/console.py:421
 msgid " Installing default wiki pages"
-msgstr ""
-
-#: trac/admin/console.py:401
-msgid " Indexing repository"
-msgstr ""
-
-#: trac/admin/console.py:404
+msgstr " Installing default wiki pages"
+
+#: trac/admin/console.py:430
+msgid " Indexing default repository"
+msgstr " Indexing default repository"
+
+#: trac/admin/console.py:433
 msgid ""
 "\n"
 "---------------------------------------------------------------------\n"
-"Warning: couldn't index the repository.\n"
+"Warning: couldn't index the default repository.\n"
 "\n"
 "This can happen for a variety of reasons: wrong repository type, \n"
 "no appropriate third party library for this repository type,\n"
 "\n"
 "You can nevertheless start using your Trac environment, but \n"
 "you'll need to check again your trac.ini file and the [trac] \n"
-"repository_type and repository_path settings in order to enable\n"
-"the Trac repository browser.\n"
+"repository_type and repository_path settings.\n"
 msgstr ""
-
-#: trac/admin/console.py:448
+"\n"
+"---------------------------------------------------------------------\n"
+"Warning: couldn't index the default repository.\n"
+"\n"
+"This can happen for a variety of reasons: wrong repository type, \n"
+"no appropriate third party library for this repository type,\n"
+"no actual repository at the specified repository path...\n"
+"\n"
+"You can nevertheless start using your Trac environment, but \n"
+"you'll need to check again your trac.ini file and the [trac] \n"
+"repository_type and repository_path settings.\n"
+
+#: trac/admin/console.py:476
 #, python-format
 msgid ""
 "\n"
 "\n"
 "Congratulations!\n"
 msgstr ""
-
-#: trac/admin/console.py:508
+"\n"
+"---------------------------------------------------------------------\n"
+"Project environment for '%(project_name)s' created.\n"
+"\n"
+"You may now configure the environment by editing the file:\n"
+"\n"
+"  %(config_path)s\n"
+"\n"
+"If you'd like to take this new project environment for a test drive,\n"
+"try running the Trac standalone web server `tracd`:\n"
+"\n"
+"  tracd --port 8000 %(project_path)s\n"
+"\n"
+"Then point your browser to http://localhost:8000/%(project_dir)s.\n"
+"There you can also browse the documentation for your installed\n"
+"version of Trac, including information on further setup (such as\n"
+"deploying Trac to a real web server).\n"
+"\n"
+"The latest documentation can also always be found on the project\n"
+"website:\n"
+"\n"
+"  http://trac.edgewall.org/\n"
+"\n"
+"Congratulations!\n"
+
+#: trac/admin/console.py:536
 #, python-format
 msgid "non-ascii environment path '%(path)s' not supported."
-msgstr ""
-
-#: trac/admin/web_ui.py:66
+msgstr "non-ascii environment path '%(path)s' not supported."
+
+#: trac/admin/web_ui.py:64
 msgid "Admin"
 msgstr "Admin"
 
-#: trac/admin/web_ui.py:67 trac/admin/templates/admin.html:16
+#: trac/admin/web_ui.py:65 trac/admin/templates/admin.html:16
 msgid "Administration"
 msgstr "Administration"
 
-#: trac/admin/web_ui.py:83
+#: trac/admin/web_ui.py:81
 msgid "No administration panels available"
 msgstr "No administration panels available"
 
-#: trac/admin/web_ui.py:105 trac/admin/web_ui.py:109
+#: trac/admin/web_ui.py:107 trac/admin/web_ui.py:111
 msgid "Unknown administration panel"
 msgstr "Unknown administration panel"
 
-#: trac/admin/web_ui.py:184 trac/admin/web_ui.py:211 trac/admin/web_ui.py:300
-#: trac/admin/web_ui.py:383 trac/prefs/web_ui.py:88
+#: trac/admin/web_ui.py:185 trac/ticket/admin.py:65 trac/ticket/admin.py:90
+#: trac/ticket/admin.py:275 trac/ticket/admin.py:457 trac/ticket/admin.py:609
+#: trac/ticket/admin.py:695 trac/ticket/report.py:189
+#: trac/ticket/roadmap.py:687 trac/versioncontrol/admin.py:198
+msgid "Your changes have been saved."
+msgstr "Your changes have been saved."
+
+#: trac/admin/web_ui.py:190 trac/ticket/admin.py:68
+msgid ""
+"Error writing to trac.ini, make sure it is writable by the web server. "
+"Your changes have not been saved."
+msgstr ""
+"Error writing to trac.ini, make sure it is writable by the web server. "
+"Your changes have not been saved."
+
+#: trac/admin/web_ui.py:203 trac/admin/web_ui.py:231 trac/admin/web_ui.py:319
+#: trac/admin/web_ui.py:401 trac/prefs/web_ui.py:86
 #: trac/prefs/templates/prefs_general.html:9
 msgid "General"
 msgstr "General"
 
-#: trac/admin/web_ui.py:184 trac/admin/templates/admin_basics.html:13
+#: trac/admin/web_ui.py:203 trac/admin/templates/admin_basics.html:13
 msgid "Basic Settings"
 msgstr "Basic Settings"
 
-#: trac/admin/web_ui.py:211 trac/admin/templates/admin_logging.html:9
-#: trac/admin/templates/admin_logging.html:21
+#: trac/admin/web_ui.py:231 trac/admin/templates/admin_logging.html:10
+#: trac/admin/templates/admin_logging.html:22
 msgid "Logging"
 msgstr "Logging"
 
-#: trac/admin/web_ui.py:220 trac/ticket/templates/milestone_delete.html:30
+#: trac/admin/web_ui.py:240 trac/ticket/templates/milestone_delete.html:31
 #: trac/ticket/templates/milestone_edit.html:73
 msgid "None"
 msgstr "None"
 
-#: trac/admin/web_ui.py:221
+#: trac/admin/web_ui.py:241
 msgid "Console"
 msgstr "Console"
 
-#: trac/admin/web_ui.py:223 trac/templates/attachment.html:28
-#: trac/templates/attachment.html:89 trac/versioncontrol/api.py:114
+#: trac/admin/web_ui.py:243 trac/templates/attachment.html:32
 msgid "File"
 msgstr "File"
 
-#: trac/admin/web_ui.py:225
+#: trac/admin/web_ui.py:245
 msgid "Syslog"
 msgstr "Syslog"
 
-#: trac/admin/web_ui.py:227
+#: trac/admin/web_ui.py:247
 msgid "Windows event log"
 msgstr "Windows event log"
 
-#: trac/admin/web_ui.py:241
+#: trac/admin/web_ui.py:260
 #, python-format
 msgid "Unknown log type %(type)s"
 msgstr "Unknown log type %(type)s"
 
-#: trac/admin/web_ui.py:242
+#: trac/admin/web_ui.py:261
 msgid "Invalid log type"
 msgstr "Invalid log type"
 
-#: trac/admin/web_ui.py:253
+#: trac/admin/web_ui.py:275
 #, python-format
 msgid "Unknown log level %(level)s"
 msgstr "Unknown log level %(level)s"
 
-#: trac/admin/web_ui.py:254
+#: trac/admin/web_ui.py:276
 msgid "Invalid log level"
 msgstr "Invalid log level"
 
-#: trac/admin/web_ui.py:270
+#: trac/admin/web_ui.py:289
 msgid "You must specify a log file"
 msgstr "You must specify a log file"
 
-#: trac/admin/web_ui.py:271
+#: trac/admin/web_ui.py:290
 msgid "Missing field"
 msgstr "Missing field"
 
-#: trac/admin/web_ui.py:300 trac/admin/templates/admin_perms.html:9
+#: trac/admin/web_ui.py:319 trac/admin/templates/admin_perms.html:9
 msgid "Permissions"
 msgstr "Permissions"
 
-#: trac/admin/web_ui.py:314
+#: trac/admin/web_ui.py:333
 msgid "All upper-cased tokens are reserved for permission names"
 msgstr "All upper-cased tokens are reserved for permission names"
 
-#: trac/admin/web_ui.py:321
+#: trac/admin/web_ui.py:340
 msgid "Unknown action"
 msgstr "Unknown action"
 
-#: trac/admin/web_ui.py:328
-#, python-format
-msgid "Permission \"%(action)s\" was already granted to \"%(subject)s\""
-msgstr "Permission \"%(action)s\" was already granted to \"%(subject)s\""
-
-#: trac/admin/web_ui.py:347
-#, python-format
-msgid "\"%(subject)s\" was already added to group \"%(group)s\""
-msgstr "\"%(subject)s\" was already added to group \"%(group)s\""
-
-#: trac/admin/web_ui.py:383 trac/admin/templates/admin_plugins.html:9
+#: trac/admin/web_ui.py:344
+#, python-format
+msgid "The subject %(subject)s has been granted the permission %(action)s."
+msgstr "The subject %(subject)s has been granted the permission %(action)s."
+
+#: trac/admin/web_ui.py:349
+#, python-format
+msgid "The permission %(action)s was already granted to %(subject)s."
+msgstr "The permission %(action)s was already granted to %(subject)s."
+
+#: trac/admin/web_ui.py:365
+#, python-format
+msgid "The subject %(subject)s has been added to the group %(group)s."
+msgstr "The subject %(subject)s has been added to the group %(group)s."
+
+#: trac/admin/web_ui.py:370
+#, python-format
+msgid "The subject %(subject)s was already added to the group %(group)s."
+msgstr "The subject %(subject)s was already added to the group %(group)s."
+
+#: trac/admin/web_ui.py:383
+msgid "The selected permissions have been revoked."
+msgstr "The selected permissions have been revoked."
+
+#: trac/admin/web_ui.py:401 trac/admin/templates/admin_plugins.html:9
 msgid "Plugins"
 msgstr "Plugins"
 
-#: trac/admin/web_ui.py:417
+#: trac/admin/web_ui.py:435
 msgid "Uploaded file is not a Python source file or egg"
 msgstr "Uploaded file is not a Python source file or egg"
 
-#: trac/admin/web_ui.py:422
+#: trac/admin/web_ui.py:440
 #, python-format
 msgid "Plugin %(name)s already installed"
 msgstr "Plugin %(name)s already installed"
 
+#: trac/admin/web_ui.py:513
+msgid "The following component has been disabled:"
+msgid_plural "The following components have been disabled:"
+msgstr[0] "The following component has been disabled:"
+msgstr[1] "The following components have been disabled:"
+
+#: trac/admin/web_ui.py:518
+msgid "The following component has been enabled:"
+msgid_plural "The following components have been enabled:"
+msgstr[0] "The following component has been enabled:"
+msgstr[1] "The following components have been enabled:"
+
 #: trac/admin/templates/admin.html:10
 msgid "Administration:"
 msgstr "Administration:"
 #: trac/admin/templates/admin_basics.html:19
 #: trac/admin/templates/admin_components.html:37
 #: trac/admin/templates/admin_components.html:66
-#: trac/admin/templates/admin_enums.html:20
-#: trac/admin/templates/admin_enums.html:34
-#: trac/admin/templates/admin_milestones.html:21
-#: trac/admin/templates/admin_milestones.html:77
+#: trac/admin/templates/admin_enums.html:21
+#: trac/admin/templates/admin_enums.html:35
+#: trac/admin/templates/admin_milestones.html:22
+#: trac/admin/templates/admin_milestones.html:80
 #: trac/admin/templates/admin_versions.html:21
 #: trac/admin/templates/admin_versions.html:56
+#: trac/versioncontrol/templates/admin_repositories.html:50
+#: trac/versioncontrol/templates/admin_repositories.html:95
+#: trac/versioncontrol/templates/admin_repositories.html:112
 msgid "Name:"
 msgstr "Name:"
 
 #: trac/admin/templates/admin_basics.html:24
+#: trac/versioncontrol/templates/admin_repositories.html:62
 msgid "URL:"
 msgstr "URL:"
 
 #: trac/admin/templates/admin_basics.html:29
-#: trac/ticket/templates/ticket.html:299
+#: trac/ticket/templates/ticket.html:254
 msgid "Description:"
 msgstr "Description:"
 
 #: trac/admin/templates/admin_basics.html:36
 #: trac/admin/templates/admin_components.html:99
-#: trac/admin/templates/admin_enums.html:69
-#: trac/admin/templates/admin_logging.html:53
-#: trac/admin/templates/admin_milestones.html:125
-#: trac/admin/templates/admin_plugins.html:103
+#: trac/admin/templates/admin_enums.html:70
+#: trac/admin/templates/admin_logging.html:54
+#: trac/admin/templates/admin_milestones.html:129
+#: trac/admin/templates/admin_plugins.html:164
 #: trac/admin/templates/admin_versions.html:94
 msgid "Apply changes"
 msgstr "Apply changes"
 
-#: trac/admin/templates/admin_components.html:10
+#: trac/admin/templates/admin_components.html:10 trac/ticket/admin.py:76
 msgid "Components"
 msgstr "Components"
 
 "Description (you may use\n"
 "                [1:WikiFormatting]\n"
 "                here):"
-msgstr ""
-"Description (you may use\n"
-"                [1:WikiFormatting]\n"
-"                here):"
-
-#: trac/admin/templates/admin_components.html:55
-#: trac/admin/templates/admin_enums.html:23
-#: trac/admin/templates/admin_milestones.html:65
-#: trac/admin/templates/admin_versions.html:45
-#: trac/templates/attachment.html:57 trac/templates/attachment.html:70
-#: trac/ticket/templates/milestone_delete.html:39
-#: trac/ticket/templates/milestone_edit.html:94
-#: trac/ticket/templates/report_delete.html:20
-#: trac/ticket/templates/report_edit.html:42
-#: trac/wiki/templates/wiki_delete.html:36
-#: trac/wiki/templates/wiki_edit.html:35 trac/wiki/templates/wiki_edit.html:126
-msgid "Cancel"
-msgstr "Cancel"
+msgstr "Description (you may use [1:WikiFormatting] here):"
 
 #: trac/admin/templates/admin_components.html:56
-#: trac/admin/templates/admin_enums.html:24
-#: trac/admin/templates/admin_milestones.html:66
+#: trac/admin/templates/admin_enums.html:25
+#: trac/admin/templates/admin_milestones.html:69
 #: trac/admin/templates/admin_versions.html:46
+#: trac/versioncontrol/templates/admin_repositories.html:85
 msgid "Save"
 msgstr "Save"
 
 msgstr "Add Component:"
 
 #: trac/admin/templates/admin_components.html:70
-#: trac/admin/templates/admin_enums.html:32
-#: trac/admin/templates/admin_enums.html:37
-#: trac/admin/templates/admin_milestones.html:90
+#: trac/admin/templates/admin_enums.html:33
+#: trac/admin/templates/admin_enums.html:38
+#: trac/admin/templates/admin_milestones.html:93
 #: trac/admin/templates/admin_perms.html:38
 #: trac/admin/templates/admin_perms.html:60
 #: trac/admin/templates/admin_versions.html:67
+#: trac/versioncontrol/templates/admin_repositories.html:102
+#: trac/versioncontrol/templates/admin_repositories.html:116
 msgid "Add"
 msgstr "Add"
 
-#: trac/admin/templates/admin_components.html:80 trac/ticket/admin.py:181
+#: trac/admin/templates/admin_components.html:80 trac/ticket/admin.py:209
+#: trac/ticket/api.py:283 trac/ticket/web_ui.py:1337
 msgid "Owner"
 msgstr "Owner"
 
 #: trac/admin/templates/admin_components.html:80
-#: trac/admin/templates/admin_enums.html:47
-#: trac/admin/templates/admin_milestones.html:100
+#: trac/admin/templates/admin_enums.html:48
+#: trac/admin/templates/admin_milestones.html:104
 #: trac/admin/templates/admin_versions.html:77
 msgid "Default"
 msgstr "Default"
 
 #: trac/admin/templates/admin_components.html:98
-#: trac/admin/templates/admin_enums.html:68
-#: trac/admin/templates/admin_milestones.html:124
+#: trac/admin/templates/admin_enums.html:69
+#: trac/admin/templates/admin_milestones.html:128
 #: trac/admin/templates/admin_perms.html:87
 #: trac/admin/templates/admin_versions.html:93
+#: trac/versioncontrol/templates/admin_repositories.html:145
 msgid "Remove selected items"
 msgstr "Remove selected items"
 
 #: trac/admin/templates/admin_components.html:101
-#: trac/admin/templates/admin_enums.html:71
-#: trac/admin/templates/admin_milestones.html:127
+#: trac/admin/templates/admin_enums.html:72
+#: trac/admin/templates/admin_milestones.html:131
 #: trac/admin/templates/admin_versions.html:96
 msgid ""
 "You can remove all items from this list to completely hide this\n"
 "              field from the user interface."
 msgstr ""
-"You can remove all items from this list to completely hide this\n"
-"              field from the user interface."
+"You can remove all items from this list to completely hide this field "
+"from the user interface."
 
 #: trac/admin/templates/admin_components.html:107
-#: trac/admin/templates/admin_enums.html:77
-#: trac/admin/templates/admin_milestones.html:133
+#: trac/admin/templates/admin_enums.html:78
+#: trac/admin/templates/admin_milestones.html:137
 #: trac/admin/templates/admin_versions.html:102
 msgid ""
 "As long as you don't add any items to the list, this field\n"
 "            will remain completely hidden from the user interface."
 msgstr ""
-"As long as you don't add any items to the list, this field\n"
-"            will remain completely hidden from the user interface."
-
-#: trac/admin/templates/admin_enums.html:13
-msgid "Manage"
-msgstr "Manage"
-
-#: trac/admin/templates/admin_enums.html:18
-msgid "Modify"
-msgstr "Modify"
-
-#: trac/admin/templates/admin_enums.html:47
+"As long as you don't add any items to the list, this field will remain "
+"completely hidden from the user interface."
+
+#: trac/admin/templates/admin_enums.html:14
+#, python-format
+msgid "Manage %(label_plural)s"
+msgstr "Manage %(label_plural)s"
+
+#: trac/admin/templates/admin_enums.html:19
+#, python-format
+msgid "Modify %(label_singular)s"
+msgstr "Modify %(label_singular)s"
+
+#: trac/admin/templates/admin_enums.html:48
 msgid "Order"
 msgstr "Order"
 
-#: trac/admin/templates/admin_logging.html:25 trac/templates/about.html:63
+#: trac/admin/templates/admin_logging.html:26 trac/templates/about.html:79
 msgid "Configuration"
 msgstr "Configuration"
 
-#: trac/admin/templates/admin_logging.html:27
+#: trac/admin/templates/admin_logging.html:28
+#: trac/versioncontrol/templates/admin_repositories.html:18
 msgid "Type:"
 msgstr "Type:"
 
-#: trac/admin/templates/admin_logging.html:36
+#: trac/admin/templates/admin_logging.html:37
 msgid "Log level:"
 msgstr "Log level:"
 
-#: trac/admin/templates/admin_logging.html:44
+#: trac/admin/templates/admin_logging.html:45
 msgid "Log file:"
 msgstr "Log file:"
 
-#: trac/admin/templates/admin_logging.html:47
-msgid "If you specify a relative path, the log file will be stored inside the"
-msgstr "If you specify a relative path, the log file will be stored inside the"
-
-#: trac/admin/templates/admin_logging.html:49
-msgid "log"
-msgstr "log"
-
-#: trac/admin/templates/admin_logging.html:49
-msgid "directory of the project environment ("
-msgstr "directory of the project environment ("
-
-#: trac/admin/templates/admin_milestones.html:10 trac/ticket/roadmap.py:828
+#: trac/admin/templates/admin_logging.html:48
+#, python-format
+msgid ""
+"If you specify a relative path, the log file will be stored inside the\n"
+"            [1:log] directory of the project environment ([2:%(dir)s])."
+msgstr ""
+"If you specify a relative path, the log file will be stored inside the  "
+"[1:log] directory of the project environment ([2:%(dir)s])."
+
+#: trac/admin/templates/admin_milestones.html:10 trac/ticket/admin.py:241
+#: trac/ticket/roadmap.py:855
 msgid "Milestones"
 msgstr "Milestones"
 
 msgid "Manage Milestones"
 msgstr "Manage Milestones"
 
-#: trac/admin/templates/admin_milestones.html:19
+#: trac/admin/templates/admin_milestones.html:20
 msgid "Modify Milestone:"
 msgstr "Modify Milestone:"
 
-#: trac/admin/templates/admin_milestones.html:24
-#: trac/admin/templates/admin_milestones.html:82
-#: trac/ticket/templates/milestone_edit.html:51
+#: trac/admin/templates/admin_milestones.html:25
+#: trac/admin/templates/admin_milestones.html:85
+#: trac/ticket/templates/milestone_edit.html:50
 msgid "Due:"
 msgstr "Due:"
 
-#: trac/admin/templates/admin_milestones.html:27
-#: trac/admin/templates/admin_milestones.html:41
-#: trac/admin/templates/admin_milestones.html:86
+#: trac/admin/templates/admin_milestones.html:26
+#: trac/admin/templates/admin_milestones.html:29
+#: trac/admin/templates/admin_milestones.html:39
+#: trac/admin/templates/admin_milestones.html:43
+#: trac/admin/templates/admin_milestones.html:87
+#: trac/admin/templates/admin_milestones.html:89
+#: trac/admin/templates/admin_versions.html:27
 #: trac/admin/templates/admin_versions.html:30
+#: trac/admin/templates/admin_versions.html:60
 #: trac/admin/templates/admin_versions.html:63
+#: trac/ticket/templates/milestone_edit.html:51
 #: trac/ticket/templates/milestone_edit.html:54
+#: trac/ticket/templates/milestone_edit.html:63
 #: trac/ticket/templates/milestone_edit.html:66
-msgid "Format:"
-msgstr "Format:"
-
-#: trac/admin/templates/admin_milestones.html:33
+#, python-format
+msgid "Format: %(datehint)s"
+msgstr "Format: %(datehint)s"
+
+#: trac/admin/templates/admin_milestones.html:35
 #: trac/ticket/templates/milestone_edit.html:59
 msgid "Completed:"
 msgstr "Completed:"
 
-#: trac/admin/templates/admin_milestones.html:55
+#: trac/admin/templates/admin_milestones.html:57
 #: trac/admin/templates/admin_versions.html:35
 #: trac/ticket/templates/milestone_edit.html:85
+#: trac/versioncontrol/templates/admin_repositories.html:73
 msgid "Description (you may use [1:WikiFormatting] here):"
 msgstr "Description (you may use [1:WikiFormatting] here):"
 
-#: trac/admin/templates/admin_milestones.html:75
+#: trac/admin/templates/admin_milestones.html:78
 msgid "Add Milestone:"
 msgstr "Add Milestone:"
 
-#: trac/admin/templates/admin_milestones.html:100 trac/ticket/admin.py:356
+#: trac/admin/templates/admin_milestones.html:104 trac/ticket/admin.py:400
 msgid "Due"
 msgstr "Due"
 
-#: trac/admin/templates/admin_milestones.html:100 trac/ticket/admin.py:356
-#: trac/ticket/templates/milestone_view.html:25
-#: trac/ticket/templates/roadmap.html:36
+#: trac/admin/templates/admin_milestones.html:104 trac/ticket/admin.py:400
 msgid "Completed"
 msgstr "Completed"
 
-#: trac/admin/templates/admin_milestones.html:100
+#: trac/admin/templates/admin_milestones.html:104 trac/ticket/web_ui.py:184
 msgid "Tickets"
 msgstr "Tickets"
 
 
 #: trac/admin/templates/admin_perms.html:18
 msgid "Grant Permission:"
-msgstr "Grant Permission:"
+msgstr "Grant permission:"
 
 #: trac/admin/templates/admin_perms.html:21
 #: trac/admin/templates/admin_perms.html:48
 "Grant permission for an action to a subject, which can be either a user\n"
 "          or a group."
 msgstr ""
-"Grant permission for an action to a subject, which can be either a user\n"
-"          or a group."
+"Grant permission for an action to a subject, which can be either a user "
+"or a group."
 
 #: trac/admin/templates/admin_perms.html:45
 msgid "Add Subject to Group:"
 msgid "Note that"
 msgstr "Note that"
 
-#: trac/admin/templates/admin_perms.html:92 trac/ticket/templates/query.html:61
+#: trac/admin/templates/admin_perms.html:92 trac/ticket/templates/query.html:73
 msgid "or"
 msgstr "or"
 
 msgstr "Group"
 
 #: trac/admin/templates/admin_perms.html:92
-#, fuzzy
 msgid ""
 "names can't be all upper-case,\n"
 "      as that is reserved for permission names."
-msgstr ""
-"names can't be all upper-case,\n"
-"      as that is reserved for permission names."
-
-#: trac/admin/templates/admin_plugins.html:17
+msgstr "names can't be all upper-case, as that is reserved for permission names."
+
+#: trac/admin/templates/admin_plugins.html:41
 msgid "Manage Plugins"
 msgstr "Manage Plugins"
 
-#: trac/admin/templates/admin_plugins.html:21
+#: trac/admin/templates/admin_plugins.html:45
 msgid "Install Plugin:"
-msgstr "Install Plugin:"
-
-#: trac/admin/templates/admin_plugins.html:23
+msgstr "Install plugin:"
+
+#: trac/admin/templates/admin_plugins.html:47
+#: trac/versioncontrol/templates/changeset.html:170
 msgid "File:"
-msgstr "File:"
-
-#: trac/admin/templates/admin_plugins.html:28
+msgid_plural "Files:"
+msgstr[0] "File:"
+msgstr[1] "Files:"
+
+#: trac/admin/templates/admin_plugins.html:52
 msgid ""
 "The web server does not have sufficient permissions to store files in\n"
 "            the environment plugins directory."
 msgstr ""
-"The web server does not have sufficient permissions to store files in\n"
-"            the environment plugins directory."
-
-#: trac/admin/templates/admin_plugins.html:32
+"The web server does not have sufficient permissions to store files in the"
+" environment plugins directory."
+
+#: trac/admin/templates/admin_plugins.html:56
 msgid "Upload a plugin packaged as Python egg."
 msgstr "Upload a plugin packaged as Python egg."
 
-#: trac/admin/templates/admin_plugins.html:37
+#: trac/admin/templates/admin_plugins.html:61
 msgid "Install"
 msgstr "Install"
 
-#: trac/admin/templates/admin_plugins.html:60 trac/templates/diff_view.html:43
-#: trac/versioncontrol/templates/changeset.html:97
+#: trac/admin/templates/admin_plugins.html:84 trac/templates/diff_view.html:51
+#: trac/versioncontrol/templates/changeset.html:142
 msgid "Author:"
 msgstr "Author:"
 
-#: trac/admin/templates/admin_plugins.html:69
+#: trac/admin/templates/admin_plugins.html:93
 msgid "Home page:"
 msgstr "Home page:"
 
-#: trac/admin/templates/admin_plugins.html:76
+#: trac/admin/templates/admin_plugins.html:100
 msgid "License:"
 msgstr "Licence:"
 
-#: trac/admin/templates/admin_plugins.html:83
+#: trac/admin/templates/admin_plugins.html:110
+msgid "Show all descriptions"
+msgstr "Show all descriptions"
+
+#: trac/admin/templates/admin_plugins.html:112
+msgid "Hide all descriptions"
+msgstr "Hide all descriptions"
+
+#: trac/admin/templates/admin_plugins.html:114 trac/ticket/admin.py:76
+#: trac/ticket/api.py:296
 msgid "Component"
 msgstr "Component"
 
-#: trac/admin/templates/admin_plugins.html:83
+#: trac/admin/templates/admin_plugins.html:117
 msgid "Enabled"
 msgstr "Enabled"
 
-#: trac/admin/templates/admin_versions.html:10
+#: trac/admin/templates/admin_plugins.html:126
+msgid "Toggle the module description"
+msgstr "Toggle the module description"
+
+#: trac/admin/templates/admin_plugins.html:142
+msgid "Toggle the component description"
+msgstr "Toggle the component description"
+
+#: trac/admin/templates/admin_versions.html:10 trac/ticket/admin.py:440
 msgid "Versions"
 msgstr "Versions"
 
 msgid "Released"
 msgstr "Released"
 
-#: trac/db/api.py:98
+#: trac/db/api.py:132
 #, python-format
 msgid "Unsupported database type \"%(scheme)s\""
 msgstr "Unsupported database type \"%(scheme)s\""
 
-#: trac/db/api.py:121
-msgid "Database connection string must start with scheme:/"
-msgstr "Database connection string must start with scheme:/"
-
-#: trac/db/pool.py:120
+#: trac/db/api.py:162
+#, python-format
+msgid ""
+"Unknown scheme \"%(scheme)s\"; database connection string must start with"
+" {scheme}:/"
+msgstr ""
+"Unknown scheme \"%(scheme)s\"; database connection string must start with"
+" {scheme}:/"
+
+#: trac/db/mysql_backend.py:80
+msgid "Cannot load Python bindings for MySQL"
+msgstr "Cannot load Python bindings for MySQL"
+
+#: trac/db/pool.py:118
 #, python-format
 msgid "Unable to get database connection within %(time)d seconds"
 msgstr "Unable to get database connection within %(time)d seconds"
 
-#: trac/db/sqlite_backend.py:133
+#: trac/db/postgres_backend.py:81
+msgid "Cannot load Python bindings for PostgreSQL"
+msgstr "Cannot load Python bindings for PostgreSQL"
+
+#: trac/db/sqlite_backend.py:153
+msgid "Cannot load Python bindings for SQLite"
+msgstr "Cannot load Python bindings for SQLite"
+
+#: trac/db/sqlite_backend.py:157
+msgid "Need at least PySqlite 2.0.7 or higher"
+msgstr "Need at least PySqlite 2.0.7 or higher"
+
+#: trac/db/sqlite_backend.py:181
 #, python-format
 msgid "Database already exists at %(path)s"
 msgstr "Database already exists at %(path)s"
 
-#: trac/db/sqlite_backend.py:161
+#: trac/db/sqlite_backend.py:241
 #, python-format
 msgid "Database \"%(path)s\" not found."
 msgstr "Database \"%(path)s\" not found."
 
-#: trac/db/sqlite_backend.py:170
+#: trac/db/sqlite_backend.py:250
 #, python-format
 msgid ""
-"The user %(user)s requires read _and_ write permission to the database "
+"The user %(user)s requires read _and_ write permissions to the database "
 "file %(path)s and the directory it is located in."
 msgstr ""
-"The user %(user)s requires read _and_ write permission to the database "
+"The user %(user)s requires read _and_ write permissions to the database "
 "file %(path)s and the directory it is located in."
 
-#: trac/mimeview/api.py:634 trac/mimeview/api.py:644
+#: trac/mimeview/api.py:674 trac/mimeview/api.py:685
 #, python-format
 msgid "No available MIME conversions from %(old)s to %(new)s"
 msgstr "No available MIME conversions from %(old)s to %(new)s"
 
-#: trac/mimeview/api.py:746
+#: trac/mimeview/api.py:793
 #, python-format
 msgid "HTML preview using %(renderer)s failed (%(err)s)"
-msgstr ""
-
-#: trac/mimeview/patch.py:55
+msgstr "HTML preview using %(renderer)s failed (%(err)s)"
+
+#: trac/mimeview/api.py:825
+#, python-format
+msgid "Can't use %(annotator)s annotator: %(error)s"
+msgstr "Can't use %(annotator)s annotator: %(error)s"
+
+#: trac/mimeview/patch.py:54
 msgid "Invalid unified diff content"
 msgstr "Invalid unified diff content"
 
-#: trac/mimeview/patch.py:165
-#, fuzzy, python-format
+#: trac/mimeview/patch.py:171
+#, python-format
 msgid "new file %(new)s"
 msgstr "new file %(new)s"
 
-#: trac/mimeview/patch.py:169
+#: trac/mimeview/patch.py:175
 #, python-format
 msgid "deleted file %(deleted)s"
-msgstr ""
-
-#: trac/mimeview/patch.py:241
+msgstr "deleted file %(deleted)s"
+
+#: trac/mimeview/patch.py:247
 msgid "this hunk was shorter than expected"
-msgstr ""
-
-#: trac/mimeview/php.py:98
-msgid ""
-"You appear to be using the PHP CGI binary. Trac requires the CLI version "
-"for syntax highlighting."
-msgstr ""
-"You appear to be using the PHP CGI binary. Trac requires the CLI version "
-"for syntax highlighting."
-
-#: trac/mimeview/rst.py:60
-msgid "Docutils not found"
-msgstr "Docutils not found"
-
-#: trac/mimeview/rst.py:62
-#, python-format
-msgid "Docutils version >= %(version)s required, %(found)s found"
-msgstr "Docutils version >= %(version)s required, %(found)s found"
-
-#: trac/prefs/web_ui.py:53 trac/prefs/templates/prefs.html:16
-#: trac/ticket/templates/ticket.html:260 trac/wiki/templates/wiki_edit.html:99
+msgstr "this hunk was shorter than expected"
+
+#: trac/mimeview/pygments.py:126 trac/prefs/templates/prefs_pygments.html:9
+msgid "Syntax Highlighting"
+msgstr "Syntax Highlighting"
+
+#: trac/mimeview/pygments.py:135 trac/prefs/web_ui.py:143
+msgid "Your preferences have been saved."
+msgstr "Your preferences have been saved."
+
+#: trac/prefs/web_ui.py:52 trac/prefs/templates/prefs.html:16
+#: trac/ticket/templates/ticket.html:374
+#: trac/wiki/templates/wiki_edit_form.html:50
 msgid "Preferences"
 msgstr "Preferences"
 
-#: trac/prefs/web_ui.py:76
+#: trac/prefs/web_ui.py:75
 msgid "Unknown preference panel"
 msgstr "Unknown preference panel"
 
-#: trac/prefs/web_ui.py:89 trac/prefs/templates/prefs_datetime.html:9
+#: trac/prefs/web_ui.py:87 trac/prefs/templates/prefs_datetime.html:10
 msgid "Date & Time"
 msgstr "Date & Time"
 
-#: trac/prefs/web_ui.py:90 trac/prefs/templates/prefs_keybindings.html:9
+#: trac/prefs/web_ui.py:88 trac/prefs/templates/prefs_keybindings.html:10
 msgid "Keyboard Shortcuts"
 msgstr "Keyboard Shortcuts"
 
-#: trac/prefs/web_ui.py:92 trac/prefs/templates/prefs_language.html:9
+#: trac/prefs/web_ui.py:90 trac/prefs/templates/prefs_language.html:9
 msgid "Language"
 msgstr "Language"
 
-#: trac/prefs/web_ui.py:94 trac/prefs/templates/prefs_advanced.html:9
+#: trac/prefs/web_ui.py:92 trac/prefs/templates/prefs_advanced.html:9
 msgid "Advanced"
 msgstr "Advanced"
 
 " be\n"
 "      restored on subsequent visits."
 msgstr ""
-"This page lets you customise your personal settings for this site.\n"
-"      These settings are stored on the server and are identified by a "
-"session\n"
-"      key stored in a browser cookie. That cookie allows your settings to"
-" be\n"
-"      restored on subsequent visits."
+"This page lets you customise your personal settings for this site.  These"
+" settings are stored on the server and are identified by a session key "
+"stored in a browser cookie. That cookie allows your settings to be "
+"restored on subsequent visits."
 
 #: trac/prefs/templates/prefs.html:33
 msgid "Save changes"
 "      easier to remember at any time if you wish to load your settings\n"
 "      in a different web browser."
 msgstr ""
-"The session key is used to identify stored custom\n"
-"      settings and session data on the server. Although it is\n"
-"      automatically generated by default, you may change it to something\n"
-"      easier to remember at any time if you wish to load your settings\n"
-"      in a different web browser."
+"The session key is used to identify stored custom settings and session "
+"data on the server. Although it is automatically generated by default, "
+"you may change it to something easier to remember at any time if you wish"
+" to load your settings in a different web browser."
 
 #: trac/prefs/templates/prefs_advanced.html:26
 msgid "Restore session:"
 "between\n"
 "      multiple computers and web browsers."
 msgstr ""
-"You may load a previously created session by entering the\n"
-"      corresponding session key below. This lets you share settings "
-"between\n"
-"      multiple computers and web browsers."
-
-#: trac/prefs/templates/prefs_datetime.html:15
+"You may load a previously created session by entering the corresponding "
+"session key below. This lets you share settings between multiple "
+"computers and web browsers."
+
+#: trac/prefs/templates/prefs_datetime.html:16
 msgid "Time zone:"
 msgstr "Time zone:"
 
-#: trac/prefs/templates/prefs_datetime.html:17
+#: trac/prefs/templates/prefs_datetime.html:18
 msgid "Default time zone"
 msgstr "Default time zone"
 
-#: trac/prefs/templates/prefs_datetime.html:24
+#: trac/prefs/templates/prefs_datetime.html:25
 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 ""
-"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."
-
-#: trac/prefs/templates/prefs_datetime.html:28
+"Configuring your time zone will result in all dates and times displayed "
+"on this site to use your time zone instead of that of the server."
+
+#: trac/prefs/templates/prefs_datetime.html:30
 msgid "Example: The current time is"
 msgstr "Example: The current time is"
 
-#: trac/prefs/templates/prefs_datetime.html:29
+#: trac/prefs/templates/prefs_datetime.html:31
 msgid "(UTC)."
 msgstr "(UTC)."
 
-#: trac/prefs/templates/prefs_datetime.html:30
-msgid "In"
-msgstr "In"
-
-#: trac/prefs/templates/prefs_datetime.html:31
-msgid "time zone"
-msgstr "time zone"
-
-#: trac/prefs/templates/prefs_datetime.html:31
-msgid ", this would be displayed as"
-msgstr ", this would be displayed as"
-
-#: trac/prefs/templates/prefs_datetime.html:35
+#: trac/prefs/templates/prefs_datetime.html:34
+#, python-format
+msgid ""
+"In your time zone %(tz)s, this would be displayed as\n"
+"            [1:%(formatted)s]."
+msgstr "In your time zone %(tz)s, this would be displayed as [1:%(formatted)s]."
+
+#: trac/prefs/templates/prefs_datetime.html:40
+#, python-format
+msgid ""
+"In the default time zone, this would be displayed as\n"
+"            [1:%(formatted)s]."
+msgstr "In the default time zone, this would be displayed as [1:%(formatted)s]."
+
+#: trac/prefs/templates/prefs_datetime.html:47
 msgid ""
 "Note: Universal Co-ordinated Time (UTC) is also known as Greenwich Mean "
 "Time (GMT)."
 "Note: Universal Co-ordinated Time (UTC) is also known as Greenwich Mean "
 "Time (GMT)."
 
-#: trac/prefs/templates/prefs_datetime.html:36
+#: trac/prefs/templates/prefs_datetime.html:48
 msgid ""
 "A positive offset is used to indicate a timezone at the east of "
 "Greenwich, i.e. ahead of Universal Time."
 "This information is used to automatically populate some forms\n"
 "        on this site with your contact details."
 msgstr ""
-"This information is used to automatically populate some forms\n"
-"        on this site with your contact details."
+"This information is used to automatically populate some forms on this "
+"site with your contact details."
 
 #: trac/prefs/templates/prefs_general.html:30
 msgid ""
 "        email address and full name, which is used for email\n"
 "        notification and RSS feeds, for example."
 msgstr ""
-"This information is used to associate your login name with your\n"
-"        email address and full name, which is used for email\n"
-"        notification and RSS feeds, for example."
-
-#: trac/prefs/templates/prefs_keybindings.html:17
+"This information is used to associate your login name with your email "
+"address and full name, which is used for email notification and RSS "
+"feeds, for example."
+
+#: trac/prefs/templates/prefs_keybindings.html:18
 msgid "Enable access keys"
 msgstr "Enable access keys"
 
-#: trac/prefs/templates/prefs_keybindings.html:20
+#: trac/prefs/templates/prefs_keybindings.html:21
 msgid ""
-"This site provides keyboard shortcuts for faster\n"
-"      access to certain functions of this site. As these shortcuts can\n"
+"This site provides keyboard shortcuts for\n"
+"      faster access to certain functions of this site. As these shortcuts"
+" can\n"
 "      cause conflicts with shortcuts provided by the desktop system or\n"
-"      web browser, they are disabled by default. See"
+"      web browser, they are disabled by default. See\n"
+"      [1:TracAccessibility]\n"
+"      for more information on access keys."
 msgstr ""
-"This site provides keyboard shortcuts for faster\n"
-"      access to certain functions of this site. As these shortcuts can\n"
-"      cause conflicts with shortcuts provided by the desktop system or\n"
-"      web browser, they are disabled by default. See"
-
-#: trac/prefs/templates/prefs_keybindings.html:24
-msgid "TracAccessibility"
-msgstr "TracAccessibility"
-
-#: trac/prefs/templates/prefs_keybindings.html:24
-msgid "for more information on access keys."
-msgstr "for more information on access keys."
+"This site provides keyboard shortcuts for faster access to certain "
+"functions of this site. As these shortcuts can cause conflicts with "
+"shortcuts provided by the desktop system or web browser, they are "
+"disabled by default. See [1:TracAccessibility] for more information on "
+"access keys."
 
 #: trac/prefs/templates/prefs_language.html:14
 msgid "Language:"
 "      displayed on this site to use your language instead of that of the\n"
 "      server."
 msgstr ""
-"Configuring your language will result in all text\n"
-"      displayed on this site to use your language instead of that of the\n"
-"      server."
+"Configuring your language will result in all text displayed on this site "
+"to use your language instead of that of the server."
 
 #: trac/prefs/templates/prefs_language.html:25
 msgid ""
 "The 'default language' option uses the browser's\n"
 "        language negotiation feature to select the appropriate language."
 msgstr ""
-"The 'default language' option uses the browser's\n"
-"        language negotiation feature to select the appropriate language."
-
-#: trac/prefs/templates/prefs_pygments.html:9
-msgid "Pygments Theme"
-msgstr "Pygments Theme"
+"The 'default language' option uses the browser's language negotiation "
+"feature to select the appropriate language."
 
 #: trac/prefs/templates/prefs_pygments.html:36
 msgid ""
 "The Pygments syntax highlighter can be used with\n"
-"      different coloring themes."
+"      different coloring styles."
 msgstr ""
-"The Pygments syntax highlighter can be used with\n"
-"      different colouring themes."
+"The Pygments syntax highlighter can be used with different coloring "
+"styles."
 
 #: trac/prefs/templates/prefs_pygments.html:38
-msgid "Theme:"
-msgstr "Theme:"
+msgid "Style:"
+msgstr "Style:"
 
 #: trac/prefs/templates/prefs_pygments.html:43
 msgid "Preview:"
 msgstr "Preview:"
 
-#: trac/search/web_ui.py:64 trac/search/templates/search.html:10
+#: trac/search/web_ui.py:63 trac/search/templates/search.html:10
 #: trac/search/templates/search.html:23 trac/search/templates/search.html:28
 #: trac/templates/theme.html:28
 msgid "Search"
 msgstr "Search"
 
-#: trac/search/web_ui.py:107
+#: trac/search/web_ui.py:153
+#, python-format
+msgid "Browse repository path %(path)s"
+msgstr "Browse repository path %(path)s"
+
+#: trac/search/web_ui.py:193
 #, python-format
 msgid "Search query too short. Query must be at least %(num)s characters long."
 msgstr "Search query too short. Query must be at least %(num)s characters long."
 
-#: trac/search/web_ui.py:109
-msgid "Search Error"
-msgstr "Search Error"
-
-#: trac/search/web_ui.py:144 trac/ticket/query.py:677 trac/ticket/report.py:321
+#: trac/search/web_ui.py:231 trac/ticket/query.py:763 trac/ticket/report.py:397
 msgid "Next Page"
-msgstr "Next Page"
-
-#: trac/search/web_ui.py:150 trac/ticket/query.py:682 trac/ticket/report.py:325
+msgstr "Next page"
+
+#: trac/search/web_ui.py:237 trac/ticket/query.py:768 trac/ticket/report.py:400
 msgid "Previous Page"
-msgstr "Previous Page"
-
-#: trac/search/web_ui.py:192
-#, python-format
-msgid "Browse repository path %(path)s"
-msgstr "Browse repository path %(path)s"
+msgstr "Previous page"
 
 #: trac/search/templates/search.html:10 trac/search/templates/search.html:40
-#: trac/ticket/templates/query_results.html:21
-#: trac/ticket/templates/report_view.html:86
+#: trac/ticket/templates/query_results.html:20
+#: trac/ticket/templates/report_view.html:79
 msgid "Results"
 msgstr "Results"
 
 msgstr "Quick jump to"
 
 #: trac/search/templates/search.html:56
-msgid "By"
-msgstr "By"
+#, python-format
+msgid "By %(author)s"
+msgstr "By %(author)s"
 
 #: trac/search/templates/search.html:65
-#: trac/ticket/templates/report_view.html:215
+#: trac/ticket/templates/report_view.html:193
 msgid "No matches found."
 msgstr "No matches found."
 
-#: trac/search/templates/search.html:70
-#: trac/ticket/templates/milestone_delete.html:44
-#: trac/ticket/templates/milestone_edit.html:98
-#: trac/ticket/templates/milestone_view.html:105
-#: trac/ticket/templates/query.html:249
-#: trac/ticket/templates/report_delete.html:26
-#: trac/ticket/templates/report_edit.html:49
-#: trac/ticket/templates/report_view.html:218
-#: trac/ticket/templates/roadmap.html:69 trac/ticket/templates/ticket.html:406
-#: trac/timeline/templates/timeline.html:55
-#: trac/versioncontrol/templates/browser.html:151
-#: trac/versioncontrol/templates/diff_form.html:62
-#: trac/versioncontrol/templates/revisionlog.html:176
-msgid "Note:"
-msgstr "Note:"
-
-#: trac/search/templates/search.html:70