Merge branch 'master' into openstreetbugs

diff --combined config/environment.rb
index 53dfabb6a94ebcc44107853bdd5727d925ddf0f5,de5852fc4316d857707b4984e34a62ac2aeb992a..29b114836a30225bd44b1aa802e9ab38402a40da
--- 1/config/environment.rb
--- 2/config/environment.rb
+++ b/config/environment.rb
@@@ -44,6 -44,7 +44,7 @@@ Rails::Initializer.run do |config
    # To use Rails without a database, you must remove the Active Record framework
    if OSM_STATUS == :database_offline
      config.frameworks -= [ :active_record ]
+     config.eager_load_paths = []
    end
  
    # Specify gems that this application depends on.
@@@ -51,7 -52,9 +52,9 @@@
    # config.gem "bj"
    # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
    # config.gem "aws-s3", :lib => "aws/s3"
-   config.gem 'composite_primary_keys', :version => '2.2.2'
+   unless  OSM_STATUS == :database_offline
+     config.gem 'composite_primary_keys', :version => '2.2.2'
+   end
    config.gem 'libxml-ruby', :version => '>= 1.1.1', :lib => 'libxml'
    config.gem 'rmagick', :lib => 'RMagick'
    config.gem 'oauth', :version => '>= 0.3.6'
@@@ -86,7 -89,9 +89,9 @@@
    # Use the database for sessions instead of the cookie-based default,
    # which shouldn't be used to store highly confidential information
    # (create the session table with 'rake db:sessions:create')
-   config.action_controller.session_store = :sql_session_store
+   unless  OSM_STATUS == :database_offline
+     config.action_controller.session_store = :sql_session_store
+   end
  
    # Use SQL instead of Active Record's schema dumper when creating the test database.
    # This is necessary if your schema can't be completely dumped by the schema dumper,
@@@ -98,5 -103,4 +103,5 @@@
  
    # Make Active Record use UTC-base instead of local time
    config.active_record.default_timezone = :utc
 +
  end

diff --combined config/locales/en.yml
index 2e57df0e5d25800aac45d7bf1599d5490b9a79f5,5d42f3c5d79bc2467e21feca4914f2c6254a18e7..9c8e2233ff89948b90bb477ef4bc4769726d6ce1
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -262,17 -262,6 +262,17 @@@ en
        download_xml: "Download XML"
        view_history: "view history"
        edit: "edit"
 +    bug:
 +      open_title: "Unresolved issue: {{bug_name}}"
 +      closed_title: "Resolved issue: {{bug_name}}"
 +      created_at: "Created at:"
 +      edited_at: "Edited at:"
 +      closed_at: "Closed at:"
 +      opened_by: "Opened by:"
 +      description: "Description:"
 +      comment_by: "Comment by: "
 +      comment: "Comment:"
 +      date: "Date:"
    changeset:
      changeset_paging_nav:
        showing_page: "Showing page {{page}}"
@@@ -944,7 -933,7 +944,7 @@@
      shop: Shop
      shop_tooltip: Shop with branded OpenStreetMap merchandise
      shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
-     sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
+     sotm2010: 'Come to the 2010 OpenStreetMap Conference, The State of the Map, July 9-11 in Girona!'
      license:
        alt: CC by-sa 2.0
        title: OpenStreetMap data is licensed under the Creative Commons Attribution-Share Alike 2.0 Generic License
@@@ -1807,20 -1796,6 +1807,20 @@@
        back: "View all blocks"
        revoker: "Revoker:"
        needs_view: "The user needs to log in before this block will be cleared."
 +  bugs:
 +    rss:
 +      description_area: "A list of bugs, reported, commented on or closed in your area [({{min_lat}}|{{min_lon}}) -- ({{max_lat}}|{{max_lon}})]"
 +      description_item: "An rss feed for bug {{id}}"
 +      closed: "closed bug (near {{place}})"
 +      new: "new bug (near {{place}})"
 +      comment: "new comment (near {{place}})"
 +    user:
 +      title_user: "Bugs submitted or commented on by {{user}}"
 +      heading_user: "{{user}}'s bugs"
 +      description_user: "Bugs submitted or commented on by {{user}}"
 +      id: "Id"
 +      last_changed: "Last changed"
 +
    javascripts:
      map:
        base: