# HG changeset patch
# User Chris Cannam
# Date 1297972113 0
# Node ID 61f66ddb0b65f2de83944deea4f34c3607c1e1d5
# Parent  5d6e2819f3dda704bc5309e44f463f19e8d3e474# Parent  497c5985af720d5ed4dc6a55a7d8a1f312c964cd
Merge from branch "live"

diff -r 5d6e2819f3dd -r 61f66ddb0b65 config/locales/en-GB.yml
--- a/config/locales/en-GB.yml	Thu Feb 17 18:35:11 2011 +0000
+++ b/config/locales/en-GB.yml	Thu Feb 17 19:48:33 2011 +0000
@@ -384,8 +384,8 @@
   permission_comment_news: Comment news
   permission_manage_documents: Manage documents
   permission_view_documents: View documents
-  permission_manage_files: Manage files
-  permission_view_files: View files
+  permission_manage_files: Manage downloads
+  permission_view_files: View downloads
   permission_manage_wiki: Manage wiki
   permission_rename_wiki_pages: Rename wiki pages
   permission_delete_wiki_pages: Delete wiki pages
@@ -433,6 +433,8 @@
   label_project: Project
   label_project_new: New project
   label_project_plural: Projects
+  label_my_project_plural: My Projects
+  label_other_project_plural: Other Projects
   label_x_projects:
     zero:  no projects
     one:   1 project
@@ -523,7 +525,7 @@
   label_attachment: File
   label_attachment_new: New file
   label_attachment_delete: Delete file
-  label_attachment_plural: Files
+  label_attachment_plural: Downloads
   label_file_added: File added
   label_report: Report
   label_report_plural: Reports
@@ -712,7 +714,7 @@
   label_week: Week
   label_date_from: From
   label_date_to: To
-  label_language_based: Based on user's language
+  label_language_based: "Based on user's language"
   label_sort_by: "Sort by {{value}}"
   label_send_test_email: Send a test email
   label_feeds_access_key: RSS access key
@@ -723,7 +725,7 @@
   label_updated_time_by: "Updated by {{author}} {{age}} ago"
   label_updated_time: "Updated {{value}} ago"
   label_jump_to_a_project: Jump to a project...
-  label_file_plural: Files
+  label_file_plural: Downloads
   label_changeset_plural: Changesets
   label_default_columns: Default columns
   label_no_change_option: (No change)
diff -r 5d6e2819f3dd -r 61f66ddb0b65 config/locales/en.yml
--- a/config/locales/en.yml	Thu Feb 17 18:35:11 2011 +0000
+++ b/config/locales/en.yml	Thu Feb 17 19:48:33 2011 +0000
@@ -399,8 +399,8 @@
   permission_comment_news: Comment news
   permission_manage_documents: Manage documents
   permission_view_documents: View documents
-  permission_manage_files: Manage files
-  permission_view_files: View files
+  permission_manage_files: Manage Downloads
+  permission_view_files: View Downloads
   permission_manage_wiki: Manage wiki
   permission_rename_wiki_pages: Rename wiki pages
   permission_delete_wiki_pages: Delete wiki pages
@@ -537,7 +537,7 @@
   label_attachment: File
   label_attachment_new: New file
   label_attachment_delete: Delete file
-  label_attachment_plural: Files
+  label_attachment_plural: Downloads
   label_file_added: File added
   label_report: Report
   label_report_plural: Reports
@@ -738,7 +738,7 @@
   label_updated_time_by: "Updated by {{author}} {{age}} ago"
   label_updated_time: "Updated {{value}} ago"
   label_jump_to_a_project: Jump to a project...
-  label_file_plural: Files
+  label_file_plural: Downloads
   label_changeset_plural: Changesets
   label_default_columns: Default columns
   label_no_change_option: (No change)
diff -r 5d6e2819f3dd -r 61f66ddb0b65 extra/soundsoftware/doxysafe.pl
--- a/extra/soundsoftware/doxysafe.pl	Thu Feb 17 18:35:11 2011 +0000
+++ b/extra/soundsoftware/doxysafe.pl	Thu Feb 17 19:48:33 2011 +0000
@@ -32,7 +32,17 @@
     DOT_TRANSPARENT => "YES",
 );
 
+# These are the keys that are safe to take from the output and include
+# in the output; they may still need to be checked for safe values (if
+# file paths).
 my @safe = qw(
+INPUT
+FILE_PATTERNS
+EXAMPLE_PATH
+EXAMPLE_PATTERNS
+IMAGE_PATH
+INCLUDE_PATH           
+INCLUDE_FILE_PATTERNS
 DOXYFILE_ENCODING      
 PROJECT_NAME           
 PROJECT_NUMBER