diff options
180 files changed, 11536 insertions, 5627 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 0df3e22da..3794043fb 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -8,13 +8,20 @@ # # $Id: application.rb,v 1.59 2009-09-17 13:01:56 francis Exp $ +require 'open-uri' class ApplicationController < ActionController::Base # Standard headers, footers and navigation for whole site layout "default" include FastGettext::Translation # make functions like _, n_, N_ etc available) + + # Note: a filter stops the chain if it redirects or renders something + before_filter :authentication_check before_filter :set_gettext_locale + before_filter :check_in_post_redirect + before_filter :session_remember_me before_filter :set_vary_header + # scrub sensitive parameters from the logs filter_parameter_logging :password @@ -47,7 +54,14 @@ class ApplicationController < ActionController::Base else requested_locale = params[:locale] || session[:locale] || cookies[:locale] || I18n.default_locale end + requested_locale = FastGettext.best_locale_in(requested_locale) session[:locale] = FastGettext.set_locale(requested_locale) + if !@user.nil? + if @user.locale != requested_locale + @user.locale = session[:locale] + @user.save! + end + end end # scrub sensitive parameters from the logs @@ -84,7 +98,6 @@ class ApplicationController < ActionController::Base # Set cookie expiry according to "remember me" checkbox, as per "An easier # and more flexible hack" on this page: # http://wiki.rubyonrails.org/rails/pages/HowtoChangeSessionOptions - before_filter :session_remember_me def session_remember_me # Reset the "sliding window" session expiry time. if request.env['rack.session.options'] @@ -101,11 +114,17 @@ class ApplicationController < ActionController::Base # Make sure expiry time for session is set (before_filters are # otherwise missed by this override) session_remember_me - + case exception + when ActiveRecord::RecordNotFound, ActionController::UnknownAction, ActionController::RoutingError + @status = 404 + else + @status = 500 + end # Display user appropriate error message @exception_backtrace = exception.backtrace.join("\n") @exception_class = exception.class.to_s - render :template => "general/exception_caught.rhtml", :status => 404 + @exception_message = exception.message + render :template => "general/exception_caught.rhtml", :status => @status end # For development sites. @@ -192,7 +211,9 @@ class ApplicationController < ActionController::Base post_redirect = PostRedirect.new(:uri => request.request_uri, :post_params => params, :reason_params => reason_params) post_redirect.save! - redirect_to signin_url(:token => post_redirect.token) + # 'modal' controls whether the sign-in form will be displayed in the typical full-blown + # page or on its own, useful for pop-ups + redirect_to signin_url(:token => post_redirect.token, :modal => params[:modal]) return false end return true @@ -256,7 +277,6 @@ class ApplicationController < ActionController::Base end # If we are in a faked redirect to POST request, then set post params. - before_filter :check_in_post_redirect def check_in_post_redirect if params[:post_redirect] and session[:post_redirect_token] post_redirect = PostRedirect.find_by_token(session[:post_redirect_token]) @@ -265,7 +285,6 @@ class ApplicationController < ActionController::Base end # Default layout shows user in corner, so needs access to it - before_filter :authentication_check def authentication_check if session[:user_id] @user = authenticated_user @@ -349,6 +368,115 @@ class ApplicationController < ActionController::Base session[:last_body_id] = public_body.id end + def param_exists(item) + return params[item] && !params[item].empty? + end + + def get_request_variety_from_params + query = "" + sortby = "newest" + varieties = [] + if params[:request_variety] && !(query =~ /variety:/) + if params[:request_variety].include? "sent" + varieties -= ['variety:sent', 'variety:followup_sent', 'variety:response', 'variety:comment'] + varieties << ['variety:sent', 'variety:followup_sent'] + end + if params[:request_variety].include? "response" + varieties << ['variety:response'] + end + if params[:request_variety].include? "comment" + varieties << ['variety:comment'] + end + end + if !varieties.empty? + query = " (#{varieties.join(' OR ')})" + end + return query + end + + def get_status_from_params + query = "" + if params[:latest_status] + statuses = [] + if params[:latest_status].class == String + params[:latest_status] = [params[:latest_status]] + end + if params[:latest_status].include?("recent") || params[:latest_status].include?("all") + query += " variety:sent" + end + if params[:latest_status].include? "successful" + statuses << ['latest_status:successful', 'latest_status:partially_successful'] + end + if params[:latest_status].include? "unsuccessful" + statuses << ['latest_status:rejected', 'latest_status:not_held'] + end + if params[:latest_status].include? "awaiting" + statuses << ['latest_status:waiting_response', 'latest_status:waiting_clarification', 'waiting_classification:true'] + end + if params[:latest_status].include? "internal_review" + statuses << ['status:internal_review'] + end + if params[:latest_status].include? "other" + statuses << ['latest_status:gone_postal', 'latest_status:error_message', 'latest_status:requires_admin', 'latest_status:user_withdrawn'] + end + if params[:latest_status].include? "gone_postal" + statuses << ['latest_status:gone_postal'] + end + if !statuses.empty? + query = " (#{statuses.join(' OR ')})" + end + end + return query + end + + def get_date_range_from_params + query = "" + if param_exists(:request_date_after) && !param_exists(:request_date_before) + params[:request_date_before] = Time.now.strftime("%d/%m/%Y") + query += " #{params[:request_date_after]}..#{params[:request_date_before]}" + elsif !param_exists(:request_date_after) && param_exists(:request_date_before) + params[:request_date_after] = "01/01/2001" + end + if param_exists(:request_date_after) + query = " #{params[:request_date_after]}..#{params[:request_date_before]}" + end + return query + end + + def get_tags_from_params + query = "" + tags = [] + if param_exists(:tags) + params[:tags].split().each do |tag| + tags << "tag:#{tag}" + end + end + if !tags.empty? + query = " (#{tags.join(' OR ')})" + end + return query + end + + def make_query_from_params + query = params[:query] || "" if query.nil? + query += get_date_range_from_params + query += get_request_variety_from_params + query += get_status_from_params + query += get_tags_from_params + return query + end + + def country_from_ip + gaze = MySociety::Config.get('GAZE_URL', '') + default = MySociety::Config.get('ISO_COUNTRY_CODE', '') + country = "" + if !gaze.empty? + country = open("#{gaze}/gaze-rest?f=get_country_from_ip;ip=#{request.remote_ip}").read.strip + end + country = default if country.empty? + return country + end + # URL generating functions are needed by all controllers (for redirects), # views (for links) and mailers (for use in emails), so include them into # all of all. diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb index 4fa603aab..ada891ce9 100644 --- a/app/controllers/general_controller.rb +++ b/app/controllers/general_controller.rb @@ -45,20 +45,23 @@ class GeneralController < ApplicationController :joins => :translations) end end - @search_examples = MySociety::Config.get('FRONTPAGE_SEARCH_EXAMPLES', '').split(/\s*;\s*/) - if @search_examples.empty? - @search_examples = @popular_bodies.map { |body| body.name } - end # Get some successful requests # begin query = 'variety:response (status:successful OR status:partially_successful)' # query = 'variety:response' # XXX debug sortby = "described" - xapian_object = perform_search([InfoRequestEvent], query, sortby, 'request_title_collapse', 8) - @successful_request_events = xapian_object.results.map { |r| r[:model] } - @successful_request_events = @successful_request_events.sort_by { |e| e.described_at }.reverse + max_count = 5 + xapian_object = perform_search([InfoRequestEvent], query, sortby, 'request_title_collapse', max_count) + @request_events = xapian_object.results.map { |r| r[:model] } + @request_events = @request_events.sort_by { |e| e.described_at }.reverse + if @request_events.count < max_count + query = 'variety:sent' + xapian_object = perform_search([InfoRequestEvent], query, sortby, 'request_title_collapse', max_count-@request_events.count) + more_events = xapian_object.results.map { |r| r[:model] } + @request_events += more_events.sort_by { |e| e.described_at }.reverse + end rescue - @successful_request_events = [] + @request_events = [] end end end @@ -82,20 +85,34 @@ class GeneralController < ApplicationController # Just does a redirect from ?query= search to /query def search_redirect - @query = params[:query] + if params[:advanced].nil? + @query, _ = make_query_from_params + else + @query, _ = params[:query] + end @sortby = params[:sortby] - @bodies = params[:bodies] + path = request.path.split("/") + if path.size > 0 && (['newest', 'described', 'relevant'].include?(path[-1])) + @sort_postfix = path.pop + end + if path.size > 0 && (['bodies', 'requests', 'users', 'all'].include?(path[-1])) + @variety_postfix = path.pop + end + @variety_postfix = params[:bodies] if @variety_postfix.nil? && !params[:bodies].nil? + @variety_postfix = "requests" if @variety_postfix.nil? + if @variety_postfix != "users" + @common_query = get_tags_from_params + end + [:latest_status, :request_variety, :request_date_after, :request_date_before, :query, :tags].each do |x| + session[x] = params[x] + end if @query.nil? || @query.empty? @query = nil @page = 1 + @advanced = !params[:advanced].nil? render :action => "search" else - if (@bodies == '1') && (@sortby.nil? || @sortby.empty?) - @postfix = 'bodies' - else - @postfix = @sortby - end - redirect_to search_url(@query, @postfix) + redirect_to search_url(@query, @variety_postfix, @sort_postfix, params[:advanced]) end end @@ -103,23 +120,56 @@ class GeneralController < ApplicationController def search # XXX Why is this so complicated with arrays and stuff? Look at the route # in config/routes.rb for comments. + if !params[:commit].nil? + search_redirect + return + end + [:latest_status, :request_variety, :request_date_after, :request_date_before, :query, :tags].each do |x| + params[x] = session[x] + end combined = params[:combined] @sortby = nil - @bodies = false # searching from front page, largely for a public authority + @bodies = @requests = @users = true + if combined.size > 0 && (['advanced'].include?(combined[-1])) + combined.pop + @advanced = true + else + @advanced = false + end # XXX currently /described isn't linked to anywhere, just used in RSS and for /list/successful # This is because it's confusingly different from /newest - but still useful for power users. - if combined.size > 1 && (['newest', 'described', 'bodies', 'relevant'].include?(combined[-1])) - @postfix = combined[-1] - combined = combined[0..-2] - if @postfix == 'bodies' + if combined.size > 0 && (['newest', 'described', 'relevant'].include?(combined[-1])) + @sort_postfix = combined.pop + @sortby = @sort_postfix + end + if !params[:view].nil? + combined += [params[:view]] + end + if combined.size > 0 && (['bodies', 'requests', 'users', 'all'].include?(combined[-1])) + @variety_postfix = combined.pop + case @variety_postfix + when 'bodies' @bodies = true - else - @sortby = @postfix + @requests = false + @users = false + when 'requests' + @bodies = false + @requests = true + @users = false + when 'users' + @bodies = false + @requests = false + @users = true end + else + @variety_postfix = "all" end @query = combined.join("/") - + if params[:query].nil? + params[:query] = @query + end @inputted_sortby = @sortby + @common_query = get_tags_from_params if @sortby.nil? # Parse query, so can work out if it has prefix terms only - if so then it is a # structured query which should show newest first, rather than a free text search @@ -145,21 +195,41 @@ class GeneralController < ApplicationController if params[:requests_per_page] requests_per_page = params[:requests_per_page].to_i end - @xapian_requests = perform_search([InfoRequestEvent], @query, @sortby, 'request_collapse', requests_per_page) - @requests_per_page = @per_page - @xapian_bodies = perform_search([PublicBody], @query, @sortby, nil, 5) - @bodies_per_page = @per_page - @xapian_users = perform_search([User], @query, @sortby, nil, 5) - @users_per_page = @per_page - - @this_page_hits = @xapian_requests.results.size + @xapian_bodies.results.size + @xapian_users.results.size - @total_hits = @xapian_requests.matches_estimated + @xapian_bodies.matches_estimated + @xapian_users.matches_estimated + @this_page_hits = @total_hits = @xapian_requests_hits = @xapian_bodies_hits = @xapian_users_hits = 0 + if @requests + @xapian_requests = perform_search([InfoRequestEvent], @query, @sortby, 'request_collapse', requests_per_page) + @requests_per_page = @per_page + @this_page_hits += @xapian_requests.results.size + @xapian_requests_hits = @xapian_requests.results.size + @xapian_requests_total_hits = @xapian_requests.matches_estimated + @total_hits += @xapian_requests.matches_estimated + end + if @bodies + @xapian_bodies = perform_search([PublicBody], @query, @sortby, nil, 5) + @bodies_per_page = @per_page + @this_page_hits += @xapian_bodies.results.size + @xapian_bodies_hits = @xapian_bodies.results.size + @xapian_bodies_total_hits = @xapian_bodies.matches_estimated + @total_hits += @xapian_bodies.matches_estimated + end + if @users + @xapian_users = perform_search([User], @query, @sortby, nil, 5) + @users_per_page = @per_page + @this_page_hits += @xapian_users.results.size + @xapian_users_hits = @xapian_users.results.size + @xapian_users_total_hits = @xapian_users.matches_estimated + @total_hits += @xapian_users.matches_estimated + end # Spelling and highight words are same for all three queries - @spelling_correction = @xapian_requests.spelling_correction - @highlight_words = @xapian_requests.words_to_highlight + if !@xapian_requests.nil? + @highlight_words = @xapian_requests.words_to_highlight + if !(@xapian_requests.spelling_correction =~ /[a-z]+:/) + @spelling_correction = @xapian_requests.spelling_correction + end + end - @track_thing = TrackThing.create_track_for_search_query(@query) + @track_thing = TrackThing.create_track_for_search_query(@query, @variety_postfix) @feed_autodetect = [ { :url => do_track_url(@track_thing, 'feed'), :title => @track_thing.params[:title_in_rss], :has_json => true } ] end diff --git a/app/controllers/public_body_controller.rb b/app/controllers/public_body_controller.rb index 05acf4868..79ca58d13 100644 --- a/app/controllers/public_body_controller.rb +++ b/app/controllers/public_body_controller.rb @@ -16,11 +16,10 @@ class PublicBodyController < ApplicationController redirect_to :url_name => MySociety::Format.simplify_url_part(params[:url_name], 'body'), :status => :moved_permanently return end - @locale = self.locale_from_params() PublicBody.with_locale(@locale) do @public_body = PublicBody.find_by_url_name_with_historic(params[:url_name]) - raise "None found" if @public_body.nil? # XXX proper 404 + raise ActiveRecord::RecordNotFound.new("None found") if @public_body.nil? # XXX proper 404 if @public_body.url_name.nil? redirect_to :back return @@ -39,11 +38,16 @@ class PublicBodyController < ApplicationController if !referrer.nil? && referrer.match(%r{^#{top_url}search/.*/bodies$}) @searched_to_send_request = true end + @view = params[:view] + params[:latest_status] = @view + query = make_query_from_params + query += " requested_from:#{@public_body.url_name}" # Use search query for this so can collapse and paginate easily # XXX really should just use SQL query here rather than Xapian. + sortby = "described" begin - @xapian_requests = perform_search([InfoRequestEvent], 'requested_from:' + @public_body.url_name, 'newest', 'request_collapse') + @xapian_requests = perform_search([InfoRequestEvent], query, sortby, 'request_collapse') if (@page > 1) @page_desc = " (page " + @page.to_s + ")" else @@ -83,31 +87,38 @@ class PublicBodyController < ApplicationController def list long_cache # XXX move some of these tag SQL queries into has_tag_string.rb + @query = "%#{params[:public_body_query].nil? ? "" : params[:public_body_query]}%" @tag = params[:tag] @locale = self.locale_from_params() - locale_condition = 'public_body_translations.locale = ?' - if @tag.nil? + + locale_condition = "(upper(public_body_translations.name) LIKE upper(?) + OR upper(public_body_translations.notes) LIKE upper (?)) + AND public_body_translations.locale = ? + AND public_bodies.id <> #{PublicBody.internal_admin_body.id}" + if @tag.nil? or @tag == "all" @tag = "all" - conditions = [locale_condition, @locale] + conditions = [locale_condition, @query, @query, @locale] elsif @tag == 'other' category_list = PublicBodyCategories::CATEGORIES.map{|c| "'"+c+"'"}.join(",") conditions = [locale_condition + ' AND (select count(*) from has_tag_string_tags where has_tag_string_tags.model_id = public_bodies.id and has_tag_string_tags.model = \'PublicBody\' - and has_tag_string_tags.name in (' + category_list + ')) = 0', @locale] + and has_tag_string_tags.name in (' + category_list + ')) = 0', @query, @query, @locale] elsif @tag.size == 1 @tag.upcase! - conditions = [locale_condition + ' AND public_body_translations.first_letter = ?', @locale, @tag] + conditions = [locale_condition + ' AND public_body_translations.first_letter = ?', @query, @query, @locale, @tag] elsif @tag.include?(":") name, value = HasTagString::HasTagStringTag.split_tag_into_name_value(@tag) conditions = [locale_condition + ' AND (select count(*) from has_tag_string_tags where has_tag_string_tags.model_id = public_bodies.id and has_tag_string_tags.model = \'PublicBody\' - and has_tag_string_tags.name = ? and has_tag_string_tags.value = ?) > 0', @locale, name, value] + and has_tag_string_tags.name = ? and has_tag_string_tags.value = ?) > 0', @query, @query, @locale, name, value] else conditions = [locale_condition + ' AND (select count(*) from has_tag_string_tags where has_tag_string_tags.model_id = public_bodies.id and has_tag_string_tags.model = \'PublicBody\' - and has_tag_string_tags.name = ?) > 0', @locale, @tag] + and has_tag_string_tags.name = ?) > 0', @query, @query, @locale, @tag] end - if @tag.size == 1 + if @tag == "all" + @description = "" + elsif @tag.size == 1 @description = _("beginning with") + " '" + @tag + "'" else @description = PublicBodyCategories::CATEGORIES_BY_TAG[@tag] @@ -115,7 +126,7 @@ class PublicBodyController < ApplicationController @description = @tag end end - PublicBody.with_locale(@locale) do + PublicBody.with_locale(@locale) do @public_bodies = PublicBody.paginate( :order => "public_body_translations.name", :page => params[:page], :per_page => 1000, # fit all councils on one page :conditions => conditions, @@ -168,5 +179,17 @@ class PublicBodyController < ApplicationController :filename => 'all-authorities.csv', :disposition =>'attachment', :encoding => 'utf8') end + + # Type ahead search + def search_typeahead + # Since acts_as_xapian doesn't support the Partial match flag, we work around it + # by making the last work a wildcard, which is quite the same + query = params[:q] + '*' + + query = query.split(' ').join(' OR ') # XXX: HACK for OR instead of default AND! + @xapian_requests = perform_search([PublicBody], query, 'relevant', 'request_collapse', 5) + + render :partial => "public_body/search_ahead" + end end diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index c1a13273a..12b5247b5 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.rb @@ -22,6 +22,21 @@ class RequestController < ApplicationController rescue MissingSourceFile, NameError end + def select_authority + # Check whether we force the user to sign in right at the start, or we allow her + # to start filling the request anonymously + if force_registration_on_new_request && !authenticated?( + :web => _("To send your FOI request"), + :email => _("Then you'll be allowed to send FOI requests."), + :email_subject => _("Confirm your email address") + ) + # do nothing - as "authenticated?" has done the redirect to signin page for us + return + end + + medium_cache + end + def show medium_cache @locale = self.locale_from_params() @@ -37,7 +52,7 @@ class RequestController < ApplicationController # Look up by new style text names @info_request = InfoRequest.find_by_url_title(params[:url_title]) if @info_request.nil? - raise "Request not found" + raise ActiveRecord::RecordNotFound.new("Request not found") end set_last_request(@info_request) @@ -66,7 +81,7 @@ class RequestController < ApplicationController @last_info_request_event_id = @info_request.last_event_id_needing_description @new_responses_count = @info_request.events_needing_description.select {|i| i.event_type == 'response'}.size -1 + # Sidebar stuff # ... requests that have similar imporant terms behavior_cache :tag => ['similar', @info_request.id] do @@ -129,26 +144,10 @@ class RequestController < ApplicationController def list medium_cache @view = params[:view] - - if @view.nil? - redirect_to request_list_url(:view => 'successful') - return - end - - if @view == 'recent' - @title = _("Recently sent Freedom of Information requests") - query = "variety:sent"; - sortby = "newest" - @track_thing = TrackThing.create_track_for_all_new_requests - elsif @view == 'successful' - @title = _("Recently successful responses") - query = 'variety:response (status:successful OR status:partially_successful)' - sortby = "described" - @track_thing = TrackThing.create_track_for_all_successful_requests - else - raise "unknown request list view " + @view.to_s - end - + params[:latest_status] = @view + query = make_query_from_params + @title = _("View and search requests") + sortby = "newest" @page = get_search_page_from_params if !@page # used in cache case, as perform_search sets @page as side effect behavior_cache :tag => [@view, @page] do xapian_object = perform_search([InfoRequestEvent], query, sortby, 'request_collapse') @@ -157,7 +156,7 @@ class RequestController < ApplicationController end @title = @title + " (page " + @page.to_s + ")" if (@page > 1) - + @track_thing = TrackThing.create_track_for_search_query(query) @feed_autodetect = [ { :url => do_track_url(@track_thing, 'feed'), :title => @track_thing.params[:title_in_rss], :has_json => true } ] # Don't let robots go more than 20 pages in @@ -203,7 +202,7 @@ class RequestController < ApplicationController params[:info_request][:public_body_id] = params[:url_name] else public_body = PublicBody.find_by_url_name_with_historic(params[:url_name]) - raise "None found" if public_body.nil? # XXX proper 404 + raise ActiveRecord::RecordNotFound.new("None found") if public_body.nil? # XXX proper 404 params[:info_request][:public_body_id] = public_body.id end elsif params[:public_body_id] @@ -686,10 +685,10 @@ class RequestController < ApplicationController raise "internal error, pre-auth filter should have caught this" if !@info_request.user_can_view?(authenticated_user) @attachment = IncomingMessage.get_attachment_by_url_part_number(@incoming_message.get_attachments_for_display, @part_number) - raise "attachment not found part number " + @part_number.to_s + " incoming_message " + @incoming_message.id.to_s if @attachment.nil? + raise ActiveRecord::RecordNotFound.new("attachment not found part number " + @part_number.to_s + " incoming_message " + @incoming_message.id.to_s) if @attachment.nil? # check filename in URL matches that in database (use a censor rule if you want to change a filename) - raise "please use same filename as original file has, display: '" + @attachment.display_filename + "' old_display: '" + @attachment.old_display_filename + "' original: '" + @original_filename + "'" if @attachment.display_filename != @original_filename && @attachment.old_display_filename != @original_filename + raise ActiveRecord::RecordNotFound.new("please use same filename as original file has, display: '" + @attachment.display_filename + "' old_display: '" + @attachment.old_display_filename + "' original: '" + @original_filename + "'") if @attachment.display_filename != @original_filename && @attachment.old_display_filename != @original_filename @attachment_url = get_attachment_url(:id => @incoming_message.info_request_id, :incoming_message_id => @incoming_message.id, :part => @part_number, @@ -743,5 +742,17 @@ class RequestController < ApplicationController return end end + + # Type ahead search + def search_typeahead + # Since acts_as_xapian doesn't support the Partial match flag, we work around it + # by making the last work a wildcard, which is quite the same + query = params[:q] + '*' + + query = query.split(' ').join(' OR ') # XXX: HACK for OR instead of default AND! + @xapian_requests = perform_search([InfoRequestEvent], query, 'relevant', 'request_collapse', 5) + + render :partial => "request/search_ahead.rhtml" + end end diff --git a/app/controllers/services_controller.rb b/app/controllers/services_controller.rb new file mode 100644 index 000000000..6fb20336e --- /dev/null +++ b/app/controllers/services_controller.rb @@ -0,0 +1,32 @@ +# controllers/application.rb: +# Parent class of all controllers in FOI site. Filters added to this controller +# apply to all controllers in the application. Likewise, all the methods added +# will be available for all controllers. +# +# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. +# Email: francis@mysociety.org; WWW: http://www.mysociety.org/ +# +# $Id: application.rb,v 1.59 2009-09-17 13:01:56 francis Exp $ + +require 'open-uri' + +class ServicesController < ApplicationController + def other_country_message + text = "" + iso_country_code = MySociety::Config.get('ISO_COUNTRY_CODE').downcase + if country_from_ip.downcase != iso_country_code + found_country = WorldFOIWebsites.by_code(country_from_ip) + found_country_name = !found_country.nil? && found_country[:country_name] + if found_country_name + text = _("Hello! You can make Freedom of Information requests within {{country_name}} at {{link_to_website}}", :country_name => found_country_name, :link_to_website => "<a href=\"#{found_country[:url]}\">#{found_country[:name]}</a>") + else + current_country = WorldFOIWebsites.by_code(iso_country_code)[:country_name] + text = _("Hello! We have an <a href=\"/help/alaveteli?country_name=#{CGI.escape(current_country)}\">important message</a> for visitors outside {{country_name}}", :country_name => current_country) + end + end + if !text.empty? + text += ' <span class="close-button">X</span>' + end + render :text => text, :content_type => "text/plain" # XXX workaround the HTML validation in test suite + end +end diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index d3c42c7f1..96dbfba74 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -8,6 +8,8 @@ class UserController < ApplicationController + layout :select_layout + protect_from_forgery :only => [ :contact, :set_profile_photo, :signchangeemail, @@ -24,7 +26,7 @@ class UserController < ApplicationController @display_user = User.find(:first, :conditions => [ "url_name = ? and email_confirmed = ?", params[:url_name], true ]) if not @display_user - raise "user not found, url_name=" + params[:url_name] + raise ActiveRecord::RecordNotFound.new("user not found, url_name=" + params[:url_name]) end @same_name_users = User.find(:all, :conditions => [ "name ilike ? and email_confirmed = ? and id <> ?", @display_user.name, true, @display_user.id ], :order => "created_at") @@ -33,9 +35,16 @@ class UserController < ApplicationController # Use search query for this so can collapse and paginate easily # XXX really should just use SQL query here rather than Xapian. begin - @xapian_requests = perform_search([InfoRequestEvent], 'requested_by:' + @display_user.url_name, 'newest', 'request_collapse') - @xapian_comments = perform_search([InfoRequestEvent], 'commented_by:' + @display_user.url_name, 'newest', nil) - + requests_query = 'requested_by:' + @display_user.url_name + comments_query = 'commented_by:' + @display_user.url_name + if !params[:user_query].nil? + requests_query += " " + params[:user_query] + comments_query += " " + params[:user_query] + @match_phrase = _("{{search_results}} matching '{{query}}'", :search_results => "", :query => params[:user_query]) + end + @xapian_requests = perform_search([InfoRequestEvent], requests_query, 'newest', 'request_collapse') + @xapian_comments = perform_search([InfoRequestEvent], comments_query, 'newest', nil) + if (@page > 1) @page_desc = " (page " + @page.to_s + ")" else @@ -71,7 +80,7 @@ class UserController < ApplicationController # Login form def signin work_out_post_redirect - + @request_from_foreign_country = country_from_ip != MySociety::Config.get('ISO_COUNTRY_CODE', 'GB') # make sure we have cookies if session.instance_variable_get(:@dbman) if not session.instance_variable_get(:@dbman).instance_variable_get(:@original) @@ -106,7 +115,12 @@ class UserController < ApplicationController session[:user_id] = @user_signin.id session[:user_circumstance] = nil session[:remember_me] = params[:remember_me] ? true : false - do_post_redirect @post_redirect + + if is_modal_dialog + render :action => 'signin_successful' + else + do_post_redirect @post_redirect + end else send_confirmation_mail @user_signin end @@ -118,10 +132,15 @@ class UserController < ApplicationController # Create new account form def signup work_out_post_redirect - + @request_from_foreign_country = country_from_ip != MySociety::Config.get('ISO_COUNTRY_CODE', 'GB') # Make the user and try to save it @user_signup = User.new(params[:user_signup]) - if !@user_signup.valid? + error = false + if @request_from_foreign_country && !verify_recaptcha + flash.now[:error] = _("There was an error with the words you entered, please try again.") + error = true + end + if error || !@user_signup.valid? # Show the form render :action => 'sign' else @@ -133,7 +152,6 @@ class UserController < ApplicationController # New unconfirmed user @user_signup.email_confirmed = false @user_signup.save! - send_confirmation_mail @user_signup return end @@ -454,7 +472,7 @@ class UserController < ApplicationController def get_profile_photo @display_user = User.find(:first, :conditions => [ "url_name = ? and email_confirmed = ?", params[:url_name], true ]) if !@display_user - raise "user not found, url_name=" + params[:url_name] + raise ActiveRecord::RecordNotFound.new("user not found, url_name=" + params[:url_name]) end if !@display_user.profile_photo raise "user has no profile photo, url_name=" + params[:url_name] @@ -500,6 +518,15 @@ class UserController < ApplicationController private + def is_modal_dialog + (params[:modal].to_i != 0) + end + + # when logging in through a modal iframe, don't display chrome around the content + def select_layout + is_modal_dialog ? 'no_chrome' : 'default' + end + # Decide where we are going to redirect back to after signin/signup, and record that def work_out_post_redirect # Redirect to front page later if nothing else specified diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index ec56566a9..d12238582 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -94,5 +94,20 @@ module ApplicationHelper block.call end end + # (unfortunately) ugly way of getting id of generated form element + # ids + # see http://chrisblunt.com/2009/10/12/rails-getting-the-id-of-form-fields-inside-a-fields_for-block/ + def sanitized_object_name(object_name) + object_name.gsub(/\]\[|[^-a-zA-Z0-9:.]/,"_").sub(/_$/,"") + end + + def sanitized_method_name(method_name) + method_name.sub(/\?$/, "") + end + + def form_tag_id(object_name, method_name) + return "#{sanitized_object_name(object_name.to_s)}_#{sanitized_method_name(method_name.to_s)}" + end + end diff --git a/app/helpers/config_helper.rb b/app/helpers/config_helper.rb index 80f2deed2..b0381a2f5 100644 --- a/app/helpers/config_helper.rb +++ b/app/helpers/config_helper.rb @@ -2,4 +2,8 @@ module ConfigHelper def site_name MySociety::Config.get('SITE_NAME', 'Alaveteli') end + + def force_registration_on_new_request + MySociety::Config.get('FORCE_REGISTRATION_ON_NEW_REQUEST', false) + end end
\ No newline at end of file diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb index 34354a79b..54b8d69d0 100755 --- a/app/helpers/link_to_helper.rb +++ b/app/helpers/link_to_helper.rb @@ -79,7 +79,7 @@ module LinkToHelper link_to(h(public_body.name), main_url(public_body_url(public_body))) + " (" + link_to("admin", public_body_admin_url(public_body)) + ")" end def list_public_bodies_default - list_public_bodies_url(:tag => 'a') + list_public_bodies_url(:tag => 'all') end # Users @@ -135,11 +135,10 @@ module LinkToHelper end end - # General pages. postfix is either the sort order, or 'bodies' to show you - # came from the front page and are looking for public bodies - def search_url(query, postfix = nil) + # General pages. + def search_url(query, variety_postfix = nil, sort_postfix = nil, advanced = nil) + query = query - ["", nil] if query.kind_of?(Array) url = search_general_url(:combined => query) - # Here we can't escape the slashes, as RFC 2396 doesn't allow slashes # within a path component. Rails is assuming when generating URLs that # either there aren't slashes, or we are in a query part where you can @@ -151,13 +150,19 @@ module LinkToHelper # http://rails.lighthouseapp.com/projects/8994/tickets/144-patch-bug-in-rails-route-globbing url = url.gsub("%2F", "/") - if !postfix.nil? && !postfix.empty? - url = url + "/" + postfix + if !variety_postfix.nil? && !variety_postfix.empty? + url = url + "/" + variety_postfix + end + if !sort_postfix.nil? && !sort_postfix.empty? + url = url + "/" + sort_postfix + end + if !advanced.nil? && (advanced) + url = url + "/advanced" end return url end - def search_link(query, postfix = nil) - link_to h(query), search_url(query, postfix) + def search_link(query, variety_postfix = nil, sort_postfix = nil, advanced = nil) + link_to h(query), search_url(query, variety_postfix, sort_postfix, advanced) end # Admin pages diff --git a/app/models/info_request.rb b/app/models/info_request.rb index c667e1499..88a02cc2c 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -117,13 +117,13 @@ class InfoRequest < ActiveRecord::Base # only check on create, so existing models with mixed case are allowed def validate_on_create if !self.title.nil? && !MySociety::Validate.uses_mixed_capitals(self.title, 10) - errors.add(:title, N_('Please write the summary using a mixture of capital and lower case letters. This makes it easier for others to read.')) + errors.add(:title, _('Please write the summary using a mixture of capital and lower case letters. This makes it easier for others to read.')) end if !self.title.nil? && title.size > 200 - errors.add(:title, N_('Please keep the summary short, like in the subject of an email. You can use a phrase, rather than a full sentence.')) + errors.add(:title, _('Please keep the summary short, like in the subject of an email. You can use a phrase, rather than a full sentence.')) end if !self.title.nil? && self.title =~ /^(FOI|Freedom of Information)\s*requests?$/i - errors.add(:title, N_('Please describe more what the request is about in the subject. There is no need to say it is an FOI request, we add that on anyway.')) + errors.add(:title, _('Please describe more what the request is about in the subject. There is no need to say it is an FOI request, we add that on anyway.')) end end @@ -451,7 +451,7 @@ public self.log_event("response", params) self.save! end - + self.info_request_events.each { |event| event.xapian_mark_needs_index } # for the "waiting_classification" index RequestMailer.deliver_new_response(self, incoming_message) end @@ -564,6 +564,7 @@ public def calculate_event_states curr_state = nil for event in self.info_request_events.reverse + event.xapian_mark_needs_index # we need to reindex all events in order to update their latest_* terms if curr_state.nil? if !event.described_state.nil? curr_state = event.described_state @@ -779,8 +780,7 @@ public # Display version of status - def display_status - status = self.calculate_status + def InfoRequest.get_status_description(status) if status == 'waiting_classification' _("Awaiting classification.") elsif status == 'waiting_response' @@ -818,6 +818,10 @@ public end end + def display_status + InfoRequest.get_status_description(self.calculate_status) + end + # Completely delete this request and all objects depending on it def fully_destroy self.track_things.each do |track_thing| diff --git a/app/models/info_request_event.rb b/app/models/info_request_event.rb index 1550a4bf5..4ea89bf81 100644 --- a/app/models/info_request_event.rb +++ b/app/models/info_request_event.rb @@ -94,7 +94,7 @@ class InfoRequestEvent < ActiveRecord::Base [ :created_at_numeric, 1, "created_at", :number ], # for sorting [ :described_at_numeric, 2, "described_at", :number ], # XXX using :number for lack of :datetime support in Xapian values [ :request, 3, "request_collapse", :string ], - [ :request_title_collapse, 4, "request_title_collapse", :string ] + [ :request_title_collapse, 4, "request_title_collapse", :string ], ], :terms => [ [ :calculated_state, 'S', "status" ], [ :requested_by, 'B', "requested_by" ], @@ -102,6 +102,9 @@ class InfoRequestEvent < ActiveRecord::Base [ :commented_by, 'C', "commented_by" ], [ :request, 'R', "request" ], [ :variety, 'V', "variety" ], + [ :latest_variety, 'K', "latest_variety" ], + [ :latest_status, 'L', "latest_status" ], + [ :waiting_classification, 'W', "waiting_classification" ], [ :filetype, 'T', "filetype" ], [ :tags, 'U', "tag" ] ], @@ -129,6 +132,27 @@ class InfoRequestEvent < ActiveRecord::Base def request self.info_request.url_title end + + def latest_variety + for event in self.info_request.info_request_events.reverse + if !event.variety.nil? and !event.variety.empty? + return event.variety + end + end + end + + def latest_status + for event in self.info_request.info_request_events.reverse + if !event.calculated_state.nil? and !event.calculated_state.empty? + return event.calculated_state + end + end + end + + def waiting_classification + self.info_request.awaiting_description == true ? "yes" : "no" + end + def request_title_collapse url_title = self.info_request.url_title # remove numeric section from the end, use this to group lots @@ -279,37 +303,7 @@ class InfoRequestEvent < ActiveRecord::Base def display_status if is_incoming_message? status = self.calculated_state - if !status.nil? - if status == 'waiting_response' - return _("Acknowledgement") - elsif status == 'waiting_clarification' - return _("Clarification required") - elsif status == 'gone_postal' - return _("Handled by post") - elsif status == 'deadline_extended' - return _("Deadline Extended") - elsif status == 'wrong_response' - return _("Wrong Response") - elsif status == 'not_held' - return _("Information not held") - elsif status == 'rejected' - return _("Refused") - elsif status == 'partially_successful' - return _("Some information sent") - elsif status == 'successful' - return _("All information sent") - elsif status == 'internal_review' - return _("Internal review acknowledgement") - elsif status == 'user_withdrawn' - return _("Withdrawn by requester") - elsif status == 'error_message' - return _("Delivery error") - elsif status == 'requires_admin' - return _("Unusual response") - end - raise "unknown status " + status - end - return "Response" + return status.nil? ? _("Response") : InfoRequest.get_status_description(status) end if is_outgoing_message? diff --git a/app/models/public_body.rb b/app/models/public_body.rb index c19433704..81149e3c2 100644 --- a/app/models/public_body.rb +++ b/app/models/public_body.rb @@ -206,7 +206,7 @@ class PublicBody < ActiveRecord::Base return self.created_at.strftime("%Y%m%d%H%M%S") end def variety - "authority" + return "authority" end # if the URL name has changed, then all requested_from: queries diff --git a/app/models/request_mailer.rb b/app/models/request_mailer.rb index 7bf70ab08..f46ce33c5 100644 --- a/app/models/request_mailer.rb +++ b/app/models/request_mailer.rb @@ -62,7 +62,7 @@ class RequestMailer < ApplicationMailer @from = contact_from_name_and_email headers 'Return-Path' => blackhole_email, 'Reply-To' => @from, # not much we can do if the user's email is broken 'Auto-Submitted' => 'auto-generated', # http://tools.ietf.org/html/rfc3834 - 'X-Auto-Response-Suppress' => 'OOF' # http://social.technet.microsoft.com/forums/en-US/exchangesvrdevelopment/thread/7e4af3fb-4ceb-4df6-9ed3-665ccdd157d2#fe60eeb3-b0ab-4443-9e54-3da490f25cbf + 'X-Auto-Response-Suppress' => 'OOF' @recipients = info_request.user.name_and_email @subject = "New response to your FOI request - " + info_request.title @body = { :incoming_message => incoming_message, :info_request => info_request, :url => url } @@ -81,7 +81,7 @@ class RequestMailer < ApplicationMailer @from = contact_from_name_and_email headers 'Return-Path' => blackhole_email, 'Reply-To' => @from, # not much we can do if the user's email is broken 'Auto-Submitted' => 'auto-generated', # http://tools.ietf.org/html/rfc3834 - 'X-Auto-Response-Suppress' => 'OOF' # http://social.technet.microsoft.com/forums/en-US/exchangesvrdevelopment/thread/7e4af3fb-4ceb-4df6-9ed3-665ccdd157d2#fe60eeb3-b0ab-4443-9e54-3da490f25cbf + 'X-Auto-Response-Suppress' => 'OOF' @recipients = user.name_and_email @subject = "Delayed response to your FOI request - " + info_request.title @body = { :info_request => info_request, :url => url } @@ -100,7 +100,7 @@ class RequestMailer < ApplicationMailer @from = contact_from_name_and_email headers 'Return-Path' => blackhole_email, 'Reply-To' => @from, # not much we can do if the user's email is broken 'Auto-Submitted' => 'auto-generated', # http://tools.ietf.org/html/rfc3834 - 'X-Auto-Response-Suppress' => 'OOF' # http://social.technet.microsoft.com/forums/en-US/exchangesvrdevelopment/thread/7e4af3fb-4ceb-4df6-9ed3-665ccdd157d2#fe60eeb3-b0ab-4443-9e54-3da490f25cbf + 'X-Auto-Response-Suppress' => 'OOF' @recipients = user.name_and_email @subject = "You're long overdue a response to your FOI request - " + info_request.title @body = { :info_request => info_request, :url => url } @@ -120,7 +120,7 @@ class RequestMailer < ApplicationMailer @from = contact_from_name_and_email headers 'Return-Path' => blackhole_email, 'Reply-To' => @from, # not much we can do if the user's email is broken 'Auto-Submitted' => 'auto-generated', # http://tools.ietf.org/html/rfc3834 - 'X-Auto-Response-Suppress' => 'OOF' # http://social.technet.microsoft.com/forums/en-US/exchangesvrdevelopment/thread/7e4af3fb-4ceb-4df6-9ed3-665ccdd157d2#fe60eeb3-b0ab-4443-9e54-3da490f25cbf + 'X-Auto-Response-Suppress' => 'OOF' @recipients = info_request.user.name_and_email @subject = "Was the response you got to your FOI request any good?" @body = { :incoming_message => incoming_message, :info_request => info_request, :url => url } @@ -131,7 +131,7 @@ class RequestMailer < ApplicationMailer @from = contact_from_name_and_email headers 'Return-Path' => blackhole_email, 'Reply-To' => @from, # not much we can do if the user's email is broken 'Auto-Submitted' => 'auto-generated', # http://tools.ietf.org/html/rfc3834 - 'X-Auto-Response-Suppress' => 'OOF' # http://social.technet.microsoft.com/forums/en-US/exchangesvrdevelopment/thread/7e4af3fb-4ceb-4df6-9ed3-665ccdd157d2#fe60eeb3-b0ab-4443-9e54-3da490f25cbf + 'X-Auto-Response-Suppress' => 'OOF' @recipients = info_request.user.name_and_email @subject = "Someone has updated the status of your request" url = main_url(request_url(info_request)) @@ -152,7 +152,7 @@ class RequestMailer < ApplicationMailer @from = contact_from_name_and_email headers 'Return-Path' => blackhole_email, 'Reply-To' => @from, # not much we can do if the user's email is broken 'Auto-Submitted' => 'auto-generated', # http://tools.ietf.org/html/rfc3834 - 'X-Auto-Response-Suppress' => 'OOF' # http://social.technet.microsoft.com/forums/en-US/exchangesvrdevelopment/thread/7e4af3fb-4ceb-4df6-9ed3-665ccdd157d2#fe60eeb3-b0ab-4443-9e54-3da490f25cbf + 'X-Auto-Response-Suppress' => 'OOF' @recipients = info_request.user.name_and_email @subject = "Clarify your FOI request - " + info_request.title @body = { :incoming_message => incoming_message, :info_request => info_request, :url => url } @@ -163,7 +163,7 @@ class RequestMailer < ApplicationMailer @from = contact_from_name_and_email headers 'Return-Path' => blackhole_email, 'Reply-To' => @from, # not much we can do if the user's email is broken 'Auto-Submitted' => 'auto-generated', # http://tools.ietf.org/html/rfc3834 - 'X-Auto-Response-Suppress' => 'OOF' # http://social.technet.microsoft.com/forums/en-US/exchangesvrdevelopment/thread/7e4af3fb-4ceb-4df6-9ed3-665ccdd157d2#fe60eeb3-b0ab-4443-9e54-3da490f25cbf + 'X-Auto-Response-Suppress' => 'OOF' @recipients = info_request.user.name_and_email @subject = "Somebody added a note to your FOI request - " + info_request.title @body = { :comment => comment, :info_request => info_request, :url => main_url(comment_url(comment)) } @@ -172,7 +172,7 @@ class RequestMailer < ApplicationMailer @from = contact_from_name_and_email headers 'Return-Path' => blackhole_email, 'Reply-To' => @from, # not much we can do if the user's email is broken 'Auto-Submitted' => 'auto-generated', # http://tools.ietf.org/html/rfc3834 - 'X-Auto-Response-Suppress' => 'OOF' # http://social.technet.microsoft.com/forums/en-US/exchangesvrdevelopment/thread/7e4af3fb-4ceb-4df6-9ed3-665ccdd157d2#fe60eeb3-b0ab-4443-9e54-3da490f25cbf + 'X-Auto-Response-Suppress' => 'OOF' @recipients = info_request.user.name_and_email @subject = "Some notes have been added to your FOI request - " + info_request.title @body = { :count => count, :info_request => info_request, :url => main_url(comment_url(earliest_unalerted_comment)) } diff --git a/app/models/track_mailer.rb b/app/models/track_mailer.rb index 4b7c603a7..f8bef4d61 100644 --- a/app/models/track_mailer.rb +++ b/app/models/track_mailer.rb @@ -85,7 +85,11 @@ class TrackMailer < ApplicationMailer # If we have anything to send, then send everything for the user in one mail if email_about_things.size > 0 # Send the email + + previous_locale = I18n.locale + I18n.locale = user.get_locale TrackMailer.deliver_event_digest(user, email_about_things) + I18n.locale = previous_locale end # Record that we've now sent those alerts to that user diff --git a/app/models/track_thing.rb b/app/models/track_thing.rb index 16a0dab87..b74f7dad5 100644 --- a/app/models/track_thing.rb +++ b/app/models/track_thing.rb @@ -22,6 +22,7 @@ # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # # $Id: track_thing.rb,v 1.53 2009-09-17 21:10:05 francis Exp $ +require 'set' class TrackThing < ActiveRecord::Base belongs_to :tracking_user, :class_name => 'User' @@ -67,6 +68,63 @@ class TrackThing < ActiveRecord::Base TrackThing.track_type_description(self.track_type) end + def track_query_description + # XXX this is very brittle... we should probably ask users + # simply to name their tracks when they make them? + self.track_query = self.track_query.gsub(/([()]|OR)/, "") + filters = self.track_query.scan /\b\S+:\S+\b/ + text = self.track_query + varieties = Set.new + date = "" + statuses = Set.new + for filter in filters + text = text.sub(filter, "") + if filter =~ /variety:user/ + varieties << _("users") + end + if filter =~ /variety:comment/ + varieties << _("comments") + end + if filter =~ /variety:authority/ + varieties << _("authorities") + end + if filter =~ /(variety:(sent|followup_sent|response)|latest_status)/ + varieties << _("requests") + end + if filter =~ /[0-9\/]+\.\.[0-9\/]+/ + date = _("between two dates") + end + if filter =~ /(rejected|not_held)/ + statuses << _("unsuccessful") + end + if filter =~ /(:successful|:partially_successful)/ + statuses << _("successful") + end + if filter =~ /waiting/ + statuses << _("awaiting a response") + end + end + if filters.empty? + text = self.track_query + end + descriptions = [] + if varieties.include? _("requests") + descriptions << _("requests which are {{list_of_statuses}}", :list_of_statuses => Array(statuses).join(_(' or '))) + varieties -= [_("requests")] + end + if descriptions.empty? and varieties.empty? + varieties << _("anything") + end + descriptions += Array(varieties) + text = text.strip + descriptions = descriptions.join(_(" or ")) + if !text.empty? + descriptions += _("{{list_of_things}} matching text '{{search_query}}'", :list_of_things => "", :search_query => text) + end + return descriptions + end + + def TrackThing.create_track_for_request(info_request) track_thing = TrackThing.new track_thing.track_type = 'request_updates' @@ -105,10 +163,25 @@ class TrackThing < ActiveRecord::Base return track_thing end - def TrackThing.create_track_for_search_query(query) + def TrackThing.create_track_for_search_query(query, variety_postfix = nil) track_thing = TrackThing.new track_thing.track_type = 'search_query' + if !(query =~ /variety:/) + case variety_postfix + when "requests" + query += " variety:sent" + when "users" + query += " variety:user" + when "authorities" + query += " variety:authority" + end + end track_thing.track_query = query + # XXX should extract requested_by:, request:, requested_from: + # and stick their values into the respective relations. + # Should also update "params" to make the list_description + # nicer and more generic. It will need to do some clever + # parsing of the query to do this nicely return track_thing end @@ -119,16 +192,16 @@ class TrackThing < ActiveRecord::Base if self.track_type == 'request_updates' @params = { # Website - :list_description => "'<a href=\"/request/" + CGI.escapeHTML(self.info_request.url_title) + "\">" + CGI.escapeHTML(self.info_request.title) + "</a>', a request", # XXX yeuch, sometimes I just want to call view helpers from the model, sorry! can't work out how + :list_description => _("'{{link_to_request}}', a request", :link_to_request => "<a href=\"/request/" + CGI.escapeHTML(self.info_request.url_title) + "\">" + CGI.escapeHTML(self.info_request.title) + "</a>"), # XXX yeuch, sometimes I just want to call view helpers from the model, sorry! can't work out how :verb_on_page => _("Track this request by email"), :verb_on_page_already => _("You are already tracking this request by email"), # Email - :title_in_email => "New updates for the request '" + self.info_request.title + "'", - :title_in_rss => "New updates for the request '" + self.info_request.title + "'", + :title_in_email => _("New updates for the request '{{request_title}}'", :request_title => self.info_request.title), + :title_in_rss => _("New updates for the request '{{request_title}}'", :request_title => self.info_request.title), # Authentication - :web => "To follow updates to the request '" + CGI.escapeHTML(self.info_request.title) + "'", - :email => "Then you will be emailed whenever the request '" + CGI.escapeHTML(self.info_request.title) + "' is updated.", - :email_subject => "Confirm you want to follow updates to the request '" + self.info_request.title + "'", + :web => _("To follow updates to the request '{{request_title}}'", :request_title => CGI.escapeHTML(self.info_request.title)), + :email => _("Then you will be emailed whenever the request '{{request_title}}' is updated.", :request_title => CGI.escapeHTML(self.info_request.title)), + :email_subject => _("Confirm you want to follow updates to the request '{{request_title}}'", :request_title => self.info_request.title), # RSS sorting :feed_sortby => 'newest' } @@ -170,7 +243,7 @@ class TrackThing < ActiveRecord::Base elsif self.track_type == 'public_body_updates' @params = { # Website - :list_description => "'<a href=\"/body/" + CGI.escapeHTML(self.public_body.url_name) + "\">" + CGI.escapeHTML(self.public_body.name) + "</a>', a public authority", # XXX yeuch, sometimes I just want to call view helpers from the model, sorry! can't work out how + :list_description => _("'{{link_to_authority}}', a public authority", :link_to_authority => "<a href=\"/body/" + CGI.escapeHTML(self.public_body.url_name) + "\">" + CGI.escapeHTML(self.public_body.name) + "</a>"), # XXX yeuch, sometimes I just want to call view helpers from the model, sorry! can't work out how :verb_on_page => _("Track requests to {{public_body_name}} by email",:public_body_name=>CGI.escapeHTML(self.public_body.name)), :verb_on_page_already => _("You are already tracking requests to {{public_body_name}} by email", :public_body_name=>CGI.escapeHTML(self.public_body.name)), # Email @@ -186,7 +259,7 @@ class TrackThing < ActiveRecord::Base elsif self.track_type == 'user_updates' @params = { # Website - :list_description => "'<a href=\"/user/" + CGI.escapeHTML(self.tracked_user.url_name) + "\">" + CGI.escapeHTML(self.tracked_user.name) + "</a>', a person", # XXX yeuch, sometimes I just want to call view helpers from the model, sorry! can't work out how + :list_description => _("'{{link_to_user}}', a person", :link_to_user => "<a href=\"/user/" + CGI.escapeHTML(self.tracked_user.url_name) + "\">" + CGI.escapeHTML(self.tracked_user.name) + "</a>"), # XXX yeuch, sometimes I just want to call view helpers from the model, sorry! can't work out how :verb_on_page => _("Track this person by email"), :verb_on_page_already => _("You are already tracking this person by email"), # Email @@ -202,16 +275,16 @@ class TrackThing < ActiveRecord::Base elsif self.track_type == 'search_query' @params = { # Website - :list_description => "'<a href=\"/search/" + CGI.escapeHTML(self.track_query) + "/newest\">" + CGI.escapeHTML(self.track_query) + "</a>' in new requests/responses", # XXX yeuch, sometimes I just want to call view helpers from the model, sorry! can't work out how - :verb_on_page => _("Track things matching '{{query}}' by email", :query=>CGI.escapeHTML(self.track_query)), - :verb_on_page_already => _("You are already tracking things matching '{{query}}' by email", :query=>CGI.escapeHTML(self.track_query)), + :list_description => "<a href=\"/search/" + CGI.escapeHTML(self.track_query) + "/newest/advanced\">" + self.track_query_description + "</a>", # XXX yeuch, sometimes I just want to call view helpers from the model, sorry! can't work out how + :verb_on_page => _("Track things matching this search by email"), + :verb_on_page_already => _("You are already tracking things matching this search by email"), # Email - :title_in_email => _("Requests or responses matching '{{query}}'", :query=>self.track_query), - :title_in_rss => _("Requests or responses matching '{{query}}'", :query=>self.track_query), + :title_in_email => _("Requests or responses matching your saved search"), + :title_in_rss => _("Requests or responses matching your saved search"), # Authentication - :web => _("To follow requests and responses matching '{{query}}'", :query=>CGI.escapeHTML(self.track_query)), - :email => _("Then you will be emailed whenever a new request or response matches '{{query}}'.", :query=>CGI.escapeHTML(self.track_query)), - :email_subject => _("Confirm you want to be emailed about new requests or responses matching '{{query}}'", :query=>self.track_query), + :web => _("To follow requests and responses matching your search"), + :email => _("Then you will be emailed whenever a new request or response matches your search."), + :email_subject => _("Confirm you want to be emailed about new requests or responses matching your search"), # RSS sorting - XXX hmmm, we don't really know which to use # here for sorting. Might be a query term (e.g. 'cctv'), in # which case newest is good, or might be something like diff --git a/app/models/user.rb b/app/models/user.rb index fddb6b035..c3c3da6f7 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -96,6 +96,15 @@ class User < ActiveRecord::Base end end end + + def get_locale + if !self.locale.nil? + locale = self.locale + else + locale = I18n.locale + end + return locale.to_s + end def visible_comments self.comments.find(:all, :conditions => 'visible') diff --git a/app/models/user_mailer.rb b/app/models/user_mailer.rb index 0972e167d..7adf5b63c 100644 --- a/app/models/user_mailer.rb +++ b/app/models/user_mailer.rb @@ -46,7 +46,5 @@ class UserMailer < ApplicationMailer @body[:old_email] = old_email @body[:new_email] = new_email end - - end diff --git a/app/views/admin_public_body/_form.rhtml b/app/views/admin_public_body/_form.rhtml index 191b29e89..6a9013071 100644 --- a/app/views/admin_public_body/_form.rhtml +++ b/app/views/admin_public_body/_form.rhtml @@ -26,20 +26,20 @@ <div id="div-locale-<%=locale.to_s%>"> <%= t.hidden_field :locale, :value => locale.to_s %> - <p><label for="public_body_name">Name</label><br/> - <%= t.text_field :name, :size => 60 %></p> + <p><label for="<%= form_tag_id(t.object_name, :name) %>">Name</label><br/> + <%= t.text_field :name, :size => 60, :id => form_tag_id(t.object_name, :name) %></p> - <p><label for="public_body_short_name">Short name <small>(only put in abbreviations which are really used, otherwise leave blank. Short or long name is used in the URL - don't worry about breaking URLs through renaming, as the history is used to redirect)</small></label><br/> - <%= t.text_field :short_name, :size => 60 %></p> + <p><label for="<%= form_tag_id(t.object_name, :short_name) %>">Short name <small>(only put in abbreviations which are really used, otherwise leave blank. Short or long name is used in the URL - don't worry about breaking URLs through renaming, as the history is used to redirect)</small></label><br/> + <%= t.text_field :short_name, :size => 60, :id => form_tag_id(t.object_name, :short_name) %></p> - <p><label for="public_body_request_email">Request email <small>(set to <strong>blank</strong> (empty string) if can't find an address; these emails are <strong>public</strong> as anyone can view with a CAPTCHA)</small></label><br/> - <%= t.text_field :request_email, :size => 40 %></p> + <p><label for="<%= form_tag_id(t.object_name, :request_email) %>">Request email <small>(set to <strong>blank</strong> (empty string) if can't find an address; these emails are <strong>public</strong> as anyone can view with a CAPTCHA)</small></label><br/> + <%= t.text_field :request_email, :size => 40, :id => form_tag_id(t.object_name, :request_email) %></p> - <p><label for="public_body_publication_scheme">Publication scheme URL</label><br/> - <%= t.text_field :publication_scheme, :size => 60 %></p> + <p><label for="<%= form_tag_id(t.object_name, :publication_scheme) %>">Publication scheme URL</label><br/> + <%= t.text_field :publication_scheme, :size => 60, :id => form_tag_id(t.object_name, :publication_scheme) %></p> - <p><label for="public_body_notes">Public notes</label> <small>(HTML, for users to consider when making FOI requests to the authority)</small><br/> - <%= t.text_area :notes, :rows => 3, :cols => 60 %></p> + <p><label for="<%= form_tag_id(t.object_name, :notes) %>">Public notes</label> <small>(HTML, for users to consider when making FOI requests to the authority)</small><br/> + <%= t.text_area :notes, :rows => 3, :cols => 60, :id => form_tag_id(t.object_name, :notes) %></p> </div> <% end diff --git a/app/views/admin_public_body/edit.rhtml b/app/views/admin_public_body/edit.rhtml index 1883eb083..b91f15a2e 100644 --- a/app/views/admin_public_body/edit.rhtml +++ b/app/views/admin_public_body/edit.rhtml @@ -1,6 +1,6 @@ <h1><%=@title%></h1> -<script> +<script type="text/javascript"> $(function() { $("#div-locales").tabs(); }); diff --git a/app/views/admin_public_body/new.rhtml b/app/views/admin_public_body/new.rhtml index 11186ee47..b859fdf6a 100644 --- a/app/views/admin_public_body/new.rhtml +++ b/app/views/admin_public_body/new.rhtml @@ -2,7 +2,7 @@ <h1><%=@title%></h1> -<script> +<script type="text/javascript"> $(function() { $("#div-locales").tabs(); }); diff --git a/app/views/general/_credits.rhtml b/app/views/general/_credits.rhtml index 8c519ce7e..b1a9ce05e 100644 --- a/app/views/general/_credits.rhtml +++ b/app/views/general/_credits.rhtml @@ -1 +1 @@ -| <%= _('Powered by <a href="http://www.alaveteli.org/">Alaveteli</a>.') %> +| <%= _('Powered by <a href="http://www.alaveteli.org/">Alaveteli</a>') %> diff --git a/app/views/general/_frontpage_intro_sentence.rhtml b/app/views/general/_frontpage_intro_sentence.rhtml index 2c3bcaf83..70b47ad06 100644 --- a/app/views/general/_frontpage_intro_sentence.rhtml +++ b/app/views/general/_frontpage_intro_sentence.rhtml @@ -1,3 +1,4 @@ -First, type in the <strong>name of the UK public authority</strong> you'd -<br>like information from. <strong>By law, they have to respond</strong> -(<a href="<%= help_about_url %>">why?</a>). +<h2> + Your <strong>Right to Know</strong> +</h2> +<p>Every citizen has the right to access information held by public authorities. <strong>By law, they have to respond</strong>. <a href="<%= help_about_url %>">Find out more about freedom of information.</a></p> diff --git a/app/views/general/_localised_datepicker.rhtml b/app/views/general/_localised_datepicker.rhtml new file mode 100644 index 000000000..5fdd63644 --- /dev/null +++ b/app/views/general/_localised_datepicker.rhtml @@ -0,0 +1,18 @@ +<script type="text/javascript"> + $(function() { + $(".use-datepicker").datepicker( + {closeText: '<%= _("Done") %>', + prevText: '<%= _("Prev") %>', + nextText: '<%= _("Next") %>', + currentText: '<%= _("Today") %>', + monthNames: <%= I18n.translate('date.month_names')[1..-1].to_json %>, + monthNamesShort: <%= I18n.translate('date.abbr_month_names')[1..-1].to_json %>, + dayNames: <%= I18n.translate('date.day_names').to_json %>, + dayNamesShort: <%= I18n.translate('date.abbr_day_names').to_json %>, + dayNamesMin: <%= I18n.translate('date.abbr_day_names').collect{|x| x[0..0]}.to_json %>, + weekHeader: '<%= _("Wk") %>', + dateFormat: '<%= I18n.translate('date.formats.default').sub("%Y", "yy").sub("%m", "mm").sub("%d", "dd").gsub("-", "/") %>'} + ); + }); +</script> + diff --git a/app/views/general/_orglink.rhtml b/app/views/general/_orglink.rhtml index 20d0d6ce4..7d74dbaac 100644 --- a/app/views/general/_orglink.rhtml +++ b/app/views/general/_orglink.rhtml @@ -1,2 +1,2 @@ <%-# Put the link to your organisation here, or leave blank -%> -<a href="http://www.alaveteli.org">an Alaveteli site</a> +<%= link_to image_tag('logo.png'), frontpage_url, :id=>'logo' %> diff --git a/app/views/general/advanced_search.rhtml b/app/views/general/advanced_search.rhtml new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/app/views/general/advanced_search.rhtml diff --git a/app/views/general/blog.rhtml b/app/views/general/blog.rhtml index c9387c24f..4ff408e52 100644 --- a/app/views/general/blog.rhtml +++ b/app/views/general/blog.rhtml @@ -1,56 +1,63 @@ <% @title = "#{site_name} blog and tweets" %> -<h1><%=@title %></h1> - <img src="/images/twitter.png" alt="twitter icon" valign="middle"> <a href="http://www.twitter.com/<%= MySociety::Config.get('TWITTER_USERNAME') %>">Follow us on twitter</a> - <img src="/images/rss.png" alt="RSS icon" valign="middle"> <a href="<%= MySociety::Config.get('BLOG_FEED') %>">Subscribe to blog</a> <% if !@twitter_user.empty? %> -<div id="twitter"> -<script src="http://widgets.twimg.com/j/2/widget.js"></script> -<script> -new TWTR.Widget({ - version: 2, - type: 'profile', - rpp: 15, - interval: 6000, - width: 'auto', - height: 500, - theme: { - shell: { - background: '#eaeaea', - color: '#000000' +<div id="right_column"> + <div class="act_link"> + <h2>Stay up to date</h2> + <img src="/images/twitter-16.png" alt="twitter icon" class="twitter-icon"> <a href="http://www.twitter.com/<%= MySociety::Config.get('TWITTER_USERNAME') %>">Follow us on twitter</a><br/><br/> + <img src="/images/feed-16.png" alt="RSS icon" valign="middle"> <a href="<%= MySociety::Config.get('BLOG_FEED') %>">Subscribe to blog</a> + </div> + <div id="twitter"> + <script src="http://widgets.twimg.com/j/2/widget.js"></script> + <script type="text/javascript"> + new TWTR.Widget({ + version: 2, + type: 'profile', + rpp: 15, + interval: 6000, + width: 'auto', + height: 500, + theme: { + shell: { + background: '#eaeaea', + color: '#000000' + }, + tweets: { + background: '#ffffff', + color: '#000000', + links: '#0b004a' + } }, - tweets: { - background: '#ffffff', - color: '#000000', - links: '#0b004a' + features: { + scrollbar: false, + loop: false, + live: false, + hashtags: true, + timestamp: true, + avatars: true, + behavior: 'all' } - }, - features: { - scrollbar: false, - loop: false, - live: false, - hashtags: true, - timestamp: true, - avatars: true, - behavior: 'all' - } -}).render().setUser('<%=@twitter_user %>').start(); -</script> - + }).render().setUser('<%=@twitter_user %>').start(); + </script> + </div> </div> <% end %> -<div id="blog"> - <% for item in @blog_items: %> - <div class="blog_post"> - <h2><a href="<%=item['link']%>"><%=h item['title'] %></a></h2> - <p class="subtitle">Posted on <%= simple_date(Time.parse(item['pubDate'][0])) %> by <%=h item['creator'] %></p> - <div><%= item['encoded'] %></div> - <p><em> - <a href="<%=item['comments'][0]%>"><%=item['comments'][1]%> comments</a> - </em> - </p> - </div> - <% end %> +<div id="left_column"> + <h1><%=@title %></h1> + + <div id="blog"> + <% for item in @blog_items: %> + <div class="blog_post"> + <h2><a href="<%=item['link']%>"><%=h item['title'] %></a></h2> + <p class="subtitle">Posted on <%= simple_date(Time.parse(item['pubDate'][0])) %> by <%=h item['creator'] %></p> + <div><%= item['encoded'] %></div> + <p><em> + <a href="<%=item['comments'][0]%>"><%=item['comments'][1]%> comments</a> + </em> + </p> + </div> + <% end %> + </div> </div> diff --git a/app/views/general/exception_caught.rhtml b/app/views/general/exception_caught.rhtml index ca36b592b..b266b53a1 100644 --- a/app/views/general/exception_caught.rhtml +++ b/app/views/general/exception_caught.rhtml @@ -1,17 +1,24 @@ -<h1><%= _("Sorry, we couldn't find that page") %></h1> +<div id="error-page"> + <% if @status == 404 %> + <h1><%= _("Sorry, we couldn't find that page") %></h1> -<p><%= _("The page either doesn't exist, or is broken. Things you can try now:")%></p> + <p><%= _("The page doesn't exist. Things you can try now:")%></p> -<ul> -<li><%= _("Check for mistakes if you typed or copied the address.")%></li> -<li><%= _("Search the site to find what you were looking for.")%> - <% form_tag({:controller => "general", :action => "search_redirect"}, {:id => "search_form"}) do %> - <%= text_field_tag 'query', params[:query], { :size => 30 } %> - <%= submit_tag _("Search") %> - <% end %> -</li> -<li><%= _('<a href="%s">Contact us</a> to tell us about the problem</li>') % [help_contact_path] %> -<li><%= _('Go to our <a href="%s">front page</a></li>') % ["/"] %> -</ul> + <ul> + <li><%= _("Check for mistakes if you typed or copied the address.")%></li> + <li><%= _("Search the site to find what you were looking for.")%> + <% form_tag({:controller => "general", :action => "search_redirect"}, {:id => "search_form"}) do %> + <%= text_field_tag 'query', params[:query], { :size => 30 } %> + <%= submit_tag _("Search") %> + <% end %> + </li> + </ul> + <% else %> + <h1><%= _("Sorry, there was a problem processing this page") %></h1> + <p><%= _('You have found a bug. Please <a href="{{contact_url}}">contact us</a> to tell us about the problem', :contact_url => help_contact_path) %></p> -<p id="error_technical_details"><%= _("<strong>Technical details:</strong>")%> <%=@exception_class ? @exception_class : _("Unknown")%></p> + <% end %> + <h2><%= _('Technical details') %></h2> + <p><strong><%=@exception_class ? @exception_class : _("Unknown")%></strong></p> + <p><strong><%=@exception_message %></strong></p> +</div> diff --git a/app/views/general/frontpage.rhtml b/app/views/general/frontpage.rhtml index 44b4980df..215288791 100644 --- a/app/views/general/frontpage.rhtml +++ b/app/views/general/frontpage.rhtml @@ -1,29 +1,43 @@ <% view_cache :ttl => 5.minutes, :tag => I18n.locale do %> - -<div id="frontpage_search"> - <h1><%= _('Make or explore Freedom of Information requests') %></h1> - - <% form_tag({:action => "search_redirect"}, {:id => "search_form"}) do %> - <p> - <%= render :partial => 'frontpage_intro_sentence' %> - <br> - - <br> - <%= text_field_tag 'query', params[:query], { :size => 30 } %> - <%= hidden_field_tag 'bodies', 1 %> - <%= submit_tag _('Search') %> - <br> - <%= render :partial => 'frontpage_search_examples' %> - <br> - <br> - <%= _('OR, <strong>search</strong> for information others have requested using {{site_name}}', :site_name => site_name) %> - </p> - <% end %> -</div> + <div id="frontpage_splash"> + <div id="left_column"> + <h1> + <%= _("Make a new<br/> + <strong>Freedom <span>of</span><br/> + Information<br/> + request</strong>") %> + </h1> + <a class="link_button_green_large" href="/select_authority"><%= _("Start now »") %></a> + </div> + <div id="right_column"> + <div id="frontpage_search_box"> + <h2> + <%= _("Search over<br/> + <strong>{{number_of_requests}} requests</strong> <span>and</span><br/> + <strong>{{number_of_authorities}} authorities</strong>", + :number_of_requests => InfoRequest.count, :number_of_authorities => PublicBody.count) %> + </h2> + <% form_tag({:action => "search_redirect"}, {:id => "search_form"}) do %> + <div> + <%= text_field_tag 'query', params[:query], { :size => 30 } %> + <%= hidden_field_tag 'bodies', 1 %> + <%= submit_tag _('Search') %> + </div> + <% end %> + </div> + <div id="frontpage_right_to_know"> + <%= render :partial => 'frontpage_intro_sentence' %> + </div> + </div> + <div style="clear:both"></div> + </div> <div id="frontpage_examples"> <% if @popular_bodies.size > 0 %> <div id="examples_0"> + <h3><%= _("Who can I request information from?") %></h3> + <%= _("{{site_name}} covers requests to {{number_of_authorities}} authorities, including:", + :site_name => site_name, :number_of_authorities => PublicBody.count) %> <ul> <% for popular_body in @popular_bodies %> <li><%=public_body_link(popular_body)%> @@ -32,23 +46,27 @@ <% end%> </ul> <p><strong> - <%= link_to _('More authorities...'), list_public_bodies_default %> + <%= link_to _('Browse all authorities...'), list_public_bodies_default %> </strong></p> </div> <% end %> - <% if @successful_request_events.size > 0 %> <div id="examples_1"> + <h3><%= _("What information has been released?") %></h3> + <%= _("{{site_name}} users have made {{number_of_requests}} requests, including:", + :site_name => site_name, :number_of_requests => InfoRequest.count) %> <ul> - <% for event in @successful_request_events %> - <li><%=link_to h(excerpt(event.info_request.title, "", 30)), request_url(event.info_request)%> - <%= _('{{length_of_time}} ago', :length_of_time => time_ago_in_words(event.described_at)) %> + <% for event in @request_events %> + <li> + <%= public_body_link(event.info_request.public_body) %> <%= _('answered a request about') %> + <%=link_to h(event.info_request.title), request_url(event.info_request)%> + <%= _('{{length_of_time}} ago', :length_of_time => time_ago_in_words(event.described_at)) %> + <p class="excerpt" onclick="document.location.href='<%=request_url(event.info_request)%>'"><%= excerpt(event.info_request.title, "", 200) %></p> </li> <% end %> </ul> <p><strong><%=link_to _('More successful requests...'), request_list_successful_url %></strong></p> </div> - <% end %> </div> diff --git a/app/views/general/search.rhtml b/app/views/general/search.rhtml index 1d934f65a..ba060d33c 100644 --- a/app/views/general/search.rhtml +++ b/app/views/general/search.rhtml @@ -1,123 +1,219 @@ <% @show_tips = @xapian_requests.nil? || (@total_hits == 0) %> +<% @include_request_link_in_authority_listing = true %> + +<%= render :partial => 'localised_datepicker' %> + <% if @query.nil? %> <% @title = _("Search Freedom of Information requests, public authorities and users") %> - <h1><%=@title%></h1> <% elsif @total_hits == 0 %> - <%= _("Nothing found for ‘{{search_terms}}’", :search_terms => h(@query)) %> + <% @title = _('There were no requests matching your query.') %> <% else %> <% @title = _("Results page {{page_number}}", :page_number => @page.to_s) %> <% end%> -<% @include_request_link_in_authority_listing = true %> +<div id="header_left"> + <% if @query.nil? %> + <h1>Search</h1> + <% else %> + <h1>Search results</h1> + <% end%> -<% if @bodies && (@page == 1 || @xapian_bodies.results.size > 0) %> - <div id="stepwise_instructions"> - <p><strong><%=_("Next, select the public authority you'd like to make the request from.") %></strong></p> - <p><% _('Can\'t find it? <a href="%s">Browse all</a> or <a href="%s">ask us to add it</a>.') % [list_public_bodies_default, "#{help_requesting_path}#missing_body"] %></p> - <p> - </div> -<% end %> + <% if @advanced %> + <div id="advanced-search"> + <p><%= _('To use the advanced search, combine phrases and labels as described in the search tips below.') %></p> + <% form_tag(advanced_search_url, :method => "get") do %> + <p> + <%= text_field_tag :query, @query, { :size => 60 } %> + <%= hidden_field_tag 'sortby', @inputted_sortby %> + <% if @bodies %> + <%= hidden_field_tag 'bodies', 1 %> + <% end %> + <%= submit_tag _("Search") %> + <%= link_to _('Simple search'), search_redirect_path %> + </p> + <% end %> + </div> + <% else %> + <% form_tag(request.url, {:method => "get", :id => "search_form"}) do %> + <p> + <%= text_field_tag 'query', params[:query], { :size => 40 } %> + <%= hidden_field_tag 'sortby', @inputted_sortby %> + <% if @bodies %> + <%= hidden_field_tag 'bodies', 1 %> + <% end %> + <%= submit_tag _("Search") %> + <%= link_to(_("Advanced search"), advanced_search_url) %> -<% form_tag({:action => "search_redirect"}, {:id => "search_form"}) do %> - <p> - <%= text_field_tag 'query', @query, { :size => 40 } %> - <%= hidden_field_tag 'sortby', @inputted_sortby %> - <% if @bodies %> - <%= hidden_field_tag 'bodies', 1 %> - <% end %> - <%= submit_tag _("Search") %> - <% if not @show_tips %> - <%= link_to _('Advanced search tips'), search_redirect_path %> + + </p> +<div id="common-subfilters"> + <div id="variety-filter"> + <h3 class="title"><%= _("Showing") %></h3> + <% labels = [ + ["requests", _("requests")], + ["users", _("users")], + ["bodies", _("authorities")], + ["all", _("everything")]]%> + <% for variety, label in labels %> + <% if @variety_postfix != variety %> + <% if variety != "users" %> + <%= link_to label, search_url([params[:query], @common_query], variety, @sort_postfix), :method => :get %> + <% else %> + <%= link_to label, search_url(params[:query], variety, @sort_postfix), :method => :get %> + <% end %> + <% else %> + <%= label %> <% end %> - </p> + <%= "|" unless variety == labels.last[0]%> + <% end %> + </div> + +<% if false %> +<%-# Commented out for now as tags are of limited use when users can't see them. This will change in the future! -%> +<% if @variety_postfix != "users" %> + <div> + <%= label_tag(:query, _("Tags (separated by a space):")) %><%= text_field_tag(:tags, params[:tags], { :size => 20 }) %> + <% for tag in InfoRequest.get_tags %> + <%= tag.name_and_value %> + <% end %> + </div> +<% end %> <% end %> +</div> -<% if !@query.nil? %> - <p> - <%=link_to_unless @sortby == 'relevant', _("Show most relevant results first"), search_url(@query, 'relevant') %> - | - <%=link_to_unless @sortby == 'newest', _("Newest results first"), search_url(@query, 'newest') %> - <% if @sortby == 'described' %> - | <%= _('Recently described results first') %> +<% if @variety_postfix == "requests" %> +<div id="requests-subfilters"> + <div> + <h3 class="title"><%= _("Restrict to") %></h3> + <% [["successful", _("successful requests")], + ["unsuccessful", _("unsuccessful requests")], + ["awaiting", _("unresolved requests")], + ["internal_review", _("internal reviews")]].each_with_index do |item, index| + status, title = item %> + + <%= check_box_tag "latest_status[]", status, params[:latest_status].nil? ? false : params[:latest_status].include?(status), :id => "latest_status_#{index}" %> + <%= label_tag("latest_status_#{index}", title) %> <br/> <% end %> - </p> + </div> + <div> + <h3 class="title"><%= _("Search in") %></h3> + <% [["sent", _("messages from users")], + ["response", _("messages from authorities")], + ["comment", _("comments")]].each_with_index do |item, index| + variety, title = item %> + + <%= check_box_tag "request_variety[]", variety, params[:request_variety].nil? ? true : params[:request_variety].include?(variety), :id => "request_variety_#{index}" %> + <%= label_tag("request_variety_#{index}", title) %> <br/> + <% end %> + </div> + <div id="date_range"> + <label class="form_label title" for="query">Made between</label> + <%= text_field_tag(:request_date_after, params[:request_date_after], {:class => "use-datepicker", :size => 10}) %> + <label class="form_label" for="query"> and</label> + <%= text_field_tag(:request_date_before, params[:request_date_before], {:class => "use-datepicker", :size => 10}) %> + </div> +</div> +<% end %> +<div> + <%= submit_tag("Filter") if @variety_postfix == "requests"%> +</div> + <% end %> <% end %> -<% if @bodies && !@query.nil? && @xapian_bodies.results.size == 0 && @page == 1 %> - <h1><%= _('No public authorities found') %></h1> - <% if @spelling_correction %> - <p id="did_you_mean"><%= _('Did you mean: {{correction}}', - :correction => search_link(@spelling_correction, @postfix)) %></p> - <% end %> - <p><%= _('<a href="%s">Browse all</a> or <a href="%s">ask us to add one</a>.') % [list_public_bodies_default, help_requesting_path + '#missing_body'] %></p> + + + <% if !@query.nil? %> + <p id="search_controls"> + <%=link_to_unless @sortby == 'relevant', _("Show most relevant results first"), search_url(@query, @variety_postfix, 'relevant') %> + | + <%=link_to_unless @sortby == 'newest', _("Newest results first"), search_url(@query, @variety_postfix, 'newest') %> + <% if @sortby == 'described' %> + | <%= _('Recently described results first') %> + <% end %> + </p> + <% end %> +</div> + +<% if @track_thing && (@xapian_bodies_hits > 0 || @xapian_users_hits > 0 || @total_hits == 0)%> + <div id="header_right"> + <h2>Track this search</h2> + <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'main' } %> + </div> <% end %> +<div style="clear:both;"></div> + <% if @total_hits == 0 %> - <h1><%=@title %></h1> + <h2><%=@title %></h2> <% end %> <% if not @query.nil? %> - <% if @spelling_correction %> - <p id="did_you_mean"><%= _('Did you mean: {{correction}}', :correction => search_link(@spelling_correction, @postfix)) %></p> - <% end %> - - <% if (!@bodies || @xapian_requests.results.size == 0) && @track_thing && (@xapian_bodies.results.size > 0 || @xapian_users.results.size > 0 || @total_hits == 0)%> - <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'main' } %> - <% end %> + <div class="results_section"> + <% if @xapian_bodies_hits > 0 %> + <% if @xapian_bodies_hits == 1 && @page == 1 %> + <h2 class="publicbody_results"><%= _('One public authority found') %></h2> + <% else %> + <h2 class="publicbody_results"><%= _('Public authorities {{start_count}} to {{end_count}} of {{total_count}}', :start_count => ((@page-1)*@bodies_per_page+1).to_s, :end_count => [@page*@bodies_per_page, @xapian_bodies.matches_estimated].min.to_s, :total_count => @xapian_bodies.matches_estimated.to_s) %></h2> + <% end %> - <% if @xapian_bodies.results.size > 0 %> - <% if @xapian_bodies.results.size == 1 && @page == 1 %> - <h1><%= _('One public authority matching ‘{{user_search_query}}’', :user_search_query => h(@query)) %></h1> - <% else %> - <h1><%= _('Public authorities {{start_count}} to {{end_count}} of {{total_count}} for {{user_search_query}}', :start_count => ((@page-1)*@bodies_per_page+1).to_s, :end_count => [@page*@bodies_per_page, @xapian_bodies.matches_estimated].min.to_s, :total_count => @xapian_bodies.matches_estimated.to_s, :user_search_query => h(@query)) %></h1> - <% end %> + <div class="results_block"> + <% for result in @xapian_bodies.results %> + <%= render :partial => 'public_body/body_listing_single', :locals => { :public_body => result[:model] } %> + <% end %> + </div> - <% for result in @xapian_bodies.results %> - <%= render :partial => 'public_body/body_listing_single', :locals => { :public_body => result[:model] } %> - <% end %> - - <%= will_paginate WillPaginate::Collection.new(@page, @bodies_per_page, @xapian_bodies.matches_estimated) %> - <% end %> - - <% if @xapian_users.results.size > 0 %> - <% if @xapian_users.results.size == 1 && @page == 1 %> - <h1><%= _("One person matching ‘{{user_search_query}}’", :user_search_query => h(@query)) %></h1> - <% else %> - <h1><%= _("People {{start_count}} to {{end_count}} of {{total_count}} for ‘{{user_search_query}}’", :start_count => ((@page-1)*@users_per_page+1).to_s, :end_count => [@page*@users_per_page, @xapian_users.matches_estimated].min.to_s, :total_count => @xapian_users.matches_estimated.to_s, :user_search_query => h(@query)) %></h1> + <%= will_paginate WillPaginate::Collection.new(@page, @bodies_per_page, @xapian_bodies.matches_estimated) %> + <% elsif @bodies && !@query.nil? && @xapian_bodies.results.size == 0 && @page == 1 %> + <h2 class="publicbody_results"><%= _('No public authorities found') %></h2> + <% if @spelling_correction %> + <p id="did_you_mean"><%= _('Did you mean: {{correction}}', :correction => search_link(@spelling_correction, @postfix)) %></p> <% end %> + <p><%= _('<a href="%s">Browse all</a> or <a href="%s">ask us to add one</a>.') % [list_public_bodies_default, help_requesting_path + '#missing_body'] %></p> + <% end %> + </div> - <% for result in @xapian_users.results %> - <%= render :partial => 'user/user_listing_single', :locals => { :display_user => result[:model] } %> - <% end %> + <div class="results_section"> + <% if @xapian_users_hits > 0 %> + <% if @xapian_users_hits == 1 && @page == 1 %> + <h2 class="person_results"><%= _("One person found") %></h2> + <% else %> + <h2 class="person_results"><%= _("People {{start_count}} to {{end_count}} of {{total_count}}", :start_count => ((@page-1)*@users_per_page+1).to_s, :end_count => [@page*@users_per_page, @xapian_users.matches_estimated].min.to_s, :total_count => @xapian_users.matches_estimated.to_s) %></h2> + <% end %> - <%= will_paginate WillPaginate::Collection.new(@page, @users_per_page, @xapian_users.matches_estimated) %> - <% end %> + <div class="results_block"> + <% for result in @xapian_users.results %> + <%= render :partial => 'user/user_listing_single', :locals => { :display_user => result[:model] } %> + <% end %> + </div> - <% if @xapian_requests.results.size > 0 %> - <% if @xapian_requests.results.size == 1 && @page == 1 %> - <h1><%= _("One FOI request matching ‘{{user_search_query}}’", :user_search_query => h(@query)) %></h1> - <% else %> - <h1><%= _("FOI requests {{start_count}} to {{end_count}} of {{total_count}} for ‘{{user_search_query}}’", :start_count => ((@page-1)*@requests_per_page+1).to_s, :end_count => [@page*@requests_per_page, @xapian_requests.matches_estimated].min.to_s, :total_count => @xapian_requests.matches_estimated.to_s, :user_search_query => h(@query)) %></h1> - <% end %> + <%= will_paginate WillPaginate::Collection.new(@page, @users_per_page, @xapian_users.matches_estimated) %> + <% end %> + </div> - <% if @track_thing %> - <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'main' } %> - <% end %> + <div class="results_section"> + <% if @xapian_requests_hits > 0 %> + <% if @xapian_requests_hits == 1 && @page == 1 %> + <h2 class="foi_results"><%= _("One FOI request found") %></h2> + <% else %> + <h2 class="foi_results"><%= _("FOI requests {{start_count}} to {{end_count}} of {{total_count}}", :start_count => ((@page-1)*@requests_per_page+1).to_s, :end_count => [@page*@requests_per_page, @xapian_requests.matches_estimated].min.to_s, :total_count => @xapian_requests.matches_estimated.to_s) %></h2> + <% end %> - <% for result in @xapian_requests.results %> - <%= render :partial => 'request/request_listing_via_event', :locals => { :event => result[:model], :info_request => result[:model].info_request } %> - <% end %> + <div class="results_block"> + <% for result in @xapian_requests.results %> + <%= render :partial => 'request/request_listing_via_event', :locals => { :event => result[:model], :info_request => result[:model].info_request } %> + <% end %> + </div> - <%= will_paginate WillPaginate::Collection.new(@page, @requests_per_page, @xapian_requests.matches_estimated) %> - <% if @track_thing %> - <p></p> - <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'main' } %> - <% end %> - <% end %> + <%= will_paginate WillPaginate::Collection.new(@page, @requests_per_page, @xapian_requests.matches_estimated) %> + <% end %> + </div> <% end %> -<% if @show_tips %> +<% if @advanced %> + +<div id="advanced-search-tips"> + <a name="show-tips"></a> <h2><%= _("Advanced search tips")%></h2> <ul> <li><%= _("Enter words that you want to find separated by spaces, e.g. <strong>climbing lane</strong>") %></li> @@ -139,28 +235,30 @@ <h2 id="statuses"><%= _('Table of statuses') %></h2> <table class="status_table"> - <tr><td><strong><%=search_link('status:waiting_response')%></strong></td><td><%= _('Waiting for the public authority to reply') %></td></tr> - <tr><td><strong><%=search_link('status:not_held')%></strong></td><td><%= _('The public authority does not have the information requested') %></td></tr> - <tr><td><strong><%=search_link('status:rejected')%></strong></td><td><%= _('The request was refused by the public authority') %></td></tr> - <tr><td><strong><%=search_link('status:partially_successful')%></strong></td><td><%= _('Some of the information requested has been received') %></td></tr> - <tr><td><strong><%=search_link('status:successful')%></strong></td><td><%= _('All of the information requested has been received') %></td></tr> - <tr><td><strong><%=search_link('status:waiting_clarification')%></strong></td><td><%= _('The public authority would like part of the request explained') %></td></tr> - <tr><td><strong><%=search_link('status:gone_postal')%></strong></td><td><%= _('The public authority would like to / has responded by post') %></td></tr> - <tr><td><strong><%=search_link('status:internal_review')%></strong></td><td><%= _('Waiting for the public authority to complete an internal review of their handling of the request') %></td></tr> - <tr><td><strong><%=search_link('status:error_message')%></strong></td><td><%= _('Received an error message, such as delivery failure.') %></td></tr> - <tr><td><strong><%=search_link('status:requires_admin')%></strong></td><td><%= _('A strange reponse, required attention by the {{site_name}} team', :site_name=>site_name) %></td></tr> - <tr><td><strong><%=search_link('status:user_withdrawn')%></strong></td><td><%= _('The requester has abandoned this request for some reason') %></td></tr> + <tr><td><strong><%=search_link('status:waiting_response', nil, nil, true)%></strong></td><td><%= _('Waiting for the public authority to reply') %></td></tr> + <tr><td><strong><%=search_link('status:not_held', nil, nil, true)%></strong></td><td><%= _('The public authority does not have the information requested') %></td></tr> + <tr><td><strong><%=search_link('status:rejected', nil, nil, true)%></strong></td><td><%= _('The request was refused by the public authority') %></td></tr> + <tr><td><strong><%=search_link('status:partially_successful', nil, nil, true)%></strong></td><td><%= _('Some of the information requested has been received') %></td></tr> + <tr><td><strong><%=search_link('status:successful', nil, nil, true)%></strong></td><td><%= _('All of the information requested has been received') %></td></tr> + <tr><td><strong><%=search_link('status:waiting_clarification', nil, nil, true)%></strong></td><td><%= _('The public authority would like part of the request explained') %></td></tr> + <tr><td><strong><%=search_link('status:gone_postal', nil, nil, true)%></strong></td><td><%= _('The public authority would like to / has responded by post') %></td></tr> + <tr><td><strong><%=search_link('status:internal_review', nil, nil, true)%></strong></td><td><%= _('Waiting for the public authority to complete an internal review of their handling of the request') %></td></tr> + <tr><td><strong><%=search_link('status:error_message', nil, nil, true)%></strong></td><td><%= _('Received an error message, such as delivery failure.') %></td></tr> + <tr><td><strong><%=search_link('status:requires_admin', nil, nil, true)%></strong></td><td><%= _('A strange reponse, required attention by the {{site_name}} team', :site_name=>site_name) %></td></tr> + <tr><td><strong><%=search_link('status:user_withdrawn', nil, nil, true)%></strong></td><td><%= _('The requester has abandoned this request for some reason') %></td></tr> </table> <h2 id="varieties"><%= _('Table of varieties') %></h2> <table class="status_table"> - <tr><td><strong><%=search_link('variety:sent')%></strong></td><td><%= _('Original request sent') %></td></tr> - <tr><td><strong><%=search_link('variety:followup_sent')%></strong></td><td><%= _('Follow up message sent by requester') %></td></tr> - <tr><td><strong><%=search_link('variety:response')%></strong></td><td><%= _('Response from a public authority') %></td></tr> - <tr><td><strong><%=search_link('variety:comment')%></strong></td><td><%= _('Annotation added to request') %></td></tr> - <tr><td><strong><%=search_link('variety:authority')%></strong></td><td><%= _('A public authority') %></td></tr> - <tr><td><strong><%=search_link('variety:user')%></strong></td><td><%= _('A {{site_name}} user', :site_name=>site_name) %></td></tr> + <tr><td><strong><%=search_link('variety:sent', nil, nil, true)%></strong></td><td><%= _('Original request sent') %></td></tr> + <tr><td><strong><%=search_link('variety:followup_sent', nil, nil, true)%></strong></td><td><%= _('Follow up message sent by requester') %></td></tr> + <tr><td><strong><%=search_link('variety:response', nil, nil, true)%></strong></td><td><%= _('Response from a public authority') %></td></tr> + <tr><td><strong><%=search_link('variety:comment', nil, nil, true)%></strong></td><td><%= _('Annotation added to request') %></td></tr> + <tr><td><strong><%=search_link('variety:authority', nil, nil, true)%></strong></td><td><%= _('A public authority') %></td></tr> + <tr><td><strong><%=search_link('variety:user', nil, nil, true)%></strong></td><td><%= _('A {{site_name}} user', :site_name=>site_name) %></td></tr> </table> +</div> + <% end %> diff --git a/app/views/help/_sidebar.rhtml b/app/views/help/_sidebar.rhtml index 99298e9c6..db69f283b 100644 --- a/app/views/help/_sidebar.rhtml +++ b/app/views/help/_sidebar.rhtml @@ -1,16 +1,17 @@ -<div id="about_sidebar"> - <h1>Help pages</h1> - <ul> +<div id="right_column"> + <h2>Help pages</h2> + <ul class="no_bullets"> <li><%= link_to_unless_current "Introduction", "/help/about" %></li> <li><%= link_to_unless_current "Making requests", "/help/requesting" %></li> <li><%= link_to_unless_current "Your privacy", "/help/privacy" %></li> <li><%= link_to_unless_current "FOI officers", "/help/officers" %></li> + <li><%= link_to_unless_current "About the software", "/help/alaveteli" %></li> <li><%= link_to_unless_current "Credits", "/help/credits" %></li> <li><%= link_to_unless_current "Programmers API", "/help/api" %></li> <li><%= link_to_unless_current "Advanced search", "/search" %></li> </ul> - <h1 id="contact">Contact us</h1> + <h2 id="contact">Contact us</h2> <p>If your question isn't answered here, or you just wanted to let us know something about the site, <a href="/help/contact">contact us</a>. </p> diff --git a/app/views/help/about.rhtml b/app/views/help/about.rhtml index d22cc5b30..648ca1fb2 100644 --- a/app/views/help/about.rhtml +++ b/app/views/help/about.rhtml @@ -2,50 +2,52 @@ <%= render :partial => 'sidebar' %> -<h1 id="introduction">Introduction to <%= site_name %><a href="#introduction">#</a> </h1> -<dl> - -<dt id="purpose">What is <%= site_name %> for? <a href="#purpose">#</a> </dt> -<dd>To help you find out inside information about what the UK government -is doing. -</dd> - -<dt id="premise">How does the site work? <a href="#premise">#</a> </dt> -<dd>You choose the public authority that you would like information from, then -write a brief note describing what you want to know. We then send your request -to the public authority. Any response they make is automatically published on the -website for you and anyone else to find and read. -</dd> - -<dt id="whybother_me">Why would I bother to do this? <a href="#whybother_me">#</a> </dt> -<dd>You pay taxes, and then government does things with the money. All sorts of -things that affect your life, from healthcare through to national defence. Some -it does badly, some it does well. The more we find out about how government -works, the better able we are to make suggestions to improve the things that -are done badly, and to celebrate the things that are done well. -</dd> - -<dt id="whybother_them">Why would the public authority bother to reply? <a href="#whybother_them">#</a> </dt> -<dd>Under Freedom of Information (FOI) law, they have to respond. The response -will either contain the information you want, or give a valid legal reason why -it must be kept confidential. -</dd> - -<dt id="who">Who makes <%= site_name %>? <a href="#who">#</a> </dt> -<dd><%= site_name %> is created and run by <a href="http://www.mysociety.org">mySociety</a>, -and was initially <a href="http://www.mysociety.org/2006/12/06/funding-for-freedom-of-information/">funded by the JRSST Charitable Trust</a>. mySociety is a project of the -registered charity <a href="http://www.ukcod.org.uk/UK_Citizens_Online_Democracy">UK Citizens Online Democracy</a>. -If you like what we're doing, then you can -<a href="https://secure.mysociety.org/donate/">make a donation</a>. -</dd> - -<dt id="updates">How can I keep up with news about <%= site_name %>?<a href="#updates">#</a> </dt> -<dd>We have a <a href="/blog">blog</a> and a <a href="http://www.twitter.com/whatdotheyknow">twitter feed</a>. -</dd> - - -</dl> - -<p><strong>Next</strong>, read about <a href="/help/requesting">making requests</a> --> - -<div id="hash_link_padding"></div> +<div id="left_column"> + <h1 id="introduction">Introduction</h1> + <dl> + + <dt id="purpose">What is WhatDoTheyKnow for? <a href="#purpose">#</a> </dt> + <dd>To help you find out inside information about what the UK government + is doing. + </dd> + + <dt id="premise">How does the site work? <a href="#premise">#</a> </dt> + <dd>You choose the public authority that you would like information from, then + write a brief note describing what you want to know. We then send your request + to the public authority. Any response they make is automatically published on the + website for you and anyone else to find and read. + </dd> + + <dt id="whybother_me">Why would I bother to do this? <a href="#whybother_me">#</a> </dt> + <dd>You pay taxes, and then government does things with the money. All sorts of + things that affect your life, from healthcare through to national defence. Some + it does badly, some it does well. The more we find out about how government + works, the better able we are to make suggestions to improve the things that + are done badly, and to celebrate the things that are done well. + </dd> + + <dt id="whybother_them">Why would the public authority bother to reply? <a href="#whybother_them">#</a> </dt> + <dd>Under Freedom of Information (FOI) law, they have to respond. The response + will either contain the information you want, or give a valid legal reason why + it must be kept confidential. + </dd> + + <dt id="who">Who makes WhatDoTheyKnow? <a href="#who">#</a> </dt> + <dd>WhatDoTheyKnow is created and run by <a href="http://www.mysociety.org">mySociety</a>, + and was initially <a href="http://www.mysociety.org/2006/12/06/funding-for-freedom-of-information/">funded by the JRSST Charitable Trust</a>. mySociety is a project of the + registered charity <a href="http://www.ukcod.org.uk/UK_Citizens_Online_Democracy">UK Citizens Online Democracy</a>. + If you like what we're doing, then you can + <a href="https://secure.mysociety.org/donate/">make a donation</a>. + </dd> + + <dt id="updates">How can I keep up with news about WhatDoTheyKnow?<a href="#updates">#</a> </dt> + <dd>We have a <a href="/blog">blog</a> and a <a href="http://www.twitter.com/whatdotheyknow">twitter feed</a>. + </dd> + + + </dl> + + <p><strong>Next</strong>, read about <a href="/help/requesting">making requests</a> --> + + <div id="hash_link_padding"></div> +</div> diff --git a/app/views/help/alaveteli.rhtml b/app/views/help/alaveteli.rhtml new file mode 100644 index 000000000..f7accdd11 --- /dev/null +++ b/app/views/help/alaveteli.rhtml @@ -0,0 +1,30 @@ +<% @title = "Making requests" %> + +<%= render :partial => 'sidebar' %> +<div id="left_column"> + <% if params[:country_name] %> + <h1><%= _("Would you like to see a website like this in your country?") %></h1> + <% else %> + <h1>Powered by Alaveteli</h1> + <% end %> + <p>This website is powered by Alaveteli. Alaveteli is free software + for making Freedom of Information requests. It can easily be + translated into any language, and customised for variations of FOI + law.</p> + + <p>The development of Alaveteli is sponsored and supported by a + number of foundataions and charities who are interested in + transparency across the world.</p> + + <p>If you would like to set up an Alaveteli website in your own + country, we can help. You will need a few days to get the site + configured and ready to use, and will then have to spend at least an + hour a week moderating and managing the site (more for busy + websites).</p> + + <p>Read more on the <a href="http://alaveteli.org">Alaveteli + website</a>, or <a href="mailto:hello@alaveteli.org">drop us an + email</a>.</p> + + <div id="hash_link_padding"></div> +</div> diff --git a/app/views/help/api.rhtml b/app/views/help/api.rhtml index 3cafbb665..297aa1e8b 100644 --- a/app/views/help/api.rhtml +++ b/app/views/help/api.rhtml @@ -1,82 +1,81 @@ -<% @title = "Application Programming Interface - API" %> +<% @title = "About our API" %> <%= render :partial => 'sidebar' %> -<h1><%=@title %></h1> - -<h2> Introduction </h2> - -<p>This page explains how programmers can make other websites and software -interact with <%= site_name %> via an "API". -</p> - -<p><%= site_name %> does not have a full API yet, but we are gradually adding -lots of things that are similar in use to an API as they are requested. -</p> - -<hr> - -<h2> 1. Linking to new requests </h2> - -<p>To encourage your users to make links to a particular public authority, use URLs of the form -<%= link_to new_request_to_body_url(:url_name => "liverpool_city_council") , new_request_to_body_url(:url_name => "liverpool_city_council") %>. -These are the parameters you can add to those URLs, either in the URL or from a form. - -<ul> - <li> <strong>title</strong> - default summary of the new request.</li> - <li> <strong>default_letter</strong> - default text of the body of the letter. The salutation (Dear...) and signoff (Yours...) are wrapped round this. </li> - <li> <strong>body</strong> - as an alternative to default_letter, this sets the default entire text of the request, so you can customise the salutation and signoff. </li> - <li> <strong>tags</strong> - space separated list of tags, so you can find and link up any requests made later, e.g. <em>openlylocal spending_id:12345</em>. The : indicates it is a machine tag. The values of machine tags may also include colons, useful for URIs. -</ul> - -<hr> - -<h2> 2. RSS (actually, Atom) feeds </h2> - -<p>There are Atom feeds on most pages which list FOI requests, which you can -use to get updates and links in XML format. Find the URL of the Atom feed in -one of these ways: -<ul> - <li>Look for the <img src="/images/feed-16.png" alt=""> RSS feed links.</li> - <li>Examine the <tt><link rel="alternate" type="application/atom+xml"></tt> tag in the head of the HTML. </li> - <li>Add <tt>/feed</tt> to the start of another URL. -</ul> - -<p>In particular, even complicated search queries have Atom feeds. -You can do all sorts of things with them, such as query by authority, by file -type, by date range, or by status. See the <a href="/search">advanced search -tips</a> for details. - -<hr> - -<h2> 3. JSON structured data </h2> - -<p>Quite a few pages have JSON versions, which let you download information about -objects in a structured form. Find them by: -<ul> - <li>Adding <tt>.json</tt> to the end of the URL. </li> - <li>Look for the <tt><link rel="alternate" type="application/json"></tt> tag in the head of the HTML. </li> -</ul> -</p> - -<p>Requests, users and authorities all have JSON versions containing basic -information about them. Every Atom feed has a JSON equivalent, containing -information about the list of events in the feed. -</p> - -<hr> -<h2> 4. Spreadsheet of all authorities </h2> - -<p> -A spreadsheet file listing every body in <%= site_name %> is available: -<%= link_to "all-authorities.csv", all_public_bodies_csv_url() %> -</p> - -<hr> - -<p>Please <a href="/help/contact">contact us</a> if you need an API feature that isn't there yet. It's -very much a work in progress, and we do add things when people ask us to.</p> - -<div id="hash_link_padding"></div> - +<div id="left_column"> + <h1><%=@title %></h1> + <dl> + <dt>Introduction</dt> + <dd> + <p>This page explains how programmers can make other websites and software + interact with WhatDoTheyKnow via an "API". + </p> + + <p>WhatDoTheyKnow does not have a full API yet, but we are gradually adding + lots of things that are similar in use to an API as they are requested. + </p> + </dd> + + <dt>Linking to new requests</dt> + <dd> + <p>To encourage your users to make links to a particular public authority, use URLs of the form + <%= link_to new_request_to_body_url(:url_name => "liverpool_city_council") , new_request_to_body_url(:url_name => "liverpool_city_council") %>. + These are the parameters you can add to those URLs, either in the URL or from a form. + + <ul> + <li> <strong>title</strong> - default summary of the new request.</li> + <li> <strong>default_letter</strong> - default text of the body of the letter. The salutation (Dear...) and signoff (Yours...) are wrapped round this. </li> + <li> <strong>body</strong> - as an alternative to default_letter, this sets the default entire text of the request, so you can customise the salutation and signoff. </li> + <li> <strong>tags</strong> - space separated list of tags, so you can find and link up any requests made later, e.g. <em>openlylocal spending_id:12345</em>. The : indicates it is a machine tag. The values of machine tags may also include colons, useful for URIs. + </ul> + </dd> + + <dt>RSS (actually, Atom) feeds</h2> + <dd> + <p>There are Atom feeds on most pages which list FOI requests, which you can + use to get updates and links in XML format. Find the URL of the Atom feed in + one of these ways: + <ul> + <li>Look for the <img src="/images/feed-16.png" alt=""> RSS feed links.</li> + <li>Examine the <tt><link rel="alternate" type="application/atom+xml"></tt> tag in the head of the HTML. </li> + <li>Add <tt>/feed</tt> to the start of another URL. + </ul> + + <p>In particular, even complicated search queries have Atom feeds. + You can do all sorts of things with them, such as query by authority, by file + type, by date range, or by status. See the <a href="/search">advanced search + tips</a> for details. + </dd> + + <dt>JSON structured data</dt> + <dd> + <p>Quite a few pages have JSON versions, which let you download information about + objects in a structured form. Find them by: + <ul> + <li>Adding <tt>.json</tt> to the end of the URL. </li> + <li>Look for the <tt><link rel="alternate" type="application/json"></tt> tag in the head of the HTML. </li> + </ul> + </p> + + <p>Requests, users and authorities all have JSON versions containing basic + information about them. Every Atom feed has a JSON equivalent, containing + information about the list of events in the feed. + </p> + </dd> + + <dt>Spreadsheet of all authorities</dt> + <dd> + <p> + A spreadsheet file listing every body in WhatDoTheyKnow is available: + <%= link_to "all-authorities.csv", all_public_bodies_csv_url() %> + </p> + + </dd> + </dl> + + <p>Please <a href="/help/contact">contact us</a> if you need an API feature that isn't there yet. It's + very much a work in progress, and we do add things when people ask us to.</p> + + <div id="hash_link_padding"></div> +</div> diff --git a/app/views/help/contact.rhtml b/app/views/help/contact.rhtml index 6c65fb1c9..dd49f7951 100644 --- a/app/views/help/contact.rhtml +++ b/app/views/help/contact.rhtml @@ -2,10 +2,12 @@ <%= foi_error_messages_for :contact %> +<h1><%= @title %></h1> + <div id="contact_preamble"> <% if !flash[:notice] %> - <h1>Contact an authority to get official information</h1> + <h2>Contact an authority to get official information</h2> <ul> <li><a href="/new">Go here</a> to make a request, in public, for information from UK public authorities.</li> @@ -17,7 +19,7 @@ </li> </ul> - <h1>Take up an issue with Government</h1> + <h2>Take up an issue with Government</h2> <ul> <li><a href="http://www.writetothem.com">Write to your MP, @@ -28,7 +30,7 @@ <% end %> - <h1>Contact the <%= site_name %> team</h1> + <h2>Contact the WhatDoTheyKnow team</h2> <% if !flash[:notice] %> <ul> <li> diff --git a/app/views/help/credits.rhtml b/app/views/help/credits.rhtml index 02cd55c90..fd753336b 100644 --- a/app/views/help/credits.rhtml +++ b/app/views/help/credits.rhtml @@ -1,90 +1,91 @@ -<% @title = "Credit where credit is due" %> +<% @title = "Credit where credit's due" %> <%= render :partial => 'sidebar' %> -<h1 id="credits"><%= @title%> <a href="#credits">#</a> </h1> +<div id="left_column"> + <h1 id="credits"><%= @title%></h1> -<dl> - -<dt id="thanks">Which people made <%= site_name %>? <a href="#thanks">#</a> </dt> -<dd>Oh, nearly everyone (and <a href="http://www.mysociety.org/helpus">maybe you too</a>)! -<ul> -<li> - <a href="http://www.yrtk.org">Heather Brooke</a> - (<a href="http://www.guardian.co.uk/politics/2008/mar/29/houseofcommons.michaelmartin?gusrc=rss&feed=worldnews">vampy!</a>) has - been pushing the idea of a UK FOI archive for years now. -</li> -<li> - Both Phil Rodgers and <a href="http://www.flourish.org/blog/">Francis Irving</a> - entered it in a mySociety competition for ideas for public interest websites to build. -</li> -<li> - <a href="http://www.mysociety.org/2006/09/27/the-mysociety-call-for-proposals-the-winner-and-runners-up/">It won</a>, - and then Chris Lightfoot (<a href="http://mk.ucant.org/archives/000129.html">RIP :(</a>) - thought up the wheeze of intercepting email responses to requests and - automatically publishing them. -</li> -<li> - Tom Steinberg got the cash to pay for the site from - <a href="http://www.jrrt.org.uk/">a dead chocolate mogul</a> (<em>thank you!</em>) ... -</li> -<li> - ... so that Francis Irving, Angie Ahl, Tommy Martin, Louise Crow, Matthew Somerville - and Tom Steinberg could do the complex mixture of design and coding to build - what you see today. -</li> -<li> - Thanks particularly to Julian Todd (<a href="http://www.freesteel.co.uk/wpblog/">great blog!</a>), - Francis Davey, and Etienne Pollard for using the site early on and giving - feedback (and/or legal advice!), and also to all our other users and - testers. -</li> -<li> - The amazing team of volunteers who run the site, answer your support - emails, maintain the database of public authorities and - <a href="http://www.mysociety.org/2009/10/13/behind-whatdotheyknow/">so much more</a>. - Thanks to John Cross, Ben Harris, Adam McGreggor, Alex Skene, - Richard Taylor. -</li> -<li> - Volunteers who have provided patches to the code - thanks Peter Collingbourne - and Tony Bowden. -</li> -<li> - Everyone who has helped look up FOI email addresses. -</li> -<li> - We couldn't do any of this without those - <a href="http://www.ukcod.org.uk/UKCOD_Trustees">crazy people</a> who volunteer, - amongst many other things, to do the accounts and fill in our VAT return. -</li> -<li> - Finally, all the officers and servants who have answered the many requests - made through the site. Their diligence, patience and professionalism is - what has actually made the information that you see here. Thank them for - helping make Government more transparent. -</li> -</ul> -You're all stars. -</dd> - -<dt id="helpus">Can I help out? <a href="#helpus">#</a> </dt> -<dd> - <p>Yes please! We're built out of our supporters and volunteers.</p> + <dl> + <dt id="thanks">Who made WhatDoTheyKnow? <a href="#thanks">#</a> </dt> + <dd>Oh, nearly everyone (and <a href="http://www.mysociety.org/helpus">maybe you too</a>)! <ul> - <li>You can <a href="https://secure.mysociety.org/donate/">make a donation</a>. We're a registered charity.</li> - <li>Help people find successful requests, and monitor performance of authorities, by - <a href="/categorise/play">playing the categorisation game</a>. </li> - <li>Find out FOI email addresses of <a href="/help/requesting#missing_body">authorities that we're missing</a>.</li> - <li>Write a blog post about either <%= site_name %> or an interesting request that you've - found. Post about it on a forum that you frequent. Tell friends about it.</li> <li>If you're - a programmer, get the source code for our parent project, <a href="http://alaveteli.org">Alaveteli</a> - and tell us about patches we can pull. It's made in Ruby on Rails. - <li>Read more about <a href="http://www.mysociety.org/helpus/">volunteering with mySociety</a>. + <li> + <a href="http://www.yrtk.org">Heather Brooke</a> + (<a href="http://www.guardian.co.uk/politics/2008/mar/29/houseofcommons.michaelmartin?gusrc=rss&feed=worldnews">vampy!</a>) has + been pushing the idea of a UK FOI archive for years now. + </li> + <li> + Both Phil Rodgers and <a href="http://www.flourish.org/blog/">Francis Irving</a> + entered it in a mySociety competition for ideas for public interest websites to build. + </li> + <li> + <a href="http://www.mysociety.org/2006/09/27/the-mysociety-call-for-proposals-the-winner-and-runners-up/">It won</a>, + and then Chris Lightfoot (<a href="http://mk.ucant.org/archives/000129.html">RIP :(</a>) + thought up the wheeze of intercepting email responses to requests and + automatically publishing them. + </li> + <li> + Tom Steinberg got the cash to pay for the site from + <a href="http://www.jrrt.org.uk/">a dead chocolate mogul</a> (<em>thank you!</em>) ... + </li> + <li> + ... so that Francis Irving, Angie Ahl, Tommy Martin, Louise Crow, Matthew Somerville + and Tom Steinberg could do the complex mixture of design and coding to build + what you see today. + </li> + <li> + Thanks particularly to Julian Todd (<a href="http://www.freesteel.co.uk/wpblog/">great blog!</a>), + Francis Davey, and Etienne Pollard for using the site early on and giving + feedback (and/or legal advice!), and also to all our other users and + testers. + </li> + <li> + The amazing team of volunteers who run the site, answer your support + emails, maintain the database of public authorities and + <a href="http://www.mysociety.org/2009/10/13/behind-whatdotheyknow/">so much more</a>. + Thanks to John Cross, Ben Harris, Adam McGreggor, Alex Skene, + Richard Taylor. + </li> + <li> + Volunteers who have provided patches to the code - thanks Peter Collingbourne + and Tony Bowden. + </li> + <li> + Everyone who has helped look up FOI email addresses. + </li> + <li> + We couldn't do any of this without those + <a href="http://www.ukcod.org.uk/UKCOD_Trustees">crazy people</a> who volunteer, + amongst many other things, to do the accounts and fill in our VAT return. + </li> + <li> + Finally, all the officers and servants who have answered the many requests + made through the site. Their diligence, patience and professionalism is + what has actually made the information that you see here. Thank them for + helping make Government more transparent. + </li> </ul> -</dd> + You're all stars. + </dd> + <dt id="helpus">Can I help out? <a href="#helpus">#</a> </dt> + <dd> + <p>Yes please! We're built out of our supporters and volunteers.</p> + <ul> + <li>You can <a href="https://secure.mysociety.org/donate/">make a donation</a>. We're a registered charity.</li> + <li>Help people find successful requests, and monitor performance of authorities, by + <a href="/categorise/play">playing the categorisation game</a>. </li> + <li>Find out FOI email addresses of <a href="/help/requesting#missing_body">authorities that we're missing</a>.</li> + <li>Write a blog post about either WhatDoTheyKnow or an interesting request that you've + found. Post about it on a forum that you frequent. Tell friends about it.</li> <li>If you're + a programmer, get the source code for our parent project, <a href="http://alaveteli.org">Alaveteli</a> + and tell us about patches we can pull. It's made in Ruby on Rails. + <li>Read more about <a href="http://www.mysociety.org/helpus/">volunteering with mySociety</a>. + </ul> + </dd> + </dl> -<div id="hash_link_padding"></div> + <div id="hash_link_padding"></div> +</div> diff --git a/app/views/help/officers.rhtml b/app/views/help/officers.rhtml index d9656186a..b26138db6 100644 --- a/app/views/help/officers.rhtml +++ b/app/views/help/officers.rhtml @@ -2,246 +2,246 @@ <%= render :partial => 'sidebar' %> -<h1 id="officers"><%= @title %> <a href="#officers">#</a> </h1> - -<dl> - -<dt id="top">I just got here from bottom of an FOI request, what is going on? <a href="#top">#</a> </dt> - -<dd><p><%= site_name %> is a service run by a charity. It helps ordinary members -of the public make FOI requests, and easily track and share the responses.</p> - -<p>The FOI request you received was made by someone using <%= site_name %>. You can -simply reply to the request as you would any other request from an individual. -The only difference is that your response will be automatically published on -the Internet. -</p> -<p>If you have privacy or other concerns, please read the answers below. -You might also like to read the <a -href="/help/about">introduction to <%= site_name %></a> to find out more about what -the site does from the point of view of a user. You can also search the -site to find the authority that you work for, and view the status of -any requests made using the site. - -<p>Finally, we welcome comments and -thoughts from FOI officers, please <a href="/help/contact">get in touch</a>. -</p> -</dd> - -<dt id="responses">Why are you publishing responses to FOI requests? <a href="#responses">#</a> </dt> - -<dd>We think there are lots of benefits. Most importantly it will encourage the -public to be more interested and involved in the work of government. We -also hope that it will reduce the number of duplicate requests on any -subject that a public body will receive. Given that Freedom of Information -responses contain public information, which anybody could easily request -again from the public authority, we think there should be no reason not to -publish it widely. -</dd> - -<dt id="realpeople">Are the people making requests real people? <a href="#realpeople">#</a> </dt> - -<dd>Yes. For the purposes of keeping track of responses we use -computer-generated email addresses for each request. However, before -they can send a request, each user must register on the site with a -unique email address that we then verify. You can search this site and -find a page listing all requests that each person has made. -</dd> - -<dt id="email_only">An email isn't a sufficient address for an FOI request! <a href="#email_only">#</a> </dt> - -<dd>Yes it is. This -<a href="http://www.whatdotheyknow.com/request/1142/response/2894/attach/5/20080806100741260.pdf">letter from the ICO to Rother District Council</a> gives guidance on the matter, specifically -in the context of requests made via <%= site_name %>. -</dd> - -<dt id="vexatious">Aren't you making lots of vexatious requests? <a href="#vexatious">#</a> </dt> - -<dd><p><%= site_name %> is not making any requests. We are sending requests on -behalf of our users, who are real people making the requests. </p> -<p>Look at it like this - if lots of different people made requests from -different Hotmail email addresses, then you would not think that Microsoft were -making vexatious requests. It is exactly the same if lots of requests are made -via <%= site_name %>. Moreover, since all requests are public it is much easier -for you to see if one of our users is making vexatious requests. </p> -<p>If that isn't enough for you, the -<a href="http://www.whatdotheyknow.com/request/1142/response/2894/attach/5/20080806100741260.pdf">letter from the ICO to Rother District Council</a> gives some guidance on the matter.</p> -</dd> - -<dt id="spam_problems">I can see a request on <%= site_name %>, but we never got it by email!<a href="#spam_problems">#</a> </dt> - -<dd><p>If a request appears on the site, then we have attempted to send it to -the authority by email. Any delivery failure messages will automatically -appear on the site. You can check the address we're using with the "View FOI -email address" link which appears on the page for the authority. <a -href="/help/contact">Contact us</a> if there is a better address we can -use.</p> -<p>Requests are sometimes not delivered because they are quietly removed by -"spam filters" in the IT department of the authority. Authorities can make -sure this doesn't happen by asking their IT departments to "whitelist" -any email from <strong>@whatdotheyknow.com</strong>. -If you <a href="/help/contact">ask us</a> we will resend any request, -and/or give technical details of delivery so an IT department can chase -up what happened to the message. -</p> -<p>Finally, you can respond to any request from your web browser, without -needing any email, using the "respond to request" link at the bottom of -each request page. -</dd> - -<dt id="days">How do you calculate the deadline shown on request pages?<a href="#days">#</a> </dt> - -<dd> -<p>The Freedom of Information Act says:</p> - -<blockquote><p>A public authority must comply with section 1(1) <strong>promptly</strong> and -in any event not later than the twentieth working day following the date of -receipt.</p></blockquote> - -<p>The nerdy detail of exactly how weekends are counted, and what happens if -the request arrives out of office hours, is just that - detail. What matters -here is that the law says authorities must respond <strong>promptly</strong>.</p> - -<p>If you've got a good reason why the request is going to take a while to -process, requesters find it really helpful if you can send a quick email with a -sentence or two saying what is happening. </p> - -<p>FOI officers often have to do a lot of <strong>hard work</strong> to answer -requests, and this is hidden from the public. We think it would help everyone -to have more of that complexity visible.</p> - -</dd> - -<dt id="days2">But really, how do you calculate the deadline?<a href="#days2">#</a> </dt> - -<dd> - -<p>Please read the answer to the previous question first. Legally, authorities -must respond <strong>promptly</strong> to FOI requests. If they fail to do that, -it is best if they show the hard work they are doing by explaining what is -taking the extra time to do. -</p> - -<p>That said, <%= site_name %> does show the maximum legal deadline -for response on each request. Here's how we calculate it.</p> - -<ul> - -<li>If the day we deliver the request by email is a working day, we count that -as "day zero", even if it was delivered late in the evening. Days end at -midnight. We then count the next working day as "day one", and so on up to -<strong>20 working days</strong>.</li> - -<li>If the day the request email was delivered was a non-working day, we count -the next working day as "day one". Delivery is delivery, even if it happened on -the weekend. Some authorities -<a href="http://www.whatdotheyknow.com/request/policy_regarding_body_scans#incoming-1100">disagree with this</a>, -our lawyer disagrees with them. </li> - -<li>Requesters are encouraged to mark when they have <strong>clarified</strong> -their request so the clock resets, but sometimes they get this wrong. If you -see a problem with a particular request, let us know and we'll fix it.</li> -</ul> - -<p>The date thus calculated is shown on requests with the text "By law, -Liverpool City Council should normally have responded by...". There is only -one case which is not normal, see the next question about -<a href="#public_interest_test">public interest test time extensions</a>. -</p> - -<p>Schools are also a special case, which <%= site_name %> displays differently. -</p> - -<ul> -<li>Since June 2009, <strong>schools</strong> have "20 working days -disregarding any working day which is not a school day, or 60 working days, -whichever is first" (<a href="http://www.opsi.gov.uk/si/si2009/draft/ukdsi_9780111477632_en_1">FOI (Time for Compliance with Request) Regulations 2009</a>). <%= site_name %> indicates on requests to schools that the 20 day deadline is only -during term time, and shows them as definitely overdue after 60 working days -</li> -</ul> - -<p>If you're getting really nerdy about all this, read the <a href="http://www.ico.gov.uk/upload/documents/library/freedom_of_information/detailed_specialist_guides/timeforcompliance.pdf">detailed ICO guidance</a>. -Meanwhile, remember that the law says authorities must respond -<strong>promptly</strong>. That's really what matters.</p> - -</dd> - -<dt id="public_interest_test">How do you reflect time extensions for public interest tests?<a href="#public_interest_test">#</a> </dt> - -<dd> - -<p>The Freedom of Information Act lets authorities claim an indefinite time -extension when applying a <strong>public interest test</strong>. Information -Commissioner guidance says that it should only be used in "exceptionally -complex" cases -(<a href="http://www.ico.gov.uk/upload/documents/library/freedom_of_information/detailed_specialist_guides/foi_good_practice_guidance_4.pdf">FOI Good Practice Guidance No. 4</a>). -<%= site_name %> doesn't specifically handle this case, which is why we use the -phrase "should normally have responded by" when the 20 working day time is -exceeded. -</p> - -<p>The same guidance says that, even in exceptionally complex cases, no -Freedom of Information request should take more than <strong>40 working days</strong> -to answer. <%= site_name %> displays requests which are overdue by that much -with stronger wording to indicate they are definitely late. -</p> +<div id="left_column"> + <h1 id="officers"><%= @title %> <a href="#officers">#</a> </h1> + + <dl> + + <dt id="top">I just got here from bottom of an FOI request, what is going on? <a href="#top">#</a> </dt> + + <dd><p>WhatDoTheyKnow is a service run by a charity. It helps ordinary members + of the public make FOI requests, and easily track and share the responses.</p> + + <p>The FOI request you received was made by someone using WhatDoTheyKnow. You can + simply reply to the request as you would any other request from an individual. + The only difference is that your response will be automatically published on + the Internet. + </p> + <p>If you have privacy or other concerns, please read the answers below. + You might also like to read the <a + href="/help/about">introduction to WhatDoTheyKnow</a> to find out more about what + the site does from the point of view of a user. You can also search the + site to find the authority that you work for, and view the status of + any requests made using the site. + + <p>Finally, we welcome comments and + thoughts from FOI officers, please <a href="/help/contact">get in touch</a>. + </p> + </dd> + + <dt id="responses">Why are you publishing responses to FOI requests? <a href="#responses">#</a> </dt> + + <dd>We think there are lots of benefits. Most importantly it will encourage the + public to be more interested and involved in the work of government. We + also hope that it will reduce the number of duplicate requests on any + subject that a public body will receive. Given that Freedom of Information + responses contain public information, which anybody could easily request + again from the public authority, we think there should be no reason not to + publish it widely. + </dd> + + <dt id="realpeople">Are the people making requests real people? <a href="#realpeople">#</a> </dt> + + <dd>Yes. For the purposes of keeping track of responses we use + computer-generated email addresses for each request. However, before + they can send a request, each user must register on the site with a + unique email address that we then verify. You can search this site and + find a page listing all requests that each person has made. + </dd> + + <dt id="email_only">An email isn't a sufficient address for an FOI request! <a href="#email_only">#</a> </dt> + + <dd>Yes it is. This + <a href="http://www.whatdotheyknow.com/request/1142/response/2894/attach/5/20080806100741260.pdf">letter from the ICO to Rother District Council</a> gives guidance on the matter, specifically + in the context of requests made via WhatDoTheyKnow. + </dd> + + <dt id="vexatious">Aren't you making lots of vexatious requests? <a href="#vexatious">#</a> </dt> + + <dd><p>WhatDoTheyKnow is not making any requests. We are sending requests on + behalf of our users, who are real people making the requests. </p> + <p>Look at it like this - if lots of different people made requests from + different Hotmail email addresses, then you would not think that Microsoft were + making vexatious requests. It is exactly the same if lots of requests are made + via WhatDoTheyKnow. Moreover, since all requests are public it is much easier + for you to see if one of our users is making vexatious requests. </p> + <p>If that isn't enough for you, the + <a href="http://www.whatdotheyknow.com/request/1142/response/2894/attach/5/20080806100741260.pdf">letter from the ICO to Rother District Council</a> gives some guidance on the matter.</p> + </dd> + + <dt id="spam_problems">I can see a request on WhatDoTheyKnow, but we never got it by email!<a href="#spam_problems">#</a> </dt> + + <dd><p>If a request appears on the site, then we have attempted to send it to + the authority by email. Any delivery failure messages will automatically + appear on the site. You can check the address we're using with the "View FOI + email address" link which appears on the page for the authority. <a + href="/help/contact">Contact us</a> if there is a better address we can + use.</p> + <p>Requests are sometimes not delivered because they are quietly removed by + "spam filters" in the IT department of the authority. Authorities can make + sure this doesn't happen by asking their IT departments to "whitelist" + any email from <strong>@whatdotheyknow.com</strong>. + If you <a href="/help/contact">ask us</a> we will resend any request, + and/or give technical details of delivery so an IT department can chase + up what happened to the message. + </p> + <p>Finally, you can respond to any request from your web browser, without + needing any email, using the "respond to request" link at the bottom of + each request page. + </dd> + + <dt id="days">How do you calculate the deadline shown on request pages?<a href="#days">#</a> </dt> + + <dd> + <p>The Freedom of Information Act says:</p> + + <blockquote><p>A public authority must comply with section 1(1) <strong>promptly</strong> and + in any event not later than the twentieth working day following the date of + receipt.</p></blockquote> + + <p>The nerdy detail of exactly how weekends are counted, and what happens if + the request arrives out of office hours, is just that - detail. What matters + here is that the law says authorities must respond <strong>promptly</strong>.</p> + + <p>If you've got a good reason why the request is going to take a while to + process, requesters find it really helpful if you can send a quick email with a + sentence or two saying what is happening. </p> + + <p>FOI officers often have to do a lot of <strong>hard work</strong> to answer + requests, and this is hidden from the public. We think it would help everyone + to have more of that complexity visible.</p> + + </dd> + + <dt id="days2">But really, how do you calculate the deadline?<a href="#days2">#</a> </dt> + + <dd> + + <p>Please read the answer to the previous question first. Legally, authorities + must respond <strong>promptly</strong> to FOI requests. If they fail to do that, + it is best if they show the hard work they are doing by explaining what is + taking the extra time to do. + </p> + + <p>That said, WhatDoTheyKnow does show the maximum legal deadline + for response on each request. Here's how we calculate it.</p> + + <ul> + + <li>If the day we deliver the request by email is a working day, we count that + as "day zero", even if it was delivered late in the evening. Days end at + midnight. We then count the next working day as "day one", and so on up to + <strong>20 working days</strong>.</li> + + <li>If the day the request email was delivered was a non-working day, we count + the next working day as "day one". Delivery is delivery, even if it happened on + the weekend. Some authorities <a href="http://www.whatdotheyknow.com/request/policy_regarding_body_scans#incoming-1100">disagree with this</a>, our lawyer disagrees with them. </li> + + <li>Requesters are encouraged to mark when they have <strong>clarified</strong> + their request so the clock resets, but sometimes they get this wrong. If you + see a problem with a particular request, let us know and we'll fix it.</li> + </ul> + + <p>The date thus calculated is shown on requests with the text "By law, + Liverpool City Council should normally have responded by...". There is only + one case which is not normal, see the next question about + <a href="#public_interest_test">public interest test time extensions</a>. + </p> + + <p>Schools are also a special case, which WhatDoTheyKnow displays differently. + </p> + + <ul> + <li>Since June 2009, <strong>schools</strong> have "20 working days + disregarding any working day which is not a school day, or 60 working days, + whichever is first" (<a href="http://www.opsi.gov.uk/si/si2009/draft/ukdsi_9780111477632_en_1">FOI (Time for Compliance with Request) Regulations 2009</a>). WhatDoTheyKnow indicates on requests to schools that the 20 day deadline is only + during term time, and shows them as definitely overdue after 60 working days + </li> + </ul> + + <p>If you're getting really nerdy about all this, read the <a href="http://www.ico.gov.uk/upload/documents/library/freedom_of_information/detailed_specialist_guides/timeforcompliance.pdf">detailed ICO guidance</a>. + Meanwhile, remember that the law says authorities must respond + <strong>promptly</strong>. That's really what matters.</p> + + </dd> + + <dt id="public_interest_test">How do you reflect time extensions for public interest tests?<a href="#public_interest_test">#</a> </dt> + + <dd> + + <p>The Freedom of Information Act lets authorities claim an indefinite time + extension when applying a <strong>public interest test</strong>. Information + Commissioner guidance says that it should only be used in "exceptionally + complex" cases + (<a href="http://www.ico.gov.uk/upload/documents/library/freedom_of_information/detailed_specialist_guides/foi_good_practice_guidance_4.pdf">FOI Good Practice Guidance No. 4</a>). + WhatDoTheyKnow doesn't specifically handle this case, which is why we use the + phrase "should normally have responded by" when the 20 working day time is + exceeded. + </p> + + <p>The same guidance says that, even in exceptionally complex cases, no + Freedom of Information request should take more than <strong>40 working days</strong> + to answer. WhatDoTheyKnow displays requests which are overdue by that much + with stronger wording to indicate they are definitely late. + </p> -<p>The Freedom of Information (Scotland) Act does not allow such a public -interest extension. <%= site_name %> would like to see the law changed to either -remove the extension from the UK Act, or to reintroduce an absolute time limit -of 40 working days even with the extension (the House of Lords <a -href="http://www.publicwhip.org.uk/division.php?date=2000-10-17&number=1&house=lords">voted -to remove</a> provision for such a time limit during the initial passage -of the UK Act through Parliament). -</p> -</dd> - -<dt id="large_file">How can I send a large file, which won't go by email?<a href="#large_file">#</a> </dt> + <p>The Freedom of Information (Scotland) Act does not allow such a public + interest extension. WhatDoTheyKnow would like to see the law changed to either + remove the extension from the UK Act, or to reintroduce an absolute time limit + of 40 working days even with the extension (the House of Lords <a + href="http://www.publicwhip.org.uk/division.php?date=2000-10-17&number=1&house=lords">voted + to remove</a> provision for such a time limit during the initial passage + of the UK Act through Parliament). + </p> + </dd> -<dd>Instead of email, you can respond to a request directly from your web -browser, including uploading a file. To do this, choose "respond to request" at -the bottom of the request's page. <a href="/help/contact">Contact us</a> if it -is too big for even that (more than, say, 50Mb). -</dd> - -<dt id="names">Why do you publish the names of civil servants and the text of emails? <a href="#names">#</a> </dt> + <dt id="large_file">How can I send a large file, which won't go by email?<a href="#large_file">#</a> </dt> -<dd>We consider what officers or servants do in the course of their employment -to be public information. We will only remove content in exceptional -circumstances, see our <a href="/help/privacy#takedown">take down policy</a>. -</dd> - -<dt id="mobiles">Do you publish email addresses or mobile phone numbers? <a href="#mobiles">#</a> </dt> - -<dd><p>To prevent spam, we automatically remove most emails and some mobile numbers from -responses to requests. Please <a href="/help/contact">contact us</a> if we've -missed one. -For technical reasons we don't always remove them from attachments, such as certain PDFs.</p> -<p>If you need to know what an address was that we've removed, please <a - href="/help/contact">get in touch with us</a>. Occasionally, an email address -forms an important part of a response and we will post it up in an obscured -form in an annotation. -</dd> - -<dt id="copyright"><a name="commercial"></a>What is your policy on copyright of documents?<a href="#copyright">#</a> </dt> - -<dd>Our Freedom of Information law is "applicant blind", so anyone in the -world can request the same document and get a copy of it. - -If you think our making a document available on the internet infringes your -copyright, you may <a href="/help/contact">contact us</a> and ask us -to take it down. However, to save tax payers' money by preventing duplicate -requests, and for good public relations, we'd advise you not to do that. -</dd> - -</dl> - - -</dl> - -<p><strong>If you haven't already</strong>, read <a href="/help/about">the introduction</a> --> -<br><strong>Otherwise</strong>, the <a href="/help/credits">credits</a> or the <a href="/help/api">programmers API</a> --> - -<div id="hash_link_padding"></div> + <dd>Instead of email, you can respond to a request directly from your web + browser, including uploading a file. To do this, choose "respond to request" at + the bottom of the request's page. <a href="/help/contact">Contact us</a> if it + is too big for even that (more than, say, 50Mb). + </dd> + + <dt id="names">Why do you publish the names of civil servants and the text of emails? <a href="#names">#</a> </dt> + + <dd>We consider what officers or servants do in the course of their employment + to be public information. We will only remove content in exceptional + circumstances, see our <a href="/help/privacy#takedown">take down policy</a>. + </dd> + + <dt id="mobiles">Do you publish email addresses or mobile phone numbers? <a href="#mobiles">#</a> </dt> + + <dd><p>To prevent spam, we automatically remove most emails and some mobile numbers from + responses to requests. Please <a href="/help/contact">contact us</a> if we've + missed one. + For technical reasons we don't always remove them from attachments, such as certain PDFs.</p> + <p>If you need to know what an address was that we've removed, please <a + href="/help/contact">get in touch with us</a>. Occasionally, an email address + forms an important part of a response and we will post it up in an obscured + form in an annotation. + </dd> + + <dt id="copyright"><a name="commercial"></a>What is your policy on copyright of documents?<a href="#copyright">#</a> </dt> + + <dd>Our Freedom of Information law is "applicant blind", so anyone in the + world can request the same document and get a copy of it. + + If you think our making a document available on the internet infringes your + copyright, you may <a href="/help/contact">contact us</a> and ask us + to take it down. However, to save tax payers' money by preventing duplicate + requests, and for good public relations, we'd advise you not to do that. + </dd> + + </dl> + + + </dl> + + <p><strong>If you haven't already</strong>, read <a href="/help/about">the introduction</a> --> + <br><strong>Otherwise</strong>, the <a href="/help/credits">credits</a> or the <a href="/help/api">programmers API</a> --> + + <div id="hash_link_padding"></div> +</div> diff --git a/app/views/help/privacy.rhtml b/app/views/help/privacy.rhtml index fc8c54885..d62afa45b 100644 --- a/app/views/help/privacy.rhtml +++ b/app/views/help/privacy.rhtml @@ -2,54 +2,54 @@ <%= render :partial => 'sidebar' %> -<h1 id="privacy"><%= @title %> <a href="#privacy">#</a> </h1> - -<dl> - -<dt id="email_address">Who gets to see my email address? <a href="#email_address">#</a> </dt> - -<dd><p>We will not disclose your email address to anyone unless we are obliged to by law, -or you ask us to. This includes the public authority that you are sending a -request to. They only get to see an email address -@whatdotheyknow.com which is specific to that request. </p> -<p>If you send a message to another user on the site, then it will reveal your -email address to them. You will be told that this is going to happen.</p> -</dd> - -<dt id="nasty_spam">Will you send nasty, brutish spam to my email address? <a href="#nasty_spam">#</a> </dt> -<dd>Nope. After you sign up to <%= site_name %> we will only send you emails -relating to a request you made, an email alert that you have signed up for, -or for other reasons that you specifically authorise. We will never give or -sell your email addresses to anyone else, unless we are obliged to by law, or -you ask us to. -</dd> - -<dt id="public_request">Why will my name and my request appear publicly on the site? <a href="#public_request">#</a> </dt> - -<dd> -<p>We publish your request on the Internet so that anybody can read it and -make use of the information that you have found. We do not normally delete -requests (<a href="#delete_requests">more details</a>). -</p> -<p> -Your name is tangled up with your request, so has to be published as well. -It is only fair, as we're going to publish the name of the civil servant who -writes the response to your request. Using your real name also helps people -get in touch with you to assist you with your research or to campaign with you. -</p> -<p>By law, you must use your real name for the request to be a valid Freedom of -Information request. See the next question for alternatives if you do not want -to publish your full name. -</p> -</dd> - -<dt id="real_name">Can I make an FOI request using a pseudonym? <a href="#real_name">#</a> </dt> - - -<dd> -<p>Technically, you must use your real name for your request to be a valid Freedom of Information request in law. See this -<a href="http://www.ico.gov.uk/upload/documents/library/freedom_of_information/detailed_specialist_guides/name_of_applicant_fop083_v1.pdf">guidance from the Information Commissioner</a> (January 2009). -</p> +<div id="left_column"> + <h1 id="privacy"><%= @title %></h1> + <dl> + + <dt id="email_address">Who gets to see my email address? <a href="#email_address">#</a> </dt> + + <dd><p>We will not disclose your email address to anyone unless we are obliged to by law, + or you ask us to. This includes the public authority that you are sending a + request to. They only get to see an email address + @whatdotheyknow.com which is specific to that request. </p> + <p>If you send a message to another user on the site, then it will reveal your + email address to them. You will be told that this is going to happen.</p> + </dd> + + <dt id="nasty_spam">Will you send nasty, brutish spam to my email address? <a href="#nasty_spam">#</a> </dt> + <dd>Nope. After you sign up to WhatDoTheyKnow we will only send you emails + relating to a request you made, an email alert that you have signed up for, + or for other reasons that you specifically authorise. We will never give or + sell your email addresses to anyone else, unless we are obliged to by law, or + you ask us to. + </dd> + + <dt id="public_request">Why will my name and my request appear publicly on the site? <a href="#public_request">#</a> </dt> + + <dd> + <p>We publish your request on the Internet so that anybody can read it and + make use of the information that you have found. We do not normally delete + requests (<a href="#delete_requests">more details</a>). + </p> + <p> + Your name is tangled up with your request, so has to be published as well. + It is only fair, as we're going to publish the name of the civil servant who + writes the response to your request. Using your real name also helps people + get in touch with you to assist you with your research or to campaign with you. + </p> + <p>By law, you must use your real name for the request to be a valid Freedom of + Information request. See the next question for alternatives if you do not want + to publish your full name. + </p> + </dd> + + <dt id="real_name">Can I make an FOI request using a pseudonym? <a href="#real_name">#</a> </dt> + + + <dd> + <p>Technically, you must use your real name for your request to be a valid Freedom of Information request in law. See this + <a href="http://www.ico.gov.uk/upload/documents/library/freedom_of_information/detailed_specialist_guides/name_of_applicant_fop083_v1.pdf">guidance from the Information Commissioner</a> (January 2009). + </p> <p>However, the same guidance also says it is good practice for the public authority to still consider a request made using an obvious pseudonym. @@ -179,6 +179,6 @@ that authorities resend these with the personal information removed.</p> <p><strong>Learn more</strong> from the help for <a href="/help/officers">FOI officers</a> --> -<div id="hash_link_padding"></div> - + <div id="hash_link_padding"></div> +</div> diff --git a/app/views/help/requesting.rhtml b/app/views/help/requesting.rhtml index eec887950..bd3ce46f3 100644 --- a/app/views/help/requesting.rhtml +++ b/app/views/help/requesting.rhtml @@ -1,293 +1,293 @@ <% @title = "Making requests" %> <%= render :partial => 'sidebar' %> - -<h1 id="making_requests"><%= @title %> <a href="#making_requests">#</a> </h1> -<dl> - -<dt id="which_authority">I'm not sure which authority to make my request to, how can I find out? <a href="#which_authority">#</a> </dt> - -<dd> -<p>It can be hard to untangle government's complicated structured, and work out -who knows the information that you want. Here are a few tips: -<ul> -<li>Browse or search <%= site_name %> looking for similar requests to yours.</li> -<li>When you've found an authority you think might have the information, use -the "home page" link on the right hand side of their page to check what they do -on their website.</li> -<li>Contact the authority by phone or email to ask if they hold the kind of -information you're after.</li> -<li>Don't worry excessively about getting the right authority. If you get it -wrong, they ought to advise you who to make the request to instead. -</li> -<li>If you've got a thorny case, please <a href="/help/contact">contact us</a> for help.</li> -</ul> - -</dd> - - - -<dt id="missing_body">You're missing the public authority that I want to request from! <a href="#missing_body">#</a> </dt> - -<dd> -<p>Please <a href="/help/contact">contact us</a> with the name of the public authority and, -if you can find it, their contact email address for Freedom of Information requests. -</p> -<p>If you'd like to help add a whole category of public authority to the site, we'd love -to hear from you too. -</p> - -</dd> - -<dt id="authorities">Why do you include some authorities that aren't formally subject to FOI?<a href="#authorities">#</a> </dt> - -<dd> -<p><%= site_name %> lets you make requests for information to a range of -organisations:</p> - -<ul> - <li> Those formally subject to the FOI Act</li> - <li> Those formally subject to the Environmental Regulations (a less well - defined group)</li> - <li> Those which voluntarily comply with the FOI Act</li> - <li> Those which aren't subject to the Act but we think should be, on grounds - such as them having significant public responsibilities. +<div id="left_column"> + <h1 id="making_requests"><%= @title %></h1> + <dl> + + <dt id="which_authority">I'm not sure which authority to make my request to, how can I find out? <a href="#which_authority">#</a> </dt> + + <dd> + <p>It can be hard to untangle government's complicated structured, and work out + who knows the information that you want. Here are a few tips: + <ul> + <li>Browse or search WhatDoTheyKnow looking for similar requests to yours.</li> + <li>When you've found an authority you think might have the information, use + the "home page" link on the right hand side of their page to check what they do + on their website.</li> + <li>Contact the authority by phone or email to ask if they hold the kind of + information you're after.</li> + <li>Don't worry excessively about getting the right authority. If you get it + wrong, they ought to advise you who to make the request to instead. </li> -</ul> - -<p>In the last case, we're using the site to lobby for expansion of the -scope of the FOI Act. Even if an organisation is not legally obliged to respond -to an FOI request, they can still do so voluntarily. -</p> - -</dd> - -<dt id="focused">Why must I keep my request focused?<a href="#focused">#</a> </dt> - -<dd> + <li>If you've got a thorny case, please <a href="/help/contact">contact us</a> for help.</li> + </ul> -<p> -Please put in your request only what is needed so that someone can -easily identify what information you are asking for. Please do -<i>not</i> include any of the following: -</p> + </dd> -<ul> -<li>arguments about your cause</li> -<li>statements that could defame or insult others</li> -</ul> -<p> -If you do, we may have to remove your request to avoid problems with -libel law, which is a pain for both you and us. Short, succinct messages -make it easier for authorities to be clear what information you are -requesting, which means you will get a reply more quickly. -</p> -<p> -If you want information to support an argument or campaign, Freedom of -Information is a powerful tool. Although you may not use this site to -run your campaign, we encourage you to use it to get the information you -need. We also encourage to run your campaign elsewhere - one effective -and very easy way is to <%= link_to 'start your own blog', -"http://wordpress.com/"%>. You are welcome to link to your campaign -from this site in an annotation to your request (you can make -annotations after submitting the request). -</p> + <dt id="missing_body">You're missing the public authority that I want to request from! <a href="#missing_body">#</a> </dt> -</dd> + <dd> + <p>Please <a href="/help/contact">contact us</a> with the name of the public authority and, + if you can find it, their contact email address for Freedom of Information requests. + </p> + <p>If you'd like to help add a whole category of public authority to the site, we'd love + to hear from you too. + </p> -<dt id="fees">Does it cost me anything to make a request?<a href="#fees">#</a> </dt> + </dd> -<dd> + <dt id="authorities">Why do you include some authorities that aren't formally subject to FOI?<a href="#authorities">#</a> </dt> -<p>Making an FOI request is nearly always free.</p> + <dd> + <p>WhatDoTheyKnow lets you make requests for information to a range of + organisations:</p> -<p>Authorities often include unnecessary, scary, boilerplate in -acknowledgement messages saying they "may" charge a fee. Ignore such notices. -They hardly ever will actually charge a fee. If they do, they can only charge you if -you have specifically agreed in advance to pay. <a - href="http://www.ico.gov.uk/upload/documents/library/freedom_of_information/practical_application/chargingafee.pdf">More - details</a> from the Information Commissioner. -</p> - -<p>Sometimes an authority will refuse your request, saying that the cost -of handling it exceeds £600 (for central government) or £450 (for all other -public authorities). At this point you can refine your -request. e.g. it would be much cheaper for an authority to tell you the amount -spent on marshmallows in the past year than in the past ten years. -</p> - -</dd> - - - -<dt id="quickly_response">How quickly will I get a response? <a href="#quickly_response">#</a> </dt> - -<dd> -<p>By law, public authorities must respond <strong>promptly</strong> to -requests. -</p> - -<p>Even if they are not prompt, in nearly all cases they must respond within -20 working days. If you had to clarify your request, or they are a school, -or one or two other cases, then they may have more time -(<a href="/help/officers#days">full details</a>). - -<p><%= site_name %> will email you if you don't get a timely response. You can -then send the public authority a message to remind them, and tell them if they -are breaking the law.</p> - -</dd> - -<dt id="deadline_extended">Deadline extended <a href="#deadline_extended">#</a> </dt> - -<dd> -<p>By law, public authorities must needs <strong>more time</strong> for request ... (TO DO) -</p> - - -</dd> -<dt id="no_response">What if I never get a response?<a href="#no_response">#</a> </dt> - -<dd> -<p>There are several things you can do if you never get a response.</p> -<ul> - <li>Sometimes there has been a genuine problem and the authority never - received the request. It is worth telephoning the authority and politely - checking that they received the request. It was sent to them by email. - </li> - <li>If they have not received it, the problem is most likely due to - "spam filters". Refer the authority to the measures in the answer - '<a href="/help/officers#spam_problems">I can see a request on <%= site_name %>, but we never got it by email!</a>' - in the FOI officers section of this help. + <ul> + <li> Those formally subject to the FOI Act</li> + <li> Those formally subject to the Environmental Regulations (a less well + defined group)</li> + <li> Those which voluntarily comply with the FOI Act</li> + <li> Those which aren't subject to the Act but we think should be, on grounds + such as them having significant public responsibilities. </li> - <li>If you're still having no luck, then you can ask for an internal review, - and then complain to the Information Commissioner about the authority. - Read our page '<a href="/help/unhappy">Unhappy about the response you got?</a>'. -</ul> -</dd> - -<dt id="not_satifised">What if I'm not satisfied with the response? <a href="#not_satifised">#</a> </dt> -<dd>If you didn't get the information you asked for, or you didn't get it in time, -then read our page '<a href="/help/unhappy">Unhappy about the response you got?</a>'. -</dd> - -<dt id="reuse">It says I can't re-use the information I got!<a href="#reuse">#</a> </dt> -<dd> -<p>Authorities often add legal boilerplate about the -"<a href="http://www.opsi.gov.uk/si/si2005/20051515">Re-Use of Public Sector -Information Regulations 2005</a>", which at first glance implies you may not -be able do anything with the information. -</p> - -<p>You can, of course, write articles about the information or summarise it, or -quote parts of it. We also think you should feel free to republish the -information in full, just as we do, even though in theory you might not be -allowed to do so. See <a href="/help/officers#copyright">our policy on copyright</a>.</p> - -</dd> - -<dt id="ico_help">Can you tell me more of the nitty gritty about the process of making requests? <a href="#ico_help">#</a> </dt> - -<dd> -<p>Have a look at the -<a href="http://www.ico.gov.uk/for_the_public/access_to_official_information.aspx">access to official information</a> -pages on the Information Commissioner's website.</p> - -<p>If you're requesting information from a Scottish public authority, -the process is very similar. There are differences around time -limits for compliance. -See the <a href="http://www.itspublicknowledge.info/nmsruntime/saveasdialog.asp?lID=1858&sID=321">Scottish -Information Commissioner's guidance</a> for details.</p> -</dd> - -<dt id="data_protection">Can I request information about myself? <a href="#data_protection">#</a> </dt> - -<dd> -<p>No. Requests made using <%= site_name %> are public, made under the Freedom of -Information Act, and cannot help you find information about a private -individual.</p> - -<p>If you would like to know what information a public -authority holds about yourself, you should make a "Subject Access Request" in -private using Data Protection law. The leaflet "<a -href="http://www.ico.gov.uk/upload/documents/library/data_protection/introductory/subject_access_rights.pdf">How to access your information</a>" (on the Information Commissioner's -website) explains how to do this.</p> - -<p>If you see that somebody has included personal information, perhaps -unwittingly, in a request, please <a href="/help/contact">contact us</a> -immediately so we can remove it.</p> -</dd> - - -<dt id="private_requests">I'd like to keep my request secret! (At least until I publish my story) <a href="#private_requests">#</a> </dt> - -<dd><p><%= site_name %> is currently only designed for public requests. All -responses that we receive are automatically published on the website for anyone -to read. </p> -<p>You should contact the public authority directly if you would like to -make a request in private. If you're interested in buying a system which helps -you manage FOI requests in secret, then <a href="/help/contact">contact us</a>. -</p> -</dd> - -<dt id="eir">Why can I only request information about the environment from some authorities? <a href="#eir">#</a> </dt> - -<dd> -<p>Some public authorities, such as <a href="http://www.whatdotheyknow.com/body/south_east_water">South East Water</a>, -don't come under the Freedom of Information Act, but do come under another law called -the Environmental Information Regulations (EIR). -</p> - -<p>It's a very similar law, so you make a request -to them using <%= site_name %> in just the same way as an FOI request. The only -difference is that on the page where your write you request, it reminds you -that you can only request "environmental information" and tells you what that -means. It is quite broad. -</p> - -<p>You can, of course, request environmental information from other -authorities. Just make a Freedom of Information (FOI) request as normal. The -authority has a duty to work out if the Environmental Information Regulations -(EIR) is the more appropriate legislation to reply under. -</p> -</dd> - -<dt id="multiple">Can I make the same to request to lots of authorities, e.g. all councils? <a href="#multiple">#</a> </dt> - -<dd>We ask you to first send a test version of your request to a few -authorities. Their responses will help you improve the wording of your request, -so that you get the best information when you send the request to all of -the authorities. There is currently no automated system for sending the request -to the other authorities, you must copy and paste it by hand. - -</dd> - -<dt id="offsite">I made a request off the site, how do I upload it to the archive?<a href="#offsite">#</a> </dt> - -<dd><%= site_name %> is an archive of requests made through the site, -and does not try to be an archive of all FOI requests. We'll never support uploading -other requests. For one thing, we wouldn't be able to verify that other -responses actually came from the authority. If this really matters to you, -you can always make the same request again via <%= site_name %>. -</dd> - -<dt id="moderation">How do you moderate request annotations? <a href="#moderation">#</a> </dt> - -<dd> -<p>Annotations on <%= site_name %> are to help -people get the information they want, or to give them pointers to places they -can go to help them act on it. We reserve the right to remove anything else. -</p> -<p>Endless, political discussions are not allowed. -Post a link to a suitable forum or campaign site elsewhere.</p> -<dd> + </ul> -</dl> + <p>In the last case, we're using the site to lobby for expansion of the + scope of the FOI Act. Even if an organisation is not legally obliged to respond + to an FOI request, they can still do so voluntarily. + </p> -<p><strong>Next</strong>, read about <a href="/help/privacy">your privacy</a> --> + </dd> -<div id="hash_link_padding"></div> + <dt id="focused">Why must I keep my request focused?<a href="#focused">#</a> </dt> + <dd> + + <p> + Please put in your request only what is needed so that someone can + easily identify what information you are asking for. Please do + <i>not</i> include any of the following: + </p> + + <ul> + <li>arguments about your cause</li> + <li>statements that could defame or insult others</li> + </ul> + + <p> + If you do, we may have to remove your request to avoid problems with + libel law, which is a pain for both you and us. Short, succinct messages + make it easier for authorities to be clear what information you are + requesting, which means you will get a reply more quickly. + </p> + + <p> + If you want information to support an argument or campaign, Freedom of + Information is a powerful tool. Although you may not use this site to + run your campaign, we encourage you to use it to get the information you + need. We also encourage to run your campaign elsewhere - one effective + and very easy way is to <%= link_to 'start your own blog', + "http://wordpress.com/"%>. You are welcome to link to your campaign + from this site in an annotation to your request (you can make + annotations after submitting the request). + </p> + + </dd> + + <dt id="fees">Does it cost me anything to make a request?<a href="#fees">#</a> </dt> + + <dd> + + <p>Making an FOI request is nearly always free.</p> + + <p>Authorities often include unnecessary, scary, boilerplate in + acknowledgement messages saying they "may" charge a fee. Ignore such notices. + They hardly ever will actually charge a fee. If they do, they can only charge you if + you have specifically agreed in advance to pay. <a + href="http://www.ico.gov.uk/upload/documents/library/freedom_of_information/practical_application/chargingafee.pdf">More + details</a> from the Information Commissioner. + </p> + + <p>Sometimes an authority will refuse your request, saying that the cost + of handling it exceeds £600 (for central government) or £450 (for all other + public authorities). At this point you can refine your + request. e.g. it would be much cheaper for an authority to tell you the amount + spent on marshmallows in the past year than in the past ten years. + </p> + + </dd> + + + + <dt id="quickly_response">How quickly will I get a response? <a href="#quickly_response">#</a> </dt> + + <dd> + <p>By law, public authorities must respond <strong>promptly</strong> to + requests. + </p> + + <p>Even if they are not prompt, in nearly all cases they must respond within + 20 working days. If you had to clarify your request, or they are a school, + or one or two other cases, then they may have more time + (<a href="/help/officers#days">full details</a>). + + <p>WhatDoTheyKnow will email you if you don't get a timely response. You can + then send the public authority a message to remind them, and tell them if they + are breaking the law.</p> + + </dd> + + <dt id="deadline_extended">Deadline extended <a href="#deadline_extended">#</a> </dt> + + <dd> + <p>By law, public authorities must needs <strong>more time</strong> for request ... (TO DO) + </p> + + + </dd> + <dt id="no_response">What if I never get a response?<a href="#no_response">#</a> </dt> + + <dd> + <p>There are several things you can do if you never get a response.</p> + <ul> + <li>Sometimes there has been a genuine problem and the authority never + received the request. It is worth telephoning the authority and politely + checking that they received the request. It was sent to them by email. + </li> + <li>If they have not received it, the problem is most likely due to + "spam filters". Refer the authority to the measures in the answer + '<a href="/help/officers#spam_problems">I can see a request on WhatDoTheyKnow, but we never got it by email!</a>' + in the FOI officers section of this help. + </li> + <li>If you're still having no luck, then you can ask for an internal review, + and then complain to the Information Commissioner about the authority. + Read our page '<a href="/help/unhappy">Unhappy about the response you got?</a>'. + </ul> + </dd> + + <dt id="not_satifised">What if I'm not satisfied with the response? <a href="#not_satifised">#</a> </dt> + <dd>If you didn't get the information you asked for, or you didn't get it in time, + then read our page '<a href="/help/unhappy">Unhappy about the response you got?</a>'. + </dd> + + <dt id="reuse">It says I can't re-use the information I got!<a href="#reuse">#</a> </dt> + <dd> + <p>Authorities often add legal boilerplate about the + "<a href="http://www.opsi.gov.uk/si/si2005/20051515">Re-Use of Public Sector + Information Regulations 2005</a>", which at first glance implies you may not + be able do anything with the information. + </p> + + <p>You can, of course, write articles about the information or summarise it, or + quote parts of it. We also think you should feel free to republish the + information in full, just as we do, even though in theory you might not be + allowed to do so. See <a href="/help/officers#copyright">our policy on copyright</a>.</p> + + </dd> + + <dt id="ico_help">Can you tell me more of the nitty gritty about the process of making requests? <a href="#ico_help">#</a> </dt> + + <dd> + <p>Have a look at the + <a href="http://www.ico.gov.uk/for_the_public/access_to_official_information.aspx">access to official information</a> + pages on the Information Commissioner's website.</p> + + <p>If you're requesting information from a Scottish public authority, + the process is very similar. There are differences around time + limits for compliance. + See the <a href="http://www.itspublicknowledge.info/nmsruntime/saveasdialog.asp?lID=1858&sID=321">Scottish + Information Commissioner's guidance</a> for details.</p> + </dd> + + <dt id="data_protection">Can I request information about myself? <a href="#data_protection">#</a> </dt> + + <dd> + <p>No. Requests made using WhatDoTheyKnow are public, made under the Freedom of + Information Act, and cannot help you find information about a private + individual.</p> + + <p>If you would like to know what information a public + authority holds about yourself, you should make a "Subject Access Request" in + private using Data Protection law. The leaflet "<a + href="http://www.ico.gov.uk/upload/documents/library/data_protection/introductory/subject_access_rights.pdf">How to access your information</a>" (on the Information Commissioner's + website) explains how to do this.</p> + + <p>If you see that somebody has included personal information, perhaps + unwittingly, in a request, please <a href="/help/contact">contact us</a> + immediately so we can remove it.</p> + </dd> + + + <dt id="private_requests">I'd like to keep my request secret! (At least until I publish my story) <a href="#private_requests">#</a> </dt> + + <dd><p>WhatDoTheyKnow is currently only designed for public requests. All + responses that we receive are automatically published on the website for anyone + to read. </p> + <p>You should contact the public authority directly if you would like to + make a request in private. If you're interested in buying a system which helps + you manage FOI requests in secret, then <a href="/help/contact">contact us</a>. + </p> + </dd> + + <dt id="eir">Why can I only request information about the environment from some authorities? <a href="#eir">#</a> </dt> + + <dd> + <p>Some public authorities, such as <a href="http://www.whatdotheyknow.com/body/south_east_water">South East Water</a>, + don't come under the Freedom of Information Act, but do come under another law called + the Environmental Information Regulations (EIR). + </p> + + <p>It's a very similar law, so you make a request + to them using WhatDoTheyKnow in just the same way as an FOI request. The only + difference is that on the page where your write you request, it reminds you + that you can only request "environmental information" and tells you what that + means. It is quite broad. + </p> + + <p>You can, of course, request environmental information from other + authorities. Just make a Freedom of Information (FOI) request as normal. The + authority has a duty to work out if the Environmental Information Regulations + (EIR) is the more appropriate legislation to reply under. + </p> + </dd> + + <dt id="multiple">Can I make the same to request to lots of authorities, e.g. all councils? <a href="#multiple">#</a> </dt> + + <dd>We ask you to first send a test version of your request to a few + authorities. Their responses will help you improve the wording of your request, + so that you get the best information when you send the request to all of + the authorities. There is currently no automated system for sending the request + to the other authorities, you must copy and paste it by hand. + + </dd> + + <dt id="offsite">I made a request off the site, how do I upload it to the archive?<a href="#offsite">#</a> </dt> + + <dd>WhatDoTheyKnow is an archive of requests made through the site, + and does not try to be an archive of all FOI requests. We'll never support uploading + other requests. For one thing, we wouldn't be able to verify that other + responses actually came from the authority. If this really matters to you, + you can always make the same request again via WhatDoTheyKnow. + </dd> + + <dt id="moderation">How do you moderate request annotations? <a href="#moderation">#</a> </dt> + + <dd> + <p>Annotations on WhatDoTheyKnow are to help + people get the information they want, or to give them pointers to places they + can go to help them act on it. We reserve the right to remove anything else. + </p> + <p>Endless, political discussions are not allowed. + Post a link to a suitable forum or campaign site elsewhere.</p> + <dd> + + </dl> + + <p><strong>Next</strong>, read about <a href="/help/privacy">your privacy</a> --> + + <div id="hash_link_padding"></div> +</div> diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml index 94ec5a956..cee98711e 100644 --- a/app/views/layouts/default.rhtml +++ b/app/views/layouts/default.rhtml @@ -1,8 +1,8 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html lang="<%= I18n.locale %>"> <head> + <script type="text/javascript" src="/javascripts/jquery.js"></script> <% if @profile_photo_javascript %> - <script type="text/javascript" src="/javascripts/jquery.js"></script> <script type="text/javascript" src="/javascripts/jquery.Jcrop.js"></script> <script type="text/javascript" src="/javascripts/profile_photo.js"></script> <link rel="stylesheet" href="/stylesheets/jquery.Jcrop.css" type="text/css" > @@ -17,16 +17,25 @@ </title> <link rel="shortcut icon" href="/favicon.ico"> - - <%= stylesheet_link_tag 'main', :title => "Main", :rel => "stylesheet" %> + <%= stylesheet_link_tag 'main', :title => "Main", :rel => "stylesheet" %> + <%= stylesheet_link_tag 'fonts', :rel => "stylesheet" %> + <%= stylesheet_link_tag 'theme', :rel => "stylesheet" %> + <%= javascript_include_tag 'jquery.js', 'jquery-ui.min','jquery.cookie.js', 'general.js' %> + <%= stylesheet_link_tag 'admin-theme/jquery-ui-1.8.15.custom.css', :rel => 'stylesheet'%> <!--[if LT IE 7]> <style type="text/css">@import url("/stylesheets/ie6.css");</style> <![endif]--> <!--[if LT IE 7]> <style type="text/css">@import url("/stylesheets/ie6-custom.css");</style> <![endif]--> + <!--[if LT IE 8]> + <style type="text/css">@import url("/stylesheets/ie7.css");</style> + <![endif]--> <%= stylesheet_link_tag 'custom', :title => "Main", :rel => "stylesheet" %> - + <% if force_registration_on_new_request %> + <%= stylesheet_link_tag 'jquery.fancybox-1.3.4', :rel => "stylesheet" %> + <% end %> + <% if @feed_autodetect %> <% for feed in @feed_autodetect %> <link rel="alternate" type="application/atom+xml" title="<%=h feed[:title] %>" href="<%=h feed[:url]%>"> @@ -45,8 +54,30 @@ <%= render :partial => 'general/before_head_end' %> </head> - <body> + <body <%= "class='front'" if params[:action] == 'frontpage' %>> + <!-- XXX: move to a separate file --> + <% if force_registration_on_new_request && !@user %> + <%= javascript_include_tag 'jquery.fancybox-1.3.4.pack' %> + <script type="text/javascript"> + $(document).ready(function() { + $("#make-request-link").fancybox({ + 'modal': false, + 'width': 900, + 'height': 400, + 'type': 'iframe', + 'href': '/en/profile/sign_in?modal=1', + 'onClosed': function() { + // modal_signin_successful variable set by modal dialog box + if (typeof modal_signin_successful != 'undefined' ) { + window.location.href = '<%= select_authority_url %>'; + } + } + }); + }); + </script> + <% end %> + <% # code for popup advert for a campaign etc. =begin <div id="everypage" class="jshide"> @@ -57,59 +88,52 @@ =end %> <div class="entirebody"> - <div id="banner"></div> - <div id="header"> - <h1> - <%= link_to site_name, frontpage_url %> - </h1> + <div id="banner"> + <div id="banner_inner"> + <div class="lang"><%= render :partial => 'general/locale_switcher' %></div> + + <% if not (controller.action_name == 'signin' or controller.action_name == 'signup') %> + <div id="logged_in_bar"> + <% if @user %> + <%= _('Hello, {{username}}!', :username => h(@user.name))%> - <div id="tagline"> - <%= _('Make and explore Freedom of Information requests') %> - </div> + <% if @user %> + <%=link_to _("My profile"), user_url(@user) %> + <% end %> - </div> - <div id="orglogo"> - <%= render :partial => 'general/orglink' %> - </div> - <div class="lang"><%= render :partial => 'general/locale_switcher' %></div> - - <div id="navigation_search"> - <% form_tag({:controller => "general", :action => "search_redirect"}, {:id => "navigation_search_form"}) do %> - <p> - <%= text_field_tag 'query', params[:query], { :size => 40, :id => "navigation_search_query" } %> - <%= submit_tag _("Search") %> - </p> - <% end %> - </div> - <div id="topnav"> - <ul id="navigation"> - <li><%= link_to _("Make request"), frontpage_url %></li> - <li><%= link_to _("View requests"), request_list_successful_url %></li> - <li><%= link_to _("View authorities"), list_public_bodies_default %></li> - <% if @user %> - <li><%=link_to _("My requests"), user_url(@user) %></li> - <% end %> - <li><%= link_to _("Read blog"), blog_url %></li> - <li><%= link_to _("Help"), help_about_url %></li> - </ul> - <% if not (controller.action_name == 'signin' or controller.action_name == 'signup') %> - <div id="logged_in_bar"> - <% if @user %> - <%= _('Hello, {{username}}!', :username => h(@user.name))%> - (<%= link_to _("Sign out"), signout_url(:r => request.request_uri) %>) - <% else %> - <%= _('Hello!') %> - (<%= link_to _("Sign in or sign up"), signin_url(:r => request.request_uri) %>) + <%= link_to _("Sign out"), signout_url(:r => request.request_uri) %> + <% else %> + <%= link_to _("Sign in or sign up"), signin_url(:r => request.request_uri) %> + <% end %> + </div> + <% end %> + + <div id="navigation_search"> + <% form_tag({:controller => "general", :action => "search_redirect"}, {:id => "navigation_search_form"}) do %> + <p> + <%= text_field_tag 'query', params[:query], { :size => 40, :id => "navigation_search_query" } %> + <%= image_submit_tag('search-button.png') %> + </p> <% end %> - </div> - <% end %> + </div> + + <%= render :partial => 'general/orglink' %> + + <div id="topnav"> + <ul id="navigation"> + <li class="<%= 'selected' if params[:controller] == 'general' and params[:action] != 'blog' %>"><%= link_to _("Home"), frontpage_url %></li> + <li class="<%= 'selected' if params[:controller] == 'request' and ['new', 'select_authority'].include?(params[:action]) %>"><%= link_to _("Make a request"), select_authority_url, :id => 'make-request-link' %></li> + <li class="<%= 'selected' if params[:controller] == 'request' and !['new', 'select_authority'].include?(params[:action]) %>"><%= link_to _("View requests"), request_list_successful_url %></li> + <li class="<%= 'selected' if params[:controller] == 'public_body' %>"><%= link_to _("View authorities"), list_public_bodies_default %></li> + <li class="<%= 'selected' if params[:controller] == 'general' and params[:action] == 'blog' %>"><%= link_to _("Read blog"), blog_url %></li> + <li class="<%= 'selected' if params[:controller] == 'help' %>"><%= link_to _("Help"), help_about_url %></li> + </ul> + </div> + </div> </div> - <div id="wrapper"> - <div id="content"> - <% if flash[:notice] %> <div id="notice"><%= flash[:notice] %></div> <% end %> @@ -118,13 +142,15 @@ <% end %> <div id="<%= controller.controller_name + "_" + controller.action_name %>" class="controller_<%= controller.controller_name %>"> - <%= yield :layout %> + <div id="other-country-notice"></div> + <%= yield :layout %> </div> </div> </div> <div id="footer"> <%= link_to _("Contact {{site_name}}", :site_name => site_name), help_contact_url %> + | <img src="/images/twitter-16.png" alt="twitter icon" class="twitter-icon"> <a href="http://www.twitter.com/<%= MySociety::Config.get('TWITTER_USERNAME') %>"><%= _("Follow us on twitter") %></a> <%= render :partial => 'general/credits' %> </div> <div class="after-footer"> </div> @@ -133,3 +159,4 @@ </div> </body> </html> + diff --git a/app/views/layouts/no_chrome.rhtml b/app/views/layouts/no_chrome.rhtml new file mode 100644 index 000000000..74c79b701 --- /dev/null +++ b/app/views/layouts/no_chrome.rhtml @@ -0,0 +1,41 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> +<html lang="<%= I18n.locale %>"> + <head> + <title> + <% if @title %> + <%=@title%> - <%= site_name %> + <% else %> + <%= site_name %> - <%= _('Make and browse Freedom of Information (FOI) requests') %> + <% end %> + </title> + + <script type="text/javascript" src="/javascripts/jquery.js"></script> + + <%= stylesheet_link_tag 'main', :title => "Main", :rel => "stylesheet" %> + <%= stylesheet_link_tag 'fonts', :rel => "stylesheet" %> + <%= stylesheet_link_tag 'theme', :rel => "stylesheet" %> + <!--[if LT IE 7]> + <style type="text/css">@import url("/stylesheets/ie6.css");</style> + <![endif]--> + <!--[if LT IE 7]> + <style type="text/css">@import url("/stylesheets/ie6-custom.css");</style> + <![endif]--> + <%= stylesheet_link_tag 'custom', :title => "Main", :rel => "stylesheet" %> + </head> + <body> + <div class="entirebody"> + <div id="content"> + <% if flash[:notice] %> + <div id="notice"><%= flash[:notice] %></div> + <% end %> + <% if flash[:error] %> + <div id="error"><%= flash[:error] %></div> + <% end %> + + <div id="<%= controller.controller_name + "_" + controller.action_name %>" class="controller_<%= controller.controller_name %>"> + <%= yield :layout %> + </div> + </div> + </div> + </body> +</html>
\ No newline at end of file diff --git a/app/views/public_body/_body_listing.rhtml b/app/views/public_body/_body_listing.rhtml index 48b6e8245..864ab8c9b 100644 --- a/app/views/public_body/_body_listing.rhtml +++ b/app/views/public_body/_body_listing.rhtml @@ -1,5 +1,7 @@ <% if public_bodies.empty? %> + <p> <%= _("None found.")%> + </p> <% else %> <% for public_body in public_bodies %> <%= render :partial => 'public_body/body_listing_single', :locals => { :public_body => public_body } %> diff --git a/app/views/public_body/_search_ahead.rhtml b/app/views/public_body/_search_ahead.rhtml new file mode 100644 index 000000000..19c7eb4e8 --- /dev/null +++ b/app/views/public_body/_search_ahead.rhtml @@ -0,0 +1,18 @@ +<p> + <% if @xapian_requests.results.size > 0 %> + <h3><%= _('Top search results:') %></h3> + <p> + <%= _('Select one to see more information about the authority.')%> + </p> + <% else %> + <h3><%= _('No results found.') %></h3> + <% end %> + <div id="authority_search_ahead_results"> + <% for result in @xapian_requests.results %> + <%= render :partial => 'body_listing_single', :locals => { :public_body => result[:model] } %> + <% end %> + </div> +</p> + + + diff --git a/app/views/public_body/list.rhtml b/app/views/public_body/list.rhtml index 5d88b1501..bb17b544f 100644 --- a/app/views/public_body/list.rhtml +++ b/app/views/public_body/list.rhtml @@ -1,8 +1,7 @@ -<div id="body_sidebar"> +<div id="right_column"> + <h2><%=_('Show only...')%></h2> - <h1><%=_('Show only...')%></h1> - - <h2><%=_('Alphabet') %></h2> + <h3><%=_('Beginning with') %></h3> <ul><li> <%= render :partial => 'alphabet' %> </li></ul> @@ -19,7 +18,7 @@ <% else %> <% first_row = false %> <% end %> - <h2><%=h row%></h2> + <h3><%=h row%></h3> <ul> <% end %> <% end %> @@ -31,24 +30,22 @@ <p> <%= link_to _('List of all authorities (CSV)'), all_public_bodies_csv_url() %> </p> - </div> <% @title = _("Public authorities - {{description}}", :description => @description) %> - -<h1><%=@title%></h1> - -<p class="subtitle"> - <%= @public_bodies.size %> <%= _('in total') %> - (<%= _('<a href="%s">can\'t find the one you want?</a>') % [help_requesting_path + '#missing_body'] %>) -</p> - -<% if @tag.size == 1 %> - <p><%= render :partial => 'alphabet' %></p> +<div id="left_column"> +<h1><%= _('Public authorities') %></h1> + +<% form_tag(list_public_bodies_default_url, :method => "get", :id=>"search_form") do %> + <div> + <%= text_field_tag(:public_body_query, params[:public_body_query]) %> + <%= submit_tag(_("Search")) %> + </div> <% end %> + +<h2 class="publicbody_results"><%= _('Found {{count}} public bodies {{description}}', :count=>@public_bodies.size, :description=>@description) %></h2> <%= render :partial => 'body_listing', :locals => { :public_bodies => @public_bodies } %> -<% if @tag.size == 1 && @public_bodies.size > 0 %> - <p><%= render :partial => 'alphabet' %></p> -<% end %> -<%= will_paginate(@public_bodies) %> + <%= will_paginate(@public_bodies) %><br/> + <%= _('<a href="%s">Can\'t find the one you want?</a>') % [help_requesting_path + '#missing_body'] %> +</div> diff --git a/app/views/public_body/show.rhtml b/app/views/public_body/show.rhtml index 36bba8851..ab8eb3826 100644 --- a/app/views/public_body/show.rhtml +++ b/app/views/public_body/show.rhtml @@ -1,70 +1,74 @@ <% @title = h(@public_body.name) + " - view and make Freedom of Information requests" %> -<div id="request_sidebar"> - <h2><%= _('Track this authority')%></h2> - <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'sidebar' } %> - <h2><%= _('More about this authority')%></h2> - <% if !@public_body.calculated_home_page.nil? %> - <%= link_to _('Home page of authority'), @public_body.calculated_home_page %><br> - <% end %> - <% if !@public_body.publication_scheme.empty? %> - <%= link_to _('Publication scheme'), @public_body.publication_scheme %><br> - <% end %> - <% if @public_body.has_tag?("charity") %> - <% for tag_value in @public_body.get_tag_values("charity") %> - <% if tag_value.match(/^SC/) %> - <%= link_to _('Charity registration'), "http://www.oscr.org.uk/CharityIndexDetails.aspx?id=" + tag_value %><br> - <% else %> - <%= link_to _('Charity registration'), "http://www.charity-commission.gov.uk/SHOWCHARITY/RegisterOfCharities/CharityFramework.aspx?RegisteredCharityNumber=" + tag_value %><br> - <% end %> - <% end %> - <% end %> - <%= link_to _('View FOI email address'), view_public_body_email_url(@public_body.url_name) %><br> -</div> +<div id="main_content"> + <div id="header_right"> + <h2><%= _('Follow this authority')%></h2> -<h1><%=h(@public_body.name)%></h1> + <% follower_count = TrackThing.count(:all, :conditions => ["public_body_id = ?", @public_body.id]) %> + <p><%= n_("There is %d person following this authority", "There are %d people following this authority", follower_count) % follower_count %></p> -<p class="subtitle"> -<%=@public_body.type_of_authority(true)%> -<% if not @public_body.short_name.empty? %>, -<%= _('also called {{public_body_short_name}}', :public_body_short_name => h(@public_body.short_name))%><% end %> -<% if !@user.nil? && @user.admin_page_links? %> -(<%= link_to _("admin"), public_body_admin_url(@public_body) %>) -<% end %> -</p> + <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'sidebar' } %> + <h2><%= _('More about this authority')%></h2> + <% if !@public_body.calculated_home_page.nil? %> + <%= link_to _('Home page of authority'), @public_body.calculated_home_page %><br> + <% end %> + <% if !@public_body.publication_scheme.empty? %> + <%= link_to _('Publication scheme'), @public_body.publication_scheme %><br> + <% end %> + <% if @public_body.has_tag?("charity") %> + <% for tag_value in @public_body.get_tag_values("charity") %> + <% if tag_value.match(/^SC/) %> + <%= link_to _('Charity registration'), "http://www.oscr.org.uk/CharityIndexDetails.aspx?id=" + tag_value %><br> + <% else %> + <%= link_to _('Charity registration'), "http://www.charity-commission.gov.uk/SHOWCHARITY/RegisterOfCharities/CharityFramework.aspx?RegisteredCharityNumber=" + tag_value %><br> + <% end %> + <% end %> + <% end %> + <%= link_to _('View FOI email address'), view_public_body_email_url(@public_body.url_name) %><br> + </div> -<% if @public_body.has_notes? && (@public_body.is_requestable? || @public_body.not_requestable_reason == 'bad_contact') %> - <p><%= @public_body.notes_as_html %></p> -<% end %> + <div id="header_left"> + <p class="public-body-name-prefix">Freedom of information requests to</p> + <h1><%=h(@public_body.name)%></h1> -<% if @public_body.eir_only? %> - <p><%= _('You can only request information about the environment from this authority.')%></p> -<% end %> + <p class="subtitle"> + <%=@public_body.type_of_authority(true)%> + <% if not @public_body.short_name.empty? %>, + <%= _('also called {{public_body_short_name}}', :public_body_short_name => h(@public_body.short_name))%><% end %> + <% if !@user.nil? && @user.admin_page_links? %> + (<%= link_to _("admin"), public_body_admin_url(@public_body) %>) + <% end %> + </p> -<div id="stepwise_make_request"> - <strong> - <% if @public_body.is_requestable? || @public_body.not_requestable_reason == 'bad_contact' %> - <% if @public_body.eir_only? %> - <%= link_to _("Make a new Environmental Information request"), new_request_to_body_url(:url_name => @public_body.url_name)%> to <%= h(@public_body.name) %> + <% if @public_body.has_notes? && (@public_body.is_requestable? || @public_body.not_requestable_reason == 'bad_contact') %> + <p><%= @public_body.notes_as_html %></p> + <% end %> + + <% if @public_body.eir_only? %> + <p><%= _('You can only request information about the environment from this authority.')%></p> + <% end %> + <div id="stepwise_make_request"> + <% if @public_body.is_requestable? || @public_body.not_requestable_reason == 'bad_contact' %> + <% if @public_body.eir_only? %> + <%= _('Make a new <strong>Environmental Information</strong> request')%> + <% else %> + <%= _('Make a new <strong>Freedom of Information</strong> request to {{public_body}}', :public_body => h(@public_body.name))%> + <% end %> + <%= _('<a class="link_button_green" href="{{url}}">{{text}}</a>', :url=>new_request_to_body_url(:url_name => @public_body.url_name), :text=>_("Start"))%> + <% elsif @public_body.has_notes? %> + <%= @public_body.notes_as_html %> + <% elsif @public_body.not_requestable_reason == 'not_apply' %> + <%= _('Freedom of Information law does not apply to this authority, so you cannot make + a request to it.')%> + <% elsif @public_body.not_requestable_reason == 'defunct' %> + <%= _('This authority no longer exists, so you cannot make a request to it.')%> <% else %> - <%= _('<a href="{{url}}">Make a new Freedom of Information request</a> to {{public_body_name}}', - :public_body_name => h(@public_body.name), :url=>new_request_to_body_url(:url_name => @public_body.url_name))%> + <%= _('For an unknown reason, it is not possible to make a request to this authority.')%> <% end %> - <% elsif @public_body.has_notes? %> - <%= @public_body.notes_as_html %> - <% elsif @public_body.not_requestable_reason == 'not_apply' %> - <%= _('Freedom of Information law does not apply to this authority, so you cannot make - a request to it.')%> - <% elsif @public_body.not_requestable_reason == 'defunct' %> - <%= _('This authority no longer exists, so you cannot make a request to it.')%> - <% else %> - <%= _('For an unknown reason, it is not possible to make a request to this authority.')%> - <% end %> - </strong> -</div> + </div> + </div> -<% if !@xapian_requests.nil? %> - <% if @xapian_requests.results.empty? %> + <% if @public_body.info_requests.size == 0 %> <% if @public_body.eir_only? %> <h2><%= _('Environmental Information Regulations requests made using this site') %></h2> <p>Nobody has made any Environmental Information Regulations requests to <%=h(@public_body.name)%> using this site yet.</p> @@ -73,14 +77,27 @@ <p><%= _('Nobody has made any Freedom of Information requests to {{public_body_name}} using this site yet.', :public_body_name => h(@public_body.name))%></p> <% end %> <% else %> - <h2> + <h2 class="foi_results"> + <% if @public_body.eir_only? %> <%= pluralize(@public_body.info_requests.size, "Environmental Information Regulations request made using this site") %> <% else %> - <%= n_('%d Freedom of Information request made using this site', '%d Freedom of Information requests made using this site', @public_body.info_requests.size) % @public_body.info_requests.size %> + <% if @public_body.info_requests.size > 1 %> + <%= n_('Search within the %d Freedom of Information requests to %s', 'Search within the %d Freedom of Information requests made to %s', @public_body.info_requests.size) % [@public_body.info_requests.size, @public_body.name] %> + <% else %> + <%= n_('%d Freedom of Information request to %s', '%d Freedom of Information requests to %s', @public_body.info_requests.size) % [@public_body.info_requests.size, @public_body.name] %> + <% end %> <% end %> <%= @page_desc %> </h2> + <% if @public_body.info_requests.size > 1 %> + <%= render :partial => 'request/request_filter_form' %> + <% end %> + <% end %> + +</div> +<div style="clear:both"> </div> +<% if !@xapian_requests.nil? %> <% for result in @xapian_requests.results %> <%= render :partial => 'request/request_listing_via_event', :locals => { :event => result[:model], :info_request => result[:model].info_request } %> @@ -88,9 +105,12 @@ <%= will_paginate WillPaginate::Collection.new(@page, @per_page, @public_body.info_requests.size) %> - <p> <%= _('Only requests made using {{site_name}} are shown.', :site_name => site_name) %></p> + <% if @xapian_requests.results.empty? %> + <p><% _('There were no requests matching your query.') %></p> + <% else %> + <p> <%= _('Only requests made using {{site_name}} are shown.', :site_name => site_name) %></p> + <% end %> - <% end %> <% else %> <% if @public_body.eir_only? %> <h2><%= _('Environmental Information Regulations requests made') %></h2> @@ -99,4 +119,3 @@ <% end %> <p> <%= _('The search index is currently offline, so we can\'t show the Freedom of Information requests that have been made to this authority.')%></p> <% end %> - diff --git a/app/views/request/_next_actions.rhtml b/app/views/request/_next_actions.rhtml new file mode 100644 index 000000000..f318df6e4 --- /dev/null +++ b/app/views/request/_next_actions.rhtml @@ -0,0 +1 @@ +<!-- Consider listing websites that users might find useful here (in your theme) --> diff --git a/app/views/request/_request_filter_form.rhtml b/app/views/request/_request_filter_form.rhtml new file mode 100644 index 000000000..ac133889d --- /dev/null +++ b/app/views/request/_request_filter_form.rhtml @@ -0,0 +1,52 @@ +<%= render :partial => 'general/localised_datepicker' %> + +<div id="list-filter"> + <% form_tag(request.path, :method => "get", :id=>"filter_requests_form") do %> + <div class="list-filter-item"> + <%= label_tag(:query, _("Keywords"), :class=>"form_label title") %> + <%= text_field_tag(:query, params[:query]) %> + </div> +<% if false # don't think we want this, but leaving as an example %> + <div class="list-filter-item"> + <%= _("Search for words in:") %> <br/> + <% [["sent", _("messages from users")], + ["response", _("messages from authorities")], + ["comment", _("comments")]].each_with_index do |item, index| + variety, title = item %> + + <%= check_box_tag "request_variety[]", variety, params[:request_variety].nil? ? true : params[:request_variety].include?(variety), :id => "request_variety_#{index}" %> + <%= label_tag("request_variety_#{index}", title) %> <br/> + <% end %> + </div> +<% end %> + <div class="list-filter-item"> + <%= label_tag(:query, _("Made between"), :class=>"form_label title") %> + <%= text_field_tag(:request_date_after, params[:request_date_after], {:class => "use-datepicker", :size => 10}) %> + <%= label_tag(:query, _("and"), :class=>"form_label") %> + <%= text_field_tag(:request_date_before, params[:request_date_before], {:class => "use-datepicker", :size => 10}) %> + </div> + <div class="list-filter-item"> + <h3 class="title">Showing</h3> + <% statuses = [["all", _("all requests")], + ["successful", _("successful requests")], + ["unsuccessful", _("unsuccessful requests")], + ["awaiting", _("unresolved requests")]] %> + <% for status, label in statuses %> + <% if params[:view] != status %> + <% if params[:controller] == "public_body" %> + <%= link_to label, url_for(:controller => "public_body", :action => "show", :view => status, :url_name => @public_body.url_name) + "?" + request.query_string %> + <% else %> + <%= link_to label, url_for(:controller => "request", :action => "list", :view => status) + "?" + request.query_string %> + <% end %> + <% else %> + <%= label %> + <% end %> + <%= "|" unless statuses.last[0] == status %> + <% end %> + </div> + + <div class="list-filter-item"> + <%= submit_tag(_("Search")) %> + </div> +<% end %> +</div> diff --git a/app/views/request/_request_listing_via_event.rhtml b/app/views/request/_request_listing_via_event.rhtml index afacabea5..e7c378cec 100644 --- a/app/views/request/_request_listing_via_event.rhtml +++ b/app/views/request/_request_listing_via_event.rhtml @@ -3,7 +3,8 @@ end %> <div class="request_listing"> - <span class="head"> + <div class="request_left"> + <span class="head"> <% if event.is_incoming_message? %> <%= link_to highlight_words(info_request.title, @highlight_words), incoming_message_url(event.incoming_message) %> <% elsif event.is_outgoing_message? and event.event_type == 'followup_sent' %> @@ -13,18 +14,9 @@ end %> <% else %> <%= link_to highlight_words(info_request.title, @highlight_words), request_url(info_request) %> <% end %> - </span> - <span class="desc"> - <%= highlight_and_excerpt(event.search_text_main(true), @highlight_words, 150) %> - </span> - - <span class="bottomline icon_<%= info_request.calculate_status %>"> - - <strong> - <%= info_request.display_status %> - </strong><br> - - <% if event.event_type == 'sent' %> + </span> + <div class="requester"> + <% if event.event_type == 'sent' %> <%= _('Request sent to {{public_body_name}} by {{info_request_user}} on {{date}}.',:public_body_name=>public_body_link_absolute(info_request.public_body),:info_request_user=>user_link_absolute(info_request.user),:date=>simple_date(event.created_at )) %> <% elsif event.event_type == 'followup_sent' %> <%=event.display_status %> @@ -37,6 +29,17 @@ end %> <% else %> <% raise _("unknown event type indexed ") + event.event_type %> <% end %> + </div> + <span class="bottomline icon_<%= info_request.calculate_status %>"> + <strong> + <%= info_request.display_status %> + </strong><br> </span> + </div> + <div class="request_right"> + <span class="desc"> + <%= highlight_and_excerpt(event.search_text_main(true), @highlight_words, 150) %> + </span> + </div> </div> diff --git a/app/views/request/_search_ahead.rhtml b/app/views/request/_search_ahead.rhtml new file mode 100644 index 000000000..9c49680c3 --- /dev/null +++ b/app/views/request/_search_ahead.rhtml @@ -0,0 +1,12 @@ +<div id="request_search_ahead_results"> + <% if @xapian_requests.results.size > 0 %> + <h3><%= _("Possibly related requests:") %></h3> + <% end %> + <% for result in @xapian_requests.results %> + <%= render :partial => 'request/request_listing_short_via_event', :locals => { :event => result[:model], :info_request => result[:model].info_request } %> + <% end %> + + <p> + <a id="body-site-search-link" target="_blank"><%= _("Or search in their website for this information.") %></a> + </p> +</div> diff --git a/app/views/request/_sidebar.rhtml b/app/views/request/_sidebar.rhtml index 2b9652d9c..62ece4821 100644 --- a/app/views/request/_sidebar.rhtml +++ b/app/views/request/_sidebar.rhtml @@ -1,33 +1,27 @@ -<div id="request_sidebar"> - <h2><%= _('Track this request') %></h2> +<div id="right_column"> + <h2><%= _('Follow this request') %></h2> + + <% follower_count = TrackThing.count(:all, :conditions => ["info_request_id = ?", @info_request.id]) + 1 %> + <p><%= n_("There is %d person following this request", "There are %d people following this request", follower_count) % follower_count %></p> <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => @info_request.user == @user, :location => 'sidebar' } %> <h2><%= _("Act on what you've learnt") %></h2> + <div class="act_link"> - <%= link_to '<img src="/images/helpmeinvestigate.png" alt="" class="rss">', "http://helpmeinvestigate.com/"%> - <%= link_to 'Get help investigating', "http://helpmeinvestigate.com/"%> - </div> - <div class="act_link"> - <%= link_to '<img src="/images/writetothem.png" alt="" class="rss">', "http://www.writetothem.com"%> - <%= link_to 'Write to your politician', "http://www.writetothem.com"%> - </div> - <div class="act_link"> - <%= link_to '<img src="/images/pledgebank.png" alt="" class="rss">', "http://www.pledgebank.com"%> - <%= link_to 'Pledge with others', "http://www.pledgebank.com"%> + <% tweet_link = "http://twitter.com/share?url=#{h(request.url)}&via=#{h(MySociety::Config.get('TWITTER_USERNAME', ''))}&text='#{h(@info_request.title)}'&related=#{_('alaveteli_foi:The software that runs {{site_name}}', :site_name => h(site_name))}" %> + <%= link_to '<img src="/images/twitter-16.png" alt="twitter icon">', tweet_link %> + <%= link_to _("Tweet this request"), tweet_link %> </div> - <!-- <div class="act_link"> - <%= link_to '<img src="/images/petitions.png" alt="" class="rss">', "http://petitions.number10.gov.uk"%> - <%= link_to 'Petition the PM', "http://petitions.number10.gov.uk"%> - </div> --> <div class="act_link"> <%= link_to '<img src="/images/wordpress.png" alt="" class="rss">', "http://wordpress.com/"%> - <%= link_to 'Start your own blog', "http://wordpress.com/"%> + <%= link_to _("Start your own blog"), "http://wordpress.com/"%> </div> + <%= render :partial => 'request/next_actions' %> <% view_cache :ttl => 1.day, :tag => ['similar', @info_request.id, I18n.locale] do %> <% if !@xapian_similar.nil? && @xapian_similar.results.size > 0 %> - <h2><% _('Similar requests')%></h2> + <h2><%= _('Similar requests')%></h2> <% for result in @xapian_similar.results %> <%= render :partial => 'request/request_listing_short_via_event', :locals => { :event => result[:model], :info_request => result[:model].info_request } %> <% end %> diff --git a/app/views/request/list.rhtml b/app/views/request/list.rhtml index 04dc0d010..0137cb6dd 100644 --- a/app/views/request/list.rhtml +++ b/app/views/request/list.rhtml @@ -1,40 +1,35 @@ -<div id="list_sidebar"> -<h1><%= _('Show only...')%></h1> -<ul> -<% for view, description, target in [ - ['successful', _('Successful responses'), request_list_successful_url(:view => 'successful')], - ['recent', _('Recently sent requests'), request_list_recent_url(:view => 'recent')] -] %> -<li> - <%= link_to_unless (@view == view), description, target %> -</li> -<% end %> -</ul> + +<div id="header_left"> + <h1><%=@title%></h1> + <%= render :partial => 'request/request_filter_form' %> </div> -<h1><%=@title%></h1> +<div id="header_right"> + <h2><%= _("Follow these requests") %></h2> + <% if @track_thing %> + <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'main' } %> + <% end %> +</div> -<% if @track_thing %> - <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'main' } %> -<% end %> +<div style="clear:both"></div> -<% view_cache :ttl => 5.minutes, :tag => [@view, @page, I18n.locale] do %> - <% if @list_results.empty? %> - <p> <%= _('No requests of this sort yet.')%></p> - <% else %> - <% for result in @list_results%> - <% if result.class.to_s == 'InfoRequestEvent' %> - <%= render :partial => 'request/request_listing_via_event', :locals => { :event => result, :info_request => result.info_request } %> - <% else %> - <p><strong><%= _('Unexpected search result type') %> <%=result.class.to_s%></strong></p> +<div class="results_section"> + <% view_cache :ttl => 5.minutes, :tag => [@view, @page, I18n.locale] do %> + <% if @list_results.empty? %> + <p> <%= _('No requests of this sort yet.')%></p> + <% else %> + <h2 class="foi_results"><%= _('{{count}} FOI requests found', :count => @list_results.size) %></h2> + <div class="results_block"> + <% for result in @list_results%> + <% if result.class.to_s == 'InfoRequestEvent' %> + <%= render :partial => 'request/request_listing_via_event', :locals => { :event => result, :info_request => result.info_request } %> + <% else %> + <p><strong><%= _('Unexpected search result type') %> <%=result.class.to_s%></strong></p> + <% end %> <% end %> - <% end %> - <% end %> + </div> + <% end %> - <%= will_paginate WillPaginate::Collection.new(@page, @per_page, @matches_estimated) %> -<% end %> - -<% if @track_thing %> - <p></p> - <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'main' } %> -<% end %> + <%= will_paginate WillPaginate::Collection.new(@page, @per_page, @matches_estimated) %> + <% end %> +</div> diff --git a/app/views/request/new.rhtml b/app/views/request/new.rhtml index b8625a8e6..79002e843 100644 --- a/app/views/request/new.rhtml +++ b/app/views/request/new.rhtml @@ -1,3 +1,22 @@ +<script type="text/javascript" src="/javascripts/ba-throttle-debounce.js"></script> +<script type="text/javascript"> + $(document).ready(function(){ + // Avoid triggering too often (on each keystroke) by using the debounce jQuery plugin: + // http://benalman.com/projects/jquery-throttle-debounce-plugin/ + $("#typeahead_search").keypress($.debounce( 300, function() { + $("#typeahead_response").load("<%=search_ahead_url%>?q="+encodeURI(this.value), function() { + // When following links in typeahead results, open new tab/window + $("#typeahead_response a").attr("target","_blank"); + + // Update the public body site search link + $("#body-site-search-link").attr("href", "http://www.google.com/#q="+encodeURI($("#typeahead_search").val())+ + "+site:<%= @info_request.public_body.calculated_home_page %>"); + }); + })); + + }); +</script> + <% @title = _("Make an {{law_used_short}} request to '{{public_body_name}}'",:law_used_short=>h(@info_request.law_used_short),:public_body_name=>h(@info_request.public_body.name)) %> <% if @existing_request %> @@ -10,107 +29,90 @@ </ul></div> <% end %> -<%= foi_error_messages_for :info_request, :outgoing_message %> + <%= foi_error_messages_for :info_request, :outgoing_message %> -<div id="request_advice"> - <h1><%= _('Read this before writing your {{info_request_law_used_full}} request', :info_request_law_used_full=>h(@info_request.law_used_full)) %></h1> - <ul> - <li> - <% form_tag("http://www.google.co.uk/search", {:id => "search_body_website_form", :method => "get"} ) do %> - <p> - <%= _('First,') %> - <% if !@info_request.public_body.publication_scheme.empty? %> - <%= _('<strong>browse</strong> the authority\'s <a href="%s">publication scheme</a> or <strong>search</strong> their web site ...') % [@info_request.public_body.publication_scheme] %> + <h1><%= _('2. Ask for Information') %></h1> + + <% form_for(:info_request, @info_request, :html => { :id => 'write_form' } ) do |f| %> + + <div id="request_header"> + <div> + <label class="form_label" for="info_request_public_body_id"><%= _('To:') %></label> + <span id="to_public_body"><%=h(@info_request.public_body.name)%></span> + <div class="form_item_note"> + <% if @info_request.public_body.info_requests.size > 0 %> + <%= _("Browse <a href='{{url}}'>other requests</a> to '{{public_body_name}}' for examples of how to word your request.", :public_body_name=>h(@info_request.public_body.name), :url=>public_body_url(@info_request.public_body)) %> <% else %> - <%= _('<strong>search</strong> the authority\'s web site ...') %> + <%= _("Browse <a href='{{url}}'>other requests</a> for examples of how to word your request.", :url=>request_list_url) %> <% end %> - <% if !@info_request.public_body.calculated_home_page.nil? %> - <br> - <%= text_field_tag 'q', params[:q], { :size => 20 } %> - <%= hidden_field_tag 'as_sitesearch', @info_request.public_body.calculated_home_page %> - <%= submit_tag _("Search") %> - <% end %> - <br> - ... <%= _('to check that the info isn\'t already published.') %> - </p> - <% end %> - </li> + </div> + </div> - <li> - <% if @info_request.public_body.info_requests.size > 0 %> - <%= _("Browse <a href='{{url}}'>other requests</a> to '{{public_body_name}}' for examples of how to word your request.", :public_body_name=>h(@info_request.public_body.name), :url=>public_body_url(@info_request.public_body)) %> - <% else %> - <%= _('Browse <a href="%s">other requests</a> for examples of how to word your request.') % [request_list_url] %> + <div id="request_header_text"> + <% if @info_request.public_body.has_notes? %> + <h3><%= _('Special note for this authority!') %></h3> + <p><%= @info_request.public_body.notes_as_html %></p> <% end %> - </li> - <li><%= _('Write your request in <strong>simple, precise language</strong>.') %></li> - <li><%= _('Ask for <strong>specific</strong> documents or information, this site is not suitable for general enquiries.') %></li> - <li><%= _('Keep it <strong>focused</strong>, you\'ll be more likely to get what you want (<a href="%s">why?</a>).') % [help_requesting_path + '#focused'] %></li> - <li><%= _('This site is <strong>public</strong>. Everything you type and any response will be published.') %></li> - </ul> - - <% if @info_request.public_body.has_notes? %> - <h1><%= _('Special note for this authority!') %></h1> - <ul> - <li><p><%= @info_request.public_body.notes_as_html %></p></li> - </ul> - <% end %> - <% if @info_request.public_body.eir_only? %> - <h1><%= _('Please ask for environmental information only') %></h1> - - <p><%= _('The Freedom of Information Act <strong>does not apply</strong> to') %> <%=h(@info_request.public_body.name)%>. - <%= _('However, you have the right to request environmental - information under a different law') %> (<a href="/help/requesting#eir">explanation</a>). - <%= _('This covers a very wide spectrum of information about the state of - the <strong>natural and built environment</strong>, such as:') %> + <% if @info_request.public_body.eir_only? %> + <h3><%= _('Please ask for environmental information only') %></h3> + + <p><%= _('The Freedom of Information Act <strong>does not apply</strong> to') %> <%=h(@info_request.public_body.name)%>. + <%= _('However, you have the right to request environmental + information under a different law') %> (<a href="/help/requesting#eir">explanation</a>). + <%= _('This covers a very wide spectrum of information about the state of + the <strong>natural and built environment</strong>, such as:') %> + <ul> + <li><%= _('Air, water, soil, land, flora and fauna (including how these effect + human beings)') %></li> + <li><%= _('Information on emissions and discharges (e.g. noise, energy, + radiation, waste materials)') %></li> + <li><%= _('Human health and safety') %></li> + <li><%= _('Cultural sites and built structures (as they may be affected by the + environmental factors listed above)') %></li> + <li><%= _('Plans and administrative measures that affect these matters') %></li> + </ul> + + <p><%= _('Please only request information that comes under those categories, <strong>do not waste your + time</strong> or the time of the public authority by requesting unrelated information.') %></p> + <% end %> + </div> + + <p> + <label class="form_label" for="typeahead_search"><%= _('Summary:') %></label> + <%= f.text_field :title, :size => 50, :id =>"typeahead_search" %> + </p> + <div class="form_item_note"> + (<%= _("a one line summary of the information you are requesting, \n\t\t\te.g.") %> + <% if @info_request.law_used == 'eir' %> + <%= _("'Pollution levels over time for the River Tyne'") %> + <% else %> + <%= _("'Crime statistics by ward level for Wales'") %> + <% end %> + ) + </div> + + <div id="typeahead_response"> + </div> + </div> + + <div id="request_advice"> <ul> - <li><%= _('Air, water, soil, land, flora and fauna (including how these effect - human beings)') %></li> - <li><%= _('Information on emissions and discharges (e.g. noise, energy, - radiation, waste materials)') %></li> - <li><%= _('Human health and safety') %></li> - <li><%= _('Cultural sites and built structures (as they may be affected by the - environmental factors listed above)') %></li> - <li><%= _('Plans and administrative measures that affect these matters') %></li> + <li><%= _('Write your request in <strong>simple, precise language</strong>.') %></li> + <li><%= _('Ask for <strong>specific</strong> documents or information, this site is not suitable for general enquiries.') %></li> + <li><%= _('Keep it <strong>focused</strong>, you\'ll be more likely to get what you want (<a href="%s">why?</a>).') % [help_requesting_path + '#focused'] %></li> </ul> + </div> - <p><%= _('Please only request information that comes under those categories, <strong>do not waste your - time</strong> or the time of the public authority by requesting unrelated information.') %></p> - <% end %> -</div> - -<% form_for(:info_request, @info_request, :html => { :id => 'write_form' } ) do |f| %> - - <div id="request_form"> - <h1> - <label class="form_label" for="info_request_public_body_id"><%= _('To:') %></label> - <span id="to_public_body"><%=h(@info_request.public_body.name)%></span> - </h1> - - <p> - <label class="form_label" for="info_request_title"><%= _('Summary:') %></label> - <%= f.text_field :title, :size => 50 %> - </p> - <div class="form_item_note"> - (<%= _('a one line summary of the information you are requesting, - e.g.') %> - <% if @info_request.law_used == 'eir' %> - <%= _("'Pollution levels over time for the River Tyne'") %> - <% else %> - <%= _("'Crime statistics by ward level for Wales'") %> - <% end %> - ) - </div> - - <% fields_for :outgoing_message do |o| %> - <p> - <label class="form_label" for="outgoing_message_body"><%= _('Your request:') %></label> - <%= o.text_area :body, :rows => 20, :cols => 60 %> - </p> - <% end %> - + <div id="request_form"> + <% fields_for :outgoing_message do |o| %> + <p> + <label class="form_label" for="outgoing_message_body"><%= _('Your request:') %></label> + <%= o.text_area :body, :rows => 20, :cols => 60 %> + </p> + <% end %> + <% if !@user %> <p class="form_note"> <%= _('Everything that you enter on this page, including <strong>your name</strong>, @@ -126,18 +128,18 @@ this website forever (<a href="%s">why?</a>).') % [help_privacy_path+"#public_request"] %> </p> <% end %> - - <p class="form_note"> - <%= _('<strong> Can I request information about myself?</strong> - <a href="%s">No! (Click here for details)</a>') % [help_requesting_path+"#data_protection"] %> - </p> - - <div class="form_button"> - <%= f.hidden_field(:public_body_id, { :value => @info_request.public_body_id } ) %> - <%= hidden_field_tag(:submitted_new_request, 1 ) %> - <%= hidden_field_tag(:preview, 1 ) %> - <%= submit_tag _("Preview your public request") %> - </div> + + <p class="form_note"> + <%= _("<strong> Can I request information about myself?</strong>\n" + + "\t\t\t<a href=\"%s\">No! (Click here for details)</a>") % [help_requesting_path+"#data_protection"] %> + </p> + + <div class="form_button"> + <%= f.hidden_field(:public_body_id, { :value => @info_request.public_body_id } ) %> + <%= hidden_field_tag(:submitted_new_request, 1 ) %> + <%= hidden_field_tag(:preview, 1 ) %> + <%= submit_tag _("Preview your public request") %> + </div> <% if !@info_request.tag_string.empty? %> <p class="form_note"> @@ -148,8 +150,8 @@ <strong>Tags:</strong> <%=h @info_request.tag_string %> </p> <% end %> - - </div> + + </div> <% end %> diff --git a/app/views/request/preview.rhtml b/app/views/request/preview.rhtml index 6f6ecb2f9..45b6a3dc1 100644 --- a/app/views/request/preview.rhtml +++ b/app/views/request/preview.rhtml @@ -2,7 +2,7 @@ <% form_for(:info_request, @info_request, :html => { :id => 'preview_form' } ) do |f| %> - <h1><%= _('Now preview your request') %></h1> + <h1><%= _('3. Now check your request') %></h1> <ul> <li><%= _('Check you haven\'t included any <strong>personal information</strong>.') %></li> <li><%= _('Your name, request and any responses will appear in <strong>search engines</strong> @@ -37,14 +37,12 @@ <%= f.hidden_field(:tag_string) %> <%= hidden_field_tag(:submitted_new_request, 1) %> <%= hidden_field_tag(:preview, 0 ) %> - <%= submit_tag _("Re-edit this request"), :name => 'reedit' %> - <%= submit_tag _("Send public ") + h(@info_request.law_used_full) + " request", :name => 'submit' %> + <%= submit_tag _("Edit this request"), :name => 'reedit', :id => 'reedit_button' %> + <%= submit_tag _("Send request"), :name => 'submit', :id => 'submit_button' %> </p> <% if !@info_request.tag_string.empty? %> <p><strong><%= _('Tags:') %></strong> <%=h @info_request.tag_string %></p> <% end %> -<% end %> - - +<% end %>
\ No newline at end of file diff --git a/app/views/request/select_authority.rhtml b/app/views/request/select_authority.rhtml new file mode 100644 index 000000000..5f9ebfd85 --- /dev/null +++ b/app/views/request/select_authority.rhtml @@ -0,0 +1,50 @@ +<script type="text/javascript" src="/javascripts/ba-throttle-debounce.js"></script> +<script type="text/javascript"> + $(document).ready(function(){ + $("#authority_preview").hide(); + + // Avoid triggering too often (on each keystroke) by using the debounce jQuery plugin: + // http://benalman.com/projects/jquery-throttle-debounce-plugin/ + $("#query").keypress($.debounce( 300, function() { + // Do a type ahead search and display results + $("#typeahead_response").load("<%=search_ahead_bodies_url%>?q="+encodeURI(this.value), function() { + $("#authority_preview").hide(); // Hide the preview, since results have changed + + // We're using the existing body list: we intercept the clicks on the titles to + // display a preview on the right hand side of the screen + $("#typeahead_response a").click(function() { + $("#authority_preview").load(this.href+" #main_content", function() { + $("#authority_preview").show(); + $("#authority_preview #header_right").hide(); + }); + return false; + }); + }); + })); + }); +</script> + +<% @title = _("Select the authority to write to") %> + + <h1 style="clear: left"><%= _('1. Select an authority') %></h1> + + <div id="authority_selection"> + <% form_tag({:controller => "general", :action => "search_redirect"}, {:id => "search_form"}) do %> + <p> + <p> + <%= _('First, type in the <strong>name of the UK public authority</strong> you\'d + <br>like information from. <strong>By law, they have to respond</strong> + (<a href="%s">why?</a>).') % help_about_url %> + </p> + <%= text_field_tag 'query', params[:query], { :size => 30 } %> + <%= hidden_field_tag 'bodies', 1 %> + <%= submit_tag _('Search') %> + </p> + <% end %> + <div id="typeahead_response"> + </div> + </div> + + <div id="authority_preview"> + </div> + diff --git a/app/views/request/show.rhtml b/app/views/request/show.rhtml index 2897a3564..c5d040fb7 100644 --- a/app/views/request/show.rhtml +++ b/app/views/request/show.rhtml @@ -22,7 +22,7 @@ <%= render :partial => 'sidebar' %> -<div id="request_main"> +<div id="left_column"> <h1><%=h(@info_request.title)%></h1> <% if @info_request.user.profile_photo %> diff --git a/app/views/track/_tracking_links.rhtml b/app/views/track/_tracking_links.rhtml index a08f97c08..f50a8bbbf 100644 --- a/app/views/track/_tracking_links.rhtml +++ b/app/views/track/_tracking_links.rhtml @@ -4,11 +4,10 @@ end %> - <% if own_request %> <p><%= _('This is your own request, so you will be automatically emailed when new responses arrive.')%></p> <% elsif existing_track %> - <% form_tag({:controller => 'track', :action => 'update', :track_id => existing_track.id}, :class => "feed_form_" + location) do %> + <% form_tag({:controller => 'track', :action => 'update', :track_id => existing_track.id}, :class => "feed_form feed_form_" + location) do %> <p> <%= track_thing.params[:verb_on_page_already] %> <%= hidden_field_tag 'track_medium', "delete" %> @@ -16,15 +15,17 @@ <%= submit_tag "unsubscribe" %> </p> <% end %> -<% else %> +<% elsif track_thing %> <div class="feed_link feed_link_<%=location%>"> <%= link_to '<img src="/images/email-16.png" alt="">', do_track_url(track_thing) %> - <%= link_to track_thing.params[:verb_on_page], do_track_url(track_thing) %> + <%= link_to _("Follow by email"), do_track_url(track_thing) %> + </div> + + <div class="feed_link feed_link_<%=location%>"> + <%= link_to '<img src="/images/feed-16.png" alt="">', do_track_url(track_thing, 'feed') %> + <%= link_to (location == 'sidebar' ? _('RSS feed of updates') : _('RSS feed')), do_track_url(track_thing, 'feed') %> </div> <% end %> -<div class="feed_link feed_link_<%=location%>"> - <%= link_to '<img src="/images/feed-16.png" alt="">', do_track_url(track_thing, 'feed') %> - <%= link_to (location == 'sidebar' ? 'RSS feed of updates' : 'RSS feed'), do_track_url(track_thing, 'feed') %> -</div> + diff --git a/app/views/track_mailer/event_digest.rhtml b/app/views/track_mailer/event_digest.rhtml index 46f230da1..089b778f8 100644 --- a/app/views/track_mailer/event_digest.rhtml +++ b/app/views/track_mailer/event_digest.rhtml @@ -18,17 +18,17 @@ # e.g. Julian Burgess sent a request to Royal Mail Group (15 May 2008) if event.event_type == 'response' url = main_url(incoming_message_url(event.incoming_message)) - main_text += event.info_request.public_body.name + " sent a response to " + event.info_request.user.name + main_text += _("{{public_body}} sent a response to {{user_name}}", :public_body => event.info_request.public_body.name, :user_name => event.info_request.user.name) elsif event.event_type == 'followup_sent' url = main_url(outgoing_message_url(event.outgoing_message)) - main_text += event.info_request.user.name + " sent a follow up message to " + event.info_request.public_body.name + main_text += _("{{user_name}} sent a follow up message to {{public_body}}", :user_name => event.info_request.user.name, :public_body => event.info_request.public_body.name) elsif event.event_type == 'sent' # this is unlikely to happen in real life, but happens in the test code url = main_url(outgoing_message_url(event.outgoing_message)) - main_text += event.info_request.user.name + " sent a request to " + event.info_request.public_body.name + main_text += _("{{user_name}} sent a request to {{public_body}}", :user_name => event.info_request.user.name, :public_body => event.info_request.public_body.name) elsif event.event_type == 'comment' url = main_url(comment_url(event.comment)) - main_text += event.comment.user.name + " added an annotation" + main_text += _("{{user_name}} added an annotation", :user_name => event.comment.user.name) else raise "unknown type in event_digest " + event.event_type end @@ -57,10 +57,10 @@ main_text += "\n" end -%><%=main_text%>Alter your subscription +%><%=main_text%><%= _("Alter your subscription")%> ======================= -Please click on the link below to cancel or alter these emails. +<% _("Please click on the link below to cancel or alter these emails.") %> <%=@unsubscribe_url%> -- <%= _('the {{site_name}} team', :site_name=>site_name) %> diff --git a/app/views/user/_signin.rhtml b/app/views/user/_signin.rhtml index 79628b3a9..4fe98ee41 100644 --- a/app/views/user/_signin.rhtml +++ b/app/views/user/_signin.rhtml @@ -3,9 +3,9 @@ <% form_tag({:action => "signin"}, {:id => "signin_form"}) do %> <%= foi_error_messages_for :user_signin %> - <% if not sign_in_as_existing_user %> + <!--<% if not sign_in_as_existing_user %> <h2><%= _('If you\'ve used {{site_name}} before', :site_name=>site_name)%></h2> - <% end %> + <% end %>--> <p> <label class="form_label" for="user_signin_email"><%= _('Your e-mail:')%></label> @@ -27,7 +27,8 @@ do not use on a public computer) ')%></p> <div class="form_button"> - <%= hidden_field_tag 'token', params[:token], { :id => 'signin_token' } %> + <%= hidden_field_tag 'token', params[:token], {:id => 'signin_token' } %> + <%= hidden_field_tag :modal, params[:modal], {:id => 'signin_modal' } %> <%= submit_tag _('Sign in') %> </div> <% end %> diff --git a/app/views/user/_signup.rhtml b/app/views/user/_signup.rhtml index 6b0a1f8c7..9c0132f26 100644 --- a/app/views/user/_signup.rhtml +++ b/app/views/user/_signup.rhtml @@ -3,15 +3,15 @@ <% form_tag({:action => "signup"}, {:id => "signup_form"}) do %> <%= foi_error_messages_for :user_signup %> - <h2><%= _('If you\'re new to {{site_name}}', :site_name=>site_name)%></h2> + <!--<h2><%= _('If you\'re new to {{site_name}}', :site_name=>site_name)%></h2>--> <p> <label class="form_label" for="user_signup_email"><%= _('Your e-mail:')%></label> <%= text_field 'user_signup', 'email', { :size => 20 } %> </p> <div class="form_item_note"> - <%= ('We will not reveal your email address to anybody unless you or - the law tell us to (<a href="%s">_details</a>). ') %[help_privacy_path] %> + <%= _('We will not reveal your email address to anybody unless you or + the law tell us to (<a href="%s">details</a>). ') %[help_privacy_path] %> </div> <p> @@ -36,8 +36,13 @@ <%= password_field 'user_signup', 'password_confirmation', { :size => 15 } %> </p> + <% if @request_from_foreign_country %> + <%= recaptcha_tags %> + <% end %> + <div class="form_button"> - <%= hidden_field_tag 'token', params[:token], { :id => 'signup_token' } %> + <%= hidden_field_tag 'token', params[:token], {:id => 'signup_token' } %> + <%= hidden_field_tag :modal, params[:modal], {:id => 'signup_modal' } %> <%= submit_tag _('Sign up') %> </div> diff --git a/app/views/user/show.rhtml b/app/views/user/show.rhtml index 8fd6c52ad..2ae6e5ed5 100644 --- a/app/views/user/show.rhtml +++ b/app/views/user/show.rhtml @@ -24,20 +24,20 @@ </div> <% end %> - -<div id="request_sidebar"> - <h2><%= _('Track this person')%></h2> - <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'sidebar' } %> - - <h2><%= _('On this page')%></h2> - <a href="#foi_requests"><%= _('FOI requests')%></a> - <br><a href="#annotations"><%= _('Annotations')%></a> - <% if @is_you %> - <br><a href="#email_subscriptions"><%= _('Email subscriptions')%></a> - <% end %> -</div> - -<div class="single_user"> +<div> + <div id="header_right"> + <h2><%= _('Track this person')%></h2> + <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'sidebar' } %> + + <h2><%= _('On this page')%></h2> + <a href="#foi_requests"><%= _('FOI requests')%></a> + <br><a href="#annotations"><%= _('Annotations')%></a> + <% if @is_you %> + <br><a href="#email_subscriptions"><%= _('Email subscriptions')%></a> + <% end %> + </div> + + <div class="header_left"> <p id="user_photo_on_profile"> <% if @display_user.profile_photo %> <% if @is_you %> @@ -113,19 +113,37 @@ <%= _('<a href="%s">Sign in</a> to change password, subscriptions and more ({{user_name}} only)',:user_name=>h(@display_user.name)) % [signin_url(:r => request.request_uri)]%> </p> <% end %> + </div> +</div> +<div style="clear:both"></div> + <% form_tag(show_user_url, :method => "get", :id=>"search_form") do %> + <div> + <%= text_field_tag(:user_query, params[:user_query]) %> + <% if @is_you %> + <%= submit_tag(_("Search your contributions")) %> + <% else %> + <%= submit_tag(_("Search contributions by this person")) %> + <% end %> + </div> + <% end %> + <% if !@xapian_requests.nil? %> <% if @xapian_requests.results.empty? %> <% if @page == 1 %> - <h2 id="foi_requests"><%= @is_you ? 'Freedom of Information requests made by you' : 'Freedom of Information requests made by this person' %> </h2> + <h2 class="foi_results" id="foi_requests"><%= @is_you ? 'Freedom of Information requests made by you' : 'Freedom of Information requests made by this person' %> <%= @match_phrase %> +</h2> <p><%= @is_you ? _('You have made no Freedom of Information requests using this site.') : _('This person has made no Freedom of Information requests using this site.') %> + <%= @page_desc %> <% end %> <% else %> - <h2 id="foi_requests"> - <%= @is_you ? n_('Your %d Freedom of Information request', 'Your %d Freedom of Information requests', @display_user.info_requests.size) % @display_user.info_requests.size : n_('This person\'s %d Freedom of Information request', 'This person\'s %d Freedom of Information requests', @display_user.info_requests.size) % @display_user.info_requests.size %> + <h2 class="foi_results" id="foi_requests"> + <%= @is_you ? n_('Your %d Freedom of Information request', 'Your %d Freedom of Information requests', @xapian_requests.results.size) % @xapian_requests.results.size : n_('This person\'s %d Freedom of Information request', 'This person\'s %d Freedom of Information requests', @xapian_requests.results.size) % @xapian_requests.results.size %> <!-- matches_estimated <%=@xapian_requests.matches_estimated%> --> - <%= @page_desc %> + <%= @match_phrase %> + <%= @page_desc %> </h2> + <% for result in @xapian_requests.results %> <%= render :partial => 'request/request_listing_via_event', :locals => { :event => result[:model], :info_request => result[:model].info_request } %> @@ -134,14 +152,16 @@ <%= will_paginate WillPaginate::Collection.new(@page, @per_page, @display_user.info_requests.size) %> <% end %> <% else %> - <h2 id="foi_requests"><%= @is_you ? _('Freedom of Information requests made by you') : _('Freedom of Information requests made by this person') %> </h2> + <h2 class="foi_results" id="foi_requests"><%= @is_you ? _('Freedom of Information requests made by you') : _('Freedom of Information requests made by this person') %> </h2> <p><%= _('The search index is currently offline, so we can\'t show the Freedom of Information requests this person has made.')%></p> <% end %> <% if !@xapian_comments.nil? %> <% if @xapian_comments.results.empty? %> <% if @page == 1 %> - <h2><%= @is_you ? _('Your annotations') : _('This person\'s annotations') %></h2> + <h2><%= @is_you ? _('Your annotations') : _('This person\'s annotations') %> + <%= @match_phrase %> + </h2> <p><%= _('None made.')%></p> <% end %> <% else %> @@ -166,7 +186,7 @@ <% else %> <h2 id="email_subscriptions"> Your <%=pluralize(@track_things.size, _('email subscription')) %> </h2> <% if @track_things_grouped.size == 1 %> - <% form_tag :controller => 'track', :action => 'delete_all_type' do %> + <% form_tag({:controller => 'track', :action => 'delete_all_type'}, :class => "feed_form") do %> <h3> <%=TrackThing.track_type_description(@track_things[0].track_type)%> <%= hidden_field_tag 'track_type', @track_things[0].track_type %> @@ -180,7 +200,7 @@ <% end %> <% for track_type, track_things in @track_things_grouped %> <% if @track_things_grouped.size > 1 %> - <% form_tag :controller => 'track', :action => 'delete_all_type' do %> + <% form_tag({:controller => 'track', :action => 'delete_all_type'}, :class => "feed_form") do %> <h3> <%=TrackThing.track_type_description(track_type)%> <%= hidden_field_tag 'track_type', track_type %> @@ -196,7 +216,7 @@ <ul> <% for track_thing in track_things %> <li> - <% form_tag :controller => 'track', :action => 'update', :track_id => track_thing.id do %> + <% form_tag({:controller => 'track', :action => 'update', :track_id => track_thing.id}, :class => "feed_form") do %> <div> <%= track_thing.params[:list_description] %> <%= hidden_field_tag 'track_medium', "delete", { :id => 'track_medium_' + track_thing.id.to_s } %> @@ -210,6 +230,3 @@ <% end %> <% end %> <% end %> - -</div> - diff --git a/app/views/user/sign.rhtml b/app/views/user/sign.rhtml index b76edbc64..76732c09a 100644 --- a/app/views/user/sign.rhtml +++ b/app/views/user/sign.rhtml @@ -21,17 +21,26 @@ <div id="sign_together"> - <p id="sign_in_reason"> + <!--<p id="sign_in_reason"> <% if @post_redirect.reason_params[:web].empty? %> <%= _(' Please sign in or make a new account.') %> <% else %> <%= @post_redirect.reason_params[:web] %>, <%= _('please sign in or make a new account.') %> <% end %> - </p> - - <%= render :partial => 'signin', :locals => { :sign_in_as_existing_user => false } %> - <%= render :partial => 'signup' %> - + </p>--> + + <div id="left_half"> + <h1>Sign in</h1> + <%= render :partial => 'signin', :locals => { :sign_in_as_existing_user => false } %> + </div> + <div id="middle_strip"> + - or - + </div> + <div id="right_half"> + <h1>Sign up</h1> + <%= render :partial => 'signup' %> + </div> + <div style="clear:both"></div> </div> <% end %> diff --git a/app/views/user/signin_successful.rhtml b/app/views/user/signin_successful.rhtml new file mode 100644 index 000000000..8c4b2b2d4 --- /dev/null +++ b/app/views/user/signin_successful.rhtml @@ -0,0 +1,9 @@ +<%= _("You're in. <a href=\"#\" id=\"send-request\">Continue sending your request</a>") %> + +<script type="text/javascript"> + parent.modal_signin_successful = true; + + $("#send-request").click(function() { + parent.$.fancybox.close(); return false; + }); +</script> diff --git a/app/views/user/wrong_user.rhtml b/app/views/user/wrong_user.rhtml index 9878d08ae..30256a639 100644 --- a/app/views/user/wrong_user.rhtml +++ b/app/views/user/wrong_user.rhtml @@ -1,8 +1,4 @@ - <p id="sign_in_reason"> -<%= @reason_params[:web] %>, please -<%= link_to _('sign out'), signout_url(:r => request.request_uri) %>, -<%= _('and sign in as ')%><%= h(@reason_params[:user_name]) %>. +<%= _('Sorry, but only {{user_name}} is allowed to do that.', :user_name => h(@reason_params[:user_name])) %> </p> - diff --git a/commonlib b/commonlib -Subproject a87ebeae21166b3b4a8a66b32399861fcd6d0c4 +Subproject 16e32f0575107068ae1f16c26e31c598e4fef41 diff --git a/config/crontab.ugly b/config/crontab.ugly index ecd3151ff..5f2fbdb3b 100644 --- a/config/crontab.ugly +++ b/config/crontab.ugly @@ -28,7 +28,7 @@ MAILTO=cron-!!(*= $site *)!!@mysociety.org 2 4 * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/check-recent-requests-sent.lock /data/vhost/!!(*= $vhost *)!!/!!(*= $vcspath *)!!/script/check-recent-requests-sent || echo "stalled?" 45 3 * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/stop-new-responses-on-old-requests.lock /data/vhost/!!(*= $vhost *)!!/!!(*= $vcspath *)!!/script/stop-new-responses-on-old-requests || echo "stalled?" # Only root can restart apache -31 1 * * * root run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/compact-xapian-database.lock /data/vhost/!!(*= $vhost *)!!/!!(*= $vcspath *)!!/script/compact-xapian-database production || echo "stalled?" +31 1 * * * root run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/compact-xapian-database.lock "/data/vhost/!!(*= $vhost *)!!/!!(*= $vcspath *)!!/script/compact-xapian-database production" || echo "stalled?" # Once a day on all servers diff --git a/config/environment.rb b/config/environment.rb index 73cab9201..2f7967cdc 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -61,6 +61,7 @@ Rails::Initializer.run do |config| config.gem "gettext", :version => '>=1.9.3' config.gem "fast_gettext", :version => '>=0.4.8' config.gem "rack", :version => '1.1.0' + config.gem "rdoc", :version => '>=2.4.3' config.gem "recaptcha", :lib => "recaptcha/rails" config.gem 'rspec', :lib => false, :version => '1.3.1' config.gem 'rspec-rails', :lib => false, :version => '1.3.3' @@ -109,7 +110,7 @@ ActionMailer::Base.default_url_options[:host] = MySociety::Config.get("DOMAIN", # So that javascript assets use full URL, so proxied admin URLs read javascript OK if (MySociety::Config.get("DOMAIN", "") != "") ActionController::Base.asset_host = Proc.new { |source, request| - if request.fullpath.match(/^\/admin\//) + if ENV["RAILS_ENV"] != "test" && request.fullpath.match(/^\/admin\//) MySociety::Config.get("ADMIN_PUBLIC_URL", "") else MySociety::Config.get("DOMAIN", 'localhost:3000') @@ -144,3 +145,4 @@ require 'sendmail_return_path.rb' require 'tnef.rb' require 'i18n_fixes.rb' require 'rack_quote_monkeypatch.rb' +require 'world_foi_websites.rb' diff --git a/config/general.yml-example b/config/general.yml-example index 5eee675ff..ae50afc5a 100644 --- a/config/general.yml-example +++ b/config/general.yml-example @@ -12,6 +12,10 @@ SITE_NAME: 'Alaveteli' # Domain used in URLs generated by scripts (e.g. for going in some emails) DOMAIN: '127.0.0.1:3000' +# ISO country code of country currrently deployed in +# (http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2) +ISO_COUNTRY_CODE: GB + # These feeds are displayed accordingly on the Alaveteli "blog" page: BLOG_FEED: 'http://www.mysociety.org/category/projects/whatdotheyknow/feed/' TWITTER_USERNAME: 'whatdotheyknow' @@ -27,15 +31,15 @@ REPLY_VERY_LATE_AFTER_DAYS: 40 # We give some types of authority like schools a bit longer than everyone else SPECIAL_REPLY_VERY_LATE_AFTER_DAYS: 60 -# example searches for the home page, semicolon delimited. -FRONTPAGE_SEARCH_EXAMPLES: 'Geraldine Quango; Department for Humpadinking' - # example public bodies for the home page, semicolon delimited - short_names FRONTPAGE_PUBLICBODY_EXAMPLES: 'tgq' # URL of theme to install (when running rails-post-deploy script) THEME_URL: 'git://github.com/mysociety/whatdotheyknow-theme.git' +# Whether a user needs to sign in to start the New Request process +FORCE_REGISTRATION_ON_NEW_REQUEST: false + ## Incoming email # Your email domain, e.g. 'foifa.com' @@ -109,3 +113,5 @@ DEBUG_RECORD_MEMORY: false # be another reason to try this setting. USE_GHOSTSCRIPT_COMPRESSION: true +# mySociety's gazeteer service. Shouldn't change. +GAZE_URL: http://gaze.mysociety.org diff --git a/config/routes.rb b/config/routes.rb index c16c10eb9..1fa2f8aa0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -23,7 +23,9 @@ ActionController::Routing::Routes.draw do |map| # Couldn't find a way to do this in routes which also picked up multiple other slashes # and dots and other characters that can appear in search query. So we sort it all # out in the controller. - general.search_general '/search/*combined', :action => 'search' + general.search_general '/search/*combined/requests', :action => 'search', :view => 'requests' + general.search_general '/search/*combined', :action => 'search' + general.advanced_search '/advancedsearch', :action => 'search_redirect', :advanced => true general.random_request '/random', :action => 'random_request' @@ -32,12 +34,19 @@ ActionController::Routing::Routes.draw do |map| map.with_options :controller => 'request' do |request| request.request_list_recent '/list/recent', :action => 'list', :view => 'recent' + request.request_list_all '/list/all', :action => 'list', :view => 'all' request.request_list_successful '/list/successful', :action => 'list', :view => 'successful' + request.request_list_unsuccessful '/list/unsuccessful', :action => 'list', :view => 'unsuccessful' + request.request_list_awaiting '/list/awaiting', :action => 'list', :view => 'awaiting' request.request_list '/list', :action => 'list' + request.select_authority '/select_authority', :action => 'select_authority' + request.new_request '/new', :action => 'new' request.new_request_to_body '/new/:url_name', :action => 'new' + request.search_ahead '/request/search_ahead', :action => 'search_typeahead' + request.show_request '/request/:url_title.:format', :action => 'show' request.show_new_request '/request/:url_title/new', :action => 'show' request.details_request '/details/request/:url_title', :action => 'details' @@ -52,7 +61,6 @@ ActionController::Routing::Routes.draw do |map| request.info_request_event '/request_event/:info_request_event_id', :action => 'show_request_event' request.upload_response "/upload/request/:url_title", :action => 'upload_response' - end # Use /profile for things to do with the currently signed in user. @@ -80,11 +88,20 @@ ActionController::Routing::Routes.draw do |map| end map.with_options :controller => 'public_body' do |body| + body.search_ahead_bodies '/body/search_ahead', :action => 'search_typeahead' body.list_public_bodies "/body", :action => 'list' + body.list_public_bodies_default "/body/list/all", :action => 'list' body.list_public_bodies "/body/list/:tag", :action => 'list' body.list_public_bodies_redirect "/local/:tag", :action => 'list_redirect' body.all_public_bodies_csv "/body/all-authorities.csv", :action => 'list_all_csv' - body.show_public_body "/body/:url_name.:format", :action => 'show' + body.show_public_body "/body/:url_name.:format", :action => 'show', :view => 'all' + body.show_public_body_all "/body/:url_name/all", :action => 'show', :view => 'all' + body.show_public_body_successful "/body/:url_name/successful", :action => 'show', :view => "successful" + body.show_public_body_unsuccessful "/body/:url_name/unsuccessful", :action => 'show', :view => "unsuccessful" + body.show_public_body_awaiting "/body/:url_name/awaiting", :action => 'show', :view => "awaiting" + body.show_public_body_tag "/body/:url_name/:tag", :action => 'show' + body.show_public_body_tag_view "/body/:url_name/:tag/:view", :action => 'show' + body.view_public_body_email "/body/:url_name/view_email", :action => 'view_email' end @@ -92,6 +109,10 @@ ActionController::Routing::Routes.draw do |map| comment.new_comment "/annotate/request/:url_title", :action => 'new', :type => 'request' end + map.with_options :controller => 'services' do |service| + service.other_country_message "/country_message", :action => 'other_country_message' + end + map.with_options :controller => 'track' do |track| # /track/ is for setting up an email alert for the item # /feed/ is a direct RSS feed of the item @@ -111,6 +132,7 @@ ActionController::Routing::Routes.draw do |map| map.with_options :controller => 'help' do |help| help.help_unhappy '/help/unhappy/:url_title', :action => 'unhappy' help.help_about '/help/about', :action => 'about' + help.help_about '/help/alaveteli', :action => 'alaveteli' help.help_contact '/help/contact', :action => 'contact' help.help_officers '/help/officers', :action => 'officers' help.help_requesting '/help/requesting', :action => 'requesting' diff --git a/db/migrate/102_add_locale_to_users.rb b/db/migrate/102_add_locale_to_users.rb new file mode 100644 index 000000000..a299a8561 --- /dev/null +++ b/db/migrate/102_add_locale_to_users.rb @@ -0,0 +1,11 @@ +class AddLocaleToUsers < ActiveRecord::Migration + def self.up + add_column :users, :locale, :string + end + def self.down + remove_column :users, :locale + end +end + + + diff --git a/lib/world_foi_websites.rb b/lib/world_foi_websites.rb new file mode 100644 index 000000000..24845437a --- /dev/null +++ b/lib/world_foi_websites.rb @@ -0,0 +1,40 @@ +class WorldFOIWebsites + def self.world_foi_websites + world_foi_websites = [ + {:name => "WhatDoTheyKnow?", + :country_name => _("United Kingdom"), + :country_iso_code => "GB", + :url => "http://www.whatdotheyknow.com"}, + {:name => "Informata Zyrtare", + :country_name => _("Kosovo"), + :country_iso_code => "XK", + :url => "http://informatazyrtare.org"}, + {:name => "Ask The EU", + :country_name => _("European Union"), + :country_iso_code => "", + :url => "http://asktheu.org"}, + {:name => "MuckRock.com", + :country_name => _("United States of America"), + :country_iso_code => "US", + :url => "http://www.muckrock.com"}, + {:name => "FYI", + :country_name => _("New Zealand"), + :country_iso_code => "NZ", + :url => "http://fyi.org.nz"}, + {:name => "Frag den Staat", + :country_name => _("Germany"), + :country_iso_code => "DE", + :url => "http://fragdenstaat.de"}, + {:name => "Acceso Intelligente", + :country_name => _("Chile"), + :country_iso_code => "CL", + :url => "accesointeligente.org"}] + return world_foi_websites + end + + def self.by_code(code) + result = self.world_foi_websites.find{|x| x[:country_iso_code].downcase == code.downcase} + return result + end +end + diff --git a/locale/app.pot b/locale/app.pot index 6a85ddbea..414c65514 100644 --- a/locale/app.pot +++ b/locale/app.pot @@ -7,7 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: version 0.0.1\n" -"POT-Creation-Date: 2011-08-22 11:15+0100\n" +"Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" +"POT-Creation-Date: 2011-09-07 12:17+0200\n" "PO-Revision-Date: 2011-08-22 11:15+0100\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -16,3362 +17,4306 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: app/controllers/request_controller.rb:60 -msgid "To update the status of this FOI request" +#: app/models/incoming_message.rb:868 +msgid "" +"\n" +"\n" +"[ {{site_name}} note: The above text was badly encoded, and has had strange " +"characters removed. ]" msgstr "" -#: app/controllers/request_controller.rb:61 -msgid "Then you can update the status of your request to " +#: app/views/user/set_profile_about_me.rhtml:14 +msgid "" +" This will appear on your {{site_name}} profile, to make it\n" +" easier for others to get involved with what you're doing." msgstr "" -#: app/controllers/request_controller.rb:62 -msgid "Update the status of your request to " +#: app/views/comment/_comment_form.rhtml:16 +msgid "" +" (<strong>no ranty</strong> politics, read our <a href=\"%s\">moderation " +"policy</a>)" msgstr "" -#: app/controllers/request_controller.rb:139 -msgid "Recently sent Freedom of Information requests" +#: app/views/request/upload_response.rhtml:40 +msgid "" +" (<strong>patience</strong>, especially for large files, it may take a " +"while!)" msgstr "" -#: app/controllers/request_controller.rb:144 -msgid "Recently successful responses" +#: app/views/user/show.rhtml:59 +msgid " (you)" msgstr "" -#: app/controllers/request_controller.rb:280 -msgid "<p>You do not need to include your email in the request in order to get a reply, as we will ask for it on the next screen (<a href=\"%s\">details</a>).</p>" +#: app/views/user/signchangepassword_send_confirm.rhtml:18 +msgid "" +" <strong>Note:</strong>\n" +" We will send you an email. Follow the instructions in it to change\n" +" your password." msgstr "" -#: app/controllers/request_controller.rb:282 -msgid "<p>You do not need to include your email in the request in order to get a reply (<a href=\"%s\">details</a>).</p>" +#: app/views/user/contact.rhtml:35 +msgid " <strong>Privacy note:</strong> Your email address will be given to" msgstr "" -#: app/controllers/request_controller.rb:284 -msgid "<p>We recommend that you edit your request and remove the email address.\n If you leave it, the email address will be sent to the authority, but will not be displayed on the site.</p>" +#: app/views/comment/new.rhtml:33 +msgid " <strong>Summarise</strong> the content of any information returned. " msgstr "" -#: app/controllers/request_controller.rb:288 -msgid "<p>Your request contains a <strong>postcode</strong>. Unless it directly relates to the subject of your request, please remove any address as it will <strong>appear publicly on the Internet</strong>.</p>" +#: app/views/comment/new.rhtml:23 +msgid " Advise on how to <strong>best clarify</strong> the request." msgstr "" -#: app/controllers/request_controller.rb:298 -msgid "To send your FOI request" +#: app/views/comment/new.rhtml:49 +msgid "" +" Ideas on what <strong>other documents to request</strong> which the " +"authority may hold. " msgstr "" -#: app/controllers/request_controller.rb:299 -msgid "Then your FOI request to {{public_body_name}} will be sent." +#: app/views/public_body/view_email.rhtml:30 +msgid "" +" If you know the address to use, then please <a href=\"%s\">send it to us</" +"a>.\n" +" You may be able to find the address on their website, or by phoning " +"them up and asking." msgstr "" -#: app/controllers/request_controller.rb:300 -msgid "Confirm your FOI request to " +#: app/views/user/set_profile_about_me.rhtml:26 +msgid "" +" Include relevant links, such as to a campaign page, your blog or a\n" +" twitter account. They will be made clickable. \n" +" e.g." msgstr "" -#: app/controllers/request_controller.rb:311 -msgid "<p>Your {{law_used_full}} request has been <strong>sent on its way</strong>!</p>\n <p><strong>We will email you</strong> when there is a response, or after 20 working days if the authority still hasn't\n replied by then.</p>\n <p>If you write about this request (for example in a forum or a blog) please link to this page, and add an \n annotation below telling people about your writing.</p>" +#: app/views/comment/new.rhtml:27 +msgid "" +" Link to the information requested, if it is <strong>already available</" +"strong> on the Internet. " msgstr "" -#: app/controllers/request_controller.rb:337 -msgid "To classify the response to this FOI request" +#: app/views/comment/new.rhtml:29 +msgid "" +" Offer better ways of <strong>wording the request</strong> to get the " +"information. " msgstr "" -#: app/controllers/request_controller.rb:338 -msgid "Then you can classify the FOI response you have got from " +#: app/views/user/sign.rhtml:26 +msgid " Please sign in or make a new account." msgstr "" -#: app/controllers/request_controller.rb:339 -msgid "Classify an FOI response from " +#: app/views/comment/new.rhtml:34 +msgid "" +" Say how you've <strong>used the information</strong>, with links if " +"possible." msgstr "" -#: app/controllers/request_controller.rb:346 -msgid "Please choose whether or not you got some of the information that you wanted." +#: app/views/comment/new.rhtml:28 +msgid "" +" Suggest <strong>where else</strong> the requester might find the " +"information. " msgstr "" -#: app/controllers/request_controller.rb:352 -msgid "The request has been updated since you originally loaded this page. Please check for any new incoming messages below, and try again." +#: app/views/user/set_profile_about_me.rhtml:11 +msgid " What are you investigating using Freedom of Information? " msgstr "" -#: app/controllers/request_controller.rb:378 -msgid "Thank you for updating the status of the request '<a href=\"{{url}}\">{{info_request_title}}</a>'. There are some more requests below for you to classify." +#: app/controllers/comment_controller.rb:75 +msgid " You are already being emailed updates about the request." msgstr "" -#: app/controllers/request_controller.rb:381 -msgid "Thank you for updating this request!" +#: app/controllers/comment_controller.rb:73 +msgid " You will also be emailed updates about the request." msgstr "" -#: app/controllers/request_controller.rb:389 -msgid "<p>Thank you! Hopefully your wait isn't too long.</p> <p>By law, you should get a response promptly, and normally before the end of <strong>\n{{date_response_required_by}}</strong>.</p>" +#: app/views/request/upload_response.rhtml:5 +msgid " made by " msgstr "" -#: app/controllers/request_controller.rb:393 -msgid "<p>Thank you! Hope you don't have to wait much longer.</p> <p>By law, you should have got a response promptly, and normally before the end of <strong>{{date_response_required_by}}</strong>.</p>" +#: app/models/track_thing.rb:112 app/models/track_thing.rb:120 +msgid " or " msgstr "" -#: app/controllers/request_controller.rb:396 -msgid "<p>Thank you! Your request is long overdue, by more than {{very_late_number_of_days}} working days. Most requests should be answered within {{late_number_of_days}} working days. You might like to complain about this, see below.</p>" +#: app/views/user/contact.rhtml:36 +msgid " when you send this message." msgstr "" -#: app/controllers/request_controller.rb:399 -msgid "<p>Thank you! Here are some ideas on what to do next:</p>\n <ul>\n <li>To send your request to another authority, first copy the text of your request below, then <a href=\"{{find_authority_url}}\">find the other authority</a>.</li>\n <li>If you would like to contest the authority's claim that they do not hold the information, here is \n <a href=\"{{complain_url}}\">how to complain</a>.\n </li>\n <li>We have <a href=\"{{other_means_url}}\">suggestions</a>\n on other means to answer your question.\n </li>\n </ul>" +#: app/views/public_body/show.rhtml:88 +msgid "%d Freedom of Information request to %s" +msgid_plural "%d Freedom of Information requests to %s" +msgstr[0] "" +msgstr[1] "" + +#: app/views/general/frontpage.rhtml:44 +msgid "%d request" +msgid_plural "%d requests" +msgstr[0] "" +msgstr[1] "" + +#: app/views/public_body/_body_listing_single.rhtml:21 +msgid "%d request made." +msgid_plural "%d requests made." +msgstr[0] "" +msgstr[1] "" + +#: app/views/request/new.rhtml:91 +msgid "'Crime statistics by ward level for Wales'" msgstr "" -#: app/controllers/request_controller.rb:414 -msgid "Oh no! Sorry to hear that your request was refused. Here is what to do now." +#: app/views/request/new.rhtml:89 +msgid "'Pollution levels over time for the River Tyne'" msgstr "" -#: app/controllers/request_controller.rb:417 -msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p><p>If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p>" +#: app/models/track_thing.rb:246 +msgid "'{{link_to_authority}}', a public authority" msgstr "" -#: app/controllers/request_controller.rb:420 -msgid "<p>We're glad you got some of the information that you wanted. If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>" +#: app/models/track_thing.rb:195 +msgid "'{{link_to_request}}', a request" msgstr "" -#: app/controllers/request_controller.rb:423 -msgid "Please write your follow up message containing the necessary clarifications below." +#: app/models/track_thing.rb:262 +msgid "'{{link_to_user}}', a person" msgstr "" -#: app/controllers/request_controller.rb:428 -msgid "<p>Thank you! Hopefully your wait isn't too long.</p><p>You should get a response within {{late_number_of_days}} days, or be told if it will take longer (<a href=\"{{review_url}}\">details</a>).</p>" +#: app/controllers/user_controller.rb:373 +msgid "" +",\n" +"\n" +"\n" +"\n" +"Yours,\n" +"\n" +"{{user_name}}" msgstr "" -#: app/controllers/request_controller.rb:431 -msgid "<p>Thank you! We'll look into what happened and try and fix it up.</p><p>If the error was a delivery failure, and you can find an up to date FOI email address for the authority, please tell us using the form below.</p>" +#: app/views/request/select_authority.rhtml:29 +msgid "1. Select an authority" msgstr "" -#: app/controllers/request_controller.rb:434 -msgid "Please use the form below to tell us more." +#: app/views/request/new.rhtml:34 +msgid "2. Ask for Information" msgstr "" -#: app/controllers/request_controller.rb:437 -msgid "If you have not done so already, please write a message below telling the authority that you have withdrawn your request. Otherwise they will not know it has been withdrawn." +#: app/views/request/preview.rhtml:5 +msgid "3. Now check your request" msgstr "" -#: app/controllers/request_controller.rb:542 -msgid "To send a follow up message to " +#: app/views/public_body/show.rhtml:57 +msgid "<a class=\"link_button_green\" href=\"{{url}}\">{{text}}</a>" msgstr "" -#: app/controllers/request_controller.rb:543 -msgid "To reply to " +#: app/views/request/_after_actions.rhtml:9 +msgid "<a href=\"%s\">Add an annotation</a> (to help the requester or others)" msgstr "" -#: app/controllers/request_controller.rb:545 -msgid "Then you can write follow up message to " +#: app/views/public_body/list.rhtml:28 +msgid "<a href=\"%s\">Are we missing a public authority?</a>." msgstr "" -#: app/controllers/request_controller.rb:546 -msgid "Then you can write your reply to " +#: app/views/request/_sidebar.rhtml:39 +msgid "" +"<a href=\"%s\">Are you the owner of\n" +" any commercial copyright on this page?</a>" msgstr "" -#: app/controllers/request_controller.rb:548 -msgid "Write your FOI follow up message to " +#: app/views/general/search.rhtml:172 +msgid "<a href=\"%s\">Browse all</a> or <a href=\"%s\">ask us to add one</a>." msgstr "" -#: app/controllers/request_controller.rb:549 -msgid "Write a reply to " +#: app/views/public_body/list.rhtml:50 +msgid "<a href=\"%s\">Can't find the one you want?</a>" msgstr "" -#: app/controllers/request_controller.rb:556 -msgid "Your follow up has not been sent because this request has been stopped to prevent spam. Please <a href=\"%s\">contact us</a> if you really want to send a follow up message." +#: app/views/user/show.rhtml:113 +msgid "" +"<a href=\"%s\">Sign in</a> to change password, subscriptions and more " +"({{user_name}} only)" msgstr "" -#: app/controllers/request_controller.rb:559 -msgid "You previously submitted that exact follow up message for this request." +#: app/views/request/_followup.rhtml:39 app/views/request/_followup.rhtml:46 +#: app/views/request/show.rhtml:83 app/views/request/show.rhtml:87 +msgid "<a href=\"%s\">details</a>" msgstr "" -#: app/controllers/request_controller.rb:582 -msgid "Your internal review request has been sent on its way." +#: app/views/request/_followup.rhtml:74 +msgid "<a href=\"%s\">what's that?</a>" msgstr "" -#: app/controllers/request_controller.rb:584 -msgid "Your follow up message has been sent on its way." +#: app/controllers/request_game_controller.rb:23 +msgid "" +"<p>All done! Thank you very much for your help.</p><p>There are <a href=" +"\"{{helpus_url}}\">more things you can do</a> to help {{site_name}}.</p>" msgstr "" -#: app/controllers/request_controller.rb:706 -msgid "To upload a response, you must be logged in using an email address from " +#: app/controllers/request_controller.rb:398 +msgid "" +"<p>Thank you! Here are some ideas on what to do next:</p>\n" +" <ul>\n" +" <li>To send your request to another authority, first copy the " +"text of your request below, then <a href=\"{{find_authority_url}}\">find the " +"other authority</a>.</li>\n" +" <li>If you would like to contest the authority's claim that they " +"do not hold the information, here is \n" +" <a href=\"{{complain_url}}\">how to complain</a>.\n" +" </li>\n" +" <li>We have <a href=\"{{other_means_url}}\">suggestions</a>\n" +" on other means to answer your question.\n" +" </li>\n" +" </ul>" +msgstr "" + +#: app/controllers/request_controller.rb:392 +msgid "" +"<p>Thank you! Hope you don't have to wait much longer.</p> <p>By law, you " +"should have got a response promptly, and normally before the end of <strong>" +"{{date_response_required_by}}</strong>.</p>" msgstr "" -#: app/controllers/request_controller.rb:707 -msgid "Then you can upload an FOI response. " +#: app/controllers/request_controller.rb:388 +msgid "" +"<p>Thank you! Hopefully your wait isn't too long.</p> <p>By law, you should " +"get a response promptly, and normally before the end of <strong>\n" +"{{date_response_required_by}}</strong>.</p>" msgstr "" -#: app/controllers/request_controller.rb:708 app/controllers/user_controller.rb:515 -msgid "Confirm your account on {{site_name}}" +#: app/controllers/request_controller.rb:427 +msgid "" +"<p>Thank you! Hopefully your wait isn't too long.</p><p>You should get a " +"response within {{late_number_of_days}} days, or be told if it will take " +"longer (<a href=\"{{review_url}}\">details</a>).</p>" msgstr "" -#: app/controllers/request_controller.rb:735 -msgid "Please type a message and/or choose a file containing your response." +#: app/controllers/request_controller.rb:430 +msgid "" +"<p>Thank you! We'll look into what happened and try and fix it up.</p><p>If " +"the error was a delivery failure, and you can find an up to date FOI email " +"address for the authority, please tell us using the form below.</p>" msgstr "" -#: app/controllers/request_controller.rb:741 -msgid "Thank you for responding to this FOI request! Your response has been published below, and a link to your response has been emailed to " +#: app/controllers/request_controller.rb:395 +msgid "" +"<p>Thank you! Your request is long overdue, by more than " +"{{very_late_number_of_days}} working days. Most requests should be answered " +"within {{late_number_of_days}} working days. You might like to complain " +"about this, see below.</p>" msgstr "" -#: app/controllers/public_body_controller.rb:77 -msgid "There was an error with the words you entered, please try again." +#: app/controllers/user_controller.rb:513 +msgid "" +"<p>Thanks for changing the text about you on your profile.</p>\n" +" <p><strong>Next...</strong> You can upload a profile photograph " +"too.</p>" msgstr "" -#: app/controllers/public_body_controller.rb:111 -msgid "beginning with" +#: app/controllers/user_controller.rb:435 +msgid "" +"<p>Thanks for updating your profile photo.</p>\n" +" <p><strong>Next...</strong> You can put some text about you " +"and your research on your profile.</p>" msgstr "" -#: app/controllers/user_controller.rb:189 -msgid "That doesn't look like a valid email address. Please check you have typed it correctly." +#: app/controllers/request_controller.rb:283 +msgid "" +"<p>We recommend that you edit your request and remove the email address.\n" +" If you leave it, the email address will be sent to the " +"authority, but will not be displayed on the site.</p>" msgstr "" -#: app/controllers/user_controller.rb:203 -msgid "Then you can change your password on {{site_name}}" +#: app/controllers/request_controller.rb:416 +msgid "" +"<p>We're glad you got all the information that you wanted. If you write " +"about or make use of the information, please come back and add an annotation " +"below saying what you did.</p><p>If you found {{site_name}} useful, <a href=" +"\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p>" msgstr "" -#: app/controllers/user_controller.rb:204 -msgid "Change your password {{site_name}}" +#: app/controllers/request_controller.rb:419 +msgid "" +"<p>We're glad you got some of the information that you wanted. If you found " +"{{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to " +"the charity which runs it.</p><p>If you want to try and get the rest of the " +"information, here's what to do now.</p>" msgstr "" -#: app/controllers/user_controller.rb:231 -msgid "Your password has been changed." +#: app/controllers/request_controller.rb:281 +msgid "" +"<p>You do not need to include your email in the request in order to get a " +"reply (<a href=\"%s\">details</a>).</p>" msgstr "" -#: app/controllers/user_controller.rb:248 -msgid "To change your email address used on {{site_name}}" +#: app/controllers/request_controller.rb:279 +msgid "" +"<p>You do not need to include your email in the request in order to get a " +"reply, as we will ask for it on the next screen (<a href=\"%s\">details</a>)." +"</p>" msgstr "" -#: app/controllers/user_controller.rb:249 -msgid "Then you can change your email address used on {{site_name}}" +#: app/controllers/request_controller.rb:287 +msgid "" +"<p>Your request contains a <strong>postcode</strong>. Unless it directly " +"relates to the subject of your request, please remove any address as it will " +"<strong>appear publicly on the Internet</strong>.</p>" msgstr "" -#: app/controllers/user_controller.rb:250 app/views/user/signchangeemail.rhtml:1 -#: app/views/user/signchangeemail.rhtml:11 -msgid "Change your email address used on {{site_name}}" +#: app/controllers/request_controller.rb:310 +msgid "" +"<p>Your {{law_used_full}} request has been <strong>sent on its way</strong>!" +"</p>\n" +" <p><strong>We will email you</strong> when there is a response, " +"or after 20 working days if the authority still hasn't\n" +" replied by then.</p>\n" +" <p>If you write about this request (for example in a forum or a " +"blog) please link to this page, and add an \n" +" annotation below telling people about your writing.</p>" msgstr "" -#: app/controllers/user_controller.rb:310 -msgid "You have now changed your email address used on {{site_name}}" +#: app/controllers/application_controller.rb:298 +msgid "" +"<p>{{site_name}} is currently in maintenance. You can only view existing " +"requests. You cannot make new ones, add followups or annotations, or " +"otherwise change the database.</p> <p>{{read_only}}</p>" msgstr "" -#: app/controllers/user_controller.rb:329 -msgid "To send a message to " +#: app/views/user/confirm.rhtml:11 +msgid "" +"<small>If you use web-based email or have \"junk mail\" filters, also check " +"your\n" +"bulk/spam mail folders. Sometimes, our messages are marked that way.</" +"small>\n" +"</p>" msgstr "" -#: app/controllers/user_controller.rb:330 -msgid "Then you can send a message to " +#: app/views/request/new.rhtml:133 +msgid "" +"<strong> Can I request information about myself?</strong>\n" +"\t\t\t<a href=\"%s\">No! (Click here for details)</a>" msgstr "" -#: app/controllers/user_controller.rb:331 -msgid "Send a message to " +#: app/views/general/search.rhtml:226 +msgid "" +"<strong><code>commented_by:tony_bowden</code></strong> to search annotations " +"made by Tony Bowden, typing the name as in the URL." msgstr "" -#: app/controllers/user_controller.rb:349 -msgid "Your message to {{recipient_user_name}} has been sent!" +#: app/views/general/search.rhtml:228 +msgid "" +"<strong><code>filetype:pdf</code></strong> to find all responses with PDF " +"attachments. Or try these: <code>{{list_of_file_extensions}}</code>" msgstr "" -#: app/controllers/user_controller.rb:355 -msgid ",\n\n\n\nYours,\n\n{{user_name}}" +#: app/views/general/search.rhtml:227 +msgid "" +"<strong><code>request:</code></strong> to restrict to a specific request, " +"typing the title as in the URL." msgstr "" -#: app/controllers/user_controller.rb:371 -msgid "You need to be logged in to change your profile photo." +#: app/views/general/search.rhtml:225 +msgid "" +"<strong><code>requested_by:julian_todd</code></strong> to search requests " +"made by Julian Todd, typing the name as in the URL." msgstr "" -#: app/controllers/user_controller.rb:398 app/controllers/user_controller.rb:414 -msgid "Thank you for updating your profile photo" +#: app/views/general/search.rhtml:224 +msgid "" +"<strong><code>requested_from:home_office</code></strong> to search requests " +"from the Home Office, typing the name as in the URL." msgstr "" -#: app/controllers/user_controller.rb:417 -msgid "<p>Thanks for updating your profile photo.</p>\n <p><strong>Next...</strong> You can put some text about you and your research on your profile.</p>" +#: app/views/general/search.rhtml:222 +msgid "" +"<strong><code>status:</code></strong> to select based on the status or " +"historical status of the request, see the <a href=\"{{statuses_url}}\">table " +"of statuses</a> below." msgstr "" -#: app/controllers/user_controller.rb:433 -msgid "You need to be logged in to clear your profile photo." +#: app/views/general/search.rhtml:230 +msgid "" +"<strong><code>tag:charity</code></strong> to find all public bodies or " +"requests with a given tag. You can include multiple tags, \n" +" and tag values, e.g. <code>tag:openlylocal AND tag:" +"financial_transaction:335633</code>. Note that by default any of the tags\n" +" can be present, you have to put <code>AND</code> explicitly if you only " +"want results them all present." msgstr "" -#: app/controllers/user_controller.rb:442 -msgid "You've now cleared your profile photo" +#: app/views/general/search.rhtml:223 +msgid "" +"<strong><code>variety:</code></strong> to select type of thing to search " +"for, see the <a href=\"{{varieties_url}}\">table of varieties</a> below." msgstr "" -#: app/controllers/user_controller.rb:470 -msgid "You need to be logged in to change the text about you on your profile." +#: app/views/comment/new.rhtml:56 +msgid "" +"<strong>Advice</strong> on how to get a response that will satisfy the " +"requester. </li>" msgstr "" -#: app/controllers/user_controller.rb:492 -msgid "You have now changed the text about you on your profile." +#: app/views/request/_other_describe_state.rhtml:56 +msgid "<strong>All the information</strong> has been sent" msgstr "" -#: app/controllers/user_controller.rb:495 -msgid "<p>Thanks for changing the text about you on your profile.</p>\n <p><strong>Next...</strong> You can upload a profile photograph too.</p>" +#: app/views/request/_followup.rhtml:79 +msgid "<strong>Anything else</strong>, such as clarifying, prompting, thanking" msgstr "" -#: app/controllers/user_controller.rb:514 -msgid "Then you can sign in to {{site_name}}" +#: app/views/request/details.rhtml:12 +msgid "" +"<strong>Caveat emptor!</strong> To use this data in an honourable way, you " +"will need \n" +"a good internal knowledge of user behaviour on {{site_name}}. How, \n" +"why and by whom requests are categorised is not straightforward, and there " +"will\n" +"be user error and ambiguity. You will also need to understand FOI law, and " +"the\n" +"way authorities use it. Plus you'll need to be an elite statistician. " +"Please\n" +"<a href=\"{{contact_path}}\">contact us</a> with questions." msgstr "" -#: app/controllers/help_controller.rb:63 -msgid "Your message has been sent. Thank you for getting in touch! We'll get back to you soon." +#: app/views/request/_other_describe_state.rhtml:28 +msgid "<strong>Clarification</strong> has been requested" msgstr "" -#: app/controllers/track_controller.rb:98 -msgid "You are already being emailed updates about " +#: app/views/request/_other_describe_state.rhtml:14 +msgid "" +"<strong>No response</strong> has been received\n" +" <small>(maybe there's just an acknowledgement)</small>" msgstr "" -#: app/controllers/track_controller.rb:111 -msgid "You will now be emailed updates about " +#: app/views/user/signchangeemail.rhtml:30 +msgid "" +"<strong>Note:</strong>\n" +" We will send an email to your new email address. Follow the\n" +" instructions in it to confirm changing your email." msgstr "" -#: app/controllers/track_controller.rb:143 -msgid "To cancel this alert" +#: app/views/user/contact.rhtml:32 +msgid "" +"<strong>Note:</strong> You're sending a message to yourself, presumably\n" +" to try out how it works." msgstr "" -#: app/controllers/track_controller.rb:144 -msgid "Then you can cancel the alert." +#: app/views/request/preview.rhtml:31 +msgid "" +"<strong>Privacy note:</strong> If you want to request private information " +"about\n" +" yourself then <a href=\"%s\">click here</a>." msgstr "" -#: app/controllers/track_controller.rb:145 -msgid "Cancel a {{site_name}} alert" +#: app/views/user/set_crop_profile_photo.rhtml:35 +msgid "" +"<strong>Privacy note:</strong> Your photo will be shown in public on the " +"Internet, \n" +" wherever you do something on {{site_name}}." msgstr "" -#: app/controllers/track_controller.rb:154 -msgid "You will no longer be emailed updates about " +#: app/views/request/followup_preview.rhtml:37 +msgid "" +"<strong>Privacy warning:</strong> Your message, and any response\n" +" to it, will be displayed publicly on this website." msgstr "" -#: app/controllers/track_controller.rb:173 -msgid "To cancel these alerts" +#: app/views/request/_other_describe_state.rhtml:52 +msgid "<strong>Some of the information</strong> has been sent " msgstr "" -#: app/controllers/track_controller.rb:174 -msgid "Then you can cancel the alerts." +#: app/views/comment/new.rhtml:35 +msgid "<strong>Thank</strong> the public authority or " msgstr "" -#: app/controllers/track_controller.rb:175 -msgid "Cancel some {{site_name}} alerts" +#: app/views/request/show.rhtml:91 +msgid "<strong>did not have</strong> the information requested." msgstr "" -#: app/controllers/track_controller.rb:183 -msgid "You will no longer be emailed updates for those alerts" +#: app/views/comment/new.rhtml:45 +msgid "" +"A <strong>summary</strong> of the response if you have received it by post. " msgstr "" -#: app/controllers/request_game_controller.rb:23 -msgid "<p>All done! Thank you very much for your help.</p><p>There are <a href=\"{{helpus_url}}\">more things you can do</a> to help {{site_name}}.</p>" +#: app/views/general/search.rhtml:258 +msgid "A public authority" msgstr "" -#: app/controllers/request_game_controller.rb:40 -msgid "To play the request categorisation game" +#: app/views/request/_other_describe_state.rhtml:34 +msgid "A response will be sent <strong>by post</strong>" msgstr "" -#: app/controllers/request_game_controller.rb:41 -msgid "Then you can play the request categorisation game." +#: app/views/general/search.rhtml:247 +msgid "A strange reponse, required attention by the {{site_name}} team" msgstr "" -#: app/controllers/request_game_controller.rb:42 -msgid "Play the request categorisation game" +#: app/views/general/search.rhtml:259 +msgid "A {{site_name}} user" msgstr "" -#: app/controllers/request_game_controller.rb:52 -msgid "Thank you for helping us keep the site tidy!" +#: app/views/user/set_profile_about_me.rhtml:20 +msgid "About you:" msgstr "" -#: app/controllers/application_controller.rb:279 -msgid "<p>{{site_name}} is currently in maintenance. You can only view existing requests. You cannot make new ones, add followups or annotations, or otherwise change the database.</p> <p>{{read_only}}</p>" +#: app/views/request/_sidebar.rhtml:8 +msgid "Act on what you've learnt" msgstr "" -#: app/controllers/comment_controller.rb:55 -msgid "To post your annotation" +#: app/views/comment/new.rhtml:14 +msgid "Add an annotation to " msgstr "" -#: app/controllers/comment_controller.rb:56 -msgid "Then your annotation to {{info_request_title}} will be posted." +#: app/views/request/show_response.rhtml:45 +msgid "" +"Add an annotation to your request with choice quotes, or\n" +" a <strong>summary of the response</strong>." msgstr "" -#: app/controllers/comment_controller.rb:57 -msgid "Confirm your annotation to {{info_request_title}}" +#: app/views/public_body/_body_listing_single.rhtml:26 +msgid "Added on {{date}}" msgstr "" -#: app/controllers/comment_controller.rb:62 -msgid "Thank you for making an annotation!" +#: app/models/user.rb:54 +msgid "Admin level is not included in list" msgstr "" -#: app/controllers/comment_controller.rb:73 -msgid " You will also be emailed updates about the request." +#: app/views/request_mailer/requires_admin.rhtml:9 +msgid "Administration URL:" msgstr "" -#: app/controllers/comment_controller.rb:75 -msgid " You are already being emailed updates about the request." +#: app/views/general/search.rhtml:46 +msgid "Advanced search" msgstr "" -#: app/models/user_mailer.rb:34 -msgid "Confirm your new email address on {{site_name}}" +#: app/views/general/search.rhtml:217 +msgid "Advanced search tips" msgstr "" -#: app/models/user_mailer.rb:45 -msgid "Unable to change email address on {{site_name}}" +#: app/views/comment/new.rhtml:52 +msgid "" +"Advise on whether the <strong>refusal is legal</strong>, and how to complain " +"about it if not." msgstr "" -#: app/models/track_thing.rb:123 -msgid "Track this request by email" +#: app/views/request/new.rhtml:67 +msgid "" +"Air, water, soil, land, flora and fauna (including how these effect\n" +" human beings)" msgstr "" -#: app/models/track_thing.rb:124 -msgid "You are already tracking this request by email" +#: app/views/general/search.rhtml:242 +msgid "All of the information requested has been received" msgstr "" -#: app/models/track_thing.rb:138 -msgid "any <a href=\"/list\">new requests</a>" +#: app/views/public_body/_body_listing_single.rhtml:12 +msgid "Also called {{other_name}}." msgstr "" -#: app/models/track_thing.rb:139 -msgid "Email me when there are new requests" +#: app/views/track_mailer/event_digest.rhtml:60 +msgid "Alter your subscription" msgstr "" -#: app/models/track_thing.rb:140 -msgid "You are being emailed when there are new requests" +#: app/views/request_mailer/new_response.rhtml:12 +msgid "" +"Although all responses are automatically published, we depend on\n" +"you, the original requester, to evaluate them." msgstr "" -#: app/models/track_thing.rb:142 app/models/track_thing.rb:143 -msgid "New Freedom of Information requests" +#: app/views/request/_other_describe_state.rhtml:70 +msgid "An <strong>error message</strong> has been received" msgstr "" -#: app/models/track_thing.rb:145 -msgid "To be emailed about any new requests" +#: app/views/general/search.rhtml:257 +msgid "Annotation added to request" msgstr "" -#: app/models/track_thing.rb:146 -msgid "Then you will be emailed whenever anyone makes a new FOI request." +#: app/views/user/show.rhtml:34 +msgid "Annotations" msgstr "" -#: app/models/track_thing.rb:147 -msgid "Confirm you want to be emailed about new requests" +#: app/views/comment/new.rhtml:17 +msgid "" +"Annotations are so anyone, including you, can help the requester with their " +"request. For example:" msgstr "" -#: app/models/track_thing.rb:154 -msgid "any <a href=\"/list/successful\">successful requests</a>" +#: app/views/comment/new.rhtml:69 +msgid "" +"Annotations will be posted publicly here, and are \n" +" <strong>not</strong> sent to {{public_body_name}}." msgstr "" -#: app/models/track_thing.rb:155 -msgid "Email me new successful responses " +#: app/views/request/_after_actions.rhtml:6 +msgid "Anyone:" msgstr "" -#: app/models/track_thing.rb:156 -msgid "You are being emailed about any new successful responses" +#: app/views/request/new.rhtml:103 +msgid "" +"Ask for <strong>specific</strong> documents or information, this site is not " +"suitable for general enquiries." msgstr "" -#: app/models/track_thing.rb:158 app/models/track_thing.rb:159 -msgid "Successful Freedom of Information requests" +#: app/views/request/show_response.rhtml:29 +msgid "" +"At the bottom of this page, write a reply to them trying to persuade them to " +"scan it in\n" +" (<a href=\"%s\">more details</a>)." msgstr "" -#: app/models/track_thing.rb:161 -msgid "To be emailed about any successful requests" +#: app/views/request/upload_response.rhtml:33 +msgid "Attachment (optional):" msgstr "" -#: app/models/track_thing.rb:162 -msgid "Then you will be emailed whenever an FOI request succeeds." +#: app/models/info_request.rb:785 +msgid "Awaiting classification." msgstr "" -#: app/models/track_thing.rb:163 -msgid "Confirm you want to be emailed when an FOI request succeeds" +#: app/models/info_request.rb:805 +msgid "Awaiting internal review." msgstr "" -#: app/models/track_thing.rb:174 -msgid "Track requests to {{public_body_name}} by email" +#: app/models/info_request.rb:787 +msgid "Awaiting response." msgstr "" -#: app/models/track_thing.rb:175 -msgid "You are already tracking requests to {{public_body_name}} by email" +#: app/views/public_body/list.rhtml:4 +msgid "Beginning with" msgstr "" -#: app/models/track_thing.rb:180 -msgid "To be emailed about requests made using {{site_name}} to the public authority '{{public_body_name}}'" +#: app/views/request/new.rhtml:46 +msgid "" +"Browse <a href='{{url}}'>other requests</a> for examples of how to word your " +"request." msgstr "" -#: app/models/track_thing.rb:181 -msgid "Then you will be emailed whenever someone requests something or gets a response from '{{public_body_name}}'." +#: app/views/request/new.rhtml:44 +msgid "" +"Browse <a href='{{url}}'>other requests</a> to '{{public_body_name}}' for " +"examples of how to word your request." msgstr "" -#: app/models/track_thing.rb:182 -msgid "Confirm you want to be emailed about requests to '{{public_body_name}}'" +#: app/views/general/frontpage.rhtml:49 +msgid "Browse all authorities..." msgstr "" -#: app/models/track_thing.rb:190 -msgid "Track this person by email" +#: app/views/request/show.rhtml:86 +msgid "" +"By law, under all circumstances, {{public_body_link}} should have responded " +"by now" msgstr "" -#: app/models/track_thing.rb:191 -msgid "You are already tracking this person by email" +#: app/views/request/show.rhtml:78 +msgid "" +"By law, {{public_body_link}} should normally have responded " +"<strong>promptly</strong> and" msgstr "" -#: app/models/track_thing.rb:193 app/models/track_thing.rb:194 -msgid "FOI requests by '{{user_name}}'" +#: app/controllers/track_controller.rb:145 +msgid "Cancel a {{site_name}} alert" msgstr "" -#: app/models/track_thing.rb:196 -msgid "To be emailed about requests by '{{user_name}}'" +#: app/controllers/track_controller.rb:175 +msgid "Cancel some {{site_name}} alerts" msgstr "" -#: app/models/track_thing.rb:197 -msgid "Then you will be emailed whenever '{{user_name}}' requests something or gets a response." +#: locale/model_attributes.rb:39 +msgid "CensorRule|Last edit comment" msgstr "" -#: app/models/track_thing.rb:198 -msgid "Confirm you want to be emailed about requests by '{{user_name}}'" +#: locale/model_attributes.rb:38 +msgid "CensorRule|Last edit editor" msgstr "" -#: app/models/track_thing.rb:206 -msgid "Track things matching '{{query}}' by email" +#: locale/model_attributes.rb:37 +msgid "CensorRule|Replacement" msgstr "" -#: app/models/track_thing.rb:207 -msgid "You are already tracking things matching '{{query}}' by email" +#: locale/model_attributes.rb:36 +msgid "CensorRule|Text" msgstr "" -#: app/models/track_thing.rb:209 app/models/track_thing.rb:210 -msgid "Requests or responses matching '{{query}}'" +#: lib/public_body_categories_en.rb:14 +msgid "Central government" msgstr "" -#: app/models/track_thing.rb:212 -msgid "To follow requests and responses matching '{{query}}'" +#: app/views/user/signchangeemail.rhtml:37 +msgid "Change email on {{site_name}}" msgstr "" -#: app/models/track_thing.rb:213 -msgid "Then you will be emailed whenever a new request or response matches '{{query}}'." +#: app/views/user/signchangepassword.rhtml:27 +msgid "Change password on {{site_name}}" msgstr "" -#: app/models/track_thing.rb:214 -msgid "Confirm you want to be emailed about new requests or responses matching '{{query}}'" +#: app/views/user/set_crop_profile_photo.rhtml:1 app/views/user/show.rhtml:104 +msgid "Change profile photo" msgstr "" -#: app/models/contact_validator.rb:28 app/models/user.rb:36 -msgid "Please enter your name" +#: app/views/user/set_profile_about_me.rhtml:1 +msgid "Change the text about you on your profile at {{site_name}}" msgstr "" -#: app/models/contact_validator.rb:29 app/models/user.rb:34 -msgid "Please enter your email address" +#: app/views/user/show.rhtml:107 +msgid "Change your email" msgstr "" -#: app/models/contact_validator.rb:30 -msgid "Please enter a subject" +#: app/controllers/user_controller.rb:268 +#: app/views/user/signchangeemail.rhtml:1 +#: app/views/user/signchangeemail.rhtml:11 +msgid "Change your email address used on {{site_name}}" msgstr "" -#: app/models/contact_validator.rb:31 -msgid "Please enter the message you want to send" +#: app/views/user/show.rhtml:106 +msgid "Change your password" msgstr "" -#: app/models/contact_validator.rb:34 -msgid "Email doesn't look like a valid address" +#: app/views/user/signchangepassword.rhtml:1 +#: app/views/user/signchangepassword.rhtml:11 +#: app/views/user/signchangepassword_send_confirm.rhtml:1 +#: app/views/user/signchangepassword_send_confirm.rhtml:9 +msgid "Change your password on {{site_name}}" msgstr "" -#: app/models/info_request.rb:34 -msgid "Please enter a summary of your request" +#: app/controllers/user_controller.rb:222 +msgid "Change your password {{site_name}}" msgstr "" -#: app/models/info_request.rb:35 -msgid "Please write a summary with some text in it" +#: app/views/public_body/show.rhtml:20 app/views/public_body/show.rhtml:22 +msgid "Charity registration" msgstr "" -#: app/models/info_request.rb:120 -msgid "Please write the summary using a mixture of capital and lower case letters. This makes it easier for others to read." +#: app/views/general/exception_caught.rhtml:8 +msgid "Check for mistakes if you typed or copied the address." msgstr "" -#: app/models/info_request.rb:123 -msgid "Please keep the summary short, like in the subject of an email. You can use a phrase, rather than a full sentence." +#: app/views/request/followup_preview.rhtml:14 +#: app/views/request/preview.rhtml:7 +msgid "Check you haven't included any <strong>personal information</strong>." msgstr "" -#: app/models/info_request.rb:126 -msgid "Please describe more what the request is about in the subject. There is no need to say it is an FOI request, we add that on anyway." +#: lib/world_foi_websites.rb:29 +msgid "Chile" msgstr "" -#: app/models/info_request.rb:395 -msgid "This request has been set by an administrator to \"allow new responses from nobody\"" +#: app/models/info_request_event.rb:316 +msgid "Clarification" msgstr "" -#: app/models/info_request.rb:401 -msgid "Only the authority can reply to this request, but there is no \"From\" address to check against" +#: app/controllers/request_controller.rb:338 +msgid "Classify an FOI response from " msgstr "" -#: app/models/info_request.rb:405 -msgid "Only the authority can reply to this request, and I don't recognise the address this reply was sent from" +#: app/views/request_mailer/very_overdue_alert.rhtml:6 +msgid "" +"Click on the link below to send a message to {{public_body_name}} telling " +"them to reply to your request. You might like to ask for an internal\n" +"review, asking them to find out why response to the request has been so slow." msgstr "" -#: app/models/info_request.rb:785 -msgid "Awaiting classification." +#: app/views/request_mailer/overdue_alert.rhtml:5 +msgid "" +"Click on the link below to send a message to {{public_body}} reminding them " +"to reply to your request." msgstr "" -#: app/models/info_request.rb:787 -msgid "Awaiting response." +#: locale/model_attributes.rb:22 +msgid "Comment|Body" msgstr "" -#: app/models/info_request.rb:789 -msgid "Delayed." +#: locale/model_attributes.rb:21 +msgid "Comment|Comment type" msgstr "" -#: app/models/info_request.rb:791 -msgid "Long overdue." +#: locale/model_attributes.rb:24 +msgid "Comment|Locale" msgstr "" -#: app/models/info_request.rb:793 -msgid "Information not held." +#: locale/model_attributes.rb:23 +msgid "Comment|Visible" msgstr "" -#: app/models/info_request.rb:795 -msgid "Refused." +#: app/models/track_thing.rb:220 +msgid "Confirm you want to be emailed about new requests" msgstr "" -#: app/models/info_request.rb:797 -msgid "Partially successful." +#: app/models/track_thing.rb:287 +msgid "" +"Confirm you want to be emailed about new requests or responses matching your " +"search" msgstr "" -#: app/models/info_request.rb:799 -msgid "Successful." +#: app/models/track_thing.rb:271 +msgid "Confirm you want to be emailed about requests by '{{user_name}}'" msgstr "" -#: app/models/info_request.rb:801 -msgid "Waiting clarification." +#: app/models/track_thing.rb:255 +msgid "Confirm you want to be emailed about requests to '{{public_body_name}}'" msgstr "" -#: app/models/info_request.rb:803 -msgid "Handled by post." +#: app/models/track_thing.rb:236 +msgid "Confirm you want to be emailed when an FOI request succeeds" msgstr "" -#: app/models/info_request.rb:805 -msgid "Awaiting internal review." +#: app/models/track_thing.rb:204 +msgid "Confirm you want to follow updates to the request '{{request_title}}'" msgstr "" -#: app/models/info_request.rb:807 app/models/info_request_event.rb:315 +#: app/controllers/request_controller.rb:299 +msgid "Confirm your FOI request to " +msgstr "" + +#: app/controllers/request_controller.rb:707 +#: app/controllers/user_controller.rb:542 +msgid "Confirm your account on {{site_name}}" +msgstr "" + +#: app/controllers/comment_controller.rb:57 +msgid "Confirm your annotation to {{info_request_title}}" +msgstr "" + +#: app/controllers/request_controller.rb:31 +msgid "Confirm your email address" +msgstr "" + +#: app/models/user_mailer.rb:34 +msgid "Confirm your new email address on {{site_name}}" +msgstr "" + +#: app/views/layouts/default.rhtml:152 +msgid "Contact {{site_name}}" +msgstr "" + +#: app/models/request_mailer.rb:218 +msgid "Could not identify the request from the email address" +msgstr "" + +#: app/models/profile_photo.rb:96 +msgid "" +"Couldn't understand the image file that you uploaded. PNG, JPEG, GIF and " +"many other common image file formats are supported." +msgstr "" + +#: app/views/user/set_crop_profile_photo.rhtml:6 +msgid "Crop your profile photo" +msgstr "" + +#: app/views/request/new.rhtml:72 +msgid "" +"Cultural sites and built structures (as they may be affected by the\n" +" environmental factors listed above)" +msgstr "" + +#: app/views/request/show.rhtml:68 +msgid "" +"Currently <strong>waiting for a response</strong> from {{public_body_link}}, " +"they must respond promptly and" +msgstr "" + +#: app/models/outgoing_message.rb:63 +msgid "Dear {{public_body_name}}," +msgstr "" + +#: app/models/info_request.rb:789 +msgid "Delayed." +msgstr "" + +#: app/models/info_request.rb:807 msgid "Delivery error" msgstr "" -#: app/models/info_request.rb:809 -msgid "Unusual response." +#: app/views/request/details.rhtml:1 app/views/request/details.rhtml:2 +msgid "Details of request '" msgstr "" -#: app/models/info_request.rb:811 -msgid "Withdrawn by the requester." +#: app/views/general/search.rhtml:170 +msgid "Did you mean: {{correction}}" msgstr "" -#: app/models/info_request.rb:816 app/models/info_request_event.rb:333 -msgid "unknown status " +#: app/views/outgoing_mailer/_followup_footer.rhtml:1 +msgid "" +"Disclaimer: This message and any reply that you make will be published on " +"the internet. Our privacy and copyright policies:" msgstr "" -#: app/models/user.rb:38 -msgid "Please enter a password" +#: app/views/general/_localised_datepicker.rhtml:4 +msgid "Done" msgstr "" -#: app/models/user.rb:49 -msgid "Please enter the same password twice" +#: app/views/request/_view_html_prefix.rhtml:6 +msgid "Download original attachment" msgstr "" -#: app/models/user.rb:54 -msgid "Admin level is not included in list" +#: app/views/request/_followup.rhtml:85 +msgid "" +"Edit and add <strong>more details</strong> to the message above,\n" +" explaining why you are dissatisfied with their response." msgstr "" -#: app/models/user.rb:106 -msgid "Please enter a valid email address" +#: app/views/admin_public_body/_locale_selector.rhtml:2 +msgid "Edit language version:" msgstr "" -#: app/models/user.rb:109 -msgid "Please enter your name, not your email address, in the name field." +#: app/views/user/set_profile_about_me.rhtml:9 +msgid "Edit text about you" msgstr "" -#: app/models/user.rb:122 -msgid "{{user_name}} (Banned)" +#: app/views/request/preview.rhtml:40 +msgid "Edit this request" msgstr "" -#: app/models/user.rb:135 +#: app/models/user.rb:144 msgid "Either the email or password was not recognised, please try again." msgstr "" -#: app/models/user.rb:137 -msgid "Either the email or password was not recognised, please try again. Or create a new account using the form on the right." +#: app/models/user.rb:146 +msgid "" +"Either the email or password was not recognised, please try again. Or create " +"a new account using the form on the right." msgstr "" -#: app/models/profile_photo.rb:91 -msgid "Please choose a file containing your photo." +#: app/models/contact_validator.rb:34 +msgid "Email doesn't look like a valid address" msgstr "" -#: app/models/profile_photo.rb:96 -msgid "Couldn't understand the image file that you uploaded. PNG, JPEG, GIF and many other common image file formats are supported." +#: app/views/comment/_comment_form.rhtml:8 +msgid "Email me future updates to this request" msgstr "" -#: app/models/profile_photo.rb:101 -msgid "Failed to convert image to a PNG" +#: app/models/track_thing.rb:228 +msgid "Email me new successful responses " msgstr "" -#: app/models/profile_photo.rb:105 -msgid "Failed to convert image to the correct size: at %{cols}x%{rows}, need %{width}x%{height}" +#: app/models/track_thing.rb:212 +msgid "Email me when there are new requests" msgstr "" -#: app/models/track_mailer.rb:25 -msgid "Your {{site_name}} email alert" +#: app/views/user/show.rhtml:36 +msgid "Email subscriptions" msgstr "" -#: app/models/info_request_event.rb:293 -msgid "Acknowledgement" +#: app/views/general/search.rhtml:219 +msgid "" +"Enter words that you want to find separated by spaces, e.g. <strong>climbing " +"lane</strong>" msgstr "" -#: app/models/info_request_event.rb:295 -msgid "Clarification required" +#: app/views/request/upload_response.rhtml:23 +msgid "" +"Enter your response below. You may attach one file (use email, or \n" +"<a href=\"%s\">contact us</a> if you need more)." msgstr "" -#: app/models/info_request_event.rb:297 -msgid "Handled by post" +#: app/views/public_body/show.rhtml:116 +msgid "Environmental Information Regulations requests made" msgstr "" -#: app/models/info_request_event.rb:299 -msgid "Deadline Extended" +#: app/views/public_body/show.rhtml:73 +msgid "Environmental Information Regulations requests made using this site" msgstr "" -#: app/models/info_request_event.rb:301 -msgid "Wrong Response" +#: lib/world_foi_websites.rb:13 +msgid "European Union" msgstr "" -#: app/models/info_request_event.rb:303 -msgid "Information not held" +#: app/views/request/details.rhtml:4 +msgid "Event history" msgstr "" -#: app/models/info_request_event.rb:305 -msgid "Refused" +#: app/views/request/_sidebar.rhtml:35 +msgid "Event history details" msgstr "" -#: app/models/info_request_event.rb:307 -msgid "Some information sent" +#: app/views/request/new.rhtml:126 +msgid "" +"Everything that you enter on this page \n" +" will be <strong>displayed publicly</strong> on\n" +" this website forever (<a href=\"%s\">why?</a>)." msgstr "" -#: app/models/info_request_event.rb:309 -msgid "All information sent" +#: app/views/request/new.rhtml:118 +msgid "" +"Everything that you enter on this page, including <strong>your name</" +"strong>, \n" +" will be <strong>displayed publicly</strong> on\n" +" this website forever (<a href=\"%s\">why?</a>)." msgstr "" -#: app/models/info_request_event.rb:311 -msgid "Internal review acknowledgement" +#: locale/model_attributes.rb:58 +msgid "EximLogDone|Filename" msgstr "" -#: app/models/info_request_event.rb:313 -msgid "Withdrawn by requester" +#: locale/model_attributes.rb:59 +msgid "EximLogDone|Last stat" msgstr "" -#: app/models/info_request_event.rb:317 -msgid "Unusual response" +#: locale/model_attributes.rb:19 +msgid "EximLog|Line" msgstr "" -#: app/models/info_request_event.rb:328 -msgid "Internal review request" +#: locale/model_attributes.rb:18 +msgid "EximLog|Order" msgstr "" -#: app/models/info_request_event.rb:331 -msgid "Clarification" +#: app/views/public_body/view_email.rhtml:3 +msgid "FOI email address for {{public_body}}" msgstr "" -#: app/models/info_request_event.rb:335 -msgid "Follow up" +#: app/views/user/show.rhtml:33 +msgid "FOI requests" msgstr "" -#: app/models/info_request_event.rb:338 -msgid "display_status only works for incoming and outgoing messages right now" +#: app/models/track_thing.rb:266 app/models/track_thing.rb:267 +msgid "FOI requests by '{{user_name}}'" msgstr "" -#: app/models/change_email_validator.rb:29 -msgid "Please enter your old email address" +#: app/views/general/search.rhtml:199 +msgid "FOI requests {{start_count}} to {{end_count}} of {{total_count}}" msgstr "" -#: app/models/change_email_validator.rb:30 -msgid "Please enter your new email address" +#: app/models/profile_photo.rb:101 +msgid "Failed to convert image to a PNG" msgstr "" -#: app/models/change_email_validator.rb:31 -msgid "Please enter your password" +#: app/models/profile_photo.rb:105 +msgid "" +"Failed to convert image to the correct size: at %{cols}x%{rows}, need %" +"{width}x%{height}" msgstr "" -#: app/models/change_email_validator.rb:39 -msgid "Old email doesn't look like a valid address" +#: app/views/request/select_authority.rhtml:35 +msgid "" +"First, type in the <strong>name of the UK public authority</strong> you'd \n" +" <br>like information from. <strong>By law, they have to respond</" +"strong>\n" +" (<a href=\"%s\">why?</a>)." msgstr "" -#: app/models/change_email_validator.rb:44 -msgid "Old email address isn't the same as the address of the account you are logged in with" +#: app/views/track/_tracking_links.rhtml:21 +msgid "Follow by email" msgstr "" -#: app/models/change_email_validator.rb:47 -msgid "Password is not correct" +#: app/views/request/list.rhtml:8 +msgid "Follow these requests" msgstr "" -#: app/models/change_email_validator.rb:53 -msgid "New email doesn't look like a valid address" +#: app/views/public_body/show.rhtml:4 +msgid "Follow this authority" msgstr "" -#: app/models/outgoing_message.rb:63 -msgid "Dear {{public_body_name}}," +#: app/views/request_mailer/old_unclassified_updated.rhtml:4 +msgid "Follow this link to see the request:" msgstr "" -#: app/models/outgoing_message.rb:68 -msgid "Yours sincerely," +#: app/views/request/_sidebar.rhtml:2 +msgid "Follow this request" msgstr "" -#: app/models/outgoing_message.rb:70 -msgid "Yours faithfully," +#: app/models/info_request_event.rb:320 +msgid "Follow up" msgstr "" -#: app/models/outgoing_message.rb:74 -msgid "GIVE DETAILS ABOUT YOUR COMPLAINT HERE" +#: app/views/general/search.rhtml:255 +msgid "Follow up message sent by requester" msgstr "" -#: app/models/outgoing_message.rb:146 -msgid "Please give details explaining why you want a review" +#: app/views/public_body/view_email.rhtml:14 +msgid "Follow up messages to existing requests are sent to " msgstr "" -#: app/models/outgoing_message.rb:148 -msgid "Please enter your follow up message" +#: app/views/request/_followup.rhtml:16 +msgid "" +"Follow ups and new responses to this request have been stopped to prevent " +"spam. Please <a href=\"{{url}}\">contact us</a> if you are {{user_link}} and " +"need to send a follow up." msgstr "" -#: app/models/outgoing_message.rb:151 -msgid "Please enter your letter requesting information" +#: app/views/layouts/default.rhtml:153 +msgid "Follow us on twitter" msgstr "" -#: app/models/outgoing_message.rb:157 -msgid "Please sign at the bottom with your name, or alter the \"%{signoff}\" signature" +#: app/views/public_body/show.rhtml:66 +msgid "" +"For an unknown reason, it is not possible to make a request to this " +"authority." msgstr "" -#: app/models/outgoing_message.rb:160 -msgid "Please write your message using a mixture of capital and lower case letters. This makes it easier for others to read." +#: app/views/user/_signin.rhtml:21 +msgid "Forgotten your password?" msgstr "" -#: app/models/outgoing_message.rb:163 -msgid "Please choose what sort of reply you are making." +#: app/views/public_body/list.rhtml:46 +msgid "Found {{count}} public bodies {{description}}" msgstr "" -#: app/models/about_me_validator.rb:24 -msgid "Please keep it shorter than 500 characters" +#: app/views/public_body/show.rhtml:61 +msgid "" +"Freedom of Information law does not apply to this authority, so you cannot " +"make\n" +" a request to it." msgstr "" -#: app/models/public_body.rb:36 -msgid "Name can't be blank" +#: app/views/request/followup_bad.rhtml:11 +msgid "Freedom of Information law no longer applies to" msgstr "" -#: app/models/public_body.rb:37 -msgid "URL name can't be blank" +#: app/views/public_body/view_email.rhtml:10 +msgid "" +"Freedom of Information law no longer applies to this authority.Follow up " +"messages to existing requests are sent to " msgstr "" -#: app/models/public_body.rb:39 -msgid "Short name is already taken" +#: app/views/public_body/show.rhtml:118 +msgid "Freedom of Information requests made" msgstr "" -#: app/models/public_body.rb:40 -msgid "Name is already taken" +#: app/views/user/show.rhtml:155 +msgid "Freedom of Information requests made by this person" msgstr "" -#: app/models/request_mailer.rb:210 -msgid "Could not identify the request from the email address" +#: app/views/user/show.rhtml:155 +msgid "Freedom of Information requests made by you" msgstr "" -#: app/models/comment.rb:59 -msgid "Please enter your annotation" +#: app/views/public_body/show.rhtml:76 +msgid "Freedom of Information requests made using this site" msgstr "" -#: app/models/comment.rb:62 -msgid "Please write your annotation using a mixture of capital and lower case letters. This makes it easier for others to read." +#: app/views/request/followup_bad.rhtml:12 +msgid "" +"From the request page, try replying to a particular message, rather than " +"sending\n" +" a general followup. If you need to make a general followup, and know\n" +" an email which will go to the right place, please <a href=\"%s\">send it " +"to us</a>." msgstr "" -#: app/models/incoming_message.rb:868 -msgid "\n\n[ {{site_name}} note: The above text was badly encoded, and has had strange characters removed. ]" +#: app/models/outgoing_message.rb:74 +msgid "GIVE DETAILS ABOUT YOUR COMPLAINT HERE" msgstr "" -#: app/views/request/_correspondence.rhtml:27 app/views/request/_correspondence.rhtml:57 -msgid "Link to this" +#: lib/world_foi_websites.rb:25 +msgid "Germany" msgstr "" -#: app/views/request/_correspondence.rhtml:28 -msgid "Reply to this message" +#: app/models/info_request.rb:803 +msgid "Handled by post." msgstr "" -#: app/views/request/_correspondence.rhtml:58 -msgid "Send follow up" +#: app/controllers/services_controller.rb:21 +msgid "" +"Hello! You can make Freedom of Information requests within {{country_name}} " +"at {{link_to_website}}" msgstr "" -#: app/views/request/list.rhtml:2 app/views/public_body/list.rhtml:3 -msgid "Show only..." +#: app/views/layouts/default.rhtml:98 +msgid "Hello, {{username}}!" msgstr "" -#: app/views/request/list.rhtml:5 -msgid "Successful responses" +#: app/views/layouts/default.rhtml:130 +msgid "Help" msgstr "" -#: app/views/request/list.rhtml:6 -msgid "Recently sent requests" +#: app/views/request/details.rhtml:50 +msgid "" +"Here <strong>described</strong> means when a user selected a status for the " +"request, and\n" +"the most recent event had its status updated to that value. " +"<strong>calculated</strong> is then inferred by\n" +"{{site_name}} for intermediate events, which weren't given an explicit\n" +"description by a user. See the <a href=\"{{search_path}}\">search tips</a> " +"for description of the states." msgstr "" -#: app/views/request/list.rhtml:23 -msgid "No requests of this sort yet." +#: app/views/request/_other_describe_state.rhtml:4 +msgid "" +"Hi! We need your help. The person who made the following request\n" +" hasn't told us whether or not it was successful. Would you mind taking\n" +" a moment to read it and help us keep the place tidy for everyone?\n" +" Thanks." msgstr "" -#: app/views/request/list.rhtml:29 -msgid "Unexpected search result type" +#: locale/model_attributes.rb:55 +msgid "Holiday|Day" msgstr "" -#: app/views/request/_request_listing_single.rhtml:12 -msgid "Requested from {{public_body_name}} by {{info_request_user}} on {{date}}" +#: locale/model_attributes.rb:56 +msgid "Holiday|Description" msgstr "" -#: app/views/request/show_response.rhtml:13 -msgid "Which of these is happening?" +#: app/views/layouts/default.rhtml:125 +msgid "Home" msgstr "" -#: app/views/request/show_response.rhtml:18 -msgid "The authority say that they <strong>need a postal\n address</strong>, not just an email, for it to be a valid FOI request" +#: app/views/public_body/show.rhtml:12 +msgid "Home page of authority" msgstr "" -#: app/views/request/show_response.rhtml:26 -msgid "The authority only has a <strong>paper copy</strong> of the information." +#: app/views/request/new.rhtml:61 +msgid "" +"However, you have the right to request environmental\n" +" information under a different law" msgstr "" -#: app/views/request/show_response.rhtml:29 -msgid "At the bottom of this page, write a reply to them trying to persuade them to scan it in\n (<a href=\"%s\">more details</a>)." +#: app/views/request/new.rhtml:71 +msgid "Human health and safety" msgstr "" -#: app/views/request/show_response.rhtml:34 -msgid "You want to <strong>give your postal address</strong> to the authority in private." +#: app/views/request/_followup.rhtml:68 +msgid "I am asking for <strong>new information</strong>" msgstr "" -#: app/views/request/show_response.rhtml:37 -msgid "To do that please send a private email to " +#: app/views/request/_followup.rhtml:73 +msgid "I am requesting an <strong>internal review</strong>" msgstr "" -#: app/views/request/show_response.rhtml:39 -msgid "containing your postal address, and asking them to reply to this request.\n Or you could phone them." +#: app/views/request_game/play.rhtml:39 +msgid "I don't like these ones — give me some more!" msgstr "" -#: app/views/request/show_response.rhtml:42 -msgid "When you receive the paper response, please help\n others find out what it says:" +#: app/views/request_game/play.rhtml:40 +msgid "I don't want to do any more tidying now!" msgstr "" -#: app/views/request/show_response.rhtml:45 -msgid "Add an annotation to your request with choice quotes, or\n a <strong>summary of the response</strong>." +#: app/views/request/_describe_state.rhtml:91 +msgid "I would like to <strong>withdraw this request</strong>" msgstr "" -#: app/views/request/show_response.rhtml:47 -msgid "If you can, scan in or photograph the response, and <strong>send us\n a copy to upload</strong>." +#: app/views/request/_describe_state.rhtml:11 +msgid "" +"I'm still <strong>waiting</strong> for my information\n" +" <small>(maybe you got an acknowledgement)</small>" msgstr "" -#: app/views/request/show_response.rhtml:60 -msgid "New response to your request" +#: app/views/request/_describe_state.rhtml:18 +msgid "I'm still <strong>waiting</strong> for the internal review" msgstr "" -#: app/views/request/show_response.rhtml:62 -msgid "Response to your request" +#: app/views/request/_describe_state.rhtml:32 +msgid "I'm waiting for an <strong>internal review</strong> response" msgstr "" -#: app/views/request/show_response.rhtml:66 -msgid "New response to {{law_used_short}} request" +#: app/views/request/_describe_state.rhtml:25 +msgid "I've been asked to <strong>clarify</strong> my request" msgstr "" -#: app/views/request/_followup.rhtml:4 -msgid "Request an internal review from" +#: app/views/request/_describe_state.rhtml:60 +msgid "I've received <strong>all the information" msgstr "" -#: app/views/request/_followup.rhtml:7 -msgid "Send a public follow up message to" +#: app/views/request/_describe_state.rhtml:56 +msgid "I've received <strong>some of the information</strong>" msgstr "" -#: app/views/request/_followup.rhtml:10 -msgid "Send a public reply to" +#: app/views/request/_describe_state.rhtml:76 +msgid "I've received an <strong>error message</strong>" msgstr "" -#: app/views/request/_followup.rhtml:16 -msgid "Follow ups and new responses to this request have been stopped to prevent spam. Please <a href=\"{{url}}\">contact us</a> if you are {{user_link}} and need to send a follow up." +#: app/views/public_body/view_email.rhtml:28 +msgid "" +"If the address is wrong, or you know a better address, please <a href=\"%s" +"\">contact us</a>." +msgstr "" + +#: app/views/request_mailer/stopped_responses.rhtml:10 +msgid "" +"If this is incorrect, or you would like to send a late response to the " +"request\n" +"or an email on another subject to {{user}}, then please\n" +"email {{contact_email}} for help." msgstr "" #: app/views/request/_followup.rhtml:20 -msgid "If you are dissatisfied by the response you got from\n the public authority, you have the right to\n complain (<a href=\"%s\">details</a>)." +msgid "" +"If you are dissatisfied by the response you got from\n" +" the public authority, you have the right to\n" +" complain (<a href=\"%s\">details</a>)." msgstr "" -#: app/views/request/_followup.rhtml:27 -msgid "Please <strong>only</strong> write messages directly relating to your request {{request_link}}. If you would like to ask for information that was not in your original request, then <a href=\"{{new_request_link}}\">file a new request</a>." +#: app/views/user/no_cookies.rhtml:20 +msgid "If you are still having trouble, please <a href=\"%s\">contact us</a>." msgstr "" -#: app/views/request/_followup.rhtml:32 -msgid "The response to your request has been <strong>delayed</strong>. You can say that, \n by law, the authority should normally have responded\n <strong>promptly</strong> and" +#: app/views/request/hidden.rhtml:15 +msgid "" +"If you are the requester, then you may <a href=\"%s\">sign in</a> to view " +"the request." msgstr "" -#: app/views/request/_followup.rhtml:36 app/views/request/show.rhtml:70 app/views/request/show.rhtml:80 -msgid "in term time" +#: app/views/request/new.rhtml:121 +msgid "" +"If you are thinking of using a pseudonym,\n" +" please <a href=\"%s\">read this first</a>." msgstr "" -#: app/views/request/_followup.rhtml:38 -msgid "by <strong>{{date}}</strong>" +#: app/views/request/show.rhtml:105 +msgid "If you are {{user_link}}, please" msgstr "" -#: app/views/request/_followup.rhtml:39 app/views/request/_followup.rhtml:46 -#: app/views/request/show.rhtml:83 app/views/request/show.rhtml:87 -msgid "<a href=\"%s\">details</a>" +#: app/views/user/bad_token.rhtml:7 +msgid "" +"If you can't click on it in the email, you'll have to <strong>select and " +"copy\n" +"it</strong> from the email. Then <strong>paste it into your browser</" +"strong>, into the place\n" +"you would type the address of any other webpage." msgstr "" -#: app/views/request/_followup.rhtml:44 -msgid "The response to your request is <strong>long overdue</strong>. You can say that, by \n law, under all circumstances, the authority should have responded\n by now" +#: app/views/request/show_response.rhtml:47 +msgid "" +"If you can, scan in or photograph the response, and <strong>send us\n" +" a copy to upload</strong>." msgstr "" -#: app/views/request/_followup.rhtml:58 -msgid "What are you doing?" +#: app/views/outgoing_mailer/_followup_footer.rhtml:4 +msgid "" +"If you find this service useful as an FOI officer, please ask your web " +"manager to link to us from your organisation's FOI page." msgstr "" -#: app/views/request/_followup.rhtml:68 -msgid "I am asking for <strong>new information</strong>" +#: app/views/user/bad_token.rhtml:13 +msgid "" +"If you got the email <strong>more than six months ago</strong>, then this " +"login link won't work any\n" +"more. Please try doing what you were doing from the beginning." msgstr "" -#: app/views/request/_followup.rhtml:73 -msgid "I am requesting an <strong>internal review</strong>" +#: app/controllers/request_controller.rb:436 +msgid "" +"If you have not done so already, please write a message below telling the " +"authority that you have withdrawn your request. Otherwise they will not know " +"it has been withdrawn." msgstr "" -#: app/views/request/_followup.rhtml:74 -msgid "<a href=\"%s\">what's that?</a>" +#: app/views/user/signchangeemail_confirm.rhtml:11 +#: app/views/user/signchangepassword_confirm.rhtml:10 +msgid "" +"If you use web-based email or have \"junk mail\" filters, also check your\n" +"bulk/spam mail folders. Sometimes, our messages are marked that way." msgstr "" -#: app/views/request/_followup.rhtml:79 -msgid "<strong>Anything else</strong>, such as clarifying, prompting, thanking" +#: app/views/user/banned.rhtml:15 +msgid "" +"If you would like us to lift this ban, then you may politely\n" +"<a href=\"/help/contact\">contact us</a> giving reasons.\n" msgstr "" -#: app/views/request/_followup.rhtml:85 -msgid "Edit and add <strong>more details</strong> to the message above,\n explaining why you are dissatisfied with their response." +#: app/views/user/_signup.rhtml:6 +msgid "If you're new to {{site_name}}" msgstr "" -#: app/views/request/_followup.rhtml:96 -msgid "Preview your message" +#: app/views/user/_signin.rhtml:7 +msgid "If you've used {{site_name}} before" msgstr "" -#: app/views/request/_sidebar.rhtml:2 -msgid "Track this request" +#: app/views/user/no_cookies.rhtml:12 +msgid "" +"If your browser is set to accept cookies and you are seeing this message,\n" +"then there is probably a fault with our server." msgstr "" -#: app/views/request/_sidebar.rhtml:5 -msgid "Act on what you've learnt" +#: locale/model_attributes.rb:61 +msgid "IncomingMessage|Cached attachment text clipped" msgstr "" -#: app/views/request/_sidebar.rhtml:30 -msgid "Similar requests" +#: locale/model_attributes.rb:62 +msgid "IncomingMessage|Cached main body text folded" msgstr "" -#: app/views/request/_sidebar.rhtml:41 -msgid "Event history details" +#: locale/model_attributes.rb:63 +msgid "IncomingMessage|Cached main body text unfolded" msgstr "" -#: app/views/request/_sidebar.rhtml:45 -msgid "<a href=\"%s\">Are you the owner of\n any commercial copyright on this page?</a>" +#: locale/model_attributes.rb:44 +msgid "InfoRequestEvent|Calculated state" msgstr "" -#: app/views/request/followup_bad.rhtml:2 -msgid "Unable to send follow up message to {{username}}" +#: locale/model_attributes.rb:43 +msgid "InfoRequestEvent|Described state" msgstr "" -#: app/views/request/followup_bad.rhtml:4 -msgid "Unable to send a reply to {{username}}" +#: locale/model_attributes.rb:41 +msgid "InfoRequestEvent|Event type" msgstr "" -#: app/views/request/followup_bad.rhtml:11 -msgid "Freedom of Information law no longer applies to" +#: locale/model_attributes.rb:45 +msgid "InfoRequestEvent|Last described at" msgstr "" -#: app/views/request/followup_bad.rhtml:12 -msgid "From the request page, try replying to a particular message, rather than sending\n a general followup. If you need to make a general followup, and know\n an email which will go to the right place, please <a href=\"%s\">send it to us</a>." +#: locale/model_attributes.rb:42 +msgid "InfoRequestEvent|Params yaml" msgstr "" -#: app/views/request/followup_bad.rhtml:18 -msgid "no longer exists. If you are trying to make\n From the request page, try replying to a particular message, rather than sending\n a general followup. If you need to make a general followup, and know\n an email which will go to the right place, please <a href=\"%s\">send it to us</a>." +#: locale/model_attributes.rb:46 +msgid "InfoRequestEvent|Prominence" msgstr "" -#: app/views/request/followup_bad.rhtml:24 -msgid "We do not have a working {{law_used_full}} address for {{public_body_name}}." +#: locale/model_attributes.rb:85 +msgid "InfoRequest|Allow new responses from" msgstr "" -#: app/views/request/followup_bad.rhtml:24 -msgid "You may be able to find\n one on their website, or by phoning them up and asking. If you manage\n to find one, then please <a href=\"%s\">send it to us</a>." +#: locale/model_attributes.rb:81 +msgid "InfoRequest|Awaiting description" msgstr "" -#: app/views/request/followup_bad.rhtml:29 -msgid "unknown reason " +#: locale/model_attributes.rb:80 +msgid "InfoRequest|Described state" msgstr "" -#: app/views/request/preview.rhtml:5 -msgid "Now preview your request" +#: locale/model_attributes.rb:86 +msgid "InfoRequest|Handle rejected responses" msgstr "" -#: app/views/request/preview.rhtml:7 app/views/request/followup_preview.rhtml:14 -msgid "Check you haven't included any <strong>personal information</strong>." +#: locale/model_attributes.rb:87 +msgid "InfoRequest|Idhash" msgstr "" -#: app/views/request/preview.rhtml:8 -msgid "Your name, request and any responses will appear in <strong>search engines</strong>\n (<a href=\"%s\">details</a>)." +#: locale/model_attributes.rb:84 +msgid "InfoRequest|Law used" msgstr "" -#: app/views/request/preview.rhtml:17 app/views/request/followup_preview.rhtml:22 -#: app/views/request/new.rhtml:88 -msgid "To:" +#: locale/model_attributes.rb:82 +msgid "InfoRequest|Prominence" msgstr "" -#: app/views/request/preview.rhtml:18 app/views/request/followup_preview.rhtml:23 -msgid "Subject:" +#: locale/model_attributes.rb:79 +msgid "InfoRequest|Title" msgstr "" -#: app/views/request/preview.rhtml:31 -msgid "<strong>Privacy note:</strong> If you want to request private information about\n yourself then <a href=\"%s\">click here</a>." +#: locale/model_attributes.rb:83 +msgid "InfoRequest|Url title" msgstr "" -#: app/views/request/preview.rhtml:40 -msgid "Re-edit this request" +#: app/models/info_request.rb:793 +msgid "Information not held." msgstr "" -#: app/views/request/preview.rhtml:41 -msgid "Send public " +#: app/views/request/new.rhtml:69 +msgid "" +"Information on emissions and discharges (e.g. noise, energy,\n" +" radiation, waste materials)" msgstr "" -#: app/views/request/preview.rhtml:45 -msgid "Tags:" +#: app/models/info_request_event.rb:313 +msgid "Internal review request" msgstr "" -#: app/views/request/new_bad_contact.rhtml:1 -msgid "Missing contact details for '" +#: app/views/outgoing_mailer/initial_request.rhtml:8 +msgid "" +"Is {{email_address}} the wrong address for {{type_of_request}} requests to " +"{{public_body_name}}? If so, please contact us using this form:" msgstr "" -#: app/views/request/new_bad_contact.rhtml:5 -msgid "Unfortunately, we do not have a working {{info_request_law_used_full}}\naddress for" +#: app/views/user/no_cookies.rhtml:8 +msgid "" +"It may be that your browser is not set to accept a thing called \"cookies" +"\",\n" +"or cannot do so. If you can, please enable cookies, or try using a " +"different\n" +"browser. Then press refresh to have another go." msgstr "" -#: app/views/request/new_bad_contact.rhtml:6 -msgid "You may be able to find\none on their website, or by phoning them up and asking. If you manage\nto find one, then please <a href=\"{{help_url}}\">send it to us</a>." +#: app/views/user/_user_listing_single.rhtml:21 +msgid "Joined in" msgstr "" -#: app/views/request/show.rhtml:5 -msgid "This request has prominence 'hidden'. You can only see it because you are logged\n in as a super user." +#: app/views/user/show.rhtml:62 +msgid "Joined {{site_name}} in" msgstr "" -#: app/views/request/show.rhtml:11 -msgid "This request is hidden, so that only you the requester can see it. Please\n <a href=\"%s\">contact us</a> if you are not sure why." +#: app/views/request/new.rhtml:104 +msgid "" +"Keep it <strong>focused</strong>, you'll be more likely to get what you want " +"(<a href=\"%s\">why?</a>)." msgstr "" -#: app/views/request/show.rhtml:36 -msgid "{{user}} (<a href=\"{{user_admin_url}}\">admin</a>) made this {{law_used_full}} request (<a href=\"{{request_admin_url}}\">admin</a>) to {{public_body_link}} (<a href=\"{{public_body_admin_url}}\">admin</a>)" +#: app/views/request/_request_filter_form.rhtml:6 +msgid "Keywords" msgstr "" -#: app/views/request/show.rhtml:44 -msgid "{{user}} made this {{law_used_full}} request" +#: lib/world_foi_websites.rb:9 +msgid "Kosovo" msgstr "" -#: app/views/request/show.rhtml:45 -msgid "to {{public_body}}" +#: app/views/contact_mailer/message.rhtml:10 +msgid "Last authority viewed: " msgstr "" -#: app/views/request/show.rhtml:52 -msgid "Please <strong>answer the question above</strong> so we know whether the " +#: app/views/contact_mailer/message.rhtml:7 +msgid "Last request viewed: " msgstr "" -#: app/views/request/show.rhtml:53 -msgid "useful information." +#: app/views/user/no_cookies.rhtml:17 +msgid "" +"Let us know what you were doing when this message\n" +"appeared and your browser and operating system type and version." msgstr "" -#: app/views/request/show.rhtml:55 -msgid "This request has an <strong>unknown status</strong>." +#: app/views/request/_correspondence.rhtml:27 +#: app/views/request/_correspondence.rhtml:57 +msgid "Link to this" msgstr "" -#: app/views/request/show.rhtml:57 -msgid "We're waiting for someone to read" +#: app/views/public_body/list.rhtml:31 +msgid "List of all authorities (CSV)" msgstr "" -#: app/views/request/show.rhtml:59 -msgid "and update the status accordingly. Perhaps <strong>you</strong> might like to help out by doing that?" +#: lib/public_body_categories_en.rb:23 +msgid "Local and regional" msgstr "" -#: app/views/request/show.rhtml:61 -msgid "We're waiting for" +#: app/models/info_request.rb:791 +msgid "Long overdue." msgstr "" -#: app/views/request/show.rhtml:62 -msgid "to read" +#: app/views/request/_request_filter_form.rhtml:23 +msgid "Made between" msgstr "" -#: app/views/request/show.rhtml:64 -msgid "and update the status." +#: app/views/public_body/show.rhtml:53 +msgid "Make a new <strong>Environmental Information</strong> request" msgstr "" -#: app/views/request/show.rhtml:68 -msgid "Currently <strong>waiting for a response</strong> from {{public_body_link}}, they must respond promptly and" +#: app/views/public_body/show.rhtml:55 +msgid "" +"Make a new <strong>Freedom of Information</strong> request to {{public_body}}" msgstr "" -#: app/views/request/show.rhtml:72 -msgid "normally" +#: app/views/general/frontpage.rhtml:5 +msgid "" +"Make a new<br/>\n" +" <strong>Freedom <span>of</span><br/>\n" +" Information<br/>\n" +" request</strong>" msgstr "" -#: app/views/request/show.rhtml:74 -msgid "no later than" +#: app/views/layouts/default.rhtml:126 +msgid "Make a request" msgstr "" -#: app/views/request/show.rhtml:77 -msgid "Response to this request is <strong>delayed</strong>." +#: app/views/request/new.rhtml:20 +msgid "Make an {{law_used_short}} request to '{{public_body_name}}'" msgstr "" -#: app/views/request/show.rhtml:78 -msgid "By law, {{public_body_link}} should normally have responded <strong>promptly</strong> and" +#: app/views/layouts/default.rhtml:15 app/views/layouts/no_chrome.rhtml:8 +msgid "Make and browse Freedom of Information (FOI) requests" msgstr "" -#: app/views/request/show.rhtml:82 -msgid "by" +#: app/views/public_body/_body_listing_single.rhtml:23 +msgid "Make your own request" msgstr "" -#: app/views/request/show.rhtml:85 -msgid "Response to this request is <strong>long overdue</strong>." +#: app/views/contact_mailer/message.rhtml:4 +msgid "Message sent using {{site_name}} contact form, " msgstr "" -#: app/views/request/show.rhtml:86 -msgid "By law, under all circumstances, {{public_body_link}} should have responded by now" +#: app/views/request/new_bad_contact.rhtml:1 +msgid "Missing contact details for '" msgstr "" -#: app/views/request/show.rhtml:88 -msgid "You can <strong>complain</strong> by" +#: app/views/public_body/show.rhtml:10 +msgid "More about this authority" msgstr "" -#: app/views/request/show.rhtml:89 -msgid "requesting an internal review" +#: app/views/general/frontpage.rhtml:68 +msgid "More successful requests..." msgstr "" -#: app/views/request/show.rhtml:91 -msgid "<strong>did not have</strong> the information requested." +#: app/views/layouts/default.rhtml:101 +msgid "My profile" msgstr "" -#: app/views/request/show.rhtml:93 -msgid "The request was <strong>refused</strong> by" +#: app/views/request/_describe_state.rhtml:64 +msgid "My request has been <strong>refused</strong>" msgstr "" -#: app/views/request/show.rhtml:95 -msgid "The request was <strong>successful</strong>." +#: app/models/public_body.rb:36 +msgid "Name can't be blank" msgstr "" -#: app/views/request/show.rhtml:97 -msgid "The request was <strong>partially successful</strong>." +#: app/models/public_body.rb:40 +msgid "Name is already taken" msgstr "" -#: app/views/request/show.rhtml:100 -msgid "is <strong>waiting for your clarification</strong>." +#: app/models/track_thing.rb:215 app/models/track_thing.rb:216 +msgid "New Freedom of Information requests" msgstr "" -#: app/views/request/show.rhtml:101 -msgid "Please" +#: lib/world_foi_websites.rb:21 +msgid "New Zealand" msgstr "" -#: app/views/request/show.rhtml:102 -msgid "send a follow up message" +#: app/views/user/signchangeemail.rhtml:20 +msgid "New e-mail:" msgstr "" -#: app/views/request/show.rhtml:104 -msgid "The request is <strong>waiting for clarification</strong>." +#: app/models/change_email_validator.rb:53 +msgid "New email doesn't look like a valid address" msgstr "" -#: app/views/request/show.rhtml:105 -msgid "If you are {{user_link}}, please" +#: app/views/user/signchangepassword.rhtml:15 +msgid "New password:" msgstr "" -#: app/views/request/show.rhtml:106 -msgid "sign in" +#: app/views/user/signchangepassword.rhtml:20 +msgid "New password: (again)" msgstr "" -#: app/views/request/show.rhtml:106 -msgid "to send a follow up message." +#: app/views/request/show_response.rhtml:60 +msgid "New response to your request" msgstr "" -#: app/views/request/show.rhtml:109 -msgid "The authority would like to / has <strong>responded by post</strong> to this request." +#: app/views/request/show_response.rhtml:66 +msgid "New response to {{law_used_short}} request" msgstr "" -#: app/views/request/show.rhtml:111 -msgid "Waiting for an <strong>internal review</strong> by {{public_body_link}} of their handling of this request." +#: app/models/track_thing.rb:199 app/models/track_thing.rb:200 +msgid "New updates for the request '{{request_title}}'" msgstr "" -#: app/views/request/show.rhtml:113 -msgid "There was a <strong>delivery error</strong> or similar, which needs fixing by the {{site_name}} team." +#: app/views/general/search.rhtml:130 +msgid "Newest results first" msgstr "" -#: app/views/request/show.rhtml:115 -msgid "This request has had an unusual response, and <strong>requires attention</strong> from the {{site_name}} team." +#: app/views/general/_localised_datepicker.rhtml:6 +msgid "Next" msgstr "" -#: app/views/request/show.rhtml:117 -msgid "This request has been <strong>withdrawn</strong> by the person who made it. \n There may be an explanation in the correspondence below." +#: app/views/user/set_draft_profile_photo.rhtml:32 +msgid "Next, crop your photo >>" +msgstr "" + +#: app/views/general/search.rhtml:168 +msgid "No public authorities found" +msgstr "" + +#: app/views/request/list.rhtml:19 +msgid "No requests of this sort yet." +msgstr "" + +#: app/views/public_body/_search_ahead.rhtml:8 +msgid "No results found." msgstr "" #: app/views/request/similar.rhtml:7 msgid "No similar requests found." msgstr "" -#: app/views/request/similar.rhtml:18 -msgid "Unexpected search result type " +#: app/views/public_body/show.rhtml:77 +msgid "" +"Nobody has made any Freedom of Information requests to {{public_body_name}} " +"using this site yet." msgstr "" -#: app/views/request/_request_listing.rhtml:2 app/views/public_body/_body_listing.rhtml:2 +#: app/views/public_body/_body_listing.rhtml:3 +#: app/views/request/_request_listing.rhtml:2 msgid "None found." msgstr "" -#: app/views/request/_hidden_correspondence.rhtml:10 -msgid "This response has been hidden. See annotations to find out why.\n If you are the requester, then you may <a href=\"%s\">sign in</a> to view the response." +#: app/views/user/show.rhtml:165 app/views/user/show.rhtml:185 +msgid "None made." msgstr "" -#: app/views/request/_hidden_correspondence.rhtml:17 -msgid "This outgoing message has been hidden. See annotations to\n find out why. If you are the requester, then you may <a href=\"%s\">sign in</a> to view the response." +#: app/views/user/signchangeemail_confirm.rhtml:3 +#: app/views/user/signchangepassword_confirm.rhtml:1 +#: app/views/user/signchangepassword_confirm.rhtml:3 +msgid "Now check your email!" msgstr "" -#: app/views/request/_hidden_correspondence.rhtml:23 -msgid "This comment has been hidden. See annotations to\n find out why. If you are the requester, then you may <a href=\"%s\">sign in</a> to view the response." +#: app/views/comment/preview.rhtml:5 +msgid "Now preview your annotation" msgstr "" -#: app/views/request/_hidden_correspondence.rhtml:32 -msgid "unexpected prominence on request event" +#: app/views/request/followup_preview.rhtml:10 +msgid "Now preview your follow up" msgstr "" -#: app/views/request/new_please_describe.rhtml:5 -msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\nif they are successful yet or not." +#: app/views/request/followup_preview.rhtml:8 +msgid "Now preview your message asking for an internal review" msgstr "" -#: app/views/request/new_please_describe.rhtml:16 -msgid "When you're done, <strong>come back here</strong>, <a href=\"%s\">reload this page</a> and file your new request." +#: app/views/user/set_draft_profile_photo.rhtml:46 +msgid "OR remove the existing photo" msgstr "" -#: app/views/request/new_please_describe.rhtml:20 -msgid "Thanks very much for helping keep everything <strong>neat and organised</strong>.\n We'll also, if you need it, give you advice on what to do next about each of your\n requests." +#: app/controllers/request_controller.rb:413 +msgid "" +"Oh no! Sorry to hear that your request was refused. Here is what to do now." msgstr "" -#: app/views/request/followup_preview.rhtml:1 -msgid "Preview follow up to '" +#: app/views/user/signchangeemail.rhtml:15 +msgid "Old e-mail:" msgstr "" -#: app/views/request/followup_preview.rhtml:8 -msgid "Now preview your message asking for an internal review" +#: app/models/change_email_validator.rb:44 +msgid "" +"Old email address isn't the same as the address of the account you are " +"logged in with" msgstr "" -#: app/views/request/followup_preview.rhtml:10 -msgid "Now preview your follow up" +#: app/models/change_email_validator.rb:39 +msgid "Old email doesn't look like a valid address" msgstr "" -#: app/views/request/followup_preview.rhtml:15 -msgid "Your message will appear in <strong>search engines</strong>" +#: app/views/user/show.rhtml:32 +msgid "On this page" msgstr "" -#: app/views/request/followup_preview.rhtml:37 -msgid "<strong>Privacy warning:</strong> Your message, and any response\n to it, will be displayed publicly on this website." +#: app/views/general/search.rhtml:197 +msgid "One FOI request found" msgstr "" -#: app/views/request/followup_preview.rhtml:49 -msgid "Re-edit this message" +#: app/views/general/search.rhtml:179 +msgid "One person found" msgstr "" -#: app/views/request/followup_preview.rhtml:50 -msgid "Send message" +#: app/views/general/search.rhtml:155 +msgid "One public authority found" msgstr "" -#: app/views/request/_after_actions.rhtml:3 -msgid "Things to do with this request" +#: app/views/public_body/show.rhtml:111 +msgid "Only requests made using {{site_name}} are shown." msgstr "" -#: app/views/request/_after_actions.rhtml:6 -msgid "Anyone:" +#: app/models/info_request.rb:405 +msgid "" +"Only the authority can reply to this request, and I don't recognise the " +"address this reply was sent from" msgstr "" -#: app/views/request/_after_actions.rhtml:9 -msgid "<a href=\"%s\">Add an annotation</a> (to help the requester or others)" +#: app/models/info_request.rb:401 +msgid "" +"Only the authority can reply to this request, but there is no \"From\" " +"address to check against" msgstr "" -#: app/views/request/_after_actions.rhtml:13 app/views/request/_after_actions.rhtml:33 -msgid "Update the status of this request" +#: app/views/request/_search_ahead.rhtml:10 +msgid "Or search in their website for this information." msgstr "" -#: app/views/request/_after_actions.rhtml:20 -msgid "{{info_request_user_name}} only:" +#: app/views/general/search.rhtml:254 +msgid "Original request sent" msgstr "" -#: app/views/request/_after_actions.rhtml:37 -msgid "Request an internal review" +#: app/views/request/_describe_state.rhtml:71 +msgid "Other:" msgstr "" -#: app/views/request/_after_actions.rhtml:43 -msgid "{{public_body_name}} only:" +#: locale/model_attributes.rb:26 +msgid "OutgoingMessage|Body" msgstr "" -#: app/views/request/_after_actions.rhtml:46 -msgid "Respond to request" +#: locale/model_attributes.rb:29 +msgid "OutgoingMessage|Last sent at" msgstr "" -#: app/views/request/_request_listing_via_event.rhtml:28 -msgid "Request sent to {{public_body_name}} by {{info_request_user}} on {{date}}." +#: locale/model_attributes.rb:28 +msgid "OutgoingMessage|Message type" msgstr "" -#: app/views/request/_request_listing_via_event.rhtml:31 -msgid "sent to {{public_body_name}} by {{info_request_user}} on {{date}}." +#: locale/model_attributes.rb:27 +msgid "OutgoingMessage|Status" msgstr "" -#: app/views/request/_request_listing_via_event.rhtml:34 -msgid "by {{public_body_name}} to {{info_request_user}} on {{date}}." +#: locale/model_attributes.rb:30 +msgid "OutgoingMessage|What doing" msgstr "" -#: app/views/request/_request_listing_via_event.rhtml:36 -msgid "Request to {{public_body_name}} by {{info_request_user}}. Annotated by {{event_comment_user}} on {{date}}." +#: app/models/info_request.rb:797 +msgid "Partially successful." msgstr "" -#: app/views/request/_request_listing_via_event.rhtml:38 -msgid "unknown event type indexed " +#: app/models/change_email_validator.rb:47 +msgid "Password is not correct" msgstr "" -#: app/views/request/upload_response.rhtml:5 -msgid "Respond to the FOI request" +#: app/views/user/_signin.rhtml:16 app/views/user/_signup.rhtml:30 +msgid "Password:" msgstr "" -#: app/views/request/upload_response.rhtml:5 -msgid " made by " +#: app/views/user/_signup.rhtml:35 +msgid "Password: (again)" msgstr "" -#: app/views/request/upload_response.rhtml:8 -msgid "Your response will <strong>appear on the Internet</strong>, <a href=\"%s\">read why</a> and answers to other questions." +#: app/views/general/search.rhtml:181 +msgid "People {{start_count}} to {{end_count}} of {{total_count}}" msgstr "" -#: app/views/request/upload_response.rhtml:11 -msgid "Respond by email" +#: app/views/user/set_draft_profile_photo.rhtml:13 +msgid "Photo of you:" msgstr "" -#: app/views/request/upload_response.rhtml:13 -msgid "You should have received a copy of the request by email, and you can respond\nby <strong>simply replying</strong> to that email. For your convenience, here is the address:" +#: app/views/request/new.rhtml:74 +msgid "Plans and administrative measures that affect these matters" msgstr "" -#: app/views/request/upload_response.rhtml:16 -msgid "You may <strong>include attachments</strong>. If you would like to attach a\nfile too large for email, use the form below." +#: app/controllers/request_game_controller.rb:42 +msgid "Play the request categorisation game" msgstr "" -#: app/views/request/upload_response.rhtml:21 -msgid "Respond using the web" +#: app/views/request_game/play.rhtml:1 app/views/request_game/play.rhtml:30 +msgid "Play the request categorisation game!" msgstr "" -#: app/views/request/upload_response.rhtml:23 -msgid "Enter your response below. You may attach one file (use email, or \n<a href=\"%s\">contact us</a> if you need more)." +#: app/views/request/show.rhtml:101 +msgid "Please" msgstr "" -#: app/views/request/upload_response.rhtml:28 -msgid "Response:" +#: app/views/user/no_cookies.rhtml:15 +msgid "Please <a href=\"%s\">get in touch</a> with us so we can fix it." msgstr "" -#: app/views/request/upload_response.rhtml:33 -msgid "Attachment (optional):" +#: app/views/request/show.rhtml:52 +msgid "" +"Please <strong>answer the question above</strong> so we know whether the " msgstr "" -#: app/views/request/upload_response.rhtml:40 -msgid " (<strong>patience</strong>, especially for large files, it may take a while!)" +#: app/views/user/show.rhtml:12 +msgid "" +"Please <strong>go to the following requests</strong>, and let us\n" +" know if there was information in the recent responses to them." msgstr "" -#: app/views/request/_request_listing_short_via_event.rhtml:9 -msgid "To {{public_body_link_absolute}}" +#: app/views/request/_followup.rhtml:27 +msgid "" +"Please <strong>only</strong> write messages directly relating to your " +"request {{request_link}}. If you would like to ask for information that was " +"not in your original request, then <a href=\"{{new_request_link}}\">file a " +"new request</a>." msgstr "" -#: app/views/request/_request_listing_short_via_event.rhtml:10 -msgid "by {{user_link_absolute}}" +#: app/views/request/new.rhtml:58 +msgid "Please ask for environmental information only" msgstr "" -#: app/views/request/_describe_state.rhtml:4 -msgid "What best describes the status of this request now?" +#: app/views/user/bad_token.rhtml:2 +msgid "" +"Please check the URL (i.e. the long code of letters and numbers) is copied\n" +"correctly from your email." msgstr "" -#: app/views/request/_describe_state.rhtml:7 app/views/request/_other_describe_state.rhtml:10 -msgid "This request is still in progress:" +#: app/models/profile_photo.rb:91 +msgid "Please choose a file containing your photo." msgstr "" -#: app/views/request/_describe_state.rhtml:11 -msgid "I'm still <strong>waiting</strong> for my information\n <small>(maybe you got an acknowledgement)</small>" +#: app/models/outgoing_message.rb:163 +msgid "Please choose what sort of reply you are making." msgstr "" -#: app/views/request/_describe_state.rhtml:18 -msgid "I'm still <strong>waiting</strong> for the internal review" +#: app/controllers/request_controller.rb:345 +msgid "" +"Please choose whether or not you got some of the information that you wanted." msgstr "" -#: app/views/request/_describe_state.rhtml:25 -msgid "I've been asked to <strong>clarify</strong> my request" +#: app/views/track_mailer/event_digest.rhtml:63 +msgid "Please click on the link below to cancel or alter these emails." msgstr "" -#: app/views/request/_describe_state.rhtml:32 -msgid "I'm waiting for an <strong>internal review</strong> response" +#: app/views/user_mailer/changeemail_confirm.rhtml:3 +msgid "" +"Please click on the link below to confirm that you want to \n" +"change the email address that you use for {{site_name}}\n" +"from {{old_email}} to {{new_email}}" msgstr "" -#: app/views/request/_describe_state.rhtml:38 -msgid "They are going to reply <strong>by post</strong>" +#: app/views/user_mailer/confirm_login.rhtml:3 +msgid "Please click on the link below to confirm your email address." msgstr "" -#: app/views/request/_describe_state.rhtml:44 app/views/request/_other_describe_state.rhtml:40 -msgid "This particular request is finished:" +#: app/models/info_request.rb:126 +msgid "" +"Please describe more what the request is about in the subject. There is no " +"need to say it is an FOI request, we add that on anyway." msgstr "" -#: app/views/request/_describe_state.rhtml:47 app/views/request/_other_describe_state.rhtml:43 -msgid "The <strong>review has finished</strong> and overall:" +#: app/views/user/set_draft_profile_photo.rhtml:22 +msgid "" +"Please don't upload offensive pictures. We will take down images\n" +" that we consider inappropriate." msgstr "" -#: app/views/request/_describe_state.rhtml:52 -msgid "They do <strong>not have</strong> the information <small>(maybe they say who does)</small>" +#: app/views/user/no_cookies.rhtml:3 +msgid "Please enable \"cookies\" to carry on" msgstr "" -#: app/views/request/_describe_state.rhtml:56 -msgid "I've received <strong>some of the information</strong>" +#: app/models/user.rb:38 +msgid "Please enter a password" msgstr "" -#: app/views/request/_describe_state.rhtml:60 -msgid "I've received <strong>all the information" +#: app/models/contact_validator.rb:30 +msgid "Please enter a subject" msgstr "" -#: app/views/request/_describe_state.rhtml:64 -msgid "My request has been <strong>refused</strong>" +#: app/models/info_request.rb:34 +msgid "Please enter a summary of your request" msgstr "" -#: app/views/request/_describe_state.rhtml:71 -msgid "Other:" +#: app/models/user.rb:115 +msgid "Please enter a valid email address" msgstr "" -#: app/views/request/_describe_state.rhtml:76 -msgid "I've received an <strong>error message</strong>" +#: app/models/contact_validator.rb:31 +msgid "Please enter the message you want to send" msgstr "" -#: app/views/request/_describe_state.rhtml:84 -msgid "This request <strong>requires administrator attention</strong>" +#: app/models/user.rb:49 +msgid "Please enter the same password twice" msgstr "" -#: app/views/request/_describe_state.rhtml:91 -msgid "I would like to <strong>withdraw this request</strong>" +#: app/models/comment.rb:59 +msgid "Please enter your annotation" msgstr "" -#: app/views/request/_describe_state.rhtml:101 -msgid "Submit status" +#: app/models/contact_validator.rb:29 app/models/user.rb:34 +msgid "Please enter your email address" msgstr "" -#: app/views/request/_describe_state.rhtml:101 -msgid "and we'll suggest <strong>what to do next</strong>" +#: app/models/outgoing_message.rb:148 +msgid "Please enter your follow up message" msgstr "" -#: app/views/request/_describe_state.rhtml:107 -msgid "We don't know whether the most recent response to this request contains\n information or not\n –\n if you are {{user_link}} please <a href=\"{{url}}\">sign in</a> and let everyone know." +#: app/models/outgoing_message.rb:151 +msgid "Please enter your letter requesting information" msgstr "" -#: app/views/request/new.rhtml:1 -msgid "Make an {{law_used_short}} request to '{{public_body_name}}'" +#: app/models/contact_validator.rb:28 app/models/user.rb:36 +msgid "Please enter your name" msgstr "" -#: app/views/request/new.rhtml:6 -msgid "{{existing_request_user}} already\n created the same request on {{date}}. You can either view the <a href=\"{{existing_request}}\">existing request</a>,\n or edit the details below to make a new but similar request." +#: app/models/user.rb:118 +msgid "Please enter your name, not your email address, in the name field." msgstr "" -#: app/views/request/new.rhtml:16 -msgid "Read this before writing your {{info_request_law_used_full}} request" +#: app/models/change_email_validator.rb:30 +msgid "Please enter your new email address" msgstr "" -#: app/views/request/new.rhtml:21 -msgid "First," +#: app/models/change_email_validator.rb:29 +msgid "Please enter your old email address" msgstr "" -#: app/views/request/new.rhtml:23 -msgid "<strong>browse</strong> the authority's <a href=\"%s\">publication scheme</a> or <strong>search</strong> their web site ..." +#: app/models/change_email_validator.rb:31 +msgid "Please enter your password" msgstr "" -#: app/views/request/new.rhtml:25 -msgid "<strong>search</strong> the authority's web site ..." +#: app/models/outgoing_message.rb:146 +msgid "Please give details explaining why you want a review" msgstr "" -#: app/views/request/new.rhtml:31 app/views/layouts/default.rhtml:80 -#: app/views/general/exception_caught.rhtml:10 app/views/general/frontpage.rhtml:14 -#: app/views/general/search.rhtml:29 -msgid "Search" +#: app/models/about_me_validator.rb:24 +msgid "Please keep it shorter than 500 characters" msgstr "" -#: app/views/request/new.rhtml:34 -msgid "to check that the info isn't already published." +#: app/models/info_request.rb:123 +msgid "" +"Please keep the summary short, like in the subject of an email. You can use " +"a phrase, rather than a full sentence." msgstr "" -#: app/views/request/new.rhtml:41 -msgid "Browse <a href='{{url}}'>other requests</a> to '{{public_body_name}}' for examples of how to word your request." +#: app/views/request/new.rhtml:77 +msgid "" +"Please only request information that comes under those categories, " +"<strong>do not waste your\n" +" time</strong> or the time of the public authority by requesting " +"unrelated information." msgstr "" -#: app/views/request/new.rhtml:43 -msgid "Browse <a href=\"%s\">other requests</a> for examples of how to word your request." +#: app/views/request/new_please_describe.rhtml:5 +msgid "" +"Please select each of these requests in turn, and <strong>let everyone know</" +"strong>\n" +"if they are successful yet or not." msgstr "" -#: app/views/request/new.rhtml:46 -msgid "Write your request in <strong>simple, precise language</strong>." +#: app/models/outgoing_message.rb:157 +msgid "" +"Please sign at the bottom with your name, or alter the \"%{signoff}\" " +"signature" msgstr "" -#: app/views/request/new.rhtml:47 -msgid "Ask for <strong>specific</strong> documents or information, this site is not suitable for general enquiries." +#: app/views/user/sign.rhtml:8 +msgid "Please sign in as " msgstr "" -#: app/views/request/new.rhtml:48 -msgid "Keep it <strong>focused</strong>, you'll be more likely to get what you want (<a href=\"%s\">why?</a>)." +#: app/controllers/request_controller.rb:734 +msgid "Please type a message and/or choose a file containing your response." msgstr "" -#: app/views/request/new.rhtml:49 -msgid "This site is <strong>public</strong>. Everything you type and any response will be published." +#: app/controllers/request_controller.rb:433 +msgid "Please use the form below to tell us more." msgstr "" -#: app/views/request/new.rhtml:53 -msgid "Special note for this authority!" +#: app/views/outgoing_mailer/followup.rhtml:6 +#: app/views/outgoing_mailer/initial_request.rhtml:5 +msgid "Please use this email address for all replies to this request:" msgstr "" -#: app/views/request/new.rhtml:60 -msgid "Please ask for environmental information only" +#: app/models/info_request.rb:35 +msgid "Please write a summary with some text in it" msgstr "" -#: app/views/request/new.rhtml:62 -msgid "The Freedom of Information Act <strong>does not apply</strong> to" +#: app/models/info_request.rb:120 +msgid "" +"Please write the summary using a mixture of capital and lower case letters. " +"This makes it easier for others to read." msgstr "" -#: app/views/request/new.rhtml:63 -msgid "However, you have the right to request environmental\n information under a different law" +#: app/models/comment.rb:62 +msgid "" +"Please write your annotation using a mixture of capital and lower case " +"letters. This makes it easier for others to read." msgstr "" -#: app/views/request/new.rhtml:65 -msgid "This covers a very wide spectrum of information about the state of\n the <strong>natural and built environment</strong>, such as:" +#: app/controllers/request_controller.rb:422 +msgid "" +"Please write your follow up message containing the necessary clarifications " +"below." msgstr "" -#: app/views/request/new.rhtml:69 -msgid "Air, water, soil, land, flora and fauna (including how these effect\n human beings)" +#: app/models/outgoing_message.rb:160 +msgid "" +"Please write your message using a mixture of capital and lower case letters. " +"This makes it easier for others to read." msgstr "" -#: app/views/request/new.rhtml:71 -msgid "Information on emissions and discharges (e.g. noise, energy,\n radiation, waste materials)" +#: app/views/comment/new.rhtml:41 +msgid "" +"Point to <strong>related information</strong>, campaigns or forums which may " +"be useful." msgstr "" -#: app/views/request/new.rhtml:73 -msgid "Human health and safety" +#: app/views/request/_search_ahead.rhtml:3 +msgid "Possibly related requests:" msgstr "" -#: app/views/request/new.rhtml:74 -msgid "Cultural sites and built structures (as they may be affected by the\n environmental factors listed above)" +#: app/views/comment/preview.rhtml:21 +msgid "Post annotation" msgstr "" -#: app/views/request/new.rhtml:76 -msgid "Plans and administrative measures that affect these matters" +#: locale/model_attributes.rb:53 +msgid "PostRedirect|Circumstance" msgstr "" -#: app/views/request/new.rhtml:79 -msgid "Please only request information that comes under those categories, <strong>do not waste your\n time</strong> or the time of the public authority by requesting unrelated information." +#: locale/model_attributes.rb:51 +msgid "PostRedirect|Email token" msgstr "" -#: app/views/request/new.rhtml:93 -msgid "Summary:" +#: locale/model_attributes.rb:50 +msgid "PostRedirect|Post params yaml" msgstr "" -#: app/views/request/new.rhtml:97 -msgid "a one line summary of the information you are requesting, \n e.g." +#: locale/model_attributes.rb:52 +msgid "PostRedirect|Reason params yaml" msgstr "" -#: app/views/request/new.rhtml:100 -msgid "'Pollution levels over time for the River Tyne'" +#: locale/model_attributes.rb:48 +msgid "PostRedirect|Token" msgstr "" -#: app/views/request/new.rhtml:102 -msgid "'Crime statistics by ward level for Wales'" +#: locale/model_attributes.rb:49 +msgid "PostRedirect|Uri" msgstr "" -#: app/views/request/new.rhtml:109 -msgid "Your request:" +#: app/views/general/_credits.rhtml:1 +msgid "Powered by <a href=\"http://www.alaveteli.org/\">Alaveteli</a>" +msgstr "" + +#: app/views/general/_localised_datepicker.rhtml:5 +msgid "Prev" msgstr "" -#: app/views/request/new.rhtml:116 -msgid "Everything that you enter on this page, including <strong>your name</strong>, \n will be <strong>displayed publicly</strong> on\n this website forever (<a href=\"%s\">why?</a>)." +#: app/views/request/followup_preview.rhtml:1 +msgid "Preview follow up to '" msgstr "" -#: app/views/request/new.rhtml:119 -msgid "If you are thinking of using a pseudonym,\n please <a href=\"%s\">read this first</a>." +#: app/views/comment/preview.rhtml:1 +msgid "Preview new annotation on '{{info_request_title}}'" msgstr "" -#: app/views/request/new.rhtml:124 -msgid "Everything that you enter on this page \n will be <strong>displayed publicly</strong> on\n this website forever (<a href=\"%s\">why?</a>)." +#: app/views/comment/_comment_form.rhtml:15 +msgid "Preview your annotation" msgstr "" -#: app/views/request/new.rhtml:131 -msgid "<strong> Can I request information about myself?</strong>\n <a href=\"%s\">No! (Click here for details)</a>" +#: app/views/request/_followup.rhtml:96 +msgid "Preview your message" msgstr "" -#: app/views/request/new.rhtml:139 +#: app/views/request/new.rhtml:141 msgid "Preview your public request" msgstr "" -#: app/views/request/_other_describe_state.rhtml:4 -msgid "Hi! We need your help. The person who made the following request\n hasn't told us whether or not it was successful. Would you mind taking\n a moment to read it and help us keep the place tidy for everyone?\n Thanks." +#: locale/model_attributes.rb:15 +msgid "ProfilePhoto|Data" msgstr "" -#: app/views/request/_other_describe_state.rhtml:14 -msgid "<strong>No response</strong> has been received\n <small>(maybe there's just an acknowledgement)</small>" +#: locale/model_attributes.rb:16 +msgid "ProfilePhoto|Draft" msgstr "" -#: app/views/request/_other_describe_state.rhtml:21 -msgid "Still awaiting an <strong>internal review</strong>" +#: app/views/public_body/list.rhtml:37 +msgid "Public authorities" msgstr "" -#: app/views/request/_other_describe_state.rhtml:28 -msgid "<strong>Clarification</strong> has been requested" +#: app/views/public_body/list.rhtml:35 +msgid "Public authorities - {{description}}" msgstr "" -#: app/views/request/_other_describe_state.rhtml:34 -msgid "A response will be sent <strong>by post</strong>" +#: app/views/general/search.rhtml:157 +msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "" -#: app/views/request/_other_describe_state.rhtml:48 -msgid "The authority do <strong>not have</strong> the information <small>(maybe they say who does)" +#: locale/model_attributes.rb:12 +msgid "PublicBody|First letter" msgstr "" -#: app/views/request/_other_describe_state.rhtml:52 -msgid "<strong>Some of the information</strong> has been sent " +#: locale/model_attributes.rb:10 +msgid "PublicBody|Home page" msgstr "" -#: app/views/request/_other_describe_state.rhtml:56 -msgid "<strong>All the information</strong> has been sent" +#: locale/model_attributes.rb:8 +msgid "PublicBody|Last edit comment" msgstr "" -#: app/views/request/_other_describe_state.rhtml:60 -msgid "The request has been <strong>refused</strong>" +#: locale/model_attributes.rb:7 +msgid "PublicBody|Last edit editor" msgstr "" -#: app/views/request/_other_describe_state.rhtml:70 -msgid "An <strong>error message</strong> has been received" +#: locale/model_attributes.rb:3 +msgid "PublicBody|Name" msgstr "" -#: app/views/request/details.rhtml:1 app/views/request/details.rhtml:2 -msgid "Details of request '" +#: locale/model_attributes.rb:11 +msgid "PublicBody|Notes" msgstr "" -#: app/views/request/details.rhtml:4 -msgid "Event history" +#: locale/model_attributes.rb:13 +msgid "PublicBody|Publication scheme" msgstr "" -#: app/views/request/details.rhtml:6 -msgid "This table shows the technical details of the internal events that happened\nto this request on {{site_name}}. This could be used to generate information about\nthe speed with which authorities respond to requests, the number of requests\nwhich require a postal response and much more." +#: locale/model_attributes.rb:5 +msgid "PublicBody|Request email" msgstr "" -#: app/views/request/details.rhtml:12 -msgid "<strong>Caveat emptor!</strong> To use this data in an honourable way, you will need \na good internal knowledge of user behaviour on {{site_name}}. How, \nwhy and by whom requests are categorised is not straightforward, and there will\nbe user error and ambiguity. You will also need to understand FOI law, and the\nway authorities use it. Plus you'll need to be an elite statistician. Please\n<a href=\"{{contact_path}}\">contact us</a> with questions." +#: locale/model_attributes.rb:4 +msgid "PublicBody|Short name" msgstr "" -#: app/views/request/details.rhtml:50 -msgid "Here <strong>described</strong> means when a user selected a status for the request, and\nthe most recent event had its status updated to that value. <strong>calculated</strong> is then inferred by\n{{site_name}} for intermediate events, which weren't given an explicit\ndescription by a user. See the <a href=\"{{search_path}}\">search tips</a> for description of the states." +#: locale/model_attributes.rb:9 +msgid "PublicBody|Url name" msgstr "" -#: app/views/request/details.rhtml:58 -msgid "You can get this page in computer-readable format as part of the main JSON\npage for the request. See the <a href=\"{{api_path}}\">API documentation</a>." +#: locale/model_attributes.rb:6 +msgid "PublicBody|Version" +msgstr "" + +#: app/views/public_body/show.rhtml:15 +msgid "Publication scheme" +msgstr "" + +#: app/views/track/_tracking_links.rhtml:26 +msgid "RSS feed" +msgstr "" + +#: app/views/track/_tracking_links.rhtml:26 +msgid "RSS feed of updates" +msgstr "" + +#: app/views/comment/preview.rhtml:20 +msgid "Re-edit this annotation" +msgstr "" + +#: app/views/request/followup_preview.rhtml:49 +msgid "Re-edit this message" +msgstr "" + +#: app/views/general/search.rhtml:233 +msgid "" +"Read about <a href=\"{{advanced_search_url}}\">advanced search operators</" +"a>, such as proximity and wildcards." +msgstr "" + +#: app/views/layouts/default.rhtml:129 +msgid "Read blog" +msgstr "" + +#: app/views/general/search.rhtml:246 +msgid "Received an error message, such as delivery failure." +msgstr "" + +#: app/views/general/search.rhtml:132 +msgid "Recently described results first" +msgstr "" + +#: app/models/info_request.rb:795 +msgid "Refused." +msgstr "" + +#: app/views/user/_signin.rhtml:26 +msgid "" +"Remember me</label> (keeps you signed in longer;\n" +" do not use on a public computer) " +msgstr "" + +#: app/views/request/_correspondence.rhtml:28 +msgid "Reply to this message" +msgstr "" + +#: app/views/comment/_single_comment.rhtml:24 +msgid "Report abuse" +msgstr "" + +#: app/views/request/_after_actions.rhtml:37 +msgid "Request an internal review" +msgstr "" + +#: app/views/request/_followup.rhtml:4 +msgid "Request an internal review from" msgstr "" #: app/views/request/hidden.rhtml:1 msgid "Request has been removed" msgstr "" -#: app/views/request/hidden.rhtml:9 -msgid "The request you have tried to view has been removed. There are\nvarious reasons why we might have done this, sorry we can't be more specific here. Please <a\n href=\"%s\">contact us</a> if you have any questions." +#: app/views/request/_request_listing_via_event.rhtml:20 +msgid "" +"Request sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "" -#: app/views/request/hidden.rhtml:15 -msgid "If you are the requester, then you may <a href=\"%s\">sign in</a> to view the request." +#: app/views/request/_request_listing_via_event.rhtml:28 +msgid "" +"Request to {{public_body_name}} by {{info_request_user}}. Annotated by " +"{{event_comment_user}} on {{date}}." +msgstr "" + +#: app/views/request/_request_listing_single.rhtml:12 +msgid "" +"Requested from {{public_body_name}} by {{info_request_user}} on {{date}}" msgstr "" #: app/views/request/_sidebar_request_listing.rhtml:13 msgid "Requested on {{date}}" msgstr "" -#: app/views/request/_view_html_prefix.rhtml:6 -msgid "Download original attachment" +#: app/models/track_thing.rb:282 app/models/track_thing.rb:283 +msgid "Requests or responses matching your saved search" msgstr "" -#: app/views/request/_view_html_prefix.rhtml:9 -msgid "This is an HTML version of an attachment to the Freedom of Information request" +#: app/views/request/upload_response.rhtml:11 +msgid "Respond by email" msgstr "" -#: app/views/contact_mailer/message.rhtml:4 -msgid "Message sent using {{site_name}} contact form, " +#: app/views/request/_after_actions.rhtml:46 +msgid "Respond to request" msgstr "" -#: app/views/contact_mailer/message.rhtml:7 -msgid "Last request viewed: " +#: app/views/request/upload_response.rhtml:5 +msgid "Respond to the FOI request" msgstr "" -#: app/views/contact_mailer/message.rhtml:10 -msgid "Last authority viewed: " +#: app/views/request/upload_response.rhtml:21 +msgid "Respond using the web" msgstr "" -#: app/views/contact_mailer/user_message.rhtml:2 -msgid "{{user_name}} has used {{site_name}} to send you the message below." +#: app/models/info_request_event.rb:306 +msgid "Response" msgstr "" -#: app/views/contact_mailer/user_message.rhtml:3 -msgid "Your details have not been given to anyone, unless you choose to reply to this\nmessage, which will then go directly to the person who wrote the message." +#: app/views/general/search.rhtml:256 +msgid "Response from a public authority" msgstr "" -#: app/views/contact_mailer/user_message.rhtml:10 -msgid "View Freedom of Information requests made by {{user_name}}:" +#: app/views/request/show.rhtml:77 +msgid "Response to this request is <strong>delayed</strong>." msgstr "" -#: app/views/admin_public_body/_locale_selector.rhtml:2 -msgid "Edit language version:" +#: app/views/request/show.rhtml:85 +msgid "Response to this request is <strong>long overdue</strong>." msgstr "" -#: app/views/user/set_crop_profile_photo.rhtml:1 app/views/user/show.rhtml:104 -msgid "Change profile photo" +#: app/views/request/show_response.rhtml:62 +msgid "Response to your request" msgstr "" -#: app/views/user/set_crop_profile_photo.rhtml:6 -msgid "Crop your profile photo" +#: app/views/request/upload_response.rhtml:28 +msgid "Response:" msgstr "" -#: app/views/user/set_crop_profile_photo.rhtml:35 -msgid "<strong>Privacy note:</strong> Your photo will be shown in public on the Internet, \n wherever you do something on {{site_name}}." +#: app/views/general/search.rhtml:88 +msgid "Restrict to" msgstr "" -#: app/views/user/_user_listing_single.rhtml:19 app/views/user/_user_listing_single.rhtml:20 -msgid "made." +#: app/views/general/search.rhtml:12 +msgid "Results page {{page_number}}" msgstr "" -#: app/views/user/_user_listing_single.rhtml:21 -msgid "Joined in" +#: app/views/user/set_profile_about_me.rhtml:35 +msgid "Save" msgstr "" -#: app/views/user/signchangepassword_confirm.rhtml:1 app/views/user/signchangepassword_confirm.rhtml:3 -#: app/views/user/signchangeemail_confirm.rhtml:3 -msgid "Now check your email!" +#: app/views/general/exception_caught.rhtml:12 +#: app/views/general/frontpage.rhtml:24 app/views/general/search.rhtml:32 +#: app/views/general/search.rhtml:45 app/views/public_body/list.rhtml:42 +#: app/views/request/_request_filter_form.rhtml:49 +#: app/views/request/select_authority.rhtml:41 +msgid "Search" msgstr "" -#: app/views/user/signchangepassword_confirm.rhtml:6 -msgid "We've sent you an email, click the link in it, then you can change your password." +#: app/views/general/search.rhtml:8 +msgid "Search Freedom of Information requests, public authorities and users" msgstr "" -#: app/views/user/signchangepassword_confirm.rhtml:10 app/views/user/signchangeemail_confirm.rhtml:11 -msgid "If you use web-based email or have \"junk mail\" filters, also check your\nbulk/spam mail folders. Sometimes, our messages are marked that way." +#: app/views/user/show.rhtml:125 +msgid "Search contributions by this person" msgstr "" -#: app/views/user/signchangepassword.rhtml:1 app/views/user/signchangepassword.rhtml:11 -#: app/views/user/signchangepassword_send_confirm.rhtml:1 app/views/user/signchangepassword_send_confirm.rhtml:9 -msgid "Change your password on {{site_name}}" +#: app/views/request/_request_filter_form.rhtml:11 +msgid "Search for words in:" msgstr "" -#: app/views/user/signchangepassword.rhtml:15 -msgid "New password:" +#: app/views/general/search.rhtml:100 +msgid "Search in" msgstr "" -#: app/views/user/signchangepassword.rhtml:20 -msgid "New password: (again)" +#: app/views/general/frontpage.rhtml:15 +msgid "" +"Search over<br/>\n" +" <strong>{{number_of_requests}} requests</strong> <span>and</" +"span><br/>\n" +" <strong>{{number_of_authorities}} authorities</strong>" msgstr "" -#: app/views/user/signchangepassword.rhtml:27 -msgid "Change password on {{site_name}}" +#: app/views/general/exception_caught.rhtml:9 +msgid "Search the site to find what you were looking for." msgstr "" -#: app/views/user/_signin.rhtml:7 -msgid "If you've used {{site_name}} before" +#: app/views/public_body/show.rhtml:86 +msgid "Search within the %d Freedom of Information requests to %s" +msgid_plural "Search within the %d Freedom of Information requests made to %s" +msgstr[0] "" +msgstr[1] "" + +#: app/views/user/show.rhtml:123 +msgid "Search your contributions" msgstr "" -#: app/views/user/_signin.rhtml:11 app/views/user/signchangepassword_send_confirm.rhtml:13 -#: app/views/user/_signup.rhtml:9 -msgid "Your e-mail:" +#: app/views/public_body/_search_ahead.rhtml:5 +msgid "Select one to see more information about the authority." msgstr "" -#: app/views/user/_signin.rhtml:16 app/views/user/_signup.rhtml:30 -msgid "Password:" +#: app/views/request/select_authority.rhtml:27 +msgid "Select the authority to write to" msgstr "" -#: app/views/user/_signin.rhtml:21 -msgid "Forgotten your password?" +#: app/controllers/user_controller.rb:349 +msgid "Send a message to " msgstr "" -#: app/views/user/_signin.rhtml:26 -msgid "Remember me</label> (keeps you signed in longer;\n do not use on a public computer) " +#: app/views/request/_followup.rhtml:7 +msgid "Send a public follow up message to" msgstr "" -#: app/views/user/_signin.rhtml:31 -msgid "Sign in" +#: app/views/request/_followup.rhtml:10 +msgid "Send a public reply to" msgstr "" -#: app/views/user/sign.rhtml:8 -msgid "Please sign in as " +#: app/views/request/_correspondence.rhtml:58 +msgid "Send follow up" msgstr "" -#: app/views/user/sign.rhtml:11 -msgid "please sign in as " +#: app/views/request/followup_preview.rhtml:50 +msgid "Send message" +msgstr "" + +#: app/views/user/show.rhtml:69 +msgid "Send message to " +msgstr "" + +#: app/views/request/preview.rhtml:41 +msgid "Send request" +msgstr "" + +#: app/views/user/show.rhtml:53 +msgid "Set your profile photo" +msgstr "" + +#: app/models/public_body.rb:39 +msgid "Short name is already taken" +msgstr "" + +#: app/views/general/search.rhtml:128 +msgid "Show most relevant results first" +msgstr "" + +#: app/views/public_body/list.rhtml:2 +msgid "Show only..." +msgstr "" + +#: app/views/general/search.rhtml:52 +msgid "Showing" +msgstr "" + +#: app/views/user/_signin.rhtml:32 +msgid "Sign in" msgstr "" #: app/views/user/sign.rhtml:20 msgid "Sign in or make a new account" msgstr "" -#: app/views/user/sign.rhtml:26 -msgid " Please sign in or make a new account." +#: app/views/layouts/default.rhtml:107 +msgid "Sign in or sign up" msgstr "" -#: app/views/user/sign.rhtml:28 -msgid "please sign in or make a new account." +#: app/views/layouts/default.rhtml:105 +msgid "Sign out" msgstr "" -#: app/views/user/contact.rhtml:32 -msgid "<strong>Note:</strong> You're sending a message to yourself, presumably\n to try out how it works." +#: app/views/user/_signup.rhtml:46 +msgid "Sign up" msgstr "" -#: app/views/user/contact.rhtml:35 -msgid " <strong>Privacy note:</strong> Your email address will be given to" +#: app/views/request/_sidebar.rhtml:24 +msgid "Similar requests" msgstr "" -#: app/views/user/contact.rhtml:36 -msgid " when you send this message." +#: app/views/general/search.rhtml:33 +msgid "Simple search" msgstr "" -#: app/views/user/confirm.rhtml:6 -msgid "We've sent you an email, and you'll need to click the link in it before you can\ncontinue." +#: app/views/general/search.rhtml:241 +msgid "Some of the information requested has been received" msgstr "" -#: app/views/user/confirm.rhtml:11 -msgid "<small>If you use web-based email or have \"junk mail\" filters, also check your\nbulk/spam mail folders. Sometimes, our messages are marked that way.</small>\n</p>" +#: app/views/request_game/play.rhtml:31 +msgid "" +"Some people who've made requests haven't let us know whether they were\n" +"successful or not. We need <strong>your</strong> help –\n" +"choose one of these requests, read it, and let everyone know whether or not " +"the\n" +"information has been provided. Everyone'll be exceedingly grateful." msgstr "" -#: app/views/user/bad_token.rhtml:2 -msgid "Please check the URL (i.e. the long code of letters and numbers) is copied\ncorrectly from your email." +#: app/views/user_mailer/changeemail_already_used.rhtml:1 +msgid "" +"Someone, perhaps you, just tried to change their email address on\n" +"{{site_name}} from {{old_email}} to {{new_email}}." msgstr "" -#: app/views/user/bad_token.rhtml:7 -msgid "If you can't click on it in the email, you'll have to <strong>select and copy\nit</strong> from the email. Then <strong>paste it into your browser</strong>, into the place\nyou would type the address of any other webpage." +#: app/views/user/wrong_user.rhtml:2 +msgid "Sorry, but only {{user_name}} is allowed to do that." msgstr "" -#: app/views/user/bad_token.rhtml:13 -msgid "If you got the email <strong>more than six months ago</strong>, then this login link won't work any\nmore. Please try doing what you were doing from the beginning." +#: app/views/general/exception_caught.rhtml:17 +msgid "Sorry, there was a problem processing this page" msgstr "" -#: app/views/user/wrong_user_unknown_email.rhtml:3 -msgid "Unfortunately we don't know the FOI\nemail address for that authority, so we can't validate this.\nPlease <a href=\"%s\">contact us</a> to sort it out." +#: app/views/general/exception_caught.rhtml:3 +msgid "Sorry, we couldn't find that page" msgstr "" -#: app/views/user/signchangepassword_send_confirm.rhtml:18 -msgid " <strong>Note:</strong>\n We will send you an email. Follow the instructions in it to change\n your password." +#: app/views/request/new.rhtml:53 +msgid "Special note for this authority!" +msgstr "" + +#: app/views/public_body/show.rhtml:57 +msgid "Start" +msgstr "" + +#: app/views/general/frontpage.rhtml:10 +msgid "Start now »" +msgstr "" + +#: app/views/request/_sidebar.rhtml:17 +msgid "Start your own blog" +msgstr "" + +#: app/views/request/_other_describe_state.rhtml:21 +msgid "Still awaiting an <strong>internal review</strong>" +msgstr "" + +#: app/views/request/followup_preview.rhtml:23 +#: app/views/request/preview.rhtml:18 +msgid "Subject:" msgstr "" #: app/views/user/signchangepassword_send_confirm.rhtml:26 msgid "Submit" msgstr "" -#: app/views/user/show.rhtml:4 -msgid "There is <strong>more than one person</strong> who uses this site and has this name. \n One of them is shown below, you may mean a different one:" +#: app/views/request/_describe_state.rhtml:101 +msgid "Submit status" msgstr "" -#: app/views/user/show.rhtml:12 -msgid "Please <strong>go to the following requests</strong>, and let us\n know if there was information in the recent responses to them." +#: app/models/track_thing.rb:231 app/models/track_thing.rb:232 +msgid "Successful Freedom of Information requests" msgstr "" -#: app/views/user/show.rhtml:20 -msgid "Thanks very much - this will help others find useful stuff. We'll\n also, if you need it, give advice on what to do next about your\n requests." +#: app/models/info_request.rb:799 +msgid "Successful." msgstr "" -#: app/views/user/show.rhtml:29 -msgid "Track this person" +#: app/views/comment/new.rhtml:38 +msgid "" +"Suggest how the requester can find the <strong>rest of the information</" +"strong>." msgstr "" -#: app/views/user/show.rhtml:32 -msgid "On this page" +#: app/views/request/new.rhtml:83 +msgid "Summary:" msgstr "" -#: app/views/user/show.rhtml:33 -msgid "FOI requests" +#: app/views/general/search.rhtml:236 +msgid "Table of statuses" msgstr "" -#: app/views/user/show.rhtml:34 -msgid "Annotations" +#: app/views/general/search.rhtml:251 +msgid "Table of varieties" msgstr "" -#: app/views/user/show.rhtml:36 -msgid "Email subscriptions" +#: app/views/general/search.rhtml:76 +msgid "Tags (separated by a space):" msgstr "" -#: app/views/user/show.rhtml:53 -msgid "Set your profile photo" +#: app/views/request/preview.rhtml:45 +msgid "Tags:" msgstr "" -#: app/views/user/show.rhtml:59 -msgid " (you)" +#: app/views/general/exception_caught.rhtml:21 +msgid "Technical details" msgstr "" -#: app/views/user/show.rhtml:62 -msgid "Joined {{site_name}} in" +#: app/controllers/request_game_controller.rb:52 +msgid "Thank you for helping us keep the site tidy!" msgstr "" -#: app/views/user/show.rhtml:69 -msgid "Send message to " +#: app/controllers/comment_controller.rb:62 +msgid "Thank you for making an annotation!" msgstr "" -#: app/views/user/show.rhtml:71 -msgid "just to see how it works" +#: app/controllers/request_controller.rb:740 +msgid "" +"Thank you for responding to this FOI request! Your response has been " +"published below, and a link to your response has been emailed to " msgstr "" -#: app/views/user/show.rhtml:79 -msgid "This user has been banned from {{site_name}} " +#: app/controllers/request_controller.rb:377 +msgid "" +"Thank you for updating the status of the request '<a href=\"{{url}}\">" +"{{info_request_title}}</a>'. There are some more requests below for you to " +"classify." msgstr "" -#: app/views/user/show.rhtml:83 -msgid "They have been given the following explanation:" +#: app/controllers/request_controller.rb:380 +msgid "Thank you for updating this request!" msgstr "" -#: app/views/user/show.rhtml:96 -msgid "edit text about you" +#: app/controllers/user_controller.rb:416 +#: app/controllers/user_controller.rb:432 +msgid "Thank you for updating your profile photo" msgstr "" -#: app/views/user/show.rhtml:106 -msgid "Change your password" +#: app/views/request_game/play.rhtml:42 +msgid "" +"Thanks for helping - your work will make it easier for everyone to find " +"successful\n" +"responses, and maybe even let us make league tables..." msgstr "" -#: app/views/user/show.rhtml:107 -msgid "Change your email" +#: app/views/user/show.rhtml:20 +msgid "" +"Thanks very much - this will help others find useful stuff. We'll\n" +" also, if you need it, give advice on what to do next about your\n" +" requests." msgstr "" -#: app/views/user/show.rhtml:113 -msgid "<a href=\"%s\">Sign in</a> to change password, subscriptions and more ({{user_name}} only)" +#: app/views/request/new_please_describe.rhtml:20 +msgid "" +"Thanks very much for helping keep everything <strong>neat and organised</" +"strong>.\n" +" We'll also, if you need it, give you advice on what to do next about " +"each of your\n" +" requests." msgstr "" -#: app/views/user/show.rhtml:121 -msgid "You have made no Freedom of Information requests using this site." +#: app/controllers/user_controller.rb:207 +msgid "" +"That doesn't look like a valid email address. Please check you have typed it " +"correctly." msgstr "" -#: app/views/user/show.rhtml:121 -msgid "This person has made no Freedom of Information requests using this site." +#: app/views/request/_describe_state.rhtml:47 +#: app/views/request/_other_describe_state.rhtml:43 +msgid "The <strong>review has finished</strong> and overall:" msgstr "" -#: app/views/user/show.rhtml:125 -msgid "Your %d Freedom of Information request" -msgid_plural "Your %d Freedom of Information requests" -msgstr[0] "" -msgstr[1] "" +#: app/views/request/new.rhtml:60 +msgid "The Freedom of Information Act <strong>does not apply</strong> to" +msgstr "" -#: app/views/user/show.rhtml:125 -msgid "This person's %d Freedom of Information request" -msgid_plural "This person's %d Freedom of Information requests" -msgstr[0] "" -msgstr[1] "" +#: app/views/user_mailer/changeemail_already_used.rhtml:8 +msgid "The accounts have been left as they previously were." +msgstr "" -#: app/views/user/show.rhtml:137 -msgid "Freedom of Information requests made by you" +#: app/views/request/_other_describe_state.rhtml:48 +msgid "" +"The authority do <strong>not have</strong> the information <small>(maybe " +"they say who does)" msgstr "" -#: app/views/user/show.rhtml:137 -msgid "Freedom of Information requests made by this person" +#: app/views/request/show_response.rhtml:26 +msgid "" +"The authority only has a <strong>paper copy</strong> of the information." msgstr "" -#: app/views/user/show.rhtml:138 -msgid "The search index is currently offline, so we can't show the Freedom of Information requests this person has made." +#: app/views/request/show_response.rhtml:18 +msgid "" +"The authority say that they <strong>need a postal\n" +" address</strong>, not just an email, for it to be a valid FOI " +"request" msgstr "" -#: app/views/user/show.rhtml:144 -msgid "Your annotations" +#: app/views/request/show.rhtml:109 +msgid "" +"The authority would like to / has <strong>responded by post</strong> to this " +"request." msgstr "" -#: app/views/user/show.rhtml:144 -msgid "This person's annotations" +#: app/views/request_mailer/stopped_responses.rhtml:1 +msgid "" +"The email that you, on behalf of {{public_body}}, sent to\n" +"{{user}} to reply to an {{law_used_short}}\n" +"request has not been delivered." msgstr "" -#: app/views/user/show.rhtml:145 app/views/user/show.rhtml:165 -msgid "None made." +#: app/views/general/exception_caught.rhtml:5 +msgid "The page doesn't exist. Things you can try now:" msgstr "" -#: app/views/user/show.rhtml:149 -msgid "Your %d annotation" -msgid_plural "Your %d annotations" -msgstr[0] "" -msgstr[1] "" +#: app/views/general/search.rhtml:239 +msgid "The public authority does not have the information requested" +msgstr "" -#: app/views/user/show.rhtml:149 -msgid "This person's %d annotation" -msgid_plural "This person's %d annotations" -msgstr[0] "" -msgstr[1] "" +#: app/views/general/search.rhtml:243 +msgid "The public authority would like part of the request explained" +msgstr "" -#: app/views/user/show.rhtml:164 -msgid "Your email subscriptions" +#: app/views/general/search.rhtml:244 +msgid "The public authority would like to / has responded by post" msgstr "" -#: app/views/user/show.rhtml:167 -msgid "email subscription" +#: app/views/request/_other_describe_state.rhtml:60 +msgid "The request has been <strong>refused</strong>" msgstr "" -#: app/views/user/show.rhtml:176 app/views/user/show.rhtml:190 -msgid "unsubscribe all" +#: app/controllers/request_controller.rb:351 +msgid "" +"The request has been updated since you originally loaded this page. Please " +"check for any new incoming messages below, and try again." msgstr "" -#: app/views/user/show.rhtml:204 -msgid "unsubscribe" +#: app/views/request/show.rhtml:104 +msgid "The request is <strong>waiting for clarification</strong>." msgstr "" -#: app/views/user/no_cookies.rhtml:3 -msgid "Please enable \"cookies\" to carry on" +#: app/views/request/show.rhtml:97 +msgid "The request was <strong>partially successful</strong>." msgstr "" -#: app/views/user/no_cookies.rhtml:5 -msgid "To carry on, you need to sign in or make an account. Unfortunately, there\nwas a technical problem trying to do this." +#: app/views/request/show.rhtml:93 +msgid "The request was <strong>refused</strong> by" msgstr "" -#: app/views/user/no_cookies.rhtml:8 -msgid "It may be that your browser is not set to accept a thing called \"cookies\",\nor cannot do so. If you can, please enable cookies, or try using a different\nbrowser. Then press refresh to have another go." +#: app/views/request/show.rhtml:95 +msgid "The request was <strong>successful</strong>." msgstr "" -#: app/views/user/no_cookies.rhtml:12 -msgid "If your browser is set to accept cookies and you are seeing this message,\nthen there is probably a fault with our server." +#: app/views/general/search.rhtml:240 +msgid "The request was refused by the public authority" msgstr "" -#: app/views/user/no_cookies.rhtml:15 -msgid "Please <a href=\"%s\">get in touch</a> with us so we can fix it." +#: app/views/request/hidden.rhtml:9 +msgid "" +"The request you have tried to view has been removed. There are\n" +"various reasons why we might have done this, sorry we can't be more specific " +"here. Please <a\n" +" href=\"%s\">contact us</a> if you have any questions." msgstr "" -#: app/views/user/no_cookies.rhtml:17 -msgid "Let us know what you were doing when this message\nappeared and your browser and operating system type and version." +#: app/views/general/search.rhtml:248 +msgid "The requester has abandoned this request for some reason" msgstr "" -#: app/views/user/no_cookies.rhtml:20 -msgid "If you are still having trouble, please <a href=\"%s\">contact us</a>." +#: app/views/request/_followup.rhtml:32 +msgid "" +"The response to your request has been <strong>delayed</strong>. You can say " +"that, \n" +" by law, the authority should normally have responded\n" +" <strong>promptly</strong> and" msgstr "" -#: app/views/user/wrong_user.rhtml:4 -msgid "sign out" +#: app/views/request/_followup.rhtml:44 +msgid "" +"The response to your request is <strong>long overdue</strong>. You can say " +"that, by \n" +" law, under all circumstances, the authority should have " +"responded\n" +" by now" msgstr "" -#: app/views/user/wrong_user.rhtml:5 -msgid "and sign in as " +#: app/views/public_body/show.rhtml:120 +msgid "" +"The search index is currently offline, so we can't show the Freedom of " +"Information requests that have been made to this authority." msgstr "" -#: app/views/user/banned.rhtml:9 -msgid "You will be unable to make new requests, send follow ups, add annotations or\nsend messages to other users. You may continue to view other requests, and set\nup\nemail alerts." +#: app/views/user/show.rhtml:156 +msgid "" +"The search index is currently offline, so we can't show the Freedom of " +"Information requests this person has made." msgstr "" -#: app/views/user/banned.rhtml:15 -msgid "If you would like us to lift this ban, then you may politely\n<a href=\"/help/contact\">contact us</a> giving reasons.\n" +#: app/controllers/track_controller.rb:144 +msgid "Then you can cancel the alert." msgstr "" -#: app/views/user/_signup.rhtml:6 -msgid "If you're new to {{site_name}}" +#: app/controllers/track_controller.rb:174 +msgid "Then you can cancel the alerts." msgstr "" -#: app/views/user/_signup.rhtml:18 -msgid "Your name:" +#: app/controllers/user_controller.rb:267 +msgid "Then you can change your email address used on {{site_name}}" msgstr "" -#: app/views/user/_signup.rhtml:22 -msgid "Your <strong>name will appear publicly</strong> \n (<a href=\"%s\">why?</a>)\n on this website and in search engines. If you\n are thinking of using a pseudonym, please \n <a href=\"%s\">read this first</a>." +#: app/controllers/user_controller.rb:221 +msgid "Then you can change your password on {{site_name}}" msgstr "" -#: app/views/user/_signup.rhtml:35 -msgid "Password: (again)" +#: app/controllers/request_controller.rb:337 +msgid "Then you can classify the FOI response you have got from " msgstr "" -#: app/views/user/_signup.rhtml:41 -msgid "Sign up" +#: app/controllers/request_game_controller.rb:41 +msgid "Then you can play the request categorisation game." msgstr "" -#: app/views/user/signchangeemail_confirm.rhtml:6 -msgid "We've sent an email to your new email address. You'll need to click the link in\nit before your email address will be changed." +#: app/controllers/user_controller.rb:348 +msgid "Then you can send a message to " msgstr "" -#: app/views/user/set_profile_about_me.rhtml:1 -msgid "Change the text about you on your profile at {{site_name}}" +#: app/controllers/user_controller.rb:541 +msgid "Then you can sign in to {{site_name}}" msgstr "" -#: app/views/user/set_profile_about_me.rhtml:3 app/views/user/signchangeemail.rhtml:3 -msgid "internal error" +#: app/controllers/request_controller.rb:76 +msgid "Then you can update the status of your request to " msgstr "" -#: app/views/user/set_profile_about_me.rhtml:9 -msgid "Edit text about you" +#: app/controllers/request_controller.rb:706 +msgid "Then you can upload an FOI response. " msgstr "" -#: app/views/user/set_profile_about_me.rhtml:11 -msgid " What are you investigating using Freedom of Information? " +#: app/controllers/request_controller.rb:544 +msgid "Then you can write follow up message to " msgstr "" -#: app/views/user/set_profile_about_me.rhtml:14 -msgid " This will appear on your {{site_name}} profile, to make it\n easier for others to get involved with what you're doing." +#: app/controllers/request_controller.rb:545 +msgid "Then you can write your reply to " msgstr "" -#: app/views/user/set_profile_about_me.rhtml:20 -msgid "About you:" +#: app/models/track_thing.rb:270 +msgid "" +"Then you will be emailed whenever '{{user_name}}' requests something or gets " +"a response." msgstr "" -#: app/views/user/set_profile_about_me.rhtml:26 -msgid " Include relevant links, such as to a campaign page, your blog or a\n twitter account. They will be made clickable. \n e.g." +#: app/models/track_thing.rb:286 +msgid "" +"Then you will be emailed whenever a new request or response matches your " +"search." msgstr "" -#: app/views/user/set_profile_about_me.rhtml:35 -msgid "Save" +#: app/models/track_thing.rb:235 +msgid "Then you will be emailed whenever an FOI request succeeds." msgstr "" -#: app/views/user/set_draft_profile_photo.rhtml:13 -msgid "Photo of you:" +#: app/models/track_thing.rb:219 +msgid "Then you will be emailed whenever anyone makes a new FOI request." msgstr "" -#: app/views/user/set_draft_profile_photo.rhtml:18 -msgid "Your photo will be shown in public <strong>on the Internet</strong>, \n wherever you do something on {{site_name}}." +#: app/models/track_thing.rb:254 +msgid "" +"Then you will be emailed whenever someone requests something or gets a " +"response from '{{public_body_name}}'." msgstr "" -#: app/views/user/set_draft_profile_photo.rhtml:22 -msgid "Please don't upload offensive pictures. We will take down images\n that we consider inappropriate." +#: app/models/track_thing.rb:203 +msgid "" +"Then you will be emailed whenever the request '{{request_title}}' is updated." msgstr "" -#: app/views/user/set_draft_profile_photo.rhtml:32 -msgid "Next, crop your photo >>" +#: app/controllers/request_controller.rb:30 +msgid "Then you'll be allowed to send FOI requests." msgstr "" -#: app/views/user/set_draft_profile_photo.rhtml:46 -msgid "OR remove the existing photo" +#: app/controllers/request_controller.rb:298 +msgid "Then your FOI request to {{public_body_name}} will be sent." msgstr "" -#: app/views/user/signchangeemail.rhtml:15 -msgid "Old e-mail:" +#: app/controllers/comment_controller.rb:56 +msgid "Then your annotation to {{info_request_title}} will be posted." msgstr "" -#: app/views/user/signchangeemail.rhtml:20 -msgid "New e-mail:" +#: app/views/request_mailer/comment_on_alert_plural.rhtml:1 +msgid "" +"There are {{count}} new annotations on your {{info_request}} request. Follow " +"this link to see what they wrote." msgstr "" -#: app/views/user/signchangeemail.rhtml:25 -msgid "Your password:" +#: app/views/public_body/show.rhtml:7 +msgid "There is %d person following this authority" +msgid_plural "There are %d people following this authority" +msgstr[0] "" +msgstr[1] "" + +#: app/views/request/_sidebar.rhtml:5 +msgid "There is %d person following this request" +msgid_plural "There are %d people following this request" +msgstr[0] "" +msgstr[1] "" + +#: app/views/user/show.rhtml:4 +msgid "" +"There is <strong>more than one person</strong> who uses this site and has " +"this name. \n" +" One of them is shown below, you may mean a different one:" msgstr "" -#: app/views/user/signchangeemail.rhtml:30 -msgid "<strong>Note:</strong>\n We will send an email to your new email address. Follow the\n instructions in it to confirm changing your email." +#: app/views/request/show.rhtml:113 +msgid "" +"There was a <strong>delivery error</strong> or similar, which needs fixing " +"by the {{site_name}} team." msgstr "" -#: app/views/user/signchangeemail.rhtml:37 -msgid "Change email on {{site_name}}" +#: app/controllers/public_body_controller.rb:81 +#: app/controllers/user_controller.rb:140 +msgid "There was an error with the words you entered, please try again." msgstr "" -#: app/views/track/_tracking_links.rhtml:9 -msgid "This is your own request, so you will be automatically emailed when new responses arrive." +#: app/views/general/search.rhtml:10 app/views/public_body/show.rhtml:109 +msgid "There were no requests matching your query." msgstr "" -#: app/views/user_mailer/already_registered.rhtml:3 -msgid "You just tried to sign up to {{site_name}}, when you\nalready have an account. Your name and password have been\nleft as they previously were.\n\nPlease click on the link below." +#: app/views/request/_describe_state.rhtml:38 +msgid "They are going to reply <strong>by post</strong>" msgstr "" -#: app/views/user_mailer/already_registered.rhtml:11 app/views/user_mailer/confirm_login.rhtml:11 -#: app/views/user_mailer/changeemail_already_used.rhtml:10 app/views/user_mailer/changeemail_confirm.rhtml:13 -#: app/views/request_mailer/stopped_responses.rhtml:16 app/views/request_mailer/not_clarified_alert.rhtml:9 -#: app/views/request_mailer/comment_on_alert.rhtml:6 app/views/request_mailer/old_unclassified_updated.rhtml:8 -#: app/views/request_mailer/very_overdue_alert.rhtml:11 app/views/request_mailer/overdue_alert.rhtml:9 -#: app/views/request_mailer/new_response_reminder_alert.rhtml:8 app/views/request_mailer/new_response.rhtml:15 -#: app/views/request_mailer/comment_on_alert_plural.rhtml:5 app/views/track_mailer/event_digest.rhtml:66 -msgid "the {{site_name}} team" +#: app/views/request/_describe_state.rhtml:52 +msgid "" +"They do <strong>not have</strong> the information <small>(maybe they say who " +"does)</small>" msgstr "" -#: app/views/user_mailer/confirm_login.rhtml:3 -msgid "Please click on the link below to confirm your email address." +#: app/views/user/show.rhtml:83 +msgid "They have been given the following explanation:" msgstr "" -#: app/views/user_mailer/confirm_login.rhtml:8 -msgid "We will not reveal your email address to anybody unless you\nor the law tell us to." +#: app/views/request_mailer/overdue_alert.rhtml:3 +msgid "" +"They have not replied to your {{law_used_short}} request {{title}} promptly, " +"as normally required by law" msgstr "" -#: app/views/user_mailer/changeemail_already_used.rhtml:1 -msgid "Someone, perhaps you, just tried to change their email address on\n{{site_name}} from {{old_email}} to {{new_email}}." +#: app/views/request_mailer/very_overdue_alert.rhtml:3 +msgid "" +"They have not replied to your {{law_used_short}} request {{title}}, \n" +"as required by law" msgstr "" -#: app/views/user_mailer/changeemail_already_used.rhtml:5 -msgid "This was not possible because there is already an account using \nthe email address {{email}}." +#: app/views/request/_after_actions.rhtml:3 +msgid "Things to do with this request" msgstr "" -#: app/views/user_mailer/changeemail_already_used.rhtml:8 -msgid "The accounts have been left as they previously were." +#: app/views/public_body/show.rhtml:64 +msgid "This authority no longer exists, so you cannot make a request to it." msgstr "" -#: app/views/user_mailer/changeemail_confirm.rhtml:3 -msgid "Please click on the link below to confirm that you want to \nchange the email address that you use for {{site_name}}\nfrom {{old_email}} to {{new_email}}" +#: app/views/request/_hidden_correspondence.rhtml:23 +msgid "" +"This comment has been hidden. See annotations to\n" +" find out why. If you are the requester, then you may <a href=\"%" +"s\">sign in</a> to view the response." msgstr "" -#: app/views/user_mailer/changeemail_confirm.rhtml:10 -msgid "We will not reveal your email addresses to anybody unless you\nor the law tell us to." +#: app/views/request/new.rhtml:63 +msgid "" +"This covers a very wide spectrum of information about the state of\n" +" the <strong>natural and built environment</strong>, such as:" msgstr "" -#: app/views/request_game/play.rhtml:1 app/views/request_game/play.rhtml:30 -msgid "Play the request categorisation game!" +#: app/views/request/_view_html_prefix.rhtml:9 +msgid "" +"This is an HTML version of an attachment to the Freedom of Information " +"request" msgstr "" -#: app/views/request_game/play.rhtml:31 -msgid "Some people who've made requests haven't let us know whether they were\nsuccessful or not. We need <strong>your</strong> help –\nchoose one of these requests, read it, and let everyone know whether or not the\ninformation has been provided. Everyone'll be exceedingly grateful." +#: app/views/request_mailer/stopped_responses.rhtml:5 +msgid "" +"This is because {{title}} is an old request that has been\n" +"marked to no longer receive responses." msgstr "" -#: app/views/request_game/play.rhtml:39 -msgid "I don't like these ones — give me some more!" +#: app/views/track/_tracking_links.rhtml:8 +msgid "" +"This is your own request, so you will be automatically emailed when new " +"responses arrive." msgstr "" -#: app/views/request_game/play.rhtml:40 -msgid "I don't want to do any more tidying now!" +#: app/views/request/_hidden_correspondence.rhtml:17 +msgid "" +"This outgoing message has been hidden. See annotations to\n" +"\t\t\t\t\t\tfind out why. If you are the requester, then you may <a href=\"%" +"s\">sign in</a> to view the response." msgstr "" -#: app/views/request_game/play.rhtml:42 -msgid "Thanks for helping - your work will make it easier for everyone to find successful\nresponses, and maybe even let us make league tables..." +#: app/views/request/_describe_state.rhtml:44 +#: app/views/request/_other_describe_state.rhtml:40 +msgid "This particular request is finished:" msgstr "" -#: app/views/request_mailer/stopped_responses.rhtml:1 -msgid "The email that you, on behalf of {{public_body}}, sent to\n{{user}} to reply to an {{law_used_short}}\nrequest has not been delivered." +#: app/views/user/show.rhtml:136 +msgid "" +"This person has made no Freedom of Information requests using this site." msgstr "" -#: app/views/request_mailer/stopped_responses.rhtml:5 -msgid "This is because {{title}} is an old request that has been\nmarked to no longer receive responses." +#: app/views/user/show.rhtml:141 +msgid "This person's %d Freedom of Information request" +msgid_plural "This person's %d Freedom of Information requests" +msgstr[0] "" +msgstr[1] "" + +#: app/views/user/show.rhtml:169 +msgid "This person's %d annotation" +msgid_plural "This person's %d annotations" +msgstr[0] "" +msgstr[1] "" + +#: app/views/user/show.rhtml:162 +msgid "This person's annotations" msgstr "" -#: app/views/request_mailer/stopped_responses.rhtml:10 -msgid "If this is incorrect, or you would like to send a late response to the request\nor an email on another subject to {{user}}, then please\nemail {{contact_email}} for help." +#: app/views/request/_describe_state.rhtml:84 +msgid "This request <strong>requires administrator attention</strong>" msgstr "" -#: app/views/request_mailer/stopped_responses.rhtml:14 -msgid "Your original message is attached." +#: app/views/request/show.rhtml:55 +msgid "This request has an <strong>unknown status</strong>." msgstr "" -#: app/views/request_mailer/not_clarified_alert.rhtml:1 -msgid "request." +#: app/views/request/show.rhtml:117 +msgid "" +"This request has been <strong>withdrawn</strong> by the person who made " +"it. \n" +" \t There may be an explanation in the correspondence below." msgstr "" -#: app/views/request_mailer/not_clarified_alert.rhtml:2 -msgid "To do this, first click on the link below." +#: app/models/info_request.rb:395 +msgid "" +"This request has been set by an administrator to \"allow new responses from " +"nobody\"" msgstr "" -#: app/views/request_mailer/not_clarified_alert.rhtml:6 -msgid "You will only get an answer to your request if you follow up\nwith the clarification." +#: app/views/request/show.rhtml:115 +msgid "" +"This request has had an unusual response, and <strong>requires attention</" +"strong> from the {{site_name}} team." msgstr "" -#: app/views/request_mailer/comment_on_alert.rhtml:1 -msgid "{{user_name}} has annotated your {{law_used_short}} \nrequest. Follow this link to see what they wrote." +#: app/views/request/show.rhtml:5 +msgid "" +"This request has prominence 'hidden'. You can only see it because you are " +"logged\n" +" in as a super user." msgstr "" -#: app/views/request_mailer/old_unclassified_updated.rhtml:1 -msgid "To help us keep the site tidy, someone else has updated the status of the \n{{law_used_full}} request {{title}} that you made to {{public_body}}, to \"{{display_status}}\" If you disagree with their categorisation, please update the status again yourself to what you believe to be more accurate." +#: app/views/request/show.rhtml:11 +msgid "" +"This request is hidden, so that only you the requester can see it. Please\n" +" <a href=\"%s\">contact us</a> if you are not sure why." msgstr "" -#: app/views/request_mailer/old_unclassified_updated.rhtml:4 -msgid "Follow this link to see the request:" +#: app/views/request/_describe_state.rhtml:7 +#: app/views/request/_other_describe_state.rhtml:10 +msgid "This request is still in progress:" msgstr "" -#: app/views/request_mailer/very_overdue_alert.rhtml:1 -msgid "are long overdue." +#: app/views/request/_hidden_correspondence.rhtml:10 +msgid "" +"This response has been hidden. See annotations to find out why.\n" +" If you are the requester, then you may <a href=\"%s\">sign in</" +"a> to view the response." msgstr "" -#: app/views/request_mailer/very_overdue_alert.rhtml:3 -msgid "They have not replied to your {{law_used_short}} request {{title}}, \nas required by law" +#: app/views/request/details.rhtml:6 +msgid "" +"This table shows the technical details of the internal events that happened\n" +"to this request on {{site_name}}. This could be used to generate information " +"about\n" +"the speed with which authorities respond to requests, the number of " +"requests\n" +"which require a postal response and much more." msgstr "" -#: app/views/request_mailer/very_overdue_alert.rhtml:4 -msgid "even during holidays" +#: app/views/user/show.rhtml:79 +msgid "This user has been banned from {{site_name}} " msgstr "" -#: app/views/request_mailer/very_overdue_alert.rhtml:6 -msgid "Click on the link below to send a message to {{public_body_name}} telling them to reply to your request. You might like to ask for an internal\nreview, asking them to find out why response to the request has been so slow." +#: app/views/user_mailer/changeemail_already_used.rhtml:5 +msgid "" +"This was not possible because there is already an account using \n" +"the email address {{email}}." msgstr "" -#: app/views/request_mailer/requires_admin.rhtml:2 -msgid "has reported an" +#: app/models/track_thing.rb:218 +msgid "To be emailed about any new requests" msgstr "" -#: app/views/request_mailer/requires_admin.rhtml:3 -msgid "response as needing administrator attention. Take a look, and reply to this\nemail to let them know what you are going to do about it." +#: app/models/track_thing.rb:234 +msgid "To be emailed about any successful requests" msgstr "" -#: app/views/request_mailer/requires_admin.rhtml:9 -msgid "Administration URL:" +#: app/models/track_thing.rb:269 +msgid "To be emailed about requests by '{{user_name}}'" msgstr "" -#: app/views/request_mailer/overdue_alert.rhtml:1 -msgid "have delayed." +#: app/models/track_thing.rb:253 +msgid "" +"To be emailed about requests made using {{site_name}} to the public " +"authority '{{public_body_name}}'" msgstr "" -#: app/views/request_mailer/overdue_alert.rhtml:3 -msgid "They have not replied to your {{law_used_short}} request {{title}} promptly, as normally required by law" +#: app/controllers/track_controller.rb:173 +msgid "To cancel these alerts" msgstr "" -#: app/views/request_mailer/overdue_alert.rhtml:3 -msgid "during term time" +#: app/controllers/track_controller.rb:143 +msgid "To cancel this alert" msgstr "" -#: app/views/request_mailer/overdue_alert.rhtml:5 -msgid "Click on the link below to send a message to {{public_body}} reminding them to reply to your request." +#: app/views/user/no_cookies.rhtml:5 +msgid "" +"To carry on, you need to sign in or make an account. Unfortunately, there\n" +"was a technical problem trying to do this." +msgstr "" + +#: app/controllers/user_controller.rb:266 +msgid "To change your email address used on {{site_name}}" +msgstr "" + +#: app/controllers/request_controller.rb:336 +msgid "To classify the response to this FOI request" +msgstr "" + +#: app/views/request/show_response.rhtml:37 +msgid "To do that please send a private email to " +msgstr "" + +#: app/views/request_mailer/not_clarified_alert.rhtml:2 +msgid "To do this, first click on the link below." +msgstr "" + +#: app/models/track_thing.rb:285 +msgid "To follow requests and responses matching your search" +msgstr "" + +#: app/models/track_thing.rb:202 +msgid "To follow updates to the request '{{request_title}}'" +msgstr "" + +#: app/views/request_mailer/old_unclassified_updated.rhtml:1 +msgid "" +"To help us keep the site tidy, someone else has updated the status of the \n" +"{{law_used_full}} request {{title}} that you made to {{public_body}}, to " +"\"{{display_status}}\" If you disagree with their categorisation, please " +"update the status again yourself to what you believe to be more accurate." msgstr "" #: app/views/request_mailer/new_response_reminder_alert.rhtml:1 msgid "To let us know, follow this link and then select the appropriate box." msgstr "" -#: app/views/request_mailer/new_response_reminder_alert.rhtml:5 -msgid "Your request was called {{info_request}}. Letting everyone know whether you got the information will help us keep tabs on" +#: app/controllers/request_game_controller.rb:40 +msgid "To play the request categorisation game" msgstr "" -#: app/views/request_mailer/new_response.rhtml:1 -msgid "You have a new response to the {{law_used_full}} request " +#: app/controllers/comment_controller.rb:55 +msgid "To post your annotation" msgstr "" -#: app/views/request_mailer/new_response.rhtml:2 -msgid "that you made to" +#: app/controllers/request_controller.rb:542 +msgid "To reply to " msgstr "" -#: app/views/request_mailer/new_response.rhtml:5 -msgid "To view the response, click on the link below." +#: app/controllers/request_controller.rb:541 +msgid "To send a follow up message to " msgstr "" -#: app/views/request_mailer/new_response.rhtml:9 -msgid "When you get there, please update the status to say if the response \ncontains any useful information." +#: app/controllers/user_controller.rb:347 +msgid "To send a message to " msgstr "" -#: app/views/request_mailer/new_response.rhtml:12 -msgid "Although all responses are automatically published, we depend on\nyou, the original requester, to evaluate them." +#: app/controllers/request_controller.rb:29 +#: app/controllers/request_controller.rb:297 +msgid "To send your FOI request" msgstr "" -#: app/views/request_mailer/comment_on_alert_plural.rhtml:1 -msgid "There are {{count}} new annotations on your {{info_request}} request. Follow this link to see what they wrote." +#: app/controllers/request_controller.rb:75 +msgid "To update the status of this FOI request" msgstr "" -#: app/views/layouts/default.rhtml:15 -msgid "Make and browse Freedom of Information (FOI) requests" +#: app/controllers/request_controller.rb:705 +msgid "" +"To upload a response, you must be logged in using an email address from " msgstr "" -#: app/views/layouts/default.rhtml:67 -msgid "Make and explore Freedom of Information requests" +#: app/views/general/search.rhtml:24 +msgid "" +"To use the advanced search, combine phrases and labels as described in the " +"search tips below." msgstr "" -#: app/views/layouts/default.rhtml:87 -msgid "Make request" +#: app/views/public_body/view_email_captcha.rhtml:5 +msgid "" +"To view the email address that we use to send FOI requests to " +"{{public_body_name}}, please enter these words." msgstr "" -#: app/views/layouts/default.rhtml:88 -msgid "View requests" +#: app/views/request_mailer/new_response.rhtml:5 +msgid "To view the response, click on the link below." msgstr "" -#: app/views/layouts/default.rhtml:89 -msgid "View authorities" +#: app/views/request/_request_listing_short_via_event.rhtml:9 +msgid "To {{public_body_link_absolute}}" msgstr "" -#: app/views/layouts/default.rhtml:91 -msgid "My requests" +#: app/views/request/followup_preview.rhtml:22 app/views/request/new.rhtml:40 +#: app/views/request/preview.rhtml:17 +msgid "To:" msgstr "" -#: app/views/layouts/default.rhtml:93 -msgid "Read blog" +#: app/views/general/_localised_datepicker.rhtml:7 +msgid "Today" msgstr "" -#: app/views/layouts/default.rhtml:94 -msgid "Help" +#: app/views/public_body/_search_ahead.rhtml:3 +msgid "Top search results:" msgstr "" -#: app/views/layouts/default.rhtml:99 -msgid "Hello, {{username}}!" +#: app/models/track_thing.rb:247 +msgid "Track requests to {{public_body_name}} by email" msgstr "" -#: app/views/layouts/default.rhtml:100 -msgid "Sign out" +#: app/models/track_thing.rb:279 +msgid "Track things matching this search by email" msgstr "" -#: app/views/layouts/default.rhtml:102 -msgid "Hello!" +#: app/views/user/show.rhtml:29 +msgid "Track this person" msgstr "" -#: app/views/layouts/default.rhtml:103 -msgid "Sign in or sign up" +#: app/models/track_thing.rb:263 +msgid "Track this person by email" msgstr "" -#: app/views/layouts/default.rhtml:127 -msgid "Contact {{site_name}}" +#: app/models/track_thing.rb:196 +msgid "Track this request by email" msgstr "" -#: app/views/general/exception_caught.rhtml:1 -msgid "Sorry, we couldn't find that page" +#: locale/model_attributes.rb:33 +msgid "TrackThing|Track medium" msgstr "" -#: app/views/general/exception_caught.rhtml:3 -msgid "The page either doesn't exist, or is broken. Things you can try now:" +#: locale/model_attributes.rb:32 +msgid "TrackThing|Track query" msgstr "" -#: app/views/general/exception_caught.rhtml:6 -msgid "Check for mistakes if you typed or copied the address." +#: locale/model_attributes.rb:34 +msgid "TrackThing|Track type" msgstr "" -#: app/views/general/exception_caught.rhtml:7 -msgid "Search the site to find what you were looking for." +#: app/views/request/_sidebar.rhtml:13 +msgid "Tweet this request" msgstr "" -#: app/views/general/exception_caught.rhtml:13 -msgid "<a href=\"%s\">Contact us</a> to tell us about the problem</li>" +#: app/views/general/search.rhtml:229 +msgid "" +"Type <strong><code>01/01/2008..14/01/2008</code></strong> to only show " +"things that happened in the first two weeks of January." msgstr "" -#: app/views/general/exception_caught.rhtml:14 -msgid "Go to our <a href=\"%s\">front page</a></li>" +#: app/models/public_body.rb:37 +msgid "URL name can't be blank" msgstr "" -#: app/views/general/exception_caught.rhtml:17 -msgid "<strong>Technical details:</strong>" +#: app/models/user_mailer.rb:45 +msgid "Unable to change email address on {{site_name}}" msgstr "" -#: app/views/general/exception_caught.rhtml:17 -msgid "Unknown" +#: app/views/request/followup_bad.rhtml:4 +msgid "Unable to send a reply to {{username}}" msgstr "" -#: app/views/general/_credits.rhtml:1 -msgid "Powered by <a href=\"http://www.alaveteli.org/\">Alaveteli</a>." +#: app/views/request/followup_bad.rhtml:2 +msgid "Unable to send follow up message to {{username}}" +msgstr "" + +#: app/views/request/list.rhtml:27 +msgid "Unexpected search result type" msgstr "" -#: app/views/general/frontpage.rhtml:4 -msgid "Make or explore Freedom of Information requests" +#: app/views/request/similar.rhtml:18 +msgid "Unexpected search result type " msgstr "" -#: app/views/general/frontpage.rhtml:16 -msgid "e.g." +#: app/views/user/wrong_user_unknown_email.rhtml:3 +msgid "" +"Unfortunately we don't know the FOI\n" +"email address for that authority, so we can't validate this.\n" +"Please <a href=\"%s\">contact us</a> to sort it out." msgstr "" -#: app/views/general/frontpage.rhtml:23 -msgid "OR, <strong>search</strong> for information others have requested using {{site_name}}" +#: app/views/request/new_bad_contact.rhtml:5 +msgid "" +"Unfortunately, we do not have a working {{info_request_law_used_full}}\n" +"address for" msgstr "" -#: app/views/general/frontpage.rhtml:34 -msgid "%d request" -msgid_plural "%d requests" -msgstr[0] "" -msgstr[1] "" +#: lib/world_foi_websites.rb:5 +msgid "United Kingdom" +msgstr "" -#: app/views/general/frontpage.rhtml:39 -msgid "More authorities..." +#: lib/world_foi_websites.rb:17 +msgid "United States of America" msgstr "" -#: app/views/general/frontpage.rhtml:49 -msgid "{{length_of_time}} ago" +#: app/views/general/exception_caught.rhtml:22 +msgid "Unknown" msgstr "" -#: app/views/general/frontpage.rhtml:53 -msgid "More successful requests..." +#: app/models/info_request.rb:809 +msgid "Unusual response." msgstr "" -#: app/views/general/search.rhtml:4 -msgid "Search Freedom of Information requests, public authorities and users" +#: app/views/request/_after_actions.rhtml:13 +#: app/views/request/_after_actions.rhtml:33 +msgid "Update the status of this request" msgstr "" -#: app/views/general/search.rhtml:9 -msgid "Results page {{page_number}}" +#: app/controllers/request_controller.rb:77 +msgid "Update the status of your request to " msgstr "" -#: app/views/general/search.rhtml:16 -msgid "Next, select the public authority you'd like to make the request from." +#: app/views/general/search.rhtml:220 +msgid "" +"Use OR (in capital letters) where you don't mind which word, e.g. " +"<strong><code>commons OR lords</code></strong>" msgstr "" -#: app/views/general/search.rhtml:17 -msgid "Can't find it? <a href=\"%s\">Browse all</a> or <a href=\"%s\">ask us to add it</a>." +#: app/views/general/search.rhtml:221 +msgid "" +"Use quotes when you want to find an exact phrase, e.g. <strong><code>" +"\"Liverpool City Council\"</code></strong>" msgstr "" -#: app/views/general/search.rhtml:31 app/views/general/search.rhtml:121 -msgid "Advanced search tips" +#: locale/model_attributes.rb:65 +msgid "UserInfoRequestSentAlert|Alert type" msgstr "" -#: app/views/general/search.rhtml:38 -msgid "Show most relevant results first" +#: locale/model_attributes.rb:76 +msgid "User|About me" msgstr "" -#: app/views/general/search.rhtml:40 -msgid "Newest results first" +#: locale/model_attributes.rb:74 +msgid "User|Admin level" msgstr "" -#: app/views/general/search.rhtml:42 -msgid "Recently described results first" +#: locale/model_attributes.rb:75 +msgid "User|Ban text" msgstr "" -#: app/views/general/search.rhtml:48 -msgid "No public authorities found" +#: locale/model_attributes.rb:67 +msgid "User|Email" msgstr "" -#: app/views/general/search.rhtml:50 app/views/general/search.rhtml:62 -msgid "Did you mean: {{correction}}" +#: locale/model_attributes.rb:71 +msgid "User|Email confirmed" msgstr "" -#: app/views/general/search.rhtml:53 -msgid "<a href=\"%s\">Browse all</a> or <a href=\"%s\">ask us to add one</a>." +#: locale/model_attributes.rb:69 +msgid "User|Hashed password" msgstr "" -#: app/views/general/search.rhtml:71 -msgid "One public authority matching ‘{{user_search_query}}’" +#: locale/model_attributes.rb:73 +msgid "User|Last daily track email" msgstr "" -#: app/views/general/search.rhtml:73 -msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}} for {{user_search_query}}" +#: locale/model_attributes.rb:77 +msgid "User|Locale" msgstr "" -#: app/views/general/search.rhtml:123 -msgid "Enter words that you want to find separated by spaces, e.g. <strong>climbing lane</strong>" +#: locale/model_attributes.rb:68 +msgid "User|Name" msgstr "" -#: app/views/general/search.rhtml:124 -msgid "Use OR (in capital letters) where you don't mind which word, e.g. <strong><code>commons OR lords</code></strong>" +#: locale/model_attributes.rb:70 +msgid "User|Salt" msgstr "" -#: app/views/general/search.rhtml:125 -msgid "Use quotes when you want to find an exact phrase, e.g. <strong><code>\"Liverpool City Council\"</code></strong>" +#: locale/model_attributes.rb:72 +msgid "User|Url name" msgstr "" -#: app/views/general/search.rhtml:126 -msgid "<strong><code>status:</code></strong> to select based on the status or historical status of the request, see the <a href=\"{{statuses_url}}\">table of statuses</a> below." +#: app/views/public_body/show.rhtml:26 +msgid "View FOI email address" msgstr "" -#: app/views/general/search.rhtml:127 -msgid "<strong><code>variety:</code></strong> to select type of thing to search for, see the <a href=\"{{varieties_url}}\">table of varieties</a> below." +#: app/views/public_body/view_email_captcha.rhtml:1 +msgid "View FOI email address for '{{public_body_name}}'" msgstr "" -#: app/views/general/search.rhtml:128 -msgid "<strong><code>requested_from:home_office</code></strong> to search requests from the Home Office, typing the name as in the URL." +#: app/views/public_body/view_email_captcha.rhtml:3 +msgid "View FOI email address for {{public_body_name}}" msgstr "" -#: app/views/general/search.rhtml:129 -msgid "<strong><code>requested_by:julian_todd</code></strong> to search requests made by Julian Todd, typing the name as in the URL." +#: app/views/contact_mailer/user_message.rhtml:10 +msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "" -#: app/views/general/search.rhtml:130 -msgid "<strong><code>commented_by:tony_bowden</code></strong> to search annotations made by Tony Bowden, typing the name as in the URL." +#: app/controllers/request_controller.rb:149 +msgid "View and search requests" msgstr "" -#: app/views/general/search.rhtml:131 -msgid "<strong><code>request:</code></strong> to restrict to a specific request, typing the title as in the URL." +#: app/views/layouts/default.rhtml:128 +msgid "View authorities" msgstr "" -#: app/views/general/search.rhtml:132 -msgid "<strong><code>filetype:pdf</code></strong> to find all responses with PDF attachments. Or try these: <code>{{list_of_file_extensions}}</code>" +#: app/views/public_body/view_email_captcha.rhtml:12 +msgid "View email" msgstr "" -#: app/views/general/search.rhtml:133 -msgid "Type <strong><code>01/01/2008..14/01/2008</code></strong> to only show things that happened in the first two weeks of January." +#: app/views/layouts/default.rhtml:127 +msgid "View requests" msgstr "" -#: app/views/general/search.rhtml:134 -msgid "<strong><code>tag:charity</code></strong> to find all public bodies or requests with a given tag. You can include multiple tags, \n and tag values, e.g. <code>tag:openlylocal AND tag:financial_transaction:335633</code>. Note that by default any of the tags\n can be present, you have to put <code>AND</code> explicitly if you only want results them all present." +#: app/models/info_request.rb:801 +msgid "Waiting clarification." msgstr "" -#: app/views/general/search.rhtml:137 -msgid "Read about <a href=\"{{advanced_search_url}}\">advanced search operators</a>, such as proximity and wildcards." +#: app/views/request/show.rhtml:111 +msgid "" +"Waiting for an <strong>internal review</strong> by {{public_body_link}} of " +"their handling of this request." msgstr "" -#: app/views/general/search.rhtml:140 -msgid "Table of statuses" +#: app/views/general/search.rhtml:245 +msgid "" +"Waiting for the public authority to complete an internal review of their " +"handling of the request" msgstr "" -#: app/views/general/search.rhtml:142 +#: app/views/general/search.rhtml:238 msgid "Waiting for the public authority to reply" msgstr "" -#: app/views/general/search.rhtml:143 -msgid "The public authority does not have the information requested" +#: app/views/public_body/view_email.rhtml:17 +msgid "We do not have a working request email address for this authority." msgstr "" -#: app/views/general/search.rhtml:144 -msgid "The request was refused by the public authority" +#: app/views/request/followup_bad.rhtml:24 +msgid "" +"We do not have a working {{law_used_full}} address for {{public_body_name}}." msgstr "" -#: app/views/general/search.rhtml:145 -msgid "Some of the information requested has been received" +#: app/views/request/_describe_state.rhtml:107 +msgid "" +"We don't know whether the most recent response to this request contains\n" +" information or not\n" +" –\n" +"\tif you are {{user_link}} please <a href=\"{{url}}\">sign in</a> and let " +"everyone know." msgstr "" -#: app/views/general/search.rhtml:146 -msgid "All of the information requested has been received" +#: app/views/user_mailer/confirm_login.rhtml:8 +msgid "" +"We will not reveal your email address to anybody unless you\n" +"or the law tell us to." msgstr "" -#: app/views/general/search.rhtml:147 -msgid "The public authority would like part of the request explained" +#: app/views/user/_signup.rhtml:13 +msgid "" +"We will not reveal your email address to anybody unless you or\n" +" the law tell us to (<a href=\"%s\">details</a>). " msgstr "" -#: app/views/general/search.rhtml:148 -msgid "The public authority would like to / has responded by post" +#: app/views/user_mailer/changeemail_confirm.rhtml:10 +msgid "" +"We will not reveal your email addresses to anybody unless you\n" +"or the law tell us to." msgstr "" -#: app/views/general/search.rhtml:149 -msgid "Waiting for the public authority to complete an internal review of their handling of the request" +#: app/views/request/show.rhtml:61 +msgid "We're waiting for" msgstr "" -#: app/views/general/search.rhtml:150 -msgid "Received an error message, such as delivery failure." +#: app/views/request/show.rhtml:57 +msgid "We're waiting for someone to read" msgstr "" -#: app/views/general/search.rhtml:151 -msgid "A strange reponse, required attention by the {{site_name}} team" +#: app/views/user/signchangeemail_confirm.rhtml:6 +msgid "" +"We've sent an email to your new email address. You'll need to click the link " +"in\n" +"it before your email address will be changed." msgstr "" -#: app/views/general/search.rhtml:152 -msgid "The requester has abandoned this request for some reason" +#: app/views/user/confirm.rhtml:6 +msgid "" +"We've sent you an email, and you'll need to click the link in it before you " +"can\n" +"continue." msgstr "" -#: app/views/general/search.rhtml:155 -msgid "Table of varieties" +#: app/views/user/signchangepassword_confirm.rhtml:6 +msgid "" +"We've sent you an email, click the link in it, then you can change your " +"password." msgstr "" -#: app/views/general/search.rhtml:158 -msgid "Original request sent" +#: app/views/request/_followup.rhtml:58 +msgid "What are you doing?" msgstr "" -#: app/views/general/search.rhtml:159 -msgid "Follow up message sent by requester" +#: app/views/request/_describe_state.rhtml:4 +msgid "What best describes the status of this request now?" msgstr "" -#: app/views/general/search.rhtml:160 -msgid "Response from a public authority" +#: app/views/general/frontpage.rhtml:55 +msgid "What information has been released?" msgstr "" -#: app/views/general/search.rhtml:161 -msgid "Annotation added to request" +#: app/views/request_mailer/new_response.rhtml:9 +msgid "" +"When you get there, please update the status to say if the response \n" +"contains any useful information." msgstr "" -#: app/views/general/search.rhtml:162 -msgid "A public authority" +#: app/views/request/show_response.rhtml:42 +msgid "" +"When you receive the paper response, please help\n" +" others find out what it says:" msgstr "" -#: app/views/general/search.rhtml:163 -msgid "A {{site_name}} user" +#: app/views/request/new_please_describe.rhtml:16 +msgid "" +"When you're done, <strong>come back here</strong>, <a href=\"%s\">reload " +"this page</a> and file your new request." msgstr "" -#: app/views/public_body/list.rhtml:5 -msgid "Alphabet" +#: app/views/request/show_response.rhtml:13 +msgid "Which of these is happening?" msgstr "" -#: app/views/public_body/list.rhtml:29 -msgid "<a href=\"%s\">Are we missing a public authority?</a>." +#: app/views/general/frontpage.rhtml:38 +msgid "Who can I request information from?" msgstr "" -#: app/views/public_body/list.rhtml:32 -msgid "List of all authorities (CSV)" +#: app/models/info_request.rb:811 +msgid "Withdrawn by the requester." msgstr "" -#: app/views/public_body/list.rhtml:37 -msgid "Public authorities - {{description}}" +#: app/views/general/_localised_datepicker.rhtml:13 +msgid "Wk" msgstr "" -#: app/views/public_body/list.rhtml:42 -msgid "in total" +#: app/views/help/alaveteli.rhtml:6 +msgid "Would you like to see a website like this in your country?" msgstr "" -#: app/views/public_body/list.rhtml:43 -msgid "<a href=\"%s\">can't find the one you want?</a>" +#: app/controllers/request_controller.rb:548 +msgid "Write a reply to " msgstr "" -#: app/views/public_body/view_email.rhtml:3 -msgid "FOI email address for {{public_body}}" +#: app/controllers/request_controller.rb:547 +msgid "Write your FOI follow up message to " msgstr "" -#: app/views/public_body/view_email.rhtml:7 -msgid "{{site_name}} sends new requests to <strong>{{request_email}}</strong> for this authority." +#: app/views/request/new.rhtml:102 +msgid "Write your request in <strong>simple, precise language</strong>." msgstr "" -#: app/views/public_body/view_email.rhtml:10 -msgid "Freedom of Information law no longer applies to this authority.Follow up messages to existing requests are sent to " +#: app/views/comment/_single_comment.rhtml:10 +msgid "You" msgstr "" -#: app/views/public_body/view_email.rhtml:14 -msgid "Follow up messages to existing requests are sent to " +#: app/controllers/track_controller.rb:98 +msgid "You are already being emailed updates about " msgstr "" -#: app/views/public_body/view_email.rhtml:17 -msgid "We do not have a working request email address for this authority." +#: app/models/track_thing.rb:248 +msgid "You are already tracking requests to {{public_body_name}} by email" msgstr "" -#: app/views/public_body/view_email.rhtml:28 -msgid "If the address is wrong, or you know a better address, please <a href=\"%s\">contact us</a>." +#: app/models/track_thing.rb:280 +msgid "You are already tracking things matching this search by email" msgstr "" -#: app/views/public_body/view_email.rhtml:30 -msgid " If you know the address to use, then please <a href=\"%s\">send it to us</a>.\n You may be able to find the address on their website, or by phoning them up and asking." +#: app/models/track_thing.rb:264 +msgid "You are already tracking this person by email" msgstr "" -#: app/views/public_body/show.rhtml:3 -msgid "Track this authority" +#: app/models/track_thing.rb:197 +msgid "You are already tracking this request by email" msgstr "" -#: app/views/public_body/show.rhtml:5 -msgid "More about this authority" +#: app/models/track_thing.rb:229 +msgid "You are being emailed about any new successful responses" msgstr "" -#: app/views/public_body/show.rhtml:7 -msgid "Home page of authority" +#: app/models/track_thing.rb:213 +msgid "You are being emailed when there are new requests" msgstr "" -#: app/views/public_body/show.rhtml:10 -msgid "Publication scheme" +#: app/views/request/show.rhtml:88 +msgid "You can <strong>complain</strong> by" msgstr "" -#: app/views/public_body/show.rhtml:15 app/views/public_body/show.rhtml:17 -msgid "Charity registration" +#: app/views/request/details.rhtml:58 +msgid "" +"You can get this page in computer-readable format as part of the main JSON\n" +"page for the request. See the <a href=\"{{api_path}}\">API documentation</" +"a>." msgstr "" -#: app/views/public_body/show.rhtml:21 -msgid "View FOI email address" +#: app/views/public_body/show.rhtml:47 +msgid "" +"You can only request information about the environment from this authority." msgstr "" -#: app/views/public_body/show.rhtml:29 -msgid "also called {{public_body_short_name}}" +#: app/views/request_mailer/new_response.rhtml:1 +msgid "You have a new response to the {{law_used_full}} request " msgstr "" -#: app/views/public_body/show.rhtml:31 -msgid "admin" +#: app/views/general/exception_caught.rhtml:18 +msgid "" +"You have found a bug. Please <a href=\"{{contact_url}}\">contact us</a> to " +"tell us about the problem" msgstr "" -#: app/views/public_body/show.rhtml:40 -msgid "You can only request information about the environment from this authority." +#: app/views/user/show.rhtml:136 +msgid "You have made no Freedom of Information requests using this site." msgstr "" -#: app/views/public_body/show.rhtml:47 -msgid "Make a new Environmental Information request" +#: app/controllers/user_controller.rb:510 +msgid "You have now changed the text about you on your profile." msgstr "" -#: app/views/public_body/show.rhtml:50 -msgid "<a href=\"{{url}}\">Make a new Freedom of Information request</a> to {{public_body_name}}" +#: app/controllers/user_controller.rb:328 +msgid "You have now changed your email address used on {{site_name}}" msgstr "" -#: app/views/public_body/show.rhtml:56 -msgid "Freedom of Information law does not apply to this authority, so you cannot make\n a request to it." +#: app/views/user_mailer/already_registered.rhtml:3 +msgid "" +"You just tried to sign up to {{site_name}}, when you\n" +"already have an account. Your name and password have been\n" +"left as they previously were.\n" +"\n" +"Please click on the link below." msgstr "" -#: app/views/public_body/show.rhtml:59 -msgid "This authority no longer exists, so you cannot make a request to it." +#: app/views/comment/new.rhtml:59 +msgid "" +"You know what caused the error, and can <strong>suggest a solution</strong>, " +"such as a working email address." msgstr "" -#: app/views/public_body/show.rhtml:61 -msgid "For an unknown reason, it is not possible to make a request to this authority." +#: app/views/request/upload_response.rhtml:16 +msgid "" +"You may <strong>include attachments</strong>. If you would like to attach a\n" +"file too large for email, use the form below." msgstr "" -#: app/views/public_body/show.rhtml:69 -msgid "Environmental Information Regulations requests made using this site" +#: app/views/request/followup_bad.rhtml:24 +msgid "" +"You may be able to find\n" +" one on their website, or by phoning them up and asking. If you manage\n" +" to find one, then please <a href=\"%s\">send it to us</a>." msgstr "" -#: app/views/public_body/show.rhtml:72 -msgid "Freedom of Information requests made using this site" +#: app/views/request/new_bad_contact.rhtml:6 +msgid "" +"You may be able to find\n" +"one on their website, or by phoning them up and asking. If you manage\n" +"to find one, then please <a href=\"{{help_url}}\">send it to us</a>." msgstr "" -#: app/views/public_body/show.rhtml:73 -msgid "Nobody has made any Freedom of Information requests to {{public_body_name}} using this site yet." +#: app/controllers/user_controller.rb:488 +msgid "You need to be logged in to change the text about you on your profile." msgstr "" -#: app/views/public_body/show.rhtml:80 -msgid "%d Freedom of Information request made using this site" -msgid_plural "%d Freedom of Information requests made using this site" -msgstr[0] "" -msgstr[1] "" +#: app/controllers/user_controller.rb:389 +msgid "You need to be logged in to change your profile photo." +msgstr "" -#: app/views/public_body/show.rhtml:91 -msgid "Only requests made using {{site_name}} are shown." +#: app/controllers/user_controller.rb:451 +msgid "You need to be logged in to clear your profile photo." msgstr "" -#: app/views/public_body/show.rhtml:96 -msgid "Environmental Information Regulations requests made" +#: app/controllers/request_controller.rb:558 +msgid "You previously submitted that exact follow up message for this request." msgstr "" -#: app/views/public_body/show.rhtml:98 -msgid "Freedom of Information requests made" +#: app/views/request/upload_response.rhtml:13 +msgid "" +"You should have received a copy of the request by email, and you can " +"respond\n" +"by <strong>simply replying</strong> to that email. For your convenience, " +"here is the address:" msgstr "" -#: app/views/public_body/show.rhtml:100 -msgid "The search index is currently offline, so we can't show the Freedom of Information requests that have been made to this authority." +#: app/views/request/show_response.rhtml:34 +msgid "" +"You want to <strong>give your postal address</strong> to the authority in " +"private." msgstr "" -#: app/views/public_body/view_email_captcha.rhtml:1 -msgid "View FOI email address for '{{public_body_name}}'" +#: app/views/user/banned.rhtml:9 +msgid "" +"You will be unable to make new requests, send follow ups, add annotations " +"or\n" +"send messages to other users. You may continue to view other requests, and " +"set\n" +"up\n" +"email alerts." msgstr "" -#: app/views/public_body/view_email_captcha.rhtml:3 -msgid "View FOI email address for {{public_body_name}}" +#: app/controllers/track_controller.rb:154 +msgid "You will no longer be emailed updates about " msgstr "" -#: app/views/public_body/view_email_captcha.rhtml:5 -msgid "To view the email address that we use to send FOI requests to {{public_body_name}}, please enter these words." +#: app/controllers/track_controller.rb:183 +msgid "You will no longer be emailed updates for those alerts" msgstr "" -#: app/views/public_body/view_email_captcha.rhtml:12 -msgid "View email" +#: app/controllers/track_controller.rb:111 +msgid "You will now be emailed updates about " msgstr "" -#: app/views/public_body/_body_listing_single.rhtml:12 -msgid "Also called {{other_name}}." +#: app/views/request_mailer/not_clarified_alert.rhtml:6 +msgid "" +"You will only get an answer to your request if you follow up\n" +"with the clarification." msgstr "" -#: app/views/public_body/_body_listing_single.rhtml:21 -msgid "%d request made." -msgid_plural "%d requests made." +#: app/controllers/user_controller.rb:460 +msgid "You've now cleared your profile photo" +msgstr "" + +#: app/views/user/show.rhtml:141 +msgid "Your %d Freedom of Information request" +msgid_plural "Your %d Freedom of Information requests" msgstr[0] "" msgstr[1] "" -#: app/views/public_body/_body_listing_single.rhtml:23 -msgid "Make your own request" +#: app/views/user/show.rhtml:169 +msgid "Your %d annotation" +msgid_plural "Your %d annotations" +msgstr[0] "" +msgstr[1] "" + +#: app/views/user/_signup.rhtml:22 +msgid "" +"Your <strong>name will appear publicly</strong> \n" +" (<a href=\"%s\">why?</a>)\n" +" on this website and in search engines. If you\n" +" are thinking of using a pseudonym, please \n" +" <a href=\"%s\">read this first</a>." msgstr "" -#: app/views/public_body/_body_listing_single.rhtml:26 -msgid "Added on {{date}}" +#: app/views/user/show.rhtml:162 +msgid "Your annotations" msgstr "" -#: app/views/outgoing_mailer/followup.rhtml:6 app/views/outgoing_mailer/initial_request.rhtml:5 -msgid "Please use this email address for all replies to this request:" +#: app/views/contact_mailer/user_message.rhtml:3 +msgid "" +"Your details have not been given to anyone, unless you choose to reply to " +"this\n" +"message, which will then go directly to the person who wrote the message." msgstr "" -#: app/views/outgoing_mailer/initial_request.rhtml:8 -msgid "Is {{email_address}} the wrong address for {{type_of_request}} requests to {{public_body_name}}? If so, please contact us using this form:" +#: app/views/user/_signin.rhtml:11 app/views/user/_signup.rhtml:9 +#: app/views/user/signchangepassword_send_confirm.rhtml:13 +msgid "Your e-mail:" msgstr "" -#: app/views/outgoing_mailer/_followup_footer.rhtml:1 -msgid "Disclaimer: This message and any reply that you make will be published on the internet. Our privacy and copyright policies:" +#: app/views/user/show.rhtml:184 +msgid "Your email subscriptions" msgstr "" -#: app/views/outgoing_mailer/_followup_footer.rhtml:4 -msgid "If you find this service useful as an FOI officer, please ask your web manager to link to us from your organisation's FOI page." +#: app/controllers/request_controller.rb:555 +msgid "" +"Your follow up has not been sent because this request has been stopped to " +"prevent spam. Please <a href=\"%s\">contact us</a> if you really want to " +"send a follow up message." msgstr "" -#: app/views/comment/_comment_form.rhtml:8 -msgid "Email me future updates to this request" +#: app/controllers/request_controller.rb:583 +msgid "Your follow up message has been sent on its way." msgstr "" -#: app/views/comment/_comment_form.rhtml:15 -msgid "Preview your annotation" +#: app/controllers/request_controller.rb:581 +msgid "Your internal review request has been sent on its way." msgstr "" -#: app/views/comment/_comment_form.rhtml:16 -msgid " (<strong>no ranty</strong> politics, read our <a href=\"%s\">moderation policy</a>)" +#: app/controllers/help_controller.rb:63 +msgid "" +"Your message has been sent. Thank you for getting in touch! We'll get back " +"to you soon." msgstr "" -#: app/views/comment/preview.rhtml:1 -msgid "Preview new annotation on '{{info_request_title}}'" +#: app/controllers/user_controller.rb:367 +msgid "Your message to {{recipient_user_name}} has been sent!" msgstr "" -#: app/views/comment/preview.rhtml:5 -msgid "Now preview your annotation" +#: app/views/request/followup_preview.rhtml:15 +msgid "Your message will appear in <strong>search engines</strong>" msgstr "" #: app/views/comment/preview.rhtml:10 -msgid "Your name and annotation will appear in <strong>search engines</strong>." +msgid "" +"Your name and annotation will appear in <strong>search engines</strong>." msgstr "" -#: app/views/comment/preview.rhtml:20 -msgid "Re-edit this annotation" +#: app/views/request/preview.rhtml:8 +msgid "" +"Your name, request and any responses will appear in <strong>search engines</" +"strong>\n" +" (<a href=\"%s\">details</a>)." msgstr "" -#: app/views/comment/preview.rhtml:21 -msgid "Post annotation" +#: app/views/user/_signup.rhtml:18 +msgid "Your name:" msgstr "" -#: app/views/comment/_single_comment.rhtml:10 -msgid "You" +#: app/views/request_mailer/stopped_responses.rhtml:14 +msgid "Your original message is attached." msgstr "" -#: app/views/comment/_single_comment.rhtml:10 -msgid "left an annotation" +#: app/controllers/user_controller.rb:249 +msgid "Your password has been changed." msgstr "" -#: app/views/comment/_single_comment.rhtml:24 -msgid "Report abuse" +#: app/views/user/signchangeemail.rhtml:25 +msgid "Your password:" msgstr "" -#: app/views/comment/new.rhtml:14 -msgid "Add an annotation to " +#: app/views/user/set_draft_profile_photo.rhtml:18 +msgid "" +"Your photo will be shown in public <strong>on the Internet</strong>, \n" +" wherever you do something on {{site_name}}." msgstr "" -#: app/views/comment/new.rhtml:17 -msgid "Annotations are so anyone, including you, can help the requester with their request. For example:" +#: app/views/request_mailer/new_response_reminder_alert.rhtml:5 +msgid "" +"Your request was called {{info_request}}. Letting everyone know whether you " +"got the information will help us keep tabs on" msgstr "" -#: app/views/comment/new.rhtml:23 -msgid " Advise on how to <strong>best clarify</strong> the request." +#: app/views/request/new.rhtml:111 +msgid "Your request:" msgstr "" -#: app/views/comment/new.rhtml:27 -msgid " Link to the information requested, if it is <strong>already available</strong> on the Internet. " +#: app/views/request/upload_response.rhtml:8 +msgid "" +"Your response will <strong>appear on the Internet</strong>, <a href=\"%s" +"\">read why</a> and answers to other questions." msgstr "" -#: app/views/comment/new.rhtml:28 -msgid " Suggest <strong>where else</strong> the requester might find the information. " +#: app/views/comment/new.rhtml:62 +msgid "" +"Your thoughts on what the {{site_name}} <strong>administrators</strong> " +"should do about the request." msgstr "" -#: app/views/comment/new.rhtml:29 -msgid " Offer better ways of <strong>wording the request</strong> to get the information. " +#: app/models/track_mailer.rb:25 +msgid "Your {{site_name}} email alert" msgstr "" -#: app/views/comment/new.rhtml:33 -msgid " <strong>Summarise</strong> the content of any information returned. " +#: app/models/outgoing_message.rb:70 +msgid "Yours faithfully," msgstr "" -#: app/views/comment/new.rhtml:34 -msgid " Say how you've <strong>used the information</strong>, with links if possible." +#: app/models/outgoing_message.rb:68 +msgid "Yours sincerely," msgstr "" -#: app/views/comment/new.rhtml:35 -msgid "<strong>Thank</strong> the public authority or " +#: app/views/request/new.rhtml:87 +msgid "" +"a one line summary of the information you are requesting, \n" +"\t\t\te.g." msgstr "" -#: app/views/comment/new.rhtml:38 -msgid "Suggest how the requester can find the <strong>rest of the information</strong>." +#: app/views/public_body/show.rhtml:38 +msgid "admin" msgstr "" -#: app/views/comment/new.rhtml:41 -msgid "Point to <strong>related information</strong>, campaigns or forums which may be useful." +#: app/views/request/_request_filter_form.rhtml:30 +msgid "all requests" msgstr "" -#: app/views/comment/new.rhtml:45 -msgid "A <strong>summary</strong> of the response if you have received it by post. " +#: app/views/public_body/show.rhtml:36 +msgid "also called {{public_body_short_name}}" msgstr "" -#: app/views/comment/new.rhtml:49 -msgid " Ideas on what <strong>other documents to request</strong> which the authority may hold. " +#: app/views/request/_request_filter_form.rhtml:25 +msgid "and" msgstr "" -#: app/views/comment/new.rhtml:52 -msgid "Advise on whether the <strong>refusal is legal</strong>, and how to complain about it if not." +#: app/views/request/show.rhtml:59 +msgid "" +"and update the status accordingly. Perhaps <strong>you</strong> might like " +"to help out by doing that?" msgstr "" -#: app/views/comment/new.rhtml:56 -msgid "<strong>Advice</strong> on how to get a response that will satisfy the requester. </li>" +#: app/views/request/show.rhtml:64 +msgid "and update the status." msgstr "" -#: app/views/comment/new.rhtml:59 -msgid "You know what caused the error, and can <strong>suggest a solution</strong>, such as a working email address." +#: app/views/request/_describe_state.rhtml:101 +msgid "and we'll suggest <strong>what to do next</strong>" msgstr "" -#: app/views/comment/new.rhtml:62 -msgid "Your thoughts on what the {{site_name}} <strong>administrators</strong> should do about the request." +#: app/views/general/frontpage.rhtml:61 +msgid "answered a request about" msgstr "" -#: app/views/comment/new.rhtml:69 -msgid "Annotations will be posted publicly here, and are \n <strong>not</strong> sent to {{public_body_name}}." +#: app/models/track_thing.rb:211 +msgid "any <a href=\"/list\">new requests</a>" msgstr "" -#: lib/public_body_categories_en.rb:14 -msgid "Central government" +#: app/models/track_thing.rb:227 +msgid "any <a href=\"/list/successful\">successful requests</a>" msgstr "" -#: lib/public_body_categories_en.rb:23 -msgid "Local and regional" +#: app/models/track_thing.rb:116 +msgid "anything" msgstr "" -#: locale/model_attributes.rb:2 -msgid "public body" +#: app/views/request_mailer/very_overdue_alert.rhtml:1 +msgid "are long overdue." msgstr "" -#: locale/model_attributes.rb:3 -msgid "PublicBody|Name" +#: app/models/track_thing.rb:89 app/views/general/search.rhtml:56 +msgid "authorities" msgstr "" -#: locale/model_attributes.rb:4 -msgid "PublicBody|Short name" +#: app/models/track_thing.rb:104 +msgid "awaiting a response" msgstr "" -#: locale/model_attributes.rb:5 -msgid "PublicBody|Request email" +#: app/controllers/public_body_controller.rb:119 +msgid "beginning with" msgstr "" -#: locale/model_attributes.rb:6 -msgid "PublicBody|Version" +#: app/models/track_thing.rb:95 +msgid "between two dates" msgstr "" -#: locale/model_attributes.rb:7 -msgid "PublicBody|Last edit editor" +#: app/views/request/show.rhtml:82 +msgid "by" msgstr "" -#: locale/model_attributes.rb:8 -msgid "PublicBody|Last edit comment" +#: app/views/request/_followup.rhtml:38 +msgid "by <strong>{{date}}</strong>" msgstr "" -#: locale/model_attributes.rb:9 -msgid "PublicBody|Url name" +#: app/views/request/_request_listing_via_event.rhtml:26 +msgid "by {{public_body_name}} to {{info_request_user}} on {{date}}." msgstr "" -#: locale/model_attributes.rb:10 -msgid "PublicBody|Home page" +#: app/views/request/_request_listing_short_via_event.rhtml:10 +msgid "by {{user_link_absolute}}" msgstr "" -#: locale/model_attributes.rb:11 -msgid "PublicBody|Notes" +#: locale/model_attributes.rb:35 +msgid "censor rule" msgstr "" -#: locale/model_attributes.rb:12 -msgid "PublicBody|First letter" +#: locale/model_attributes.rb:20 +msgid "comment" msgstr "" -#: locale/model_attributes.rb:13 -msgid "PublicBody|Publication scheme" +#: app/models/track_thing.rb:86 app/views/general/search.rhtml:103 +#: app/views/request/_request_filter_form.rhtml:14 +msgid "comments" msgstr "" -#: locale/model_attributes.rb:14 -msgid "profile photo" +#: app/views/request/show_response.rhtml:39 +msgid "" +"containing your postal address, and asking them to reply to this request.\n" +" Or you could phone them." msgstr "" -#: locale/model_attributes.rb:15 -msgid "ProfilePhoto|Data" +#: app/models/info_request_event.rb:323 +msgid "display_status only works for incoming and outgoing messages right now" msgstr "" -#: locale/model_attributes.rb:16 -msgid "ProfilePhoto|Draft" +#: app/views/request_mailer/overdue_alert.rhtml:3 +msgid "during term time" msgstr "" -#: locale/model_attributes.rb:17 -msgid "exim log" +#: app/views/user/show.rhtml:96 +msgid "edit text about you" msgstr "" -#: locale/model_attributes.rb:18 -msgid "EximLog|Order" +#: app/views/user/show.rhtml:187 +msgid "email subscription" msgstr "" -#: locale/model_attributes.rb:19 -msgid "EximLog|Line" +#: app/views/request_mailer/very_overdue_alert.rhtml:4 +msgid "even during holidays" msgstr "" -#: locale/model_attributes.rb:20 -msgid "comment" +#: app/views/general/search.rhtml:57 +msgid "everything" msgstr "" -#: locale/model_attributes.rb:21 -msgid "Comment|Comment type" +#: locale/model_attributes.rb:17 +msgid "exim log" msgstr "" -#: locale/model_attributes.rb:22 -msgid "Comment|Body" +#: locale/model_attributes.rb:57 +msgid "exim log done" msgstr "" -#: locale/model_attributes.rb:23 -msgid "Comment|Visible" +#: app/views/request_mailer/requires_admin.rhtml:2 +msgid "has reported an" msgstr "" -#: locale/model_attributes.rb:24 -msgid "Comment|Locale" +#: app/views/request_mailer/overdue_alert.rhtml:1 +msgid "have delayed." msgstr "" -#: locale/model_attributes.rb:25 -msgid "outgoing message" +#: locale/model_attributes.rb:54 +msgid "holiday" msgstr "" -#: locale/model_attributes.rb:26 -msgid "OutgoingMessage|Body" +#: app/views/request/_followup.rhtml:36 app/views/request/show.rhtml:70 +#: app/views/request/show.rhtml:80 +msgid "in term time" msgstr "" -#: locale/model_attributes.rb:27 -msgid "OutgoingMessage|Status" +#: locale/model_attributes.rb:60 +msgid "incoming message" msgstr "" -#: locale/model_attributes.rb:28 -msgid "OutgoingMessage|Message type" +#: locale/model_attributes.rb:78 +msgid "info request" msgstr "" -#: locale/model_attributes.rb:29 -msgid "OutgoingMessage|Last sent at" +#: locale/model_attributes.rb:40 +msgid "info request event" msgstr "" -#: locale/model_attributes.rb:30 -msgid "OutgoingMessage|What doing" +#: app/views/user/set_profile_about_me.rhtml:3 +#: app/views/user/signchangeemail.rhtml:3 +msgid "internal error" msgstr "" -#: locale/model_attributes.rb:31 -msgid "track thing" +#: app/views/general/search.rhtml:92 +msgid "internal reviews" msgstr "" -#: locale/model_attributes.rb:32 -msgid "TrackThing|Track query" +#: app/views/request/show.rhtml:100 +msgid "is <strong>waiting for your clarification</strong>." msgstr "" -#: locale/model_attributes.rb:33 -msgid "TrackThing|Track medium" +#: app/views/user/show.rhtml:71 +msgid "just to see how it works" msgstr "" -#: locale/model_attributes.rb:34 -msgid "TrackThing|Track type" +#: app/views/comment/_single_comment.rhtml:10 +msgid "left an annotation" msgstr "" -#: locale/model_attributes.rb:35 -msgid "censor rule" +#: app/views/user/_user_listing_single.rhtml:19 +#: app/views/user/_user_listing_single.rhtml:20 +msgid "made." msgstr "" -#: locale/model_attributes.rb:36 -msgid "CensorRule|Text" +#: app/views/general/search.rhtml:102 +#: app/views/request/_request_filter_form.rhtml:13 +msgid "messages from authorities" msgstr "" -#: locale/model_attributes.rb:37 -msgid "CensorRule|Replacement" +#: app/views/general/search.rhtml:101 +#: app/views/request/_request_filter_form.rhtml:12 +msgid "messages from users" msgstr "" -#: locale/model_attributes.rb:38 -msgid "CensorRule|Last edit editor" +#: app/views/request/show.rhtml:74 +msgid "no later than" msgstr "" -#: locale/model_attributes.rb:39 -msgid "CensorRule|Last edit comment" +#: app/views/request/followup_bad.rhtml:18 +msgid "" +"no longer exists. If you are trying to make\n" +" From the request page, try replying to a particular message, rather than " +"sending\n" +" a general followup. If you need to make a general followup, and know\n" +" an email which will go to the right place, please <a href=\"%s\">send it " +"to us</a>." msgstr "" -#: locale/model_attributes.rb:40 -msgid "info request event" +#: app/views/request/show.rhtml:72 +msgid "normally" msgstr "" -#: locale/model_attributes.rb:41 -msgid "InfoRequestEvent|Event type" +#: locale/model_attributes.rb:25 +msgid "outgoing message" msgstr "" -#: locale/model_attributes.rb:42 -msgid "InfoRequestEvent|Params yaml" +#: app/views/user/sign.rhtml:11 +msgid "please sign in as " msgstr "" -#: locale/model_attributes.rb:43 -msgid "InfoRequestEvent|Described state" +#: app/views/user/sign.rhtml:28 +msgid "please sign in or make a new account." msgstr "" -#: locale/model_attributes.rb:44 -msgid "InfoRequestEvent|Calculated state" +#: locale/model_attributes.rb:47 +msgid "post redirect" msgstr "" -#: locale/model_attributes.rb:45 -msgid "InfoRequestEvent|Last described at" +#: locale/model_attributes.rb:14 +msgid "profile photo" msgstr "" -#: locale/model_attributes.rb:46 -msgid "InfoRequestEvent|Prominence" +#: locale/model_attributes.rb:2 +msgid "public body" msgstr "" -#: locale/model_attributes.rb:47 -msgid "post redirect" +#: app/views/request_mailer/not_clarified_alert.rhtml:1 +msgid "request." msgstr "" -#: locale/model_attributes.rb:48 -msgid "PostRedirect|Token" +#: app/views/request/show.rhtml:89 +msgid "requesting an internal review" msgstr "" -#: locale/model_attributes.rb:49 -msgid "PostRedirect|Uri" +#: app/models/track_thing.rb:92 app/models/track_thing.rb:111 +#: app/models/track_thing.rb:113 app/views/general/search.rhtml:54 +msgid "requests" msgstr "" -#: locale/model_attributes.rb:50 -msgid "PostRedirect|Post params yaml" +#: app/models/track_thing.rb:112 +msgid "requests which are {{list_of_statuses}}" msgstr "" -#: locale/model_attributes.rb:51 -msgid "PostRedirect|Email token" +#: app/views/request_mailer/requires_admin.rhtml:3 +msgid "" +"response as needing administrator attention. Take a look, and reply to this\n" +"email to let them know what you are going to do about it." msgstr "" -#: locale/model_attributes.rb:52 -msgid "PostRedirect|Reason params yaml" +#: app/views/request/show.rhtml:102 +msgid "send a follow up message" msgstr "" -#: locale/model_attributes.rb:53 -msgid "PostRedirect|Circumstance" +#: app/views/request/_request_listing_via_event.rhtml:23 +msgid "sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "" -#: locale/model_attributes.rb:54 -msgid "holiday" +#: app/views/request/show.rhtml:106 +msgid "sign in" msgstr "" -#: locale/model_attributes.rb:55 -msgid "Holiday|Day" +#: app/models/track_thing.rb:101 +msgid "successful" msgstr "" -#: locale/model_attributes.rb:56 -msgid "Holiday|Description" +#: app/views/general/search.rhtml:89 +#: app/views/request/_request_filter_form.rhtml:31 +msgid "successful requests" msgstr "" -#: locale/model_attributes.rb:57 -msgid "exim log done" +#: app/views/request_mailer/new_response.rhtml:2 +msgid "that you made to" msgstr "" -#: locale/model_attributes.rb:58 -msgid "EximLogDone|Filename" +#: app/views/request_mailer/comment_on_alert.rhtml:6 +#: app/views/request_mailer/comment_on_alert_plural.rhtml:5 +#: app/views/request_mailer/new_response.rhtml:15 +#: app/views/request_mailer/new_response_reminder_alert.rhtml:8 +#: app/views/request_mailer/not_clarified_alert.rhtml:9 +#: app/views/request_mailer/old_unclassified_updated.rhtml:8 +#: app/views/request_mailer/overdue_alert.rhtml:9 +#: app/views/request_mailer/stopped_responses.rhtml:16 +#: app/views/request_mailer/very_overdue_alert.rhtml:11 +#: app/views/track_mailer/event_digest.rhtml:66 +#: app/views/user_mailer/already_registered.rhtml:11 +#: app/views/user_mailer/changeemail_already_used.rhtml:10 +#: app/views/user_mailer/changeemail_confirm.rhtml:13 +#: app/views/user_mailer/confirm_login.rhtml:11 +msgid "the {{site_name}} team" msgstr "" -#: locale/model_attributes.rb:59 -msgid "EximLogDone|Last stat" +#: app/views/request/show.rhtml:62 +msgid "to read" msgstr "" -#: locale/model_attributes.rb:60 -msgid "incoming message" +#: app/views/request/show.rhtml:106 +msgid "to send a follow up message." msgstr "" -#: locale/model_attributes.rb:61 -msgid "IncomingMessage|Cached attachment text clipped" +#: app/views/request/show.rhtml:45 +msgid "to {{public_body}}" msgstr "" -#: locale/model_attributes.rb:62 -msgid "IncomingMessage|Cached main body text folded" +#: locale/model_attributes.rb:31 +msgid "track thing" msgstr "" -#: locale/model_attributes.rb:63 -msgid "IncomingMessage|Cached main body text unfolded" +#: app/views/request/_hidden_correspondence.rhtml:32 +msgid "unexpected prominence on request event" msgstr "" -#: locale/model_attributes.rb:64 -msgid "IncomingMessage|Sent at" +#: app/views/request/_request_listing_via_event.rhtml:30 +msgid "unknown event type indexed " msgstr "" -#: locale/model_attributes.rb:65 -msgid "IncomingMessage|Subject" +#: app/views/request/followup_bad.rhtml:29 +msgid "unknown reason " msgstr "" -#: locale/model_attributes.rb:66 -msgid "IncomingMessage|Safe mail from" +#: app/models/info_request.rb:816 app/models/info_request_event.rb:318 +msgid "unknown status " msgstr "" -#: locale/model_attributes.rb:67 -msgid "IncomingMessage|Mail from domain" +#: app/views/general/search.rhtml:91 +#: app/views/request/_request_filter_form.rhtml:33 +msgid "unresolved requests" msgstr "" -#: locale/model_attributes.rb:68 -msgid "IncomingMessage|Valid to reply to" +#: app/views/user/show.rhtml:224 +msgid "unsubscribe" msgstr "" -#: locale/model_attributes.rb:69 -msgid "user info request sent alert" +#: app/views/user/show.rhtml:196 app/views/user/show.rhtml:210 +msgid "unsubscribe all" msgstr "" -#: locale/model_attributes.rb:70 -msgid "UserInfoRequestSentAlert|Alert type" +#: app/models/track_thing.rb:98 +msgid "unsuccessful" msgstr "" -#: locale/model_attributes.rb:71 +#: app/views/general/search.rhtml:90 +#: app/views/request/_request_filter_form.rhtml:32 +msgid "unsuccessful requests" +msgstr "" + +#: app/views/request/show.rhtml:53 +msgid "useful information." +msgstr "" + +#: locale/model_attributes.rb:66 msgid "user" msgstr "" -#: locale/model_attributes.rb:72 -msgid "User|Email" +#: locale/model_attributes.rb:64 +msgid "user info request sent alert" msgstr "" -#: locale/model_attributes.rb:73 -msgid "User|Name" +#: app/models/track_thing.rb:83 app/views/general/search.rhtml:55 +msgid "users" msgstr "" -#: locale/model_attributes.rb:74 -msgid "User|Hashed password" +#: app/views/request/list.rhtml:21 +msgid "{{count}} FOI requests found" msgstr "" -#: locale/model_attributes.rb:75 -msgid "User|Salt" +#: app/views/request/new.rhtml:25 +msgid "" +"{{existing_request_user}} already\n" +" created the same request on {{date}}. You can either view the <a href=" +"\"{{existing_request}}\">existing request</a>,\n" +" or edit the details below to make a new but similar request." msgstr "" -#: locale/model_attributes.rb:76 -msgid "User|Email confirmed" +#: app/views/request/_after_actions.rhtml:20 +msgid "{{info_request_user_name}} only:" msgstr "" -#: locale/model_attributes.rb:77 -msgid "User|Url name" +#: app/views/general/frontpage.rhtml:63 +msgid "{{length_of_time}} ago" msgstr "" -#: locale/model_attributes.rb:78 -msgid "User|Last daily track email" +#: app/models/track_thing.rb:122 +msgid "{{list_of_things}} matching text '{{search_query}}'" msgstr "" -#: locale/model_attributes.rb:79 -msgid "User|Admin level" +#: app/views/request/_after_actions.rhtml:43 +msgid "{{public_body_name}} only:" msgstr "" -#: locale/model_attributes.rb:80 -msgid "User|Ban text" +#: app/views/track_mailer/event_digest.rhtml:21 +msgid "{{public_body}} sent a response to {{user_name}}" msgstr "" -#: locale/model_attributes.rb:81 -msgid "User|About me" +#: app/controllers/user_controller.rb:43 +msgid "{{search_results}} matching '{{query}}'" msgstr "" -#: locale/model_attributes.rb:82 -msgid "info request" +#: app/views/general/frontpage.rhtml:39 +msgid "" +"{{site_name}} covers requests to {{number_of_authorities}} authorities, " +"including:" msgstr "" -#: locale/model_attributes.rb:83 -msgid "InfoRequest|Title" +#: app/views/public_body/view_email.rhtml:7 +msgid "" +"{{site_name}} sends new requests to <strong>{{request_email}}</strong> for " +"this authority." msgstr "" -#: locale/model_attributes.rb:84 -msgid "InfoRequest|Described state" +#: app/views/general/frontpage.rhtml:56 +msgid "" +"{{site_name}} users have made {{number_of_requests}} requests, including:" msgstr "" -#: locale/model_attributes.rb:85 -msgid "InfoRequest|Awaiting description" +#: app/models/user.rb:131 +msgid "{{user_name}} (Banned)" msgstr "" -#: locale/model_attributes.rb:86 -msgid "InfoRequest|Prominence" +#: app/views/track_mailer/event_digest.rhtml:31 +msgid "{{user_name}} added an annotation" msgstr "" -#: locale/model_attributes.rb:87 -msgid "InfoRequest|Url title" +#: app/views/request_mailer/comment_on_alert.rhtml:1 +msgid "" +"{{user_name}} has annotated your {{law_used_short}} \n" +"request. Follow this link to see what they wrote." msgstr "" -#: locale/model_attributes.rb:88 -msgid "InfoRequest|Law used" +#: app/views/contact_mailer/user_message.rhtml:2 +msgid "{{user_name}} has used {{site_name}} to send you the message below." msgstr "" -#: locale/model_attributes.rb:89 -msgid "InfoRequest|Allow new responses from" +#: app/views/track_mailer/event_digest.rhtml:24 +msgid "{{user_name}} sent a follow up message to {{public_body}}" msgstr "" -#: locale/model_attributes.rb:90 -msgid "InfoRequest|Handle rejected responses" +#: app/views/track_mailer/event_digest.rhtml:28 +msgid "{{user_name}} sent a request to {{public_body}}" msgstr "" -#: locale/model_attributes.rb:91 -msgid "InfoRequest|Idhash" +#: app/views/request/show.rhtml:36 +msgid "" +"{{user}} (<a href=\"{{user_admin_url}}\">admin</a>) made this " +"{{law_used_full}} request (<a href=\"{{request_admin_url}}\">admin</a>) to " +"{{public_body_link}} (<a href=\"{{public_body_admin_url}}\">admin</a>)" +msgstr "" + +#: app/views/request/show.rhtml:44 +msgid "{{user}} made this {{law_used_full}} request" msgstr "" diff --git a/locale/de/app.po b/locale/de/app.po index 604fcc500..635fcb437 100644 --- a/locale/de/app.po +++ b/locale/de/app.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2011-08-11 12:30+0200\n" -"PO-Revision-Date: 2011-08-12 00:21+0000\n" -"Last-Translator: KerstiRu <kersti@access-info.org>\n" +"POT-Creation-Date: 2011-09-05 11:30+0200\n" +"PO-Revision-Date: 2011-09-05 09:58+0000\n" +"Last-Translator: vbrestovci <vbrestovci@gmail.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: app/models/incoming_message.rb:866 +#: app/models/incoming_message.rb:868 msgid "" "\n" "\n" @@ -30,12 +30,14 @@ msgid "" " This will appear on your {{site_name}} profile, to make it\n" " easier for others to get involved with what you're doing." msgstr "" +" Diese Information wird auf Ihrem {{site_name}} -profil angezeigt werden, um" +" andere Nutzer über Ihre Aktivitäten zu informieren. " #: app/views/comment/_comment_form.rhtml:16 msgid "" " (<strong>no ranty</strong> politics, read our <a href=\"%s\">moderation " "policy</a>)" -msgstr "" +msgstr "<a href=\"%s\">Moderationsregeln</a>)" #: app/views/request/upload_response.rhtml:40 msgid "" @@ -61,6 +63,8 @@ msgstr "" #: app/views/user/contact.rhtml:35 msgid " <strong>Privacy note:</strong> Your email address will be given to" msgstr "" +" <strong>Datenschutzerklärung:</strong> Ihre Emailadresse wird " +"weitergeleitet an: " #: app/views/comment/new.rhtml:33 msgid " <strong>Summarise</strong> the content of any information returned. " @@ -147,23 +151,23 @@ msgstr "" #: app/views/request/upload_response.rhtml:5 msgid " made by " -msgstr "" +msgstr "erstellt durch" -#: app/views/user/show.rhtml:123 -msgid " made no Freedom of Information requests using this site." -msgstr "Keine Informationsfreiheitsanfrage über diese Seite gestellt." +#: app/models/track_thing.rb:112 app/models/track_thing.rb:120 +msgid " or " +msgstr "" #: app/views/user/contact.rhtml:36 msgid " when you send this message." msgstr "wenn Sie diese Nachricht senden. " -#: app/views/public_body/show.rhtml:80 +#: app/views/public_body/show.rhtml:82 msgid "%d Freedom of Information request made using this site" msgid_plural "%d Freedom of Information requests made using this site" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d Informationsfreiheitsanfrage über diese Seite gestellt" +msgstr[1] "%d Informationsfreiheitsanfragen über diese Seite gestellt" -#: app/views/general/frontpage.rhtml:36 +#: app/views/general/frontpage.rhtml:44 msgid "%d request" msgid_plural "%d requests" msgstr[0] "" @@ -175,15 +179,27 @@ msgid_plural "%d requests made." msgstr[0] "" msgstr[1] "" -#: app/views/request/new.rhtml:102 +#: app/views/request/new.rhtml:83 msgid "'Crime statistics by ward level for Wales'" -msgstr "" +msgstr "´Kriminalitätsrate auf Länderebene´" -#: app/views/request/new.rhtml:100 +#: app/views/request/new.rhtml:81 msgid "'Pollution levels over time for the River Tyne'" msgstr "" -#: app/controllers/user_controller.rb:355 +#: app/models/track_thing.rb:246 +msgid "'{{link_to_authority}}', a public authority" +msgstr "" + +#: app/models/track_thing.rb:195 +msgid "'{{link_to_request}}', a request" +msgstr "" + +#: app/models/track_thing.rb:262 +msgid "'{{link_to_user}}', a person" +msgstr "" + +#: app/controllers/user_controller.rb:373 msgid "" ",\n" "\n" @@ -201,36 +217,51 @@ msgstr "" "\n" "{{user_name}}" +#: app/views/request/select_authority.rhtml:29 +msgid "1. Select an authority" +msgstr "" + +#: app/views/request/new.rhtml:26 +msgid "2. Ask for Information" +msgstr "" + +#: app/views/request/preview.rhtml:5 +msgid "3. Now check your request" +msgstr "" + +#: app/views/public_body/show.rhtml:53 +msgid "<a class=\"link_button_green\" href=\"{{url}}\">{{text}}</a>" +msgstr "" + #: app/views/request/_after_actions.rhtml:9 msgid "<a href=\"%s\">Add an annotation</a> (to help the requester or others)" msgstr "" "<a href=\"%s\">Kommentar hinzufügen</a> (um den Anfragensteller oder andere " "Nutzern zu unterstützen)" -#: app/views/public_body/list.rhtml:29 +#: app/views/public_body/list.rhtml:28 msgid "<a href=\"%s\">Are we missing a public authority?</a>." msgstr "<a href=\"%s\">Fehlt eine Behörde?</a>." -#: app/views/request/_sidebar.rhtml:45 +#: app/views/request/_sidebar.rhtml:36 msgid "" "<a href=\"%s\">Are you the owner of\n" " any commercial copyright on this page?</a>" msgstr "<a href=\"%s\">Halten Sie die Urheberrechte dieser Seite?</a>" -#: app/views/general/search.rhtml:53 +#: app/views/general/search.rhtml:172 msgid "<a href=\"%s\">Browse all</a> or <a href=\"%s\">ask us to add one</a>." msgstr "<a href=\"%s\">Alle durchsuchen</a> or <a href=\"%s\">ask us to add one</a>." -#: app/views/general/exception_caught.rhtml:13 -msgid "<a href=\"%s\">Contact us</a> to tell us about the problem</li>" +#: app/views/public_body/list.rhtml:50 +msgid "<a href=\"%s\">Can't find the one you want?</a>" msgstr "" -"<a href=\"%s\">Kontaktieren Sie uns</a>, um das Problem zu beschreiben</li>" -#: app/views/public_body/list.rhtml:43 -msgid "<a href=\"%s\">can't find the one you want?</a>" +#: app/views/user/show.rhtml:113 +msgid "" +"<a href=\"%s\">Sign in</a> to change password, subscriptions and more " +"({{user_name}} only)" msgstr "" -"<a href=\"%s\">Können Sie die von Ihnen benötigte Information nicht " -"finden?</a>" #: app/views/request/_followup.rhtml:39 app/views/request/_followup.rhtml:46 #: app/views/request/show.rhtml:83 app/views/request/show.rhtml:87 @@ -241,12 +272,6 @@ msgstr "<a href=\"%s\">Details</a>" msgid "<a href=\"%s\">what's that?</a>" msgstr "<a href=\"%s\">Was ist das?</a>" -#: app/views/public_body/show.rhtml:50 -msgid "" -"<a href=\"{{url}}\">Make a new Freedom of Information request</a> to " -"{{public_body_name}}" -msgstr "" - #: app/controllers/request_game_controller.rb:23 msgid "" "<p>All done! Thank you very much for your help.</p><p>There are <a " @@ -254,7 +279,7 @@ msgid "" "{{site_name}}.</p>" msgstr "" -#: app/controllers/request_controller.rb:399 +#: app/controllers/request_controller.rb:398 msgid "" "<p>Thank you! Here are some ideas on what to do next:</p>\n" " <ul>\n" @@ -268,7 +293,7 @@ msgid "" " </ul>" msgstr "" -#: app/controllers/request_controller.rb:393 +#: app/controllers/request_controller.rb:392 msgid "" "<p>Thank you! Hope you don't have to wait much longer.</p> <p>By law, you " "should have got a response promptly, and normally before the end of " @@ -278,7 +303,7 @@ msgstr "" "gesetzlicher Vorschrift hätten Sie sofort oder vor Ende " "<strong>{{date_response_required_by}}</strong> erhalten sollen. </p>" -#: app/controllers/request_controller.rb:389 +#: app/controllers/request_controller.rb:388 msgid "" "<p>Thank you! Hopefully your wait isn't too long.</p> <p>By law, you should get a response promptly, and normally before the end of <strong>\n" "{{date_response_required_by}}</strong>.</p>" @@ -287,14 +312,14 @@ msgstr "" "gesetzlicher Vorschrift hätten Sie sofort oder vor Ende " "<strong>{{date_response_required_by}}</strong> erhalten sollen. </p>" -#: app/controllers/request_controller.rb:428 +#: app/controllers/request_controller.rb:427 msgid "" "<p>Thank you! Hopefully your wait isn't too long.</p><p>You should get a " -"response within 20 days, or be told if it will take longer (<a " -"href=\"{{review_url}}\">details</a>).</p>" +"response within {{late_number_of_days}} days, or be told if it will take " +"longer (<a href=\"{{review_url}}\">details</a>).</p>" msgstr "" -#: app/controllers/request_controller.rb:431 +#: app/controllers/request_controller.rb:430 msgid "" "<p>Thank you! We'll look into what happened and try and fix it up.</p><p>If " "the error was a delivery failure, and you can find an up to date FOI email " @@ -305,14 +330,15 @@ msgstr "" "und Sie können eine aktuelle IFG Email-Adresse dieser Behörde finden, teilen" " Sie uns diese bitte mit Hilfe des unten angezeigten Formulars mit.</p>" -#: app/controllers/request_controller.rb:396 +#: app/controllers/request_controller.rb:395 msgid "" -"<p>Thank you! Your request is long overdue, by more than 40 working days. " -"Most requests should be answered within 20 working days. You might like to " -"complain about this, see below.</p>" +"<p>Thank you! Your request is long overdue, by more than " +"{{very_late_number_of_days}} working days. Most requests should be answered " +"within {{late_number_of_days}} working days. You might like to complain " +"about this, see below.</p>" msgstr "" -#: app/controllers/user_controller.rb:495 +#: app/controllers/user_controller.rb:513 msgid "" "<p>Thanks for changing the text about you on your profile.</p>\n" " <p><strong>Next...</strong> You can upload a profile photograph too.</p>" @@ -320,7 +346,7 @@ msgstr "" "<p>Vielen Dank für die Änderung Ihres Profiltextes.</p>\n" " <p><strong>Weiter...</strong> Sie können auch ein Profilbild hochladen.</p>" -#: app/controllers/user_controller.rb:417 +#: app/controllers/user_controller.rb:435 msgid "" "<p>Thanks for updating your profile photo.</p>\n" " <p><strong>Next...</strong> You can put some text about you and your research on your profile.</p>" @@ -328,7 +354,7 @@ msgstr "" "<p>Danke für die Aktualisierung Ihres Profilbildes.</p>\n" " <p><strong>Nächster Schritt...</strong> Sie können Informationen zu Ihrer Person und Ihrer Suchanfrage zu Ihrem Profil hinzufügen.</p>" -#: app/controllers/request_controller.rb:284 +#: app/controllers/request_controller.rb:283 msgid "" "<p>We recommend that you edit your request and remove the email address.\n" " If you leave it, the email address will be sent to the authority, but will not be displayed on the site.</p>" @@ -336,7 +362,7 @@ msgstr "" "<p>Wir empfehlen Ihnen Ihre Anfrage zu bearbeiten und Ihre Emailadresse zu entfernen.\n" " Sollten Sie die Emaildresse nicht entfernen, wir diese an die entsprechende Behörde gesendet, jedoch nicht auf der Seite angezeigt.</p>" -#: app/controllers/request_controller.rb:417 +#: app/controllers/request_controller.rb:416 msgid "" "<p>We're glad you got all the information that you wanted. If you write " "about or make use of the information, please come back and add an annotation" @@ -345,7 +371,7 @@ msgid "" "it.</p>" msgstr "" -#: app/controllers/request_controller.rb:420 +#: app/controllers/request_controller.rb:419 msgid "" "<p>We're glad you got some of the information that you wanted. If you found " "{{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to " @@ -353,15 +379,15 @@ msgid "" "information, here's what to do now.</p>" msgstr "" -#: app/controllers/request_controller.rb:282 +#: app/controllers/request_controller.rb:281 msgid "" "<p>You do not need to include your email in the request in order to get a " "reply (<a href=\"%s\">details</a>).</p>" msgstr "" "<p> Es ist nicht erfoderlich Ihre Emailadresse in der Anfrage zu nennen, um " -"eine Antwort zu erhalten (<a href=\"%s\">details</a>).</p>" +"eine Antwort zu erhalten (<a href=\"%s\">Details</a>).</p>" -#: app/controllers/request_controller.rb:280 +#: app/controllers/request_controller.rb:279 msgid "" "<p>You do not need to include your email in the request in order to get a " "reply, as we will ask for it on the next screen (<a " @@ -371,7 +397,7 @@ msgstr "" "Anfrage einfügen, da wir diese auf der folgenden Seite erfragen werden (<a " "href=\"%s\">Details</a>).</p>" -#: app/controllers/request_controller.rb:288 +#: app/controllers/request_controller.rb:287 msgid "" "<p>Your request contains a <strong>postcode</strong>. Unless it directly " "relates to the subject of your request, please remove any address as it will" @@ -382,7 +408,7 @@ msgstr "" "diese zu entfern en, da diese ansonsten<strong>im Internet veröffentlicht " "wird </strong>.</p>" -#: app/controllers/request_controller.rb:311 +#: app/controllers/request_controller.rb:310 msgid "" "<p>Your {{law_used_full}} request has been <strong>sent on its way</strong>!</p>\n" " <p><strong>We will email you</strong> when there is a response, or after 20 working days if the authority still hasn't\n" @@ -390,13 +416,20 @@ msgid "" " <p>If you write about this request (for example in a forum or a blog) please link to this page, and add an \n" " annotation below telling people about your writing.</p>" msgstr "" +"<p>Ihre {{law_used_full}} Anfrage wurde <strong>versendet</strong>!</p>\n" +" <p><strong>Wir werden Ihnen emailen</strong> sobald eine Antwort eintrifft oder nach 20 Werktagen, falls die Behörde bis dahin nicht geantwortet hat.</p>\n" +" <p>Sollten Sie über diese Anfrage schreiben (z.B. in einem Forum oder Blog) verlinken Sie Ihren Beitrag bitte mit dieser Seite und fügen Sie hier einen Kommentar an, welcher andere Nutzer über Ihren Artikel informiert.</p>" -#: app/controllers/application_controller.rb:279 +#: app/controllers/application_controller.rb:298 msgid "" "<p>{{site_name}} is currently in maintenance. You can only view existing " "requests. You cannot make new ones, add followups or annotations, or " "otherwise change the database.</p> <p>{{read_only}}</p>" msgstr "" +"<p>{{site_name}} wird gerade überarbeitet. Sie können ausschließlich " +"existierende Anfragen ansehen. Sie können keine neuen Anfragen stellen, " +"Follow-ups oder Anmerkungen hinzufügen oder andere Änderungen an der " +"Datenbank vornehmen.</p> <p>{{read_only}}</p>" #: app/views/user/confirm.rhtml:11 msgid "" @@ -404,25 +437,25 @@ msgid "" "bulk/spam mail folders. Sometimes, our messages are marked that way.</small>\n" "</p>" msgstr "" -"Sollten Sie eine webbasierten Emailanbieter oder ´junk mail´ Filter nutzen, " +"Sollten Sie eine webbasierten Emailanbieter oder ´Junk-mail´ Filter nutzen, " "prüfen Sie Ihren Spamordner. Es kommt vor, dass unsere Nachrichten dort " "landen. " -#: app/views/request/new.rhtml:131 +#: app/views/request/new.rhtml:124 msgid "" "<strong> Can I request information about myself?</strong>\n" "\t\t\t<a href=\"%s\">No! (Click here for details)</a>" msgstr "" "<strong> Kann ich Informationen zu meiner eigenen Person anfragen?</strong>\n" -"<span class=\"whitespace other\" title=\"Tab\">»</span><span class=\"whitespace other\" title=\"Tab\">»</span><span class=\"whitespace other\" title=\"Tab\">»</span><a href=\"%s\">Nein! (Click here for details)</a>" +"<span class=\"whitespace other\" title=\"Tab\">»</span><span class=\"whitespace other\" title=\"Tab\">»</span><span class=\"whitespace other\" title=\"Tab\">»</span><a href=\"%s\">Nein! (Weitere Informationen)</a>" -#: app/views/general/search.rhtml:130 +#: app/views/general/search.rhtml:226 msgid "" "<strong><code>commented_by:tony_bowden</code></strong> to search annotations" " made by Tony Bowden, typing the name as in the URL." msgstr "" -#: app/views/general/search.rhtml:132 +#: app/views/general/search.rhtml:228 msgid "" "<strong><code>filetype:pdf</code></strong> to find all responses with PDF " "attachments. Or try these: <code>{{list_of_file_extensions}}</code>" @@ -431,7 +464,7 @@ msgstr "" "zu finden. Oder versuchen Sie es hiermit: " "<code>{{list_of_file_extensions}}</code>" -#: app/views/general/search.rhtml:131 +#: app/views/general/search.rhtml:227 msgid "" "<strong><code>request:</code></strong> to restrict to a specific request, " "typing the title as in the URL." @@ -439,33 +472,36 @@ msgstr "" "<strong><code>Anfrage:</code></strong> um die Suchanfrage zu begrenzen, " "geben Sie den Titel wie in der URL ein." -#: app/views/general/search.rhtml:129 +#: app/views/general/search.rhtml:225 msgid "" "<strong><code>requested_by:julian_todd</code></strong> to search requests " "made by Julian Todd, typing the name as in the URL." msgstr "" -#: app/views/general/search.rhtml:128 +#: app/views/general/search.rhtml:224 msgid "" "<strong><code>requested_from:home_office</code></strong> to search requests " "from the Home Office, typing the name as in the URL." msgstr "" -#: app/views/general/search.rhtml:126 +#: app/views/general/search.rhtml:222 msgid "" "<strong><code>status:</code></strong> to select based on the status or " "historical status of the request, see the <a href=\"{{statuses_url}}\">table" " of statuses</a> below." msgstr "" -#: app/views/general/search.rhtml:134 +#: app/views/general/search.rhtml:230 msgid "" "<strong><code>tag:charity</code></strong> to find all public bodies or requests with a given tag. You can include multiple tags, \n" " and tag values, e.g. <code>tag:openlylocal AND tag:financial_transaction:335633</code>. Note that by default any of the tags\n" " can be present, you have to put <code>AND</code> explicitly if you only want results them all present." msgstr "" +"<strong><code>markieren Sie:Karitas</code></strong>, um alle Behörden oder Anfragen mit dieser Markierung zu finden. Sie können mehrere Markierungen, \n" +" and tag values, e.g. <code>tag:openlylocal AND tag:financial_transaction:335633</code>. Note that by default any of the tags\n" +" can be present, you have to put <code>AND</code> explicitly if you only want results them all present." -#: app/views/general/search.rhtml:127 +#: app/views/general/search.rhtml:223 msgid "" "<strong><code>variety:</code></strong> to select type of thing to search " "for, see the <a href=\"{{varieties_url}}\">table of varieties</a> below." @@ -484,7 +520,7 @@ msgstr "Informationen wurden vollständig gesendet" #: app/views/request/_followup.rhtml:79 msgid "" "<strong>Anything else</strong>, such as clarifying, prompting, thanking" -msgstr "" +msgstr "<strong>Alles andere</strong>, z.B. Klärungen, Hinweise, Danksagungen" #: app/views/request/details.rhtml:12 msgid "" @@ -542,35 +578,21 @@ msgid "" "<strong>Privacy warning:</strong> Your message, and any response\n" " to it, will be displayed publicly on this website." msgstr "" -"<strong>Privacy warning:</strong> Ihre Nachricht als auch alle " +"<strong>Datenschutzhinweis:</strong> Ihre Nachricht als auch alle " "entsprechenden Reaktionen werden auf dieser Webseite veröffentlicht." #: app/views/request/_other_describe_state.rhtml:52 msgid "<strong>Some of the information</strong> has been sent " msgstr "Information wurde teilweise gesendet" -#: app/views/general/exception_caught.rhtml:17 -msgid "<strong>Technical details:</strong>" -msgstr "<strong>Technische Details:</strong>" - #: app/views/comment/new.rhtml:35 msgid "<strong>Thank</strong> the public authority or " msgstr "<strong>Danken Sie</strong> der Behörde oder " -#: app/views/request/new.rhtml:23 -msgid "" -"<strong>browse</strong> the authority's <a href=\"%s\">publication " -"scheme</a> or <strong>search</strong> their web site ..." -msgstr "" - #: app/views/request/show.rhtml:91 msgid "<strong>did not have</strong> the information requested." msgstr "Die angefragten Informationen waren <strong>nicht vorhanden</strong>." -#: app/views/request/new.rhtml:25 -msgid "<strong>search</strong> the authority's web site ..." -msgstr "<strong>Besuchen Sie</strong> die Webseite dieser Behörde" - #: app/views/comment/new.rhtml:45 msgid "" "A <strong>summary</strong> of the response if you have received it by post. " @@ -578,19 +600,19 @@ msgstr "" "Eine <strong>Zusammenfassung</strong> of the response if you have received " "it by post. " -#: app/views/general/search.rhtml:162 +#: app/views/general/search.rhtml:258 msgid "A public authority" -msgstr "" +msgstr "Eine Behörde" #: app/views/request/_other_describe_state.rhtml:34 msgid "A response will be sent <strong>by post</strong>" msgstr "Antwort wird <strong>postalisch</strong> zugestellt" -#: app/views/general/search.rhtml:151 +#: app/views/general/search.rhtml:247 msgid "A strange reponse, required attention by the {{site_name}} team" msgstr "" -#: app/views/general/search.rhtml:163 +#: app/views/general/search.rhtml:259 msgid "A {{site_name}} user" msgstr "" @@ -598,19 +620,15 @@ msgstr "" msgid "About you:" msgstr "Zu Ihrer Person:" -#: app/models/info_request_event.rb:293 -msgid "Acknowledgement" -msgstr "Bestätigung" - #: app/views/request/_sidebar.rhtml:5 msgid "Act on what you've learnt" -msgstr "" +msgstr "Handel aus Deinen Erfahrungen" #: app/views/comment/new.rhtml:14 msgid "Add an annotation to " -msgstr "Fügen Sie einen Kommentar hinzu" +msgstr "Kommentieren Sie" -#: app/views/request/show_response.rhtml:47 +#: app/views/request/show_response.rhtml:45 msgid "" "Add an annotation to your request with choice quotes, or\n" " a <strong>summary of the response</strong>." @@ -630,7 +648,11 @@ msgstr "" msgid "Administration URL:" msgstr "Administrator URL" -#: app/views/general/search.rhtml:31 app/views/general/search.rhtml:121 +#: app/views/general/search.rhtml:46 +msgid "Advanced search" +msgstr "" + +#: app/views/general/search.rhtml:217 msgid "Advanced search tips" msgstr "Tipps zur erweiterten Suchanfrage" @@ -640,30 +662,24 @@ msgid "" " about it if not." msgstr "" -#: app/views/request/new.rhtml:69 +#: app/views/request/new.rhtml:59 msgid "" "Air, water, soil, land, flora and fauna (including how these effect\n" -" human beings)" +" human beings)" msgstr "" -"Luft, Wasser, Erde, Land, Flora and Fauna (inkl. wie diese den Menschen " -"beeinflussen)" -#: app/models/info_request_event.rb:309 -msgid "All information sent" -msgstr "Information vollständig gesendet" - -#: app/views/general/search.rhtml:146 +#: app/views/general/search.rhtml:242 msgid "All of the information requested has been received" msgstr "" -#: app/views/public_body/list.rhtml:5 -msgid "Alphabet" -msgstr "Alphabet" - #: app/views/public_body/_body_listing_single.rhtml:12 msgid "Also called {{other_name}}." msgstr "" +#: app/views/track_mailer/event_digest.rhtml:60 +msgid "Alter your subscription" +msgstr "" + #: app/views/request_mailer/new_response.rhtml:12 msgid "" "Although all responses are automatically published, we depend on\n" @@ -676,21 +692,21 @@ msgstr "" msgid "An <strong>error message</strong> has been received" msgstr "Eine <strong>Fehlermeldung</strong> wurde empfangen" -#: app/views/general/search.rhtml:161 +#: app/views/general/search.rhtml:257 msgid "Annotation added to request" msgstr "" #: app/views/user/show.rhtml:34 msgid "Annotations" -msgstr "Anmerkungen" +msgstr "Kommentare" #: app/views/comment/new.rhtml:17 msgid "" "Annotations are so anyone, including you, can help the requester with their " "request. For example:" msgstr "" -"Anmerkungen helfen Ihnen sowie weiteren Benutzern bei der Erstellungen einer" -" neuer Anfrage. Beispielsweise:" +"Anmerkungen helfen Ihnen, sowie weiteren Benutzern bei der Erstellungen " +"einer neuer Anfrage. Zum Beispiel:" #: app/views/comment/new.rhtml:69 msgid "" @@ -702,9 +718,9 @@ msgstr "" #: app/views/request/_after_actions.rhtml:6 msgid "Anyone:" -msgstr "Jeder:" +msgstr "Jedermann:" -#: app/views/request/new.rhtml:47 +#: app/views/request/new.rhtml:94 msgid "" "Ask for <strong>specific</strong> documents or information, this site is not" " suitable for general enquiries." @@ -712,7 +728,7 @@ msgstr "" "Fragen Sie nach <strong>spezifischen</strong> Dokumenten oder Informationen." " Diese Seite ist nicht für generelle Anfragen vorgesehen. " -#: app/views/request/show_response.rhtml:31 +#: app/views/request/show_response.rhtml:29 msgid "" "At the bottom of this page, write a reply to them trying to persuade them to scan it in\n" " (<a href=\"%s\">more details</a>)." @@ -724,31 +740,39 @@ msgstr "" msgid "Attachment (optional):" msgstr "Anhang (freiwillig)" -#: app/models/info_request.rb:783 +#: app/models/info_request.rb:785 msgid "Awaiting classification." msgstr "Zuordnung wird erwartet. " -#: app/models/info_request.rb:803 +#: app/models/info_request.rb:805 msgid "Awaiting internal review." msgstr "Interne Prüfung ausstehend." -#: app/models/info_request.rb:785 +#: app/models/info_request.rb:787 msgid "Awaiting response." msgstr "Antwort ausstehend. " -#: app/views/request/new.rhtml:43 +#: app/views/public_body/list.rhtml:4 +msgid "Beginning with" +msgstr "" + +#: app/views/request/new.rhtml:38 msgid "" -"Browse <a href=\"%s\">other requests</a> for examples of how to word your " -"request." +"Browse <a href='{{url}}'>other requests</a> for examples of how to word your" +" request." msgstr "" -"Durchsuchen Sie <a href=\"%s\">andere Anfragen</a> für " -"Formulierungsbeispiele. " -#: app/views/request/new.rhtml:41 +#: app/views/request/new.rhtml:36 msgid "" "Browse <a href='{{url}}'>other requests</a> to '{{public_body_name}}' for " "examples of how to word your request." msgstr "" +"Schauen Sie <a href='{{url}}'>andere Anfragen</a> an '{{public_body_name}}' " +"für Formulierungsbeispiele an. " + +#: app/views/general/frontpage.rhtml:49 +msgid "Browse all authorities..." +msgstr "" #: app/views/request/show.rhtml:86 msgid "" @@ -766,14 +790,6 @@ msgstr "" "Nach gesetzlicher Vorschrift sollte {{public_body_link}} " "<strong>umgehend</strong> geantwortet haben und" -#: app/views/general/search.rhtml:17 -msgid "" -"Can't find it? <a href=\"%s\">Browse all</a> or <a href=\"%s\">ask us to add" -" it</a>." -msgstr "" -"Nicht gefunden? <a href=\"%s\">Durchsuchen Sie alle Behörden</a> oder <a " -"href=\"%s\">bitten Sie uns die Behörde hinzuzufügen</a>." - #: app/controllers/track_controller.rb:145 msgid "Cancel a {{site_name}} alert" msgstr "Benachrichtigung für {{site_name}} abbestellen" @@ -798,10 +814,6 @@ msgstr "" msgid "CensorRule|Text" msgstr "" -#: lib/public_body_categories_en.rb:14 -msgid "Central government" -msgstr "Zentralregierung" - #: app/views/user/signchangeemail.rhtml:37 msgid "Change email on {{site_name}}" msgstr "" @@ -810,19 +822,20 @@ msgstr "" msgid "Change password on {{site_name}}" msgstr "Passwort ändern: {{site_name}}" -#: app/views/user/set_crop_profile_photo.rhtml:1 app/views/user/show.rhtml:104 +#: app/views/user/show.rhtml:104 app/views/user/set_crop_profile_photo.rhtml:1 msgid "Change profile photo" msgstr "Profilbild ändern" #: app/views/user/set_profile_about_me.rhtml:1 msgid "Change the text about you on your profile at {{site_name}}" msgstr "" +"Ändern Sie den Text zu Ihrer Person in Ihrem Nutzerprofil auf {{site_name}}" #: app/views/user/show.rhtml:107 msgid "Change your email" msgstr "Emailadresse ändern" -#: app/controllers/user_controller.rb:250 +#: app/controllers/user_controller.rb:268 #: app/views/user/signchangeemail.rhtml:1 #: app/views/user/signchangeemail.rhtml:11 msgid "Change your email address used on {{site_name}}" @@ -832,43 +845,39 @@ msgstr "Ändern Sie die unter {{site_name}} genutzte Email-Adresse" msgid "Change your password" msgstr "Passwort ändern" -#: app/views/user/signchangepassword.rhtml:1 -#: app/views/user/signchangepassword.rhtml:11 #: app/views/user/signchangepassword_send_confirm.rhtml:1 #: app/views/user/signchangepassword_send_confirm.rhtml:9 +#: app/views/user/signchangepassword.rhtml:1 +#: app/views/user/signchangepassword.rhtml:11 msgid "Change your password on {{site_name}}" msgstr "Ändern Sie Ihr Passwort: {{site_name}}" -#: app/controllers/user_controller.rb:204 +#: app/controllers/user_controller.rb:222 msgid "Change your password {{site_name}}" msgstr "Passwort ändern{{site_name}}" -#: app/views/public_body/show.rhtml:15 app/views/public_body/show.rhtml:17 +#: app/views/public_body/show.rhtml:17 app/views/public_body/show.rhtml:19 msgid "Charity registration" msgstr "" -#: app/views/general/exception_caught.rhtml:6 +#: app/views/general/exception_caught.rhtml:8 msgid "Check for mistakes if you typed or copied the address." msgstr "" "Sollten Sie die Adresse eingegeben oder kopiert haben, überprüfen Sie diese " "auf Fehler." -#: app/views/request/followup_preview.rhtml:14 #: app/views/request/preview.rhtml:7 +#: app/views/request/followup_preview.rhtml:14 msgid "Check you haven't included any <strong>personal information</strong>." msgstr "" -"Stellen Sie sicher, dass Sie keine <strong>persönlichen " -"Informationen</strong>verwendet haben." +"Stellen Sie sicher, dass Sie keine <strong> persönlichen Informationen " +"</strong> verwendet haben." -#: app/models/info_request_event.rb:331 +#: app/models/info_request_event.rb:316 msgid "Clarification" msgstr "Klärung" -#: app/models/info_request_event.rb:295 -msgid "Clarification required" -msgstr "Klärung notwendig" - -#: app/controllers/request_controller.rb:339 +#: app/controllers/request_controller.rb:338 msgid "Classify an FOI response from " msgstr "" @@ -902,37 +911,41 @@ msgstr "" msgid "Comment|Visible" msgstr "" -#: app/models/track_thing.rb:147 +#: app/models/track_thing.rb:220 msgid "Confirm you want to be emailed about new requests" msgstr "" -#: app/models/track_thing.rb:214 +#: app/models/track_thing.rb:287 msgid "" -"Confirm you want to be emailed about new requests or responses matching " -"'{{query}}'" +"Confirm you want to be emailed about new requests or responses matching your" +" search" msgstr "" -#: app/models/track_thing.rb:198 +#: app/models/track_thing.rb:271 msgid "Confirm you want to be emailed about requests by '{{user_name}}'" msgstr "" -#: app/models/track_thing.rb:182 +#: app/models/track_thing.rb:255 msgid "" "Confirm you want to be emailed about requests to '{{public_body_name}}'" msgstr "" -#: app/models/track_thing.rb:163 +#: app/models/track_thing.rb:236 msgid "Confirm you want to be emailed when an FOI request succeeds" msgstr "" "Bestätigen Sie, dass Sie bei erfolgreicher IFG-Anfrage eine Emailbestätigung" " erhalten möchten" -#: app/controllers/request_controller.rb:300 +#: app/models/track_thing.rb:204 +msgid "Confirm you want to follow updates to the request '{{request_title}}'" +msgstr "" + +#: app/controllers/request_controller.rb:299 msgid "Confirm your FOI request to " msgstr "Bestätigen Sie Ihre IFG-Anfrage " -#: app/controllers/request_controller.rb:703 -#: app/controllers/user_controller.rb:515 +#: app/controllers/request_controller.rb:707 +#: app/controllers/user_controller.rb:542 msgid "Confirm your account on {{site_name}}" msgstr "Bestätigen Sie Ihr Nutzerkonto auf {{site_name}}" @@ -940,11 +953,15 @@ msgstr "Bestätigen Sie Ihr Nutzerkonto auf {{site_name}}" msgid "Confirm your annotation to {{info_request_title}}" msgstr "Bestätigen Sie Ihre Anmerkung zu {{info_request_title}}" +#: app/controllers/request_controller.rb:31 +msgid "Confirm your email address" +msgstr "" + #: app/models/user_mailer.rb:34 msgid "Confirm your new email address on {{site_name}}" msgstr "" -#: app/views/layouts/default.rhtml:127 +#: app/views/layouts/default.rhtml:152 msgid "Contact {{site_name}}" msgstr "Kontakt {{site_name}}" @@ -962,12 +979,12 @@ msgstr "" #: app/views/user/set_crop_profile_photo.rhtml:6 msgid "Crop your profile photo" -msgstr "" +msgstr "Bearbeite Dein Profilbild" -#: app/views/request/new.rhtml:74 +#: app/views/request/new.rhtml:64 msgid "" "Cultural sites and built structures (as they may be affected by the\n" -" environmental factors listed above)" +" environmental factors listed above)" msgstr "" #: app/views/request/show.rhtml:68 @@ -975,22 +992,18 @@ msgid "" "Currently <strong>waiting for a response</strong> from {{public_body_link}}," " they must respond promptly and" msgstr "" -"<strong>Antwort</strong> von {{public_body_link}} wird erwartet. Sie sollte " -"in Kürze eine Antwort erhalten und" +"<strong>Antwort</strong> von {{public_body_link}} wird erwartet. Sie sollten" +" in Kürze eine Antwort erhalten und" -#: app/models/info_request_event.rb:299 -msgid "Deadline Extended" -msgstr "Frist verlängert" +#: app/models/outgoing_message.rb:63 +msgid "Dear {{public_body_name}}," +msgstr "Sehr geehrte / Sehr geehrter {{public_body_name}}," -#: app/models/outgoing_message.rb:57 -msgid "Dear " -msgstr "Sehr geehrte / sehr geehrter " - -#: app/models/info_request.rb:787 +#: app/models/info_request.rb:789 msgid "Delayed." msgstr "Verzögert." -#: app/models/info_request.rb:805 app/models/info_request_event.rb:315 +#: app/models/info_request.rb:807 msgid "Delivery error" msgstr "Übertragungsfehler" @@ -998,7 +1011,7 @@ msgstr "Übertragungsfehler" msgid "Details of request '" msgstr "Anfragedetails" -#: app/views/general/search.rhtml:50 app/views/general/search.rhtml:62 +#: app/views/general/search.rhtml:170 msgid "Did you mean: {{correction}}" msgstr "Meinten Sie: {{correction}}" @@ -1010,6 +1023,10 @@ msgstr "" "Haftungsausschluss: Diese Nachricht und alle Antworten werden im Internet veröffentlicht. \t\n" "Nutzungsbedingungen und Datenschutz:" +#: app/views/general/_localised_datepicker.rhtml:4 +msgid "Done" +msgstr "" + #: app/views/request/_view_html_prefix.rhtml:6 msgid "Download original attachment" msgstr "Originalanhang herunterladen" @@ -1030,13 +1047,17 @@ msgstr "Sprachauswahl ändern:" msgid "Edit text about you" msgstr "Profiltext ändern" -#: app/models/user.rb:135 +#: app/views/request/preview.rhtml:40 +msgid "Edit this request" +msgstr "" + +#: app/models/user.rb:144 msgid "Either the email or password was not recognised, please try again." msgstr "" "Passwort oder emailadresse wurde nicht erkannt. Bitte versuchen Sie es " "erneut. " -#: app/models/user.rb:137 +#: app/models/user.rb:146 msgid "" "Either the email or password was not recognised, please try again. Or create" " a new account using the form on the right." @@ -1054,11 +1075,11 @@ msgid "Email me future updates to this request" msgstr "" "Informieren Sie mich über zukünftige Aktualisierungen zu dieser Anfrage" -#: app/models/track_thing.rb:155 +#: app/models/track_thing.rb:228 msgid "Email me new successful responses " msgstr "Neue erfolgreiche Anfragen per Email erhalten " -#: app/models/track_thing.rb:139 +#: app/models/track_thing.rb:212 msgid "Email me when there are new requests" msgstr "" @@ -1066,7 +1087,7 @@ msgstr "" msgid "Email subscriptions" msgstr "Email Abo" -#: app/views/general/search.rhtml:123 +#: app/views/general/search.rhtml:219 msgid "" "Enter words that you want to find separated by spaces, e.g. <strong>climbing" " lane</strong>" @@ -1080,11 +1101,11 @@ msgstr "" "Geben Sie unten Ihre Antwort ein. Sie könne eine Datei anhängen (nutzen Sie Email, oder \n" "<a href=\"%s\">kontaktieren Sie uns</a> falls Sie mehrere Anhänge benötigen)." -#: app/views/public_body/show.rhtml:96 +#: app/views/public_body/show.rhtml:104 msgid "Environmental Information Regulations requests made" msgstr "" -#: app/views/public_body/show.rhtml:69 +#: app/views/public_body/show.rhtml:71 msgid "Environmental Information Regulations requests made using this site" msgstr "" @@ -1092,33 +1113,33 @@ msgstr "" msgid "Event history" msgstr "Verlaufsübersicht" -#: app/views/request/_sidebar.rhtml:41 +#: app/views/request/_sidebar.rhtml:32 msgid "Event history details" msgstr "Details Verlaufsübersicht" -#: app/views/request/new.rhtml:124 +#: app/views/request/new.rhtml:117 msgid "" "Everything that you enter on this page \n" " will be <strong>displayed publicly</strong> on\n" " this website forever (<a href=\"%s\">why?</a>)." msgstr "" "Jegliche auf dieser Seite eingegebene Information wird\n" -" für immer auf dieser Internetseite <strong>veröffentlicht</strong>(<a href=\"%s\">Warum?</a>)." +" permanent auf dieser Internetseite <strong>veröffentlicht</strong>(<a href=\"%s\"> Warum?</a>)." -#: app/views/request/new.rhtml:116 +#: app/views/request/new.rhtml:109 msgid "" "Everything that you enter on this page, including <strong>your name</strong>, \n" " will be <strong>displayed publicly</strong> on\n" " this website forever (<a href=\"%s\">why?</a>)." msgstr "" "Jegliche auf dieser Seite eingegebene Information, inklusive <strong>Ihrem Namen</strong>, ⏎ wird\n" -" für immer auf dieser Internetseite <strong>veröffentlicht</strong>(<a href=\"%s\">Warum?</a>)." +" permanent auf dieser Internetseite <strong>veröffentlicht</strong>(<a href=\"%s\"> Warum?</a>)." -#: locale/model_attributes.rb:60 +#: locale/model_attributes.rb:58 msgid "EximLogDone|Filename" msgstr "" -#: locale/model_attributes.rb:61 +#: locale/model_attributes.rb:59 msgid "EximLogDone|Last stat" msgstr "" @@ -1138,10 +1159,14 @@ msgstr "IFG-Emailadresse für {{public_body}}" msgid "FOI requests" msgstr "IFG-Anfrage" -#: app/models/track_thing.rb:193 app/models/track_thing.rb:194 +#: app/models/track_thing.rb:266 app/models/track_thing.rb:267 msgid "FOI requests by '{{user_name}}'" msgstr "" +#: app/views/general/search.rhtml:199 +msgid "FOI requests {{start_count}} to {{end_count}} of {{total_count}}" +msgstr "" + #: app/models/profile_photo.rb:101 msgid "Failed to convert image to a PNG" msgstr "Konnte Bild nicht in ein PNG konvertieren" @@ -1154,35 +1179,28 @@ msgstr "" "Konnte Bild nicht in die richtige Größe umwandeln: %{cols} x %{rows}, " "brauche %{width} x %{height}" -#: app/views/request/new.rhtml:21 -msgid "First," -msgstr "Erstens, " - -#: app/views/general/frontpage.rhtml:8 +#: app/views/request/select_authority.rhtml:35 msgid "" "First, type in the <strong>name of the UK public authority</strong> you'd \n" " <br>like information from. <strong>By law, they have to respond</strong>\n" " (<a href=\"%s\">why?</a>)." msgstr "" -"Schritt 1, suchen Sie nach dem <strong>Namen der gewünschten Behörde. </strong> \n" -"<br><strong>Die Behörden sind gesetzlich verpflichtet Ihre Anfrage zu beantworten.</strong>\n" -" (<a href=\"%s\">Warum?</a>)." #: app/views/request_mailer/old_unclassified_updated.rhtml:4 msgid "Follow this link to see the request:" msgstr "Folgen Sie diesem Link, um die Anfrage anzusehen:" -#: app/models/info_request_event.rb:335 +#: app/models/info_request_event.rb:320 msgid "Follow up" msgstr "Follow-up" -#: app/views/general/search.rhtml:159 +#: app/views/general/search.rhtml:255 msgid "Follow up message sent by requester" msgstr "" #: app/views/public_body/view_email.rhtml:14 msgid "Follow up messages to existing requests are sent to " -msgstr "" +msgstr "Nachfragen bzgl. bestehender anfragen werden weitergeleitet an:" #: app/views/request/_followup.rhtml:16 msgid "" @@ -1191,7 +1209,11 @@ msgid "" " need to send a follow up." msgstr "" -#: app/views/public_body/show.rhtml:61 +#: app/views/layouts/default.rhtml:153 +msgid "Follow us on twitter" +msgstr "" + +#: app/views/public_body/show.rhtml:62 msgid "" "For an unknown reason, it is not possible to make a request to this " "authority." @@ -1203,10 +1225,14 @@ msgstr "" msgid "Forgotten your password?" msgstr "Passwort vergessen?" -#: app/views/public_body/show.rhtml:56 +#: app/views/public_body/list.rhtml:46 +msgid "Found {{count}} public bodies {{description}}" +msgstr "" + +#: app/views/public_body/show.rhtml:57 msgid "" "Freedom of Information law does not apply to this authority, so you cannot make\n" -" a request to it." +" a request to it." msgstr "" #: app/views/request/followup_bad.rhtml:11 @@ -1221,19 +1247,19 @@ msgstr "" "Das Informationsfreiheitsgesetz ist für diese Behörde nicht länger gültig. " "Follow-up Nachrichten bestehnder Nachrichten wurden gesendet an" -#: app/views/user/show.rhtml:128 -msgid "Freedom of Information request" -msgstr "Informationsfreiheitsanfrage" - -#: app/views/public_body/show.rhtml:98 +#: app/views/public_body/show.rhtml:106 msgid "Freedom of Information requests made" msgstr "Anfrage ausgeführt" -#: app/views/user/show.rhtml:121 app/views/user/show.rhtml:140 -msgid "Freedom of Information requests made by" -msgstr "Informationsfreiheitsanfrage gestellt durch" +#: app/views/user/show.rhtml:155 +msgid "Freedom of Information requests made by this person" +msgstr "Informationsfreiheits-Anfrage durch diese Person gestellt" -#: app/views/public_body/show.rhtml:72 +#: app/views/user/show.rhtml:155 +msgid "Freedom of Information requests made by you" +msgstr "" + +#: app/views/public_body/show.rhtml:74 msgid "Freedom of Information requests made using this site" msgstr "Anfrage über diese Seite gestellt" @@ -1244,31 +1270,19 @@ msgid "" " an email which will go to the right place, please <a href=\"%s\">send it to us</a>." msgstr "" -#: app/models/outgoing_message.rb:73 +#: app/models/outgoing_message.rb:74 msgid "GIVE DETAILS ABOUT YOUR COMPLAINT HERE" msgstr "HINTELASSEN SIE HIER DETAILS ZU IHRER BESCHWERDE" -#: app/views/general/exception_caught.rhtml:14 -msgid "Go to our <a href=\"%s\">front page</a></li>" -msgstr "Gehen Sie zu unserer <a href=\"%s\">Startseite</a></li>" - -#: app/models/info_request_event.rb:297 -msgid "Handled by post" -msgstr "Postalisch bearbeitet" - -#: app/models/info_request.rb:801 +#: app/models/info_request.rb:803 msgid "Handled by post." msgstr "Postalisch bearbeitet." -#: app/views/layouts/default.rhtml:102 -msgid "Hello!" -msgstr "Hallo!" - -#: app/views/layouts/default.rhtml:99 +#: app/views/layouts/default.rhtml:97 msgid "Hello, {{username}}!" -msgstr "Hallo, " +msgstr "Hallo, {{username}}!" -#: app/views/layouts/default.rhtml:94 +#: app/views/layouts/default.rhtml:129 msgid "Help" msgstr "Hilfe" @@ -1288,27 +1302,29 @@ msgid "" " Thanks." msgstr "" -#: locale/model_attributes.rb:57 +#: locale/model_attributes.rb:55 msgid "Holiday|Day" msgstr "" -#: locale/model_attributes.rb:58 +#: locale/model_attributes.rb:56 msgid "Holiday|Description" msgstr "" -#: app/views/public_body/show.rhtml:7 +#: app/views/layouts/default.rhtml:124 +msgid "Home" +msgstr "" + +#: app/views/public_body/show.rhtml:9 msgid "Home page of authority" msgstr "Offizielle Homepage der Behörde" -#: app/views/request/new.rhtml:63 +#: app/views/request/new.rhtml:53 msgid "" "However, you have the right to request environmental\n" -" information under a different law" +" information under a different law" msgstr "" -"Sie haben jeoch das Recht Umweltanfragen unter einem anderen Gesetz zu " -"stellen. " -#: app/views/request/new.rhtml:73 +#: app/views/request/new.rhtml:63 msgid "Human health and safety" msgstr "Gesundheit und Sicherheit" @@ -1322,7 +1338,7 @@ msgstr "Ich stelle eine Anfrage zur <strong>internen Prüfung</strong>" #: app/views/request_game/play.rhtml:39 msgid "I don't like these ones — give me some more!" -msgstr "" +msgstr "Ich würde gerne andere Anfragen erhalten!" #: app/views/request_game/play.rhtml:40 msgid "I don't want to do any more tidying now!" @@ -1337,7 +1353,7 @@ msgid "" "I'm still <strong>waiting</strong> for my information\n" " <small>(maybe you got an acknowledgement)</small>" msgstr "" -"Ich <strong>warte</strong>noch immer auf meine Informationen\n" +"Ich <strong>warte</strong> noch immer auf meine Informationen\n" " <small>(vielleicht haben Sie eine Bestätigung erhalten)</small>" #: app/views/request/_describe_state.rhtml:18 @@ -1351,7 +1367,7 @@ msgstr "Ich warte auf eine Antwort der <strong>internen Prüfung</strong>" #: app/views/request/_describe_state.rhtml:25 msgid "I've been asked to <strong>clarify</strong> my request" msgstr "" -"Ich wurde gefragt meine Anfrage <strong>deutlicher zu erläutern</strong>" +"Ich wurde gebeten meine Anfrage <strong>deutlicher zu erläutern</strong>" #: app/views/request/_describe_state.rhtml:60 msgid "I've received <strong>all the information" @@ -1387,7 +1403,7 @@ msgid "" " complain (<a href=\"%s\">details</a>)." msgstr "" "Sollten Sie mit den erhaltenen Informationen nicht zufrieden sein, haben Sie" -" das Recht eine Beschwerde einzureichen (<a href=\"%s\">details</a>)." +" das Recht eine Beschwerde einzureichen (<a href=\"%s\">Details</a>)." #: app/views/user/no_cookies.rhtml:20 msgid "If you are still having trouble, please <a href=\"%s\">contact us</a>." @@ -1403,7 +1419,7 @@ msgstr "" "Falls Sie der Antragsteller sind, <a href=\"%s\">melden Sie sich an</a>, um " "die Anfrage anzusehen." -#: app/views/request/new.rhtml:119 +#: app/views/request/new.rhtml:112 msgid "" "If you are thinking of using a pseudonym,\n" " please <a href=\"%s\">read this first</a>." @@ -1421,8 +1437,12 @@ msgid "" "it</strong> from the email. Then <strong>paste it into your browser</strong>, into the place\n" "you would type the address of any other webpage." msgstr "" +"Falls Sie den link in Ihrer Email nicht anklicken können, müssen Sie diesen " +"<strong>auswählen und kopieren</strong>. <strong>Fügen Sie diesen dann in " +"Ihr Browserfenster ein</strong>, an der Stelle, an der Sie auch jede andere " +"Webadresse eingeben würden." -#: app/views/request/show_response.rhtml:49 +#: app/views/request/show_response.rhtml:47 msgid "" "If you can, scan in or photograph the response, and <strong>send us\n" " a copy to upload</strong>." @@ -1445,7 +1465,7 @@ msgstr "" "haben</strong>, ist dieser Anmeldecode nichtmehr aktiv. Bitte nehmen Sie " "eine neue Registrierung vor. " -#: app/controllers/request_controller.rb:437 +#: app/controllers/request_controller.rb:436 msgid "" "If you have not done so already, please write a message below telling the " "authority that you have withdrawn your request. Otherwise they will not know" @@ -1455,8 +1475,8 @@ msgstr "" "zu informieren, dass Sie Ihre Anfrage zurückgezogen haben. Anderenfalls " "weiss diese nicht, dass dies geschehen ist. " -#: app/views/user/signchangeemail_confirm.rhtml:11 #: app/views/user/signchangepassword_confirm.rhtml:10 +#: app/views/user/signchangeemail_confirm.rhtml:11 msgid "" "If you use web-based email or have \"junk mail\" filters, also check your\n" "bulk/spam mail folders. Sometimes, our messages are marked that way." @@ -1489,15 +1509,15 @@ msgstr "" "Sollte Ihr Browser Cookies zulassen und Sie trotzdem diese Nachricht " "erhalten, gibt es wahrscheinlich ein Problem mit unserem Server." -#: locale/model_attributes.rb:63 +#: locale/model_attributes.rb:61 msgid "IncomingMessage|Cached attachment text clipped" msgstr "" -#: locale/model_attributes.rb:64 +#: locale/model_attributes.rb:62 msgid "IncomingMessage|Cached main body text folded" msgstr "" -#: locale/model_attributes.rb:65 +#: locale/model_attributes.rb:63 msgid "IncomingMessage|Cached main body text unfolded" msgstr "" @@ -1525,59 +1545,53 @@ msgstr "" msgid "InfoRequestEvent|Prominence" msgstr "" -#: locale/model_attributes.rb:86 +#: locale/model_attributes.rb:85 msgid "InfoRequest|Allow new responses from" msgstr "" -#: locale/model_attributes.rb:82 +#: locale/model_attributes.rb:81 msgid "InfoRequest|Awaiting description" msgstr "" -#: locale/model_attributes.rb:81 +#: locale/model_attributes.rb:80 msgid "InfoRequest|Described state" msgstr "" -#: locale/model_attributes.rb:87 +#: locale/model_attributes.rb:86 msgid "InfoRequest|Handle rejected responses" msgstr "" -#: locale/model_attributes.rb:85 +#: locale/model_attributes.rb:87 +msgid "InfoRequest|Idhash" +msgstr "" + +#: locale/model_attributes.rb:84 msgid "InfoRequest|Law used" msgstr "" -#: locale/model_attributes.rb:83 +#: locale/model_attributes.rb:82 msgid "InfoRequest|Prominence" msgstr "" -#: locale/model_attributes.rb:80 +#: locale/model_attributes.rb:79 msgid "InfoRequest|Title" msgstr "" -#: locale/model_attributes.rb:84 +#: locale/model_attributes.rb:83 msgid "InfoRequest|Url title" msgstr "" -#: app/models/info_request_event.rb:303 -msgid "Information not held" -msgstr "Information nicht verfügbar" - -#: app/models/info_request.rb:791 +#: app/models/info_request.rb:793 msgid "Information not held." msgstr "Information nicht verfügbr" -#: app/views/request/new.rhtml:71 +#: app/views/request/new.rhtml:61 msgid "" "Information on emissions and discharges (e.g. noise, energy,\n" -" radiation, waste materials)" +" radiation, waste materials)" msgstr "" -"Informationen über emissions and discharges (e.g. noise, energy,\n" -" radiation, waste materials)" -#: app/models/info_request_event.rb:311 -msgid "Internal review acknowledgement" -msgstr "" - -#: app/models/info_request_event.rb:328 +#: app/models/info_request_event.rb:313 msgid "Internal review request" msgstr "Anfrage zur internen Prüfung" @@ -1596,6 +1610,9 @@ msgid "" "or cannot do so. If you can, please enable cookies, or try using a different\n" "browser. Then press refresh to have another go." msgstr "" +"Möglicherweise blockiert Ihr Browser keine sogenannten ´Cookies´. Bitte " +"erlauben Sie diese oder versuchen Sie es mit einem anderen Browser. Klicken " +"Sie anschliessend auf aktualisieren, um es erneut zu versuchen. " #: app/views/user/_user_listing_single.rhtml:21 msgid "Joined in" @@ -1605,7 +1622,7 @@ msgstr "Angemeldet" msgid "Joined {{site_name}} in" msgstr "" -#: app/views/request/new.rhtml:48 +#: app/views/request/new.rhtml:95 msgid "" "Keep it <strong>focused</strong>, you'll be more likely to get what you want" " (<a href=\"%s\">why?</a>)." @@ -1614,6 +1631,10 @@ msgstr "" "gewünschten Informationen zu erhalten ist somit größer(<a " "href=\"%s\">Warum?</a>)." +#: app/views/request/_request_filter_form.rhtml:25 +msgid "Keywords" +msgstr "" + #: app/views/contact_mailer/message.rhtml:10 msgid "Last authority viewed: " msgstr "Zuletzt angesehene Behörde: " @@ -1636,47 +1657,47 @@ msgstr "" msgid "Link to this" msgstr "" -#: app/views/public_body/list.rhtml:32 +#: app/views/public_body/list.rhtml:31 msgid "List of all authorities (CSV)" msgstr "Liste aller Behörden (CSV)" -#: lib/public_body_categories_en.rb:23 -msgid "Local and regional" -msgstr "Örtlich und regional" - -#: app/models/info_request.rb:789 +#: app/models/info_request.rb:791 msgid "Long overdue." msgstr "Stark verspätet." -#: app/views/public_body/show.rhtml:47 -msgid "Make a new Environmental Information request" -msgstr "Stellen Sie eine neue Umweltanfrage" +#: app/views/request/_request_filter_form.rhtml:42 +msgid "Made between" +msgstr "" -#: app/views/request/new.rhtml:1 -msgid "Make an {{law_used_short}} request to '{{public_body_name}}'" -msgstr "Stellen Sie einen {{law_used_short}} Antrag an '{{public_body_name}}'" +#: app/views/public_body/show.rhtml:49 +msgid "Make a new <strong>Environmental Information</strong> request" +msgstr "" -#: app/views/layouts/default.rhtml:15 -msgid "Make and browse Freedom of Information (FOI) requests" +#: app/views/public_body/show.rhtml:51 +msgid "Make a new <strong>Freedom of Information</strong> request" msgstr "" -"Hier können Sie Anfragen an das Informationsgesetz (IFG)stellen und " -"bestehende Anfragen durchsuchen" -#: app/views/layouts/default.rhtml:67 -msgid "Make and explore Freedom of Information requests" +#: app/views/general/frontpage.rhtml:5 +msgid "" +"Make a new<br/>\n" +" <strong>Freedom <span>of</span><br/>\n" +" Information<br/>\n" +" request</strong>" msgstr "" -"Hier können Sie Informationsfreiheitsanfragen stellen und bestehende " -"Anfragen durchsuchen" -#: app/views/general/frontpage.rhtml:4 -msgid "Make or explore Freedom of Information requests" +#: app/views/layouts/default.rhtml:125 +msgid "Make a request" msgstr "" -"Hier können Sie Informationsfreiheitsanfragen stellen oder bestehende " -"Anfragen durchsuchen" -#: app/views/layouts/default.rhtml:87 -msgid "Make request" -msgstr "Anfrage stellen" +#: app/views/request/new.rhtml:12 +msgid "Make an {{law_used_short}} request to '{{public_body_name}}'" +msgstr "Stellen Sie einen {{law_used_short}} Antrag an '{{public_body_name}}'" + +#: app/views/layouts/default.rhtml:15 app/views/layouts/no_chrome.rhtml:8 +msgid "Make and browse Freedom of Information (FOI) requests" +msgstr "" +"Hier können Sie Anfragen an das Informationsgesetz (IFG)stellen und " +"bestehende Anfragen durchsuchen" #: app/views/public_body/_body_listing_single.rhtml:23 msgid "Make your own request" @@ -1690,26 +1711,22 @@ msgstr "" msgid "Missing contact details for '" msgstr "Folgende Kontaktdetails fehlen:" -#: app/views/public_body/show.rhtml:5 +#: app/views/public_body/show.rhtml:7 msgid "More about this authority" msgstr "Weitere Informationen zu dieser Behörde" -#: app/views/general/frontpage.rhtml:41 -msgid "More authorities..." -msgstr "Weitere Behörden" - -#: app/views/general/frontpage.rhtml:55 +#: app/views/general/frontpage.rhtml:68 msgid "More successful requests..." msgstr "Weitere erfolgreiche Anfragen" +#: app/views/layouts/default.rhtml:100 +msgid "My profile" +msgstr "" + #: app/views/request/_describe_state.rhtml:64 msgid "My request has been <strong>refused</strong>" msgstr "Meine Anfrage wurde <strong>abgelehnt</strong>" -#: app/views/layouts/default.rhtml:91 -msgid "My requests" -msgstr "Meine Anfragen " - #: app/models/public_body.rb:36 msgid "Name can't be blank" msgstr "Name muss eingegeben werden " @@ -1718,9 +1735,9 @@ msgstr "Name muss eingegeben werden " msgid "Name is already taken" msgstr "Benutzername vergeben" -#: app/models/track_thing.rb:142 app/models/track_thing.rb:143 +#: app/models/track_thing.rb:215 app/models/track_thing.rb:216 msgid "New Freedom of Information requests" -msgstr "" +msgstr "Neue IFG-Anfragen" #: app/views/user/signchangeemail.rhtml:20 msgid "New e-mail:" @@ -1738,41 +1755,47 @@ msgstr "Neues Passwort:" msgid "New password: (again)" msgstr "Neues Passwort: (erneut eingeben)" -#: app/views/request/show_response.rhtml:62 +#: app/views/request/show_response.rhtml:60 msgid "New response to your request" msgstr "Neue Antwort auf Ihre Anfrage" -#: app/views/request/show_response.rhtml:68 +#: app/views/request/show_response.rhtml:66 msgid "New response to {{law_used_short}} request" msgstr "Neue Antwort auf {{law_used_short}} Anfrage" -#: app/views/general/search.rhtml:40 +#: app/models/track_thing.rb:199 app/models/track_thing.rb:200 +msgid "New updates for the request '{{request_title}}'" +msgstr "" + +#: app/views/general/search.rhtml:130 msgid "Newest results first" msgstr "Aktuellste Ergebnisse zuerst anzeigen" -#: app/views/user/set_draft_profile_photo.rhtml:32 -msgid "Next, crop your photo >>" +#: app/views/general/_localised_datepicker.rhtml:6 +msgid "Next" msgstr "" -#: app/views/general/search.rhtml:16 -msgid "Next, select the public authority you'd like to make the request from." +#: app/views/user/set_draft_profile_photo.rhtml:32 +msgid "Next, crop your photo >>" msgstr "" -"Nächster Schritt: Wählen Sie die Behörde, an welche Sie eine Anfrage senden " -"möchten. " -#: app/views/general/search.rhtml:48 +#: app/views/general/search.rhtml:168 msgid "No public authorities found" msgstr "Keine Behörde gefunden" -#: app/views/request/list.rhtml:23 +#: app/views/request/list.rhtml:19 msgid "No requests of this sort yet." msgstr "Es besteht noch keine Anfrage dieser Art." +#: app/views/public_body/_search_ahead.rhtml:8 +msgid "No results found." +msgstr "" + #: app/views/request/similar.rhtml:7 msgid "No similar requests found." msgstr "Keine vergleichbaren Anfragen gefunden. " -#: app/views/public_body/show.rhtml:73 +#: app/views/public_body/show.rhtml:75 msgid "" "Nobody has made any Freedom of Information requests to {{public_body_name}} " "using this site yet." @@ -1780,20 +1803,24 @@ msgstr "" "Bisher hat niemand eine Anfrage an {{public_body_name}} über diese Seite " "gestellt." -#: app/views/public_body/_body_listing.rhtml:2 #: app/views/request/_request_listing.rhtml:2 +#: app/views/public_body/_body_listing.rhtml:3 msgid "None found." msgstr "Keine gefunden." -#: app/views/user/signchangeemail_confirm.rhtml:3 +#: app/views/user/show.rhtml:165 app/views/user/show.rhtml:185 +msgid "None made." +msgstr "" + #: app/views/user/signchangepassword_confirm.rhtml:1 #: app/views/user/signchangepassword_confirm.rhtml:3 +#: app/views/user/signchangeemail_confirm.rhtml:3 msgid "Now check your email!" msgstr "Rufen Sie nun Ihre Emails ab. " #: app/views/comment/preview.rhtml:5 msgid "Now preview your annotation" -msgstr "Überprüfen Sie Ihre Anfrage" +msgstr "Überprüfen Sie nun Ihren Kommentar" #: app/views/request/followup_preview.rhtml:10 msgid "Now preview your follow up" @@ -1803,23 +1830,11 @@ msgstr "Überprüfen Sie nun Ihr Follow-up" msgid "Now preview your message asking for an internal review" msgstr "Überprüfen Sie nun Ihre Anfrage zur internen Prüfung" -#: app/views/request/preview.rhtml:5 -msgid "Now preview your request" -msgstr "Überprüfen Sie Ihre Anfrage" - #: app/views/user/set_draft_profile_photo.rhtml:46 msgid "OR remove the existing photo" msgstr "OR entfernen Sie das bestehende Photo" -#: app/views/general/frontpage.rhtml:25 -msgid "" -"OR, <strong>search</strong> for information others have requested using " -"{{site_name}}" -msgstr "" -"oder <strong>suchen Sie</strong> nach Informationen, welche von anderne " -"Nutzern angefragt wurden. {{site_name}}" - -#: app/controllers/request_controller.rb:414 +#: app/controllers/request_controller.rb:413 msgid "" "Oh no! Sorry to hear that your request was refused. Here is what to do now." msgstr "" @@ -1844,11 +1859,19 @@ msgstr "" msgid "On this page" msgstr "Auf dieser Seite" -#: app/views/general/search.rhtml:71 -msgid "One public authority matching ‘{{user_search_query}}’" -msgstr "Eine zutreffende Behörde ‘{{user_search_query}}’" +#: app/views/general/search.rhtml:197 +msgid "One FOI request found" +msgstr "" + +#: app/views/general/search.rhtml:179 +msgid "One person found" +msgstr "" + +#: app/views/general/search.rhtml:155 +msgid "One public authority found" +msgstr "" -#: app/views/public_body/show.rhtml:91 +#: app/views/public_body/show.rhtml:98 msgid "Only requests made using {{site_name}} are shown." msgstr "" "Es werden ausschliesslich Anfragen zu folgendem Sucheintrag angezeit: " @@ -1866,10 +1889,14 @@ msgid "" "address to check against" msgstr "" -#: app/views/general/search.rhtml:158 +#: app/views/general/search.rhtml:254 msgid "Original request sent" msgstr "" +#: app/views/request/_describe_state.rhtml:71 +msgid "Other:" +msgstr "" + #: locale/model_attributes.rb:26 msgid "OutgoingMessage|Body" msgstr "" @@ -1890,7 +1917,7 @@ msgstr "" msgid "OutgoingMessage|What doing" msgstr "" -#: app/models/info_request.rb:795 +#: app/models/info_request.rb:797 msgid "Partially successful." msgstr "Teilweise erfolgreich. " @@ -1898,7 +1925,7 @@ msgstr "Teilweise erfolgreich. " msgid "Password is not correct" msgstr "falsches Passwort" -#: app/views/user/_signin.rhtml:16 app/views/user/_signup.rhtml:30 +#: app/views/user/_signup.rhtml:30 app/views/user/_signin.rhtml:16 msgid "Password:" msgstr "Passwort:" @@ -1906,11 +1933,15 @@ msgstr "Passwort:" msgid "Password: (again)" msgstr "Passwort: (nochmal eingeben)" +#: app/views/general/search.rhtml:181 +msgid "People {{start_count}} to {{end_count}} of {{total_count}}" +msgstr "" + #: app/views/user/set_draft_profile_photo.rhtml:13 msgid "Photo of you:" msgstr "Ihr Profilbild:" -#: app/views/request/new.rhtml:76 +#: app/views/request/new.rhtml:66 msgid "Plans and administrative measures that affect these matters" msgstr "" @@ -1920,7 +1951,7 @@ msgstr "" #: app/views/request_game/play.rhtml:1 app/views/request_game/play.rhtml:30 msgid "Play the request categorisation game!" -msgstr "" +msgstr "Helfen Sie uns ausstehende Anfragen zu kategorisieren!" #: app/views/request/show.rhtml:101 msgid "Please" @@ -1952,8 +1983,12 @@ msgid "" "not in your original request, then <a href=\"{{new_request_link}}\">file a " "new request</a>." msgstr "" +"Bitte senden Sie <strong>ausschließlich</strong> Nachrichten, welche sich " +"direkt auf Ihre Anfrage beziehen {{request_link}}. Sollten Sie Informationen" +" anfragen wollen, welche nicht Teil Ihrer ursprünglichen Anfrage sind, dann " +"<a href=\"{{new_request_link}}\">stellen Sie eine neue Anfrage</a>." -#: app/views/request/new.rhtml:60 +#: app/views/request/new.rhtml:50 msgid "Please ask for environmental information only" msgstr "Bitte fragen Sie ausschliesslich nach Umweltinformationen" @@ -1962,16 +1997,18 @@ msgid "" "Please check the URL (i.e. the long code of letters and numbers) is copied\n" "correctly from your email." msgstr "" +"Bitte überprüfen Sie, ob Sie die URL (Webadresse) korrekt aus Ihrer Email " +"kopiert haben. " #: app/models/profile_photo.rb:91 msgid "Please choose a file containing your photo." msgstr "Bitte wählen Sie eine Datei mit Ihrem Foto." -#: app/models/outgoing_message.rb:162 +#: app/models/outgoing_message.rb:163 msgid "Please choose what sort of reply you are making." msgstr "Bitte wählen Sie, welche Art von Antwort Sie geben." -#: app/controllers/request_controller.rb:346 +#: app/controllers/request_controller.rb:345 msgid "" "Please choose whether or not you got some of the information that you " "wanted." @@ -1979,6 +2016,10 @@ msgstr "" "Bitte wählen Sie ob Sie einige der erwünschten Informationen erhalten haben " "oder ob dies nicht der Fall ist. " +#: app/views/track_mailer/event_digest.rhtml:63 +msgid "Please click on the link below to cancel or alter these emails." +msgstr "" + #: app/views/user_mailer/changeemail_confirm.rhtml:3 msgid "" "Please click on the link below to confirm that you want to \n" @@ -2025,7 +2066,7 @@ msgstr "Bitte geben Sie einen Betreff ein" msgid "Please enter a summary of your request" msgstr "Bitte geben Sie eine Zusammenfassung Ihrer Anfrage ein" -#: app/models/user.rb:106 +#: app/models/user.rb:115 msgid "Please enter a valid email address" msgstr "Bitte geben Sie eine gültige E-Mail-Adresse ein" @@ -2041,23 +2082,23 @@ msgstr "Bitte geben Sie das gleiche Passwort zweimal ein" msgid "Please enter your annotation" msgstr "Bitte geben Sie Ihre Anmerkung ein" -#: app/models/contact_validator.rb:29 app/models/user.rb:34 +#: app/models/user.rb:34 app/models/contact_validator.rb:29 msgid "Please enter your email address" msgstr "Bitte geben Sie Ihre E-Mail Adresse ein" -#: app/models/outgoing_message.rb:147 +#: app/models/outgoing_message.rb:148 msgid "Please enter your follow up message" msgstr "Bitte geben Sie Ihre Follow-Up-Nachricht ein" -#: app/models/outgoing_message.rb:150 +#: app/models/outgoing_message.rb:151 msgid "Please enter your letter requesting information" msgstr "Bitte geben Sie Ihre Briefanfrage-Informationen ein" -#: app/models/contact_validator.rb:28 app/models/user.rb:36 +#: app/models/user.rb:36 app/models/contact_validator.rb:28 msgid "Please enter your name" msgstr "Bitte geben Sie Ihren Namen ein" -#: app/models/user.rb:109 +#: app/models/user.rb:118 msgid "Please enter your name, not your email address, in the name field." msgstr "" "Bitte geben Sie Ihren Namen und nicht Ihre E-Mail-Adresse in das Name-Feld " @@ -2075,7 +2116,7 @@ msgstr "Bitte geben Sie Ihre alte E-Mail-Adresse ein" msgid "Please enter your password" msgstr "Bitte geben Sie Ihr Passwort ein" -#: app/models/outgoing_message.rb:145 +#: app/models/outgoing_message.rb:146 msgid "Please give details explaining why you want a review" msgstr "Bitte machen Sie Angaben, warum Sie eine Durchsicht möchten" @@ -2091,14 +2132,11 @@ msgstr "" "Bitte halten Sie die Zusammenfassung kurz, wie in der Betreffzeile einer " "E-Mail. Sie können eine Phrase, sondern als ein ganzer Satz." -#: app/views/request/new.rhtml:79 +#: app/views/request/new.rhtml:69 msgid "" "Please only request information that comes under those categories, <strong>do not waste your\n" -" time</strong> or the time of the public authority by requesting unrelated information." +" time</strong> or the time of the public authority by requesting unrelated information." msgstr "" -"Bitte stellen Sie ausschliesslich Anfragen, welche unter dieser Kategorie " -"fallen, <strong>vergeuden Sie nicht Ihre Zeit</strong> oder die der Behörden" -" mit der Anfrage unzutreffender Informationen." #: app/views/request/new_please_describe.rhtml:5 msgid "" @@ -2106,7 +2144,7 @@ msgid "" "if they are successful yet or not." msgstr "" -#: app/models/outgoing_message.rb:156 +#: app/models/outgoing_message.rb:157 msgid "" "Please sign at the bottom with your name, or alter the \"%{signoff}\" " "signature" @@ -2118,13 +2156,13 @@ msgstr "" msgid "Please sign in as " msgstr "Anmelden als" -#: app/controllers/request_controller.rb:730 +#: app/controllers/request_controller.rb:734 msgid "Please type a message and/or choose a file containing your response." msgstr "" "Bitte geben Sie eine Nachricht ein und / oder wählen Sie eine Datei aus, " "welche Ihre Antwort enthält" -#: app/controllers/request_controller.rb:434 +#: app/controllers/request_controller.rb:433 msgid "Please use the form below to tell us more." msgstr "Bitte nutzen Sie das Formular, um uns ausführlicher zu informieren. " @@ -2154,7 +2192,7 @@ msgstr "" "Bitte nutzen Sie eine Mischung aus Groß- und Kleinschreibung für Ihre " "Anmerkung. Dies vereinfacht das Lesen für andere." -#: app/controllers/request_controller.rb:423 +#: app/controllers/request_controller.rb:422 msgid "" "Please write your follow up message containing the necessary clarifications " "below." @@ -2162,7 +2200,7 @@ msgstr "" "Bitte geben Sie unten Ihre Follow-up Nachricht mit den nötigen " "Klärungsdetails ein. " -#: app/models/outgoing_message.rb:159 +#: app/models/outgoing_message.rb:160 msgid "" "Please write your message using a mixture of capital and lower case letters." " This makes it easier for others to read." @@ -2178,41 +2216,49 @@ msgstr "" "Weisen Sie auf ähnliche, evtl. nütziche Informationen, Kampagnen oder Foren " "hin" +#: app/views/request/_search_ahead.rhtml:4 +msgid "Possibly related requests:" +msgstr "" + #: app/views/comment/preview.rhtml:21 msgid "Post annotation" msgstr "Anmerkung hinzufügen" -#: locale/model_attributes.rb:55 +#: locale/model_attributes.rb:53 msgid "PostRedirect|Circumstance" msgstr "" -#: locale/model_attributes.rb:53 +#: locale/model_attributes.rb:51 msgid "PostRedirect|Email token" msgstr "" -#: locale/model_attributes.rb:52 +#: locale/model_attributes.rb:50 msgid "PostRedirect|Post params yaml" msgstr "" -#: locale/model_attributes.rb:54 +#: locale/model_attributes.rb:52 msgid "PostRedirect|Reason params yaml" msgstr "" -#: locale/model_attributes.rb:50 +#: locale/model_attributes.rb:48 msgid "PostRedirect|Token" msgstr "" -#: locale/model_attributes.rb:51 +#: locale/model_attributes.rb:49 msgid "PostRedirect|Uri" msgstr "" #: app/views/general/_credits.rhtml:1 -msgid "Powered by <a href=\"http://www.alaveteli.org/\">Alaveteli</a>." -msgstr "Ermöglicht durch <a href=\"http://www.alaveteli.org/\">Alaveteli</a>." +msgid "Powered by <a href=\"http://www.alaveteli.org/\">Alaveteli</a>" +msgstr "" + +#: app/views/general/_localised_datepicker.rhtml:5 +msgid "Prev" +msgstr "" #: app/views/request/followup_preview.rhtml:1 msgid "Preview follow up to '" -msgstr "" +msgstr "Überprüfen Sie die Nachfrage an" #: app/views/comment/preview.rhtml:1 msgid "Preview new annotation on '{{info_request_title}}'" @@ -2220,15 +2266,15 @@ msgstr "Sehen Sie den neuen Kommentar zu '{{info_request_title}}'" #: app/views/comment/_comment_form.rhtml:15 msgid "Preview your annotation" -msgstr "Überprüfen Sie Ihre Anmerkung" +msgstr "Überprüfen Sie Ihren Kommentar" #: app/views/request/_followup.rhtml:96 msgid "Preview your message" msgstr "Anfrage ansehen" -#: app/views/request/new.rhtml:139 +#: app/views/request/new.rhtml:132 msgid "Preview your public request" -msgstr "Öffentliche Anfrage ansehen" +msgstr "Vorschau der Anfrage ansehen" #: locale/model_attributes.rb:15 msgid "ProfilePhoto|Data" @@ -2239,13 +2285,15 @@ msgid "ProfilePhoto|Draft" msgstr "" #: app/views/public_body/list.rhtml:37 +msgid "Public authorities" +msgstr "" + +#: app/views/public_body/list.rhtml:35 msgid "Public authorities - {{description}}" msgstr "Behörden - {{description}}" -#: app/views/general/search.rhtml:73 -msgid "" -"Public authorities {{start_count}} to {{end_count}} of {{total_count}} for " -"{{user_search_query}}" +#: app/views/general/search.rhtml:157 +msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "" #: locale/model_attributes.rb:12 @@ -2292,12 +2340,16 @@ msgstr "Behörde|URL" msgid "PublicBody|Version" msgstr "Behörde|Version" -#: app/views/public_body/show.rhtml:10 +#: app/views/public_body/show.rhtml:12 msgid "Publication scheme" msgstr "" -#: locale/model_attributes.rb:48 -msgid "RawEmail|Data binary" +#: app/views/track/_tracking_links.rhtml:27 +msgid "RSS feed" +msgstr "" + +#: app/views/track/_tracking_links.rhtml:27 +msgid "RSS feed of updates" msgstr "" #: app/views/comment/preview.rhtml:20 @@ -2308,51 +2360,25 @@ msgstr "Anmerkung erneut bearbeiten" msgid "Re-edit this message" msgstr "Nachricht ändern" -#: app/views/request/preview.rhtml:40 -msgid "Re-edit this request" -msgstr "Anfrage ändern" - -#: app/views/general/search.rhtml:137 +#: app/views/general/search.rhtml:233 msgid "" "Read about <a href=\"{{advanced_search_url}}\">advanced search " "operators</a>, such as proximity and wildcards." msgstr "" -#: app/views/layouts/default.rhtml:93 +#: app/views/layouts/default.rhtml:128 msgid "Read blog" msgstr "Blog lesen" -#: app/views/request/new.rhtml:16 -msgid "Read this before writing your {{info_request_law_used_full}} request" -msgstr "" -"Lesen Sie dies bevor Sie Ihre {{info_request_law_used_full}} Anfrage " -"schreiben" - -#: app/views/general/search.rhtml:150 +#: app/views/general/search.rhtml:246 msgid "Received an error message, such as delivery failure." msgstr "" -#: app/views/general/search.rhtml:42 +#: app/views/general/search.rhtml:132 msgid "Recently described results first" msgstr "Kürzlich widergegebene Ergebnisse zuerst" -#: app/controllers/request_controller.rb:139 -msgid "Recently sent Freedom of Information requests" -msgstr "Kürzlich gesendete Informationsfreiheitsgesetzanfragen" - -#: app/views/request/list.rhtml:6 -msgid "Recently sent requests" -msgstr "Kürzlich gestellte Anfragen" - -#: app/controllers/request_controller.rb:144 -msgid "Recently successful responses" -msgstr "Aktuelle erfolgreiche Antworten" - -#: app/models/info_request_event.rb:305 -msgid "Refused" -msgstr "Abgelehnt" - -#: app/models/info_request.rb:793 +#: app/models/info_request.rb:795 msgid "Refused." msgstr "Abgelehnt." @@ -2361,6 +2387,8 @@ msgid "" "Remember me</label> (keeps you signed in longer;\n" " do not use on a public computer) " msgstr "" +"Login speichern</label> (Sie bleiben eingeloggt. Nutzen Sie diese Funktion " +"nicht an öffentlichen Computern) " #: app/views/request/_correspondence.rhtml:28 msgid "Reply to this message" @@ -2382,14 +2410,14 @@ msgstr "Anfrage zur internen Prüfung von" msgid "Request has been removed" msgstr "Anfrage wurde verweigert" -#: app/views/request/_request_listing_via_event.rhtml:28 +#: app/views/request/_request_listing_via_event.rhtml:20 msgid "" "Request sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "" "Anfrage gestellt an {{public_body_name}} durch {{info_request_user}} am " "{{date}}." -#: app/views/request/_request_listing_via_event.rhtml:36 +#: app/views/request/_request_listing_via_event.rhtml:28 msgid "" "Request to {{public_body_name}} by {{info_request_user}}. Annotated by " "{{event_comment_user}} on {{date}}." @@ -2407,8 +2435,8 @@ msgstr "" msgid "Requested on {{date}}" msgstr "Angefragt am {{date}}" -#: app/models/track_thing.rb:209 app/models/track_thing.rb:210 -msgid "Requests or responses matching '{{query}}'" +#: app/models/track_thing.rb:282 app/models/track_thing.rb:283 +msgid "Requests or responses matching your saved search" msgstr "" #: app/views/request/upload_response.rhtml:11 @@ -2425,11 +2453,15 @@ msgstr "IFG-Anfrage beantworten" #: app/views/request/upload_response.rhtml:21 msgid "Respond using the web" +msgstr "Online antworten" + +#: app/models/info_request_event.rb:306 +msgid "Response" msgstr "" -#: app/views/general/search.rhtml:160 +#: app/views/general/search.rhtml:256 msgid "Response from a public authority" -msgstr "" +msgstr "Antwort von einer Behörde" #: app/views/request/show.rhtml:77 msgid "Response to this request is <strong>delayed</strong>." @@ -2440,7 +2472,7 @@ msgid "Response to this request is <strong>long overdue</strong>." msgstr "" "Die Antwort auf diese Anfrage ist <strong>lange im Rückstand</strong>." -#: app/views/request/show_response.rhtml:64 +#: app/views/request/show_response.rhtml:62 msgid "Response to your request" msgstr "Reagieren Sie auf Ihre Anfrage" @@ -2448,7 +2480,11 @@ msgstr "Reagieren Sie auf Ihre Anfrage" msgid "Response:" msgstr "Antwort:" -#: app/views/general/search.rhtml:9 +#: app/views/general/search.rhtml:88 +msgid "Restrict to" +msgstr "" + +#: app/views/general/search.rhtml:12 msgid "Results page {{page_number}}" msgstr "Ergebnisanzeige {{page_number}}" @@ -2456,29 +2492,63 @@ msgstr "Ergebnisanzeige {{page_number}}" msgid "Save" msgstr "Speichern" -#: app/views/general/exception_caught.rhtml:10 -#: app/views/general/frontpage.rhtml:16 app/views/general/search.rhtml:29 -#: app/views/layouts/default.rhtml:80 app/views/request/new.rhtml:31 +#: app/views/request/_request_filter_form.rhtml:49 +#: app/views/request/select_authority.rhtml:41 +#: app/views/public_body/list.rhtml:42 +#: app/views/general/exception_caught.rhtml:12 +#: app/views/general/frontpage.rhtml:24 app/views/general/search.rhtml:32 +#: app/views/general/search.rhtml:45 msgid "Search" msgstr "Suche" -#: app/views/general/search.rhtml:4 +#: app/views/general/search.rhtml:8 msgid "Search Freedom of Information requests, public authorities and users" msgstr "Suchen Sie nach Informationsfreiheitsanfragen, Behörden und Nutzern" -#: app/views/general/exception_caught.rhtml:7 +#: app/views/user/show.rhtml:125 +msgid "Search contributions by this person" +msgstr "" + +#: app/views/request/_request_filter_form.rhtml:30 +msgid "Search for words in:" +msgstr "" + +#: app/views/general/search.rhtml:100 +msgid "Search in" +msgstr "" + +#: app/views/general/frontpage.rhtml:15 +msgid "" +"Search over<br/>\n" +" <strong>{{number_of_requests}} requests</strong> <span>and</span><br/>\n" +" <strong>{{number_of_authorities}} authorities</strong>" +msgstr "" + +#: app/views/general/exception_caught.rhtml:9 msgid "Search the site to find what you were looking for." msgstr "" "Duchsuchen Sie die Seite, um die von Ihnen gewünschten Informationen zu " "finden. " -#: app/controllers/user_controller.rb:331 +#: app/views/user/show.rhtml:123 +msgid "Search your contributions" +msgstr "" + +#: app/views/public_body/_search_ahead.rhtml:5 +msgid "Select one to see more information about the authority." +msgstr "" + +#: app/views/request/select_authority.rhtml:27 +msgid "Select the authority to write to" +msgstr "" + +#: app/controllers/user_controller.rb:349 msgid "Send a message to " msgstr "Nachricht senden an" #: app/views/request/_followup.rhtml:7 msgid "Send a public follow up message to" -msgstr "Senden Sie eine öffentliche Follow-up Nachricht" +msgstr "Senden Sie eine öffentliche Nachfrage an" #: app/views/request/_followup.rhtml:10 msgid "Send a public reply to" @@ -2486,7 +2556,7 @@ msgstr "Senden Sie eine öffentliche Antwort an" #: app/views/request/_correspondence.rhtml:58 msgid "Send follow up" -msgstr "Follow-Up senden" +msgstr "Nachfrage senden" #: app/views/request/followup_preview.rhtml:50 msgid "Send message" @@ -2497,8 +2567,8 @@ msgid "Send message to " msgstr "Nachricht senden an" #: app/views/request/preview.rhtml:41 -msgid "Send public " -msgstr "Öffentlich senden" +msgid "Send request" +msgstr "" #: app/views/user/show.rhtml:53 msgid "Set your profile photo" @@ -2508,15 +2578,20 @@ msgstr "Profilbild wählen" msgid "Short name is already taken" msgstr "Nutzername bereits vergeben " -#: app/views/general/search.rhtml:38 +#: app/views/general/search.rhtml:128 msgid "Show most relevant results first" msgstr "Relevanteste Suchergebnisse zuerst anzeigen " -#: app/views/public_body/list.rhtml:3 app/views/request/list.rhtml:2 +#: app/views/public_body/list.rhtml:2 msgid "Show only..." msgstr "" -#: app/views/user/_signin.rhtml:31 app/views/user/show.rhtml:113 +#: app/views/request/_request_filter_form.rhtml:5 +#: app/views/general/search.rhtml:52 +msgid "Showing" +msgstr "" + +#: app/views/user/_signin.rhtml:32 msgid "Sign in" msgstr "Anmelden" @@ -2524,27 +2599,27 @@ msgstr "Anmelden" msgid "Sign in or make a new account" msgstr "Anmelden oder neues Benutzerkonto erstellen" -#: app/views/layouts/default.rhtml:103 +#: app/views/layouts/default.rhtml:106 msgid "Sign in or sign up" msgstr "Amelden oder einloggen " -#: app/views/layouts/default.rhtml:100 +#: app/views/layouts/default.rhtml:104 msgid "Sign out" msgstr "Ausloggen" -#: app/views/user/_signup.rhtml:41 +#: app/views/user/_signup.rhtml:46 msgid "Sign up" msgstr "Benutzerkonto erstellen" -#: app/views/request/_sidebar.rhtml:30 +#: app/views/request/_sidebar.rhtml:21 msgid "Similar requests" msgstr "Ähnliche Anfragen" -#: app/models/info_request_event.rb:307 -msgid "Some information sent" -msgstr "Information teilweise gesendet" +#: app/views/general/search.rhtml:33 +msgid "Simple search" +msgstr "" -#: app/views/general/search.rhtml:145 +#: app/views/general/search.rhtml:241 msgid "Some of the information requested has been received" msgstr "" @@ -2567,22 +2642,38 @@ msgid "" "{{site_name}} from {{old_email}} to {{new_email}}." msgstr "" -#: app/views/general/exception_caught.rhtml:1 +#: app/views/general/exception_caught.rhtml:17 +msgid "Sorry, there was a problem processing this page" +msgstr "" + +#: app/views/general/exception_caught.rhtml:3 msgid "Sorry, we couldn't find that page" msgstr "Diese Seite wurde leider nicht gefunden" -#: app/views/request/new.rhtml:53 +#: app/views/request/new.rhtml:45 msgid "Special note for this authority!" msgstr "Spezielle Nachricht and diese Behörde!" +#: app/views/public_body/show.rhtml:53 +msgid "Start" +msgstr "" + +#: app/views/general/frontpage.rhtml:10 +msgid "Start now »" +msgstr "" + +#: app/views/request/_sidebar.rhtml:14 +msgid "Start your own blog" +msgstr "" + #: app/views/request/_other_describe_state.rhtml:21 msgid "Still awaiting an <strong>internal review</strong>" msgstr "<strong>internal review</strong> weiterhin ausstehend" -#: app/views/request/followup_preview.rhtml:23 #: app/views/request/preview.rhtml:18 +#: app/views/request/followup_preview.rhtml:23 msgid "Subject:" -msgstr "Thema:" +msgstr "Betreff:" #: app/views/user/signchangepassword_send_confirm.rhtml:26 msgid "Submit" @@ -2592,15 +2683,11 @@ msgstr "Senden" msgid "Submit status" msgstr "Status senden" -#: app/models/track_thing.rb:158 app/models/track_thing.rb:159 +#: app/models/track_thing.rb:231 app/models/track_thing.rb:232 msgid "Successful Freedom of Information requests" msgstr "Erfolgreiche Informationsfreiheitsanfrage" -#: app/views/request/list.rhtml:5 -msgid "Successful responses" -msgstr "Erfolgreiche Anfragen" - -#: app/models/info_request.rb:797 +#: app/models/info_request.rb:799 msgid "Successful." msgstr "Erfolgreich." @@ -2612,18 +2699,30 @@ msgstr "" "Schlagen Sie vor, wie der Anfragensteller <strong>den Rest der " "Information</strong> finden kann." -#: app/views/request/new.rhtml:93 +#: app/views/request/new.rhtml:75 msgid "Summary:" msgstr "Zusammenfassung:" -#: app/views/general/search.rhtml:140 +#: app/views/general/search.rhtml:236 msgid "Table of statuses" msgstr "Statusliste" +#: app/views/general/search.rhtml:251 +msgid "Table of varieties" +msgstr "" + +#: app/views/general/search.rhtml:76 +msgid "Tags (separated by a space):" +msgstr "" + #: app/views/request/preview.rhtml:45 msgid "Tags:" msgstr "Links:" +#: app/views/general/exception_caught.rhtml:21 +msgid "Technical details" +msgstr "" + #: app/controllers/request_game_controller.rb:52 msgid "Thank you for helping us keep the site tidy!" msgstr "" @@ -2632,7 +2731,7 @@ msgstr "" msgid "Thank you for making an annotation!" msgstr "Vielen Dank für Ihre Anmerkung" -#: app/controllers/request_controller.rb:736 +#: app/controllers/request_controller.rb:740 msgid "" "Thank you for responding to this FOI request! Your response has been " "published below, and a link to your response has been emailed to " @@ -2640,19 +2739,19 @@ msgstr "" "Vielen Dank für Ihre IFG-Anfrage! Ihre Antwort wird unten angezeigt und ein " "Link zu Ihrer Antwort wurde gesendet an" -#: app/controllers/request_controller.rb:378 +#: app/controllers/request_controller.rb:377 msgid "" "Thank you for updating the status of the request '<a " "href=\"{{url}}\">{{info_request_title}}</a>'. There are some more requests " "below for you to classify." msgstr "" -#: app/controllers/request_controller.rb:381 +#: app/controllers/request_controller.rb:380 msgid "Thank you for updating this request!" msgstr "Vielen Dank für die Aktualisierung dieser Anfrage!" -#: app/controllers/user_controller.rb:398 -#: app/controllers/user_controller.rb:414 +#: app/controllers/user_controller.rb:416 +#: app/controllers/user_controller.rb:432 msgid "Thank you for updating your profile photo" msgstr "Vielen Dank für die Aktualisierung Ihres Profilbildes" @@ -2678,8 +2777,11 @@ msgid "" " We'll also, if you need it, give you advice on what to do next about each of your\n" " requests." msgstr "" +"Vielen Dank für die Mithilfe die Seite sauber und übersichtlich zu halten. " +"Gerne beraten wir Sie auch bei den nächsten Schritten Ihrer Anfragen, falls " +"Sie dies wünschen. " -#: app/controllers/user_controller.rb:189 +#: app/controllers/user_controller.rb:207 msgid "" "That doesn't look like a valid email address. Please check you have typed it" " correctly." @@ -2687,12 +2789,12 @@ msgstr "" "Dies sieht nicht nach einer gültigen Emailadresse aus. Bitte überprüfen Sie " "Ihre Eingabe. " -#: app/views/request/_describe_state.rhtml:47 #: app/views/request/_other_describe_state.rhtml:43 +#: app/views/request/_describe_state.rhtml:47 msgid "The <strong>review has finished</strong> and overall:" msgstr "Die <strong>Prüfung wurde abgeschlossen</strong> und insgesamt:" -#: app/views/request/new.rhtml:62 +#: app/views/request/new.rhtml:52 msgid "The Freedom of Information Act <strong>does not apply</strong> to" msgstr "Das Informationsfreiheitsgesetz <strong>trifft nicht zu</strong> auf" @@ -2709,7 +2811,7 @@ msgstr "" "information <small>(vielleicht können sie Ihnen mitteilen von wem Sie die " "Informationen erhalten können)" -#: app/views/request/show_response.rhtml:28 +#: app/views/request/show_response.rhtml:26 msgid "" "The authority only has a <strong>paper copy</strong> of the information." msgstr "" @@ -2742,34 +2844,29 @@ msgstr "" "{{user}} gesendete Anfrage, um auf {{law_used_short}}\n" "zu reagieren, wurde nicht übermittelt." -#: app/views/request/show_response.rhtml:22 -msgid "" -"The law, the Ministry of Justice and the Information Commissioner\n" -" all say that an email is sufficient (<a href=\"%s\">more details</a>).\n" -" At the bottom of this page, write a reply to the authority explaining this to them." +#: app/views/general/exception_caught.rhtml:5 +msgid "The page doesn't exist. Things you can try now:" msgstr "" -#: app/views/general/exception_caught.rhtml:3 -msgid "The page either doesn't exist, or is broken. Things you can try now:" -msgstr "Diese Seite existiert nicht oder ist beschädigt. Versuchen Sie:" - -#: app/views/general/search.rhtml:143 +#: app/views/general/search.rhtml:239 msgid "The public authority does not have the information requested" -msgstr "" +msgstr "Der Behörde liegen die angefragten Informationen nicht vor. " -#: app/views/general/search.rhtml:147 +#: app/views/general/search.rhtml:243 msgid "The public authority would like part of the request explained" msgstr "" +"Die Behörde würde gerne weitere Erläuterungen zu einem Teil der Anfrage " +"erhalten." -#: app/views/general/search.rhtml:148 +#: app/views/general/search.rhtml:244 msgid "The public authority would like to / has responded by post" -msgstr "" +msgstr "Die Behörde würde gerne / hat Ihnen postalisch geantwortet" #: app/views/request/_other_describe_state.rhtml:60 msgid "The request has been <strong>refused</strong>" msgstr "Die Anfrage wurde <strong>abgelehnt</strong>" -#: app/controllers/request_controller.rb:352 +#: app/controllers/request_controller.rb:351 msgid "" "The request has been updated since you originally loaded this page. Please " "check for any new incoming messages below, and try again." @@ -2791,9 +2888,9 @@ msgstr "Die Anfrage wurde <strong>abgelehnt</strong> durch" msgid "The request was <strong>successful</strong>." msgstr "Die Anfrage war <strong>erfolgreich</strong>." -#: app/views/general/search.rhtml:144 +#: app/views/general/search.rhtml:240 msgid "The request was refused by the public authority" -msgstr "" +msgstr "Die Anfrage wurde von der Behörde abgelehnt" #: app/views/request/hidden.rhtml:9 msgid "" @@ -2804,7 +2901,7 @@ msgstr "" "Die von Ihnen ausgewählte Anfrage wurde verweigert. Dies kann unterschiedliche Ursachen haben, welche an dieser Stelle leider nicht näher erläutert werden können. Bitte<a\n" " href=\"%s\">kontaktieren Sie uns</a> für weitere Fragen. " -#: app/views/general/search.rhtml:152 +#: app/views/general/search.rhtml:248 msgid "The requester has abandoned this request for some reason" msgstr "" @@ -2827,7 +2924,7 @@ msgstr "" "gesetzlicher Vorschrift sollte {{public_body_link}} Ihnen inzwischen unter " "allen Umständen geantwortet haben. " -#: app/views/public_body/show.rhtml:100 +#: app/views/public_body/show.rhtml:108 msgid "" "The search index is currently offline, so we can't show the Freedom of " "Information requests that have been made to this authority." @@ -2835,7 +2932,7 @@ msgstr "" "Da die Suchanzeige momentan offline ist, können wir die an diese Behörde " "gestellten Informationsfreiheitsanfragen gerade leider nicht anzeigen. " -#: app/views/user/show.rhtml:141 +#: app/views/user/show.rhtml:156 msgid "" "The search index is currently offline, so we can't show the Freedom of " "Information requests this person has made." @@ -2851,15 +2948,15 @@ msgstr "" msgid "Then you can cancel the alerts." msgstr "" -#: app/controllers/user_controller.rb:249 +#: app/controllers/user_controller.rb:267 msgid "Then you can change your email address used on {{site_name}}" msgstr "" -#: app/controllers/user_controller.rb:203 +#: app/controllers/user_controller.rb:221 msgid "Then you can change your password on {{site_name}}" msgstr "" -#: app/controllers/request_controller.rb:338 +#: app/controllers/request_controller.rb:337 msgid "Then you can classify the FOI response you have got from " msgstr "" @@ -2867,58 +2964,70 @@ msgstr "" msgid "Then you can play the request categorisation game." msgstr "" -#: app/controllers/user_controller.rb:330 +#: app/controllers/user_controller.rb:348 msgid "Then you can send a message to " msgstr "" -#: app/controllers/user_controller.rb:514 +#: app/controllers/user_controller.rb:541 msgid "Then you can sign in to {{site_name}}" msgstr "" -#: app/controllers/request_controller.rb:61 +#: app/controllers/request_controller.rb:76 msgid "Then you can update the status of your request to " msgstr "" -#: app/controllers/request_controller.rb:702 +#: app/controllers/request_controller.rb:706 msgid "Then you can upload an FOI response. " msgstr "Dann können Sie eine IFG-Antwort hochladen. " -#: app/controllers/request_controller.rb:545 +#: app/controllers/request_controller.rb:544 msgid "Then you can write follow up message to " msgstr "" -#: app/controllers/request_controller.rb:546 +#: app/controllers/request_controller.rb:545 msgid "Then you can write your reply to " msgstr "" -#: app/models/track_thing.rb:197 +#: app/models/track_thing.rb:270 msgid "" "Then you will be emailed whenever '{{user_name}}' requests something or gets" " a response." msgstr "" -#: app/models/track_thing.rb:213 +#: app/models/track_thing.rb:286 msgid "" -"Then you will be emailed whenever a new request or response matches " -"'{{query}}'." +"Then you will be emailed whenever a new request or response matches your " +"search." msgstr "" -#: app/models/track_thing.rb:162 +#: app/models/track_thing.rb:235 msgid "Then you will be emailed whenever an FOI request succeeds." msgstr "" "Sie werden bei jeder erfolgreichen IFG-Anfrage per Email benachrichtigt. " -#: app/models/track_thing.rb:146 +#: app/models/track_thing.rb:219 msgid "Then you will be emailed whenever anyone makes a new FOI request." msgstr "" +"Sie werden dann per email informiert, sobald jemand eine neue IFG-Anfrage " +"stellt. " -#: app/models/track_thing.rb:181 +#: app/models/track_thing.rb:254 msgid "" "Then you will be emailed whenever someone requests something or gets a " "response from '{{public_body_name}}'." msgstr "" -#: app/controllers/request_controller.rb:299 +#: app/models/track_thing.rb:203 +msgid "" +"Then you will be emailed whenever the request '{{request_title}}' is " +"updated." +msgstr "" + +#: app/controllers/request_controller.rb:30 +msgid "Then you'll be allowed to send FOI requests." +msgstr "" + +#: app/controllers/request_controller.rb:298 msgid "Then your FOI request to {{public_body_name}} will be sent." msgstr "Dann wird Ihre OFG-Anfrage an {{public_body_name}} gesendet. " @@ -2948,13 +3057,18 @@ msgid "" "by the {{site_name}} team." msgstr "" -#: app/controllers/public_body_controller.rb:77 +#: app/controllers/user_controller.rb:140 +#: app/controllers/public_body_controller.rb:81 msgid "There was an error with the words you entered, please try again." msgstr "" +#: app/views/public_body/show.rhtml:96 app/views/general/search.rhtml:10 +msgid "There were no requests matching your query." +msgstr "" + #: app/views/request/_describe_state.rhtml:38 msgid "They are going to reply <strong>by post</strong>" -msgstr "Ihnen wird <strong>postalisch</strong> geantwortet werden" +msgstr "Ich erhalte meine Antwort <strong>auf dem Postweg</strong>" #: app/views/request/_describe_state.rhtml:52 msgid "" @@ -2989,7 +3103,7 @@ msgstr "" msgid "Things to do with this request" msgstr "Weitere Möglichkeiten für diese Anfrage" -#: app/views/public_body/show.rhtml:59 +#: app/views/public_body/show.rhtml:60 msgid "This authority no longer exists, so you cannot make a request to it." msgstr "" "Diese Behörde existiert nichtmehr. Es ist folglich nicht möglich eine " @@ -3001,10 +3115,10 @@ msgid "" " find out why. If you are the requester, then you may <a href=\"%s\">sign in</a> to view the response." msgstr "" -#: app/views/request/new.rhtml:65 +#: app/views/request/new.rhtml:55 msgid "" "This covers a very wide spectrum of information about the state of\n" -" the <strong>natural and built environment</strong>, such as:" +" the <strong>natural and built environment</strong>, such as:" msgstr "" #: app/views/request/_view_html_prefix.rhtml:9 @@ -3027,8 +3141,8 @@ msgid "" "This is your own request, so you will be automatically emailed when new " "responses arrive." msgstr "" -"Dies ist Ihre Anfrage. Sie erhalten eine automatische Emailbenchrichtigung, " -"sobald Ihre Anfrage beantwortet wird. " +"Dies ist Ihre eigene Anfrage. Sie erhalten eine automatische " +"Emailbenachrichtigung, sobald Ihre Anfrage beantwortet wird. " #: app/views/request/_hidden_correspondence.rhtml:17 msgid "" @@ -3036,17 +3150,37 @@ msgid "" "\t\t\t\t\t\tfind out why. If you are the requester, then you may <a href=\"%s\">sign in</a> to view the response." msgstr "" -#: app/views/user/show.rhtml:122 -msgid "This person has" -msgstr "Diese Person hat" +#: app/views/request/_other_describe_state.rhtml:40 +#: app/views/request/_describe_state.rhtml:44 +msgid "This particular request is finished:" +msgstr "Diese Anfrage wurde abgeschlossen:" -#: app/views/user/show.rhtml:152 -msgid "This person's" +#: app/views/user/show.rhtml:136 +msgid "" +"This person has made no Freedom of Information requests using this site." +msgstr "" +"Diese Person hat eine Informationsfreiheits-Anfrage über diese Seite " +"gestellt. " + +#: app/views/user/show.rhtml:141 +msgid "This person's %d Freedom of Information request" +msgid_plural "This person's %d Freedom of Information requests" +msgstr[0] "" +msgstr[1] "" + +#: app/views/user/show.rhtml:169 +msgid "This person's %d annotation" +msgid_plural "This person's %d annotations" +msgstr[0] "" +msgstr[1] "" + +#: app/views/user/show.rhtml:162 +msgid "This person's annotations" msgstr "" #: app/views/request/_describe_state.rhtml:84 msgid "This request <strong>requires administrator attention</strong>" -msgstr "" +msgstr "Diese Anfrage <strong>müsste einmal überprüft werden</strong>" #: app/views/request/show.rhtml:55 msgid "This request has an <strong>unknown status</strong>." @@ -3071,6 +3205,8 @@ msgid "" "This request has had an unusual response, and <strong>requires " "attention</strong> from the {{site_name}} team." msgstr "" +"Diese Anfrage erhielt eine ungewöhnliche Antwort und müsste einmal durch das" +" {{site_name}} team <strong>überprüft</strong> werden." #: app/views/request/show.rhtml:5 msgid "" @@ -3083,6 +3219,13 @@ msgid "" "This request is hidden, so that only you the requester can see it. Please\n" " <a href=\"%s\">contact us</a> if you are not sure why." msgstr "" +"Diese Anfrage ist verborgen, so dass ausschliesslich Sie als Nutzer sie sehen können. \n" +"Bitte⏎ <a href=\"%s\">kontaktieren Sie us</a> falls Sie nicht wissen warum." + +#: app/views/request/_other_describe_state.rhtml:10 +#: app/views/request/_describe_state.rhtml:7 +msgid "This request is still in progress:" +msgstr "Diese Anfrage ist noch in Bearbeitung" #: app/views/request/_hidden_correspondence.rhtml:10 msgid "" @@ -3090,14 +3233,6 @@ msgid "" " If you are the requester, then you may <a href=\"%s\">sign in</a> to view the response." msgstr "" -#: app/views/request/new.rhtml:49 -msgid "" -"This site is <strong>public</strong>. Everything you type and any response " -"will be published." -msgstr "" -"Diese Seite ist <strong>öffentlich</strong>. Jede von Ihnen eingegebene " -"Information, sowie jegliche Antwort wird veröffentlicht. " - #: app/views/request/details.rhtml:6 msgid "" "This table shows the technical details of the internal events that happened\n" @@ -3116,19 +3251,19 @@ msgid "" "the email address {{email}}." msgstr "" -#: app/models/track_thing.rb:145 +#: app/models/track_thing.rb:218 msgid "To be emailed about any new requests" msgstr "" -#: app/models/track_thing.rb:161 +#: app/models/track_thing.rb:234 msgid "To be emailed about any successful requests" msgstr "Um per Email über erfolgreiche Anfragen informiert zu werden" -#: app/models/track_thing.rb:196 +#: app/models/track_thing.rb:269 msgid "To be emailed about requests by '{{user_name}}'" msgstr "" -#: app/models/track_thing.rb:180 +#: app/models/track_thing.rb:253 msgid "" "To be emailed about requests made using {{site_name}} to the public " "authority '{{public_body_name}}'" @@ -3150,15 +3285,15 @@ msgstr "" "Um fortzufahren müssen Sie sich anmelden oder ein Benutzerkonto erstellen. " "Leider sind bei diesem Versuch technische Störungen aufgetreten. " -#: app/controllers/user_controller.rb:248 +#: app/controllers/user_controller.rb:266 msgid "To change your email address used on {{site_name}}" msgstr "" -#: app/controllers/request_controller.rb:337 +#: app/controllers/request_controller.rb:336 msgid "To classify the response to this FOI request" msgstr "" -#: app/views/request/show_response.rhtml:39 +#: app/views/request/show_response.rhtml:37 msgid "To do that please send a private email to " msgstr "Senden Sie uns hierfür bitte eine private Email" @@ -3166,8 +3301,12 @@ msgstr "Senden Sie uns hierfür bitte eine private Email" msgid "To do this, first click on the link below." msgstr "Klicken Sie hierfür bitte auf den unten angezeigten Link." -#: app/models/track_thing.rb:212 -msgid "To follow requests and responses matching '{{query}}'" +#: app/models/track_thing.rb:285 +msgid "To follow requests and responses matching your search" +msgstr "" + +#: app/models/track_thing.rb:202 +msgid "To follow updates to the request '{{request_title}}'" msgstr "" #: app/views/request_mailer/old_unclassified_updated.rhtml:1 @@ -3190,36 +3329,45 @@ msgstr "" msgid "To post your annotation" msgstr "Um Ihre Anmerkung zu senden" -#: app/controllers/request_controller.rb:543 +#: app/controllers/request_controller.rb:542 msgid "To reply to " msgstr "" -#: app/controllers/request_controller.rb:542 +#: app/controllers/request_controller.rb:541 msgid "To send a follow up message to " -msgstr "" +msgstr "Um eine Nachfrage zu senden" -#: app/controllers/user_controller.rb:329 +#: app/controllers/user_controller.rb:347 msgid "To send a message to " msgstr "" -#: app/controllers/request_controller.rb:298 +#: app/controllers/request_controller.rb:29 +#: app/controllers/request_controller.rb:297 msgid "To send your FOI request" msgstr "Um Ihre IFG-Anfrage zu senden" -#: app/controllers/request_controller.rb:60 +#: app/controllers/request_controller.rb:75 msgid "To update the status of this FOI request" msgstr "Um den Status dieser IFG-Anfrage zu aktualisieren" -#: app/controllers/request_controller.rb:701 +#: app/controllers/request_controller.rb:705 msgid "" "To upload a response, you must be logged in using an email address from " msgstr "" +#: app/views/general/search.rhtml:24 +msgid "" +"To use the advanced search, combine phrases and labels as described in the " +"search tips below." +msgstr "" + #: app/views/public_body/view_email_captcha.rhtml:5 msgid "" "To view the email address that we use to send FOI requests to " "{{public_body_name}}, please enter these words." msgstr "" +"Geben Sie bitte diese Worte ein, um die Email-Adresse zu sehen, welche wir " +"verwenden, um IFG-Anfragen an {{public_body_name}} zu senden." #: app/views/request_mailer/new_response.rhtml:5 msgid "To view the response, click on the link below." @@ -3230,20 +3378,36 @@ msgstr "" msgid "To {{public_body_link_absolute}}" msgstr "An {{public_body_link_absolute}}" -#: app/views/request/followup_preview.rhtml:22 app/views/request/new.rhtml:88 -#: app/views/request/preview.rhtml:17 +#: app/views/request/preview.rhtml:17 app/views/request/new.rhtml:32 +#: app/views/request/followup_preview.rhtml:22 msgid "To:" msgstr "An:" -#: app/models/track_thing.rb:174 +#: app/views/general/_localised_datepicker.rhtml:7 +msgid "Today" +msgstr "" + +#: app/views/public_body/_search_ahead.rhtml:3 +msgid "Top search results:" +msgstr "" + +#: app/views/track/_tracking_links.rhtml:22 +msgid "Track by email" +msgstr "" + +#: app/models/track_thing.rb:247 msgid "Track requests to {{public_body_name}} by email" msgstr "An {{public_body_name}} gestellte Anfragen via Email verfolgen" -#: app/models/track_thing.rb:206 -msgid "Track things matching '{{query}}' by email" +#: app/views/request/list.rhtml:8 +msgid "Track these requests" msgstr "" -#: app/views/public_body/show.rhtml:3 +#: app/models/track_thing.rb:279 +msgid "Track things matching this search by email" +msgstr "" + +#: app/views/public_body/show.rhtml:5 msgid "Track this authority" msgstr "Diese Behörde beobachten" @@ -3251,17 +3415,17 @@ msgstr "Diese Behörde beobachten" msgid "Track this person" msgstr "Dieser Person folgen " -#: app/models/track_thing.rb:190 +#: app/models/track_thing.rb:263 msgid "Track this person by email" -msgstr "" +msgstr "Dieser Person via Email folgen" #: app/views/request/_sidebar.rhtml:2 msgid "Track this request" msgstr "Diese Anfrage verfolgen" -#: app/models/track_thing.rb:123 +#: app/models/track_thing.rb:196 msgid "Track this request by email" -msgstr "" +msgstr "Diese Anfrage via Email verfolgen" #: locale/model_attributes.rb:33 msgid "TrackThing|Track medium" @@ -3275,7 +3439,11 @@ msgstr "" msgid "TrackThing|Track type" msgstr "" -#: app/views/general/search.rhtml:133 +#: app/views/request/_sidebar.rhtml:10 +msgid "Tweet this request" +msgstr "" + +#: app/views/general/search.rhtml:229 msgid "" "Type <strong><code>01/01/2008..14/01/2008</code></strong> to only show " "things that happened in the first two weeks of January." @@ -3297,9 +3465,9 @@ msgstr "Antwort an {{username}} kann nicht gesendet werden" #: app/views/request/followup_bad.rhtml:2 msgid "Unable to send follow up message to {{username}}" -msgstr "Follow-Up Nachricht an {{username}} kann nicht gesendet werden" +msgstr "Nachfrage an {{username}} kann nicht gesendet werden" -#: app/views/request/list.rhtml:29 +#: app/views/request/list.rhtml:27 msgid "Unexpected search result type" msgstr "Unerwartetes Suchergebnis" @@ -3324,15 +3492,11 @@ msgstr "" "Wir haben leider keine funktionierende Email-Adresse für " "{{info_request_law_used_full}}" -#: app/views/general/exception_caught.rhtml:17 +#: app/views/general/exception_caught.rhtml:22 msgid "Unknown" msgstr "Unbekannt" -#: app/models/info_request_event.rb:317 -msgid "Unusual response" -msgstr "Ungewöhnliche Antwort" - -#: app/models/info_request.rb:807 +#: app/models/info_request.rb:809 msgid "Unusual response." msgstr "Ungewöhnliche Antwort." @@ -3341,17 +3505,17 @@ msgstr "Ungewöhnliche Antwort." msgid "Update the status of this request" msgstr "Status der Anfrage aktualisieren" -#: app/controllers/request_controller.rb:62 +#: app/controllers/request_controller.rb:77 msgid "Update the status of your request to " msgstr "" -#: app/views/general/search.rhtml:124 +#: app/views/general/search.rhtml:220 msgid "" "Use OR (in capital letters) where you don't mind which word, e.g. " "<strong><code>commons OR lords</code></strong>" msgstr "" -#: app/views/general/search.rhtml:125 +#: app/views/general/search.rhtml:221 msgid "" "Use quotes when you want to find an exact phrase, e.g. " "<strong><code>\"Liverpool City Council\"</code></strong>" @@ -3359,51 +3523,55 @@ msgstr "" "Verwenden Sie Anführungszeichen, e.g. <strong><code>\"Europäischer " "Bürgerbeauftragter\"</code></strong>" -#: locale/model_attributes.rb:67 +#: locale/model_attributes.rb:65 msgid "UserInfoRequestSentAlert|Alert type" msgstr "" -#: locale/model_attributes.rb:78 +#: locale/model_attributes.rb:76 msgid "User|About me" msgstr "BenutzerIÜber mich" -#: locale/model_attributes.rb:76 +#: locale/model_attributes.rb:74 msgid "User|Admin level" msgstr "" -#: locale/model_attributes.rb:77 +#: locale/model_attributes.rb:75 msgid "User|Ban text" msgstr "" -#: locale/model_attributes.rb:69 +#: locale/model_attributes.rb:67 msgid "User|Email" msgstr "BenutzerIEmail" -#: locale/model_attributes.rb:73 +#: locale/model_attributes.rb:71 msgid "User|Email confirmed" msgstr "UserIEmail bestätigt" -#: locale/model_attributes.rb:71 +#: locale/model_attributes.rb:69 msgid "User|Hashed password" msgstr "" -#: locale/model_attributes.rb:75 +#: locale/model_attributes.rb:73 msgid "User|Last daily track email" msgstr "" -#: locale/model_attributes.rb:70 +#: locale/model_attributes.rb:77 +msgid "User|Locale" +msgstr "" + +#: locale/model_attributes.rb:68 msgid "User|Name" msgstr "BenutzerIName" -#: locale/model_attributes.rb:72 +#: locale/model_attributes.rb:70 msgid "User|Salt" msgstr "" -#: locale/model_attributes.rb:74 +#: locale/model_attributes.rb:72 msgid "User|Url name" msgstr "Benutzer|URL Name" -#: app/views/public_body/show.rhtml:21 +#: app/views/public_body/show.rhtml:23 msgid "View FOI email address" msgstr "IFG-emailadressen ansehen" @@ -3419,7 +3587,11 @@ msgstr "IFG-Emailadresse für {{public_body}} ansehen" msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "" -#: app/views/layouts/default.rhtml:89 +#: app/controllers/request_controller.rb:149 +msgid "View and search requests" +msgstr "" + +#: app/views/layouts/default.rhtml:127 msgid "View authorities" msgstr "Behörden ansehen" @@ -3427,11 +3599,11 @@ msgstr "Behörden ansehen" msgid "View email" msgstr "Email ansehen" -#: app/views/layouts/default.rhtml:88 +#: app/views/layouts/default.rhtml:126 msgid "View requests" msgstr "Anfragen ansehen" -#: app/models/info_request.rb:799 +#: app/models/info_request.rb:801 msgid "Waiting clarification." msgstr "Klärung wird erwartet. " @@ -3441,15 +3613,15 @@ msgid "" "their handling of this request." msgstr "" -#: app/views/general/search.rhtml:149 +#: app/views/general/search.rhtml:245 msgid "" "Waiting for the public authority to complete an internal review of their " "handling of the request" msgstr "" -#: app/views/general/search.rhtml:142 +#: app/views/general/search.rhtml:238 msgid "Waiting for the public authority to reply" -msgstr "" +msgstr "Antwort der Behörde wird erwartet" #: app/views/public_body/view_email.rhtml:17 msgid "We do not have a working request email address for this authority." @@ -3477,6 +3649,14 @@ msgid "" "We will not reveal your email address to anybody unless you\n" "or the law tell us to." msgstr "" +"Wir werden Ihre Emailadresse nicht veröffentlichen, sofern nicht von Ihnen " +"freigegeben oder gesetzlich vorgeschrieben. " + +#: app/views/user/_signup.rhtml:13 +msgid "" +"We will not reveal your email address to anybody unless you or\n" +" the law tell us to (<a href=\"%s\">details</a>). " +msgstr "" #: app/views/user_mailer/changeemail_confirm.rhtml:10 msgid "" @@ -3488,7 +3668,7 @@ msgstr "" #: app/views/request/show.rhtml:61 msgid "We're waiting for" -msgstr "" +msgstr "Wir erwarten" #: app/views/request/show.rhtml:57 msgid "We're waiting for someone to read" @@ -3526,13 +3706,17 @@ msgstr "Was machen Sie?" msgid "What best describes the status of this request now?" msgstr "Was ist die beste Beschreibung für diese Anfrage?" +#: app/views/general/frontpage.rhtml:55 +msgid "What information has been released?" +msgstr "" + #: app/views/request_mailer/new_response.rhtml:9 msgid "" "When you get there, please update the status to say if the response \n" "contains any useful information." msgstr "" -#: app/views/request/show_response.rhtml:44 +#: app/views/request/show_response.rhtml:42 msgid "" "When you receive the paper response, please help\n" " others find out what it says:" @@ -3550,60 +3734,60 @@ msgstr "" msgid "Which of these is happening?" msgstr "Welcher dieser Aspekte ist zutreffend?" -#: app/models/info_request_event.rb:313 -msgid "Withdrawn by requester" -msgstr "Von Antragsteller zurückgezogen" +#: app/views/general/frontpage.rhtml:38 +msgid "Who can I request information from?" +msgstr "" -#: app/models/info_request.rb:809 +#: app/models/info_request.rb:811 msgid "Withdrawn by the requester." msgstr "Vom Antragsteller zurückgezogen" -#: app/controllers/request_controller.rb:549 +#: app/views/general/_localised_datepicker.rhtml:13 +msgid "Wk" +msgstr "" + +#: app/controllers/request_controller.rb:548 msgid "Write a reply to " msgstr "Antwort senden" -#: app/controllers/request_controller.rb:548 +#: app/controllers/request_controller.rb:547 msgid "Write your FOI follow up message to " msgstr "Senden Sie Ihre Follow-Up Nachricht an " -#: app/views/request/new.rhtml:46 +#: app/views/request/new.rhtml:93 msgid "Write your request in <strong>simple, precise language</strong>." msgstr "" "Formulieren Sie Ihre Anfrage in <strong>schlicht und präzise </strong>." -#: app/models/info_request_event.rb:301 -msgid "Wrong Response" -msgstr "Falsche Antwort" - #: app/views/comment/_single_comment.rhtml:10 msgid "You" -msgstr "" +msgstr "Sie" #: app/controllers/track_controller.rb:98 msgid "You are already being emailed updates about " msgstr "Sie erhielten bereits Aktualisierungen zu" -#: app/models/track_thing.rb:175 +#: app/models/track_thing.rb:248 msgid "You are already tracking requests to {{public_body_name}} by email" -msgstr "" +msgstr "Sie verfolgen die Anfragen an {{public_body_name}} bereits via Email" -#: app/models/track_thing.rb:207 -msgid "You are already tracking things matching '{{query}}' by email" +#: app/models/track_thing.rb:280 +msgid "You are already tracking things matching this search by email" msgstr "" -#: app/models/track_thing.rb:191 +#: app/models/track_thing.rb:264 msgid "You are already tracking this person by email" -msgstr "" +msgstr "Sie folgen dieser Person bereits via Email" -#: app/models/track_thing.rb:124 +#: app/models/track_thing.rb:197 msgid "You are already tracking this request by email" -msgstr "" +msgstr "Sie folgen dieser Anfrage bereits via Email" -#: app/models/track_thing.rb:156 +#: app/models/track_thing.rb:229 msgid "You are being emailed about any new successful responses" msgstr "Sie werden per Email über neue erfolgreiche Antworten informiert " -#: app/models/track_thing.rb:140 +#: app/models/track_thing.rb:213 msgid "You are being emailed when there are new requests" msgstr "" @@ -3617,26 +3801,33 @@ msgid "" "page for the request. See the <a href=\"{{api_path}}\">API documentation</a>." msgstr "" -#: app/views/public_body/show.rhtml:40 +#: app/views/public_body/show.rhtml:43 msgid "" "You can only request information about the environment from this authority." msgstr "" "Umweltanfragen können ausschliesslich über diese Behörde gestellt werden. " -#: app/views/user/show.rhtml:122 -msgid "You have" -msgstr "Sie haben" - #: app/views/request_mailer/new_response.rhtml:1 msgid "You have a new response to the {{law_used_full}} request " msgstr "" "Sie haben eine neue Antwort auf die Anfrage {{law_used_full}} erhalten " -#: app/controllers/user_controller.rb:492 +#: app/views/general/exception_caught.rhtml:18 +msgid "" +"You have found a bug. Please <a href=\"{{contact_url}}\">contact us</a> to " +"tell us about the problem" +msgstr "" + +#: app/views/user/show.rhtml:136 +msgid "You have made no Freedom of Information requests using this site." +msgstr "" +"Sie haben eine Informationsfreiheits-Anfrage über diese Seite gestellt. " + +#: app/controllers/user_controller.rb:510 msgid "You have now changed the text about you on your profile." msgstr "Sie haben den Text zu Ihrer Person in Ihrem Profil nun geändert. " -#: app/controllers/user_controller.rb:310 +#: app/controllers/user_controller.rb:328 msgid "You have now changed your email address used on {{site_name}}" msgstr "" "Sie haben die aud der Seite {{site_name}} verwendete Email-Adresse nun " @@ -3680,25 +3871,22 @@ msgstr "" msgid "" "You may be able to find\n" "one on their website, or by phoning them up and asking. If you manage\n" -"to find one, then please <a href=\"%s\">send it to us</a>." +"to find one, then please <a href=\"{{help_url}}\">send it to us</a>." msgstr "" -"Es ist mögliche eine auf deren Internetseite zu finden oder sie telefonisch " -"zu erfragen. Sollten Sie sie herausfinden, <a href=\"%s\">senden sie sie uns" -" bitte zu</a>." -#: app/controllers/user_controller.rb:470 +#: app/controllers/user_controller.rb:488 msgid "You need to be logged in to change the text about you on your profile." msgstr "Sie müssen angemeldet sein, um Ihren Profiltext zu ändern. " -#: app/controllers/user_controller.rb:371 +#: app/controllers/user_controller.rb:389 msgid "You need to be logged in to change your profile photo." msgstr "Sie müssen angemeldet sein, um Ihren Profilbild zu ändern. " -#: app/controllers/user_controller.rb:433 +#: app/controllers/user_controller.rb:451 msgid "You need to be logged in to clear your profile photo." msgstr "Sie müssen angemeldet sein, um Ihren Profilbild zu löschen." -#: app/controllers/request_controller.rb:559 +#: app/controllers/request_controller.rb:558 msgid "" "You previously submitted that exact follow up message for this request." msgstr "" @@ -3710,7 +3898,7 @@ msgid "" "by <strong>simply replying</strong> to that email. For your convenience, here is the address:" msgstr "" -#: app/views/request/show_response.rhtml:36 +#: app/views/request/show_response.rhtml:34 msgid "" "You want to <strong>give your postal address</strong> to the authority in " "private." @@ -3723,6 +3911,10 @@ msgid "" "up\n" "email alerts." msgstr "" +"Sie werden keine Anfragen stellen-, Nachfragen senden-, Kommentare " +"hinzufügen- oder anderen Nachrichten senden können. Sie können weiterhin " +"andere Anfragen anschauen oder die Funktion zur automatischen " +"Emailbenachrichtigung einrichten." #: app/controllers/track_controller.rb:154 msgid "You will no longer be emailed updates about " @@ -3742,13 +3934,21 @@ msgid "" "with the clarification." msgstr "" -#: app/controllers/user_controller.rb:442 +#: app/controllers/user_controller.rb:460 msgid "You've now cleared your profile photo" msgstr "Sie haben Ihr Profilbild nun gelöscht" -#: app/views/user/show.rhtml:152 -msgid "Your " -msgstr "" +#: app/views/user/show.rhtml:141 +msgid "Your %d Freedom of Information request" +msgid_plural "Your %d Freedom of Information requests" +msgstr[0] "Ihre %d Informationsfreiheitsanfrage" +msgstr[1] "Ihre %d Informationsfreiheitsanfragen" + +#: app/views/user/show.rhtml:169 +msgid "Your %d annotation" +msgid_plural "Your %d annotations" +msgstr[0] "" +msgstr[1] "" #: app/views/user/_signup.rhtml:22 msgid "" @@ -3759,33 +3959,40 @@ msgid "" " <a href=\"%s\">read this first</a>." msgstr "" +#: app/views/user/show.rhtml:162 +msgid "Your annotations" +msgstr "" + #: app/views/contact_mailer/user_message.rhtml:3 msgid "" "Your details have not been given to anyone, unless you choose to reply to this\n" "message, which will then go directly to the person who wrote the message." msgstr "" -#: app/views/user/_signin.rhtml:11 app/views/user/_signup.rhtml:9 #: app/views/user/signchangepassword_send_confirm.rhtml:13 +#: app/views/user/_signup.rhtml:9 app/views/user/_signin.rhtml:11 msgid "Your e-mail:" msgstr "Ihre Email:" -#: app/views/user/show.rhtml:168 +#: app/views/user/show.rhtml:184 msgid "Your email subscriptions" msgstr "" -#: app/controllers/request_controller.rb:556 +#: app/controllers/request_controller.rb:555 msgid "" "Your follow up has not been sent because this request has been stopped to " "prevent spam. Please <a href=\"%s\">contact us</a> if you really want to " "send a follow up message." msgstr "" +"Ihre Nachfrage wurde nicht gesendet, da Sie durch unseren Spamfilter " +"gestoppt wurde. Bitte <a href=\"%s\">kontaktieren Sie uns</a> wenn Sie " +"wirklich eine Nachfrage senden möchten. " -#: app/controllers/request_controller.rb:584 +#: app/controllers/request_controller.rb:583 msgid "Your follow up message has been sent on its way." msgstr "Ihre Follow-up Nachricht wurde gesendet." -#: app/controllers/request_controller.rb:582 +#: app/controllers/request_controller.rb:581 msgid "Your internal review request has been sent on its way." msgstr "Ihre Anfrage zur internen Überprüfung wurde gesendet. " @@ -3797,14 +4004,14 @@ msgstr "" "Ihre Nachricht wurde gesendet. Vielen Dank für die Kontaktaufnahme! Wir " "werden uns in Kürze mit Ihnen in Verbindung senden. " -#: app/controllers/user_controller.rb:349 +#: app/controllers/user_controller.rb:367 msgid "Your message to {{recipient_user_name}} has been sent!" msgstr "Ihre Nachricht an {{recipient_user_name}} wurde versendet!" #: app/views/request/followup_preview.rhtml:15 msgid "Your message will appear in <strong>search engines</strong>" msgstr "" -"Your message will appear in <strong>Suchmaschinen</strong> angezeigt werden" +"Ihre Nachricht wird in <strong>Suchmaschinen</strong> angezeigt werden" #: app/views/comment/preview.rhtml:10 msgid "" @@ -3819,7 +4026,7 @@ msgid "" " (<a href=\"%s\">details</a>)." msgstr "" "Ihr Name, Ihre Anfrage und alle Antworten werden in <strong>Suchmaschinen</strong> angezeigt werden\n" -" (<a href=\"%s\">details</a>)." +" (<a href=\"%s\">Details</a>)." #: app/views/user/_signup.rhtml:18 msgid "Your name:" @@ -3829,7 +4036,7 @@ msgstr "Ihr Name:" msgid "Your original message is attached." msgstr "Ihre ursprüngliche Nachricht befindet sich im Anhang. " -#: app/controllers/user_controller.rb:231 +#: app/controllers/user_controller.rb:249 msgid "Your password has been changed." msgstr "Ihr Passwort wurde geändert." @@ -3852,7 +4059,7 @@ msgstr "" "Sie uns, ob Sie die gewünschte Information erhalten. Dies hilft uns die " "Seite aktuell zu halten." -#: app/views/request/new.rhtml:109 +#: app/views/request/new.rhtml:102 msgid "Your request:" msgstr "Ihre Anfrage:" @@ -3874,15 +4081,15 @@ msgstr "" msgid "Your {{site_name}} email alert" msgstr "" -#: app/models/outgoing_message.rb:69 +#: app/models/outgoing_message.rb:70 msgid "Yours faithfully," msgstr "Mit freundlichem Gruß, " -#: app/models/outgoing_message.rb:67 +#: app/models/outgoing_message.rb:68 msgid "Yours sincerely," msgstr "Mit freundlichem Gruß, " -#: app/views/request/new.rhtml:97 +#: app/views/request/new.rhtml:79 msgid "" "a one line summary of the information you are requesting, \n" "\t\t\te.g." @@ -3890,14 +4097,22 @@ msgstr "" "Einzeilige Zusammenfassung der von Ihnen angefragten Information, \n" "<span class=\"whitespace other\" title=\"Tab\">»</span><span class=\"whitespace other\" title=\"Tab\">»</span><span class=\"whitespace other\" title=\"Tab\">»</span>e.g." -#: app/views/public_body/show.rhtml:31 +#: app/views/public_body/show.rhtml:34 msgid "admin" msgstr "Administration" -#: app/views/public_body/show.rhtml:29 +#: app/views/request/_request_filter_form.rhtml:6 +msgid "all requests" +msgstr "" + +#: app/views/public_body/show.rhtml:32 msgid "also called {{public_body_short_name}}" msgstr "auch genannt: {{public_body_short_name}}" +#: app/views/request/_request_filter_form.rhtml:44 +msgid "and" +msgstr "" + #: app/views/user/wrong_user.rhtml:5 msgid "and sign in as " msgstr "und melden Sie sich an als" @@ -3916,28 +4131,36 @@ msgstr "und aktualisieren Sie den Status. " msgid "and we'll suggest <strong>what to do next</strong>" msgstr "und wir werden <strong>nächstmögliche Schritte</strong> vorschlagen" -#: app/views/user/show.rhtml:153 -msgid "annotation" -msgstr "Anmerkung" - -#: app/views/user/show.rhtml:147 -msgid "annotations" -msgstr "Anmerkungen" - -#: app/models/track_thing.rb:138 +#: app/models/track_thing.rb:211 msgid "any <a href=\"/list\">new requests</a>" msgstr "" -#: app/models/track_thing.rb:154 +#: app/models/track_thing.rb:227 msgid "any <a href=\"/list/successful\">successful requests</a>" msgstr "" +#: app/models/track_thing.rb:116 +msgid "anything" +msgstr "" + #: app/views/request_mailer/very_overdue_alert.rhtml:1 msgid "are long overdue." msgstr "sind lange überfällig. " -#: app/controllers/public_body_controller.rb:111 +#: app/models/track_thing.rb:89 app/views/general/search.rhtml:56 +msgid "authorities" +msgstr "" + +#: app/models/track_thing.rb:104 +msgid "awaiting a response" +msgstr "" + +#: app/controllers/public_body_controller.rb:119 msgid "beginning with" +msgstr "mit Anfangsbuchstabe " + +#: app/models/track_thing.rb:95 +msgid "between two dates" msgstr "" #: app/views/request/show.rhtml:82 @@ -3948,7 +4171,7 @@ msgstr "von" msgid "by <strong>{{date}}</strong>" msgstr "bis zum <strong>{{date}}</strong>" -#: app/views/request/_request_listing_via_event.rhtml:34 +#: app/views/request/_request_listing_via_event.rhtml:26 msgid "by {{public_body_name}} to {{info_request_user}} on {{date}}." msgstr "von {{public_body_name}} an {{info_request_user}} am {{date}}." @@ -3964,13 +4187,19 @@ msgstr "" msgid "comment" msgstr "Kommentar" -#: app/views/request/show_response.rhtml:41 +#: app/models/track_thing.rb:86 +#: app/views/request/_request_filter_form.rhtml:33 +#: app/views/general/search.rhtml:103 +msgid "comments" +msgstr "" + +#: app/views/request/show_response.rhtml:39 msgid "" "containing your postal address, and asking them to reply to this request.\n" " Or you could phone them." msgstr "" -#: app/models/info_request_event.rb:338 +#: app/models/info_request_event.rb:323 msgid "display_status only works for incoming and outgoing messages right now" msgstr "" @@ -3978,15 +4207,11 @@ msgstr "" msgid "during term time" msgstr "" -#: app/views/general/frontpage.rhtml:18 -msgid "e.g." -msgstr "z.B." - #: app/views/user/show.rhtml:96 msgid "edit text about you" msgstr "Bearbeiten Sie den Infotext zu Ihrer Person" -#: app/views/user/show.rhtml:171 +#: app/views/user/show.rhtml:187 msgid "email subscription" msgstr "Anleitung mailen" @@ -3994,11 +4219,15 @@ msgstr "Anleitung mailen" msgid "even during holidays" msgstr "" +#: app/views/general/search.rhtml:57 +msgid "everything" +msgstr "" + #: locale/model_attributes.rb:17 msgid "exim log" msgstr "" -#: locale/model_attributes.rb:59 +#: locale/model_attributes.rb:57 msgid "exim log done" msgstr "" @@ -4010,24 +4239,20 @@ msgstr "" msgid "have delayed." msgstr "" -#: locale/model_attributes.rb:56 +#: locale/model_attributes.rb:54 msgid "holiday" -msgstr "" +msgstr "Urlaub" #: app/views/request/_followup.rhtml:36 app/views/request/show.rhtml:70 #: app/views/request/show.rhtml:80 msgid "in term time" msgstr "" -#: app/views/public_body/list.rhtml:42 -msgid "in total" -msgstr "vollständig" - -#: locale/model_attributes.rb:62 +#: locale/model_attributes.rb:60 msgid "incoming message" msgstr "Eingehende Nachricht" -#: locale/model_attributes.rb:79 +#: locale/model_attributes.rb:78 msgid "info request" msgstr "Informationsanfrage" @@ -4035,11 +4260,15 @@ msgstr "Informationsanfrage" msgid "info request event" msgstr "Verlauf Informationsanfrage" -#: app/views/user/set_profile_about_me.rhtml:3 #: app/views/user/signchangeemail.rhtml:3 +#: app/views/user/set_profile_about_me.rhtml:3 msgid "internal error" msgstr "interner Fehler" +#: app/views/general/search.rhtml:92 +msgid "internal reviews" +msgstr "" + #: app/views/request/show.rhtml:100 msgid "is <strong>waiting for your clarification</strong>." msgstr "<strong>Ihre Erläuterung wird erwartet</strong>." @@ -4057,6 +4286,16 @@ msgstr "Anmerkung hinterlassen" msgid "made." msgstr "" +#: app/views/request/_request_filter_form.rhtml:32 +#: app/views/general/search.rhtml:102 +msgid "messages from authorities" +msgstr "" + +#: app/views/request/_request_filter_form.rhtml:31 +#: app/views/general/search.rhtml:101 +msgid "messages from users" +msgstr "" + #: app/views/request/show.rhtml:74 msgid "no later than" msgstr "nicht später als" @@ -4073,10 +4312,6 @@ msgstr "" msgid "normally" msgstr "normalerweise" -#: app/views/user/show.rhtml:114 -msgid "only" -msgstr "nur" - #: locale/model_attributes.rb:25 msgid "outgoing message" msgstr "Gesendete Nachricht" @@ -4089,7 +4324,7 @@ msgstr "Bitte melden Sie sich an als" msgid "please sign in or make a new account." msgstr "Bitte melden Sie sich an oder erstellen Sie ein neues Benutzerkonto." -#: locale/model_attributes.rb:49 +#: locale/model_attributes.rb:47 msgid "post redirect" msgstr "" @@ -4101,10 +4336,6 @@ msgstr "Profilbild" msgid "public body" msgstr "Behörde" -#: locale/model_attributes.rb:47 -msgid "raw email" -msgstr "" - #: app/views/request_mailer/not_clarified_alert.rhtml:1 msgid "request." msgstr "Anfrage." @@ -4113,6 +4344,15 @@ msgstr "Anfrage." msgid "requesting an internal review" msgstr "Interne Prüfung beantragen " +#: app/models/track_thing.rb:92 app/models/track_thing.rb:111 +#: app/models/track_thing.rb:113 app/views/general/search.rhtml:54 +msgid "requests" +msgstr "" + +#: app/models/track_thing.rb:112 +msgid "requests which are {{list_of_statuses}}" +msgstr "" + #: app/views/request_mailer/requires_admin.rhtml:3 msgid "" "response as needing administrator attention. Take a look, and reply to this\n" @@ -4123,7 +4363,7 @@ msgstr "" msgid "send a follow up message" msgstr "Nachfrage versenden" -#: app/views/request/_request_listing_via_event.rhtml:31 +#: app/views/request/_request_listing_via_event.rhtml:23 msgid "sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "" "gesendet an {{public_body_name}} durch {{info_request_user}} am {{date}}." @@ -4136,48 +4376,43 @@ msgstr "Anmelden" msgid "sign out" msgstr "Abmelden" +#: app/models/track_thing.rb:101 +msgid "successful" +msgstr "" + +#: app/views/request/_request_filter_form.rhtml:7 +#: app/views/general/search.rhtml:89 +msgid "successful requests" +msgstr "" + #: app/views/request_mailer/new_response.rhtml:2 msgid "that you made to" msgstr "" -#: app/views/request_mailer/comment_on_alert.rhtml:6 #: app/views/request_mailer/comment_on_alert_plural.rhtml:5 -#: app/views/request_mailer/new_response.rhtml:15 -#: app/views/request_mailer/new_response_reminder_alert.rhtml:8 -#: app/views/request_mailer/not_clarified_alert.rhtml:9 #: app/views/request_mailer/old_unclassified_updated.rhtml:8 +#: app/views/request_mailer/new_response_reminder_alert.rhtml:8 +#: app/views/request_mailer/very_overdue_alert.rhtml:11 #: app/views/request_mailer/overdue_alert.rhtml:9 #: app/views/request_mailer/stopped_responses.rhtml:16 -#: app/views/request_mailer/very_overdue_alert.rhtml:11 -#: app/views/track_mailer/event_digest.rhtml:66 +#: app/views/request_mailer/new_response.rhtml:15 +#: app/views/request_mailer/not_clarified_alert.rhtml:9 +#: app/views/request_mailer/comment_on_alert.rhtml:6 #: app/views/user_mailer/already_registered.rhtml:11 -#: app/views/user_mailer/changeemail_already_used.rhtml:10 -#: app/views/user_mailer/changeemail_confirm.rhtml:13 #: app/views/user_mailer/confirm_login.rhtml:11 +#: app/views/user_mailer/changeemail_confirm.rhtml:13 +#: app/views/user_mailer/changeemail_already_used.rhtml:10 +#: app/views/track_mailer/event_digest.rhtml:66 msgid "the {{site_name}} team" msgstr "" -#: app/views/user/show.rhtml:140 -msgid "this person" -msgstr "diese Person" - -#: app/views/user/show.rhtml:113 -msgid "" -"to change password, \n" -" subscriptions and more" -msgstr "" - -#: app/views/request/new.rhtml:34 -msgid "to check that the info isn't already published." -msgstr "" - #: app/views/request/show.rhtml:62 msgid "to read" -msgstr "" +msgstr "zu lesen" #: app/views/request/show.rhtml:106 msgid "to send a follow up message." -msgstr "" +msgstr "um eine Nachfrage zu senden. " #: app/views/request/show.rhtml:45 msgid "to {{public_body}}" @@ -4191,7 +4426,7 @@ msgstr "" msgid "unexpected prominence on request event" msgstr "" -#: app/views/request/_request_listing_via_event.rhtml:38 +#: app/views/request/_request_listing_via_event.rhtml:30 msgid "unknown event type indexed " msgstr "" @@ -4199,52 +4434,90 @@ msgstr "" msgid "unknown reason " msgstr "unbekannte Ursache" -#: app/models/info_request.rb:814 app/models/info_request_event.rb:333 +#: app/models/info_request_event.rb:318 app/models/info_request.rb:816 msgid "unknown status " msgstr "unbekannter Status" -#: app/views/user/show.rhtml:208 +#: app/views/request/_request_filter_form.rhtml:9 +#: app/views/general/search.rhtml:91 +msgid "unresolved requests" +msgstr "" + +#: app/views/user/show.rhtml:224 msgid "unsubscribe" msgstr "abmelden" -#: app/views/user/show.rhtml:180 app/views/user/show.rhtml:194 +#: app/views/user/show.rhtml:196 app/views/user/show.rhtml:210 msgid "unsubscribe all" msgstr "alle abbestellen" +#: app/models/track_thing.rb:98 +msgid "unsuccessful" +msgstr "" + +#: app/views/request/_request_filter_form.rhtml:8 +#: app/views/general/search.rhtml:90 +msgid "unsuccessful requests" +msgstr "" + #: app/views/request/show.rhtml:53 msgid "useful information." msgstr "nützliche Information" -#: locale/model_attributes.rb:68 +#: locale/model_attributes.rb:66 msgid "user" msgstr "Benutzer" -#: locale/model_attributes.rb:66 +#: locale/model_attributes.rb:64 msgid "user info request sent alert" msgstr "" -#: app/views/user/show.rhtml:140 -msgid "you" +#: app/models/track_thing.rb:83 app/views/general/search.rhtml:55 +msgid "users" +msgstr "" + +#: app/views/request/list.rhtml:21 +msgid "{{count}} FOI requests found" msgstr "" -#: app/views/request/new.rhtml:6 +#: app/views/request/new.rhtml:17 msgid "" "{{existing_request_user}} already\n" " created the same request on {{date}}. You can either view the <a href=\"{{existing_request}}\">existing request</a>,\n" " or edit the details below to make a new but similar request." msgstr "" +"{{existing_request_user}} hat am {{date}} bereits die gleiche Anfrage gestellt. Sie können entweder die <a href=\"{{existing_request}}\">bestehende Anfrage</a> ansehen,\n" +" oder die unten aufgeführten Details bearbeiten, um eine neue, aber ähnliche Anfrage zu stellen." #: app/views/request/_after_actions.rhtml:20 msgid "{{info_request_user_name}} only:" -msgstr "{{info_request_user_name}} ausschließlich:" +msgstr "Nur {{info_request_user_name}}:" -#: app/views/general/frontpage.rhtml:51 +#: app/views/general/frontpage.rhtml:63 msgid "{{length_of_time}} ago" msgstr "vor {{length_of_time}} " +#: app/models/track_thing.rb:122 +msgid "{{list_of_things}} matching text '{{search_query}}'" +msgstr "" + #: app/views/request/_after_actions.rhtml:43 msgid "{{public_body_name}} only:" -msgstr "{{public_body_name}} ausschließlich:" +msgstr "Nur {{public_body_name}}:" + +#: app/views/track_mailer/event_digest.rhtml:21 +msgid "{{public_body}} sent a response to {{user_name}}" +msgstr "" + +#: app/controllers/user_controller.rb:43 +msgid "{{search_results}} matching '{{query}}'" +msgstr "" + +#: app/views/general/frontpage.rhtml:39 +msgid "" +"{{site_name}} covers requests to {{number_of_authorities}} authorities, " +"including:" +msgstr "" #: app/views/public_body/view_email.rhtml:7 msgid "" @@ -4252,10 +4525,19 @@ msgid "" "this authority." msgstr "" -#: app/models/user.rb:122 +#: app/views/general/frontpage.rhtml:56 +msgid "" +"{{site_name}} users have made {{number_of_requests}} requests, including:" +msgstr "" + +#: app/models/user.rb:131 msgid "{{user_name}} (Banned)" msgstr "" +#: app/views/track_mailer/event_digest.rhtml:31 +msgid "{{user_name}} added an annotation" +msgstr "" + #: app/views/request_mailer/comment_on_alert.rhtml:1 msgid "" "{{user_name}} has annotated your {{law_used_short}} \n" @@ -4268,6 +4550,14 @@ msgstr "" msgid "{{user_name}} has used {{site_name}} to send you the message below." msgstr "" +#: app/views/track_mailer/event_digest.rhtml:24 +msgid "{{user_name}} sent a follow up message to {{public_body}}" +msgstr "" + +#: app/views/track_mailer/event_digest.rhtml:28 +msgid "{{user_name}} sent a request to {{public_body}}" +msgstr "" + #: app/views/request/show.rhtml:36 msgid "" "{{user}} (<a href=\"{{user_admin_url}}\">admin</a>) made this " diff --git a/locale/es/app.po b/locale/es/app.po index b2ebcea0d..269360596 100644 --- a/locale/es/app.po +++ b/locale/es/app.po @@ -2,15 +2,16 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # -# <victoria@access-info.org>, 2011. +# Translators: # David Cabo <david.cabo@gmail.com>, 2011. # skenaja <alex@alexskene.com>, 2011. +# <victoria@access-info.org>, 2011. msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2011-08-11 12:30+0200\n" -"PO-Revision-Date: 2011-08-12 00:21+0000\n" +"POT-Creation-Date: 2011-09-07 12:17+0200\n" +"PO-Revision-Date: 2011-09-07 10:37+0000\n" "Last-Translator: dcabo <david.cabo@gmail.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -19,7 +20,7 @@ msgstr "" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: app/models/incoming_message.rb:866 +#: app/models/incoming_message.rb:868 msgid "" "\n" "\n" @@ -160,21 +161,21 @@ msgstr " Recibirá actualizaciones por correo sobre esta petición." msgid " made by " msgstr " hecha por " -#: app/views/user/show.rhtml:123 -msgid " made no Freedom of Information requests using this site." -msgstr " no ha hecho peticiones de Acceso a la Información en esta web." +#: app/models/track_thing.rb:112 app/models/track_thing.rb:120 +msgid " or " +msgstr " o " #: app/views/user/contact.rhtml:36 msgid " when you send this message." msgstr " cuando envió este mensaje." -#: app/views/public_body/show.rhtml:80 -msgid "%d Freedom of Information request made using this site" -msgid_plural "%d Freedom of Information requests made using this site" -msgstr[0] "" -msgstr[1] "" +#: app/views/public_body/show.rhtml:88 +msgid "%d Freedom of Information request to %s" +msgid_plural "%d Freedom of Information requests to %s" +msgstr[0] "%d solicitud de información a %s" +msgstr[1] "%d solicitudes de información a %s" -#: app/views/general/frontpage.rhtml:36 +#: app/views/general/frontpage.rhtml:44 msgid "%d request" msgid_plural "%d requests" msgstr[0] "%d petición" @@ -183,18 +184,30 @@ msgstr[1] "%d peticiones" #: app/views/public_body/_body_listing_single.rhtml:21 msgid "%d request made." msgid_plural "%d requests made." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d petición enviada." +msgstr[1] "%d peticiones enviadas." -#: app/views/request/new.rhtml:102 +#: app/views/request/new.rhtml:91 msgid "'Crime statistics by ward level for Wales'" msgstr "'Estadísticas de crímenes por región en España'" -#: app/views/request/new.rhtml:100 +#: app/views/request/new.rhtml:89 msgid "'Pollution levels over time for the River Tyne'" msgstr "'Niveles históricos de contaminación en el río Ebro'" -#: app/controllers/user_controller.rb:355 +#: app/models/track_thing.rb:246 +msgid "'{{link_to_authority}}', a public authority" +msgstr "'{{link_to_authority}}', un organismo público" + +#: app/models/track_thing.rb:195 +msgid "'{{link_to_request}}', a request" +msgstr "'{{link_to_request}}', una solicitud" + +#: app/models/track_thing.rb:262 +msgid "'{{link_to_user}}', a person" +msgstr "'{{link_to_user}}', una persona" + +#: app/controllers/user_controller.rb:373 msgid "" ",\n" "\n" @@ -212,17 +225,33 @@ msgstr "" "\n" "{{user_name}}" +#: app/views/request/select_authority.rhtml:29 +msgid "1. Select an authority" +msgstr "1. Elija un organismo público" + +#: app/views/request/new.rhtml:34 +msgid "2. Ask for Information" +msgstr "2. Solicite información" + +#: app/views/request/preview.rhtml:5 +msgid "3. Now check your request" +msgstr "3. Revise su solicitud" + +#: app/views/public_body/show.rhtml:57 +msgid "<a class=\"link_button_green\" href=\"{{url}}\">{{text}}</a>" +msgstr "<a class=\"link_button_green\" href=\"{{url}}\">{{text}}</a>" + #: app/views/request/_after_actions.rhtml:9 msgid "<a href=\"%s\">Add an annotation</a> (to help the requester or others)" msgstr "" "<a href=\"%s\">Añada un comentario</a> (para ayudar al peticionario o a " "otros)" -#: app/views/public_body/list.rhtml:29 +#: app/views/public_body/list.rhtml:28 msgid "<a href=\"%s\">Are we missing a public authority?</a>." msgstr "<a href=\"%s\">¿Nos falta algún organismo público?</a>." -#: app/views/request/_sidebar.rhtml:45 +#: app/views/request/_sidebar.rhtml:39 msgid "" "<a href=\"%s\">Are you the owner of\n" " any commercial copyright on this page?</a>" @@ -230,17 +259,21 @@ msgstr "" "<a href=\"%s\">¿Posee el copyright\n" " de alguna información de esta página?</a>" -#: app/views/general/search.rhtml:53 +#: app/views/general/search.rhtml:172 msgid "<a href=\"%s\">Browse all</a> or <a href=\"%s\">ask us to add one</a>." msgstr "<a href=\"%s\">Ver todas</a> o <a href=\"%s\">pídanos que añadamos una</a>." -#: app/views/general/exception_caught.rhtml:13 -msgid "<a href=\"%s\">Contact us</a> to tell us about the problem</li>" -msgstr "<a href=\"%s\">Contáctenos</a> para informarnos sobre el problema</li>" +#: app/views/public_body/list.rhtml:50 +msgid "<a href=\"%s\">Can't find the one you want?</a>" +msgstr "<a href=\"%s\">¿No encuentra el que busca?</a>" -#: app/views/public_body/list.rhtml:43 -msgid "<a href=\"%s\">can't find the one you want?</a>" -msgstr "<a href=\"%s\">¿No puede encontrar el que busca?</a>" +#: app/views/user/show.rhtml:113 +msgid "" +"<a href=\"%s\">Sign in</a> to change password, subscriptions and more " +"({{user_name}} only)" +msgstr "" +"<a href=\"%s\">Abra una sesión</a> para cambiar su contraseña, " +"suscripciones... (sólo {{user_name}})" #: app/views/request/_followup.rhtml:39 app/views/request/_followup.rhtml:46 #: app/views/request/show.rhtml:83 app/views/request/show.rhtml:87 @@ -251,14 +284,6 @@ msgstr "<a href=\"%s\">detalles</a>" msgid "<a href=\"%s\">what's that?</a>" msgstr "<a href=\"%s\">¿Qué es eso?</a>" -#: app/views/public_body/show.rhtml:50 -msgid "" -"<a href=\"{{url}}\">Make a new Freedom of Information request</a> to " -"{{public_body_name}}" -msgstr "" -"<a href=\"{{url}}\">Haga una nueva petición de acceso a la información</a> a " -"{{public_body_name}}" - #: app/controllers/request_game_controller.rb:23 msgid "" "<p>All done! Thank you very much for your help.</p><p>There are <a " @@ -269,7 +294,7 @@ msgstr "" "href=\"{{helpus_url}}\">más cosas que puede hacer</a> para ayudar a " "{{site_name}}.</p>" -#: app/controllers/request_controller.rb:399 +#: app/controllers/request_controller.rb:398 msgid "" "<p>Thank you! Here are some ideas on what to do next:</p>\n" " <ul>\n" @@ -293,7 +318,7 @@ msgstr "" " </li>\n" " </ul>" -#: app/controllers/request_controller.rb:393 +#: app/controllers/request_controller.rb:392 msgid "" "<p>Thank you! Hope you don't have to wait much longer.</p> <p>By law, you " "should have got a response promptly, and normally before the end of " @@ -303,7 +328,7 @@ msgstr "" "debería recibir una respuesta pronto, y normalmente antes del final de " "<strong>{{date_response_required_by}}</strong>.</p>" -#: app/controllers/request_controller.rb:389 +#: app/controllers/request_controller.rb:388 msgid "" "<p>Thank you! Hopefully your wait isn't too long.</p> <p>By law, you should get a response promptly, and normally before the end of <strong>\n" "{{date_response_required_by}}</strong>.</p>" @@ -311,17 +336,17 @@ msgstr "" "<p>¡Gracias! Esperamos que su espera no sea demasiado larga.</p> <p>Por ley, debería recibir una respuesta pronto, y normalmente antes del fin de <strong>\n" "{{date_response_required_by}}</strong>.</p>" -#: app/controllers/request_controller.rb:428 +#: app/controllers/request_controller.rb:427 msgid "" "<p>Thank you! Hopefully your wait isn't too long.</p><p>You should get a " -"response within 20 days, or be told if it will take longer (<a " -"href=\"{{review_url}}\">details</a>).</p>" +"response within {{late_number_of_days}} days, or be told if it will take " +"longer (<a href=\"{{review_url}}\">details</a>).</p>" msgstr "" -"<p>¡Gracias! Esperamos que su búsqueda no sea demasiado larga.</p><p>Debería recibir " -"una respuesta en 20 días, o ser informado de posibles retrasos (<a " -"href=\"{{review_url}}\">detalles</a>).</p>" +"<p>¡Gracias! Deseamos que su espera no sea demasiado larga.</p><p>Debería " +"recibir una respuesta en {{late_number_of_days}} días, o ser informado de " +"que tardará más (<a href=\"{{review_url}}\">más información</a>).</p>" -#: app/controllers/request_controller.rb:431 +#: app/controllers/request_controller.rb:430 msgid "" "<p>Thank you! We'll look into what happened and try and fix it up.</p><p>If " "the error was a delivery failure, and you can find an up to date FOI email " @@ -332,17 +357,19 @@ msgstr "" "dirección más actualizada para este organismo, por favor indíquenoslo en el " "siguiente formulario.</p>" -#: app/controllers/request_controller.rb:396 +#: app/controllers/request_controller.rb:395 msgid "" -"<p>Thank you! Your request is long overdue, by more than 40 working days. " -"Most requests should be answered within 20 working days. You might like to " -"complain about this, see below.</p>" +"<p>Thank you! Your request is long overdue, by more than " +"{{very_late_number_of_days}} working days. Most requests should be answered " +"within {{late_number_of_days}} working days. You might like to complain " +"about this, see below.</p>" msgstr "" -"<p>¡Gracias! Su petición está muy retrasada, más de 40 días laborables. " -"La mayoría de las peticiones deberían ser contestadas en 20 días laborables. " -"Puede que usted quiera reclamar, como le explicamos a continuación.</p>" +"<p>¡Gracias! Su petición está muy retrasada, han pasado más de " +"{{very_late_number_of_days}} días laborales. La mayoría de las peticiones " +"deberían ser respondidas en {{late_number_of_days}} días laborales. Puede " +"reclamar sobre esta situación, como se explica más abajo.</p>" -#: app/controllers/user_controller.rb:495 +#: app/controllers/user_controller.rb:513 msgid "" "<p>Thanks for changing the text about you on your profile.</p>\n" " <p><strong>Next...</strong> You can upload a profile photograph too.</p>" @@ -350,7 +377,7 @@ msgstr "" "<p>Gracias por actualizar el texto de su perfil personal.</p>\n" " <p><strong>Ahora...</strong> puede subir también una foto a su perfil.</p>" -#: app/controllers/user_controller.rb:417 +#: app/controllers/user_controller.rb:435 msgid "" "<p>Thanks for updating your profile photo.</p>\n" " <p><strong>Next...</strong> You can put some text about you and your research on your profile.</p>" @@ -358,7 +385,7 @@ msgstr "" "<p>Gracias por actualizar la foto de su perfil.</p>\n" " <p><strong>Ahora...</strong> puede escribir sobre usted y su investigación en su perfil.</p>" -#: app/controllers/request_controller.rb:284 +#: app/controllers/request_controller.rb:283 msgid "" "<p>We recommend that you edit your request and remove the email address.\n" " If you leave it, the email address will be sent to the authority, but will not be displayed on the site.</p>" @@ -366,7 +393,7 @@ msgstr "" "<p>Le aconsejamos que edite su petición y elimine su dirección de correo.\n" " Si la deja, su dirección será enviada al organismo público, pero no será visible en esta web.</p>" -#: app/controllers/request_controller.rb:417 +#: app/controllers/request_controller.rb:416 msgid "" "<p>We're glad you got all the information that you wanted. If you write " "about or make use of the information, please come back and add an annotation" @@ -374,24 +401,26 @@ msgid "" "href=\"{{donation_url}}\">make a donation</a> to the charity which runs " "it.</p>" msgstr "" -"<p>Nos alegra saber que ha obtenido toda la información que solicitó. Si escribe " -"sobre ella, o la utiliza, por favor vuelva y añada un comentario a continuación" -" explicando lo que ha hecho.</p><p>Si {{site_name}} le ha resultado útil, <a " -"href=\"{{donation_url}}\">puede donar</a> a la ONG responsable.</p>" +"<p>Nos alegra saber que ha obtenido toda la información que solicitó. Si " +"escribe sobre ella, o la utiliza, por favor vuelva y añada un comentario a " +"continuación explicando lo que ha hecho.</p><p>Si {{site_name}} le ha " +"resultado útil, <a href=\"{{donation_url}}\">puede donar</a> a la ONG " +"responsable.</p>" -#: app/controllers/request_controller.rb:420 +#: app/controllers/request_controller.rb:419 msgid "" "<p>We're glad you got some of the information that you wanted. If you found " "{{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to " "the charity which runs it.</p><p>If you want to try and get the rest of the " "information, here's what to do now.</p>" msgstr "" -"<p>Nos alegra saber que ha obtenido parte de la información que solicitó. Si escribe " -"sobre ella, o la utiliza, por favor vuelva y añada un comentario a continuación" -" explicando lo que ha hecho.</p><p>Si {{site_name}} le ha resultado útil, <a " -"href=\"{{donation_url}}\">puede donar</a> a la ONG responsable.</p>" +"<p>Nos alegra saber que ha obtenido parte de la información que solicitó. Si" +" escribe sobre ella, o la utiliza, por favor vuelva y añada un comentario a " +"continuación explicando lo que ha hecho.</p><p>Si {{site_name}} le ha " +"resultado útil, <a href=\"{{donation_url}}\">puede donar</a> a la ONG " +"responsable.</p>" -#: app/controllers/request_controller.rb:282 +#: app/controllers/request_controller.rb:281 msgid "" "<p>You do not need to include your email in the request in order to get a " "reply (<a href=\"%s\">details</a>).</p>" @@ -399,7 +428,7 @@ msgstr "" "<p>No necesita incluir su dirección de correo en la petición para recibir " "una respuesta (<a href=\"%s\">más detalles</a>).</p>" -#: app/controllers/request_controller.rb:280 +#: app/controllers/request_controller.rb:279 msgid "" "<p>You do not need to include your email in the request in order to get a " "reply, as we will ask for it on the next screen (<a " @@ -409,7 +438,7 @@ msgstr "" "una respuesta, se la pediremos en el siguiente paso (<a href=\"%s\">más " "detalles</a>).</p>" -#: app/controllers/request_controller.rb:288 +#: app/controllers/request_controller.rb:287 msgid "" "<p>Your request contains a <strong>postcode</strong>. Unless it directly " "relates to the subject of your request, please remove any address as it will" @@ -420,7 +449,7 @@ msgstr "" "dirección, ya que <strong>estará disponible públicamente en " "Internet</strong>.</p>" -#: app/controllers/request_controller.rb:311 +#: app/controllers/request_controller.rb:310 msgid "" "<p>Your {{law_used_full}} request has been <strong>sent on its way</strong>!</p>\n" " <p><strong>We will email you</strong> when there is a response, or after 20 working days if the authority still hasn't\n" @@ -434,15 +463,16 @@ msgstr "" " <p>Si escribe sobre esta petición (en un foro o blog, por ejemplo) por favor enlace a esta página, y añada\n" " un comentario a continuación informando a posibles interesados.</p>" -#: app/controllers/application_controller.rb:279 +#: app/controllers/application_controller.rb:298 msgid "" "<p>{{site_name}} is currently in maintenance. You can only view existing " "requests. You cannot make new ones, add followups or annotations, or " "otherwise change the database.</p> <p>{{read_only}}</p>" msgstr "" -"<p>{{site_name}} está en mantenimiento temporalmente. Sólo puede ver peticiones " -"existentes. No puede crear una nueva, añadir comentarios, enviar respuestas, o " -"realizar otras operaciones que alteren la base de datos.</p> <p>{{read_only}}</p>" +"<p>{{site_name}} está en mantenimiento temporalmente. Sólo puede ver " +"peticiones existentes. No puede crear una nueva, añadir comentarios, enviar " +"respuestas, o realizar otras operaciones que alteren la base de datos.</p> " +"<p>{{read_only}}</p>" #: app/views/user/confirm.rhtml:11 msgid "" @@ -454,7 +484,7 @@ msgstr "" "sus carpetas de spam. A veces, nuestros mensajes se marcan así por error.</small>\n" "</p>" -#: app/views/request/new.rhtml:131 +#: app/views/request/new.rhtml:133 msgid "" "<strong> Can I request information about myself?</strong>\n" "\t\t\t<a href=\"%s\">No! (Click here for details)</a>" @@ -462,7 +492,7 @@ msgstr "" "<strong> ¿Puedo pedir información sobre mí?</strong>\n" "\t\t\t<a href=\"%s\">¡No! (Pulse aquí para más detalles)</a>" -#: app/views/general/search.rhtml:130 +#: app/views/general/search.rhtml:226 msgid "" "<strong><code>commented_by:tony_bowden</code></strong> to search annotations" " made by Tony Bowden, typing the name as in the URL." @@ -470,7 +500,7 @@ msgstr "" "<strong><code>commented_by:rafael_nadal</code></strong> para buscar " "comentarios hechos por el usuario 'rafael_nadal'." -#: app/views/general/search.rhtml:132 +#: app/views/general/search.rhtml:228 msgid "" "<strong><code>filetype:pdf</code></strong> to find all responses with PDF " "attachments. Or try these: <code>{{list_of_file_extensions}}</code>" @@ -478,7 +508,7 @@ msgstr "" "<strong><code>filetype:pdf</code></strong> para buscar todas las respuestas " "con PDFs adjuntos. O prueba estas: <code>{{list_of_file_extensions}}</code>" -#: app/views/general/search.rhtml:131 +#: app/views/general/search.rhtml:227 msgid "" "<strong><code>request:</code></strong> to restrict to a specific request, " "typing the title as in the URL." @@ -486,7 +516,7 @@ msgstr "" "<strong><code>request:</code></strong> para restringir la búsqueda a una " "petición específica, escribiendo el título tal y como aparece en la URL." -#: app/views/general/search.rhtml:129 +#: app/views/general/search.rhtml:225 msgid "" "<strong><code>requested_by:julian_todd</code></strong> to search requests " "made by Julian Todd, typing the name as in the URL." @@ -495,7 +525,7 @@ msgstr "" "peticiones realizadas por Julian Todd, escribiendo el nombre como aparece en" " la URL." -#: app/views/general/search.rhtml:128 +#: app/views/general/search.rhtml:224 msgid "" "<strong><code>requested_from:home_office</code></strong> to search requests " "from the Home Office, typing the name as in the URL." @@ -504,17 +534,17 @@ msgstr "" "peticiones realizadas al Consejo Europeo, escribiendo su nombre como aparece" " en la URL." -#: app/views/general/search.rhtml:126 +#: app/views/general/search.rhtml:222 msgid "" "<strong><code>status:</code></strong> to select based on the status or " "historical status of the request, see the <a href=\"{{statuses_url}}\">table" " of statuses</a> below." msgstr "" -"<strong><code>status:</code></strong> para filtrar en función del estado actual " -"o histórico de la petición, consulte la <a href=\"{{statuses_url}}\">tabla" -" de estados</a> a continuación." +"<strong><code>status:</code></strong> para filtrar en función del estado " +"actual o histórico de la petición, consulte la <a " +"href=\"{{statuses_url}}\">tabla de estados</a> a continuación." -#: app/views/general/search.rhtml:134 +#: app/views/general/search.rhtml:230 msgid "" "<strong><code>tag:charity</code></strong> to find all public bodies or requests with a given tag. You can include multiple tags, \n" " and tag values, e.g. <code>tag:openlylocal AND tag:financial_transaction:335633</code>. Note that by default any of the tags\n" @@ -524,13 +554,14 @@ msgstr "" " y valores, e.g. <code>tag:salud AND tag:financial_transaction:335633</code>. Por defecto, basta con que cualquiera de las etiquetas\n" " esté presente, añada <code>AND</code> explícitamente si sólo quiere resultados con todas ellas presentes." -#: app/views/general/search.rhtml:127 +#: app/views/general/search.rhtml:223 msgid "" "<strong><code>variety:</code></strong> to select type of thing to search " "for, see the <a href=\"{{varieties_url}}\">table of varieties</a> below." msgstr "" -"<strong><code>variety:</code></strong> para filtrar en función del tipo de objeto, " -"consulte la <a href=\"{{varieties_url}}\">tabla de tipos de objetos</a> a continuación." +"<strong><code>variety:</code></strong> para filtrar en función del tipo de " +"objeto, consulte la <a href=\"{{varieties_url}}\">tabla de tipos de " +"objetos</a> a continuación." #: app/views/comment/new.rhtml:56 msgid "" @@ -625,30 +656,14 @@ msgstr "" msgid "<strong>Some of the information</strong> has been sent " msgstr "Se ha enviado <strong>parte de la información</strong> " -#: app/views/general/exception_caught.rhtml:17 -msgid "<strong>Technical details:</strong>" -msgstr "<strong>Detalles técnicos:</strong>" - #: app/views/comment/new.rhtml:35 msgid "<strong>Thank</strong> the public authority or " msgstr "<strong>Dé las gracias</strong> al organismo público o " -#: app/views/request/new.rhtml:23 -msgid "" -"<strong>browse</strong> the authority's <a href=\"%s\">publication " -"scheme</a> or <strong>search</strong> their web site ..." -msgstr "" -"<strong>explore</strong> <a href=\"%s\">la información publicada</a> " -"por el organismo o <strong>busque</strong> en su página web..." - #: app/views/request/show.rhtml:91 msgid "<strong>did not have</strong> the information requested." msgstr "<strong>no tenía</strong> la información solicitada." -#: app/views/request/new.rhtml:25 -msgid "<strong>search</strong> the authority's web site ..." -msgstr "<strong>busque</strong> en la web del organismo público ..." - #: app/views/comment/new.rhtml:45 msgid "" "A <strong>summary</strong> of the response if you have received it by post. " @@ -656,7 +671,7 @@ msgstr "" "Un <strong>resumen</strong> de la respuesta si la ha recibido por correo " "ordinario. " -#: app/views/general/search.rhtml:162 +#: app/views/general/search.rhtml:258 msgid "A public authority" msgstr "Un organismo público" @@ -664,11 +679,12 @@ msgstr "Un organismo público" msgid "A response will be sent <strong>by post</strong>" msgstr "Una respuesta será enviada <strong>por correo ordinario</strong>" -#: app/views/general/search.rhtml:151 +#: app/views/general/search.rhtml:247 msgid "A strange reponse, required attention by the {{site_name}} team" -msgstr "Una respuesta inusual, debe ser revisada por el equipo de {{site_name}}" +msgstr "" +"Una respuesta inusual, debe ser revisada por el equipo de {{site_name}}" -#: app/views/general/search.rhtml:163 +#: app/views/general/search.rhtml:259 msgid "A {{site_name}} user" msgstr "Un usuario de {{site_name}}" @@ -676,11 +692,7 @@ msgstr "Un usuario de {{site_name}}" msgid "About you:" msgstr "Sobre mí:" -#: app/models/info_request_event.rb:293 -msgid "Acknowledgement" -msgstr "Esperando respuesta" - -#: app/views/request/_sidebar.rhtml:5 +#: app/views/request/_sidebar.rhtml:8 msgid "Act on what you've learnt" msgstr "Utilice esta información" @@ -688,7 +700,7 @@ msgstr "Utilice esta información" msgid "Add an annotation to " msgstr "Añada un comentario a " -#: app/views/request/show_response.rhtml:47 +#: app/views/request/show_response.rhtml:45 msgid "" "Add an annotation to your request with choice quotes, or\n" " a <strong>summary of the response</strong>." @@ -708,7 +720,11 @@ msgstr "Nivel de Administrador no incluido en la lista" msgid "Administration URL:" msgstr "URL de Administración:" -#: app/views/general/search.rhtml:31 app/views/general/search.rhtml:121 +#: app/views/general/search.rhtml:46 +msgid "Advanced search" +msgstr "Búsqueda avanzada" + +#: app/views/general/search.rhtml:217 msgid "Advanced search tips" msgstr "Ayuda para la búsqueda avanzada" @@ -720,30 +736,26 @@ msgstr "" "Consejo sobre <strong>si el rechazo es legal</strong>, y como apelar si no " "lo es." -#: app/views/request/new.rhtml:69 +#: app/views/request/new.rhtml:67 msgid "" "Air, water, soil, land, flora and fauna (including how these effect\n" -" human beings)" +" human beings)" msgstr "" "Aire, agua, tierra, flora y fauna (incluyendo sus efectos en los\n" " seres humanos)" -#: app/models/info_request_event.rb:309 -msgid "All information sent" -msgstr "Toda la información enviada" - -#: app/views/general/search.rhtml:146 +#: app/views/general/search.rhtml:242 msgid "All of the information requested has been received" msgstr "Toda la informacion solicitada ha sido recibida" -#: app/views/public_body/list.rhtml:5 -msgid "Alphabet" -msgstr "Alfabeto" - #: app/views/public_body/_body_listing_single.rhtml:12 msgid "Also called {{other_name}}." msgstr "También conocido como {{other_name}}." +#: app/views/track_mailer/event_digest.rhtml:60 +msgid "Alter your subscription" +msgstr "Modifique su suscripción" + #: app/views/request_mailer/new_response.rhtml:12 msgid "" "Although all responses are automatically published, we depend on\n" @@ -756,7 +768,7 @@ msgstr "" msgid "An <strong>error message</strong> has been received" msgstr "Se ha recibido <strong>un mensaje de error</strong>" -#: app/views/general/search.rhtml:161 +#: app/views/general/search.rhtml:257 msgid "Annotation added to request" msgstr "Comentario añadido a la petición" @@ -784,7 +796,7 @@ msgstr "" msgid "Anyone:" msgstr "Cualquiera:" -#: app/views/request/new.rhtml:47 +#: app/views/request/new.rhtml:103 msgid "" "Ask for <strong>specific</strong> documents or information, this site is not" " suitable for general enquiries." @@ -792,7 +804,7 @@ msgstr "" "Pida documentos o información <strong>específica</strong>, esta web no está " "pensada para resolver dudas generales." -#: app/views/request/show_response.rhtml:31 +#: app/views/request/show_response.rhtml:29 msgid "" "At the bottom of this page, write a reply to them trying to persuade them to scan it in\n" " (<a href=\"%s\">more details</a>)." @@ -804,33 +816,41 @@ msgstr "" msgid "Attachment (optional):" msgstr "Adjuntos (opcional):" -#: app/models/info_request.rb:783 +#: app/models/info_request.rb:785 msgid "Awaiting classification." msgstr "Esperando clasificación." -#: app/models/info_request.rb:803 +#: app/models/info_request.rb:805 msgid "Awaiting internal review." msgstr "Esperando revisión interna." -#: app/models/info_request.rb:785 +#: app/models/info_request.rb:787 msgid "Awaiting response." msgstr "Esperando respuesta." -#: app/views/request/new.rhtml:43 +#: app/views/public_body/list.rhtml:4 +msgid "Beginning with" +msgstr "Comenzando por" + +#: app/views/request/new.rhtml:46 msgid "" -"Browse <a href=\"%s\">other requests</a> for examples of how to word your " -"request." +"Browse <a href='{{url}}'>other requests</a> for examples of how to word your" +" request." msgstr "" -"Revise <a href=\"%s\">otras peticiones</a> para ver ejemplos de cómo " -"redactar su petición." +"Consulte <a href='{{url}}'>otras solicitudes</a> para ver cómo puede " +"redactar su solicitud." -#: app/views/request/new.rhtml:41 +#: app/views/request/new.rhtml:44 msgid "" "Browse <a href='{{url}}'>other requests</a> to '{{public_body_name}}' for " "examples of how to word your request." msgstr "" -"Explore <a href='{{url}}'>otras peticiones</a> a '{{public_body_name}}' para " -"ver ejemplos de cómo redactar su petición." +"Explore <a href='{{url}}'>otras peticiones</a> a '{{public_body_name}}' para" +" ver ejemplos de cómo redactar su petición." + +#: app/views/general/frontpage.rhtml:49 +msgid "Browse all authorities..." +msgstr "Explore otros organismos públicos..." #: app/views/request/show.rhtml:86 msgid "" @@ -848,14 +868,6 @@ msgstr "" "Por ley, {{public_body_link}} debería haber respondido " "<strong>pronto</strong> y" -#: app/views/general/search.rhtml:17 -msgid "" -"Can't find it? <a href=\"%s\">Browse all</a> or <a href=\"%s\">ask us to add" -" it</a>." -msgstr "" -"No lo encuentra? <a href=\"%s\">Consulte la lista completa</a> o <a " -"href=\"%s\">pídanos que añadamos uno nuevo</a> " - #: app/controllers/track_controller.rb:145 msgid "Cancel a {{site_name}} alert" msgstr "Cancele una alerta de {{site_name}}" @@ -904,7 +916,7 @@ msgstr "Cambiar el texto de su perfil en {{site_name}}" msgid "Change your email" msgstr "Cambie su correo" -#: app/controllers/user_controller.rb:250 +#: app/controllers/user_controller.rb:268 #: app/views/user/signchangeemail.rhtml:1 #: app/views/user/signchangeemail.rhtml:11 msgid "Change your email address used on {{site_name}}" @@ -921,15 +933,15 @@ msgstr "Cambie su contraseña" msgid "Change your password on {{site_name}}" msgstr "Cambie su contraseña en {{site_name}}" -#: app/controllers/user_controller.rb:204 +#: app/controllers/user_controller.rb:222 msgid "Change your password {{site_name}}" msgstr "Cambie su contraseña en {{site_name}}" -#: app/views/public_body/show.rhtml:15 app/views/public_body/show.rhtml:17 +#: app/views/public_body/show.rhtml:20 app/views/public_body/show.rhtml:22 msgid "Charity registration" msgstr "Registro de la ONG" -#: app/views/general/exception_caught.rhtml:6 +#: app/views/general/exception_caught.rhtml:8 msgid "Check for mistakes if you typed or copied the address." msgstr "Busque erratas si ha copiado la dirección." @@ -939,15 +951,15 @@ msgid "Check you haven't included any <strong>personal information</strong>." msgstr "" "Compruebe que no ha incluído <strong>ninguna información personal</strong>." -#: app/models/info_request_event.rb:331 +#: lib/world_foi_websites.rb:29 +msgid "Chile" +msgstr "Chile" + +#: app/models/info_request_event.rb:316 msgid "Clarification" msgstr "Aclaración" -#: app/models/info_request_event.rb:295 -msgid "Clarification required" -msgstr "Se necesita aclaración" - -#: app/controllers/request_controller.rb:339 +#: app/controllers/request_controller.rb:338 msgid "Classify an FOI response from " msgstr "Clasifique una petición de " @@ -983,38 +995,46 @@ msgstr "Comment|Locale" msgid "Comment|Visible" msgstr "Comment|Visible" -#: app/models/track_thing.rb:147 +#: app/models/track_thing.rb:220 msgid "Confirm you want to be emailed about new requests" msgstr "Confirme que quiere recibir correos sobre nuevas peticiones" -#: app/models/track_thing.rb:214 +#: app/models/track_thing.rb:287 msgid "" -"Confirm you want to be emailed about new requests or responses matching " -"'{{query}}'" +"Confirm you want to be emailed about new requests or responses matching your" +" search" msgstr "" -"Confirme que quiere recibir correos sobre nuevas peticiones o respuestas " -"que encajen con '{{query}}'" +"Confirme que quiere recibir correos sobre nuevas solicitudes o respuestas " +"que coincidan con su búsqueda" -#: app/models/track_thing.rb:198 +#: app/models/track_thing.rb:271 msgid "Confirm you want to be emailed about requests by '{{user_name}}'" -msgstr "Confirme que quiere recibir correos sobre las peticiones de '{{user_name}}'" +msgstr "" +"Confirme que quiere recibir correos sobre las peticiones de '{{user_name}}'" -#: app/models/track_thing.rb:182 +#: app/models/track_thing.rb:255 msgid "" "Confirm you want to be emailed about requests to '{{public_body_name}}'" msgstr "" -"Confirme que quiere recibir correos sobre peticiones a '{{public_body_name}}'" +"Confirme que quiere recibir correos sobre peticiones a " +"'{{public_body_name}}'" -#: app/models/track_thing.rb:163 +#: app/models/track_thing.rb:236 msgid "Confirm you want to be emailed when an FOI request succeeds" msgstr "Confirme que quiere recibir correos cuando una petición tenga éxito" -#: app/controllers/request_controller.rb:300 +#: app/models/track_thing.rb:204 +msgid "Confirm you want to follow updates to the request '{{request_title}}'" +msgstr "" +"Confirme que quiere recibir actualizaciones sobre la solicitud " +"'{{request_title}}'" + +#: app/controllers/request_controller.rb:299 msgid "Confirm your FOI request to " msgstr "Confirme su petición a " -#: app/controllers/request_controller.rb:703 -#: app/controllers/user_controller.rb:515 +#: app/controllers/request_controller.rb:707 +#: app/controllers/user_controller.rb:542 msgid "Confirm your account on {{site_name}}" msgstr "Confirme su cuenta en {{site_name}}" @@ -1022,17 +1042,22 @@ msgstr "Confirme su cuenta en {{site_name}}" msgid "Confirm your annotation to {{info_request_title}}" msgstr "Confirme su comentario a {{info_request_title}}" +#: app/controllers/request_controller.rb:31 +msgid "Confirm your email address" +msgstr "Confirme su dirección de correo" + #: app/models/user_mailer.rb:34 msgid "Confirm your new email address on {{site_name}}" msgstr "Confirme su nueva dirección de correo en {{site_name}}" -#: app/views/layouts/default.rhtml:127 +#: app/views/layouts/default.rhtml:152 msgid "Contact {{site_name}}" msgstr "Contacte con {{site_name}}" -#: app/models/request_mailer.rb:210 +#: app/models/request_mailer.rb:218 msgid "Could not identify the request from the email address" -msgstr "No hemos podido identificar la petición a partir de la dirección de correo" +msgstr "" +"No hemos podido identificar la petición a partir de la dirección de correo" #: app/models/profile_photo.rb:96 msgid "" @@ -1046,10 +1071,10 @@ msgstr "" msgid "Crop your profile photo" msgstr "Recorte su foto de perfil" -#: app/views/request/new.rhtml:74 +#: app/views/request/new.rhtml:72 msgid "" "Cultural sites and built structures (as they may be affected by the\n" -" environmental factors listed above)" +" environmental factors listed above)" msgstr "" "Enclaves culturales y edificios (ya que pueden estar afectados por\n" " los factores medioambientales mencionados anteriormente)" @@ -1062,19 +1087,15 @@ msgstr "" "Actualmente <strong>esperando la respuesta</strong> de {{public_body_link}}," " que debe responder pronto y" -#: app/models/info_request_event.rb:299 -msgid "Deadline Extended" -msgstr "Fecha límite extendida" - -#: app/models/outgoing_message.rb:57 -msgid "Dear " -msgstr "Estimado/a " +#: app/models/outgoing_message.rb:63 +msgid "Dear {{public_body_name}}," +msgstr "Estimado {{public_body_name}}," -#: app/models/info_request.rb:787 +#: app/models/info_request.rb:789 msgid "Delayed." msgstr "Retrasado." -#: app/models/info_request.rb:805 app/models/info_request_event.rb:315 +#: app/models/info_request.rb:807 msgid "Delivery error" msgstr "Error en la entrega" @@ -1082,7 +1103,7 @@ msgstr "Error en la entrega" msgid "Details of request '" msgstr "Detalles de la petición '" -#: app/views/general/search.rhtml:50 app/views/general/search.rhtml:62 +#: app/views/general/search.rhtml:170 msgid "Did you mean: {{correction}}" msgstr "¿Quiere decir: {{correction}}?" @@ -1094,6 +1115,10 @@ msgstr "" "Atención: Este mensaje y cualquier respuesta que usted haga serán publicadas" " en Internet. Nuestras políticas de privacidad y copyright:" +#: app/views/general/_localised_datepicker.rhtml:4 +msgid "Done" +msgstr "Ok" + #: app/views/request/_view_html_prefix.rhtml:6 msgid "Download original attachment" msgstr "Descargar ficheros adjuntos" @@ -1114,11 +1139,15 @@ msgstr "Editar versión en idioma:" msgid "Edit text about you" msgstr "Edite el texto sobre usted" -#: app/models/user.rb:135 +#: app/views/request/preview.rhtml:40 +msgid "Edit this request" +msgstr "Editar esta solicitud" + +#: app/models/user.rb:144 msgid "Either the email or password was not recognised, please try again." msgstr "El correo o la contraseña son inválidos, por favor pruebe otra vez." -#: app/models/user.rb:137 +#: app/models/user.rb:146 msgid "" "Either the email or password was not recognised, please try again. Or create" " a new account using the form on the right." @@ -1134,11 +1163,11 @@ msgstr "La dirección de correo no parece válida" msgid "Email me future updates to this request" msgstr "Quiero recibir emails con las actulizaciones de esta solicitud" -#: app/models/track_thing.rb:155 +#: app/models/track_thing.rb:228 msgid "Email me new successful responses " msgstr "Recibir respuestas válidas " -#: app/models/track_thing.rb:139 +#: app/models/track_thing.rb:212 msgid "Email me when there are new requests" msgstr "Recibir correos cuando haya nuevas peticiones" @@ -1146,7 +1175,7 @@ msgstr "Recibir correos cuando haya nuevas peticiones" msgid "Email subscriptions" msgstr "Suscripciones de correo" -#: app/views/general/search.rhtml:123 +#: app/views/general/search.rhtml:219 msgid "" "Enter words that you want to find separated by spaces, e.g. <strong>climbing" " lane</strong>" @@ -1162,23 +1191,27 @@ msgstr "" "Escriba su petición a continuación. Puede adjuntar un fichero (mande un correo,\n" " o <a href=\"%s\">contáctenos</a>, si necesita más)." -#: app/views/public_body/show.rhtml:96 +#: app/views/public_body/show.rhtml:116 msgid "Environmental Information Regulations requests made" msgstr "Peticiones medio-ambientales realizadas" -#: app/views/public_body/show.rhtml:69 +#: app/views/public_body/show.rhtml:73 msgid "Environmental Information Regulations requests made using this site" msgstr "Peticiones medio-ambientales realizadas en esta web" +#: lib/world_foi_websites.rb:13 +msgid "European Union" +msgstr "Unión Europea" + #: app/views/request/details.rhtml:4 msgid "Event history" msgstr "Historial de eventos" -#: app/views/request/_sidebar.rhtml:41 +#: app/views/request/_sidebar.rhtml:35 msgid "Event history details" msgstr "Historial de eventos" -#: app/views/request/new.rhtml:124 +#: app/views/request/new.rhtml:126 msgid "" "Everything that you enter on this page \n" " will be <strong>displayed publicly</strong> on\n" @@ -1188,7 +1221,7 @@ msgstr "" " estará <strong>disponible públicamente</strong> en\n" " está web para siempre (<a href=\"%s\">¿por qué?</a>)." -#: app/views/request/new.rhtml:116 +#: app/views/request/new.rhtml:118 msgid "" "Everything that you enter on this page, including <strong>your name</strong>, \n" " will be <strong>displayed publicly</strong> on\n" @@ -1198,11 +1231,11 @@ msgstr "" " estará <strong>disponible públicamente</strong> en\n" " está web para siempre (<a href=\"%s\">¿por qué?</a>)." -#: locale/model_attributes.rb:60 +#: locale/model_attributes.rb:58 msgid "EximLogDone|Filename" msgstr "EximLogDone|Filename" -#: locale/model_attributes.rb:61 +#: locale/model_attributes.rb:59 msgid "EximLogDone|Last stat" msgstr "EximLogDone|Last stat" @@ -1222,10 +1255,14 @@ msgstr "Dirección de correo para {{public_body}}" msgid "FOI requests" msgstr "Peticiones de información" -#: app/models/track_thing.rb:193 app/models/track_thing.rb:194 +#: app/models/track_thing.rb:266 app/models/track_thing.rb:267 msgid "FOI requests by '{{user_name}}'" msgstr "Peticiones de información por '{{user_name}}'" +#: app/views/general/search.rhtml:199 +msgid "FOI requests {{start_count}} to {{end_count}} of {{total_count}}" +msgstr "Solicitudes {{start_count}} a {{end_count}} de {{total_count}}" + #: app/models/profile_photo.rb:101 msgid "Failed to convert image to a PNG" msgstr "Error al convertir la imagen a PNG" @@ -1238,29 +1275,41 @@ msgstr "" "Error al convertir la imagen al tamaño adecuado: es %{cols}x%{rows}, debería" " ser %{width}x%{height}" -#: app/views/request/new.rhtml:21 -msgid "First," -msgstr "Primero," - -#: app/views/general/frontpage.rhtml:8 +#: app/views/request/select_authority.rhtml:35 msgid "" "First, type in the <strong>name of the UK public authority</strong> you'd \n" " <br>like information from. <strong>By law, they have to respond</strong>\n" " (<a href=\"%s\">why?</a>)." msgstr "" -"Primero, escriba el <strong>nombre del organismo público</strong> al que quiera \n" -" <br>pedir información. <strong>Por ley, están obligados a responder</strong>\n" +"Primero, escriba el <strong>nombre del organismo público</strong> al \n" +" <br>que quiera solicitar información. <strong>Por ley, tienen que responder</strong>\n" " (<a href=\"%s\">¿por qué?</a>)." +#: app/views/track/_tracking_links.rhtml:21 +msgid "Follow by email" +msgstr "Seguir por correo" + +#: app/views/request/list.rhtml:8 +msgid "Follow these requests" +msgstr "Seguir estas solicitudes" + +#: app/views/public_body/show.rhtml:4 +msgid "Follow this authority" +msgstr "Seguir a este organismo" + #: app/views/request_mailer/old_unclassified_updated.rhtml:4 msgid "Follow this link to see the request:" msgstr "Siga este enlace para ver la petición:" -#: app/models/info_request_event.rb:335 +#: app/views/request/_sidebar.rhtml:2 +msgid "Follow this request" +msgstr "Seguir esta solicitud" + +#: app/models/info_request_event.rb:320 msgid "Follow up" msgstr "Seguimiento" -#: app/views/general/search.rhtml:159 +#: app/views/general/search.rhtml:255 msgid "Follow up message sent by requester" msgstr "Respuesta enviada por el creador de la petición" @@ -1274,11 +1323,15 @@ msgid "" "spam. Please <a href=\"{{url}}\">contact us</a> if you are {{user_link}} and" " need to send a follow up." msgstr "" -"Se han bloquedao nuevas respuestas a esta petición para prevenir " -"spam. Por favor <a href=\"{{url}}\">contáctenos</a> si es usted {{user_link}} y" -" necesita responder." +"Se han bloquedao nuevas respuestas a esta petición para prevenir spam. Por " +"favor <a href=\"{{url}}\">contáctenos</a> si es usted {{user_link}} y " +"necesita responder." -#: app/views/public_body/show.rhtml:61 +#: app/views/layouts/default.rhtml:153 +msgid "Follow us on twitter" +msgstr "Síguenos en Twitter" + +#: app/views/public_body/show.rhtml:66 msgid "" "For an unknown reason, it is not possible to make a request to this " "authority." @@ -1289,13 +1342,17 @@ msgstr "" msgid "Forgotten your password?" msgstr "¿Ha olvidado su contraseña?" -#: app/views/public_body/show.rhtml:56 +#: app/views/public_body/list.rhtml:46 +msgid "Found {{count}} public bodies {{description}}" +msgstr "Encontrados {{count}} organismos públicos {{description}}" + +#: app/views/public_body/show.rhtml:61 msgid "" "Freedom of Information law does not apply to this authority, so you cannot make\n" -" a request to it." +" a request to it." msgstr "" -"La ley de acceso a la información no es aplicable a esta institución por lo " -"que no puedes enviar una solicitud." +"La ley de acceso a la información no es aplicable a este organismo, por lo que no puede enviarle\n" +" una solicitud." #: app/views/request/followup_bad.rhtml:11 msgid "Freedom of Information law no longer applies to" @@ -1309,19 +1366,19 @@ msgstr "" "La ley de acceso a la información ya no es aplicable a este organismo. Los " "mensajes de seguimiento de peticiones existentes se envían a " -#: app/views/user/show.rhtml:128 -msgid "Freedom of Information request" -msgstr "Petición de acceso a la información" - -#: app/views/public_body/show.rhtml:98 +#: app/views/public_body/show.rhtml:118 msgid "Freedom of Information requests made" msgstr "Peticiones de acceso a información realizadas" -#: app/views/user/show.rhtml:121 app/views/user/show.rhtml:140 -msgid "Freedom of Information requests made by" -msgstr "Peticiones de acceso a información hechas por" +#: app/views/user/show.rhtml:155 +msgid "Freedom of Information requests made by this person" +msgstr "Solicitudes de información realizadas por esta persona" + +#: app/views/user/show.rhtml:155 +msgid "Freedom of Information requests made by you" +msgstr "Solicitudes de información realizadas por usted" -#: app/views/public_body/show.rhtml:72 +#: app/views/public_body/show.rhtml:76 msgid "Freedom of Information requests made using this site" msgstr "Peticiones de acceso a información realizadas por esta web" @@ -1335,31 +1392,31 @@ msgstr "" " responder a la petición en general. Si necesita hacerlo y tiene una dirección de\n" " correo válida, por favor <a href=\"%s\">mándenosla</a>." -#: app/models/outgoing_message.rb:73 +#: app/models/outgoing_message.rb:74 msgid "GIVE DETAILS ABOUT YOUR COMPLAINT HERE" msgstr "DETALLE SU QUEJA AQUÍ" -#: app/views/general/exception_caught.rhtml:14 -msgid "Go to our <a href=\"%s\">front page</a></li>" -msgstr "Ir a la <a href=\"%s\">página de inicio</a></li>" +#: lib/world_foi_websites.rb:25 +msgid "Germany" +msgstr "Alemania" -#: app/models/info_request_event.rb:297 -msgid "Handled by post" -msgstr "Resuelta por correo ordinario" - -#: app/models/info_request.rb:801 +#: app/models/info_request.rb:803 msgid "Handled by post." msgstr "Resuelta por correo ordinario" -#: app/views/layouts/default.rhtml:102 -msgid "Hello!" -msgstr "¡Hola!" +#: app/controllers/services_controller.rb:21 +msgid "" +"Hello! You can make Freedom of Information requests within {{country_name}} " +"at {{link_to_website}}" +msgstr "" +"¡Hola! Puede hacer solicitudes de información en {{country_name}} usando " +"{{link_to_website}}" -#: app/views/layouts/default.rhtml:99 +#: app/views/layouts/default.rhtml:98 msgid "Hello, {{username}}!" msgstr "¡Hola, {{username}}!" -#: app/views/layouts/default.rhtml:94 +#: app/views/layouts/default.rhtml:130 msgid "Help" msgstr "Ayuda" @@ -1386,27 +1443,31 @@ msgstr "" " no nos ha dicho si tuvo o no éxito. ¿Le importaría invertir unos minutos\n" " en leerla y ayudarnos a clasificarla para el beneficio de todos? Gracias." -#: locale/model_attributes.rb:57 +#: locale/model_attributes.rb:55 msgid "Holiday|Day" msgstr "Holiday|Day" -#: locale/model_attributes.rb:58 +#: locale/model_attributes.rb:56 msgid "Holiday|Description" msgstr "Holiday|Description" -#: app/views/public_body/show.rhtml:7 +#: app/views/layouts/default.rhtml:125 +msgid "Home" +msgstr "Inicio" + +#: app/views/public_body/show.rhtml:12 msgid "Home page of authority" msgstr "Sitio web del organismo" -#: app/views/request/new.rhtml:63 +#: app/views/request/new.rhtml:61 msgid "" "However, you have the right to request environmental\n" -" information under a different law" +" information under a different law" msgstr "" -"En cambio, tiene derecho a pedir información medioambiental\n" -" bajo la cobertura de otra ley" +"En cambio, tiene derecho a solicitar información\n" +" medioambiental bajo otra ley" -#: app/views/request/new.rhtml:73 +#: app/views/request/new.rhtml:71 msgid "Human health and safety" msgstr "Salud y seguridad" @@ -1503,7 +1564,7 @@ msgstr "" "Si la petición es suya, puede <a href=\"%s\">abrir una sesión</a> para " "verla." -#: app/views/request/new.rhtml:119 +#: app/views/request/new.rhtml:121 msgid "" "If you are thinking of using a pseudonym,\n" " please <a href=\"%s\">read this first</a>." @@ -1525,7 +1586,7 @@ msgstr "" "</strong> en el correo. A continuación, <strong>péguelo en su navegador</strong>, en el lugar\n" "dónde escribe la dirección de cualquier otra página web." -#: app/views/request/show_response.rhtml:49 +#: app/views/request/show_response.rhtml:47 msgid "" "If you can, scan in or photograph the response, and <strong>send us\n" " a copy to upload</strong>." @@ -1549,7 +1610,7 @@ msgstr "" "Si recibió el correo <strong>hace más de seis meses</strong>, entonces el enlace ya no funcionará.\n" "Por favor intente hacer lo que estaba haciendo inicialmente." -#: app/controllers/request_controller.rb:437 +#: app/controllers/request_controller.rb:436 msgid "" "If you have not done so already, please write a message below telling the " "authority that you have withdrawn your request. Otherwise they will not know" @@ -1592,15 +1653,15 @@ msgstr "" "Si su navegador acepta cookies y está viendo este mensaje,\n" "puede que haya un problema en nuestro servidor." -#: locale/model_attributes.rb:63 +#: locale/model_attributes.rb:61 msgid "IncomingMessage|Cached attachment text clipped" msgstr "IncomingMessage|Cached attachment text clipped" -#: locale/model_attributes.rb:64 +#: locale/model_attributes.rb:62 msgid "IncomingMessage|Cached main body text folded" msgstr "IncomingMessage|Cached main body text folded" -#: locale/model_attributes.rb:65 +#: locale/model_attributes.rb:63 msgid "IncomingMessage|Cached main body text unfolded" msgstr "IncomingMessage|Cached main body text unfolded" @@ -1628,59 +1689,55 @@ msgstr "InfoRequestEvent|Params yaml" msgid "InfoRequestEvent|Prominence" msgstr "InfoRequestEvent|Prominence" -#: locale/model_attributes.rb:86 +#: locale/model_attributes.rb:85 msgid "InfoRequest|Allow new responses from" msgstr "InfoRequest|Allow new responses from" -#: locale/model_attributes.rb:82 +#: locale/model_attributes.rb:81 msgid "InfoRequest|Awaiting description" msgstr "InfoRequest|Awaiting description" -#: locale/model_attributes.rb:81 +#: locale/model_attributes.rb:80 msgid "InfoRequest|Described state" msgstr "InfoRequest|Described state" -#: locale/model_attributes.rb:87 +#: locale/model_attributes.rb:86 msgid "InfoRequest|Handle rejected responses" msgstr "InfoRequest|Handle rejected responses" -#: locale/model_attributes.rb:85 +#: locale/model_attributes.rb:87 +msgid "InfoRequest|Idhash" +msgstr "InfoRequest|Idhash" + +#: locale/model_attributes.rb:84 msgid "InfoRequest|Law used" msgstr "InfoRequest|Law used" -#: locale/model_attributes.rb:83 +#: locale/model_attributes.rb:82 msgid "InfoRequest|Prominence" msgstr "InfoRequest|Prominence" -#: locale/model_attributes.rb:80 +#: locale/model_attributes.rb:79 msgid "InfoRequest|Title" msgstr "InfoRequest|Title" -#: locale/model_attributes.rb:84 +#: locale/model_attributes.rb:83 msgid "InfoRequest|Url title" msgstr "InfoRequest|Url title" -#: app/models/info_request_event.rb:303 -msgid "Information not held" -msgstr "Información no disponible" - -#: app/models/info_request.rb:791 +#: app/models/info_request.rb:793 msgid "Information not held." msgstr "Información no disponible." -#: app/views/request/new.rhtml:71 +#: app/views/request/new.rhtml:69 msgid "" "Information on emissions and discharges (e.g. noise, energy,\n" -" radiation, waste materials)" +" radiation, waste materials)" msgstr "" "Información sobre emisiones (por ejemplo ruido, energía,\n" " radiación, materiales de desecho...)" -#: app/models/info_request_event.rb:311 -msgid "Internal review acknowledgement" -msgstr "Acuse de recibo de revisión interna" - -#: app/models/info_request_event.rb:328 +#: app/models/info_request_event.rb:313 msgid "Internal review request" msgstr "Petición de revisión interna" @@ -1689,8 +1746,9 @@ msgid "" "Is {{email_address}} the wrong address for {{type_of_request}} requests to " "{{public_body_name}}? If so, please contact us using this form:" msgstr "" -"¿Es {{email_address}} la dirección incorrecta para peticiones {{type_of_request}} a " -"{{public_body_name}}? Si es así, por favor contáctenos usando el siguiente formulario:" +"¿Es {{email_address}} la dirección incorrecta para peticiones " +"{{type_of_request}} a {{public_body_name}}? Si es así, por favor contáctenos" +" usando el siguiente formulario:" #: app/views/user/no_cookies.rhtml:8 msgid "" @@ -1710,7 +1768,7 @@ msgstr "Registrado el" msgid "Joined {{site_name}} in" msgstr "Registrado en {{site_name}} el" -#: app/views/request/new.rhtml:48 +#: app/views/request/new.rhtml:104 msgid "" "Keep it <strong>focused</strong>, you'll be more likely to get what you want" " (<a href=\"%s\">why?</a>)." @@ -1718,6 +1776,14 @@ msgstr "" "Sea <strong>específico</strong>, tendrá más probabilidades de conseguir lo " "que quiere (<a href=\"%s\">¿por qué?</a>)." +#: app/views/request/_request_filter_form.rhtml:6 +msgid "Keywords" +msgstr "Términos" + +#: lib/world_foi_websites.rb:9 +msgid "Kosovo" +msgstr "Kosovo" + #: app/views/contact_mailer/message.rhtml:10 msgid "Last authority viewed: " msgstr "Ultimo organismo visitado: " @@ -1740,7 +1806,7 @@ msgstr "" msgid "Link to this" msgstr "Enlace" -#: app/views/public_body/list.rhtml:32 +#: app/views/public_body/list.rhtml:31 msgid "List of all authorities (CSV)" msgstr "Lista de todos los organismos (CSV)" @@ -1748,34 +1814,49 @@ msgstr "Lista de todos los organismos (CSV)" msgid "Local and regional" msgstr "Local y regional" -#: app/models/info_request.rb:789 +#: app/models/info_request.rb:791 msgid "Long overdue." msgstr "Muy retrasada." -#: app/views/public_body/show.rhtml:47 -msgid "Make a new Environmental Information request" -msgstr "Haga una nueva petición de información medioambiental" +#: app/views/request/_request_filter_form.rhtml:23 +msgid "Made between" +msgstr "Realizadas entre" + +#: app/views/public_body/show.rhtml:53 +msgid "Make a new <strong>Environmental Information</strong> request" +msgstr "" +"Envíe una nueva <strong>solicitud de información medioambiental</strong>" + +#: app/views/public_body/show.rhtml:55 +msgid "" +"Make a new <strong>Freedom of Information</strong> request to " +"{{public_body}}" +msgstr "" +"Hacer una nueva <strong>solicitud de información</strong> a {{public_body}}" + +#: app/views/general/frontpage.rhtml:5 +msgid "" +"Make a new<br/>\n" +" <strong>Freedom <span>of</span><br/>\n" +" Information<br/>\n" +" request</strong>" +msgstr "" +"Envíe una nueva<br/>\n" +" <strong>Solicitud <span>de</span><br/>\n" +" información</strong>" + +#: app/views/layouts/default.rhtml:126 +msgid "Make a request" +msgstr "Enviar solicitud" -#: app/views/request/new.rhtml:1 +#: app/views/request/new.rhtml:20 msgid "Make an {{law_used_short}} request to '{{public_body_name}}'" msgstr "Hacer una petición {{law_used_short}} a '{{public_body_name}}'" -#: app/views/layouts/default.rhtml:15 +#: app/views/layouts/default.rhtml:15 app/views/layouts/no_chrome.rhtml:8 msgid "Make and browse Freedom of Information (FOI) requests" msgstr "Realiza una petición de información o mira las ya realizadas" -#: app/views/layouts/default.rhtml:67 -msgid "Make and explore Freedom of Information requests" -msgstr "Realiza una petición de información o mira las ya realizadas" - -#: app/views/general/frontpage.rhtml:4 -msgid "Make or explore Freedom of Information requests" -msgstr "Realiza una petición de información o mira las ya realizadas" - -#: app/views/layouts/default.rhtml:87 -msgid "Make request" -msgstr "Realizar petición" - #: app/views/public_body/_body_listing_single.rhtml:23 msgid "Make your own request" msgstr "Hacer mi propia petición" @@ -1788,26 +1869,22 @@ msgstr "Mensaje enviado usando {{site_name}}, " msgid "Missing contact details for '" msgstr "Faltan datos de contacto para '" -#: app/views/public_body/show.rhtml:5 +#: app/views/public_body/show.rhtml:10 msgid "More about this authority" msgstr "Más información sobre este organismo" -#: app/views/general/frontpage.rhtml:41 -msgid "More authorities..." -msgstr "Más organismos..." - -#: app/views/general/frontpage.rhtml:55 +#: app/views/general/frontpage.rhtml:68 msgid "More successful requests..." msgstr "Más peticiones realizadas con éxito..." +#: app/views/layouts/default.rhtml:101 +msgid "My profile" +msgstr "Mi perfil" + #: app/views/request/_describe_state.rhtml:64 msgid "My request has been <strong>refused</strong>" msgstr "Mi petición ha sido <strong>rechazada</strong>" -#: app/views/layouts/default.rhtml:91 -msgid "My requests" -msgstr "Mis peticiones" - #: app/models/public_body.rb:36 msgid "Name can't be blank" msgstr "El nombre no puede estar vacío" @@ -1816,10 +1893,14 @@ msgstr "El nombre no puede estar vacío" msgid "Name is already taken" msgstr "El nombre ya está siendo utilizado" -#: app/models/track_thing.rb:142 app/models/track_thing.rb:143 +#: app/models/track_thing.rb:215 app/models/track_thing.rb:216 msgid "New Freedom of Information requests" msgstr "Nuevas peticiones de acceso a información" +#: lib/world_foi_websites.rb:21 +msgid "New Zealand" +msgstr "Nueva Zelanda" + #: app/views/user/signchangeemail.rhtml:20 msgid "New e-mail:" msgstr "Nueva dirección:" @@ -1836,39 +1917,47 @@ msgstr "Nueva contraseña:" msgid "New password: (again)" msgstr "Nueva contraseña: (de nuevo)" -#: app/views/request/show_response.rhtml:62 +#: app/views/request/show_response.rhtml:60 msgid "New response to your request" msgstr "Nueva respuesta a su petición" -#: app/views/request/show_response.rhtml:68 +#: app/views/request/show_response.rhtml:66 msgid "New response to {{law_used_short}} request" msgstr "Nueva respuesta a su petición {{law_used_short}}" -#: app/views/general/search.rhtml:40 +#: app/models/track_thing.rb:199 app/models/track_thing.rb:200 +msgid "New updates for the request '{{request_title}}'" +msgstr "Actualizaciones para la solicitud '{{request_title}}'" + +#: app/views/general/search.rhtml:130 msgid "Newest results first" msgstr "Resultados recientes primero" +#: app/views/general/_localised_datepicker.rhtml:6 +msgid "Next" +msgstr "Siguiente" + #: app/views/user/set_draft_profile_photo.rhtml:32 msgid "Next, crop your photo >>" msgstr "Ahora, recorte su foto >>" -#: app/views/general/search.rhtml:16 -msgid "Next, select the public authority you'd like to make the request from." -msgstr "Ahora, elige el organismo al que le quiere enviar su petición." - -#: app/views/general/search.rhtml:48 +#: app/views/general/search.rhtml:168 msgid "No public authorities found" msgstr "No se han encontrado organismos" -#: app/views/request/list.rhtml:23 +#: app/views/request/list.rhtml:19 msgid "No requests of this sort yet." msgstr "No existen peticiones de este tipo todavía." +#: app/views/public_body/_search_ahead.rhtml:8 +msgid "No results found." +msgstr "No se han encontrado resultados." + #: app/views/request/similar.rhtml:7 msgid "No similar requests found." msgstr "No se han encontrado peticiones similares." -#: app/views/public_body/show.rhtml:73 +#: app/views/public_body/show.rhtml:77 msgid "" "Nobody has made any Freedom of Information requests to {{public_body_name}} " "using this site yet." @@ -1876,11 +1965,15 @@ msgstr "" "Nadie ha realizado todavía una petición de información a " "{{public_body_name}} usando esta web." -#: app/views/public_body/_body_listing.rhtml:2 +#: app/views/public_body/_body_listing.rhtml:3 #: app/views/request/_request_listing.rhtml:2 msgid "None found." msgstr "No se han encontrado resultados." +#: app/views/user/show.rhtml:165 app/views/user/show.rhtml:185 +msgid "None made." +msgstr "Ninguno/a." + #: app/views/user/signchangeemail_confirm.rhtml:3 #: app/views/user/signchangepassword_confirm.rhtml:1 #: app/views/user/signchangepassword_confirm.rhtml:3 @@ -1899,23 +1992,11 @@ msgstr "Ahora revise su mensaje" msgid "Now preview your message asking for an internal review" msgstr "Ahora revise su mensaje pidiendo una revisión interna" -#: app/views/request/preview.rhtml:5 -msgid "Now preview your request" -msgstr "Ahora revise su petición" - #: app/views/user/set_draft_profile_photo.rhtml:46 msgid "OR remove the existing photo" msgstr "O borre la foto actual" -#: app/views/general/frontpage.rhtml:25 -msgid "" -"OR, <strong>search</strong> for information others have requested using " -"{{site_name}}" -msgstr "" -"O, <strong>busca</strong> en la información que otros han solicitado usando " -"{{site_name}}" - -#: app/controllers/request_controller.rb:414 +#: app/controllers/request_controller.rb:413 msgid "" "Oh no! Sorry to hear that your request was refused. Here is what to do now." msgstr "" @@ -1941,12 +2022,19 @@ msgstr "La dirección de correo antigua no parece válida" msgid "On this page" msgstr "En esta página" -#: app/views/general/search.rhtml:71 -msgid "One public authority matching ‘{{user_search_query}}’" -msgstr "" -"Un organismo público coincide con ‘{{user_search_query}}’" +#: app/views/general/search.rhtml:197 +msgid "One FOI request found" +msgstr "Una solicitud encontrada" + +#: app/views/general/search.rhtml:179 +msgid "One person found" +msgstr "Una persona encontrada" -#: app/views/public_body/show.rhtml:91 +#: app/views/general/search.rhtml:155 +msgid "One public authority found" +msgstr "Un organismo público encontrado" + +#: app/views/public_body/show.rhtml:111 msgid "Only requests made using {{site_name}} are shown." msgstr "Sólo se muestran las peticiones realizadas con {{site_name}}." @@ -1963,13 +2051,21 @@ msgid "" "Only the authority can reply to this request, but there is no \"From\" " "address to check against" msgstr "" -"Sólo el organismo puede responder a esta petición, pero no hay un campo \"From\" " -"contra el que comparar" +"Sólo el organismo puede responder a esta petición, pero no hay un campo " +"\"From\" contra el que comparar" + +#: app/views/request/_search_ahead.rhtml:10 +msgid "Or search in their website for this information." +msgstr "O busque esta información en su web." -#: app/views/general/search.rhtml:158 +#: app/views/general/search.rhtml:254 msgid "Original request sent" msgstr "Petición original enviada" +#: app/views/request/_describe_state.rhtml:71 +msgid "Other:" +msgstr "Otros:" + #: locale/model_attributes.rb:26 msgid "OutgoingMessage|Body" msgstr "OutgoingMessage|Body" @@ -1990,7 +2086,7 @@ msgstr "OutgoingMessage|Status" msgid "OutgoingMessage|What doing" msgstr "OutgoingMessage|What doing" -#: app/models/info_request.rb:795 +#: app/models/info_request.rb:797 msgid "Partially successful." msgstr "Éxito parcial." @@ -2006,11 +2102,15 @@ msgstr "Contraseña:" msgid "Password: (again)" msgstr "Contraseña: (de nuevo)" +#: app/views/general/search.rhtml:181 +msgid "People {{start_count}} to {{end_count}} of {{total_count}}" +msgstr "Personas {{start_count}} a {{end_count}} de {{total_count}}" + #: app/views/user/set_draft_profile_photo.rhtml:13 msgid "Photo of you:" msgstr "Foto:" -#: app/views/request/new.rhtml:76 +#: app/views/request/new.rhtml:74 msgid "Plans and administrative measures that affect these matters" msgstr "Planes y medidas administrativas que afecten a estos temas" @@ -2054,12 +2154,12 @@ msgid "" "not in your original request, then <a href=\"{{new_request_link}}\">file a " "new request</a>." msgstr "" -"Por favor escriba <strong>sólo</strong> mensajes directamente relacionados con su " -"petición {{request_link}}. Si quiere pedir información que no estaba " -"en su petición original, entonces <a href=\"{{new_request_link}}\">envíe una " -"nueva petición</a>." +"Por favor escriba <strong>sólo</strong> mensajes directamente relacionados " +"con su petición {{request_link}}. Si quiere pedir información que no estaba " +"en su petición original, entonces <a href=\"{{new_request_link}}\">envíe una" +" nueva petición</a>." -#: app/views/request/new.rhtml:60 +#: app/views/request/new.rhtml:58 msgid "Please ask for environmental information only" msgstr "Por favor pida información medio-ambiental solamente" @@ -2075,16 +2175,21 @@ msgstr "" msgid "Please choose a file containing your photo." msgstr "Por favor elige el fichero que contiene tu foto" -#: app/models/outgoing_message.rb:162 +#: app/models/outgoing_message.rb:163 msgid "Please choose what sort of reply you are making." msgstr "Por favor, elija el tipo de respuesta que está creando." -#: app/controllers/request_controller.rb:346 +#: app/controllers/request_controller.rb:345 msgid "" "Please choose whether or not you got some of the information that you " "wanted." msgstr "Por favor indique si ha recibido o no la información que quería." +#: app/views/track_mailer/event_digest.rhtml:63 +msgid "Please click on the link below to cancel or alter these emails." +msgstr "" +"Por favor use el siguiente enlace para cancelar o editar estos correos." + #: app/views/user_mailer/changeemail_confirm.rhtml:3 msgid "" "Please click on the link below to confirm that you want to \n" @@ -2133,7 +2238,7 @@ msgstr "Por favor, introduzca un asunto" msgid "Please enter a summary of your request" msgstr "Por favor, introduzca un resumen de su petición" -#: app/models/user.rb:106 +#: app/models/user.rb:115 msgid "Please enter a valid email address" msgstr "Por favor, introduzca una dirección de correo válida" @@ -2153,11 +2258,11 @@ msgstr "Por favor, introduzca su comentario" msgid "Please enter your email address" msgstr "Por favor, introduzca su dirección de correo" -#: app/models/outgoing_message.rb:147 +#: app/models/outgoing_message.rb:148 msgid "Please enter your follow up message" msgstr "Por favor, introduzca su mensaje" -#: app/models/outgoing_message.rb:150 +#: app/models/outgoing_message.rb:151 msgid "Please enter your letter requesting information" msgstr "Por favor, introduzca su petición de información" @@ -2165,7 +2270,7 @@ msgstr "Por favor, introduzca su petición de información" msgid "Please enter your name" msgstr "Por favor, introduzca su nombre" -#: app/models/user.rb:109 +#: app/models/user.rb:118 msgid "Please enter your name, not your email address, in the name field." msgstr "" "Por favor, introduzca su nombre - no su dirección de correo - en el campo " @@ -2183,7 +2288,7 @@ msgstr "Por favor, introduzca su antigua dirección de correo" msgid "Please enter your password" msgstr "Por favor, introduzca su contraseña" -#: app/models/outgoing_message.rb:145 +#: app/models/outgoing_message.rb:146 msgid "Please give details explaining why you want a review" msgstr "Por favor, explica por qué quiere una revisión" @@ -2199,13 +2304,14 @@ msgstr "" "Por favor, mantenga el resumen corto, como en el asunto de un correo " "electrónico" -#: app/views/request/new.rhtml:79 +#: app/views/request/new.rhtml:77 msgid "" "Please only request information that comes under those categories, <strong>do not waste your\n" -" time</strong> or the time of the public authority by requesting unrelated information." +" time</strong> or the time of the public authority by requesting unrelated information." msgstr "" -"Por favor, pida información sólo de estas categorias, <strong>no pierda su tiempo\n" -" </strong> o el del organismo público pidiendo información no relacionada." +"Por favor, pida información sólo de estas categorias, <strong>no pierda su " +"tiempo </strong> o el del organismo público pidiendo información no " +"relacionada." #: app/views/request/new_please_describe.rhtml:5 msgid "" @@ -2215,7 +2321,7 @@ msgstr "" "Por favor elija estas peticiones una a una, y <strong>haz que se sepa</strong>\n" "si han tenido éxito o no." -#: app/models/outgoing_message.rb:156 +#: app/models/outgoing_message.rb:157 msgid "" "Please sign at the bottom with your name, or alter the \"%{signoff}\" " "signature" @@ -2227,12 +2333,12 @@ msgstr "" msgid "Please sign in as " msgstr "Por favor abre una sesión como " -#: app/controllers/request_controller.rb:730 +#: app/controllers/request_controller.rb:734 msgid "Please type a message and/or choose a file containing your response." msgstr "" "Por favor escriba un mensaje y/o escoja un fichero conteniendo su respuesta." -#: app/controllers/request_controller.rb:434 +#: app/controllers/request_controller.rb:433 msgid "Please use the form below to tell us more." msgstr "Por favor use el formulario a continuación para decirnos más." @@ -2263,7 +2369,7 @@ msgstr "" "Por favor, escriba su comentario usando letras mayúsculas y minúsculas para " "facilitar su lectura" -#: app/controllers/request_controller.rb:423 +#: app/controllers/request_controller.rb:422 msgid "" "Please write your follow up message containing the necessary clarifications " "below." @@ -2271,7 +2377,7 @@ msgstr "" "Por favor escriba su mensaje conteniendo las aclaraciones necesarias a " "continuación." -#: app/models/outgoing_message.rb:159 +#: app/models/outgoing_message.rb:160 msgid "" "Please write your message using a mixture of capital and lower case letters." " This makes it easier for others to read." @@ -2287,37 +2393,45 @@ msgstr "" "Haga referencia a <strong>información relacionada</strong>, campañas o foros" " que puedan ser útiles." +#: app/views/request/_search_ahead.rhtml:3 +msgid "Possibly related requests:" +msgstr "Posibles solicitudes relacionadas:" + #: app/views/comment/preview.rhtml:21 msgid "Post annotation" msgstr "Enviar comentario" -#: locale/model_attributes.rb:55 +#: locale/model_attributes.rb:53 msgid "PostRedirect|Circumstance" msgstr "PostRedirect|Circumstance" -#: locale/model_attributes.rb:53 +#: locale/model_attributes.rb:51 msgid "PostRedirect|Email token" msgstr "PostRedirect|Email token" -#: locale/model_attributes.rb:52 +#: locale/model_attributes.rb:50 msgid "PostRedirect|Post params yaml" msgstr "PostRedirect|Post params yaml" -#: locale/model_attributes.rb:54 +#: locale/model_attributes.rb:52 msgid "PostRedirect|Reason params yaml" msgstr "PostRedirect|Reason params yaml" -#: locale/model_attributes.rb:50 +#: locale/model_attributes.rb:48 msgid "PostRedirect|Token" msgstr "PostRedirect|Token" -#: locale/model_attributes.rb:51 +#: locale/model_attributes.rb:49 msgid "PostRedirect|Uri" msgstr "PostRedirect" #: app/views/general/_credits.rhtml:1 -msgid "Powered by <a href=\"http://www.alaveteli.org/\">Alaveteli</a>." -msgstr "Basado en <a href=\"http://www.alaveteli.org/\">Alaveteli</a>." +msgid "Powered by <a href=\"http://www.alaveteli.org/\">Alaveteli</a>" +msgstr "Basado en <a href=\"http://www.alaveteli.org/\">Alaveteli</a>" + +#: app/views/general/_localised_datepicker.rhtml:5 +msgid "Prev" +msgstr "Anterior" #: app/views/request/followup_preview.rhtml:1 msgid "Preview follow up to '" @@ -2335,7 +2449,7 @@ msgstr "Revise su comentario" msgid "Preview your message" msgstr "Revise su mensaje" -#: app/views/request/new.rhtml:139 +#: app/views/request/new.rhtml:141 msgid "Preview your public request" msgstr "Revise su petición pública" @@ -2348,16 +2462,17 @@ msgid "ProfilePhoto|Draft" msgstr "ProfilePhoto|Draft" #: app/views/public_body/list.rhtml:37 +msgid "Public authorities" +msgstr "Organismos públicos" + +#: app/views/public_body/list.rhtml:35 msgid "Public authorities - {{description}}" msgstr "Organismos públicos - {{description}}" -#: app/views/general/search.rhtml:73 -msgid "" -"Public authorities {{start_count}} to {{end_count}} of {{total_count}} for " -"{{user_search_query}}" +#: app/views/general/search.rhtml:157 +msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "" -"Organismos {{start_count}} a {{end_count}} de {{total_count}} para " -"{{user_search_query}}" +"Organismos públicos {{start_count}} a {{end_count}} de {{total_count}}" #: locale/model_attributes.rb:12 msgid "PublicBody|First letter" @@ -2403,13 +2518,17 @@ msgstr "Dirección web" msgid "PublicBody|Version" msgstr "Versión" -#: app/views/public_body/show.rhtml:10 +#: app/views/public_body/show.rhtml:15 msgid "Publication scheme" msgstr "Esquema de publicación" -#: locale/model_attributes.rb:48 -msgid "RawEmail|Data binary" -msgstr "RawEmail|Data binary" +#: app/views/track/_tracking_links.rhtml:26 +msgid "RSS feed" +msgstr "RSS" + +#: app/views/track/_tracking_links.rhtml:26 +msgid "RSS feed of updates" +msgstr "Actualizaciones RSS" #: app/views/comment/preview.rhtml:20 msgid "Re-edit this annotation" @@ -2419,51 +2538,28 @@ msgstr "Editar este comentario" msgid "Re-edit this message" msgstr "Editar este mensaje" -#: app/views/request/preview.rhtml:40 -msgid "Re-edit this request" -msgstr "Editar esta petición" - -#: app/views/general/search.rhtml:137 +#: app/views/general/search.rhtml:233 msgid "" "Read about <a href=\"{{advanced_search_url}}\">advanced search " "operators</a>, such as proximity and wildcards." msgstr "" -"Lea más sobre <a href=\"{{advanced_search_url}}\">operadores avanzados " -"de búsqueda</a>, como indicadores de proximidad y comodines." +"Lea más sobre <a href=\"{{advanced_search_url}}\">operadores avanzados de " +"búsqueda</a>, como indicadores de proximidad y comodines." -#: app/views/layouts/default.rhtml:93 +#: app/views/layouts/default.rhtml:129 msgid "Read blog" msgstr "Leer el blog" -#: app/views/request/new.rhtml:16 -msgid "Read this before writing your {{info_request_law_used_full}} request" -msgstr "Lea esto antes de escribir su petición {{info_request_law_used_full}}" - -#: app/views/general/search.rhtml:150 +#: app/views/general/search.rhtml:246 msgid "Received an error message, such as delivery failure." -msgstr "Se ha recibido un mensaje de error, como fallo al entregar el mensaje." +msgstr "" +"Se ha recibido un mensaje de error, como fallo al entregar el mensaje." -#: app/views/general/search.rhtml:42 +#: app/views/general/search.rhtml:132 msgid "Recently described results first" msgstr "Resultados descritos recientemente primero" -#: app/controllers/request_controller.rb:139 -msgid "Recently sent Freedom of Information requests" -msgstr "Peticiones de acceso a la información enviadas recientemente" - -#: app/views/request/list.rhtml:6 -msgid "Recently sent requests" -msgstr "Peticiones enviadas recientemente" - -#: app/controllers/request_controller.rb:144 -msgid "Recently successful responses" -msgstr "Respuestas exitosas recientes" - -#: app/models/info_request_event.rb:305 -msgid "Refused" -msgstr "Rechazada" - -#: app/models/info_request.rb:793 +#: app/models/info_request.rb:795 msgid "Refused." msgstr "Rechazada." @@ -2495,14 +2591,14 @@ msgstr "Pida una revisión interna de" msgid "Request has been removed" msgstr "La petición ha sido eliminada" -#: app/views/request/_request_listing_via_event.rhtml:28 +#: app/views/request/_request_listing_via_event.rhtml:20 msgid "" "Request sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "" "Petición enviada a {{public_body_name}} por {{info_request_user}} el " "{{date}}." -#: app/views/request/_request_listing_via_event.rhtml:36 +#: app/views/request/_request_listing_via_event.rhtml:28 msgid "" "Request to {{public_body_name}} by {{info_request_user}}. Annotated by " "{{event_comment_user}} on {{date}}." @@ -2519,9 +2615,9 @@ msgstr "Petición a {{public_body_name}} de {{info_request_user}} el {{date}}" msgid "Requested on {{date}}" msgstr "Pedida el {{date}}" -#: app/models/track_thing.rb:209 app/models/track_thing.rb:210 -msgid "Requests or responses matching '{{query}}'" -msgstr "Peticiones o respuestas coincidiendo con '{{query}}'" +#: app/models/track_thing.rb:282 app/models/track_thing.rb:283 +msgid "Requests or responses matching your saved search" +msgstr "Solicitudes o respuestas para su búsqueda guardada" #: app/views/request/upload_response.rhtml:11 msgid "Respond by email" @@ -2539,7 +2635,11 @@ msgstr "Contestar la petición" msgid "Respond using the web" msgstr "Contestar vía web" -#: app/views/general/search.rhtml:160 +#: app/models/info_request_event.rb:306 +msgid "Response" +msgstr "Respuesta" + +#: app/views/general/search.rhtml:256 msgid "Response from a public authority" msgstr "Respuesta de un organismo público" @@ -2551,7 +2651,7 @@ msgstr "La respuesta a esta petición está <strong>retrasada</strong>." msgid "Response to this request is <strong>long overdue</strong>." msgstr "La respuesta a esta petición está <strong>muy retrasada</strong>." -#: app/views/request/show_response.rhtml:64 +#: app/views/request/show_response.rhtml:62 msgid "Response to your request" msgstr "Respuesta a su petición" @@ -2559,7 +2659,11 @@ msgstr "Respuesta a su petición" msgid "Response:" msgstr "Respuesta:" -#: app/views/general/search.rhtml:9 +#: app/views/general/search.rhtml:88 +msgid "Restrict to" +msgstr "Filtrar por" + +#: app/views/general/search.rhtml:12 msgid "Results page {{page_number}}" msgstr "Página de resultados {{page_number}}" @@ -2567,21 +2671,63 @@ msgstr "Página de resultados {{page_number}}" msgid "Save" msgstr "Guardar" -#: app/views/general/exception_caught.rhtml:10 -#: app/views/general/frontpage.rhtml:16 app/views/general/search.rhtml:29 -#: app/views/layouts/default.rhtml:80 app/views/request/new.rhtml:31 +#: app/views/general/exception_caught.rhtml:12 +#: app/views/general/frontpage.rhtml:24 app/views/general/search.rhtml:32 +#: app/views/general/search.rhtml:45 app/views/public_body/list.rhtml:42 +#: app/views/request/_request_filter_form.rhtml:49 +#: app/views/request/select_authority.rhtml:41 msgid "Search" msgstr "Buscar" -#: app/views/general/search.rhtml:4 +#: app/views/general/search.rhtml:8 msgid "Search Freedom of Information requests, public authorities and users" msgstr "Buscar peticiones de información, organismos públicos y usuarios" -#: app/views/general/exception_caught.rhtml:7 +#: app/views/user/show.rhtml:125 +msgid "Search contributions by this person" +msgstr "Buscar aportaciones de esta persona" + +#: app/views/request/_request_filter_form.rhtml:11 +msgid "Search for words in:" +msgstr "Buscar palabras en:" + +#: app/views/general/search.rhtml:100 +msgid "Search in" +msgstr "Buscar en" + +#: app/views/general/frontpage.rhtml:15 +msgid "" +"Search over<br/>\n" +" <strong>{{number_of_requests}} requests</strong> <span>and</span><br/>\n" +" <strong>{{number_of_authorities}} authorities</strong>" +msgstr "" +"Busque entre<br/>\n" +" <strong>{{number_of_requests}} solicitudes</strong> <span>y</span><br/>\n" +" <strong>{{number_of_authorities}} organismos</strong>" + +#: app/views/general/exception_caught.rhtml:9 msgid "Search the site to find what you were looking for." msgstr "Buscar en esta web para encontrar lo que busca." -#: app/controllers/user_controller.rb:331 +#: app/views/public_body/show.rhtml:86 +msgid "Search within the %d Freedom of Information requests to %s" +msgid_plural "Search within the %d Freedom of Information requests made to %s" +msgstr[0] "Busque en la %d solicitud de información hecha a %s" +msgstr[1] "Busque entre las %d solicitudes de información hechas a %s" + +#: app/views/user/show.rhtml:123 +msgid "Search your contributions" +msgstr "Busque sus aportaciones" + +#: app/views/public_body/_search_ahead.rhtml:5 +msgid "Select one to see more information about the authority." +msgstr "Elija uno para ver más información sobre el organismo." + +#: app/views/request/select_authority.rhtml:27 +msgid "Select the authority to write to" +msgstr "Elija el organismo al que escribir" + +#: app/controllers/user_controller.rb:349 msgid "Send a message to " msgstr "Enviar un mensaje a " @@ -2606,8 +2752,8 @@ msgid "Send message to " msgstr "Enviar un mensaje a " #: app/views/request/preview.rhtml:41 -msgid "Send public " -msgstr "Enviar público " +msgid "Send request" +msgstr "Enviar solicitud" #: app/views/user/show.rhtml:53 msgid "Set your profile photo" @@ -2617,15 +2763,19 @@ msgstr "Cambiar foto de perfil" msgid "Short name is already taken" msgstr "Nombre de usuario ya en uso" -#: app/views/general/search.rhtml:38 +#: app/views/general/search.rhtml:128 msgid "Show most relevant results first" msgstr "Muestra resultados más relevantes primero" -#: app/views/public_body/list.rhtml:3 app/views/request/list.rhtml:2 +#: app/views/public_body/list.rhtml:2 msgid "Show only..." msgstr "Mostrar sólo..." -#: app/views/user/_signin.rhtml:31 app/views/user/show.rhtml:113 +#: app/views/general/search.rhtml:52 +msgid "Showing" +msgstr "Mostrando" + +#: app/views/user/_signin.rhtml:32 msgid "Sign in" msgstr "Abrir sesión" @@ -2633,27 +2783,27 @@ msgstr "Abrir sesión" msgid "Sign in or make a new account" msgstr "Abrir sesión o crear nueva cuenta" -#: app/views/layouts/default.rhtml:103 +#: app/views/layouts/default.rhtml:107 msgid "Sign in or sign up" msgstr "Iniciar sesión o registro" -#: app/views/layouts/default.rhtml:100 +#: app/views/layouts/default.rhtml:105 msgid "Sign out" msgstr "Cerrar sesión" -#: app/views/user/_signup.rhtml:41 +#: app/views/user/_signup.rhtml:46 msgid "Sign up" msgstr "Registrarse" -#: app/views/request/_sidebar.rhtml:30 +#: app/views/request/_sidebar.rhtml:24 msgid "Similar requests" msgstr "Peticiones similares" -#: app/models/info_request_event.rb:307 -msgid "Some information sent" -msgstr "Enviada parte de la información" +#: app/views/general/search.rhtml:33 +msgid "Simple search" +msgstr "Búsqueda básica" -#: app/views/general/search.rhtml:145 +#: app/views/general/search.rhtml:241 msgid "Some of the information requested has been received" msgstr "Parte de la información solicitada ha sido recibida" @@ -2677,7 +2827,15 @@ msgstr "" "Alguien, tal vez usted, acaba de intentar cambiar su dirección de correo en\n" "{{site_name}} de {{old_email}} a {{new_email}}." -#: app/views/general/exception_caught.rhtml:1 +#: app/views/user/wrong_user.rhtml:2 +msgid "Sorry, but only {{user_name}} is allowed to do that." +msgstr "Lo sentimos, pero sólo {{user_name}} puede hacer eso." + +#: app/views/general/exception_caught.rhtml:17 +msgid "Sorry, there was a problem processing this page" +msgstr "Lo sentimos, hubo un problema procesando esta página" + +#: app/views/general/exception_caught.rhtml:3 msgid "Sorry, we couldn't find that page" msgstr "Lo sentimos, no hemos podido encontrar esa página" @@ -2685,6 +2843,18 @@ msgstr "Lo sentimos, no hemos podido encontrar esa página" msgid "Special note for this authority!" msgstr "¡Notas especiales sobre este organismo!" +#: app/views/public_body/show.rhtml:57 +msgid "Start" +msgstr "Comenzar" + +#: app/views/general/frontpage.rhtml:10 +msgid "Start now »" +msgstr "Comience ahora »" + +#: app/views/request/_sidebar.rhtml:17 +msgid "Start your own blog" +msgstr "Comience su propio blog" + #: app/views/request/_other_describe_state.rhtml:21 msgid "Still awaiting an <strong>internal review</strong>" msgstr "Todavía esperando por una <strong>revisión interna</strong>" @@ -2702,15 +2872,11 @@ msgstr "Enviar" msgid "Submit status" msgstr "Enviar estado" -#: app/models/track_thing.rb:158 app/models/track_thing.rb:159 +#: app/models/track_thing.rb:231 app/models/track_thing.rb:232 msgid "Successful Freedom of Information requests" msgstr "Peticiones de acceso a la información con éxito" -#: app/views/request/list.rhtml:5 -msgid "Successful responses" -msgstr "Respuestas con exito" - -#: app/models/info_request.rb:797 +#: app/models/info_request.rb:799 msgid "Successful." msgstr "Exitosa." @@ -2719,21 +2885,33 @@ msgid "" "Suggest how the requester can find the <strong>rest of the " "information</strong>." msgstr "" -"Sugerir al creador de la petición cómo puede encontrar el <strong>resto de la " -"información</strong>." +"Sugerir al creador de la petición cómo puede encontrar el <strong>resto de " +"la información</strong>." -#: app/views/request/new.rhtml:93 +#: app/views/request/new.rhtml:83 msgid "Summary:" msgstr "Resumen:" -#: app/views/general/search.rhtml:140 +#: app/views/general/search.rhtml:236 msgid "Table of statuses" msgstr "Tabla de estados" +#: app/views/general/search.rhtml:251 +msgid "Table of varieties" +msgstr "Tabla de tipos de objetos" + +#: app/views/general/search.rhtml:76 +msgid "Tags (separated by a space):" +msgstr "Etiquetas (separadas por un espacio):" + #: app/views/request/preview.rhtml:45 msgid "Tags:" msgstr "Etiquetas:" +#: app/views/general/exception_caught.rhtml:21 +msgid "Technical details" +msgstr "Detalles técnicos" + #: app/controllers/request_game_controller.rb:52 msgid "Thank you for helping us keep the site tidy!" msgstr "¡Gracias por ayudarnos a mantener la web en orden!" @@ -2742,7 +2920,7 @@ msgstr "¡Gracias por ayudarnos a mantener la web en orden!" msgid "Thank you for making an annotation!" msgstr "¡Gracias por hacer un comentario!" -#: app/controllers/request_controller.rb:736 +#: app/controllers/request_controller.rb:740 msgid "" "Thank you for responding to this FOI request! Your response has been " "published below, and a link to your response has been emailed to " @@ -2750,7 +2928,7 @@ msgstr "" "¡Gracias por responder a esta petición de información! Su respuesta ha sido " "publicada a continuación, y un enlace a su respuesta ha sido enviada a " -#: app/controllers/request_controller.rb:378 +#: app/controllers/request_controller.rb:377 msgid "" "Thank you for updating the status of the request '<a " "href=\"{{url}}\">{{info_request_title}}</a>'. There are some more requests " @@ -2760,12 +2938,12 @@ msgstr "" "href=\"{{url}}\">{{info_request_title}}</a>'. A continuación le mostramos " "algunas peticiones más que puede clasificar." -#: app/controllers/request_controller.rb:381 +#: app/controllers/request_controller.rb:380 msgid "Thank you for updating this request!" msgstr "¡Gracias por actualizar esta petición!" -#: app/controllers/user_controller.rb:398 -#: app/controllers/user_controller.rb:414 +#: app/controllers/user_controller.rb:416 +#: app/controllers/user_controller.rb:432 msgid "Thank you for updating your profile photo" msgstr "Gracias por actualizar su foto de perfil" @@ -2797,7 +2975,7 @@ msgstr "" " Nosotros también, si lo necesita, ofrecemos consejos sobre qué\n" " hacer a continuación con sus peticiones." -#: app/controllers/user_controller.rb:189 +#: app/controllers/user_controller.rb:207 msgid "" "That doesn't look like a valid email address. Please check you have typed it" " correctly." @@ -2810,7 +2988,7 @@ msgstr "" msgid "The <strong>review has finished</strong> and overall:" msgstr "La <strong>revisión ha finalizado</strong> y en resumen:" -#: app/views/request/new.rhtml:62 +#: app/views/request/new.rhtml:60 msgid "The Freedom of Information Act <strong>does not apply</strong> to" msgstr "La ley de acceso a la información <strong>no es aplicable</strong> a" @@ -2826,7 +3004,7 @@ msgstr "" "El organismo <strong>no tiene</strong> la información <small>(tal vez dicen " "quién la tiene)" -#: app/views/request/show_response.rhtml:28 +#: app/views/request/show_response.rhtml:26 msgid "" "The authority only has a <strong>paper copy</strong> of the information." msgstr "" @@ -2859,26 +3037,19 @@ msgstr "" "{{user}} como respuesta a la petición {{law_used_short}}\n" "no ha sido entregado." -#: app/views/request/show_response.rhtml:22 -msgid "" -"The law, the Ministry of Justice and the Information Commissioner\n" -" all say that an email is sufficient (<a href=\"%s\">more details</a>).\n" -" At the bottom of this page, write a reply to the authority explaining this to them." -msgstr "" - -#: app/views/general/exception_caught.rhtml:3 -msgid "The page either doesn't exist, or is broken. Things you can try now:" -msgstr "La página no existe, o está rota. Cosas que puede probar ahora:" +#: app/views/general/exception_caught.rhtml:5 +msgid "The page doesn't exist. Things you can try now:" +msgstr "La página no existe. Puede intentar:" -#: app/views/general/search.rhtml:143 +#: app/views/general/search.rhtml:239 msgid "The public authority does not have the information requested" msgstr "El organismo no tiene la información solicitada" -#: app/views/general/search.rhtml:147 +#: app/views/general/search.rhtml:243 msgid "The public authority would like part of the request explained" msgstr "El organismo ha pedido una aclaración a parte de la petición" -#: app/views/general/search.rhtml:148 +#: app/views/general/search.rhtml:244 msgid "The public authority would like to / has responded by post" msgstr "El organismo quiere responder (o ha respondido) por correo ordinario" @@ -2886,7 +3057,7 @@ msgstr "El organismo quiere responder (o ha respondido) por correo ordinario" msgid "The request has been <strong>refused</strong>" msgstr "La petición ha sido <strong>rechazada</strong>" -#: app/controllers/request_controller.rb:352 +#: app/controllers/request_controller.rb:351 msgid "" "The request has been updated since you originally loaded this page. Please " "check for any new incoming messages below, and try again." @@ -2911,7 +3082,7 @@ msgstr "La petición fue <strong>rechazada</strong> por" msgid "The request was <strong>successful</strong>." msgstr "La petición fue <strong>exitosa</strong>." -#: app/views/general/search.rhtml:144 +#: app/views/general/search.rhtml:240 msgid "The request was refused by the public authority" msgstr "La petición ha sido rechazada por el organismo" @@ -2925,7 +3096,7 @@ msgstr "" "varios posibles motivos para esto, pero no podemos ser más específicos aquí. Por favor <a\n" " href=\"%s\">contáctenos</a> si tiene cualquier pregunta." -#: app/views/general/search.rhtml:152 +#: app/views/general/search.rhtml:248 msgid "The requester has abandoned this request for some reason" msgstr "El creador de la petición ha cancelado la petición por algún motivo" @@ -2949,7 +3120,7 @@ msgstr "" " Por ley, bajo cualquier circunstancia, el organismo ya debería\n" " haber respondido" -#: app/views/public_body/show.rhtml:100 +#: app/views/public_body/show.rhtml:120 msgid "" "The search index is currently offline, so we can't show the Freedom of " "Information requests that have been made to this authority." @@ -2957,7 +3128,7 @@ msgstr "" "El motor de búsqueda no está accesible en estos momentos: no podemos mostrar" " las peticiones de información realizadas a este organismo." -#: app/views/user/show.rhtml:141 +#: app/views/user/show.rhtml:156 msgid "" "The search index is currently offline, so we can't show the Freedom of " "Information requests this person has made." @@ -2973,15 +3144,15 @@ msgstr "Entonces podrá cancelar su alerta." msgid "Then you can cancel the alerts." msgstr "Entonces podrá cancelar las alertas." -#: app/controllers/user_controller.rb:249 +#: app/controllers/user_controller.rb:267 msgid "Then you can change your email address used on {{site_name}}" msgstr "Entonces podrá cambiar el correo utilizado en {{site_name}}" -#: app/controllers/user_controller.rb:203 +#: app/controllers/user_controller.rb:221 msgid "Then you can change your password on {{site_name}}" msgstr "Entonces podrá cambiar su contraseña en {{site_name}}" -#: app/controllers/request_controller.rb:338 +#: app/controllers/request_controller.rb:337 msgid "Then you can classify the FOI response you have got from " msgstr "Entonces podrá clasificar la respuesta que ha obtenido " @@ -2989,63 +3160,77 @@ msgstr "Entonces podrá clasificar la respuesta que ha obtenido " msgid "Then you can play the request categorisation game." msgstr "Entonces podrá jugar al juego de clasificar peticiones" -#: app/controllers/user_controller.rb:330 +#: app/controllers/user_controller.rb:348 msgid "Then you can send a message to " msgstr "Entonces podrá mandar un mensaje a" -#: app/controllers/user_controller.rb:514 +#: app/controllers/user_controller.rb:541 msgid "Then you can sign in to {{site_name}}" msgstr "Entonces podrá entrar a {{site_name}}" -#: app/controllers/request_controller.rb:61 +#: app/controllers/request_controller.rb:76 msgid "Then you can update the status of your request to " msgstr "Entonces podrá actualizar el estado de su petición a " -#: app/controllers/request_controller.rb:702 +#: app/controllers/request_controller.rb:706 msgid "Then you can upload an FOI response. " msgstr "Entonces podrá subir una respuesta. " -#: app/controllers/request_controller.rb:545 +#: app/controllers/request_controller.rb:544 msgid "Then you can write follow up message to " msgstr "Entonces podrá escribir un mensaje a " -#: app/controllers/request_controller.rb:546 +#: app/controllers/request_controller.rb:545 msgid "Then you can write your reply to " msgstr "Entonces podrá escribir su respuesta a " -#: app/models/track_thing.rb:197 +#: app/models/track_thing.rb:270 msgid "" "Then you will be emailed whenever '{{user_name}}' requests something or gets" " a response." msgstr "" -"Entonces recibirá un correo cada vez que '{{user_name}}' solicite algo o reciba" -" una respuesta." +"Entonces recibirá un correo cada vez que '{{user_name}}' solicite algo o " +"reciba una respuesta." -#: app/models/track_thing.rb:213 +#: app/models/track_thing.rb:286 msgid "" -"Then you will be emailed whenever a new request or response matches " -"'{{query}}'." +"Then you will be emailed whenever a new request or response matches your " +"search." msgstr "" -"Entonces recibirá un correo cada vez que una nueva petición o respuesta coincida con " -"'{{query}}'." +"Entonces recibirá correos siempre que una nueva solicitud o respuesta encaje" +" con su búsqueda." -#: app/models/track_thing.rb:162 +#: app/models/track_thing.rb:235 msgid "Then you will be emailed whenever an FOI request succeeds." msgstr "Entonces recibirá un correo cada vez que una petición tenga éxito." -#: app/models/track_thing.rb:146 +#: app/models/track_thing.rb:219 msgid "Then you will be emailed whenever anyone makes a new FOI request." -msgstr "Entonces recibirá un correo cada vez que alguien haga una nueva petición de información." +msgstr "" +"Entonces recibirá un correo cada vez que alguien haga una nueva petición de " +"información." -#: app/models/track_thing.rb:181 +#: app/models/track_thing.rb:254 msgid "" "Then you will be emailed whenever someone requests something or gets a " "response from '{{public_body_name}}'." msgstr "" -"Entonces recibirá un correo cada vez que alguien haga una petición o reciba una " -"respuesta de '{{public_body_name}}'." +"Entonces recibirá un correo cada vez que alguien haga una petición o reciba " +"una respuesta de '{{public_body_name}}'." -#: app/controllers/request_controller.rb:299 +#: app/models/track_thing.rb:203 +msgid "" +"Then you will be emailed whenever the request '{{request_title}}' is " +"updated." +msgstr "" +"Entonces recibirá correos siempre que la solicitud '{{request_title}}' se " +"actualice." + +#: app/controllers/request_controller.rb:30 +msgid "Then you'll be allowed to send FOI requests." +msgstr "Entonces podrá enviar solicitudes de información." + +#: app/controllers/request_controller.rb:298 msgid "Then your FOI request to {{public_body_name}} will be sent." msgstr "Entonces su petición a {{public_body_name}} será enviada." @@ -3061,6 +3246,18 @@ msgstr "" "Hay {{count}} comentarios en su petición {{info_request}}. Siga este enlace " "para leer lo que dicen." +#: app/views/public_body/show.rhtml:7 +msgid "There is %d person following this authority" +msgid_plural "There are %d people following this authority" +msgstr[0] "Hay %d persona siguiendo a este organismo." +msgstr[1] "Hay %d personas siguiendo a este organismo." + +#: app/views/request/_sidebar.rhtml:5 +msgid "There is %d person following this request" +msgid_plural "There are %d people following this request" +msgstr[0] "Hay %d persona siguiendo esta solicitud." +msgstr[1] "Hay %d personas siguiendo esta solicitud." + #: app/views/user/show.rhtml:4 msgid "" "There is <strong>more than one person</strong> who uses this site and has this name. \n" @@ -3074,14 +3271,19 @@ msgid "" "There was a <strong>delivery error</strong> or similar, which needs fixing " "by the {{site_name}} team." msgstr "" -"Se ha producido un <strong>error en la entrega</strong> o similar, y necesita ser " -"arreglado por el equipo de {{site_name}}." +"Se ha producido un <strong>error en la entrega</strong> o similar, y " +"necesita ser arreglado por el equipo de {{site_name}}." -#: app/controllers/public_body_controller.rb:77 +#: app/controllers/public_body_controller.rb:81 +#: app/controllers/user_controller.rb:140 msgid "There was an error with the words you entered, please try again." msgstr "" "Ha habido un error con las palabras introducidas, por favor pruebe otra vez." +#: app/views/general/search.rhtml:10 app/views/public_body/show.rhtml:109 +msgid "There were no requests matching your query." +msgstr "No se encontraron solicitudes para su búsqueda." + #: app/views/request/_describe_state.rhtml:38 msgid "They are going to reply <strong>by post</strong>" msgstr "Van a responder <strong>por correo ordinario</strong>" @@ -3118,7 +3320,7 @@ msgstr "" msgid "Things to do with this request" msgstr "Cosas que hacer con esta petición" -#: app/views/public_body/show.rhtml:59 +#: app/views/public_body/show.rhtml:64 msgid "This authority no longer exists, so you cannot make a request to it." msgstr "" "Este organismo ya no existe, no pueden realizarse peticiones de información." @@ -3131,10 +3333,10 @@ msgstr "" "Este respuesta está oculta. Revise los comentarios\n" " para descubrir por qué. Si es su petición, <a href=\"%s\">abra una sesión</a> para ver la respuesta." -#: app/views/request/new.rhtml:65 +#: app/views/request/new.rhtml:63 msgid "" "This covers a very wide spectrum of information about the state of\n" -" the <strong>natural and built environment</strong>, such as:" +" the <strong>natural and built environment</strong>, such as:" msgstr "" "Esto incluye un amplio espectro de información sobre el estado de\n" " el <strong>entorno natural y urbanizado</strong>, como:" @@ -3155,7 +3357,7 @@ msgstr "" "Esto es porque {{title}} es una petición antigua\n" "marcada para ya no recibir más respuestas." -#: app/views/track/_tracking_links.rhtml:9 +#: app/views/track/_tracking_links.rhtml:8 msgid "" "This is your own request, so you will be automatically emailed when new " "responses arrive." @@ -3171,13 +3373,32 @@ msgstr "" "Este mensaje está oculto. Lea los comentarios\n" "\t\t\t\t\t\tpara descubrir por qué. Si es su petición, <a href=\"%s\">abra una sesión</a> para ver la respuesta." -#: app/views/user/show.rhtml:122 -msgid "This person has" -msgstr "Esta persona ha" +#: app/views/request/_describe_state.rhtml:44 +#: app/views/request/_other_describe_state.rhtml:40 +msgid "This particular request is finished:" +msgstr "Esta petición está cerrada:" + +#: app/views/user/show.rhtml:136 +msgid "" +"This person has made no Freedom of Information requests using this site." +msgstr "" +"Esta persona no ha realizado solicitudes de información usando esta web." + +#: app/views/user/show.rhtml:141 +msgid "This person's %d Freedom of Information request" +msgid_plural "This person's %d Freedom of Information requests" +msgstr[0] "Su %d solicitud de información" +msgstr[1] "Sus %d solicitudes de información" -#: app/views/user/show.rhtml:152 -msgid "This person's" -msgstr "Esta persona" +#: app/views/user/show.rhtml:169 +msgid "This person's %d annotation" +msgid_plural "This person's %d annotations" +msgstr[0] "Su %d comentario" +msgstr[1] "Sus %d comentarios" + +#: app/views/user/show.rhtml:162 +msgid "This person's annotations" +msgstr "Sus comentarios" #: app/views/request/_describe_state.rhtml:84 msgid "This request <strong>requires administrator attention</strong>" @@ -3201,16 +3422,16 @@ msgid "" "This request has been set by an administrator to \"allow new responses from " "nobody\"" msgstr "" -"Esta petición ha sido configurada por el administrador a \"no permitir respuestas de " -"nadie\"" +"Esta petición ha sido configurada por el administrador a \"no permitir " +"respuestas de nadie\"" #: app/views/request/show.rhtml:115 msgid "" "This request has had an unusual response, and <strong>requires " "attention</strong> from the {{site_name}} team." msgstr "" -"Esta petición ha recibido una respuesta inusual, y <strong>requiere " -"la intervención</strong> del equipo de {{site_name}}." +"Esta petición ha recibido una respuesta inusual, y <strong>requiere la " +"intervención</strong> del equipo de {{site_name}}." #: app/views/request/show.rhtml:5 msgid "" @@ -3228,6 +3449,11 @@ msgstr "" "Esta petición está oculta, por lo que sólo usted como creador puede verla. Por favor\n" " <a href=\"%s\">contáctenos</a> si no está seguro de por qué." +#: app/views/request/_describe_state.rhtml:7 +#: app/views/request/_other_describe_state.rhtml:10 +msgid "This request is still in progress:" +msgstr "Esta petición está todavía en proceso:" + #: app/views/request/_hidden_correspondence.rhtml:10 msgid "" "This response has been hidden. See annotations to find out why.\n" @@ -3236,14 +3462,6 @@ msgstr "" "Este respuesta está oculta. Revise los comentarios\n" " para descubrir por qué. Si es su petición, <a href=\"%s\">abra una sesión</a> para ver la respuesta." -#: app/views/request/new.rhtml:49 -msgid "" -"This site is <strong>public</strong>. Everything you type and any response " -"will be published." -msgstr "" -"Esta web es <strong>pública</strong>. Todo lo que escriba y cualquier " -"respuesta será publicada." - #: app/views/request/details.rhtml:6 msgid "" "This table shows the technical details of the internal events that happened\n" @@ -3268,25 +3486,25 @@ msgstr "" "No es posible porque ya existe una cuenta usando la dirección \n" "de correo {{email}}." -#: app/models/track_thing.rb:145 +#: app/models/track_thing.rb:218 msgid "To be emailed about any new requests" msgstr "Para recibir correos sobre nuevas peticiones" -#: app/models/track_thing.rb:161 +#: app/models/track_thing.rb:234 msgid "To be emailed about any successful requests" msgstr "Para recibir correos sobre cualquier petición exitosa" -#: app/models/track_thing.rb:196 +#: app/models/track_thing.rb:269 msgid "To be emailed about requests by '{{user_name}}'" msgstr "Para recibir correos sobre peticiones de '{{user_name}}'" -#: app/models/track_thing.rb:180 +#: app/models/track_thing.rb:253 msgid "" "To be emailed about requests made using {{site_name}} to the public " "authority '{{public_body_name}}'" msgstr "" -"Para recibir correos sobre peticiones hechas en {{site_name}} al " -"organismo '{{public_body_name}}'" +"Para recibir correos sobre peticiones hechas en {{site_name}} al organismo " +"'{{public_body_name}}'" #: app/controllers/track_controller.rb:173 msgid "To cancel these alerts" @@ -3304,15 +3522,15 @@ msgstr "" "Para continuar, necesita abrir una sesión o crear una cuenta. Desgraciadamente,\n" "ha habido un problema técnico al intentar hacerlo." -#: app/controllers/user_controller.rb:248 +#: app/controllers/user_controller.rb:266 msgid "To change your email address used on {{site_name}}" msgstr "Cambiar la dirección de correo usada en {{site_name}}" -#: app/controllers/request_controller.rb:337 +#: app/controllers/request_controller.rb:336 msgid "To classify the response to this FOI request" msgstr "Reclasificar la respuesta a esta petición" -#: app/views/request/show_response.rhtml:39 +#: app/views/request/show_response.rhtml:37 msgid "To do that please send a private email to " msgstr "Para hacerlo, por favor mande un correo privado a " @@ -3320,9 +3538,13 @@ msgstr "Para hacerlo, por favor mande un correo privado a " msgid "To do this, first click on the link below." msgstr "Para hacerlo, elija primero el siguiente enlace." -#: app/models/track_thing.rb:212 -msgid "To follow requests and responses matching '{{query}}'" -msgstr "Para seguir peticiones y respuestas que coincidan con '{{query}}'" +#: app/models/track_thing.rb:285 +msgid "To follow requests and responses matching your search" +msgstr "Para seguir solicitudes y respuestas que encajen con su búsqueda" + +#: app/models/track_thing.rb:202 +msgid "To follow updates to the request '{{request_title}}'" +msgstr "Para seguir actualizaciones a la solicitud '{{request_title}}'" #: app/views/request_mailer/old_unclassified_updated.rhtml:1 msgid "" @@ -3344,33 +3566,42 @@ msgstr "Jugar al juego de recategorización de peticiones" msgid "To post your annotation" msgstr "Añadir su comentario" -#: app/controllers/request_controller.rb:543 +#: app/controllers/request_controller.rb:542 msgid "To reply to " msgstr "Contestar a " -#: app/controllers/request_controller.rb:542 +#: app/controllers/request_controller.rb:541 msgid "To send a follow up message to " msgstr "Enviar una respuesta a " -#: app/controllers/user_controller.rb:329 +#: app/controllers/user_controller.rb:347 msgid "To send a message to " msgstr "Para enviar un mensaje a" -#: app/controllers/request_controller.rb:298 +#: app/controllers/request_controller.rb:29 +#: app/controllers/request_controller.rb:297 msgid "To send your FOI request" msgstr "Para enviar su petición de información" -#: app/controllers/request_controller.rb:60 +#: app/controllers/request_controller.rb:75 msgid "To update the status of this FOI request" msgstr "Para actualizar el estado de su petición de información" -#: app/controllers/request_controller.rb:701 +#: app/controllers/request_controller.rb:705 msgid "" "To upload a response, you must be logged in using an email address from " msgstr "" "Para cargar una respuesta, debe estar registrado con una dirección de correo" " electrónico de" +#: app/views/general/search.rhtml:24 +msgid "" +"To use the advanced search, combine phrases and labels as described in the " +"search tips below." +msgstr "" +"Para usar la búsqueda avanzada, combine frases y etiquetas como se describe " +"en las instrucciones a continuación." + #: app/views/public_body/view_email_captcha.rhtml:5 msgid "" "To view the email address that we use to send FOI requests to " @@ -3387,36 +3618,36 @@ msgstr "Para ver la respuesta, use el siguiente enlace." msgid "To {{public_body_link_absolute}}" msgstr "Para {{public_body_link_absolute}}" -#: app/views/request/followup_preview.rhtml:22 app/views/request/new.rhtml:88 +#: app/views/request/followup_preview.rhtml:22 app/views/request/new.rhtml:40 #: app/views/request/preview.rhtml:17 msgid "To:" msgstr "Para:" -#: app/models/track_thing.rb:174 +#: app/views/general/_localised_datepicker.rhtml:7 +msgid "Today" +msgstr "Hoy" + +#: app/views/public_body/_search_ahead.rhtml:3 +msgid "Top search results:" +msgstr "Mejores resultados:" + +#: app/models/track_thing.rb:247 msgid "Track requests to {{public_body_name}} by email" msgstr "Seguir peticiones a {{public_body_name}} por correo" -#: app/models/track_thing.rb:206 -msgid "Track things matching '{{query}}' by email" -msgstr "Seguir resultados de '{{query}}' por correo" - -#: app/views/public_body/show.rhtml:3 -msgid "Track this authority" -msgstr "Seguir a este organismo" +#: app/models/track_thing.rb:279 +msgid "Track things matching this search by email" +msgstr "Seguir esta búsqueda por correo" #: app/views/user/show.rhtml:29 msgid "Track this person" msgstr "Seguir a esta persona" -#: app/models/track_thing.rb:190 +#: app/models/track_thing.rb:263 msgid "Track this person by email" msgstr "Seguir a esta persona por correo" -#: app/views/request/_sidebar.rhtml:2 -msgid "Track this request" -msgstr "Seguir esta petición" - -#: app/models/track_thing.rb:123 +#: app/models/track_thing.rb:196 msgid "Track this request by email" msgstr "Seguir esta petición por correo" @@ -3432,7 +3663,11 @@ msgstr "TrackThing|Track query" msgid "TrackThing|Track type" msgstr "TrackThing|Track type" -#: app/views/general/search.rhtml:133 +#: app/views/request/_sidebar.rhtml:13 +msgid "Tweet this request" +msgstr "Tuitear esta solicitud" + +#: app/views/general/search.rhtml:229 msgid "" "Type <strong><code>01/01/2008..14/01/2008</code></strong> to only show " "things that happened in the first two weeks of January." @@ -3456,7 +3691,7 @@ msgstr "No se pudo enviar la respuesta a {{username}}" msgid "Unable to send follow up message to {{username}}" msgstr "No se pudo enviar la respuesta a {{username}}" -#: app/views/request/list.rhtml:29 +#: app/views/request/list.rhtml:27 msgid "Unexpected search result type" msgstr "Se encontró un tipo de resultado inesperado" @@ -3480,15 +3715,19 @@ msgid "" "address for" msgstr "Desgraciadamente, no tenemos una dirección de correo válida para" -#: app/views/general/exception_caught.rhtml:17 +#: lib/world_foi_websites.rb:5 +msgid "United Kingdom" +msgstr "Reino Unido" + +#: lib/world_foi_websites.rb:17 +msgid "United States of America" +msgstr "Estados Unidos de América" + +#: app/views/general/exception_caught.rhtml:22 msgid "Unknown" msgstr "Desconocido" -#: app/models/info_request_event.rb:317 -msgid "Unusual response" -msgstr "Respuesta no habitual" - -#: app/models/info_request.rb:807 +#: app/models/info_request.rb:809 msgid "Unusual response." msgstr "Respuesta no habitual." @@ -3497,11 +3736,11 @@ msgstr "Respuesta no habitual." msgid "Update the status of this request" msgstr "Actualizar el estado de esta petición" -#: app/controllers/request_controller.rb:62 +#: app/controllers/request_controller.rb:77 msgid "Update the status of your request to " msgstr "Actualizar el estado de la petición a " -#: app/views/general/search.rhtml:124 +#: app/views/general/search.rhtml:220 msgid "" "Use OR (in capital letters) where you don't mind which word, e.g. " "<strong><code>commons OR lords</code></strong>" @@ -3509,7 +3748,7 @@ msgstr "" "Escriba OR (en mayúsculas) cuando no le importe qué palabra, e.g. " "<strong><code>diputado OR parlamento</code></strong>" -#: app/views/general/search.rhtml:125 +#: app/views/general/search.rhtml:221 msgid "" "Use quotes when you want to find an exact phrase, e.g. " "<strong><code>\"Liverpool City Council\"</code></strong>" @@ -3517,51 +3756,55 @@ msgstr "" "Utilice comillas cuando quiera buscar una frase exacta, por ejemplo " "<strong><code>\"Consejo de Europa\"</code></strong>" -#: locale/model_attributes.rb:67 +#: locale/model_attributes.rb:65 msgid "UserInfoRequestSentAlert|Alert type" msgstr "UserInfoRequestSentAlert|Alert type" -#: locale/model_attributes.rb:78 +#: locale/model_attributes.rb:76 msgid "User|About me" msgstr "User|About me" -#: locale/model_attributes.rb:76 +#: locale/model_attributes.rb:74 msgid "User|Admin level" msgstr "User|Admin level" -#: locale/model_attributes.rb:77 +#: locale/model_attributes.rb:75 msgid "User|Ban text" msgstr "User|Ban text" -#: locale/model_attributes.rb:69 +#: locale/model_attributes.rb:67 msgid "User|Email" msgstr "User|Email" -#: locale/model_attributes.rb:73 +#: locale/model_attributes.rb:71 msgid "User|Email confirmed" msgstr "User|Email confirmed" -#: locale/model_attributes.rb:71 +#: locale/model_attributes.rb:69 msgid "User|Hashed password" msgstr "User|Hashed password" -#: locale/model_attributes.rb:75 +#: locale/model_attributes.rb:73 msgid "User|Last daily track email" msgstr "User|Last daily track email" -#: locale/model_attributes.rb:70 +#: locale/model_attributes.rb:77 +msgid "User|Locale" +msgstr "User|Locale" + +#: locale/model_attributes.rb:68 msgid "User|Name" msgstr "User|Name" -#: locale/model_attributes.rb:72 +#: locale/model_attributes.rb:70 msgid "User|Salt" msgstr "User|Salt" -#: locale/model_attributes.rb:74 +#: locale/model_attributes.rb:72 msgid "User|Url name" msgstr "User|Url name" -#: app/views/public_body/show.rhtml:21 +#: app/views/public_body/show.rhtml:26 msgid "View FOI email address" msgstr "Ver dirección de correo" @@ -3577,7 +3820,11 @@ msgstr "Ver dirección de correo para '{{public_body_name}}'" msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "Ver peticiones de acceso a información hechas por {{user_name}}:" -#: app/views/layouts/default.rhtml:89 +#: app/controllers/request_controller.rb:149 +msgid "View and search requests" +msgstr "Ver y buscar solicitudes" + +#: app/views/layouts/default.rhtml:128 msgid "View authorities" msgstr "Ver organismos públicos" @@ -3585,11 +3832,11 @@ msgstr "Ver organismos públicos" msgid "View email" msgstr "Ver correo" -#: app/views/layouts/default.rhtml:88 +#: app/views/layouts/default.rhtml:127 msgid "View requests" msgstr "Ver solicitudes" -#: app/models/info_request.rb:799 +#: app/models/info_request.rb:801 msgid "Waiting clarification." msgstr "Esperando aclaración." @@ -3601,15 +3848,15 @@ msgstr "" "Esperando una <strong>revisión interna</strong> por parte de " "{{public_body_link}} de cómo han respondido a esta petición." -#: app/views/general/search.rhtml:149 +#: app/views/general/search.rhtml:245 msgid "" "Waiting for the public authority to complete an internal review of their " "handling of the request" msgstr "" -"Esperando que el organismo termine una revisión interna de su respuesta " -"a la petición" +"Esperando que el organismo termine una revisión interna de su respuesta a la" +" petición" -#: app/views/general/search.rhtml:142 +#: app/views/general/search.rhtml:238 msgid "Waiting for the public authority to reply" msgstr "Esperando que el organismo responda" @@ -3643,6 +3890,14 @@ msgstr "" "No revelaremos su dirección de correo a nadie salvo que usted\n" "nos lo diga, o la ley nos obligue." +#: app/views/user/_signup.rhtml:13 +msgid "" +"We will not reveal your email address to anybody unless you or\n" +" the law tell us to (<a href=\"%s\">details</a>). " +msgstr "" +"No revelaremos su dirección de correo a nadie salvo que usted nos lo diga\n" +" o la ley nos obligue (<a href=\"%s\">más información</a>). " + #: app/views/user_mailer/changeemail_confirm.rhtml:10 msgid "" "We will not reveal your email addresses to anybody unless you\n" @@ -3691,6 +3946,10 @@ msgstr "¿Qué está haciendo?" msgid "What best describes the status of this request now?" msgstr "¿Cómo describiría el estado de esta petición ahora?" +#: app/views/general/frontpage.rhtml:55 +msgid "What information has been released?" +msgstr "¿Qué información se ha solicitado?" + #: app/views/request_mailer/new_response.rhtml:9 msgid "" "When you get there, please update the status to say if the response \n" @@ -3699,7 +3958,7 @@ msgstr "" "Por favor actualice el estado para indicar si la respuesta \n" "contiene información útil." -#: app/views/request/show_response.rhtml:44 +#: app/views/request/show_response.rhtml:42 msgid "" "When you receive the paper response, please help\n" " others find out what it says:" @@ -3719,31 +3978,35 @@ msgstr "" msgid "Which of these is happening?" msgstr "¿Qué está pasando?" -#: app/models/info_request_event.rb:313 -msgid "Withdrawn by requester" -msgstr "Retirada por el autor" +#: app/views/general/frontpage.rhtml:38 +msgid "Who can I request information from?" +msgstr "¿A quién puedo solicitar información?" -#: app/models/info_request.rb:809 +#: app/models/info_request.rb:811 msgid "Withdrawn by the requester." msgstr "Retirada por el autor." -#: app/controllers/request_controller.rb:549 +#: app/views/general/_localised_datepicker.rhtml:13 +msgid "Wk" +msgstr "Wk" + +#: app/views/help/alaveteli.rhtml:6 +msgid "Would you like to see a website like this in your country?" +msgstr "¿Le gustaría ver una web como esta en su país?" + +#: app/controllers/request_controller.rb:548 msgid "Write a reply to " msgstr "Escribir una respuesta a " -#: app/controllers/request_controller.rb:548 +#: app/controllers/request_controller.rb:547 msgid "Write your FOI follow up message to " msgstr "Escriba su respuesta a " -#: app/views/request/new.rhtml:46 +#: app/views/request/new.rhtml:102 msgid "Write your request in <strong>simple, precise language</strong>." msgstr "" "Escriba su petición en un <strong>lenguaje sencillo y preciso</strong>." -#: app/models/info_request_event.rb:301 -msgid "Wrong Response" -msgstr "Respuesta incorrecta" - #: app/views/comment/_single_comment.rhtml:10 msgid "You" msgstr "Usted" @@ -3752,27 +4015,27 @@ msgstr "Usted" msgid "You are already being emailed updates about " msgstr "Ya está recibiendo actualizaciones por correo sobre " -#: app/models/track_thing.rb:175 +#: app/models/track_thing.rb:248 msgid "You are already tracking requests to {{public_body_name}} by email" msgstr "Ya está siguiendo las peticiones a {{public_body_name}} por correo" -#: app/models/track_thing.rb:207 -msgid "You are already tracking things matching '{{query}}' by email" -msgstr "Ya está siguiendo los resultados de '{{query}}' por correo" +#: app/models/track_thing.rb:280 +msgid "You are already tracking things matching this search by email" +msgstr "Ya está siguiendo esta búsqueda por correo" -#: app/models/track_thing.rb:191 +#: app/models/track_thing.rb:264 msgid "You are already tracking this person by email" msgstr "Ya está siguiendo a esta persona por correo" -#: app/models/track_thing.rb:124 +#: app/models/track_thing.rb:197 msgid "You are already tracking this request by email" msgstr "Ya está siguiendo esta petición por correo" -#: app/models/track_thing.rb:156 +#: app/models/track_thing.rb:229 msgid "You are being emailed about any new successful responses" msgstr "Está recibiendo correos sobre cualquier nueva respuesta exitosa" -#: app/models/track_thing.rb:140 +#: app/models/track_thing.rb:213 msgid "You are being emailed when there are new requests" msgstr "Usted está recibiendo correos cuando hay nuevas peticiones" @@ -3788,24 +4051,32 @@ msgstr "" "Puede obtener esta página en un formato procesable como parte de la página JSON\n" "de la petición. Consulte <a href=\"{{api_path}}\">la documentación de nuestro API</a>." -#: app/views/public_body/show.rhtml:40 +#: app/views/public_body/show.rhtml:47 msgid "" "You can only request information about the environment from this authority." msgstr "Solo puede solicitar información medioambiental a esta institución" -#: app/views/user/show.rhtml:122 -msgid "You have" -msgstr "Tiene" - #: app/views/request_mailer/new_response.rhtml:1 msgid "You have a new response to the {{law_used_full}} request " msgstr "Tiene una nueva respuesta a la petición {{law_used_full}} " -#: app/controllers/user_controller.rb:492 +#: app/views/general/exception_caught.rhtml:18 +msgid "" +"You have found a bug. Please <a href=\"{{contact_url}}\">contact us</a> to " +"tell us about the problem" +msgstr "" +"Ha encontrado un error. Por favor <a " +"href=\"{{contact_url}}\">contáctenos</a> para informarnos del problema" + +#: app/views/user/show.rhtml:136 +msgid "You have made no Freedom of Information requests using this site." +msgstr "No ha realizado solicitudes de información usando esta web." + +#: app/controllers/user_controller.rb:510 msgid "You have now changed the text about you on your profile." msgstr "Ha cambiado el texto sobre usted en su perfil." -#: app/controllers/user_controller.rb:310 +#: app/controllers/user_controller.rb:328 msgid "You have now changed your email address used on {{site_name}}" msgstr "Ha cambiado la dirección de correo que usa en {{site_name}}" @@ -3853,29 +4124,28 @@ msgstr "" msgid "" "You may be able to find\n" "one on their website, or by phoning them up and asking. If you manage\n" -"to find one, then please <a href=\"%s\">send it to us</a>." +"to find one, then please <a href=\"{{help_url}}\">send it to us</a>." msgstr "" "Puede que encuentre una\n" -"en su página web, o preguntando por teléfono. Si la consigue\n" -"por favor <a href=\"%s\">envíenosla</a>." +"en su página web, o llamándoles pare preguntar. Si\n" +"consigue una, por favor <a href=\"{{help_url}}\">mándenosla</a>." -#: app/controllers/user_controller.rb:470 +#: app/controllers/user_controller.rb:488 msgid "You need to be logged in to change the text about you on your profile." msgstr "Necesita identificarse para cambiar el texto de su perfil." -#: app/controllers/user_controller.rb:371 +#: app/controllers/user_controller.rb:389 msgid "You need to be logged in to change your profile photo." msgstr "Necesita identificarse para cambiar la foto de su perfil." -#: app/controllers/user_controller.rb:433 +#: app/controllers/user_controller.rb:451 msgid "You need to be logged in to clear your profile photo." msgstr "Necesita identificarse para borrar la foto de su perfil." -#: app/controllers/request_controller.rb:559 +#: app/controllers/request_controller.rb:558 msgid "" "You previously submitted that exact follow up message for this request." -msgstr "" -"Ya ha enviado esa misma respuesta a esta petición." +msgstr "Ya ha enviado esa misma respuesta a esta petición." #: app/views/request/upload_response.rhtml:13 msgid "" @@ -3885,13 +4155,12 @@ msgstr "" "Debería de haber recibido una copia de la petición por correo, y puede contestar\n" "<strong>simplemente respondiendo</strong> a ese correo. Para su comodidad, esta es la dirección:" -#: app/views/request/show_response.rhtml:36 +#: app/views/request/show_response.rhtml:34 msgid "" "You want to <strong>give your postal address</strong> to the authority in " "private." msgstr "" -"Quiere <strong>darle su dirección postal</strong> al organismo " -"en privado." +"Quiere <strong>darle su dirección postal</strong> al organismo en privado." #: app/views/user/banned.rhtml:9 msgid "" @@ -3924,13 +4193,21 @@ msgstr "" "Sólo recibirá una respuesta a su petición si continúa\n" "con la aclaración." -#: app/controllers/user_controller.rb:442 +#: app/controllers/user_controller.rb:460 msgid "You've now cleared your profile photo" msgstr "Ha borrado la foto de su perfil" -#: app/views/user/show.rhtml:152 -msgid "Your " -msgstr "Su " +#: app/views/user/show.rhtml:141 +msgid "Your %d Freedom of Information request" +msgid_plural "Your %d Freedom of Information requests" +msgstr[0] "Su %d solicitud de información" +msgstr[1] "Sus %d solicitudes de información" + +#: app/views/user/show.rhtml:169 +msgid "Your %d annotation" +msgid_plural "Your %d annotations" +msgstr[0] "Su %d comentario" +msgstr[1] "Sus %d comentarios" #: app/views/user/_signup.rhtml:22 msgid "" @@ -3946,6 +4223,10 @@ msgstr "" " pensando en utilizar un seudónimo, por favor \n" " <a href=\"%s\">lea esto primero</a>." +#: app/views/user/show.rhtml:162 +msgid "Your annotations" +msgstr "Sus comentarios" + #: app/views/contact_mailer/user_message.rhtml:3 msgid "" "Your details have not been given to anyone, unless you choose to reply to this\n" @@ -3959,11 +4240,11 @@ msgstr "" msgid "Your e-mail:" msgstr "Su correo:" -#: app/views/user/show.rhtml:168 +#: app/views/user/show.rhtml:184 msgid "Your email subscriptions" msgstr "Sus suscripciones de correo" -#: app/controllers/request_controller.rb:556 +#: app/controllers/request_controller.rb:555 msgid "" "Your follow up has not been sent because this request has been stopped to " "prevent spam. Please <a href=\"%s\">contact us</a> if you really want to " @@ -3973,11 +4254,11 @@ msgstr "" "evitar spam. Por favor <a href=\"%s\">contáctenos</a> si realmente quiere " "enviar una respuesta." -#: app/controllers/request_controller.rb:584 +#: app/controllers/request_controller.rb:583 msgid "Your follow up message has been sent on its way." msgstr "Su mensaje de seguimiento está en camino." -#: app/controllers/request_controller.rb:582 +#: app/controllers/request_controller.rb:581 msgid "Your internal review request has been sent on its way." msgstr "Su petición para una revisión interna está en camino." @@ -3989,7 +4270,7 @@ msgstr "" "Su mensaje ha sido enviado. Gracias por escribir, nos pondremos en contacto " "con usted pronto." -#: app/controllers/user_controller.rb:349 +#: app/controllers/user_controller.rb:367 msgid "Your message to {{recipient_user_name}} has been sent!" msgstr "Su mensaje a {{recipient_user_name}} ha sido enviado." @@ -4001,7 +4282,8 @@ msgstr "Su mensaje aparecerá en <strong>los motores de búsqueda</strong>" msgid "" "Your name and annotation will appear in <strong>search engines</strong>." msgstr "" -"Su nombre y su comentario aparecerán en los <strong>motores de búsqueda</strong>." +"Su nombre y su comentario aparecerán en los <strong>motores de " +"búsqueda</strong>." #: app/views/request/preview.rhtml:8 msgid "" @@ -4019,7 +4301,7 @@ msgstr "Su nombre:" msgid "Your original message is attached." msgstr "Su mensaje original está adjunto." -#: app/controllers/user_controller.rb:231 +#: app/controllers/user_controller.rb:249 msgid "Your password has been changed." msgstr "Su contraseña ha sido cambiada." @@ -4040,10 +4322,10 @@ msgid "" "Your request was called {{info_request}}. Letting everyone know whether you " "got the information will help us keep tabs on" msgstr "" -"Su petición se llamaba {{info_request}}. Háganos saber si ha recibido " -"la información para ayudarnos a controlar a" +"Su petición se llamaba {{info_request}}. Háganos saber si ha recibido la " +"información para ayudarnos a controlar a" -#: app/views/request/new.rhtml:109 +#: app/views/request/new.rhtml:111 msgid "Your request:" msgstr "Su petición:" @@ -4052,8 +4334,8 @@ msgid "" "Your response will <strong>appear on the Internet</strong>, <a " "href=\"%s\">read why</a> and answers to other questions." msgstr "" -"Su respuesta <strong>aparecerá en Internet</strong>, <a " -"href=\"%s\">lea por qué</a> y respuestas a otras preguntas." +"Su respuesta <strong>aparecerá en Internet</strong>, <a href=\"%s\">lea por " +"qué</a> y respuestas a otras preguntas." #: app/views/comment/new.rhtml:62 msgid "" @@ -4067,15 +4349,15 @@ msgstr "" msgid "Your {{site_name}} email alert" msgstr "Su alerta en {{site_name}}" -#: app/models/outgoing_message.rb:69 +#: app/models/outgoing_message.rb:70 msgid "Yours faithfully," msgstr "Un saludo," -#: app/models/outgoing_message.rb:67 +#: app/models/outgoing_message.rb:68 msgid "Yours sincerely," msgstr "Un saludo," -#: app/views/request/new.rhtml:97 +#: app/views/request/new.rhtml:87 msgid "" "a one line summary of the information you are requesting, \n" "\t\t\te.g." @@ -4083,25 +4365,29 @@ msgstr "" "un resumen de una línea de la información que solicita, \n" "\t\t\tpor ejemplo" -#: app/views/public_body/show.rhtml:31 +#: app/views/public_body/show.rhtml:38 msgid "admin" msgstr "admin" -#: app/views/public_body/show.rhtml:29 +#: app/views/request/_request_filter_form.rhtml:30 +msgid "all requests" +msgstr "todas las solicitudes" + +#: app/views/public_body/show.rhtml:36 msgid "also called {{public_body_short_name}}" msgstr "también conocido como {{public_body_short_name}}" -#: app/views/user/wrong_user.rhtml:5 -msgid "and sign in as " -msgstr "y abra una sesión como " +#: app/views/request/_request_filter_form.rhtml:25 +msgid "and" +msgstr "y" #: app/views/request/show.rhtml:59 msgid "" "and update the status accordingly. Perhaps <strong>you</strong> might like " "to help out by doing that?" msgstr "" -"y actualice su estado. ¿Tal vez <strong>usted</strong> quiera ayudarnos " -"a hacerlo?" +"y actualice su estado. ¿Tal vez <strong>usted</strong> quiera ayudarnos a " +"hacerlo?" #: app/views/request/show.rhtml:64 msgid "and update the status." @@ -4111,30 +4397,42 @@ msgstr "y actualizar su estado." msgid "and we'll suggest <strong>what to do next</strong>" msgstr "y le sugeriremos <strong>qué hacer a continuación</strong>" -#: app/views/user/show.rhtml:153 -msgid "annotation" -msgstr "comentario" - -#: app/views/user/show.rhtml:147 -msgid "annotations" -msgstr "comentarios" +#: app/views/general/frontpage.rhtml:61 +msgid "answered a request about" +msgstr "contestó la solicitud" -#: app/models/track_thing.rb:138 +#: app/models/track_thing.rb:211 msgid "any <a href=\"/list\">new requests</a>" msgstr "cualquier <a href=\"/list\">petición nueva</a>" -#: app/models/track_thing.rb:154 +#: app/models/track_thing.rb:227 msgid "any <a href=\"/list/successful\">successful requests</a>" msgstr "cualquier <a href=\"/list/successful\">petición con éxito</a>" +#: app/models/track_thing.rb:116 +msgid "anything" +msgstr "cualquiera" + #: app/views/request_mailer/very_overdue_alert.rhtml:1 msgid "are long overdue." msgstr "están muy retrasados." -#: app/controllers/public_body_controller.rb:111 +#: app/models/track_thing.rb:89 app/views/general/search.rhtml:56 +msgid "authorities" +msgstr "organismos" + +#: app/models/track_thing.rb:104 +msgid "awaiting a response" +msgstr "esperando una respuesta" + +#: app/controllers/public_body_controller.rb:119 msgid "beginning with" msgstr "empezando con" +#: app/models/track_thing.rb:95 +msgid "between two dates" +msgstr "entre dos fechas" + #: app/views/request/show.rhtml:82 msgid "by" msgstr "por" @@ -4143,7 +4441,7 @@ msgstr "por" msgid "by <strong>{{date}}</strong>" msgstr "antes de <strong>{{date}}</strong>" -#: app/views/request/_request_listing_via_event.rhtml:34 +#: app/views/request/_request_listing_via_event.rhtml:26 msgid "by {{public_body_name}} to {{info_request_user}} on {{date}}." msgstr "por {{public_body_name}} a {{info_request_user}} el {{date}}." @@ -4159,7 +4457,12 @@ msgstr "regla de censura" msgid "comment" msgstr "comentario" -#: app/views/request/show_response.rhtml:41 +#: app/models/track_thing.rb:86 app/views/general/search.rhtml:103 +#: app/views/request/_request_filter_form.rhtml:14 +msgid "comments" +msgstr "comentarios" + +#: app/views/request/show_response.rhtml:39 msgid "" "containing your postal address, and asking them to reply to this request.\n" " Or you could phone them." @@ -4167,7 +4470,7 @@ msgstr "" "incluyendo su dirección postal, y pidiéndoles que contesten a su petición.\n" " O pruebe a llamarles por teléfono." -#: app/models/info_request_event.rb:338 +#: app/models/info_request_event.rb:323 msgid "display_status only works for incoming and outgoing messages right now" msgstr "" "display_status sólo funciona para mensajes de entrada y salida ahora mismo" @@ -4176,15 +4479,11 @@ msgstr "" msgid "during term time" msgstr "durante el periodo escolar" -#: app/views/general/frontpage.rhtml:18 -msgid "e.g." -msgstr "por ejemplo" - #: app/views/user/show.rhtml:96 msgid "edit text about you" msgstr "edite el texto sobre usted" -#: app/views/user/show.rhtml:171 +#: app/views/user/show.rhtml:187 msgid "email subscription" msgstr "suscripción de correo" @@ -4192,11 +4491,15 @@ msgstr "suscripción de correo" msgid "even during holidays" msgstr "incluso durante las vacaciones" +#: app/views/general/search.rhtml:57 +msgid "everything" +msgstr "todo" + #: locale/model_attributes.rb:17 msgid "exim log" msgstr "log exim" -#: locale/model_attributes.rb:59 +#: locale/model_attributes.rb:57 msgid "exim log done" msgstr "log exim completado" @@ -4208,7 +4511,7 @@ msgstr "ha denunciado un" msgid "have delayed." msgstr "han retrasado." -#: locale/model_attributes.rb:56 +#: locale/model_attributes.rb:54 msgid "holiday" msgstr "vacaciones" @@ -4217,15 +4520,11 @@ msgstr "vacaciones" msgid "in term time" msgstr "durante el periodo escolar" -#: app/views/public_body/list.rhtml:42 -msgid "in total" -msgstr "en total" - -#: locale/model_attributes.rb:62 +#: locale/model_attributes.rb:60 msgid "incoming message" msgstr "incoming message" -#: locale/model_attributes.rb:79 +#: locale/model_attributes.rb:78 msgid "info request" msgstr "info request" @@ -4238,6 +4537,10 @@ msgstr "info request event" msgid "internal error" msgstr "error interno" +#: app/views/general/search.rhtml:92 +msgid "internal reviews" +msgstr "revisiones internas" + #: app/views/request/show.rhtml:100 msgid "is <strong>waiting for your clarification</strong>." msgstr "está <strong>esperando su aclaración</strong>." @@ -4255,6 +4558,16 @@ msgstr "dejó un comentario" msgid "made." msgstr "hecho." +#: app/views/general/search.rhtml:102 +#: app/views/request/_request_filter_form.rhtml:13 +msgid "messages from authorities" +msgstr "mensajes de organismos" + +#: app/views/general/search.rhtml:101 +#: app/views/request/_request_filter_form.rhtml:12 +msgid "messages from users" +msgstr "mensajes de usuarios" + #: app/views/request/show.rhtml:74 msgid "no later than" msgstr "no más tarde de" @@ -4275,10 +4588,6 @@ msgstr "" msgid "normally" msgstr "normalmente" -#: app/views/user/show.rhtml:114 -msgid "only" -msgstr "sólo" - #: locale/model_attributes.rb:25 msgid "outgoing message" msgstr "mensaje de salida" @@ -4291,7 +4600,7 @@ msgstr "por favor abra una sesión como " msgid "please sign in or make a new account." msgstr "por favor abra una sesión o cree una nueva cuenta." -#: locale/model_attributes.rb:49 +#: locale/model_attributes.rb:47 msgid "post redirect" msgstr "post redirect" @@ -4303,10 +4612,6 @@ msgstr "foto de perfil" msgid "public body" msgstr "organismo público" -#: locale/model_attributes.rb:47 -msgid "raw email" -msgstr "correo original" - #: app/views/request_mailer/not_clarified_alert.rhtml:1 msgid "request." msgstr "petición." @@ -4315,6 +4620,15 @@ msgstr "petición." msgid "requesting an internal review" msgstr "pidiendo una revisión interna" +#: app/models/track_thing.rb:92 app/models/track_thing.rb:111 +#: app/models/track_thing.rb:113 app/views/general/search.rhtml:54 +msgid "requests" +msgstr "solicitudes" + +#: app/models/track_thing.rb:112 +msgid "requests which are {{list_of_statuses}}" +msgstr "solicitudes que son {{list_of_statuses}}" + #: app/views/request_mailer/requires_admin.rhtml:3 msgid "" "response as needing administrator attention. Take a look, and reply to this\n" @@ -4327,7 +4641,7 @@ msgstr "" msgid "send a follow up message" msgstr "envíe un mensaje de seguimiento" -#: app/views/request/_request_listing_via_event.rhtml:31 +#: app/views/request/_request_listing_via_event.rhtml:23 msgid "sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "enviada a {{public_body_name}} por {{info_request_user}} el {{date}}." @@ -4335,9 +4649,14 @@ msgstr "enviada a {{public_body_name}} por {{info_request_user}} el {{date}}." msgid "sign in" msgstr "abrir sesión" -#: app/views/user/wrong_user.rhtml:4 -msgid "sign out" -msgstr "cerrar sesión" +#: app/models/track_thing.rb:101 +msgid "successful" +msgstr "exitosas" + +#: app/views/general/search.rhtml:89 +#: app/views/request/_request_filter_form.rhtml:31 +msgid "successful requests" +msgstr "solicitudes exitosas" #: app/views/request_mailer/new_response.rhtml:2 msgid "that you made to" @@ -4360,22 +4679,6 @@ msgstr "que hizo a" msgid "the {{site_name}} team" msgstr "el equipo de {{site_name}}" -#: app/views/user/show.rhtml:140 -msgid "this person" -msgstr "esta persona" - -#: app/views/user/show.rhtml:113 -msgid "" -"to change password, \n" -" subscriptions and more" -msgstr "" -"para cambiar la contraseña, \n" -" las suscripciones y más" - -#: app/views/request/new.rhtml:34 -msgid "to check that the info isn't already published." -msgstr "comprobar que la información no esta ya publicada." - #: app/views/request/show.rhtml:62 msgid "to read" msgstr "leer" @@ -4396,7 +4699,7 @@ msgstr "track thing" msgid "unexpected prominence on request event" msgstr "visibilidad inesperada en el evento de la petición" -#: app/views/request/_request_listing_via_event.rhtml:38 +#: app/views/request/_request_listing_via_event.rhtml:30 msgid "unknown event type indexed " msgstr "indexado tipo de evento desconocido " @@ -4404,35 +4707,53 @@ msgstr "indexado tipo de evento desconocido " msgid "unknown reason " msgstr "motivo desconocido " -#: app/models/info_request.rb:814 app/models/info_request_event.rb:333 +#: app/models/info_request.rb:816 app/models/info_request_event.rb:318 msgid "unknown status " msgstr "estado desconocido " -#: app/views/user/show.rhtml:208 +#: app/views/general/search.rhtml:91 +#: app/views/request/_request_filter_form.rhtml:33 +msgid "unresolved requests" +msgstr "solicitudes no resueltas" + +#: app/views/user/show.rhtml:224 msgid "unsubscribe" msgstr "cancelar suscripción" -#: app/views/user/show.rhtml:180 app/views/user/show.rhtml:194 +#: app/views/user/show.rhtml:196 app/views/user/show.rhtml:210 msgid "unsubscribe all" msgstr "cancelar todas las suscripciones" +#: app/models/track_thing.rb:98 +msgid "unsuccessful" +msgstr "fallidas" + +#: app/views/general/search.rhtml:90 +#: app/views/request/_request_filter_form.rhtml:32 +msgid "unsuccessful requests" +msgstr "solicitudes fallidas" + #: app/views/request/show.rhtml:53 msgid "useful information." msgstr "información útil." -#: locale/model_attributes.rb:68 +#: locale/model_attributes.rb:66 msgid "user" msgstr "usuario" -#: locale/model_attributes.rb:66 +#: locale/model_attributes.rb:64 msgid "user info request sent alert" msgstr "user info request sent alert" -#: app/views/user/show.rhtml:140 -msgid "you" -msgstr "Usted" +#: app/models/track_thing.rb:83 app/views/general/search.rhtml:55 +msgid "users" +msgstr "usuarios" + +#: app/views/request/list.rhtml:21 +msgid "{{count}} FOI requests found" +msgstr "{{count}} solicitudes de información encontradas" -#: app/views/request/new.rhtml:6 +#: app/views/request/new.rhtml:25 msgid "" "{{existing_request_user}} already\n" " created the same request on {{date}}. You can either view the <a href=\"{{existing_request}}\">existing request</a>,\n" @@ -4446,26 +4767,57 @@ msgstr "" msgid "{{info_request_user_name}} only:" msgstr "Sólo {{info_request_user_name}}:" -#: app/views/general/frontpage.rhtml:51 +#: app/views/general/frontpage.rhtml:63 msgid "{{length_of_time}} ago" msgstr "hace {{length_of_time}}" +#: app/models/track_thing.rb:122 +msgid "{{list_of_things}} matching text '{{search_query}}'" +msgstr "{{list_of_things}} encontradas por '{{search_query}}'" + #: app/views/request/_after_actions.rhtml:43 msgid "{{public_body_name}} only:" msgstr "Sólo {{public_body_name}}:" +#: app/views/track_mailer/event_digest.rhtml:21 +msgid "{{public_body}} sent a response to {{user_name}}" +msgstr "{{public_body}} respondió a {{user_name}}" + +#: app/controllers/user_controller.rb:43 +msgid "{{search_results}} matching '{{query}}'" +msgstr "{{search_results}} encontrados por '{{query}}'" + +#: app/views/general/frontpage.rhtml:39 +msgid "" +"{{site_name}} covers requests to {{number_of_authorities}} authorities, " +"including:" +msgstr "" +"{{site_name}} incluye solicitudes a {{number_of_authorities}} organismos " +"públicos, incluyendo:" + #: app/views/public_body/view_email.rhtml:7 msgid "" "{{site_name}} sends new requests to <strong>{{request_email}}</strong> for " "this authority." msgstr "" -"{{site_name}} envía nuevas peticiones a <strong>{{request_email}}</strong> para " -"este organismo." +"{{site_name}} envía nuevas peticiones a <strong>{{request_email}}</strong> " +"para este organismo." -#: app/models/user.rb:122 +#: app/views/general/frontpage.rhtml:56 +msgid "" +"{{site_name}} users have made {{number_of_requests}} requests, including:" +msgstr "" +"Los usuarios de {{site_name}} han hecho {{number_of_requests}} solicitudes, " +"incluyendo:" + +#: app/models/user.rb:131 msgid "{{user_name}} (Banned)" msgstr "{{user_name}} (Expulsado)" +#: app/views/track_mailer/event_digest.rhtml:31 +msgid "{{user_name}} added an annotation" +msgstr "{{user_name}} añadió un comentario" + #: app/views/request_mailer/comment_on_alert.rhtml:1 msgid "" "{{user_name}} has annotated your {{law_used_short}} \n" @@ -4476,7 +4828,16 @@ msgstr "" #: app/views/contact_mailer/user_message.rhtml:2 msgid "{{user_name}} has used {{site_name}} to send you the message below." -msgstr "{{user_name}} ha usado {{site_name}} para enviarle el siguiente mensaje." +msgstr "" +"{{user_name}} ha usado {{site_name}} para enviarle el siguiente mensaje." + +#: app/views/track_mailer/event_digest.rhtml:24 +msgid "{{user_name}} sent a follow up message to {{public_body}}" +msgstr "{{user_name}} envió un mensaje a {{public_body}}" + +#: app/views/track_mailer/event_digest.rhtml:28 +msgid "{{user_name}} sent a request to {{public_body}}" +msgstr "{{user_name}} envió una solicitud a {{public_body}}" #: app/views/request/show.rhtml:36 msgid "" @@ -4484,8 +4845,8 @@ msgid "" "{{law_used_full}} request (<a href=\"{{request_admin_url}}\">admin</a>) to " "{{public_body_link}} (<a href=\"{{public_body_admin_url}}\">admin</a>)" msgstr "" -"{{user}} (<a href=\"{{user_admin_url}}\">admin</a>) hizo esta " -"petición {{law_used_full}} (<a href=\"{{request_admin_url}}\">admin</a>) a " +"{{user}} (<a href=\"{{user_admin_url}}\">admin</a>) hizo esta petición " +"{{law_used_full}} (<a href=\"{{request_admin_url}}\">admin</a>) a " "{{public_body_link}} (<a href=\"{{public_body_admin_url}}\">admin</a>)" #: app/views/request/show.rhtml:44 diff --git a/locale/fr/app.po b/locale/fr/app.po index 63fdf31f9..1c1c789af 100644 --- a/locale/fr/app.po +++ b/locale/fr/app.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # <victoria@access-info.org>, 2011. +# <alex@alexskene.com>, 2011. # skenaja <alex@alexskene.com>, 2011. msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2011-08-11 12:30+0200\n" -"PO-Revision-Date: 2011-08-12 00:21+0000\n" -"Last-Translator: vickyanderica <victoria@access-info.org>\n" +"POT-Creation-Date: 2011-09-05 11:30+0200\n" +"PO-Revision-Date: 2011-09-05 09:58+0000\n" +"Last-Translator: vbrestovci <vbrestovci@gmail.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +19,7 @@ msgstr "" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" -#: app/models/incoming_message.rb:866 +#: app/models/incoming_message.rb:868 msgid "" "\n" "\n" @@ -129,25 +130,25 @@ msgstr "" msgid " made by " msgstr "" -#: app/views/user/show.rhtml:123 -msgid " made no Freedom of Information requests using this site." +#: app/models/track_thing.rb:112 app/models/track_thing.rb:120 +msgid " or " msgstr "" #: app/views/user/contact.rhtml:36 msgid " when you send this message." msgstr "" -#: app/views/public_body/show.rhtml:80 +#: app/views/public_body/show.rhtml:82 msgid "%d Freedom of Information request made using this site" msgid_plural "%d Freedom of Information requests made using this site" msgstr[0] "" msgstr[1] "" -#: app/views/general/frontpage.rhtml:36 +#: app/views/general/frontpage.rhtml:44 msgid "%d request" msgid_plural "%d requests" -msgstr[0] "other: %d sollicitude" -msgstr[1] "" +msgstr[0] "%d sollicitude" +msgstr[1] "%d sollicitudes" #: app/views/public_body/_body_listing_single.rhtml:21 msgid "%d request made." @@ -155,15 +156,27 @@ msgid_plural "%d requests made." msgstr[0] "" msgstr[1] "" -#: app/views/request/new.rhtml:102 +#: app/views/request/new.rhtml:83 msgid "'Crime statistics by ward level for Wales'" msgstr "" -#: app/views/request/new.rhtml:100 +#: app/views/request/new.rhtml:81 msgid "'Pollution levels over time for the River Tyne'" msgstr "" -#: app/controllers/user_controller.rb:355 +#: app/models/track_thing.rb:246 +msgid "'{{link_to_authority}}', a public authority" +msgstr "" + +#: app/models/track_thing.rb:195 +msgid "'{{link_to_request}}', a request" +msgstr "" + +#: app/models/track_thing.rb:262 +msgid "'{{link_to_user}}', a person" +msgstr "" + +#: app/controllers/user_controller.rb:373 msgid "" ",\n" "\n" @@ -172,34 +185,52 @@ msgid "" "Yours,\n" "\n" "{{user_name}}" +msgstr ",\\n\\n\\n\\nCordialement,\\n\\n{{user_name}}" + +#: app/views/request/select_authority.rhtml:29 +msgid "1. Select an authority" +msgstr "" + +#: app/views/request/new.rhtml:26 +msgid "2. Ask for Information" +msgstr "" + +#: app/views/request/preview.rhtml:5 +msgid "3. Now check your request" +msgstr "" + +#: app/views/public_body/show.rhtml:53 +msgid "<a class=\"link_button_green\" href=\"{{url}}\">{{text}}</a>" msgstr "" #: app/views/request/_after_actions.rhtml:9 msgid "<a href=\"%s\">Add an annotation</a> (to help the requester or others)" msgstr "" -#: app/views/public_body/list.rhtml:29 +#: app/views/public_body/list.rhtml:28 msgid "<a href=\"%s\">Are we missing a public authority?</a>." msgstr "" -#: app/views/request/_sidebar.rhtml:45 +#: app/views/request/_sidebar.rhtml:36 msgid "" "<a href=\"%s\">Are you the owner of\n" " any commercial copyright on this page?</a>" msgstr "" -#: app/views/general/search.rhtml:53 +#: app/views/general/search.rhtml:172 msgid "<a href=\"%s\">Browse all</a> or <a href=\"%s\">ask us to add one</a>." msgstr "" "<a href=\"%s\">Voir tout</a> ou <a href=\"%s\"> demandez nous d'ajouter " "une</a>." -#: app/views/general/exception_caught.rhtml:13 -msgid "<a href=\"%s\">Contact us</a> to tell us about the problem</li>" +#: app/views/public_body/list.rhtml:50 +msgid "<a href=\"%s\">Can't find the one you want?</a>" msgstr "" -#: app/views/public_body/list.rhtml:43 -msgid "<a href=\"%s\">can't find the one you want?</a>" +#: app/views/user/show.rhtml:113 +msgid "" +"<a href=\"%s\">Sign in</a> to change password, subscriptions and more " +"({{user_name}} only)" msgstr "" #: app/views/request/_followup.rhtml:39 app/views/request/_followup.rhtml:46 @@ -211,12 +242,6 @@ msgstr "" msgid "<a href=\"%s\">what's that?</a>" msgstr "" -#: app/views/public_body/show.rhtml:50 -msgid "" -"<a href=\"{{url}}\">Make a new Freedom of Information request</a> to " -"{{public_body_name}}" -msgstr "" - #: app/controllers/request_game_controller.rb:23 msgid "" "<p>All done! Thank you very much for your help.</p><p>There are <a " @@ -224,7 +249,7 @@ msgid "" "{{site_name}}.</p>" msgstr "" -#: app/controllers/request_controller.rb:399 +#: app/controllers/request_controller.rb:398 msgid "" "<p>Thank you! Here are some ideas on what to do next:</p>\n" " <ul>\n" @@ -238,59 +263,60 @@ msgid "" " </ul>" msgstr "" -#: app/controllers/request_controller.rb:393 +#: app/controllers/request_controller.rb:392 msgid "" "<p>Thank you! Hope you don't have to wait much longer.</p> <p>By law, you " "should have got a response promptly, and normally before the end of " "<strong>{{date_response_required_by}}</strong>.</p>" msgstr "" -#: app/controllers/request_controller.rb:389 +#: app/controllers/request_controller.rb:388 msgid "" "<p>Thank you! Hopefully your wait isn't too long.</p> <p>By law, you should get a response promptly, and normally before the end of <strong>\n" "{{date_response_required_by}}</strong>.</p>" msgstr "" -#: app/controllers/request_controller.rb:428 +#: app/controllers/request_controller.rb:427 msgid "" "<p>Thank you! Hopefully your wait isn't too long.</p><p>You should get a " -"response within 20 days, or be told if it will take longer (<a " -"href=\"{{review_url}}\">details</a>).</p>" +"response within {{late_number_of_days}} days, or be told if it will take " +"longer (<a href=\"{{review_url}}\">details</a>).</p>" msgstr "" -#: app/controllers/request_controller.rb:431 +#: app/controllers/request_controller.rb:430 msgid "" "<p>Thank you! We'll look into what happened and try and fix it up.</p><p>If " "the error was a delivery failure, and you can find an up to date FOI email " "address for the authority, please tell us using the form below.</p>" msgstr "" -#: app/controllers/request_controller.rb:396 +#: app/controllers/request_controller.rb:395 msgid "" -"<p>Thank you! Your request is long overdue, by more than 40 working days. " -"Most requests should be answered within 20 working days. You might like to " -"complain about this, see below.</p>" +"<p>Thank you! Your request is long overdue, by more than " +"{{very_late_number_of_days}} working days. Most requests should be answered " +"within {{late_number_of_days}} working days. You might like to complain " +"about this, see below.</p>" msgstr "" -#: app/controllers/user_controller.rb:495 +#: app/controllers/user_controller.rb:513 msgid "" "<p>Thanks for changing the text about you on your profile.</p>\n" " <p><strong>Next...</strong> You can upload a profile photograph too.</p>" msgstr "" -#: app/controllers/user_controller.rb:417 +#: app/controllers/user_controller.rb:435 msgid "" "<p>Thanks for updating your profile photo.</p>\n" " <p><strong>Next...</strong> You can put some text about you and your research on your profile.</p>" msgstr "" -#: app/controllers/request_controller.rb:284 +#: app/controllers/request_controller.rb:283 msgid "" "<p>We recommend that you edit your request and remove the email address.\n" " If you leave it, the email address will be sent to the authority, but will not be displayed on the site.</p>" msgstr "" -#: app/controllers/request_controller.rb:417 +#: app/controllers/request_controller.rb:416 msgid "" "<p>We're glad you got all the information that you wanted. If you write " "about or make use of the information, please come back and add an annotation" @@ -299,7 +325,7 @@ msgid "" "it.</p>" msgstr "" -#: app/controllers/request_controller.rb:420 +#: app/controllers/request_controller.rb:419 msgid "" "<p>We're glad you got some of the information that you wanted. If you found " "{{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to " @@ -307,27 +333,27 @@ msgid "" "information, here's what to do now.</p>" msgstr "" -#: app/controllers/request_controller.rb:282 +#: app/controllers/request_controller.rb:281 msgid "" "<p>You do not need to include your email in the request in order to get a " "reply (<a href=\"%s\">details</a>).</p>" msgstr "" -#: app/controllers/request_controller.rb:280 +#: app/controllers/request_controller.rb:279 msgid "" "<p>You do not need to include your email in the request in order to get a " "reply, as we will ask for it on the next screen (<a " "href=\"%s\">details</a>).</p>" msgstr "" -#: app/controllers/request_controller.rb:288 +#: app/controllers/request_controller.rb:287 msgid "" "<p>Your request contains a <strong>postcode</strong>. Unless it directly " "relates to the subject of your request, please remove any address as it will" " <strong>appear publicly on the Internet</strong>.</p>" msgstr "" -#: app/controllers/request_controller.rb:311 +#: app/controllers/request_controller.rb:310 msgid "" "<p>Your {{law_used_full}} request has been <strong>sent on its way</strong>!</p>\n" " <p><strong>We will email you</strong> when there is a response, or after 20 working days if the authority still hasn't\n" @@ -336,7 +362,7 @@ msgid "" " annotation below telling people about your writing.</p>" msgstr "" -#: app/controllers/application_controller.rb:279 +#: app/controllers/application_controller.rb:298 msgid "" "<p>{{site_name}} is currently in maintenance. You can only view existing " "requests. You cannot make new ones, add followups or annotations, or " @@ -350,13 +376,13 @@ msgid "" "</p>" msgstr "" -#: app/views/request/new.rhtml:131 +#: app/views/request/new.rhtml:124 msgid "" "<strong> Can I request information about myself?</strong>\n" "\t\t\t<a href=\"%s\">No! (Click here for details)</a>" msgstr "" -#: app/views/general/search.rhtml:130 +#: app/views/general/search.rhtml:226 msgid "" "<strong><code>commented_by:tony_bowden</code></strong> to search annotations" " made by Tony Bowden, typing the name as in the URL." @@ -364,7 +390,7 @@ msgstr "" "<strong><code>commented_by:tony_bowden</code></strong> Pour chercher des " "commentaires faits par Tony Bowden, écrivez le nom comme dans l'URL" -#: app/views/general/search.rhtml:132 +#: app/views/general/search.rhtml:228 msgid "" "<strong><code>filetype:pdf</code></strong> to find all responses with PDF " "attachments. Or try these: <code>{{list_of_file_extensions}}</code>" @@ -373,7 +399,7 @@ msgstr "" "avec des documents PDF. Ou essayer ceux-ci: " "<code>{{list_of_file_extensions}}</code>" -#: app/views/general/search.rhtml:131 +#: app/views/general/search.rhtml:227 msgid "" "<strong><code>request:</code></strong> to restrict to a specific request, " "typing the title as in the URL." @@ -381,7 +407,7 @@ msgstr "" "<strong><code>request:</code></strong> Pour vous limiter à une sollicitude " "concrète, tapez le titre comme dans l'URL." -#: app/views/general/search.rhtml:129 +#: app/views/general/search.rhtml:225 msgid "" "<strong><code>requested_by:julian_todd</code></strong> to search requests " "made by Julian Todd, typing the name as in the URL." @@ -389,7 +415,7 @@ msgstr "" "<strong><code>requested_by:julian_todd</code></strong> Pour chercher les " "sollicitudes faites par Julian Todd, écrivez le nom comme dans l'URL. " -#: app/views/general/search.rhtml:128 +#: app/views/general/search.rhtml:224 msgid "" "<strong><code>requested_from:home_office</code></strong> to search requests " "from the Home Office, typing the name as in the URL." @@ -397,14 +423,14 @@ msgstr "" "<strong><code>requested_from:home_office</code></strong> Pour chercher les " "sollicitudes du Home Office, écrivez le nom comme dans l'URL. " -#: app/views/general/search.rhtml:126 +#: app/views/general/search.rhtml:222 msgid "" "<strong><code>status:</code></strong> to select based on the status or " "historical status of the request, see the <a href=\"{{statuses_url}}\">table" " of statuses</a> below." msgstr "" -#: app/views/general/search.rhtml:134 +#: app/views/general/search.rhtml:230 msgid "" "<strong><code>tag:charity</code></strong> to find all public bodies or requests with a given tag. You can include multiple tags, \n" " and tag values, e.g. <code>tag:openlylocal AND tag:financial_transaction:335633</code>. Note that by default any of the tags\n" @@ -412,12 +438,12 @@ msgid "" msgstr "" "<strong><code>tag:charity</code></strong> pour trouvez tous les institutions" " publiques ou les sollicitudes avec la même étiquette. Vous pouvez inclure " -"plusieurs étiquettes, ⏎ ou plusieurs étiquettes, ex. <code>tag:openlylocal " +"plusieurs étiquettes,\\n ou plusieurs étiquettes, ex. <code>tag:openlylocal " "AND tag:financial_transaction:335633</code>. Note that by default any of the" -" tags⏎ can be present, you have to put <code>AND</code> explicitly if you " -"only want results them all present." +" tags \\n can be present, you have to put <code>AND</code> explicitly if you" +" only want results them all present." -#: app/views/general/search.rhtml:127 +#: app/views/general/search.rhtml:223 msgid "" "<strong><code>variety:</code></strong> to select type of thing to search " "for, see the <a href=\"{{varieties_url}}\">table of varieties</a> below." @@ -493,34 +519,20 @@ msgstr "" msgid "<strong>Some of the information</strong> has been sent " msgstr "" -#: app/views/general/exception_caught.rhtml:17 -msgid "<strong>Technical details:</strong>" -msgstr "" - #: app/views/comment/new.rhtml:35 msgid "<strong>Thank</strong> the public authority or " msgstr "" -#: app/views/request/new.rhtml:23 -msgid "" -"<strong>browse</strong> the authority's <a href=\"%s\">publication " -"scheme</a> or <strong>search</strong> their web site ..." -msgstr "" - #: app/views/request/show.rhtml:91 msgid "<strong>did not have</strong> the information requested." msgstr "" -#: app/views/request/new.rhtml:25 -msgid "<strong>search</strong> the authority's web site ..." -msgstr "" - #: app/views/comment/new.rhtml:45 msgid "" "A <strong>summary</strong> of the response if you have received it by post. " msgstr "" -#: app/views/general/search.rhtml:162 +#: app/views/general/search.rhtml:258 msgid "A public authority" msgstr "" @@ -528,11 +540,11 @@ msgstr "" msgid "A response will be sent <strong>by post</strong>" msgstr "" -#: app/views/general/search.rhtml:151 +#: app/views/general/search.rhtml:247 msgid "A strange reponse, required attention by the {{site_name}} team" msgstr "" -#: app/views/general/search.rhtml:163 +#: app/views/general/search.rhtml:259 msgid "A {{site_name}} user" msgstr "" @@ -540,10 +552,6 @@ msgstr "" msgid "About you:" msgstr "" -#: app/models/info_request_event.rb:293 -msgid "Acknowledgement" -msgstr "" - #: app/views/request/_sidebar.rhtml:5 msgid "Act on what you've learnt" msgstr "" @@ -552,7 +560,7 @@ msgstr "" msgid "Add an annotation to " msgstr "" -#: app/views/request/show_response.rhtml:47 +#: app/views/request/show_response.rhtml:45 msgid "" "Add an annotation to your request with choice quotes, or\n" " a <strong>summary of the response</strong>." @@ -570,7 +578,11 @@ msgstr "Le niveau administratif n'est pas inclus dans cette liste" msgid "Administration URL:" msgstr "" -#: app/views/general/search.rhtml:31 app/views/general/search.rhtml:121 +#: app/views/general/search.rhtml:46 +msgid "Advanced search" +msgstr "" + +#: app/views/general/search.rhtml:217 msgid "Advanced search tips" msgstr "Conseils pour une recherche avancée" @@ -580,28 +592,24 @@ msgid "" " about it if not." msgstr "" -#: app/views/request/new.rhtml:69 +#: app/views/request/new.rhtml:59 msgid "" "Air, water, soil, land, flora and fauna (including how these effect\n" -" human beings)" +" human beings)" msgstr "" -#: app/models/info_request_event.rb:309 -msgid "All information sent" -msgstr "" - -#: app/views/general/search.rhtml:146 +#: app/views/general/search.rhtml:242 msgid "All of the information requested has been received" msgstr "" -#: app/views/public_body/list.rhtml:5 -msgid "Alphabet" -msgstr "" - #: app/views/public_body/_body_listing_single.rhtml:12 msgid "Also called {{other_name}}." msgstr "" +#: app/views/track_mailer/event_digest.rhtml:60 +msgid "Alter your subscription" +msgstr "" + #: app/views/request_mailer/new_response.rhtml:12 msgid "" "Although all responses are automatically published, we depend on\n" @@ -612,7 +620,7 @@ msgstr "" msgid "An <strong>error message</strong> has been received" msgstr "" -#: app/views/general/search.rhtml:161 +#: app/views/general/search.rhtml:257 msgid "Annotation added to request" msgstr "" @@ -636,13 +644,13 @@ msgstr "" msgid "Anyone:" msgstr "" -#: app/views/request/new.rhtml:47 +#: app/views/request/new.rhtml:94 msgid "" "Ask for <strong>specific</strong> documents or information, this site is not" " suitable for general enquiries." msgstr "" -#: app/views/request/show_response.rhtml:31 +#: app/views/request/show_response.rhtml:29 msgid "" "At the bottom of this page, write a reply to them trying to persuade them to scan it in\n" " (<a href=\"%s\">more details</a>)." @@ -652,30 +660,38 @@ msgstr "" msgid "Attachment (optional):" msgstr "" -#: app/models/info_request.rb:783 +#: app/models/info_request.rb:785 msgid "Awaiting classification." msgstr "" -#: app/models/info_request.rb:803 +#: app/models/info_request.rb:805 msgid "Awaiting internal review." msgstr "" -#: app/models/info_request.rb:785 +#: app/models/info_request.rb:787 msgid "Awaiting response." msgstr "" -#: app/views/request/new.rhtml:43 +#: app/views/public_body/list.rhtml:4 +msgid "Beginning with" +msgstr "" + +#: app/views/request/new.rhtml:38 msgid "" -"Browse <a href=\"%s\">other requests</a> for examples of how to word your " -"request." +"Browse <a href='{{url}}'>other requests</a> for examples of how to word your" +" request." msgstr "" -#: app/views/request/new.rhtml:41 +#: app/views/request/new.rhtml:36 msgid "" "Browse <a href='{{url}}'>other requests</a> to '{{public_body_name}}' for " "examples of how to word your request." msgstr "" +#: app/views/general/frontpage.rhtml:49 +msgid "Browse all authorities..." +msgstr "" + #: app/views/request/show.rhtml:86 msgid "" "By law, under all circumstances, {{public_body_link}} should have responded " @@ -688,14 +704,6 @@ msgid "" "<strong>promptly</strong> and" msgstr "" -#: app/views/general/search.rhtml:17 -msgid "" -"Can't find it? <a href=\"%s\">Browse all</a> or <a href=\"%s\">ask us to add" -" it</a>." -msgstr "" -"Vous ne l'avez pas truové? <a href=\"%s\">Voyez tous</a> ou <a " -"href=\"%s\">demandez nous de l'inclure</a>." - #: app/controllers/track_controller.rb:145 msgid "Cancel a {{site_name}} alert" msgstr "" @@ -720,10 +728,6 @@ msgstr "" msgid "CensorRule|Text" msgstr "" -#: lib/public_body_categories_en.rb:14 -msgid "Central government" -msgstr "" - #: app/views/user/signchangeemail.rhtml:37 msgid "Change email on {{site_name}}" msgstr "" @@ -732,7 +736,7 @@ msgstr "" msgid "Change password on {{site_name}}" msgstr "" -#: app/views/user/set_crop_profile_photo.rhtml:1 app/views/user/show.rhtml:104 +#: app/views/user/show.rhtml:104 app/views/user/set_crop_profile_photo.rhtml:1 msgid "Change profile photo" msgstr "" @@ -744,7 +748,7 @@ msgstr "" msgid "Change your email" msgstr "" -#: app/controllers/user_controller.rb:250 +#: app/controllers/user_controller.rb:268 #: app/views/user/signchangeemail.rhtml:1 #: app/views/user/signchangeemail.rhtml:11 msgid "Change your email address used on {{site_name}}" @@ -754,39 +758,35 @@ msgstr "" msgid "Change your password" msgstr "" -#: app/views/user/signchangepassword.rhtml:1 -#: app/views/user/signchangepassword.rhtml:11 #: app/views/user/signchangepassword_send_confirm.rhtml:1 #: app/views/user/signchangepassword_send_confirm.rhtml:9 +#: app/views/user/signchangepassword.rhtml:1 +#: app/views/user/signchangepassword.rhtml:11 msgid "Change your password on {{site_name}}" msgstr "" -#: app/controllers/user_controller.rb:204 +#: app/controllers/user_controller.rb:222 msgid "Change your password {{site_name}}" msgstr "" -#: app/views/public_body/show.rhtml:15 app/views/public_body/show.rhtml:17 +#: app/views/public_body/show.rhtml:17 app/views/public_body/show.rhtml:19 msgid "Charity registration" msgstr "" -#: app/views/general/exception_caught.rhtml:6 +#: app/views/general/exception_caught.rhtml:8 msgid "Check for mistakes if you typed or copied the address." msgstr "" -#: app/views/request/followup_preview.rhtml:14 #: app/views/request/preview.rhtml:7 +#: app/views/request/followup_preview.rhtml:14 msgid "Check you haven't included any <strong>personal information</strong>." msgstr "" -#: app/models/info_request_event.rb:331 +#: app/models/info_request_event.rb:316 msgid "Clarification" msgstr "" -#: app/models/info_request_event.rb:295 -msgid "Clarification required" -msgstr "" - -#: app/controllers/request_controller.rb:339 +#: app/controllers/request_controller.rb:338 msgid "Classify an FOI response from " msgstr "" @@ -804,49 +804,53 @@ msgstr "" #: locale/model_attributes.rb:22 msgid "Comment|Body" -msgstr "" +msgstr "Commentaire|Texte" #: locale/model_attributes.rb:21 msgid "Comment|Comment type" -msgstr "" +msgstr "Commentaire|Type de Commentaire" #: locale/model_attributes.rb:24 msgid "Comment|Locale" -msgstr "" +msgstr "Commentaire|Localisation" #: locale/model_attributes.rb:23 msgid "Comment|Visible" -msgstr "" +msgstr "Commentaire|Visible" -#: app/models/track_thing.rb:147 +#: app/models/track_thing.rb:220 msgid "Confirm you want to be emailed about new requests" msgstr "" -#: app/models/track_thing.rb:214 +#: app/models/track_thing.rb:287 msgid "" -"Confirm you want to be emailed about new requests or responses matching " -"'{{query}}'" +"Confirm you want to be emailed about new requests or responses matching your" +" search" msgstr "" -#: app/models/track_thing.rb:198 +#: app/models/track_thing.rb:271 msgid "Confirm you want to be emailed about requests by '{{user_name}}'" msgstr "" -#: app/models/track_thing.rb:182 +#: app/models/track_thing.rb:255 msgid "" "Confirm you want to be emailed about requests to '{{public_body_name}}'" msgstr "" -#: app/models/track_thing.rb:163 +#: app/models/track_thing.rb:236 msgid "Confirm you want to be emailed when an FOI request succeeds" msgstr "" -#: app/controllers/request_controller.rb:300 +#: app/models/track_thing.rb:204 +msgid "Confirm you want to follow updates to the request '{{request_title}}'" +msgstr "" + +#: app/controllers/request_controller.rb:299 msgid "Confirm your FOI request to " msgstr "" -#: app/controllers/request_controller.rb:703 -#: app/controllers/user_controller.rb:515 +#: app/controllers/request_controller.rb:707 +#: app/controllers/user_controller.rb:542 msgid "Confirm your account on {{site_name}}" msgstr "" @@ -854,11 +858,15 @@ msgstr "" msgid "Confirm your annotation to {{info_request_title}}" msgstr "" +#: app/controllers/request_controller.rb:31 +msgid "Confirm your email address" +msgstr "" + #: app/models/user_mailer.rb:34 msgid "Confirm your new email address on {{site_name}}" msgstr "" -#: app/views/layouts/default.rhtml:127 +#: app/views/layouts/default.rhtml:152 msgid "Contact {{site_name}}" msgstr "Contact {{site_name}}" @@ -878,10 +886,10 @@ msgstr "" msgid "Crop your profile photo" msgstr "" -#: app/views/request/new.rhtml:74 +#: app/views/request/new.rhtml:64 msgid "" "Cultural sites and built structures (as they may be affected by the\n" -" environmental factors listed above)" +" environmental factors listed above)" msgstr "" #: app/views/request/show.rhtml:68 @@ -890,19 +898,15 @@ msgid "" " they must respond promptly and" msgstr "" -#: app/models/info_request_event.rb:299 -msgid "Deadline Extended" -msgstr "" - -#: app/models/outgoing_message.rb:57 -msgid "Dear " +#: app/models/outgoing_message.rb:63 +msgid "Dear {{public_body_name}}," msgstr "" -#: app/models/info_request.rb:787 +#: app/models/info_request.rb:789 msgid "Delayed." msgstr "" -#: app/models/info_request.rb:805 app/models/info_request_event.rb:315 +#: app/models/info_request.rb:807 msgid "Delivery error" msgstr "" @@ -910,7 +914,7 @@ msgstr "" msgid "Details of request '" msgstr "" -#: app/views/general/search.rhtml:50 app/views/general/search.rhtml:62 +#: app/views/general/search.rhtml:170 msgid "Did you mean: {{correction}}" msgstr "Vous vouliez dire: {{correction}}" @@ -920,6 +924,10 @@ msgid "" "the internet. Our privacy and copyright policies:" msgstr "" +#: app/views/general/_localised_datepicker.rhtml:4 +msgid "Done" +msgstr "" + #: app/views/request/_view_html_prefix.rhtml:6 msgid "Download original attachment" msgstr "" @@ -938,11 +946,15 @@ msgstr "" msgid "Edit text about you" msgstr "" -#: app/models/user.rb:135 +#: app/views/request/preview.rhtml:40 +msgid "Edit this request" +msgstr "" + +#: app/models/user.rb:144 msgid "Either the email or password was not recognised, please try again." msgstr "" -#: app/models/user.rb:137 +#: app/models/user.rb:146 msgid "" "Either the email or password was not recognised, please try again. Or create" " a new account using the form on the right." @@ -956,11 +968,11 @@ msgstr "" msgid "Email me future updates to this request" msgstr "Écrivez-moi avec les nouveautés de cette sollicitude" -#: app/models/track_thing.rb:155 +#: app/models/track_thing.rb:228 msgid "Email me new successful responses " msgstr "" -#: app/models/track_thing.rb:139 +#: app/models/track_thing.rb:212 msgid "Email me when there are new requests" msgstr "" @@ -968,7 +980,7 @@ msgstr "" msgid "Email subscriptions" msgstr "" -#: app/views/general/search.rhtml:123 +#: app/views/general/search.rhtml:219 msgid "" "Enter words that you want to find separated by spaces, e.g. <strong>climbing" " lane</strong>" @@ -982,11 +994,11 @@ msgid "" "<a href=\"%s\">contact us</a> if you need more)." msgstr "" -#: app/views/public_body/show.rhtml:96 +#: app/views/public_body/show.rhtml:104 msgid "Environmental Information Regulations requests made" msgstr "" -#: app/views/public_body/show.rhtml:69 +#: app/views/public_body/show.rhtml:71 msgid "Environmental Information Regulations requests made using this site" msgstr "" @@ -994,39 +1006,39 @@ msgstr "" msgid "Event history" msgstr "" -#: app/views/request/_sidebar.rhtml:41 +#: app/views/request/_sidebar.rhtml:32 msgid "Event history details" msgstr "" -#: app/views/request/new.rhtml:124 +#: app/views/request/new.rhtml:117 msgid "" "Everything that you enter on this page \n" " will be <strong>displayed publicly</strong> on\n" " this website forever (<a href=\"%s\">why?</a>)." msgstr "" -#: app/views/request/new.rhtml:116 +#: app/views/request/new.rhtml:109 msgid "" "Everything that you enter on this page, including <strong>your name</strong>, \n" " will be <strong>displayed publicly</strong> on\n" " this website forever (<a href=\"%s\">why?</a>)." msgstr "" -#: locale/model_attributes.rb:60 +#: locale/model_attributes.rb:58 msgid "EximLogDone|Filename" -msgstr "" +msgstr "EximLogComplet|Nom du fichier" -#: locale/model_attributes.rb:61 +#: locale/model_attributes.rb:59 msgid "EximLogDone|Last stat" -msgstr "" +msgstr "EximLogComplet|Dernier état" #: locale/model_attributes.rb:19 msgid "EximLog|Line" -msgstr "" +msgstr "EximLogComplet|Ligne" #: locale/model_attributes.rb:18 msgid "EximLog|Order" -msgstr "" +msgstr "EximLogComplet|Ordre" #: app/views/public_body/view_email.rhtml:3 msgid "FOI email address for {{public_body}}" @@ -1036,10 +1048,14 @@ msgstr "" msgid "FOI requests" msgstr "" -#: app/models/track_thing.rb:193 app/models/track_thing.rb:194 +#: app/models/track_thing.rb:266 app/models/track_thing.rb:267 msgid "FOI requests by '{{user_name}}'" msgstr "" +#: app/views/general/search.rhtml:199 +msgid "FOI requests {{start_count}} to {{end_count}} of {{total_count}}" +msgstr "" + #: app/models/profile_photo.rb:101 msgid "Failed to convert image to a PNG" msgstr "Je n'ais pas pu convertir l'image en PNG" @@ -1052,29 +1068,22 @@ msgstr "" "Nous n'avons pas pu changer la dimension de l'image: at %{cols}x%{rows}, " "need %{width}x%{height}" -#: app/views/request/new.rhtml:21 -msgid "First," -msgstr "" - -#: app/views/general/frontpage.rhtml:8 +#: app/views/request/select_authority.rhtml:35 msgid "" "First, type in the <strong>name of the UK public authority</strong> you'd \n" " <br>like information from. <strong>By law, they have to respond</strong>\n" " (<a href=\"%s\">why?</a>)." msgstr "" -"Écrivez en premier lieu le <strong> nom de l'institution publique</strong> " -"de laquelle vous voulez recevoir ⏎ <br>l'information<strong> Selon la loi, " -"ils doivent vous répondre</strong>⏎ (<a href=\"%s\">pourquoi?</a>)." #: app/views/request_mailer/old_unclassified_updated.rhtml:4 msgid "Follow this link to see the request:" msgstr "" -#: app/models/info_request_event.rb:335 +#: app/models/info_request_event.rb:320 msgid "Follow up" msgstr "" -#: app/views/general/search.rhtml:159 +#: app/views/general/search.rhtml:255 msgid "Follow up message sent by requester" msgstr "" @@ -1089,7 +1098,11 @@ msgid "" " need to send a follow up." msgstr "" -#: app/views/public_body/show.rhtml:61 +#: app/views/layouts/default.rhtml:153 +msgid "Follow us on twitter" +msgstr "" + +#: app/views/public_body/show.rhtml:62 msgid "" "For an unknown reason, it is not possible to make a request to this " "authority." @@ -1101,13 +1114,15 @@ msgstr "" msgid "Forgotten your password?" msgstr "" -#: app/views/public_body/show.rhtml:56 +#: app/views/public_body/list.rhtml:46 +msgid "Found {{count}} public bodies {{description}}" +msgstr "" + +#: app/views/public_body/show.rhtml:57 msgid "" "Freedom of Information law does not apply to this authority, so you cannot make\n" -" a request to it." +" a request to it." msgstr "" -"La loi d'accès à l'information n'est pas applicable à cette institution, " -"vous ne pouvez donc pas y envoyer⏎ une sollicitude." #: app/views/request/followup_bad.rhtml:11 msgid "Freedom of Information law no longer applies to" @@ -1119,22 +1134,22 @@ msgid "" "messages to existing requests are sent to " msgstr "" -#: app/views/user/show.rhtml:128 -msgid "Freedom of Information request" -msgstr "" - -#: app/views/public_body/show.rhtml:98 +#: app/views/public_body/show.rhtml:106 msgid "Freedom of Information requests made" -msgstr "La sollicitude d'accès à l'information a été envoyée" +msgstr "sollicitudes d'accès à l'information envoyées" -#: app/views/user/show.rhtml:121 app/views/user/show.rhtml:140 -msgid "Freedom of Information requests made by" +#: app/views/user/show.rhtml:155 +msgid "Freedom of Information requests made by this person" msgstr "" -#: app/views/public_body/show.rhtml:72 +#: app/views/user/show.rhtml:155 +msgid "Freedom of Information requests made by you" +msgstr "" + +#: app/views/public_body/show.rhtml:74 msgid "Freedom of Information requests made using this site" msgstr "" -"La sollicitude d'accès à l'information a été envoyée en utilisant cette page" +"sollicitudes d'accès à l'information envoyées en utilisant cette site web" #: app/views/request/followup_bad.rhtml:12 msgid "" @@ -1143,31 +1158,19 @@ msgid "" " an email which will go to the right place, please <a href=\"%s\">send it to us</a>." msgstr "" -#: app/models/outgoing_message.rb:73 +#: app/models/outgoing_message.rb:74 msgid "GIVE DETAILS ABOUT YOUR COMPLAINT HERE" msgstr "" -#: app/views/general/exception_caught.rhtml:14 -msgid "Go to our <a href=\"%s\">front page</a></li>" -msgstr "" - -#: app/models/info_request_event.rb:297 -msgid "Handled by post" -msgstr "" - -#: app/models/info_request.rb:801 +#: app/models/info_request.rb:803 msgid "Handled by post." msgstr "" -#: app/views/layouts/default.rhtml:102 -msgid "Hello!" -msgstr "Bonjour!" - -#: app/views/layouts/default.rhtml:99 +#: app/views/layouts/default.rhtml:97 msgid "Hello, {{username}}!" msgstr "Bonjour, {{username}}!" -#: app/views/layouts/default.rhtml:94 +#: app/views/layouts/default.rhtml:129 msgid "Help" msgstr "Aide" @@ -1187,25 +1190,29 @@ msgid "" " Thanks." msgstr "" -#: locale/model_attributes.rb:57 +#: locale/model_attributes.rb:55 msgid "Holiday|Day" -msgstr "" +msgstr "JoursFériés|Jour" -#: locale/model_attributes.rb:58 +#: locale/model_attributes.rb:56 msgid "Holiday|Description" +msgstr "JoursFériés|Description" + +#: app/views/layouts/default.rhtml:124 +msgid "Home" msgstr "" -#: app/views/public_body/show.rhtml:7 +#: app/views/public_body/show.rhtml:9 msgid "Home page of authority" msgstr "Page web de l'institution" -#: app/views/request/new.rhtml:63 +#: app/views/request/new.rhtml:53 msgid "" "However, you have the right to request environmental\n" -" information under a different law" +" information under a different law" msgstr "" -#: app/views/request/new.rhtml:73 +#: app/views/request/new.rhtml:63 msgid "Human health and safety" msgstr "" @@ -1289,7 +1296,7 @@ msgid "" "the request." msgstr "" -#: app/views/request/new.rhtml:119 +#: app/views/request/new.rhtml:112 msgid "" "If you are thinking of using a pseudonym,\n" " please <a href=\"%s\">read this first</a>." @@ -1306,7 +1313,7 @@ msgid "" "you would type the address of any other webpage." msgstr "" -#: app/views/request/show_response.rhtml:49 +#: app/views/request/show_response.rhtml:47 msgid "" "If you can, scan in or photograph the response, and <strong>send us\n" " a copy to upload</strong>." @@ -1324,15 +1331,15 @@ msgid "" "more. Please try doing what you were doing from the beginning." msgstr "" -#: app/controllers/request_controller.rb:437 +#: app/controllers/request_controller.rb:436 msgid "" "If you have not done so already, please write a message below telling the " "authority that you have withdrawn your request. Otherwise they will not know" " it has been withdrawn." msgstr "" -#: app/views/user/signchangeemail_confirm.rhtml:11 #: app/views/user/signchangepassword_confirm.rhtml:10 +#: app/views/user/signchangeemail_confirm.rhtml:11 msgid "" "If you use web-based email or have \"junk mail\" filters, also check your\n" "bulk/spam mail folders. Sometimes, our messages are marked that way." @@ -1358,15 +1365,15 @@ msgid "" "then there is probably a fault with our server." msgstr "" -#: locale/model_attributes.rb:63 +#: locale/model_attributes.rb:61 msgid "IncomingMessage|Cached attachment text clipped" msgstr "" -#: locale/model_attributes.rb:64 +#: locale/model_attributes.rb:62 msgid "IncomingMessage|Cached main body text folded" msgstr "" -#: locale/model_attributes.rb:65 +#: locale/model_attributes.rb:63 msgid "IncomingMessage|Cached main body text unfolded" msgstr "" @@ -1394,57 +1401,53 @@ msgstr "" msgid "InfoRequestEvent|Prominence" msgstr "" -#: locale/model_attributes.rb:86 +#: locale/model_attributes.rb:85 msgid "InfoRequest|Allow new responses from" msgstr "" -#: locale/model_attributes.rb:82 +#: locale/model_attributes.rb:81 msgid "InfoRequest|Awaiting description" msgstr "" -#: locale/model_attributes.rb:81 +#: locale/model_attributes.rb:80 msgid "InfoRequest|Described state" msgstr "" -#: locale/model_attributes.rb:87 +#: locale/model_attributes.rb:86 msgid "InfoRequest|Handle rejected responses" msgstr "" -#: locale/model_attributes.rb:85 +#: locale/model_attributes.rb:87 +msgid "InfoRequest|Idhash" +msgstr "" + +#: locale/model_attributes.rb:84 msgid "InfoRequest|Law used" msgstr "" -#: locale/model_attributes.rb:83 +#: locale/model_attributes.rb:82 msgid "InfoRequest|Prominence" msgstr "" -#: locale/model_attributes.rb:80 +#: locale/model_attributes.rb:79 msgid "InfoRequest|Title" msgstr "" -#: locale/model_attributes.rb:84 +#: locale/model_attributes.rb:83 msgid "InfoRequest|Url title" msgstr "" -#: app/models/info_request_event.rb:303 -msgid "Information not held" -msgstr "" - -#: app/models/info_request.rb:791 +#: app/models/info_request.rb:793 msgid "Information not held." msgstr "" -#: app/views/request/new.rhtml:71 +#: app/views/request/new.rhtml:61 msgid "" "Information on emissions and discharges (e.g. noise, energy,\n" -" radiation, waste materials)" -msgstr "" - -#: app/models/info_request_event.rb:311 -msgid "Internal review acknowledgement" +" radiation, waste materials)" msgstr "" -#: app/models/info_request_event.rb:328 +#: app/models/info_request_event.rb:313 msgid "Internal review request" msgstr "" @@ -1469,12 +1472,16 @@ msgstr "" msgid "Joined {{site_name}} in" msgstr "" -#: app/views/request/new.rhtml:48 +#: app/views/request/new.rhtml:95 msgid "" "Keep it <strong>focused</strong>, you'll be more likely to get what you want" " (<a href=\"%s\">why?</a>)." msgstr "" +#: app/views/request/_request_filter_form.rhtml:25 +msgid "Keywords" +msgstr "" + #: app/views/contact_mailer/message.rhtml:10 msgid "Last authority viewed: " msgstr "" @@ -1494,41 +1501,45 @@ msgstr "" msgid "Link to this" msgstr "" -#: app/views/public_body/list.rhtml:32 +#: app/views/public_body/list.rhtml:31 msgid "List of all authorities (CSV)" msgstr "" -#: lib/public_body_categories_en.rb:23 -msgid "Local and regional" +#: app/models/info_request.rb:791 +msgid "Long overdue." msgstr "" -#: app/models/info_request.rb:789 -msgid "Long overdue." +#: app/views/request/_request_filter_form.rhtml:42 +msgid "Made between" msgstr "" -#: app/views/public_body/show.rhtml:47 -msgid "Make a new Environmental Information request" +#: app/views/public_body/show.rhtml:49 +msgid "Make a new <strong>Environmental Information</strong> request" msgstr "" -#: app/views/request/new.rhtml:1 -msgid "Make an {{law_used_short}} request to '{{public_body_name}}'" +#: app/views/public_body/show.rhtml:51 +msgid "Make a new <strong>Freedom of Information</strong> request" msgstr "" -#: app/views/layouts/default.rhtml:15 -msgid "Make and browse Freedom of Information (FOI) requests" -msgstr "Envoyer et rechercher des sollicitudes d'accès à lìnformation" +#: app/views/general/frontpage.rhtml:5 +msgid "" +"Make a new<br/>\n" +" <strong>Freedom <span>of</span><br/>\n" +" Information<br/>\n" +" request</strong>" +msgstr "" -#: app/views/layouts/default.rhtml:67 -msgid "Make and explore Freedom of Information requests" -msgstr "Faire et chercher des sollicitudes d'accès à l’information" +#: app/views/layouts/default.rhtml:125 +msgid "Make a request" +msgstr "" -#: app/views/general/frontpage.rhtml:4 -msgid "Make or explore Freedom of Information requests" -msgstr "Faire et chercher des sollicitudes d'accès à l’information" +#: app/views/request/new.rhtml:12 +msgid "Make an {{law_used_short}} request to '{{public_body_name}}'" +msgstr "" -#: app/views/layouts/default.rhtml:87 -msgid "Make request" -msgstr "Faire une sollicitude" +#: app/views/layouts/default.rhtml:15 app/views/layouts/no_chrome.rhtml:8 +msgid "Make and browse Freedom of Information (FOI) requests" +msgstr "Envoyer et rechercher des sollicitudes d'accès à lìnformation" #: app/views/public_body/_body_listing_single.rhtml:23 msgid "Make your own request" @@ -1542,26 +1553,22 @@ msgstr "" msgid "Missing contact details for '" msgstr "" -#: app/views/public_body/show.rhtml:5 +#: app/views/public_body/show.rhtml:7 msgid "More about this authority" msgstr "Plus d'infos sur cet administration" -#: app/views/general/frontpage.rhtml:41 -msgid "More authorities..." -msgstr "Encore plus d'administrations" - -#: app/views/general/frontpage.rhtml:55 +#: app/views/general/frontpage.rhtml:68 msgid "More successful requests..." msgstr "Les sollicitudes les plus réussites" +#: app/views/layouts/default.rhtml:100 +msgid "My profile" +msgstr "" + #: app/views/request/_describe_state.rhtml:64 msgid "My request has been <strong>refused</strong>" msgstr "" -#: app/views/layouts/default.rhtml:91 -msgid "My requests" -msgstr "Mes demandes" - #: app/models/public_body.rb:36 msgid "Name can't be blank" msgstr "Le nom ne peut pas être effacé" @@ -1570,7 +1577,7 @@ msgstr "Le nom ne peut pas être effacé" msgid "Name is already taken" msgstr "Le nom est déjà pris" -#: app/models/track_thing.rb:142 app/models/track_thing.rb:143 +#: app/models/track_thing.rb:215 app/models/track_thing.rb:216 msgid "New Freedom of Information requests" msgstr "" @@ -1590,40 +1597,47 @@ msgstr "" msgid "New password: (again)" msgstr "" -#: app/views/request/show_response.rhtml:62 +#: app/views/request/show_response.rhtml:60 msgid "New response to your request" msgstr "" -#: app/views/request/show_response.rhtml:68 +#: app/views/request/show_response.rhtml:66 msgid "New response to {{law_used_short}} request" msgstr "" -#: app/views/general/search.rhtml:40 +#: app/models/track_thing.rb:199 app/models/track_thing.rb:200 +msgid "New updates for the request '{{request_title}}'" +msgstr "" + +#: app/views/general/search.rhtml:130 msgid "Newest results first" msgstr "Les résultats les plus nouveaux en premier lieu" -#: app/views/user/set_draft_profile_photo.rhtml:32 -msgid "Next, crop your photo >>" +#: app/views/general/_localised_datepicker.rhtml:6 +msgid "Next" msgstr "" -#: app/views/general/search.rhtml:16 -msgid "Next, select the public authority you'd like to make the request from." +#: app/views/user/set_draft_profile_photo.rhtml:32 +msgid "Next, crop your photo >>" msgstr "" -"En suite, selectionnez l'administration que vous voulez faire votre demande." -#: app/views/general/search.rhtml:48 +#: app/views/general/search.rhtml:168 msgid "No public authorities found" msgstr "Aucune institution trouvée" -#: app/views/request/list.rhtml:23 +#: app/views/request/list.rhtml:19 msgid "No requests of this sort yet." msgstr "" +#: app/views/public_body/_search_ahead.rhtml:8 +msgid "No results found." +msgstr "" + #: app/views/request/similar.rhtml:7 msgid "No similar requests found." msgstr "" -#: app/views/public_body/show.rhtml:73 +#: app/views/public_body/show.rhtml:75 msgid "" "Nobody has made any Freedom of Information requests to {{public_body_name}} " "using this site yet." @@ -1631,14 +1645,18 @@ msgstr "" "Personne n'a jamais envoyée une sollicitude d'accès à l'information à " "{{public_body_name}} en utilisant cette page." -#: app/views/public_body/_body_listing.rhtml:2 #: app/views/request/_request_listing.rhtml:2 +#: app/views/public_body/_body_listing.rhtml:3 msgid "None found." msgstr "" -#: app/views/user/signchangeemail_confirm.rhtml:3 +#: app/views/user/show.rhtml:165 app/views/user/show.rhtml:185 +msgid "None made." +msgstr "" + #: app/views/user/signchangepassword_confirm.rhtml:1 #: app/views/user/signchangepassword_confirm.rhtml:3 +#: app/views/user/signchangeemail_confirm.rhtml:3 msgid "Now check your email!" msgstr "" @@ -1654,21 +1672,11 @@ msgstr "" msgid "Now preview your message asking for an internal review" msgstr "" -#: app/views/request/preview.rhtml:5 -msgid "Now preview your request" -msgstr "" - #: app/views/user/set_draft_profile_photo.rhtml:46 msgid "OR remove the existing photo" msgstr "" -#: app/views/general/frontpage.rhtml:25 -msgid "" -"OR, <strong>search</strong> for information others have requested using " -"{{site_name}}" -msgstr "" - -#: app/controllers/request_controller.rb:414 +#: app/controllers/request_controller.rb:413 msgid "" "Oh no! Sorry to hear that your request was refused. Here is what to do now." msgstr "" @@ -1691,11 +1699,19 @@ msgstr "" msgid "On this page" msgstr "" -#: app/views/general/search.rhtml:71 -msgid "One public authority matching ‘{{user_search_query}}’" +#: app/views/general/search.rhtml:197 +msgid "One FOI request found" +msgstr "" + +#: app/views/general/search.rhtml:179 +msgid "One person found" msgstr "" -#: app/views/public_body/show.rhtml:91 +#: app/views/general/search.rhtml:155 +msgid "One public authority found" +msgstr "" + +#: app/views/public_body/show.rhtml:98 msgid "Only requests made using {{site_name}} are shown." msgstr "Seules les demandes faites en utilisant {{site_name}} sont présentés." @@ -1711,10 +1727,14 @@ msgid "" "address to check against" msgstr "" -#: app/views/general/search.rhtml:158 +#: app/views/general/search.rhtml:254 msgid "Original request sent" msgstr "" +#: app/views/request/_describe_state.rhtml:71 +msgid "Other:" +msgstr "" + #: locale/model_attributes.rb:26 msgid "OutgoingMessage|Body" msgstr "" @@ -1735,7 +1755,7 @@ msgstr "" msgid "OutgoingMessage|What doing" msgstr "" -#: app/models/info_request.rb:795 +#: app/models/info_request.rb:797 msgid "Partially successful." msgstr "" @@ -1743,7 +1763,7 @@ msgstr "" msgid "Password is not correct" msgstr "" -#: app/views/user/_signin.rhtml:16 app/views/user/_signup.rhtml:30 +#: app/views/user/_signup.rhtml:30 app/views/user/_signin.rhtml:16 msgid "Password:" msgstr "" @@ -1751,11 +1771,15 @@ msgstr "" msgid "Password: (again)" msgstr "" +#: app/views/general/search.rhtml:181 +msgid "People {{start_count}} to {{end_count}} of {{total_count}}" +msgstr "" + #: app/views/user/set_draft_profile_photo.rhtml:13 msgid "Photo of you:" msgstr "" -#: app/views/request/new.rhtml:76 +#: app/views/request/new.rhtml:66 msgid "Plans and administrative measures that affect these matters" msgstr "" @@ -1794,7 +1818,7 @@ msgid "" "new request</a>." msgstr "" -#: app/views/request/new.rhtml:60 +#: app/views/request/new.rhtml:50 msgid "Please ask for environmental information only" msgstr "" @@ -1808,16 +1832,20 @@ msgstr "" msgid "Please choose a file containing your photo." msgstr "Choisissez un fichier qui contient votre photo." -#: app/models/outgoing_message.rb:162 +#: app/models/outgoing_message.rb:163 msgid "Please choose what sort of reply you are making." msgstr "S'il vous plait choisissez le type de réponse que vous faites" -#: app/controllers/request_controller.rb:346 +#: app/controllers/request_controller.rb:345 msgid "" "Please choose whether or not you got some of the information that you " "wanted." msgstr "" +#: app/views/track_mailer/event_digest.rhtml:63 +msgid "Please click on the link below to cancel or alter these emails." +msgstr "" + #: app/views/user_mailer/changeemail_confirm.rhtml:3 msgid "" "Please click on the link below to confirm that you want to \n" @@ -1859,7 +1887,7 @@ msgstr "Entrez un sujet" msgid "Please enter a summary of your request" msgstr "Entrez un récapitulatif de votre demande" -#: app/models/user.rb:106 +#: app/models/user.rb:115 msgid "Please enter a valid email address" msgstr "Entrez une adresse email valide" @@ -1875,23 +1903,23 @@ msgstr "Entrez le même mot de passe deux fois " msgid "Please enter your annotation" msgstr "S'il vous plait introduisez votre commentaire" -#: app/models/contact_validator.rb:29 app/models/user.rb:34 +#: app/models/user.rb:34 app/models/contact_validator.rb:29 msgid "Please enter your email address" msgstr "Entrez votre addresse email" -#: app/models/outgoing_message.rb:147 +#: app/models/outgoing_message.rb:148 msgid "Please enter your follow up message" msgstr "S'il vous plait introduisez votre message " -#: app/models/outgoing_message.rb:150 +#: app/models/outgoing_message.rb:151 msgid "Please enter your letter requesting information" msgstr "Ecrivez votre demande d'accès aux documents administratifs" -#: app/models/contact_validator.rb:28 app/models/user.rb:36 +#: app/models/user.rb:36 app/models/contact_validator.rb:28 msgid "Please enter your name" msgstr "Entrez votre nom" -#: app/models/user.rb:109 +#: app/models/user.rb:118 msgid "Please enter your name, not your email address, in the name field." msgstr "" "S'il vous plait indiquer votre nom, non pas votre email, dans la case NOM" @@ -1908,7 +1936,7 @@ msgstr "Entrez votre ancienne addresse email" msgid "Please enter your password" msgstr "Entrez votre mot de passe" -#: app/models/outgoing_message.rb:145 +#: app/models/outgoing_message.rb:146 msgid "Please give details explaining why you want a review" msgstr "S'il vous plait expliquer pourquoi vous voulez une révision." @@ -1923,10 +1951,10 @@ msgid "" msgstr "" "S'il vous plait soyez bref dans le résumé, comme dans le titre d'un email." -#: app/views/request/new.rhtml:79 +#: app/views/request/new.rhtml:69 msgid "" "Please only request information that comes under those categories, <strong>do not waste your\n" -" time</strong> or the time of the public authority by requesting unrelated information." +" time</strong> or the time of the public authority by requesting unrelated information." msgstr "" #: app/views/request/new_please_describe.rhtml:5 @@ -1935,7 +1963,7 @@ msgid "" "if they are successful yet or not." msgstr "" -#: app/models/outgoing_message.rb:156 +#: app/models/outgoing_message.rb:157 msgid "" "Please sign at the bottom with your name, or alter the \"%{signoff}\" " "signature" @@ -1947,11 +1975,11 @@ msgstr "" msgid "Please sign in as " msgstr "" -#: app/controllers/request_controller.rb:730 +#: app/controllers/request_controller.rb:734 msgid "Please type a message and/or choose a file containing your response." msgstr "" -#: app/controllers/request_controller.rb:434 +#: app/controllers/request_controller.rb:433 msgid "Please use the form below to tell us more." msgstr "" @@ -1980,13 +2008,13 @@ msgstr "" "S'il vous plait écrivez votre commentaire en utilisant des lettres " "majuscules et minuscules. Ce sera plus facile de lire." -#: app/controllers/request_controller.rb:423 +#: app/controllers/request_controller.rb:422 msgid "" "Please write your follow up message containing the necessary clarifications " "below." msgstr "" -#: app/models/outgoing_message.rb:159 +#: app/models/outgoing_message.rb:160 msgid "" "Please write your message using a mixture of capital and lower case letters." " This makes it easier for others to read." @@ -2000,36 +2028,44 @@ msgid "" " be useful." msgstr "" +#: app/views/request/_search_ahead.rhtml:4 +msgid "Possibly related requests:" +msgstr "" + #: app/views/comment/preview.rhtml:21 msgid "Post annotation" msgstr "" -#: locale/model_attributes.rb:55 +#: locale/model_attributes.rb:53 msgid "PostRedirect|Circumstance" msgstr "" -#: locale/model_attributes.rb:53 +#: locale/model_attributes.rb:51 msgid "PostRedirect|Email token" msgstr "" -#: locale/model_attributes.rb:52 +#: locale/model_attributes.rb:50 msgid "PostRedirect|Post params yaml" msgstr "" -#: locale/model_attributes.rb:54 +#: locale/model_attributes.rb:52 msgid "PostRedirect|Reason params yaml" msgstr "" -#: locale/model_attributes.rb:50 +#: locale/model_attributes.rb:48 msgid "PostRedirect|Token" msgstr "" -#: locale/model_attributes.rb:51 +#: locale/model_attributes.rb:49 msgid "PostRedirect|Uri" msgstr "" #: app/views/general/_credits.rhtml:1 -msgid "Powered by <a href=\"http://www.alaveteli.org/\">Alaveteli</a>." +msgid "Powered by <a href=\"http://www.alaveteli.org/\">Alaveteli</a>" +msgstr "" + +#: app/views/general/_localised_datepicker.rhtml:5 +msgid "Prev" msgstr "" #: app/views/request/followup_preview.rhtml:1 @@ -2048,7 +2084,7 @@ msgstr "" msgid "Preview your message" msgstr "" -#: app/views/request/new.rhtml:139 +#: app/views/request/new.rhtml:132 msgid "Preview your public request" msgstr "" @@ -2061,16 +2097,16 @@ msgid "ProfilePhoto|Draft" msgstr "" #: app/views/public_body/list.rhtml:37 +msgid "Public authorities" +msgstr "" + +#: app/views/public_body/list.rhtml:35 msgid "Public authorities - {{description}}" msgstr "" -#: app/views/general/search.rhtml:73 -msgid "" -"Public authorities {{start_count}} to {{end_count}} of {{total_count}} for " -"{{user_search_query}}" +#: app/views/general/search.rhtml:157 +msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "" -"Administrations {{start_count}} à {{end_count}} de {{total_count}} pour " -"{{user_search_query}} " #: locale/model_attributes.rb:12 msgid "PublicBody|First letter" @@ -2116,12 +2152,16 @@ msgstr "" msgid "PublicBody|Version" msgstr "" -#: app/views/public_body/show.rhtml:10 +#: app/views/public_body/show.rhtml:12 msgid "Publication scheme" msgstr "Diffusions d'Infos Publiques" -#: locale/model_attributes.rb:48 -msgid "RawEmail|Data binary" +#: app/views/track/_tracking_links.rhtml:27 +msgid "RSS feed" +msgstr "" + +#: app/views/track/_tracking_links.rhtml:27 +msgid "RSS feed of updates" msgstr "" #: app/views/comment/preview.rhtml:20 @@ -2132,49 +2172,25 @@ msgstr "" msgid "Re-edit this message" msgstr "" -#: app/views/request/preview.rhtml:40 -msgid "Re-edit this request" -msgstr "" - -#: app/views/general/search.rhtml:137 +#: app/views/general/search.rhtml:233 msgid "" "Read about <a href=\"{{advanced_search_url}}\">advanced search " "operators</a>, such as proximity and wildcards." msgstr "" -#: app/views/layouts/default.rhtml:93 +#: app/views/layouts/default.rhtml:128 msgid "Read blog" msgstr "Lire le blog" -#: app/views/request/new.rhtml:16 -msgid "Read this before writing your {{info_request_law_used_full}} request" -msgstr "" - -#: app/views/general/search.rhtml:150 +#: app/views/general/search.rhtml:246 msgid "Received an error message, such as delivery failure." msgstr "" -#: app/views/general/search.rhtml:42 +#: app/views/general/search.rhtml:132 msgid "Recently described results first" msgstr "" -#: app/controllers/request_controller.rb:139 -msgid "Recently sent Freedom of Information requests" -msgstr "" - -#: app/views/request/list.rhtml:6 -msgid "Recently sent requests" -msgstr "" - -#: app/controllers/request_controller.rb:144 -msgid "Recently successful responses" -msgstr "" - -#: app/models/info_request_event.rb:305 -msgid "Refused" -msgstr "" - -#: app/models/info_request.rb:793 +#: app/models/info_request.rb:795 msgid "Refused." msgstr "" @@ -2204,12 +2220,12 @@ msgstr "" msgid "Request has been removed" msgstr "" -#: app/views/request/_request_listing_via_event.rhtml:28 +#: app/views/request/_request_listing_via_event.rhtml:20 msgid "" "Request sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "" -#: app/views/request/_request_listing_via_event.rhtml:36 +#: app/views/request/_request_listing_via_event.rhtml:28 msgid "" "Request to {{public_body_name}} by {{info_request_user}}. Annotated by " "{{event_comment_user}} on {{date}}." @@ -2224,8 +2240,8 @@ msgstr "" msgid "Requested on {{date}}" msgstr "" -#: app/models/track_thing.rb:209 app/models/track_thing.rb:210 -msgid "Requests or responses matching '{{query}}'" +#: app/models/track_thing.rb:282 app/models/track_thing.rb:283 +msgid "Requests or responses matching your saved search" msgstr "" #: app/views/request/upload_response.rhtml:11 @@ -2244,7 +2260,11 @@ msgstr "" msgid "Respond using the web" msgstr "" -#: app/views/general/search.rhtml:160 +#: app/models/info_request_event.rb:306 +msgid "Response" +msgstr "" + +#: app/views/general/search.rhtml:256 msgid "Response from a public authority" msgstr "" @@ -2256,7 +2276,7 @@ msgstr "" msgid "Response to this request is <strong>long overdue</strong>." msgstr "" -#: app/views/request/show_response.rhtml:64 +#: app/views/request/show_response.rhtml:62 msgid "Response to your request" msgstr "" @@ -2264,7 +2284,11 @@ msgstr "" msgid "Response:" msgstr "" -#: app/views/general/search.rhtml:9 +#: app/views/general/search.rhtml:88 +msgid "Restrict to" +msgstr "" + +#: app/views/general/search.rhtml:12 msgid "Results page {{page_number}}" msgstr "Page de résultats {{page_number}}" @@ -2272,23 +2296,57 @@ msgstr "Page de résultats {{page_number}}" msgid "Save" msgstr "" -#: app/views/general/exception_caught.rhtml:10 -#: app/views/general/frontpage.rhtml:16 app/views/general/search.rhtml:29 -#: app/views/layouts/default.rhtml:80 app/views/request/new.rhtml:31 +#: app/views/request/_request_filter_form.rhtml:49 +#: app/views/request/select_authority.rhtml:41 +#: app/views/public_body/list.rhtml:42 +#: app/views/general/exception_caught.rhtml:12 +#: app/views/general/frontpage.rhtml:24 app/views/general/search.rhtml:32 +#: app/views/general/search.rhtml:45 msgid "Search" msgstr "Rechercher" -#: app/views/general/search.rhtml:4 +#: app/views/general/search.rhtml:8 msgid "Search Freedom of Information requests, public authorities and users" msgstr "" "Chercher des sollicitudes d'accès à l'information, des institutions " -"publiques et des ****" +"publiques et utilisateurs" + +#: app/views/user/show.rhtml:125 +msgid "Search contributions by this person" +msgstr "" + +#: app/views/request/_request_filter_form.rhtml:30 +msgid "Search for words in:" +msgstr "" -#: app/views/general/exception_caught.rhtml:7 +#: app/views/general/search.rhtml:100 +msgid "Search in" +msgstr "" + +#: app/views/general/frontpage.rhtml:15 +msgid "" +"Search over<br/>\n" +" <strong>{{number_of_requests}} requests</strong> <span>and</span><br/>\n" +" <strong>{{number_of_authorities}} authorities</strong>" +msgstr "" + +#: app/views/general/exception_caught.rhtml:9 msgid "Search the site to find what you were looking for." msgstr "" -#: app/controllers/user_controller.rb:331 +#: app/views/user/show.rhtml:123 +msgid "Search your contributions" +msgstr "" + +#: app/views/public_body/_search_ahead.rhtml:5 +msgid "Select one to see more information about the authority." +msgstr "" + +#: app/views/request/select_authority.rhtml:27 +msgid "Select the authority to write to" +msgstr "" + +#: app/controllers/user_controller.rb:349 msgid "Send a message to " msgstr "" @@ -2313,7 +2371,7 @@ msgid "Send message to " msgstr "" #: app/views/request/preview.rhtml:41 -msgid "Send public " +msgid "Send request" msgstr "" #: app/views/user/show.rhtml:53 @@ -2324,15 +2382,20 @@ msgstr "" msgid "Short name is already taken" msgstr "Ce nom est déjà pris" -#: app/views/general/search.rhtml:38 +#: app/views/general/search.rhtml:128 msgid "Show most relevant results first" msgstr "Afficher les résultats les plus pertinents en premier" -#: app/views/public_body/list.rhtml:3 app/views/request/list.rhtml:2 +#: app/views/public_body/list.rhtml:2 msgid "Show only..." msgstr "" -#: app/views/user/_signin.rhtml:31 app/views/user/show.rhtml:113 +#: app/views/request/_request_filter_form.rhtml:5 +#: app/views/general/search.rhtml:52 +msgid "Showing" +msgstr "" + +#: app/views/user/_signin.rhtml:32 msgid "Sign in" msgstr "" @@ -2340,27 +2403,27 @@ msgstr "" msgid "Sign in or make a new account" msgstr "" -#: app/views/layouts/default.rhtml:103 +#: app/views/layouts/default.rhtml:106 msgid "Sign in or sign up" msgstr "Se connecter ou s'inscrire" -#: app/views/layouts/default.rhtml:100 +#: app/views/layouts/default.rhtml:104 msgid "Sign out" msgstr "Se déconnecter" -#: app/views/user/_signup.rhtml:41 +#: app/views/user/_signup.rhtml:46 msgid "Sign up" msgstr "" -#: app/views/request/_sidebar.rhtml:30 +#: app/views/request/_sidebar.rhtml:21 msgid "Similar requests" msgstr "" -#: app/models/info_request_event.rb:307 -msgid "Some information sent" +#: app/views/general/search.rhtml:33 +msgid "Simple search" msgstr "" -#: app/views/general/search.rhtml:145 +#: app/views/general/search.rhtml:241 msgid "Some of the information requested has been received" msgstr "" @@ -2378,20 +2441,36 @@ msgid "" "{{site_name}} from {{old_email}} to {{new_email}}." msgstr "" -#: app/views/general/exception_caught.rhtml:1 +#: app/views/general/exception_caught.rhtml:17 +msgid "Sorry, there was a problem processing this page" +msgstr "" + +#: app/views/general/exception_caught.rhtml:3 msgid "Sorry, we couldn't find that page" msgstr "" -#: app/views/request/new.rhtml:53 +#: app/views/request/new.rhtml:45 msgid "Special note for this authority!" msgstr "" +#: app/views/public_body/show.rhtml:53 +msgid "Start" +msgstr "" + +#: app/views/general/frontpage.rhtml:10 +msgid "Start now »" +msgstr "" + +#: app/views/request/_sidebar.rhtml:14 +msgid "Start your own blog" +msgstr "" + #: app/views/request/_other_describe_state.rhtml:21 msgid "Still awaiting an <strong>internal review</strong>" msgstr "" -#: app/views/request/followup_preview.rhtml:23 #: app/views/request/preview.rhtml:18 +#: app/views/request/followup_preview.rhtml:23 msgid "Subject:" msgstr "" @@ -2403,15 +2482,11 @@ msgstr "" msgid "Submit status" msgstr "" -#: app/models/track_thing.rb:158 app/models/track_thing.rb:159 +#: app/models/track_thing.rb:231 app/models/track_thing.rb:232 msgid "Successful Freedom of Information requests" msgstr "" -#: app/views/request/list.rhtml:5 -msgid "Successful responses" -msgstr "" - -#: app/models/info_request.rb:797 +#: app/models/info_request.rb:799 msgid "Successful." msgstr "" @@ -2421,18 +2496,30 @@ msgid "" "information</strong>." msgstr "" -#: app/views/request/new.rhtml:93 +#: app/views/request/new.rhtml:75 msgid "Summary:" msgstr "" -#: app/views/general/search.rhtml:140 +#: app/views/general/search.rhtml:236 msgid "Table of statuses" msgstr "Table d'états" +#: app/views/general/search.rhtml:251 +msgid "Table of varieties" +msgstr "" + +#: app/views/general/search.rhtml:76 +msgid "Tags (separated by a space):" +msgstr "" + #: app/views/request/preview.rhtml:45 msgid "Tags:" msgstr "" +#: app/views/general/exception_caught.rhtml:21 +msgid "Technical details" +msgstr "" + #: app/controllers/request_game_controller.rb:52 msgid "Thank you for helping us keep the site tidy!" msgstr "" @@ -2441,25 +2528,25 @@ msgstr "" msgid "Thank you for making an annotation!" msgstr "" -#: app/controllers/request_controller.rb:736 +#: app/controllers/request_controller.rb:740 msgid "" "Thank you for responding to this FOI request! Your response has been " "published below, and a link to your response has been emailed to " msgstr "" -#: app/controllers/request_controller.rb:378 +#: app/controllers/request_controller.rb:377 msgid "" "Thank you for updating the status of the request '<a " "href=\"{{url}}\">{{info_request_title}}</a>'. There are some more requests " "below for you to classify." msgstr "" -#: app/controllers/request_controller.rb:381 +#: app/controllers/request_controller.rb:380 msgid "Thank you for updating this request!" msgstr "" -#: app/controllers/user_controller.rb:398 -#: app/controllers/user_controller.rb:414 +#: app/controllers/user_controller.rb:416 +#: app/controllers/user_controller.rb:432 msgid "Thank you for updating your profile photo" msgstr "" @@ -2483,18 +2570,18 @@ msgid "" " requests." msgstr "" -#: app/controllers/user_controller.rb:189 +#: app/controllers/user_controller.rb:207 msgid "" "That doesn't look like a valid email address. Please check you have typed it" " correctly." msgstr "" -#: app/views/request/_describe_state.rhtml:47 #: app/views/request/_other_describe_state.rhtml:43 +#: app/views/request/_describe_state.rhtml:47 msgid "The <strong>review has finished</strong> and overall:" msgstr "" -#: app/views/request/new.rhtml:62 +#: app/views/request/new.rhtml:52 msgid "The Freedom of Information Act <strong>does not apply</strong> to" msgstr "" @@ -2508,7 +2595,7 @@ msgid "" "they say who does)" msgstr "" -#: app/views/request/show_response.rhtml:28 +#: app/views/request/show_response.rhtml:26 msgid "" "The authority only has a <strong>paper copy</strong> of the information." msgstr "" @@ -2532,26 +2619,19 @@ msgid "" "request has not been delivered." msgstr "" -#: app/views/request/show_response.rhtml:22 -msgid "" -"The law, the Ministry of Justice and the Information Commissioner\n" -" all say that an email is sufficient (<a href=\"%s\">more details</a>).\n" -" At the bottom of this page, write a reply to the authority explaining this to them." +#: app/views/general/exception_caught.rhtml:5 +msgid "The page doesn't exist. Things you can try now:" msgstr "" -#: app/views/general/exception_caught.rhtml:3 -msgid "The page either doesn't exist, or is broken. Things you can try now:" -msgstr "" - -#: app/views/general/search.rhtml:143 +#: app/views/general/search.rhtml:239 msgid "The public authority does not have the information requested" msgstr "" -#: app/views/general/search.rhtml:147 +#: app/views/general/search.rhtml:243 msgid "The public authority would like part of the request explained" msgstr "" -#: app/views/general/search.rhtml:148 +#: app/views/general/search.rhtml:244 msgid "The public authority would like to / has responded by post" msgstr "" @@ -2559,7 +2639,7 @@ msgstr "" msgid "The request has been <strong>refused</strong>" msgstr "" -#: app/controllers/request_controller.rb:352 +#: app/controllers/request_controller.rb:351 msgid "" "The request has been updated since you originally loaded this page. Please " "check for any new incoming messages below, and try again." @@ -2581,7 +2661,7 @@ msgstr "" msgid "The request was <strong>successful</strong>." msgstr "" -#: app/views/general/search.rhtml:144 +#: app/views/general/search.rhtml:240 msgid "The request was refused by the public authority" msgstr "" @@ -2592,7 +2672,7 @@ msgid "" " href=\"%s\">contact us</a> if you have any questions." msgstr "" -#: app/views/general/search.rhtml:152 +#: app/views/general/search.rhtml:248 msgid "The requester has abandoned this request for some reason" msgstr "" @@ -2610,13 +2690,13 @@ msgid "" " by now" msgstr "" -#: app/views/public_body/show.rhtml:100 +#: app/views/public_body/show.rhtml:108 msgid "" "The search index is currently offline, so we can't show the Freedom of " "Information requests that have been made to this authority." msgstr "" -#: app/views/user/show.rhtml:141 +#: app/views/user/show.rhtml:156 msgid "" "The search index is currently offline, so we can't show the Freedom of " "Information requests this person has made." @@ -2630,15 +2710,15 @@ msgstr "" msgid "Then you can cancel the alerts." msgstr "" -#: app/controllers/user_controller.rb:249 +#: app/controllers/user_controller.rb:267 msgid "Then you can change your email address used on {{site_name}}" msgstr "" -#: app/controllers/user_controller.rb:203 +#: app/controllers/user_controller.rb:221 msgid "Then you can change your password on {{site_name}}" msgstr "" -#: app/controllers/request_controller.rb:338 +#: app/controllers/request_controller.rb:337 msgid "Then you can classify the FOI response you have got from " msgstr "" @@ -2646,57 +2726,67 @@ msgstr "" msgid "Then you can play the request categorisation game." msgstr "" -#: app/controllers/user_controller.rb:330 +#: app/controllers/user_controller.rb:348 msgid "Then you can send a message to " msgstr "" -#: app/controllers/user_controller.rb:514 +#: app/controllers/user_controller.rb:541 msgid "Then you can sign in to {{site_name}}" msgstr "" -#: app/controllers/request_controller.rb:61 +#: app/controllers/request_controller.rb:76 msgid "Then you can update the status of your request to " msgstr "" -#: app/controllers/request_controller.rb:702 +#: app/controllers/request_controller.rb:706 msgid "Then you can upload an FOI response. " msgstr "" -#: app/controllers/request_controller.rb:545 +#: app/controllers/request_controller.rb:544 msgid "Then you can write follow up message to " msgstr "" -#: app/controllers/request_controller.rb:546 +#: app/controllers/request_controller.rb:545 msgid "Then you can write your reply to " msgstr "" -#: app/models/track_thing.rb:197 +#: app/models/track_thing.rb:270 msgid "" "Then you will be emailed whenever '{{user_name}}' requests something or gets" " a response." msgstr "" -#: app/models/track_thing.rb:213 +#: app/models/track_thing.rb:286 msgid "" -"Then you will be emailed whenever a new request or response matches " -"'{{query}}'." +"Then you will be emailed whenever a new request or response matches your " +"search." msgstr "" -#: app/models/track_thing.rb:162 +#: app/models/track_thing.rb:235 msgid "Then you will be emailed whenever an FOI request succeeds." msgstr "" -#: app/models/track_thing.rb:146 +#: app/models/track_thing.rb:219 msgid "Then you will be emailed whenever anyone makes a new FOI request." msgstr "" -#: app/models/track_thing.rb:181 +#: app/models/track_thing.rb:254 msgid "" "Then you will be emailed whenever someone requests something or gets a " "response from '{{public_body_name}}'." msgstr "" -#: app/controllers/request_controller.rb:299 +#: app/models/track_thing.rb:203 +msgid "" +"Then you will be emailed whenever the request '{{request_title}}' is " +"updated." +msgstr "" + +#: app/controllers/request_controller.rb:30 +msgid "Then you'll be allowed to send FOI requests." +msgstr "" + +#: app/controllers/request_controller.rb:298 msgid "Then your FOI request to {{public_body_name}} will be sent." msgstr "" @@ -2722,10 +2812,15 @@ msgid "" "by the {{site_name}} team." msgstr "" -#: app/controllers/public_body_controller.rb:77 +#: app/controllers/user_controller.rb:140 +#: app/controllers/public_body_controller.rb:81 msgid "There was an error with the words you entered, please try again." msgstr "" +#: app/views/public_body/show.rhtml:96 app/views/general/search.rhtml:10 +msgid "There were no requests matching your query." +msgstr "" + #: app/views/request/_describe_state.rhtml:38 msgid "They are going to reply <strong>by post</strong>" msgstr "" @@ -2756,7 +2851,7 @@ msgstr "" msgid "Things to do with this request" msgstr "" -#: app/views/public_body/show.rhtml:59 +#: app/views/public_body/show.rhtml:60 msgid "This authority no longer exists, so you cannot make a request to it." msgstr "" @@ -2766,10 +2861,10 @@ msgid "" " find out why. If you are the requester, then you may <a href=\"%s\">sign in</a> to view the response." msgstr "" -#: app/views/request/new.rhtml:65 +#: app/views/request/new.rhtml:55 msgid "" "This covers a very wide spectrum of information about the state of\n" -" the <strong>natural and built environment</strong>, such as:" +" the <strong>natural and built environment</strong>, such as:" msgstr "" #: app/views/request/_view_html_prefix.rhtml:9 @@ -2796,12 +2891,30 @@ msgid "" "\t\t\t\t\t\tfind out why. If you are the requester, then you may <a href=\"%s\">sign in</a> to view the response." msgstr "" -#: app/views/user/show.rhtml:122 -msgid "This person has" +#: app/views/request/_other_describe_state.rhtml:40 +#: app/views/request/_describe_state.rhtml:44 +msgid "This particular request is finished:" msgstr "" -#: app/views/user/show.rhtml:152 -msgid "This person's" +#: app/views/user/show.rhtml:136 +msgid "" +"This person has made no Freedom of Information requests using this site." +msgstr "" + +#: app/views/user/show.rhtml:141 +msgid "This person's %d Freedom of Information request" +msgid_plural "This person's %d Freedom of Information requests" +msgstr[0] "" +msgstr[1] "" + +#: app/views/user/show.rhtml:169 +msgid "This person's %d annotation" +msgid_plural "This person's %d annotations" +msgstr[0] "" +msgstr[1] "" + +#: app/views/user/show.rhtml:162 +msgid "This person's annotations" msgstr "" #: app/views/request/_describe_state.rhtml:84 @@ -2842,18 +2955,17 @@ msgid "" " <a href=\"%s\">contact us</a> if you are not sure why." msgstr "" +#: app/views/request/_other_describe_state.rhtml:10 +#: app/views/request/_describe_state.rhtml:7 +msgid "This request is still in progress:" +msgstr "" + #: app/views/request/_hidden_correspondence.rhtml:10 msgid "" "This response has been hidden. See annotations to find out why.\n" " If you are the requester, then you may <a href=\"%s\">sign in</a> to view the response." msgstr "" -#: app/views/request/new.rhtml:49 -msgid "" -"This site is <strong>public</strong>. Everything you type and any response " -"will be published." -msgstr "" - #: app/views/request/details.rhtml:6 msgid "" "This table shows the technical details of the internal events that happened\n" @@ -2872,19 +2984,19 @@ msgid "" "the email address {{email}}." msgstr "" -#: app/models/track_thing.rb:145 +#: app/models/track_thing.rb:218 msgid "To be emailed about any new requests" msgstr "" -#: app/models/track_thing.rb:161 +#: app/models/track_thing.rb:234 msgid "To be emailed about any successful requests" msgstr "" -#: app/models/track_thing.rb:196 +#: app/models/track_thing.rb:269 msgid "To be emailed about requests by '{{user_name}}'" msgstr "" -#: app/models/track_thing.rb:180 +#: app/models/track_thing.rb:253 msgid "" "To be emailed about requests made using {{site_name}} to the public " "authority '{{public_body_name}}'" @@ -2904,15 +3016,15 @@ msgid "" "was a technical problem trying to do this." msgstr "" -#: app/controllers/user_controller.rb:248 +#: app/controllers/user_controller.rb:266 msgid "To change your email address used on {{site_name}}" msgstr "" -#: app/controllers/request_controller.rb:337 +#: app/controllers/request_controller.rb:336 msgid "To classify the response to this FOI request" msgstr "" -#: app/views/request/show_response.rhtml:39 +#: app/views/request/show_response.rhtml:37 msgid "To do that please send a private email to " msgstr "" @@ -2920,8 +3032,12 @@ msgstr "" msgid "To do this, first click on the link below." msgstr "" -#: app/models/track_thing.rb:212 -msgid "To follow requests and responses matching '{{query}}'" +#: app/models/track_thing.rb:285 +msgid "To follow requests and responses matching your search" +msgstr "" + +#: app/models/track_thing.rb:202 +msgid "To follow updates to the request '{{request_title}}'" msgstr "" #: app/views/request_mailer/old_unclassified_updated.rhtml:1 @@ -2942,31 +3058,38 @@ msgstr "" msgid "To post your annotation" msgstr "" -#: app/controllers/request_controller.rb:543 +#: app/controllers/request_controller.rb:542 msgid "To reply to " msgstr "" -#: app/controllers/request_controller.rb:542 +#: app/controllers/request_controller.rb:541 msgid "To send a follow up message to " msgstr "" -#: app/controllers/user_controller.rb:329 +#: app/controllers/user_controller.rb:347 msgid "To send a message to " msgstr "" -#: app/controllers/request_controller.rb:298 +#: app/controllers/request_controller.rb:29 +#: app/controllers/request_controller.rb:297 msgid "To send your FOI request" msgstr "" -#: app/controllers/request_controller.rb:60 +#: app/controllers/request_controller.rb:75 msgid "To update the status of this FOI request" msgstr "" -#: app/controllers/request_controller.rb:701 +#: app/controllers/request_controller.rb:705 msgid "" "To upload a response, you must be logged in using an email address from " msgstr "" +#: app/views/general/search.rhtml:24 +msgid "" +"To use the advanced search, combine phrases and labels as described in the " +"search tips below." +msgstr "" + #: app/views/public_body/view_email_captcha.rhtml:5 msgid "" "To view the email address that we use to send FOI requests to " @@ -2981,28 +3104,44 @@ msgstr "" msgid "To {{public_body_link_absolute}}" msgstr "" -#: app/views/request/followup_preview.rhtml:22 app/views/request/new.rhtml:88 -#: app/views/request/preview.rhtml:17 +#: app/views/request/preview.rhtml:17 app/views/request/new.rhtml:32 +#: app/views/request/followup_preview.rhtml:22 msgid "To:" msgstr "" -#: app/models/track_thing.rb:174 +#: app/views/general/_localised_datepicker.rhtml:7 +msgid "Today" +msgstr "" + +#: app/views/public_body/_search_ahead.rhtml:3 +msgid "Top search results:" +msgstr "" + +#: app/views/track/_tracking_links.rhtml:22 +msgid "Track by email" +msgstr "" + +#: app/models/track_thing.rb:247 msgid "Track requests to {{public_body_name}} by email" msgstr "" -#: app/models/track_thing.rb:206 -msgid "Track things matching '{{query}}' by email" +#: app/views/request/list.rhtml:8 +msgid "Track these requests" msgstr "" -#: app/views/public_body/show.rhtml:3 -msgid "Track this authority" +#: app/models/track_thing.rb:279 +msgid "Track things matching this search by email" msgstr "" +#: app/views/public_body/show.rhtml:5 +msgid "Track this authority" +msgstr "Suivez cet institution publique" + #: app/views/user/show.rhtml:29 msgid "Track this person" msgstr "" -#: app/models/track_thing.rb:190 +#: app/models/track_thing.rb:263 msgid "Track this person by email" msgstr "" @@ -3010,7 +3149,7 @@ msgstr "" msgid "Track this request" msgstr "" -#: app/models/track_thing.rb:123 +#: app/models/track_thing.rb:196 msgid "Track this request by email" msgstr "" @@ -3026,7 +3165,11 @@ msgstr "" msgid "TrackThing|Track type" msgstr "" -#: app/views/general/search.rhtml:133 +#: app/views/request/_sidebar.rhtml:10 +msgid "Tweet this request" +msgstr "" + +#: app/views/general/search.rhtml:229 msgid "" "Type <strong><code>01/01/2008..14/01/2008</code></strong> to only show " "things that happened in the first two weeks of January." @@ -3048,7 +3191,7 @@ msgstr "" msgid "Unable to send follow up message to {{username}}" msgstr "" -#: app/views/request/list.rhtml:29 +#: app/views/request/list.rhtml:27 msgid "Unexpected search result type" msgstr "" @@ -3069,15 +3212,11 @@ msgid "" "address for" msgstr "" -#: app/views/general/exception_caught.rhtml:17 +#: app/views/general/exception_caught.rhtml:22 msgid "Unknown" msgstr "" -#: app/models/info_request_event.rb:317 -msgid "Unusual response" -msgstr "" - -#: app/models/info_request.rb:807 +#: app/models/info_request.rb:809 msgid "Unusual response." msgstr "" @@ -3086,67 +3225,71 @@ msgstr "" msgid "Update the status of this request" msgstr "" -#: app/controllers/request_controller.rb:62 +#: app/controllers/request_controller.rb:77 msgid "Update the status of your request to " msgstr "" -#: app/views/general/search.rhtml:124 +#: app/views/general/search.rhtml:220 msgid "" "Use OR (in capital letters) where you don't mind which word, e.g. " "<strong><code>commons OR lords</code></strong>" msgstr "" -#: app/views/general/search.rhtml:125 +#: app/views/general/search.rhtml:221 msgid "" "Use quotes when you want to find an exact phrase, e.g. " "<strong><code>\"Liverpool City Council\"</code></strong>" msgstr "" -#: locale/model_attributes.rb:67 +#: locale/model_attributes.rb:65 msgid "UserInfoRequestSentAlert|Alert type" msgstr "" -#: locale/model_attributes.rb:78 +#: locale/model_attributes.rb:76 msgid "User|About me" msgstr "" -#: locale/model_attributes.rb:76 +#: locale/model_attributes.rb:74 msgid "User|Admin level" msgstr "" -#: locale/model_attributes.rb:77 +#: locale/model_attributes.rb:75 msgid "User|Ban text" msgstr "" -#: locale/model_attributes.rb:69 +#: locale/model_attributes.rb:67 msgid "User|Email" msgstr "" -#: locale/model_attributes.rb:73 +#: locale/model_attributes.rb:71 msgid "User|Email confirmed" msgstr "" -#: locale/model_attributes.rb:71 +#: locale/model_attributes.rb:69 msgid "User|Hashed password" msgstr "" -#: locale/model_attributes.rb:75 +#: locale/model_attributes.rb:73 msgid "User|Last daily track email" msgstr "" -#: locale/model_attributes.rb:70 +#: locale/model_attributes.rb:77 +msgid "User|Locale" +msgstr "" + +#: locale/model_attributes.rb:68 msgid "User|Name" msgstr "" -#: locale/model_attributes.rb:72 +#: locale/model_attributes.rb:70 msgid "User|Salt" msgstr "" -#: locale/model_attributes.rb:74 +#: locale/model_attributes.rb:72 msgid "User|Url name" msgstr "" -#: app/views/public_body/show.rhtml:21 +#: app/views/public_body/show.rhtml:23 msgid "View FOI email address" msgstr "" @@ -3162,19 +3305,23 @@ msgstr "" msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "" -#: app/views/layouts/default.rhtml:89 -msgid "View authorities" +#: app/controllers/request_controller.rb:149 +msgid "View and search requests" msgstr "" +#: app/views/layouts/default.rhtml:127 +msgid "View authorities" +msgstr "Voir institutions publiques" + #: app/views/public_body/view_email_captcha.rhtml:12 msgid "View email" msgstr "" -#: app/views/layouts/default.rhtml:88 +#: app/views/layouts/default.rhtml:126 msgid "View requests" msgstr "Voir requêtes" -#: app/models/info_request.rb:799 +#: app/models/info_request.rb:801 msgid "Waiting clarification." msgstr "" @@ -3184,13 +3331,13 @@ msgid "" "their handling of this request." msgstr "" -#: app/views/general/search.rhtml:149 +#: app/views/general/search.rhtml:245 msgid "" "Waiting for the public authority to complete an internal review of their " "handling of the request" msgstr "" -#: app/views/general/search.rhtml:142 +#: app/views/general/search.rhtml:238 msgid "Waiting for the public authority to reply" msgstr "" @@ -3217,6 +3364,12 @@ msgid "" "or the law tell us to." msgstr "" +#: app/views/user/_signup.rhtml:13 +msgid "" +"We will not reveal your email address to anybody unless you or\n" +" the law tell us to (<a href=\"%s\">details</a>). " +msgstr "" + #: app/views/user_mailer/changeemail_confirm.rhtml:10 msgid "" "We will not reveal your email addresses to anybody unless you\n" @@ -3257,13 +3410,17 @@ msgstr "" msgid "What best describes the status of this request now?" msgstr "" +#: app/views/general/frontpage.rhtml:55 +msgid "What information has been released?" +msgstr "" + #: app/views/request_mailer/new_response.rhtml:9 msgid "" "When you get there, please update the status to say if the response \n" "contains any useful information." msgstr "" -#: app/views/request/show_response.rhtml:44 +#: app/views/request/show_response.rhtml:42 msgid "" "When you receive the paper response, please help\n" " others find out what it says:" @@ -3279,28 +3436,28 @@ msgstr "" msgid "Which of these is happening?" msgstr "" -#: app/models/info_request_event.rb:313 -msgid "Withdrawn by requester" +#: app/views/general/frontpage.rhtml:38 +msgid "Who can I request information from?" msgstr "" -#: app/models/info_request.rb:809 +#: app/models/info_request.rb:811 msgid "Withdrawn by the requester." msgstr "" -#: app/controllers/request_controller.rb:549 -msgid "Write a reply to " +#: app/views/general/_localised_datepicker.rhtml:13 +msgid "Wk" msgstr "" #: app/controllers/request_controller.rb:548 -msgid "Write your FOI follow up message to " +msgid "Write a reply to " msgstr "" -#: app/views/request/new.rhtml:46 -msgid "Write your request in <strong>simple, precise language</strong>." +#: app/controllers/request_controller.rb:547 +msgid "Write your FOI follow up message to " msgstr "" -#: app/models/info_request_event.rb:301 -msgid "Wrong Response" +#: app/views/request/new.rhtml:93 +msgid "Write your request in <strong>simple, precise language</strong>." msgstr "" #: app/views/comment/_single_comment.rhtml:10 @@ -3311,27 +3468,27 @@ msgstr "" msgid "You are already being emailed updates about " msgstr "" -#: app/models/track_thing.rb:175 +#: app/models/track_thing.rb:248 msgid "You are already tracking requests to {{public_body_name}} by email" msgstr "" -#: app/models/track_thing.rb:207 -msgid "You are already tracking things matching '{{query}}' by email" +#: app/models/track_thing.rb:280 +msgid "You are already tracking things matching this search by email" msgstr "" -#: app/models/track_thing.rb:191 +#: app/models/track_thing.rb:264 msgid "You are already tracking this person by email" msgstr "" -#: app/models/track_thing.rb:124 +#: app/models/track_thing.rb:197 msgid "You are already tracking this request by email" msgstr "" -#: app/models/track_thing.rb:156 +#: app/models/track_thing.rb:229 msgid "You are being emailed about any new successful responses" msgstr "" -#: app/models/track_thing.rb:140 +#: app/models/track_thing.rb:213 msgid "You are being emailed when there are new requests" msgstr "" @@ -3345,24 +3502,30 @@ msgid "" "page for the request. See the <a href=\"{{api_path}}\">API documentation</a>." msgstr "" -#: app/views/public_body/show.rhtml:40 +#: app/views/public_body/show.rhtml:43 msgid "" "You can only request information about the environment from this authority." msgstr "" -#: app/views/user/show.rhtml:122 -msgid "You have" -msgstr "" - #: app/views/request_mailer/new_response.rhtml:1 msgid "You have a new response to the {{law_used_full}} request " msgstr "" -#: app/controllers/user_controller.rb:492 +#: app/views/general/exception_caught.rhtml:18 +msgid "" +"You have found a bug. Please <a href=\"{{contact_url}}\">contact us</a> to " +"tell us about the problem" +msgstr "" + +#: app/views/user/show.rhtml:136 +msgid "You have made no Freedom of Information requests using this site." +msgstr "" + +#: app/controllers/user_controller.rb:510 msgid "You have now changed the text about you on your profile." msgstr "" -#: app/controllers/user_controller.rb:310 +#: app/controllers/user_controller.rb:328 msgid "You have now changed your email address used on {{site_name}}" msgstr "" @@ -3398,22 +3561,22 @@ msgstr "" msgid "" "You may be able to find\n" "one on their website, or by phoning them up and asking. If you manage\n" -"to find one, then please <a href=\"%s\">send it to us</a>." +"to find one, then please <a href=\"{{help_url}}\">send it to us</a>." msgstr "" -#: app/controllers/user_controller.rb:470 +#: app/controllers/user_controller.rb:488 msgid "You need to be logged in to change the text about you on your profile." msgstr "" -#: app/controllers/user_controller.rb:371 +#: app/controllers/user_controller.rb:389 msgid "You need to be logged in to change your profile photo." msgstr "" -#: app/controllers/user_controller.rb:433 +#: app/controllers/user_controller.rb:451 msgid "You need to be logged in to clear your profile photo." msgstr "" -#: app/controllers/request_controller.rb:559 +#: app/controllers/request_controller.rb:558 msgid "" "You previously submitted that exact follow up message for this request." msgstr "" @@ -3424,7 +3587,7 @@ msgid "" "by <strong>simply replying</strong> to that email. For your convenience, here is the address:" msgstr "" -#: app/views/request/show_response.rhtml:36 +#: app/views/request/show_response.rhtml:34 msgid "" "You want to <strong>give your postal address</strong> to the authority in " "private." @@ -3456,13 +3619,21 @@ msgid "" "with the clarification." msgstr "" -#: app/controllers/user_controller.rb:442 +#: app/controllers/user_controller.rb:460 msgid "You've now cleared your profile photo" msgstr "" -#: app/views/user/show.rhtml:152 -msgid "Your " -msgstr "" +#: app/views/user/show.rhtml:141 +msgid "Your %d Freedom of Information request" +msgid_plural "Your %d Freedom of Information requests" +msgstr[0] "" +msgstr[1] "" + +#: app/views/user/show.rhtml:169 +msgid "Your %d annotation" +msgid_plural "Your %d annotations" +msgstr[0] "" +msgstr[1] "" #: app/views/user/_signup.rhtml:22 msgid "" @@ -3473,33 +3644,37 @@ msgid "" " <a href=\"%s\">read this first</a>." msgstr "" +#: app/views/user/show.rhtml:162 +msgid "Your annotations" +msgstr "" + #: app/views/contact_mailer/user_message.rhtml:3 msgid "" "Your details have not been given to anyone, unless you choose to reply to this\n" "message, which will then go directly to the person who wrote the message." msgstr "" -#: app/views/user/_signin.rhtml:11 app/views/user/_signup.rhtml:9 #: app/views/user/signchangepassword_send_confirm.rhtml:13 +#: app/views/user/_signup.rhtml:9 app/views/user/_signin.rhtml:11 msgid "Your e-mail:" msgstr "" -#: app/views/user/show.rhtml:168 +#: app/views/user/show.rhtml:184 msgid "Your email subscriptions" msgstr "" -#: app/controllers/request_controller.rb:556 +#: app/controllers/request_controller.rb:555 msgid "" "Your follow up has not been sent because this request has been stopped to " "prevent spam. Please <a href=\"%s\">contact us</a> if you really want to " "send a follow up message." msgstr "" -#: app/controllers/request_controller.rb:584 +#: app/controllers/request_controller.rb:583 msgid "Your follow up message has been sent on its way." msgstr "" -#: app/controllers/request_controller.rb:582 +#: app/controllers/request_controller.rb:581 msgid "Your internal review request has been sent on its way." msgstr "" @@ -3509,7 +3684,7 @@ msgid "" "to you soon." msgstr "" -#: app/controllers/user_controller.rb:349 +#: app/controllers/user_controller.rb:367 msgid "Your message to {{recipient_user_name}} has been sent!" msgstr "" @@ -3536,7 +3711,7 @@ msgstr "" msgid "Your original message is attached." msgstr "" -#: app/controllers/user_controller.rb:231 +#: app/controllers/user_controller.rb:249 msgid "Your password has been changed." msgstr "" @@ -3556,7 +3731,7 @@ msgid "" "got the information will help us keep tabs on" msgstr "" -#: app/views/request/new.rhtml:109 +#: app/views/request/new.rhtml:102 msgid "Your request:" msgstr "" @@ -3576,28 +3751,40 @@ msgstr "" msgid "Your {{site_name}} email alert" msgstr "" -#: app/models/outgoing_message.rb:69 +#: app/models/outgoing_message.rb:70 msgid "Yours faithfully," msgstr "" +"Je vous prie de croire, Monsieur/Madame, à l'assurance de mes salutations " +"distinguées," -#: app/models/outgoing_message.rb:67 +#: app/models/outgoing_message.rb:68 msgid "Yours sincerely," msgstr "" +"Je vous prie de croire, Monsieur/Madame, à l'assurance de mes salutations " +"distinguées," -#: app/views/request/new.rhtml:97 +#: app/views/request/new.rhtml:79 msgid "" "a one line summary of the information you are requesting, \n" "\t\t\te.g." msgstr "" -#: app/views/public_body/show.rhtml:31 +#: app/views/public_body/show.rhtml:34 msgid "admin" msgstr "admin" -#: app/views/public_body/show.rhtml:29 +#: app/views/request/_request_filter_form.rhtml:6 +msgid "all requests" +msgstr "" + +#: app/views/public_body/show.rhtml:32 msgid "also called {{public_body_short_name}}" msgstr "aussi appelé {{public_body_short_name}}" +#: app/views/request/_request_filter_form.rhtml:44 +msgid "and" +msgstr "" + #: app/views/user/wrong_user.rhtml:5 msgid "and sign in as " msgstr "" @@ -3616,30 +3803,38 @@ msgstr "" msgid "and we'll suggest <strong>what to do next</strong>" msgstr "" -#: app/views/user/show.rhtml:153 -msgid "annotation" -msgstr "" - -#: app/views/user/show.rhtml:147 -msgid "annotations" -msgstr "" - -#: app/models/track_thing.rb:138 +#: app/models/track_thing.rb:211 msgid "any <a href=\"/list\">new requests</a>" msgstr "" -#: app/models/track_thing.rb:154 +#: app/models/track_thing.rb:227 msgid "any <a href=\"/list/successful\">successful requests</a>" msgstr "" +#: app/models/track_thing.rb:116 +msgid "anything" +msgstr "" + #: app/views/request_mailer/very_overdue_alert.rhtml:1 msgid "are long overdue." msgstr "" -#: app/controllers/public_body_controller.rb:111 +#: app/models/track_thing.rb:89 app/views/general/search.rhtml:56 +msgid "authorities" +msgstr "" + +#: app/models/track_thing.rb:104 +msgid "awaiting a response" +msgstr "" + +#: app/controllers/public_body_controller.rb:119 msgid "beginning with" msgstr "" +#: app/models/track_thing.rb:95 +msgid "between two dates" +msgstr "" + #: app/views/request/show.rhtml:82 msgid "by" msgstr "" @@ -3648,7 +3843,7 @@ msgstr "" msgid "by <strong>{{date}}</strong>" msgstr "" -#: app/views/request/_request_listing_via_event.rhtml:34 +#: app/views/request/_request_listing_via_event.rhtml:26 msgid "by {{public_body_name}} to {{info_request_user}} on {{date}}." msgstr "" @@ -3662,15 +3857,21 @@ msgstr "" #: locale/model_attributes.rb:20 msgid "comment" +msgstr "commentaire" + +#: app/models/track_thing.rb:86 +#: app/views/request/_request_filter_form.rhtml:33 +#: app/views/general/search.rhtml:103 +msgid "comments" msgstr "" -#: app/views/request/show_response.rhtml:41 +#: app/views/request/show_response.rhtml:39 msgid "" "containing your postal address, and asking them to reply to this request.\n" " Or you could phone them." msgstr "" -#: app/models/info_request_event.rb:338 +#: app/models/info_request_event.rb:323 msgid "display_status only works for incoming and outgoing messages right now" msgstr "" @@ -3678,15 +3879,11 @@ msgstr "" msgid "during term time" msgstr "" -#: app/views/general/frontpage.rhtml:18 -msgid "e.g." -msgstr "ex:" - #: app/views/user/show.rhtml:96 msgid "edit text about you" msgstr "" -#: app/views/user/show.rhtml:171 +#: app/views/user/show.rhtml:187 msgid "email subscription" msgstr "" @@ -3694,13 +3891,17 @@ msgstr "" msgid "even during holidays" msgstr "" +#: app/views/general/search.rhtml:57 +msgid "everything" +msgstr "" + #: locale/model_attributes.rb:17 msgid "exim log" -msgstr "" +msgstr "exim log" -#: locale/model_attributes.rb:59 +#: locale/model_attributes.rb:57 msgid "exim log done" -msgstr "" +msgstr "exim log complet" #: app/views/request_mailer/requires_admin.rhtml:2 msgid "has reported an" @@ -3710,24 +3911,20 @@ msgstr "" msgid "have delayed." msgstr "" -#: locale/model_attributes.rb:56 +#: locale/model_attributes.rb:54 msgid "holiday" -msgstr "" +msgstr "jour férié" #: app/views/request/_followup.rhtml:36 app/views/request/show.rhtml:70 #: app/views/request/show.rhtml:80 msgid "in term time" msgstr "" -#: app/views/public_body/list.rhtml:42 -msgid "in total" -msgstr "" - -#: locale/model_attributes.rb:62 +#: locale/model_attributes.rb:60 msgid "incoming message" msgstr "" -#: locale/model_attributes.rb:79 +#: locale/model_attributes.rb:78 msgid "info request" msgstr "" @@ -3735,11 +3932,15 @@ msgstr "" msgid "info request event" msgstr "" -#: app/views/user/set_profile_about_me.rhtml:3 #: app/views/user/signchangeemail.rhtml:3 +#: app/views/user/set_profile_about_me.rhtml:3 msgid "internal error" msgstr "" +#: app/views/general/search.rhtml:92 +msgid "internal reviews" +msgstr "" + #: app/views/request/show.rhtml:100 msgid "is <strong>waiting for your clarification</strong>." msgstr "" @@ -3757,6 +3958,16 @@ msgstr "" msgid "made." msgstr "" +#: app/views/request/_request_filter_form.rhtml:32 +#: app/views/general/search.rhtml:102 +msgid "messages from authorities" +msgstr "" + +#: app/views/request/_request_filter_form.rhtml:31 +#: app/views/general/search.rhtml:101 +msgid "messages from users" +msgstr "" + #: app/views/request/show.rhtml:74 msgid "no later than" msgstr "" @@ -3773,10 +3984,6 @@ msgstr "" msgid "normally" msgstr "" -#: app/views/user/show.rhtml:114 -msgid "only" -msgstr "" - #: locale/model_attributes.rb:25 msgid "outgoing message" msgstr "" @@ -3789,7 +3996,7 @@ msgstr "" msgid "please sign in or make a new account." msgstr "" -#: locale/model_attributes.rb:49 +#: locale/model_attributes.rb:47 msgid "post redirect" msgstr "" @@ -3801,10 +4008,6 @@ msgstr "" msgid "public body" msgstr "" -#: locale/model_attributes.rb:47 -msgid "raw email" -msgstr "" - #: app/views/request_mailer/not_clarified_alert.rhtml:1 msgid "request." msgstr "" @@ -3813,6 +4016,15 @@ msgstr "" msgid "requesting an internal review" msgstr "" +#: app/models/track_thing.rb:92 app/models/track_thing.rb:111 +#: app/models/track_thing.rb:113 app/views/general/search.rhtml:54 +msgid "requests" +msgstr "" + +#: app/models/track_thing.rb:112 +msgid "requests which are {{list_of_statuses}}" +msgstr "" + #: app/views/request_mailer/requires_admin.rhtml:3 msgid "" "response as needing administrator attention. Take a look, and reply to this\n" @@ -3823,7 +4035,7 @@ msgstr "" msgid "send a follow up message" msgstr "" -#: app/views/request/_request_listing_via_event.rhtml:31 +#: app/views/request/_request_listing_via_event.rhtml:23 msgid "sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "" @@ -3835,41 +4047,36 @@ msgstr "" msgid "sign out" msgstr "" +#: app/models/track_thing.rb:101 +msgid "successful" +msgstr "" + +#: app/views/request/_request_filter_form.rhtml:7 +#: app/views/general/search.rhtml:89 +msgid "successful requests" +msgstr "" + #: app/views/request_mailer/new_response.rhtml:2 msgid "that you made to" msgstr "" -#: app/views/request_mailer/comment_on_alert.rhtml:6 #: app/views/request_mailer/comment_on_alert_plural.rhtml:5 -#: app/views/request_mailer/new_response.rhtml:15 -#: app/views/request_mailer/new_response_reminder_alert.rhtml:8 -#: app/views/request_mailer/not_clarified_alert.rhtml:9 #: app/views/request_mailer/old_unclassified_updated.rhtml:8 +#: app/views/request_mailer/new_response_reminder_alert.rhtml:8 +#: app/views/request_mailer/very_overdue_alert.rhtml:11 #: app/views/request_mailer/overdue_alert.rhtml:9 #: app/views/request_mailer/stopped_responses.rhtml:16 -#: app/views/request_mailer/very_overdue_alert.rhtml:11 -#: app/views/track_mailer/event_digest.rhtml:66 +#: app/views/request_mailer/new_response.rhtml:15 +#: app/views/request_mailer/not_clarified_alert.rhtml:9 +#: app/views/request_mailer/comment_on_alert.rhtml:6 #: app/views/user_mailer/already_registered.rhtml:11 -#: app/views/user_mailer/changeemail_already_used.rhtml:10 -#: app/views/user_mailer/changeemail_confirm.rhtml:13 #: app/views/user_mailer/confirm_login.rhtml:11 +#: app/views/user_mailer/changeemail_confirm.rhtml:13 +#: app/views/user_mailer/changeemail_already_used.rhtml:10 +#: app/views/track_mailer/event_digest.rhtml:66 msgid "the {{site_name}} team" msgstr "" -#: app/views/user/show.rhtml:140 -msgid "this person" -msgstr "" - -#: app/views/user/show.rhtml:113 -msgid "" -"to change password, \n" -" subscriptions and more" -msgstr "" - -#: app/views/request/new.rhtml:34 -msgid "to check that the info isn't already published." -msgstr "" - #: app/views/request/show.rhtml:62 msgid "to read" msgstr "" @@ -3890,7 +4097,7 @@ msgstr "" msgid "unexpected prominence on request event" msgstr "" -#: app/views/request/_request_listing_via_event.rhtml:38 +#: app/views/request/_request_listing_via_event.rhtml:30 msgid "unknown event type indexed " msgstr "" @@ -3898,35 +4105,53 @@ msgstr "" msgid "unknown reason " msgstr "" -#: app/models/info_request.rb:814 app/models/info_request_event.rb:333 +#: app/models/info_request_event.rb:318 app/models/info_request.rb:816 msgid "unknown status " msgstr "" -#: app/views/user/show.rhtml:208 +#: app/views/request/_request_filter_form.rhtml:9 +#: app/views/general/search.rhtml:91 +msgid "unresolved requests" +msgstr "" + +#: app/views/user/show.rhtml:224 msgid "unsubscribe" msgstr "" -#: app/views/user/show.rhtml:180 app/views/user/show.rhtml:194 +#: app/views/user/show.rhtml:196 app/views/user/show.rhtml:210 msgid "unsubscribe all" msgstr "" +#: app/models/track_thing.rb:98 +msgid "unsuccessful" +msgstr "" + +#: app/views/request/_request_filter_form.rhtml:8 +#: app/views/general/search.rhtml:90 +msgid "unsuccessful requests" +msgstr "" + #: app/views/request/show.rhtml:53 msgid "useful information." msgstr "" -#: locale/model_attributes.rb:68 +#: locale/model_attributes.rb:66 msgid "user" msgstr "" -#: locale/model_attributes.rb:66 +#: locale/model_attributes.rb:64 msgid "user info request sent alert" msgstr "" -#: app/views/user/show.rhtml:140 -msgid "you" +#: app/models/track_thing.rb:83 app/views/general/search.rhtml:55 +msgid "users" +msgstr "" + +#: app/views/request/list.rhtml:21 +msgid "{{count}} FOI requests found" msgstr "" -#: app/views/request/new.rhtml:6 +#: app/views/request/new.rhtml:17 msgid "" "{{existing_request_user}} already\n" " created the same request on {{date}}. You can either view the <a href=\"{{existing_request}}\">existing request</a>,\n" @@ -3937,24 +4162,51 @@ msgstr "" msgid "{{info_request_user_name}} only:" msgstr "" -#: app/views/general/frontpage.rhtml:51 +#: app/views/general/frontpage.rhtml:63 msgid "{{length_of_time}} ago" msgstr "depuis {{length_of_time}}" +#: app/models/track_thing.rb:122 +msgid "{{list_of_things}} matching text '{{search_query}}'" +msgstr "" + #: app/views/request/_after_actions.rhtml:43 msgid "{{public_body_name}} only:" msgstr "" +#: app/views/track_mailer/event_digest.rhtml:21 +msgid "{{public_body}} sent a response to {{user_name}}" +msgstr "" + +#: app/controllers/user_controller.rb:43 +msgid "{{search_results}} matching '{{query}}'" +msgstr "" + +#: app/views/general/frontpage.rhtml:39 +msgid "" +"{{site_name}} covers requests to {{number_of_authorities}} authorities, " +"including:" +msgstr "" + #: app/views/public_body/view_email.rhtml:7 msgid "" "{{site_name}} sends new requests to <strong>{{request_email}}</strong> for " "this authority." msgstr "" -#: app/models/user.rb:122 +#: app/views/general/frontpage.rhtml:56 +msgid "" +"{{site_name}} users have made {{number_of_requests}} requests, including:" +msgstr "" + +#: app/models/user.rb:131 msgid "{{user_name}} (Banned)" msgstr "" +#: app/views/track_mailer/event_digest.rhtml:31 +msgid "{{user_name}} added an annotation" +msgstr "" + #: app/views/request_mailer/comment_on_alert.rhtml:1 msgid "" "{{user_name}} has annotated your {{law_used_short}} \n" @@ -3965,6 +4217,14 @@ msgstr "" msgid "{{user_name}} has used {{site_name}} to send you the message below." msgstr "" +#: app/views/track_mailer/event_digest.rhtml:24 +msgid "{{user_name}} sent a follow up message to {{public_body}}" +msgstr "" + +#: app/views/track_mailer/event_digest.rhtml:28 +msgid "{{user_name}} sent a request to {{public_body}}" +msgstr "" + #: app/views/request/show.rhtml:36 msgid "" "{{user}} (<a href=\"{{user_admin_url}}\">admin</a>) made this " diff --git a/public/.gitignore b/public/.gitignore index 0e08da146..805e48973 100644 --- a/public/.gitignore +++ b/public/.gitignore @@ -3,3 +3,4 @@ /foi-live-creation.png /foi-user-use.png /google*.html +asktheeu-theme diff --git a/public/images/arrow-left.png b/public/images/arrow-left.png Binary files differnew file mode 100644 index 000000000..74d2fa253 --- /dev/null +++ b/public/images/arrow-left.png diff --git a/public/images/arrow-right.png b/public/images/arrow-right.png Binary files differnew file mode 100644 index 000000000..34dd75ef8 --- /dev/null +++ b/public/images/arrow-right.png diff --git a/public/images/bighand.png b/public/images/bighand.png Binary files differnew file mode 100644 index 000000000..92a4a6105 --- /dev/null +++ b/public/images/bighand.png diff --git a/public/images/button-gradient-large.png b/public/images/button-gradient-large.png Binary files differnew file mode 100644 index 000000000..93ebc6cbc --- /dev/null +++ b/public/images/button-gradient-large.png diff --git a/public/images/button-gradient.png b/public/images/button-gradient.png Binary files differnew file mode 100644 index 000000000..8b29e89ba --- /dev/null +++ b/public/images/button-gradient.png diff --git a/public/images/button-preview.png b/public/images/button-preview.png Binary files differnew file mode 100644 index 000000000..79b4ccd04 --- /dev/null +++ b/public/images/button-preview.png diff --git a/public/images/button-search.png b/public/images/button-search.png Binary files differnew file mode 100644 index 000000000..23945f4f0 --- /dev/null +++ b/public/images/button-search.png diff --git a/public/images/calendar.png b/public/images/calendar.png Binary files differnew file mode 100644 index 000000000..44981a41c --- /dev/null +++ b/public/images/calendar.png diff --git a/public/images/defaultprofilepic.png b/public/images/defaultprofilepic.png Binary files differnew file mode 100644 index 000000000..affdaad3d --- /dev/null +++ b/public/images/defaultprofilepic.png diff --git a/public/images/email-16.png b/public/images/email-16.png Binary files differindex 030eafde6..8692748e2 100644 --- a/public/images/email-16.png +++ b/public/images/email-16.png diff --git a/public/images/flying-computer.png b/public/images/flying-computer.png Binary files differnew file mode 100644 index 000000000..b1e1d59bb --- /dev/null +++ b/public/images/flying-computer.png diff --git a/public/images/home-grad.png b/public/images/home-grad.png Binary files differnew file mode 100644 index 000000000..ff9887a11 --- /dev/null +++ b/public/images/home-grad.png diff --git a/public/images/icon-foi.png b/public/images/icon-foi.png Binary files differnew file mode 100644 index 000000000..138bf3b5c --- /dev/null +++ b/public/images/icon-foi.png diff --git a/public/images/icon-person.png b/public/images/icon-person.png Binary files differnew file mode 100644 index 000000000..dfb35a849 --- /dev/null +++ b/public/images/icon-person.png diff --git a/public/images/icon-publicbody.png b/public/images/icon-publicbody.png Binary files differnew file mode 100644 index 000000000..0f3848ccf --- /dev/null +++ b/public/images/icon-publicbody.png diff --git a/public/images/littlehand.png b/public/images/littlehand.png Binary files differnew file mode 100644 index 000000000..f7ec82045 --- /dev/null +++ b/public/images/littlehand.png diff --git a/public/images/logo.png b/public/images/logo.png Binary files differnew file mode 100644 index 000000000..1a865124f --- /dev/null +++ b/public/images/logo.png diff --git a/public/images/quote-marks.png b/public/images/quote-marks.png Binary files differnew file mode 100644 index 000000000..752b7d4cf --- /dev/null +++ b/public/images/quote-marks.png diff --git a/public/images/quote.png b/public/images/quote.png Binary files differindex d7e679c23..752b7d4cf 100644 --- a/public/images/quote.png +++ b/public/images/quote.png diff --git a/public/images/rss-16.png b/public/images/rss-16.png Binary files differnew file mode 100644 index 000000000..d61986a56 --- /dev/null +++ b/public/images/rss-16.png diff --git a/public/images/rss-blue.png b/public/images/rss-blue.png Binary files differnew file mode 100644 index 000000000..abc1b1859 --- /dev/null +++ b/public/images/rss-blue.png diff --git a/public/images/rss-orange.png b/public/images/rss-orange.png Binary files differnew file mode 100644 index 000000000..d0e6a949e --- /dev/null +++ b/public/images/rss-orange.png diff --git a/public/images/search-button.png b/public/images/search-button.png Binary files differnew file mode 100644 index 000000000..f5d41d4f1 --- /dev/null +++ b/public/images/search-button.png diff --git a/public/images/start-button.png b/public/images/start-button.png Binary files differnew file mode 100644 index 000000000..585931c35 --- /dev/null +++ b/public/images/start-button.png diff --git a/public/images/status-complete.png b/public/images/status-complete.png Binary files differnew file mode 100644 index 000000000..2ff49770a --- /dev/null +++ b/public/images/status-complete.png diff --git a/public/images/status-denied.png b/public/images/status-denied.png Binary files differnew file mode 100644 index 000000000..1f768af5e --- /dev/null +++ b/public/images/status-denied.png diff --git a/public/images/status-error.png b/public/images/status-error.png Binary files differnew file mode 100644 index 000000000..5865dd1e1 --- /dev/null +++ b/public/images/status-error.png diff --git a/public/images/status-gone-postal.png b/public/images/status-gone-postal.png Binary files differnew file mode 100644 index 000000000..00df771ac --- /dev/null +++ b/public/images/status-gone-postal.png diff --git a/public/images/status-internal-review.png b/public/images/status-internal-review.png Binary files differnew file mode 100644 index 000000000..639f72797 --- /dev/null +++ b/public/images/status-internal-review.png diff --git a/public/images/status-not-held.png b/public/images/status-not-held.png Binary files differnew file mode 100644 index 000000000..9d20ac2e7 --- /dev/null +++ b/public/images/status-not-held.png diff --git a/public/images/status-overdue.png b/public/images/status-overdue.png Binary files differnew file mode 100644 index 000000000..637fed8d9 --- /dev/null +++ b/public/images/status-overdue.png diff --git a/public/images/status-pending.png b/public/images/status-pending.png Binary files differnew file mode 100644 index 000000000..dcf4009f3 --- /dev/null +++ b/public/images/status-pending.png diff --git a/public/images/status-withdrawn.png b/public/images/status-withdrawn.png Binary files differnew file mode 100644 index 000000000..d56aa213f --- /dev/null +++ b/public/images/status-withdrawn.png diff --git a/public/images/stripes-70.png b/public/images/stripes-70.png Binary files differnew file mode 100644 index 000000000..fda1c339d --- /dev/null +++ b/public/images/stripes-70.png diff --git a/public/images/stripes.png b/public/images/stripes.png Binary files differnew file mode 100644 index 000000000..fda1c339d --- /dev/null +++ b/public/images/stripes.png diff --git a/public/images/twitter-16.png b/public/images/twitter-16.png Binary files differnew file mode 100644 index 000000000..e848b8f2e --- /dev/null +++ b/public/images/twitter-16.png diff --git a/public/images/ui-icons-theme.png b/public/images/ui-icons-theme.png Binary files differnew file mode 100644 index 000000000..f619648da --- /dev/null +++ b/public/images/ui-icons-theme.png diff --git a/public/javascripts/ba-throttle-debounce.js b/public/javascripts/ba-throttle-debounce.js new file mode 100644 index 000000000..07205508e --- /dev/null +++ b/public/javascripts/ba-throttle-debounce.js @@ -0,0 +1,9 @@ +/* + * jQuery throttle / debounce - v1.1 - 3/7/2010 + * http://benalman.com/projects/jquery-throttle-debounce-plugin/ + * + * Copyright (c) 2010 "Cowboy" Ben Alman + * Dual licensed under the MIT and GPL licenses. + * http://benalman.com/about/license/ + */ +(function(b,c){var $=b.jQuery||b.Cowboy||(b.Cowboy={}),a;$.throttle=a=function(e,f,j,i){var h,d=0;if(typeof f!=="boolean"){i=j;j=f;f=c}function g(){var o=this,m=+new Date()-d,n=arguments;function l(){d=+new Date();j.apply(o,n)}function k(){h=c}if(i&&!h){l()}h&&clearTimeout(h);if(i===c&&m>e){l()}else{if(f!==true){h=setTimeout(i?k:l,i===c?e-m:e)}}}if($.guid){g.guid=j.guid=j.guid||$.guid++}return g};$.debounce=function(d,e,f){return f===c?a(d,e,false):a(d,f,e!==false)}})(this);
\ No newline at end of file diff --git a/public/javascripts/general.js b/public/javascripts/general.js new file mode 100644 index 000000000..ed5095f82 --- /dev/null +++ b/public/javascripts/general.js @@ -0,0 +1,22 @@ +$(document).ready(function() { + if(window.location.search.substring(1).search("country_name") == -1) { + if (!$.cookie('has_seen_country_message')) { + $.ajax({ + url: "/country_message", + dataType: 'html', + success: function(country_message){ + if (country_message != ''){ + $('#other-country-notice').html(country_message); + $('body:not(.front) #other-country-notice').show() + } + } + }) + + } + } + + $('#other-country-notice').click(function() { + $('#other-country-notice').hide(); + $.cookie('has_seen_country_message', 1, {expires: 365, path: '/'}); + }) +})
\ No newline at end of file diff --git a/public/javascripts/jquery-ui.min.js b/public/javascripts/jquery-ui.min.js index d9d450a7e..35d983f43 100755..100644 --- a/public/javascripts/jquery-ui.min.js +++ b/public/javascripts/jquery-ui.min.js @@ -1,5 +1,5 @@ /*! - * jQuery UI 1.8.15 + * jQuery UI 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -7,7 +7,7 @@ * * http://docs.jquery.com/UI */ -(function(c,j){function k(a,b){var d=a.nodeName.toLowerCase();if("area"===d){b=a.parentNode;d=b.name;if(!a.href||!d||b.nodeName.toLowerCase()!=="map")return false;a=c("img[usemap=#"+d+"]")[0];return!!a&&l(a)}return(/input|select|textarea|button|object/.test(d)?!a.disabled:"a"==d?a.href||b:b)&&l(a)}function l(a){return!c(a).parents().andSelf().filter(function(){return c.curCSS(this,"visibility")==="hidden"||c.expr.filters.hidden(this)}).length}c.ui=c.ui||{};if(!c.ui.version){c.extend(c.ui,{version:"1.8.15", +(function(c,j){function k(a,b){var d=a.nodeName.toLowerCase();if("area"===d){b=a.parentNode;d=b.name;if(!a.href||!d||b.nodeName.toLowerCase()!=="map")return false;a=c("img[usemap=#"+d+"]")[0];return!!a&&l(a)}return(/input|select|textarea|button|object/.test(d)?!a.disabled:"a"==d?a.href||b:b)&&l(a)}function l(a){return!c(a).parents().andSelf().filter(function(){return c.curCSS(this,"visibility")==="hidden"||c.expr.filters.hidden(this)}).length}c.ui=c.ui||{};if(!c.ui.version){c.extend(c.ui,{version:"1.8.16", keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91}});c.fn.extend({propAttr:c.fn.prop||c.fn.attr,_focus:c.fn.focus,focus:function(a,b){return typeof a==="number"?this.each(function(){var d= this;setTimeout(function(){c(d).focus();b&&b.call(d)},a)}):this._focus.apply(this,arguments)},scrollParent:function(){var a;a=c.browser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(c.curCSS(this,"position",1))&&/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(c.curCSS(this, "overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0);return/fixed/.test(this.css("position"))||!a.length?c(document):a},zIndex:function(a){if(a!==j)return this.css("zIndex",a);if(this.length){a=c(this[0]);for(var b;a.length&&a[0]!==document;){b=a.css("position");if(b==="absolute"||b==="relative"||b==="fixed"){b=parseInt(a.css("zIndex"),10);if(!isNaN(b)&&b!==0)return b}a=a.parent()}}return 0},disableSelection:function(){return this.bind((c.support.selectstart?"selectstart": @@ -17,7 +17,7 @@ outerWidth:c.fn.outerWidth,outerHeight:c.fn.outerHeight};c.fn["inner"+b]=functio a.element[0].parentNode)for(var e=0;e<b.length;e++)a.options[b[e][0]]&&b[e][1].apply(a.element,d)}},contains:function(a,b){return document.compareDocumentPosition?a.compareDocumentPosition(b)&16:a!==b&&a.contains(b)},hasScroll:function(a,b){if(c(a).css("overflow")==="hidden")return false;b=b&&b==="left"?"scrollLeft":"scrollTop";var d=false;if(a[b]>0)return true;a[b]=1;d=a[b]>0;a[b]=0;return d},isOverAxis:function(a,b,d){return a>b&&a<b+d},isOver:function(a,b,d,e,h,i){return c.ui.isOverAxis(a,d,h)&& c.ui.isOverAxis(b,e,i)}})}})(jQuery); ;/*! - * jQuery UI Widget 1.8.15 + * jQuery UI Widget 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -25,47 +25,14 @@ c.ui.isOverAxis(b,e,i)}})}})(jQuery); * * http://docs.jquery.com/UI/Widget */ -(function(b,j){if(b.cleanData){var k=b.cleanData;b.cleanData=function(a){for(var c=0,d;(d=a[c])!=null;c++)b(d).triggerHandler("remove");k(a)}}else{var l=b.fn.remove;b.fn.remove=function(a,c){return this.each(function(){if(!c)if(!a||b.filter(a,[this]).length)b("*",this).add([this]).each(function(){b(this).triggerHandler("remove")});return l.call(b(this),a,c)})}}b.widget=function(a,c,d){var e=a.split(".")[0],f;a=a.split(".")[1];f=e+"-"+a;if(!d){d=c;c=b.Widget}b.expr[":"][f]=function(h){return!!b.data(h, -a)};b[e]=b[e]||{};b[e][a]=function(h,g){arguments.length&&this._createWidget(h,g)};c=new c;c.options=b.extend(true,{},c.options);b[e][a].prototype=b.extend(true,c,{namespace:e,widgetName:a,widgetEventPrefix:b[e][a].prototype.widgetEventPrefix||a,widgetBaseClass:f},d);b.widget.bridge(a,b[e][a])};b.widget.bridge=function(a,c){b.fn[a]=function(d){var e=typeof d==="string",f=Array.prototype.slice.call(arguments,1),h=this;d=!e&&f.length?b.extend.apply(null,[true,d].concat(f)):d;if(e&&d.charAt(0)==="_")return h; -e?this.each(function(){var g=b.data(this,a),i=g&&b.isFunction(g[d])?g[d].apply(g,f):g;if(i!==g&&i!==j){h=i;return false}}):this.each(function(){var g=b.data(this,a);g?g.option(d||{})._init():b.data(this,a,new c(d,this))});return h}};b.Widget=function(a,c){arguments.length&&this._createWidget(a,c)};b.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",options:{disabled:false},_createWidget:function(a,c){b.data(c,this.widgetName,this);this.element=b(c);this.options=b.extend(true,{},this.options, -this._getCreateOptions(),a);var d=this;this.element.bind("remove."+this.widgetName,function(){d.destroy()});this._create();this._trigger("create");this._init()},_getCreateOptions:function(){return b.metadata&&b.metadata.get(this.element[0])[this.widgetName]},_create:function(){},_init:function(){},destroy:function(){this.element.unbind("."+this.widgetName).removeData(this.widgetName);this.widget().unbind("."+this.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClass+"-disabled ui-state-disabled")}, -widget:function(){return this.element},option:function(a,c){var d=a;if(arguments.length===0)return b.extend({},this.options);if(typeof a==="string"){if(c===j)return this.options[a];d={};d[a]=c}this._setOptions(d);return this},_setOptions:function(a){var c=this;b.each(a,function(d,e){c._setOption(d,e)});return this},_setOption:function(a,c){this.options[a]=c;if(a==="disabled")this.widget()[c?"addClass":"removeClass"](this.widgetBaseClass+"-disabled ui-state-disabled").attr("aria-disabled",c);return this}, -enable:function(){return this._setOption("disabled",false)},disable:function(){return this._setOption("disabled",true)},_trigger:function(a,c,d){var e=this.options[a];c=b.Event(c);c.type=(a===this.widgetEventPrefix?a:this.widgetEventPrefix+a).toLowerCase();d=d||{};if(c.originalEvent){a=b.event.props.length;for(var f;a;){f=b.event.props[--a];c[f]=c.originalEvent[f]}}this.element.trigger(c,d);return!(b.isFunction(e)&&e.call(this.element[0],c,d)===false||c.isDefaultPrevented())}}})(jQuery); -;/*! - * jQuery UI Mouse 1.8.15 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Mouse - * - * Depends: - * jquery.ui.widget.js - */ -(function(b){b.widget("ui.mouse",{options:{cancel:":input,option",distance:1,delay:0},_mouseInit:function(){var a=this;this.element.bind("mousedown."+this.widgetName,function(c){return a._mouseDown(c)}).bind("click."+this.widgetName,function(c){if(true===b.data(c.target,a.widgetName+".preventClickEvent")){b.removeData(c.target,a.widgetName+".preventClickEvent");c.stopImmediatePropagation();return false}});this.started=false},_mouseDestroy:function(){this.element.unbind("."+this.widgetName)},_mouseDown:function(a){a.originalEvent= -a.originalEvent||{};if(!a.originalEvent.mouseHandled){this._mouseStarted&&this._mouseUp(a);this._mouseDownEvent=a;var c=this,e=a.which==1,f=typeof this.options.cancel=="string"?b(a.target).closest(this.options.cancel).length:false;if(!e||f||!this._mouseCapture(a))return true;this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet)this._mouseDelayTimer=setTimeout(function(){c.mouseDelayMet=true},this.options.delay);if(this._mouseDistanceMet(a)&&this._mouseDelayMet(a)){this._mouseStarted=this._mouseStart(a)!== -false;if(!this._mouseStarted){a.preventDefault();return true}}true===b.data(a.target,this.widgetName+".preventClickEvent")&&b.removeData(a.target,this.widgetName+".preventClickEvent");this._mouseMoveDelegate=function(d){return c._mouseMove(d)};this._mouseUpDelegate=function(d){return c._mouseUp(d)};b(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);a.preventDefault();return a.originalEvent.mouseHandled=true}},_mouseMove:function(a){if(b.browser.msie&& -!(document.documentMode>=9)&&!a.button)return this._mouseUp(a);if(this._mouseStarted){this._mouseDrag(a);return a.preventDefault()}if(this._mouseDistanceMet(a)&&this._mouseDelayMet(a))(this._mouseStarted=this._mouseStart(this._mouseDownEvent,a)!==false)?this._mouseDrag(a):this._mouseUp(a);return!this._mouseStarted},_mouseUp:function(a){b(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted= -false;a.target==this._mouseDownEvent.target&&b.data(a.target,this.widgetName+".preventClickEvent",true);this._mouseStop(a)}return false},_mouseDistanceMet:function(a){return Math.max(Math.abs(this._mouseDownEvent.pageX-a.pageX),Math.abs(this._mouseDownEvent.pageY-a.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return true}})})(jQuery); +(function(b,j){if(b.cleanData){var k=b.cleanData;b.cleanData=function(a){for(var c=0,d;(d=a[c])!=null;c++)try{b(d).triggerHandler("remove")}catch(e){}k(a)}}else{var l=b.fn.remove;b.fn.remove=function(a,c){return this.each(function(){if(!c)if(!a||b.filter(a,[this]).length)b("*",this).add([this]).each(function(){try{b(this).triggerHandler("remove")}catch(d){}});return l.call(b(this),a,c)})}}b.widget=function(a,c,d){var e=a.split(".")[0],f;a=a.split(".")[1];f=e+"-"+a;if(!d){d=c;c=b.Widget}b.expr[":"][f]= +function(h){return!!b.data(h,a)};b[e]=b[e]||{};b[e][a]=function(h,g){arguments.length&&this._createWidget(h,g)};c=new c;c.options=b.extend(true,{},c.options);b[e][a].prototype=b.extend(true,c,{namespace:e,widgetName:a,widgetEventPrefix:b[e][a].prototype.widgetEventPrefix||a,widgetBaseClass:f},d);b.widget.bridge(a,b[e][a])};b.widget.bridge=function(a,c){b.fn[a]=function(d){var e=typeof d==="string",f=Array.prototype.slice.call(arguments,1),h=this;d=!e&&f.length?b.extend.apply(null,[true,d].concat(f)): +d;if(e&&d.charAt(0)==="_")return h;e?this.each(function(){var g=b.data(this,a),i=g&&b.isFunction(g[d])?g[d].apply(g,f):g;if(i!==g&&i!==j){h=i;return false}}):this.each(function(){var g=b.data(this,a);g?g.option(d||{})._init():b.data(this,a,new c(d,this))});return h}};b.Widget=function(a,c){arguments.length&&this._createWidget(a,c)};b.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",options:{disabled:false},_createWidget:function(a,c){b.data(c,this.widgetName,this);this.element=b(c);this.options= +b.extend(true,{},this.options,this._getCreateOptions(),a);var d=this;this.element.bind("remove."+this.widgetName,function(){d.destroy()});this._create();this._trigger("create");this._init()},_getCreateOptions:function(){return b.metadata&&b.metadata.get(this.element[0])[this.widgetName]},_create:function(){},_init:function(){},destroy:function(){this.element.unbind("."+this.widgetName).removeData(this.widgetName);this.widget().unbind("."+this.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClass+ +"-disabled ui-state-disabled")},widget:function(){return this.element},option:function(a,c){var d=a;if(arguments.length===0)return b.extend({},this.options);if(typeof a==="string"){if(c===j)return this.options[a];d={};d[a]=c}this._setOptions(d);return this},_setOptions:function(a){var c=this;b.each(a,function(d,e){c._setOption(d,e)});return this},_setOption:function(a,c){this.options[a]=c;if(a==="disabled")this.widget()[c?"addClass":"removeClass"](this.widgetBaseClass+"-disabled ui-state-disabled").attr("aria-disabled", +c);return this},enable:function(){return this._setOption("disabled",false)},disable:function(){return this._setOption("disabled",true)},_trigger:function(a,c,d){var e=this.options[a];c=b.Event(c);c.type=(a===this.widgetEventPrefix?a:this.widgetEventPrefix+a).toLowerCase();d=d||{};if(c.originalEvent){a=b.event.props.length;for(var f;a;){f=b.event.props[--a];c[f]=c.originalEvent[f]}}this.element.trigger(c,d);return!(b.isFunction(e)&&e.call(this.element[0],c,d)===false||c.isDefaultPrevented())}}})(jQuery); ;/* - * jQuery UI Position 1.8.15 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Position - */ -(function(c){c.ui=c.ui||{};var n=/left|center|right/,o=/top|center|bottom/,t=c.fn.position,u=c.fn.offset;c.fn.position=function(b){if(!b||!b.of)return t.apply(this,arguments);b=c.extend({},b);var a=c(b.of),d=a[0],g=(b.collision||"flip").split(" "),e=b.offset?b.offset.split(" "):[0,0],h,k,j;if(d.nodeType===9){h=a.width();k=a.height();j={top:0,left:0}}else if(d.setTimeout){h=a.width();k=a.height();j={top:a.scrollTop(),left:a.scrollLeft()}}else if(d.preventDefault){b.at="left top";h=k=0;j={top:b.of.pageY, -left:b.of.pageX}}else{h=a.outerWidth();k=a.outerHeight();j=a.offset()}c.each(["my","at"],function(){var f=(b[this]||"").split(" ");if(f.length===1)f=n.test(f[0])?f.concat(["center"]):o.test(f[0])?["center"].concat(f):["center","center"];f[0]=n.test(f[0])?f[0]:"center";f[1]=o.test(f[1])?f[1]:"center";b[this]=f});if(g.length===1)g[1]=g[0];e[0]=parseInt(e[0],10)||0;if(e.length===1)e[1]=e[0];e[1]=parseInt(e[1],10)||0;if(b.at[0]==="right")j.left+=h;else if(b.at[0]==="center")j.left+=h/2;if(b.at[1]==="bottom")j.top+= -k;else if(b.at[1]==="center")j.top+=k/2;j.left+=e[0];j.top+=e[1];return this.each(function(){var f=c(this),l=f.outerWidth(),m=f.outerHeight(),p=parseInt(c.curCSS(this,"marginLeft",true))||0,q=parseInt(c.curCSS(this,"marginTop",true))||0,v=l+p+(parseInt(c.curCSS(this,"marginRight",true))||0),w=m+q+(parseInt(c.curCSS(this,"marginBottom",true))||0),i=c.extend({},j),r;if(b.my[0]==="right")i.left-=l;else if(b.my[0]==="center")i.left-=l/2;if(b.my[1]==="bottom")i.top-=m;else if(b.my[1]==="center")i.top-= -m/2;i.left=Math.round(i.left);i.top=Math.round(i.top);r={left:i.left-p,top:i.top-q};c.each(["left","top"],function(s,x){c.ui.position[g[s]]&&c.ui.position[g[s]][x](i,{targetWidth:h,targetHeight:k,elemWidth:l,elemHeight:m,collisionPosition:r,collisionWidth:v,collisionHeight:w,offset:e,my:b.my,at:b.at})});c.fn.bgiframe&&f.bgiframe();f.offset(c.extend(i,{using:b.using}))})};c.ui.position={fit:{left:function(b,a){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();b.left= -d>0?b.left-d:Math.max(b.left-a.collisionPosition.left,b.left)},top:function(b,a){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();b.top=d>0?b.top-d:Math.max(b.top-a.collisionPosition.top,b.top)}},flip:{left:function(b,a){if(a.at[0]!=="center"){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();var g=a.my[0]==="left"?-a.elemWidth:a.my[0]==="right"?a.elemWidth:0,e=a.at[0]==="left"?a.targetWidth:-a.targetWidth,h=-2*a.offset[0];b.left+= -a.collisionPosition.left<0?g+e+h:d>0?g+e+h:0}},top:function(b,a){if(a.at[1]!=="center"){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();var g=a.my[1]==="top"?-a.elemHeight:a.my[1]==="bottom"?a.elemHeight:0,e=a.at[1]==="top"?a.targetHeight:-a.targetHeight,h=-2*a.offset[1];b.top+=a.collisionPosition.top<0?g+e+h:d>0?g+e+h:0}}}};if(!c.offset.setOffset){c.offset.setOffset=function(b,a){if(/static/.test(c.curCSS(b,"position")))b.style.position="relative";var d=c(b), -g=d.offset(),e=parseInt(c.curCSS(b,"top",true),10)||0,h=parseInt(c.curCSS(b,"left",true),10)||0;g={top:a.top-g.top+e,left:a.left-g.left+h};"using"in a?a.using.call(b,g):d.css(g)};c.fn.offset=function(b){var a=this[0];if(!a||!a.ownerDocument)return null;if(b)return this.each(function(){c.offset.setOffset(this,b)});return u.call(this)}}})(jQuery); -;/* - * jQuery UI Tabs 1.8.15 + * jQuery UI Tabs 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -97,6 +64,89 @@ if(a.hasClass("ui-tabs-selected")&&this.anchors.length>1)this.select(b+(b+1<this this._ui(this.anchors[b],this.panels[b]));return this}},disable:function(b){b=this._getIndex(b);var e=this.options;if(b!=e.selected){this.lis.eq(b).addClass("ui-state-disabled");e.disabled.push(b);e.disabled.sort();this._trigger("disable",null,this._ui(this.anchors[b],this.panels[b]))}return this},select:function(b){b=this._getIndex(b);if(b==-1)if(this.options.collapsible&&this.options.selected!=-1)b=this.options.selected;else return this;this.anchors.eq(b).trigger(this.options.event+".tabs");return this}, load:function(b){b=this._getIndex(b);var e=this,a=this.options,c=this.anchors.eq(b)[0],h=d.data(c,"load.tabs");this.abort();if(!h||this.element.queue("tabs").length!==0&&d.data(c,"cache.tabs"))this.element.dequeue("tabs");else{this.lis.eq(b).addClass("ui-state-processing");if(a.spinner){var j=d("span",c);j.data("label.tabs",j.html()).html(a.spinner)}this.xhr=d.ajax(d.extend({},a.ajaxOptions,{url:h,success:function(k,n){e.element.find(e._sanitizeSelector(c.hash)).html(k);e._cleanup();a.cache&&d.data(c, "cache.tabs",true);e._trigger("load",null,e._ui(e.anchors[b],e.panels[b]));try{a.ajaxOptions.success(k,n)}catch(m){}},error:function(k,n){e._cleanup();e._trigger("load",null,e._ui(e.anchors[b],e.panels[b]));try{a.ajaxOptions.error(k,n,b,c)}catch(m){}}}));e.element.dequeue("tabs");return this}},abort:function(){this.element.queue([]);this.panels.stop(false,true);this.element.queue("tabs",this.element.queue("tabs").splice(-2,2));if(this.xhr){this.xhr.abort();delete this.xhr}this._cleanup();return this}, -url:function(b,e){this.anchors.eq(b).removeData("cache.tabs").data("load.tabs",e);return this},length:function(){return this.anchors.length}});d.extend(d.ui.tabs,{version:"1.8.15"});d.extend(d.ui.tabs.prototype,{rotation:null,rotate:function(b,e){var a=this,c=this.options,h=a._rotate||(a._rotate=function(j){clearTimeout(a.rotation);a.rotation=setTimeout(function(){var k=c.selected;a.select(++k<a.anchors.length?k:0)},b);j&&j.stopPropagation()});e=a._unrotate||(a._unrotate=!e?function(j){j.clientX&& +url:function(b,e){this.anchors.eq(b).removeData("cache.tabs").data("load.tabs",e);return this},length:function(){return this.anchors.length}});d.extend(d.ui.tabs,{version:"1.8.16"});d.extend(d.ui.tabs.prototype,{rotation:null,rotate:function(b,e){var a=this,c=this.options,h=a._rotate||(a._rotate=function(j){clearTimeout(a.rotation);a.rotation=setTimeout(function(){var k=c.selected;a.select(++k<a.anchors.length?k:0)},b);j&&j.stopPropagation()});e=a._unrotate||(a._unrotate=!e?function(j){j.clientX&& a.rotate(null)}:function(){t=c.selected;h()});if(b){this.element.bind("tabsshow",h);this.anchors.bind(c.event+".tabs",e);h()}else{clearTimeout(a.rotation);this.element.unbind("tabsshow",h);this.anchors.unbind(c.event+".tabs",e);delete this._rotate;delete this._unrotate}return this}})})(jQuery); +;/* + * jQuery UI Datepicker 1.8.16 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Datepicker + * + * Depends: + * jquery.ui.core.js + */ +(function(d,C){function M(){this.debug=false;this._curInst=null;this._keyEvent=false;this._disabledInputs=[];this._inDialog=this._datepickerShowing=false;this._mainDivId="ui-datepicker-div";this._inlineClass="ui-datepicker-inline";this._appendClass="ui-datepicker-append";this._triggerClass="ui-datepicker-trigger";this._dialogClass="ui-datepicker-dialog";this._disableClass="ui-datepicker-disabled";this._unselectableClass="ui-datepicker-unselectable";this._currentClass="ui-datepicker-current-day";this._dayOverClass= +"ui-datepicker-days-cell-over";this.regional=[];this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su", +"Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:false,showMonthAfterYear:false,yearSuffix:""};this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:false,hideIfNoPrevNext:false,navigationAsDateFormat:false,gotoCurrent:false,changeMonth:false,changeYear:false,yearRange:"c-10:c+10",showOtherMonths:false,selectOtherMonths:false,showWeek:false,calculateWeek:this.iso8601Week,shortYearCutoff:"+10", +minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:true,showButtonPanel:false,autoSize:false,disabled:false};d.extend(this._defaults,this.regional[""]);this.dpDiv=N(d('<div id="'+this._mainDivId+'" class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'))}function N(a){return a.bind("mouseout", +function(b){b=d(b.target).closest("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a");b.length&&b.removeClass("ui-state-hover ui-datepicker-prev-hover ui-datepicker-next-hover")}).bind("mouseover",function(b){b=d(b.target).closest("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a");if(!(d.datepicker._isDisabledDatepicker(J.inline?a.parent()[0]:J.input[0])||!b.length)){b.parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover"); +b.addClass("ui-state-hover");b.hasClass("ui-datepicker-prev")&&b.addClass("ui-datepicker-prev-hover");b.hasClass("ui-datepicker-next")&&b.addClass("ui-datepicker-next-hover")}})}function H(a,b){d.extend(a,b);for(var c in b)if(b[c]==null||b[c]==C)a[c]=b[c];return a}d.extend(d.ui,{datepicker:{version:"1.8.16"}});var B=(new Date).getTime(),J;d.extend(M.prototype,{markerClassName:"hasDatepicker",maxRows:4,log:function(){this.debug&&console.log.apply("",arguments)},_widgetDatepicker:function(){return this.dpDiv}, +setDefaults:function(a){H(this._defaults,a||{});return this},_attachDatepicker:function(a,b){var c=null;for(var e in this._defaults){var f=a.getAttribute("date:"+e);if(f){c=c||{};try{c[e]=eval(f)}catch(h){c[e]=f}}}e=a.nodeName.toLowerCase();f=e=="div"||e=="span";if(!a.id){this.uuid+=1;a.id="dp"+this.uuid}var i=this._newInst(d(a),f);i.settings=d.extend({},b||{},c||{});if(e=="input")this._connectDatepicker(a,i);else f&&this._inlineDatepicker(a,i)},_newInst:function(a,b){return{id:a[0].id.replace(/([^A-Za-z0-9_-])/g, +"\\\\$1"),input:a,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:b,dpDiv:!b?this.dpDiv:N(d('<div class="'+this._inlineClass+' ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'))}},_connectDatepicker:function(a,b){var c=d(a);b.append=d([]);b.trigger=d([]);if(!c.hasClass(this.markerClassName)){this._attachments(c,b);c.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp).bind("setData.datepicker", +function(e,f,h){b.settings[f]=h}).bind("getData.datepicker",function(e,f){return this._get(b,f)});this._autoSize(b);d.data(a,"datepicker",b);b.settings.disabled&&this._disableDatepicker(a)}},_attachments:function(a,b){var c=this._get(b,"appendText"),e=this._get(b,"isRTL");b.append&&b.append.remove();if(c){b.append=d('<span class="'+this._appendClass+'">'+c+"</span>");a[e?"before":"after"](b.append)}a.unbind("focus",this._showDatepicker);b.trigger&&b.trigger.remove();c=this._get(b,"showOn");if(c== +"focus"||c=="both")a.focus(this._showDatepicker);if(c=="button"||c=="both"){c=this._get(b,"buttonText");var f=this._get(b,"buttonImage");b.trigger=d(this._get(b,"buttonImageOnly")?d("<img/>").addClass(this._triggerClass).attr({src:f,alt:c,title:c}):d('<button type="button"></button>').addClass(this._triggerClass).html(f==""?c:d("<img/>").attr({src:f,alt:c,title:c})));a[e?"before":"after"](b.trigger);b.trigger.click(function(){d.datepicker._datepickerShowing&&d.datepicker._lastInput==a[0]?d.datepicker._hideDatepicker(): +d.datepicker._showDatepicker(a[0]);return false})}},_autoSize:function(a){if(this._get(a,"autoSize")&&!a.inline){var b=new Date(2009,11,20),c=this._get(a,"dateFormat");if(c.match(/[DM]/)){var e=function(f){for(var h=0,i=0,g=0;g<f.length;g++)if(f[g].length>h){h=f[g].length;i=g}return i};b.setMonth(e(this._get(a,c.match(/MM/)?"monthNames":"monthNamesShort")));b.setDate(e(this._get(a,c.match(/DD/)?"dayNames":"dayNamesShort"))+20-b.getDay())}a.input.attr("size",this._formatDate(a,b).length)}},_inlineDatepicker:function(a, +b){var c=d(a);if(!c.hasClass(this.markerClassName)){c.addClass(this.markerClassName).append(b.dpDiv).bind("setData.datepicker",function(e,f,h){b.settings[f]=h}).bind("getData.datepicker",function(e,f){return this._get(b,f)});d.data(a,"datepicker",b);this._setDate(b,this._getDefaultDate(b),true);this._updateDatepicker(b);this._updateAlternate(b);b.settings.disabled&&this._disableDatepicker(a);b.dpDiv.css("display","block")}},_dialogDatepicker:function(a,b,c,e,f){a=this._dialogInst;if(!a){this.uuid+= +1;this._dialogInput=d('<input type="text" id="'+("dp"+this.uuid)+'" style="position: absolute; top: -100px; width: 0px; z-index: -10;"/>');this._dialogInput.keydown(this._doKeyDown);d("body").append(this._dialogInput);a=this._dialogInst=this._newInst(this._dialogInput,false);a.settings={};d.data(this._dialogInput[0],"datepicker",a)}H(a.settings,e||{});b=b&&b.constructor==Date?this._formatDate(a,b):b;this._dialogInput.val(b);this._pos=f?f.length?f:[f.pageX,f.pageY]:null;if(!this._pos)this._pos=[document.documentElement.clientWidth/ +2-100+(document.documentElement.scrollLeft||document.body.scrollLeft),document.documentElement.clientHeight/2-150+(document.documentElement.scrollTop||document.body.scrollTop)];this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px");a.settings.onSelect=c;this._inDialog=true;this.dpDiv.addClass(this._dialogClass);this._showDatepicker(this._dialogInput[0]);d.blockUI&&d.blockUI(this.dpDiv);d.data(this._dialogInput[0],"datepicker",a);return this},_destroyDatepicker:function(a){var b= +d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();d.removeData(a,"datepicker");if(e=="input"){c.append.remove();c.trigger.remove();b.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)}else if(e=="div"||e=="span")b.removeClass(this.markerClassName).empty()}},_enableDatepicker:function(a){var b=d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e= +a.nodeName.toLowerCase();if(e=="input"){a.disabled=false;c.trigger.filter("button").each(function(){this.disabled=false}).end().filter("img").css({opacity:"1.0",cursor:""})}else if(e=="div"||e=="span"){b=b.children("."+this._inlineClass);b.children().removeClass("ui-state-disabled");b.find("select.ui-datepicker-month, select.ui-datepicker-year").removeAttr("disabled")}this._disabledInputs=d.map(this._disabledInputs,function(f){return f==a?null:f})}},_disableDatepicker:function(a){var b=d(a),c=d.data(a, +"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();if(e=="input"){a.disabled=true;c.trigger.filter("button").each(function(){this.disabled=true}).end().filter("img").css({opacity:"0.5",cursor:"default"})}else if(e=="div"||e=="span"){b=b.children("."+this._inlineClass);b.children().addClass("ui-state-disabled");b.find("select.ui-datepicker-month, select.ui-datepicker-year").attr("disabled","disabled")}this._disabledInputs=d.map(this._disabledInputs,function(f){return f== +a?null:f});this._disabledInputs[this._disabledInputs.length]=a}},_isDisabledDatepicker:function(a){if(!a)return false;for(var b=0;b<this._disabledInputs.length;b++)if(this._disabledInputs[b]==a)return true;return false},_getInst:function(a){try{return d.data(a,"datepicker")}catch(b){throw"Missing instance data for this datepicker";}},_optionDatepicker:function(a,b,c){var e=this._getInst(a);if(arguments.length==2&&typeof b=="string")return b=="defaults"?d.extend({},d.datepicker._defaults):e?b=="all"? +d.extend({},e.settings):this._get(e,b):null;var f=b||{};if(typeof b=="string"){f={};f[b]=c}if(e){this._curInst==e&&this._hideDatepicker();var h=this._getDateDatepicker(a,true),i=this._getMinMaxDate(e,"min"),g=this._getMinMaxDate(e,"max");H(e.settings,f);if(i!==null&&f.dateFormat!==C&&f.minDate===C)e.settings.minDate=this._formatDate(e,i);if(g!==null&&f.dateFormat!==C&&f.maxDate===C)e.settings.maxDate=this._formatDate(e,g);this._attachments(d(a),e);this._autoSize(e);this._setDate(e,h);this._updateAlternate(e); +this._updateDatepicker(e)}},_changeDatepicker:function(a,b,c){this._optionDatepicker(a,b,c)},_refreshDatepicker:function(a){(a=this._getInst(a))&&this._updateDatepicker(a)},_setDateDatepicker:function(a,b){if(a=this._getInst(a)){this._setDate(a,b);this._updateDatepicker(a);this._updateAlternate(a)}},_getDateDatepicker:function(a,b){(a=this._getInst(a))&&!a.inline&&this._setDateFromField(a,b);return a?this._getDate(a):null},_doKeyDown:function(a){var b=d.datepicker._getInst(a.target),c=true,e=b.dpDiv.is(".ui-datepicker-rtl"); +b._keyEvent=true;if(d.datepicker._datepickerShowing)switch(a.keyCode){case 9:d.datepicker._hideDatepicker();c=false;break;case 13:c=d("td."+d.datepicker._dayOverClass+":not(."+d.datepicker._currentClass+")",b.dpDiv);c[0]&&d.datepicker._selectDay(a.target,b.selectedMonth,b.selectedYear,c[0]);if(a=d.datepicker._get(b,"onSelect")){c=d.datepicker._formatDate(b);a.apply(b.input?b.input[0]:null,[c,b])}else d.datepicker._hideDatepicker();return false;case 27:d.datepicker._hideDatepicker();break;case 33:d.datepicker._adjustDate(a.target, +a.ctrlKey?-d.datepicker._get(b,"stepBigMonths"):-d.datepicker._get(b,"stepMonths"),"M");break;case 34:d.datepicker._adjustDate(a.target,a.ctrlKey?+d.datepicker._get(b,"stepBigMonths"):+d.datepicker._get(b,"stepMonths"),"M");break;case 35:if(a.ctrlKey||a.metaKey)d.datepicker._clearDate(a.target);c=a.ctrlKey||a.metaKey;break;case 36:if(a.ctrlKey||a.metaKey)d.datepicker._gotoToday(a.target);c=a.ctrlKey||a.metaKey;break;case 37:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,e?+1:-1,"D");c= +a.ctrlKey||a.metaKey;if(a.originalEvent.altKey)d.datepicker._adjustDate(a.target,a.ctrlKey?-d.datepicker._get(b,"stepBigMonths"):-d.datepicker._get(b,"stepMonths"),"M");break;case 38:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,-7,"D");c=a.ctrlKey||a.metaKey;break;case 39:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,e?-1:+1,"D");c=a.ctrlKey||a.metaKey;if(a.originalEvent.altKey)d.datepicker._adjustDate(a.target,a.ctrlKey?+d.datepicker._get(b,"stepBigMonths"):+d.datepicker._get(b, +"stepMonths"),"M");break;case 40:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,+7,"D");c=a.ctrlKey||a.metaKey;break;default:c=false}else if(a.keyCode==36&&a.ctrlKey)d.datepicker._showDatepicker(this);else c=false;if(c){a.preventDefault();a.stopPropagation()}},_doKeyPress:function(a){var b=d.datepicker._getInst(a.target);if(d.datepicker._get(b,"constrainInput")){b=d.datepicker._possibleChars(d.datepicker._get(b,"dateFormat"));var c=String.fromCharCode(a.charCode==C?a.keyCode:a.charCode); +return a.ctrlKey||a.metaKey||c<" "||!b||b.indexOf(c)>-1}},_doKeyUp:function(a){a=d.datepicker._getInst(a.target);if(a.input.val()!=a.lastVal)try{if(d.datepicker.parseDate(d.datepicker._get(a,"dateFormat"),a.input?a.input.val():null,d.datepicker._getFormatConfig(a))){d.datepicker._setDateFromField(a);d.datepicker._updateAlternate(a);d.datepicker._updateDatepicker(a)}}catch(b){d.datepicker.log(b)}return true},_showDatepicker:function(a){a=a.target||a;if(a.nodeName.toLowerCase()!="input")a=d("input", +a.parentNode)[0];if(!(d.datepicker._isDisabledDatepicker(a)||d.datepicker._lastInput==a)){var b=d.datepicker._getInst(a);if(d.datepicker._curInst&&d.datepicker._curInst!=b){d.datepicker._datepickerShowing&&d.datepicker._triggerOnClose(d.datepicker._curInst);d.datepicker._curInst.dpDiv.stop(true,true)}var c=d.datepicker._get(b,"beforeShow");c=c?c.apply(a,[a,b]):{};if(c!==false){H(b.settings,c);b.lastVal=null;d.datepicker._lastInput=a;d.datepicker._setDateFromField(b);if(d.datepicker._inDialog)a.value= +"";if(!d.datepicker._pos){d.datepicker._pos=d.datepicker._findPos(a);d.datepicker._pos[1]+=a.offsetHeight}var e=false;d(a).parents().each(function(){e|=d(this).css("position")=="fixed";return!e});if(e&&d.browser.opera){d.datepicker._pos[0]-=document.documentElement.scrollLeft;d.datepicker._pos[1]-=document.documentElement.scrollTop}c={left:d.datepicker._pos[0],top:d.datepicker._pos[1]};d.datepicker._pos=null;b.dpDiv.empty();b.dpDiv.css({position:"absolute",display:"block",top:"-1000px"});d.datepicker._updateDatepicker(b); +c=d.datepicker._checkOffset(b,c,e);b.dpDiv.css({position:d.datepicker._inDialog&&d.blockUI?"static":e?"fixed":"absolute",display:"none",left:c.left+"px",top:c.top+"px"});if(!b.inline){c=d.datepicker._get(b,"showAnim");var f=d.datepicker._get(b,"duration"),h=function(){var i=b.dpDiv.find("iframe.ui-datepicker-cover");if(i.length){var g=d.datepicker._getBorders(b.dpDiv);i.css({left:-g[0],top:-g[1],width:b.dpDiv.outerWidth(),height:b.dpDiv.outerHeight()})}};b.dpDiv.zIndex(d(a).zIndex()+1);d.datepicker._datepickerShowing= +true;d.effects&&d.effects[c]?b.dpDiv.show(c,d.datepicker._get(b,"showOptions"),f,h):b.dpDiv[c||"show"](c?f:null,h);if(!c||!f)h();b.input.is(":visible")&&!b.input.is(":disabled")&&b.input.focus();d.datepicker._curInst=b}}}},_updateDatepicker:function(a){this.maxRows=4;var b=d.datepicker._getBorders(a.dpDiv);J=a;a.dpDiv.empty().append(this._generateHTML(a));var c=a.dpDiv.find("iframe.ui-datepicker-cover");c.length&&c.css({left:-b[0],top:-b[1],width:a.dpDiv.outerWidth(),height:a.dpDiv.outerHeight()}); +a.dpDiv.find("."+this._dayOverClass+" a").mouseover();b=this._getNumberOfMonths(a);c=b[1];a.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width("");c>1&&a.dpDiv.addClass("ui-datepicker-multi-"+c).css("width",17*c+"em");a.dpDiv[(b[0]!=1||b[1]!=1?"add":"remove")+"Class"]("ui-datepicker-multi");a.dpDiv[(this._get(a,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl");a==d.datepicker._curInst&&d.datepicker._datepickerShowing&&a.input&&a.input.is(":visible")&& +!a.input.is(":disabled")&&a.input[0]!=document.activeElement&&a.input.focus();if(a.yearshtml){var e=a.yearshtml;setTimeout(function(){e===a.yearshtml&&a.yearshtml&&a.dpDiv.find("select.ui-datepicker-year:first").replaceWith(a.yearshtml);e=a.yearshtml=null},0)}},_getBorders:function(a){var b=function(c){return{thin:1,medium:2,thick:3}[c]||c};return[parseFloat(b(a.css("border-left-width"))),parseFloat(b(a.css("border-top-width")))]},_checkOffset:function(a,b,c){var e=a.dpDiv.outerWidth(),f=a.dpDiv.outerHeight(), +h=a.input?a.input.outerWidth():0,i=a.input?a.input.outerHeight():0,g=document.documentElement.clientWidth+d(document).scrollLeft(),j=document.documentElement.clientHeight+d(document).scrollTop();b.left-=this._get(a,"isRTL")?e-h:0;b.left-=c&&b.left==a.input.offset().left?d(document).scrollLeft():0;b.top-=c&&b.top==a.input.offset().top+i?d(document).scrollTop():0;b.left-=Math.min(b.left,b.left+e>g&&g>e?Math.abs(b.left+e-g):0);b.top-=Math.min(b.top,b.top+f>j&&j>f?Math.abs(f+i):0);return b},_findPos:function(a){for(var b= +this._get(this._getInst(a),"isRTL");a&&(a.type=="hidden"||a.nodeType!=1||d.expr.filters.hidden(a));)a=a[b?"previousSibling":"nextSibling"];a=d(a).offset();return[a.left,a.top]},_triggerOnClose:function(a){var b=this._get(a,"onClose");if(b)b.apply(a.input?a.input[0]:null,[a.input?a.input.val():"",a])},_hideDatepicker:function(a){var b=this._curInst;if(!(!b||a&&b!=d.data(a,"datepicker")))if(this._datepickerShowing){a=this._get(b,"showAnim");var c=this._get(b,"duration"),e=function(){d.datepicker._tidyDialog(b); +this._curInst=null};d.effects&&d.effects[a]?b.dpDiv.hide(a,d.datepicker._get(b,"showOptions"),c,e):b.dpDiv[a=="slideDown"?"slideUp":a=="fadeIn"?"fadeOut":"hide"](a?c:null,e);a||e();d.datepicker._triggerOnClose(b);this._datepickerShowing=false;this._lastInput=null;if(this._inDialog){this._dialogInput.css({position:"absolute",left:"0",top:"-100px"});if(d.blockUI){d.unblockUI();d("body").append(this.dpDiv)}}this._inDialog=false}},_tidyDialog:function(a){a.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")}, +_checkExternalClick:function(a){if(d.datepicker._curInst){a=d(a.target);a[0].id!=d.datepicker._mainDivId&&a.parents("#"+d.datepicker._mainDivId).length==0&&!a.hasClass(d.datepicker.markerClassName)&&!a.hasClass(d.datepicker._triggerClass)&&d.datepicker._datepickerShowing&&!(d.datepicker._inDialog&&d.blockUI)&&d.datepicker._hideDatepicker()}},_adjustDate:function(a,b,c){a=d(a);var e=this._getInst(a[0]);if(!this._isDisabledDatepicker(a[0])){this._adjustInstDate(e,b+(c=="M"?this._get(e,"showCurrentAtPos"): +0),c);this._updateDatepicker(e)}},_gotoToday:function(a){a=d(a);var b=this._getInst(a[0]);if(this._get(b,"gotoCurrent")&&b.currentDay){b.selectedDay=b.currentDay;b.drawMonth=b.selectedMonth=b.currentMonth;b.drawYear=b.selectedYear=b.currentYear}else{var c=new Date;b.selectedDay=c.getDate();b.drawMonth=b.selectedMonth=c.getMonth();b.drawYear=b.selectedYear=c.getFullYear()}this._notifyChange(b);this._adjustDate(a)},_selectMonthYear:function(a,b,c){a=d(a);var e=this._getInst(a[0]);e["selected"+(c=="M"? +"Month":"Year")]=e["draw"+(c=="M"?"Month":"Year")]=parseInt(b.options[b.selectedIndex].value,10);this._notifyChange(e);this._adjustDate(a)},_selectDay:function(a,b,c,e){var f=d(a);if(!(d(e).hasClass(this._unselectableClass)||this._isDisabledDatepicker(f[0]))){f=this._getInst(f[0]);f.selectedDay=f.currentDay=d("a",e).html();f.selectedMonth=f.currentMonth=b;f.selectedYear=f.currentYear=c;this._selectDate(a,this._formatDate(f,f.currentDay,f.currentMonth,f.currentYear))}},_clearDate:function(a){a=d(a); +this._getInst(a[0]);this._selectDate(a,"")},_selectDate:function(a,b){a=this._getInst(d(a)[0]);b=b!=null?b:this._formatDate(a);a.input&&a.input.val(b);this._updateAlternate(a);var c=this._get(a,"onSelect");if(c)c.apply(a.input?a.input[0]:null,[b,a]);else a.input&&a.input.trigger("change");if(a.inline)this._updateDatepicker(a);else{this._hideDatepicker();this._lastInput=a.input[0];typeof a.input[0]!="object"&&a.input.focus();this._lastInput=null}},_updateAlternate:function(a){var b=this._get(a,"altField"); +if(b){var c=this._get(a,"altFormat")||this._get(a,"dateFormat"),e=this._getDate(a),f=this.formatDate(c,e,this._getFormatConfig(a));d(b).each(function(){d(this).val(f)})}},noWeekends:function(a){a=a.getDay();return[a>0&&a<6,""]},iso8601Week:function(a){a=new Date(a.getTime());a.setDate(a.getDate()+4-(a.getDay()||7));var b=a.getTime();a.setMonth(0);a.setDate(1);return Math.floor(Math.round((b-a)/864E5)/7)+1},parseDate:function(a,b,c){if(a==null||b==null)throw"Invalid arguments";b=typeof b=="object"? +b.toString():b+"";if(b=="")return null;var e=(c?c.shortYearCutoff:null)||this._defaults.shortYearCutoff;e=typeof e!="string"?e:(new Date).getFullYear()%100+parseInt(e,10);for(var f=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,h=(c?c.dayNames:null)||this._defaults.dayNames,i=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort,g=(c?c.monthNames:null)||this._defaults.monthNames,j=c=-1,l=-1,u=-1,k=false,o=function(p){(p=A+1<a.length&&a.charAt(A+1)==p)&&A++;return p},m=function(p){var D= +o(p);p=new RegExp("^\\d{1,"+(p=="@"?14:p=="!"?20:p=="y"&&D?4:p=="o"?3:2)+"}");p=b.substring(q).match(p);if(!p)throw"Missing number at position "+q;q+=p[0].length;return parseInt(p[0],10)},n=function(p,D,K){p=d.map(o(p)?K:D,function(w,x){return[[x,w]]}).sort(function(w,x){return-(w[1].length-x[1].length)});var E=-1;d.each(p,function(w,x){w=x[1];if(b.substr(q,w.length).toLowerCase()==w.toLowerCase()){E=x[0];q+=w.length;return false}});if(E!=-1)return E+1;else throw"Unknown name at position "+q;},s= +function(){if(b.charAt(q)!=a.charAt(A))throw"Unexpected literal at position "+q;q++},q=0,A=0;A<a.length;A++)if(k)if(a.charAt(A)=="'"&&!o("'"))k=false;else s();else switch(a.charAt(A)){case "d":l=m("d");break;case "D":n("D",f,h);break;case "o":u=m("o");break;case "m":j=m("m");break;case "M":j=n("M",i,g);break;case "y":c=m("y");break;case "@":var v=new Date(m("@"));c=v.getFullYear();j=v.getMonth()+1;l=v.getDate();break;case "!":v=new Date((m("!")-this._ticksTo1970)/1E4);c=v.getFullYear();j=v.getMonth()+ +1;l=v.getDate();break;case "'":if(o("'"))s();else k=true;break;default:s()}if(q<b.length)throw"Extra/unparsed characters found in date: "+b.substring(q);if(c==-1)c=(new Date).getFullYear();else if(c<100)c+=(new Date).getFullYear()-(new Date).getFullYear()%100+(c<=e?0:-100);if(u>-1){j=1;l=u;do{e=this._getDaysInMonth(c,j-1);if(l<=e)break;j++;l-=e}while(1)}v=this._daylightSavingAdjust(new Date(c,j-1,l));if(v.getFullYear()!=c||v.getMonth()+1!=j||v.getDate()!=l)throw"Invalid date";return v},ATOM:"yy-mm-dd", +COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925))*24*60*60*1E7,formatDate:function(a,b,c){if(!b)return"";var e=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,f=(c?c.dayNames:null)||this._defaults.dayNames,h=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort;c=(c?c.monthNames: +null)||this._defaults.monthNames;var i=function(o){(o=k+1<a.length&&a.charAt(k+1)==o)&&k++;return o},g=function(o,m,n){m=""+m;if(i(o))for(;m.length<n;)m="0"+m;return m},j=function(o,m,n,s){return i(o)?s[m]:n[m]},l="",u=false;if(b)for(var k=0;k<a.length;k++)if(u)if(a.charAt(k)=="'"&&!i("'"))u=false;else l+=a.charAt(k);else switch(a.charAt(k)){case "d":l+=g("d",b.getDate(),2);break;case "D":l+=j("D",b.getDay(),e,f);break;case "o":l+=g("o",Math.round(((new Date(b.getFullYear(),b.getMonth(),b.getDate())).getTime()- +(new Date(b.getFullYear(),0,0)).getTime())/864E5),3);break;case "m":l+=g("m",b.getMonth()+1,2);break;case "M":l+=j("M",b.getMonth(),h,c);break;case "y":l+=i("y")?b.getFullYear():(b.getYear()%100<10?"0":"")+b.getYear()%100;break;case "@":l+=b.getTime();break;case "!":l+=b.getTime()*1E4+this._ticksTo1970;break;case "'":if(i("'"))l+="'";else u=true;break;default:l+=a.charAt(k)}return l},_possibleChars:function(a){for(var b="",c=false,e=function(h){(h=f+1<a.length&&a.charAt(f+1)==h)&&f++;return h},f= +0;f<a.length;f++)if(c)if(a.charAt(f)=="'"&&!e("'"))c=false;else b+=a.charAt(f);else switch(a.charAt(f)){case "d":case "m":case "y":case "@":b+="0123456789";break;case "D":case "M":return null;case "'":if(e("'"))b+="'";else c=true;break;default:b+=a.charAt(f)}return b},_get:function(a,b){return a.settings[b]!==C?a.settings[b]:this._defaults[b]},_setDateFromField:function(a,b){if(a.input.val()!=a.lastVal){var c=this._get(a,"dateFormat"),e=a.lastVal=a.input?a.input.val():null,f,h;f=h=this._getDefaultDate(a); +var i=this._getFormatConfig(a);try{f=this.parseDate(c,e,i)||h}catch(g){this.log(g);e=b?"":e}a.selectedDay=f.getDate();a.drawMonth=a.selectedMonth=f.getMonth();a.drawYear=a.selectedYear=f.getFullYear();a.currentDay=e?f.getDate():0;a.currentMonth=e?f.getMonth():0;a.currentYear=e?f.getFullYear():0;this._adjustInstDate(a)}},_getDefaultDate:function(a){return this._restrictMinMax(a,this._determineDate(a,this._get(a,"defaultDate"),new Date))},_determineDate:function(a,b,c){var e=function(h){var i=new Date; +i.setDate(i.getDate()+h);return i},f=function(h){try{return d.datepicker.parseDate(d.datepicker._get(a,"dateFormat"),h,d.datepicker._getFormatConfig(a))}catch(i){}var g=(h.toLowerCase().match(/^c/)?d.datepicker._getDate(a):null)||new Date,j=g.getFullYear(),l=g.getMonth();g=g.getDate();for(var u=/([+-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,k=u.exec(h);k;){switch(k[2]||"d"){case "d":case "D":g+=parseInt(k[1],10);break;case "w":case "W":g+=parseInt(k[1],10)*7;break;case "m":case "M":l+=parseInt(k[1],10);g= +Math.min(g,d.datepicker._getDaysInMonth(j,l));break;case "y":case "Y":j+=parseInt(k[1],10);g=Math.min(g,d.datepicker._getDaysInMonth(j,l));break}k=u.exec(h)}return new Date(j,l,g)};if(b=(b=b==null||b===""?c:typeof b=="string"?f(b):typeof b=="number"?isNaN(b)?c:e(b):new Date(b.getTime()))&&b.toString()=="Invalid Date"?c:b){b.setHours(0);b.setMinutes(0);b.setSeconds(0);b.setMilliseconds(0)}return this._daylightSavingAdjust(b)},_daylightSavingAdjust:function(a){if(!a)return null;a.setHours(a.getHours()> +12?a.getHours()+2:0);return a},_setDate:function(a,b,c){var e=!b,f=a.selectedMonth,h=a.selectedYear;b=this._restrictMinMax(a,this._determineDate(a,b,new Date));a.selectedDay=a.currentDay=b.getDate();a.drawMonth=a.selectedMonth=a.currentMonth=b.getMonth();a.drawYear=a.selectedYear=a.currentYear=b.getFullYear();if((f!=a.selectedMonth||h!=a.selectedYear)&&!c)this._notifyChange(a);this._adjustInstDate(a);if(a.input)a.input.val(e?"":this._formatDate(a))},_getDate:function(a){return!a.currentYear||a.input&& +a.input.val()==""?null:this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay))},_generateHTML:function(a){var b=new Date;b=this._daylightSavingAdjust(new Date(b.getFullYear(),b.getMonth(),b.getDate()));var c=this._get(a,"isRTL"),e=this._get(a,"showButtonPanel"),f=this._get(a,"hideIfNoPrevNext"),h=this._get(a,"navigationAsDateFormat"),i=this._getNumberOfMonths(a),g=this._get(a,"showCurrentAtPos"),j=this._get(a,"stepMonths"),l=i[0]!=1||i[1]!=1,u=this._daylightSavingAdjust(!a.currentDay? +new Date(9999,9,9):new Date(a.currentYear,a.currentMonth,a.currentDay)),k=this._getMinMaxDate(a,"min"),o=this._getMinMaxDate(a,"max");g=a.drawMonth-g;var m=a.drawYear;if(g<0){g+=12;m--}if(o){var n=this._daylightSavingAdjust(new Date(o.getFullYear(),o.getMonth()-i[0]*i[1]+1,o.getDate()));for(n=k&&n<k?k:n;this._daylightSavingAdjust(new Date(m,g,1))>n;){g--;if(g<0){g=11;m--}}}a.drawMonth=g;a.drawYear=m;n=this._get(a,"prevText");n=!h?n:this.formatDate(n,this._daylightSavingAdjust(new Date(m,g-j,1)),this._getFormatConfig(a)); +n=this._canAdjustMonth(a,-1,m,g)?'<a class="ui-datepicker-prev ui-corner-all" onclick="DP_jQuery_'+B+".datepicker._adjustDate('#"+a.id+"', -"+j+", 'M');\" title=\""+n+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"e":"w")+'">'+n+"</span></a>":f?"":'<a class="ui-datepicker-prev ui-corner-all ui-state-disabled" title="'+n+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"e":"w")+'">'+n+"</span></a>";var s=this._get(a,"nextText");s=!h?s:this.formatDate(s,this._daylightSavingAdjust(new Date(m, +g+j,1)),this._getFormatConfig(a));f=this._canAdjustMonth(a,+1,m,g)?'<a class="ui-datepicker-next ui-corner-all" onclick="DP_jQuery_'+B+".datepicker._adjustDate('#"+a.id+"', +"+j+", 'M');\" title=\""+s+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"w":"e")+'">'+s+"</span></a>":f?"":'<a class="ui-datepicker-next ui-corner-all ui-state-disabled" title="'+s+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"w":"e")+'">'+s+"</span></a>";j=this._get(a,"currentText");s=this._get(a,"gotoCurrent")&& +a.currentDay?u:b;j=!h?j:this.formatDate(j,s,this._getFormatConfig(a));h=!a.inline?'<button type="button" class="ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all" onclick="DP_jQuery_'+B+'.datepicker._hideDatepicker();">'+this._get(a,"closeText")+"</button>":"";e=e?'<div class="ui-datepicker-buttonpane ui-widget-content">'+(c?h:"")+(this._isInRange(a,s)?'<button type="button" class="ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all" onclick="DP_jQuery_'+ +B+".datepicker._gotoToday('#"+a.id+"');\">"+j+"</button>":"")+(c?"":h)+"</div>":"";h=parseInt(this._get(a,"firstDay"),10);h=isNaN(h)?0:h;j=this._get(a,"showWeek");s=this._get(a,"dayNames");this._get(a,"dayNamesShort");var q=this._get(a,"dayNamesMin"),A=this._get(a,"monthNames"),v=this._get(a,"monthNamesShort"),p=this._get(a,"beforeShowDay"),D=this._get(a,"showOtherMonths"),K=this._get(a,"selectOtherMonths");this._get(a,"calculateWeek");for(var E=this._getDefaultDate(a),w="",x=0;x<i[0];x++){var O= +"";this.maxRows=4;for(var G=0;G<i[1];G++){var P=this._daylightSavingAdjust(new Date(m,g,a.selectedDay)),t=" ui-corner-all",y="";if(l){y+='<div class="ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" ui-datepicker-group-first";t=" ui-corner-"+(c?"right":"left");break;case i[1]-1:y+=" ui-datepicker-group-last";t=" ui-corner-"+(c?"left":"right");break;default:y+=" ui-datepicker-group-middle";t="";break}y+='">'}y+='<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix'+t+'">'+(/all|left/.test(t)&& +x==0?c?f:n:"")+(/all|right/.test(t)&&x==0?c?n:f:"")+this._generateMonthYearHeader(a,g,m,k,o,x>0||G>0,A,v)+'</div><table class="ui-datepicker-calendar"><thead><tr>';var z=j?'<th class="ui-datepicker-week-col">'+this._get(a,"weekHeader")+"</th>":"";for(t=0;t<7;t++){var r=(t+h)%7;z+="<th"+((t+h+6)%7>=5?' class="ui-datepicker-week-end"':"")+'><span title="'+s[r]+'">'+q[r]+"</span></th>"}y+=z+"</tr></thead><tbody>";z=this._getDaysInMonth(m,g);if(m==a.selectedYear&&g==a.selectedMonth)a.selectedDay=Math.min(a.selectedDay, +z);t=(this._getFirstDayOfMonth(m,g)-h+7)%7;z=Math.ceil((t+z)/7);this.maxRows=z=l?this.maxRows>z?this.maxRows:z:z;r=this._daylightSavingAdjust(new Date(m,g,1-t));for(var Q=0;Q<z;Q++){y+="<tr>";var R=!j?"":'<td class="ui-datepicker-week-col">'+this._get(a,"calculateWeek")(r)+"</td>";for(t=0;t<7;t++){var I=p?p.apply(a.input?a.input[0]:null,[r]):[true,""],F=r.getMonth()!=g,L=F&&!K||!I[0]||k&&r<k||o&&r>o;R+='<td class="'+((t+h+6)%7>=5?" ui-datepicker-week-end":"")+(F?" ui-datepicker-other-month":"")+(r.getTime()== +P.getTime()&&g==a.selectedMonth&&a._keyEvent||E.getTime()==r.getTime()&&E.getTime()==P.getTime()?" "+this._dayOverClass:"")+(L?" "+this._unselectableClass+" ui-state-disabled":"")+(F&&!D?"":" "+I[1]+(r.getTime()==u.getTime()?" "+this._currentClass:"")+(r.getTime()==b.getTime()?" ui-datepicker-today":""))+'"'+((!F||D)&&I[2]?' title="'+I[2]+'"':"")+(L?"":' onclick="DP_jQuery_'+B+".datepicker._selectDay('#"+a.id+"',"+r.getMonth()+","+r.getFullYear()+', this);return false;"')+">"+(F&&!D?" ":L?'<span class="ui-state-default">'+ +r.getDate()+"</span>":'<a class="ui-state-default'+(r.getTime()==b.getTime()?" ui-state-highlight":"")+(r.getTime()==u.getTime()?" ui-state-active":"")+(F?" ui-priority-secondary":"")+'" href="#">'+r.getDate()+"</a>")+"</td>";r.setDate(r.getDate()+1);r=this._daylightSavingAdjust(r)}y+=R+"</tr>"}g++;if(g>11){g=0;m++}y+="</tbody></table>"+(l?"</div>"+(i[0]>0&&G==i[1]-1?'<div class="ui-datepicker-row-break"></div>':""):"");O+=y}w+=O}w+=e+(d.browser.msie&&parseInt(d.browser.version,10)<7&&!a.inline?'<iframe src="javascript:false;" class="ui-datepicker-cover" frameborder="0"></iframe>': +"");a._keyEvent=false;return w},_generateMonthYearHeader:function(a,b,c,e,f,h,i,g){var j=this._get(a,"changeMonth"),l=this._get(a,"changeYear"),u=this._get(a,"showMonthAfterYear"),k='<div class="ui-datepicker-title">',o="";if(h||!j)o+='<span class="ui-datepicker-month">'+i[b]+"</span>";else{i=e&&e.getFullYear()==c;var m=f&&f.getFullYear()==c;o+='<select class="ui-datepicker-month" onchange="DP_jQuery_'+B+".datepicker._selectMonthYear('#"+a.id+"', this, 'M');\" >";for(var n=0;n<12;n++)if((!i||n>=e.getMonth())&& +(!m||n<=f.getMonth()))o+='<option value="'+n+'"'+(n==b?' selected="selected"':"")+">"+g[n]+"</option>";o+="</select>"}u||(k+=o+(h||!(j&&l)?" ":""));if(!a.yearshtml){a.yearshtml="";if(h||!l)k+='<span class="ui-datepicker-year">'+c+"</span>";else{g=this._get(a,"yearRange").split(":");var s=(new Date).getFullYear();i=function(q){q=q.match(/c[+-].*/)?c+parseInt(q.substring(1),10):q.match(/[+-].*/)?s+parseInt(q,10):parseInt(q,10);return isNaN(q)?s:q};b=i(g[0]);g=Math.max(b,i(g[1]||""));b=e?Math.max(b, +e.getFullYear()):b;g=f?Math.min(g,f.getFullYear()):g;for(a.yearshtml+='<select class="ui-datepicker-year" onchange="DP_jQuery_'+B+".datepicker._selectMonthYear('#"+a.id+"', this, 'Y');\" >";b<=g;b++)a.yearshtml+='<option value="'+b+'"'+(b==c?' selected="selected"':"")+">"+b+"</option>";a.yearshtml+="</select>";k+=a.yearshtml;a.yearshtml=null}}k+=this._get(a,"yearSuffix");if(u)k+=(h||!(j&&l)?" ":"")+o;k+="</div>";return k},_adjustInstDate:function(a,b,c){var e=a.drawYear+(c=="Y"?b:0),f=a.drawMonth+ +(c=="M"?b:0);b=Math.min(a.selectedDay,this._getDaysInMonth(e,f))+(c=="D"?b:0);e=this._restrictMinMax(a,this._daylightSavingAdjust(new Date(e,f,b)));a.selectedDay=e.getDate();a.drawMonth=a.selectedMonth=e.getMonth();a.drawYear=a.selectedYear=e.getFullYear();if(c=="M"||c=="Y")this._notifyChange(a)},_restrictMinMax:function(a,b){var c=this._getMinMaxDate(a,"min");a=this._getMinMaxDate(a,"max");b=c&&b<c?c:b;return b=a&&b>a?a:b},_notifyChange:function(a){var b=this._get(a,"onChangeMonthYear");if(b)b.apply(a.input? +a.input[0]:null,[a.selectedYear,a.selectedMonth+1,a])},_getNumberOfMonths:function(a){a=this._get(a,"numberOfMonths");return a==null?[1,1]:typeof a=="number"?[1,a]:a},_getMinMaxDate:function(a,b){return this._determineDate(a,this._get(a,b+"Date"),null)},_getDaysInMonth:function(a,b){return 32-this._daylightSavingAdjust(new Date(a,b,32)).getDate()},_getFirstDayOfMonth:function(a,b){return(new Date(a,b,1)).getDay()},_canAdjustMonth:function(a,b,c,e){var f=this._getNumberOfMonths(a);c=this._daylightSavingAdjust(new Date(c, +e+(b<0?b:f[0]*f[1]),1));b<0&&c.setDate(this._getDaysInMonth(c.getFullYear(),c.getMonth()));return this._isInRange(a,c)},_isInRange:function(a,b){var c=this._getMinMaxDate(a,"min");a=this._getMinMaxDate(a,"max");return(!c||b.getTime()>=c.getTime())&&(!a||b.getTime()<=a.getTime())},_getFormatConfig:function(a){var b=this._get(a,"shortYearCutoff");b=typeof b!="string"?b:(new Date).getFullYear()%100+parseInt(b,10);return{shortYearCutoff:b,dayNamesShort:this._get(a,"dayNamesShort"),dayNames:this._get(a, +"dayNames"),monthNamesShort:this._get(a,"monthNamesShort"),monthNames:this._get(a,"monthNames")}},_formatDate:function(a,b,c,e){if(!b){a.currentDay=a.selectedDay;a.currentMonth=a.selectedMonth;a.currentYear=a.selectedYear}b=b?typeof b=="object"?b:this._daylightSavingAdjust(new Date(e,c,b)):this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay));return this.formatDate(this._get(a,"dateFormat"),b,this._getFormatConfig(a))}});d.fn.datepicker=function(a){if(!this.length)return this; +if(!d.datepicker.initialized){d(document).mousedown(d.datepicker._checkExternalClick).find("body").append(d.datepicker.dpDiv);d.datepicker.initialized=true}var b=Array.prototype.slice.call(arguments,1);if(typeof a=="string"&&(a=="isDisabled"||a=="getDate"||a=="widget"))return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this[0]].concat(b));if(a=="option"&&arguments.length==2&&typeof arguments[1]=="string")return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this[0]].concat(b));return this.each(function(){typeof a== +"string"?d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this].concat(b)):d.datepicker._attachDatepicker(this,a)})};d.datepicker=new M;d.datepicker.initialized=false;d.datepicker.uuid=(new Date).getTime();d.datepicker.version="1.8.16";window["DP_jQuery_"+B]=d})(jQuery); ;
\ No newline at end of file diff --git a/public/javascripts/jquery.cookie.js b/public/javascripts/jquery.cookie.js index 6df1faca2..6a3e394b4 100644 --- a/public/javascripts/jquery.cookie.js +++ b/public/javascripts/jquery.cookie.js @@ -1,96 +1,41 @@ /** - * Cookie plugin + * jQuery Cookie plugin * - * Copyright (c) 2006 Klaus Hartl (stilbuero.de) + * Copyright (c) 2010 Klaus Hartl (stilbuero.de) * Dual licensed under the MIT and GPL licenses: * http://www.opensource.org/licenses/mit-license.php * http://www.gnu.org/licenses/gpl.html * */ +jQuery.cookie = function (key, value, options) { -/** - * Create a cookie with the given name and value and other optional parameters. - * - * @example $.cookie('the_cookie', 'the_value'); - * @desc Set the value of a cookie. - * @example $.cookie('the_cookie', 'the_value', { expires: 7, path: '/', domain: 'jquery.com', secure: true }); - * @desc Create a cookie with all available options. - * @example $.cookie('the_cookie', 'the_value'); - * @desc Create a session cookie. - * @example $.cookie('the_cookie', null); - * @desc Delete a cookie by passing null as value. Keep in mind that you have to use the same path and domain - * used when the cookie was set. - * - * @param String name The name of the cookie. - * @param String value The value of the cookie. - * @param Object options An object literal containing key/value pairs to provide optional cookie attributes. - * @option Number|Date expires Either an integer specifying the expiration date from now on in days or a Date object. - * If a negative value is specified (e.g. a date in the past), the cookie will be deleted. - * If set to null or omitted, the cookie will be a session cookie and will not be retained - * when the the browser exits. - * @option String path The value of the path atribute of the cookie (default: path of page that created the cookie). - * @option String domain The value of the domain attribute of the cookie (default: domain of page that created the cookie). - * @option Boolean secure If true, the secure attribute of the cookie will be set and the cookie transmission will - * require a secure protocol (like HTTPS). - * @type undefined - * - * @name $.cookie - * @cat Plugins/Cookie - * @author Klaus Hartl/klaus.hartl@stilbuero.de - */ + // key and at least value given, set cookie... + if (arguments.length > 1 && String(value) !== "[object Object]") { + options = jQuery.extend({}, options); -/** - * Get the value of a cookie with the given name. - * - * @example $.cookie('the_cookie'); - * @desc Get the value of a cookie. - * - * @param String name The name of the cookie. - * @return The value of the cookie. - * @type String - * - * @name $.cookie - * @cat Plugins/Cookie - * @author Klaus Hartl/klaus.hartl@stilbuero.de - */ -jQuery.cookie = function(name, value, options) { - if (typeof value != 'undefined') { // name and value given, set cookie - options = options || {}; - if (value === null) { - value = ''; + if (value === null || value === undefined) { options.expires = -1; } - var expires = ''; - if (options.expires && (typeof options.expires == 'number' || options.expires.toUTCString)) { - var date; - if (typeof options.expires == 'number') { - date = new Date(); - date.setTime(date.getTime() + (options.expires * 24 * 60 * 60 * 1000)); - } else { - date = options.expires; - } - expires = '; expires=' + date.toUTCString(); // use expires attribute, max-age is not supported by IE - } - // CAUTION: Needed to parenthesize options.path and options.domain - // in the following expressions, otherwise they evaluate to undefined - // in the packed version for some reason... - var path = options.path ? '; path=' + (options.path) : ''; - var domain = options.domain ? '; domain=' + (options.domain) : ''; - var secure = options.secure ? '; secure' : ''; - document.cookie = [name, '=', encodeURIComponent(value), expires, path, domain, secure].join(''); - } else { // only name given, get cookie - var cookieValue = null; - if (document.cookie && document.cookie != '') { - var cookies = document.cookie.split(';'); - for (var i = 0; i < cookies.length; i++) { - var cookie = jQuery.trim(cookies[i]); - // Does this cookie string begin with the name we want? - if (cookie.substring(0, name.length + 1) == (name + '=')) { - cookieValue = decodeURIComponent(cookie.substring(name.length + 1)); - break; - } - } + + if (typeof options.expires === 'number') { + var days = options.expires, t = options.expires = new Date(); + t.setDate(t.getDate() + days); } - return cookieValue; + + value = String(value); + + return (document.cookie = [ + encodeURIComponent(key), '=', + options.raw ? value : encodeURIComponent(value), + options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE + options.path ? '; path=' + options.path : '', + options.domain ? '; domain=' + options.domain : '', + options.secure ? '; secure' : '' + ].join('')); } -};
\ No newline at end of file + + // key and possibly options given, get cookie... + options = value || {}; + var result, decode = options.raw ? function (s) { return s; } : decodeURIComponent; + return (result = new RegExp('(?:^|; )' + encodeURIComponent(key) + '=([^;]*)').exec(document.cookie)) ? decode(result[1]) : null; +}; diff --git a/public/javascripts/jquery.fancybox-1.3.4.pack.js b/public/javascripts/jquery.fancybox-1.3.4.pack.js new file mode 100755 index 000000000..1373ed083 --- /dev/null +++ b/public/javascripts/jquery.fancybox-1.3.4.pack.js @@ -0,0 +1,46 @@ +/* + * FancyBox - jQuery Plugin + * Simple and fancy lightbox alternative + * + * Examples and documentation at: http://fancybox.net + * + * Copyright (c) 2008 - 2010 Janis Skarnelis + * That said, it is hardly a one-person project. Many people have submitted bugs, code, and offered their advice freely. Their support is greatly appreciated. + * + * Version: 1.3.4 (11/11/2010) + * Requires: jQuery v1.3+ + * + * Dual licensed under the MIT and GPL licenses: + * http://www.opensource.org/licenses/mit-license.php + * http://www.gnu.org/licenses/gpl.html + */ + +;(function(b){var m,t,u,f,D,j,E,n,z,A,q=0,e={},o=[],p=0,d={},l=[],G=null,v=new Image,J=/\.(jpg|gif|png|bmp|jpeg)(.*)?$/i,W=/[^\.]\.(swf)\s*$/i,K,L=1,y=0,s="",r,i,h=false,B=b.extend(b("<div/>")[0],{prop:0}),M=b.browser.msie&&b.browser.version<7&&!window.XMLHttpRequest,N=function(){t.hide();v.onerror=v.onload=null;G&&G.abort();m.empty()},O=function(){if(false===e.onError(o,q,e)){t.hide();h=false}else{e.titleShow=false;e.width="auto";e.height="auto";m.html('<p id="fancybox-error">The requested content cannot be loaded.<br />Please try again later.</p>'); +F()}},I=function(){var a=o[q],c,g,k,C,P,w;N();e=b.extend({},b.fn.fancybox.defaults,typeof b(a).data("fancybox")=="undefined"?e:b(a).data("fancybox"));w=e.onStart(o,q,e);if(w===false)h=false;else{if(typeof w=="object")e=b.extend(e,w);k=e.title||(a.nodeName?b(a).attr("title"):a.title)||"";if(a.nodeName&&!e.orig)e.orig=b(a).children("img:first").length?b(a).children("img:first"):b(a);if(k===""&&e.orig&&e.titleFromAlt)k=e.orig.attr("alt");c=e.href||(a.nodeName?b(a).attr("href"):a.href)||null;if(/^(?:javascript)/i.test(c)|| +c=="#")c=null;if(e.type){g=e.type;if(!c)c=e.content}else if(e.content)g="html";else if(c)g=c.match(J)?"image":c.match(W)?"swf":b(a).hasClass("iframe")?"iframe":c.indexOf("#")===0?"inline":"ajax";if(g){if(g=="inline"){a=c.substr(c.indexOf("#"));g=b(a).length>0?"inline":"ajax"}e.type=g;e.href=c;e.title=k;if(e.autoDimensions)if(e.type=="html"||e.type=="inline"||e.type=="ajax"){e.width="auto";e.height="auto"}else e.autoDimensions=false;if(e.modal){e.overlayShow=true;e.hideOnOverlayClick=false;e.hideOnContentClick= +false;e.enableEscapeButton=false;e.showCloseButton=false}e.padding=parseInt(e.padding,10);e.margin=parseInt(e.margin,10);m.css("padding",e.padding+e.margin);b(".fancybox-inline-tmp").unbind("fancybox-cancel").bind("fancybox-change",function(){b(this).replaceWith(j.children())});switch(g){case "html":m.html(e.content);F();break;case "inline":if(b(a).parent().is("#fancybox-content")===true){h=false;break}b('<div class="fancybox-inline-tmp" />').hide().insertBefore(b(a)).bind("fancybox-cleanup",function(){b(this).replaceWith(j.children())}).bind("fancybox-cancel", +function(){b(this).replaceWith(m.children())});b(a).appendTo(m);F();break;case "image":h=false;b.fancybox.showActivity();v=new Image;v.onerror=function(){O()};v.onload=function(){h=true;v.onerror=v.onload=null;e.width=v.width;e.height=v.height;b("<img />").attr({id:"fancybox-img",src:v.src,alt:e.title}).appendTo(m);Q()};v.src=c;break;case "swf":e.scrolling="no";C='<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="'+e.width+'" height="'+e.height+'"><param name="movie" value="'+c+ +'"></param>';P="";b.each(e.swf,function(x,H){C+='<param name="'+x+'" value="'+H+'"></param>';P+=" "+x+'="'+H+'"'});C+='<embed src="'+c+'" type="application/x-shockwave-flash" width="'+e.width+'" height="'+e.height+'"'+P+"></embed></object>";m.html(C);F();break;case "ajax":h=false;b.fancybox.showActivity();e.ajax.win=e.ajax.success;G=b.ajax(b.extend({},e.ajax,{url:c,data:e.ajax.data||{},error:function(x){x.status>0&&O()},success:function(x,H,R){if((typeof R=="object"?R:G).status==200){if(typeof e.ajax.win== +"function"){w=e.ajax.win(c,x,H,R);if(w===false){t.hide();return}else if(typeof w=="string"||typeof w=="object")x=w}m.html(x);F()}}}));break;case "iframe":Q()}}else O()}},F=function(){var a=e.width,c=e.height;a=a.toString().indexOf("%")>-1?parseInt((b(window).width()-e.margin*2)*parseFloat(a)/100,10)+"px":a=="auto"?"auto":a+"px";c=c.toString().indexOf("%")>-1?parseInt((b(window).height()-e.margin*2)*parseFloat(c)/100,10)+"px":c=="auto"?"auto":c+"px";m.wrapInner('<div style="width:'+a+";height:"+c+ +";overflow: "+(e.scrolling=="auto"?"auto":e.scrolling=="yes"?"scroll":"hidden")+';position:relative;"></div>');e.width=m.width();e.height=m.height();Q()},Q=function(){var a,c;t.hide();if(f.is(":visible")&&false===d.onCleanup(l,p,d)){b.event.trigger("fancybox-cancel");h=false}else{h=true;b(j.add(u)).unbind();b(window).unbind("resize.fb scroll.fb");b(document).unbind("keydown.fb");f.is(":visible")&&d.titlePosition!=="outside"&&f.css("height",f.height());l=o;p=q;d=e;if(d.overlayShow){u.css({"background-color":d.overlayColor, +opacity:d.overlayOpacity,cursor:d.hideOnOverlayClick?"pointer":"auto",height:b(document).height()});if(!u.is(":visible")){M&&b("select:not(#fancybox-tmp select)").filter(function(){return this.style.visibility!=="hidden"}).css({visibility:"hidden"}).one("fancybox-cleanup",function(){this.style.visibility="inherit"});u.show()}}else u.hide();i=X();s=d.title||"";y=0;n.empty().removeAttr("style").removeClass();if(d.titleShow!==false){if(b.isFunction(d.titleFormat))a=d.titleFormat(s,l,p,d);else a=s&&s.length? +d.titlePosition=="float"?'<table id="fancybox-title-float-wrap" cellpadding="0" cellspacing="0"><tr><td id="fancybox-title-float-left"></td><td id="fancybox-title-float-main">'+s+'</td><td id="fancybox-title-float-right"></td></tr></table>':'<div id="fancybox-title-'+d.titlePosition+'">'+s+"</div>":false;s=a;if(!(!s||s==="")){n.addClass("fancybox-title-"+d.titlePosition).html(s).appendTo("body").show();switch(d.titlePosition){case "inside":n.css({width:i.width-d.padding*2,marginLeft:d.padding,marginRight:d.padding}); +y=n.outerHeight(true);n.appendTo(D);i.height+=y;break;case "over":n.css({marginLeft:d.padding,width:i.width-d.padding*2,bottom:d.padding}).appendTo(D);break;case "float":n.css("left",parseInt((n.width()-i.width-40)/2,10)*-1).appendTo(f);break;default:n.css({width:i.width-d.padding*2,paddingLeft:d.padding,paddingRight:d.padding}).appendTo(f)}}}n.hide();if(f.is(":visible")){b(E.add(z).add(A)).hide();a=f.position();r={top:a.top,left:a.left,width:f.width(),height:f.height()};c=r.width==i.width&&r.height== +i.height;j.fadeTo(d.changeFade,0.3,function(){var g=function(){j.html(m.contents()).fadeTo(d.changeFade,1,S)};b.event.trigger("fancybox-change");j.empty().removeAttr("filter").css({"border-width":d.padding,width:i.width-d.padding*2,height:e.autoDimensions?"auto":i.height-y-d.padding*2});if(c)g();else{B.prop=0;b(B).animate({prop:1},{duration:d.changeSpeed,easing:d.easingChange,step:T,complete:g})}})}else{f.removeAttr("style");j.css("border-width",d.padding);if(d.transitionIn=="elastic"){r=V();j.html(m.contents()); +f.show();if(d.opacity)i.opacity=0;B.prop=0;b(B).animate({prop:1},{duration:d.speedIn,easing:d.easingIn,step:T,complete:S})}else{d.titlePosition=="inside"&&y>0&&n.show();j.css({width:i.width-d.padding*2,height:e.autoDimensions?"auto":i.height-y-d.padding*2}).html(m.contents());f.css(i).fadeIn(d.transitionIn=="none"?0:d.speedIn,S)}}}},Y=function(){if(d.enableEscapeButton||d.enableKeyboardNav)b(document).bind("keydown.fb",function(a){if(a.keyCode==27&&d.enableEscapeButton){a.preventDefault();b.fancybox.close()}else if((a.keyCode== +37||a.keyCode==39)&&d.enableKeyboardNav&&a.target.tagName!=="INPUT"&&a.target.tagName!=="TEXTAREA"&&a.target.tagName!=="SELECT"){a.preventDefault();b.fancybox[a.keyCode==37?"prev":"next"]()}});if(d.showNavArrows){if(d.cyclic&&l.length>1||p!==0)z.show();if(d.cyclic&&l.length>1||p!=l.length-1)A.show()}else{z.hide();A.hide()}},S=function(){if(!b.support.opacity){j.get(0).style.removeAttribute("filter");f.get(0).style.removeAttribute("filter")}e.autoDimensions&&j.css("height","auto");f.css("height","auto"); +s&&s.length&&n.show();d.showCloseButton&&E.show();Y();d.hideOnContentClick&&j.bind("click",b.fancybox.close);d.hideOnOverlayClick&&u.bind("click",b.fancybox.close);b(window).bind("resize.fb",b.fancybox.resize);d.centerOnScroll&&b(window).bind("scroll.fb",b.fancybox.center);if(d.type=="iframe")b('<iframe id="fancybox-frame" name="fancybox-frame'+(new Date).getTime()+'" frameborder="0" hspace="0" '+(b.browser.msie?'allowtransparency="true""':"")+' scrolling="'+e.scrolling+'" src="'+d.href+'"></iframe>').appendTo(j); +f.show();h=false;b.fancybox.center();d.onComplete(l,p,d);var a,c;if(l.length-1>p){a=l[p+1].href;if(typeof a!=="undefined"&&a.match(J)){c=new Image;c.src=a}}if(p>0){a=l[p-1].href;if(typeof a!=="undefined"&&a.match(J)){c=new Image;c.src=a}}},T=function(a){var c={width:parseInt(r.width+(i.width-r.width)*a,10),height:parseInt(r.height+(i.height-r.height)*a,10),top:parseInt(r.top+(i.top-r.top)*a,10),left:parseInt(r.left+(i.left-r.left)*a,10)};if(typeof i.opacity!=="undefined")c.opacity=a<0.5?0.5:a;f.css(c); +j.css({width:c.width-d.padding*2,height:c.height-y*a-d.padding*2})},U=function(){return[b(window).width()-d.margin*2,b(window).height()-d.margin*2,b(document).scrollLeft()+d.margin,b(document).scrollTop()+d.margin]},X=function(){var a=U(),c={},g=d.autoScale,k=d.padding*2;c.width=d.width.toString().indexOf("%")>-1?parseInt(a[0]*parseFloat(d.width)/100,10):d.width+k;c.height=d.height.toString().indexOf("%")>-1?parseInt(a[1]*parseFloat(d.height)/100,10):d.height+k;if(g&&(c.width>a[0]||c.height>a[1]))if(e.type== +"image"||e.type=="swf"){g=d.width/d.height;if(c.width>a[0]){c.width=a[0];c.height=parseInt((c.width-k)/g+k,10)}if(c.height>a[1]){c.height=a[1];c.width=parseInt((c.height-k)*g+k,10)}}else{c.width=Math.min(c.width,a[0]);c.height=Math.min(c.height,a[1])}c.top=parseInt(Math.max(a[3]-20,a[3]+(a[1]-c.height-40)*0.5),10);c.left=parseInt(Math.max(a[2]-20,a[2]+(a[0]-c.width-40)*0.5),10);return c},V=function(){var a=e.orig?b(e.orig):false,c={};if(a&&a.length){c=a.offset();c.top+=parseInt(a.css("paddingTop"), +10)||0;c.left+=parseInt(a.css("paddingLeft"),10)||0;c.top+=parseInt(a.css("border-top-width"),10)||0;c.left+=parseInt(a.css("border-left-width"),10)||0;c.width=a.width();c.height=a.height();c={width:c.width+d.padding*2,height:c.height+d.padding*2,top:c.top-d.padding-20,left:c.left-d.padding-20}}else{a=U();c={width:d.padding*2,height:d.padding*2,top:parseInt(a[3]+a[1]*0.5,10),left:parseInt(a[2]+a[0]*0.5,10)}}return c},Z=function(){if(t.is(":visible")){b("div",t).css("top",L*-40+"px");L=(L+1)%12}else clearInterval(K)}; +b.fn.fancybox=function(a){if(!b(this).length)return this;b(this).data("fancybox",b.extend({},a,b.metadata?b(this).metadata():{})).unbind("click.fb").bind("click.fb",function(c){c.preventDefault();if(!h){h=true;b(this).blur();o=[];q=0;c=b(this).attr("rel")||"";if(!c||c==""||c==="nofollow")o.push(this);else{o=b("a[rel="+c+"], area[rel="+c+"]");q=o.index(this)}I()}});return this};b.fancybox=function(a,c){var g;if(!h){h=true;g=typeof c!=="undefined"?c:{};o=[];q=parseInt(g.index,10)||0;if(b.isArray(a)){for(var k= +0,C=a.length;k<C;k++)if(typeof a[k]=="object")b(a[k]).data("fancybox",b.extend({},g,a[k]));else a[k]=b({}).data("fancybox",b.extend({content:a[k]},g));o=jQuery.merge(o,a)}else{if(typeof a=="object")b(a).data("fancybox",b.extend({},g,a));else a=b({}).data("fancybox",b.extend({content:a},g));o.push(a)}if(q>o.length||q<0)q=0;I()}};b.fancybox.showActivity=function(){clearInterval(K);t.show();K=setInterval(Z,66)};b.fancybox.hideActivity=function(){t.hide()};b.fancybox.next=function(){return b.fancybox.pos(p+ +1)};b.fancybox.prev=function(){return b.fancybox.pos(p-1)};b.fancybox.pos=function(a){if(!h){a=parseInt(a);o=l;if(a>-1&&a<l.length){q=a;I()}else if(d.cyclic&&l.length>1){q=a>=l.length?0:l.length-1;I()}}};b.fancybox.cancel=function(){if(!h){h=true;b.event.trigger("fancybox-cancel");N();e.onCancel(o,q,e);h=false}};b.fancybox.close=function(){function a(){u.fadeOut("fast");n.empty().hide();f.hide();b.event.trigger("fancybox-cleanup");j.empty();d.onClosed(l,p,d);l=e=[];p=q=0;d=e={};h=false}if(!(h||f.is(":hidden"))){h= +true;if(d&&false===d.onCleanup(l,p,d))h=false;else{N();b(E.add(z).add(A)).hide();b(j.add(u)).unbind();b(window).unbind("resize.fb scroll.fb");b(document).unbind("keydown.fb");j.find("iframe").attr("src",M&&/^https/i.test(window.location.href||"")?"javascript:void(false)":"about:blank");d.titlePosition!=="inside"&&n.empty();f.stop();if(d.transitionOut=="elastic"){r=V();var c=f.position();i={top:c.top,left:c.left,width:f.width(),height:f.height()};if(d.opacity)i.opacity=1;n.empty().hide();B.prop=1; +b(B).animate({prop:0},{duration:d.speedOut,easing:d.easingOut,step:T,complete:a})}else f.fadeOut(d.transitionOut=="none"?0:d.speedOut,a)}}};b.fancybox.resize=function(){u.is(":visible")&&u.css("height",b(document).height());b.fancybox.center(true)};b.fancybox.center=function(a){var c,g;if(!h){g=a===true?1:0;c=U();!g&&(f.width()>c[0]||f.height()>c[1])||f.stop().animate({top:parseInt(Math.max(c[3]-20,c[3]+(c[1]-j.height()-40)*0.5-d.padding)),left:parseInt(Math.max(c[2]-20,c[2]+(c[0]-j.width()-40)*0.5- +d.padding))},typeof a=="number"?a:200)}};b.fancybox.init=function(){if(!b("#fancybox-wrap").length){b("body").append(m=b('<div id="fancybox-tmp"></div>'),t=b('<div id="fancybox-loading"><div></div></div>'),u=b('<div id="fancybox-overlay"></div>'),f=b('<div id="fancybox-wrap"></div>'));D=b('<div id="fancybox-outer"></div>').append('<div class="fancybox-bg" id="fancybox-bg-n"></div><div class="fancybox-bg" id="fancybox-bg-ne"></div><div class="fancybox-bg" id="fancybox-bg-e"></div><div class="fancybox-bg" id="fancybox-bg-se"></div><div class="fancybox-bg" id="fancybox-bg-s"></div><div class="fancybox-bg" id="fancybox-bg-sw"></div><div class="fancybox-bg" id="fancybox-bg-w"></div><div class="fancybox-bg" id="fancybox-bg-nw"></div>').appendTo(f); +D.append(j=b('<div id="fancybox-content"></div>'),E=b('<a id="fancybox-close"></a>'),n=b('<div id="fancybox-title"></div>'),z=b('<a href="javascript:;" id="fancybox-left"><span class="fancy-ico" id="fancybox-left-ico"></span></a>'),A=b('<a href="javascript:;" id="fancybox-right"><span class="fancy-ico" id="fancybox-right-ico"></span></a>'));E.click(b.fancybox.close);t.click(b.fancybox.cancel);z.click(function(a){a.preventDefault();b.fancybox.prev()});A.click(function(a){a.preventDefault();b.fancybox.next()}); +b.fn.mousewheel&&f.bind("mousewheel.fb",function(a,c){if(h)a.preventDefault();else if(b(a.target).get(0).clientHeight==0||b(a.target).get(0).scrollHeight===b(a.target).get(0).clientHeight){a.preventDefault();b.fancybox[c>0?"prev":"next"]()}});b.support.opacity||f.addClass("fancybox-ie");if(M){t.addClass("fancybox-ie6");f.addClass("fancybox-ie6");b('<iframe id="fancybox-hide-sel-frame" src="'+(/^https/i.test(window.location.href||"")?"javascript:void(false)":"about:blank")+'" scrolling="no" border="0" frameborder="0" tabindex="-1"></iframe>').prependTo(D)}}}; +b.fn.fancybox.defaults={padding:10,margin:40,opacity:false,modal:false,cyclic:false,scrolling:"auto",width:560,height:340,autoScale:true,autoDimensions:true,centerOnScroll:false,ajax:{},swf:{wmode:"transparent"},hideOnOverlayClick:true,hideOnContentClick:false,overlayShow:true,overlayOpacity:0.7,overlayColor:"#777",titleShow:true,titlePosition:"float",titleFormat:null,titleFromAlt:false,transitionIn:"fade",transitionOut:"fade",speedIn:300,speedOut:300,changeSpeed:300,changeFade:"fast",easingIn:"swing", +easingOut:"swing",showCloseButton:true,showNavArrows:true,enableEscapeButton:true,enableKeyboardNav:true,onStart:function(){},onCancel:function(){},onComplete:function(){},onCleanup:function(){},onClosed:function(){},onError:function(){}};b(document).ready(function(){b.fancybox.init()})})(jQuery);
\ No newline at end of file diff --git a/public/javascripts/jquery.form.js b/public/javascripts/jquery.form.js new file mode 100644 index 000000000..bc0061418 --- /dev/null +++ b/public/javascripts/jquery.form.js @@ -0,0 +1,11 @@ +/*! + * jQuery Form Plugin + * version: 2.83 (11-JUL-2011) + * @requires jQuery v1.3.2 or later + * + * Examples and documentation at: http://malsup.com/jquery/form/ + * Dual licensed under the MIT and GPL licenses: + * http://www.opensource.org/licenses/mit-license.php + * http://www.gnu.org/licenses/gpl.html + */ +(function(a){function b(){var a="[jquery.form] "+Array.prototype.join.call(arguments,"");if(window.console&&window.console.log){window.console.log(a)}else if(window.opera&&window.opera.postError){window.opera.postError(a)}}a.fn.ajaxSubmit=function(c){function t(e){function C(c){if(o.aborted||B){return}try{z=w(n)}catch(d){b("cannot access response document: ",d);c=v}if(c===u&&o){o.abort("timeout");return}else if(c==v&&o){o.abort("server abort");return}if(!z||z.location.href==j.iframeSrc){if(!r)return}n.detachEvent?n.detachEvent("onload",C):n.removeEventListener("load",C,false);var e="success",f;try{if(r){throw"timeout"}var g=j.dataType=="xml"||z.XMLDocument||a.isXMLDoc(z);b("isXml="+g);if(!g&&window.opera&&(z.body==null||z.body.innerHTML=="")){if(--A){b("requeing onLoad callback, DOM not available");setTimeout(C,250);return}}var h=z.body?z.body:z.documentElement;o.responseText=h?h.innerHTML:null;o.responseXML=z.XMLDocument?z.XMLDocument:z;if(g)j.dataType="xml";o.getResponseHeader=function(a){var b={"content-type":j.dataType};return b[a]};if(h){o.status=Number(h.getAttribute("status"))||o.status;o.statusText=h.getAttribute("statusText")||o.statusText}var i=j.dataType||"";var l=/(json|script|text)/.test(i.toLowerCase());if(l||j.textarea){var p=z.getElementsByTagName("textarea")[0];if(p){o.responseText=p.value;o.status=Number(p.getAttribute("status"))||o.status;o.statusText=p.getAttribute("statusText")||o.statusText}else if(l){var q=z.getElementsByTagName("pre")[0];var t=z.getElementsByTagName("body")[0];if(q){o.responseText=q.textContent?q.textContent:q.innerHTML}else if(t){o.responseText=t.innerHTML}}}else if(j.dataType=="xml"&&!o.responseXML&&o.responseText!=null){o.responseXML=D(o.responseText)}try{y=F(o,j.dataType,j)}catch(c){e="parsererror";o.error=f=c||e}}catch(c){b("error caught: ",c);e="error";o.error=f=c||e}if(o.aborted){b("upload aborted");e=null}if(o.status){e=o.status>=200&&o.status<300||o.status===304?"success":"error"}if(e==="success"){j.success&&j.success.call(j.context,y,"success",o);k&&a.event.trigger("ajaxSuccess",[o,j])}else if(e){if(f==undefined)f=o.statusText;j.error&&j.error.call(j.context,o,e,f);k&&a.event.trigger("ajaxError",[o,j,f])}k&&a.event.trigger("ajaxComplete",[o,j]);if(k&&!--a.active){a.event.trigger("ajaxStop")}j.complete&&j.complete.call(j.context,o,e);B=true;if(j.timeout)clearTimeout(s);setTimeout(function(){if(!j.iframeTarget)m.remove();o.responseXML=null},100)}function x(){function h(){try{var a=w(n).readyState;b("state = "+a);if(a.toLowerCase()=="uninitialized")setTimeout(h,50)}catch(c){b("Server abort: ",c," (",c.name,")");C(v);s&&clearTimeout(s);s=undefined}}var c=g.attr("target"),e=g.attr("action");f.setAttribute("target",l);if(!d){f.setAttribute("method","POST")}if(e!=j.url){f.setAttribute("action",j.url)}if(!j.skipEncodingOverride&&(!d||/post/i.test(d))){g.attr({encoding:"multipart/form-data",enctype:"multipart/form-data"})}if(j.timeout){s=setTimeout(function(){r=true;C(u)},j.timeout)}var i=[];try{if(j.extraData){for(var k in j.extraData){i.push(a('<input type="hidden" name="'+k+'" />').attr("value",j.extraData[k]).appendTo(f)[0])}}if(!j.iframeTarget){m.appendTo("body");n.attachEvent?n.attachEvent("onload",C):n.addEventListener("load",C,false)}setTimeout(h,15);f.submit()}finally{f.setAttribute("action",e);if(c){f.setAttribute("target",c)}else{g.removeAttr("target")}a(i).remove()}}function w(a){var b=a.contentWindow?a.contentWindow.document:a.contentDocument?a.contentDocument:a.document;return b}var f=g[0],h,i,j,k,l,m,n,o,p,q,r,s;var t=!!a.fn.prop;if(e){for(i=0;i<e.length;i++){h=a(f[e[i].name]);h[t?"prop":"attr"]("disabled",false)}}if(a(":input[name=submit],:input[id=submit]",f).length){alert('Error: Form elements must not have name or id of "submit".');return}j=a.extend(true,{},a.ajaxSettings,c);j.context=j.context||j;l="jqFormIO"+(new Date).getTime();if(j.iframeTarget){m=a(j.iframeTarget);q=m.attr("name");if(q==null)m.attr("name",l);else l=q}else{m=a('<iframe name="'+l+'" src="'+j.iframeSrc+'" />');m.css({position:"absolute",top:"-1000px",left:"-1000px"})}n=m[0];o={aborted:0,responseText:null,responseXML:null,status:0,statusText:"n/a",getAllResponseHeaders:function(){},getResponseHeader:function(){},setRequestHeader:function(){},abort:function(c){var d=c==="timeout"?"timeout":"aborted";b("aborting upload... "+d);this.aborted=1;m.attr("src",j.iframeSrc);o.error=d;j.error&&j.error.call(j.context,o,d,c);k&&a.event.trigger("ajaxError",[o,j,d]);j.complete&&j.complete.call(j.context,o,d)}};k=j.global;if(k&&!(a.active++)){a.event.trigger("ajaxStart")}if(k){a.event.trigger("ajaxSend",[o,j])}if(j.beforeSend&&j.beforeSend.call(j.context,o,j)===false){if(j.global){a.active--}return}if(o.aborted){return}p=f.clk;if(p){q=p.name;if(q&&!p.disabled){j.extraData=j.extraData||{};j.extraData[q]=p.value;if(p.type=="image"){j.extraData[q+".x"]=f.clk_x;j.extraData[q+".y"]=f.clk_y}}}var u=1;var v=2;if(j.forceSync){x()}else{setTimeout(x,10)}var y,z,A=50,B;var D=a.parseXML||function(a,b){if(window.ActiveXObject){b=new ActiveXObject("Microsoft.XMLDOM");b.async="false";b.loadXML(a)}else{b=(new DOMParser).parseFromString(a,"text/xml")}return b&&b.documentElement&&b.documentElement.nodeName!="parsererror"?b:null};var E=a.parseJSON||function(a){return window["eval"]("("+a+")")};var F=function(b,c,d){var e=b.getResponseHeader("content-type")||"",f=c==="xml"||!c&&e.indexOf("xml")>=0,g=f?b.responseXML:b.responseText;if(f&&g.documentElement.nodeName==="parsererror"){a.error&&a.error("parsererror")}if(d&&d.dataFilter){g=d.dataFilter(g,c)}if(typeof g==="string"){if(c==="json"||!c&&e.indexOf("json")>=0){g=E(g)}else if(c==="script"||!c&&e.indexOf("javascript")>=0){a.globalEval(g)}}return g}}if(!this.length){b("ajaxSubmit: skipping submit process - no element selected");return this}var d,e,f,g=this;if(typeof c=="function"){c={success:c}}d=this.attr("method");e=this.attr("action");f=typeof e==="string"?a.trim(e):"";f=f||window.location.href||"";if(f){f=(f.match(/^([^#]+)/)||[])[1]}c=a.extend(true,{url:f,success:a.ajaxSettings.success,type:d||"GET",iframeSrc:/^https/i.test(window.location.href||"")?"javascript:false":"about:blank"},c);var h={};this.trigger("form-pre-serialize",[this,c,h]);if(h.veto){b("ajaxSubmit: submit vetoed via form-pre-serialize trigger");return this}if(c.beforeSerialize&&c.beforeSerialize(this,c)===false){b("ajaxSubmit: submit aborted via beforeSerialize callback");return this}var i,j,k=this.formToArray(c.semantic);if(c.data){c.extraData=c.data;for(i in c.data){if(c.data[i]instanceof Array){for(var l in c.data[i]){k.push({name:i,value:c.data[i][l]})}}else{j=c.data[i];j=a.isFunction(j)?j():j;k.push({name:i,value:j})}}}if(c.beforeSubmit&&c.beforeSubmit(k,this,c)===false){b("ajaxSubmit: submit aborted via beforeSubmit callback");return this}this.trigger("form-submit-validate",[k,this,c,h]);if(h.veto){b("ajaxSubmit: submit vetoed via form-submit-validate trigger");return this}var m=a.param(k);if(c.type.toUpperCase()=="GET"){c.url+=(c.url.indexOf("?")>=0?"&":"?")+m;c.data=null}else{c.data=m}var n=[];if(c.resetForm){n.push(function(){g.resetForm()})}if(c.clearForm){n.push(function(){g.clearForm()})}if(!c.dataType&&c.target){var o=c.success||function(){};n.push(function(b){var d=c.replaceTarget?"replaceWith":"html";a(c.target)[d](b).each(o,arguments)})}else if(c.success){n.push(c.success)}c.success=function(a,b,d){var e=c.context||c;for(var f=0,h=n.length;f<h;f++){n[f].apply(e,[a,b,d||g,g])}};var p=a("input:file",this).length>0;var q="multipart/form-data";var r=g.attr("enctype")==q||g.attr("encoding")==q;if(c.iframe!==false&&(p||c.iframe||r)){if(c.closeKeepAlive){a.get(c.closeKeepAlive,function(){t(k)})}else{t(k)}}else{if(a.browser.msie&&d=="get"){var s=g[0].getAttribute("method");if(typeof s==="string")c.type=s}a.ajax(c)}this.trigger("form-submit-notify",[this,c]);return this};a.fn.ajaxForm=function(c){if(this.length===0){var d={s:this.selector,c:this.context};if(!a.isReady&&d.s){b("DOM not ready, queuing ajaxForm");a(function(){a(d.s,d.c).ajaxForm(c)});return this}b("terminating; zero elements found by selector"+(a.isReady?"":" (DOM not ready)"));return this}return this.ajaxFormUnbind().bind("submit.form-plugin",function(b){if(!b.isDefaultPrevented()){b.preventDefault();a(this).ajaxSubmit(c)}}).bind("click.form-plugin",function(b){var c=b.target;var d=a(c);if(!d.is(":submit,input:image")){var e=d.closest(":submit");if(e.length==0){return}c=e[0]}var f=this;f.clk=c;if(c.type=="image"){if(b.offsetX!=undefined){f.clk_x=b.offsetX;f.clk_y=b.offsetY}else if(typeof a.fn.offset=="function"){var g=d.offset();f.clk_x=b.pageX-g.left;f.clk_y=b.pageY-g.top}else{f.clk_x=b.pageX-c.offsetLeft;f.clk_y=b.pageY-c.offsetTop}}setTimeout(function(){f.clk=f.clk_x=f.clk_y=null},100)})};a.fn.ajaxFormUnbind=function(){return this.unbind("submit.form-plugin click.form-plugin")};a.fn.formToArray=function(b){var c=[];if(this.length===0){return c}var d=this[0];var e=b?d.getElementsByTagName("*"):d.elements;if(!e){return c}var f,g,h,i,j,k,l;for(f=0,k=e.length;f<k;f++){j=e[f];h=j.name;if(!h){continue}if(b&&d.clk&&j.type=="image"){if(!j.disabled&&d.clk==j){c.push({name:h,value:a(j).val()});c.push({name:h+".x",value:d.clk_x},{name:h+".y",value:d.clk_y})}continue}i=a.fieldValue(j,true);if(i&&i.constructor==Array){for(g=0,l=i.length;g<l;g++){c.push({name:h,value:i[g]})}}else if(i!==null&&typeof i!="undefined"){c.push({name:h,value:i})}}if(!b&&d.clk){var m=a(d.clk),n=m[0];h=n.name;if(h&&!n.disabled&&n.type=="image"){c.push({name:h,value:m.val()});c.push({name:h+".x",value:d.clk_x},{name:h+".y",value:d.clk_y})}}return c};a.fn.formSerialize=function(b){return a.param(this.formToArray(b))};a.fn.fieldSerialize=function(b){var c=[];this.each(function(){var d=this.name;if(!d){return}var e=a.fieldValue(this,b);if(e&&e.constructor==Array){for(var f=0,g=e.length;f<g;f++){c.push({name:d,value:e[f]})}}else if(e!==null&&typeof e!="undefined"){c.push({name:this.name,value:e})}});return a.param(c)};a.fn.fieldValue=function(b){for(var c=[],d=0,e=this.length;d<e;d++){var f=this[d];var g=a.fieldValue(f,b);if(g===null||typeof g=="undefined"||g.constructor==Array&&!g.length){continue}g.constructor==Array?a.merge(c,g):c.push(g)}return c};a.fieldValue=function(b,c){var d=b.name,e=b.type,f=b.tagName.toLowerCase();if(c===undefined){c=true}if(c&&(!d||b.disabled||e=="reset"||e=="button"||(e=="checkbox"||e=="radio")&&!b.checked||(e=="submit"||e=="image")&&b.form&&b.form.clk!=b||f=="select"&&b.selectedIndex==-1)){return null}if(f=="select"){var g=b.selectedIndex;if(g<0){return null}var h=[],i=b.options;var j=e=="select-one";var k=j?g+1:i.length;for(var l=j?g:0;l<k;l++){var m=i[l];if(m.selected){var n=m.value;if(!n){n=m.attributes&&m.attributes["value"]&&!m.attributes["value"].specified?m.text:m.value}if(j){return n}h.push(n)}}return h}return a(b).val()};a.fn.clearForm=function(){return this.each(function(){a("input,select,textarea",this).clearFields()})};a.fn.clearFields=a.fn.clearInputs=function(){var a=/^(?:color|date|datetime|email|month|number|password|range|search|tel|text|time|url|week)$/i;return this.each(function(){var b=this.type,c=this.tagName.toLowerCase();if(a.test(b)||c=="textarea"){this.value=""}else if(b=="checkbox"||b=="radio"){this.checked=false}else if(c=="select"){this.selectedIndex=-1}})};a.fn.resetForm=function(){return this.each(function(){if(typeof this.reset=="function"||typeof this.reset=="object"&&!this.reset.nodeType){this.reset()}})};a.fn.enable=function(a){if(a===undefined){a=true}return this.each(function(){this.disabled=!a})};a.fn.selected=function(b){if(b===undefined){b=true}return this.each(function(){var c=this.type;if(c=="checkbox"||c=="radio"){this.checked=b}else if(this.tagName.toLowerCase()=="option"){var d=a(this).parent("select");if(b&&d[0]&&d[0].type=="select-one"){d.find("option").selected(false)}this.selected=b}})};})(jQuery)
\ No newline at end of file diff --git a/public/robots.txt b/public/robots.txt index 80dfd8ef7..029ae0dbf 100644 --- a/public/robots.txt +++ b/public/robots.txt @@ -8,6 +8,10 @@ # Crawl-delay: 1 # http://www.bing.com/community/blogs/webmaster/archive/2009/08/10/crawl-delay-and-the-bing-crawler-msnbot.aspx +# This file uses the non-standard extension characters * and $, which are supported by Google and Yahoo! +# http://code.google.com/web/controlcrawlindex/docs/robots_txt.html +# http://help.yahoo.com/l/us/yahoo/search/webcrawler/slurp-02.html + User-agent: * Disallow: /annotate/ Disallow: /new/ @@ -19,4 +23,4 @@ Disallow: /user/contact/ Disallow: /feed/ Disallow: /profile/ Disallow: /signin - +Disallow: /body/*/view_email$ diff --git a/public/stylesheets/admin-theme/jquery-ui-1.8.15.custom.css b/public/stylesheets/admin-theme/jquery-ui-1.8.15.custom.css index 50a77d629..ea0254a2b 100755 --- a/public/stylesheets/admin-theme/jquery-ui-1.8.15.custom.css +++ b/public/stylesheets/admin-theme/jquery-ui-1.8.15.custom.css @@ -1,5 +1,5 @@ /* - * jQuery UI CSS Framework 1.8.15 + * jQuery UI CSS Framework 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -42,7 +42,7 @@ /* - * jQuery UI CSS Framework 1.8.15 + * jQuery UI CSS Framework 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -50,13 +50,13 @@ * * http://docs.jquery.com/UI/Theming/API * - * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,Arial,sans-serif&fwDefault=normal&fsDefault=1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=01_flat.png&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=01_flat.png&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=01_flat.png&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=01_flat.png&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=01_flat.png&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=05_inset_soft.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px + * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,Arial,sans-serif&fwDefault=normal&fsDefault=&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=01_flat.png&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=01_flat.png&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=01_flat.png&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=01_flat.png&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=01_flat.png&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=01_flat.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px */ /* Component containers ----------------------------------*/ -.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1em; } +.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: ; } .ui-widget .ui-widget { font-size: 1em; } .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; } .ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; } @@ -78,7 +78,7 @@ ----------------------------------*/ .ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #fcefa1; background: #fbf9ee url(images/ui-bg_flat_55_fbf9ee_40x100.png) 50% 50% repeat-x; color: #363636; } .ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; } -.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_inset-soft_95_fef1ec_1x100.png) 50% bottom repeat-x; color: #cd0a0a; } +.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_flat_95_fef1ec_40x100.png) 50% 50% repeat-x; color: #cd0a0a; } .ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; } .ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; } .ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; } @@ -288,7 +288,7 @@ /* Overlays */ .ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); } .ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/* - * jQuery UI Tabs 1.8.15 + * jQuery UI Tabs 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -305,3 +305,71 @@ .ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */ .ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; } .ui-tabs .ui-tabs-hide { display: none !important; } +/* + * jQuery UI Datepicker 1.8.16 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Datepicker#theming + */ +.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; } +.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; } +.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; } +.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; } +.ui-datepicker .ui-datepicker-prev { left:2px; } +.ui-datepicker .ui-datepicker-next { right:2px; } +.ui-datepicker .ui-datepicker-prev-hover { left:1px; } +.ui-datepicker .ui-datepicker-next-hover { right:1px; } +.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px; } +.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; } +.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; } +.ui-datepicker select.ui-datepicker-month-year {width: 100%;} +.ui-datepicker select.ui-datepicker-month, +.ui-datepicker select.ui-datepicker-year { width: 49%;} +.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; } +.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0; } +.ui-datepicker td { border: 0; padding: 1px; } +.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; } +.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; } +.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; } +.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; } + +/* with multiple calendars */ +.ui-datepicker.ui-datepicker-multi { width:auto; } +.ui-datepicker-multi .ui-datepicker-group { float:left; } +.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; } +.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; } +.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; } +.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; } +.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; } +.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; } +.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; } +.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; } + +/* RTL support */ +.ui-datepicker-rtl { direction: rtl; } +.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; } +.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; } +.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; } +.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; } +.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; } +.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; } +.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; } +.ui-datepicker-rtl .ui-datepicker-group { float:right; } +.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; } +.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; } + +/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */ +.ui-datepicker-cover { + display: none; /*sorry for IE5*/ + display/**/: block; /*sorry for IE5*/ + position: absolute; /*must have*/ + z-index: -1; /*must have*/ + filter: mask(); /*must have*/ + top: -4px; /*must have*/ + left: -4px; /*must have*/ + width: 200px; /*must have*/ + height: 200px; /*must have*/ +}
\ No newline at end of file diff --git a/public/stylesheets/fancybox-x.png b/public/stylesheets/fancybox-x.png Binary files differnew file mode 100755 index 000000000..c2130f869 --- /dev/null +++ b/public/stylesheets/fancybox-x.png diff --git a/public/stylesheets/fancybox-y.png b/public/stylesheets/fancybox-y.png Binary files differnew file mode 100755 index 000000000..7ef399b99 --- /dev/null +++ b/public/stylesheets/fancybox-y.png diff --git a/public/stylesheets/fancybox.png b/public/stylesheets/fancybox.png Binary files differnew file mode 100755 index 000000000..65e14f68f --- /dev/null +++ b/public/stylesheets/fancybox.png diff --git a/public/stylesheets/fonts.css b/public/stylesheets/fonts.css new file mode 100644 index 000000000..f63b4b1f8 --- /dev/null +++ b/public/stylesheets/fonts.css @@ -0,0 +1,73 @@ + +@font-face { + font-family: 'DeliciousBold'; + src: url('./fonts/delicious-bold-webfont.eot'); + src: url('./fonts/delicious-bold-webfont.eot?#iefix') format('embedded-opentype'), + url('./fonts/delicious-bold-webfont.woff') format('woff'), + url('./fonts/delicious-bold-webfont.ttf') format('truetype'), + url('./fonts/delicious-bold-webfont.svg#DeliciousBold') format('svg'); + font-weight: normal; + font-style: normal; + +} + +@font-face { + font-family: 'DeliciousBoldItalic'; + src: url('./fonts/delicious-bolditalic-webfont.eot'); + src: url('./fonts/delicious-bolditalic-webfont.eot?#iefix') format('embedded-opentype'), + url('./fonts/delicious-bolditalic-webfont.woff') format('woff'), + url('./fonts/delicious-bolditalic-webfont.ttf') format('truetype'), + url('./fonts/delicious-bolditalic-webfont.svg#DeliciousBoldItalic') format('svg'); + font-weight: normal; + font-style: normal; + +} + +@font-face { + font-family: 'DeliciousHeavyRegular'; + src: url('./fonts/delicious-heavy-webfont.eot'); + src: url('./fonts/delicious-heavy-webfont.eot?#iefix') format('embedded-opentype'), + url('./fonts/delicious-heavy-webfont.woff') format('woff'), + url('./fonts/delicious-heavy-webfont.ttf') format('truetype'), + url('./fonts/delicious-heavy-webfont.svg#DeliciousHeavyRegular') format('svg'); + font-weight: normal; + font-style: normal; + +} + +@font-face { + font-family: 'DeliciousItalic'; + src: url('./fonts/delicious-italic-webfont.eot'); + src: url('./fonts/delicious-italic-webfont.eot?#iefix') format('embedded-opentype'), + url('./fonts/delicious-italic-webfont.woff') format('woff'), + url('./fonts/delicious-italic-webfont.ttf') format('truetype'), + url('./fonts/delicious-italic-webfont.svg#DeliciousItalic') format('svg'); + font-weight: normal; + font-style: normal; + +} + +@font-face { + font-family: 'DeliciousRoman'; + src: url('./fonts/delicious-roman-webfont.eot'); + src: url('./fonts/delicious-roman-webfont.eot?#iefix') format('embedded-opentype'), + url('./fonts/delicious-roman-webfont.woff') format('woff'), + url('./fonts/delicious-roman-webfont.ttf') format('truetype'), + url('./fonts/delicious-roman-webfont.svg#DeliciousRoman') format('svg'); + font-weight: normal; + font-style: normal; + +} + +@font-face { + font-family: 'DeliciousSmallCapsRegular'; + src: url('./fonts/delicious-smallcaps-webfont.eot'); + src: url('./fonts/delicious-smallcaps-webfont.eot?#iefix') format('embedded-opentype'), + url('./fonts/delicious-smallcaps-webfont.woff') format('woff'), + url('./fonts/delicious-smallcaps-webfont.ttf') format('truetype'), + url('./fonts/delicious-smallcaps-webfont.svg#DeliciousSmallCapsRegular') format('svg'); + font-weight: normal; + font-style: normal; + +} + diff --git a/public/stylesheets/fonts/delicious-bold-webfont.eot b/public/stylesheets/fonts/delicious-bold-webfont.eot Binary files differnew file mode 100755 index 000000000..90d2e95fa --- /dev/null +++ b/public/stylesheets/fonts/delicious-bold-webfont.eot diff --git a/public/stylesheets/fonts/delicious-bold-webfont.svg b/public/stylesheets/fonts/delicious-bold-webfont.svg new file mode 100755 index 000000000..51a5d9080 --- /dev/null +++ b/public/stylesheets/fonts/delicious-bold-webfont.svg @@ -0,0 +1,222 @@ +<?xml version="1.0" standalone="no"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" > +<svg xmlns="http://www.w3.org/2000/svg"> +<metadata> +This is a custom SVG webfont generated by Font Squirrel. +Copyright : copyright 19941996 Jos Buivenga +</metadata> +<defs> +<font id="DeliciousBold" horiz-adv-x="921" > +<font-face units-per-em="2048" ascent="1638" descent="-410" /> +<missing-glyph horiz-adv-x="614" /> +<glyph unicode=" " horiz-adv-x="614" /> +<glyph unicode="	" horiz-adv-x="614" /> +<glyph unicode=" " horiz-adv-x="614" /> +<glyph unicode="!" horiz-adv-x="540" d="M143 104.5q0 61.5 48.5 106.5t109.5 45t101 -37t40 -96q0 -61 -48 -107.5t-109.5 -46.5t-101.5 37t-40 98.5zM180 1049q0 254 29 356l221 29q-39 -217 -39 -416v-637h-184q-27 510 -27 668z" /> +<glyph unicode=""" horiz-adv-x="708" d="M109 1317l30 156h152l33 -156l-48 -342h-122zM377 1317l31 156h149l35 -156l-47 -342h-123z" /> +<glyph unicode="#" horiz-adv-x="1138" d="M98 416l29 196h168l27 226h-140l27 196h137l43 385h184l-43 -385h154l41 346h184l-41 -346h164l-16 -196h-170l-29 -226h135l-18 -196h-143l-52 -412h-186l53 412h-153l-52 -361h-186l53 361h-170zM479 612h154l29 226h-154z" /> +<glyph unicode="$" horiz-adv-x="888" d="M88 979q0 143 91 236.5t235 103.5v113h92v-115q78 -10 156.5 -53t123.5 -105l-122 -121q-63 70 -158 95v-377l123 -84q96 -63 143 -138t47 -198q0 -139 -87 -237.5t-226 -121.5v-127h-92v119q-76 2 -159 38t-140 87l102 162q106 -86 197 -94v387l-138 90 q-88 57 -138 147.5t-50 192.5zM307 989q0 -109 107 -178v319q-49 -12 -78 -51t-29 -90zM506 178q94 43 94 160q0 82 -94 147v-307z" /> +<glyph unicode="%" horiz-adv-x="1431" d="M90 1032q0 119 84 204t205 85q55 0 137 -35q31 -18 37 -20q39 -12 98 -13q154 0 322 66l153 -39l-643 -1280h-200l589 1167q-78 -61 -215 -61q10 -41 11 -74q0 -119 -84 -204t-205 -85t-205 85t-84 204zM266 1032q0 -45 33 -78.5t80 -33.5t80 33.5t33 78.5t-33 79t-80 34 t-80 -34t-33 -79zM756 258q0 119 85 204t203.5 85t203.5 -85t85 -204t-85 -204t-203.5 -85t-203.5 85t-85 204zM932 258q0 -45 33.5 -79t79 -34t79 34t33.5 79t-33.5 79t-79 34t-79 -34t-33.5 -79z" /> +<glyph unicode="&" horiz-adv-x="1290" d="M82 489q0 168 84 307.5t240 161.5q-55 20 -91 70.5t-36 108.5q0 129 109.5 204.5t244.5 75.5q154 0 263.5 -81t109.5 -228v-104h192v-177h-188v-600q0 -41 10 -61.5t47 -20.5q41 0 113 29l51 -139q-53 -27 -79 -38t-64.5 -19.5t-88.5 -8.5q-104 0 -154 71t-50 179v608 h-82q-162 0 -203 -10q-193 -53 -193 -319q0 -98 24 -226.5t77 -128.5q16 0 43.5 29t70.5 58.5t101 29.5q37 0 82 -10l-39 -144q-35 8 -61.5 -3t-46.5 -33l-39 -45q-19 -23 -48.5 -39.5t-66.5 -16.5q-113 0 -193 92.5t-109.5 204.5t-29.5 223zM489 1120q0 -117 173 -116h149 v57q0 92 -34 142t-120 50q-168 0 -168 -133z" /> +<glyph unicode="'" horiz-adv-x="425" d="M100 1317l33 156h150l34 -156l-47 -342h-125z" /> +<glyph unicode="(" horiz-adv-x="688" d="M76 678q0 281 149.5 522.5t399.5 394.5l26 -184q-182 -117 -287.5 -316.5t-105.5 -420.5q0 -473 393 -789l-22 -198q-279 211 -416 440t-137 551z" /> +<glyph unicode=")" horiz-adv-x="694" d="M41 -115q393 315 393 789q0 221 -104.5 420.5t-286.5 316.5l25 184q250 -154 399 -395.5t149 -521.5q0 -322 -137 -552t-416 -439z" /> +<glyph unicode="*" horiz-adv-x="868" d="M55 1100v190l273 -114l-64 221h318l-58 -221l271 114v-190l-236 -76l215 -332h-221l-127 209l-129 -209h-219l215 332z" /> +<glyph unicode="+" horiz-adv-x="964" d="M78 420v184h313v336h180v-336h316v-184h-316v-336h-180v336h-313z" /> +<glyph unicode="," horiz-adv-x="528" d="M27 -229q137 199 137 327q0 35 -4 52q61 49 123 49q43 0 89 -37t74 -82q-109 -213 -290 -397z" /> +<glyph unicode="-" horiz-adv-x="618" d="M86 430v184h440v-184h-440z" /> +<glyph unicode="." horiz-adv-x="528" d="M121 104q0 61 47 106.5t111 45.5q59 0 99 -37t40 -96q0 -63 -47 -108.5t-111 -45.5q-59 0 -99 38t-40 97z" /> +<glyph unicode="/" horiz-adv-x="729" d="M8 -289l522 1825h191l-522 -1825h-191z" /> +<glyph unicode="0" d="M49 500q0 233 104.5 383.5t307.5 150.5t307 -152.5t104 -381.5q0 -137 -42 -254t-138 -197t-231 -80q-199 0 -305.5 160t-106.5 371zM256 500q0 -141 56.5 -240.5t148.5 -99.5q205 0 205 340q0 154 -55.5 249t-149.5 95t-149.5 -94t-55.5 -250z" /> +<glyph unicode="1" d="M201 799v155q117 0 250 41l26 9h174v-1004h-213v799h-237z" /> +<glyph unicode="2" d="M111 160q141 80 307 259t166 306q0 57 -39 88t-99 31q-70 0 -145.5 -32t-126.5 -81l-45 172q59 61 155.5 96t184.5 35q152 0 242 -75.5t90 -225.5q0 -154 -102.5 -300t-247.5 -240h385v-193h-686z" /> +<glyph unicode="3" d="M131 -178q111 2 213 34.5t181 114.5t79 199q0 152 -239 152q-90 0 -199 -11v164l108 17q100 55 236 163q70 57 70 115q0 35 -27 57.5t-61 22.5q-41 0 -114 -27.5t-124 -56.5l-53 -29l-54 162q74 43 121 66.5t118 45t136 21.5q125 0 199 -67.5t74 -171.5q0 -94 -80 -182.5 t-170 -123.5q115 -10 193.5 -93t78.5 -193q0 -141 -56 -250t-152.5 -171.5t-214.5 -92t-251 -29.5h-12v164z" /> +<glyph unicode="4" d="M59 166q145 373 494 838h209v-816h117v-188h-121v-283h-205v283h-483zM281 188h272v502q-186 -281 -272 -502z" /> +<glyph unicode="5" d="M123 -176q113 0 217 33.5t182 116.5t78 198q0 72 -49 109.5t-121 37.5q-102 0 -278 -49l61 734h547v-185h-354l-19 -323q98 12 100 12q141 0 234.5 -82t93.5 -223q0 -170 -96 -297t-243 -187q-142 -57 -301 -57h-11h-41v162z" /> +<glyph unicode="6" d="M84 530q0 506 598 795l82 -145q-164 -102 -257 -187.5t-159 -224.5q106 43 189 43q137 0 229 -107.5t92 -248.5q0 -201 -99.5 -343.5t-291.5 -142.5q-104 0 -183 52.5t-120 139.5t-60.5 179t-19.5 190zM295 489q0 -47 8 -99t27.5 -107.5t58.5 -92t90 -36.5q168 0 168 307 q0 92 -52 139t-144 47q-51 0 -146 -37q-10 -51 -10 -121z" /> +<glyph unicode="7" d="M119 811v193h680v-115q0 -285 -129 -650.5t-305 -598.5l-183 92q166 236 286 531.5t128 547.5h-477z" /> +<glyph unicode="8" d="M72 334q0 117 54 196.5t161 145.5q-180 109 -181 280q0 154 101.5 244t257.5 90q162 0 253 -83t91 -238q0 -98 -49 -165t-142 -122q117 -59 179.5 -133t62.5 -189q0 -178 -115.5 -284.5t-295.5 -106.5q-156 0 -266.5 104.5t-110.5 260.5zM285 354q0 -82 51 -146.5 t131 -64.5q78 0 128 64.5t50 144.5q0 43 -16.5 78t-55 66.5t-59.5 44.5l-74 43q-155 -95 -155 -230zM313 948q0 -63 37 -103t103 -75q152 88 151 201q0 156 -149 155q-72 0 -107 -51t-35 -127z" /> +<glyph unicode="9" d="M68 545q0 201 98 345t289 144q115 0 194.5 -52t120.5 -143t57.5 -184.5t16.5 -201.5q0 -266 -193.5 -475t-468.5 -320l-57 160q338 168 453 413q-102 -39 -160 -38q-152 0 -251 100t-99 252zM279 541q0 -78 50 -132.5t126 -54.5q88 0 166 39q10 66 10 121 q0 49 -8.5 102.5t-28 111.5t-57 95t-91.5 37q-167 0 -167 -319z" /> +<glyph unicode=":" horiz-adv-x="528" d="M121 104q0 61 47 106.5t111 45.5q59 0 99 -37t40 -96q0 -63 -47 -108.5t-111 -45.5q-59 0 -99 38t-40 97zM121 694q0 63 47 108.5t111 45.5q59 0 99 -38t40 -97q0 -63 -47 -108.5t-111 -45.5q-59 0 -99 38t-40 97z" /> +<glyph unicode=";" horiz-adv-x="528" d="M23 -229q137 205 137 327q0 27 -6 52q61 49 122 49q43 0 89.5 -37t74.5 -82q-109 -213 -290 -397zM135 692q0 63 47 108.5t111 45.5q59 0 99 -38t40 -97q0 -63 -47 -108.5t-111 -45.5q-59 0 -99 38t-40 97z" /> +<glyph unicode="<" horiz-adv-x="614" d="M33 512l403 410l146 -117l-295 -293l299 -293l-146 -117z" /> +<glyph unicode="=" horiz-adv-x="983" d="M86 270v185h811v-185h-811zM86 559v184h811v-184h-811z" /> +<glyph unicode=">" horiz-adv-x="614" d="M29 219l297 293l-293 293l145 117l404 -410l-408 -410z" /> +<glyph unicode="?" horiz-adv-x="733" d="M129 104q0 61 47 106.5t111 45.5q59 0 99 -37t40 -96q0 -63 -47 -108.5t-111 -45.5q-59 0 -99 38t-40 97zM190 381v111q0 147 18.5 200t106.5 168l109 144q63 88 63 137q0 100 -79 100q-98 0 -197 -29v172q121 33 235.5 33t184 -74.5t69.5 -189.5q0 -49 -17 -98t-37 -78 l-58 -82l-148 -203q-66 -92 -65 -198v-113h-185z" /> +<glyph unicode="@" horiz-adv-x="1622" d="M92 727q0 297 221.5 525.5t515.5 228.5q315 0 505 -171t190 -481q0 -199 -139.5 -364.5t-333.5 -165.5q-66 0 -119 41t-55 104q-57 -45 -133 -82.5t-130 -37.5q-94 0 -136 94t-42 201q0 207 101.5 363.5t298.5 156.5q76 0 172 -86l14 57h172l-141 -575q-8 -33 -9 -48 q0 -53 41 -53q94 0 166 100.5t86 204.5q6 43 6 90q0 231 -140 355.5t-376 124.5q-227 0 -383.5 -178.5t-156.5 -407.5q0 -256 173 -421t429 -165q281 0 493 217l109 -98q-250 -287 -641 -287q-315 0 -536.5 221.5t-221.5 536.5zM614 590q0 -98 62 -98q55 0 219 92l82 340 q-98 59 -158 59q-66 0 -116 -74.5t-69.5 -160.5t-19.5 -158z" /> +<glyph unicode="A" horiz-adv-x="1044" d="M23 0l407 1290h184l410 -1290h-229l-123 371h-295l-123 -371h-231zM426 567h195l-97 398z" /> +<glyph unicode="B" horiz-adv-x="1028" d="M150 27v1263h335q170 0 288 -75.5t118 -237.5q0 -88 -48 -167t-126 -116q109 -16 176.5 -104t67.5 -201q0 -199 -134.5 -309.5t-337.5 -110.5q-122 1 -339 58zM373 774h110q84 0 135.5 47t51.5 131q0 92 -45 122t-142 30h-110v-330zM373 184q66 -18 112 -18 q117 0 184.5 55t67.5 168q0 117 -68.5 154t-193.5 37h-102v-396z" /> +<glyph unicode="C" horiz-adv-x="1017" d="M106 645q0 117 31 232.5t90.5 217t159.5 164t225 62.5q209 0 334 -92l-86 -154q-92 55 -248 55q-68 0 -124 -52t-88.5 -130t-51 -159.5t-18.5 -151.5q0 -78 12 -152.5t41 -151.5t89 -124t144 -47q139 0 246 78l103 -152q-66 -55 -165.5 -87t-191.5 -32 q-135 0 -235.5 59.5t-156.5 161t-83 215t-27 240.5z" /> +<glyph unicode="D" horiz-adv-x="1120" d="M150 0v1290h387q133 0 230 -55t150.5 -151.5t77 -205t23.5 -235.5q0 -125 -27.5 -235.5t-85 -204.5t-157 -148.5t-230.5 -54.5h-368zM371 193h147q274 0 275 446q0 459 -265 459h-157v-905z" /> +<glyph unicode="E" horiz-adv-x="929" d="M147 0v1290h697v-198h-473v-320h362v-201h-362v-368h493v-203h-717z" /> +<glyph unicode="F" horiz-adv-x="843" d="M145 0v1290h643v-196h-419v-322h331v-201h-331v-571h-224z" /> +<glyph unicode="G" horiz-adv-x="1073" d="M100 645q0 119 31 234.5t90.5 217t160.5 163t228 61.5q92 0 193.5 -28.5t167.5 -80.5l-88 -157q-117 78 -273 78q-96 0 -164.5 -92.5t-95 -200t-26.5 -203.5q0 -78 13 -153.5t43 -151.5t90 -123t144 -47q78 0 138 16v412h211v-559q-143 -61 -353 -62q-135 0 -237.5 59.5 t-159.5 159t-85 215t-28 242.5z" /> +<glyph unicode="H" horiz-adv-x="1122" d="M152 0v1290h223v-518h373v518h223v-1290h-223v571h-373v-571h-223z" /> +<glyph unicode="I" horiz-adv-x="487" d="M133 0v1290h221v-1290h-221z" /> +<glyph unicode="J" horiz-adv-x="501" d="M-6 -180q150 66 149 162v1308h219v-1319q0 -215 -317 -307z" /> +<glyph unicode="K" horiz-adv-x="993" d="M152 0v1290h223v-491l356 491h240l-471 -659l481 -541v-90h-205l-401 457v-457h-223z" /> +<glyph unicode="L" horiz-adv-x="782" d="M145 0v1290h215v-1093h404v-197h-619z" /> +<glyph unicode="M" horiz-adv-x="1519" d="M162 0v1290h262l307 -874l29 -115q8 55 28 115l308 874h262v-1290h-223v711l16 149l-299 -860h-184l-299 860l16 -149v-711h-223z" /> +<glyph unicode="N" horiz-adv-x="1134" d="M152 0v1290h262l286 -651q33 -74 60 -186v837h223v-1290h-215l-408 903q14 -84 15 -170v-733h-223z" /> +<glyph unicode="O" horiz-adv-x="1122" d="M102 645q0 119 27 234.5t79 216t144 163t209 62.5q119 0 211 -61.5t144.5 -164t78 -216t25.5 -234.5t-25.5 -234.5t-78 -216t-144.5 -164t-211 -61.5t-211 61.5t-144 164t-78 216t-26 234.5zM326 645q0 -84 11 -161.5t35.5 -152.5t74 -120t115 -45t114.5 45t73.5 120 t36 152.5t11.5 161.5t-11.5 162t-36 152.5t-73.5 119.5t-114.5 45t-115 -45t-74 -119.5t-35.5 -152.5t-11 -162z" /> +<glyph unicode="P" horiz-adv-x="1001" d="M133 0v1290h299q504 0 504 -409q0 -195 -126 -320t-321 -125q-59 0 -133 33v-469h-223zM356 659q76 -29 119 -28q102 0 170 74.5t68 177.5q0 109 -83 162t-198 53h-76v-439z" /> +<glyph unicode="Q" horiz-adv-x="1122" d="M102 645q0 119 27 234.5t79 216t144 163t209 62.5q119 0 211 -61.5t144.5 -164t78 -216t25.5 -234.5q0 -215 -79 -400.5t-236 -248.5q51 -31 76.5 -43t63.5 -21.5t85 -9.5l94 15l-39 -220q-49 -8 -74 -8q-51 0 -97 14.5t-95 50.5t-73.5 56t-81.5 77l-66 66 q-135 20 -228.5 132t-130.5 250t-37 290zM326 645q0 -84 11 -162t35.5 -152.5t74 -119.5t115 -45t114.5 45t73.5 119.5t36 152.5t11.5 162t-11.5 162t-36 152.5t-73.5 119.5t-114.5 45t-115 -45t-74 -119.5t-35.5 -152.5t-11 -162z" /> +<glyph unicode="R" horiz-adv-x="1034" d="M152 0v1290h297q254 0 372.5 -112.5t118.5 -296.5q0 -152 -87 -275t-224 -135l366 -381v-90h-200l-420 461v-461h-223zM375 655q63 -27 117 -26q104 0 162.5 73.5t58.5 180.5q0 215 -264 215h-74v-443z" /> +<glyph unicode="S" horiz-adv-x="888" d="M88 979q0 154 103.5 248t259.5 94q94 0 188 -44t147 -118l-122 -121q-90 98 -203 99q-68 0 -111 -40t-43 -108q0 -74 53.5 -130t128 -98t149.5 -91t128 -134t53 -200q0 -164 -114.5 -265.5t-280.5 -101.5q-78 0 -164 36t-145 89l102 162q119 -94 209 -94q78 0 126 49 t48 127q0 49 -38 95t-95 80t-122.5 79t-123 93t-95.5 125t-38 169z" /> +<glyph unicode="T" horiz-adv-x="829" d="M20 1085v205h789v-205h-285v-1085h-221v1085h-283z" /> +<glyph unicode="U" horiz-adv-x="1142" d="M150 506v784h223v-784q0 -340 198.5 -340t198.5 340v784h223v-784q0 -231 -102.5 -384t-319.5 -153t-319 153t-102 384z" /> +<glyph unicode="V" horiz-adv-x="1044" d="M12 1290h238l219 -772l53 -182l45 160l228 794h237l-399 -1290h-221z" /> +<glyph unicode="W" horiz-adv-x="1449" d="M18 1290h226l157 -723q16 -74 25 -188q4 119 23 190l169 721h213l170 -721q18 -72 23 -190q8 115 25 188l159 723h224l-295 -1290h-219l-175 782q-10 35 -18 115q-8 -78 -16 -115l-177 -782h-219z" /> +<glyph unicode="X" horiz-adv-x="1007" d="M14 0l359 659l-348 631h247l222 -424l217 424h237l-330 -620l377 -670h-258l-243 459l-232 -459h-248z" /> +<glyph unicode="Y" horiz-adv-x="964" d="M27 1290h239l215 -583l228 583h229l-344 -809v-481h-223v483z" /> +<glyph unicode="Z" horiz-adv-x="937" d="M72 0v174q197 408 479 913h-438v203h712v-178q-295 -508 -493 -909h547v-203h-807z" /> +<glyph unicode="[" horiz-adv-x="507" d="M31 -319v1816h370v-180h-182v-1456h182v-180h-370z" /> +<glyph unicode="\" horiz-adv-x="686" d="M-4 1536h192l523 -1825h-193z" /> +<glyph unicode="]" horiz-adv-x="509" d="M111 -139h180v1456h-180v180h368v-1816h-368v180z" /> +<glyph unicode="^" horiz-adv-x="1277" d="M113 643l448 819h152l448 -819h-215l-309 559l-309 -559h-215z" /> +<glyph unicode="_" d="M0 -123h922v-184h-922v184z" /> +<glyph unicode="`" horiz-adv-x="692" d="M55 1407l172 176q123 -168 342 -328l-98 -139q-258 137 -416 291z" /> +<glyph unicode="a" horiz-adv-x="954" d="M78 256q0 84 61 203l441 190v101q0 100 -119 100q-63 0 -136 -36t-124 -87l-74 129q63 76 160.5 127t191.5 51q145 0 231.5 -72.5t86.5 -213.5v-584q0 -53 39 -53q12 0 36 12l56 -109q-70 -43 -146 -43q-68 0 -117 39t-61 107q-96 -147 -254 -148q-135 0 -203.5 75 t-68.5 212zM281 258q0 -45 25.5 -79t68.5 -34q92 0 150.5 91.5t58.5 193.5v37l-287 -119q-16 -57 -16 -90z" /> +<glyph unicode="b" horiz-adv-x="1030" d="M158 102v1321h215v-493q35 41 94 72.5t108 31.5q178 0 275.5 -142t97.5 -331q0 -109 -22.5 -208t-69.5 -188t-134 -142.5t-204 -53.5q-184 0 -360 133zM373 201q82 -55 159 -56q57 0 99.5 43t62 111t27.5 127t8 115q0 49 -7 95t-23.5 96t-53.5 80t-88 30q-76 0 -184 -103 v-538z" /> +<glyph unicode="c" horiz-adv-x="843" d="M86 492q0 131 42 250.5t139.5 205.5t232.5 86q82 0 165 -32.5t130 -90.5l-109 -127q-80 70 -184 70q-66 0 -115 -63.5t-67.5 -138t-18.5 -140.5q0 -51 10.5 -108.5t33 -116t65.5 -97t98 -38.5q106 0 235 102l74 -148q-63 -59 -153.5 -98t-169.5 -39q-129 0 -225.5 82 t-139.5 198t-43 243z" /> +<glyph unicode="d" horiz-adv-x="1048" d="M90 457q0 115 19.5 212t62.5 182t125 134t195 49q37 0 84 -8t75 -16l29 -9v422h215v-1212q0 -51 11.5 -69.5t56.5 -18.5l-66 -154q-12 -1 -22 0q-65 0 -97 21q-55 39 -78 133q-31 -59 -92 -106.5t-147 -47.5q-166 0 -268.5 141.5t-102.5 346.5zM311 479q0 -45 6.5 -91 t21.5 -101.5t50 -91t86 -39.5q5 0 10 -1q87 0 140 105q55 111 55 211v342q-106 33 -180 33q-189 0 -189 -367z" /> +<glyph unicode="e" horiz-adv-x="964" d="M88 526q0 203 120 355.5t318 152.5q145 0 253 -118.5t112 -266.5q0 -23 1 -67.5t1 -67.5h-586q-2 -12 -2 -37q0 -66 17.5 -136.5t64.5 -129.5t115 -59q123 0 268 110l72 -139q-74 -61 -173.5 -107.5t-179.5 -46.5q-143 0 -237 89t-129 209t-35 259zM336 692h342 q-6 78 -49 130t-117 52q-131 0 -176 -182z" /> +<glyph unicode="f" horiz-adv-x="585" d="M27 850v154h131v114q0 63 21.5 116.5t54 86.5t73.5 58.5t82 38t74 19.5t53 9h23l36 -156q-8 0 -21 -2t-49 -13t-62.5 -28.5t-48 -54.5t-21.5 -84v-104h186v-181h-186v-823h-215v827z" /> +<glyph unicode="g" horiz-adv-x="931" d="M70 -145q0 70 56 125t128 86q-47 6 -84 50t-37 95q0 55 42 98t101 66q-84 35 -128 120t-44 179q0 164 99.5 262t263.5 98q98 0 168 -30h256v-185h-117q29 -94 29 -151q0 -127 -67.5 -213t-192.5 -117q-2 0 -29 -4t-41 -8l-10 -2q-10 -4 -15.5 -5.5t-15.5 -4.5t-16 -5 t-16.5 -7t-15.5 -9t-13.5 -11.5t-11.5 -13.5t-6 -15t-3 -20q0 -16 16.5 -25t45 -12t52 -3t56.5 1t39 1h66q109 0 183.5 -60.5t74.5 -167.5q0 -170 -139.5 -271.5t-317.5 -101.5q-145 0 -250.5 64t-105.5 197zM281 -117q0 -133 153 -133q96 0 169 55.5t73 145.5q0 78 -156 78 h-119q-4 -2 -12 -7.5l-29.5 -20.5t-37 -30.5t-28.5 -40t-13 -47.5zM315 696q0 -201 144 -200q74 0 105.5 54t31.5 132q0 80 -34 138.5t-107.5 58.5t-106.5 -52.5t-33 -130.5z" /> +<glyph unicode="h" horiz-adv-x="1062" d="M154 0v1423h215v-493q53 43 132 73.5t142 30.5q158 0 214 -78.5t56 -214.5v-741h-215v741q0 61 -15 83t-65 22q-61 0 -131.5 -34t-117.5 -71v-741h-215z" /> +<glyph unicode="i" horiz-adv-x="487" d="M102 1251q0 57 44 99.5t102 42.5q55 0 96 -38t41 -93q0 -57 -44 -99.5t-101 -42.5q-55 0 -96.5 38t-41.5 93zM137 0v1004h211v-1004h-211z" /> +<glyph unicode="j" horiz-adv-x="487" d="M-6 -244q59 20 102 65.5t43 104.5v1078h211v-1090q0 -57 -21.5 -105.5t-51 -79t-76.5 -58t-81 -41t-81 -27.5zM102 1251q0 57 44 99.5t102 42.5q55 0 96 -38t41 -93q0 -57 -44 -99.5t-101 -42.5q-55 0 -96.5 38t-41.5 93z" /> +<glyph unicode="k" horiz-adv-x="964" d="M156 0v1423h215v-745l282 326h265l-369 -429l407 -493v-82h-206l-379 471v-471h-215z" /> +<glyph unicode="l" horiz-adv-x="483" d="M125 420v1003h211v-1003q0 -182 70 -420h-222q-59 152 -59 420z" /> +<glyph unicode="m" horiz-adv-x="1579" d="M156 0v1004h215v-72q35 31 115.5 66.5t136.5 35.5q143 0 235 -119q2 2 28.5 18.5t38.5 22.5l38 22q27 15 44 22.5t41.5 16.5t47 13t43.5 4q291 0 291 -284v-750h-216v750q0 55 -18 76.5t-70 21.5q-86 0 -213 -92v-756h-215v721q0 127 -88 127q-53 0 -126.5 -39 t-112.5 -72v-737h-215z" /> +<glyph unicode="n" horiz-adv-x="1062" d="M154 0v1004h215v-74q53 43 132 73.5t142 30.5q158 0 214 -78.5t56 -214.5v-741h-215v741q0 61 -15 84t-65 23q-115 0 -249 -107v-741h-215z" /> +<glyph unicode="o" horiz-adv-x="999" d="M90 502q0 131 43 248.5t139.5 200.5t227.5 83t227 -83t139 -200.5t43 -248.5q0 -133 -43 -251t-139 -200t-227 -82t-227.5 82t-139.5 200t-43 251zM305 502q0 -143 53.5 -245.5t141.5 -102.5t141 102t53 246q0 141 -53 244.5t-141 103.5t-141.5 -103.5t-53.5 -244.5z" /> +<glyph unicode="p" horiz-adv-x="1056" d="M158 -358v1362h217v-74q96 104 221 104q178 0 275.5 -149.5t97.5 -337.5q0 -102 -17.5 -195.5t-57.5 -183.5t-120 -144.5t-190 -54.5q-154 0 -209 103v-430h-217zM375 489q0 -78 12 -145.5t60.5 -127.5t127.5 -60q55 0 92.5 41t52.5 106.5t21.5 117.5t6.5 105 q0 315 -173 316q-94 0 -200 -103v-250z" /> +<glyph unicode="q" horiz-adv-x="1054" d="M88 465q0 133 41 258t138.5 218t234.5 93q80 0 179 -19.5t159 -39.5l59 -19v-1314h-217v430q-33 -45 -92.5 -74t-116.5 -29q-133 0 -223 77t-126 184.5t-36 234.5zM307 492q0 -49 7.5 -99.5t23.5 -108t53 -93t90 -35.5q51 0 86 26q115 84 115 307v338q-12 4 -30.5 8.5 t-71.5 12.5q-27 4 -47.5 4t-34.5 -4q-55 -8 -94 -47t-59.5 -94.5t-29 -108.5t-8.5 -106z" /> +<glyph unicode="r" horiz-adv-x="653" d="M150 0v1004h217v-74q90 104 155 104l121 -30l-35 -203q-66 37 -114 37q-25 0 -56.5 -22.5t-52.5 -45.5l-20 -22v-748h-215z" /> +<glyph unicode="s" horiz-adv-x="858" d="M90 739q0 141 104.5 218t251.5 77q88 0 177.5 -36.5t134.5 -102.5l-113 -111q-37 37 -93 60.5t-110 23.5q-51 0 -95 -31.5t-44 -80.5q0 -57 96 -103l250 -127q68 -35 106 -102.5t38 -144.5q0 -147 -109 -228.5t-262 -81.5q-72 0 -156 36t-147 87l80 144q131 -94 229 -95 q66 0 110 29t44 92q0 70 -103 123l-278 145q-53 29 -82 86t-29 123z" /> +<glyph unicode="t" horiz-adv-x="626" d="M35 850v154h137v180h203v-180h182v-183h-178v-594q0 -72 51 -71l107 26l51 -151q-106 -51 -156 -58q-27 -4 -63 -4q-104 0 -154.5 71t-50.5 181v606z" /> +<glyph unicode="u" horiz-adv-x="1062" d="M152 258v746h215v-746q0 -53 17 -75.5t71 -22.5q104 0 241 102v742h215v-818q0 -68 41 -98l-65 -119q-47 4 -96.5 43t-61.5 80q-66 -49 -149.5 -86t-151.5 -37q-147 0 -211.5 71t-64.5 218z" /> +<glyph unicode="v" horiz-adv-x="925" d="M18 1004h232l219 -695q139 352 211 695h229q-143 -520 -368 -1004h-158z" /> +<glyph unicode="w" horiz-adv-x="1372" d="M12 1004h228l184 -682l162 682h205l176 -682q119 377 157 682h226q-66 -487 -297 -1004h-205l-103 369q-12 45 -25 113.5t-20 115.5l-8 47q-27 -178 -55 -276l-105 -369h-213z" /> +<glyph unicode="x" horiz-adv-x="868" d="M20 0l291 518l-272 486h242l151 -302l154 302h235l-272 -474l307 -530h-246l-180 340l-174 -340h-236z" /> +<glyph unicode="y" horiz-adv-x="929" d="M23 1004h227l180 -564q43 -137 53 -207q125 360 205 771h219q-33 -147 -79 -314.5t-115.5 -381.5t-158.5 -383t-175 -230q-33 -25 -86 -46.5t-90 -29.5l-37 -10l-47 162q90 29 139 71q47 41 113 158z" /> +<glyph unicode="z" horiz-adv-x="872" d="M70 0v170q221 379 432 641h-393v193h663v-175q-281 -356 -444 -634h487v-195h-745z" /> +<glyph unicode="{" horiz-adv-x="681" d="M61 518v141q66 0 113 58.5t47 148.5v357q0 168 62.5 227t160.5 59h144l35 -172h-156q-39 0 -49 -26.5t-10 -114.5v-356q0 -88 -46.5 -160t-93.5 -94q53 -33 96.5 -97.5t43.5 -152.5v-356q0 -86 12 -113t57 -27h146l-35 -172h-70h-69q-98 0 -163 58.5t-65 226.5v356 q0 90 -47 149.5t-113 59.5z" /> +<glyph unicode="|" horiz-adv-x="454" d="M135 -29v1569h184v-1569h-184z" /> +<glyph unicode="}" horiz-adv-x="681" d="M53 -160h146q45 0 57 27t12 113v356q0 88 42 152.5t96 97.5q-47 23 -92.5 94.5t-45.5 159.5v356q0 88 -10 114.5t-49 26.5h-156l35 172h143q98 0 161 -59t63 -227v-357q0 -90 47 -148.5t112 -58.5v-141q-66 0 -112.5 -59.5t-46.5 -149.5v-356q0 -168 -64.5 -226.5 t-163.5 -58.5h-71h-68z" /> +<glyph unicode="~" horiz-adv-x="1363" d="M285 459v207l22 32q14 20 64.5 53t105.5 33q84 0 220.5 -65.5t199.5 -65.5q109 0 178 119l6 12v-217l-21 -30q-13 -18 -61.5 -49t-101.5 -31q-94 0 -230.5 66.5t-191.5 66.5q-35 0 -67.5 -13.5t-54 -33t-38 -39t-24.5 -33.5z" /> +<glyph unicode="¡" horiz-adv-x="540" d="M94 852q0 61 48 107.5t109.5 46.5t101.5 -37t40 -98.5t-48 -107.5t-109.5 -46t-101.5 38t-40 97zM104 -459q41 211 41 414v639h185q27 -510 26 -668q0 -254 -30 -356z" /> +<glyph unicode="¢" horiz-adv-x="843" d="M86 492q0 231 102 368q109 154 277 172v137h92v-139q70 -8 129 -37.5t84 -54.5l25 -27l-109 -129q-53 47 -129 66v-690q41 10 88 33.5t72 41.5l26 21l74 -148q-115 -104 -260 -131v-127h-92v123q-150 12 -254 138q-125 145 -125 383zM301 512q0 -127 45 -226.5 t119 -125.5v688q-68 -23 -116 -110t-48 -226z" /> +<glyph unicode="£" horiz-adv-x="905" d="M25 745l59 148h78v252q0 141 105.5 207.5t240.5 66.5q150 0 242 -78l-56 -149q-86 51 -174 51q-143 0 -143 -127v-223h260v-184h-260v-195q0 -154 -37 -328h100l90 -30q38 -12 73 -13q96 0 167 97l18 28l43 -172q-2 -4 -7 -10l-20 -25q-15 -18 -32.5 -31.5t-46.5 -31.5 t-58.5 -25.5t-68.5 -11.5q-9 -1 -17 -1l-61 11l-106 29h-332q80 352 80 524v195z" /> +<glyph unicode="¤" horiz-adv-x="1110" d="M6 463l78 172h111v55v58h-181l82 176h123q33 217 180.5 353t378.5 136q197 0 344 -141l-75 -168q-68 70 -128.5 98.5t-150.5 28.5q-270 0 -338 -307h551l-82 -174h-491q-7 -36 -8 -70q0 -23 3 -45h445l-82 -174h-336q51 -303 318 -303q156 0 319 192v-241 q-139 -133 -330 -134q-205 0 -346 130.5t-172 357.5h-213z" /> +<glyph unicode="¥" horiz-adv-x="974" d="M31 1290h241l220 -583l221 583h231l-211 -487h197v-187h-277l-49 -114h326v-187h-334v-315h-221v315h-324v187h316l-50 114h-266v187h189z" /> +<glyph unicode="§" horiz-adv-x="860" d="M25 -158l77 160q160 -100 306 -100q72 0 111.5 33.5t39.5 91.5q0 43 -40 77.5t-150 88.5q-10 4 -56.5 26.5t-61.5 30.5t-54 30.5t-55 41.5l-38 45q-23 27 -30.5 57.5t-7.5 67.5q0 98 62 172.5t163 105.5q-217 96 -217 242q0 141 100 225t256 84q158 0 326 -94l-84 -160 q-150 74 -246 74q-66 0 -102.5 -35t-36.5 -90q0 -10 4 -20.5t12 -19.5t15.5 -16.5t21.5 -15.5t20.5 -12t22.5 -11.5t18 -9.5l63 -30l73 -37l67 -38q45 -26 68.5 -48.5t50.5 -52t39 -62.5t12 -70q0 -96 -62.5 -179t-154.5 -113q59 -33 97 -57.5t75 -72t37 -98.5 q0 -154 -100.5 -245t-266.5 -91q-167 0 -374 125zM276 514q0 -41 32 -74.5t85 -33.5q84 0 134.5 36.5t50.5 92.5q0 43 -38 73.5t-94 30.5q-76 0 -123 -35t-47 -90z" /> +<glyph unicode="¨" horiz-adv-x="786" d="M76 1276q0 57 43 103t100 46q47 0 81 -32.5t34 -77.5q0 -57 -46 -100.5t-104 -43.5q-45 0 -76.5 30t-31.5 75zM422 1276q0 57 43 103t100 46q47 0 80 -32.5t33 -77.5q0 -57 -46 -100.5t-104 -43.5q-45 0 -75.5 30t-30.5 75z" /> +<glyph unicode="©" horiz-adv-x="1800" d="M242 503.5q0 274.5 194.5 468t467 193.5t467 -193.5t194.5 -468t-194.5 -468t-467 -193.5t-467 193.5t-194.5 468zM403 504q0 -207 146.5 -353.5t353.5 -146.5t353.5 146.5t146.5 353.5t-146.5 353.5t-353.5 146.5t-353.5 -146.5t-146.5 -353.5zM600 514q0 150 85 253 t230 103q55 0 121 -29.5t111 -70.5l-82 -108q-88 63 -147 63q-72 0 -111 -67.5t-39 -143.5q0 -92 38 -162.5t122 -70.5q66 0 143 59l62 -117q-100 -88 -211 -88q-158 0 -240 107.5t-82 271.5z" /> +<glyph unicode="ª" horiz-adv-x="774" d="M70 936q0 66 47 151l336 146v78q0 76 -93 75q-98 0 -196 -94l-58 99q49 57 123 96t146 39q111 0 176 -54.5t65 -162.5v-445q0 -39 29 -39q18 0 29 9l43 -82q-55 -33 -111 -33q-53 0 -90 29.5t-47 80.5q-74 -113 -193 -112q-206 0 -206 219zM225 936q0 -35 18.5 -59.5 t51.5 -24.5q70 0 115 68.5t45 146.5v27l-219 -88q-11 -56 -11 -70z" /> +<glyph unicode="«" horiz-adv-x="1024" d="M27 496l403 409l145 -117l-296 -288l301 -297l-146 -117zM387 496l404 409l145 -117l-295 -288l299 -297l-145 -117z" /> +<glyph unicode="¬" horiz-adv-x="1095" d="M82 717v184h850v-555l-182 -35v406h-668z" /> +<glyph unicode="­" horiz-adv-x="618" d="M86 430v184h440v-184h-440z" /> +<glyph unicode="®" horiz-adv-x="1800" d="M242 503.5q0 274.5 194.5 468t467 193.5t467 -193.5t194.5 -468t-194.5 -468t-467 -193.5t-467 193.5t-194.5 468zM403 504q0 -207 146.5 -353.5t353.5 -146.5t353.5 146.5t146.5 353.5t-146.5 353.5t-353.5 146.5t-353.5 -146.5t-146.5 -353.5zM692 147v725h178 q125 0 203 -58t78 -179q0 -76 -39 -141.5t-106 -87.5l176 -183v-76h-138l-192 205v-205h-160zM852 530q16 -8 41 -8q47 0 71.5 33t24.5 80q0 94 -119 94h-18v-199z" /> +<glyph unicode="¯" horiz-adv-x="686" d="M43 1143v182h598v-182h-598z" /> +<glyph unicode="°" horiz-adv-x="720" d="M49 1038q0 125 89 214t214 89t214 -89t89 -214t-89 -214t-214 -89t-214 89t-89 214zM205 1038.5q0 -61.5 43 -104.5t104.5 -43t104.5 43t43 104.5t-43 104.5t-104.5 43t-104.5 -43t-43 -104.5z" /> +<glyph unicode="±" horiz-adv-x="915" d="M78 487v172h313v271h180v-271h316v-172h-316v-225h-180v225h-313zM98 0v170h768v-170h-768z" /> +<glyph unicode="²" d="M111 160q141 80 307 259t166 306q0 57 -39 88t-99 31q-70 0 -145.5 -32t-126.5 -81l-45 172q59 61 155.5 96t184.5 35q152 0 242 -75.5t90 -225.5q0 -154 -102.5 -300t-247.5 -240h385v-193h-686z" /> +<glyph unicode="³" d="M131 -178q111 2 213 34.5t181 114.5t79 199q0 152 -239 152q-90 0 -199 -11v164l108 17q100 55 236 163q70 57 70 115q0 35 -27 57.5t-61 22.5q-41 0 -114 -27.5t-124 -56.5l-53 -29l-54 162q74 43 121 66.5t118 45t136 21.5q125 0 199 -67.5t74 -171.5q0 -94 -80 -182.5 t-170 -123.5q115 -10 193.5 -93t78.5 -193q0 -141 -56 -250t-152.5 -171.5t-214.5 -92t-251 -29.5h-12v164z" /> +<glyph unicode="´" horiz-adv-x="692" d="M86 1255q96 70 182 152t123 129l37 47l172 -176q-184 -170 -416 -291z" /> +<glyph unicode="µ" horiz-adv-x="1058" d="M57 -371q92 145 93 277q0 45 -9.5 127t-9.5 141v49v781h215v-791q0 -53 84 -53q51 0 97 16.5t68.5 30.5t78.5 57v740h215v-818q0 -39 22.5 -47t55.5 15l67 -134q-78 -51 -155 -51q-59 0 -116.5 27t-78.5 76q-141 -102 -242 -103q-51 0 -88 19q12 -90 13 -152 q0 -80 -50 -164z" /> +<glyph unicode="¶" horiz-adv-x="1112" d="M61 778q-11 61 -11 122.5t11 122.5q23 122 125.5 207t255.5 85q45 0 95.5 -4t113 -11.5t94.5 -9.5v80h177v-78l106 19l-8 -168l-100 -23q-2 -340 -73 -715.5t-202 -642.5l-188 78q139 256 209.5 598t74.5 678q-27 2 -77 9.5t-91 11.5t-75 4q-116 -4 -116 -193 q0 -18 1 -39q14 -199 119 -221q9 -2 18 -1q64 0 152 71q-94 -272 -271 -273q-133 0 -225 85t-115 208z" /> +<glyph unicode="·" horiz-adv-x="528" d="M121 492q0 63 47 108t111 45q59 0 99 -38t40 -97q0 -63 -47 -108.5t-111 -45.5q-59 0 -99 38.5t-40 97.5z" /> +<glyph unicode="¸" horiz-adv-x="823" d="M375 -299q66 35 95.5 53.5t53 42t23.5 47.5q0 33 -40 37q-10 1 -20 1q-30 0 -61 -9l-39 -14l2 141h246q84 -61 84 -154q0 -78 -73 -142t-165 -103z" /> +<glyph unicode="¹" d="M201 799v155q117 0 250 41l26 9h174v-1004h-213v799h-237z" /> +<glyph unicode="º" horiz-adv-x="802" d="M94 1118.5q0 157.5 82 281.5t229.5 124t230.5 -124t83 -281.5t-83 -280.5t-230.5 -123t-229.5 123t-82 280.5zM258 1118.5q0 -108.5 41 -186.5t107 -78q68 0 108.5 78t40.5 186.5t-41 187t-108 78.5q-66 0 -107 -78.5t-41 -187z" /> +<glyph unicode="»" horiz-adv-x="1024" d="M98 788l146 117l407 -409l-403 -410l-146 117l295 289zM459 788l145 117l408 -409l-404 -410l-145 117l297 289z" /> +<glyph unicode="¼" horiz-adv-x="2537" d="M201 799v155q117 0 250 41l26 9h174v-1004h-213v799h-237zM743 -256l869 1769h198l-868 -1769h-199zM1675 166q145 373 494 838h209v-816h116v-188h-120v-283h-205v283h-483zM1896 188h273v502q-187 -281 -273 -502z" /> +<glyph unicode="½" horiz-adv-x="2537" d="M201 799v155q117 0 250 41l26 9h174v-1004h-213v799h-237zM743 -256l869 1769h198l-868 -1769h-199zM1726 160q141 80 307.5 259t166.5 306q0 57 -39 88t-99 31q-70 0 -145.5 -32t-126.5 -81l-45 172q59 61 155.5 96t184.5 35q152 0 242 -75.5t90 -225.5 q0 -154 -102.5 -300t-248.5 -240h385v-193h-686z" /> +<glyph unicode="¾" horiz-adv-x="2537" d="M131 -178q111 2 213 34.5t181 114.5t79 199q0 152 -239 152q-90 0 -199 -11v164l108 17q100 55 236 163q70 57 70 115q0 35 -27 57.5t-61 22.5q-41 0 -114 -27.5t-124 -56.5l-53 -29l-54 162q74 43 121 66.5t118 45t136 21.5q125 0 199 -67.5t74 -171.5q0 -94 -80 -182.5 t-170 -123.5q115 -10 193.5 -93t78.5 -193q0 -141 -56 -250t-152.5 -171.5t-214.5 -92t-251 -29.5h-12v164zM743 -256l869 1769h198l-868 -1769h-199zM1675 166q145 373 494 838h209v-816h116v-188h-120v-283h-205v283h-483zM1896 188h273v502q-187 -281 -273 -502z" /> +<glyph unicode="¿" horiz-adv-x="733" d="M57 -150q0 49 17.5 98.5t36 78t57.5 82.5l149 202q63 88 64 199v113h184v-111q0 -150 -17.5 -202t-105.5 -167l-108 -143q-63 -82 -64 -137q0 -100 78 -101q100 0 197 29v-172q-135 -33 -236 -33q-115 0 -183.5 73.5t-68.5 190.5zM330 881q0 61 48 107t109.5 46 t101.5 -36.5t40 -98t-48.5 -106.5t-109.5 -45t-101 37t-40 96z" /> +<glyph unicode="À" horiz-adv-x="1044" d="M23 0l407 1290h184l410 -1290h-229l-123 371h-295l-123 -371h-231zM262 1659l172 176q121 -168 342 -328l-98 -139q-254 133 -416 291zM426 567h195l-97 398z" /> +<glyph unicode="Á" horiz-adv-x="1044" d="M23 0l407 1290h184l410 -1290h-229l-123 371h-295l-123 -371h-231zM262 1507q96 70 182 152t123 129l37 47l172 -176q-184 -170 -416 -291zM426 567h195l-97 398z" /> +<glyph unicode="Â" horiz-adv-x="1044" d="M23 0l407 1290h184l410 -1290h-229l-123 371h-295l-123 -371h-231zM174 1505q195 135 346 334q14 -20 41 -53t117 -121t188 -158l-98 -139q-109 57 -248 188q-111 -119 -248 -190zM426 567h195l-97 398z" /> +<glyph unicode="Ã" horiz-adv-x="1044" d="M23 0l407 1290h184l410 -1290h-229l-123 371h-295l-123 -371h-231zM115 1581q90 72 149.5 102.5t118.5 30.5q63 0 146 -43t120 -43q45 0 70.5 12.5t99.5 61.5l88 -129q-90 -84 -141 -108.5t-131 -24.5q-47 0 -129 43t-129 43q-72 0 -184 -82zM426 567h195l-97 398z" /> +<glyph unicode="Ä" horiz-adv-x="1044" d="M23 0l407 1290h184l410 -1290h-229l-123 371h-295l-123 -371h-231zM215 1528q0 59 44 104t101 45q47 0 80 -32.5t33 -77.5q0 -57 -46 -100.5t-103 -43.5q-45 0 -77 30t-32 75zM426 567h195l-97 398zM561 1528q0 59 44 104t102 45q45 0 78.5 -32.5t33.5 -77.5 q0 -57 -46 -100.5t-103 -43.5q-45 0 -77 30t-32 75z" /> +<glyph unicode="Å" horiz-adv-x="1044" d="M23 0l407 1290h184l410 -1290h-229l-123 371h-295l-123 -371h-231zM283 1581q0 98 71.5 169t167.5 71t166 -72t70 -168q0 -98 -71 -169t-169 -71t-166.5 71t-68.5 169zM426 567h195l-97 398zM438 1581q0 -33 24.5 -58.5t55.5 -25.5q33 0 57.5 25.5t24.5 58.5t-23.5 57.5 t-52.5 24.5q-37 0 -61.5 -24.5t-24.5 -57.5z" /> +<glyph unicode="Æ" horiz-adv-x="1497" d="M18 0l408 1290h178l84 -262v262h698v-198h-473v-320h363v-201h-363v-368h494v-203h-717v393h-309l-131 -393h-232zM436 590h201l-100 375z" /> +<glyph unicode="Ç" horiz-adv-x="1017" d="M106 645q0 162 52.5 311.5t171.5 257t282 107.5q94 0 177 -23.5t120 -46.5l37 -22l-86 -154q-90 55 -248 55q-57 0 -120.5 -48t-102.5 -128q-59 -129 -59 -317q0 -78 12 -152.5t41 -151.5t89 -124t144 -47q135 0 246 78l103 -152q-90 -76 -236 -106q63 -59 64 -136 q0 -78 -73 -142t-165 -103l-106 100q66 35 95 53.5t53 42t24 47.5q0 33 -40 37q-10 1 -20 1q-30 0 -61 -9l-39 -14v131q-94 29 -165 97.5t-111 160.5t-59.5 191.5t-19.5 205.5z" /> +<glyph unicode="È" horiz-adv-x="929" d="M147 0v1290h697v-198h-473v-320h362v-201h-362v-368h493v-203h-717zM244 1659l172 176q127 -174 342 -328l-99 -139q-253 133 -415 291z" /> +<glyph unicode="É" horiz-adv-x="929" d="M147 0v1290h697v-198h-473v-320h362v-201h-362v-368h493v-203h-717zM244 1507q98 70 183 152t122 129l37 47l172 -176q-156 -156 -416 -291z" /> +<glyph unicode="Ê" horiz-adv-x="929" d="M147 0v1290h697v-198h-473v-320h362v-201h-362v-368h493v-203h-717zM152 1505q190 131 348 334q14 -20 40.5 -53t117 -121t186.5 -158l-99 -139q-111 59 -247 188q-111 -119 -246 -190z" /> +<glyph unicode="Ë" horiz-adv-x="929" d="M147 0v1290h697v-198h-473v-320h362v-201h-362v-368h493v-203h-717zM201 1528q0 59 43 104t100 45q47 0 80 -32.5t33 -77.5q0 -57 -46 -100.5t-104 -43.5q-45 0 -75.5 30t-30.5 75zM547 1528q0 59 43 104t100 45q47 0 80 -32.5t33 -77.5q0 -57 -46 -100.5t-104 -43.5 q-45 0 -75.5 30t-30.5 75z" /> +<glyph unicode="Ì" horiz-adv-x="487" d="M-12 1659l172 176q121 -168 342 -328l-101 -139q-253 135 -413 291zM133 0v1290h221v-1290h-221z" /> +<glyph unicode="Í" horiz-adv-x="487" d="M-12 1507q96 70 182 152t123 129l37 47l172 -176q-182 -168 -416 -291zM133 0v1290h221v-1290h-221z" /> +<glyph unicode="Î" horiz-adv-x="487" d="M-106 1505q190 131 348 334q14 -20 40.5 -53t116.5 -121t187 -158l-99 -139q-111 59 -247 188q-113 -121 -246 -190zM133 0v1290h221v-1290h-221z" /> +<glyph unicode="Ï" horiz-adv-x="487" d="M-61 1528q0 59 43 104t100 45q47 0 81 -32.5t34 -77.5q0 -57 -46.5 -100.5t-103.5 -43.5q-45 0 -76.5 30t-31.5 75zM133 0v1290h221v-1290h-221zM285 1528q0 59 43 104t100 45q47 0 81 -32.5t34 -77.5q0 -57 -46 -100.5t-104 -43.5q-45 0 -76.5 30t-31.5 75z" /> +<glyph unicode="Ñ" horiz-adv-x="1134" d="M152 0v1290h262l286 -651q33 -74 60 -186v837h223v-1290h-215l-408 903q14 -84 15 -170v-733h-223zM168 1581q92 72 150.5 102.5t119.5 30.5q63 0 145.5 -43t118.5 -43q45 0 73 12.5t97 61.5l89 -129q-90 -84 -141.5 -108.5t-129.5 -24.5q-47 0 -130 43t-128 43 q-74 0 -186 -82z" /> +<glyph unicode="Ò" horiz-adv-x="1122" d="M102 645q0 119 27 234.5t79 216t144 163t209 62.5q119 0 211 -61.5t144.5 -164t78 -216t25.5 -234.5t-25.5 -234.5t-78 -216t-144.5 -164t-211 -61.5t-211 61.5t-144 164t-78 216t-26 234.5zM297 1659l172 176q121 -168 342 -328l-98 -139q-254 133 -416 291zM326 645 q0 -84 11 -161.5t35.5 -152.5t74 -120t115 -45t114.5 45t73.5 120t36 152.5t11.5 161.5t-11.5 162t-36 152.5t-73.5 119.5t-114.5 45t-115 -45t-74 -119.5t-35.5 -152.5t-11 -162z" /> +<glyph unicode="Ó" horiz-adv-x="1122" d="M102 645q0 119 27 234.5t79 216t144 163t209 62.5q119 0 211 -61.5t144.5 -164t78 -216t25.5 -234.5t-25.5 -234.5t-78 -216t-144.5 -164t-211 -61.5t-211 61.5t-144 164t-78 216t-26 234.5zM301 1507q96 70 182 152t123 129l37 47l172 -176q-184 -170 -416 -291z M326 645q0 -84 11 -162t35.5 -152.5t74 -119.5t115 -45t114.5 45t73.5 119.5t36 152.5t11.5 162t-11.5 162t-36 152.5t-73.5 119.5t-114.5 45t-115 -45t-74 -119.5t-35.5 -152.5t-11 -162z" /> +<glyph unicode="Ô" horiz-adv-x="1122" d="M102 645q0 119 27 234.5t79 216t144 163t209 62.5q119 0 211 -61.5t144.5 -164t78 -216t25.5 -234.5t-25.5 -234.5t-78 -216t-144.5 -164t-211 -61.5t-211 61.5t-144 164t-78 216t-26 234.5zM219 1505q195 135 346 334q14 -20 41 -53t117 -121t188 -158l-98 -139 q-109 57 -248 188q-111 -119 -248 -190zM326 645q0 -84 11 -161.5t35.5 -152.5t74 -120t115 -45t114.5 45t73.5 120t36 152.5t11.5 161.5t-11.5 162t-36 152.5t-73.5 119.5t-114.5 45t-115 -45t-74 -119.5t-35.5 -152.5t-11 -162z" /> +<glyph unicode="Õ" horiz-adv-x="1122" d="M102 645q0 119 27 234.5t79 216t144 163t209 62.5q119 0 211 -61.5t144.5 -164t78 -216t25.5 -234.5t-25.5 -234.5t-78 -216t-144.5 -164t-211 -61.5t-211 61.5t-144 164t-78 216t-26 234.5zM156 1581q92 72 150.5 102.5t119.5 30.5q63 0 146 -43t120 -43q45 0 72 12.5 t96 61.5l88 -129q-90 -84 -140 -108.5t-130 -24.5q-47 0 -129 43t-129 43q-74 0 -184 -82zM326 645q0 -84 11 -161.5t35.5 -152.5t74 -120t115 -45t114.5 45t73.5 120t36 152.5t11.5 161.5t-11.5 162t-36 152.5t-73.5 119.5t-114.5 45t-115 -45t-74 -119.5t-35.5 -152.5 t-11 -162z" /> +<glyph unicode="Ö" horiz-adv-x="1122" d="M102 645q0 119 27 234.5t79 216t144 163t209 62.5q119 0 211 -61.5t144.5 -164t78 -216t25.5 -234.5t-25.5 -234.5t-78 -216t-144.5 -164t-211 -61.5t-211 61.5t-144 164t-78 216t-26 234.5zM260 1528q0 59 43 104t100 45q47 0 80 -32.5t33 -77.5q0 -57 -46 -100.5 t-103 -43.5q-45 0 -76 30t-31 75zM326 645q0 -84 11 -161.5t35.5 -152.5t74 -120t115 -45t114.5 45t73.5 120t36 152.5t11.5 161.5t-11.5 162t-36 152.5t-73.5 119.5t-114.5 45t-115 -45t-74 -119.5t-35.5 -152.5t-11 -162zM606 1528q0 59 43 104t101 45q47 0 79.5 -32.5 t32.5 -77.5q0 -57 -46 -100.5t-103 -43.5q-45 0 -76 30t-31 75z" /> +<glyph unicode="Ø" horiz-adv-x="1122" d="M102 655q0 111 26 221.5t77 214t143 167t213 63.5q66 0 133 -23l68 236h102l-82 -283q121 -90 179.5 -259t58.5 -345q0 -113 -24.5 -225.5t-76 -217t-144.5 -170t-214 -65.5q-72 0 -139 25l-80 -281h-102l94 332q-119 90 -175.5 261t-56.5 349zM326 635q0 -254 71 -373 l242 846q-33 16 -78 16q-235 0 -235 -489zM477 184q39 -18 84 -18q236 0 236 481q0 262 -76 385z" /> +<glyph unicode="Ù" horiz-adv-x="1142" d="M150 506v784h223v-784q0 -340 198.5 -340t198.5 340v784h223v-784q0 -231 -102.5 -384t-319.5 -153t-319 153t-102 384zM309 1659l172 176q125 -170 344 -328l-100 -139q-252 133 -416 291z" /> +<glyph unicode="Ú" horiz-adv-x="1142" d="M150 506v784h223v-784q0 -340 198.5 -340t198.5 340v784h223v-784q0 -231 -102.5 -384t-319.5 -153t-319 153t-102 384zM319 1507q98 70 183.5 152t122.5 129l37 47l172 -176q-156 -156 -414 -291z" /> +<glyph unicode="Û" horiz-adv-x="1142" d="M150 506v784h223v-784q0 -340 198.5 -340t198.5 340v784h223v-784q0 -231 -102.5 -384t-319.5 -153t-319 153t-102 384zM225 1505q195 135 346 334q14 -20 41 -53t117 -121t189 -158l-99 -139q-111 59 -248 188q-111 -119 -247 -190z" /> +<glyph unicode="Ü" horiz-adv-x="1142" d="M150 506v784h223v-784q0 -340 198.5 -340t198.5 340v784h223v-784q0 -231 -102.5 -384t-319.5 -153t-319 153t-102 384zM270 1528q0 59 44 104t102 45q47 0 79.5 -32.5t32.5 -77.5q0 -57 -46 -100.5t-103 -43.5q-45 0 -77 30t-32 75zM616 1528q0 59 44.5 104t101.5 45 q45 0 78.5 -32.5t33.5 -77.5q0 -57 -46 -100.5t-103 -43.5q-45 0 -77 30t-32 75z" /> +<glyph unicode="Ý" horiz-adv-x="964" d="M27 1290h239l215 -583l228 583h229l-344 -809v-481h-223v483zM385 1583q96 70 182 152t123 129l37 47l172 -176q-184 -170 -416 -291z" /> +<glyph unicode="ß" horiz-adv-x="1171" d="M27 846v158h129v131q0 143 113.5 226t260.5 83q180 0 299 -95.5t119 -271.5q0 -31 -5 -66.5t-11 -59.5l-18 -66q-11 -43 -15 -62q-68 31 -135 31q-113 0 -113 -98q0 -12 6.5 -24.5t14.5 -21t22.5 -18.5t22.5 -15t26.5 -14.5t20.5 -11.5l250 -135q57 -31 91 -88t34 -125 q0 -158 -103.5 -246t-265.5 -88q-172 0 -324 99l86 161q111 -76 246 -75q68 0 111 30.5t43 94.5q0 72 -92 120l-273 144q-129 68 -129 207q0 117 74 196.5t190 79.5q31 0 48 -2q8 31 8 70q0 168 -215 168q-68 0 -120 -42t-52 -110v-1110h-215v827z" /> +<glyph unicode="à" horiz-adv-x="954" d="M78 256q0 84 61 203l441 190v101q0 100 -119 100q-63 0 -136 -36t-124 -87l-74 129q63 76 160.5 127t191.5 51q145 0 231.5 -72.5t86.5 -213.5v-584q0 -53 39 -53q12 0 36 12l56 -109q-70 -43 -146 -43q-68 0 -117 39t-61 107q-96 -147 -254 -148q-135 0 -203.5 75 t-68.5 212zM229 1407l172 176q123 -168 342 -328l-98 -139q-258 137 -416 291zM281 258q0 -45 25.5 -79t68.5 -34q92 0 150.5 91.5t58.5 193.5v37l-287 -119q-16 -57 -16 -90z" /> +<glyph unicode="á" horiz-adv-x="954" d="M78 256q0 84 61 203l441 190v101q0 100 -119 100q-63 0 -136 -36t-124 -87l-74 129q63 76 160.5 127t191.5 51q145 0 231.5 -72.5t86.5 -213.5v-584q0 -53 39 -53q12 0 36 12l56 -109q-70 -43 -146 -43q-68 0 -117 39t-61 107q-96 -147 -254 -148q-135 0 -203.5 75 t-68.5 212zM240 1255q98 70 183 152t122 129l37 47l172 -176q-156 -156 -416 -291zM281 258q0 -45 25.5 -79t68.5 -34q92 0 150.5 91.5t58.5 193.5v37l-287 -119q-16 -57 -16 -90z" /> +<glyph unicode="â" horiz-adv-x="954" d="M78 256q0 84 61 203l441 190v101q0 100 -119 100q-63 0 -136 -36t-124 -87l-74 129q63 76 160.5 127t191.5 51q145 0 231.5 -72.5t86.5 -213.5v-584q0 -53 39 -53q12 0 36 12l56 -109q-70 -43 -146 -43q-68 0 -117 39t-61 107q-96 -147 -254 -148q-135 0 -203.5 75 t-68.5 212zM133 1253q186 127 348 334q14 -20 41 -53t117 -121t186 -158l-98 -139q-117 61 -248 187q-115 -119 -246 -189zM281 258q0 -45 25.5 -79t68.5 -34q92 0 150.5 91.5t58.5 193.5v37l-287 -119q-16 -57 -16 -90z" /> +<glyph unicode="ã" horiz-adv-x="954" d="M74 1329q92 72 150.5 102.5t119.5 30.5q63 0 145 -43t119 -43q45 0 73 12.5t97 61.5l88 -129q-90 -84 -140 -108.5t-130 -24.5q-47 0 -129 43t-129 43q-74 0 -186 -82zM78 256q0 84 61 203l441 190v101q0 100 -119 100q-63 0 -136 -36t-124 -87l-74 129q63 76 160.5 127 t191.5 51q145 0 231.5 -72.5t86.5 -213.5v-584q0 -53 39 -53q12 0 36 12l56 -109q-70 -43 -146 -43q-68 0 -117 39t-61 107q-96 -147 -254 -148q-135 0 -203.5 75t-68.5 212zM281 258q0 -45 25.5 -79t68.5 -34q92 0 150.5 91.5t58.5 193.5v37l-287 -119q-16 -57 -16 -90z " /> +<glyph unicode="ä" horiz-adv-x="954" d="M78 256q0 84 61 203l441 190v101q0 100 -119 100q-63 0 -136 -36t-124 -87l-74 129q63 76 160.5 127t191.5 51q145 0 231.5 -72.5t86.5 -213.5v-584q0 -53 39 -53q12 0 36 12l56 -109q-70 -43 -146 -43q-68 0 -117 39t-61 107q-96 -147 -254 -148q-135 0 -203.5 75 t-68.5 212zM180 1276q0 57 44 103t102 46q47 0 79.5 -32.5t32.5 -77.5q0 -57 -46 -100.5t-103 -43.5q-45 0 -77 30t-32 75zM281 258q0 -45 25.5 -79t68.5 -34q92 0 150.5 91.5t58.5 193.5v37l-287 -119q-16 -57 -16 -90zM526 1276q0 57 44 103t102 46q47 0 79.5 -32.5 t32.5 -77.5q0 -57 -46 -100.5t-103 -43.5q-45 0 -77 30t-32 75z" /> +<glyph unicode="å" horiz-adv-x="954" d="M78 256q0 84 61 203l441 190v101q0 100 -119 100q-63 0 -136 -36t-124 -87l-74 129q63 76 160.5 127t191.5 51q145 0 231.5 -72.5t86.5 -213.5v-584q0 -53 39 -53q12 0 36 12l56 -109q-70 -43 -146 -43q-68 0 -117 39t-61 107q-96 -147 -254 -148q-135 0 -203.5 75 t-68.5 212zM240 1349.5q0 98.5 71.5 169t167.5 70.5t166 -70.5t70 -169t-71 -169t-169 -70.5t-166.5 70.5t-68.5 169zM281 258q0 -45 25.5 -79t68.5 -34q92 0 150.5 91.5t58.5 193.5v37l-287 -119q-16 -57 -16 -90zM393 1349.5q0 -32.5 25.5 -57t56.5 -24.5q33 0 57.5 24.5 t24.5 57t-23.5 57.5t-52.5 25q-37 0 -62.5 -25t-25.5 -57.5z" /> +<glyph unicode="æ" horiz-adv-x="1511" d="M102 264q0 66 50 189l462 190v98q-16 41 -46.5 73t-67.5 32q-61 0 -137 -49t-132 -109l-88 146q68 84 169.5 142t201.5 58q182 0 260 -108q115 109 273 108q152 0 255 -118.5t109 -272.5l4 -135h-588q0 -53 10.5 -109.5t32 -114t64.5 -94t100 -36.5q137 0 256 71l74 -155 q-156 -100 -340 -101q-102 0 -188 50.5t-142 138.5l-129 -111q-90 -78 -186 -78q-129 0 -203 82t-74 213zM315 258q0 -43 21.5 -71.5t64.5 -28.5q20 0 45 9t54.5 29.5t47 34t49.5 41t38 31.5q-18 72 -23 164l-272 -117q-25 -74 -25 -92zM856 686h332q-10 68 -50 118 t-103.5 50t-109.5 -50t-69 -118z" /> +<glyph unicode="ç" horiz-adv-x="843" d="M86 492q0 133 40 251.5t137 204.5t237 86q76 0 127 -15t73 -32l95 -72l-109 -131q-90 70 -184 70q-76 0 -138.5 -95t-62.5 -247q0 -147 58.5 -254.5t148.5 -107.5q49 0 117.5 33.5t115.5 72.5l76 -152q-88 -74 -199 -112q74 -59 74 -146q0 -78 -72.5 -142t-164.5 -103 l-107 100q66 35 95.5 53.5t53 42t23.5 47.5q0 33 -40 37q-10 1 -20 1q-30 0 -59 -9l-41 -14v137q-92 37 -156.5 124t-91 181.5t-26.5 190.5z" /> +<glyph unicode="è" horiz-adv-x="960" d="M88 526q0 203 120 355.5t318 152.5q145 0 253 -118.5t112 -266.5q0 -23 1 -67.5t1 -67.5h-586q-2 -12 -2 -37q0 -66 17.5 -136.5t64.5 -129.5t115 -59q123 0 268 110l72 -139q-74 -61 -173.5 -107.5t-179.5 -46.5q-143 0 -237 89t-129 209t-35 259zM252 1407l172 176 q127 -174 342 -328l-98 -139q-254 133 -416 291zM336 692h342q-6 78 -49 130t-117 52q-131 0 -176 -182z" /> +<glyph unicode="é" horiz-adv-x="960" d="M88 526q0 203 120 355.5t318 152.5q145 0 253 -118.5t112 -266.5q0 -23 1 -67.5t1 -67.5h-586q-2 -12 -2 -37q0 -66 17.5 -136.5t64.5 -129.5t115 -59q123 0 268 110l72 -139q-74 -61 -173.5 -107.5t-179.5 -46.5q-143 0 -237 89t-129 209t-35 259zM276 1255 q96 70 182.5 152t123.5 129l36 47l173 -176q-184 -170 -416 -291zM336 692h342q-6 78 -49 130t-117 52q-131 0 -176 -182z" /> +<glyph unicode="ê" horiz-adv-x="960" d="M88 526q0 203 120 355.5t318 152.5q145 0 253 -118.5t112 -266.5q0 -23 1 -67.5t1 -67.5h-586q-2 -12 -2 -37q0 -66 17.5 -136.5t64.5 -129.5t115 -59q123 0 268 110l72 -139q-74 -61 -173.5 -107.5t-179.5 -46.5q-143 0 -237 89t-129 209t-35 259zM164 1253 q193 131 346 334q14 -20 41 -53t117 -121t188 -158l-98 -139q-117 61 -248 187q-115 -119 -248 -189zM336 692h342q-6 78 -49 130t-117 52q-131 0 -176 -182z" /> +<glyph unicode="ë" horiz-adv-x="960" d="M88 526q0 203 120 355.5t318 152.5q145 0 253 -118.5t112 -266.5q0 -23 1 -67.5t1 -67.5h-586q-2 -12 -2 -37q0 -66 17.5 -136.5t64.5 -129.5t115 -59q123 0 268 110l72 -139q-74 -61 -173.5 -107.5t-179.5 -46.5q-143 0 -237 89t-129 209t-35 259zM217 1276q0 57 44 103 t99 46q47 0 81 -32.5t34 -77.5q0 -57 -46 -100.5t-103 -43.5q-45 0 -77 30t-32 75zM336 692h342q-6 78 -49 130t-117 52q-131 0 -176 -182zM563 1276q0 57 44 103t100 46q47 0 80.5 -32.5t33.5 -77.5q0 -57 -46 -100.5t-103 -43.5q-45 0 -77 30t-32 75z" /> +<glyph unicode="ì" horiz-adv-x="487" d="M-16 1407l172 176q127 -174 342 -328l-99 -139q-259 135 -415 291zM137 0v1004h213v-1004h-213z" /> +<glyph unicode="í" horiz-adv-x="487" d="M-10 1255q98 70 183 152t122 129l37 47l172 -176q-156 -156 -416 -291zM137 0v1004h213v-1004h-213z" /> +<glyph unicode="î" horiz-adv-x="487" d="M-98 1253q186 127 348 334q14 -20 40.5 -53t117 -121t186.5 -158l-98 -139q-117 61 -248 187q-115 -119 -248 -189zM137 0v1004h213v-1004h-213z" /> +<glyph unicode="ï" horiz-adv-x="487" d="M-55 1276q0 57 44 103t101 46q47 0 80 -32.5t33 -77.5q0 -57 -46 -100.5t-104 -43.5q-45 0 -76.5 30t-31.5 75zM137 0v1004h213v-1004h-213zM291 1276q0 57 44 103t101 46q47 0 80 -32.5t33 -77.5q0 -57 -46 -100.5t-104 -43.5q-45 0 -76.5 30t-31.5 75z" /> +<glyph unicode="ñ" horiz-adv-x="1062" d="M141 1329q90 72 149.5 102.5t119.5 30.5q63 0 146 -43t120 -43q45 0 72.5 12.5t97.5 61.5l88 -129q-90 -84 -141.5 -108.5t-130.5 -24.5q-45 0 -128 43t-131 43q-72 0 -184 -82zM154 0v1004h215v-74q53 43 132 73.5t142 30.5q158 0 214 -78.5t56 -214.5v-741h-215v741 q0 61 -15 84t-65 23q-115 0 -249 -107v-741h-215z" /> +<glyph unicode="ò" horiz-adv-x="999" d="M90 502q0 131 43 248.5t139.5 200.5t227.5 83t227 -83t139 -200.5t43 -248.5q0 -133 -43 -251t-139 -200t-227 -82t-227.5 82t-139.5 200t-43 251zM250 1407l172 176q125 -170 344 -328l-100 -139q-258 137 -416 291zM305 502q0 -143 53.5 -245.5t141.5 -102.5t141 102 t53 246q0 141 -53 244.5t-141 103.5t-141.5 -103.5t-53.5 -244.5z" /> +<glyph unicode="ó" horiz-adv-x="999" d="M90 502q0 131 43 248.5t139.5 200.5t227.5 83t227 -83t139 -200.5t43 -248.5q0 -133 -43 -251t-139 -200t-227 -82t-227.5 82t-139.5 200t-43 251zM250 1255q96 70 182 152t123 129l37 47l172 -176q-184 -170 -416 -291zM305 502q0 -143 53.5 -245.5t141.5 -102.5 t141 102t53 246q0 141 -53 244.5t-141 103.5t-141.5 -103.5t-53.5 -244.5z" /> +<glyph unicode="ô" horiz-adv-x="999" d="M90 502q0 131 43 248.5t139.5 200.5t227.5 83t227 -83t139 -200.5t43 -248.5q0 -133 -43 -251t-139 -200t-227 -82t-227.5 82t-139.5 200t-43 251zM162 1253q186 127 348 334q14 -20 41 -53t117 -121t186 -158l-98 -139q-117 61 -248 187q-115 -119 -248 -189zM305 502 q0 -143 53.5 -245.5t141.5 -102.5t141 102t53 246q0 141 -53 244.5t-141 103.5t-141.5 -103.5t-53.5 -244.5z" /> +<glyph unicode="õ" horiz-adv-x="999" d="M90 502q0 131 43 248.5t139.5 200.5t227.5 83t227 -83t139 -200.5t43 -248.5q0 -133 -43 -251t-139 -200t-227 -82t-227.5 82t-139.5 200t-43 251zM113 1329q90 72 149.5 102.5t118.5 30.5q63 0 146 -43t120 -43q45 0 70.5 12.5t99.5 61.5l88 -129q-90 -84 -141 -108.5 t-131 -24.5q-47 0 -129 43t-129 43q-72 0 -185 -82zM305 502q0 -143 53.5 -245.5t141.5 -102.5t141 102t53 246q0 141 -53 244.5t-141 103.5t-141.5 -103.5t-53.5 -244.5z" /> +<glyph unicode="ö" horiz-adv-x="999" d="M90 502q0 131 43 248.5t139.5 200.5t227.5 83t227 -83t139 -200.5t43 -248.5q0 -133 -43 -251t-139 -200t-227 -82t-227.5 82t-139.5 200t-43 251zM199 1276q0 57 44 103t101 46q45 0 79 -32.5t34 -77.5q0 -57 -46 -100.5t-104 -43.5q-45 0 -76.5 30t-31.5 75zM305 502 q0 -143 53.5 -245.5t141.5 -102.5t141 102t53 246q0 141 -53 244.5t-141 103.5t-141.5 -103.5t-53.5 -244.5zM545 1276q0 57 44 103t99 46q47 0 81 -32.5t34 -77.5q0 -57 -46 -100.5t-104 -43.5q-45 0 -76.5 30t-31.5 75z" /> +<glyph unicode="÷" horiz-adv-x="1001" d="M96 420v184h807v-184h-807zM342 213q0 63 47 108.5t111 45.5q59 0 99 -38t40 -98q0 -61 -47 -106t-111 -45q-59 0 -99 37t-40 96zM342 799q0 63 47 108t111 45q59 0 99 -37.5t40 -97.5q0 -63 -47 -108t-111 -45q-59 0 -99 38t-40 97z" /> +<glyph unicode="ø" horiz-adv-x="999" d="M90 500q0 129 42 246.5t138.5 202.5t229.5 85q49 0 96 -12l49 172h103l-60 -213q111 -68 166 -202t55 -279q0 -205 -107.5 -368t-301.5 -163q-49 0 -99 13l-57 -205h-102l69 246q-111 68 -166 201t-55 276zM305 500q0 -182 64 -275l176 619q-20 6 -45 6q-59 0 -100.5 -36 t-59.5 -94t-26.5 -111.5t-8.5 -108.5zM453 160q18 -8 47 -8q59 0 100 35.5t59.5 94t26.5 110.5t8 108q0 184 -65 278z" /> +<glyph unicode="ù" horiz-adv-x="1058" d="M152 258v746h215v-746q0 -53 17 -75.5t71 -22.5q104 0 241 102v742h215v-818q0 -68 41 -98l-65 -119q-47 4 -96.5 43t-61.5 80q-66 -49 -149.5 -86t-151.5 -37q-147 0 -211.5 71t-64.5 218zM276 1407l173 176q121 -168 342 -328l-99 -139q-260 135 -416 291z" /> +<glyph unicode="ú" horiz-adv-x="1058" d="M152 258v746h215v-746q0 -53 17 -75.5t71 -22.5q104 0 241 102v742h215v-818q0 -68 41 -98l-65 -119q-47 4 -96.5 43t-61.5 80q-66 -49 -149.5 -86t-151.5 -37q-147 0 -211.5 71t-64.5 218zM268 1255q96 70 182.5 152t122.5 129l37 47l172 -176q-156 -156 -415 -291z" /> +<glyph unicode="û" horiz-adv-x="1058" d="M152 258v746h215v-746q0 -53 17 -75.5t71 -22.5q104 0 241 102v742h215v-818q0 -68 41 -98l-65 -119q-47 4 -96.5 43t-61.5 80q-66 -49 -149.5 -86t-151.5 -37q-147 0 -211.5 71t-64.5 218zM176 1253q184 127 346 334q14 -20 41 -53t117 -121t188 -158l-100 -139 q-119 63 -246 187q-125 -125 -248 -189z" /> +<glyph unicode="ü" horiz-adv-x="1058" d="M152 258v746h215v-746q0 -53 17 -75.5t71 -22.5q104 0 241 102v742h215v-818q0 -68 41 -98l-65 -119q-47 4 -96.5 43t-61.5 80q-66 -49 -149.5 -86t-151.5 -37q-147 0 -211.5 71t-64.5 218zM223 1276q0 57 43 103t101 46q47 0 80.5 -32.5t33.5 -77.5q0 -57 -46 -100.5 t-103 -43.5q-45 0 -77 30t-32 75zM569 1276q0 57 43 103t101 46q47 0 79.5 -32.5t32.5 -77.5q0 -57 -46 -100.5t-103 -43.5q-45 0 -76 30t-31 75z" /> +<glyph unicode="ý" horiz-adv-x="929" d="M23 1004h227l180 -564q43 -137 53 -207q125 360 205 771h219q-33 -147 -79 -314.5t-115.5 -381.5t-158.5 -383t-175 -230q-33 -25 -86 -46.5t-90 -29.5l-37 -10l-47 162q90 29 139 71q47 41 113 158zM367 1296q96 70 182 152t123 129l37 47l172 -176q-184 -170 -416 -291 z" /> +<glyph unicode="ÿ" horiz-adv-x="929" d="M23 1004h227l180 -564q43 -137 53 -207q125 360 205 771h219q-33 -147 -79 -314.5t-115.5 -381.5t-158.5 -383t-175 -230q-33 -25 -86 -46.5t-90 -29.5l-37 -10l-47 162q90 29 139 71q47 41 113 158zM182 1276q0 57 44 103t100 46q47 0 80.5 -32.5t33.5 -77.5 q0 -57 -46 -100.5t-103 -43.5q-45 0 -77 30t-32 75zM528 1276q0 57 43 103t101 46q47 0 80.5 -32.5t33.5 -77.5q0 -57 -46 -100.5t-103 -43.5q-45 0 -77 30t-32 75z" /> +<glyph unicode="Œ" horiz-adv-x="1290" d="M102 653q0 106 25 212t74 204t137 159.5t203 61.5h663v-198h-473v-320h363v-201h-363v-368h494v-203h-684q-117 0 -206 63.5t-137 165t-72 208.5t-24 216zM319 633q0 -408 189 -440v903q-189 -35 -189 -463z" /> +<glyph unicode="œ" horiz-adv-x="1558" d="M102 494q0 129 43 248.5t139.5 205.5t229.5 86q178 0 285 -139q123 139 303 139q152 0 255 -118.5t109 -272.5l7 -135h-590q0 -72 17.5 -147.5t67.5 -141t122 -65.5q139 0 256 71l73 -155q-162 -100 -354 -101q-156 0 -272 133q-113 -133 -279 -133q-129 0 -226.5 83 t-141.5 200t-44 242zM317 493.5q0 -55.5 8.5 -107.5t28 -108.5t60.5 -91t100 -34.5q121 0 174 165q-23 96 -22 185q0 100 22 178q-49 170 -174 170q-57 0 -99 -37t-61.5 -96.5t-28 -113.5t-8.5 -109.5zM913 686h332q-10 68 -51 118t-104.5 50t-107.5 -49t-69 -119z" /> +<glyph unicode="Ÿ" horiz-adv-x="964" d="M27 1290h239l215 -583l228 583h229l-344 -809v-481h-223v483zM186 1528q0 59 43 104t101 45q47 0 79.5 -32.5t32.5 -77.5q0 -57 -46 -100.5t-103 -43.5q-45 0 -76 30t-31 75zM532 1528q0 59 43 104t101 45q47 0 79.5 -32.5t32.5 -77.5q0 -57 -46 -100.5t-103 -43.5 q-45 0 -76 30t-31 75z" /> +<glyph unicode="ˆ" horiz-adv-x="823" d="M92 1253q193 131 346 334q14 -20 41 -53t117 -121t188 -158l-98 -139q-117 61 -248 187q-115 -119 -248 -189z" /> +<glyph unicode="˜" horiz-adv-x="778" d="M-14 1329q92 72 150.5 102.5t117.5 30.5q63 0 146 -43t120 -43q45 0 73 12.5t97 61.5l88 -129q-90 -84 -141 -108.5t-129 -24.5q-47 0 -130 43t-128 43q-74 0 -187 -82z" /> +<glyph unicode="–" horiz-adv-x="733" d="M0 430v184h733v-184h-733z" /> +<glyph unicode="—" horiz-adv-x="1245" d="M0 432v184h1245v-184h-1245z" /> +<glyph unicode="‘" horiz-adv-x="546" d="M70 1006q109 213 290 397l127 -88q-137 -195 -137 -328q0 -18 4 -51q-61 -49 -121 -49q-43 0 -87.5 37t-75.5 82z" /> +<glyph unicode="’" horiz-adv-x="552" d="M63 891q137 199 138 330q0 25 -6 49q68 51 122 51q43 0 88.5 -37t75.5 -82q-109 -209 -291 -399z" /> +<glyph unicode="‚" horiz-adv-x="528" d="M27 -229q137 199 137 327q0 35 -4 52q61 49 123 49q43 0 89 -37t74 -82q-109 -213 -290 -397z" /> +<glyph unicode="“" horiz-adv-x="913" d="M66 1006q109 213 290 397l127 -88q-137 -195 -137 -328q0 -18 4 -51q-61 -49 -121 -49q-43 0 -87.5 37t-75.5 82zM440 1006q117 221 293 397l127 -88q-137 -195 -137 -328q0 -18 4 -51q-61 -49 -123 -49q-80 0 -164 119z" /> +<glyph unicode="”" horiz-adv-x="913" d="M59 891q137 199 138 330q0 25 -7 49q68 51 123 51q43 0 88 -37t76 -82q-109 -209 -291 -399zM434 891q139 203 139 330q0 25 -6 49q63 51 123 51q41 0 88 -37t76 -82q-109 -209 -291 -399z" /> +<glyph unicode="„" horiz-adv-x="888" d="M27 -223q137 195 137 327q0 35 -4 52q61 49 123 49q41 0 88 -37t75 -82q-109 -213 -290 -397zM371 -223q137 195 137 327q0 18 -4 52q61 49 121 49q43 0 88 -37t75 -82q-109 -213 -290 -397z" /> +<glyph unicode="•" horiz-adv-x="868" d="M63 645.5q0 151.5 109 260t260.5 108.5t261 -108.5t109.5 -260t-109.5 -260.5t-261 -109t-260.5 109t-109 260.5z" /> +<glyph unicode="…" horiz-adv-x="1236" d="M100 104.5q0 61.5 47.5 106.5t110.5 45q59 0 99 -37t40 -96q0 -61 -47 -107.5t-108.5 -46.5t-101.5 37t-40 98.5zM451 104.5q0 61.5 47 106.5t110 45q59 0 99.5 -37t40.5 -96q0 -61 -47.5 -107.5t-109 -46.5t-101 37t-39.5 98.5zM797 104.5q0 61.5 47 106.5t110 45 q59 0 99.5 -37t40.5 -96q0 -61 -47.5 -107.5t-108.5 -46.5t-101 37t-40 98.5z" /> +<glyph unicode="‹" horiz-adv-x="614" d="M33 512l403 410l146 -117l-295 -289l299 -297l-146 -117z" /> +<glyph unicode="›" horiz-adv-x="614" d="M29 219l297 293l-293 293l145 117l404 -410l-408 -410z" /> +<glyph unicode="™" horiz-adv-x="1642" d="M145 1278v129h500v-129h-182v-684h-137v684h-181zM713 596v813h166l192 -551l19 -72q6 35 18 72l192 551h166v-813h-139v448l8 95l-186 -543h-117l-188 543l10 -95v-448h-141z" /> +<glyph unicode="" horiz-adv-x="1004" d="M0 1005h1005v-1005h-1005v1005z" /> +<glyph unicode="fi" horiz-adv-x="1069" d="M37 846v158h127v92q0 96 38 166.5t101.5 107.5t133 54.5t147.5 17.5q51 0 107.5 -8.5t119.5 -25.5t104 -55t41 -91q0 -61 -44 -100.5t-105 -39.5q-59 0 -86 29t-38 64.5t-24 44.5q-45 27 -112 26q-66 0 -116 -60.5t-50 -178.5v-43h188v-181h-188v-823h-217v827zM713 0 v1004h211v-1004h-211z" /> +<glyph unicode="fl" horiz-adv-x="1069" d="M37 846v158h129v73q0 174 100.5 264.5t253.5 90.5q119 0 191 -91l4 -4v84h211v-1001q0 -182 69 -420h-221q-59 152 -59 420v774q-51 74 -156 74q-100 0 -139 -57.5t-39 -163.5v-43h188v-181h-188v-823h-215v827z" /> +<glyph unicode="ffi" horiz-adv-x="1658" d="M27 850v154h131v114q0 63 21.5 116.5t54 86.5t73.5 58.5t82 38t74 19.5t53 9h23l36 -156q-8 0 -21 -2t-49 -13t-62.5 -28.5t-48 -54.5t-21.5 -84v-104h186v-181h-186v-823h-215v827zM612 850v154h131v114q0 63 21.5 116.5t54.5 86.5t74 58.5t82 38t73.5 19.5t53.5 9h22 l37 -156q-8 0 -21.5 -2t-49 -13t-62.5 -28.5t-48.5 -54.5t-21.5 -84v-104h187v-181h-187v-823h-215v827zM1274 1251q0 57 44 99.5t101 42.5q55 0 96 -38t41 -93q0 -57 -44 -99.5t-101 -42.5q-55 0 -96 38t-41 93zM1309 0v1004h211v-1004h-211z" /> +<glyph unicode="ffl" horiz-adv-x="1654" d="M27 850v154h131v114q0 63 21.5 116.5t54 86.5t73.5 58.5t82 38t74 19.5t53 9h23l36 -156q-8 0 -21 -2t-49 -13t-62.5 -28.5t-48 -54.5t-21.5 -84v-104h186v-181h-186v-823h-215v827zM612 850v154h131v114q0 63 21.5 116.5t54.5 86.5t74 58.5t82 38t73.5 19.5t53.5 9h22 l37 -156q-8 0 -21.5 -2t-49 -13t-62.5 -28.5t-48.5 -54.5t-21.5 -84v-104h187v-181h-187v-823h-215v827zM1296 420v1003h211v-1003q0 -182 70 -420h-221q-60 152 -60 420z" /> +</font> +</defs></svg>
\ No newline at end of file diff --git a/public/stylesheets/fonts/delicious-bold-webfont.ttf b/public/stylesheets/fonts/delicious-bold-webfont.ttf Binary files differnew file mode 100755 index 000000000..2ec5d3e49 --- /dev/null +++ b/public/stylesheets/fonts/delicious-bold-webfont.ttf diff --git a/public/stylesheets/fonts/delicious-bold-webfont.woff b/public/stylesheets/fonts/delicious-bold-webfont.woff Binary files differnew file mode 100755 index 000000000..b47277ef1 --- /dev/null +++ b/public/stylesheets/fonts/delicious-bold-webfont.woff diff --git a/public/stylesheets/fonts/delicious-bolditalic-webfont.eot b/public/stylesheets/fonts/delicious-bolditalic-webfont.eot Binary files differnew file mode 100755 index 000000000..8e8957864 --- /dev/null +++ b/public/stylesheets/fonts/delicious-bolditalic-webfont.eot diff --git a/public/stylesheets/fonts/delicious-bolditalic-webfont.svg b/public/stylesheets/fonts/delicious-bolditalic-webfont.svg new file mode 100755 index 000000000..7368c90f2 --- /dev/null +++ b/public/stylesheets/fonts/delicious-bolditalic-webfont.svg @@ -0,0 +1,222 @@ +<?xml version="1.0" standalone="no"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" > +<svg xmlns="http://www.w3.org/2000/svg"> +<metadata> +This is a custom SVG webfont generated by Font Squirrel. +Copyright : 40 I1995 Jos Buivenga +</metadata> +<defs> +<font id="DeliciousBoldItalic" horiz-adv-x="921" > +<font-face units-per-em="2048" ascent="1638" descent="-410" /> +<missing-glyph horiz-adv-x="614" /> +<glyph unicode=" " horiz-adv-x="614" /> +<glyph unicode="	" horiz-adv-x="614" /> +<glyph unicode=" " horiz-adv-x="614" /> +<glyph unicode="!" horiz-adv-x="514" d="M74 104.5q0 61.5 50 105.5t114 44q61 0 101 -37t40 -96q0 -61 -50 -106.5t-114 -45.5q-61 0 -101 37t-40 98.5zM168 381l14 309q6 160 10.5 223.5t21.5 176t50 217.5l31 102l237 27q-100 -254 -135 -602q-20 -219 -45 -453h-184z" /> +<glyph unicode=""" horiz-adv-x="583" d="M166 999l4 314l51 137h141l11 -147l-90 -304h-117zM453 999l4 314l51 137h141l10 -147l-90 -304h-116z" /> +<glyph unicode="#" horiz-adv-x="1138" d="M106 412l29 206h164l25 216h-140l37 206h129l39 379h189l-39 -379h137l41 344h188l-41 -344h160l-18 -206h-164l-27 -216h129l-18 -206h-138l-51 -412h-188l51 412h-139l-51 -359h-189l51 359h-166zM487 618h140l26 216h-139z" /> +<glyph unicode="$" horiz-adv-x="878" d="M37 92l121 164q78 -68 170 -82l61 393l-131 99q-124 91 -124 240q0 25 3 52q16 147 114.5 246t250.5 113l16 106h123l-16 -110q59 -12 116.5 -48t85.5 -65l27 -29l-137 -114q-45 45 -123 59l-55 -364l75 -54q164 -119 164 -292q0 -164 -100 -283t-256 -148l-21 -131h-122 l18 127q-68 8 -133.5 38t-95.5 57zM367 954q0 -63 61 -120l43 272q-104 -39 -104 -152zM455 197q102 53 102 159q0 68 -59 127z" /> +<glyph unicode="%" horiz-adv-x="1431" d="M90 1032q0 119 84 204t205 85q104 0 182 -66l311 64l144 -39l-451 -1280h-200l401 1106h-109q10 -41 11 -74q0 -119 -84 -204t-205 -85t-205 85t-84 204zM266 1032q0 -45 33 -78.5t80 -33.5t80 33.5t33 78.5t-33 79t-80 34t-80 -34t-33 -79zM756 256q0 121 85 205 t203.5 84t203.5 -84t85 -205t-85 -205t-203.5 -84t-203.5 84t-85 205zM932 256q0 -47 33.5 -80t79 -33t79 33t33.5 80t-33.5 80t-79 33t-79 -33t-33.5 -80z" /> +<glyph unicode="&" horiz-adv-x="1800" d="M117 590q0 262 184 457.5t451 246.5l28 -182q-201 -53 -325 -217q-100 -132 -101 -284q0 -38 6 -76q309 252 551 469q105 95 105 170q0 51 -49 97q-47 44 -97 62l54 115q12 -2 32.5 -8t72.5 -31t92 -53.5t73 -79.5t33 -111q0 -141 -166 -280l-631 -533q135 -199 401 -198 q236 0 420.5 164.5t184.5 398.5q0 78 -21 133h-137l-25 115q86 41 148 41q156 0 209 -80t53 -221q0 -209 -128 -381t-317.5 -262.5t-392.5 -92.5h-10q-182 0 -338 71q-160 73 -260 217.5t-100 332.5z" /> +<glyph unicode="'" horiz-adv-x="301" d="M164 999l6 314l51 137h141l11 -147l-90 -304h-119z" /> +<glyph unicode="(" horiz-adv-x="716" d="M140 522q11 213 86 410.5t226.5 379t356.5 306.5l-2 -205q-199 -125 -331 -348t-157 -461q-5 -52 -5 -103q0 -183 69 -354q39 -84 69.5 -123.5t137.5 -146.5l-98 -139q-211 174 -289 383q-64 163 -64 345q0 28 1 56z" /> +<glyph unicode=")" horiz-adv-x="696" d="M-33 -117q129 102 172 144.5t109 128.5q154 205 199 455q19 103 19 200q0 140 -39 268q-67 217 -226 340l47 195q229 -170 327 -427q69 -181 70 -376q0 -81 -12 -164q-41 -283 -209 -538q-129 -197 -389 -388z" /> +<glyph unicode="*" horiz-adv-x="808" d="M74 758l229 264l-227 76l69 176l205 -100l-31 208h322l-102 -208l217 100l49 -176l-250 -82l145 -307h-202l-82 192l-164 -199z" /> +<glyph unicode="+" horiz-adv-x="964" d="M92 418v188h299v322h180v-322h301v-188h-301v-322h-180v322h-299z" /> +<glyph unicode="," horiz-adv-x="528" d="M-55 -201q106 129 141 211q18 41 25 133l25 11q15 6 49 15t51 9q37 -2 70.5 -31.5t47.5 -56.5l15 -29l-70 -110q-45 -72 -262 -246z" /> +<glyph unicode="-" horiz-adv-x="618" d="M106 436v172h406v-172h-406z" /> +<glyph unicode="." horiz-adv-x="528" d="M74 104.5q0 61.5 50 105.5t114 44q61 0 101 -37t40 -96q0 -61 -50 -106.5t-114 -45.5q-61 0 -101 37t-40 98.5z" /> +<glyph unicode="/" horiz-adv-x="755" d="M-154 -303l793 1853h201l-805 -1853h-189z" /> +<glyph unicode="0" d="M49 383q0 104 32 215t90 210t155.5 162.5t214.5 63.5q168 0 249.5 -116.5t81.5 -284.5q0 -152 -51 -299.5t-165.5 -256t-268.5 -108.5q-168 0 -253 122t-85 292zM264 399q0 -98 32 -168.5t103 -70.5q90 0 151.5 78.5t84 178t22.5 204.5q0 217 -141 217q-80 0 -139.5 -75 t-86 -172.5t-26.5 -191.5z" /> +<glyph unicode="1" d="M231 791l25 167q133 0 260 43h164l-143 -1001h-199l115 791h-222z" /> +<glyph unicode="2" d="M102 178q180 92 357 275q182 197 182 303q0 35 -24.5 58.5t-71.5 23.5q-94 0 -260 -97l-82 148q84 59 120.5 81.5t104.5 43t147 20.5q233 0 277 -182q8 -35 8 -71q0 -56 -19 -114q-32 -97 -99.5 -185.5t-135 -155t-143.5 -125.5h344l-31 -201h-661z" /> +<glyph unicode="3" d="M53 -182q135 12 250 51q274 102 275 338q0 47 -33 72.5t-66 29.5t-86 4q-98 0 -184 -10l-14 178q33 4 78.5 8.5t58.5 6.5l223 161q88 66 88 129q0 25 -17.5 40.5t-45.5 15.5q-41 0 -166 -54l-119 -51l-64 152l115 53q201 92 281 92q111 0 172 -57t61 -170 q0 -68 -49 -134.5t-98 -103.5t-127 -86q211 -31 211 -237q0 -172 -96.5 -307.5t-254.5 -204.5q-168 -72 -358 -72z" /> +<glyph unicode="4" d="M37 0l16 170l58 86q229 356 473 662l69 86h215l-127 -824h121l-33 -180h-124q-55 -242 -127 -352l-162 69q31 66 80 283h-459zM293 180h237l74 475q-61 -86 -311 -475z" /> +<glyph unicode="5" d="M63 -180q143 0 275 59q113 49 183.5 134t70.5 196q0 106 -179 106q-65 0 -155 -14l-78 -14l164 717h533l-29 -193h-334l-76 -313q43 6 92 6q119 0 201 -67.5t82 -188.5q0 -178 -103.5 -311.5t-267.5 -204.5q-162 -74 -348 -74z" /> +<glyph unicode="6" d="M96 381q0 426 346 719q152 127 359 223l65 -145q-166 -100 -227 -150q-162 -123 -256 -311q-35 -70 -58.5 -168t-23.5 -176q0 -88 32 -150.5t93 -62.5q72 0 123 63.5t69.5 140t18.5 150.5q0 86 -62 110q-57 22 -166 21h-20l174 168q104 0 194.5 -77t90.5 -218 q0 -215 -125 -383t-326 -168q-86 0 -147.5 38t-93 101.5t-46 131t-14.5 143.5z" /> +<glyph unicode="7" d="M84 -250q193 219 350.5 505t204.5 548h-473l31 201h682l-25 -168q-43 -285 -229.5 -636.5t-395.5 -582.5z" /> +<glyph unicode="8" d="M66 287q0 119 72.5 222t183.5 165q-129 94 -129 231q0 162 114.5 273.5t278.5 111.5q137 0 219 -69q84 -70 84 -191q0 -203 -244 -352q88 -39 141.5 -111.5t53.5 -167.5q0 -49 -19 -114q-43 -145 -162.5 -231.5t-273.5 -86.5q-139 0 -229 90.5t-90 229.5zM283 315 q0 -68 36.5 -114.5t100.5 -46.5q80 0 139 76.5t59 158.5q0 39 -16 69.5t-29.5 43t-56.5 40t-53 33.5q-180 -98 -180 -260zM399 907q0 -72 93 -129q18 8 55 29q53 27 96 85t43 112q0 104 -121 104q-72 0 -119 -63.5t-47 -137.5z" /> +<glyph unicode="9" d="M74 -176q166 100 227 149q162 123 256 312q35 70 59.5 169t24.5 175q0 213 -127 213q-68 0 -118 -63.5t-71.5 -141.5t-21.5 -150q0 -86 62 -109q57 -22 166 -22h20l-174 -168q-104 0 -194.5 77t-90.5 218q0 215 124 383t327 168q115 0 186.5 -68.5t94 -154.5t22.5 -190 q0 -410 -348 -719q-137 -121 -359 -224z" /> +<glyph unicode=":" horiz-adv-x="528" d="M74 104.5q0 61.5 50 105.5t114 44q61 0 101 -37t40 -96q0 -61 -50 -106.5t-114 -45.5q-61 0 -101 37t-40 98.5zM158 682q0 61 50 105t114 44q59 0 99 -36.5t40 -96.5q0 -61 -50.5 -106t-113.5 -45q-59 0 -99 38t-40 97z" /> +<glyph unicode=";" horiz-adv-x="528" d="M-55 -201q106 129 141 211q18 41 25 133l25 11q15 6 49 15t51 9q37 -2 70.5 -31.5t47.5 -56.5l15 -29l-70 -110q-45 -72 -262 -246zM158 682q0 61 50 105t114 44q59 0 99 -36.5t40 -96.5q0 -61 -50.5 -106t-113.5 -45q-59 0 -99 38t-40 97z" /> +<glyph unicode="<" horiz-adv-x="614" d="M53 512l371 397l137 -116l-266 -277l268 -285l-135 -116z" /> +<glyph unicode="=" horiz-adv-x="983" d="M90 293v172h782v-172h-782zM90 549v172h782v-172h-782z" /> +<glyph unicode=">" horiz-adv-x="614" d="M51 231l268 285l-266 277l137 116l371 -397l-375 -397z" /> +<glyph unicode="?" horiz-adv-x="813" d="M92 104.5q0 61.5 50.5 105.5t113.5 44q61 0 101 -37t40 -96q0 -61 -50 -106.5t-114 -45.5q-61 0 -101 37t-40 98.5zM193 1362l122 131q51 -70 105 -70h160q82 0 136 -31.5t71.5 -76.5t25.5 -95q3 -20 3 -38q0 -26 -7 -47q-8 -43 -40 -99.5t-55.5 -86t-83 -97.5t-65.5 -74 q-94 -111 -119.5 -158t-37.5 -126l-17 -113h-184l12 113q18 172 88 256l185 231l33 41l39.5 48t26.5 46q14 29 13 62q0 59 -51 59h-152q-113 0 -202 117z" /> +<glyph unicode="@" horiz-adv-x="1622" d="M92 727q0 297 221.5 525.5t515.5 228.5q326 0 510.5 -175.5t184.5 -476.5q0 -55 -13 -110q-33 -168 -165 -294t-295 -126h-6q-64 0 -114 41q-52 43 -54 104l-53 -35q-32 -22 -105 -56q-62 -29 -106 -28q-8 0 -15 1q-113 14 -149 171q-16 67 -16 132q0 87 28 170 q49 166 131 253t244 87q35 0 77.5 -21.5t69.5 -44.5l25 -20l14 57h172l-141 -575q-9 -22 -9 -44q0 -12 3 -24q8 -33 38 -33q100 0 170 105.5t82 199.5q6 43 6 90q0 227 -139 353.5t-377 126.5q-225 0 -382.5 -178.5t-157.5 -407.5q0 -242 159.5 -407.5t403.5 -178.5 q18 -1 35 -1q283 0 497 218l109 -98q-252 -287 -636 -287h-5q-319 4 -538.5 222.5t-219.5 535.5zM641 758q-26 -104 -26 -168q0 -97 62 -97q11 0 23 3q27 6 76 28.5t84 40.5l35 19l82 340q-98 59 -158 59q-123 0 -178 -225z" /> +<glyph unicode="A" horiz-adv-x="1052" d="M-41 0l602 1290h195l200 -1290h-231l-53 371h-305l-166 -371h-242zM442 567h209l-47 398z" /> +<glyph unicode="B" horiz-adv-x="1017" d="M84 29l192 1261h322q160 0 258 -66.5t98 -215.5q0 -109 -63.5 -193t-145.5 -121q188 -47 189 -252q0 -29 -6 -59q-31 -193 -174.5 -303.5t-341.5 -110.5q-90 1 -328 60zM330 184q68 -18 98 -18q123 0 202 76.5t79 199.5q0 45 -18.5 74t-55.5 41t-66.5 15t-76.5 3h-99z M424 774h90h6q88 0 150 59q63 60 63 150q0 72 -32.5 97.5t-120.5 25.5h-107z" /> +<glyph unicode="C" horiz-adv-x="1007" d="M94 481q0 70 15 170q18 115 68 230.5t125 215t181.5 162t223.5 62.5q209 0 319 -90l6 -4l-108 -156q-86 55 -236 55q-68 0 -134.5 -56t-109.5 -124q-57 -88 -91 -219t-34 -244q0 -127 49.5 -223t161.5 -96q117 0 254 82l86 -156q-70 -55 -172 -88t-194 -33 q-215 0 -312.5 140.5t-97.5 371.5z" /> +<glyph unicode="D" horiz-adv-x="1126" d="M82 0l201 1290h374q231 0 328 -174q65 -117 65 -293q0 -86 -16 -186q-49 -309 -210.5 -473t-372.5 -164h-369zM338 201h131q100 0 174 65.5t111 169t53 201.5t16 190q0 262 -192 263h-154z" /> +<glyph unicode="E" horiz-adv-x="911" d="M82 0l199 1290h675l-28 -198h-451l-49 -318h332l-31 -205h-334l-57 -366h469l-31 -203h-694z" /> +<glyph unicode="F" horiz-adv-x="845" d="M82 0l197 1290h620l-27 -196h-397l-51 -322h317l-28 -203h-318l-90 -569h-223z" /> +<glyph unicode="G" horiz-adv-x="1060" d="M94 481q0 139 43 285.5t119 270.5t194.5 204t256.5 80q98 0 180 -23.5t114 -48.5l33 -22l-110 -156q-88 55 -236 55q-63 0 -133 -57t-111 -123q-57 -88 -91 -219t-34 -244q0 -78 16.5 -144.5t68 -119.5t128.5 -53l136 16l65 408h215l-88 -563q-186 -57 -352 -58 q-215 0 -314.5 140.5t-99.5 371.5z" /> +<glyph unicode="H" horiz-adv-x="1120" d="M84 0l201 1290h225l-80 -518h350l84 518h228l-201 -1290h-229l92 571h-353l-90 -571h-227z" /> +<glyph unicode="I" horiz-adv-x="485" d="M61 0l189 1290h225l-190 -1290h-224z" /> +<glyph unicode="J" horiz-adv-x="487" d="M-119 -170l51 20q115 43 129 136l189 1304h225l-194 -1327q-16 -117 -93 -182q-100 -88 -278 -117z" /> +<glyph unicode="K" horiz-adv-x="931" d="M78 0l198 1290h228l-70 -475l170 170q103 103 103 227q0 26 -5 54l213 41l7 -24q4 -15 7 -59q1 -15 1 -29q0 -29 -4 -57q-6 -42 -32 -96.5t-69 -97.5l-315 -313l401 -537v-94h-215l-321 449l-68 -449h-229z" /> +<glyph unicode="L" horiz-adv-x="761" d="M86 0l205 1290h221l-174 -1093h389l-27 -197h-614z" /> +<glyph unicode="M" horiz-adv-x="1517" d="M82 0l205 1290h270l178 -831q12 -53 13 -148q18 88 51 154l418 825h274l-205 -1290h-233l100 635l41 225q-74 -213 -98 -264l-295 -596h-191l-139 641l-22 219l-33 -215l-101 -645h-233z" /> +<glyph unicode="N" horiz-adv-x="1132" d="M82 0l201 1290h262l196 -702l29 -156q0 164 8 219l99 639h229l-201 -1290h-217l-250 899q-2 -86 -14 -166l-115 -733h-227z" /> +<glyph unicode="O" horiz-adv-x="1120" d="M119 483q0 98 20.5 208t66.5 222.5t109.5 202.5t158.5 147.5t206 57.5q131 0 217 -83t116.5 -191.5t30.5 -237.5q0 -98 -20 -207.5t-66.5 -223.5t-111 -204t-159.5 -147.5t-206 -57.5q-100 0 -174 47t-112.5 125t-57 163t-18.5 179zM338 430q0 -256 164 -256 q88 0 155.5 78t101.5 194.5t49 220t15 185.5q0 264 -164 264q-88 0 -154.5 -80t-100 -197.5t-50 -223t-16.5 -185.5z" /> +<glyph unicode="P" horiz-adv-x="991" d="M82 0l199 1290h288q238 0 341 -121q82 -96 83 -227q0 -34 -6 -70q-29 -193 -162 -315.5t-321 -122.5q-29 0 -58.5 7.5t-46.5 13.5l-16 8l-76 -463h-225zM410 655q51 -23 98 -22q98 0 166.5 70.5t89.5 183.5q5 29 5 53q0 61 -32 101q-45 56 -186 57h-72z" /> +<glyph unicode="Q" horiz-adv-x="1071" d="M94 483q0 125 33 263.5t96.5 270.5t176 218t253.5 86q102 0 178 -49t114 -130t55.5 -165t17.5 -172q0 -330 -143.5 -569.5t-419.5 -368.5l63 -35q54 -28 137 -28q122 0 306 61l-48 -248l-30 -6q-20 -4 -81 -9q-38 -3 -75 -4q-22 0 -44 2q-58 3 -135 24q-76 20 -142 57 l-205 116l-25 115l215 98q-147 51 -222 179t-75 294zM315 475q0 -272 238 -315q242 207 242 665q0 289 -160 289q-88 0 -154.5 -69.5t-100.5 -176t-49.5 -207t-15.5 -186.5z" /> +<glyph unicode="R" horiz-adv-x="1017" d="M82 0l199 1290h288q182 0 303 -80t121 -264q0 -166 -95 -303t-253 -166l279 -383l-15 -94h-198l-324 449l-8 4l-72 -453h-225zM410 659q55 -25 90 -24q113 0 189.5 86t76.5 205q0 164 -217 164h-72z" /> +<glyph unicode="S" horiz-adv-x="878" d="M37 92l121 164q96 -84 202 -84q78 0 137.5 54.5t59.5 129.5q0 84 -80 144l-219 166q-124 91 -124 240q0 25 3 52q18 160 134 261.5t288 101.5q152 0 283 -137l12 -13l-137 -114q-63 63 -172 63q-74 0 -126 -46t-52 -120q0 -76 79 -135l168 -121q164 -119 164 -292 q0 -186 -126 -311.5t-312 -125.5q-80 0 -155.5 31t-110.5 61z" /> +<glyph unicode="T" horiz-adv-x="800" d="M92 1075l33 211h784l-32 -211h-279l-164 -1075h-223l164 1075h-283z" /> +<glyph unicode="U" horiz-adv-x="1114" d="M126 317q-4 35 -4 70q0 64 13 129l119 774h227l-123 -788q-10 -104 -10 -163q0 -67 33 -115q35 -50 111 -50q193 0 245 342l121 774h227l-122 -794q-23 -147 -79.5 -261t-163 -190t-249.5 -76q-113 0 -190.5 48.5t-110.5 125t-44 174.5z" /> +<glyph unicode="V" horiz-adv-x="991" d="M115 1290h239l135 -954l224 440q57 113 57 275v239h231v-237q0 -201 -81 -357l-371 -696h-225z" /> +<glyph unicode="W" horiz-adv-x="1517" d="M158 1290h241l35 -721l-2 -190q33 147 53 201l281 710h217l45 -743l4 -168q37 96 68 162l114 231q86 176 86 301q-2 119 -2 217h232v-237q0 -135 -105 -353l-348 -700h-215l-47 768q-1 13 -1 31q0 55 9 159q-16 -88 -41 -157l-50 -134l-98 -258l-110 -292 q-43 -117 -41 -117h-227z" /> +<glyph unicode="X" horiz-adv-x="1013" d="M10 0v94l416 572l-268 624h248l182 -420l293 420h184v-92l-385 -534l289 -664h-258l-191 453l-319 -453h-191z" /> +<glyph unicode="Y" horiz-adv-x="880" d="M55 1165l154 154q129 -82 209 -246q49 -104 61 -262q35 154 138.5 304.5t232.5 217.5l143 -151q-61 -39 -113.5 -87t-94.5 -114t-73.5 -120t-60.5 -141l-46 -138q-17 -51 -38 -154l-28 -143q-8 -41 -26 -150l-21 -135h-224l74 471q-14 127 -20 164q-20 164 -86 314 t-181 216z" /> +<glyph unicode="Z" horiz-adv-x="909" d="M49 180l574 901h-390l19 209h670l-21 -184l-577 -895h546l-30 -211h-789z" /> +<glyph unicode="[" horiz-adv-x="589" d="M12 -319l264 1818h355l-29 -192h-168l-209 -1434h168l-28 -192h-353z" /> +<glyph unicode="\" horiz-adv-x="686" d="M12 1550h189l493 -1853h-188z" /> +<glyph unicode="]" horiz-adv-x="595" d="M-14 -319l28 192h168l209 1434h-168l27 192h354l-266 -1818h-352z" /> +<glyph unicode="^" horiz-adv-x="1277" d="M119 655l442 795h152q190 -365 444 -795h-221l-299 531l-299 -531h-219z" /> +<glyph unicode="_" d="M0 -154h922v-122h-922v122z" /> +<glyph unicode="`" horiz-adv-x="518" d="M88 1403l180 156q90 -154 264 -295l-108 -125q-195 112 -336 264z" /> +<glyph unicode="a" horiz-adv-x="1003" d="M98 266q0 111 32 238t92.5 248.5t165 201.5t233.5 80q104 0 299 -37l-103 -739q-9 -48 -9 -77q0 -35 19 -36l50 11l45 -140q-92 -47 -168 -47q-66 0 -106 49q-32 39 -32 84q0 11 2 23l9 57q-4 -8 -14.5 -22.5t-43 -51t-67.5 -65.5t-90.5 -51.5t-112.5 -22.5 q-201 0 -201 297zM322 218q0 -19 12 -31.5t41 -12.5q66 0 156 119t108 209l55 332q-47 4 -69 4q-72 0 -132.5 -64.5t-96.5 -160t-55 -187.5t-19 -162v-46z" /> +<glyph unicode="b" horiz-adv-x="1038" d="M102 109l201 1314h217l-76 -493q10 12 29 29.5t73 46t105 28.5q152 0 224.5 -101.5t72.5 -273.5q0 -119 -33.5 -238.5t-97 -221t-166 -166t-227.5 -64.5q-74 0 -154 35t-123 70zM317 197q45 -41 129 -41q74 0 134.5 77.5t88 160.5t40.5 157q10 72 10 125q0 166 -109 166 q-98 0 -207 -125z" /> +<glyph unicode="c" horiz-adv-x="849" d="M92 381q0 133 45 265t119 218q72 82 162 126t160 44q33 0 61.5 -4t50 -9t43 -14.5t33.5 -16.5t26.5 -18t19.5 -17l15 -15l11 -10l-129 -137q-41 57 -148 57q-72 0 -145.5 -94t-98.5 -250q-8 -70 -8 -98q0 -111 40 -180.5t110 -69.5q43 0 99 31.5t93 64.5l35 33l100 -123 q-6 -8 -17 -21.5t-48 -46.5t-76 -58.5t-95 -47t-110 -21.5q-180 0 -276 140q-72 102 -72 272z" /> +<glyph unicode="d" horiz-adv-x="1024" d="M92 395q0 246 141.5 442.5t335.5 196.5q96 0 179 -73q25 143 24 219q0 86 -45 186l170 80q90 -133 90 -293q0 -35 -6 -70l-109 -684q-29 -184 -133 -307t-280 -123q-180 0 -273.5 121t-93.5 305zM313 383q0 -229 152 -229q37 0 67.5 15t52 49t35 59.5t24.5 79l14.5 70.5 t11.5 69l45 276q-84 70 -144 70q-115 0 -186.5 -147.5t-71.5 -311.5z" /> +<glyph unicode="e" horiz-adv-x="894" d="M92 373q0 156 54.5 303t174 252.5t279.5 105.5q262 0 262 -246q0 -86 -56 -156.5t-148.5 -115.5t-175.5 -71.5t-169 -43.5v-28q0 -74 34 -148.5t97 -74.5q59 0 120 25.5t91 49.5l31 25l92 -123q-16 -18 -47 -44t-126 -70t-193 -44q-160 0 -240 119t-80 285zM338 586 q307 72 307 215q0 55 -65 55q-86 0 -148.5 -85t-93.5 -185z" /> +<glyph unicode="f" horiz-adv-x="550" d="M16 -299q111 205 138 524l45 602l-121 21l24 156h115q0 72 10.5 137t34 132.5t73.5 108.5t120 41q33 0 64.5 -5t45.5 -11l17 -6l-25 -168h-63q-14 0 -25.5 -9.5t-18 -27.5t-11.5 -35.5t-7 -44t-3 -43t-1 -40.5v-29h137v-181h-151l-62 -714q-10 -129 -63 -239t-148 -249z " /> +<glyph unicode="g" horiz-adv-x="907" d="M-33 -188q0 90 79 186t159 147l78 52l88 -123l-52 -46q-31 -28 -82 -89.5t-51 -94.5q0 -61 109 -61q102 0 198.5 61.5t96.5 141.5q0 59 -34 96t-103 37l-11 76q49 37 65.5 60.5t37.5 84.5q-113 -63 -178 -64q-133 0 -199 86.5t-66 221.5q0 201 106.5 325.5t305.5 124.5 l315 -35q-12 -205 -52 -432t-109 -342q63 -20 100 -85.5t37 -137.5q0 -98 -52.5 -177t-132 -125t-165.5 -70.5t-164 -24.5q-324 0 -324 207zM317 594q0 -117 93 -117q70 0 117.5 63.5t64.5 143.5q14 66 22 162q-61 12 -127 12q-84 0 -127 -76.5t-43 -187.5z" /> +<glyph unicode="h" horiz-adv-x="1042" d="M84 0l217 1423h219l-92 -581q4 8 13.5 20l38 46t60 59.5t80 46t97.5 20.5q119 0 175 -42t57 -109v-13q0 -63 -9 -139l-66 -422q-18 -121 -52 -184.5t-124 -155.5l-131 109q49 63 64.5 109t32.5 147l65 409q3 20 3 36q0 29 -10 40q-15 18 -60 19q-57 0 -143.5 -82 t-127.5 -160l-90 -596h-217z" /> +<glyph unicode="i" horiz-adv-x="477" d="M66 0l151 1004h217l-153 -1004h-215zM213 1251q0 78 74 121q33 20 73 21q55 0 95.5 -38t40.5 -93q0 -25 -11 -50q-23 -57 -77 -79q-27 -12 -58 -13q-78 0 -119 66q-18 32 -18 65z" /> +<glyph unicode="j" horiz-adv-x="477" d="M-119 -240l56 25q41 18 74.5 58t39.5 85l166 1076h215l-160 -1057q-20 -143 -90.5 -213t-181.5 -107l-96 -33zM213 1251q0 78 74 121q33 20 73 21q55 0 95.5 -38t40.5 -93q0 -25 -11 -50q-23 -57 -77 -79q-27 -12 -58 -13q-78 0 -119 66q-18 32 -18 65z" /> +<glyph unicode="k" horiz-adv-x="980" d="M84 0l217 1423h215l-121 -788q6 2 24.5 3t38 4t36.5 9q92 27 161.5 71t69.5 99q0 33 -19.5 44.5t-76.5 11.5l-17 141q76 16 148 16q96 0 143 -55t47 -137q0 -141 -111.5 -231.5t-248.5 -90.5l362 -520h-278l-305 465l-72 -465h-213z" /> +<glyph unicode="l" horiz-adv-x="493" d="M123 426l143 997h217l-145 -1009q-11 -86 -11 -155q0 -24 2 -46q5 -84 17 -131l12 -47l-206 -58q-41 124 -41 276q0 82 12 173z" /> +<glyph unicode="m" horiz-adv-x="1576" d="M86 0l158 1004h223l-31 -162q117 193 303 192q211 0 211 -178q123 178 291 178q143 0 187 -76q29 -50 30 -130q0 -41 -8 -91l-113 -737h-219l119 750q2 15 2 27q0 65 -63 65q-94 0 -240 -191l-12 -18l-101 -633h-217l121 750q6 22 6 39q0 16 -5 27q-11 24 -62.5 24 t-136.5 -82t-128 -150l-96 -608h-219z" /> +<glyph unicode="n" horiz-adv-x="1060" d="M84 0l158 1004h217l-29 -162q49 80 126 136t161 56q113 0 170 -43t60 -109q1 -18 1 -37q0 -51 -6 -108l-115 -737h-219l119 750q3 21 3 36q0 27 -9 38q-14 17 -57 18q-111 0 -271 -244l-92 -598h-217z" /> +<glyph unicode="o" horiz-adv-x="999" d="M92 395q0 141 55.5 284.5t170 249t260.5 105.5q166 0 248.5 -127t82.5 -303q0 -102 -32.5 -211.5t-92 -205t-154.5 -157t-206 -61.5q-166 0 -249 126t-83 300zM305 365q0 -207 137 -207q68 0 120 53t80 132t41 154.5t13 137.5q0 209 -137 209q-68 0 -120 -53.5 t-79.5 -133t-41 -155.5t-13.5 -137z" /> +<glyph unicode="p" horiz-adv-x="1095" d="M70 -358l147 942l-137 -78l31 192l137 86l33 220h219l-11 -74q143 104 220 104q96 0 164.5 -46t96 -118.5t39.5 -159.5q5 -35 4 -70q0 -50 -9 -99q-14 -102 -45 -195.5t-83.5 -182.5t-137.5 -141.5t-191 -52.5q-133 0 -189 109l-69 -436h-219zM413 350q1 -43 10 -75.5 t25.5 -60.5t44 -42t66.5 -14q158 0 221 374q11 75 11 132q0 178 -107 178q-61 0 -225 -119q-2 -14 -10.5 -54t-13.5 -72l-12 -79q-7 -47 -9 -86l-2 -54q1 -14 1 -28z" /> +<glyph unicode="q" horiz-adv-x="1058" d="M94 367q0 143 57.5 293.5t175 262t261.5 111.5q170 0 383 -65l-203 -1327h-219l69 436q-33 -45 -94 -77t-116 -32q-168 0 -241 111t-73 287zM317 362q0 -199 119 -198q78 0 136.5 72.5t86 165t41.5 206.5l31 217q-70 16 -106 17q-88 0 -151.5 -46t-95.5 -122t-46.5 -153 t-14.5 -159z" /> +<glyph unicode="r" horiz-adv-x="710" d="M88 0l154 1004h215l-23 -152l21 35l29 44l29 36q22 27 37 37t38.5 20t48.5 10q86 0 135 -116l-143 -179q-2 4 -6.5 11.5t-18.5 17.5t-31 8q-66 -4 -153 -145l-29 -45l-90 -586h-213z" /> +<glyph unicode="s" horiz-adv-x="843" d="M45 92l113 154q113 -88 200 -88q145 0 162 110q2 8 2 16q0 54 -76 93l-204 115q-61 35 -95 103q-24 50 -23 112q0 23 3 49q23 135 131.5 206.5t251.5 71.5q53 0 103.5 -15t85 -35.5t61 -42t39.5 -36.5l12 -16l-123 -115q-74 76 -201 76q-66 0 -106.5 -35t-40.5 -76 q0 -20 14.5 -38.5t28.5 -27.5t45 -26l180 -96q127 -68 128 -218q0 -43 -11 -93q-27 -115 -128 -193t-265 -78q-66 0 -137.5 31t-110.5 61z" /> +<glyph unicode="t" horiz-adv-x="688" d="M127 840l25 164h124l23 178h197l-25 -178h174l-31 -181h-165l-91 -602q0 -2 -1 -7t-1 -9q0 -49 35 -49q68 0 154 71l63 -147q-125 -111 -258 -111q-201 0 -200 199q0 18 4 59l88 596z" /> +<glyph unicode="u" horiz-adv-x="1038" d="M108 156q-1 11 -1 21q0 43 10 89l114 738h218l-117 -750q-3 -21 -3 -36q0 -27 9 -39q14 -17 57 -17q104 0 271 244l92 598h217l-131 -836q-4 -31 8 -50.5t29 -23.5l14 -4l-78 -121q-10 -1 -22 -1h-14q-22 1 -67.5 15.5t-64.5 47.5q-15 25 -15 67q0 29 7 66 q-53 -78 -135 -136.5t-164 -58.5q-86 0 -140.5 25.5t-72.5 67t-21 94.5z" /> +<glyph unicode="v" horiz-adv-x="866" d="M68 1004h227l115 -719l206 358q28 45 28 119q0 77 -13 135q-12 53 -27 84l207 43l11 -29q7 -18 18.5 -74.5t13.5 -111.5v-13q0 -51 -14 -115q-16 -73 -54 -136l-325 -545h-193z" /> +<glyph unicode="w" horiz-adv-x="1355" d="M76 1004h229l72 -711l262 711h213l68 -711l145 282q37 72 54 124q16 49 17 117q0 78 -32 163l207 45q4 -10 9 -28.5t12 -75t7 -111.5t-17 -130t-54 -138l-307 -541h-203l-58 682q-25 -121 -51 -184l-211 -498h-213z" /> +<glyph unicode="x" horiz-adv-x="864" d="M-14 0v86l338 432l-222 486h238l133 -336l94 96q20 23 31.5 38t24 42.5t10.5 61.5t-19 77l203 43q2 -8 7 -22.5t12 -56.5q4 -28 4 -54q0 -13 -1 -27q-3 -39 -21.5 -87t-55.5 -85l-205 -202l238 -492h-244l-141 334l-248 -334h-176z" /> +<glyph unicode="y" horiz-adv-x="880" d="M-18 -225q106 45 173.5 100t120.5 150l-200 979h229l123 -728l61 109q168 287 168 358q0 113 -43 236l211 45q41 -113 41 -246q0 -121 -67 -237l-336 -584q-78 -137 -177.5 -215t-252.5 -125z" /> +<glyph unicode="z" horiz-adv-x="843" d="M18 0l13 184q248 348 499 627h-430l25 193h709l-21 -173q-281 -301 -522 -632h483l-22 -199h-734z" /> +<glyph unicode="{" horiz-adv-x="720" d="M68 504l24 170q59 0 103.5 44t67 120.5t33.5 141t18.5 146.5t9.5 95q23 168 90 228t159 60h144l6 -184h-143q-39 0 -52.5 -26.5t-25.5 -116.5l-51 -346q-23 -154 -148 -254q77 -80 77 -194q0 -29 -5 -60l-49 -346q-10 -53 -10 -82q0 -12 1 -21q6 -27 45 -26h148l-61 -185 h-130q-188 0 -187 208q0 42 7 91l49 344q3 24 4 46q0 60 -26 97q-35 50 -98 50z" /> +<glyph unicode="|" horiz-adv-x="454" d="M135 -29v1569h184v-1569h-184z" /> +<glyph unicode="}" horiz-adv-x="630" d="M-47 -147h133q29 0 41 5t24.5 35.5t22.5 100.5l51 346q20 145 146 250q-76 84 -76 200q0 28 4 58l51 346q10 66 10 96q0 19 -4 25q-8 10 -30 10h-160l61 184h133q184 0 184 -207q0 -42 -7 -94l-50 -344q-4 -26 -4 -49q0 -57 26 -92q36 -49 99 -49l-24 -170 q-61 0 -114.5 -56.5t-66.5 -148.5l-51 -344q-25 -170 -93.5 -228.5t-160.5 -58.5h-139z" /> +<glyph unicode="~" horiz-adv-x="1140" d="M254 387l47 256q10 10 34.5 37t35 35t32 21.5t48 17.5t65.5 4q78 0 193.5 -53.5t169.5 -53.5q47 0 93 40t144 175l-57 -284q-12 -10 -32.5 -30t-29 -27t-25 -18t-31.5 -14.5t-38.5 -6.5t-56.5 -3q-76 0 -192.5 53.5t-170.5 53.5q-47 0 -90 -37t-139 -166z" /> +<glyph unicode="¡" horiz-adv-x="514" d="M8 -428q100 252 135 600q18 219 45 453h185l-15 -310q-16 -326 -45 -462q-14 -76 -39 -154l-30 -102zM162 886.5q0 61.5 50 105.5t114 44q61 0 101 -36.5t40 -96.5q0 -61 -50 -106t-114 -45q-61 0 -101 36.5t-40 98z" /> +<glyph unicode="¢" horiz-adv-x="849" d="M92 381q0 133 45 265t119 218q117 135 274 166l21 139h123l-21 -141q25 -4 47.5 -10t40 -14.5t30.5 -15.5t24.5 -17t17.5 -17l14 -14l11 -10l-127 -135q-27 33 -86 47l-101 -678q106 25 164 102l100 -123q-14 -16 -39.5 -39.5t-102.5 -70.5t-150 -60l-19 -123h-123 l19 125q-133 20 -209 134q-72 102 -72 272zM309 408q0 -180 92 -236l99 659q-61 -35 -112.5 -118.5t-70.5 -206.5q-8 -69 -8 -98z" /> +<glyph unicode="£" horiz-adv-x="905" d="M25 745l59 148h78v252q0 141 105.5 207.5t240.5 66.5q150 0 242 -78l-56 -149q-86 51 -174 51q-143 0 -143 -127v-223h260v-184h-260v-195q0 -154 -37 -328h100l90 -30q38 -12 73 -13q96 0 167 97l18 28l43 -172q-2 -4 -7 -10l-20 -25q-15 -18 -32.5 -31.5t-46.5 -31.5 t-58.5 -25.5t-68.5 -11.5q-9 -1 -17 -1l-61 11l-106 29h-332q80 352 80 524v195z" /> +<glyph unicode="¤" horiz-adv-x="1110" d="M-31 463l107 172h110q0 14 9 55q0 6 3 28.5t5 29.5h-180l110 176h121q68 217 238 353t401 136q195 0 321 -141l-102 -168q-55 70 -111.5 98.5t-148.5 28.5q-268 0 -385 -307h532l-106 -174h-477q-18 -55 -23 -115h428l-108 -174h-320q2 -156 74 -229.5t197 -73.5 q156 0 348 192l-37 -241q-164 -133 -352 -134q-203 0 -325 130q-116 124 -116 336v22h-213z" /> +<glyph unicode="¥" horiz-adv-x="880" d="M35 293l31 190h274l-16 131h-261l31 191h193q-72 268 -232 360l154 154q129 -82 209 -246q47 -100 61 -280q27 154 133.5 313.5t237.5 226.5l143 -151q-195 -123 -307 -377h211l-31 -191h-252q-25 -86 -34 -131h288l-30 -190h-297q-10 -53 -25.5 -151.5t-23.5 -141.5 h-224l47 293h-280z" /> +<glyph unicode="§" horiz-adv-x="860" d="M25 -158l77 160q160 -100 306 -100q72 0 111.5 33.5t39.5 91.5q0 43 -40 77.5t-150 88.5q-10 4 -56.5 26.5t-61.5 30.5t-54 30.5t-55 41.5l-38 45q-23 27 -30.5 57.5t-7.5 67.5q0 98 62 172.5t163 105.5q-217 96 -217 242q0 141 100 225t256 84q158 0 326 -94l-84 -160 q-150 74 -246 74q-66 0 -102.5 -35t-36.5 -90q0 -10 4 -20.5t12 -19.5t15.5 -16.5t21.5 -15.5t20.5 -12t22.5 -11.5t18 -9.5l63 -30l73 -37l67 -38q45 -26 68.5 -48.5t50.5 -52t39 -62.5t12 -70q0 -96 -62.5 -179t-154.5 -113q59 -33 97 -57.5t75 -72t37 -98.5 q0 -154 -100.5 -245t-266.5 -91q-167 0 -374 125zM276 514q0 -41 32 -74.5t85 -33.5q84 0 134.5 36.5t50.5 92.5q0 43 -38 73.5t-94 30.5q-76 0 -123 -35t-47 -90z" /> +<glyph unicode="¨" horiz-adv-x="638" d="M76 1276q0 57 43 103t100 46q47 0 81 -32.5t34 -77.5q0 -57 -46 -100.5t-104 -43.5q-45 0 -76.5 30t-31.5 75zM422 1276q0 57 43 103t100 46q47 0 80 -32.5t33 -77.5q0 -57 -46 -100.5t-104 -43.5q-45 0 -75.5 30t-30.5 75z" /> +<glyph unicode="©" horiz-adv-x="1800" d="M246 502q0 174 88 327.5t241 241.5q150 86 328 86q176 0 330 -86q154 -90 240 -242q88 -147 88 -327q0 -186 -91 -334q-88 -152 -243 -240q-154 -86 -324 -86q-174 0 -323 86q-154 88 -242 238q-92 152 -92 336zM410 502q0 -137 67 -254q66 -113 179.5 -177.5 t246.5 -66.5q205 0 346 141q150 145 150 357q0 131 -66 246q-88 154 -260 219q-92 31 -170 30q-131 0 -248 -67q-115 -68 -180 -182q-65 -109 -65 -246zM600 514q0 154 86 255t229 101q113 -2 232 -100l-82 -108q-86 63 -147 63q-51 0 -100.5 -53.5t-49.5 -157.5 q0 -94 40 -163.5t120 -69.5q63 0 143 59l62 -117q-100 -88 -211 -88q-139 0 -230.5 96.5t-91.5 282.5z" /> +<glyph unicode="ª" horiz-adv-x="743" d="M158 969q0 82 24.5 179t70.5 189.5t126 153.5t176 61q70 0 227 -28l-77 -561q-7 -36 -8 -59q0 -28 16 -27l37 8l34 -107q-70 -35 -129 -35q-49 0 -78 37q-25 31 -25 66q0 7 1 14l6 45l-11 -17q-7 -11 -31.5 -39t-51.5 -49.5t-69 -39t-85 -17.5q-153 1 -153 226zM328 958 q0 -23 1 -33t10 -18t30 -8q49 0 118.5 90t81.5 158l43 252q-37 4 -55 4q-53 0 -99 -49t-73 -122t-42 -143.5t-15 -121.5v-9z" /> +<glyph unicode="«" horiz-adv-x="970" d="M37 500l457 393l131 -121l-330 -276l244 -285l-162 -113zM385 500l457 393l133 -121l-332 -276l246 -285l-162 -113z" /> +<glyph unicode="¬" horiz-adv-x="1095" d="M82 717v184h850v-555l-182 -35v406h-668z" /> +<glyph unicode="­" horiz-adv-x="618" d="M106 436v172h406v-172h-406z" /> +<glyph unicode="®" horiz-adv-x="1800" d="M242 500q0 174 88 327.5t241 241.5q150 86 328 86t328 -86q154 -88 241.5 -241.5t87.5 -327.5q0 -184 -90 -334q-92 -156 -243 -240q-150 -86 -324 -86t-324 86q-156 88 -241 240q-92 156 -92 334zM406 500q0 -135 65 -254q70 -117 182 -180q111 -61 246 -64h6 q127 0 242 66.5t180.5 177t65.5 254.5q0 131 -66 245q-41 76 -110 132q-59 55 -148 88q-92 31 -170 30q-131 0 -248 -67q-115 -68 -180 -182.5t-65 -245.5zM692 147v725h178q141 0 211 -65.5t70 -171.5q0 -76 -40 -142.5t-105 -86.5l176 -183v-76h-138l-182 193l-10 12v-205 h-160zM852 530q20 -8 41 -8q45 0 70.5 32t25.5 81q0 94 -119 94h-18v-199z" /> +<glyph unicode="¯" horiz-adv-x="630" d="M45 1174l29 120h565l-29 -120h-565z" /> +<glyph unicode="°" horiz-adv-x="638" d="M68 1044q18 115 113 197t210 82q119 0 192 -86q58 -69 58 -158q0 -23 -4 -47q-18 -115 -113.5 -196.5t-210.5 -81.5q-119 0 -191 86q-58 69 -58 158q0 22 4 46zM219 1032q-2 -11 -2 -22q0 -39 25 -68q31 -37 84 -37q57 0 103 41t56 98q2 11 2 22q0 39 -24 69 q-31 37 -84 36q-57 0 -103.5 -41t-56.5 -98z" /> +<glyph unicode="±" horiz-adv-x="915" d="M78 487v172h313v271h180v-271h316v-172h-316v-225h-180v225h-313zM98 0v170h768v-170h-768z" /> +<glyph unicode="²" d="M102 178q180 92 357 275q182 197 182 303q0 35 -24.5 58.5t-71.5 23.5q-94 0 -260 -97l-82 148q84 59 120.5 81.5t104.5 43t147 20.5q233 0 277 -182q8 -35 8 -71q0 -56 -19 -114q-32 -97 -99.5 -185.5t-135 -155t-143.5 -125.5h344l-31 -201h-661z" /> +<glyph unicode="³" d="M53 -182q135 12 250 51q274 102 275 338q0 47 -33 72.5t-66 29.5t-86 4q-98 0 -184 -10l-14 178q33 4 78.5 8.5t58.5 6.5l223 161q88 66 88 129q0 25 -17.5 40.5t-45.5 15.5q-41 0 -166 -54l-119 -51l-64 152l115 53q201 92 281 92q111 0 172 -57t61 -170 q0 -68 -49 -134.5t-98 -103.5t-127 -86q211 -31 211 -237q0 -172 -96.5 -307.5t-254.5 -204.5q-168 -72 -358 -72z" /> +<glyph unicode="´" horiz-adv-x="573" d="M92 1270q98 61 187.5 134t130.5 114l39 41l139 -164q-156 -131 -420 -256z" /> +<glyph unicode="µ" horiz-adv-x="1058" d="M57 -371q92 145 93 277q0 45 -9.5 127t-9.5 141v49v781h215v-791q0 -53 84 -53q51 0 97 16.5t68.5 30.5t78.5 57v740h215v-818q0 -39 22.5 -47t55.5 15l67 -134q-78 -51 -155 -51q-59 0 -116.5 27t-78.5 76q-141 -102 -242 -103q-51 0 -88 19q12 -90 13 -152 q0 -80 -50 -164z" /> +<glyph unicode="¶" horiz-adv-x="1132" d="M109 901q23 193 161 316q121 107 280 106q24 0 48 -2l264 -25q0 6 4 32l8 50h181q-4 -39 -13 -75l103 20l-39 -180l-107 -25q-90 -235 -90 -419q0 -92 23 -173q19 -88 19 -179q0 -76 -13 -154q-29 -174 -84 -267l-205 82q109 274 110 433q0 40 -7 73q-20 94 -21 192 q0 197 82 414l-205 19h-8q-73 0 -126 -103q-42 -81 -42 -164q0 -29 5 -58q19 -114 126 -118q10 -23 -92 -204q-33 -5 -63 -5q-130 0 -218 85q-87 85 -87 246q1 39 6 83z" /> +<glyph unicode="·" horiz-adv-x="559" d="M139 514q0 61 50.5 105.5t113.5 44.5q59 0 99 -37t40 -97q0 -61 -49 -106t-112 -45q-61 0 -101.5 37t-40.5 98z" /> +<glyph unicode="¸" horiz-adv-x="823" d="M346 -262q176 61 177 118q0 21 -16 25q-13 4 -31.5 -1t-36.5 -13l-32 -15q-15 -7 -18 -8l23 154h209q49 -39 63 -96q3 -13 3 -26q0 -60 -63 -122q-77 -76 -173 -116z" /> +<glyph unicode="¹" d="M231 791l25 167q133 0 260 43h164l-143 -1001h-199l115 791h-222z" /> +<glyph unicode="º" horiz-adv-x="788" d="M170 1065q0 172 103.5 328.5t265.5 156.5q127 0 189.5 -97t62.5 -230q0 -106 -41 -214t-129.5 -188t-198.5 -80q-125 0 -188.5 95.5t-63.5 228.5zM332 1040q0 -158 104 -157q51 0 91 40t60.5 101t31 118.5t10.5 104.5q0 158 -103 158q-68 0 -114.5 -70.5t-63 -148.5 t-16.5 -146z" /> +<glyph unicode="»" horiz-adv-x="1046" d="M63 219l332 277l-245 284l161 113l342 -401l-456 -394zM414 219l329 277l-243 284l162 113l339 -401l-456 -394z" /> +<glyph unicode="¼" horiz-adv-x="2844" d="M231 791l25 167q133 0 260 43h164l-143 -1001h-199l115 791h-222zM598 -268l1145 1794h213l-1145 -1794h-213zM1960 0l16 170l58 86q229 356 473 662l69 86h215l-127 -824h121l-32 -180h-125q-55 -242 -127 -352l-162 69q31 66 80 283h-459zM2216 180h238l73 475 q-61 -86 -311 -475z" /> +<glyph unicode="½" horiz-adv-x="2844" d="M231 791l25 167q133 0 260 43h164l-143 -1001h-199l115 791h-222zM598 -268l1145 1794h213l-1145 -1794h-213zM2025 178q180 92 357 275q182 197 182 303q0 35 -24.5 58.5t-71.5 23.5q-94 0 -260 -97l-82 148q84 59 121 81.5t104.5 43t147.5 20.5q233 0 276 -182 q8 -35 8 -71q0 -56 -19 -114q-32 -97 -99.5 -185.5t-135 -155t-143.5 -125.5h344l-31 -201h-661z" /> +<glyph unicode="¾" horiz-adv-x="2844" d="M53 -182q135 12 250 51q274 102 275 338q0 47 -33 72.5t-66 29.5t-86 4q-98 0 -184 -10l-14 178q33 4 78.5 8.5t58.5 6.5l223 161q88 66 88 129q0 25 -17.5 40.5t-45.5 15.5q-41 0 -166 -54l-119 -51l-64 152l115 53q201 92 281 92q111 0 172 -57t61 -170 q0 -68 -49 -134.5t-98 -103.5t-127 -86q211 -31 211 -237q0 -172 -96.5 -307.5t-254.5 -204.5q-168 -72 -358 -72zM598 -268l1145 1794h213l-1145 -1794h-213zM1960 0l16 170l58 86q229 356 473 662l69 86h215l-127 -824h121l-32 -180h-125q-55 -242 -127 -352l-162 69 q31 66 80 283h-459zM2216 180h238l73 475q-61 -86 -311 -475z" /> +<glyph unicode="¿" horiz-adv-x="829" d="M38 -195q3 37 5 66q8 43 40 99.5t55.5 86t83 97t65.5 73.5q94 111 119.5 158t37.5 127l17 113h184l-12 -113q-18 -168 -88 -256l-185 -231q-4 -4 -32.5 -39t-40 -50.5t-25.5 -45t-16 -54.5q0 -68 53 -67h152q113 0 202 -117l6 -8l-122 -131q-51 70 -107 69h-158 q-66 0 -114.5 21.5t-71.5 54.5t-37 72q-12 32 -12 62q0 6 1 13zM455 885q0 61 50 106t113 45q61 0 101.5 -36.5t40.5 -98.5q0 -59 -50.5 -104t-113.5 -45q-61 0 -101 37t-40 96z" /> +<glyph unicode="À" horiz-adv-x="1052" d="M-41 0l602 1290h195l200 -1290h-231l-53 371h-305l-166 -371h-242zM442 567h209l-47 398zM455 1669l180 156q90 -154 264 -295l-108 -125q-195 112 -336 264z" /> +<glyph unicode="Á" horiz-adv-x="1052" d="M-41 0l602 1290h195l200 -1290h-231l-53 371h-305l-166 -371h-242zM442 567h209l-47 398zM479 1536q98 61 187.5 134t128.5 114l41 41l139 -164q-184 -145 -420 -256z" /> +<glyph unicode="Â" horiz-adv-x="1052" d="M-41 0l602 1290h195l200 -1290h-231l-53 371h-305l-166 -371h-242zM352 1546q268 141 414 258q115 -145 264 -274l-135 -121q-117 109 -164 162q-156 -92 -282 -156zM442 567h209l-47 398z" /> +<glyph unicode="Ã" horiz-adv-x="1052" d="M-41 0l602 1290h195l200 -1290h-231l-53 371h-305l-166 -371h-242zM295 1587q123 100 229 109q11 1 22 1q69 0 148 -34q86 -31 120 -31q9 0 13 2q25 9 25 44q0 20 -8 48l178 -34q1 -11 1 -22q0 -64 -32 -114q-47 -76 -153 -81q-12 -1 -24 -1l-120 25q-8 4 -26.5 12.5 t-25.5 12.5t-21.5 9t-25.5 8t-26.5 5t-33.5 2q-61 0 -177 -86zM442 567h209l-47 398z" /> +<glyph unicode="Ä" horiz-adv-x="1052" d="M-41 0l602 1290h195l200 -1290h-231l-53 371h-305l-166 -371h-242zM397 1542q0 57 44 103.5t100 46.5q47 0 80.5 -33t33.5 -78q0 -57 -46 -100t-103 -43q-45 0 -77 29.5t-32 74.5zM442 567h209l-47 398zM743 1542q0 57 43 103.5t101 46.5q47 0 80.5 -33t33.5 -78 q0 -57 -46 -100t-103 -43q-45 0 -77 29.5t-32 74.5z" /> +<glyph unicode="Å" horiz-adv-x="1052" d="M-41 0l602 1290h195l200 -1290h-231l-53 371h-305l-166 -371h-242zM442 567h209l-47 398zM487 1616q14 88 86 149.5t160 61.5t144 -67q44 -53 43 -119q0 -17 -2 -35q-14 -88 -85 -150.5t-161 -62.5t-145 66q-43 53 -43 120q0 18 3 37zM629 1595q0 -23 17.5 -40t37.5 -17 q41 0 66.5 28.5t25.5 63.5q0 23 -17.5 39.5t-37.5 16.5q-41 0 -66.5 -27t-25.5 -64z" /> +<glyph unicode="Æ" horiz-adv-x="1476" d="M-41 0l619 1290h202l23 -260l41 260h672l-33 -207h-436l-52 -307h328l-33 -211h-327l-58 -356h459l-35 -209h-692l63 391h-301l-192 -391h-248zM492 596h200l-51 346z" /> +<glyph unicode="Ç" horiz-adv-x="1007" d="M94 481q0 70 15 170q18 115 68 230.5t125 215t181.5 162t223.5 62.5q209 0 319 -90l6 -4l-108 -156q-86 55 -236 55q-68 0 -134.5 -56t-109.5 -124q-57 -88 -91 -219t-34 -244q0 -127 49.5 -223t161.5 -96q117 0 254 82l86 -156q-111 -88 -274 -113q31 -33 41 -75 q3 -13 3 -26q0 -60 -63 -122q-77 -76 -174 -116l-102 100q174 61 174 118q0 21 -15 25q-13 4 -31.5 -1t-36.5 -13l-33 -15q-15 -7 -17 -8l23 146q-271 83 -271 491z" /> +<glyph unicode="È" horiz-adv-x="911" d="M82 0l199 1290h675l-28 -198h-451l-49 -318h332l-31 -205h-334l-57 -366h469l-31 -203h-694zM449 1669l180 156q88 -154 264 -295l-109 -125q-216 125 -335 264z" /> +<glyph unicode="É" horiz-adv-x="911" d="M82 0l199 1290h675l-28 -198h-451l-49 -318h332l-31 -205h-334l-57 -366h469l-31 -203h-694zM408 1536q98 61 187 134t130 114l39 41l139 -164q-184 -145 -420 -256z" /> +<glyph unicode="Ê" horiz-adv-x="911" d="M82 0l199 1290h675l-28 -198h-451l-49 -318h332l-31 -205h-334l-57 -366h469l-31 -203h-694zM311 1546q268 141 414 258q115 -145 262 -274l-133 -121q-117 109 -164 162q-156 -92 -282 -156z" /> +<glyph unicode="Ë" horiz-adv-x="911" d="M82 0l199 1290h675l-28 -198h-451l-49 -318h332l-31 -205h-334l-57 -366h469l-31 -203h-694zM375 1542q0 57 44 103.5t99 46.5q47 0 81 -33t34 -78q0 -57 -46 -100t-104 -43q-45 0 -76.5 29.5t-31.5 74.5zM721 1542q0 57 43 103.5t100 46.5q47 0 81 -33t34 -78 q0 -57 -46 -100t-104 -43q-47 0 -77.5 29.5t-30.5 74.5z" /> +<glyph unicode="Ì" horiz-adv-x="485" d="M63 0l189 1290h225l-190 -1290h-224zM129 1669l180 156q88 -154 264 -295l-108 -125q-217 125 -336 264z" /> +<glyph unicode="Í" horiz-adv-x="485" d="M61 0l177 1290h198l-178 -1290h-197zM176 1483q80 57 152.5 125.5t105.5 107.5l33 39l113 -153q-127 -127 -342 -242z" /> +<glyph unicode="Î" horiz-adv-x="485" d="M61 1546q266 141 414 258q113 -145 262 -274l-135 -121q-117 109 -164 162q-152 -90 -280 -156zM70 0l190 1290h223l-188 -1290h-225z" /> +<glyph unicode="Ï" horiz-adv-x="485" d="M63 0l189 1290h225l-190 -1290h-224zM96 1542q0 57 43 103.5t101 46.5q47 0 80.5 -33t33.5 -78q0 -57 -46 -100t-103 -43q-45 0 -77 29.5t-32 74.5zM442 1542q0 57 43 103.5t101 46.5q47 0 79.5 -33t32.5 -78q0 -57 -46 -100t-103 -43q-45 0 -76 29.5t-31 74.5z" /> +<glyph unicode="Ñ" horiz-adv-x="1132" d="M82 0l201 1290h262l196 -702l29 -156q0 164 8 219l99 639h229l-201 -1290h-217l-250 899q-2 -86 -14 -166l-115 -733h-227zM369 1587q123 100 229 109q11 1 22 1q69 0 148 -34q86 -31 119 -31q9 0 14 2q25 9 25 44q0 20 -8 48l178 -34q1 -12 1 -23q0 -67 -32 -113 q-47 -76 -154 -81q-12 -1 -23 -1q-58 0 -118 25q-10 4 -32 14l-30 15q-9 4 -26.5 9t-35 8t-38.5 3q-61 0 -176 -86z" /> +<glyph unicode="Ò" horiz-adv-x="1120" d="M119 483q0 125 34.5 265.5t100 271.5t177.5 216t249 85q131 0 217 -83t116.5 -191.5t30.5 -237.5q0 -125 -34.5 -265.5t-100 -271.5t-177 -217t-249.5 -86q-100 0 -173.5 47t-113.5 125t-58.5 163t-18.5 179zM338 430q0 -256 164 -256q88 0 155.5 78t101.5 194.5t49 220 t15 185.5q0 264 -164 264q-86 0 -153.5 -80t-101 -197.5t-50 -223t-16.5 -185.5zM483 1669l181 156q90 -154 264 -295l-109 -125q-195 112 -336 264z" /> +<glyph unicode="Ó" horiz-adv-x="1120" d="M119 483q0 125 34.5 265.5t100 271.5t177.5 216t249 85q131 0 217 -83t116.5 -191.5t30.5 -237.5q0 -125 -34.5 -265.5t-100 -271.5t-177 -217t-249.5 -86q-100 0 -173.5 47t-113.5 125t-58.5 163t-18.5 179zM338 430q0 -256 164 -256q88 0 155.5 78t101.5 194.5t49 220 t15 185.5q0 264 -164 264q-86 0 -153.5 -80t-101 -197.5t-50 -223t-16.5 -185.5zM504 1536q98 61 187 134t128 114l41 41l139 -164q-156 -131 -419 -256z" /> +<glyph unicode="Ô" horiz-adv-x="1120" d="M119 483q0 125 34.5 265.5t100 271.5t177.5 216t249 85q131 0 217 -83t116.5 -191.5t30.5 -237.5q0 -125 -34.5 -265.5t-100 -271.5t-177 -217t-249.5 -86q-100 0 -173.5 47t-113.5 125t-58.5 163t-18.5 179zM338 430q0 -256 164 -256q88 0 155.5 78t101.5 194.5t49 220 t15 185.5q0 264 -164 264q-86 0 -153.5 -80t-101 -197.5t-50 -223t-16.5 -185.5zM373 1546q266 141 413 258q115 -145 263 -274l-134 -121q-96 86 -165 162q-119 -74 -281 -156z" /> +<glyph unicode="Õ" horiz-adv-x="1120" d="M119 483q0 125 34.5 265.5t100 271.5t177.5 216t249 85q131 0 217 -83t116.5 -191.5t30.5 -237.5q0 -125 -34.5 -265.5t-100 -271.5t-177 -217t-249.5 -86q-100 0 -173.5 47t-113.5 125t-58.5 163t-18.5 179zM338 430q0 -256 164 -256q88 0 155.5 78t101.5 194.5t49 220 t15 185.5q0 264 -164 264q-86 0 -153.5 -80t-101 -197.5t-50 -223t-16.5 -185.5zM350 1587q123 100 230 109q10 1 21 1q68 0 151 -34q83 -31 116 -31q9 0 15 2q25 9 24 44q0 20 -8 48l178 -34q1 -12 1 -23q0 -67 -31 -113q-47 -76 -154 -81q-12 -1 -23 -1q-58 0 -118 25 q-10 4 -32 14l-31 15q-9 4 -26.5 9t-35 8t-37.5 3q-61 0 -176 -86z" /> +<glyph unicode="Ö" horiz-adv-x="1120" d="M119 483q0 125 34.5 265.5t100 271.5t177.5 216t249 85q131 0 217 -83t116.5 -191.5t30.5 -237.5q0 -125 -34.5 -265.5t-100 -271.5t-177 -217t-249.5 -86q-100 0 -173.5 47t-113.5 125t-58.5 163t-18.5 179zM338 430q0 -256 164 -256q88 0 155.5 78t101.5 194.5t49 220 t15 185.5q0 264 -164 264q-86 0 -153.5 -80t-101 -197.5t-50 -223t-16.5 -185.5zM438 1542q0 57 43 103.5t101 46.5q47 0 79.5 -33t32.5 -78q0 -57 -46 -100t-103 -43q-45 0 -76 29.5t-31 74.5zM784 1542q0 57 43 103.5t101 46.5q47 0 79.5 -33t32.5 -78q0 -57 -46 -100 t-103 -43q-45 0 -76 29.5t-31 74.5z" /> +<glyph unicode="Ø" horiz-adv-x="1120" d="M117 -299l153 344q-152 135 -151 438q0 125 34.5 265.5t100 271.5t177.5 216t249 85q82 0 141 -31l115 258h102l-137 -311q143 -137 143 -428q0 -125 -34.5 -265.5t-100 -271.5t-178.5 -217t-250 -86q-72 0 -131 27l-131 -295h-102zM338 430q0 -106 27 -168l370 836 q-35 18 -76 18q-86 0 -153.5 -79t-101 -196.5t-50 -224t-16.5 -186.5zM434 188q31 -14 68 -14q88 0 155.5 78t101.5 193.5t49 220t15 186.5q0 96 -22 160z" /> +<glyph unicode="Ù" horiz-adv-x="1114" d="M126 317q-4 35 -4 70q0 64 13 129l119 774h227l-123 -788q-10 -104 -10 -163q0 -67 33 -115q35 -50 111 -50q193 0 245 342l121 774h227l-122 -794q-23 -147 -79.5 -261t-163 -190t-249.5 -76q-113 0 -190.5 48.5t-110.5 125t-44 174.5zM492 1669l180 156 q88 -154 262 -295l-109 -125q-212 123 -333 264z" /> +<glyph unicode="Ú" horiz-adv-x="1114" d="M126 317q-4 35 -4 70q0 64 13 129l119 774h227l-123 -788q-10 -104 -10 -163q0 -67 33 -115q35 -50 111 -50q193 0 245 342l121 774h227l-122 -794q-23 -147 -79.5 -261t-163 -190t-249.5 -76q-113 0 -190.5 48.5t-110.5 125t-44 174.5zM469 1536q98 61 187 134t130 114 l39 41l140 -164q-184 -145 -420 -256z" /> +<glyph unicode="Û" horiz-adv-x="1114" d="M126 317q-4 35 -4 70q0 64 13 129l119 774h227l-123 -788q-10 -104 -10 -163q0 -67 33 -115q35 -50 111 -50q193 0 245 342l121 774h227l-122 -794q-23 -147 -79.5 -261t-163 -190t-249.5 -76q-113 0 -190.5 48.5t-110.5 125t-44 174.5zM371 1546q266 141 413 258 q113 -145 263 -274l-136 -121q-102 94 -163 162q-152 -90 -281 -156z" /> +<glyph unicode="Ü" horiz-adv-x="1114" d="M126 317q-4 35 -4 70q0 64 13 129l119 774h227l-123 -788q-10 -104 -10 -163q0 -67 33 -115q35 -50 111 -50q193 0 245 342l121 774h227l-122 -794q-23 -147 -79.5 -261t-163 -190t-249.5 -76q-113 0 -190.5 48.5t-110.5 125t-44 174.5zM412 1542q0 57 44 103.5t101 46.5 q47 0 80 -33t33 -78q0 -57 -46 -100t-104 -43q-45 0 -76.5 29.5t-31.5 74.5zM758 1542q0 57 44 103.5t101 46.5q45 0 79 -33t34 -78q0 -57 -46 -100t-104 -43q-45 0 -76.5 29.5t-31.5 74.5z" /> +<glyph unicode="Ý" horiz-adv-x="880" d="M55 1165l154 154q129 -82 209 -246q49 -104 61 -262q35 154 138.5 304.5t232.5 217.5l143 -151q-61 -39 -113.5 -87t-94.5 -114t-73.5 -120t-60.5 -141l-46 -138q-17 -51 -38 -154l-28 -143q-8 -41 -26 -150l-21 -135h-224l74 471q-14 127 -20 164q-20 164 -86 314 t-181 216zM799 1587q98 61 187 134t130 114l39 41l139 -164q-156 -131 -420 -256z" /> +<glyph unicode="ß" horiz-adv-x="1122" d="M2 -307q12 18 32.5 55t59.5 161t51 257q45 477 58 649l-135 33l26 156h125l19 135q20 162 172 244q119 65 244 66q34 0 69 -5q117 -18 191.5 -95t86.5 -206q2 -16 2 -33q0 -118 -75 -270q-86 18 -123 18q-57 0 -88 -33q-33 -35 -33 -78q0 -54 96 -110l183 -111 q111 -68 110 -217q-2 -160 -122 -250t-283 -90q-66 0 -129.5 25.5t-94.5 50.5l-30 25l106 161q70 -66 150 -65q68 0 114.5 27.5t55.5 68.5q1 7 1 14q0 56 -77 103l-182 108q-63 37 -98 117q-24 56 -23 112q0 24 4 48q23 133 121 201.5t207 68.5q13 45 12 81q0 47 -21 80 q-37 58 -137 58q-72 0 -130 -44t-64 -107l-25 -240l-78 -809q-14 -160 -203 -436l-8 -12z" /> +<glyph unicode="à" horiz-adv-x="1003" d="M98 266q0 111 32 238t92.5 248.5t165 201.5t233.5 80q104 0 299 -37l-103 -739q-9 -48 -9 -77q0 -35 19 -36l50 11l45 -140q-92 -47 -168 -47q-66 0 -106 49q-32 39 -32 84q0 11 2 23l9 57q-4 -8 -14.5 -22.5t-43 -51t-67.5 -65.5t-90.5 -51.5t-112.5 -22.5 q-201 0 -201 297zM322 218q0 -19 12 -31.5t41 -12.5q66 0 156 119t108 209l55 332q-47 4 -69 4q-72 0 -132.5 -64.5t-96.5 -160t-55 -187.5t-19 -162v-46zM444 1403l181 156q90 -154 264 -295l-109 -125q-195 112 -336 264z" /> +<glyph unicode="á" horiz-adv-x="1003" d="M98 266q0 111 32 238t92.5 248.5t165 201.5t233.5 80q104 0 299 -37l-103 -739q-9 -48 -9 -77q0 -35 19 -36l50 11l45 -140q-92 -47 -168 -47q-66 0 -106 49q-32 39 -32 84q0 11 2 23l9 57q-4 -8 -14.5 -22.5t-43 -51t-67.5 -65.5t-90.5 -51.5t-112.5 -22.5 q-201 0 -201 297zM322 218q0 -19 12 -31.5t41 -12.5q66 0 156 119t108 209l55 332q-47 4 -69 4q-72 0 -132.5 -64.5t-96.5 -160t-55 -187.5t-19 -162v-46zM473 1270q98 61 187.5 134t130.5 114l38 41l140 -164q-156 -131 -420 -256z" /> +<glyph unicode="â" horiz-adv-x="1003" d="M98 266q0 111 32 238t92.5 248.5t165 201.5t233.5 80q104 0 299 -37l-103 -739q-9 -48 -9 -77q0 -35 19 -36l50 11l45 -140q-92 -47 -168 -47q-66 0 -106 49q-32 39 -32 84q0 11 2 23l9 57q-4 -8 -14.5 -22.5t-43 -51t-67.5 -65.5t-90.5 -51.5t-112.5 -22.5 q-201 0 -201 297zM317 1280q266 141 414 258q113 -145 262 -274l-135 -121q-117 109 -164 162q-152 -90 -280 -156zM322 218q0 -19 12 -31.5t41 -12.5q66 0 156 119t108 209l55 332q-47 4 -69 4q-72 0 -132.5 -64.5t-96.5 -160t-55 -187.5t-19 -162v-46z" /> +<glyph unicode="ã" horiz-adv-x="1003" d="M98 266q0 111 32 238t92.5 248.5t165 201.5t233.5 80q104 0 299 -37l-103 -739q-9 -48 -9 -77q0 -35 19 -36l50 11l45 -140q-92 -47 -168 -47q-66 0 -106 49q-32 39 -32 84q0 11 2 23l9 57q-4 -8 -14.5 -22.5t-43 -51t-67.5 -65.5t-90.5 -51.5t-112.5 -22.5 q-201 0 -201 297zM276 1321q123 100 230 109q10 1 21 0q68 0 151 -33q83 -31 116 -31q9 0 15 2q25 9 25 44q0 20 -9 48l179 -35q1 -14 1 -27q0 -62 -32 -108q-47 -76 -154 -82q-12 -1 -23 -1q-58 0 -118 26l-30 14q-26 12 -32 14.5t-25.5 9.5t-36.5 9t-38 2q-61 0 -176 -86z M322 218q0 -19 12 -31.5t41 -12.5q66 0 156 119t108 209l55 332q-47 4 -69 4q-72 0 -132.5 -64.5t-96.5 -160t-55 -187.5t-19 -162v-46z" /> +<glyph unicode="ä" horiz-adv-x="1003" d="M98 266q0 111 32 238t92.5 248.5t165 201.5t233.5 80q104 0 299 -37l-103 -739q-9 -48 -9 -77q0 -35 19 -36l50 11l45 -140q-92 -47 -168 -47q-66 0 -106 49q-32 39 -32 84q0 11 2 23l9 57q-4 -8 -14.5 -22.5t-43 -51t-67.5 -65.5t-90.5 -51.5t-112.5 -22.5 q-201 0 -201 297zM322 218q0 -19 12 -31.5t41 -12.5q66 0 156 119t108 209l55 332q-47 4 -69 4q-72 0 -132.5 -64.5t-96.5 -160t-55 -187.5t-19 -162v-46zM393 1276q0 57 43 103t101 46q47 0 80.5 -32.5t33.5 -77.5q0 -57 -46 -100.5t-103 -43.5q-47 0 -78 30t-31 75z M739 1276q0 57 43 103t101 46q47 0 79.5 -32.5t32.5 -77.5q0 -57 -46 -100.5t-103 -43.5q-45 0 -76 30t-31 75z" /> +<glyph unicode="å" horiz-adv-x="1003" d="M98 266q0 111 32 238t92.5 248.5t165 201.5t233.5 80q104 0 299 -37l-103 -739q-9 -48 -9 -77q0 -35 19 -36l50 11l45 -140q-92 -47 -168 -47q-66 0 -106 49q-32 39 -32 84q0 11 2 23l9 57q-4 -8 -14.5 -22.5t-43 -51t-67.5 -65.5t-90.5 -51.5t-112.5 -22.5 q-201 0 -201 297zM322 218q0 -19 12 -31.5t41 -12.5q66 0 156 119t108 209l55 332q-47 4 -69 4q-72 0 -132.5 -64.5t-96.5 -160t-55 -187.5t-19 -162v-46zM494 1356q14 88 86.5 149.5t158.5 61.5q88 0 144 -67q44 -53 44 -120q0 -18 -3 -37q-14 -86 -85 -148t-161 -62 t-144 66q-43 53 -43 120q0 18 3 37zM635 1335q0 -23 17.5 -41t37.5 -18q41 0 66.5 29.5t25.5 64.5q0 23 -17 39t-38 16q-41 0 -66.5 -26.5t-25.5 -63.5z" /> +<glyph unicode="æ" horiz-adv-x="1361" d="M98 266q0 115 33 244t94.5 249t166 197.5t229.5 77.5q76 0 266 -41q88 41 184 41q262 0 262 -246q0 -86 -56 -157.5t-148.5 -115.5t-174.5 -70.5t-170 -43.5v-28q0 -74 34 -148.5t97 -74.5q61 0 129 28.5t113 71.5l92 -123q-66 -70 -168 -114t-198 -44q-193 0 -277 185 q-135 -184 -307 -185q-201 0 -201 297zM319 238q0 -33 11.5 -48.5t44.5 -15.5q45 0 98 54.5t90 111.5v33q0 268 146 467q-14 0 -43 -1t-41 -1q-76 0 -138.5 -70t-96.5 -170t-52.5 -195t-18.5 -165zM809 586q307 70 307 215q0 55 -65 55q-84 0 -146.5 -84t-95.5 -186z" /> +<glyph unicode="ç" horiz-adv-x="849" d="M92 381q0 133 45 265t119 218q72 82 162 126t160 44q33 0 61.5 -4t50 -9t43 -14.5t33.5 -16.5t26.5 -18t19.5 -17l15 -15l11 -10l-129 -137q-41 57 -148 57q-72 0 -145.5 -94t-98.5 -250q-8 -70 -8 -98q0 -111 40 -180.5t110 -69.5q43 0 99 31.5t93 64.5l35 33l100 -123 q-12 -16 -36.5 -42t-95 -77t-140.5 -68q35 -37 43 -75q3 -13 3 -26q0 -60 -63 -122q-77 -76 -173 -116l-103 100q174 61 175 118q0 21 -16 25q-13 4 -31.5 -1t-36.5 -13l-32 -15q-15 -7 -18 -8l23 154h10q-82 37 -131 111q-72 102 -72 272z" /> +<glyph unicode="è" horiz-adv-x="894" d="M92 373q0 156 54.5 303t174 252.5t279.5 105.5q262 0 262 -246q0 -86 -56 -156.5t-148.5 -115.5t-175.5 -71.5t-169 -43.5v-28q0 -74 34 -148.5t97 -74.5q59 0 120 25.5t91 49.5l31 25l92 -123q-16 -18 -47 -44t-126 -70t-193 -44q-160 0 -240 119t-80 285zM338 586 q307 72 307 215q0 55 -65 55q-86 0 -148.5 -85t-93.5 -185zM393 1403l180 156q90 -154 265 -295l-109 -125q-195 112 -336 264z" /> +<glyph unicode="é" horiz-adv-x="894" d="M92 373q0 156 54.5 303t174 252.5t279.5 105.5q262 0 262 -246q0 -86 -56 -156.5t-148.5 -115.5t-175.5 -71.5t-169 -43.5v-28q0 -74 34 -148.5t97 -74.5q59 0 120 25.5t91 49.5l31 25l92 -123q-16 -18 -47 -44t-126 -70t-193 -44q-160 0 -240 119t-80 285zM338 586 q307 72 307 215q0 55 -65 55q-86 0 -148.5 -85t-93.5 -185zM389 1270q98 61 187.5 134t128.5 114l40 41l140 -164q-156 -131 -420 -256z" /> +<glyph unicode="ê" horiz-adv-x="894" d="M92 373q0 156 54.5 303t174 252.5t279.5 105.5q262 0 262 -246q0 -86 -56 -156.5t-148.5 -115.5t-175.5 -71.5t-169 -43.5v-28q0 -74 34 -148.5t97 -74.5q59 0 120 25.5t91 49.5l31 25l92 -123q-16 -18 -47 -44t-126 -70t-193 -44q-160 0 -240 119t-80 285zM219 1280 q268 141 414 258q115 -145 262 -274l-133 -121q-117 109 -164 162q-156 -92 -283 -156zM338 586q307 72 307 215q0 55 -65 55q-86 0 -148.5 -85t-93.5 -185z" /> +<glyph unicode="ë" horiz-adv-x="894" d="M92 373q0 156 54.5 303t174 252.5t279.5 105.5q262 0 262 -246q0 -86 -56 -156.5t-148.5 -115.5t-175.5 -71.5t-169 -43.5v-28q0 -74 34 -148.5t97 -74.5q59 0 120 25.5t91 49.5l31 25l92 -123q-16 -18 -47 -44t-126 -70t-193 -44q-160 0 -240 119t-80 285zM313 1276 q0 57 44 103t102 46q47 0 79.5 -32.5t32.5 -77.5q0 -57 -46 -100.5t-103 -43.5q-45 0 -77 30t-32 75zM338 586q307 72 307 215q0 55 -65 55q-86 0 -148.5 -85t-93.5 -185zM659 1276q0 57 44.5 103t101.5 46q47 0 80 -32.5t33 -77.5q0 -57 -46.5 -100.5t-103.5 -43.5 q-45 0 -77 30t-32 75z" /> +<glyph unicode="ì" horiz-adv-x="477" d="M66 0l135 1004h186l-135 -1004h-186zM76 1403l180 156q90 -154 264 -295l-108 -125q-195 112 -336 264z" /> +<glyph unicode="í" horiz-adv-x="477" d="M66 0l135 1004h186l-135 -1004h-186zM98 1270q215 137 355 289l139 -164q-158 -133 -420 -256z" /> +<glyph unicode="î" horiz-adv-x="477" d="M66 1280q268 141 413 258q115 -145 262 -274l-133 -121q-117 109 -166 162q-133 -82 -280 -156zM145 0l138 1004h184l-135 -1004h-187z" /> +<glyph unicode="ï" horiz-adv-x="477" d="M66 1276q0 57 44 103t99 46q47 0 81 -32.5t34 -77.5q0 -57 -46.5 -100.5t-103.5 -43.5q-45 0 -76.5 30t-31.5 75zM106 0l138 1004h186l-137 -1004h-187zM412 1276q0 57 44 103t99 46q47 0 81 -32.5t34 -77.5q0 -57 -46 -100.5t-104 -43.5q-45 0 -76.5 30t-31.5 75z" /> +<glyph unicode="ñ" horiz-adv-x="1060" d="M84 0l158 1004h217l-29 -162q49 80 126 136t161 56q113 0 170 -43t60 -109q1 -18 1 -37q0 -51 -6 -108l-115 -737h-219l119 750q3 21 3 36q0 27 -9 38q-14 17 -57 18q-111 0 -271 -244l-92 -598h-217zM285 1321q123 100 229 109q10 1 21 0q68 0 151 -33q83 -31 117 -31 q9 0 14 2q25 9 25 44q0 20 -8 48l178 -35q1 -14 1 -27q0 -62 -32 -108q-47 -76 -154 -82q-12 -1 -23 -1q-58 0 -118 26l-30 14q-26 12 -32 14.5t-25 9.5t-36.5 9t-38.5 2q-61 0 -176 -86z" /> +<glyph unicode="ò" horiz-adv-x="999" d="M92 395q0 141 55.5 284.5t170 249t260.5 105.5q166 0 248.5 -127t82.5 -303q0 -102 -32.5 -211.5t-92 -205t-154.5 -157t-206 -61.5q-166 0 -249 126t-83 300zM305 365q0 -207 137 -207q68 0 120 53t80 132t41 154.5t13 137.5q0 209 -137 209q-68 0 -120 -53.5 t-79.5 -133t-41 -155.5t-13.5 -137zM395 1403l180 156q90 -154 265 -295l-109 -125q-195 112 -336 264z" /> +<glyph unicode="ó" horiz-adv-x="999" d="M92 395q0 141 55.5 284.5t170 249t260.5 105.5q166 0 248.5 -127t82.5 -303q0 -102 -32.5 -211.5t-92 -205t-154.5 -157t-206 -61.5q-166 0 -249 126t-83 300zM305 365q0 -207 137 -207q68 0 120 53t80 132t41 154.5t13 137.5q0 209 -137 209q-68 0 -120 -53.5 t-79.5 -133t-41 -155.5t-13.5 -137zM406 1270q98 61 187 134t128 114l41 41l139 -164q-184 -145 -420 -256z" /> +<glyph unicode="ô" horiz-adv-x="999" d="M92 395q0 141 55.5 284.5t170 249t260.5 105.5q166 0 248.5 -127t82.5 -303q0 -102 -32.5 -211.5t-92 -205t-154.5 -157t-206 -61.5q-166 0 -249 126t-83 300zM272 1280q268 141 414 258q115 -145 262 -274l-133 -121q-117 109 -164 162q-156 -92 -282 -156zM305 365 q0 -207 137 -207q68 0 120 53t80 132t41 154.5t13 137.5q0 209 -137 209q-68 0 -120 -53.5t-79.5 -133t-41 -155.5t-13.5 -137z" /> +<glyph unicode="õ" horiz-adv-x="999" d="M92 395q0 141 55.5 284.5t170 249t260.5 105.5q166 0 248.5 -127t82.5 -303q0 -102 -32.5 -211.5t-92 -205t-154.5 -157t-206 -61.5q-166 0 -249 126t-83 300zM260 1321q123 100 229 109q11 1 22 0q70 0 151 -33q6 -2 25.5 -9.5t28.5 -10.5t28.5 -8t25.5 -4t23 3 q25 9 24 44q0 20 -8 48l180 -35q1 -11 1 -21q0 -64 -32 -114q-51 -76 -155 -82q-12 -1 -23 -1q-58 0 -118 26q-8 4 -27 12t-26 12.5t-21.5 9.5t-25.5 8t-26.5 5t-33.5 2q-61 0 -176 -86zM305 365q0 -207 137 -207q68 0 120 53t80 132t41 154.5t13 137.5q0 209 -137 209 q-68 0 -120 -53.5t-79.5 -133t-41 -155.5t-13.5 -137z" /> +<glyph unicode="ö" horiz-adv-x="999" d="M92 395q0 141 55.5 284.5t170 249t260.5 105.5q166 0 248.5 -127t82.5 -303q0 -102 -32.5 -211.5t-92 -205t-154.5 -157t-206 -61.5q-166 0 -249 126t-83 300zM305 365q0 -207 137 -207q68 0 120 53t80 132t41 154.5t13 137.5q0 209 -137 209q-68 0 -120 -53.5 t-79.5 -133t-41 -155.5t-13.5 -137zM340 1276q0 57 43 103t100 46q47 0 80 -32.5t33 -77.5q0 -57 -46 -100.5t-104 -43.5q-45 0 -75.5 30t-30.5 75zM684 1276q0 57 44 103t101 46q47 0 80 -32.5t33 -77.5q0 -57 -46 -100.5t-103 -43.5q-45 0 -77 30t-32 75z" /> +<glyph unicode="÷" horiz-adv-x="1001" d="M96 420v184h807v-184h-807zM342 213q0 63 47 108.5t111 45.5q59 0 99 -38t40 -98q0 -61 -47 -106t-111 -45q-59 0 -99 37t-40 96zM342 799q0 63 47 108t111 45q59 0 99 -37.5t40 -97.5q0 -63 -47 -108t-111 -45q-59 0 -99 38t-40 97z" /> +<glyph unicode="ø" horiz-adv-x="999" d="M92 395q0 141 55.5 284.5t170 249t260.5 105.5q59 0 102 -16l80 178h102l-100 -221q147 -113 147 -371q0 -102 -32.5 -211.5t-92 -205t-154.5 -157t-206 -61.5q-61 0 -105 17l-94 -209h-102l113 254q-144 112 -144 364zM305 365q0 -80 23 -134l272 609q-29 4 -41 4 q-68 0 -120 -53.5t-79.5 -132t-41 -154.5t-13.5 -139zM399 164q18 -6 43 -6q68 0 120 52t80 132t41 154.5t13 138.5q0 88 -24 137z" /> +<glyph unicode="ù" horiz-adv-x="1038" d="M105 156q-1 11 0 21q0 43 10 89l114 738h217l-116 -750q-3 -21 -3 -36q0 -27 9 -39q14 -17 57 -17q104 0 271 244l92 598h217l-131 -836q-4 -31 8 -50.5t27 -23.5l16 -4l-78 -121q-10 -1 -22 -1h-14q-22 1 -67.5 15.5t-64.5 47.5q-15 25 -15 67q0 29 7 66 q-53 -78 -135 -136.5t-164 -58.5q-86 0 -140.5 25.5t-73 67t-21.5 94.5zM436 1403l180 156q90 -154 265 -295l-109 -125q-195 112 -336 264z" /> +<glyph unicode="ú" horiz-adv-x="1038" d="M105 156q-1 11 0 21q0 43 10 89l114 738h217l-116 -750q-3 -21 -3 -36q0 -27 9 -39q14 -17 57 -17q104 0 271 244l92 598h217l-131 -836q-4 -31 8 -50.5t27 -23.5l16 -4l-78 -121q-10 -1 -22 -1h-14q-22 1 -67.5 15.5t-64.5 47.5q-15 25 -15 67q0 29 7 66 q-53 -78 -135 -136.5t-164 -58.5q-86 0 -140.5 25.5t-73 67t-21.5 94.5zM446 1270q215 137 355 289l139 -164q-158 -133 -420 -256z" /> +<glyph unicode="û" horiz-adv-x="1038" d="M105 156q-1 11 0 21q0 43 10 89l114 738h217l-116 -750q-3 -21 -3 -36q0 -27 9 -39q14 -17 57 -17q104 0 271 244l92 598h217l-131 -836q-4 -31 8 -50.5t27 -23.5l16 -4l-78 -121q-10 -1 -22 -1h-14q-22 1 -67.5 15.5t-64.5 47.5q-15 25 -15 67q0 29 7 66 q-53 -78 -135 -136.5t-164 -58.5q-86 0 -140.5 25.5t-73 67t-21.5 94.5zM307 1280q268 141 414 258q115 -145 264 -274l-135 -121q-117 109 -164 162q-156 -92 -283 -156z" /> +<glyph unicode="ü" horiz-adv-x="1038" d="M105 156q-1 11 0 21q0 43 10 89l114 738h217l-116 -750q-3 -21 -3 -36q0 -27 9 -39q14 -17 57 -17q104 0 271 244l92 598h217l-131 -836q-4 -31 8 -50.5t27 -23.5l16 -4l-78 -121q-10 -1 -22 -1h-14q-22 1 -67.5 15.5t-64.5 47.5q-15 25 -15 67q0 29 7 66 q-53 -78 -135 -136.5t-164 -58.5q-86 0 -140.5 25.5t-73 67t-21.5 94.5zM348 1276q0 57 44 103t100 46q47 0 80.5 -32.5t33.5 -77.5q0 -57 -46 -100.5t-103 -43.5q-45 0 -77 30t-32 75zM694 1276q0 57 43 103t101 46q47 0 80.5 -32.5t33.5 -77.5q0 -57 -46 -100.5 t-103 -43.5q-47 0 -78 30t-31 75z" /> +<glyph unicode="ý" horiz-adv-x="880" d="M-18 -225q106 45 173.5 100t120.5 150l-200 979h229l123 -728l61 109q168 287 168 358q0 113 -43 236l211 45q41 -113 41 -246q0 -121 -67 -237l-336 -584q-78 -137 -177.5 -215t-252.5 -125zM776 1288q98 61 187.5 134t130.5 114l39 41l139 -164q-156 -131 -420 -256z " /> +<glyph unicode="ÿ" horiz-adv-x="880" d="M-18 -225q106 45 173.5 100t120.5 150l-200 979h229l123 -728l61 109q170 291 170 358q0 109 -45 236l211 45q41 -113 41 -246q0 -121 -67 -237l-336 -584q-78 -137 -177.5 -215t-252.5 -125zM188 1276q0 57 44 103t100 46q47 0 80.5 -32.5t33.5 -77.5q0 -57 -46 -100.5 t-103 -43.5q-45 0 -77 30t-32 75zM535 1276q0 57 43 103t100 46q47 0 80 -32.5t33 -77.5q0 -57 -45.5 -100.5t-102.5 -43.5q-47 0 -77.5 30t-30.5 75z" /> +<glyph unicode="Œ" horiz-adv-x="1286" d="M150 750q76 297 256 444q119 96 258 96h667l-33 -207h-467l-49 -307h359l-33 -211h-358l-56 -356h486l-33 -209h-674q-225 0 -313 233q-44 118 -44 257q1 122 34 260zM352 627q-16 -104 -16 -184q0 -219 125 -242l139 882q-96 -27 -157.5 -155.5t-90.5 -300.5z" /> +<glyph unicode="œ" horiz-adv-x="1486" d="M100 506q35 207 169 367.5t327 160.5q166 0 262 -133q139 133 322 133q121 0 197.5 -62.5t76.5 -183.5q0 -86 -57.5 -156.5t-152.5 -117.5t-182 -75.5t-181 -49.5v-8q-2 -82 35.5 -152.5t101.5 -70.5q119 0 270 161l101 -143q-199 -209 -404 -209q-164 0 -254 125 q-135 -125 -295 -125q-135 0 -220 85t-111 205q-14 67 -14 136q0 56 9 113zM324 494q-11 -74 -12 -132q0 -206 143 -206q125 0 198 163q-2 18 -2 54q0 166 62 313q-18 158 -135 158q-98 0 -163.5 -101.5t-90.5 -248.5zM907 586q311 70 312 215q0 47 -70 47q-78 0 -143.5 -79 t-98.5 -183z" /> +<glyph unicode="Ÿ" horiz-adv-x="880" d="M55 1165l154 154q129 -82 209 -246q49 -104 61 -262q35 154 138.5 304.5t232.5 217.5l143 -151q-61 -39 -113.5 -87t-94.5 -114t-73.5 -120t-60.5 -141l-46 -138q-17 -51 -38 -154l-28 -143q-8 -41 -26 -150l-21 -135h-224l74 471q-14 127 -20 164q-20 164 -86 314 t-181 216zM240 1542q0 57 44 103.5t101 46.5q47 0 80 -33t33 -78q0 -57 -46 -100t-104 -43q-45 0 -76.5 29.5t-31.5 74.5zM586 1542q0 57 44 103.5t101 46.5q47 0 80 -33t33 -78q0 -57 -46 -100t-104 -43q-45 0 -76.5 29.5t-31.5 74.5z" /> +<glyph unicode="ˆ" horiz-adv-x="737" d="M70 1280q266 141 413 258q113 -145 262 -274l-135 -121q-117 109 -164 162q-152 -90 -280 -156z" /> +<glyph unicode="˜" horiz-adv-x="763" d="M20 1321q123 100 230 109q10 1 21 0q68 0 151 -33q83 -31 116 -31q9 0 15 2q25 9 25 44q0 20 -9 48l179 -35q1 -14 1 -27q0 -62 -32 -108q-47 -76 -154 -82q-12 -1 -23 -1q-58 0 -118 26l-30 14q-26 12 -32 14.5t-25.5 9.5t-36.5 9t-38 2q-61 0 -176 -86z" /> +<glyph unicode="–" horiz-adv-x="733" d="M0 461v123h733v-123h-733z" /> +<glyph unicode="—" horiz-adv-x="1245" d="M0 463v123h1245v-123h-1245z" /> +<glyph unicode="‘" horiz-adv-x="559" d="M174 999l70 111q45 72 262 246l92 -94q-100 -119 -141 -211q-18 -41 -25 -133l-25 -11q-15 -6 -49 -15t-51 -9q-39 2 -71.5 31.5t-47.5 56.5z" /> +<glyph unicode="’" horiz-adv-x="610" d="M172 944q106 129 141 211q18 41 25 133l26 10q15 6 48.5 15.5t50.5 9.5q37 -2 70.5 -31.5t48.5 -58.5l14 -27l-70 -110q-45 -72 -262 -246z" /> +<glyph unicode="‚" horiz-adv-x="528" d="M16 -209q57 68 85 104.5t59 106.5q27 61 27 117q0 7 -1 14q82 45 121 45q29 0 64 -28.5t55 -57.5l18 -29q-98 -164 -307 -366z" /> +<glyph unicode="“" horiz-adv-x="944" d="M178 999l70 111q45 72 262 246l92 -94q-100 -119 -141 -211q-18 -41 -25 -134l-25 -10q-15 -6 -49 -15t-51 -9q-39 2 -71.5 31.5t-46.5 56.5zM541 999l69 111q45 72 262 246l93 -94q-100 -119 -142 -211q-18 -41 -24 -133l-26 -11q-15 -6 -49 -15t-50 -9q-39 2 -72 31.5 t-47 56.5z" /> +<glyph unicode="”" horiz-adv-x="942" d="M168 944q106 129 141 211q18 41 25 133l25 10q15 6 49 15.5t51 9.5q37 -2 70.5 -31.5t48.5 -58.5l14 -27l-70 -110q-45 -72 -262 -246zM530 944q106 129 142 211q18 41 24 133l26 10q15 6 49 15.5t50 9.5q37 -2 71 -31.5t48 -58.5l14 -27l-69 -110q-45 -72 -262 -246z " /> +<glyph unicode="„" horiz-adv-x="933" d="M-55 -195q106 123 141 211q18 41 25 134l25 10q15 6 49 15t51 9q39 -2 71.5 -31.5t46.5 -58.5l15 -26l-70 -111q-45 -72 -262 -246zM307 -195q106 123 142 211q18 41 24 134l26 10q15 6 49 15t50 9q39 -2 71.5 -31.5t47.5 -58.5l14 -26l-69 -111q-45 -72 -263 -246z" /> +<glyph unicode="•" horiz-adv-x="868" d="M80 645.5q0 145.5 103.5 248.5t249 103t249.5 -103t104 -248.5t-104 -249t-249.5 -103.5t-249 103.5t-103.5 249z" /> +<glyph unicode="…" horiz-adv-x="1204" d="M70 104.5q0 61.5 50 105.5t113 44q61 0 101.5 -37t40.5 -96q0 -61 -50.5 -106.5t-113.5 -45.5q-61 0 -101 37t-40 98.5zM422 104.5q0 61.5 50 105.5t114 44q61 0 101 -37t40 -96q0 -61 -50 -106.5t-114 -45.5q-61 0 -101 37t-40 98.5zM770 104.5q0 61.5 50 105.5t114 44 q61 0 101 -37t40 -96q0 -61 -50 -106.5t-114 -45.5q-61 0 -101 37t-40 98.5z" /> +<glyph unicode="‹" horiz-adv-x="589" d="M37 500l430 393l127 -121l-313 -276l229 -285l-152 -113z" /> +<glyph unicode="›" horiz-adv-x="665" d="M63 219l314 277l-230 284l152 113l322 -401l-431 -394z" /> +<glyph unicode="™" horiz-adv-x="1583" d="M219 1282l21 135h495l-20 -135h-176l-103 -676h-143l104 676h-178zM717 608l129 813h170l112 -524l9 -92q10 55 32 96l263 520h174l-131 -813h-146l64 400l24 143q-45 -135 -61 -168l-187 -375h-118l-88 404l-15 139l-20 -137l-64 -406h-147z" /> +<glyph unicode="" horiz-adv-x="1025" d="M0 1025h1025v-1025h-1025v1025z" /> +<glyph unicode="fi" horiz-adv-x="1056" d="M16 -299q111 205 138 524l45 602l-121 21l24 156h115l4 92q8 176 129 267t307 91q51 0 117 -13.5t132.5 -39t100.5 -75.5q19 -28 18 -60q0 -25 -11 -54q-23 -57 -80 -79q-25 -12 -55 -13q-78 0 -119 66q-18 29 -18 67q0 10 1 21q-57 8 -110 8q-16 0 -32 -1 q-69 -3 -119 -51t-52 -136l-2 -90h137v-181h-151l-62 -714q-10 -129 -63 -239t-148 -249zM604 0l141 1004h216l-140 -1004h-217z" /> +<glyph unicode="fl" horiz-adv-x="1056" d="M18 -299q111 205 138 524l45 602l-121 21l24 156h115l6 102q10 199 118 268.5t310 69.5q82 0 173.5 -19.5t140.5 -38.5l51 -18l-144 -954q-11 -82 -11 -155q0 -126 34 -224l-209 -58q-40 122 -40 269q0 85 14 180l118 823q-61 31 -135 31q-86 0 -147.5 -57.5 t-63.5 -126.5l-4 -92h137v-181h-151l-62 -714q-10 -129 -63 -239t-148 -249z" /> +<glyph unicode="ffi" horiz-adv-x="1579" d="M16 -299q111 205 138 524l45 602l-121 21l24 156h115q0 72 10.5 137t34 132.5t73.5 108.5t120 41q33 0 64.5 -5t45.5 -11l17 -6l-25 -168h-63q-14 0 -25.5 -9.5t-18 -27.5t-11.5 -35.5t-7 -44t-3 -43t-1 -40.5v-29h137v-181h-151l-62 -714q-10 -129 -63 -239t-148 -249z M567 -299q111 205 138 524l45 602l-121 21l24 156h115q0 72 10 137t34 132.5t74 108.5t120 41q33 0 64.5 -5t45.5 -11l17 -6l-25 -168h-64q-14 0 -25 -9.5t-17.5 -27.5t-11.5 -35.5t-7 -44t-3 -43t-1 -40.5v-29h137v-181h-151l-62 -714q-10 -129 -63.5 -239t-147.5 -249z M1167 0l152 1004h217l-154 -1004h-215zM1315 1251q0 78 74 121q33 20 73 21q55 0 95 -38t40 -93q0 -25 -10 -50q-23 -57 -78 -79q-27 -12 -57 -13q-78 0 -119 66q-18 32 -18 65z" /> +<glyph unicode="ffl" horiz-adv-x="1595" d="M16 -299q111 205 138 524l45 602l-121 21l24 156h115q0 72 10.5 137t34 132.5t73.5 108.5t120 41q33 0 64.5 -5t45.5 -11l17 -6l-25 -168h-63q-14 0 -25.5 -9.5t-18 -27.5t-11.5 -35.5t-7 -44t-3 -43t-1 -40.5v-29h137v-181h-151l-62 -714q-10 -129 -63 -239t-148 -249z M567 -299q111 205 138 524l45 602l-121 21l24 156h115q0 72 10 137t34 132.5t74 108.5t120 41q33 0 64.5 -5t45.5 -11l17 -6l-25 -168h-64q-14 0 -25 -9.5t-17.5 -27.5t-11.5 -35.5t-7 -44t-3 -43t-1 -40.5v-29h137v-181h-151l-62 -714q-10 -129 -63.5 -239t-147.5 -249z M1225 426l143 997h217l-145 -1009q-11 -86 -11 -155q0 -24 2 -46q5 -84 17 -131l12 -47l-207 -58q-41 124 -41 276q1 82 13 173z" /> +</font> +</defs></svg>
\ No newline at end of file diff --git a/public/stylesheets/fonts/delicious-bolditalic-webfont.ttf b/public/stylesheets/fonts/delicious-bolditalic-webfont.ttf Binary files differnew file mode 100755 index 000000000..ef25c0adc --- /dev/null +++ b/public/stylesheets/fonts/delicious-bolditalic-webfont.ttf diff --git a/public/stylesheets/fonts/delicious-bolditalic-webfont.woff b/public/stylesheets/fonts/delicious-bolditalic-webfont.woff Binary files differnew file mode 100755 index 000000000..068f460de --- /dev/null +++ b/public/stylesheets/fonts/delicious-bolditalic-webfont.woff diff --git a/public/stylesheets/fonts/delicious-heavy-webfont.eot b/public/stylesheets/fonts/delicious-heavy-webfont.eot Binary files differnew file mode 100755 index 000000000..782a01422 --- /dev/null +++ b/public/stylesheets/fonts/delicious-heavy-webfont.eot diff --git a/public/stylesheets/fonts/delicious-heavy-webfont.svg b/public/stylesheets/fonts/delicious-heavy-webfont.svg new file mode 100755 index 000000000..64e0eb347 --- /dev/null +++ b/public/stylesheets/fonts/delicious-heavy-webfont.svg @@ -0,0 +1,222 @@ +<?xml version="1.0" standalone="no"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" > +<svg xmlns="http://www.w3.org/2000/svg"> +<metadata> +This is a custom SVG webfont generated by Font Squirrel. +Copyright : copyright 19941996 Jos Buivenga +</metadata> +<defs> +<font id="DeliciousHeavyRegular" horiz-adv-x="921" > +<font-face units-per-em="2048" ascent="1638" descent="-410" /> +<missing-glyph horiz-adv-x="614" /> +<glyph unicode=" " horiz-adv-x="614" /> +<glyph unicode="	" horiz-adv-x="614" /> +<glyph unicode=" " horiz-adv-x="614" /> +<glyph unicode="!" horiz-adv-x="540" d="M115 123q0 68 56 114t130 46q72 0 125 -43t53 -108.5t-57 -113t-131 -47.5q-70 0 -123 43t-53 109zM139 1022q0 262 39 381l305 37q-55 -254 -55 -430v-600h-258l-13 192q-9 131 -13.5 226.5t-4.5 193.5z" /> +<glyph unicode=""" horiz-adv-x="708" d="M68 1305l38 168h160l47 -99v-401h-196zM385 971v403l51 99h154l45 -168l-55 -332z" /> +<glyph unicode="#" horiz-adv-x="1138" d="M68 356l36 262h115l29 216h-96l36 262h95l43 321h264l-43 -321h143l37 278h264l-37 -278h107l-25 -262h-118l-29 -216h88l-27 -262h-98l-47 -350h-258l45 350h-146l-43 -307h-258l39 307h-116zM481 618h146l28 216h-145z" /> +<glyph unicode="$" horiz-adv-x="888" d="M47 954q0 170 117 270q114 97 284 97h7l8 113l92 -9l-8 -114q82 -18 164 -68.5t129 -116.5l-170 -151q-53 61 -142 86l-18 -270l117 -74q113 -74 173 -157t60 -206q0 -168 -118.5 -271t-288.5 -114l-9 -121l-92 9l8 118q-158 27 -288 140l135 213q92 -70 172 -92l20 280 l-106 70q-117 78 -181.5 161.5t-64.5 206.5zM346 963q0 -68 76 -119l14 223q-37 -6 -63.5 -35.5t-26.5 -68.5zM471 233q88 25 88 123q0 47 -72 105z" /> +<glyph unicode="%" horiz-adv-x="1431" d="M49 1003.5q0 131.5 93.5 224.5t224.5 93q80 0 153 -39q4 -4 16 -11l17 -11q43 -20 145 -21q180 0 377 80l197 -49l-885 -1272h-272l757 1081q-68 -45 -190 -45q2 -10 2 -30q0 -131 -93 -224.5t-224 -93.5t-224.5 93t-93.5 224.5zM289 999.5q0 -32.5 22.5 -55t55 -22.5 t55 22.5t22.5 55t-22.5 55t-55 22.5t-55 -22.5t-22.5 -55zM735 287q0 131 93.5 224t224.5 93t224 -93t93 -224t-93 -224.5t-224 -93.5t-224.5 93.5t-93.5 224.5zM975 282.5q0 -32.5 22.5 -55t55 -22.5t55 22.5t22.5 55t-22.5 55t-55 22.5t-55 -22.5t-22.5 -55z" /> +<glyph unicode="&" horiz-adv-x="1290" d="M43 500q0 158 82 281.5t231 148.5q-53 18 -85.5 70.5t-32.5 111.5q0 143 122.5 224t272.5 81q166 0 290 -86t124 -246v-81h192v-244h-188v-463q0 -31 1 -42t12 -24.5t38 -13.5q41 0 74 19l69 -201q-137 -66 -246 -66q-121 0 -183 77t-62 200v514h-195q-59 0 -100 -21.5 t-61.5 -47t-31 -80t-11.5 -86t-1 -97.5q0 -217 60 -217q10 0 71.5 45t122.5 45q35 0 70 -12v-191q-47 0 -80 -20.5t-49.5 -44t-51 -44t-83.5 -20.5q-94 0 -169 51.5t-117 132t-63.5 170t-21.5 177.5zM530 1098q0 -94 131 -94h109v36q0 78 -23.5 115t-95.5 37 q-121 0 -121 -94z" /> +<glyph unicode="'" horiz-adv-x="425" d="M59 1305l41 168h215l43 -168l-71 -330h-158z" /> +<glyph unicode="(" horiz-adv-x="688" d="M35 676q0 293 159.5 526.5t432.5 396.5l37 -239q-172 -119 -268.5 -300t-96.5 -388q0 -444 354 -733l-45 -238q-145 106 -242.5 199.5t-177 209t-116.5 255t-37 311.5z" /> +<glyph unicode=")" horiz-adv-x="694" d="M29 1360q172 -119 268 -300t96 -388q0 -444 -354 -733l45 -238q197 143 313.5 268t188 302.5t71.5 404.5q0 293 -159.5 526.5t-431.5 396.5z" /> +<glyph unicode="*" horiz-adv-x="868" d="M18 1053l41 268l240 -141l-82 229h412l-82 -229l244 141l38 -268l-211 -82l220 -293h-316l-98 180l-92 -180h-299l194 293z" /> +<glyph unicode="+" horiz-adv-x="964" d="M45 391v242h305v299h262v-299h308v-242h-308v-301h-262v301h-305z" /> +<glyph unicode="," horiz-adv-x="528" d="M27 -229q115 152 114 247q0 18 -16 156q90 68 162 68q45 0 101 -46t93 -96q-154 -289 -309 -428z" /> +<glyph unicode="-" horiz-adv-x="618" d="M45 408v227h520v-227h-520z" /> +<glyph unicode="." horiz-adv-x="528" d="M80 131q0 72 56.5 122t129.5 50q70 0 123 -46t53 -116q0 -72 -56 -122t-130 -50q-70 0 -123 46t-53 116z" /> +<glyph unicode="/" horiz-adv-x="729" d="M8 -289l443 1825h276l-442 -1825h-277z" /> +<glyph unicode="0" d="M45 501.5q0 227.5 104.5 380t311.5 152.5t311.5 -152.5t104.5 -380t-104.5 -380t-311.5 -152.5t-311.5 152.5t-104.5 380zM317 502q0 -283 144 -283q68 0 105.5 73t37.5 210q0 281 -143.5 281t-143.5 -281z" /> +<glyph unicode="1" d="M158 737v219q111 0 276 48h219v-1004h-293v737h-202z" /> +<glyph unicode="2" d="M74 193q143 92 306 249.5t163 268.5q0 37 -29 54t-68 17q-72 0 -153.5 -32.5t-140.5 -79.5l-68 219q68 68 176.5 106.5t208.5 38.5q164 0 268.5 -78.5t104.5 -238.5q0 -127 -99.5 -248t-234.5 -215h360v-254h-751z" /> +<glyph unicode="3" d="M90 -133q72 2 148.5 19.5t151.5 50t123 94t48 139.5q0 39 -17.5 64.5t-51 36t-61.5 13.5t-66 3q-119 0 -238 -13v228l129 10q188 102 254 166q33 33 33 70q0 45 -49 45q-72 0 -308 -107l-71 203q92 55 208.5 99t198.5 44q131 0 222.5 -69.5t91.5 -194.5q0 -88 -59.5 -165 t-143.5 -116q96 -23 160.5 -102.5t64.5 -175.5q0 -147 -61.5 -258t-166 -172.5t-227 -91t-260.5 -29.5h-53v209z" /> +<glyph unicode="4" d="M43 201q188 414 489 803h271v-750h78v-254h-82v-283h-283v283h-461zM319 254h193v348q-20 -25 -98.5 -164t-94.5 -184z" /> +<glyph unicode="5" d="M82 -133q106 0 208.5 27.5t185.5 102.5t83 185q0 51 -41 79t-96 28q-145 0 -307 -45l90 760h596v-252h-355l-20 -240q47 10 88 10q145 0 243.5 -84t98.5 -227q0 -176 -106.5 -305t-260.5 -188q-148 -56 -314 -56h-11h-82v205z" /> +<glyph unicode="6" d="M59 537q0 147 52.5 274t148.5 223t205.5 167t249.5 134l108 -182q-295 -176 -405 -350q90 37 135 37q150 0 241 -111t91 -262q0 -215 -98.5 -356.5t-303.5 -141.5q-147 0 -246.5 89t-138.5 212.5t-39 266.5zM350 500q0 -90 31 -185.5t102 -95.5q121 0 121 242 q0 152 -133 151q-39 0 -113 -28q-8 -53 -8 -84z" /> +<glyph unicode="7" d="M78 745v259h762v-148q0 -276 -136.5 -631.5t-324.5 -593.5l-234 140q160 217 282 482t140 492h-489z" /> +<glyph unicode="8" d="M31 352q0 178 219 320q-184 129 -184 266q0 166 119.5 259t289.5 93q164 0 269.5 -89t105.5 -251q0 -133 -188 -260q113 -59 176 -132t63 -181q0 -188 -130 -298t-322 -110q-168 0 -293 108.5t-125 274.5zM326 373q0 -63 40 -112.5t101 -49.5q63 0 100 46t37 112 q0 82 -158 180q-120 -90 -120 -176zM354 932q0 -72 101 -135q111 72 110 153q0 109 -110 109q-101 0 -101 -127z" /> +<glyph unicode="9" d="M45 537q0 215 98.5 356t302.5 141q147 0 247 -89t138.5 -212t38.5 -266q0 -500 -673 -807l-95 193q299 158 410 348q-84 -37 -135 -37q-150 0 -241 110.5t-91 262.5zM330 543q0 -74 28.5 -113t100.5 -39q39 0 112 29q8 53 9 84q0 90 -31 184t-103 94q-41 0 -66.5 -23.5 t-35.5 -67.5t-12 -72.5t-2 -75.5z" /> +<glyph unicode=":" horiz-adv-x="528" d="M80 131q0 72 56.5 122t129.5 50q70 0 123 -46t53 -116q0 -72 -56 -122t-130 -50q-70 0 -123 46t-53 116zM80 721q0 74 56.5 124t129.5 50q70 0 123 -46t53 -116q0 -74 -56 -124t-130 -50q-70 0 -123 46t-53 116z" /> +<glyph unicode=";" horiz-adv-x="528" d="M20 -229q115 145 115 247q0 18 -16 156q90 68 162 68q47 0 102 -45t92 -97q-154 -289 -309 -428zM94 719q0 74 56.5 124t130.5 50q70 0 123 -46t53 -116q0 -74 -56.5 -124t-130.5 -50q-70 0 -123 46t-53 116z" /> +<glyph unicode="<" horiz-adv-x="614" d="M33 512l352 432l207 -168l-199 -262l201 -270l-207 -164z" /> +<glyph unicode="=" horiz-adv-x="983" d="M35 248v219h893v-219h-893zM35 545v219h893v-219h-893z" /> +<glyph unicode=">" horiz-adv-x="614" d="M31 244l207 -164l354 432l-352 432l-207 -168l198 -262z" /> +<glyph unicode="?" horiz-adv-x="733" d="M80 122.5q0 65.5 56.5 113t129.5 47.5q70 0 123 -43t53 -108.5t-57 -113t-129 -47.5q-70 0 -123 43t-53 108.5zM137 410v110q0 121 17.5 193.5t83.5 140.5l106 111q86 90 86 151q0 29 -15.5 43.5t-31.5 16.5t-49 2q-90 0 -187 -27v227q188 43 277 43q137 0 216 -82 t79 -219q0 -119 -113 -241l-127 -138q-92 -98 -92 -221v-110h-250z" /> +<glyph unicode="@" horiz-adv-x="1622" d="M51 721q0 311 236.5 535.5t550.5 224.5q195 0 357.5 -71t266 -215t103.5 -339q0 -180 -152.5 -348t-322.5 -168q-82 0 -127 35t-74 104q-147 -121 -242 -121q-109 0 -159 79t-50 196q0 182 85 316t251 134q94 0 174 -79l8 51h222l-66 -424q-2 -10 -5 -27.5t-5 -32 t-2 -26.5q0 -45 43 -45q68 0 114 118.5t46 206.5q0 207 -132.5 310.5t-343.5 103.5q-205 0 -352 -154.5t-147 -361.5q0 -240 169 -379t414 -139q154 0 259.5 44t236.5 150l113 -141q-160 -147 -314.5 -218t-355.5 -71q-324 0 -561.5 216.5t-237.5 535.5zM672 657 q0 -78 39 -77q29 0 54.5 6t34.5 10t43 21.5t40 21.5l28 186q-86 43 -114 43q-125 0 -125 -211z" /> +<glyph unicode="A" horiz-adv-x="1044" d="M12 0l361 1290h301l362 -1290h-317l-66 266h-258l-65 -266h-318zM428 506h193l-97 393z" /> +<glyph unicode="B" horiz-adv-x="1028" d="M109 31v1259h413q182 0 296 -84t114 -260q0 -74 -49 -151.5t-119 -96.5q102 -16 169.5 -104t67.5 -193q0 -207 -149.5 -319.5t-362.5 -112.5q-110 1 -380 62zM414 227q66 -14 71 -14q96 0 153.5 47t57.5 141q0 39 -13 68t-32.5 43t-51.5 21.5t-56.5 9.5t-61.5 2h-67v-318 zM414 776h67q150 0 150 142q0 117 -109 116h-108v-258z" /> +<glyph unicode="C" horiz-adv-x="1017" d="M66 645q0 168 59 318.5t187 254t300 103.5q90 0 190.5 -24.5t162.5 -73.5l-113 -205q-94 47 -240 47q-82 0 -140 -81t-79.5 -174t-21.5 -173q0 -70 9 -133.5t33.5 -130t77 -106.5t125.5 -40q129 0 242 74l133 -203q-72 -59 -178 -94t-205 -35q-139 0 -246.5 57.5 t-170 155t-94 214t-31.5 249.5z" /> +<glyph unicode="D" horiz-adv-x="1120" d="M109 0v1290h428q272 0 397 -177t125 -462q0 -170 -57.5 -314t-183.5 -240.5t-300 -96.5h-409zM412 258h106q70 0 118 37t71.5 98.5t34 120.5t10.5 125q0 76 -6.5 131t-26 121.5t-68.5 103.5t-123 37h-116v-774z" /> +<glyph unicode="E" horiz-adv-x="929" d="M106 0v1290h748v-262h-442v-225h340v-266h-340v-271h465v-266h-771z" /> +<glyph unicode="F" horiz-adv-x="843" d="M104 0v1290h695v-262h-389v-225h307v-266h-307v-537h-306z" /> +<glyph unicode="G" horiz-adv-x="1073" d="M59 645q0 170 59.5 320.5t188.5 252t303 101.5q102 0 216 -33t188 -92l-117 -201q-137 72 -287 72q-82 0 -141 -81t-81.5 -174t-22.5 -173q0 -70 10 -134.5t35.5 -130t78 -105.5t125.5 -40q72 0 97 9v395h293v-588q-162 -74 -394 -74q-139 0 -247.5 56.5t-173 152.5 t-97.5 215t-33 252z" /> +<glyph unicode="H" horiz-adv-x="1122" d="M111 0v1290h305v-487h291v487h305v-1290h-305v539h-291v-539h-305z" /> +<glyph unicode="I" horiz-adv-x="487" d="M92 0v1290h303v-1290h-303z" /> +<glyph unicode="J" horiz-adv-x="501" d="M-29 -125q49 16 90 52t41 79v1284h301v-1294q0 -74 -29.5 -131.5t-87 -95t-111.5 -60t-130 -45.5z" /> +<glyph unicode="K" horiz-adv-x="993" d="M111 0v1290h305v-438l235 438h342l-389 -649l379 -504v-137h-264l-303 440v-440h-305z" /> +<glyph unicode="L" horiz-adv-x="782" d="M104 0v1290h297v-1028h365v-262h-662z" /> +<glyph unicode="M" horiz-adv-x="1519" d="M111 0v1290h331l287 -784q20 -55 31 -135q10 80 31 135l284 784h334v-1290h-305v565l16 156l-243 -721h-236l-244 721l19 -156v-565h-305z" /> +<glyph unicode="N" horiz-adv-x="1134" d="M111 0v1290h329l224 -508q37 -80 55 -176v684h305v-1290h-281l-344 764q16 -82 17 -166v-598h-305z" /> +<glyph unicode="O" horiz-adv-x="1122" d="M61 645q0 115 27 227.5t82 216t156.5 168t234.5 64.5t234.5 -64.5t157 -168t82 -216t26.5 -227.5t-26.5 -227.5t-82 -216t-157 -168t-234.5 -64.5t-234.5 64.5t-156.5 168t-82 216t-27 227.5zM367 645.5q0 -65.5 2 -113t13 -109t31.5 -99t57.5 -65.5t90 -28t90 28 t57.5 67t32 100t13.5 108.5t2 110.5q0 66 -2 113t-13.5 107.5t-32 99.5t-57.5 66.5t-90 27.5t-90 -27.5t-57.5 -66.5t-31.5 -99.5t-13 -107.5t-2 -112.5z" /> +<glyph unicode="P" horiz-adv-x="1001" d="M106 0v1290h340q238 0 384.5 -98t146.5 -326q0 -186 -133 -319t-320 -133q-66 0 -112 28v-442h-306zM412 688q61 -25 82 -24q178 0 178 204q0 96 -56.5 131t-158.5 35h-45v-346z" /> +<glyph unicode="Q" horiz-adv-x="1122" d="M61 645q0 121 29 235.5t85 216t156.5 163t229.5 61.5t229.5 -61.5t157 -163t85 -216t28.5 -235.5q0 -199 -76 -379t-231 -256q63 -72 139 -71q72 0 168 30l-45 -288q-20 -4 -60 -5q-156 0 -261 75t-206 222q-113 16 -198.5 85t-133.5 166.5t-72 203.5t-24 217zM367 645 q0 -49 1 -79.5t6 -87t17 -93.5t32.5 -76t55.5 -58.5t82 -19.5q55 0 94 32t58.5 73t30 107.5t11.5 104.5t1 97q0 49 -1 80t-6.5 87t-17.5 93t-32.5 76t-55.5 58.5t-82 19.5t-82 -19.5t-55.5 -58.5t-32.5 -76t-17 -93t-6 -87t-1 -80z" /> +<glyph unicode="R" horiz-adv-x="1034" d="M111 0v1290h338q152 0 265 -36.5t190 -135t77 -252.5q0 -125 -67.5 -230.5t-182.5 -148.5l270 -350v-137h-256l-329 451v-451h-305zM416 682q47 -14 76 -14q84 0 132 57t48 143q0 88 -43 127t-133 39h-80v-352z" /> +<glyph unicode="S" horiz-adv-x="888" d="M47 954q0 168 116 267.5t288 99.5q106 0 214.5 -54.5t174.5 -140.5l-170 -151q-37 41 -95.5 68.5t-113.5 27.5q-45 0 -80 -31.5t-35 -76.5q0 -53 53.5 -98.5t128 -85.5t150.5 -90t129 -136t53 -199q0 -176 -128 -280.5t-308 -104.5q-84 0 -182.5 42t-169.5 104l135 213 q137 -100 219 -101q59 0 96 35t37 94q0 37 -38 74t-95 68.5t-122.5 77t-123 93.5t-95.5 122.5t-38 162.5z" /> +<glyph unicode="T" horiz-adv-x="829" d="M23 1022v268h786v-268h-244v-1022h-303l2 1022h-241z" /> +<glyph unicode="U" horiz-adv-x="1142" d="M109 514v776h305v-776q0 -147 37.5 -215t119.5 -68t120 68t38 215v776h305v-776q0 -104 -23.5 -195.5t-73.5 -172t-144.5 -129t-221.5 -48.5t-221 48.5t-144 129t-73.5 172t-23.5 195.5z" /> +<glyph unicode="V" horiz-adv-x="1044" d="M10 1290h328l158 -696q14 -59 30 -182q18 129 31 182l158 696h325l-364 -1290h-301z" /> +<glyph unicode="W" horiz-adv-x="1449" d="M12 1290h312l82 -585l22 -209q10 139 27 209l133 585h274l133 -585l31 -205q8 133 18 205l82 585h312l-250 -1290h-305l-138 690l-20 137q-10 -90 -20 -137l-138 -690h-305z" /> +<glyph unicode="X" horiz-adv-x="1007" d="M10 0l299 664l-289 626h342l130 -364l131 364h331l-274 -626l317 -664h-354l-149 399l-142 -399h-342z" /> +<glyph unicode="Y" horiz-adv-x="964" d="M4 1290h326l151 -502l154 502h326l-326 -807v-483h-305l2 483z" /> +<glyph unicode="Z" horiz-adv-x="937" d="M31 0v211q193 375 450 813h-409v266h794v-215q-262 -428 -467 -807h506v-268h-874z" /> +<glyph unicode="[" horiz-adv-x="507" d="M57 -319v1816h394v-250h-123v-1317h123v-249h-394z" /> +<glyph unicode="\" horiz-adv-x="686" d="M10 1536h277l391 -1825h-277z" /> +<glyph unicode="]" horiz-adv-x="509" d="M57 -70v-249h394v1816h-394v-250h123v-1317h-123z" /> +<glyph unicode="^" horiz-adv-x="1277" d="M84 643l453 819h198l453 -819h-309l-242 469l-246 -469h-307z" /> +<glyph unicode="_" d="M0 -92h922v-246h-922v246z" /> +<glyph unicode="`" horiz-adv-x="692" d="M39 1393l205 202q164 -193 331 -319l-114 -174q-221 121 -422 291z" /> +<glyph unicode="a" horiz-adv-x="954" d="M37 274q0 82 74 218l450 180v43q0 39 -34.5 60.5t-75.5 21.5q-127 0 -248 -95l-105 168q76 72 179.5 118t201.5 46q158 0 258.5 -75.5t100.5 -227.5v-534q0 -53 24 -54q12 0 29 9l45 -140q-86 -43 -158 -43q-78 0 -123 45t-55 117q-27 -74 -98.5 -118t-151.5 -44 q-313 0 -313 305zM315 279q0 -31 23.5 -51.5t56.5 -20.5q84 0 128 63.5t44 151.5v55l-233 -96q-19 -55 -19 -102z" /> +<glyph unicode="b" horiz-adv-x="1030" d="M117 115v1308h297v-493q100 104 190 104q182 0 283.5 -142t101.5 -331q0 -117 -26.5 -220t-81 -188t-148.5 -134.5t-217 -49.5q-192 1 -399 146zM414 250q53 -37 110 -37q164 0 164 328q0 248 -131 247q-74 0 -143 -104v-434z" /> +<glyph unicode="c" horiz-adv-x="843" d="M45 494q0 217 122 378.5t333 161.5q80 0 166 -34.5t145 -90.5l-133 -174q-70 55 -176 56q-55 0 -93 -53.5t-52.5 -114t-14.5 -113.5q0 -55 14.5 -119.5t54.5 -122t97 -57.5q109 0 217 88l106 -190q-68 -59 -160.5 -99.5t-176.5 -40.5q-205 0 -327 157t-122 368z" /> +<glyph unicode="d" horiz-adv-x="1048" d="M49 471q0 117 22.5 213t72 177t137.5 127t211 46q63 0 147 -30v419h297v-1185q0 -27 2 -44.5t15.5 -33t37.5 -15.5l-61 -176q-12 0 -32.5 -1t-33.5 -1q-61 0 -109 36t-67 106q-25 -59 -92.5 -100.5t-134.5 -41.5q-193 0 -302.5 152.5t-109.5 351.5zM352 489 q0 -274 133 -274q57 0 94 50t48.5 105.5t11.5 112.5v279q-63 29 -139 29q-37 0 -63.5 -13.5t-42 -42t-25 -52.5t-12.5 -69t-4 -63.5t-1 -61.5z" /> +<glyph unicode="e" horiz-adv-x="964" d="M47 524q0 211 135 360.5t344 149.5q162 0 279 -116.5t121 -278.5q4 -111 4 -164h-584q-2 -10 -2 -33q0 -86 38 -157.5t118 -71.5q162 0 282 88l86 -184q-76 -63 -182 -106.5t-197 -43.5q-150 0 -253 84t-146 206t-43 267zM367 664h284q-2 68 -39 121t-100 53 q-57 0 -98 -56.5t-47 -117.5z" /> +<glyph unicode="f" horiz-adv-x="585" d="M16 791v213h101v94q0 96 43 167.5t104.5 104.5t123 52.5t104.5 21.5l43 2l45 -211q-6 -2 -17.5 -4t-40 -13.5t-50 -26.5t-40 -43t-18.5 -63v-81h153v-240h-153v-764h-297v774z" /> +<glyph unicode="g" horiz-adv-x="931" d="M37 -121q0 61 56.5 118.5t119.5 80.5q-45 12 -80 51t-35 86q0 82 138 160q-74 35 -123.5 119t-49.5 159q0 172 112 276.5t292 104.5q98 0 176 -30h252v-216l-96 25q41 -72 41 -164q0 -127 -82 -214t-207 -111q-4 0 -31.5 -4.5t-44 -8.5t-39 -12t-34 -21.5t-11.5 -29.5 q0 -8 7.5 -15.5t19.5 -10.5l25 -6q13 -3 33 -3h32h30h21h66q125 0 204.5 -54.5t79.5 -172.5q0 -182 -148.5 -287t-334.5 -105q-68 0 -132.5 14.5t-124.5 45.5t-96 89t-36 136zM322 -92q0 -88 112 -88q82 0 140.5 43t58.5 108q0 8 -4 14.5t-12.5 10.5t-15.5 6t-20.5 3 t-20.5 1h-21h-19h-108q-90 -55 -90 -98zM356 674q0 -147 103 -148q94 0 94 138q0 145 -98.5 145t-98.5 -135z" /> +<glyph unicode="h" horiz-adv-x="1062" d="M113 0v1423h297v-493q147 104 233 104q94 0 158.5 -26.5t96.5 -73.5t44 -96.5t12 -112.5v-725h-297v725q0 63 -51 63q-33 0 -64.5 -9t-47 -17t-47.5 -30l-37 -25v-707h-297z" /> +<glyph unicode="i" horiz-adv-x="487" d="M61 1268q0 72 57.5 123t129 51t125 -47t53.5 -117q0 -74 -56.5 -123t-129.5 -49q-72 0 -125.5 46t-53.5 116zM96 0v1004h293v-1004h-293z" /> +<glyph unicode="j" horiz-adv-x="487" d="M-35 -193q82 37 107.5 67t25.5 79v1051h293v-1065q0 -80 -31.5 -139.5t-93 -98.5t-112 -59.5t-125.5 -42.5zM61 1268q0 72 57.5 123t129 51t125 -47t53.5 -117q0 -74 -56.5 -123t-129.5 -49q-72 0 -125.5 46t-53.5 116z" /> +<glyph unicode="k" horiz-adv-x="964" d="M115 0v1423h297v-673l198 254h334l-352 -429l362 -446v-129h-262l-280 379v-379h-297z" /> +<glyph unicode="l" horiz-adv-x="483" d="M84 436v987h293v-987q0 -117 16.5 -225.5t32.5 -159.5l14 -51h-286q-70 157 -70 436z" /> +<glyph unicode="m" horiz-adv-x="1579" d="M115 0v1006h297v-76q135 104 235 104q160 0 230 -96l6 -8q156 104 256 104q332 0 331 -303v-731h-296v711q0 80 -52 80q-45 0 -90 -16.5t-67 -33.5l-23 -18v-723h-297v705q0 49 -11 66t-38 17q-35 0 -67.5 -10t-46 -18t-41 -29.5t-29.5 -23.5v-707h-297z" /> +<glyph unicode="n" horiz-adv-x="1062" d="M113 0v1004h297v-74q147 104 233 104q94 0 158.5 -26.5t96.5 -73.5t44 -96.5t12 -112.5v-725h-297v725q0 63 -51 63q-33 0 -64.5 -9t-47 -17t-47.5 -30l-37 -25v-707h-297z" /> +<glyph unicode="o" horiz-adv-x="999" d="M49 502q0 127 45 243.5t151.5 202.5t254 86t254 -86t151.5 -202.5t45 -243.5t-45 -244t-151.5 -203t-254 -86t-254 86t-151.5 203t-45 244zM346 502q0 -133 41 -210t112.5 -77t112.5 77t41 210t-41 208.5t-112.5 75.5t-112.5 -75.5t-41 -208.5z" /> +<glyph unicode="p" horiz-adv-x="1056" d="M113 -358v1362h299l-2 -74q12 12 31.5 29.5t75.5 46t106 28.5q125 0 216 -82t129 -191.5t38 -223.5q0 -98 -18.5 -187.5t-61.5 -180.5t-132 -145.5t-214 -54.5q-94 0 -168 72v-399h-299zM412 485q0 -276 159 -276q33 0 56.5 15.5t38 47t22.5 58t11 73t3 62.5v55 q0 268 -131 268q-29 0 -56.5 -10t-36.5 -15t-36.5 -30.5t-29.5 -27.5v-220z" /> +<glyph unicode="q" horiz-adv-x="1054" d="M47 459q0 94 25.5 190t77 184.5t143.5 144.5t209 56q78 0 187.5 -21.5t178.5 -41.5l72 -23v-1306h-299v405q-84 -78 -168 -78q-150 0 -250 77t-138 182.5t-38 230.5zM348 481q0 -272 133 -272q61 0 99 52t49.5 108.5t11.5 111.5v293q-74 18 -116 18q-12 0 -21 -1 q-47 -8 -80 -42t-48.5 -83.5t-21.5 -93.5t-6 -91z" /> +<glyph unicode="r" horiz-adv-x="653" d="M109 0v1004h299v-74q88 104 139 104q27 0 53.5 -7t38.5 -15l14 -8l-39 -291q-72 31 -129 30q-23 0 -43 -7t-28 -15l-8 -8v-713h-297z" /> +<glyph unicode="s" horiz-adv-x="858" d="M49 733q4 123 107.5 212t289.5 89q106 0 197.5 -43t130.5 -86l37 -43l-156 -143q-111 84 -213 84q-98 0 -98 -58q0 -12 5 -22t18.5 -19.5t20.5 -13.5t30 -14l96 -43q74 -33 103.5 -47.5t84 -50t77 -68.5t39.5 -84q14 -41 14 -90q0 -11 -1 -23q-14 -178 -186 -256 q-94 -45 -223 -45q-74 0 -160 36t-135 71l-51 35l108 198q162 -104 244 -104q113 0 113 74q0 43 -80 79q-29 14 -110 49t-118.5 56.5t-90 61.5t-73.5 91q-20 47 -20 106v11z" /> +<glyph unicode="t" horiz-adv-x="626" d="M35 791v213h96v180h285v-180h168v-236h-164v-475q0 -61 33 -72q16 -6 32 -6q32 0 68 21l63 -203q-88 -37 -120 -47q-49 -16 -127 -17q-127 0 -186.5 80t-59.5 195v524z" /> +<glyph unicode="u" horiz-adv-x="1062" d="M111 274v730h297v-730q0 -35 15 -48t50 -13q66 0 182 80v711h297v-795q0 -51 52 -84l-95 -156q-121 14 -194 119q-162 -119 -287 -119q-317 0 -317 305z" /> +<glyph unicode="v" horiz-adv-x="925" d="M16 1004h322l135 -586q96 285 127 586h315q-141 -582 -348 -1004h-213z" /> +<glyph unicode="w" horiz-adv-x="1372" d="M16 1004h314q92 -457 92 -586l135 586h270l138 -586q84 344 84 586h307q-66 -555 -277 -1004h-262q-100 324 -127 504q-20 -143 -125 -504h-276z" /> +<glyph unicode="x" horiz-adv-x="868" d="M4 0l275 518l-269 486h330l92 -216l96 216h326l-270 -476l280 -528h-334l-98 262l-104 -262h-324z" /> +<glyph unicode="y" horiz-adv-x="929" d="M18 1004h316q137 -459 149 -658q78 283 125 658h305q-29 -154 -70.5 -323t-106 -380t-152.5 -376t-181 -226q-37 -25 -96 -46.5t-102 -29.5l-41 -10l-68 217q72 25 113 50.5t57.5 46t46.5 73.5l13 20z" /> +<glyph unicode="z" horiz-adv-x="872" d="M51 0v197q154 283 357 553h-324v254h709v-209q-217 -270 -371 -541h405v-254h-776z" /> +<glyph unicode="{" horiz-adv-x="681" d="M31 481v215q74 0 116.5 40t42.5 120v340q0 313 265 313h141l51 -227h-119q-43 0 -56 -20.5t-13 -75.5v-357q0 -131 -127 -243q127 -113 127 -240v-356q0 -55 13 -74.5t56 -19.5h121l-51 -228h-70h-69q-268 0 -269 312v339q0 80 -42.5 121t-116.5 41z" /> +<glyph unicode="|" horiz-adv-x="454" d="M94 -29v1569h266v-1569h-266z" /> +<glyph unicode="}" horiz-adv-x="681" d="M31 -104l51 -228h70h69q270 0 271 312v339q0 80 41.5 121t115.5 41v215q-74 0 -115.5 40t-41.5 120v340q0 313 -267 313h-141l-51 -227h119q43 0 57 -20.5t14 -75.5v-357q0 -133 125 -243q-125 -111 -125 -240v-356q0 -53 -14 -73.5t-57 -20.5h-121z" /> +<glyph unicode="~" horiz-adv-x="1363" d="M274 463v209q10 16 27.5 39.5t71 62.5t104.5 39q92 0 229.5 -66.5t190.5 -66.5q41 0 90 28.5t78 57.5l27 27v-224q-8 -16 -24.5 -38.5t-67 -61.5t-103.5 -39q-102 0 -239.5 66.5t-182.5 66.5q-74 0 -107 -16t-94 -84z" /> +<glyph unicode="¡" horiz-adv-x="540" d="M70 -465q53 262 53 430v600h260l11 -194l12.5 -222.5t5.5 -195.5q0 -262 -39 -381zM74 844q0 68 56 114t130 46q72 0 125 -43t53 -107q0 -68 -57 -115t-131 -47q-70 0 -123 43t-53 109z" /> +<glyph unicode="¢" horiz-adv-x="843" d="M45 494q0 221 109 364q66 82 153.5 127t175.5 49v135h92v-141q74 -10 132.5 -42t80.5 -58l23 -27l-145 -158q-31 25 -91 39v-561q82 23 150 78l106 -190q-113 -98 -256 -132v-129h-92v121q-176 2 -303 142q-135 150 -135 383zM342 510q0 -115 41 -197t100 -98v573 q-53 -14 -97 -82.5t-44 -195.5z" /> +<glyph unicode="£" horiz-adv-x="905" d="M25 727l96 195v198q0 109 67.5 180.5t149.5 95t170 23.5q166 0 291 -100l-82 -211q-119 66 -197 66q-53 0 -77.5 -17.5t-24.5 -62.5v-172h260v-252h-260v-148q0 -96 -29 -268h55q70 -16 99 -31q38 -12 72 -11q114 0 202 122l60 -211q-2 -4 -9 -10l-25 -27 q-19 -20 -40 -35.5t-54.5 -36t-67.5 -29t-80 -15.5q-15 -2 -31 -2q-30 0 -60 9l-102 23h-375q88 422 88 532v154z" /> +<glyph unicode="¤" horiz-adv-x="1110" d="M-12 436l98 217h68v37l2 41h-156l104 219h80q43 205 200 334t394 129q125 0 213 -40t180 -124l-112 -235q-90 90 -148.5 118.5t-142.5 28.5q-217 0 -285 -211h547l-102 -219h-479q-4 -16 -5 -78h447l-105 -219h-305q55 -207 267 -207q53 0 83.5 8.5t91 55.5t144.5 145 v-321q-90 -80 -152.5 -110t-177.5 -30q-211 0 -362.5 123t-192.5 338h-194z" /> +<glyph unicode="¥" horiz-adv-x="974" d="M4 1290h330l153 -502l152 502h322l-179 -440h158v-232h-252l-47 -116h299v-232h-305v-270h-303v270h-291v232h283l-48 116h-235v232h141z" /> +<glyph unicode="§" horiz-adv-x="860" d="M20 -160l111 207q137 -76 274 -76q51 0 82 22.5t35 57.5q2 16 -17.5 35.5t-56 40t-68.5 35.5l-76 33q-44 18 -56 24q-104 51 -163.5 113.5t-59.5 159.5q0 92 55 172.5t143 105.5q-68 16 -129 79.5t-61 137.5q0 154 113.5 244t283.5 90t350 -109l-110 -196q-8 8 -26.5 18 t-81.5 26q-49 12 -105 12q-15 0 -31 -1q-98 -6 -98 -78q0 -8 10 -19t29 -22l39 -21q20 -11 42.5 -21.5t39.5 -17.5l32 -13l17 -7q55 -27 97 -52t87 -63t69.5 -85t24.5 -103q0 -90 -50 -173t-128 -111q74 -25 122 -83.5t48 -125.5q0 -164 -112.5 -261.5t-295.5 -97.5 q-100 0 -182 26.5t-197 96.5zM279 506q2 -31 35.5 -55.5t80.5 -24.5q100 0 135 35q33 33 33 87q0 35 -32.5 60t-88.5 25q-92 0 -130 -36q-34 -32 -34 -81q1 -5 1 -10z" /> +<glyph unicode="¨" horiz-adv-x="786" d="M43 1276q0 72 50 122t118 50q66 0 113 -47t47 -115q0 -33 -13 -63q-18 -49 -61 -79t-94 -30q-66 0 -113 47t-47 115zM410 1276q0 72 50 122t118 50q63 0 111 -47t48 -115q0 -33 -12 -63q-20 -49 -63.5 -79t-92.5 -30q-66 0 -112.5 47t-46.5 115z" /> +<glyph unicode="©" horiz-adv-x="1800" d="M242 500q0 178 86 329q86 150 243 240q164 88 328 88q170 0 328 -88q162 -94 243 -240q86 -152 86 -329q0 -184 -90 -334q-96 -160 -243 -240q-150 -86 -324 -86t-324 86q-147 80 -241 240q-92 160 -92 334zM406 500q0 -135 65 -254q70 -117 182 -180q111 -61 246 -64h6 q127 0 242 66.5t180.5 177t65.5 254.5q0 131 -66 245q-41 76 -110 132q-59 55 -148 88q-92 31 -170 30q-131 0 -248 -67q-115 -68 -180 -182.5t-65 -245.5zM559 514q0 158 96.5 266.5t259.5 108.5q66 0 131.5 -29t98.5 -57l33 -31l-121 -137l-17 12q-8 6 -17 10.5l-15.5 7.5 t-15.5 4t-14 3t-16 2h-15h-15h-14q-33 0 -71 -39t-38 -123q0 -80 31.5 -130t87.5 -50q82 0 162 65l96 -155q-14 -14 -40 -35t-95.5 -54.5t-128.5 -33.5q-158 0 -260.5 102.5t-102.5 292.5z" /> +<glyph unicode="ª" horiz-adv-x="774" d="M39 948q0 63 55 166l342 137v33q0 29 -26.5 45.5t-57.5 16.5q-94 0 -186 -72l-80 127q55 55 134 90t155 35q119 0 195.5 -57.5t76.5 -174.5v-405q0 -39 19 -39q14 0 22 6l35 -106q-70 -33 -121 -33q-57 0 -93 33.5t-42 89.5q-20 -55 -74.5 -89t-116.5 -34 q-237 0 -237 231zM250 952q0 -25 18.5 -40t42.5 -15q63 0 97 49t34 115v41l-178 -72q-14 -43 -14 -78z" /> +<glyph unicode="«" horiz-adv-x="1024" d="M72 512l280 432l207 -168l-147 -266l149 -266l-207 -164zM518 510l240 434l207 -168l-127 -262l129 -270l-207 -164z" /> +<glyph unicode="¬" horiz-adv-x="1095" d="M51 668v233h922v-545l-264 -53v365h-658z" /> +<glyph unicode="­" horiz-adv-x="618" d="M45 408v227h520v-227h-520z" /> +<glyph unicode="®" horiz-adv-x="1800" d="M242 500q0 178 86 329q86 150 243 240q164 88 328 88q170 0 328 -88q162 -94 243 -240q86 -152 86 -329q0 -184 -90 -334q-96 -160 -243 -240q-150 -86 -324 -86t-324 86q-147 80 -241 240q-92 160 -92 334zM406 500q0 -135 65 -254q70 -117 182 -180q111 -61 246 -64h6 q127 0 242 66.5t180.5 177t65.5 254.5q0 131 -66 245q-41 76 -110 132q-59 55 -148 88q-92 31 -170 30q-131 0 -248 -67q-115 -68 -180 -182.5t-65 -245.5zM651 129v760h219q139 0 230.5 -64.5t91.5 -197.5q0 -70 -40 -142.5t-101 -89.5l151 -123v-143h-176q-14 14 -143 172 l10 -172h-242zM893 535q6 -2 18 -3q61 0 62 80q0 66 -64 66l-16 -2v-141z" /> +<glyph unicode="¯" horiz-adv-x="686" d="M2 1143v182h680v-182h-680z" /> +<glyph unicode="°" horiz-adv-x="720" d="M49 1030q0 129 91 220t220 91t220.5 -91t91.5 -218q0 -129 -91.5 -220t-220.5 -91t-220 91t-91 218zM254 1034q0 -43 30.5 -73.5t73.5 -30.5t74 30.5t31 73.5t-31 74t-74 31t-73.5 -31t-30.5 -74z" /> +<glyph unicode="±" horiz-adv-x="915" d="M78 487v234h246v209h262v-209h243v-234h-243v-200h-262v200h-246zM86 0v231h737v-231h-737z" /> +<glyph unicode="²" d="M74 193q143 92 306 249.5t163 268.5q0 37 -29 54t-68 17q-72 0 -153.5 -32.5t-140.5 -79.5l-68 219q68 68 176.5 106.5t208.5 38.5q164 0 268.5 -78.5t104.5 -238.5q0 -127 -99.5 -248t-234.5 -215h360v-254h-751z" /> +<glyph unicode="³" d="M90 -133q72 2 148.5 19.5t151.5 50t123 94t48 139.5q0 39 -17.5 64.5t-51 36t-61.5 13.5t-66 3q-119 0 -238 -13v228l129 10q188 102 254 166q33 33 33 70q0 45 -49 45q-72 0 -308 -107l-71 203q92 55 208.5 99t198.5 44q131 0 222.5 -69.5t91.5 -194.5q0 -88 -59.5 -165 t-143.5 -116q96 -23 160.5 -102.5t64.5 -175.5q0 -147 -61.5 -258t-166 -172.5t-227 -91t-260.5 -29.5h-53v209z" /> +<glyph unicode="´" horiz-adv-x="692" d="M88 1284l115 -174q221 121 422 291l-205 203q-164 -193 -332 -320z" /> +<glyph unicode="µ" horiz-adv-x="1062" d="M27 -358q66 113 102 219q33 90 33 213q-51 76 -51 200v730h297v-730q0 -35 15 -48t50 -13q66 0 182 80v711h297v-795q0 -51 52 -84l-95 -156q-121 14 -194 119q-162 -119 -287 -119l-61 11q35 -45 34 -115q0 -39 -10 -94.5t-18 -92.5l-11 -36h-335z" /> +<glyph unicode="¶" horiz-adv-x="1112" d="M39 885q0 180 98.5 307t304.5 127q49 0 144.5 -16.5t126.5 -18.5l-8 86h249l4 -86l84 19v-222l-81 -22q-6 -330 -80 -682t-215 -625l-269 103q147 258 229.5 573t88.5 625l-16 5q-9 3 -36.5 11t-53 11t-57.5 2t-54 -9q-55 -23 -74 -109q-6 -30 -6 -59q0 -56 23 -107 q36 -79 116 -79h68q-10 -20 -28.5 -52t-81 -90.5t-132.5 -70.5q-26 -5 -51 -5q-41 0 -78 13q-59 20 -98 62.5t-67 98.5t-39 109.5t-11 100.5z" /> +<glyph unicode="·" horiz-adv-x="528" d="M80 520q0 72 56.5 122t129.5 50q70 0 123 -46t53 -116q0 -72 -57 -123t-129 -51q-70 0 -123 47t-53 117z" /> +<glyph unicode="¸" horiz-adv-x="823" d="M305 -274q193 66 201 110q6 39 -34 42q-6 0 -13 1q-34 0 -70 -14l-41 -17v152h301q111 -70 111 -162q0 -143 -287 -244z" /> +<glyph unicode="¹" d="M158 737v219q111 0 276 48h219v-1004h-293v737h-202z" /> +<glyph unicode="º" horiz-adv-x="802" d="M63 1120q0 154 89.5 279t253 125t254 -125t90.5 -279q0 -156 -90.5 -280.5t-254 -124.5t-253 124.5t-89.5 280.5zM289 1120q0 -102 31.5 -160.5t85.5 -58.5q55 0 85.5 58.5t30.5 161t-30.5 158.5t-85.5 56q-53 0 -85 -57.5t-32 -157.5z" /> +<glyph unicode="»" horiz-adv-x="1024" d="M63 244l207 -164l242 430l-240 434l-206 -168l127 -262zM469 244l207 -164l282 432l-280 432l-207 -168l147 -266z" /> +<glyph unicode="¼" horiz-adv-x="2537" d="M158 737v219q111 0 276 48h219v-1004h-293v737h-202zM698 -256l869 1769h288l-868 -1769h-289zM1659 201q188 414 489 803h271v-750h78v-254h-82v-283h-283v283h-461zM1935 254h193v348q-20 -25 -98.5 -164t-94.5 -184z" /> +<glyph unicode="½" horiz-adv-x="2537" d="M158 737v219q111 0 276 48h219v-1004h-293v737h-202zM698 -256l869 1769h288l-868 -1769h-289zM1690 193q143 92 306 249.5t163 268.5q0 37 -29 54t-68 17q-72 0 -153.5 -32.5t-141.5 -79.5l-67 219q68 68 176.5 106.5t208.5 38.5q164 0 268.5 -78.5t104.5 -238.5 q0 -127 -99.5 -248t-234.5 -215h360v-254h-751z" /> +<glyph unicode="¾" horiz-adv-x="2537" d="M90 -133q72 2 148.5 19.5t151.5 50t123 94t48 139.5q0 39 -17.5 64.5t-51 36t-61.5 13.5t-66 3q-119 0 -238 -13v228l129 10q188 102 254 166q33 33 33 70q0 45 -49 45q-72 0 -308 -107l-71 203q92 55 208.5 99t198.5 44q131 0 222.5 -69.5t91.5 -194.5q0 -88 -59.5 -165 t-143.5 -116q96 -23 160.5 -102.5t64.5 -175.5q0 -147 -61.5 -258t-166 -172.5t-227 -91t-260.5 -29.5h-53v209zM698 -256l869 1769h288l-868 -1769h-289zM1659 201q188 414 489 803h271v-750h78v-254h-82v-283h-283v283h-461zM1935 254h193v348q-20 -25 -98.5 -164 t-94.5 -184z" /> +<glyph unicode="¿" horiz-adv-x="733" d="M39 -117q0 125 111 242l129 137q90 96 90 221v111h249v-111q0 -121 -17 -193.5t-83 -139.5l-106 -111q-86 -90 -86 -152q0 -29 16 -43t32.5 -16t47.5 -2q90 0 186 27v-228q-184 -43 -276 -43q-137 0 -215 82t-78 219zM313 872.5q0 65.5 57.5 112.5t129 47t125 -43 t53.5 -108.5t-57.5 -112.5t-129 -47t-125 43t-53.5 108.5z" /> +<glyph unicode="À" horiz-adv-x="1044" d="M12 0l361 1290h301l362 -1290h-317l-66 266h-258l-65 -266h-318zM246 1645l205 202q164 -193 331 -319l-114 -174q-221 121 -422 291zM428 506h193l-97 393z" /> +<glyph unicode="Á" horiz-adv-x="1044" d="M12 0l361 1290h301l362 -1290h-317l-66 266h-258l-65 -266h-318zM264 1536l115 -174q221 121 422 291l-205 202q-164 -192 -332 -319zM428 506h193l-97 393z" /> +<glyph unicode="Â" horiz-adv-x="1044" d="M12 0l361 1290h301l362 -1290h-317l-66 266h-258l-65 -266h-318zM115 1542l94 57q98 61 285 242q164 -164 284 -239l94 -58l-137 -186q-121 68 -241 188q-117 -117 -242 -188zM428 506h193l-97 393z" /> +<glyph unicode="Ã" horiz-adv-x="1044" d="M12 0l361 1290h301l362 -1290h-317l-66 266h-258l-65 -266h-318zM129 1591q78 72 126 97.5t128 25.5q68 0 154 -33.5t112 -33.5q57 0 127 67l117 -137l-26 -26q-22 -22 -26 -25l-26 -22q-20 -17 -30 -22l-29 -17q-20 -11 -35.5 -14t-38.5 -7t-47 -4q-55 0 -138 33.5 t-120 33.5q-70 0 -144 -65zM428 506h193l-97 393z" /> +<glyph unicode="Ä" horiz-adv-x="1044" d="M12 0l361 1290h301l362 -1290h-317l-66 266h-258l-65 -266h-318zM174 1559q0 72 50 122t118 50q63 0 110.5 -46.5t47.5 -115.5q0 -31 -11 -62q-20 -49 -63 -79.5t-94 -30.5q-66 0 -112 47t-46 115zM428 506h193l-97 393zM539 1559q0 72 50 122t118 50q66 0 112.5 -46.5 t46.5 -115.5q0 -33 -12 -62q-18 -49 -61 -79.5t-95 -30.5q-66 0 -112.5 47t-46.5 115z" /> +<glyph unicode="Å" horiz-adv-x="1044" d="M12 0l361 1290h301l362 -1290h-317l-66 266h-258l-65 -266h-318zM272 1595q0 104 74 179t180 75q104 0 179 -74.5t75 -179.5q0 -106 -74.5 -180t-179.5 -74q-106 0 -180 74t-74 180zM428 506h193l-97 393zM471 1595.5q0 -22.5 16.5 -39t39 -16.5t39 16.5t16.5 39 t-16.5 39t-39 16.5t-39 -16.5t-16.5 -39z" /> +<glyph unicode="Æ" horiz-adv-x="1497" d="M12 0l357 1290h307l98 -352v352h656v-262h-406v-225h295v-266h-295v-271h424v-266h-688l-80 289h-270l-80 -289h-318zM451 530h188l-94 369z" /> +<glyph unicode="Ç" horiz-adv-x="1017" d="M66 645q0 115 32.5 229.5t96 217t172 166t245.5 63.5q211 0 346 -94l7 -4l-113 -205q-96 47 -240 47q-43 0 -97 -39t-87 -106q-57 -106 -57 -283q0 -68 9 -130.5t32.5 -130t76 -108.5t127.5 -41q131 0 242 74l133 -203q-94 -80 -248 -114q86 -63 86 -146 q0 -143 -286 -244l-166 132q193 66 198 110q6 39 -33 42q-6 0 -13 1q-34 0 -70 -14l-41 -17v152h2q-96 35 -167 105.5t-111 161.5t-58 185.5t-18 192.5z" /> +<glyph unicode="È" horiz-adv-x="929" d="M106 0v1290h748v-262h-442v-225h340v-266h-340v-271h465v-266h-771zM215 1645l205 202q160 -193 332 -319l-115 -174q-215 117 -422 291z" /> +<glyph unicode="É" horiz-adv-x="929" d="M106 0v1290h748v-262h-442v-225h340v-266h-340v-271h465v-266h-771zM248 1536l114 -174q221 121 422 291l-204 202q-164 -192 -332 -319z" /> +<glyph unicode="Ê" horiz-adv-x="929" d="M92 1542l94 57q100 61 285 242q164 -164 285 -239l94 -58l-137 -186q-121 68 -242 188q-117 -117 -242 -188zM106 0v1290h748v-262h-442v-225h340v-266h-340v-271h465v-266h-771z" /> +<glyph unicode="Ë" horiz-adv-x="929" d="M106 0v1290h748v-262h-442v-225h340v-266h-340v-271h465v-266h-771zM139 1561q0 72 50.5 122t117.5 50q63 0 111.5 -47.5t48.5 -114.5q0 -35 -12 -62q-20 -49 -63.5 -79.5t-92.5 -30.5q-66 0 -113 47t-47 115zM506 1561q0 72 50 122t118 50q63 0 110 -47.5t47 -114.5 q0 -31 -10 -62q-20 -51 -63 -80.5t-94 -29.5q-66 0 -112 47t-46 115z" /> +<glyph unicode="Ì" horiz-adv-x="487" d="M-31 1645l205 202q164 -193 332 -319l-115 -174q-221 121 -422 291zM92 0v1290h303v-1290h-303z" /> +<glyph unicode="Í" horiz-adv-x="487" d="M-20 1536l114 -174q221 121 422 291l-205 202q-163 -192 -331 -319zM92 0v1290h303v-1290h-303z" /> +<glyph unicode="Î" horiz-adv-x="487" d="M-137 1542l94 57q100 61 285 242q164 -164 284 -239l95 -58l-138 -186q-121 68 -241 188q-117 -117 -242 -188zM92 0v1290h303v-1290h-303z" /> +<glyph unicode="Ï" horiz-adv-x="487" d="M-98 1559q0 72 50 122t118 50q66 0 112.5 -47.5t46.5 -114.5q0 -33 -12 -62q-18 -51 -61 -80.5t-95 -29.5q-66 0 -112.5 47t-46.5 115zM92 0v1290h303v-1290h-303zM268 1559q0 72 50.5 122t117.5 50q66 0 113 -47.5t47 -114.5q0 -33 -12 -62q-18 -49 -62.5 -79.5 t-93.5 -30.5q-66 0 -113 47t-47 115z" /> +<glyph unicode="Ñ" horiz-adv-x="1134" d="M111 0v1290h329l224 -508q37 -80 55 -176v684h305v-1290h-281l-344 764q16 -82 17 -166v-598h-305zM178 1591q78 72 126 97.5t130 25.5q68 0 153 -33.5t111 -33.5q57 0 127 67l117 -137l-26 -26q-22 -22 -26 -25l-26 -22q-20 -17 -29 -22l-29 -17q-19 -11 -36 -14l-38 -7 q-22 -4 -46 -4q-55 0 -138 33.5t-120 33.5q-72 0 -145 -65z" /> +<glyph unicode="Ò" horiz-adv-x="1122" d="M61 645q0 115 27 227.5t82 216t156.5 168t234.5 64.5t234.5 -64.5t157 -168t82 -216t26.5 -227.5t-26.5 -227.5t-82 -216t-157 -168t-234.5 -64.5t-234.5 64.5t-156.5 168t-82 216t-27 227.5zM274 1645l205 202q164 -193 332 -319l-115 -174q-221 121 -422 291z M367 645.5q0 -65.5 2 -113t13 -109t31.5 -99t57.5 -65.5t90 -28t90 28t57.5 67t32 100t13.5 108.5t2 110.5q0 66 -2 113t-13.5 107.5t-32 99.5t-57.5 66.5t-90 27.5t-90 -27.5t-57.5 -66.5t-31.5 -99.5t-13 -107.5t-2 -112.5z" /> +<glyph unicode="Ó" horiz-adv-x="1122" d="M61 645q0 115 27 227.5t82 216t156.5 168t234.5 64.5t234.5 -64.5t157 -168t82 -216t26.5 -227.5t-26.5 -227.5t-82 -216t-157 -168t-234.5 -64.5t-234.5 64.5t-156.5 168t-82 216t-27 227.5zM336 1536l115 -174q221 121 421 291l-204 202q-164 -192 -332 -319z M367 645.5q0 -65.5 2 -113t13 -109t31.5 -99t57.5 -65.5t90 -28t90 28t57.5 67t32 100t13.5 108.5t2 110.5q0 66 -2 113t-13.5 107.5t-32 99.5t-57.5 66.5t-90 27.5t-90 -27.5t-57.5 -66.5t-31.5 -99.5t-13 -107.5t-2 -112.5z" /> +<glyph unicode="Ô" horiz-adv-x="1122" d="M61 645q0 115 27 227.5t82 216t156.5 168t234.5 64.5t234.5 -64.5t157 -168t82 -216t26.5 -227.5t-26.5 -227.5t-82 -216t-157 -168t-234.5 -64.5t-234.5 64.5t-156.5 168t-82 216t-27 227.5zM160 1542l94 57q98 61 285 242q164 -164 284 -239l95 -58l-138 -186 q-121 68 -241 188q-117 -117 -242 -188zM367 645.5q0 -65.5 2 -113t13 -109t31.5 -99t57.5 -65.5t90 -28t90 28t57.5 67t32 100t13.5 108.5t2 110.5q0 66 -2 113t-13.5 107.5t-32 99.5t-57.5 66.5t-90 27.5t-90 -27.5t-57.5 -66.5t-31.5 -99.5t-13 -107.5t-2 -112.5z" /> +<glyph unicode="Õ" horiz-adv-x="1122" d="M61 645q0 115 27 227.5t82 216t156.5 168t234.5 64.5t234.5 -64.5t157 -168t82 -216t26.5 -227.5t-26.5 -227.5t-82 -216t-157 -168t-234.5 -64.5t-234.5 64.5t-156.5 168t-82 216t-27 227.5zM170 1591q78 72 126 97.5t130 25.5q68 0 154 -33.5t112 -33.5q25 0 55.5 16 t51.5 33l18 18l117 -137l-26 -26q-22 -22 -26 -25l-26 -22q-20 -17 -30 -22l-28 -17q-19 -11 -36 -14l-38 -7q-22 -4 -46 -4q-55 0 -138 33.5t-120 33.5q-72 0 -146 -65zM367 645.5q0 -65.5 2 -113t13 -108.5t31.5 -99t57.5 -66t90 -28t90 28t57.5 67t32 100t13.5 108.5 t2 110.5q0 66 -2 113t-13.5 107.5t-32 99.5t-57.5 66.5t-90 27.5t-90 -27.5t-57.5 -66.5t-31.5 -99.5t-13 -107.5t-2 -112.5z" /> +<glyph unicode="Ö" horiz-adv-x="1122" d="M61 645q0 115 27 227.5t82 216t156.5 168t234.5 64.5t234.5 -64.5t157 -168t82 -216t26.5 -227.5t-26.5 -227.5t-82 -216t-157 -168t-234.5 -64.5t-234.5 64.5t-156.5 168t-82 216t-27 227.5zM219 1561q0 72 50 122t118 50q66 0 113 -47.5t47 -114.5q0 -35 -12 -62 q-18 -49 -61.5 -79.5t-94.5 -30.5q-66 0 -113 47t-47 115zM367 645.5q0 -65.5 2 -113t13 -109t31.5 -99t57.5 -65.5t90 -28t90 28t57.5 67t32 100t13.5 108.5t2 110.5q0 66 -2 113t-13.5 107.5t-32 99.5t-57.5 66.5t-90 27.5t-90 -27.5t-57.5 -66.5t-31.5 -99.5t-13 -107.5 t-2 -112.5zM586 1561q0 72 50 122t118 50q63 0 111 -47.5t48 -114.5q0 -35 -12 -62q-20 -49 -63 -79.5t-95 -30.5q-66 0 -111.5 47t-45.5 115z" /> +<glyph unicode="Ø" horiz-adv-x="1122" d="M61 653q0 113 28 223.5t83 214t156.5 167t232.5 63.5q74 0 133 -18l68 231h102l-78 -272q139 -84 207 -258.5t68 -356.5q0 -113 -26.5 -225.5t-82 -217t-157 -170t-234.5 -65.5q-72 0 -139 21l-80 -277h-102l92 320q-137 86 -204 262t-67 358zM367 635q0 -217 49 -311 l207 725q-31 10 -62 10q-66 0 -107.5 -39t-59 -110.5t-22.5 -131t-5 -143.5zM494 244q31 -12 67 -13q45 0 79 18.5t54.5 53.5t33.5 72t18.5 90t7.5 91t2 91q0 227 -54 324z" /> +<glyph unicode="Ù" horiz-adv-x="1142" d="M109 514v776h305v-776q0 -147 37.5 -215t119.5 -68t120 68t38 215v776h305v-776q0 -104 -23.5 -195.5t-73.5 -172t-144.5 -129t-221.5 -48.5t-221 48.5t-144 129t-73.5 172t-23.5 195.5zM297 1645l205 202q164 -193 332 -319l-115 -174q-221 121 -422 291z" /> +<glyph unicode="Ú" horiz-adv-x="1142" d="M109 514v776h305v-776q0 -147 37.5 -215t119.5 -68t120 68t38 215v776h305v-776q0 -104 -23.5 -195.5t-73.5 -172t-144.5 -129t-221.5 -48.5t-221 48.5t-144 129t-73.5 172t-23.5 195.5zM319 1536l115 -174q221 121 422 291l-205 202q-164 -192 -332 -319z" /> +<glyph unicode="Û" horiz-adv-x="1142" d="M109 514v776h305v-776q0 -147 37.5 -215t119.5 -68t120 68t38 215v776h305v-776q0 -104 -23.5 -195.5t-73.5 -172t-144.5 -129t-221.5 -48.5t-221 48.5t-144 129t-73.5 172t-23.5 195.5zM170 1542l94 57q100 61 285 242q164 -164 285 -239l94 -58l-137 -186 q-121 68 -242 188q-117 -117 -242 -188z" /> +<glyph unicode="Ü" horiz-adv-x="1142" d="M109 514v776h305v-776q0 -147 37.5 -215t119.5 -68t120 68t38 215v776h305v-776q0 -104 -23.5 -195.5t-73.5 -172t-144.5 -129t-221.5 -48.5t-221 48.5t-144 129t-73.5 172t-23.5 195.5zM231 1560.5q0 69.5 50.5 121t117.5 51.5q63 0 110.5 -47.5t47.5 -114.5 q0 -29 -10 -64q-20 -49 -63.5 -79.5t-94.5 -30.5q-66 0 -112 47t-46 116.5zM596 1561q0 70 50 121t118 51q66 0 113 -47.5t47 -114.5q0 -33 -13 -64q-18 -49 -61 -79.5t-94 -30.5q-66 0 -113 48t-47 116z" /> +<glyph unicode="Ý" horiz-adv-x="964" d="M4 1290h326l151 -502l154 502h326l-326 -807v-483h-305l2 483zM367 1618l114 -174q221 121 422 291l-205 202q-163 -192 -331 -319z" /> +<glyph unicode="ß" horiz-adv-x="1171" d="M27 786v218h88v108q0 106 66.5 184t157.5 113t191 35q207 0 333 -105.5t126 -279.5q0 -51 -20.5 -99.5t-44 -81t-39.5 -68.5q-10 -22 -10 -47q0 -15 4 -32q10 -43 55 -94l96 -115q55 -66 79 -120t24 -130q0 -127 -100.5 -215t-262.5 -88q-176 2 -283 80l101 232 q35 -23 85 -42.5t107 -20.5h4q55 0 80 32q16 19 16 45q0 51 -63 129l-88 104q-101 118 -101 211q0 9 1 17q4 33 31.5 72.5t52 92t24.5 121.5q0 82 -45 119t-149 37q-55 0 -93 -36t-38 -91v-1073h-297v768z" /> +<glyph unicode="à" horiz-adv-x="954" d="M37 274q0 82 74 218l450 180v43q0 39 -34.5 60.5t-75.5 21.5q-127 0 -248 -95l-105 168q76 72 179.5 118t201.5 46q158 0 258.5 -75.5t100.5 -227.5v-534q0 -53 24 -54q12 0 29 9l45 -140q-86 -43 -158 -43q-78 0 -123 45t-55 117q-27 -74 -98.5 -118t-151.5 -44 q-313 0 -313 305zM213 1393l205 202q164 -193 332 -319l-115 -174q-221 121 -422 291zM315 279q0 -31 23.5 -51.5t56.5 -20.5q84 0 128 63.5t44 151.5v55l-233 -96q-19 -55 -19 -102z" /> +<glyph unicode="á" horiz-adv-x="954" d="M37 274q0 82 74 218l450 180v43q0 39 -34.5 60.5t-75.5 21.5q-127 0 -248 -95l-105 168q76 72 179.5 118t201.5 46q158 0 258.5 -75.5t100.5 -227.5v-534q0 -53 24 -54q12 0 29 9l45 -140q-86 -43 -158 -43q-78 0 -123 45t-55 117q-27 -74 -98.5 -118t-151.5 -44 q-313 0 -313 305zM217 1284l115 -174q223 121 422 291l-205 203q-160 -193 -332 -320zM315 279q0 -31 23.5 -51.5t56.5 -20.5q84 0 128 63.5t44 151.5v55l-233 -96q-19 -55 -19 -102z" /> +<glyph unicode="â" horiz-adv-x="954" d="M37 274q0 82 74 218l450 180v43q0 39 -34.5 60.5t-75.5 21.5q-127 0 -248 -95l-105 168q76 72 179.5 118t201.5 46q158 0 258.5 -75.5t100.5 -227.5v-534q0 -53 24 -54q12 0 29 9l45 -140q-86 -43 -158 -43q-78 0 -123 45t-55 117q-27 -74 -98.5 -118t-151.5 -44 q-313 0 -313 305zM70 1290l94 58q100 61 285 241q164 -166 284 -239l94 -58l-137 -186q-121 68 -241 188q-117 -117 -242 -188zM315 279q0 -31 23.5 -51.5t56.5 -20.5q84 0 128 63.5t44 151.5v55l-233 -96q-19 -55 -19 -102z" /> +<glyph unicode="ã" horiz-adv-x="954" d="M37 274q0 82 74 218l450 180v43q0 39 -34.5 60.5t-75.5 21.5q-127 0 -248 -95l-105 168q76 72 179.5 118t201.5 46q158 0 258.5 -75.5t100.5 -227.5v-534q0 -53 24 -54q12 0 29 9l45 -140q-86 -43 -158 -43q-78 0 -123 45t-55 117q-27 -74 -98.5 -118t-151.5 -44 q-313 0 -313 305zM86 1339q78 72 126 97.5t130 25.5q68 0 153 -33.5t111 -33.5q57 0 127 67l117 -137l-26 -26q-22 -22 -26 -25l-26 -22q-20 -17 -30 -22l-28 -17q-19 -11 -36 -14l-38 -7q-22 -4 -46 -4q-55 0 -138 33.5t-120 33.5q-72 0 -146 -65zM315 279 q0 -31 23.5 -51.5t56.5 -20.5q84 0 128 63.5t44 151.5v55l-233 -96q-19 -55 -19 -102z" /> +<glyph unicode="ä" horiz-adv-x="954" d="M37 274q0 82 74 218l450 180v43q0 39 -34.5 60.5t-75.5 21.5q-127 0 -248 -95l-105 168q76 72 179.5 118t201.5 46q158 0 258.5 -75.5t100.5 -227.5v-534q0 -53 24 -54q12 0 29 9l45 -140q-86 -43 -158 -43q-78 0 -123 45t-55 117q-27 -74 -98.5 -118t-151.5 -44 q-313 0 -313 305zM137 1276q0 72 50.5 122t117.5 50q63 0 111.5 -47t48.5 -115q0 -23 -12 -63q-20 -49 -63.5 -79t-94.5 -30q-66 0 -112 47t-46 115zM315 279q0 -31 23.5 -51.5t56.5 -20.5q84 0 128 63.5t44 151.5v55l-233 -96q-19 -55 -19 -102zM502 1276q0 72 50 122 t118 50q66 0 112.5 -47t46.5 -115q0 -29 -10 -63q-20 -49 -63 -79t-95 -30q-66 0 -112.5 47t-46.5 115z" /> +<glyph unicode="å" horiz-adv-x="954" d="M37 274q0 82 74 218l450 180v43q0 39 -34.5 60.5t-75.5 21.5q-127 0 -248 -95l-105 168q76 72 179.5 118t201.5 46q158 0 258.5 -75.5t100.5 -227.5v-534q0 -53 24 -54q12 0 29 9l45 -140q-86 -43 -158 -43q-78 0 -123 45t-55 117q-27 -74 -98.5 -118t-151.5 -44 q-313 0 -313 305zM223 1364q0 104 74 179t180 75q104 0 179 -75t75 -179t-74.5 -179t-179.5 -75q-106 0 -180 75t-74 179zM315 279q0 -31 23.5 -51.5t56.5 -20.5q84 0 128 63.5t44 151.5v55l-233 -96q-19 -55 -19 -102zM422 1363.5q0 -22.5 16.5 -38.5t39 -16t38.5 16 t16 38.5t-16 39t-38.5 16.5t-39 -16.5t-16.5 -39z" /> +<glyph unicode="æ" horiz-adv-x="1511" d="M37 274q0 82 74 218l450 180q0 59 -22.5 92t-87.5 33q-127 0 -248 -95l-105 168q84 70 144 103q106 61 237 61q88 0 163 -30.5t110 -81.5q45 51 123.5 81.5t168.5 30.5q184 0 291 -128t111 -267l4 -164h-586q-1 -17 -1 -33q0 -82 34 -149q41 -80 123 -80q156 2 280 88 l86 -184q-20 -16 -55 -41t-135 -67t-188 -42q-113 0 -209.5 62.5t-134.5 142.5q-59 -84 -142.5 -143.5t-171.5 -59.5q-84 0 -112 8q-104 31 -151.5 113t-49.5 184zM317 279q0 -72 68 -72q182 0 182 262l-231 -100q-19 -47 -19 -90zM887 672h278q-2 59 -32.5 112.5 t-102.5 53.5q-59 0 -96 -54.5t-47 -111.5z" /> +<glyph unicode="ç" horiz-adv-x="843" d="M45 494q0 221 109 364q68 86 162 131t184 45q98 0 176 -33.5t106 -66.5l29 -33l-145 -158q-57 47 -164 48q-53 0 -106.5 -72t-53.5 -209q0 -127 50 -213t116 -86q49 0 103.5 21.5t84.5 43.5l29 23l106 -190q-84 -74 -200 -115q102 -66 102 -156q0 -143 -287 -244 l-167 132q193 66 200 110q6 39 -34 42q-6 0 -12 1q-34 0 -68 -14l-43 -17v152h16q-94 41 -158 111q-135 150 -135 383z" /> +<glyph unicode="è" horiz-adv-x="960" d="M47 524q0 211 135 360.5t344 149.5q162 0 279 -116.5t121 -278.5q4 -111 4 -164h-584q-2 -10 -2 -33q0 -86 38 -157.5t118 -71.5q162 0 282 88l86 -184q-76 -63 -182 -106.5t-197 -43.5q-150 0 -253 84t-146 206t-43 267zM231 1393l205 202q160 -193 332 -319l-115 -174 q-221 121 -422 291zM367 664h284q-2 68 -39 121t-100 53q-57 0 -98 -56.5t-47 -117.5z" /> +<glyph unicode="é" horiz-adv-x="960" d="M47 524q0 211 135 360.5t344 149.5q162 0 279 -116.5t121 -278.5q4 -111 4 -164h-584q-2 -10 -2 -33q0 -86 38 -157.5t118 -71.5q162 0 282 88l86 -184q-76 -63 -182 -106.5t-197 -43.5q-150 0 -253 84t-146 206t-43 267zM272 1284l115 -174q221 121 422 291l-205 203 q-160 -193 -332 -320zM367 664h284q-2 68 -39 121t-100 53q-57 0 -98 -56.5t-47 -117.5z" /> +<glyph unicode="ê" horiz-adv-x="960" d="M47 524q0 211 135 360.5t344 149.5q162 0 279 -116.5t121 -278.5q4 -111 4 -164h-584q-2 -10 -2 -33q0 -86 38 -157.5t118 -71.5q162 0 282 88l86 -184q-76 -63 -182 -106.5t-197 -43.5q-150 0 -253 84t-146 206t-43 267zM104 1290l95 58q98 61 284 241 q164 -166 285 -239l94 -58l-137 -186q-121 68 -242 188q-117 -117 -241 -188zM367 664h284q-2 68 -39 121t-100 53q-57 0 -98 -56.5t-47 -117.5z" /> +<glyph unicode="ë" horiz-adv-x="960" d="M47 524q0 211 135 360.5t344 149.5q162 0 279 -116.5t121 -278.5q4 -111 4 -164h-584q-2 -10 -2 -33q0 -86 38 -157.5t118 -71.5q162 0 282 88l86 -184q-76 -63 -182 -106.5t-197 -43.5q-150 0 -253 84t-146 206t-43 267zM170 1276q0 72 50 122t118 50q66 0 113 -47 t47 -115q0 -33 -13 -63q-18 -49 -61 -79t-94 -30q-66 0 -113 47t-47 115zM367 664h284q-2 68 -39 121t-100 53q-57 0 -98 -56.5t-47 -117.5zM537 1276q0 72 50 122t118 50q66 0 112.5 -47t46.5 -115q0 -33 -12 -63q-18 -49 -62.5 -79t-93.5 -30q-66 0 -112.5 47t-46.5 115z " /> +<glyph unicode="ì" horiz-adv-x="487" d="M-29 1393l205 202q164 -193 332 -319l-115 -174q-221 121 -422 291zM96 0v1004h293v-1004h-293z" /> +<glyph unicode="í" horiz-adv-x="487" d="M-20 1284l114 -174q221 121 422 291l-205 203q-159 -193 -331 -320zM96 0v1004h293v-1004h-293z" /> +<glyph unicode="î" horiz-adv-x="487" d="M-158 1290l95 58q100 61 284 241q164 -166 285 -239l94 -58l-137 -186q-121 68 -242 188q-117 -117 -241 -188zM96 0v1004h293v-1004h-293z" /> +<glyph unicode="ï" horiz-adv-x="487" d="M-98 1276q0 72 50 122t118 50q63 0 110 -47t47 -115q0 -29 -10 -63q-20 -49 -63 -79t-95 -30q-66 0 -111.5 47t-45.5 115zM96 0v1004h293v-1004h-293zM266 1276q0 72 50.5 122t117.5 50q66 0 113 -47t47 -115q0 -33 -12 -63q-18 -49 -61.5 -79t-94.5 -30q-66 0 -113 47 t-47 115z" /> +<glyph unicode="ñ" horiz-adv-x="1062" d="M113 0v1004h297v-74q147 104 233 104q94 0 158.5 -26.5t96.5 -73.5t44 -96.5t12 -112.5v-725h-297v725q0 63 -51 63q-33 0 -64.5 -9t-47 -17t-47.5 -30l-37 -25v-707h-297zM158 1339q78 72 126 97.5t128 25.5q70 0 154.5 -33.5t111.5 -33.5q57 0 127 67l117 -137l-26 -26 q-22 -22 -27 -25l-25 -22q-20 -17 -30 -22l-30 -17q-20 -11 -35.5 -14t-38 -7t-46.5 -4q-55 0 -137.5 33.5t-121.5 33.5q-70 0 -143 -65z" /> +<glyph unicode="ò" horiz-adv-x="999" d="M49 502q0 127 45 243.5t151.5 202.5t254 86t254 -86t151.5 -202.5t45 -243.5t-45 -244t-151.5 -203t-254 -86t-254 86t-151.5 203t-45 244zM227 1393l205 202q164 -193 332 -319l-115 -174q-221 121 -422 291zM346 502q0 -133 41 -210t112.5 -77t112.5 77t41 210 t-41 208.5t-112.5 75.5t-112.5 -75.5t-41 -208.5z" /> +<glyph unicode="ó" horiz-adv-x="999" d="M49 502q0 127 45 243.5t151.5 202.5t254 86t254 -86t151.5 -202.5t45 -243.5t-45 -244t-151.5 -203t-254 -86t-254 86t-151.5 203t-45 244zM229 1284l115 -174q221 121 422 291l-205 203q-160 -193 -332 -320zM346 502q0 -133 41 -210t112.5 -77t112.5 77t41 210 t-41 208.5t-112.5 75.5t-112.5 -75.5t-41 -208.5z" /> +<glyph unicode="ô" horiz-adv-x="999" d="M49 502q0 127 45 243.5t151.5 202.5t254 86t254 -86t151.5 -202.5t45 -243.5t-45 -244t-151.5 -203t-254 -86t-254 86t-151.5 203t-45 244zM94 1290l94 58q100 61 285 241q164 -166 285 -239l94 -58l-137 -186q-121 68 -242 188q-117 -117 -242 -188zM346 502 q0 -133 41 -210t112.5 -77t112.5 77t41 210t-41 208.5t-112.5 75.5t-112.5 -75.5t-41 -208.5z" /> +<glyph unicode="õ" horiz-adv-x="999" d="M49 502q0 127 45 243.5t151.5 202.5t254 86t254 -86t151.5 -202.5t45 -243.5t-45 -244t-151.5 -203t-254 -86t-254 86t-151.5 203t-45 244zM117 1339q78 72 126 97.5t128 25.5q68 0 153.5 -33.5t112.5 -33.5q57 0 127 67l117 -137l-26 -26q-22 -22 -27 -25l-25 -22 q-20 -17 -30 -22l-30 -17q-20 -11 -35.5 -14t-38 -7t-46.5 -4q-55 0 -138.5 33.5t-119.5 33.5q-70 0 -144 -65zM346 502q0 -133 41 -210t112.5 -77t112.5 77t41 210t-41 208.5t-112.5 75.5t-112.5 -75.5t-41 -208.5z" /> +<glyph unicode="ö" horiz-adv-x="999" d="M49 502q0 127 45 243.5t151.5 202.5t254 86t254 -86t151.5 -202.5t45 -243.5t-45 -244t-151.5 -203t-254 -86t-254 86t-151.5 203t-45 244zM156 1276q0 72 50 122t118 50q63 0 110 -47t47 -115q0 -29 -10 -63q-20 -49 -63 -79t-95 -30q-66 0 -111.5 47t-45.5 115z M346 502q0 -133 41 -210t112.5 -77t112.5 77t41 210t-41 208.5t-112.5 75.5t-112.5 -75.5t-41 -208.5zM520 1276q0 72 50.5 122t117.5 50q66 0 113 -47t47 -115q0 -33 -12 -63q-18 -49 -61.5 -79t-94.5 -30q-66 0 -113 47t-47 115z" /> +<glyph unicode="÷" horiz-adv-x="1001" d="M55 393v244h889v-244h-889zM301 160q0 74 59.5 126t139.5 52q76 0 128 -45t52 -115q0 -74 -59.5 -126t-139.5 -52q-76 0 -128 45t-52 115zM301 856q0 74 59.5 126t139.5 52q76 0 128 -45t52 -115q0 -74 -59.5 -126t-139.5 -52q-76 0 -128 45t-52 115z" /> +<glyph unicode="ø" horiz-adv-x="999" d="M49 500q0 94 27.5 185t80 171t141.5 129t202 49q49 0 96 -10l47 162h102l-55 -195q127 -63 193.5 -202.5t66.5 -288.5q0 -94 -27.5 -185.5t-79.5 -170t-141.5 -127t-201.5 -48.5q-47 0 -99 11l-61 -213h-102l69 245q-125 63 -191.5 200.5t-66.5 287.5zM346 500 q0 -133 41 -209l141 493q-10 2 -28 2q-72 0 -113 -76.5t-41 -209.5zM469 219q20 -4 31 -4q72 0 112.5 76t40.5 209q0 139 -43 213z" /> +<glyph unicode="ù" horiz-adv-x="1058" d="M111 274v730h297v-730q0 -35 15 -48t50 -13q66 0 182 80v711h297v-795q0 -51 52 -84l-95 -156q-121 14 -194 119q-162 -119 -287 -119q-317 0 -317 305zM252 1393l205 202q164 -193 331 -319l-114 -174q-221 121 -422 291z" /> +<glyph unicode="ú" horiz-adv-x="1058" d="M111 274v730h297v-730q0 -35 15 -48t50 -13q66 0 182 80v711h297v-795q0 -51 52 -84l-95 -156q-121 14 -194 119q-162 -119 -287 -119q-317 0 -317 305zM262 1284l115 -174q215 117 422 291l-205 203q-160 -193 -332 -320z" /> +<glyph unicode="û" horiz-adv-x="1058" d="M111 274v730h297v-730q0 -35 15 -48t50 -13q66 0 182 80v711h297v-795q0 -51 52 -84l-95 -156q-121 14 -194 119q-162 -119 -287 -119q-317 0 -317 305zM121 1290l94 58q98 61 285 241q162 -166 284 -239l95 -58l-138 -186q-121 68 -241 188q-117 -117 -242 -188z" /> +<glyph unicode="ü" horiz-adv-x="1058" d="M111 274v730h297v-730q0 -35 15 -48t50 -13q66 0 182 80v711h297v-795q0 -51 52 -84l-95 -156q-121 14 -194 119q-162 -119 -287 -119q-317 0 -317 305zM190 1276q0 72 50.5 122t117.5 50q66 0 113 -47t47 -115q0 -33 -12 -63q-18 -49 -61.5 -79t-94.5 -30q-66 0 -113 47 t-47 115zM557 1276q0 72 50 122t118 50q63 0 111.5 -47t48.5 -115q0 -33 -13 -63q-20 -49 -63 -79t-92 -30q-66 0 -113 47t-47 115z" /> +<glyph unicode="ý" horiz-adv-x="929" d="M18 1004h316q137 -459 149 -658q78 283 125 658h305q-29 -154 -70.5 -323t-106 -380t-152.5 -376t-181 -226q-37 -25 -96 -46.5t-102 -29.5l-41 -10l-68 217q72 25 113 50.5t57.5 46t46.5 73.5l13 20zM350 1331l115 -174q221 121 422 291l-205 203q-164 -193 -332 -320z " /> +<glyph unicode="ÿ" horiz-adv-x="929" d="M18 1004h316q137 -459 149 -658q78 283 125 658h305q-29 -154 -70.5 -323t-106 -380t-152.5 -376t-181 -226q-37 -25 -96 -46.5t-102 -29.5l-41 -10l-68 217q72 25 113 50.5t57.5 46t46.5 73.5l13 20zM139 1276q0 72 50.5 122t117.5 50q66 0 113 -47t47 -115 q0 -33 -12 -63q-18 -49 -61.5 -79t-94.5 -30q-66 0 -113 47t-47 115zM506 1276q0 72 50 122t118 50q66 0 113 -47t47 -115q0 -33 -13 -63q-18 -49 -62 -79t-93 -30q-66 0 -113 47t-47 115z" /> +<glyph unicode="Œ" horiz-adv-x="1290" d="M61 653q0 102 33 210t93.5 205t164 159.5t230.5 62.5h663v-262h-432v-225h322v-266h-322v-271h453v-266h-684q-129 0 -232.5 63.5t-164 164t-92.5 211t-32 214.5zM348 635q0 -113 43 -234.5t117 -152.5v794q-66 -18 -113 -155t-47 -252z" /> +<glyph unicode="œ" horiz-adv-x="1558" d="M63 500q0 94 28 185t80 171t141 129t202 49q170 0 289 -112q123 113 307 112.5t290.5 -128.5t110.5 -267l5 -164h-586l-2 -33q0 -82 35 -149q41 -80 122 -80q156 2 281 88l86 -184q-20 -16 -55 -41t-135.5 -67t-188.5 -42q-162 0 -278 107q-119 -104 -281 -105 q-113 0 -202 48.5t-141 127t-80 170t-28 185.5zM360 500q0 -133 41 -209t113 -76t113 76t41 209t-41 209.5t-113 76.5t-113 -76.5t-41 -209.5zM952 672h279q-2 59 -33 112.5t-102 53.5q-59 0 -96.5 -54.5t-47.5 -111.5z" /> +<glyph unicode="Ÿ" horiz-adv-x="964" d="M4 1290h326l151 -502l154 502h326l-328 -807l2 -483h-305v483zM139 1559q0 72 50.5 122t117.5 50q66 0 113 -47.5t47 -114.5q0 -33 -12 -62q-18 -49 -62.5 -79.5t-93.5 -30.5q-66 0 -113 47t-47 115zM506 1559q0 72 50 122t118 50q63 0 111.5 -47.5t48.5 -114.5 q0 -25 -13 -62q-20 -51 -63 -80.5t-94 -29.5q-66 0 -112 47t-46 115z" /> +<glyph unicode="ˆ" horiz-adv-x="823" d="M33 1290l94 58q98 61 285 241q164 -166 284 -239l95 -58l-138 -186q-121 68 -241 188q-117 -117 -242 -188z" /> +<glyph unicode="˜" horiz-adv-x="778" d="M0 1339q78 72 126 97.5t128 25.5q70 0 155 -33.5t111 -33.5q57 0 127 67l117 -137l-26 -26q-22 -22 -26 -25l-26 -22q-20 -17 -30 -22l-28 -17q-19 -11 -36 -14l-38 -7q-22 -4 -46 -4q-57 0 -139 33.5t-119 33.5q-72 0 -146 -65z" /> +<glyph unicode="–" horiz-adv-x="733" d="M-41 430v184h815v-184h-815z" /> +<glyph unicode="—" horiz-adv-x="1245" d="M-41 432v184h1327v-184h-1327z" /> +<glyph unicode="‘" horiz-adv-x="546" d="M35 985q154 289 309 428l145 -98q-117 -147 -116 -248q0 -2 18 -156q-90 -68 -162 -67q-47 0 -101 45t-93 96z" /> +<glyph unicode="’" horiz-adv-x="552" d="M55 891q115 152 115 248q0 25 -16 155q84 68 161 68q45 0 101.5 -46t93.5 -95q-158 -293 -309 -428z" /> +<glyph unicode="‚" horiz-adv-x="528" d="M27 -229q115 152 114 247q0 18 -16 156q90 68 162 68q45 0 101 -46t93 -96q-154 -289 -309 -428z" /> +<glyph unicode="“" horiz-adv-x="913" d="M29 985q160 291 309 428l145 -98q-115 -152 -114 -248q0 -29 7 -84l9 -72q-90 -68 -162 -67q-81 0 -194 141zM406 985q154 289 309 428l145 -98q-115 -152 -115 -248q0 -18 17 -156q-90 -68 -162 -67q-45 0 -100 45t-94 96z" /> +<glyph unicode="”" horiz-adv-x="913" d="M57 891q117 147 117 248q0 8 -18 155q88 68 161 68q47 0 102.5 -45t92.5 -96q-158 -293 -309 -428zM434 891q43 53 79 124.5t36 123.5q0 25 -17 155q84 68 162 68q47 0 102.5 -45t92.5 -96q-158 -293 -309 -428z" /> +<glyph unicode="„" horiz-adv-x="913" d="M41 -223q115 152 115 248q0 18 -17 155q90 68 162 68q45 0 100.5 -45t94.5 -97q-154 -289 -310 -428zM420 -223q115 152 115 248q0 18 -17 155q90 68 162 68q82 0 194 -142q-78 -143 -147.5 -244.5t-161.5 -183.5z" /> +<glyph unicode="•" horiz-adv-x="868" d="M29 649q0 168 117.5 286t285.5 118t286 -118t118 -286t-118 -285.5t-286 -117.5t-285.5 117.5t-117.5 285.5z" /> +<glyph unicode="…" horiz-adv-x="1236" d="M41 131q0 72 56.5 122t129.5 50q70 0 123 -46t53 -116q0 -72 -56 -122t-130 -50q-70 0 -123 46t-53 116zM434 131q0 72 57.5 122t131.5 50q70 0 123 -46t53 -116q0 -72 -56.5 -122t-130.5 -50q-72 0 -125 46t-53 116zM831 131q0 72 57.5 122t131.5 50q70 0 123 -46 t53 -116q0 -72 -56.5 -122t-129.5 -50q-72 0 -125.5 46t-53.5 116z" /> +<glyph unicode="‹" horiz-adv-x="614" d="M33 512l352 432l207 -168l-199 -262l201 -270l-207 -164z" /> +<glyph unicode="›" horiz-adv-x="614" d="M31 244l207 -164l354 432l-352 432l-207 -168l198 -262z" /> +<glyph unicode="™" horiz-adv-x="1642" d="M147 1237v170h496v-170h-154v-643h-190v643h-152zM680 596v813h211l178 -494l21 -86q6 51 18 86l180 494h211v-813h-192v356l10 99l-154 -455h-147l-154 455l10 -99v-356h-192z" /> +<glyph unicode="" horiz-adv-x="1004" d="M0 1005h1005v-1005h-1005v1005z" /> +<glyph unicode="fi" horiz-adv-x="1069" d="M27 797v207h90v94q0 156 131 250q125 90 319 105q40 3 77 3q143 0 239 -47q117 -53 116 -152q0 -33 -12 -63q-20 -49 -69.5 -79t-104.5 -30q-72 0 -123 44.5t-53 107.5q-15 4 -31 4q-51 0 -112 -40q-80 -52 -80 -116v-81h145v-238h-145v-766h-297v776zM672 0v1004h293 v-1004h-293z" /> +<glyph unicode="fl" horiz-adv-x="1069" d="M27 797v207h90v126q0 98 41 168t104.5 102t139.5 50q60 14 118 14q16 0 32 -1q73 -5 132 -7l281 -33v-987q0 -117 14 -225.5t29 -159.5l14 -51h-272q-78 127 -78 436v793h-88q-170 0 -170 -111v-114h145v-238h-145v-766h-297v776z" /> +<glyph unicode="ffi" horiz-adv-x="1658" d="M16 791v213h101v94q0 96 43 167.5t104.5 104.5t123 52.5t104.5 21.5l43 2l45 -211q-6 -2 -17.5 -4t-40 -13.5t-50 -26.5t-40 -43t-18.5 -63v-81h153v-240h-153v-764h-297v774zM602 791v213h100v94q0 96 43 167.5t104.5 104.5t123 52.5t104.5 21.5l43 2l45 -211 q-6 -2 -17 -4t-40 -13.5t-50.5 -26.5t-40 -43t-18.5 -63v-81h154v-240h-154v-764h-297v774zM1233 1268q0 72 57.5 123t129 51t124.5 -47t53 -117q0 -74 -56 -123t-130 -49q-72 0 -125 46t-53 116zM1268 0v1004h293v-1004h-293z" /> +<glyph unicode="ffl" horiz-adv-x="1654" d="M16 791v213h101v94q0 96 43 167.5t104.5 104.5t123 52.5t104.5 21.5l43 2l45 -211q-6 -2 -17.5 -4t-40 -13.5t-50 -26.5t-40 -43t-18.5 -63v-81h153v-240h-153v-764h-297v774zM602 791v213h100v94q0 96 43 167.5t104.5 104.5t123 52.5t104.5 21.5l43 2l45 -211 q-6 -2 -17 -4t-40 -13.5t-50.5 -26.5t-40 -43t-18.5 -63v-81h154v-240h-154v-764h-297v774zM1255 436v987h293v-987q0 -117 16.5 -225.5t32.5 -159.5l15 -51h-287q-70 157 -70 436z" /> +</font> +</defs></svg>
\ No newline at end of file diff --git a/public/stylesheets/fonts/delicious-heavy-webfont.ttf b/public/stylesheets/fonts/delicious-heavy-webfont.ttf Binary files differnew file mode 100755 index 000000000..deba1f94f --- /dev/null +++ b/public/stylesheets/fonts/delicious-heavy-webfont.ttf diff --git a/public/stylesheets/fonts/delicious-heavy-webfont.woff b/public/stylesheets/fonts/delicious-heavy-webfont.woff Binary files differnew file mode 100755 index 000000000..b3c48915d --- /dev/null +++ b/public/stylesheets/fonts/delicious-heavy-webfont.woff diff --git a/public/stylesheets/fonts/delicious-italic-webfont.eot b/public/stylesheets/fonts/delicious-italic-webfont.eot Binary files differnew file mode 100755 index 000000000..8bc7f8ce0 --- /dev/null +++ b/public/stylesheets/fonts/delicious-italic-webfont.eot diff --git a/public/stylesheets/fonts/delicious-italic-webfont.svg b/public/stylesheets/fonts/delicious-italic-webfont.svg new file mode 100755 index 000000000..3cad32124 --- /dev/null +++ b/public/stylesheets/fonts/delicious-italic-webfont.svg @@ -0,0 +1,222 @@ +<?xml version="1.0" standalone="no"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" > +<svg xmlns="http://www.w3.org/2000/svg"> +<metadata> +This is a custom SVG webfont generated by Font Squirrel. +Copyright : 40 I1995 Jos Buivenga +</metadata> +<defs> +<font id="DeliciousItalic" horiz-adv-x="921" > +<font-face units-per-em="2048" ascent="1638" descent="-410" /> +<missing-glyph horiz-adv-x="614" /> +<glyph unicode=" " horiz-adv-x="614" /> +<glyph unicode="	" horiz-adv-x="614" /> +<glyph unicode=" " horiz-adv-x="614" /> +<glyph unicode="!" horiz-adv-x="516" d="M90 84q0 51 39 88t90 37q49 0 85 -33t36 -82t-40 -87t-91 -38q-49 0 -84 33t-35 82zM182 332l82 704q20 174 92 375l160 21q-70 -209 -98 -396l-113 -704h-123z" /> +<glyph unicode=""" horiz-adv-x="585" d="M188 999l9 322l47 129h100l8 -129l-96 -324zM471 999l8 322l47 129h101l8 -129l-96 -324z" /> +<glyph unicode="#" horiz-adv-x="1138" d="M125 436l20 135h164l39 312h-145l20 135h142l51 403h123l-52 -403h236l45 364h123l-45 -364h174l-12 -135h-181l-39 -312h154l-12 -135h-158l-53 -418h-123l53 418h-235l-47 -379h-123l47 379h-166zM432 571h234l39 312h-234z" /> +<glyph unicode="$" horiz-adv-x="880" d="M45 57l66 121q133 -74 249 -80l76 484l-47 32q-41 29 -49 36t-41 33t-42 39t-30.5 39.5t-29 49.5t-14.5 53.5t-7 63.5q0 162 107.5 271.5t269.5 119.5l18 113h93l-19 -115q141 -14 236 -98l-74 -111q-72 59 -182 78l-74 -467q133 -94 168 -135q74 -82 74 -197 q0 -158 -101.5 -271.5t-257.5 -140.5l-20 -124h-92l18 118q-160 4 -295 88zM340 958q0 -41 21.5 -76.5t42 -55t63.5 -50.5l65 412q-86 -14 -139 -78t-53 -152zM455 113q76 25 126 90t50 143q0 98 -111 178z" /> +<glyph unicode="%" horiz-adv-x="1431" d="M94 1048.5q0 112.5 80 192.5t193 80q80 0 145 -41q82 -23 143 -23q57 0 114.5 15.5t86.5 30.5l27 16l104 -29l-455 -1290h-135l432 1196q-35 -18 -88 -27.5t-90 -9.5l-35 -2q23 -43 23 -108q0 -113 -80 -193t-192.5 -80t-192.5 80t-80 192.5zM215 1048.5 q0 -63.5 44 -107.5t107.5 -44t107.5 44t44 107.5t-44 107.5t-107.5 44t-107.5 -44t-44 -107.5zM788 241.5q0 112.5 80 192.5t193 80t192.5 -80t79.5 -192.5t-79.5 -192.5t-192.5 -80t-193 80t-80 192.5zM909 241.5q0 -63.5 44 -107.5t107.5 -44t107.5 44t44 107.5t-44 107.5 t-107.5 44t-107.5 -44t-44 -107.5z" /> +<glyph unicode="&" horiz-adv-x="1800" d="M117 584q0 260 189.5 462.5t449.5 245.5l18 -114q-197 -37 -343 -207t-146 -369q0 -74 22 -151l311 254q10 10 71 58l96 79q36 31 93.5 85t91.5 95t60.5 89t26.5 85q0 53 -56.5 100t-117.5 70l39 84q109 -23 195.5 -92.5t86.5 -167.5q0 -20 -2 -29q-4 -27 -19.5 -58.5 t-42.5 -66.5l-55 -66q-27 -32 -68 -72l-72 -68q-30 -28 -77 -67l-69 -58l-67 -54q-44 -35 -50 -41l-330 -268q150 -260 475 -260q172 0 328 83t253 231.5t97 322.5q0 92 -35 172h-180l-14 72q70 41 176 41q119 0 165 -79t46 -220q0 -211 -129 -383t-322.5 -262.5 t-398.5 -90.5q-285 0 -490.5 168t-205.5 447z" /> +<glyph unicode="'" horiz-adv-x="303" d="M188 999l9 322l47 129h100l8 -129l-96 -324z" /> +<glyph unicode="(" horiz-adv-x="716" d="M139 485q0 338 185.5 637t484.5 467l-2 -121q-248 -145 -401.5 -418.5t-153.5 -564.5q0 -203 84 -379q43 -92 83 -141t130 -129l-64 -82q-346 270 -346 731z" /> +<glyph unicode=")" horiz-adv-x="696" d="M-25 -166q106 80 168 134.5t129 137.5q256 322 256 715q0 197 -73.5 371t-221.5 278l33 119q186 -129 283.5 -326.5t97.5 -428.5q0 -383 -244 -728q-139 -199 -385 -364z" /> +<glyph unicode="*" horiz-adv-x="808" d="M86 1128l49 121l260 -100l-41 233h246l-106 -247l272 112l31 -117l-281 -106l150 -315h-136l-112 239l-201 -239l-115 34l246 291z" /> +<glyph unicode="+" horiz-adv-x="964" d="M92 451v122h330v355h119v-355h331v-122h-331v-355h-119v355h-330z" /> +<glyph unicode="," horiz-adv-x="528" d="M-45 -207q181 195 181 329q0 11 -1 21q49 23 90 23q68 0 127 -113q-111 -170 -313 -336z" /> +<glyph unicode="-" horiz-adv-x="618" d="M113 461v123h393v-123h-393z" /> +<glyph unicode="." horiz-adv-x="528" d="M82 84q0 51 39 88t90 37q49 0 85 -33t36 -82t-40 -87t-91 -38q-49 0 -84 33t-35 82z" /> +<glyph unicode="/" horiz-adv-x="755" d="M-98 -303l823 1853h127l-823 -1853h-127z" /> +<glyph unicode="0" d="M49 375q0 109 33 222.5t93.5 212.5t158.5 161.5t215 62.5q164 0 243.5 -110.5t79.5 -280.5q0 -152 -51 -301t-166.5 -261t-273.5 -112q-164 0 -248 118t-84 288zM199 391q0 -119 47 -208t153 -89q109 0 187 98.5t107.5 215t29.5 221.5q0 279 -195 278q-104 0 -183 -93 t-112.5 -208t-33.5 -215z" /> +<glyph unicode="1" d="M238 856l16 98q88 0 199 29l75 18h142l-158 -1001h-152l136 856h-258z" /> +<glyph unicode="2" d="M96 127q195 98 383 293q78 80 142.5 179t64.5 177q0 66 -44 96.5t-112 30.5q-100 0 -260 -98l-51 100q100 72 175 100.5t184 28.5q274 0 274 -256q0 -117 -92 -251t-205 -231t-225 -161h456l-22 -135h-660z" /> +<glyph unicode="3" d="M57 -225q92 2 188.5 29.5t182.5 78.5t141.5 134t55.5 182q0 154 -244 153q-74 0 -166 -10l-8 117q10 2 28.5 4t33.5 4l30 4q23 4 134.5 73.5t150.5 98.5q115 80 114 170q0 45 -31.5 68.5t-78.5 23.5q-100 0 -297 -104l-43 100q84 55 192.5 94t198.5 39q98 0 157.5 -52 t59.5 -148q0 -64 -30.5 -120.5t-89 -102.5t-103.5 -72.5t-115 -63.5q111 0 188.5 -63.5t77.5 -171.5q0 -182 -106.5 -317.5t-263 -199t-334.5 -63.5z" /> +<glyph unicode="4" d="M35 0l12 133q266 434 641 871h166l-137 -871h131l-21 -133h-135q-53 -240 -123 -342l-114 51q47 98 90 291h-510zM201 133h364l111 666q-274 -338 -475 -666z" /> +<glyph unicode="5" d="M72 -221q170 4 323 80q96 47 170 144t74 198q0 82 -59.5 118.5t-147.5 36.5q-96 0 -242 -41l168 689h508l-20 -123h-367l-98 -412q43 12 88 12q332 0 332 -256q0 -164 -114 -298t-273 -202q-155 -67 -309 -67h-9h-10z" /> +<glyph unicode="6" d="M96 365q0 328 196.5 566t522.5 384l39 -101q-219 -127 -303 -200q-23 -18 -41 -37q-111 -115 -174 -238q-41 -80 -67.5 -188.5t-26.5 -194.5q0 -102 43 -184t137 -82q215 0 270 361q4 37 4 55q0 180 -229 180q-66 0 -150 -37l31 31l30 30q9 9 27.5 24.5t31.5 21.5l32 14 q18 8 39.5 11t46.5 3q127 0 210 -73.5t83 -198.5q0 -33 -6 -68q-31 -197 -149 -337t-304 -140q-106 0 -175 62.5t-93.5 147t-24.5 188.5z" /> +<glyph unicode="7" d="M100 -281q207 223 384.5 551t222.5 602h-525l21 132h671l-20 -132q-47 -291 -238.5 -652t-408.5 -591z" /> +<glyph unicode="8" d="M66 264q0 145 122 287q61 70 183 123q-82 51 -123 107.5t-41 140.5q0 162 118.5 265t282.5 103q127 0 204 -56t77 -175q0 -129 -79 -223.5t-208 -147.5q135 -78 174 -121q61 -68 62 -166q0 -59 -21 -127q-45 -143 -166 -225t-274 -82q-135 0 -223 82t-88 215zM223 297 q0 -90 51.5 -151.5t139.5 -61.5q106 0 187 92t81 200.5t-102 170.5l-117 71q-104 -51 -172 -134t-68 -187zM352 928q0 -111 140 -187q121 47 186 114t65 183q0 141 -168 142q-94 0 -158.5 -78t-64.5 -174z" /> +<glyph unicode="9" d="M80 -217q223 127 307 199q25 20 45 43q268 274 268 608q0 281 -163 280q-86 0 -149.5 -61t-93.5 -137t-42 -164q-6 -27 -6 -55q0 -178 231 -179q59 0 148 35q-16 -14 -52 -51t-51.5 -47t-52.5 -23.5t-82 -13.5q-127 0 -210 74t-83 198l6 68q33 209 144.5 343t308.5 134 q154 0 226.5 -111.5t72.5 -273.5q0 -86 -18 -172q-111 -522 -705 -790z" /> +<glyph unicode=":" horiz-adv-x="528" d="M82 84q0 51 39 88t90 37q49 0 85 -33t36 -82t-40 -87t-91 -38q-49 0 -84 33t-35 82zM184 708.5q0 49.5 40 87.5t89 38t85 -33t36 -82t-40 -87t-91 -38q-49 0 -84 32.5t-35 82z" /> +<glyph unicode=";" horiz-adv-x="528" d="M-51 -207q181 195 181 329q0 11 -1 21q49 23 90 23q68 0 127 -113q-111 -170 -313 -336zM207 711q0 51 40 89t91 38q49 0 84 -33t35 -82q0 -51 -40 -89t-91 -38q-49 0 -84 33t-35 82z" /> +<glyph unicode="<" horiz-adv-x="614" d="M68 512l378 385l97 -78l-305 -307l309 -307l-96 -78z" /> +<glyph unicode="=" horiz-adv-x="983" d="M90 293v123h782v-123h-782zM90 598v123h782v-123h-782z" /> +<glyph unicode=">" horiz-adv-x="614" d="M68 205l96 -78l383 385l-379 385l-96 -78l305 -307z" /> +<glyph unicode="?" horiz-adv-x="815" d="M121 84q0 51 40 88t91 37q49 0 84 -33t35 -82t-40 -87t-91 -38q-49 0 -84 33t-35 82zM197 1382l100 105q47 -66 113 -66h180q227 0 227 -176q0 -133 -119 -272l-182 -207q-35 -39 -58.5 -68.5t-40.5 -61.5l-27 -48q-9 -16 -18.5 -54t-11.5 -50.5t-10 -68t-12 -77.5h-125 q4 20 14.5 97t16.5 101.5t23.5 81t46 100.5t69.5 91l182 205q35 39 64.5 98t29.5 105q0 82 -100 81h-172q-135 0 -190 84z" /> +<glyph unicode="@" horiz-adv-x="1622" d="M88 727q0 299 223.5 529.5t519.5 230.5q295 0 490 -179.5t195 -471.5q0 -113 -56.5 -236t-160 -212t-218.5 -89q-72 0 -119 35t-47 104q0 12 5 33q-119 -102 -175 -127q-45 -20 -90 -20q-98 0 -152 80.5t-54 183.5q0 94 18 185t58 178t116 141.5t176 54.5q145 0 225 -117 l21 84h133l-141 -592q-12 -45 -13 -67q0 -55 56 -56q125 0 218 151.5t93 285.5q0 252 -163 394t-419 142q-254 0 -429 -195.5t-175 -453.5q0 -270 179.5 -457.5t449.5 -187.5q152 0 292 65.5t230 182.5l96 -52q-94 -139 -270 -225t-348 -86q-319 0 -541.5 222.5 t-222.5 541.5zM588 610q0 -59 21.5 -106t74.5 -47q18 0 43 6t41 12t47 22.5t41 22.5l43 26q33 19 35 21l84 369q-76 98 -205 98q-78 0 -132 -83t-73.5 -174t-19.5 -167z" /> +<glyph unicode="A" horiz-adv-x="1052" d="M-45 0l612 1290h178l205 -1290h-168l-61 416h-393l-203 -416h-170zM389 551h313l-69 569z" /> +<glyph unicode="B" horiz-adv-x="1017" d="M88 20l201 1268h317q346 0 346 -262q0 -109 -68.5 -208t-172.5 -128q104 -6 162.5 -73.5t58.5 -172.5q0 -217 -155.5 -346t-375.5 -129q-120 0 -313 51zM270 135q88 -27 150 -26q147 0 247.5 87t100.5 236q0 59 -23.5 98t-68.5 55.5t-86 21.5t-101 5h-143zM367 745 q27 0 76 -1t75 -1q115 0 194 75t79 190q0 154 -207 153h-152z" /> +<glyph unicode="C" horiz-adv-x="1007" d="M119 465q0 176 55 347t160 298q176 211 409 211q197 0 318 -88l-76 -100q-102 57 -262 57q-84 0 -165 -60.5t-134 -142.5q-141 -217 -141 -518q0 -152 64.5 -261.5t205.5 -109.5q164 0 291 90l55 -104q-74 -53 -177.5 -85t-197.5 -32q-209 0 -307 140.5t-98 357.5z" /> +<glyph unicode="D" horiz-adv-x="1128" d="M88 0l205 1290h373q199 0 292 -124t93 -330q0 -145 -36 -287.5t-105.5 -267.5t-191.5 -203t-278 -78h-352zM270 131h191q119 0 206 70.5t132 183.5t65.5 225.5t20.5 220.5q0 328 -248 328h-203z" /> +<glyph unicode="E" horiz-adv-x="913" d="M88 0l205 1290h663l-22 -137h-500l-65 -410h383l-21 -141h-383l-74 -461h521l-23 -141h-684z" /> +<glyph unicode="F" horiz-adv-x="847" d="M88 0l205 1290h606l-22 -135h-443l-65 -412h350l-21 -141h-350l-96 -602h-164z" /> +<glyph unicode="G" horiz-adv-x="1062" d="M119 465q0 176 55 347t160 298q176 211 409 211q162 0 320 -88l-82 -105q-98 63 -258 64q-84 0 -165 -61.5t-134 -143.5q-141 -217 -141 -518q0 -152 64.5 -261.5t205.5 -109.5q106 0 184 29l68 424h151l-84 -531q-139 -53 -344 -53q-211 0 -310 139.5t-99 358.5z" /> +<glyph unicode="H" horiz-adv-x="1122" d="M88 0l205 1290h164l-88 -547h467l88 547h163l-204 -1290h-164l96 604h-467l-96 -604h-164z" /> +<glyph unicode="I" horiz-adv-x="487" d="M88 0l205 1290h160l-205 -1290h-160z" /> +<glyph unicode="J" horiz-adv-x="487" d="M-113 -223q174 53 195 178l211 1335h160l-213 -1347q-33 -207 -336 -277z" /> +<glyph unicode="K" horiz-adv-x="931" d="M88 0l205 1290h164l-92 -585l327 342q72 74 72 190q0 27 -2 39l164 29q6 -31 6 -64q0 -141 -105 -250l-350 -356l432 -586v-49h-172l-399 539l-86 -539h-164z" /> +<glyph unicode="L" horiz-adv-x="763" d="M88 0l205 1290h156l-187 -1163h457l-19 -127h-612z" /> +<glyph unicode="M" horiz-adv-x="1519" d="M88 0l205 1290h217l188 -880q29 -141 35 -209q70 170 90 209l445 880h217l-205 -1290h-164l139 877q8 59 41 178l-520 -1055h-143l-223 1057q-8 -119 -19 -176l-139 -881h-164z" /> +<glyph unicode="N" horiz-adv-x="1134" d="M88 0l205 1290h215l280 -985l19 178l129 807h164l-205 -1290h-168l-319 1057q-2 -86 -17 -180l-139 -877h-164z" /> +<glyph unicode="O" horiz-adv-x="1120" d="M119 473q0 100 21.5 211t67.5 225.5t110.5 205.5t160.5 148.5t209 57.5q98 0 170 -45t111 -121t56 -159t17 -175q0 -127 -34.5 -270t-101 -276.5t-180.5 -220.5t-253 -87q-98 0 -171 46t-110.5 123t-55 160t-17.5 177zM276 436q0 -334 218 -334q86 0 155.5 55.5 t111.5 139.5t70.5 187.5t40 193.5t11.5 164q0 344 -217 344q-104 0 -185.5 -84t-122.5 -209t-61.5 -243t-20.5 -214z" /> +<glyph unicode="P" horiz-adv-x="993" d="M88 0l205 1290h278q182 0 302 -76.5t120 -248.5q0 -223 -137 -363.5t-344 -140.5q-96 0 -180 45l-80 -506h-164zM352 637q100 -43 160 -43q133 0 224 102.5t91 247.5q0 113 -78.5 164t-197.5 51h-115z" /> +<glyph unicode="Q" horiz-adv-x="1071" d="M94 485q0 129 35 269.5t100.5 269.5t179 213t255.5 84q98 0 169.5 -45t110.5 -121t56.5 -160t17.5 -174q0 -356 -170 -606t-502 -373q10 -4 40 -20l39 -22q9 -5 34.5 -17l38 -17.5t36 -13.5t41 -10t40 -5t46.5 -3q135 0 281 47l-33 -166q-68 -18 -168 -18q-47 0 -88 4 t-85 17l-69 21q-26 7 -76 33l-66 35q-15 8 -76 44l-76 44l-17 70q199 109 254 143q-170 41 -259 168t-89 309zM254 477q0 -334 311 -375q154 119 223.5 318t69.5 422q0 344 -217 344q-104 0 -184 -77t-121 -194.5t-61.5 -229.5t-20.5 -208z" /> +<glyph unicode="R" horiz-adv-x="1019" d="M88 0l205 1290h278q182 0 302 -76.5t120 -248.5q0 -176 -110.5 -319.5t-282.5 -174.5l315 -422l-8 -49h-159l-351 471q-37 12 -65 31l-80 -502h-164zM352 637q86 -43 146 -43q131 0 230 107.5t99 242.5q0 113 -78.5 164t-197.5 51h-115z" /> +<glyph unicode="S" horiz-adv-x="880" d="M53 88l84 113q119 -98 228 -99q94 0 176 76t82 170q0 63 -47.5 117.5t-114.5 97.5l-134 89q-67 46 -114 116t-47 158q0 176 120 285.5t296 109.5q76 0 152.5 -42t125.5 -103l-96 -80q-37 43 -93.5 70.5t-109.5 27.5q-92 0 -158.5 -65.5t-66.5 -157.5q0 -59 32.5 -108.5 t83.5 -82.5l108 -72q58 -40 108.5 -79t83 -102.5t32.5 -139.5q0 -182 -124.5 -300t-309.5 -118q-174 0 -297 119z" /> +<glyph unicode="T" horiz-adv-x="800" d="M102 1143l23 143h788l-22 -143h-316l-180 -1143h-159l180 1143h-314z" /> +<glyph unicode="U" horiz-adv-x="1114" d="M135 358q0 72 12 144l125 788h164l-125 -790q-12 -70 -12 -144q0 -254 195 -254q244 0 309 400l125 788h164l-127 -796q-16 -106 -52 -196.5t-94.5 -167.5t-147.5 -120t-200 -43q-172 0 -254 107.5t-82 283.5z" /> +<glyph unicode="V" horiz-adv-x="993" d="M143 1290h179l161 -1093l303 567q66 121 66 311v215h172v-211q0 -205 -86 -360l-391 -719h-189z" /> +<glyph unicode="W" horiz-adv-x="1519" d="M164 1290h174l53 -913q1 -15 2 -35q0 -40 -6 -100q20 78 43 135l363 913h163l66 -913q4 -36 4 -77q0 -28 -2 -58q20 63 61 147l189 404q6 12 21 46l23 49q7 15 18.5 45t17.5 50.5t10 48t4 53.5v205h172v-211q0 -57 -20.5 -128.5t-36.5 -107.5l-58 -120l-356 -723h-166 q-6 111 -23.5 328t-27.5 388t-14 326q-6 -18 -20.5 -53t-16.5 -43l-365 -946h-174z" /> +<glyph unicode="X" horiz-adv-x="1013" d="M8 0v45l455 617l-273 628h179l209 -473l350 473h137v-45l-422 -575l295 -670h-188l-222 512l-374 -512h-146z" /> +<glyph unicode="Y" horiz-adv-x="882" d="M92 1196l107 113q72 -45 136 -139.5t91 -180.5q52 -157 52 -272q0 -16 -1 -31l31 115q37 137 150.5 301t228.5 223l98 -104q-172 -104 -286.5 -343t-159.5 -483l-70 -395h-162l74 457q-8 133 -32.5 263t-91.5 272.5t-165 203.5z" /> +<glyph unicode="Z" horiz-adv-x="909" d="M25 0v139l661 1008h-457l13 143h649l-14 -143l-672 -1004h629l-23 -143h-786z" /> +<glyph unicode="[" horiz-adv-x="589" d="M18 -319l289 1818h318l-21 -119h-190l-250 -1581h190l-18 -118h-318z" /> +<glyph unicode="\" horiz-adv-x="686" d="M25 1550h127l530 -1853h-127z" /> +<glyph unicode="]" horiz-adv-x="595" d="M-8 -319l18 118h191l250 1581h-191l21 119h317l-289 -1818h-317z" /> +<glyph unicode="^" horiz-adv-x="1277" d="M145 655l435 795h114q195 -381 434 -795h-143l-348 629l-348 -629h-144z" /> +<glyph unicode="_" d="M0 -154h922v-122h-922v122z" /> +<glyph unicode="`" horiz-adv-x="518" d="M102 1411l148 129q86 -150 268 -299l-80 -92q-211 123 -336 262z" /> +<glyph unicode="a" horiz-adv-x="1003" d="M92 248q0 117 34 249t97.5 254.5t169 202.5t234.5 80q117 0 284 -33l-125 -860q0 -4 -1 -9t-1 -7q0 -49 47 -49q20 0 50 12l26 -78q-66 -39 -135 -39q-63 0 -104 41t-41 107q0 20 7 55t9 47q-45 -96 -156.5 -174t-214.5 -78q-180 0 -180 279zM258 262q0 -156 76 -156 q106 0 220 136.5t132 251.5l64 397q-55 14 -121 14q-86 0 -161 -72.5t-118 -177t-67.5 -210t-24.5 -183.5z" /> +<glyph unicode="b" horiz-adv-x="1038" d="M102 92l211 1329h156l-78 -493q113 106 266 106q143 0 216 -107.5t73 -256.5q0 -170 -54 -325t-180 -265.5t-302 -110.5q-76 0 -161.5 35t-146.5 88zM272 178q72 -84 191 -84q80 0 145.5 62.5t102.5 156t56 186.5t19 167q0 240 -172 239q-129 0 -245 -112z" /> +<glyph unicode="c" horiz-adv-x="849" d="M92 365q0 113 32 227.5t90 213.5t156.5 162.5t219.5 63.5q117 0 246 -100l-80 -94q-94 70 -183 69q-102 0 -179 -92t-109.5 -202.5t-32.5 -209.5q0 -53 10 -104t31.5 -99t64.5 -78t101 -30q49 0 132 48t134 96l59 -82q-74 -78 -174 -131.5t-196 -53.5q-154 0 -238 118 t-84 278z" /> +<glyph unicode="d" horiz-adv-x="1024" d="M92 379q0 162 56.5 308.5t179.5 246.5t288 100q123 0 187 -86q33 176 33 269q0 113 -43 176l120 53q74 -104 74 -258q0 -41 -6 -78l-119 -721q-31 -184 -134 -302t-279 -118q-174 0 -265.5 115t-91.5 295zM250 367q0 -119 48 -197t161 -78q43 0 77.5 14.5t58 33 t45.5 57.5t32 63.5t22.5 75.5t16.5 70.5t12 70.5l59 340q-66 92 -180 92q-94 0 -165.5 -53t-110.5 -139t-57.5 -175t-18.5 -175z" /> +<glyph unicode="e" horiz-adv-x="894" d="M92 362q0 158 56.5 307.5t179.5 257t284 107.5q113 0 181.5 -57t68.5 -166q0 -270 -606 -397q-2 -16 -2 -47q0 -100 47 -187.5t139 -87.5q70 0 148 44t133 104l61 -84q-176 -186 -376 -187q-156 0 -235 115.5t-79 277.5zM268 539q426 92 426 284q0 88 -114 88 q-117 0 -202 -120.5t-110 -251.5z" /> +<glyph unicode="f" horiz-adv-x="550" d="M20 -330q125 209 150 475q49 494 66 740l-144 18l17 101h133l6 96q16 322 241 321q47 0 93 -16l-15 -111q-18 6 -43 6q-113 0 -121 -208q-4 -66 -4 -88h166l-2 -117l-172 -6q-8 -123 -24.5 -318.5t-30.5 -329.5l-12 -133q-20 -225 -213 -483z" /> +<glyph unicode="g" horiz-adv-x="907" d="M-41 -217q0 104 104.5 214t221.5 177l65 -96q-76 -51 -154.5 -130t-78.5 -136q0 -53 49 -75t110 -22q119 0 242 71t123 179q0 80 -55 124q-53 42 -128 42h-7l-7 43q2 4 19 24l21 25l21 26q15 19 20 27.5t18.5 27t19.5 29.5t16.5 27.5t15.5 29.5l11 29q6 15 8 30 q-43 -55 -116.5 -94.5t-141.5 -39.5q-125 0 -187.5 78t-62.5 205q0 193 109 314.5t301 121.5q127 0 303 -28q-8 -137 -39 -318q-43 -254 -84 -352q-31 -72 -71 -121q76 -12 123 -76.5t47 -154.5q0 -119 -88 -209t-204 -130t-231 -40q-51 0 -98 6t-99 23.5t-84 55.5t-32 93z M260 608q0 -68 36 -111.5t105 -43.5q84 0 153 76.5t89 164.5q18 92 29 211q-61 14 -183 15q-109 0 -169 -98.5t-60 -213.5z" /> +<glyph unicode="h" horiz-adv-x="1042" d="M90 0l225 1421h156l-96 -606q59 88 160.5 153.5t199.5 65.5q104 0 159.5 -41t55.5 -141q0 -29 -8 -90l-74 -469q-16 -104 -55 -174t-121 -152l-88 76q94 121 117 266l65 453q4 37 5 55q0 49 -26 69.5t-77 20.5q-76 0 -170 -70.5t-145 -146.5q-25 -37 -25 -45l-102 -645 h-156z" /> +<glyph unicode="i" horiz-adv-x="479" d="M90 0l160 1004h151l-159 -1004h-152zM244 1286q0 49 40 87t91 38q49 0 84 -32.5t35 -82.5q0 -51 -40 -88t-92 -37q-49 0 -83.5 33t-34.5 82z" /> +<glyph unicode="j" horiz-adv-x="479" d="M-123 -285q176 61 195 181l176 1108h151l-178 -1123q-16 -90 -57 -133q-92 -94 -270 -143zM244 1286q0 49 40 87t91 38q49 0 84 -32.5t35 -82.5q0 -51 -40 -88t-92 -37q-49 0 -83.5 33t-34.5 82z" /> +<glyph unicode="k" horiz-adv-x="983" d="M90 0l225 1421h152l-133 -837q158 10 284 69q59 29 110.5 79t51.5 104q0 43 -30 61q-25 15 -59 15q-7 0 -15 -1l-10 123q27 8 67 8q96 0 157.5 -50t61.5 -144q0 -100 -67.5 -175t-158.5 -109t-189 -38l370 -526h-196l-381 559l-88 -559h-152z" /> +<glyph unicode="l" horiz-adv-x="495" d="M137 225q0 94 15 178l161 1018h152l-162 -1018q-16 -94 -16 -182q0 -133 28 -196l-145 -43q-33 91 -33 243z" /> +<glyph unicode="m" horiz-adv-x="1576" d="M90 0l160 1004h156l-33 -193q39 72 145.5 147.5t181.5 75.5q104 0 168 -53q56 -47 57 -133q0 -11 -1 -23q49 82 136 145.5t171 63.5q233 0 233 -198q0 -37 -6 -74l-121 -762h-155l121 762q4 33 4 49q0 96 -99 96q-74 0 -167 -83t-146 -165l-102 -659h-156l121 762 q4 33 4 47q0 96 -111 96q-72 0 -157.5 -82t-147.5 -172l-100 -651h-156z" /> +<glyph unicode="n" horiz-adv-x="1062" d="M90 0l160 1004h156l-31 -189q51 82 157.5 150.5t202.5 68.5q104 0 159.5 -41t55.5 -141q0 -29 -8 -90l-121 -762h-155l120 762q6 55 7 57q0 88 -91 88q-98 0 -200.5 -82t-155.5 -180l-100 -645h-156z" /> +<glyph unicode="o" horiz-adv-x="1001" d="M92 385q0 143 55.5 288.5t172 253t266.5 107.5q162 0 242.5 -124t80.5 -296q0 -141 -56 -286.5t-173 -252t-264 -106.5q-162 0 -243 123t-81 293zM246 369q0 -115 43 -197t147 -82q84 0 148.5 57.5t100.5 145.5t53.5 175t17.5 163q0 117 -43 198.5t-148 81.5 q-109 0 -185.5 -101t-105 -219t-28.5 -222z" /> +<glyph unicode="p" horiz-adv-x="1097" d="M68 -358l168 1069l-146 -78l16 106l150 90l27 175h155l-10 -76q178 106 287 106q143 0 217 -107.5t74 -256.5q0 -104 -30 -222t-85 -227.5t-149.5 -181.5t-209.5 -72q-84 0 -146 41t-85 119l-78 -485h-155zM346 362q0 -111 46 -191.5t151 -80.5q78 0 139 64.5t95 161 t50.5 187.5t16.5 163q0 244 -160 243q-86 0 -276 -110l-50 -301q-12 -91 -12 -136z" /> +<glyph unicode="q" horiz-adv-x="1060" d="M92 342q0 111 33 228.5t92 223t158.5 173t216.5 67.5q80 0 174 -15t147 -32l54 -16l-211 -1331h-156l76 487q-96 -160 -283 -160q-152 0 -226.5 107.5t-74.5 267.5zM256 360q0 -106 37 -187t129 -81q68 0 126 42t95 106.5t59.5 130t32.5 127.5l60 381q-104 29 -164 28 q-100 0 -177 -52t-118 -137t-60.5 -175.5t-19.5 -182.5z" /> +<glyph unicode="r" horiz-adv-x="712" d="M90 0l160 1004h158l-31 -185l45 64q106 152 213 151q39 0 74.5 -27.5t54.5 -66.5l-119 -139q-31 63 -92 63q-43 0 -152 -131l-49 -61l-106 -672h-156z" /> +<glyph unicode="s" horiz-adv-x="843" d="M47 92l76 103q49 -39 115.5 -71t119.5 -32q80 0 146.5 49t66.5 127t-104 133l-197 107q-139 74 -139 211q0 154 112.5 234.5t272.5 80.5q86 0 163 -35.5t124 -103.5l-86 -76q-92 92 -223 92q-74 0 -138.5 -41t-64.5 -110q0 -33 19.5 -59.5t41 -41t56.5 -32.5l174 -92 q143 -76 143 -222q0 -156 -105.5 -250t-261.5 -94q-147 0 -311 123z" /> +<glyph unicode="t" horiz-adv-x="690" d="M143 903l17 101h143l29 178h143l-29 -178h203l-18 -119h-199l-108 -680q-3 -21 -4 -39q0 -26 8 -44q12 -30 63 -30q84 0 170 74l45 -100q-117 -96 -256 -97q-111 0 -155 61q-33 44 -33 113q0 25 4 54l110 688z" /> +<glyph unicode="u" horiz-adv-x="1038" d="M111 156q0 29 8 86l121 762h155l-121 -762q-6 -31 -6 -62q0 -84 94 -84q168 0 347 250l106 658h156l-135 -850q-4 -29 -5 -41q0 -39 35 -41l-67 -103h-6h-6q-49 0 -80 33q-33 35 -33 88t18 103q-63 -90 -162.5 -157t-199.5 -67q-109 0 -164 42.5t-55 144.5z" /> +<glyph unicode="v" horiz-adv-x="866" d="M70 1004h168l145 -828l279 457q39 63 38 153q0 111 -41 199l152 33q35 -78 35 -193q0 -141 -70 -256l-344 -569h-158z" /> +<glyph unicode="w" horiz-adv-x="1357" d="M82 1004h164l100 -816l324 816h161l89 -816l229 435q41 80 41 176t-33 184l150 35q31 -96 30 -203q0 -131 -53 -227l-321 -586l-168 -2l-62 512q-15 121 -14 226q0 42 2 81q-45 -176 -103 -307l-219 -512h-172z" /> +<glyph unicode="x" horiz-adv-x="864" d="M-20 2v37l370 481l-221 484h170l168 -386l192 191q27 27 27 82q0 53 -16 98l151 31q14 -43 15 -105q0 -109 -68 -176l-242 -237l244 -502h-174l-182 387l-299 -387z" /> +<glyph unicode="y" horiz-adv-x="882" d="M-16 -276q102 41 174.5 108.5t136.5 169.5l-211 1002h166l149 -832l297 504q20 37 21 94q0 106 -43 217l151 31q37 -92 37 -205q0 -119 -53 -207l-389 -649q-80 -135 -171 -215t-229 -123z" /> +<glyph unicode="z" horiz-adv-x="843" d="M20 0l11 145q258 358 604 734h-520l14 125h700l-16 -127q-324 -350 -623 -744h574l-16 -133h-728z" /> +<glyph unicode="{" horiz-adv-x="722" d="M74 541l16 96q76 0 134.5 81t72.5 165l57 360q18 127 72.5 196.5t169.5 69.5h121l6 -110h-121q-16 0 -29.5 -3t-23.5 -7.5t-19.5 -14.5l-14.5 -15t-11 -21.5t-9 -21.5t-8 -25l-5 -24q-1 -5 -5 -27.5t-4 -25.5l-55 -360q-14 -82 -68.5 -156.5t-126.5 -113.5 q51 -29 82 -89.5t31 -123.5q0 -33 -4 -49l-58 -361q-8 -66 -8 -96q0 -49 19.5 -67.5t70.5 -18.5h109l-39 -111h-117q-90 0 -131 42t-41 134q0 31 8 88l58 361q4 37 4 53q0 70 -35 132.5t-98 62.5z" /> +<glyph unicode="|" horiz-adv-x="454" d="M166 -37v1585h123v-1585h-123z" /> +<glyph unicode="}" horiz-adv-x="630" d="M-47 -221h108q35 0 58.5 11t37 23.5t22.5 44t12.5 46t9.5 57.5l57 361q14 82 67.5 154.5t127.5 107.5q-51 33 -82 94t-31 125q0 35 4 51l55 360q10 55 10.5 100.5t-16 65t-61.5 19.5h-121l39 110h121q88 0 128 -42t40 -132q0 -31 -9 -92l-57 -360q-4 -18 -4 -54 q0 -68 35 -130t98 -62l-16 -96q-76 0 -135.5 -82t-71.5 -166l-57 -361q-18 -127 -73.5 -195.5t-172.5 -68.5h-117z" /> +<glyph unicode="~" horiz-adv-x="1142" d="M281 504l20 127q8 8 28.5 35.5t26.5 33.5l24 23q17 16 31.5 20.5t37 9.5t51.5 5q76 0 201.5 -70t197.5 -70q111 0 184 119l-24 -147q-8 -8 -23.5 -26.5t-21.5 -23.5t-18.5 -17.5t-18.5 -15.5l-20 -10q-13 -7 -25 -8.5t-29.5 -3.5t-40.5 -2q-74 0 -200.5 70t-198.5 70 q-66 0 -100.5 -26.5t-81.5 -92.5z" /> +<glyph unicode="¡" horiz-adv-x="516" d="M25 -426q63 190 98 395l110 705h123l-80 -705q-25 -184 -92 -375zM201 911.5q0 49.5 40 87t91 37.5q49 0 84 -32.5t35 -82t-40 -87t-92 -37.5q-49 0 -83.5 32.5t-34.5 82z" /> +<glyph unicode="¢" horiz-adv-x="868" d="M100 365q0 133 44 271t124 228q133 143 285 164l22 139h93l-23 -137q76 -8 123 -40t100 -99l-102 -80q-66 82 -139 94l-129 -811q74 6 182 78l63 -74q-121 -117 -266 -129l-18 -119h-92l18 121q-143 23 -214 131.5t-71 262.5zM260 399q0 -246 148 -295l124 799 q-88 -25 -153.5 -116t-92 -192.5t-26.5 -195.5z" /> +<glyph unicode="£" horiz-adv-x="905" d="M61 791l41 102h80v270q0 129 97.5 191.5t232.5 62.5q145 0 213 -57l-35 -94q-63 37 -166 37q-186 0 -186 -170v-240h274v-123h-274v-260q0 -180 -47 -385h145q119 -39 180 -39q47 0 96.5 26.5t80.5 65.5l22 -102q-41 -45 -102.5 -76t-118.5 -31q-27 0 -72 7.5t-76 15.5 l-30 8h-307q74 330 73 514v264z" /> +<glyph unicode="¤" horiz-adv-x="1110" d="M16 498l82 129h119q4 41 8 63q2 23 13 66h-181l82 129h137q59 227 226.5 377.5t390.5 150.5q197 0 326 -143l-78 -123q-92 137 -279 137q-152 0 -271.5 -106.5t-170.5 -292.5h561l-82 -129h-516q-14 -57 -14 -68q-1 -4 -7 -61h457l-82 -129h-379q-1 -18 0 -35 q0 -167 72 -258q80 -100 223 -101q86 0 178.5 43t165.5 119l-26 -164q-145 -127 -348 -127q-195 0 -309 142q-101 125 -101 328q0 26 2 53h-199z" /> +<glyph unicode="¥" horiz-adv-x="882" d="M55 334l21 123h305q-4 63 -25 190h-247l20 123h203q-76 332 -240 432l107 107q72 -45 136 -139.5t91 -180.5q52 -157 52 -272q0 -16 -1 -31l31 115q37 137 150.5 301t228.5 223l98 -104q-104 -61 -192 -187.5t-146 -263.5h268l-20 -123h-293q-37 -111 -51 -190h311 l-20 -123h-314l-59 -334h-162l55 334h-307z" /> +<glyph unicode="§" horiz-adv-x="860" d="M43 -190l57 112q147 -90 308 -90q86 0 141 42t55 126q0 20 -7 38.5t-15.5 33t-26.5 31t-29.5 25.5t-37 24.5t-35 19.5t-37.5 18l-33 17q-6 2 -62.5 28.5t-71.5 35.5l-59 37q-43 28 -58 49.5t-31.5 57.5t-16.5 74q0 127 74.5 197t199.5 86q-6 2 -35 16l-38 19 q-8 4 -35 18.5t-36 20.5l-32 21q-23 15 -31 26.5t-22 29t-20.5 34t-11.5 38t-5 43.5q0 139 98.5 213t241.5 74q158 0 295 -78l-55 -106q-139 66 -244 65q-80 0 -131 -42t-51 -120q0 -49 53 -91t129 -75.5t150.5 -71.5t128 -97.5t53.5 -133.5q0 -113 -58.5 -194.5 t-166.5 -106.5q49 -27 77.5 -45t65.5 -48.5t55.5 -69.5t18.5 -84q0 -154 -98.5 -236t-254.5 -82q-188 1 -356 101zM238 496q0 -57 52 -93t111 -36q92 0 153.5 41t61.5 129q0 66 -52 105.5t-120 39.5q-94 0 -150 -47t-56 -139z" /> +<glyph unicode="¨" horiz-adv-x="638" d="M121 1276q0 45 34.5 83t82.5 38q35 0 59.5 -23.5t24.5 -58.5q0 -45 -39 -80t-84 -35q-33 0 -55.5 21.5t-22.5 54.5zM436 1276q0 45 35 83t82 38q35 0 59.5 -23.5t24.5 -58.5q0 -45 -39 -80t-84 -35q-33 0 -55.5 21.5t-22.5 54.5z" /> +<glyph unicode="©" horiz-adv-x="1800" d="M246 501.5q0 272.5 192.5 465t464.5 192.5q274 0 467 -192.5t193 -465t-193.5 -466t-466 -193.5t-465 193.5t-192.5 466zM346 502q0 -236 164 -397.5t399 -161.5q229 0 391 163.5t162 395t-163.5 395.5t-395 164t-394.5 -164t-163 -395zM594 500q0 154 82 262t231 108 q123 0 209 -79l-55 -70q-61 51 -154 51q-104 0 -150 -77t-46 -189q0 -117 50 -196t161 -79q76 0 172 70l43 -68q-41 -39 -104.5 -68.5t-115.5 -29.5q-152 0 -237.5 104.5t-85.5 260.5z" /> +<glyph unicode="ª" horiz-adv-x="745" d="M154 954q0 123 42 255t139 237.5t224 105.5q74 0 217 -24l-94 -656q0 -2 -1 -6t-1 -6q0 -37 35 -37q18 0 39 11l20 -60q-51 -31 -104 -31q-49 0 -80 32t-31 81q0 16 6 43t8 35q-37 -74 -120.5 -132.5t-161.5 -58.5q-137 0 -137 211zM281 965q0 -119 57 -119 q80 0 166 103.5t102 191.5q14 100 47 301q-35 12 -92 12q-86 0 -153.5 -93t-97 -202.5t-29.5 -193.5z" /> +<glyph unicode="«" horiz-adv-x="970" d="M68 512l378 385l97 -78l-305 -307l309 -307l-96 -78zM434 512l379 385l96 -78l-305 -307l309 -307l-96 -78z" /> +<glyph unicode="¬" horiz-adv-x="1095" d="M94 760v123h826v-523l-121 -22v422h-705z" /> +<glyph unicode="­" horiz-adv-x="618" d="M113 461v123h393v-123h-393z" /> +<glyph unicode="®" horiz-adv-x="1800" d="M242 500q0 274 191.5 465.5t466 191.5t465.5 -191.5t191 -466t-192.5 -467t-464.5 -192.5t-464.5 194t-192.5 466zM342 500q0 -238 163 -398.5t400 -160.5q231 0 391 163.5t160 395t-164 395.5t-393 164q-231 0 -394 -164t-163 -395zM688 145v727h176q125 0 212 -59 t87 -178q0 -84 -57 -159t-139 -83l225 -217v-31h-109l-245 248q-23 6 -45 19v-267h-105zM793 498q57 -27 94 -27q76 0 122 45t46 123t-54.5 113.5t-136.5 35.5h-71v-290z" /> +<glyph unicode="¯" horiz-adv-x="632" d="M51 1174l21 120h561l-21 -120h-561z" /> +<glyph unicode="°" horiz-adv-x="641" d="M63 995q0 129 102.5 228.5t231.5 99.5q104 0 174 -68.5t70 -173.5q0 -133 -99.5 -230t-232.5 -97q-104 0 -175 68.5t-71 172.5zM164 1008q0 -72 44 -117t114 -45q88 0 154.5 69.5t66.5 153.5q0 72 -44 118t-116 46q-82 0 -150.5 -68.5t-68.5 -156.5z" /> +<glyph unicode="±" horiz-adv-x="915" d="M92 451v122h330v355h119v-355h331v-122h-331v-256h-119v256h-330zM113 -2v123h739v-123h-739z" /> +<glyph unicode="²" d="M96 127q195 98 383 293q78 80 142.5 179t64.5 177q0 66 -44 96.5t-112 30.5q-100 0 -260 -98l-51 100q100 72 175 100.5t184 28.5q274 0 274 -256q0 -117 -92 -251t-205 -231t-225 -161h456l-22 -135h-660z" /> +<glyph unicode="³" d="M57 -225q92 2 188.5 29.5t182.5 78.5t141.5 134t55.5 182q0 154 -244 153q-74 0 -166 -10l-8 117q10 2 28.5 4t33.5 4l30 4q23 4 134.5 73.5t150.5 98.5q115 80 114 170q0 45 -31.5 68.5t-78.5 23.5q-100 0 -297 -104l-43 100q84 55 192.5 94t198.5 39q98 0 157.5 -52 t59.5 -148q0 -63 -30.5 -120t-89 -103t-103.5 -72.5t-115 -63.5q111 0 188.5 -63.5t77.5 -171.5q0 -182 -106.5 -317.5t-263 -199t-334.5 -63.5z" /> +<glyph unicode="´" horiz-adv-x="573" d="M104 1241q225 147 363 299l106 -129q-160 -137 -417 -262z" /> +<glyph unicode="µ" horiz-adv-x="1062" d="M127 -360q59 137 59 229q0 61 -11 186t-11 187v762h155v-762q0 -76 21.5 -111t93.5 -35q70 0 162 36t143 81v791h156v-850q0 -80 43 -82l-51 -103q-55 0 -95 32t-49 85q-63 -51 -152 -84t-171 -33q-31 0 -88 31q39 -117 39 -180q0 -76 -39 -144z" /> +<glyph unicode="¶" horiz-adv-x="1132" d="M102 831q0 203 125 346.5t326 143.5q27 0 39 -2l326 -31l12 90h112q-2 -14 -5 -28l-7 -33q-4 -18 -6 -29l109 21l-23 -105l-111 -24q-109 -266 -108 -496q0 -94 27 -176q35 -111 34 -238q0 -211 -65 -354l-185 74q78 150 78 370q0 45 -9 131.5t-9 131.5q0 270 125 559 l-289 24q-6 1 -12 1q-60 0 -109 -55q-53 -60 -75.5 -137t-22.5 -145q0 -82 39 -145t114 -66l-98 -139q-33 -4 -49 -4q-137 0 -210 88t-73 227z" /> +<glyph unicode="·" horiz-adv-x="559" d="M145 494q0 51 40 87.5t91 36.5q49 0 84 -32.5t35 -81.5q0 -51 -39 -88t-90 -37q-49 0 -85 33t-36 82z" /> +<glyph unicode="¸" horiz-adv-x="686" d="M371 -293q193 96 192 162q0 51 -57 51q-27 0 -105 -18l17 96h213q55 -47 55 -109q0 -74 -82 -143.5t-166 -101.5z" /> +<glyph unicode="¹" d="M238 856l16 98q88 0 199 29l75 18h142l-158 -1001h-152l136 856h-258z" /> +<glyph unicode="º" horiz-adv-x="790" d="M170 1057q0 176 104.5 334.5t270.5 158.5q123 0 184.5 -94t61.5 -225q0 -109 -43 -218.5t-131.5 -190.5t-200.5 -81q-123 0 -184.5 92.5t-61.5 223.5zM287 1044q0 -213 143 -213q84 0 142.5 77t80 166t21.5 169q0 213 -144 213q-63 0 -112 -44t-77 -110.5t-41 -133.5 t-13 -124z" /> +<glyph unicode="»" horiz-adv-x="1048" d="M137 205l96 -78l383 385l-378 385l-97 -78l305 -307zM504 205l96 -78l383 385l-379 385l-96 -78l305 -307z" /> +<glyph unicode="¼" horiz-adv-x="2844" d="M238 856l16 98q88 0 199 29l75 18h142l-158 -1001h-152l136 856h-258zM631 -268l1163 1794h129l-1163 -1794h-129zM1958 0l12 133q266 434 641 871h166l-137 -871h131l-21 -133h-135q-53 -240 -123 -342l-114 51q47 98 90 291h-510zM2124 133h364l111 666 q-274 -338 -475 -666z" /> +<glyph unicode="½" horiz-adv-x="2844" d="M238 856l16 98q88 0 199 29l75 18h142l-158 -1001h-152l136 856h-258zM631 -268l1163 1794h129l-1163 -1794h-129zM2019 127q195 98 383 293q78 80 142.5 179t64.5 177q0 66 -44 96.5t-111 30.5q-100 0 -261 -98l-51 100q100 72 175 100.5t184 28.5q274 0 274 -256 q0 -117 -92 -251t-205 -231t-225 -161h457l-23 -135h-659z" /> +<glyph unicode="¾" horiz-adv-x="2844" d="M57 -225q92 2 188.5 29.5t182.5 78.5t141.5 134t55.5 182q0 154 -244 153q-74 0 -166 -10l-8 117q10 2 28.5 4t33.5 4l30 4q23 4 134.5 73.5t150.5 98.5q115 80 114 170q0 45 -31.5 68.5t-78.5 23.5q-100 0 -297 -104l-43 100q84 55 192.5 94t198.5 39q98 0 157.5 -52 t59.5 -148q0 -63 -30.5 -120t-89 -103t-103.5 -72.5t-115 -63.5q111 0 188.5 -63.5t77.5 -171.5q0 -182 -106.5 -317.5t-263 -199t-334.5 -63.5zM631 -268l1163 1794h129l-1163 -1794h-129zM1958 0l12 133q266 434 641 871h166l-137 -871h131l-21 -133h-135 q-53 -240 -123 -342l-114 51q47 98 90 291h-510zM2124 133h364l111 666q-274 -338 -475 -666z" /> +<glyph unicode="¿" horiz-adv-x="829" d="M33 -242q0 135 121 273l180 207q41 45 67 83l42 59q15 22 27.5 64.5t15.5 55t13.5 78t14.5 88.5h125l-15.5 -97.5t-17.5 -100.5t-23.5 -83t-46 -99t-69.5 -91l-182 -205q-35 -39 -65 -98.5t-30 -104.5q0 -82 103 -82h170q135 0 190 -84l-100 -104q-47 66 -113 65h-180 q-227 0 -227 176zM479 909q0 49 40 87t91 38q49 0 84 -32.5t35 -81.5q0 -51 -39 -88t-90 -37q-49 0 -85 32.5t-36 81.5z" /> +<glyph unicode="À" horiz-adv-x="1052" d="M-45 0l612 1290h178l205 -1290h-168l-61 416h-393l-203 -416h-170zM389 551h313l-69 569zM463 1677l147 129q84 -150 269 -299l-82 -92q-211 123 -334 262z" /> +<glyph unicode="Á" horiz-adv-x="1052" d="M-45 0l612 1290h178l205 -1290h-168l-61 416h-393l-203 -416h-170zM389 551h313l-69 569zM492 1507q225 147 362 299l107 -129q-162 -137 -418 -262z" /> +<glyph unicode="Â" horiz-adv-x="1052" d="M-45 0l612 1290h178l205 -1290h-168l-61 416h-393l-203 -416h-170zM338 1520q94 51 222 137t179 131q104 -143 244 -275l-92 -90q-125 125 -176 195q-197 -127 -314 -193zM389 551h313l-69 569z" /> +<glyph unicode="Ã" horiz-adv-x="1052" d="M-45 0l612 1290h178l205 -1290h-168l-61 416h-393l-203 -416h-170zM299 1587q53 66 110 91q43 19 101 20q19 0 39 -2q37 -4 127 -46t147 -42q70 0 97 100l102 -20q-20 -109 -85 -159q-54 -42 -129 -42q-15 0 -32 2q-59 6 -136 46t-138 40q-37 0 -74 -15.5t-55 -31.5 l-21 -17zM389 551h313l-69 569z" /> +<glyph unicode="Ä" horiz-adv-x="1052" d="M-45 0l612 1290h178l205 -1290h-168l-61 416h-393l-203 -416h-170zM389 551h313l-69 569zM432 1542q0 45 36 83t81 38q35 0 59.5 -23.5t24.5 -58.5q0 -45 -39 -80t-84 -35q-33 0 -55.5 21.5t-22.5 54.5zM748 1542q0 45 35.5 83t80.5 38q35 0 59.5 -23.5t24.5 -58.5 q0 -45 -39 -80t-84 -35q-33 0 -55 21.5t-22 54.5z" /> +<glyph unicode="Å" horiz-adv-x="1052" d="M-45 0l612 1290h178l205 -1290h-168l-61 416h-393l-203 -416h-170zM389 551h313l-69 569zM494 1571q0 98 77.5 175t176.5 77q78 0 129 -52.5t51 -130.5q0 -98 -78 -174.5t-176 -76.5q-78 0 -129 52t-51 130zM586 1587q0 -43 29.5 -73.5t72.5 -30.5q55 0 100.5 44t45.5 97 q0 43 -28 74t-71 31q-57 0 -103 -43.5t-46 -98.5z" /> +<glyph unicode="Æ" horiz-adv-x="1476" d="M-45 0l612 1290h191l28 -432l70 432h664l-23 -137h-500l-65 -410h383l-21 -141h-383l-73 -461h520l-23 -141h-684l66 416h-389l-203 -416h-170zM389 551h305l-63 569z" /> +<glyph unicode="Ç" horiz-adv-x="1007" d="M119 465q0 176 55 347t160 298q176 211 409 211q197 0 318 -88l-78 -107q-109 66 -260 66q-84 0 -166 -62.5t-133 -142.5q-141 -217 -141 -518q0 -152 64.5 -261.5t205.5 -109.5q164 0 291 90l55 -104q-106 -76 -252 -104q39 -47 39 -91q0 -74 -82 -143.5t-166 -101.5 l-67 63q193 88 192 162q0 51 -57 51q-27 0 -105 -18l13 78q-158 39 -226.5 173t-68.5 312z" /> +<glyph unicode="È" horiz-adv-x="913" d="M88 0l205 1290h663l-22 -137h-500l-65 -410h383l-21 -141h-383l-74 -461h521l-23 -141h-684zM461 1677l147 129q86 -150 269 -299l-80 -92q-211 123 -336 262z" /> +<glyph unicode="É" horiz-adv-x="913" d="M88 0l205 1290h663l-22 -137h-500l-65 -410h383l-21 -141h-383l-74 -461h521l-23 -141h-684zM440 1507q225 147 363 299l106 -129q-162 -137 -420 -262z" /> +<glyph unicode="Ê" horiz-adv-x="913" d="M88 0l205 1290h663l-22 -137h-500l-65 -410h383l-21 -141h-383l-74 -461h521l-23 -141h-684zM307 1520q92 53 220 138t180 130q104 -143 243 -275l-92 -90q-125 125 -176 195q-197 -127 -313 -193z" /> +<glyph unicode="Ë" horiz-adv-x="913" d="M88 0l205 1290h663l-22 -137h-500l-65 -410h383l-21 -141h-383l-74 -461h521l-23 -141h-684zM420 1542q0 45 36 83t81 38q35 0 59.5 -23.5t24.5 -58.5q0 -45 -39 -80t-84 -35q-33 0 -55.5 21.5t-22.5 54.5zM735 1542q0 45 36 83t81 38q35 0 59.5 -23.5t24.5 -58.5 q0 -45 -39 -80t-84 -35q-33 0 -55.5 21.5t-22.5 54.5z" /> +<glyph unicode="Ì" horiz-adv-x="487" d="M88 0l205 1290h160l-205 -1290h-160zM166 1677l147 129q84 -150 267 -299l-80 -92q-211 123 -334 262z" /> +<glyph unicode="Í" horiz-adv-x="487" d="M88 0l205 1290h160l-205 -1290h-160zM195 1507q102 66 193 140.5t132 117.5l39 41l107 -129q-162 -137 -420 -262z" /> +<glyph unicode="Î" horiz-adv-x="487" d="M88 1520q94 51 222 137t179 131q104 -143 244 -275l-92 -90q-125 125 -176 195q-197 -127 -313 -193zM111 0l204 1290h160l-205 -1290h-159z" /> +<glyph unicode="Ï" horiz-adv-x="487" d="M88 0l205 1290h160l-205 -1290h-160zM147 1542q0 45 35 83t82 38q33 0 57.5 -23.5t24.5 -58.5q0 -45 -38 -80t-83 -35q-33 0 -55.5 21.5t-22.5 54.5zM463 1542q0 45 34.5 83t82.5 38q33 0 57.5 -23.5t24.5 -58.5q0 -45 -38 -80t-83 -35q-33 0 -55.5 21.5t-22.5 54.5z" /> +<glyph unicode="Ñ" horiz-adv-x="1134" d="M88 0l205 1290h215l280 -985l19 178l129 807h164l-205 -1290h-168l-319 1057q-2 -86 -17 -180l-139 -877h-164zM395 1587q53 66 110 91q43 19 101 20q19 0 39 -2q37 -4 127 -46t148 -42q70 0 96 100l102 -20q-20 -109 -85 -159q-54 -42 -129 -42q-15 0 -32 2 q-59 6 -136 46t-138 40q-37 0 -74 -15.5t-57 -31.5l-18 -17z" /> +<glyph unicode="Ò" horiz-adv-x="1120" d="M119 473q0 100 21.5 211t67.5 225.5t110.5 205.5t160.5 148.5t209 57.5q98 0 170 -45t111 -121t56 -159t17 -175q0 -127 -34.5 -270t-101 -276.5t-180.5 -220.5t-253 -87q-98 0 -171 46t-110.5 123t-55 160t-17.5 177zM276 436q0 -334 218 -334q86 0 155.5 55.5 t111.5 139.5t70.5 187.5t40 193.5t11.5 164q0 344 -217 344q-104 0 -185.5 -84t-122.5 -209t-61.5 -243t-20.5 -214zM498 1677l147 129q84 -150 268 -299l-79 -92q-213 123 -336 262z" /> +<glyph unicode="Ó" horiz-adv-x="1120" d="M119 473q0 100 21.5 211t67.5 225.5t110.5 205.5t160.5 148.5t209 57.5q98 0 170 -45t111 -121t56 -159t17 -175q0 -127 -34.5 -270t-101 -276.5t-180.5 -220.5t-253 -87q-98 0 -171 46t-110.5 123t-55 160t-17.5 177zM276 436q0 -334 218 -334q86 0 155.5 55.5 t111.5 139.5t70.5 187.5t40 193.5t11.5 164q0 344 -217 344q-104 0 -185.5 -84t-122.5 -209t-61.5 -243t-20.5 -214zM545 1507q225 147 362 299l107 -129q-162 -137 -418 -262z" /> +<glyph unicode="Ô" horiz-adv-x="1120" d="M119 473q0 100 21.5 211t67.5 225.5t110.5 205.5t160.5 148.5t209 57.5q98 0 170 -45t111 -121t56 -159t17 -175q0 -127 -34.5 -270t-101 -276.5t-180.5 -220.5t-253 -87q-98 0 -171 46t-110.5 123t-55 160t-17.5 177zM276 436q0 -334 218 -334q86 0 155.5 55.5 t111.5 139.5t70.5 187.5t40 193.5t11.5 164q0 344 -217 344q-104 0 -185.5 -84t-122.5 -209t-61.5 -243t-20.5 -214zM387 1520q94 51 222 137t179 131q104 -143 244 -275l-92 -90q-125 125 -176 195q-197 -127 -313 -193z" /> +<glyph unicode="Õ" horiz-adv-x="1120" d="M119 473q0 100 21.5 211t67.5 225.5t110.5 205.5t160.5 148.5t209 57.5q98 0 170 -45t111 -121t56 -159t17 -175q0 -127 -34.5 -270t-101 -276.5t-180.5 -220.5t-253 -87q-98 0 -171 46t-110.5 123t-55 160t-17.5 177zM276 436q0 -334 218 -334q86 0 155.5 55.5 t111.5 139.5t70.5 187.5t40 193.5t11.5 164q0 344 -217 344q-104 0 -185.5 -84t-122.5 -209t-61.5 -243t-20.5 -214zM365 1587q53 66 109 91q43 19 101 20q19 0 39 -2q37 -4 127 -46t148 -42q70 0 96 100l102 -20q-20 -109 -85 -159q-54 -42 -129 -42q-15 0 -31 2 q-59 6 -136 46t-139 40q-37 0 -73.5 -15.5t-55.5 -31.5l-20 -17z" /> +<glyph unicode="Ö" horiz-adv-x="1120" d="M119 473q0 100 21.5 211t67.5 225.5t110.5 205.5t160.5 148.5t209 57.5q98 0 170 -45t111 -121t56 -159t17 -175q0 -127 -34.5 -270t-101 -276.5t-180.5 -220.5t-253 -87q-98 0 -171 46t-110.5 123t-55 160t-17.5 177zM276 436q0 -334 218 -334q86 0 155.5 55.5 t111.5 139.5t70.5 187.5t40 193.5t11.5 164q0 344 -217 344q-104 0 -185.5 -84t-122.5 -209t-61.5 -243t-20.5 -214zM481 1542q0 45 36 83t81 38q35 0 59.5 -23.5t24.5 -58.5q0 -45 -38 -80t-85 -35q-33 0 -55.5 21.5t-22.5 54.5zM797 1542q0 45 35.5 83t80.5 38 q35 0 59.5 -23.5t24.5 -58.5q0 -45 -37.5 -80t-85.5 -35q-33 0 -55 21.5t-22 54.5z" /> +<glyph unicode="Ø" horiz-adv-x="1120" d="M119 473q0 100 21.5 211t67.5 225.5t110.5 205.5t160.5 148.5t209 57.5q78 0 146 -31l114 260h103l-140 -315q131 -133 131 -414q0 -127 -34.5 -270t-101 -276.5t-180.5 -220.5t-253 -87q-66 0 -115 19l-129 -289h-102l149 336q-157 125 -157 440zM276 436 q0 -174 64 -260l434 979q-47 31 -108 31q-104 0 -185.5 -84t-122.5 -209t-61.5 -243t-20.5 -214zM416 117q39 -14 78 -15q86 0 155.5 55.5t111.5 139.5t70.5 187.5t40 193.5t11.5 164q0 141 -43 233z" /> +<glyph unicode="Ù" horiz-adv-x="1114" d="M135 358q0 72 12 144l125 788h164l-125 -790q-12 -70 -12 -144q0 -254 195 -254q244 0 309 400l125 788h164l-127 -796q-16 -106 -52 -196.5t-94.5 -167.5t-147.5 -120t-200 -43q-172 0 -254 107.5t-82 283.5zM520 1677l148 129q86 -150 268 -299l-80 -92 q-211 123 -336 262z" /> +<glyph unicode="Ú" horiz-adv-x="1114" d="M135 358q0 72 12 144l125 788h164l-125 -790q-12 -70 -12 -144q0 -254 195 -254q244 0 309 400l125 788h164l-127 -796q-16 -106 -52 -196.5t-94.5 -167.5t-147.5 -120t-200 -43q-172 0 -254 107.5t-82 283.5zM502 1507q225 147 362 299l107 -129q-162 -137 -418 -262z " /> +<glyph unicode="Û" horiz-adv-x="1114" d="M135 358q0 72 12 144l125 788h164l-125 -790q-12 -70 -12 -144q0 -254 195 -254q244 0 309 400l125 788h164l-127 -796q-16 -106 -52 -196.5t-94.5 -167.5t-147.5 -120t-200 -43q-172 0 -254 107.5t-82 283.5zM401 1520q94 51 222.5 137t179.5 131q104 -143 244 -275 l-93 -90q-125 125 -176 195q-197 -127 -313 -193z" /> +<glyph unicode="Ü" horiz-adv-x="1114" d="M135 358q0 72 12 144l125 788h164l-125 -790q-12 -70 -12 -144q0 -254 195 -254q244 0 309 400l125 788h164l-127 -796q-16 -106 -52 -196.5t-94.5 -167.5t-147.5 -120t-200 -43q-172 0 -254 107.5t-82 283.5zM475 1542q0 45 36 83t81 38q35 0 59.5 -23.5t24.5 -58.5 q0 -45 -39 -80t-84 -35q-33 0 -55.5 21.5t-22.5 54.5zM791 1542q0 45 35.5 83t80.5 38q35 0 59.5 -23.5t24.5 -58.5q0 -45 -39 -80t-84 -35q-33 0 -55 21.5t-22 54.5z" /> +<glyph unicode="Ý" horiz-adv-x="882" d="M92 1196l107 113q72 -45 136 -139.5t91 -180.5q52 -157 52 -272q0 -16 -1 -31l31 115q37 137 150.5 301t228.5 223l98 -104q-172 -104 -286.5 -343t-159.5 -483l-70 -395h-162l74 457q-8 133 -32.5 263t-91.5 272.5t-165 203.5zM860 1540q225 147 363 299l106 -129 q-160 -137 -418 -262z" /> +<glyph unicode="ß" horiz-adv-x="1122" d="M20 -330q127 213 152 475l64 740l-144 18l17 101h139l16 155q12 133 139 212t271 79q147 0 245.5 -82t98.5 -225q0 -115 -68 -244q-86 14 -110 14q-76 0 -140.5 -41t-64.5 -112q0 -33 20.5 -60.5t41 -41t57.5 -31.5l174 -92q154 -82 153 -248q0 -154 -114.5 -237 t-274.5 -83q-80 0 -163 35t-136 92l76 105q45 -43 108.5 -77t116.5 -34q76 0 150 48t74 122q0 57 -45.5 100t-111 74l-130 64.5t-109.5 90t-45 132.5q0 143 108.5 227t258.5 88q29 72 28 129q0 86 -57 125t-145 39q-90 0 -166 -54t-84 -140l-111 -1096q-18 -170 -198 -420z " /> +<glyph unicode="à" horiz-adv-x="1003" d="M92 248q0 117 34 249t97.5 254.5t169 202.5t234.5 80q117 0 284 -33l-125 -860q0 -4 -1 -9t-1 -7q0 -49 47 -49q20 0 50 12l26 -78q-66 -39 -135 -39q-63 0 -104 41t-41 107q0 20 7 55t9 47q-45 -96 -156.5 -174t-214.5 -78q-180 0 -180 279zM258 262q0 -156 76 -156 q106 0 220 136.5t132 251.5l64 397q-55 14 -121 14q-86 0 -161 -72.5t-118 -177t-67.5 -210t-24.5 -183.5zM473 1411l148 129q86 -150 268 -299l-80 -92q-211 123 -336 262z" /> +<glyph unicode="á" horiz-adv-x="1003" d="M92 248q0 117 34 249t97.5 254.5t169 202.5t234.5 80q117 0 284 -33l-125 -860q0 -4 -1 -9t-1 -7q0 -49 47 -49q20 0 50 12l26 -78q-66 -39 -135 -39q-63 0 -104 41t-41 107q0 20 7 55t9 47q-45 -96 -156.5 -174t-214.5 -78q-180 0 -180 279zM258 262q0 -156 76 -156 q106 0 220 136.5t132 251.5l64 397q-55 14 -121 14q-86 0 -161 -72.5t-118 -177t-67.5 -210t-24.5 -183.5zM485 1241q225 147 363 299l106 -129q-160 -137 -417 -262z" /> +<glyph unicode="â" horiz-adv-x="1003" d="M92 248q0 117 34 249t97.5 254.5t169 202.5t234.5 80q117 0 284 -33l-125 -860q0 -4 -1 -9t-1 -7q0 -49 47 -49q20 0 50 12l26 -78q-66 -39 -135 -39q-63 0 -104 41t-41 107q0 20 7 55t9 47q-45 -96 -156.5 -174t-214.5 -78q-180 0 -180 279zM258 262q0 -156 76 -156 q106 0 220 136.5t132 251.5l64 397q-55 14 -121 14q-86 0 -161 -72.5t-118 -177t-67.5 -210t-24.5 -183.5zM334 1253q94 51 222 137.5t179 131.5q104 -143 244 -275l-92 -90q-125 125 -176 195q-197 -127 -314 -193z" /> +<glyph unicode="ã" horiz-adv-x="1003" d="M92 248q0 117 34 249t97.5 254.5t169 202.5t234.5 80q117 0 284 -33l-125 -860q0 -4 -1 -9t-1 -7q0 -49 47 -49q20 0 50 12l26 -78q-66 -39 -135 -39q-63 0 -104 41t-41 107q0 20 7 55t9 47q-45 -96 -156.5 -174t-214.5 -78q-180 0 -180 279zM258 262q0 -156 76 -155 q106 0 220 136t132 251l64 397q-55 14 -121 14q-86 0 -161 -72.5t-118 -177t-67.5 -210t-24.5 -183.5zM315 1321q53 66 110 91q43 19 101 19q19 0 39 -1q37 -4 127 -46.5t148 -42.5q72 0 96 101l102 -21q-20 -109 -85 -158q-54 -42 -129 -42q-15 0 -31 2q-59 6 -136 46 t-139 40q-37 0 -73.5 -15.5t-55.5 -31.5l-20 -17z" /> +<glyph unicode="ä" horiz-adv-x="1003" d="M92 248q0 117 34 249t97.5 254.5t169 202.5t234.5 80q117 0 284 -33l-125 -860q0 -4 -1 -9t-1 -7q0 -49 47 -49q20 0 50 12l26 -78q-66 -39 -135 -39q-63 0 -104 41t-41 107q0 20 7 55t9 47q-45 -96 -156.5 -174t-214.5 -78q-180 0 -180 279zM258 262q0 -156 76 -156 q106 0 220 136.5t132 251.5l64 397q-55 14 -121 14q-86 0 -161 -72.5t-118 -177t-67.5 -210t-24.5 -183.5zM442 1276q0 45 35 83t82 38q33 0 57.5 -23.5t24.5 -58.5q0 -45 -38 -80t-83 -35q-33 0 -55.5 21.5t-22.5 54.5zM758 1276q0 45 34.5 83t81.5 38q33 0 57.5 -23.5 t24.5 -58.5q0 -45 -37.5 -80t-82.5 -35q-33 0 -55.5 21.5t-22.5 54.5z" /> +<glyph unicode="å" horiz-adv-x="1003" d="M92 248q0 117 34 249t97.5 254.5t169 202.5t234.5 80q117 0 284 -33l-125 -860q0 -4 -1 -9t-1 -7q0 -49 47 -49q20 0 50 12l26 -78q-66 -39 -135 -39q-63 0 -104 41t-41 107q0 20 7 55t9 47q-45 -96 -156.5 -174t-214.5 -78q-180 0 -180 279zM258 262q0 -156 76 -156 q106 0 220 136.5t132 251.5l64 397q-55 14 -121 14q-86 0 -161 -72.5t-118 -177t-67.5 -210t-24.5 -183.5zM494 1350q14 88 88.5 152.5t163 64.5t140.5 -64q41 -50 41 -116q0 -18 -3 -37q-14 -88 -88 -152.5t-164 -64.5q-88 0 -141 63q-41 50 -41 116q1 19 4 38zM586 1350 q-2 -10 -2 -21q0 -37 24 -65q31 -37 78 -37q49 0 92 36.5t51 86.5q2 11 2 20q0 36 -23 66q-30 37 -77 37q-51 0 -94 -37t-51 -86z" /> +<glyph unicode="æ" horiz-adv-x="1361" d="M92 248q0 117 34 249t97.5 254.5t169 202.5t234.5 80q86 0 262 -43q90 43 190 43q113 0 181.5 -57t68.5 -166q0 -270 -606 -397q0 -8 -1 -24.5t-1 -22.5q0 -100 47 -187.5t139 -87.5q72 0 149 44t134 104l59 -84q-172 -186 -377 -187q-197 0 -272 183 q-61 -74 -151.5 -128.5t-176.5 -54.5q-180 0 -180 279zM258 262q0 -156 76 -156q113 0 233 154q-8 46 -8 102q0 145 50 288t145 241q-57 14 -125 14q-86 0 -161 -72.5t-118 -177t-67.5 -210t-24.5 -183.5zM735 539q426 92 426 284q0 88 -114 88q-117 0 -202 -120.5 t-110 -251.5z" /> +<glyph unicode="ç" horiz-adv-x="849" d="M92 365q0 113 32 227.5t90 213.5t156.5 162.5t219.5 63.5q117 0 246 -100l-80 -94q-94 70 -183 69q-102 0 -179 -92t-109.5 -202.5t-32.5 -209.5q0 -53 10 -104t31.5 -99t64.5 -78t101 -30q49 0 132 48t134 96l59 -82q-109 -115 -252 -164q49 -45 50 -101 q0 -74 -82 -143.5t-166 -101.5l-68 63l21 10l24 13.5l25.5 14.5t30.5 18l26 19q16 11 26 20l19 21q10 11 14.5 23.5t4.5 22.5q0 51 -58 51q-29 0 -102 -18l12 86q-104 37 -160.5 142.5t-56.5 234.5z" /> +<glyph unicode="è" horiz-adv-x="894" d="M92 362q0 158 56.5 307.5t179.5 257t284 107.5q113 0 181.5 -57t68.5 -166q0 -270 -606 -397q-2 -16 -2 -47q0 -100 47 -187.5t139 -87.5q70 0 148 44t133 104l61 -84q-176 -186 -376 -187q-156 0 -235 115.5t-79 277.5zM268 539q426 92 426 284q0 88 -114 88 q-117 0 -202 -120.5t-110 -251.5zM408 1411l147 129q86 -150 268 -299l-80 -92q-210 123 -335 262z" /> +<glyph unicode="é" horiz-adv-x="894" d="M92 362q0 158 56.5 307.5t179.5 257t284 107.5q113 0 181.5 -57t68.5 -166q0 -270 -606 -397q-2 -16 -2 -47q0 -100 47 -187.5t139 -87.5q70 0 148 44t133 104l61 -84q-176 -186 -376 -187q-156 0 -235 115.5t-79 277.5zM268 539q426 92 426 284q0 88 -114 88 q-117 0 -202 -120.5t-110 -251.5zM410 1241q225 147 362 299l107 -129q-160 -137 -418 -262z" /> +<glyph unicode="ê" horiz-adv-x="894" d="M92 362q0 158 56.5 307.5t179.5 257t284 107.5q113 0 181.5 -57t68.5 -166q0 -270 -606 -397q-2 -16 -2 -47q0 -100 47 -187.5t139 -87.5q70 0 148 44t133 104l61 -84q-176 -186 -376 -187q-156 0 -235 115.5t-79 277.5zM260 1253q94 51 222 137.5t180 131.5 q104 -143 243 -275l-92 -90q-125 125 -176 195q-197 -127 -313 -193zM268 539q426 92 426 284q0 88 -114 88q-117 0 -202 -120.5t-110 -251.5z" /> +<glyph unicode="ë" horiz-adv-x="894" d="M92 362q0 158 56.5 307.5t179.5 257t284 107.5q113 0 181.5 -57t68.5 -166q0 -270 -606 -397q-2 -16 -2 -47q0 -100 47 -187.5t139 -87.5q70 0 148 44t133 104l61 -84q-176 -186 -376 -187q-156 0 -235 115.5t-79 277.5zM268 539q426 92 426 284q0 88 -114 88 q-117 0 -202 -120.5t-110 -251.5zM358 1276q0 45 36 83t81 38q35 0 59.5 -23.5t24.5 -58.5q0 -45 -38 -80t-85 -35q-33 0 -55.5 21.5t-22.5 54.5zM674 1276q0 45 35.5 83t81.5 38q35 0 59 -23.5t24 -58.5q0 -45 -37.5 -80t-84.5 -35q-33 0 -55.5 21.5t-22.5 54.5z" /> +<glyph unicode="ì" horiz-adv-x="479" d="M90 0l160 1004h151l-159 -1004h-152zM125 1411l147 129q86 -150 269 -299l-80 -92q-211 123 -336 262z" /> +<glyph unicode="í" horiz-adv-x="479" d="M90 0l160 1004h151l-159 -1004h-152zM127 1241q102 66 193.5 140.5t130.5 117.5l41 41l106 -129q-162 -137 -420 -262z" /> +<glyph unicode="î" horiz-adv-x="479" d="M90 1253q94 51 222 137.5t180 131.5q104 -143 243 -275l-92 -90q-125 125 -176 195q-197 -127 -313 -193zM176 0l160 1004h151l-159 -1004h-152z" /> +<glyph unicode="ï" horiz-adv-x="479" d="M90 0l160 1004h151l-159 -1004h-152zM109 1276q0 45 34.5 83t81.5 38q33 0 58.5 -24.5t25.5 -57.5q0 -45 -39 -80t-84 -35q-33 0 -55 21.5t-22 54.5zM424 1276q0 45 35 83t82 38q33 0 58.5 -24.5t25.5 -57.5q0 -45 -39 -80t-84 -35q-33 0 -55.5 21.5t-22.5 54.5z" /> +<glyph unicode="ñ" horiz-adv-x="1062" d="M90 0l160 1004h156l-31 -189q51 82 157.5 150.5t202.5 68.5q104 0 159.5 -41t55.5 -141q0 -29 -8 -90l-121 -762h-155l120 762q6 55 7 57q0 88 -91 88q-98 0 -200.5 -82t-155.5 -180l-100 -645h-156zM311 1321q53 66 110 91q43 19 101 19q19 0 39 -1q37 -4 127 -46.5 t148 -42.5q72 0 96 101l102 -21q-20 -109 -85 -158q-54 -42 -129 -42q-15 0 -32 2q-59 6 -136 46t-138 40q-37 0 -74 -15.5t-55 -31.5l-20 -17z" /> +<glyph unicode="ò" horiz-adv-x="1001" d="M92 385q0 143 55.5 288.5t172 253t266.5 107.5q162 0 242.5 -124t80.5 -296q0 -141 -56 -286.5t-173 -252t-264 -106.5q-162 0 -243 123t-81 293zM246 369q0 -115 43 -197t147 -82q84 0 148.5 57.5t100.5 145.5t53.5 175t17.5 163q0 117 -43 198.5t-148 81.5 q-109 0 -185.5 -101t-105 -219t-28.5 -222zM414 1411l147 129q86 -150 268 -299l-79 -92q-211 123 -336 262z" /> +<glyph unicode="ó" horiz-adv-x="1001" d="M92 385q0 143 55.5 288.5t172 253t266.5 107.5q162 0 242.5 -124t80.5 -296q0 -141 -56 -286.5t-173 -252t-264 -106.5q-162 0 -243 123t-81 293zM246 369q0 -115 43 -197t147 -82q84 0 148.5 57.5t100.5 145.5t53.5 175t17.5 163q0 117 -43 198.5t-148 81.5 q-109 0 -185.5 -101t-105 -219t-28.5 -222zM418 1241q225 147 362 299l107 -129q-162 -137 -418 -262z" /> +<glyph unicode="ô" horiz-adv-x="1001" d="M92 385q0 143 55.5 288.5t172 253t266.5 107.5q162 0 242.5 -124t80.5 -296q0 -141 -56 -286.5t-173 -252t-264 -106.5q-162 0 -243 123t-81 293zM246 369q0 -115 43 -197t147 -82q84 0 148.5 57.5t100.5 145.5t53.5 175t17.5 163q0 117 -43 198.5t-148 81.5 q-109 0 -185.5 -101t-105 -219t-28.5 -222zM289 1253q94 51 222 137.5t179 131.5q104 -143 244 -275l-92 -90q-125 125 -176 195q-197 -127 -314 -193z" /> +<glyph unicode="õ" horiz-adv-x="1001" d="M92 385q0 143 55.5 288.5t172 253t266.5 107.5q162 0 242.5 -124t80.5 -296q0 -141 -56 -286.5t-173 -252t-264 -106.5q-162 0 -243 123t-81 293zM246 369q0 -115 43 -197t147 -82q84 0 148.5 57.5t100.5 145.5t53.5 175t17.5 163q0 117 -43 198.5t-148 81.5 q-109 0 -185.5 -101t-105 -219t-28.5 -222zM266 1321q53 66 110 91q43 19 101 19q19 0 39 -1q37 -4 127 -46.5t148 -42.5q72 0 96 101l102 -21q-18 -109 -84 -158q-54 -42 -130 -42q-15 0 -32 2q-57 6 -135 46t-139 40q-37 0 -74 -15.5t-55 -31.5l-21 -17z" /> +<glyph unicode="ö" horiz-adv-x="1001" d="M92 385q0 143 55.5 288.5t172 253t266.5 107.5q162 0 242.5 -124t80.5 -296q0 -141 -56 -286.5t-173 -252t-264 -106.5q-162 0 -243 123t-81 293zM246 369q0 -115 43 -197t147 -82q84 0 148.5 57.5t100.5 145.5t53.5 175t17.5 163q0 117 -43 198.5t-148 81.5 q-109 0 -185.5 -101t-105 -219t-28.5 -222zM383 1276q0 45 36 83t81 38q35 0 59.5 -23.5t24.5 -58.5q0 -45 -38 -80t-83 -35q-33 0 -56.5 21.5t-23.5 54.5zM698 1276q0 45 36 83t81 38q35 0 59.5 -23.5t24.5 -58.5q0 -45 -38 -80t-83 -35q-33 0 -56.5 21.5t-23.5 54.5z" /> +<glyph unicode="÷" horiz-adv-x="1001" d="M111 451v122h778v-122h-778zM377 209q0 51 40 88t91 37q49 0 84 -33t35 -82t-40 -87t-89 -38t-85 33t-36 82zM377 817q0 51 40 88t91 37q49 0 84 -32.5t35 -82t-40 -87.5t-89 -38t-85 33t-36 82z" /> +<glyph unicode="ø" horiz-adv-x="1001" d="M92 385q0 143 55.5 288.5t172 253t266.5 107.5q55 0 96 -14l74 166h102l-94 -209q145 -111 145 -363q0 -141 -56 -286.5t-173 -252t-264 -106.5q-55 0 -97 15l-98 -217h-102l117 260q-144 110 -144 358zM246 369q0 -133 49 -209l334 741q-31 10 -64 10 q-109 0 -185.5 -101t-105 -219t-28.5 -222zM371 100q31 -10 65 -10q84 0 148.5 57.5t100.5 145.5t53.5 175t17.5 163q0 137 -51 211z" /> +<glyph unicode="ù" horiz-adv-x="1038" d="M111 156q0 29 8 86l121 762h155l-121 -762q-6 -31 -6 -62q0 -84 94 -84q168 0 347 250l106 658h156l-135 -850q-4 -29 -5 -41q0 -39 35 -41l-67 -103h-6h-6q-49 0 -80 33q-33 35 -33 88t18 103q-63 -90 -162.5 -157t-199.5 -67q-109 0 -164 42.5t-55 144.5zM453 1411 l147 129q86 -150 268 -299l-80 -92q-210 123 -335 262z" /> +<glyph unicode="ú" horiz-adv-x="1038" d="M111 156q0 29 8 86l121 762h155l-121 -762q-6 -31 -6 -62q0 -84 94 -84q168 0 347 250l106 658h156l-135 -850q-4 -29 -5 -41q0 -39 35 -41l-67 -103h-6h-6q-49 0 -80 33q-33 35 -33 88t18 103q-63 -90 -162.5 -157t-199.5 -67q-109 0 -164 42.5t-55 144.5zM430 1241 q225 147 363 299l106 -129q-160 -137 -418 -262z" /> +<glyph unicode="û" horiz-adv-x="1038" d="M111 156q0 29 8 86l121 762h155l-121 -762q-6 -31 -6 -62q0 -84 94 -84q168 0 347 250l106 658h156l-135 -850q-4 -29 -5 -41q0 -39 35 -41l-67 -103h-6h-6q-49 0 -80 33q-33 35 -33 88t18 103q-63 -90 -162.5 -157t-199.5 -67q-109 0 -164 42.5t-55 144.5zM326 1253 q94 51 222 137.5t179 131.5q104 -143 244 -275l-92 -90q-125 125 -177 195q-197 -127 -313 -193z" /> +<glyph unicode="ü" horiz-adv-x="1038" d="M111 156q0 29 8 86l121 762h155l-121 -762q-6 -31 -6 -62q0 -84 94 -84q168 0 347 250l106 658h156l-135 -850q-4 -29 -5 -41q0 -39 35 -41l-67 -103h-6h-6q-49 0 -80 33q-33 35 -33 88t18 103q-63 -90 -162.5 -157t-199.5 -67q-109 0 -164 42.5t-55 144.5zM406 1276 q0 45 35.5 83t80.5 38q35 0 59.5 -23.5t24.5 -58.5q0 -45 -39 -80t-84 -35q-33 0 -55 21.5t-22 54.5zM721 1276q0 45 36 83t81 38q35 0 59.5 -23.5t24.5 -58.5q0 -45 -39 -80t-84 -35q-33 0 -55.5 21.5t-22.5 54.5z" /> +<glyph unicode="ý" horiz-adv-x="882" d="M-16 -276q102 41 174.5 108.5t136.5 169.5l-211 1002h166l149 -832l297 504q20 37 21 94q0 106 -43 217l151 31q37 -92 37 -205q0 -119 -53 -207l-389 -649q-80 -135 -171 -215t-229 -123zM801 1249q225 147 362 299l107 -129q-160 -137 -418 -262z" /> +<glyph unicode="ÿ" horiz-adv-x="882" d="M-16 -276q102 41 174.5 108.5t136.5 169.5l-211 1002h166l149 -832l297 504q20 37 21 94q0 106 -43 217l151 31q37 -92 37 -205q0 -119 -53 -207l-389 -649q-80 -135 -171 -215t-229 -123zM274 1276q0 45 35 83t82 38q35 0 59.5 -23.5t24.5 -58.5q0 -45 -39 -80t-84 -35 q-33 0 -55.5 21.5t-22.5 54.5zM590 1276q0 45 34.5 83t82.5 38q35 0 59.5 -23.5t24.5 -58.5q0 -45 -39 -80t-84 -35q-33 0 -55.5 21.5t-22.5 54.5z" /> +<glyph unicode="Œ" horiz-adv-x="1282" d="M119 481q0 92 14 172q16 104 57 211t103.5 205t159 159.5t206.5 61.5h666l-22 -137h-500l-64 -410h383l-22 -141h-383l-74 -461h520l-22 -141h-686q-94 0 -163 43t-104.5 116.5t-52 153.5t-16.5 168zM270 446q0 -317 207 -317l164 1030q-98 0 -175 -80t-117 -198.5 t-59.5 -231.5t-19.5 -203z" /> +<glyph unicode="œ" horiz-adv-x="1486" d="M92 385q0 141 56.5 287.5t173 254t264.5 107.5q184 0 270 -170q147 170 348 170q113 0 181.5 -57t68.5 -166q0 -270 -606 -397q0 -8 -1 -24.5t-1 -22.5q0 -100 48 -187.5t138 -87.5q72 0 148.5 44t134.5 104l59 -84q-176 -186 -377 -187q-180 0 -262 160 q-139 -160 -319 -160q-162 0 -243 123t-81 293zM246 369q0 -115 43 -197t147 -82q160 0 252 209q-4 41 -4 63q0 178 68 332q-20 217 -187 217q-84 0 -148.5 -57t-100 -145t-53 -176t-17.5 -164zM860 539q426 92 426 284q0 88 -115 88q-117 0 -201.5 -120.5t-109.5 -251.5z " /> +<glyph unicode="Ÿ" horiz-adv-x="882" d="M92 1196l107 113q72 -45 136 -139.5t91 -180.5q52 -157 52 -272q0 -16 -1 -31l31 115q37 137 150.5 301t228.5 223l98 -104q-172 -104 -286.5 -343t-159.5 -483l-70 -395h-162l74 457q-8 133 -32.5 263t-91.5 272.5t-165 203.5zM350 1542q0 45 36 83t81 38 q35 0 59.5 -23.5t24.5 -58.5q0 -45 -38 -80t-83 -35q-33 0 -56.5 21.5t-23.5 54.5zM666 1542q0 45 35.5 83t80.5 38q35 0 59.5 -23.5t24.5 -58.5q0 -45 -37.5 -80t-83.5 -35q-33 0 -56 21.5t-23 54.5z" /> +<glyph unicode="ˆ" horiz-adv-x="737" d="M84 1253q94 51 222 137.5t179 131.5q104 -143 244 -275l-92 -90q-125 125 -176 195q-197 -127 -314 -193z" /> +<glyph unicode="˜" horiz-adv-x="763" d="M23 1321q53 66 109 91q43 19 101 19q19 0 39 -1q37 -4 127 -46.5t148 -42.5q72 0 96 101l102 -21q-20 -109 -85 -158q-54 -42 -129 -42q-15 0 -31 2q-59 6 -136 46t-139 40q-37 0 -73.5 -15.5t-57.5 -31.5l-18 -17z" /> +<glyph unicode="–" horiz-adv-x="733" d="M0 461v123h733v-123h-733z" /> +<glyph unicode="—" horiz-adv-x="1245" d="M0 463v123h1245v-123h-1245z" /> +<glyph unicode="‘" horiz-adv-x="559" d="M199 1008q109 166 315 335l82 -75q-197 -211 -180 -350q-45 -23 -88 -23q-66 0 -129 113z" /> +<glyph unicode="’" horiz-adv-x="610" d="M160 938q181 195 181 328q0 11 -1 22q49 23 90 23q68 0 127 -113q-111 -170 -313 -336z" /> +<glyph unicode="‚" horiz-adv-x="528" d="M-51 -229q117 139 162 239q14 35 21 69t7 48l-2 16q63 35 103 35q59 -2 114 -94q-113 -178 -323 -377z" /> +<glyph unicode="“" horiz-adv-x="944" d="M203 1008q109 166 315 335l82 -75q-181 -195 -181 -329q0 -11 1 -21q-45 -23 -88 -23q-66 0 -129 113zM565 1008q109 166 316 335l82 -75q-181 -195 -182 -329q0 -11 1 -21q-45 -23 -88 -23q-66 0 -129 113z" /> +<glyph unicode="”" horiz-adv-x="942" d="M166 938q181 195 181 328q0 11 -1 22q49 23 90 23q68 0 127 -113q-111 -170 -313 -336zM528 938q181 195 182 328q0 11 -1 22q49 23 90 23q68 0 127 -113q-111 -170 -314 -336z" /> +<glyph unicode="„" horiz-adv-x="935" d="M-43 -201q181 195 181 329q0 11 -1 22q45 23 88 22q68 0 127 -113q-111 -170 -313 -335zM319 -201q181 195 182 329q0 11 -1 22q45 23 88 22q68 0 127 -113q-111 -170 -314 -335z" /> +<glyph unicode="•" horiz-adv-x="868" d="M80 645.5q0 145.5 103.5 248.5t249 103t249.5 -103t104 -248.5t-104 -249t-249.5 -103.5t-249 103.5t-103.5 249z" /> +<glyph unicode="…" horiz-adv-x="1204" d="M78 84q0 51 39 88t90 37q49 0 85 -33t36 -82t-40 -87t-91 -38q-49 0 -84 33t-35 82zM430 84q0 51 39 88t90 37q49 0 85 -33t36 -82t-40 -87t-91 -38q-49 0 -84 33t-35 82zM778 84q0 51 39 88t90 37q49 0 85 -33t36 -82t-40 -87t-91 -38q-49 0 -84 33t-35 82z" /> +<glyph unicode="‹" horiz-adv-x="589" d="M68 512l378 385l97 -78l-305 -307l309 -307l-96 -78z" /> +<glyph unicode="›" horiz-adv-x="667" d="M133 205l96 -78l383 385l-379 385l-96 -78l305 -307z" /> +<glyph unicode="™" horiz-adv-x="1583" d="M225 1325l15 92h497l-14 -92h-199l-114 -719h-101l115 719h-199zM721 608l129 813h137l119 -555q18 -106 20 -131q45 106 58 131l280 555h138l-129 -813h-105l88 553l25 111l-326 -664h-90l-141 666q-2 -55 -13 -111l-86 -555h-104z" /> +<glyph unicode="" horiz-adv-x="1020" d="M0 1020h1020v-1020h-1020v1020z" /> +<glyph unicode="fi" horiz-adv-x="1056" d="M20 -330q121 203 150 475q2 12 37 404q20 213 29 336l-144 18l17 101h133l12 167q12 150 127 215.5t278 65.5q86 0 221.5 -28.5t159.5 -80.5q6 -18 7 -36q0 -49 -42 -89t-92 -40q-27 0 -53 18t-26 43q0 10 4 26.5t4 26.5q0 33 -52.5 46.5t-101.5 13.5 q-117 0 -198.5 -56.5t-86.5 -167.5q-4 -82 -4 -124h166l-2 -117l-170 -6q-10 -158 -43 -453q-25 -262 -41 -391q-25 -180 -198 -420zM659 0l158 1004h152l-158 -1004h-152z" /> +<glyph unicode="fl" horiz-adv-x="1056" d="M20 -330l36 67t63 167t51 241q57 610 66 740l-144 18l17 101h133l12 167q10 129 100 199t215 77q35 2 70 2q89 0 176 -13q121 -18 215 -58l-156 -975q-16 -111 -16 -195q0 -116 31 -183l-148 -43q-6 18 -13 52t-17 146q-3 35 -4 70q0 77 16 153l143 900q-59 37 -137 46 q-26 3 -51 3q-51 0 -98 -13q-72 -18 -123 -73.5t-54 -137.5l-4 -124h166l-2 -117l-170 -6l-84 -844q-8 -76 -57 -181.5t-96 -170.5l-45 -68z" /> +<glyph unicode="ffi" horiz-adv-x="1581" d="M20 -330q125 209 150 475q49 494 66 740l-144 18l17 101h133l6 96q16 322 241 321q47 0 93 -16l-15 -111q-18 6 -43 6q-113 0 -121 -208q-4 -66 -4 -88h166l-2 -117l-172 -6q-8 -123 -24.5 -318.5t-30.5 -329.5l-12 -133q-20 -225 -213 -483zM571 -330q125 209 150 475 q49 494 65 740l-143 18l16 101h134l6 96q16 322 241 321q47 0 93 -16l-15 -111q-18 6 -43 6q-113 0 -121 -208q-4 -66 -4 -88h166l-2 -117l-172 -6q-8 -123 -24.5 -318.5t-30.5 -329.5l-13 -133q-20 -225 -212 -483zM1192 0l160 1004h151l-160 -1004h-151zM1346 1286 q0 49 39.5 87t91.5 38q49 0 83.5 -32.5t34.5 -82.5q0 -51 -39.5 -88t-91.5 -37q-49 0 -83.5 33t-34.5 82z" /> +<glyph unicode="ffl" horiz-adv-x="1597" d="M20 -330q125 209 150 475q49 494 66 740l-144 18l17 101h133l6 96q16 322 241 321q47 0 93 -16l-15 -111q-18 6 -43 6q-113 0 -121 -208q-4 -66 -4 -88h166l-2 -117l-172 -6q-8 -123 -24.5 -318.5t-30.5 -329.5l-12 -133q-20 -225 -213 -483zM571 -330q125 209 150 475 q49 494 65 740l-143 18l16 101h134l6 96q16 322 241 321q47 0 93 -16l-15 -111q-18 6 -43 6q-113 0 -121 -208q-4 -66 -4 -88h166l-2 -117l-172 -6q-8 -123 -24.5 -318.5t-30.5 -329.5l-13 -133q-20 -225 -212 -483zM1239 225q0 94 14 178l162 1018h152l-162 -1018 q-16 -94 -16 -182q0 -133 28 -196l-145 -43q-33 91 -33 243z" /> +</font> +</defs></svg>
\ No newline at end of file diff --git a/public/stylesheets/fonts/delicious-italic-webfont.ttf b/public/stylesheets/fonts/delicious-italic-webfont.ttf Binary files differnew file mode 100755 index 000000000..01d11991b --- /dev/null +++ b/public/stylesheets/fonts/delicious-italic-webfont.ttf diff --git a/public/stylesheets/fonts/delicious-italic-webfont.woff b/public/stylesheets/fonts/delicious-italic-webfont.woff Binary files differnew file mode 100755 index 000000000..32aa7611e --- /dev/null +++ b/public/stylesheets/fonts/delicious-italic-webfont.woff diff --git a/public/stylesheets/fonts/delicious-roman-webfont.eot b/public/stylesheets/fonts/delicious-roman-webfont.eot Binary files differnew file mode 100755 index 000000000..2e1b7b24e --- /dev/null +++ b/public/stylesheets/fonts/delicious-roman-webfont.eot diff --git a/public/stylesheets/fonts/delicious-roman-webfont.svg b/public/stylesheets/fonts/delicious-roman-webfont.svg new file mode 100755 index 000000000..c7c20b31c --- /dev/null +++ b/public/stylesheets/fonts/delicious-roman-webfont.svg @@ -0,0 +1,222 @@ +<?xml version="1.0" standalone="no"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" > +<svg xmlns="http://www.w3.org/2000/svg"> +<metadata> +This is a custom SVG webfont generated by Font Squirrel. +Copyright : copyright 19941996 Jos Buivenga +</metadata> +<defs> +<font id="DeliciousRoman" horiz-adv-x="921" > +<font-face units-per-em="2048" ascent="1638" descent="-410" /> +<missing-glyph horiz-adv-x="614" /> +<glyph unicode=" " horiz-adv-x="614" /> +<glyph unicode="	" horiz-adv-x="614" /> +<glyph unicode=" " horiz-adv-x="614" /> +<glyph unicode="!" horiz-adv-x="540" d="M174 84q0 51 40 88t91 37q49 0 84 -33t35 -82t-40 -87t-91 -38q-49 0 -84 33t-35 82zM213 1085q0 180 31 326l155 21q-35 -203 -34 -396v-704h-123q-29 528 -29 753z" /> +<glyph unicode=""" horiz-adv-x="708" d="M131 1321l27 129h100l29 -129l-45 -322h-68zM414 1321l26 129h101l28 -129l-45 -322h-67z" /> +<glyph unicode="#" horiz-adv-x="1138" d="M125 436l20 135h164l39 312h-145l20 135h142l51 403h123l-52 -403h236l45 364h123l-45 -364h174l-12 -135h-181l-39 -312h154l-12 -135h-158l-53 -418h-123l53 418h-235l-47 -379h-123l47 379h-166zM432 571h234l39 312h-234z" /> +<glyph unicode="$" horiz-adv-x="911" d="M127 983q0 147 86 236.5t233 99.5v113h93v-115q147 -18 249 -98l-55 -111q-82 59 -194 78v-467q158 -100 206 -152q92 -98 93 -248q0 -135 -83 -228t-216 -116v-124h-93v118q-164 4 -309 88l47 123q154 -76 262 -82v484l-46 29l-49 32l-43 30q-34 24 -44 33l-37 33 q-27 25 -35 40.5t-25 41t-23.5 49t-11.5 53t-5 60.5zM287 997q0 -55 25.5 -98t51 -63.5t82.5 -59.5v412q-76 -12 -117.5 -63.5t-41.5 -127.5zM539 113q68 23 104.5 79t36.5 130q0 111 -141 202v-411z" /> +<glyph unicode="%" horiz-adv-x="1431" d="M94 1048.5q0 112.5 80 192.5t193 80q80 0 145 -41q82 -23 143 -23q57 0 114.5 15.5t86.5 30.5l27 16l104 -29l-455 -1290h-135l432 1196q-35 -18 -88 -27.5t-90 -9.5l-35 -2q23 -43 23 -108q0 -113 -80 -193t-192.5 -80t-192.5 80t-80 192.5zM215 1048.5 q0 -63.5 44 -107.5t107.5 -44t107.5 44t44 107.5t-44 107.5t-107.5 44t-107.5 -44t-44 -107.5zM788 241.5q0 112.5 80 192.5t193 80t192.5 -80t79.5 -192.5t-79.5 -192.5t-192.5 -80t-193 80t-80 192.5zM909 241.5q0 -63.5 44 -107.5t107.5 -44t107.5 44t44 107.5t-44 107.5 t-107.5 44t-107.5 -44t-44 -107.5z" /> +<glyph unicode="&" horiz-adv-x="1290" d="M86 479q0 174 90 324.5t252 157.5q-141 59 -141 184q0 123 107.5 199.5t236.5 76.5q141 0 249.5 -77.5t108.5 -213.5v-126h203v-119h-199v-678q0 -113 80 -113q53 0 119 29l35 -96q-115 -57 -209 -58q-96 0 -138 64.5t-42 165.5v686h-199q-203 0 -290 -97.5t-87 -302.5 q0 -193 64 -313q41 -76 77 -76q23 0 56 34t79 67.5t103 33.5q51 0 100 -22l-30 -111q-41 12 -64 13q-47 0 -112.5 -71t-133.5 -71q-84 0 -148.5 52.5t-98 134.5t-51 164.5t-17.5 158.5zM442 1145q0 -76 65.5 -108.5t149.5 -32.5h189v96q0 94 -51.5 155.5t-143.5 61.5 q-82 0 -145.5 -46t-63.5 -126z" /> +<glyph unicode="'" horiz-adv-x="425" d="M131 1321l27 129h100l29 -129l-45 -322h-68z" /> +<glyph unicode="(" horiz-adv-x="688" d="M96 680q0 272 140.5 518t373.5 391l17 -116q-190 -125 -300 -343.5t-110 -453.5q0 -518 412 -848l-15 -127q-262 199 -390 431.5t-128 547.5z" /> +<glyph unicode=")" horiz-adv-x="694" d="M63 -172q414 330 414 848q0 236 -110.5 454t-300.5 343l16 116q233 -145 373.5 -391t140.5 -518q0 -315 -128 -547.5t-390 -431.5z" /> +<glyph unicode="*" horiz-adv-x="868" d="M72 1128v132l307 -111l-74 231h238l-70 -231l305 106v-127l-268 -86l217 -333h-143l-158 252l-156 -252h-133l201 333z" /> +<glyph unicode="+" horiz-adv-x="964" d="M92 451v122h330v355h119v-355h331v-122h-331v-355h-119v355h-330z" /> +<glyph unicode="," horiz-adv-x="528" d="M59 -229q98 141 123 239q10 41 11 84l-5 49q57 35 97 35q27 0 59.5 -23.5t52.5 -48.5l19 -22q-84 -178 -264 -377z" /> +<glyph unicode="-" horiz-adv-x="618" d="M111 461v123h391v-123h-391z" /> +<glyph unicode="." horiz-adv-x="528" d="M147 84q0 51 40 88t92 37q49 0 83.5 -33t34.5 -82t-40 -87t-91 -38q-49 0 -84 33t-35 82z" /> +<glyph unicode="/" horiz-adv-x="729" d="M35 -303l530 1853h129l-530 -1853h-129z" /> +<glyph unicode="0" d="M57 502q0 133 39 249.5t133.5 199.5t231.5 83t231 -83t133 -199.5t39 -249.5t-39 -250t-133 -200t-231 -83t-231.5 83t-133.5 200t-39 250zM205 502q0 -92 20.5 -177t81 -156t154.5 -71t154.5 71t81 156t20.5 177t-20.5 177t-81 155.5t-154.5 70.5t-154.5 -70.5 t-81 -155.5t-20.5 -177z" /> +<glyph unicode="1" d="M203 858v98q88 0 194 29l74 19h141v-1004h-151v858h-258z" /> +<glyph unicode="2" d="M127 127q156 84 325 279.5t169 343.5q0 74 -52.5 113.5t-128.5 39.5q-133 0 -284 -117l-29 119q92 72 161.5 100.5t176.5 28.5q143 0 228 -70.5t85 -211.5q0 -188 -190 -404q-131 -147 -228 -213h455v-135h-659z" /> +<glyph unicode="3" d="M147 -225q68 0 146 20q358 82 358 365q0 193 -289 192q-59 0 -174 -12v119l91 12q133 72 258 172q90 70 90 152q0 51 -39 81.5t-92 30.5q-51 0 -142.5 -38t-156.5 -76l-37 108q207 133 370 133q109 0 179.5 -63.5t70.5 -171.5q0 -57 -24.5 -106.5t-73.5 -91.5t-86 -66.5 t-98 -59.5q129 0 218 -78t89 -204q0 -178 -95.5 -304.5t-238.5 -180.5q-138 -52 -303 -52h-12h-9v119z" /> +<glyph unicode="4" d="M63 133q139 387 502 871h168v-871h131v-133h-135v-283h-145v283h-512zM215 133h369v680q-242 -354 -369 -680z" /> +<glyph unicode="5" d="M137 -221q164 4 312 80q193 100 192 305q0 98 -65.5 145t-167.5 47q-98 0 -236 -41l57 689h508v-123h-366l-33 -412q57 12 86 12q10 0 26.5 -1t26.5 -1q133 -6 226.5 -80.5t93.5 -201.5q0 -322 -285 -457q-168 -80 -349 -80h-18h-8v119z" /> +<glyph unicode="6" d="M96 524q0 264 160 465t420 326l55 -101q-184 -115 -284.5 -213t-157.5 -264q127 47 215 47q150 0 244 -95t94 -245q0 -125 -37 -229t-125 -175t-215 -71q-102 0 -178 53.5t-115 139.5t-57.5 176t-18.5 186zM246 481q0 -82 18.5 -163.5t73.5 -153.5t139 -72q213 0 213 359 q0 113 -64.5 173t-179.5 60q-66 0 -184 -51q-16 -78 -16 -152z" /> +<glyph unicode="7" d="M121 872v132h672v-132q0 -272 -137.5 -640.5t-313.5 -591.5l-135 57q180 238 309 570.5t129 604.5h-524z" /> +<glyph unicode="8" d="M84 317q0 117 66.5 211.5t177.5 145.5q-102 61 -154.5 128.5t-52.5 172.5q0 143 100.5 229t247.5 86q152 0 237 -77.5t85 -229.5q0 -96 -69 -174t-167 -121q66 -33 91.5 -48t73.5 -49t68.5 -63.5t38 -77t17.5 -104.5q0 -174 -110.5 -275.5t-287.5 -101.5 q-147 0 -254.5 100.5t-107.5 247.5zM238 340q0 -100 64.5 -177t162.5 -77t161.5 76t63.5 176q0 49 -13 86t-45 65.5t-54.5 45t-74.5 44t-73 39.5q-192 -100 -192 -278zM266 967q0 -82 44 -132.5t128 -93.5l69 36q13 7 52 33t50.5 46.5t24.5 55t13 79.5q0 188 -194 189 q-84 0 -135.5 -63.5t-51.5 -149.5z" /> +<glyph unicode="9" d="M88 557q0 199 92 338t281 139q102 0 179 -56t118 -146.5t59.5 -184.5t18.5 -188q0 -266 -190.5 -480.5t-461.5 -324.5l-43 117q203 102 321 208.5t179 284.5q-131 -47 -219 -47q-68 0 -131 29q-203 86 -203 311zM240 551q0 -98 61 -165t160 -67q119 0 207 54 q16 78 16 151q0 82 -18.5 163t-73.5 152.5t-139 71.5q-213 0 -213 -360z" /> +<glyph unicode=":" horiz-adv-x="528" d="M147 84q0 51 40 88t92 37q49 0 83.5 -33t34.5 -82t-40 -87t-91 -38q-49 0 -84 33t-35 82zM147 713q0 51 40 88t92 37q49 0 83.5 -33t34.5 -82t-40 -87t-91 -38q-49 0 -84 33t-35 82z" /> +<glyph unicode=";" horiz-adv-x="528" d="M53 -229q98 141 123 239q10 41 10 84l-4 49q57 35 97 35q27 0 59.5 -23.5t50.5 -48.5l21 -22q-84 -178 -265 -377zM147 709q0 51 40 89t92 38q49 0 83.5 -33t34.5 -82q0 -51 -40 -89t-91 -38q-49 0 -84 33t-35 82z" /> +<glyph unicode="<" horiz-adv-x="614" d="M68 512l378 385l97 -78l-305 -307l309 -307l-96 -78z" /> +<glyph unicode="=" horiz-adv-x="983" d="M90 293v123h782v-123h-782zM90 598v123h782v-123h-782z" /> +<glyph unicode=">" horiz-adv-x="614" d="M68 205l96 -78l383 385l-379 385l-96 -78l305 -307z" /> +<glyph unicode="?" horiz-adv-x="733" d="M147 84q0 51 40 88t92 37q49 0 83.5 -33t34.5 -82t-40 -87t-91 -38q-49 0 -84 33t-35 82zM211 332v104q0 86 2 127t20.5 103.5t55.5 111.5l168 226q70 96 69 161q0 57 -30.5 92t-87.5 35q-88 0 -172 -18v117q96 27 184 26q121 0 190.5 -63.5t69.5 -184.5q0 -98 -100 -229 l-164 -217q-45 -59 -62.5 -120.5t-17.5 -166.5v-104h-125z" /> +<glyph unicode="@" horiz-adv-x="1622" d="M88 727q0 299 223.5 529.5t519.5 230.5q295 0 490 -179.5t195 -471.5q0 -113 -56.5 -236t-160 -212t-218.5 -89q-72 0 -119 35t-47 104q0 12 5 33q-119 -102 -175 -127q-45 -20 -90 -20q-98 0 -152 80.5t-54 183.5q0 94 18 185t58 178t116 141.5t176 54.5q145 0 225 -117 l21 84h133l-141 -592q-12 -45 -13 -67q0 -55 56 -56q125 0 218 151.5t93 285.5q0 252 -163 394t-419 142q-254 0 -429 -195.5t-175 -453.5q0 -270 179.5 -457.5t449.5 -187.5q152 0 292 65.5t230 182.5l96 -52q-94 -139 -270 -225t-348 -86q-319 0 -541.5 222.5 t-222.5 541.5zM588 610q0 -59 21.5 -106t74.5 -47q18 0 43 6t41 12t47 22.5t41 22.5l43 26q33 19 35 21l84 369q-76 98 -205 98q-78 0 -132 -83t-73.5 -174t-19.5 -167z" /> +<glyph unicode="A" horiz-adv-x="1044" d="M25 0l409 1290h176l410 -1290h-168l-137 416h-385l-137 -416h-168zM369 551h307l-154 569z" /> +<glyph unicode="B" horiz-adv-x="1028" d="M164 20v1270h317q123 0 203 -30q190 -76 190 -295q0 -86 -57 -169t-137 -106q125 -8 195.5 -97t70.5 -218q0 -195 -131 -300.5t-330 -105.5q-124 0 -321 51zM328 745h151q104 0 169 59.5t65 162.5q0 197 -234 196h-151v-418zM328 135q92 -27 153 -26q135 0 218 67.5 t83 200.5q0 74 -23.5 123t-69.5 72.5t-96 31.5t-122 8h-143v-477z" /> +<glyph unicode="C" horiz-adv-x="1017" d="M113 645q0 119 29.5 233.5t87 216t157.5 164t227 62.5q195 0 332 -88l-59 -107q-119 66 -273 66q-86 0 -154.5 -58.5t-106.5 -147.5t-57.5 -180t-19.5 -169q0 -90 16.5 -176t52.5 -171t106.5 -136.5t166.5 -51.5q166 0 279 84l70 -102q-68 -53 -166.5 -84t-190.5 -31 q-135 0 -235.5 60.5t-155.5 161t-80.5 214t-25.5 240.5z" /> +<glyph unicode="D" horiz-adv-x="1120" d="M164 0v1290h373q133 0 228 -56t146.5 -152.5t74 -205t22.5 -233.5t-27 -234.5t-82 -203.5t-153.5 -149.5t-229.5 -55.5h-352zM326 131h190q98 0 166 47t100.5 128t46 161t13.5 172q0 520 -314 520h-202v-1028z" /> +<glyph unicode="E" horiz-adv-x="929" d="M164 0v1290h663v-137h-499v-410h383v-141h-383v-461h520v-141h-684z" /> +<glyph unicode="F" horiz-adv-x="843" d="M164 0v1290h606v-135h-442v-412h350v-141h-350v-602h-164z" /> +<glyph unicode="G" horiz-adv-x="1073" d="M113 645q0 119 29.5 233.5t87 216t157.5 164t227 62.5q96 0 168 -20.5t166 -67.5l-63 -109q-113 70 -271 70q-111 0 -190.5 -96.5t-113.5 -219t-34 -241.5q0 -90 15.5 -176t51.5 -171t106.5 -137.5t168.5 -52.5q109 0 181 29v422h151v-528q-129 -53 -336 -54 q-135 0 -236.5 59.5t-156.5 160t-81.5 215t-26.5 241.5z" /> +<glyph unicode="H" horiz-adv-x="1122" d="M164 0v1290h164v-547h467v547h163v-1290h-163v604h-467v-604h-164z" /> +<glyph unicode="I" horiz-adv-x="487" d="M164 0v1290h160v-1290h-160z" /> +<glyph unicode="J" horiz-adv-x="501" d="M12 -223q166 55 166 178v1335h160v-1347q0 -205 -291 -277z" /> +<glyph unicode="K" horiz-adv-x="993" d="M164 0v1290h164v-590l450 590h174l-495 -663l520 -578v-49h-164l-485 539v-539h-164z" /> +<glyph unicode="L" horiz-adv-x="782" d="M164 0v1290h155v-1155h445v-135h-600z" /> +<glyph unicode="M" horiz-adv-x="1519" d="M164 0v1290h217l379 -1089l379 1089h217v-1290h-164v877l10 178l-371 -1055h-143l-371 1057q10 -106 11 -176v-881h-164z" /> +<glyph unicode="N" horiz-adv-x="1134" d="M164 0v1290h217l436 -987q-10 98 -10 180v807h164v-1290h-168l-486 1053q10 -96 11 -176v-877h-164z" /> +<glyph unicode="O" horiz-adv-x="1122" d="M113 645.5q0 110.5 23.5 222t73.5 217t141 171t210 65.5t210 -65.5t141.5 -171t74 -217t23.5 -222t-23.5 -222.5t-74 -217.5t-141.5 -171t-210 -65.5t-210 65.5t-141 171t-73.5 217.5t-23.5 222.5zM276 645q0 -72 14.5 -155.5t44.5 -175t89 -151t137 -59.5t137.5 59.5 t89 151t44 175t14.5 155.5t-14.5 156t-44 175t-89 150.5t-137.5 59.5t-137 -59.5t-89 -150.5t-44.5 -175t-14.5 -156z" /> +<glyph unicode="P" horiz-adv-x="1001" d="M164 0v1290h278q211 0 345.5 -98t134.5 -299q0 -190 -114 -311t-304 -121q-100 0 -176 41v-502h-164zM328 637q98 -43 166 -43q121 0 192.5 89t71.5 212q0 133 -89 198.5t-227 65.5h-114v-522z" /> +<glyph unicode="Q" horiz-adv-x="1122" d="M113 645q0 111 23.5 222.5t73.5 217t141 171t210 65.5t210 -65.5t141.5 -171t74 -217t23.5 -222.5q0 -209 -80 -402.5t-244 -252.5q129 -137 262 -137q41 0 74 8l-43 -156q-33 -4 -49 -4q-51 0 -96.5 13.5t-88.5 45t-67.5 52t-69.5 66.5l-57 59l-37 34q-106 12 -188 83 t-126 172.5t-65.5 208t-21.5 210.5zM276 645q0 -72 14.5 -155.5t44.5 -175t89 -151t137 -59.5t137.5 59.5t89 151t44 175t14.5 155.5t-14.5 156t-44 175t-89 150.5t-137.5 59.5t-137 -59.5t-89 -150.5t-44.5 -175t-14.5 -156z" /> +<glyph unicode="R" horiz-adv-x="1034" d="M164 0v1290h278q211 0 345.5 -98t134.5 -299q0 -158 -84 -274.5t-236 -147.5l381 -422v-49h-160l-424 471q-39 12 -71 31v-502h-164zM328 637q94 -43 151 -43q129 0 204 85t75 216q0 133 -89 198.5t-227 65.5h-114v-522z" /> +<glyph unicode="S" horiz-adv-x="888" d="M92 983q0 162 97.5 250t261.5 88q88 0 173 -41t130 -111l-92 -77q-78 98 -211 98q-86 0 -142.5 -49t-56.5 -133q0 -82 57.5 -146.5t138 -109.5t161.5 -96.5t138.5 -136.5t57.5 -200q0 -158 -110.5 -254t-270.5 -96q-76 0 -161 34t-146 87l69 117q129 -106 240 -107 q96 0 158.5 62.5t62.5 159.5q0 72 -57.5 132t-137.5 107l-163 99q-82 52 -139.5 134.5t-57.5 188.5z" /> +<glyph unicode="T" horiz-adv-x="829" d="M20 1147v143h789v-143h-315v-1147h-160v1147h-314z" /> +<glyph unicode="U" horiz-adv-x="1142" d="M162 502v788h164v-790q0 -395 245.5 -395.5t245.5 397.5v788h164v-796q0 -225 -98.5 -375t-311.5 -150t-311 152t-98 381z" /> +<glyph unicode="V" horiz-adv-x="1044" d="M12 1290h178l336 -1093l338 1093h170l-422 -1290h-180z" /> +<glyph unicode="W" horiz-adv-x="1449" d="M20 1290h175l198 -913q16 -72 17 -135l235 1048h164l235 -1048q0 63 17 135l207 913h166l-304 -1290h-174l-229 1042l-229 -1042h-174z" /> +<glyph unicode="X" horiz-adv-x="1007" d="M20 0l383 662l-372 628h178l285 -473l274 473h168l-354 -620l401 -670h-188l-303 512l-293 -512h-179z" /> +<glyph unicode="Y" horiz-adv-x="964" d="M27 1290h174l286 -643l289 643h164l-377 -817v-473h-162v473z" /> +<glyph unicode="Z" horiz-adv-x="937" d="M74 0v139q283 559 557 1010h-512v141h702v-141q-301 -496 -567 -1006h623v-143h-803z" /> +<glyph unicode="[" horiz-adv-x="507" d="M57 -319v1818h318v-119h-191v-1581h191v-118h-318z" /> +<glyph unicode="\" horiz-adv-x="686" d="M25 1550h127l530 -1853h-127z" /> +<glyph unicode="]" horiz-adv-x="509" d="M135 -201h191v1581h-191v119h318v-1818h-318v118z" /> +<glyph unicode="^" horiz-adv-x="1277" d="M145 655l435 795h114l434 -795h-143l-348 629l-348 -629h-144z" /> +<glyph unicode="_" d="M0 -154h922v-122h-922v122z" /> +<glyph unicode="`" horiz-adv-x="692" d="M92 1411l127 129q106 -147 316 -299l-66 -92q-240 127 -377 262z" /> +<glyph unicode="a" horiz-adv-x="954" d="M86 246q0 72 59 182l482 205v129q0 72 -43 108.5t-115 36.5q-70 0 -146.5 -44t-129.5 -103l-58 96q61 78 157.5 128t190.5 50q137 0 218 -68.5t81 -203.5v-625q0 -61 66 -61q25 0 41 12l39 -78q-59 -37 -119 -37q-82 0 -131 49.5t-49 131.5q-25 -86 -106 -135.5 t-175 -49.5q-123 0 -192.5 76t-69.5 201zM240 252q0 -68 36.5 -114t102.5 -46q109 0 178.5 109.5t69.5 224.5v84l-361 -152q-26 -57 -26 -106z" /> +<glyph unicode="b" horiz-adv-x="1030" d="M168 92v1329h156v-493q43 49 113.5 77.5t135.5 28.5q172 0 264.5 -146.5t92.5 -328.5q0 -92 -12.5 -172t-43 -159t-78.5 -135t-125 -90t-175 -34q-78 0 -169 36t-159 87zM324 178q35 -39 92 -61.5t110 -22.5q72 0 123 46t76 120t35 141.5t10 135.5q0 63 -8 119.5 t-30.5 117t-69 96t-111.5 35.5q-59 0 -122.5 -32.5t-104.5 -79.5v-615z" /> +<glyph unicode="c" horiz-adv-x="843" d="M100 492q0 129 39 247.5t134.5 206.5t228.5 88q156 0 262 -102l-70 -92q-86 72 -190 71q-86 0 -145.5 -71.5t-81 -157.5t-21.5 -170q0 -90 21.5 -180t84 -165t154.5 -75q86 0 225 90l52 -96q-57 -49 -137.5 -83t-151.5 -34q-197 0 -300.5 158t-103.5 365z" /> +<glyph unicode="d" horiz-adv-x="1048" d="M102 444q0 119 20.5 218.5t68 186.5t134.5 136t207 49q88 0 197 -30v417h156v-1233q0 -113 55 -118l-43 -101q-78 4 -113 39q-47 51 -47 142q-23 -86 -102.5 -133.5t-173.5 -47.5q-172 0 -265.5 146.5t-93.5 328.5zM262 467q0 -55 11.5 -114.5t34 -121t68.5 -100.5 t105 -39q115 0 181.5 121t66.5 246v413q-88 37 -184 37q-283 0 -283 -442z" /> +<glyph unicode="e" horiz-adv-x="964" d="M100 528q0 197 118 351.5t308 154.5q145 0 241.5 -114.5t106.5 -264.5q2 -16 2.5 -51t2.5 -53h-619v-39q0 -84 20.5 -174t79 -168t144.5 -78q100 0 284 127l50 -98q-72 -61 -170.5 -106.5t-180.5 -45.5q-104 0 -183 52.5t-121 138.5t-62.5 179t-20.5 189zM279 668h436 q0 94 -55.5 168.5t-147.5 74.5q-90 0 -151.5 -73.5t-81.5 -169.5z" /> +<glyph unicode="f" horiz-adv-x="585" d="M51 903v101h135v159q0 242 351 285l28 -121q-8 0 -26.5 -2t-54 -14.5t-66.5 -30.5t-53.5 -56t-22.5 -87v-133h199v-119h-199v-885h-156v885z" /> +<glyph unicode="g" horiz-adv-x="931" d="M82 -170q0 47 15.5 85t49 67.5t60 47t76.5 44.5q-55 6 -95.5 42t-40.5 87q0 37 15.5 66.5t48.5 52t56.5 34t64.5 27.5q-98 35 -157.5 121t-59.5 190q0 152 96 246t248 94q90 0 149 -30h277v-123h-146q47 -82 47 -192.5t-70.5 -197t-178.5 -118.5q-4 -2 -23.5 -7.5 t-30 -9.5t-32 -11t-36 -13t-32.5 -15.5t-30 -18.5l-23 -19q-12 -10 -17.5 -23.5t-5.5 -26.5q0 -72 254 -71h70q100 0 168.5 -56.5t68.5 -152.5q0 -166 -137 -262.5t-309 -96.5q-137 0 -238.5 56.5t-101.5 183.5zM233 -139q0 -80 56.5 -119t140.5 -39q102 0 194.5 64.5 t92.5 162.5q0 119 -197 119h-121q-37 -20 -58.5 -34.5t-50 -39t-43 -53t-14.5 -61.5zM264 700q0 -86 51.5 -156.5t135.5 -70.5t135 70.5t51 156.5t-51 157t-135 71t-135.5 -71t-51.5 -157z" /> +<glyph unicode="h" horiz-adv-x="1062" d="M168 0v1421h156v-491q55 39 151 71.5t174 32.5q147 0 198.5 -69.5t51.5 -202.5v-762h-156v762q0 76 -24.5 110.5t-95.5 34.5q-78 0 -167 -33.5t-132 -70.5v-803h-156z" /> +<glyph unicode="i" horiz-adv-x="487" d="M123 1284q0 47 35 78t82 31q45 0 78.5 -30t33.5 -75q0 -47 -34.5 -77.5t-81.5 -30.5q-45 0 -79 29.5t-34 74.5zM168 0v1004h151v-1004h-151z" /> +<glyph unicode="j" horiz-adv-x="487" d="M2 -285q166 63 166 181v1108h151v-1123q0 -195 -282 -274zM123 1284q0 47 35 78t82 31q45 0 78.5 -30t33.5 -75q0 -47 -34.5 -77.5t-81.5 -30.5q-45 0 -79 29.5t-34 74.5z" /> +<glyph unicode="k" horiz-adv-x="964" d="M168 0v1421h156v-837l362 420h184l-368 -433l454 -534v-37h-163l-469 559v-559h-156z" /> +<glyph unicode="l" horiz-adv-x="483" d="M156 403v1018h151v-1018q0 -203 62 -403h-162q-51 139 -51 403z" /> +<glyph unicode="m" horiz-adv-x="1579" d="M168 0v1004h156v-74q145 104 276 104q182 0 238 -106q53 43 146 74.5t161 31.5q270 0 270 -272v-762h-155v762q0 74 -29 109.5t-101 35.5q-150 0 -262 -92q2 -18 2 -53v-762h-155v762q0 74 -29 109.5t-100 35.5q-131 0 -262 -104v-803h-156z" /> +<glyph unicode="n" horiz-adv-x="1062" d="M168 0v1004h156v-74q55 39 151 71.5t174 32.5q147 0 198.5 -69.5t51.5 -202.5v-762h-156v762q0 76 -24.5 110.5t-95.5 34.5q-78 0 -168 -34.5t-131 -69.5v-803h-156z" /> +<glyph unicode="o" horiz-adv-x="999" d="M100 500q0 127 40 243.5t134.5 203.5t225.5 87t225 -87t134 -203.5t40 -243.5q0 -125 -41 -243t-135 -203t-223 -85t-223.5 85t-135.5 203t-41 243zM256 500q0 -139 64.5 -273.5t179 -134.5t179 134t64.5 274q0 84 -23.5 175t-81.5 163.5t-138 72.5t-138.5 -72.5 t-82 -163.5t-23.5 -175z" /> +<glyph unicode="p" horiz-adv-x="1056" d="M172 -360v1364h156v-76q51 47 126.5 76.5t143.5 29.5q172 0 264 -146.5t92 -328.5q0 -78 -9 -152.5t-33.5 -156.5t-64.5 -142.5t-107.5 -99.5t-153.5 -39q-188 0 -258 158v-487h-156zM328 498q0 -68 10 -131.5t35.5 -129t78 -105.5t123.5 -40q68 0 115 47t68.5 124 t29 141.5t7.5 132.5q0 63 -8.5 120.5t-31 119t-68.5 98t-112 36.5q-61 0 -128.5 -34.5t-118.5 -83.5v-295z" /> +<glyph unicode="q" horiz-adv-x="1056" d="M102 481q0 96 24 190.5t70 177.5t126.5 134t183.5 51q150 0 381 -63v-1331h-156v487q-74 -158 -258 -158q-98 0 -173 47t-116 124t-61.5 163t-20.5 178zM264 537q0 -442 217 -443q51 0 99 29q152 92 151 375v376q-84 33 -190 33q-137 0 -207 -112.5t-70 -257.5z" /> +<glyph unicode="r" horiz-adv-x="653" d="M168 0v1004h158v-80q4 4 18 19t22 22l23 19q16 13 29.5 20.5t33 15.5t42 11t49.5 3q25 0 50 -7t38 -15l12 -8l-55 -140q-33 27 -92 27q-33 0 -70 -22.5t-51.5 -36t-50.5 -50.5v-782h-156z" /> +<glyph unicode="s" horiz-adv-x="860" d="M96 768q0 131 101.5 198.5t238.5 67.5q90 0 175 -35.5t134 -103.5l-81 -82q-100 100 -232 100q-72 0 -127 -34.5t-55 -102.5q0 -37 25.5 -68.5t49.5 -44.5l66 -36l189 -92q184 -90 184 -275q0 -143 -103.5 -217t-250.5 -74q-160 0 -293 119l57 111q141 -109 244 -109 q82 0 139 38t57 116q0 94 -127 157l-213 107q-178 90 -178 260z" /> +<glyph unicode="t" horiz-adv-x="626" d="M51 903v101h144v178h143v-178h203v-119h-199v-678q0 -113 80 -113q23 0 52.5 7.5t47.5 13.5l19 8l34 -96q-90 -57 -208 -58q-80 0 -130.5 54.5t-50.5 175.5v686z" /> +<glyph unicode="u" horiz-adv-x="1062" d="M164 242v762h155v-762q0 -76 21.5 -111t93.5 -35q68 0 161 36t144 81v791h156v-850q0 -78 43 -82l-51 -103q-55 0 -95 32t-49 85q-61 -53 -151 -85t-172 -32q-139 0 -197.5 67t-58.5 206z" /> +<glyph unicode="v" horiz-adv-x="925" d="M20 1004h168l277 -828q199 453 278 828h156q-129 -543 -360 -1004h-154z" /> +<glyph unicode="w" horiz-adv-x="1372" d="M25 1004h163l230 -816l194 816h162l213 -816q125 379 203 816h149q-86 -520 -276 -1004h-166l-139 512q-14 53 -29.5 130t-23.5 128l-9 49q-25 -182 -57 -307l-137 -512h-172z" /> +<glyph unicode="x" horiz-adv-x="868" d="M25 0l317 520l-301 484h170l217 -349l211 349h164l-293 -478l334 -526h-174l-244 391l-238 -391h-163z" /> +<glyph unicode="y" horiz-adv-x="929" d="M23 1004h163l234 -658q39 -115 55 -205q154 383 275 863h155q-250 -973 -493 -1256q-78 -90 -240 -129l-33 119q70 16 152 86q43 37 106 160z" /> +<glyph unicode="z" horiz-adv-x="872" d="M70 0v133q279 463 518 739h-477v132h657v-136q-291 -354 -518 -735h557v-133h-737z" /> +<glyph unicode="{" horiz-adv-x="681" d="M82 541v96q63 0 115.5 71.5t52.5 174.5v360q0 160 55 213t146 53h120l23 -110h-121q-57 0 -77.5 -36t-20.5 -149v-360q0 -82 -38 -149.5t-75 -94.5l-39 -26l16.5 -10.5t37 -30t46 -51t36 -73.5t16.5 -97v-361q0 -113 21.5 -147.5t88.5 -34.5h109l-23 -111h-116 q-41 0 -72 8.5t-64.5 33t-51 80.5t-17.5 142v361q0 102 -52.5 175t-115.5 73z" /> +<glyph unicode="|" horiz-adv-x="454" d="M166 -37v1585h123v-1585h-123z" /> +<glyph unicode="}" horiz-adv-x="681" d="M82 1399l22 110h121q41 0 72 -8t62.5 -33.5t49 -82t17.5 -142.5v-360q0 -102 52 -174t116 -72v-96q-63 0 -115.5 -73t-52.5 -175v-361q0 -86 -17.5 -142t-51 -80.5t-64.5 -33t-72 -8.5h-117l-22 111h108q68 0 89.5 34.5t21.5 147.5v361q0 51 15.5 97t38 74.5t45 50 t38.5 29.5l15 11q-6 4 -16.5 10t-37 31.5t-46 54.5t-36 76t-16.5 98v360q0 113 -20.5 149t-77.5 36h-121z" /> +<glyph unicode="~" horiz-adv-x="1363" d="M299 504v127q25 53 74 90t104 37q78 0 213 -70t209 -70q113 0 166 119l-2 -147q-25 -47 -75 -77t-103 -30q-76 0 -213 70t-209 70q-107 0 -164 -119z" /> +<glyph unicode="¡" horiz-adv-x="540" d="M119 905q0 51 40 89t91 38q49 0 84 -33.5t35 -83t-40 -87t-91 -37.5q-49 0 -84 32.5t-35 81.5zM143 -430q35 199 35 395v705h123q31 -565 31 -754q0 -170 -33 -326z" /> +<glyph unicode="¢" horiz-adv-x="843" d="M100 492q0 238 101 372q96 133 248 164v141h92v-139q137 -14 223 -98l-70 -92q-63 51 -153 65v-811q82 10 200 88l52 -96q-98 -92 -252 -115v-123h-92v123q-133 23 -226 131q-123 142 -123 390zM256 512q0 -125 47 -249t146 -161v795q-100 -33 -146.5 -147.5 t-46.5 -237.5z" /> +<glyph unicode="£" horiz-adv-x="905" d="M61 791l41 102h80v270q0 129 97.5 191.5t232.5 62.5q145 0 213 -57l-35 -94q-63 37 -166 37q-186 0 -186 -170v-240h274v-123h-274v-260q0 -180 -47 -385h145q119 -39 180 -39q47 0 96.5 26.5t80.5 65.5l22 -102q-41 -45 -102.5 -76t-118.5 -31q-27 0 -72 7.5t-76 15.5 l-30 8h-307q74 330 73 514v264z" /> +<glyph unicode="¤" horiz-adv-x="1110" d="M20 498l62 129h149q-2 27 -2 63q0 39 2 66h-211l62 129h164q25 229 167 378.5t365 149.5q205 0 348 -143l-57 -123q-113 137 -301 137q-330 0 -379 -399h561l-61 -129h-516q-4 -53 -4 -68q0 -16 4 -61h456l-61 -129h-379q23 -190 119 -292t240 -102q86 0 171 43t146 119 v-164q-127 -127 -328 -127q-195 0 -332 141.5t-159 381.5h-226z" /> +<glyph unicode="¥" horiz-adv-x="974" d="M25 1290h174l288 -643l289 643h172q-238 -518 -239 -518h247v-123h-303l-84 -182v-10h383v-123h-383v-334h-163v334h-375v123h375v12l-84 180h-287v123h229z" /> +<glyph unicode="§" horiz-adv-x="860" d="M43 -190l57 112q147 -90 308 -90q86 0 141 42t55 126q0 61 -53 108.5t-130 80.5l-154 71q-77 37 -130 95.5t-53 133.5q0 125 73.5 195t200.5 88q-147 70 -192 111q-74 66 -74 155q0 139 98.5 213t241.5 74q158 0 295 -78l-55 -106q-139 66 -244 65q-80 0 -131 -42 t-51 -120q0 -51 53 -92t129 -74.5t150.5 -72.5t128 -105.5t53.5 -152.5q0 -109 -59.5 -179.5t-165.5 -93.5q63 -33 103 -59.5t77 -77.5t37 -110q0 -154 -98.5 -236t-254.5 -82q-186 1 -356 101zM238 496q0 -57 52 -93t111 -36q92 0 153.5 41t61.5 129q0 66 -52 105.5 t-120 39.5q-94 0 -150 -47t-56 -139z" /> +<glyph unicode="¨" horiz-adv-x="786" d="M121 1276q0 45 36 83t81 38q35 0 59.5 -23.5t24.5 -58.5q0 -45 -39 -80t-84 -35q-33 0 -55.5 21.5t-22.5 54.5zM436 1276q0 45 36 83t81 38q35 0 59.5 -23.5t24.5 -58.5q0 -45 -39 -80t-84 -35q-33 0 -55.5 21.5t-22.5 54.5z" /> +<glyph unicode="©" horiz-adv-x="1800" d="M246 501.5q0 272.5 192.5 465t464.5 192.5q274 0 467 -192.5t193 -465t-193.5 -466t-466 -193.5t-465 193.5t-192.5 466zM346 502q0 -236 164 -397.5t399 -161.5q229 0 391 163.5t162 395t-163.5 395.5t-395 164t-394.5 -164t-163 -395zM594 500q0 154 82 262t231 108 q123 0 209 -79l-55 -70q-61 51 -154 51q-104 0 -150 -77t-46 -189q0 -117 50 -196t161 -79q76 0 172 70l43 -68q-41 -39 -104.5 -68.5t-115.5 -29.5q-152 0 -237.5 104.5t-85.5 260.5z" /> +<glyph unicode="ª" horiz-adv-x="860" d="M96 768q0 131 101.5 198.5t238.5 67.5q90 0 175 -35.5t134 -103.5l-81 -82q-100 100 -232 100q-72 0 -127 -34.5t-55 -102.5q0 -37 25.5 -68.5t49.5 -44.5l66 -36l189 -92q184 -90 184 -275q0 -143 -103.5 -217t-250.5 -74q-160 0 -293 119l57 111q141 -109 244 -109 q82 0 139 38t57 116q0 94 -127 157l-213 107q-178 90 -178 260zM117 1409l65 92q119 -63 248 -205q166 158 252 203l66 -92q-203 -145 -316 -299q-137 178 -315 301z" /> +<glyph unicode="«" horiz-adv-x="1024" d="M68 512l378 385l97 -78l-305 -307l309 -307l-96 -78zM432 512l379 385l96 -78l-305 -307l309 -307l-96 -78z" /> +<glyph unicode="¬" horiz-adv-x="1095" d="M94 760v123h826v-523l-121 -22v422h-705z" /> +<glyph unicode="­" horiz-adv-x="618" d="M111 461v123h391v-123h-391z" /> +<glyph unicode="®" horiz-adv-x="1800" d="M242 500q0 274 191.5 465.5t466 191.5t465.5 -191.5t191 -466t-192.5 -467t-464.5 -192.5t-464.5 194t-192.5 466zM342 500q0 -238 163 -398.5t400 -160.5q231 0 391 163.5t160 395t-164 395.5t-393 164q-231 0 -394 -164t-163 -395zM688 145v727h176q125 0 212 -59 t87 -178q0 -84 -57 -159t-139 -83l225 -217v-31h-109l-245 248q-23 6 -45 19v-267h-105zM793 498q57 -27 94 -27q76 0 122 45t46 123t-54.5 113.5t-136.5 35.5h-71v-290z" /> +<glyph unicode="¯" horiz-adv-x="686" d="M61 1174v120h562v-120h-562z" /> +<glyph unicode="°" horiz-adv-x="720" d="M68 1038.5q0 116.5 84 200.5t200.5 84t200.5 -84t84 -200.5t-84 -200.5t-200.5 -84t-200.5 84t-84 200.5zM160 1038q0 -80 56 -136t136 -56t136.5 56t56.5 136t-56.5 136.5t-136.5 56.5t-136 -56.5t-56 -136.5z" /> +<glyph unicode="±" horiz-adv-x="915" d="M92 451v122h330v355h119v-355h331v-122h-331v-256h-119v256h-330zM113 -2v123h739v-123h-739z" /> +<glyph unicode="²" d="M127 127q156 84 325 279.5t169 343.5q0 74 -52.5 113.5t-128.5 39.5q-133 0 -284 -117l-29 119q92 72 161.5 100.5t176.5 28.5q143 0 228 -70.5t85 -211.5q0 -188 -190 -404q-131 -147 -228 -213h455v-135h-659z" /> +<glyph unicode="³" d="M147 -225q68 0 146 20q358 82 358 365q0 193 -289 192q-59 0 -174 -12v119l91 12q133 72 258 172q90 70 90 152q0 51 -39 81.5t-92 30.5q-51 0 -142.5 -38t-156.5 -76l-37 108q207 133 370 133q109 0 179.5 -63.5t70.5 -171.5q0 -57 -24.5 -106.5t-73.5 -91.5t-86 -66.5 t-98 -59.5q129 0 218 -78t89 -204q0 -178 -95.5 -304.5t-238.5 -180.5q-138 -52 -303 -52h-12h-9v119z" /> +<glyph unicode="´" horiz-adv-x="692" d="M121 1241q201 145 315 299l127 -129q-139 -137 -377 -262z" /> +<glyph unicode="µ" horiz-adv-x="1062" d="M127 -360q59 137 59 229q0 61 -11 186t-11 187v762h155v-762q0 -76 21.5 -111t93.5 -35q70 0 162 36t143 81v791h156v-850q0 -80 43 -82l-51 -103q-55 0 -95 32t-49 85q-63 -51 -152 -84t-171 -33q-31 0 -88 31q39 -117 39 -180q0 -76 -39 -144z" /> +<glyph unicode="¶" horiz-adv-x="1112" d="M55 928q0 172 105.5 282.5t275.5 110.5q53 0 113.5 -5t133.5 -13l112 -13l-2 88h114q0 -59 -2 -88l113 19l-6 -105l-107 -24q0 -348 -69.5 -741.5t-200.5 -659.5l-131 41q141 256 212.5 635t71.5 725q-256 27 -292 26q-86 0 -122 -72.5t-36 -166.5q0 -51 7 -99.5 t25.5 -98.5t56.5 -81t93 -31q88 0 166 62q-102 -203 -293 -203q-164 0 -251 121t-87 291z" /> +<glyph unicode="·" horiz-adv-x="528" d="M147 494q0 51 40 87.5t92 36.5q49 0 83.5 -32.5t34.5 -81.5t-40 -87t-91 -38q-49 0 -84 33t-35 82z" /> +<glyph unicode="¸" horiz-adv-x="823" d="M389 -2h213q76 -55 76 -127q0 -68 -67.5 -131.5t-143.5 -95.5l-78 63q166 90 166 154q0 27 -18.5 43t-47.5 16q-27 0 -100 -18v96z" /> +<glyph unicode="¹" d="M203 858v98q88 0 194 29l74 19h141v-1004h-151v858h-258z" /> +<glyph unicode="º" horiz-adv-x="843" d="M100 492q0 129 39 247.5t134.5 206.5t228.5 88q156 0 262 -102l-70 -92q-86 72 -190 71q-86 0 -145.5 -71.5t-81 -157.5t-21.5 -170q0 -90 21.5 -180t84 -165t154.5 -75q86 0 225 90l52 -96q-57 -49 -137.5 -83t-151.5 -34q-197 0 -300.5 158t-103.5 365zM256 1241 q201 145 315 299l127 -129q-139 -137 -376 -262z" /> +<glyph unicode="»" horiz-adv-x="1024" d="M131 205l96 -78l383 385l-379 385l-96 -78l305 -307zM496 205l96 -78l383 385l-379 385l-96 -78l305 -307z" /> +<glyph unicode="¼" horiz-adv-x="2537" d="M203 858v98q88 0 194 29l74 19h141v-1004h-151v858h-258zM772 -268l881 1794h129l-881 -1794h-129zM1679 133q139 387 502 871h168v-871h131v-133h-135v-283h-145v283h-512zM1831 133h369v680q-242 -354 -369 -680z" /> +<glyph unicode="½" horiz-adv-x="2537" d="M203 858v98q88 0 194 29l74 19h141v-1004h-151v858h-258zM772 -268l881 1794h129l-881 -1794h-129zM1743 127q156 84 324.5 279.5t168.5 343.5q0 74 -52 113.5t-128 39.5q-133 0 -284 -117l-29 119q92 72 161.5 100.5t176.5 28.5q143 0 228 -70.5t85 -211.5 q0 -188 -190 -404q-131 -147 -228 -213h455v-135h-659z" /> +<glyph unicode="¾" horiz-adv-x="2537" d="M147 -225q68 0 146 20q358 82 358 365q0 193 -289 192q-59 0 -174 -12v119l91 12q133 72 258 172q90 70 90 152q0 51 -39 81.5t-92 30.5q-51 0 -142.5 -38t-156.5 -76l-37 108q207 133 370 133q109 0 179.5 -63.5t70.5 -171.5q0 -57 -24.5 -106.5t-73.5 -91.5t-86 -66.5 t-98 -59.5q129 0 218 -78t89 -204q0 -178 -95.5 -304.5t-238.5 -180.5q-138 -52 -303 -52h-12h-9v119zM772 -268l881 1794h129l-881 -1794h-129zM1679 133q139 387 502 871h168v-871h131v-133h-135v-283h-145v283h-512zM1831 133h369v680q-242 -354 -369 -680z" /> +<glyph unicode="¿" horiz-adv-x="733" d="M86 -164q0 94 100 230l164 215q47 61 63.5 121.5t16.5 164.5v99h125v-99q0 -86 -2 -127t-20.5 -103.5t-55.5 -111.5l-168 -225q-70 -92 -69 -160q0 -59 30.5 -94t87.5 -35q88 0 172 19v-117q-111 -27 -184 -27q-121 0 -190.5 63.5t-69.5 186.5zM369 909q0 51 40 88t91 37 q49 0 83.5 -32.5t34.5 -82t-39.5 -87t-91.5 -37.5q-49 0 -83.5 32.5t-34.5 81.5z" /> +<glyph unicode="À" horiz-adv-x="1044" d="M25 0l409 1290h176l410 -1290h-168l-137 416h-385l-137 -416h-168zM307 1677l127 129q106 -147 316 -299l-66 -92q-240 127 -377 262zM369 551h307l-154 569z" /> +<glyph unicode="Á" horiz-adv-x="1044" d="M25 0l409 1290h176l410 -1290h-168l-137 416h-385l-137 -416h-168zM307 1507q201 145 316 299l127 -129q-139 -137 -377 -262zM369 551h307l-154 569z" /> +<glyph unicode="Â" horiz-adv-x="1044" d="M25 0l409 1290h176l410 -1290h-168l-137 416h-385l-137 -416h-168zM203 1505q164 113 313 301q127 -164 313 -299l-65 -94q-117 61 -248 205q-133 -145 -248 -205zM369 551h307l-154 569z" /> +<glyph unicode="Ã" horiz-adv-x="1044" d="M25 0l409 1290h176l410 -1290h-168l-137 416h-385l-137 -416h-168zM139 1581q152 119 246 119q59 0 146 -45t135 -45q53 0 83.5 13t88.5 52l63 -78q-74 -68 -125 -91t-125 -23q-41 0 -128 45t-144 45q-18 0 -35.5 -4t-40.5 -16l-33 -16q-10 -5 -38.5 -23.5t-32.5 -20.5z M369 551h307l-154 569z" /> +<glyph unicode="Ä" horiz-adv-x="1044" d="M25 0l409 1290h176l410 -1290h-168l-137 416h-385l-137 -416h-168zM258 1542q0 45 36 83t81 38q35 0 59.5 -23.5t24.5 -58.5q0 -45 -39 -80t-84 -35q-33 0 -55.5 21.5t-22.5 54.5zM369 551h307l-154 569zM573 1542q0 45 36 83t81 38q35 0 59.5 -23.5t24.5 -58.5 q0 -45 -39 -80t-84 -35q-33 0 -55.5 21.5t-22.5 54.5z" /> +<glyph unicode="Å" horiz-adv-x="1044" d="M25 0l409 1290h176l410 -1290h-168l-137 416h-385l-137 -416h-168zM309 1606q0 88 64.5 152.5t152.5 64.5t150.5 -63.5t62.5 -153.5t-64.5 -153.5t-152.5 -63.5t-150.5 63.5t-62.5 153.5zM369 551h307l-154 569zM401 1605.5q0 -49.5 37 -86t84 -36.5q49 0 86 36.5t37 86 t-35 86.5t-82 37q-51 0 -89 -37t-38 -86.5z" /> +<glyph unicode="Æ" horiz-adv-x="1486" d="M25 0l407 1290h191l98 -432v432h663v-137h-499v-410h383v-141h-383v-461h520v-141h-684v416h-389l-137 -416h-170zM371 551h305l-154 569z" /> +<glyph unicode="Ç" horiz-adv-x="1017" d="M113 645q0 119 29.5 233.5t87 216t157.5 164t227 62.5q199 0 332 -88l-59 -107q-127 68 -273 68q-82 0 -154.5 -62.5t-111.5 -144.5q-72 -145 -72 -350q0 -90 16.5 -176t52.5 -172t106.5 -138.5t166.5 -52.5q164 0 277 90l72 -104q-98 -80 -250 -107q53 -53 53 -106 q0 -68 -67.5 -131.5t-143.5 -95.5l-78 63q166 90 166 154q0 27 -18.5 43t-46.5 16q-27 0 -101 -18v82q-102 29 -177 98.5t-114.5 164.5t-58 194.5t-18.5 203.5z" /> +<glyph unicode="È" horiz-adv-x="929" d="M164 0v1290h663v-137h-499v-410h383v-141h-383v-461h520v-141h-684zM285 1677l127 129q113 -152 315 -299l-65 -92q-234 123 -377 262z" /> +<glyph unicode="É" horiz-adv-x="929" d="M164 0v1290h663v-137h-499v-410h383v-141h-383v-461h520v-141h-684zM289 1507q201 145 315 299l127 -129q-139 -137 -377 -262z" /> +<glyph unicode="Ê" horiz-adv-x="929" d="M164 0v1290h663v-137h-499v-410h383v-141h-383v-461h520v-141h-684zM184 1505q164 113 314 301q131 -170 313 -299l-66 -94q-117 61 -247 205q-141 -150 -248 -205z" /> +<glyph unicode="Ë" horiz-adv-x="929" d="M164 0v1290h663v-137h-499v-410h383v-141h-383v-461h520v-141h-684zM240 1542q0 45 34.5 83t81.5 38q35 0 58.5 -23.5t23.5 -58.5q0 -45 -38 -80t-83 -35q-33 0 -55 21.5t-22 54.5zM555 1542q0 45 35 83t82 38q35 0 58.5 -23.5t23.5 -58.5q0 -45 -38 -80t-83 -35 q-33 0 -55.5 21.5t-22.5 54.5z" /> +<glyph unicode="Ì" horiz-adv-x="487" d="M25 1677l127 129q111 -154 315 -299l-66 -92q-235 123 -376 262zM164 0v1290h160v-1290h-160z" /> +<glyph unicode="Í" horiz-adv-x="487" d="M23 1507q201 145 315 299l127 -129q-139 -137 -377 -262zM164 0v1290h160v-1290h-160z" /> +<glyph unicode="Î" horiz-adv-x="487" d="M-70 1505q164 113 314 301q127 -164 313 -299l-65 -94q-117 61 -248 205q-133 -145 -248 -205zM164 0v1290h160v-1290h-160z" /> +<glyph unicode="Ï" horiz-adv-x="487" d="M-14 1542q0 45 35.5 83t80.5 38q35 0 59.5 -23.5t24.5 -58.5q0 -45 -38.5 -80t-84.5 -35q-33 0 -55 21.5t-22 54.5zM164 0v1290h160v-1290h-160zM301 1542q0 45 36 83t81 38q35 0 59.5 -23.5t24.5 -58.5q0 -45 -39 -80t-84 -35q-33 0 -55.5 21.5t-22.5 54.5z" /> +<glyph unicode="Ñ" horiz-adv-x="1134" d="M164 0v1290h217l436 -987q-10 98 -10 180v807h164v-1290h-168l-486 1053q10 -96 11 -176v-877h-164zM195 1581q152 119 245 119q59 0 146.5 -45t134.5 -45q53 0 84 13t88 52l63 -78q-74 -68 -125 -91t-124 -23q-41 0 -128 45t-145 45q-18 0 -35.5 -4t-40.5 -16l-32 -16 q-10 -5 -39 -23.5t-33 -20.5z" /> +<glyph unicode="Ò" horiz-adv-x="1122" d="M113 645.5q0 110.5 23.5 222t73.5 217t141 171t210 65.5t210 -65.5t141.5 -171t74 -217t23.5 -222t-23.5 -222.5t-74 -217.5t-141.5 -171t-210 -65.5t-210 65.5t-141 171t-73.5 217.5t-23.5 222.5zM276 645q0 -72 14.5 -155.5t44.5 -175t89 -151t137 -59.5t137.5 59.5 t89 151t44 175t14.5 155.5t-14.5 156t-44 175t-89 150.5t-137.5 59.5t-137 -59.5t-89 -150.5t-44.5 -175t-14.5 -156zM336 1677l127 129q106 -147 315 -299l-65 -92q-240 127 -377 262z" /> +<glyph unicode="Ó" horiz-adv-x="1122" d="M113 645.5q0 110.5 23.5 222t73.5 217t141 171t210 65.5t210 -65.5t141.5 -171t74 -217t23.5 -222t-23.5 -222.5t-74 -217.5t-141.5 -171t-210 -65.5t-210 65.5t-141 171t-73.5 217.5t-23.5 222.5zM276 645q0 -72 14.5 -155.5t44.5 -175t89 -151t137 -59.5t137.5 59.5 t89 151t44 175t14.5 155.5t-14.5 156t-44 175t-89 150.5t-137.5 59.5t-137 -59.5t-89 -150.5t-44.5 -175t-14.5 -156zM342 1507q201 145 315 299l127 -129q-139 -137 -376 -262z" /> +<glyph unicode="Ô" horiz-adv-x="1122" d="M113 645.5q0 110.5 23.5 222t73.5 217t141 171t210 65.5t210 -65.5t141.5 -171t74 -217t23.5 -222t-23.5 -222.5t-74 -217.5t-141.5 -171t-210 -65.5t-210 65.5t-141 171t-73.5 217.5t-23.5 222.5zM246 1511q160 109 313 301q127 -164 313 -299l-65 -94q-113 57 -248 205 q-129 -145 -248 -205zM276 645q0 -72 14.5 -155.5t44.5 -175t89 -151t137 -59.5t137.5 59.5t89 151t44 175t14.5 155.5t-14.5 156t-44 175t-89 150.5t-137.5 59.5t-137 -59.5t-89 -150.5t-44.5 -175t-14.5 -156z" /> +<glyph unicode="Õ" horiz-adv-x="1122" d="M113 645.5q0 110.5 23.5 222t73.5 217t141 171t210 65.5t210 -65.5t141.5 -171t74 -217t23.5 -222t-23.5 -222.5t-74 -217.5t-141.5 -171t-210 -65.5t-210 65.5t-141 171t-73.5 217.5t-23.5 222.5zM176 1581q152 119 246 119q59 0 146 -45t134 -45q53 0 84 13t88 52 l64 -78q-74 -68 -125 -91t-125 -23q-41 0 -128 45t-144 45q-18 0 -36 -4t-40 -16l-33 -16q-10 -5 -38.5 -23.5t-32.5 -20.5zM276 645q0 -72 14.5 -155.5t44.5 -175t89 -151t137 -59.5t137.5 59.5t89 151t44 175t14.5 155.5t-14.5 156t-44 175t-89 150.5t-137.5 59.5 t-137 -59.5t-89 -150.5t-44.5 -175t-14.5 -156z" /> +<glyph unicode="Ö" horiz-adv-x="1122" d="M113 645.5q0 110.5 23.5 222t73.5 217t141 171t210 65.5t210 -65.5t141.5 -171t74 -217t23.5 -222t-23.5 -222.5t-74 -217.5t-141.5 -171t-210 -65.5t-210 65.5t-141 171t-73.5 217.5t-23.5 222.5zM276 645q0 -72 14.5 -155.5t44.5 -175t89 -151t137 -59.5t137.5 59.5 t89 151t44 175t14.5 155.5t-14.5 156t-44 175t-89 150.5t-137.5 59.5t-137 -59.5t-89 -150.5t-44.5 -175t-14.5 -156zM299 1542q0 45 36 83t81 38q35 0 59.5 -23.5t24.5 -58.5q0 -45 -39 -80t-84 -35q-33 0 -55.5 21.5t-22.5 54.5zM614 1542q0 45 36 83t81 38 q35 0 59.5 -23.5t24.5 -58.5q0 -45 -39 -80t-84 -35q-33 0 -55.5 21.5t-22.5 54.5z" /> +<glyph unicode="Ø" horiz-adv-x="1122" d="M113 653q0 111 24.5 221.5t73.5 214t140 168t210 64.5q78 0 139 -27l70 240h102l-84 -293q115 -92 168.5 -257t53.5 -339q0 -111 -23.5 -222.5t-73 -217t-140.5 -171t-212 -65.5q-63 0 -131 23l-80 -279h-102l94 330q-119 92 -174 262t-55 348zM276 633q0 -307 109 -443 l279 971q-45 25 -103 25q-88 0 -149.5 -57.5t-88 -152.5t-37 -176t-10.5 -167zM467 123q45 -18 94 -19q90 0 150.5 55.5t87 147.5t37 172t10.5 166q0 297 -103 442z" /> +<glyph unicode="Ù" horiz-adv-x="1142" d="M162 502v788h164v-790q0 -395 245.5 -395.5t245.5 397.5v788h164v-796q0 -225 -98.5 -375t-311.5 -150t-311 152t-98 381zM354 1677l127 129q106 -147 316 -299l-66 -92q-240 127 -377 262z" /> +<glyph unicode="Ú" horiz-adv-x="1142" d="M162 502v788h164v-790q0 -395 245.5 -395.5t245.5 397.5v788h164v-796q0 -225 -98.5 -375t-311.5 -150t-311 152t-98 381zM358 1507q201 145 316 299l127 -129q-139 -137 -377 -262z" /> +<glyph unicode="Û" horiz-adv-x="1142" d="M162 502v788h164v-790q0 -395 245.5 -395.5t245.5 397.5v788h164v-796q0 -225 -98.5 -375t-311.5 -150t-311 152t-98 381zM254 1505q164 113 313 301q127 -164 314 -299l-66 -94q-117 61 -248 205q-133 -145 -248 -205z" /> +<glyph unicode="Ü" horiz-adv-x="1126" d="M162 502v788h164v-790q0 -395 245.5 -395.5t245.5 397.5v788h164v-796q0 -225 -98.5 -375t-311.5 -150t-311 152t-98 381zM311 1542q0 45 36 83t81 38q35 0 59.5 -23.5t24.5 -58.5q0 -45 -39 -80t-84 -35q-33 0 -55.5 21.5t-22.5 54.5zM627 1542q0 45 35.5 83t80.5 38 q35 0 59.5 -23.5t24.5 -58.5q0 -45 -38.5 -80t-83.5 -35q-33 0 -55.5 21.5t-22.5 54.5z" /> +<glyph unicode="Ý" horiz-adv-x="964" d="M27 1290h174l286 -643l289 643h164l-377 -817v-473h-162v473zM418 1536q201 145 315 299l127 -129q-139 -137 -377 -262z" /> +<glyph unicode="ß" horiz-adv-x="1171" d="M47 903v101h135v155q0 133 110.5 211t250.5 78q156 0 260 -92t104 -246q0 -53 -41 -209q-35 18 -90 19q-80 0 -131 -42t-51 -120q0 -49 53 -90t129 -75t152 -74t129 -107.5t53 -157.5q0 -141 -103.5 -213t-250.5 -72q-188 0 -357 103l58 112q147 -92 307 -92 q84 0 140.5 45t56.5 125q0 59 -53.5 106.5t-130.5 81.5l-153 70q-77 37 -130.5 95.5t-53.5 136.5q0 137 90.5 210.5t231.5 73.5q14 53 14 94q0 94 -62.5 145.5t-156.5 51.5q-88 0 -153.5 -54t-65.5 -140v-1133h-156v885z" /> +<glyph unicode="à" horiz-adv-x="954" d="M86 246q0 72 59 182l482 205v129q0 72 -43 108.5t-115 36.5q-70 0 -146.5 -44t-129.5 -103l-58 96q61 78 157.5 128t190.5 50q137 0 218 -68.5t81 -203.5v-625q0 -61 66 -61q25 0 41 12l39 -78q-59 -37 -119 -37q-82 0 -131 49.5t-49 131.5q-25 -86 -106 -135.5 t-175 -49.5q-123 0 -192.5 76t-69.5 201zM240 252q0 -68 36.5 -114t102.5 -46q109 0 178.5 109.5t69.5 224.5v84l-361 -152q-26 -57 -26 -106zM244 1411l127 129q106 -147 315 -299l-65 -92q-240 127 -377 262z" /> +<glyph unicode="á" horiz-adv-x="954" d="M86 246q0 72 59 182l482 205v129q0 72 -43 108.5t-115 36.5q-70 0 -146.5 -44t-129.5 -103l-58 96q61 78 157.5 128t190.5 50q137 0 218 -68.5t81 -203.5v-625q0 -61 66 -61q25 0 41 12l39 -78q-59 -37 -119 -37q-82 0 -131 49.5t-49 131.5q-25 -86 -106 -135.5 t-175 -49.5q-123 0 -192.5 76t-69.5 201zM240 252q0 -68 36.5 -114t102.5 -46q109 0 178.5 109.5t69.5 224.5v84l-361 -152q-26 -57 -26 -106zM258 1241q201 145 315 299l127 -129q-139 -137 -376 -262z" /> +<glyph unicode="â" horiz-adv-x="954" d="M86 246q0 72 59 182l482 205v129q0 72 -43 108.5t-115 36.5q-70 0 -146.5 -44t-129.5 -103l-58 96q61 78 157.5 128t190.5 50q137 0 218 -68.5t81 -203.5v-625q0 -61 66 -61q25 0 41 12l39 -78q-59 -37 -119 -37q-82 0 -131 49.5t-49 131.5q-25 -86 -106 -135.5 t-175 -49.5q-123 0 -192.5 76t-69.5 201zM147 1239q164 113 314 301q127 -164 313 -299l-65 -94q-117 61 -248 205q-133 -145 -248 -205zM240 252q0 -68 36.5 -114t102.5 -46q109 0 178.5 109.5t69.5 224.5v84l-361 -152q-26 -57 -26 -106z" /> +<glyph unicode="ã" horiz-adv-x="954" d="M86 246q0 72 59 182l482 205v129q0 72 -43 108.5t-115 36.5q-70 0 -146.5 -44t-129.5 -103l-58 96q61 78 157.5 128t190.5 50q137 0 218 -68.5t81 -203.5v-625q0 -61 66 -61q25 0 41 12l39 -78q-59 -37 -119 -37q-82 0 -131 49.5t-49 131.5q-25 -86 -106 -135.5 t-175 -49.5q-123 0 -192.5 76t-69.5 201zM86 1315q152 119 246 119q59 0 146 -45.5t134 -45.5q53 0 84 13.5t88 52.5l64 -78q-74 -68 -125 -91t-125 -23q-41 0 -128 45t-144 45q-18 0 -36 -4.5t-40 -15.5l-33 -16q-10 -5 -38.5 -23.5t-33.5 -20.5zM240 252q0 -68 36.5 -114 t102.5 -46q109 0 178.5 109.5t69.5 224.5v84l-361 -152q-26 -57 -26 -106z" /> +<glyph unicode="ä" horiz-adv-x="954" d="M86 246q0 72 59 182l482 205v129q0 72 -43 108.5t-115 36.5q-70 0 -146.5 -44t-129.5 -103l-58 96q61 78 157.5 128t190.5 50q137 0 218 -68.5t81 -203.5v-625q0 -61 66 -61q25 0 41 12l39 -78q-59 -37 -119 -37q-82 0 -131 49.5t-49 131.5q-25 -86 -106 -135.5 t-175 -49.5q-123 0 -192.5 76t-69.5 201zM203 1276q0 45 35.5 83t80.5 38q35 0 59.5 -23.5t24.5 -58.5q0 -45 -38.5 -80t-83.5 -35q-33 0 -55.5 21.5t-22.5 54.5zM240 252q0 -68 36.5 -114t102.5 -46q109 0 178.5 109.5t69.5 224.5v84l-361 -152q-26 -57 -26 -106zM518 1276 q0 45 36 83t81 38q35 0 59.5 -23.5t24.5 -58.5q0 -45 -39 -80t-84 -35q-33 0 -55.5 21.5t-22.5 54.5z" /> +<glyph unicode="å" horiz-adv-x="954" d="M86 246q0 72 59 182l482 205v129q0 72 -43 108.5t-115 36.5q-70 0 -146.5 -44t-129.5 -103l-58 96q61 78 157.5 128t190.5 50q137 0 218 -68.5t81 -203.5v-625q0 -61 66 -61q25 0 41 12l39 -78q-59 -37 -119 -37q-82 0 -131 49.5t-49 131.5q-25 -86 -106 -135.5 t-175 -49.5q-123 0 -192.5 76t-69.5 201zM240 252q0 -68 36.5 -114t102.5 -46q109 0 178.5 109.5t69.5 224.5v84l-361 -152q-26 -57 -26 -106zM244 1350q0 88 64.5 152.5t152.5 64.5t150.5 -64.5t62.5 -152.5t-64.5 -152.5t-152.5 -64.5t-150.5 64.5t-62.5 152.5zM336 1350 q0 -49 36 -86t85 -37t86 36.5t37 86t-34 86.5t-83 37q-51 0 -89 -36t-38 -87z" /> +<glyph unicode="æ" horiz-adv-x="1484" d="M86 252q0 111 59 180q33 37 482 201v129q0 72 -43 108.5t-115 36.5t-147.5 -43t-128.5 -104l-58 96q61 78 157.5 128t190.5 50q197 0 269 -137q121 137 295 137q145 0 243.5 -114.5t104.5 -264.5l4 -104h-619v-39q0 -63 12.5 -131t40 -135.5t80 -110.5t121.5 -43 q156 0 254 60l47 -101q-133 -82 -327 -82q-102 0 -190.5 61.5t-133.5 155.5l-170 -145q-84 -72 -174 -72q-125 0 -189.5 77t-64.5 206zM240 247.5q0 -59.5 33.5 -104.5t91.5 -45q72 0 145 62l141 119q-27 88 -30 229q-319 -115 -345 -150q-36 -51 -36 -110.5zM799 668h436 q0 94 -56.5 170.5t-146.5 76.5t-151.5 -74.5t-81.5 -172.5z" /> +<glyph unicode="ç" horiz-adv-x="843" d="M100 492q0 238 101 372q55 74 135 122t166 48q68 0 141.5 -27.5t120.5 -74.5l-70 -92q-84 70 -190 69q-84 0 -142.5 -68.5t-82.5 -158.5q-23 -76 -23 -170q0 -86 21.5 -176t81 -167t147.5 -77q96 0 235 90l52 -96q-72 -66 -179 -98q63 -59 64 -117q0 -68 -67.5 -131.5 t-143.5 -95.5l-78 63q166 90 166 154q0 27 -18.5 43t-47.5 16q-27 0 -100 -18v84q-147 51 -218 192.5t-71 313.5z" /> +<glyph unicode="è" horiz-adv-x="964" d="M100 528q0 197 118 351.5t308 154.5q145 0 241.5 -114.5t106.5 -264.5q2 -16 2.5 -51t2.5 -53h-619v-39q0 -84 20.5 -174t79 -168t144.5 -78q100 0 284 127l50 -98q-72 -61 -170.5 -106.5t-180.5 -45.5q-104 0 -183 52.5t-121 138.5t-62.5 179t-20.5 189zM279 668h436 q0 94 -55.5 168.5t-147.5 74.5q-90 0 -151.5 -73.5t-81.5 -169.5zM293 1411l127 129q106 -147 315 -299l-65 -92q-240 127 -377 262z" /> +<glyph unicode="é" horiz-adv-x="964" d="M100 528q0 197 118 351.5t308 154.5q145 0 241.5 -114.5t106.5 -264.5q2 -16 2.5 -51t2.5 -53h-619v-39q0 -84 20.5 -174t79 -168t144.5 -78q100 0 284 127l50 -98q-72 -61 -170.5 -106.5t-180.5 -45.5q-104 0 -183 52.5t-121 138.5t-62.5 179t-20.5 189zM279 668h436 q0 94 -55.5 168.5t-147.5 74.5q-90 0 -151.5 -73.5t-81.5 -169.5zM313 1241q201 145 316 299l127 -129q-139 -137 -377 -262z" /> +<glyph unicode="ê" horiz-adv-x="964" d="M100 528q0 197 118 351.5t308 154.5q145 0 241.5 -114.5t106.5 -264.5q2 -16 2.5 -51t2.5 -53h-619v-39q0 -84 20.5 -174t79 -168t144.5 -78q100 0 284 127l50 -98q-72 -61 -170.5 -106.5t-180.5 -45.5q-104 0 -183 52.5t-121 138.5t-62.5 179t-20.5 189zM199 1239 q164 113 313 301q127 -164 313 -299l-65 -94q-117 61 -248 205q-133 -145 -248 -205zM279 668h436q0 94 -55.5 168.5t-147.5 74.5q-90 0 -151.5 -73.5t-81.5 -169.5z" /> +<glyph unicode="ë" horiz-adv-x="964" d="M100 528q0 197 118 351.5t308 154.5q145 0 241.5 -114.5t106.5 -264.5q2 -16 2.5 -51t2.5 -53h-619v-39q0 -84 20.5 -174t79 -168t144.5 -78q100 0 284 127l50 -98q-72 -61 -170.5 -106.5t-180.5 -45.5q-104 0 -183 52.5t-121 138.5t-62.5 179t-20.5 189zM270 1276 q0 45 36 83t81 38q35 0 59.5 -23.5t24.5 -58.5q0 -45 -39 -80t-84 -35q-33 0 -55.5 21.5t-22.5 54.5zM279 668h436q0 94 -55.5 168.5t-147.5 74.5q-90 0 -151.5 -73.5t-81.5 -169.5zM586 1276q0 45 35.5 83t80.5 38q35 0 59.5 -23.5t24.5 -58.5q0 -45 -38.5 -80t-83.5 -35 q-33 0 -55.5 21.5t-22.5 54.5z" /> +<glyph unicode="ì" horiz-adv-x="487" d="M23 1411l127 129q106 -147 315 -299l-66 -92q-239 127 -376 262zM168 0v1004h151v-1004h-151z" /> +<glyph unicode="í" horiz-adv-x="487" d="M41 1241q201 145 315 299l127 -129q-139 -137 -377 -262zM168 0v1004h151v-1004h-151z" /> +<glyph unicode="î" horiz-adv-x="487" d="M-76 1239q164 113 314 301q127 -164 313 -299l-66 -94q-117 61 -247 205q-133 -145 -248 -205zM168 0v1004h151v-1004h-151z" /> +<glyph unicode="ï" horiz-adv-x="487" d="M-16 1276q0 45 34.5 83t81.5 38q33 0 58.5 -24.5t25.5 -57.5q0 -45 -38.5 -80t-84.5 -35q-33 0 -55 21.5t-22 54.5zM168 0v1004h151v-1004h-151zM299 1276q0 45 35 83t82 38q33 0 58.5 -24.5t25.5 -57.5q0 -45 -39 -80t-84 -35q-33 0 -55.5 21.5t-22.5 54.5z" /> +<glyph unicode="ñ" horiz-adv-x="1062" d="M166 1315q152 119 246 119q59 0 146 -45.5t134 -45.5q53 0 84 13.5t88 52.5l64 -78q-74 -68 -125 -91t-125 -23q-41 0 -128 45t-145 45q-18 0 -35.5 -4.5t-39.5 -15.5l-33 -16q-10 -5 -39 -23.5t-33 -20.5zM168 0v1004h156v-74q55 39 151 71.5t174 32.5 q147 0 198.5 -69.5t51.5 -202.5v-762h-156v762q0 76 -24.5 110.5t-95.5 34.5q-78 0 -168 -34.5t-131 -69.5v-803h-156z" /> +<glyph unicode="ò" horiz-adv-x="999" d="M100 500q0 127 40 243.5t134.5 203.5t225.5 87t225 -87t134 -203.5t40 -243.5q0 -125 -41 -243t-135 -203t-223 -85t-223.5 85t-135.5 203t-41 243zM256 500q0 -139 64.5 -273.5t179 -134.5t179 134t64.5 274q0 84 -23.5 175t-81.5 163.5t-138 72.5t-138.5 -72.5 t-82 -163.5t-23.5 -175zM281 1411l127 129q106 -147 315 -299l-66 -92q-239 127 -376 262z" /> +<glyph unicode="ó" horiz-adv-x="999" d="M100 500q0 127 40 243.5t134.5 203.5t225.5 87t225 -87t134 -203.5t40 -243.5q0 -125 -41 -243t-135 -203t-223 -85t-223.5 85t-135.5 203t-41 243zM256 500q0 -139 64.5 -273.5t179 -134.5t179 134t64.5 274q0 84 -23.5 175t-81.5 163.5t-138 72.5t-138.5 -72.5 t-82 -163.5t-23.5 -175zM293 1241q201 145 315 299l127 -129q-139 -137 -377 -262z" /> +<glyph unicode="ô" horiz-adv-x="999" d="M100 500q0 127 40 243.5t134.5 203.5t225.5 87t225 -87t134 -203.5t40 -243.5q0 -125 -41 -243t-135 -203t-223 -85t-223.5 85t-135.5 203t-41 243zM193 1239q164 113 313 301q127 -164 313 -299l-65 -94q-117 61 -248 205q-133 -145 -248 -205zM256 500 q0 -139 64.5 -273.5t179 -134.5t179 134t64.5 274q0 84 -23.5 175t-81.5 163.5t-138 72.5t-138.5 -72.5t-82 -163.5t-23.5 -175z" /> +<glyph unicode="õ" horiz-adv-x="999" d="M100 500q0 127 40 243.5t134.5 203.5t225.5 87t225 -87t134 -203.5t40 -243.5q0 -125 -41 -243t-135 -203t-223 -85t-223.5 85t-135.5 203t-41 243zM117 1315q152 119 245 119q59 0 146.5 -45.5t134.5 -45.5q53 0 84 13.5t88 52.5l64 -78q-74 -68 -125.5 -91t-124.5 -23 q-41 0 -128 45t-145 45q-18 0 -35.5 -4.5t-39.5 -15.5l-33 -16q-10 -5 -39 -23.5t-33 -20.5zM256 500q0 -139 64.5 -273.5t179 -134.5t179 134t64.5 274q0 84 -23.5 175t-81.5 163.5t-138 72.5t-138.5 -72.5t-82 -163.5t-23.5 -175z" /> +<glyph unicode="ö" horiz-adv-x="999" d="M100 500q0 127 40 243.5t134.5 203.5t225.5 87t225 -87t134 -203.5t40 -243.5q0 -125 -41 -243t-135 -203t-223 -85t-223.5 85t-135.5 203t-41 243zM250 1276q0 45 36 83t81 38q35 0 59.5 -23.5t24.5 -58.5q0 -45 -39 -80t-84 -35q-33 0 -55.5 21.5t-22.5 54.5zM256 500 q0 -139 64.5 -273.5t179 -134.5t179 134t64.5 274q0 84 -23.5 175t-81.5 163.5t-138 72.5t-138.5 -72.5t-82 -163.5t-23.5 -175zM565 1276q0 45 36 83t81 38q35 0 59.5 -23.5t24.5 -58.5q0 -45 -39 -80t-84 -35q-33 0 -55.5 21.5t-22.5 54.5z" /> +<glyph unicode="÷" horiz-adv-x="1001" d="M111 451v122h778v-122h-778zM381 209q0 51 40 88t91 37q49 0 84 -33t35 -82t-40 -87t-91 -38q-49 0 -84 33t-35 82zM381 817q0 51 40 88t91 37q49 0 84 -32.5t35 -82t-40 -87.5t-91 -38q-49 0 -84 33t-35 82z" /> +<glyph unicode="ø" horiz-adv-x="999" d="M100 500q0 92 25 183t72 171t125.5 130t177.5 50q49 0 94 -12l49 170h102l-61 -213q106 -72 160.5 -204t54.5 -275q0 -125 -41 -243t-135 -203t-223 -85q-55 0 -101 15l-59 -211h-102l71 254q-104 72 -156.5 202t-52.5 271zM256 500q0 -229 92 -338l213 741q-27 8 -61 8 q-72 0 -123 -41t-76 -108.5t-35 -131.5t-10 -130zM434 100q35 -10 66 -10q72 0 123 41t75.5 107.5t34.5 130t10 131.5q0 233 -96 346z" /> +<glyph unicode="ù" horiz-adv-x="1058" d="M164 242v762h155v-762q0 -76 21.5 -111t93.5 -35q68 0 161 36t144 81v791h156v-850q0 -78 43 -82l-51 -103q-55 0 -95 32t-49 85q-61 -53 -151 -85t-172 -32q-139 0 -197.5 67t-58.5 206zM313 1411l127 129q106 -147 316 -299l-66 -92q-240 127 -377 262z" /> +<glyph unicode="ú" horiz-adv-x="1058" d="M164 242v762h155v-762q0 -76 21.5 -111t93.5 -35q68 0 161 36t144 81v791h156v-850q0 -78 43 -82l-51 -103q-55 0 -95 32t-49 85q-61 -53 -151 -85t-172 -32q-139 0 -197.5 67t-58.5 206zM313 1241q201 145 316 299l127 -129q-139 -137 -377 -262z" /> +<glyph unicode="û" horiz-adv-x="1058" d="M164 242v762h155v-762q0 -76 21.5 -111t93.5 -35q68 0 161 36t144 81v791h156v-850q0 -78 43 -82l-51 -103q-55 0 -95 32t-49 85q-61 -53 -151 -85t-172 -32q-139 0 -197.5 67t-58.5 206zM207 1239q164 113 313 301q127 -164 314 -299l-66 -94q-117 61 -248 205 q-133 -145 -248 -205z" /> +<glyph unicode="ü" horiz-adv-x="1058" d="M164 242v762h155v-762q0 -76 21.5 -111t93.5 -35q68 0 161 36t144 81v791h156v-850q0 -78 43 -82l-51 -103q-55 0 -95 32t-49 85q-61 -53 -151 -85t-172 -32q-139 0 -197.5 67t-58.5 206zM270 1276q0 45 36 83t81 38q35 0 59.5 -23.5t24.5 -58.5q0 -45 -39 -80t-84 -35 q-33 0 -55.5 21.5t-22.5 54.5zM586 1276q0 45 35.5 83t80.5 38q35 0 59.5 -23.5t24.5 -58.5q0 -45 -38.5 -80t-83.5 -35q-33 0 -55.5 21.5t-22.5 54.5z" /> +<glyph unicode="ý" horiz-adv-x="929" d="M23 1004h163l234 -658q39 -115 55 -205q154 383 275 863h155q-250 -973 -493 -1256q-78 -90 -240 -129l-33 119q70 16 152 86q43 37 106 160zM399 1249q201 145 316 299l127 -129q-139 -137 -377 -262z" /> +<glyph unicode="ÿ" horiz-adv-x="929" d="M23 1004h163l234 -658q39 -115 55 -205q154 383 275 863h155q-250 -973 -493 -1256q-78 -90 -240 -129l-33 119q70 16 152 86q43 37 106 160zM217 1276q0 45 36 83t81 38q35 0 59.5 -23.5t24.5 -58.5q0 -45 -39 -80t-84 -35q-33 0 -55.5 21.5t-22.5 54.5zM532 1276 q0 45 36 83t81 38q35 0 59.5 -23.5t24.5 -58.5q0 -45 -39 -80t-84 -35q-33 0 -55.5 21.5t-22.5 54.5z" /> +<glyph unicode="Œ" horiz-adv-x="1306" d="M113 653q0 102 23.5 208t70.5 205t133 161.5t199 62.5h665v-137h-499v-410h382v-141h-382v-461h520v-141h-686q-115 0 -202 64.5t-133 167t-68.5 209t-22.5 212.5zM270 633q0 -80 10.5 -155t36 -160t84 -137t140.5 -52v1030q-84 0 -142.5 -55t-84 -145.5t-35 -167 t-9.5 -158.5z" /> +<glyph unicode="œ" horiz-adv-x="1558" d="M100 500q0 92 25 183t72 171t125.5 130t177.5 50q197 0 297 -172q123 172 323 172q145 0 242.5 -114.5t105.5 -264.5q2 -16 2 -51t3 -53h-619v-39q0 -63 12.5 -131t40 -135.5t79.5 -110.5t122 -43q154 0 254 60l47 -101q-133 -82 -328 -82q-86 0 -161.5 44t-126.5 116 q-113 -160 -293 -160q-129 0 -223.5 85t-135.5 203t-41 243zM256 500q0 -68 10 -131.5t35 -130t76 -107.5t123 -41q160 0 219 209q-25 100 -25 229q0 78 27 168q-61 215 -221 215q-72 0 -123 -41t-76 -108.5t-35 -131.5t-10 -130zM872 668h437q0 94 -55.5 170.5t-147.5 76.5 q-88 0 -151 -75.5t-83 -171.5z" /> +<glyph unicode="Ÿ" horiz-adv-x="964" d="M27 1290h174l286 -643l289 643h164l-377 -817v-473h-162v473zM244 1542q0 45 35.5 83t80.5 38q35 0 59.5 -23.5t24.5 -58.5q0 -45 -38.5 -80t-83.5 -35q-33 0 -55.5 21.5t-22.5 54.5zM559 1542q0 45 36 83t81 38q35 0 59.5 -23.5t24.5 -58.5q0 -45 -39 -80t-84 -35 q-33 0 -55.5 21.5t-22.5 54.5z" /> +<glyph unicode="ˆ" horiz-adv-x="823" d="M123 1239q164 113 313 301q127 -164 314 -299l-66 -94q-117 61 -248 205q-133 -145 -248 -205z" /> +<glyph unicode="˜" horiz-adv-x="778" d="M2 1315q152 119 246 119q59 0 146 -45.5t134 -45.5q53 0 84 13.5t88 52.5l64 -78q-74 -68 -125 -91t-125 -23q-41 0 -128 45t-144 45q-18 0 -36 -4.5t-40 -15.5l-33 -16q-10 -5 -38.5 -23.5t-33.5 -20.5z" /> +<glyph unicode="–" horiz-adv-x="733" d="M0 461v123h733v-123h-733z" /> +<glyph unicode="—" horiz-adv-x="1245" d="M0 463v123h1245v-123h-1245z" /> +<glyph unicode="‘" horiz-adv-x="546" d="M94 977q84 178 264 377l93 -64q-98 -141 -123 -239q-10 -41 -11 -84l5 -49q-57 -35 -97 -35q-27 0 -59.5 23.5t-50.5 47.5z" /> +<glyph unicode="’" horiz-adv-x="552" d="M98 915q98 141 123 240q10 41 10 84l-4 49q57 35 97 35q27 0 59.5 -23.5t50.5 -46.5l21 -24q-84 -178 -265 -377z" /> +<glyph unicode="‚" horiz-adv-x="528" d="M59 -223q98 141 123 239q10 41 11 84l-5 50q57 35 97 34q27 0 59.5 -23.5t52.5 -45.5l19 -25q-84 -178 -264 -377z" /> +<glyph unicode="“" horiz-adv-x="913" d="M96 977q84 178 264 377l93 -64q-98 -141 -123 -239q-10 -41 -11 -84l5 -49q-57 -35 -97 -35q-27 0 -59.5 23.5t-52.5 47.5zM459 977q84 178 264 377l92 -64q-98 -141 -123 -239q-10 -41 -10 -84l4 -49q-57 -35 -96 -35q-27 0 -59.5 23.5t-51.5 47.5z" /> +<glyph unicode="”" horiz-adv-x="913" d="M96 915q98 141 123 240q10 41 10 84l-4 49q57 35 97 35q27 0 59.5 -23.5t52.5 -46.5l19 -24q-84 -178 -265 -377zM459 915q98 141 123 240q10 41 10 84l-4 49q57 35 96 35q27 0 59.5 -23.5t51.5 -46.5l20 -24q-84 -178 -264 -377z" /> +<glyph unicode="„" horiz-adv-x="888" d="M59 -223q98 141 123 239q10 41 11 84l-5 50q57 35 97 34q27 0 59.5 -23.5t52.5 -45.5l19 -25q-84 -178 -264 -377zM422 -223q98 141 123 239q10 41 10 84l-4 50q57 35 96 34q27 0 59.5 -23.5t51.5 -45.5l20 -25q-84 -178 -264 -377z" /> +<glyph unicode="•" horiz-adv-x="868" d="M80 645.5q0 145.5 103.5 248.5t249 103t249.5 -103t104 -248.5t-104 -249t-249.5 -103.5t-249 103.5t-103.5 249z" /> +<glyph unicode="…" horiz-adv-x="1236" d="M143 84q0 51 40 88t91 37q49 0 84 -33t35 -82t-40 -87t-91 -38q-49 0 -84 33t-35 82zM496 84q0 51 39.5 88t91.5 37q49 0 83.5 -33t34.5 -82t-39.5 -87t-91.5 -38q-49 0 -83.5 33t-34.5 82zM844 84q0 51 40 88t91 37q49 0 84 -33t35 -82t-40 -87t-91 -38q-49 0 -84 33 t-35 82z" /> +<glyph unicode="‹" horiz-adv-x="614" d="M68 512l378 385l97 -78l-305 -307l309 -307l-96 -78z" /> +<glyph unicode="›" horiz-adv-x="614" d="M68 205l96 -78l383 385l-379 385l-96 -78l305 -307z" /> +<glyph unicode="™" horiz-adv-x="1642" d="M137 1331v90h498v-90h-199v-723h-100v723h-199zM731 608v813h137l240 -686l238 686h137v-813h-103v553l6 111l-233 -664h-90l-234 666q6 -68 7 -111v-555h-105z" /> +<glyph unicode="" horiz-adv-x="1004" d="M0 1005h1005v-1005h-1005v1005z" /> +<glyph unicode="fi" horiz-adv-x="1069" d="M47 903v101h135v112q0 168 115 249t291 81q43 0 96 -6t115.5 -21.5t104.5 -48.5t42 -78q0 -49 -35.5 -80.5t-87.5 -31.5q-43 0 -64.5 18.5t-28.5 43t-19.5 50t-51 44t-110.5 18.5q-106 0 -158.5 -78t-52.5 -191v-81h199v-119h-199v-885h-156v885zM760 0v1004h151v-1004 h-151z" /> +<glyph unicode="fl" horiz-adv-x="1069" d="M47 903v101h135v112q0 152 100.5 238t254 86t225.5 -78v57h151v-1016q0 -197 62 -403h-162q-51 137 -51 403v828q-72 111 -201 110q-63 0 -107 -20.5t-66.5 -47t-34 -78.5t-13.5 -88t-2 -103h199v-119h-199v-885h-156v885z" /> +<glyph unicode="ffi" horiz-adv-x="1658" d="M51 903v101h135v159q0 242 351 285l28 -121q-8 0 -26.5 -2t-54 -14.5t-66.5 -30.5t-53.5 -56t-22.5 -87v-133h199v-119h-199v-885h-156v885zM637 903v101h135v159q0 242 350 285l29 -121q-8 0 -26.5 -2t-54.5 -14.5t-66.5 -30.5t-53 -56t-22.5 -87v-133h198v-119h-198 v-885h-156v885zM1294 1284q0 47 35 78t82 31q45 0 79 -30t34 -75q0 -47 -35 -77.5t-82 -30.5q-45 0 -79 29.5t-34 74.5zM1339 0v1004h152v-1004h-152z" /> +<glyph unicode="ffl" horiz-adv-x="1654" d="M51 903v101h135v159q0 242 351 285l28 -121q-8 0 -26.5 -2t-54 -14.5t-66.5 -30.5t-53.5 -56t-22.5 -87v-133h199v-119h-199v-885h-156v885zM637 903v101h135v159q0 242 350 285l29 -121q-8 0 -26.5 -2t-54.5 -14.5t-66.5 -30.5t-53 -56t-22.5 -87v-133h198v-119h-198 v-885h-156v885zM1327 403v1018h152v-1018q0 -203 61 -403h-162q-51 139 -51 403z" /> +</font> +</defs></svg>
\ No newline at end of file diff --git a/public/stylesheets/fonts/delicious-roman-webfont.ttf b/public/stylesheets/fonts/delicious-roman-webfont.ttf Binary files differnew file mode 100755 index 000000000..cc27c5c1d --- /dev/null +++ b/public/stylesheets/fonts/delicious-roman-webfont.ttf diff --git a/public/stylesheets/fonts/delicious-roman-webfont.woff b/public/stylesheets/fonts/delicious-roman-webfont.woff Binary files differnew file mode 100755 index 000000000..9acbdd4a0 --- /dev/null +++ b/public/stylesheets/fonts/delicious-roman-webfont.woff diff --git a/public/stylesheets/fonts/delicious-smallcaps-webfont.eot b/public/stylesheets/fonts/delicious-smallcaps-webfont.eot Binary files differnew file mode 100755 index 000000000..358efc11f --- /dev/null +++ b/public/stylesheets/fonts/delicious-smallcaps-webfont.eot diff --git a/public/stylesheets/fonts/delicious-smallcaps-webfont.svg b/public/stylesheets/fonts/delicious-smallcaps-webfont.svg new file mode 100755 index 000000000..d1235b7f6 --- /dev/null +++ b/public/stylesheets/fonts/delicious-smallcaps-webfont.svg @@ -0,0 +1,222 @@ +<?xml version="1.0" standalone="no"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" > +<svg xmlns="http://www.w3.org/2000/svg"> +<metadata> +This is a custom SVG webfont generated by Font Squirrel. +Copyright : 35 I1995 Jos Buivenga +</metadata> +<defs> +<font id="DeliciousSmallCapsRegular" horiz-adv-x="450" > +<font-face units-per-em="1000" ascent="800" descent="-200" /> +<missing-glyph horiz-adv-x="300" /> +<glyph unicode=" " horiz-adv-x="300" /> +<glyph unicode="	" horiz-adv-x="300" /> +<glyph unicode=" " horiz-adv-x="300" /> +<glyph unicode="!" horiz-adv-x="264" d="M207 46q0 -24 -19.5 -42.5t-44.5 -18.5q-24 0 -41 16t-17 40q0 25 19.5 43t44.5 18q24 0 41 -16t17 -40zM195 699q-17 -99 -17 -193v-344h-60q-14 258 -14 368q0 88 15 159z" /> +<glyph unicode=""" horiz-adv-x="346" d="M126 708l14 -63l-22 -157h-33l-21 157l13 63h49zM264 708l14 -63l-22 -157h-33l-21 157l13 63h49z" /> +<glyph unicode="#" horiz-adv-x="556" d="M325 279l19 152h-114l-19 -152h114zM375 675h60l-22 -178h85l-6 -66h-88l-19 -152h75l-6 -66h-77l-26 -204h-60l26 204h-115l-23 -185h-60l23 185h-81l10 66h80l19 152h-71l10 66h69l25 197h60l-25 -197h115z" /> +<glyph unicode="$" horiz-adv-x="445" d="M263 256v-201q33 11 51 38.5t18 63.5q0 54 -69 99zM218 379v201q-37 -6 -57.5 -31t-20.5 -62q0 -27 12.5 -48t25 -31t40.5 -29zM409 156q0 -66 -40.5 -111.5t-105.5 -56.5v-61h-45v58q-80 2 -151 43l23 60q75 -37 128 -40v236l-22.5 14.5l-24 15.5l-21 14.5t-21.5 16 l-18 16.5t-17 19.5t-12.5 20t-11.5 24t-5.5 26t-2.5 29.5q0 72 42 115.5t114 48.5v55h45v-56q72 -9 122 -48l-27 -54q-40 29 -95 38v-228q77 -49 101 -74q45 -48 45 -121z" /> +<glyph unicode="%" horiz-adv-x="699" d="M253 512q0 31 -21.5 52.5t-52.5 21.5t-52.5 -21.5t-21.5 -52.5t21.5 -52.5t52.5 -21.5t52.5 21.5t21.5 52.5zM482 630l-222 -630h-66l211 584q-17 -9 -43 -13.5t-44 -4.5l-17 -1q11 -21 11 -53q0 -55 -39 -94t-94 -39t-94 39t-39 94t39 94t94 39q39 0 71 -20 q40 -11 70 -11q28 0 56 7.5t42 14.5l13 8zM651 118q0 -55 -39 -94t-94 -39t-94 39t-39 94t39 94t94 39t94 -39t39 -94zM592 118q0 31 -21.5 52.5t-52.5 21.5t-52.5 -21.5t-21.5 -52.5t21.5 -52.5t52.5 -21.5t52.5 21.5t21.5 52.5z" /> +<glyph unicode="&" horiz-adv-x="630" d="M413 490v47q0 46 -25 76t-70 30q-40 0 -71 -22.5t-31 -61.5q0 -37 32 -53t73 -16h92zM599 13q-56 -28 -102 -28q-47 0 -67.5 31.5t-20.5 80.5v335h-97q-99 0 -141.5 -47.5t-42.5 -147.5q0 -94 31 -153q20 -37 38 -37q11 0 27 16.5t38.5 33t50.5 16.5q25 0 49 -11l-15 -54 q-20 6 -31 6q-23 0 -55 -34.5t-65 -34.5q-41 0 -72.5 25.5t-48 65.5t-25 80.5t-8.5 77.5q0 85 44 158.5t123 76.5q-69 29 -69 90q0 60 52.5 97.5t115.5 37.5q69 0 122 -38t53 -104v-62h99v-58h-97v-331q0 -55 39 -55q26 0 58 14z" /> +<glyph unicode="'" horiz-adv-x="208" d="M126 708l14 -63l-22 -157h-33l-21 157l13 63h49z" /> +<glyph unicode="(" horiz-adv-x="336" d="M307 -84l-7 -62q-128 97 -190.5 210.5t-62.5 267.5q0 133 68.5 253t182.5 191l8 -57q-93 -61 -146.5 -167.5t-53.5 -221.5q0 -253 201 -414z" /> +<glyph unicode=")" horiz-adv-x="339" d="M40 776q114 -71 182.5 -191t68.5 -253q0 -154 -62.5 -267.5t-190.5 -210.5l-7 62q202 161 202 414q0 115 -54 221.5t-147 167.5z" /> +<glyph unicode="*" horiz-adv-x="424" d="M265 674l-34 -113l149 52v-62l-131 -42l106 -163h-70l-77 123l-76 -123h-65l98 163l-130 42v64l150 -54l-36 113h116z" /> +<glyph unicode="+" horiz-adv-x="471" d="M426 220h-162v-173h-58v173h-161v60h161v173h58v-173h162v-60z" /> +<glyph unicode="," horiz-adv-x="258" d="M139 87q13 0 29 -11.5t26 -23.5l9 -11q-41 -87 -129 -184l-45 31q48 69 60 117q5 20 5 41l-2 24q28 17 47 17z" /> +<glyph unicode="-" horiz-adv-x="302" d="M245 285v-60h-191v60h191z" /> +<glyph unicode="." horiz-adv-x="258" d="M194 46q0 -24 -19.5 -42.5t-44.5 -18.5q-24 0 -41 16t-17 40q0 25 19.5 43t44.5 18q24 0 41 -16t17 -40z" /> +<glyph unicode="/" horiz-adv-x="356" d="M339 757l-259 -905h-63l259 905h63z" /> +<glyph unicode="0" d="M225 -10q-82 0 -139 94.5t-57 230.5t57 230.5t139 94.5t139 -94.5t57 -230.5t-57 -230.5t-139 -94.5zM225 571q-50 0 -88.5 -73.5t-38.5 -182.5t38.5 -182.5t88.5 -73.5t88.5 73.5t38.5 182.5t-38.5 182.5t-88.5 73.5z" /> +<glyph unicode="1" d="M224 0v553h-145v54q25 0 63 5.5t64 11.5l25 6h70v-630h-77z" /> +<glyph unicode="2" d="M227 645q82 0 129 -42q36 -33 44 -86t-7 -103.5t-45 -87.5l-145 -176q-14 -17 -26.5 -37.5t-17.5 -32.5l-5 -11h244v-69h-330l-6 62q17 48 69 111l100 120q149 178 61 261q-29 27 -70 27q-72 0 -146 -57l-14 58q7 7 20.5 17.5t56.5 28t88 17.5z" /> +<glyph unicode="3" d="M242 12q-48 -19 -104 -24q-30 -3 -61 -3h-5v57h14.5t33.5 3t49 9t51 19t48.5 31t33.5 47.5t14 66.5q0 92 -139 92q-35 0 -85 -6v60l44 6q52 28 125 84q43 32 43 73q0 13 -4 21q-18 35 -58 35q-29 0 -73.5 -19.5t-72.5 -39.5l-18 55q33 25 83 45.5t97 20.5q92 0 117 -79 q6 -18 6 -37q0 -69 -80 -123l-54 -34q41 0 81 -23q65 -37 65 -115q0 -165 -151 -222z" /> +<glyph unicode="4" d="M356 140v-140h-72v140h-249l-4 65q65 183 244 425h83v-424h64v-66h-66zM284 533q-114 -166 -177 -327h177v327z" /> +<glyph unicode="5" d="M250 13q-50 -22 -111 -26q-22 -2 -67 -2h-5v60q82 -6 152 28q92 44 92 147q0 49 -32 71t-80 22q-41 0 -115 -20l28 337h248v-62h-178l-16 -198q21 5 41 5h26q48 -2 87 -24q29 -15 49 -46t20 -69q0 -86 -39 -141t-100 -82z" /> +<glyph unicode="6" d="M337 221q0 95 -90 111q-15 3 -29 3q-34 0 -90 -25q-8 -38 -8 -74q0 -78 30.5 -134.5t82.5 -56.5q72 0 95 86q9 36 9 90zM330 643l27 -49l-62.5 -40t-44 -33.5t-42.5 -42.5q-47 -58 -67 -117q66 23 105 23h15q22 -1 46 -10t48.5 -27t40 -51.5t15.5 -77.5 q0 -102 -48 -167.5t-136 -65.5q-89 0 -134.5 78.5t-45.5 193.5q0 152 113 267q69 70 170 119z" /> +<glyph unicode="7" d="M387 630v-64q0 -135 -69 -318q-61 -165 -148 -275l-66 28q90 118 149 272q62 164 62 293h-256v64h328z" /> +<glyph unicode="8" d="M409 138q-10 -71 -62.5 -112t-128.5 -41q-74 0 -125.5 51t-51.5 124q0 59 40 116q25 36 78 61q-44 27 -68 55t-30 69q-2 18 -2 26q0 64 43.5 110.5t120.5 47.5h6q83 1 120.5 -41.5t36.5 -109.5v-7q0 -38 -28.5 -78t-82.5 -65q5 -3 25 -13q56 -29 84 -66t28 -91 q0 -16 -3 -36zM314 509q-6 79 -93 79q-38 0 -63.5 -29.5t-25.5 -75.5q0 -39 20.5 -64.5t61.5 -46.5l37 19q63 32 63 104v14zM272 273q-10 5 -24.5 13.5l-25 14.5t-12.5 7q-93 -49 -93 -137q0 -49 30.5 -87.5t79.5 -38.5q48 0 78 38.5t30 86.5q0 69 -63 103z" /> +<glyph unicode="9" d="M334 396q0 77 -30.5 133t-82.5 56q-104 0 -104 -176q0 -50 27 -79t63 -33q6 -1 18 -1q25 0 61 9q23 8 40 17q8 38 8 74zM294 106q-86 -88 -204 -135l-21 58q130 68 176 124q44 53 66 114l-6 -2q-3 -1 -16.5 -6t-22.5 -7q-24 -7 -60 -7q-24 0 -50.5 9t-52.5 27t-43 52.5 t-17 78.5q0 102 47 167.5t135 65.5q64 0 106 -42t61 -113q16 -57 16 -126q0 -142 -114 -258z" /> +<glyph unicode=":" horiz-adv-x="258" d="M194 46q0 -24 -19.5 -42.5t-44.5 -18.5q-24 0 -41 16t-17 40q0 25 19.5 43t44.5 18q24 0 41 -16t17 -40zM194 353q0 -24 -19.5 -42.5t-44.5 -18.5q-24 0 -41 16t-17 40q0 25 19.5 43t44.5 18q24 0 41 -16t17 -40z" /> +<glyph unicode=";" horiz-adv-x="258" d="M136 87q13 0 29 -11.5t25 -23.5l10 -11q-41 -87 -129 -184l-45 31q48 69 60 117q5 20 5 41l-2 24q28 17 47 17zM194 352q0 -25 -19.5 -43.5t-44.5 -18.5q-24 0 -41 16t-17 40q0 25 19.5 43.5t44.5 18.5q24 0 41 -16t17 -40z" /> +<glyph unicode="<" horiz-adv-x="300" d="M267 100l-47 -38l-187 188l185 188l47 -38l-149 -150z" /> +<glyph unicode="=" horiz-adv-x="480" d="M426 203v-60h-382v60h382zM426 352v-60h-382v60h382z" /> +<glyph unicode=">" horiz-adv-x="300" d="M33 100l47 -38l187 188l-185 188l-47 -38l149 -150z" /> +<glyph unicode="?" horiz-adv-x="358" d="M194 46q0 -24 -19.5 -42.5t-44.5 -18.5q-24 0 -41 16t-17 40q0 25 19.5 43t44.5 18q24 0 41 -16t17 -40zM164 162h-61v51q0 42 1 62t10 50.5t27 54.5l82 110q34 47 34 79q0 28 -15 45t-43 17q-43 0 -84 -9v57q47 13 90 13q59 0 93 -31t34 -90q0 -48 -49 -112l-80 -106 q-22 -29 -30.5 -59t-8.5 -81v-51z" /> +<glyph unicode="@" horiz-adv-x="792" d="M497 457q-37 48 -100 48q-38 0 -64.5 -40.5t-36 -85t-9.5 -81.5q0 -29 10.5 -52t36.5 -23q9 0 21 3t20 6t23 11t20 11l21 12.5t17 10.5zM528 146q-35 0 -58 17t-23 51q0 6 2 16q-58 -50 -85 -62q-22 -10 -44 -10q-48 0 -74.5 39.5t-26.5 89.5q0 46 9 90.5t28.5 87 t56.5 69t86 26.5q71 0 110 -57l10 41h65l-69 -289q-6 -22 -6 -33q0 -27 27 -27q61 0 106.5 74t45.5 139q0 123 -79.5 192.5t-204.5 69.5q-124 0 -209.5 -95.5t-85.5 -221.5q0 -132 87.5 -223.5t219.5 -91.5q74 0 142.5 32t112.5 89l47 -25q-46 -68 -132 -110t-170 -42 q-156 0 -264.5 108.5t-108.5 264.5q0 146 109 258.5t254 112.5q144 0 239 -87.5t95 -230.5q0 -55 -27.5 -115t-78 -103.5t-106.5 -43.5z" /> +<glyph unicode="A" horiz-adv-x="510" d="M255 547l-75 -278h150zM498 0h-82l-67 203h-188l-67 -203h-82l200 630h86z" /> +<glyph unicode="B" horiz-adv-x="502" d="M382 184q0 36 -11.5 60t-34 35.5t-47 15.5t-59.5 4h-70v-233q45 -13 75 -13q66 0 106.5 33t40.5 98zM348 472q0 96 -114 96h-74v-204h74q51 0 82.5 29t31.5 79zM235 630q60 0 99 -15q93 -37 93 -144q0 -42 -28 -82.5t-67 -51.5q61 -4 95.5 -47.5t34.5 -106.5 q0 -95 -64 -146.5t-161 -51.5q-61 0 -157 25v620h155z" /> +<glyph unicode="C" horiz-adv-x="497" d="M472 41q-33 -26 -81 -41t-93 -15q-66 0 -115 29.5t-76 78.5t-39.5 104.5t-12.5 117.5q0 58 14.5 114t42.5 105.5t77 80t111 30.5q95 0 162 -43l-29 -52q-58 32 -133 32q-42 0 -75.5 -28.5t-52 -72t-28 -88t-9.5 -82.5q0 -44 8 -86t25.5 -83.5t52 -66.5t81.5 -25 q81 0 136 41z" /> +<glyph unicode="D" horiz-adv-x="547" d="M258 566h-99v-502h93q48 0 81 23t49 62.5t22.5 78.5t6.5 84q0 254 -153 254zM262 630q65 0 111.5 -27.5t71.5 -74.5t36 -100t11 -114t-13 -114.5t-40 -99.5t-75 -73t-112 -27h-172v630h182z" /> +<glyph unicode="E" horiz-adv-x="454" d="M404 630v-67h-244v-200h187v-69h-187v-225h254v-69h-334v630h324z" /> +<glyph unicode="F" horiz-adv-x="412" d="M376 630v-66h-216v-201h171v-69h-171v-294h-80v630h296z" /> +<glyph unicode="G" horiz-adv-x="524" d="M464 11q-63 -26 -164 -26q-66 0 -115.5 29t-76.5 78t-40 105t-13 118q0 58 14.5 114t42.5 105.5t77 80t111 30.5q47 0 82 -10t81 -33l-31 -53q-55 34 -132 34q-54 0 -93 -47t-55.5 -107t-16.5 -118q0 -44 7.5 -86t25 -83.5t52 -67t82.5 -25.5q53 0 88 14v206h74v-258z " /> +<glyph unicode="H" horiz-adv-x="548" d="M468 0h-80v295h-228v-295h-80v630h80v-267h228v267h80v-630z" /> +<glyph unicode="I" horiz-adv-x="238" d="M158 630v-630h-78v630h78z" /> +<glyph unicode="J" horiz-adv-x="245" d="M165 -28q0 -100 -142 -135l-17 54q81 27 81 87v652h78v-658z" /> +<glyph unicode="K" horiz-adv-x="485" d="M477 0h-80l-237 263v-263h-80v630h80v-288l220 288h85l-242 -324l254 -282v-24z" /> +<glyph unicode="L" horiz-adv-x="382" d="M156 630v-564h217v-66h-293v630h76z" /> +<glyph unicode="M" horiz-adv-x="742" d="M662 630v-630h-80v428l5 87l-181 -515h-70l-181 516q5 -52 5 -86v-430h-80v630h106l185 -532l185 532h106z" /> +<glyph unicode="N" horiz-adv-x="554" d="M474 0h-82l-237 514q5 -47 5 -86v-428h-80v630h106l213 -482q-5 48 -5 88v394h80v-630z" /> +<glyph unicode="O" horiz-adv-x="548" d="M274 579q-38 0 -67 -29t-43.5 -73.5t-21.5 -85.5t-7 -76t7 -76t21.5 -85.5t43.5 -73.5t67 -29t67 29t43.5 73.5t21.5 85.5t7 76t-7 76t-21.5 85.5t-43.5 73.5t-67 29zM274 645q58 0 102.5 -32t69 -83.5t36 -106t11.5 -108.5t-11.5 -108.5t-36 -106t-69 -83.5t-102.5 -32 t-102.5 32t-69 83.5t-36 106t-11.5 108.5t11.5 108.5t36 106t69 83.5t102.5 32z" /> +<glyph unicode="P" horiz-adv-x="489" d="M216 566h-56v-255q48 -21 81 -21q59 0 94 43.5t35 103.5q0 65 -43.5 97t-110.5 32zM216 630q103 0 168.5 -48t65.5 -146q0 -93 -55.5 -152t-148.5 -59q-49 0 -86 20v-245h-80v630h136z" /> +<glyph unicode="Q" horiz-adv-x="548" d="M335 -5q63 -67 128 -67q20 0 36 4l-21 -76q-16 -2 -24 -2q-25 0 -47 6.5t-43 22t-33 25.5t-34 32.5l-28 28.5l-18 17q-52 6 -92 40.5t-61.5 84t-32 101.5t-10.5 103q0 54 11.5 108.5t36 106t69 83.5t102.5 32t102.5 -32t69 -83.5t36 -106t11.5 -108.5q0 -102 -39 -196.5 t-119 -123.5zM274 579q-38 0 -67 -29t-43.5 -73.5t-21.5 -85.5t-7 -76t7 -76t21.5 -85.5t43.5 -73.5t67 -29t67 29t43.5 73.5t21.5 85.5t7 76t-7 76t-21.5 85.5t-43.5 73.5t-67 29z" /> +<glyph unicode="R" horiz-adv-x="505" d="M370 437q0 65 -43.5 97t-110.5 32h-56v-255q46 -21 74 -21q63 0 99.5 41.5t36.5 105.5zM480 0h-78l-207 230q-19 6 -35 15v-245h-80v630h136q103 0 168.5 -48t65.5 -146q0 -77 -41 -134t-115 -72l186 -206v-24z" /> +<glyph unicode="S" horiz-adv-x="434" d="M220 645q43 0 84.5 -20t63.5 -54l-45 -38q-38 48 -103 48q-42 0 -69.5 -24t-27.5 -65q0 -40 28 -71.5t67.5 -53.5t79 -47t67.5 -66.5t28 -97.5q0 -77 -54 -124t-132 -47q-37 0 -78.5 16.5t-71.5 42.5l34 57q63 -52 117 -52q47 0 77.5 30.5t30.5 77.5q0 35 -28 64.5 t-67.5 52.5l-79.5 48.5t-68 65.5t-28 92q0 79 47.5 122t127.5 43z" /> +<glyph unicode="T" horiz-adv-x="405" d="M395 560h-154v-560h-78v560h-153v70h385v-70z" /> +<glyph unicode="U" horiz-adv-x="558" d="M479 241q0 -110 -48 -183t-152 -73t-152 74t-48 186v385h80v-386q0 -193 120 -193t120 194v385h80v-389z" /> +<glyph unicode="V" horiz-adv-x="510" d="M505 630l-206 -630h-88l-205 630h87l164 -534l165 534h83z" /> +<glyph unicode="W" horiz-adv-x="708" d="M700 630l-148 -630h-85l-112 509l-112 -509h-85l-148 630h85l97 -446q8 -35 8 -66l115 512h80l115 -512q0 31 8 66l101 446h81z" /> +<glyph unicode="X" horiz-adv-x="492" d="M480 0h-92l-148 250l-143 -250h-87l187 323l-182 307h87l139 -231l134 231h82l-173 -303z" /> +<glyph unicode="Y" horiz-adv-x="471" d="M459 630l-184 -399v-231h-79v231l-183 399h85l140 -314l141 314h80z" /> +<glyph unicode="Z" horiz-adv-x="458" d="M401 630v-69q-147 -242 -277 -491h304v-70h-392v68q138 273 272 493h-250v69h343z" /> +<glyph unicode="[" horiz-adv-x="248" d="M183 732v-58h-93v-772h93v-58h-155v888h155z" /> +<glyph unicode="\" horiz-adv-x="335" d="M333 -148h-62l-259 905h62z" /> +<glyph unicode="]" horiz-adv-x="249" d="M221 732v-888h-155v58h93v772h-93v58h155z" /> +<glyph unicode="^" horiz-adv-x="624" d="M551 320h-70l-170 307l-170 -307h-70l212 388h56q198 -364 212 -388z" /> +<glyph unicode="_" d="M450 -75v-60h-450v60h450z" /> +<glyph unicode="`" horiz-adv-x="338" d="M261 606l-32 -45q-117 62 -184 128l62 63q52 -72 154 -146z" /> +<glyph unicode="a" horiz-adv-x="465" d="M359 0l-54 162h-147l-53 -162h-83l169 514h81l170 -514h-83zM232 419l-59 -193h117z" /> +<glyph unicode="b" horiz-adv-x="479" d="M227 -16q-49 0 -137 22v508h135q53 0 85 -12q81 -31 81 -120q0 -16 -7.5 -38t-18.5 -35q-15 -17 -39 -32q94 -26 94 -127q0 -76 -54 -121t-139 -45zM282 442q-22 12 -58 12h-55v-152l54 -1q39 -1 64.5 20.5t25.5 61.5q0 44 -31 59zM308 223q-23 16 -87 16h-52v-180 q34 -9 56 -9q53 0 84.5 25.5t31.5 74.5q0 51 -33 73z" /> +<glyph unicode="c" horiz-adv-x="465" d="M273 -16q-56 0 -97.5 24.5t-65 65.5t-34.5 87t-11 96q0 113 53 188q58 85 157 85q82 0 142 -38l-29 -52q-57 29 -113 29q-28 0 -57 -21.5t-46 -55.5q-28 -56 -28 -138q0 -84 24 -131q38 -76 108 -76q59 0 114 38l35 -51q-68 -50 -152 -50z" /> +<glyph unicode="d" horiz-adv-x="509" d="M239 0h-149v514h157q95 0 146 -67t51 -191q0 -126 -57 -191t-148 -65zM244 452h-76v-390h71q126 0 126 193q0 197 -121 197z" /> +<glyph unicode="e" horiz-adv-x="437" d="M90 0v514h282v-64h-203v-149h156v-66h-156v-169h212v-66h-291z" /> +<glyph unicode="f" horiz-adv-x="394" d="M169 450v-149h143v-66h-143v-235h-79v514h260v-64h-181z" /> +<glyph unicode="g" horiz-adv-x="498" d="M386 440q-46 29 -111 29q-28 0 -56.5 -21t-46.5 -56q-28 -56 -28 -138q0 -84 24 -131q38 -76 108 -76q34 0 67 10v169h74v-218q-60 -23 -142 -23q-45 0 -81.5 16t-60 43t-39.5 62.5t-22.5 73t-6.5 77.5q0 113 53 188q59 85 157 85q42 0 71 -8.5t72 -29.5z" /> +<glyph unicode="h" horiz-adv-x="514" d="M346 0v236h-177v-236h-79v514h79v-213h177v213h79v-514h-79z" /> +<glyph unicode="i" horiz-adv-x="261" d="M90 0v514h82v-514h-82z" /> +<glyph unicode="j" horiz-adv-x="255" d="M136 -87q-31 -28 -102 -47l-18 54q41 13 61 36q8 9 8 30v528h80v-533q0 -44 -29 -68z" /> +<glyph unicode="k" horiz-adv-x="457" d="M357 0l-188 201v-201h-79v514h79v-218l173 218h86l-205 -264l209 -219v-31h-75z" /> +<glyph unicode="l" horiz-adv-x="367" d="M90 0v514h76v-450h181v-64h-257z" /> +<glyph unicode="m" horiz-adv-x="673" d="M505 0v369l-127 -369h-66l-144 375v-26v-349h-78v514h98l134 -346q0 -1 1.5 -3.5t3 -7.5t4 -12l6 -17t6.5 -21l18 60l124 347h98v-514h-78z" /> +<glyph unicode="n" horiz-adv-x="527" d="M356 0l-185 384q0 -11 0.5 -19.5t1 -12t0.5 -5.5v-347h-79v515h98l164 -357q-1 26 -1 36v321h79v-515h-78z" /> +<glyph unicode="o" horiz-adv-x="505" d="M253 -16q-48 0 -86 25.5t-59 67t-32 88t-11 95.5q0 65 18.5 124.5t63 102.5t106.5 43q63 0 107.5 -44t62.5 -103.5t18 -125.5t-18 -125.5t-62.5 -103.5t-107.5 -44zM253 466q-31 0 -54 -19.5t-34.5 -52.5t-16.5 -68t-5 -74q0 -37 5 -70.5t16.5 -65t34.5 -50t54 -18.5 q42 0 67.5 35t33.5 78t8 96q0 52 -8.5 96t-34.5 78.5t-66 34.5z" /> +<glyph unicode="p" horiz-adv-x="455" d="M354 221q-47 -41 -120 -41q-31 0 -65 17v-197h-79v514h119q103 0 152 -45.5t49 -114.5q0 -85 -56 -133zM209 452h-40v-194q31 -15 55 -15q50 0 78.5 31.5t28.5 80.5q0 44 -31 70.5t-91 26.5z" /> +<glyph unicode="q" horiz-adv-x="505" d="M427 -118q-12 -2 -25 -2q-21 0 -40 6t-38 19t-30.5 22.5t-32 30t-28.5 27.5q-57 7 -96.5 52t-55.5 102t-16 120q0 65 18.5 124.5t63 103t106.5 43.5q63 0 107.5 -44t62.5 -103.5t18 -126.5q0 -83 -31.5 -156.5t-95.5 -103.5q54 -45 96 -45q12 0 38 5zM253 466 q-31 0 -54 -20t-34.5 -53t-16.5 -68t-5 -74q0 -37 5 -70t16.5 -64.5t34.5 -50t54 -18.5q42 0 67.5 34.5t33.5 77.5t8 96q0 38 -5 72.5t-17 66.5t-34 51.5t-53 19.5z" /> +<glyph unicode="r" horiz-adv-x="481" d="M361 0l-173 184l-19 9v-193h-79v514h119q103 0 152 -46t49 -114q0 -60 -32 -105.5t-93 -62.5l150 -159v-27h-74zM209 452h-40v-194q1 -1 8.5 -4.5t21 -7t25.5 -3.5q50 0 78.5 31.5t28.5 80.5q0 44 -31 70.5t-91 26.5z" /> +<glyph unicode="s" horiz-adv-x="408" d="M196 -16q-60 0 -133 52l35 55q18 -13 37 -24q38 -20 62 -20q36 0 60 22t24 59q0 43 -52 76l-95 57q-79 49 -79 132q0 65 41.5 101t110.5 36q35 0 66 -14.5t44 -27t21 -24.5l-47 -38q-38 42 -84 42q-33 0 -54 -17.5t-21 -48.5q0 -51 56 -84l86 -53q83 -49 83 -138 q0 -64 -46.5 -103.5t-114.5 -39.5z" /> +<glyph unicode="t" horiz-adv-x="388" d="M232 447v-447h-77v447h-127v67h332v-67h-128z" /> +<glyph unicode="u" horiz-adv-x="522" d="M261 -16q-88 0 -130 61.5t-42 152.5v316h78v-316q0 -150 94 -150t94 150v316h78v-319q0 -92 -42 -151.5t-130 -59.5z" /> +<glyph unicode="v" horiz-adv-x="466" d="M274 0h-82l-173 514h84l132 -412l132 412h81z" /> +<glyph unicode="w" horiz-adv-x="627" d="M482 0h-77q-73 307 -89 383l-6 -28l-83 -355h-80l-125 514h83l82 -369l91 369h76l90 -369l83 369h80z" /> +<glyph unicode="x" horiz-adv-x="452" d="M341 0l-119 194l-115 -194h-86l158 264l-154 250h86l112 -178l107 178h82l-147 -247l166 -267h-90z" /> +<glyph unicode="y" horiz-adv-x="416" d="M247 189v-189h-78v189l-155 325h84l112 -242l113 242h80z" /> +<glyph unicode="z" horiz-adv-x="429" d="M49 0v61q117 224 211 370l11 17h-204v66h298v-62q-116 -182 -211 -355l-16 -30h249v-67h-338z" /> +<glyph unicode="{" horiz-adv-x="333" d="M290 -108l-11 -54h-57q-20 0 -35 4t-31.5 16t-25 39.5t-8.5 69.5v176q0 50 -25.5 85.5t-56.5 35.5v47q31 0 56.5 35t25.5 85v176q0 78 27 104t71 26h59l11 -54h-59q-28 0 -38 -17.5t-10 -72.5v-176q0 -40 -18.5 -73t-36.5 -46l-19 -13q3 -2 8 -5t18 -14.5t22.5 -25 t17.5 -36t8 -47.5v-176q0 -55 10.5 -72t43.5 -17h53z" /> +<glyph unicode="|" horiz-adv-x="222" d="M141 756v-774h-60v774h60z" /> +<glyph unicode="}" horiz-adv-x="333" d="M290 264q-31 0 -56.5 -35.5t-25.5 -85.5v-176q0 -42 -8.5 -69.5t-25 -39.5t-31.5 -16t-35 -4h-57l-11 54h53q33 0 43.5 17t10.5 72v176q0 25 7.5 47.5t18.5 36.5t22 24.5t19 14.5l7 5q-3 2 -8 5t-18 15.5t-22.5 26.5t-17.5 37t-8 48v176q0 55 -10 72.5t-38 17.5h-59 l11 54h59q20 0 35 -4t30.5 -16.5t24 -40t8.5 -69.5v-176q0 -50 25.5 -85t56.5 -35v-47z" /> +<glyph unicode="~" horiz-adv-x="666" d="M146 308q12 26 36 44t51 18q38 0 104 -34t102 -34q55 0 81 58l-1 -72q-12 -23 -36.5 -37.5t-50.5 -14.5q-37 0 -104 34t-102 34q-52 0 -80 -58v62z" /> +<glyph unicode="¡" horiz-adv-x="264" d="M58 442q0 25 19.5 43.5t44.5 18.5q24 0 41 -16.5t17 -40.5t-19.5 -42.5t-44.5 -18.5q-24 0 -41 16t-17 40zM70 -210q17 97 17 193v344h60q15 -276 15 -368q0 -83 -16 -159z" /> +<glyph unicode="¢" horiz-adv-x="412" d="M219 50v388q-49 -16 -71.5 -72t-22.5 -116q0 -61 23 -121.5t71 -78.5zM264 571v-68q67 -7 109 -48l-34 -45q-31 25 -75 32v-396q40 5 98 43l25 -47q-48 -45 -123 -56v-60h-45v60q-65 11 -110 64q-60 69 -60 190q0 116 49 182q47 65 121 80v69h45z" /> +<glyph unicode="£" horiz-adv-x="442" d="M398 37q-20 -22 -50 -37t-58 -15q-13 0 -35 3.5t-37 7.5l-15 4h-150q36 161 36 251v129l-59 6l20 50h39v132q0 63 47.5 93.5t113.5 30.5q71 0 104 -28l-17 -46q-31 18 -81 18q-91 0 -91 -83v-117h134v-60h-134v-127q0 -88 -23 -188h71q58 -19 88 -19q23 0 47 13t39 32z " /> +<glyph unicode="¤" horiz-adv-x="542" d="M550 620l-28 -60q-55 67 -147 67q-161 0 -185 -195h274l-30 -63h-252q-2 -26 -2 -33q0 -8 2 -30h223l-30 -63h-185q11 -93 58 -142.5t117 -49.5q42 0 83.5 21t71.5 58v-80q-62 -62 -160 -62q-95 0 -162 69t-78 186h-110l30 63h71q-1 13 -1 31q0 19 1 32h-101l30 63h80 q12 112 81.5 185t178.5 73q100 0 170 -70z" /> +<glyph unicode="¥" horiz-adv-x="476" d="M467 317h-148l-41 -89v-5h187v-60h-187v-163h-80v163h-183v60h183v6l-41 88h-140v60h112l-117 253h85l141 -314l141 314h84q-116 -253 -117 -253h121v-60z" /> +<glyph unicode="§" horiz-adv-x="420" d="M301 262q0 32 -25.5 51.5t-58.5 19.5q-46 0 -73.5 -23t-27.5 -68q0 -28 25.5 -45.5t54.5 -17.5q45 0 75 20t30 63zM211 647q77 0 144 -38l-27 -52q-68 32 -119 32q-39 0 -64 -20.5t-25 -58.5q0 -25 26 -45t63 -36.5t73.5 -35.5t62.5 -51.5t26 -74.5q0 -53 -29 -87.5 t-81 -45.5q31 -16 50.5 -29t37.5 -38t18 -54q0 -75 -48 -115t-124 -40q-91 0 -174 49l28 55q72 -44 150 -44q42 0 69 20.5t27 61.5q0 30 -26 53t-63.5 39.5l-75 34.5t-63.5 46.5t-26 65.5q0 61 36 95t98 43q-72 34 -94 54q-36 32 -36 76q0 68 48 104t118 36z" /> +<glyph unicode="¨" horiz-adv-x="384" d="M157 642q0 -22 -19 -39t-41 -17q-16 0 -27 10.5t-11 26.5q0 22 17.5 40.5t39.5 18.5q17 0 29 -11.5t12 -28.5zM311 642q0 -22 -19 -39t-41 -17q-16 0 -27 10.5t-11 26.5q0 22 17.5 40.5t39.5 18.5q17 0 29 -11.5t12 -28.5z" /> +<glyph unicode="©" horiz-adv-x="879" d="M763 245q0 -133 -94.5 -227.5t-227.5 -94.5t-227 94.5t-94 227.5t94 227t227 94q134 0 228 -94t94 -227zM714 245q0 113 -80 193t-193 80t-192.5 -80t-79.5 -193q0 -115 80 -194t195 -79q112 0 191 80t79 193zM555 114q-20 -19 -51 -33.5t-56 -14.5q-74 0 -116 51 t-42 127q0 75 40 128t113 53q60 0 102 -39l-27 -34q-30 25 -75 25q-51 0 -73.5 -37.5t-22.5 -92.5q0 -57 24.5 -95.5t78.5 -38.5q37 0 84 34z" /> +<glyph unicode="ª" horiz-adv-x="378" d="M276 374l-41 123h-112l-40 -123h-63l128 391h62l129 -391h-63zM179 693l-44 -147h89z" /> +<glyph unicode="«" horiz-adv-x="500" d="M267 100l-47 -38l-187 188l185 188l47 -38l-149 -150zM445 100l-47 -38l-187 188l185 188l47 -38l-149 -150z" /> +<glyph unicode="¬" horiz-adv-x="535" d="M449 176l-59 -11v206h-344v60h403v-255z" /> +<glyph unicode="®" horiz-adv-x="879" d="M760 244q0 -134 -94 -228t-227 -94t-227 94.5t-94 227.5q0 134 93.5 227.5t227.5 93.5t227.5 -93.5t93.5 -227.5zM711 244q0 113 -80 193t-192 80q-113 0 -192.5 -80t-79.5 -193q0 -116 79.5 -194.5t195.5 -78.5q113 0 191 80t78 193zM582 71h-53l-120 121q-11 3 -22 9 v-130h-51v355h86q61 0 103.5 -29t42.5 -87q0 -41 -28 -77.5t-68 -40.5l110 -106v-15zM515 312q0 38 -26.5 55.5t-66.5 17.5h-35v-142q28 -13 46 -13q37 0 59.5 22t22.5 60z" /> +<glyph unicode="¯" horiz-adv-x="335" d="M304 632v-59h-274v59h274z" /> +<glyph unicode="°" horiz-adv-x="352" d="M172 601q-39 0 -66.5 -27.5t-27.5 -66.5t27.5 -66.5t66.5 -27.5t66.5 27.5t27.5 66.5t-27.5 66.5t-66.5 27.5zM172 646q57 0 98 -41t41 -98t-41 -98t-98 -41t-98 41t-41 98t41 98t98 41z" /> +<glyph unicode="±" horiz-adv-x="447" d="M416 59v-60h-361v60h361zM426 220h-162v-125h-58v125h-161v60h161v173h58v-173h162v-60z" /> +<glyph unicode="²" d="M227 645q82 0 129 -42q36 -33 44 -86t-7 -103.5t-45 -87.5l-145 -176q-14 -17 -26.5 -37.5t-17.5 -32.5l-5 -11h244v-69h-330l-6 62q17 48 69 111l100 120q149 178 61 261q-29 27 -70 27q-72 0 -146 -57l-14 58q7 7 20.5 17.5t56.5 28t88 17.5z" /> +<glyph unicode="³" d="M242 12q-48 -19 -104 -24q-30 -3 -61 -3h-5v57h14.5t33.5 3t49 9t51 19t48.5 31t33.5 47.5t14 66.5q0 92 -139 92q-35 0 -85 -6v60l44 6q52 28 125 84q43 32 43 73q0 13 -4 21q-18 35 -58 35q-29 0 -73.5 -19.5t-72.5 -39.5l-18 55q33 25 83 45.5t97 20.5q92 0 117 -79 q6 -18 6 -37q0 -69 -80 -123l-54 -34q41 0 81 -23q65 -37 65 -115q0 -165 -151 -222z" /> +<glyph unicode="´" horiz-adv-x="338" d="M213 752l62 -63q-68 -67 -184 -128l-32 45q98 71 154 146z" /> +<glyph unicode="µ" horiz-adv-x="519" d="M181 -88q0 -37 -19 -70l-100 -18q29 67 29 112q0 30 -5.5 91t-5.5 91v372h76v-372q0 -37 10.5 -54t45.5 -17q34 0 79 17.5t70 39.5v386h76v-415q0 -39 21 -40l-25 -50q-27 0 -46.5 15.5t-23.5 41.5q-31 -25 -74.5 -41t-83.5 -16q-15 0 -43 15q19 -57 19 -88z" /> +<glyph unicode="¶" horiz-adv-x="543" d="M497 639l-3 -51l-52 -12q0 -170 -34 -362t-98 -322l-64 20q69 125 104 310t35 354q-125 13 -143 13q-42 0 -59.5 -35.5t-17.5 -81.5q0 -25 3.5 -48.5t12.5 -48t27.5 -39.5t45.5 -15q43 0 81 30q-50 -99 -143 -99q-80 0 -122.5 59t-42.5 142q0 84 51.5 138t134.5 54 q26 0 55.5 -2.5t65 -6.5l54.5 -6l-1 43h56q0 -29 -1 -43z" /> +<glyph unicode="·" horiz-adv-x="258" d="M194 246q0 -24 -19.5 -42.5t-44.5 -18.5q-24 0 -41 16t-17 40q0 25 19.5 43t44.5 18q24 0 41 -16t17 -40z" /> +<glyph unicode="¸" horiz-adv-x="402" d="M331 -63q0 -33 -33 -64t-70 -47l-38 31q81 44 81 75q0 13 -9 21t-23 8q-13 0 -49 -9v47h104q37 -27 37 -62z" /> +<glyph unicode="¹" d="M224 0v553h-145v54q25 0 63 5.5t64 11.5l25 6h70v-630h-77z" /> +<glyph unicode="º" horiz-adv-x="392" d="M203 361q-70 0 -106.5 64.5t-36.5 145.5q0 79 37 142t106 63q70 0 106.5 -63.5t36.5 -144.5q0 -80 -36.5 -143.5t-106.5 -63.5zM203 727q-31 0 -50.5 -27t-26 -61t-6.5 -74q0 -64 19 -109.5t64 -45.5q32 0 51.5 26.5t25.5 59t6 72.5t-6.5 73t-26 59.5t-50.5 26.5z" /> +<glyph unicode="»" horiz-adv-x="500" d="M242 100l47 -38l187 188l-185 188l-47 -38l149 -150zM64 100l47 -38l187 188l-185 188l-47 -38l149 -150z" /> +<glyph unicode="¼" horiz-adv-x="1239" d="M1145 140v-140h-72v140h-249l-4 65q65 183 244 425h83v-424h64v-66h-66zM1073 533q-114 -166 -177 -327h177v327zM870 745l-430 -876h-63l430 876h63zM224 0v553h-145v54q25 0 63 5.5t64 11.5l25 6h70v-630h-77z" /> +<glyph unicode="½" horiz-adv-x="1239" d="M1016 645q82 0 129 -42q36 -33 44 -86t-7 -103.5t-45 -87.5l-145 -176q-14 -17 -26.5 -37.5t-17.5 -32.5l-5 -11h244v-69h-330l-6 62q17 48 69 111l100 120q149 178 61 261q-29 27 -70 27q-72 0 -146 -57l-14 58q7 7 20.5 17.5t56.5 28t88 17.5zM870 745l-430 -876h-63 l430 876h63zM224 0v553h-145v54q25 0 63 5.5t64 11.5l25 6h70v-630h-77z" /> +<glyph unicode="¾" horiz-adv-x="1239" d="M1145 140v-140h-72v140h-249l-4 65q65 183 244 425h83v-424h64v-66h-66zM1073 533q-114 -166 -177 -327h177v327zM870 745l-430 -876h-63l430 876h63zM242 12q-48 -19 -104 -24q-30 -3 -61 -3h-5v57h14.5t33.5 3t49 9t51 19t48.5 31t33.5 47.5t14 66.5q0 92 -139 92 q-35 0 -85 -6v60l44 6q52 28 125 84q43 32 43 73q0 13 -4 21q-18 35 -58 35q-29 0 -73.5 -19.5t-72.5 -39.5l-18 55q33 25 83 45.5t97 20.5q92 0 117 -79q6 -18 6 -37q0 -69 -80 -123l-54 -34q41 0 81 -23q65 -37 65 -115q0 -165 -151 -222z" /> +<glyph unicode="¿" horiz-adv-x="358" d="M180 444q0 25 19.5 43t44.5 18q24 0 41 -16t17 -40t-19.5 -42.5t-44.5 -18.5q-24 0 -41 16t-17 40zM210 325h61v-48q0 -42 -1 -62t-10 -50.5t-27 -54.5l-82 -110q-34 -45 -34 -78q0 -29 15 -46t43 -17q43 0 84 9v-57q-54 -13 -90 -13q-59 0 -93 31t-34 91q0 46 49 112 l80 105q23 30 31 59.5t8 80.5v48z" /> +<glyph unicode="À" horiz-adv-x="510" d="M255 547l-75 -278h150zM498 0h-82l-67 203h-188l-67 -203h-82l200 630h86zM366 736l-32 -45q-117 62 -184 128l62 63q52 -72 154 -146z" /> +<glyph unicode="Á" horiz-adv-x="510" d="M255 547l-75 -278h150zM498 0h-82l-67 203h-188l-67 -203h-82l200 630h86zM304 882l62 -63q-68 -67 -184 -128l-32 45q98 71 154 146z" /> +<glyph unicode="Â" horiz-adv-x="510" d="M255 547l-75 -278h150zM498 0h-82l-67 203h-188l-67 -203h-82l200 630h86zM405 736l-32 -46q-57 30 -121 100q-65 -71 -121 -100l-32 45q80 55 153 147q62 -80 153 -146z" /> +<glyph unicode="Ã" horiz-adv-x="510" d="M255 547l-75 -278h150zM498 0h-82l-67 203h-188l-67 -203h-82l200 630h86zM188 830q29 0 71.5 -22t65.5 -22q26 0 41 6.5t43 25.5l31 -38q-36 -33 -61 -44.5t-61 -11.5q-20 0 -62.5 22t-70.5 22q-9 0 -17.5 -2t-19.5 -7.5l-16 -8t-19 -11.5t-16 -10l-29 43q74 58 120 58z " /> +<glyph unicode="Ä" horiz-adv-x="510" d="M255 547l-75 -278h150zM498 0h-82l-67 203h-188l-67 -203h-82l200 630h86zM224 772q0 -22 -19 -39t-41 -17q-16 0 -27 10.5t-11 26.5q0 22 17.5 40.5t39.5 18.5q17 0 29 -11.5t12 -28.5zM378 772q0 -22 -19 -39t-41 -17q-16 0 -27 10.5t-11 26.5q0 22 17.5 40.5 t39.5 18.5q17 0 29 -11.5t12 -28.5z" /> +<glyph unicode="Å" horiz-adv-x="510" d="M315 784q0 24 -17 42t-40 18q-25 0 -43.5 -18t-18.5 -42t18 -42t41 -18q24 0 42 18t18 42zM361 784q0 -44 -31.5 -75t-74.5 -31t-73.5 31t-30.5 75q0 43 31.5 74.5t74.5 31.5t73.5 -31t30.5 -75zM255 547l-75 -278h150zM498 0h-82l-67 203h-188l-67 -203h-82l200 630h86z " /> +<glyph unicode="Æ" horiz-adv-x="726" d="M255 547l-74 -278h149zM676 630v-67h-244v-200h187v-69h-187v-225h254v-69h-334v203h-190l-67 -203h-83l199 630h93l48 -211v211h324z" /> +<glyph unicode="Ç" horiz-adv-x="497" d="M376 -63q0 -33 -33 -64t-70 -47l-38 31q81 44 81 75q0 13 -9 21t-23 8q-13 0 -49 -9v40q-50 14 -86.5 48t-56 80.5t-28.5 95t-9 99.5q0 58 14.5 114t42.5 105.5t77 80t111 30.5q97 0 162 -43l-29 -52q-62 33 -133 33q-40 0 -75.5 -30.5t-54.5 -70.5q-35 -71 -35 -171 q0 -44 8 -86t25.5 -84t52 -67.5t81.5 -25.5q80 0 135 44l35 -51q-48 -39 -122 -52q26 -26 26 -52z" /> +<glyph unicode="È" horiz-adv-x="454" d="M404 630v-67h-244v-200h187v-69h-187v-225h254v-69h-334v630h324zM355 736l-32 -45q-117 62 -184 128l62 63q52 -72 154 -146z" /> +<glyph unicode="É" horiz-adv-x="454" d="M404 630v-67h-244v-200h187v-69h-187v-225h254v-69h-334v630h324zM295 882l62 -63q-68 -67 -184 -128l-32 45q98 71 154 146z" /> +<glyph unicode="Ê" horiz-adv-x="454" d="M404 630v-67h-244v-200h187v-69h-187v-225h254v-69h-334v630h324zM396 736l-32 -46q-57 30 -121 100q-65 -71 -121 -100l-32 45q80 55 153 147q62 -80 153 -146z" /> +<glyph unicode="Ë" horiz-adv-x="454" d="M404 630v-67h-244v-200h187v-69h-187v-225h254v-69h-334v630h324zM215 772q0 -22 -19 -39t-41 -17q-16 0 -27 10.5t-11 26.5q0 22 17.5 40.5t39.5 18.5q17 0 29 -11.5t12 -28.5zM369 772q0 -22 -19 -39t-41 -17q-16 0 -27 10.5t-11 26.5q0 22 17.5 40.5t39.5 18.5 q17 0 29 -11.5t12 -28.5z" /> +<glyph unicode="Ì" horiz-adv-x="238" d="M158 630v-630h-78v630h78zM296 736l-32 -45q-117 62 -184 128l62 63q52 -72 154 -146z" /> +<glyph unicode="Í" horiz-adv-x="238" d="M158 630v-630h-78v630h78zM234 882l62 -63q-68 -67 -184 -128l-32 45q98 71 154 146z" /> +<glyph unicode="Î" horiz-adv-x="238" d="M158 630v-630h-78v630h78zM386 736l-32 -46q-57 30 -121 100q-65 -71 -121 -100l-32 45q80 55 153 147q62 -80 153 -146z" /> +<glyph unicode="Ï" horiz-adv-x="238" d="M158 630v-630h-78v630h78zM178 772q0 -22 -19 -39t-41 -17q-16 0 -27 10.5t-11 26.5q0 22 17.5 40.5t39.5 18.5q17 0 29 -11.5t12 -28.5zM332 772q0 -22 -19 -39t-41 -17q-16 0 -27 10.5t-11 26.5q0 22 17.5 40.5t39.5 18.5q17 0 29 -11.5t12 -28.5z" /> +<glyph unicode="Ñ" horiz-adv-x="554" d="M474 0h-82l-237 514q5 -47 5 -86v-428h-80v630h106l213 -482q-5 48 -5 88v394h80v-630zM215 830q29 0 71.5 -22t65.5 -22q26 0 41 6.5t43 25.5l31 -38q-36 -33 -61 -44.5t-61 -11.5q-20 0 -62.5 22t-70.5 22q-9 0 -17.5 -2t-19.5 -7.5l-16 -8t-19 -11.5t-16 -10l-29 43 q74 58 120 58z" /> +<glyph unicode="Ò" horiz-adv-x="548" d="M274 579q-38 0 -67 -29t-43.5 -73.5t-21.5 -85.5t-7 -76t7 -76t21.5 -85.5t43.5 -73.5t67 -29t67 29t43.5 73.5t21.5 85.5t7 76t-7 76t-21.5 85.5t-43.5 73.5t-67 29zM274 645q58 0 102.5 -32t69 -83.5t36 -106t11.5 -108.5t-11.5 -108.5t-36 -106t-69 -83.5t-102.5 -32 t-102.5 32t-69 83.5t-36 106t-11.5 108.5t11.5 108.5t36 106t69 83.5t102.5 32zM380 736l-32 -45q-117 62 -184 128l62 63q52 -72 154 -146z" /> +<glyph unicode="Ó" horiz-adv-x="548" d="M274 579q-38 0 -67 -29t-43.5 -73.5t-21.5 -85.5t-7 -76t7 -76t21.5 -85.5t43.5 -73.5t67 -29t67 29t43.5 73.5t21.5 85.5t7 76t-7 76t-21.5 85.5t-43.5 73.5t-67 29zM274 645q58 0 102.5 -32t69 -83.5t36 -106t11.5 -108.5t-11.5 -108.5t-36 -106t-69 -83.5t-102.5 -32 t-102.5 32t-69 83.5t-36 106t-11.5 108.5t11.5 108.5t36 106t69 83.5t102.5 32zM321 882l62 -63q-68 -67 -184 -128l-32 45q98 71 154 146z" /> +<glyph unicode="Ô" horiz-adv-x="548" d="M274 579q-38 0 -67 -29t-43.5 -73.5t-21.5 -85.5t-7 -76t7 -76t21.5 -85.5t43.5 -73.5t67 -29t67 29t43.5 73.5t21.5 85.5t7 76t-7 76t-21.5 85.5t-43.5 73.5t-67 29zM274 645q58 0 102.5 -32t69 -83.5t36 -106t11.5 -108.5t-11.5 -108.5t-36 -106t-69 -83.5t-102.5 -32 t-102.5 32t-69 83.5t-36 106t-11.5 108.5t11.5 108.5t36 106t69 83.5t102.5 32zM426 739l-32 -46q-57 30 -121 100q-65 -71 -121 -100l-32 45q80 55 153 147q62 -80 153 -146z" /> +<glyph unicode="Õ" horiz-adv-x="548" d="M274 579q-38 0 -67 -29t-43.5 -73.5t-21.5 -85.5t-7 -76t7 -76t21.5 -85.5t43.5 -73.5t67 -29t67 29t43.5 73.5t21.5 85.5t7 76t-7 76t-21.5 85.5t-43.5 73.5t-67 29zM274 645q58 0 102.5 -32t69 -83.5t36 -106t11.5 -108.5t-11.5 -108.5t-36 -106t-69 -83.5t-102.5 -32 t-102.5 32t-69 83.5t-36 106t-11.5 108.5t11.5 108.5t36 106t69 83.5t102.5 32zM206 830q29 0 71.5 -22t65.5 -22q26 0 41 6.5t43 25.5l31 -38q-36 -33 -61 -44.5t-61 -11.5q-20 0 -62.5 22t-70.5 22q-9 0 -17.5 -2t-19.5 -7.5l-16 -8t-19 -11.5t-16 -10l-29 43 q74 58 120 58z" /> +<glyph unicode="Ö" horiz-adv-x="548" d="M274 579q-38 0 -67 -29t-43.5 -73.5t-21.5 -85.5t-7 -76t7 -76t21.5 -85.5t43.5 -73.5t67 -29t67 29t43.5 73.5t21.5 85.5t7 76t-7 76t-21.5 85.5t-43.5 73.5t-67 29zM274 645q58 0 102.5 -32t69 -83.5t36 -106t11.5 -108.5t-11.5 -108.5t-36 -106t-69 -83.5t-102.5 -32 t-102.5 32t-69 83.5t-36 106t-11.5 108.5t11.5 108.5t36 106t69 83.5t102.5 32zM244 772q0 -22 -19 -39t-41 -17q-16 0 -27 10.5t-11 26.5q0 22 17.5 40.5t39.5 18.5q17 0 29 -11.5t12 -28.5zM398 772q0 -22 -19 -39t-41 -17q-16 0 -27 10.5t-11 26.5q0 22 17.5 40.5 t39.5 18.5q17 0 29 -11.5t12 -28.5z" /> +<glyph unicode="Ø" horiz-adv-x="548" d="M363 531l-135 -471q22 -9 46 -9q44 0 73.5 27t42.5 72t18 84t5 81q0 145 -50 216zM188 93l136 474q-22 12 -50 12q-43 0 -73 -28t-43 -74.5t-18 -86t-5 -81.5q0 -150 53 -216zM171 -140h-50l46 161q-58 45 -85 128t-27 170q0 54 12 108t36 104.5t68.5 82t102.5 31.5 q38 0 68 -13l34 117h50l-41 -143q56 -45 82 -125.5t26 -165.5q0 -54 -11.5 -108.5t-35.5 -106t-68.5 -83.5t-103.5 -32q-31 0 -64 11z" /> +<glyph unicode="Ù" horiz-adv-x="558" d="M479 241q0 -110 -48 -183t-152 -73t-152 74t-48 186v385h80v-386q0 -193 120 -193t120 194v385h80v-389zM389 736l-32 -45q-117 62 -184 128l62 63q52 -72 154 -146z" /> +<glyph unicode="Ú" horiz-adv-x="558" d="M479 241q0 -110 -48 -183t-152 -73t-152 74t-48 186v385h80v-386q0 -193 120 -193t120 194v385h80v-389zM329 882l62 -63q-68 -67 -184 -128l-32 45q98 71 154 146z" /> +<glyph unicode="Û" horiz-adv-x="558" d="M479 241q0 -110 -48 -183t-152 -73t-152 74t-48 186v385h80v-386q0 -193 120 -193t120 194v385h80v-389zM430 736l-32 -46q-57 30 -121 100q-65 -71 -121 -100l-32 45q80 55 153 147q62 -80 153 -146z" /> +<glyph unicode="Ü" horiz-adv-x="550" d="M479 241q0 -110 -48 -183t-152 -73t-152 74t-48 186v385h80v-386q0 -193 120 -193t120 194v385h80v-389zM250 772q0 -22 -19 -39t-41 -17q-16 0 -27 10.5t-11 26.5q0 22 17.5 40.5t39.5 18.5q17 0 29 -11.5t12 -28.5zM404 772q0 -22 -19 -39t-41 -17q-16 0 -27 10.5 t-11 26.5q0 22 17.5 40.5t39.5 18.5q17 0 29 -11.5t12 -28.5z" /> +<glyph unicode="Ý" horiz-adv-x="471" d="M358 896l62 -63q-68 -67 -184 -128l-32 45q98 71 154 146zM459 630l-184 -399v-231h-79v231l-183 399h85l140 -314l141 314h80z" /> +<glyph unicode="ß" horiz-adv-x="572" d="M542 124q0 -69 -50.5 -104t-122.5 -35q-92 0 -174 50l28 55q72 -45 150 -45q41 0 68.5 22t27.5 61q0 29 -26 52t-63.5 39.5l-75 34.5t-63.5 46.5t-26 66.5q0 67 44 103t113 36q7 26 7 46q0 46 -30.5 71t-76.5 25q-43 0 -75 -26.5t-32 -68.5v-553h-76v432l-66 9v49h66v76 q0 65 54 103t122 38q76 0 127 -45t51 -120q0 -26 -20 -102q-17 9 -44 9q-39 0 -64 -20.5t-25 -58.5q0 -24 26 -44t63 -36.5t74 -36t63 -52.5t26 -77z" /> +<glyph unicode="à" horiz-adv-x="465" d="M359 0l-54 162h-147l-53 -162h-83l169 514h81l170 -514h-83zM232 419l-59 -193h117zM335 631l-32 -45q-117 62 -184 128l62 63q52 -72 154 -146z" /> +<glyph unicode="á" horiz-adv-x="465" d="M359 0l-54 162h-147l-53 -162h-83l169 514h81l170 -514h-83zM232 419l-59 -193h117zM272 777l62 -63q-68 -67 -184 -128l-32 45q98 71 154 146z" /> +<glyph unicode="â" horiz-adv-x="465" d="M359 0l-54 162h-147l-53 -162h-83l169 514h81l170 -514h-83zM232 419l-59 -193h117zM382 631l-32 -46q-57 30 -121 100q-65 -71 -121 -100l-32 45q80 55 153 147q62 -80 153 -146z" /> +<glyph unicode="ã" horiz-adv-x="465" d="M359 0l-54 162h-147l-53 -162h-83l169 514h81l170 -514h-83zM232 419l-59 -193h117zM165 725q29 0 71.5 -22t65.5 -22q26 0 41 6.5t43 25.5l31 -38q-36 -33 -61 -44.5t-61 -11.5q-20 0 -62.5 22t-70.5 22q-9 0 -17.5 -2t-19.5 -7.5l-16 -8t-19 -11.5t-16 -10l-29 43 q74 58 120 58z" /> +<glyph unicode="ä" horiz-adv-x="465" d="M359 0l-54 162h-147l-53 -162h-83l169 514h81l170 -514h-83zM232 419l-59 -193h117zM204 667q0 -22 -19 -39t-41 -17q-16 0 -27 10.5t-11 26.5q0 22 17.5 40.5t39.5 18.5q17 0 29 -11.5t12 -28.5zM358 667q0 -22 -19 -39t-41 -17q-16 0 -27 10.5t-11 26.5q0 22 17.5 40.5 t39.5 18.5q17 0 29 -11.5t12 -28.5z" /> +<glyph unicode="å" horiz-adv-x="465" d="M359 0l-54 162h-147l-53 -162h-83l169 514h81l170 -514h-83zM232 419l-59 -193h117zM233 744q-25 0 -43.5 -17.5t-18.5 -42.5q0 -24 17.5 -42t41.5 -18t42 18t18 42t-16.5 42t-40.5 18zM232 790q43 0 73.5 -31.5t30.5 -74.5q0 -44 -31 -75t-75 -31q-43 0 -73.5 31.5 t-30.5 74.5t31.5 74.5t74.5 31.5z" /> +<glyph unicode="æ" horiz-adv-x="645" d="M302 0v160h-145l-53 -160h-82l167 515h86l27 -151v151h279v-66h-200v-150h153v-67h-153v-164h208v-68h-287zM232 411l-58 -186h108z" /> +<glyph unicode="ç" horiz-adv-x="465" d="M337 -43q4 -9 4 -20q0 -32 -33 -63.5t-70 -47.5l-38 31q81 44 81 75q0 5 -1 8q-7 21 -31 21q-11 0 -49 -9v45q-69 26 -102 99t-33 161q0 113 53 188q58 85 157 85q82 0 142 -38l-29 -52q-57 29 -113 29q-28 0 -57 -21.5t-46 -55.5q-28 -56 -28 -138q0 -84 24 -131 q38 -76 108 -76q59 0 114 38l35 -51q-47 -35 -109 -46q14 -14 21 -31z" /> +<glyph unicode="è" horiz-adv-x="437" d="M90 0v514h282v-64h-203v-149h156v-66h-156v-169h212v-66h-291zM340 631l-32 -45q-117 62 -184 128l62 63q52 -72 154 -146z" /> +<glyph unicode="é" horiz-adv-x="437" d="M90 0v514h282v-64h-203v-149h156v-66h-156v-169h212v-66h-291zM280 777l62 -63q-68 -67 -184 -128l-32 45q98 71 154 146z" /> +<glyph unicode="ê" horiz-adv-x="437" d="M386 631l-32 -46q-57 30 -121 100q-65 -71 -121 -100l-32 45q80 55 153 147q62 -80 153 -146zM102 0v514h282v-64h-203v-149h156v-66h-156v-169h212v-66h-291z" /> +<glyph unicode="ë" horiz-adv-x="437" d="M90 0v514h282v-64h-203v-149h156v-66h-156v-169h212v-66h-291zM204 642q0 -22 -19 -39t-41 -17q-16 0 -27 10.5t-11 26.5q0 22 17.5 40.5t39.5 18.5q17 0 29 -11.5t12 -28.5zM358 642q0 -22 -19 -39t-41 -17q-16 0 -27 10.5t-11 26.5q0 22 17.5 40.5t39.5 18.5 q17 0 29 -11.5t12 -28.5z" /> +<glyph unicode="ì" horiz-adv-x="261" d="M90 0v514h82v-514h-82zM306 631l-32 -45q-117 62 -184 128l62 63q52 -72 154 -146z" /> +<glyph unicode="í" horiz-adv-x="261" d="M90 0v514h82v-514h-82zM244 777l62 -63q-68 -67 -184 -128l-32 45q98 71 154 146z" /> +<glyph unicode="î" horiz-adv-x="261" d="M90 0v514h82v-514h-82zM396 631l-32 -46q-57 30 -121 100q-65 -71 -121 -100l-32 45q80 55 153 147q62 -80 153 -146z" /> +<glyph unicode="ï" horiz-adv-x="261" d="M90 0v514h82v-514h-82zM188 667q0 -22 -19 -39t-41 -17q-16 0 -27 10.5t-11 26.5q0 22 17.5 40.5t39.5 18.5q17 0 29 -11.5t12 -28.5zM342 667q0 -22 -19 -39t-41 -17q-16 0 -27 10.5t-11 26.5q0 22 17.5 40.5t39.5 18.5q17 0 29 -11.5t12 -28.5z" /> +<glyph unicode="ñ" horiz-adv-x="539" d="M366 0l-185 384q0 -11 0.5 -19.5t1 -12t0.5 -5.5v-347h-79v515h98l164 -357q-1 26 -1 36v321h79v-515h-78zM201 725q29 0 71.5 -22t65.5 -22q26 0 41 6.5t43 25.5l31 -38q-36 -33 -61 -44.5t-61 -11.5q-20 0 -62.5 22t-70.5 22q-9 0 -17.5 -2t-19.5 -7.5l-16 -8 t-19 -11.5t-16 -10l-29 43q74 58 120 58z" /> +<glyph unicode="ò" horiz-adv-x="505" d="M263 -16q-48 0 -86 25.5t-59 67t-32 88t-11 95.5q0 65 18.5 124.5t63 102.5t106.5 43q63 0 107.5 -44t62.5 -103.5t18 -125.5t-18 -125.5t-62.5 -103.5t-107.5 -44zM263 466q-31 0 -54 -19.5t-34.5 -52.5t-16.5 -68t-5 -74q0 -37 5 -70.5t16.5 -65t34.5 -50t54 -18.5 q42 0 67.5 35t33.5 78t8 96q0 52 -8.5 96t-34.5 78.5t-66 34.5zM363 631l-32 -45q-117 62 -184 128l62 63q52 -72 154 -146z" /> +<glyph unicode="ó" horiz-adv-x="505" d="M263 -16q-48 0 -86 25.5t-59 67t-32 88t-11 95.5q0 65 18.5 124.5t63 102.5t106.5 43q63 0 107.5 -44t62.5 -103.5t18 -125.5t-18 -125.5t-62.5 -103.5t-107.5 -44zM263 466q-31 0 -54 -19.5t-34.5 -52.5t-16.5 -68t-5 -74q0 -37 5 -70.5t16.5 -65t34.5 -50t54 -18.5 q42 0 67.5 35t33.5 78t8 96q0 52 -8.5 96t-34.5 78.5t-66 34.5zM310 777l62 -63q-68 -67 -184 -128l-32 45q98 71 154 146z" /> +<glyph unicode="ô" horiz-adv-x="505" d="M263 -16q-48 0 -86 25.5t-59 67t-32 88t-11 95.5q0 65 18.5 124.5t63 102.5t106.5 43q63 0 107.5 -44t62.5 -103.5t18 -125.5t-18 -125.5t-62.5 -103.5t-107.5 -44zM263 466q-31 0 -54 -19.5t-34.5 -52.5t-16.5 -68t-5 -74q0 -37 5 -70.5t16.5 -65t34.5 -50t54 -18.5 q42 0 67.5 35t33.5 78t8 96q0 52 -8.5 96t-34.5 78.5t-66 34.5zM406 631l-32 -46q-57 30 -121 100q-65 -71 -121 -100l-32 45q80 55 153 147q62 -80 153 -146z" /> +<glyph unicode="õ" horiz-adv-x="505" d="M263 -16q-48 0 -86 25.5t-59 67t-32 88t-11 95.5q0 65 18.5 124.5t63 102.5t106.5 43q63 0 107.5 -44t62.5 -103.5t18 -125.5t-18 -125.5t-62.5 -103.5t-107.5 -44zM263 466q-31 0 -54 -19.5t-34.5 -52.5t-16.5 -68t-5 -74q0 -37 5 -70.5t16.5 -65t34.5 -50t54 -18.5 q42 0 67.5 35t33.5 78t8 96q0 52 -8.5 96t-34.5 78.5t-66 34.5zM188 725q29 0 71.5 -22t65.5 -22q26 0 41 6.5t43 25.5l31 -38q-36 -33 -61 -44.5t-61 -11.5q-20 0 -62.5 22t-70.5 22q-9 0 -17.5 -2t-19.5 -7.5l-16 -8t-19 -11.5t-16 -10l-29 43q74 58 120 58z" /> +<glyph unicode="ö" horiz-adv-x="505" d="M263 -16q-48 0 -86 25.5t-59 67t-32 88t-11 95.5q0 65 18.5 124.5t63 102.5t106.5 43q63 0 107.5 -44t62.5 -103.5t18 -125.5t-18 -125.5t-62.5 -103.5t-107.5 -44zM263 466q-31 0 -54 -19.5t-34.5 -52.5t-16.5 -68t-5 -74q0 -37 5 -70.5t16.5 -65t34.5 -50t54 -18.5 q42 0 67.5 35t33.5 78t8 96q0 52 -8.5 96t-34.5 78.5t-66 34.5zM228 667q0 -22 -19 -39t-41 -17q-16 0 -27 10.5t-11 26.5q0 22 17.5 40.5t39.5 18.5q17 0 29 -11.5t12 -28.5zM382 667q0 -22 -19 -39t-41 -17q-16 0 -27 10.5t-11 26.5q0 22 17.5 40.5t39.5 18.5 q17 0 29 -11.5t12 -28.5z" /> +<glyph unicode="÷" horiz-adv-x="489" d="M308 404q0 -24 -19.5 -42.5t-44.5 -18.5q-24 0 -41 16t-17 40q0 25 19.5 43t44.5 18q24 0 41 -16t17 -40zM308 107q0 -24 -19.5 -42.5t-44.5 -18.5q-24 0 -41 16t-17 40q0 25 19.5 43t44.5 18q24 0 41 -16t17 -40zM434 280v-60h-380v60h380z" /> +<glyph unicode="ø" horiz-adv-x="505" d="M182 85l108 373q-18 8 -37 8q-31 0 -54 -19.5t-34.5 -52.5t-16.5 -68t-5 -74q0 -114 39 -167zM329 419l-106 -366q15 -5 30 -5q42 0 67.5 35t33.5 78t8 96q0 105 -33 162zM382 605l-31 -109q45 -36 67.5 -102t22.5 -137q0 -66 -18 -125.5t-62.5 -103.5t-107.5 -44 q-22 0 -48 7l-29 -102h-50l36 124q-48 36 -72.5 104.5t-24.5 142.5q0 65 18.5 124.5t63 102.5t106.5 43q29 0 55 -9l24 84h50z" /> +<glyph unicode="ù" horiz-adv-x="522" d="M271 -16q-88 0 -130 61.5t-42 152.5v316h78v-316q0 -150 94 -150t94 150v316h78v-319q0 -92 -42 -151.5t-130 -59.5zM373 631l-32 -45q-117 62 -184 128l62 63q52 -72 154 -146z" /> +<glyph unicode="ú" horiz-adv-x="522" d="M271 -16q-88 0 -130 61.5t-42 152.5v316h78v-316q0 -150 94 -150t94 150v316h78v-319q0 -92 -42 -151.5t-130 -59.5zM312 777l62 -63q-68 -67 -184 -128l-32 45q98 71 154 146z" /> +<glyph unicode="û" horiz-adv-x="522" d="M413 631l-32 -46q-57 30 -121 100q-65 -71 -121 -100l-32 45q80 55 153 147q62 -80 153 -146zM271 -16q-88 0 -130 61.5t-42 152.5v316h78v-316q0 -150 94 -150t94 150v316h78v-319q0 -92 -42 -151.5t-130 -59.5z" /> +<glyph unicode="ü" horiz-adv-x="522" d="M271 -16q-88 0 -130 61.5t-42 152.5v316h78v-316q0 -150 94 -150t94 150v316h78v-319q0 -92 -42 -151.5t-130 -59.5zM233 667q0 -22 -19 -39t-41 -17q-16 0 -27 10.5t-11 26.5q0 22 17.5 40.5t39.5 18.5q17 0 29 -11.5t12 -28.5zM387 667q0 -22 -19 -39t-41 -17 q-16 0 -27 10.5t-11 26.5q0 22 17.5 40.5t39.5 18.5q17 0 29 -11.5t12 -28.5z" /> +<glyph unicode="ý" horiz-adv-x="416" d="M331 781l62 -63q-68 -67 -184 -128l-32 45q98 71 154 146zM247 189v-189h-78v189l-155 325h84l112 -242l113 242h80z" /> +<glyph unicode="ÿ" horiz-adv-x="416" d="M187 642q0 -22 -19 -39t-41 -17q-16 0 -27 10.5t-11 26.5q0 22 17.5 40.5t39.5 18.5q17 0 29 -11.5t12 -28.5zM341 642q0 -22 -19 -39t-41 -17q-16 0 -27 10.5t-11 26.5q0 22 17.5 40.5t39.5 18.5q17 0 29 -11.5t12 -28.5zM257 189v-189h-78v189l-155 325h84l112 -242 l113 242h80z" /> +<glyph unicode="Œ" horiz-adv-x="638" d="M264 566q-41 0 -69.5 -27t-41 -71t-17 -81.5t-4.5 -77.5q0 -39 5 -75.5t17.5 -78t41 -67t68.5 -25.5v503zM588 630v-67h-244v-200h187v-69h-187v-225h254v-69h-335q-56 0 -98.5 31.5t-65 81.5t-33.5 102t-11 104q0 50 11.5 101.5t34.5 100t65 79t97 30.5h325z" /> +<glyph unicode="œ" horiz-adv-x="583" d="M244 0q-61 0 -103 42t-59 98.5t-17 119.5q0 62 17.5 117.5t60 96t101.5 40.5h275v-66h-202v-146h155v-68h-155v-166h210v-68h-283zM238 450q-36 -5 -58 -37.5t-29.5 -72t-7.5 -88.5q0 -46 7.5 -84t29.5 -69t58 -35v386z" /> +<glyph unicode="Ÿ" horiz-adv-x="471" d="M459 630l-184 -399v-231h-79v231l-183 399h85l140 -314l141 314h80zM217 772q0 -22 -19 -39t-41 -17q-16 0 -27 10.5t-11 26.5q0 22 17.5 40.5t39.5 18.5q17 0 29 -11.5t12 -28.5zM371 772q0 -22 -19 -39t-41 -17q-16 0 -27 10.5t-11 26.5q0 22 17.5 40.5t39.5 18.5 q17 0 29 -11.5t12 -28.5z" /> +<glyph unicode="ˆ" horiz-adv-x="402" d="M366 606l-32 -46q-57 30 -121 100q-65 -71 -121 -100l-32 45q80 55 153 147q62 -80 153 -146z" /> +<glyph unicode="˜" horiz-adv-x="380" d="M121 700q29 0 71.5 -22t65.5 -22q26 0 41 6.5t43 25.5l31 -38q-36 -33 -61 -44.5t-61 -11.5q-20 0 -62.5 22t-70.5 22q-9 0 -17.5 -2t-19.5 -7.5l-16 -8t-19 -11.5t-16 -10l-29 43q74 58 120 58z" /> +<glyph unicode="–" horiz-adv-x="358" d="M358 285v-60h-358v60h358z" /> +<glyph unicode="—" horiz-adv-x="608" d="M608 286v-60h-608v60h608z" /> +<glyph unicode="‘" horiz-adv-x="267" d="M110 431q-13 0 -29 11.5t-25 23.5l-10 11q41 87 129 184l45 -31q-48 -69 -60 -117q-5 -20 -5 -41l2 -24q-28 -17 -47 -17z" /> +<glyph unicode="’" horiz-adv-x="270" d="M158 646q13 0 29 -11.5t25 -22.5l10 -12q-41 -87 -129 -184l-45 31q48 69 60 117q5 20 5 41l-2 24q28 17 47 17z" /> +<glyph unicode="‚" horiz-adv-x="258" d="M139 90q13 0 29 -11.5t26 -22.5l9 -12q-41 -87 -129 -184l-45 31q48 69 60 117q5 20 5 41l-2 24q28 17 47 17z" /> +<glyph unicode="“" horiz-adv-x="446" d="M288 431l47 17q-2 9 -2 24q0 21 5 41q12 48 60 117l-45 31q-86 -95 -129 -184q34 -46 64 -46zM111 431l47 17q-2 9 -2 24q0 21 5 41q12 48 60 117l-45 31q-86 -95 -129 -184q34 -46 64 -46z" /> +<glyph unicode="”" horiz-adv-x="446" d="M157 646l-47 -17q2 -9 2 -24q0 -21 -5 -41q-12 -48 -60 -117l45 -31q86 95 129 184q-34 46 -64 46zM334 646l-47 -17q2 -9 2 -24q0 -21 -5 -41q-12 -48 -60 -117l45 -31q86 95 129 184q-34 46 -64 46z" /> +<glyph unicode="„" horiz-adv-x="434" d="M139 90l-47 -17q2 -9 2 -24q0 -21 -5 -41q-12 -48 -60 -117l45 -31q86 95 129 184q-34 46 -64 46zM316 90l-47 -17q2 -9 2 -24q0 -21 -5 -41q-12 -48 -60 -117l45 -31q86 95 129 184q-34 46 -64 46z" /> +<glyph unicode="•" horiz-adv-x="424" d="M211 487q71 0 122 -50.5t51 -121.5t-51 -121.5t-122 -50.5t-121.5 50.5t-50.5 121.5t50.5 121.5t121.5 50.5z" /> +<glyph unicode="…" horiz-adv-x="604" d="M192 46q0 -24 -19.5 -42.5t-44.5 -18.5q-24 0 -41 16t-17 40q0 25 19.5 43t44.5 18q24 0 41 -16t17 -40zM364 46q0 -24 -19.5 -42.5t-44.5 -18.5q-24 0 -41 16t-17 40q0 25 19.5 43t44.5 18q24 0 41 -16t17 -40zM534 46q0 -24 -19.5 -42.5t-44.5 -18.5q-24 0 -41 16 t-17 40q0 25 19.5 43t44.5 18q24 0 41 -16t17 -40z" /> +<glyph unicode="‹" horiz-adv-x="300" d="M267 100l-47 -38l-187 188l185 188l47 -38l-149 -150z" /> +<glyph unicode="›" horiz-adv-x="300" d="M33 100l47 -38l187 188l-185 188l-47 -38l149 -150z" /> +<glyph unicode="⁄" horiz-adv-x="339" d="M420 745l-430 -876h-63l430 876h63z" /> +<glyph unicode="™" horiz-adv-x="802" d="M310 650h-97v-353h-49v353h-97v44h243v-44zM724 694v-397h-50v270l3 54l-114 -324h-44l-114 325q3 -33 3 -54v-271h-51v397h67l117 -335l116 335h67z" /> +<glyph unicode="" horiz-adv-x="515" d="M0 515h515v-515h-515v515z" /> +<glyph unicode="fi" horiz-adv-x="661" d="M490 0v514h76v-514h-76zM173 450v-149h142v-66h-142v-235h-78v514h257v-64h-179z" /> +<glyph unicode="fl" horiz-adv-x="762" d="M488 0v514h75v-450h179v-64h-254zM173 450v-149h141v-66h-141v-235h-78v514h256v-64h-178z" /> +<glyph unicode="ffi" horiz-adv-x="1049" d="M878 0v514h82v-514h-82zM563 450v-149h143v-66h-143v-235h-79v514h260v-64h-181zM169 450v-149h143v-66h-143v-235h-79v514h260v-64h-181z" /> +<glyph unicode="ffl" horiz-adv-x="1155" d="M878 0v514h76v-450h181v-64h-257zM563 450v-149h143v-66h-143v-235h-79v514h260v-64h-181zM169 450v-149h143v-66h-143v-235h-79v514h260v-64h-181z" /> +</font> +</defs></svg>
\ No newline at end of file diff --git a/public/stylesheets/fonts/delicious-smallcaps-webfont.ttf b/public/stylesheets/fonts/delicious-smallcaps-webfont.ttf Binary files differnew file mode 100755 index 000000000..152f15f13 --- /dev/null +++ b/public/stylesheets/fonts/delicious-smallcaps-webfont.ttf diff --git a/public/stylesheets/fonts/delicious-smallcaps-webfont.woff b/public/stylesheets/fonts/delicious-smallcaps-webfont.woff Binary files differnew file mode 100755 index 000000000..0d4d1f7d0 --- /dev/null +++ b/public/stylesheets/fonts/delicious-smallcaps-webfont.woff diff --git a/public/stylesheets/ie7.css b/public/stylesheets/ie7.css new file mode 100644 index 000000000..c6e8fe4f2 --- /dev/null +++ b/public/stylesheets/ie7.css @@ -0,0 +1,18 @@ +form input[type=submit], a.link_button_green { + border: solid 0px #FFF; + line-height: 16px; + padding-top: 3px +} + +input#navigation_search_query { + margin-bottom: -5px; +} + +.request_left span.head { + line-height: 35px; +} + +#header_left, +#left_column { + margin-top: 20px; +}
\ No newline at end of file diff --git a/public/stylesheets/jquery.fancybox-1.3.4.css b/public/stylesheets/jquery.fancybox-1.3.4.css new file mode 100755 index 000000000..6f53d8f4a --- /dev/null +++ b/public/stylesheets/jquery.fancybox-1.3.4.css @@ -0,0 +1,359 @@ +/*
+ * FancyBox - jQuery Plugin
+ * Simple and fancy lightbox alternative
+ *
+ * Examples and documentation at: http://fancybox.net
+ *
+ * Copyright (c) 2008 - 2010 Janis Skarnelis
+ * That said, it is hardly a one-person project. Many people have submitted bugs, code, and offered their advice freely. Their support is greatly appreciated.
+ *
+ * Version: 1.3.4 (11/11/2010)
+ * Requires: jQuery v1.3+
+ *
+ * Dual licensed under the MIT and GPL licenses:
+ * http://www.opensource.org/licenses/mit-license.php
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
+#fancybox-loading {
+ position: fixed;
+ top: 50%;
+ left: 50%;
+ width: 40px;
+ height: 40px;
+ margin-top: -20px;
+ margin-left: -20px;
+ cursor: pointer;
+ overflow: hidden;
+ z-index: 1104;
+ display: none;
+}
+
+#fancybox-loading div {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 40px;
+ height: 480px;
+ background-image: url('fancybox.png');
+}
+
+#fancybox-overlay {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ z-index: 1100;
+ display: none;
+}
+
+#fancybox-tmp {
+ padding: 0;
+ margin: 0;
+ border: 0;
+ overflow: auto;
+ display: none;
+}
+
+#fancybox-wrap {
+ position: absolute;
+ top: 0;
+ left: 0;
+ padding: 20px;
+ z-index: 1101;
+ outline: none;
+ display: none;
+}
+
+#fancybox-outer {
+ position: relative;
+ width: 100%;
+ height: 100%;
+ background: #fff;
+}
+
+#fancybox-content {
+ width: 0;
+ height: 0;
+ padding: 0;
+ outline: none;
+ position: relative;
+ overflow: hidden;
+ z-index: 1102;
+ border: 0px solid #fff;
+}
+
+#fancybox-hide-sel-frame {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background: transparent;
+ z-index: 1101;
+}
+
+#fancybox-close {
+ position: absolute;
+ top: -15px;
+ right: -15px;
+ width: 30px;
+ height: 30px;
+ background: transparent url('fancybox.png') -40px 0px;
+ cursor: pointer;
+ z-index: 1103;
+ display: none;
+}
+
+#fancybox-error {
+ color: #444;
+ font: normal 12px/20px Arial;
+ padding: 14px;
+ margin: 0;
+}
+
+#fancybox-img {
+ width: 100%;
+ height: 100%;
+ padding: 0;
+ margin: 0;
+ border: none;
+ outline: none;
+ line-height: 0;
+ vertical-align: top;
+}
+
+#fancybox-frame {
+ width: 100%;
+ height: 100%;
+ border: none;
+ display: block;
+}
+
+#fancybox-left, #fancybox-right {
+ position: absolute;
+ bottom: 0px;
+ height: 100%;
+ width: 35%;
+ cursor: pointer;
+ outline: none;
+ background: transparent url('blank.gif');
+ z-index: 1102;
+ display: none;
+}
+
+#fancybox-left {
+ left: 0px;
+}
+
+#fancybox-right {
+ right: 0px;
+}
+
+#fancybox-left-ico, #fancybox-right-ico {
+ position: absolute;
+ top: 50%;
+ left: -9999px;
+ width: 30px;
+ height: 30px;
+ margin-top: -15px;
+ cursor: pointer;
+ z-index: 1102;
+ display: block;
+}
+
+#fancybox-left-ico {
+ background-image: url('fancybox.png');
+ background-position: -40px -30px;
+}
+
+#fancybox-right-ico {
+ background-image: url('fancybox.png');
+ background-position: -40px -60px;
+}
+
+#fancybox-left:hover, #fancybox-right:hover {
+ visibility: visible; /* IE6 */
+}
+
+#fancybox-left:hover span {
+ left: 20px;
+}
+
+#fancybox-right:hover span {
+ left: auto;
+ right: 20px;
+}
+
+.fancybox-bg {
+ position: absolute;
+ padding: 0;
+ margin: 0;
+ border: 0;
+ width: 20px;
+ height: 20px;
+ z-index: 1001;
+}
+
+#fancybox-bg-n {
+ top: -20px;
+ left: 0;
+ width: 100%;
+ background-image: url('fancybox-x.png');
+}
+
+#fancybox-bg-ne {
+ top: -20px;
+ right: -20px;
+ background-image: url('fancybox.png');
+ background-position: -40px -162px;
+}
+
+#fancybox-bg-e {
+ top: 0;
+ right: -20px;
+ height: 100%;
+ background-image: url('fancybox-y.png');
+ background-position: -20px 0px;
+}
+
+#fancybox-bg-se {
+ bottom: -20px;
+ right: -20px;
+ background-image: url('fancybox.png');
+ background-position: -40px -182px;
+}
+
+#fancybox-bg-s {
+ bottom: -20px;
+ left: 0;
+ width: 100%;
+ background-image: url('fancybox-x.png');
+ background-position: 0px -20px;
+}
+
+#fancybox-bg-sw {
+ bottom: -20px;
+ left: -20px;
+ background-image: url('fancybox.png');
+ background-position: -40px -142px;
+}
+
+#fancybox-bg-w {
+ top: 0;
+ left: -20px;
+ height: 100%;
+ background-image: url('fancybox-y.png');
+}
+
+#fancybox-bg-nw {
+ top: -20px;
+ left: -20px;
+ background-image: url('fancybox.png');
+ background-position: -40px -122px;
+}
+
+#fancybox-title {
+ font-family: Helvetica;
+ font-size: 12px;
+ z-index: 1102;
+}
+
+.fancybox-title-inside {
+ padding-bottom: 10px;
+ text-align: center;
+ color: #333;
+ background: #fff;
+ position: relative;
+}
+
+.fancybox-title-outside {
+ padding-top: 10px;
+ color: #fff;
+}
+
+.fancybox-title-over {
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ color: #FFF;
+ text-align: left;
+}
+
+#fancybox-title-over {
+ padding: 10px;
+ background-image: url('fancy_title_over.png');
+ display: block;
+}
+
+.fancybox-title-float {
+ position: absolute;
+ left: 0;
+ bottom: -20px;
+ height: 32px;
+}
+
+#fancybox-title-float-wrap {
+ border: none;
+ border-collapse: collapse;
+ width: auto;
+}
+
+#fancybox-title-float-wrap td {
+ border: none;
+ white-space: nowrap;
+}
+
+#fancybox-title-float-left {
+ padding: 0 0 0 15px;
+ background: url('fancybox.png') -40px -90px no-repeat;
+}
+
+#fancybox-title-float-main {
+ color: #FFF;
+ line-height: 29px;
+ font-weight: bold;
+ padding: 0 0 3px 0;
+ background: url('fancybox-x.png') 0px -40px;
+}
+
+#fancybox-title-float-right {
+ padding: 0 0 0 15px;
+ background: url('fancybox.png') -55px -90px no-repeat;
+}
+
+/* IE6 */
+
+.fancybox-ie6 #fancybox-close { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_close.png', sizingMethod='scale'); }
+
+.fancybox-ie6 #fancybox-left-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_nav_left.png', sizingMethod='scale'); }
+.fancybox-ie6 #fancybox-right-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_nav_right.png', sizingMethod='scale'); }
+
+.fancybox-ie6 #fancybox-title-over { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_title_over.png', sizingMethod='scale'); zoom: 1; }
+.fancybox-ie6 #fancybox-title-float-left { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_title_left.png', sizingMethod='scale'); }
+.fancybox-ie6 #fancybox-title-float-main { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_title_main.png', sizingMethod='scale'); }
+.fancybox-ie6 #fancybox-title-float-right { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_title_right.png', sizingMethod='scale'); }
+
+.fancybox-ie6 #fancybox-bg-w, .fancybox-ie6 #fancybox-bg-e, .fancybox-ie6 #fancybox-left, .fancybox-ie6 #fancybox-right, #fancybox-hide-sel-frame {
+ height: expression(this.parentNode.clientHeight + "px");
+}
+
+#fancybox-loading.fancybox-ie6 {
+ position: absolute; margin-top: 0;
+ top: expression( (-20 + (document.documentElement.clientHeight ? document.documentElement.clientHeight/2 : document.body.clientHeight/2 ) + ( ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop )) + 'px');
+}
+
+#fancybox-loading.fancybox-ie6 div { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_loading.png', sizingMethod='scale'); }
+
+/* IE6, IE7, IE8 */
+
+.fancybox-ie .fancybox-bg { background: transparent !important; }
+
+.fancybox-ie #fancybox-bg-n { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_shadow_n.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-ne { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_shadow_ne.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-e { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_shadow_e.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-se { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_shadow_se.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-s { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_shadow_s.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-sw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_shadow_sw.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-w { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_shadow_w.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-nw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_shadow_nw.png', sizingMethod='scale'); }
\ No newline at end of file diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css index 28b2762ab..d9bdd25a8 100644 --- a/public/stylesheets/main.css +++ b/public/stylesheets/main.css @@ -226,7 +226,7 @@ body font-size: 0.9em; z-index: 200; padding: 0.20em 10px 0.25em 1em; - color: #FFF; + color: #444; } #logged_in_bar a, #logged_in_bar a:visited @@ -312,6 +312,7 @@ h1, h2, h3 line-height: 1em; letter-spacing: 0em; color: #555; + clear: left; } h1 { font-size: 1.8em;} h2 { font-size: 1.4em;} @@ -414,6 +415,10 @@ div#twitter margin: 0 0 1em 1em; } +img.twitter-icon { + vertical-align: middle; +} + .blog_post { margin-bottom: 2em; } @@ -927,19 +932,72 @@ a img.attachment_image { #body_sidebar a { text-decoration: none; } +/*------------------------------------------------ selecting an authority */ + +#authority_selection +{ + float: left; + width: 40%; +} + +#authority_search_ahead_results +{ + width: 26em; +} + +#authority_preview +{ + width: 45%; + float: right; + background-color: #FFFFE0; + padding-left: 1em; + padding-right: 1em; + overflow: hidden; +} + + #authority_preview #header_left, + #authority_preview.request_left, + #authority_preview #stepwise_make_request + { + width: 95%; + } + /*------------------------------------------------ making a request / sign up / sign in */ #request_advice -{} +{ + float: right; + width: 250px; + margin-top: 1em; +} + #request_advice ul { - width: 26em; margin: 0 auto 0 auto; } #request_advice ul li { margin: 0 0 1em 0; } +#request_header +{ + background-color: #FFFFE0; + padding-top: 0.5em; + padding-bottom: 1em; +} + +#request_header_text +{ + font-size: 0.8em; + margin-left: 11em; +} + +#request_search_ahead_results +{ + font-size: 0.8em; + margin-left: 11em; +} + #request_form -{ margin-top: 4em;} +{ margin-top: 1em;} #request_form label, label.form_label @@ -952,10 +1010,6 @@ label.form_label padding: 0 10px 0 0; margin: 0 0 0 0; } - #request_form h1 label - { - font-size: 0.55em; - } .form_item_note, .form_note { @@ -1238,4 +1292,4 @@ div.lang { div#user_locale_switcher { margin: 5px; -}
\ No newline at end of file +} diff --git a/public/stylesheets/theme.css b/public/stylesheets/theme.css new file mode 100644 index 000000000..a00a1b21f --- /dev/null +++ b/public/stylesheets/theme.css @@ -0,0 +1,929 @@ +h1 { + color: #93278F; + font-size: 42px; + font-family: 'DeliciousBold', Arial, sans-serif; + margin-bottom:15px; + margin-top:10px; +} + +h2 a { + text-decoration: none; +} + +h2 a:hover { + text-decoration: underline; +} + +h2, dt { + color: #93278F; + font-size: 21px; + font-family: 'DeliciousBold', Arial, sans-serif; + font-weight:normal; +} + +h3 { + color: #6B3C6A; + font-family: 'DeliciousRoman', Arial, sans-serif; + font-weight: normal; + text-decoration: none; + font-size: 20px; + margin-top: 3px; + margin-bottom:10px; +} + +dd { + margin:18px 0px 36px 0px; + width:auto; +} + +dl { + margin-top:24px; + line-height:160%; +} + +div.controller_help dt:hover > a, div.controller_help h1:hover > a, div#help_unhappy h1:hover > a.hover_a { + color: #777; + font-family:Arial, sans-serif; +} + +a { + color: #93278F; + text-decoration: underline; +} + +body { + font-family: Arial, sans-serif; + color: #444444; + font-size: 12px; +} + +body.front { + background: url(/images/home-grad.png) repeat-x 0px 160px; +} + +#wrapper { + padding-top:160px; +} + +#banner { + background: url(/images/stripes.png); + border: none; + height:160px; +} + +#banner_inner { + width: 890px; + margin: auto; + position:relative; +} + +#banner_inner a#logo { + position:absolute; + left:0px; + top:70px; + z-index: 100; +} + +a img { + border: none +} + +#navigation_search { + width:auto; + right:0px; + top:10px; +} + +#navigation_search input[type=image] { + border: 0px; + margin-bottom: -9px; + margin-left: -4px; +} + +#navigation_search input[type=text] { + font-size: 12px; + padding:5px 5px 4px 5px; + border-color:#BE7DBC; + border-radius:5px 0px 0px 5px; + -moz-border-radius:5px 0px 0px 5px; +} + +#logged_in_bar { + top: 18px; + right:210px; + float:none; + position:absolute; +} + +#logged_in_bar a { + color: #93278F; +} + +div.lang { + top:40px; + position:absolute; + padding:0px; +} + +#topnav { + background: transparent; + top: 120px; + left: 115px; + font-family:'DeliciousRoman', Arial, sans-serif; + font-size: 18px; +} + +#topnav ul li a { + color: #6B3C6A !important; +} + +#topnav ul li { + padding:10px 15px; + margin: 0px 3px; +} + +#topnav ul li.selected { + background:#FFF; +} + +#topnav li a, #topnav li a:visited { + padding:0px; +} + +.request_left { + width: 625px; + float:left; +} + +.request_right { + padding-top:5px; + width: 245px; + float:left; +} + +#wrapper { + width: 900px; +} + +#content { + width: 875px; +} + +#stepwise_make_request { + background: url(/images/stripes.png); + border: 1px solid #DEBEDD; + border-radius:5px; + -moz-border-radius:5px; + font-family:'DeliciousRoman', Arial, sans-serif; + color: #6B3C6A; + font-size:18px; + padding:10px 12px; + text-align:left; + width: 412px; + margin-bottom:40px; +} + +#stepwise_make_request a img { + margin-bottom:-10px; + margin-top: -10px; + margin-left:6px; +} + +#stepwise_make_request strong { + color: #93278F; +} + +p.subtitle { + margin-top:10px; + margin-bottom:20px; + font-style: italic; +} + +.results_section { + margin-bottom:40px; +} + +.results_section div:last-child { + border-bottom-width:0px; + padding-bottom:0px; +} + +.request_listing, +.user_listing, +.body_listing { + border-bottom:1px solid #DDD; + padding:12px 0px 6px; + margin:0px; + margin-bottom:-1px; +} + +.body_listing { + padding-bottom:16px; +} + +.request_listing span.head, +.user_listing span.head, +.body_listing span.head { + background:none; + padding:0px; + font-size:21px; + margin-bottom:6px; +} + +.request_listing span.head a, +.user_listing span.head a, +.body_listing span.head a { + color: #6B3C6A; + font-family: 'DeliciousRoman', Arial, sans-serif; + font-weight: normal; + text-decoration: none; + font-size: 20px; + margin-top: 3px; + display: block; + margin-bottom: -6px; +} + +.request_listing span.head a:hover, +.user_listing span.head a:hover, +.body_listing span.head a:hover { + text-decoration: underline; +} + +.request_listing .requester { + font-size: 12px; + padding-bottom:0px; +} + +.request_listing .requester a { + text-decoration: underline; +} + +.body_listing span.desc, +.body_listing span.bottomline, +.user_listing span.bottomline { + padding:0px; + margin:0px; + font-style: normal; + font-size: 12px; + font-weight: normal !important; +} + +.request_listing span.bottomline { + padding: 3px 0px 0px 27px; + font-style: normal; + margin-bottom: 0px; + margin-top:12px; + background-position: top left; + font-size: 14px; + font-weight: normal !important; + min-height: 36px; +} + +.user_listing { + padding-top:10px; + padding-bottom:0px; +} + +.icon_requires_admin, +.icon_waiting_response_overdue, +.icon_waiting_response_very_overdue { + background-image: url(/images/status-overdue.png); + color: #C1272D; +} + +.icon_successful, +.icon_partially_successful { + background-image: url(/images/status-complete.png); + color: #69952F; +} + +.icon_waiting_response, +.icon_waiting_classification, +.icon_waiting_clarification { + background-image: url(/images/status-pending.png); + color: #A68C2E; +} + +.icon_failed, +.icon_rejected { + background-image: url(/images/status-denied.png); + color: #C1272D; +} + +.icon_not_held { + background-image: url(/images/status-not-held.png); + color: #A68C2E; +} + +.icon_gone_postal { + background-image: url(/images/status-gone-postal.png); + color: #A68C2E; +} + +.icon_error_message { + background-image: url(/images/status-error.png); + color: #C1272D; +} + +.icon_internal_review { + background-image: url(/images/status-internal-review.png); + color: #A68C2E; +} + +.icon_user_withdrawn { + background-image: url(/images/status-withdrawn.png); + color: #A68C2E; +} + +#request_sidebar { + width: 212px; + font-size: 12px; +} + +#request_sidebar h2 { + margin-bottom:10px; +} + +.feed_link { + padding: 4px 0px; +} + +.feed_link a { + text-decoration: none; +} + +.request_listing span.desc { + background: url(/images/quote-marks.png) no-repeat; + padding: 0px 0px 0px 40px; + min-height:60px; + font-size:12px; + width:auto; + color:#444; + line-height:18px; +} + +#footer { + border-color: #FFF; + margin-top:60px; +} + +#search_form { + margin:0px -6px 20px 0px; +} + +#advanced-search input[type=text] { + width: auto; +} + +#search_form input[type=submit] { + border-radius: 0px 2px 2px 0px; +} + +#header_left { + width:625px; + float:left; +} + +#header_right { + float:right; + width:230px; + padding-top:27px; +} + +.feed_link, +.act_link { + display:block !important; + margin-bottom:10px; +} + +.feed_link a, +.act_link a, +#header_right > a { + text-decoration: none; + color: #6B3C6A; +} + +.feed_link a:hover, +.act_link a:hover, +#header_right > a:hover { + text-decoration: underline; +} + +.feed_link a img, +.act_link img, +.act_link a img { + padding-right:2px; +} + +form.feed_form input[type="submit"] { + font-size: 12px; + line-height: 12px; + padding: 2px 4px; +} + +#header_right > br { + line-height:200%; +} + +#general_search h2 { + clear:both; + margin-top:20px; +} + +.highlight { + background:#FFFF00; + border-width:0px; +} + +h2.foi_results, +h2.person_results, +h2.publicbody_results { + padding-top:0px; + padding-bottom:15px; + margin-bottom:0px; + margin-top: 0px; +} + +h2.foi_results { + width: 600px; +} + +.list_toggle_controls { + padding-bottom:20px; +} + +#request_advice ol { + margin-left:18px; + margin-top:20px; + display:block; + padding:0px; +} + +#request_advice ol li { + padding-bottom:5px; +} + +#request_form label, +label.form_label { + width: 100px; + font-family: 'DeliciousRoman', Arial, sans-serif; +} + +#request_form label, +label.form_label, +span#to_public_body { + color: #6B3C6A; + font-size: 18px; +} + +#date_range label, +#filter_requests_form label { + display: inline; + float: none; + padding-right: 5px; +} + +#date_range label.title, +#filter_requests_form label.title, +h3.title { + display: inline-block; + float: none; + width:110px; +} + +h3.title { + width: 114px; + margin-bottom: 5px; +} + +#requests-subfilters div { + margin-top: 10px; +} + +#requests-subfilters #latest_status_0, +#requests-subfilters #request_variety_0 { + margin-left: 0px; +} + +#requests-subfilters input[type=checkbox] { + margin-left: 117px; +} + +.list-filter-item { + margin-bottom: 10px; +} + +span#to_public_body { + font-family: 'DeliciousBold', Arial, sans-serif; +} + +.form_item_note, .form_note { + margin-left:12em; +} + +#left_column { + width:600px; + float:left; +} + +#right_column { + width:220px; + float:right; + margin-top:30px; +} + +#left_half { + width:45%; + float:left; +} + +#right_half { + width:45%; + float:right; +} + +#middle_strip { + float: left; + width: 10%; + height: 100px; + text-align: center; + margin-top: 45px; + font-size: 16px; + font-family: Georgia; + font-style: italic; + color: #93278F; +} + +#signup, #signin { + float:none; + margin-top:20px; + width:auto; +} + +#sign_together h1 { + width: 320px; + text-align: center; +} + +#sign_together .form_button { + margin-left: 10.5em; +} + +#signup .form_item_note, #signin .form_note { + margin-left:11.5em; + width:24em; +} + +#request_form label, label.form_label { + margin-top:2px; + text-align:left; +} + +form input[type=text], +form input[type=password] { + font-size: 14px; + padding: 5px; + width:200px; + color: #555; + border-radius: 3px; + -moz-border-radius: 3px; + border-style: solid; + border-color: #BBB; + border-width: 1px; +} + +form input.use-datepicker[type=text] { + width: 130px !important; + background: url(/images/calendar.png) no-repeat 115px 3px; + margin: 0px !important; + border-radius:3px !important; + font-size: 14px !important; +} + +form input[type=submit], +a.link_button_green, +a.link_button_green_large, +span.close-button { + background: url(/images/button-gradient.png); + color: white; + text-decoration: none; + padding: 5px 11px; + display: inline-block; + line-height: 18px; + border: solid 1px #69952F; + border-radius: 2px; + text-shadow: 1px 1px 0px #5B841D; + font-family: 'DeliciousRoman', Arial, sans-serif; + font-size: 18px; + cursor: pointer; + cursor: hand; +} + +a.link_button_green_large { + background: url(/images/button-gradient-large.png); + font-size: 22px; + line-height: 22px; + padding-bottom: 7px; +} + +@-moz-document url-prefix() { + form input[type=submit], + a.link_button_green { + padding: 2px 11px; + margin-top:1px; + } +} + +form input[type=submit].small { + font-size: 15px; + padding: 4px 9px; + line-height: 10px; +} + +ul.no_bullets { + list-style-type:none; + margin:0px 0px 30px 0px; + padding:0px; +} + +ul.no_bullets li { + margin-bottom:6px; +} + +#contact_preamble { + margin: 0px 0px 30px 0px; + width:auto; +} + +#frontpage_search { + background:transparent; +} + +#public_body_list #right_column ul { + padding: 0px 0px 20px 0px; + margin: 0px; + list-style: none; +} + +div#twitter { + margin-top:30px; + background:#FFF; +} + +div.blog_post p { + line-height:180%; +} + +div.frontpage-box { + background: url(/images/stripes.png); + border: 1px solid #DEBEDD; + border-radius:5px; + -moz-border-radius:5px; + font-family:'DeliciousRoman', Arial, sans-serif; + color: #6B3C6A; + font-size:18px; + padding:15px 12px 0; + text-align:center; + width: 255px; + height: 210px; + float: left; +} + +#frontpage-box-1 { + margin-right: 10px; + vertical-align: middle; +} + +#frontpage-box-2 { + margin-right: 10px; +} + + +#bighand { + padding: 0; + margin: 0; + height: 210px; + background: url(/images/bighand.png) no-repeat scroll 0 bottom transparent; +} + +#littlehand { + padding: 0; + margin: 0; + height: 210px; + background: url(/images/littlehand.png) repeat-x scroll 10px bottom transparent; +} + +#frontpage-box-3 { +} + +#frontpage-box-3 #search_form input[type=text] { + width: 10em; +} + +#frontpage_examples p, +#frontpage_examples ul { + text-align: left; +} +#examples_1 ul li { + border-bottom: 1px solid #ddd; + padding: 5px 0 5px 0; +} + +#frontpage_examples .excerpt { + cursor: hand; + cursor: pointer; + background: url(/images/quote-marks.png) no-repeat; + padding: 0px 0px 0px 40px; + font-size:12px; + color:#444; + line-height:18px; + min-height: 30px; + font-style: italic; +} + +#set_photo { + background: url(/images/defaultprofilepic.png) +} + +div.correspondence { + width: 100%; + background: url(/images/stripes-70.png); + border-width: 0px; + font-size: 13px; +} + +/* ---------- Frontpage ----------- */ + +#frontpage_splash { + height: 375px; + margin-top: -12px; + margin-bottom: 20px; + width: 100%; + background: url(/images/flying-computer.png) no-repeat 175px bottom; +} + +#frontpage_splash #left_column { + line-height: 40px; + margin-top: 66px; +} + +#frontpage_splash h1 { + margin: 0px 0px 20px 0px; + font-family: 'DeliciousRoman', Arial, sans-serif; + font-size: 39px; + color: #6B3C6A; + font-weight:normal; +} + +#frontpage_splash h1 strong { + font-family: 'DeliciousHeavyRegular', Arial, sans-serif; + font-size: 54px; + color: #93278F; + font-weight: normal; +} + +#frontpage_splash h1 span { + font-family: Georgia; + font-style: italic; + font-weight:normal; + font-size: 25px; + color: #6B3C6A; +} + +#frontpage_splash #right_column { + width: 265px; +} + +#frontpage_splash h2 { + font-size: 26px; + font-weight:normal; + color: #6B3C6A; + font-family:'DeliciousRoman', Arial, sans-serif; + margin-bottom: 10px; + line-height: 28px; +} + +#frontpage_splash h2 strong { + font-size: 31px; + color: #93278F; + font-family:'DeliciousBold', Arial, sans-serif; +} + +#frontpage_splash h2 span { + color: #6B3C6A; + font-style: italic; + font-size: 19px; + font-family: Georgia; +} + +#frontpage_splash #right_column input[type=text] { + width: 180px; +} + +#frontpage_splash #frontpage_search_box { + margin-bottom: 30px; + margin-top: -10px; +} + +#frontpage_splash #frontpage_right_to_know p { + line-height: 20px; +} + +body.front h3 { + font-size: 28px; +} + +/* ---------- Calendar theme ----------- */ + +#ui-datepicker-div.ui-widget { + font-family: Arial, sans-serif; + color: #93278F; +} + +#ui-datepicker-div .ui-datepicker-header, +#ui-datepicker-div .ui-widget-header { + background: none; + border: solid 0px white; + color: #93278F; + font-family: 'DeliciousRoman'; + font-size: 17px; + font-weight: normal; + line-height: 1.5em !important; +} + +#ui-datepicker-div .ui-state-default { + background: #F2F2F2; + border: solid 0px #FFF; + border-radius: 2px; +} + +#ui-datepicker-div .ui-state-default:hover { + background: #DEB4D8; + color: #FFF; +} + +#ui-datepicker-div .ui-state-active { + background: #D093C7; + color: #FFF; +} + +#ui-datepicker-div .ui-icon-circle-triangle-w, +#ui-datepicker-div .ui-icon-circle-triangle-e { + background-image: url(/images/ui-icons-theme.png); +} + +#ui-datepicker-div .ui-datepicker-prev { + margin-top: 2px; + opacity: 0.5; +} + +#ui-datepicker-div .ui-datepicker-prev-hover { + left: 2px; + top: 2px; + border: none; + background:#FFF; + cursor:pointer; + opacity: 1; +} + +#ui-datepicker-div .ui-datepicker-next { + margin-top: 2px; + opacity: 0.5; +} + +#ui-datepicker-div .ui-datepicker-next-hover { + right: 2px; + top: 2px; + border: none; + background:#FFF; + cursor:pointer; + opacity: 1; +} + +#other-country-notice { + position: absolute; +} + +span.close-button { + cursor: pointer; + font-size: 1em; + padding: 0 1px 0 1px; + line-height: 1.1em; + font-family: Arial; +} +body.front #other-country-notice, +#other-country-notice { + display: none; +} + +p.public-body-name-prefix { + color: #DEB4D8; + margin-top: 15px; + margin-bottom: -15px; +} + +#authority_preview .public-body-name-prefix, +#authority_preview #list-filter, +#authority_preview h2.foi_results { + display: none; +}
\ No newline at end of file diff --git a/spec/controllers/admin_request_controller_spec.rb b/spec/controllers/admin_request_controller_spec.rb index 423c2fb49..6f9af0525 100644 --- a/spec/controllers/admin_request_controller_spec.rb +++ b/spec/controllers/admin_request_controller_spec.rb @@ -71,7 +71,7 @@ describe AdminRequestController, "when administering the holding pen" do post :redeliver_incoming, :redeliver_incoming_message_id => new_im.id, :url_title => ir.url_title ir = InfoRequest.find_by_url_title(ir.url_title) ir.incoming_messages.length.should == 2 - response.should redirect_to('http://test.host/admin/request/show/101') + response.should redirect_to(:controller=>'admin_request', :action=>'show', :id=>101) InfoRequest.holding_pen_request.incoming_messages.length.should == 0 end diff --git a/spec/controllers/general_controller_spec.rb b/spec/controllers/general_controller_spec.rb index 3640a8148..1ffbda90d 100644 --- a/spec/controllers/general_controller_spec.rb +++ b/spec/controllers/general_controller_spec.rb @@ -64,7 +64,7 @@ describe GeneralController, "when searching" do it "should redirect from search query URL to pretty URL" do post :search_redirect, :query => "mouse" # query hidden in POST parameters - response.should redirect_to(:action => 'search', :combined => "mouse") # URL /search/:query + response.should redirect_to(:action => 'search', :combined => "mouse", :view => "requests") # URL /search/:query/all end describe "when using different locale settings" do @@ -122,6 +122,34 @@ describe GeneralController, "when searching" do end + it "should filter results based on end of URL being 'all'" do + get :search, :combined => ['"bob"', "all"] + assigns[:xapian_requests].results.size.should == 2 + assigns[:xapian_users].results.size.should == 1 + assigns[:xapian_bodies].results.size.should == 0 + end + + it "should filter results based on end of URL being 'users'" do + get :search, :combined => ['"bob"', "users"] + assigns[:xapian_requests].should == nil + assigns[:xapian_users].results.size.should == 1 + assigns[:xapian_bodies].should == nil + end + + it "should filter results based on end of URL being 'requests'" do + get :search, :combined => ['"bob"', "requests"] + assigns[:xapian_requests].results.size.should == 2 + assigns[:xapian_users].should == nil + assigns[:xapian_bodies].should == nil + end + + it "should filter results based on end of URL being 'bodies'" do + get :search, :combined => ['"quango"', "bodies"] + assigns[:xapian_requests].should == nil + assigns[:xapian_users].should == nil + assigns[:xapian_bodies].results.size.should == 1 + end + it "should show help when searching for nothing" do get :search_redirect, :query => nil response.should render_template('search') diff --git a/spec/controllers/public_body_controller_spec.rb b/spec/controllers/public_body_controller_spec.rb index 0050678d2..c5c9d60e1 100644 --- a/spec/controllers/public_body_controller_spec.rb +++ b/spec/controllers/public_body_controller_spec.rb @@ -7,47 +7,54 @@ describe PublicBodyController, "when showing a body" do fixtures :public_bodies, :public_body_translations, :public_body_versions it "should be successful" do - get :show, :url_name => "dfh" + get :show, :url_name => "dfh", :view => 'all' response.should be_success end it "should render with 'show' template" do - get :show, :url_name => "dfh" + get :show, :url_name => "dfh", :view => 'all' response.should render_template('show') end it "should assign the body" do - get :show, :url_name => "dfh" + get :show, :url_name => "dfh", :view => 'all' assigns[:public_body].should == public_bodies(:humpadink_public_body) end + it "should assign the requests" do + get :show, :url_name => "tgq", :view => 'all' + assigns[:xapian_requests].results.count.should == 2 + get :show, :url_name => "tgq", :view => 'successful' + assigns[:xapian_requests].results.count.should == 0 + end + it "should assign the body using different locale from that used for url_name" do PublicBody.with_locale(:es) do - get :show, {:url_name => "dfh"} + get :show, {:url_name => "dfh", :view => 'all'} assigns[:public_body].notes.should == "Baguette" end end it "should assign the body using same locale as that used in url_name" do PublicBody.with_locale(:es) do - get :show, {:url_name => "edfh"} + get :show, {:url_name => "edfh", :view => 'all'} assigns[:public_body].notes.should == "Baguette" end end it "should redirect use to the relevant locale even when url_name is for a different locale" do ActionController::Routing::Routes.filters.clear - get :show, {:url_name => "edfh"} + get :show, {:url_name => "edfh", :view => 'all'} response.should redirect_to "http://test.host/body/dfh" end it "should redirect to newest name if you use historic name of public body in URL" do - get :show, :url_name => "hdink" + get :show, :url_name => "hdink", :view => 'all' response.should redirect_to(:controller => 'public_body', :action => 'show', :url_name => "dfh") end it "should redirect to lower case name if you use mixed case name in URL" do - get :show, :url_name => "dFh" + get :show, :url_name => "dFh", :view => 'all' response.should redirect_to(:controller => 'public_body', :action => 'show', :url_name => "dfh") end end @@ -68,7 +75,17 @@ describe PublicBodyController, "when listing bodies" do assigns[:public_bodies].should == [ public_bodies(:humpadink_public_body), public_bodies(:geraldine_public_body) ] assigns[:tag].should == "all" - assigns[:description].should == "all" + assigns[:description].should == "" + end + + it "should support simple searching of bodies by title" do + get :list, :public_body_query => 'quango' + assigns[:public_bodies].should == [ public_bodies(:geraldine_public_body) ] + end + + it "should support simple searching of bodies by notes" do + get :list, :public_body_query => 'Albatross' + assigns[:public_bodies].should == [ public_bodies(:humpadink_public_body) ] end it "should list bodies in alphabetical order with different locale" do @@ -77,7 +94,7 @@ describe PublicBodyController, "when listing bodies" do response.should render_template('list') assigns[:public_bodies].should == [ public_bodies(:geraldine_public_body), public_bodies(:humpadink_public_body) ] assigns[:tag].should == "all" - assigns[:description].should == "all" + assigns[:description].should == "" I18n.default_locale = :en end @@ -96,7 +113,7 @@ describe PublicBodyController, "when listing bodies" do get :list response.should render_template('list') - assigns[:public_bodies].should == [ public_bodies(:humpadink_public_body), public_bodies(:geraldine_public_body) ] + assigns[:public_bodies].count.should == 2 end @@ -128,7 +145,7 @@ describe PublicBodyController, "when showing JSON version for API" do fixtures :public_bodies, :public_body_translations it "should be successful" do - get :show, :url_name => "dfh", :format => "json" + get :show, :url_name => "dfh", :format => "json", :view => 'all' pb = JSON.parse(response.body) pb.class.to_s.should == 'Hash' @@ -139,6 +156,41 @@ describe PublicBodyController, "when showing JSON version for API" do end +describe PublicBodyController, "when doing type ahead searches" do + fixtures :info_requests, :info_request_events, :public_bodies, :public_body_translations, :users, :incoming_messages, :raw_emails, :outgoing_messages, :comments + + it "should return nothing for the empty query string" do + get :search_typeahead, :q => "" + response.should render_template('public_body/_search_ahead') + assigns[:xapian_requests].results.size.should == 0 + end + + it "should return a body matching the given keyword, but not users with a matching description" do + get :search_typeahead, :q => "Geraldine" + response.should render_template('public_body/_search_ahead') + assigns[:xapian_requests].results.size.should == 1 + assigns[:xapian_requests].results[0][:model].name.should == public_bodies(:geraldine_public_body).name + end + it "should return all requests matching any of the given keywords" do + get :search_typeahead, :q => "Geraldine Humpadinking" + response.should render_template('public_body/_search_ahead') + assigns[:xapian_requests].results.size.should == 2 + assigns[:xapian_requests].results[0][:model].name.should == public_bodies(:humpadink_public_body).name + assigns[:xapian_requests].results[1][:model].name.should == public_bodies(:geraldine_public_body).name + end + it "should return requests matching the given keywords in any of their locales" do + get :search_typeahead, :q => "baguette" # part of the spanish notes + response.should render_template('public_body/_search_ahead') + assigns[:xapian_requests].results.size.should == 1 + assigns[:xapian_requests].results[0][:model].name.should == public_bodies(:humpadink_public_body).name + end + it "should return partial matches" do + get :search_typeahead, :q => "geral" # 'geral' for 'Geraldine' + response.should render_template('public_body/_search_ahead') + assigns[:xapian_requests].results.size.should == 1 + assigns[:xapian_requests].results[0][:model].name.should == public_bodies(:geraldine_public_body).name + end +end diff --git a/spec/controllers/request_controller_spec.rb b/spec/controllers/request_controller_spec.rb index f69cf414c..63e86b525 100644 --- a/spec/controllers/request_controller_spec.rb +++ b/spec/controllers/request_controller_spec.rb @@ -1,7 +1,3 @@ -# £2k p/a -# talk about margins -# - require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') require 'json' @@ -24,13 +20,29 @@ describe RequestController, "when listing recent requests" do response.should render_template('list') end + it "should filter requests" do + get :list, :view => 'all' + assigns[:list_results].size.should == 2 + get :list, :view => 'successful' + assigns[:list_results].size.should == 0 + end + + it "should filter requests by date" do + get :list, :view => 'all', :request_date_before => '13/10/2007' + assigns[:list_results].size.should == 1 + get :list, :view => 'all', :request_date_after => '13/10/2007' + assigns[:list_results].size.should == 1 + get :list, :view => 'all', :request_date_after => '10/10/2007', :request_date_before => '01/01/2010' + assigns[:list_results].size.should == 2 + end + it "should assign the first page of results" do xap_results = mock_model(ActsAsXapian::Search, :results => (1..25).to_a.map { |m| { :model => m } }, :matches_estimated => 103) InfoRequest.should_receive(:full_search). - with([InfoRequestEvent],"variety:sent", "created_at", anything, anything, anything, anything). + with([InfoRequestEvent]," variety:sent", "created_at", anything, anything, anything, anything). and_return(xap_results) get :list, :view => 'recent' assigns[:list_results].size.should == 25 @@ -149,7 +161,7 @@ describe RequestController, "when showing one request" do lambda { get :get_attachment, :incoming_message_id => ir.incoming_messages[1].id, :id => ir.id, :part => 2, :file_name => ['http://trying.to.hack'] - }.should raise_error(RuntimeError) + }.should raise_error(ActiveRecord::RecordNotFound) end it "should censor attachments downloaded as binary" do @@ -337,7 +349,20 @@ describe RequestController, "when creating a new request" do response.should render_template('new') end + it "should redirect to sign in page when input is good and nobody is logged in" do + params = { :info_request => { :public_body_id => @body.id, + :title => "Why is your quango called Geraldine?", :tag_string => "" }, + :outgoing_message => { :body => "This is a silly letter. It is too short to be interesting." }, + :submitted_new_request => 1, :preview => 0 + } + post :new, params + post_redirect = PostRedirect.get_last_post_redirect + response.should redirect_to(:controller => 'user', :action => 'signin', :token => post_redirect.token) + # post_redirect.post_params.should == params # XXX get this working. there's a : vs '' problem amongst others + end + it "should show preview when input is good" do + session[:user_id] = @user.id post :new, { :info_request => { :public_body_id => @body.id, :title => "Why is your quango called Geraldine?", :tag_string => "" }, :outgoing_message => { :body => "This is a silly letter. It is too short to be interesting." }, @@ -355,18 +380,6 @@ describe RequestController, "when creating a new request" do response.should render_template('new') end - it "should redirect to sign in page when input is good and nobody is logged in" do - params = { :info_request => { :public_body_id => @body.id, - :title => "Why is your quango called Geraldine?", :tag_string => "" }, - :outgoing_message => { :body => "This is a silly letter. It is too short to be interesting." }, - :submitted_new_request => 1, :preview => 0 - } - post :new, params - post_redirect = PostRedirect.get_last_post_redirect - response.should redirect_to(:controller => 'user', :action => 'signin', :token => post_redirect.token) - # post_redirect.post_params.should == params # XXX get this working. there's a : vs '' problem amongst others - end - it "should create the request and outgoing message, and send the outgoing message by email, and redirect to request page when input is good and somebody is logged in" do session[:user_id] = @user.id post :new, :info_request => { :public_body_id => @body.id, @@ -438,6 +451,7 @@ describe RequestController, "when making a new request" do @user.stub!(:get_undescribed_requests).and_return([]) @user.stub!(:can_leave_requests_undescribed?).and_return(false) @user.stub!(:can_file_requests?).and_return(true) + @user.stub!(:locale).and_return("en") User.stub!(:find).and_return(@user) @body = mock_model(PublicBody, :id => 314, :eir_only? => false, :is_requestable? => true, :name => "Test Quango") @@ -735,18 +749,16 @@ describe RequestController, "when classifying an information request" do response.should redirect_to(:controller => 'help', :action => 'unhappy', :url_title => @dog_request.url_title) end - describe "when using custom statuses from the theme" do + it "knows about extended states" do InfoRequest.send(:require, File.expand_path(File.join(File.dirname(__FILE__), '..', 'models', 'customstates'))) InfoRequest.send(:include, InfoRequestCustomStates) InfoRequest.class_eval('@@custom_states_loaded = true') RequestController.send(:require, File.expand_path(File.join(File.dirname(__FILE__), '..', 'models', 'customstates'))) RequestController.send(:include, RequestControllerCustomStates) RequestController.class_eval('@@custom_states_loaded = true') - it "knows about extended states" do - Time.stub!(:now).and_return(Time.utc(2007, 11, 10, 00, 01)) - post_status('deadline_extended') - flash[:notice].should == 'Authority has requested extension of the deadline.' - end + Time.stub!(:now).and_return(Time.utc(2007, 11, 10, 00, 01)) + post_status('deadline_extended') + flash[:notice].should == 'Authority has requested extension of the deadline.' end end @@ -1309,5 +1321,36 @@ describe RequestController, "when showing JSON version for API" do end +describe RequestController, "when doing type ahead searches" do + fixtures :info_requests, :info_request_events, :public_bodies, :public_body_translations, :users, :incoming_messages, :raw_emails, :outgoing_messages, :comments + + it "should return nothing for the empty query string" do + get :search_typeahead, :q => "" + response.should render_template('request/_search_ahead.rhtml') + assigns[:xapian_requests].results.size.should == 0 + end + + it "should return a request matching the given keyword, but not users with a matching description" do + get :search_typeahead, :q => "chicken" + response.should render_template('request/_search_ahead.rhtml') + assigns[:xapian_requests].results.size.should == 1 + assigns[:xapian_requests].results[0][:model].title.should == info_requests(:naughty_chicken_request).title + end + + it "should return all requests matching any of the given keywords" do + get :search_typeahead, :q => "money dog" + response.should render_template('request/_search_ahead.rhtml') + assigns[:xapian_requests].results.size.should == 2 + assigns[:xapian_requests].results[0][:model].title.should == info_requests(:fancy_dog_request).title + assigns[:xapian_requests].results[1][:model].title.should == info_requests(:naughty_chicken_request).title + end + + it "should return partial matches" do + get :search_typeahead, :q => "chick" # 'chick' for 'chicken' + response.should render_template('request/_search_ahead.rhtml') + assigns[:xapian_requests].results.size.should == 1 + assigns[:xapian_requests].results[0][:model].title.should == info_requests(:naughty_chicken_request).title + end +end diff --git a/spec/controllers/services_controller_spec.rb b/spec/controllers/services_controller_spec.rb new file mode 100644 index 000000000..1bafd0c8f --- /dev/null +++ b/spec/controllers/services_controller_spec.rb @@ -0,0 +1,31 @@ +require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') + +describe ServicesController, "when using web services" do + integrate_views + + it "should show no alaveteli message when in the deployed country" do + config = MySociety::Config.load_default() + config['ISO_COUNTRY_CODE'] = "DE" + controller.stub!(:country_from_ip).and_return('DE') + get :other_country_message + response.body.should == "" + end + + it "should show an alaveteli message when not in the deployed country and in a country with no FOI website" do + config = MySociety::Config.load_default() + config['ISO_COUNTRY_CODE'] = "DE" + controller.stub!(:country_from_ip).and_return('ZZ') + get :other_country_message + response.body.should match(/outside Germany/) + end + + it "should show link to other FOI website when not in the deployed country" do + config = MySociety::Config.load_default() + config['ISO_COUNTRY_CODE'] = "ZZ" + controller.stub!(:country_from_ip).and_return('DE') + get :other_country_message + response.body.should match(/within Germany/) + end + + +end diff --git a/spec/controllers/track_controller_spec.rb b/spec/controllers/track_controller_spec.rb index 2f3f903f9..8c2e19c58 100644 --- a/spec/controllers/track_controller_spec.rb +++ b/spec/controllers/track_controller_spec.rb @@ -16,6 +16,7 @@ describe TrackController, "when making a new track on a request" do @user = mock_model(User) User.stub!(:find).and_return(@user) + @user.stub!(:locale).and_return("en") end it "should require login when making new track" do @@ -69,7 +70,6 @@ describe TrackController, "when sending alerts for a track" do mail.body.should include('added an annotation') # comment included mail.body.should =~ /This a the daftest comment the world has ever seen/ # comment text included - # Check subscription managing link # XXX We can't do this, as it is redirecting to another controller. I'm # apparently meant to be writing controller unit tests here, not functional @@ -93,6 +93,19 @@ describe TrackController, "when sending alerts for a track" do deliveries.size.should == 0 end + it "should send localised alerts" do + # set the time the comment event happened at to within the last week + ire = info_request_events(:silly_comment_event) + ire.created_at = Time.now - 3.days + ire.save! + user = users(:silly_name_user) + user.locale = "es" + user.save! + TrackMailer.alert_tracks + deliveries = ActionMailer::Base.deliveries + mail = deliveries[0] + mail.body.should include('el equipo de ') + end end describe TrackController, "when viewing RSS feed for a track" do diff --git a/spec/controllers/user_controller_spec.rb b/spec/controllers/user_controller_spec.rb index 438fb8c0c..0ba542630 100644 --- a/spec/controllers/user_controller_spec.rb +++ b/spec/controllers/user_controller_spec.rb @@ -32,6 +32,13 @@ describe UserController, "when showing a user" do assigns[:display_user].should == users(:bob_smith_user) end + it "should search the user's contributions" do + get :show, :url_name => "bob_smith" + assigns[:xapian_requests].results.count.should == 2 + get :show, :url_name => "bob_smith", :user_query => "money" + assigns[:xapian_requests].results.count.should == 1 + end + # Error handling not quite good enough for this yet # it "should not show unconfirmed users" do # get :show, :url_name => "silly_emnameem" @@ -171,6 +178,19 @@ describe UserController, "when signing up" do deliveries[0].body.should include("not reveal your email") end + it "should send confirmation mail in other languages or different locales" do + session[:locale] = "es" + post :signup, {:user_signup => { :email => 'new@localhost', :name => 'New Person', + :password => 'sillypassword', :password_confirmation => 'sillypassword', + } + } + response.should render_template('confirm') + + deliveries = ActionMailer::Base.deliveries + deliveries.size.should == 1 + deliveries[0].body.should include("No revelaremos su dirección de correo") + end + it "should send special 'already signed up' mail if you fill the form in with existing registered email " do post :signup, { :user_signup => { :email => 'silly@localhost', :name => 'New Person', :password => 'sillypassword', :password_confirmation => 'sillypassword' } diff --git a/spec/fixtures/users.yml b/spec/fixtures/users.yml index 2485c95a0..c54ac0985 100644 --- a/spec/fixtures/users.yml +++ b/spec/fixtures/users.yml @@ -10,6 +10,7 @@ bob_smith_user: email_confirmed: true admin_level: 'none' ban_text: '' + locale: 'en' about_me: 'I like making requests about fancy dogs and naughty chickens and stuff.' silly_name_user: id: "2" @@ -23,6 +24,7 @@ silly_name_user: email_confirmed: false admin_level: 'none' ban_text: '' + locale: 'en' about_me: '' admin_user: id: "3" @@ -36,4 +38,5 @@ admin_user: email_confirmed: false admin_level: 'super' ban_text: '' + locale: '' about_me: '' diff --git a/spec/integration/errors_spec.rb b/spec/integration/errors_spec.rb new file mode 100644 index 000000000..c64ca79e8 --- /dev/null +++ b/spec/integration/errors_spec.rb @@ -0,0 +1,45 @@ +require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') + +describe "When rendering errors" do + + fixtures [ :info_requests, + :info_request_events, + :public_bodies, + :public_body_translations, + :users, + :raw_emails, + :outgoing_messages, + :incoming_messages, + :comments ] + + before(:each) do + load_raw_emails_data(raw_emails) + ActionController::Base.consider_all_requests_local = false + end + + after(:each) do + ActionController::Base.consider_all_requests_local = true + end + + it "should render a 404 for unrouteable URLs" do + get("/frobsnasm") + response.code.should == "404" + response.body.should include("The page doesn't exist") + end + it "should render a 404 for users that don't exist" do + get("/user/wobsnasm") + response.code.should == "404" + end + it "should render a 404 for bodies that don't exist" do + get("/body/wobsnasm") + response.code.should == "404" + end + it "should render a 500 for general errors" do + ir = info_requests(:naughty_chicken_request) + # Set an invalid state for the request. Note that update_attribute doesn't run the validations + ir.update_attribute(:described_state, "crotchety") + get("/request/#{ir.url_title}") + response.code.should == "500" + end +end + diff --git a/spec/integration/search_request_spec.rb b/spec/integration/search_request_spec.rb index 9398519b7..25c091111 100644 --- a/spec/integration/search_request_spec.rb +++ b/spec/integration/search_request_spec.rb @@ -1,9 +1,62 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe "When searching" do + + fixtures [ :info_requests, + :info_request_events, + :public_bodies, + :public_body_translations, + :users, + :raw_emails, + :outgoing_messages, + :incoming_messages, + :comments ] + + before(:each) do + load_raw_emails_data(raw_emails) + end + it "should not strip quotes from quoted query" do request_via_redirect("post", "/search", :query => '"mouse stilton"') response.body.should include(""mouse stilton"") end + + it "should correctly execute simple search" do + request_via_redirect("post", "/search", + :query => 'bob' + ) + response.body.should include("FOI requests") + end + + it "should correctly filter searches for requests" do + request_via_redirect("post", "/search/bob/requests") + response.body.should_not include("One person found") + response.body.should include("FOI requests 1 to 2 of 2") + end + it "should correctly filter searches for users" do + request_via_redirect("post", "/search/bob/users") + response.body.should include("One person found") + response.body.should_not include("FOI requests 1 to 2 of 2") + end + + it "should correctly filter searches for successful requests" do + request_via_redirect("post", "/search", + :query => "bob", + :latest_status => ['successful']) + response.body.should include("no requests matching your query") + end + + it "should correctly filter searches for comments" do + request_via_redirect("post", "/search", + :query => "daftest", + :request_variety => ['comments']) + response.body.should include("One FOI request found") + + request_via_redirect("post", "/search", + :query => "daftest", + :request_variety => ['response','sent']) + response.body.should include("no requests matching your query") + end + end diff --git a/spec/models/customstates.rb b/spec/models/customstates.rb index 406d4ead9..3488e6730 100644 --- a/spec/models/customstates.rb +++ b/spec/models/customstates.rb @@ -5,16 +5,6 @@ module InfoRequestCustomStates end # Mixin methods for InfoRequest - def theme_display_status(status) - if status == 'deadline_extended' - _("Deadline extended.") - elsif status == 'wrong_response' - _("Wrong Response.") - else - raise _("unknown status ") + status - end - end - def theme_calculate_status return 'waiting_classification' if self.awaiting_description waiting_response = self.described_state == "waiting_response" || self.described_state == "deadline_extended" @@ -41,6 +31,16 @@ module InfoRequestCustomStates end module ClassMethods + def theme_display_status(status) + if status == 'deadline_extended' + _("Deadline extended.") + elsif status == 'wrong_response' + _("Wrong Response.") + else + raise _("unknown status ") + status + end + end + def theme_extra_states return ['deadline_extended', 'wrong_response'] diff --git a/spec/models/track_mailer_spec.rb b/spec/models/track_mailer_spec.rb index 828904d02..b90ca7e52 100644 --- a/spec/models/track_mailer_spec.rb +++ b/spec/models/track_mailer_spec.rb @@ -21,7 +21,8 @@ describe TrackMailer do @user = mock_model(User, :no_xapian_reindex= => false, :last_daily_track_email= => true, :save! => true, - :url_name => 'test-name') + :url_name => 'test-name', + :get_locale => 'en') User.stub!(:find).and_return([@user]) @user.stub!(:no_xapian_reindex=) end diff --git a/spec/models/track_thing_spec.rb b/spec/models/track_thing_spec.rb index 6b9cd6d4a..1a0324a78 100644 --- a/spec/models/track_thing_spec.rb +++ b/spec/models/track_thing_spec.rb @@ -28,5 +28,15 @@ describe TrackThing, "when tracking changes" do found_track.should == @track_thing end + it "will make some sane descriptions of search-based tracks" do + tests = [['bob variety:user', "users matching text 'bob'"], + ['bob (variety:sent OR variety:followup_sent OR variety:response OR variety:comment) (latest_status:successful OR latest_status:partially_successful OR latest_status:rejected OR latest_status:not_held)', "requests which are successful or unsuccessful or comments matching text 'bob'"], + ['(latest_status:waiting_response OR latest_status:waiting_clarification OR waiting_classification:true)', 'requests which are awaiting a response']] + for query, description in tests + track_thing = TrackThing.create_track_for_search_query(query) + track_thing.track_query_description.should == description + end + end + end diff --git a/spec/views/public_body/show.rhtml_spec.rb b/spec/views/public_body/show.rhtml_spec.rb index 7793b9b38..797923c5d 100644 --- a/spec/views/public_body/show.rhtml_spec.rb +++ b/spec/views/public_body/show.rhtml_spec.rb @@ -1,7 +1,6 @@ require File.dirname(__FILE__) + '/../../spec_helper' describe "when viewing a body" do - before do @pb = mock_model(PublicBody, :name => 'Test Quango', @@ -28,6 +27,8 @@ describe "when viewing a body" do assigns[:xapian_requests] = @xap assigns[:page] = 1 assigns[:per_page] = 10 + # work round a bug in ActionController::TestRequest; allows request.query_string to work in the template + request.env["REQUEST_URI"] = "" end it "should be successful" do @@ -51,7 +52,7 @@ describe "when viewing a body" do end it "should cope with no results" do - @xap.stub!(:results).and_return([]) + @pb.stub!(:info_requests).and_return([]) render "public_body/show" response.should have_tag("p", /Nobody has made any Freedom of Information requests/m) end @@ -67,10 +68,10 @@ describe "when viewing a body" do @pb.stub!(:get_tag_values).and_return(['98765', '12345']) render "public_body/show" - response.should have_tag("div#request_sidebar") do + response.should have_tag("div#header_right") do with_tag("a[href*=?]", /charity-commission.gov.uk.*RegisteredCharityNumber=98765$/) end - response.should have_tag("div#request_sidebar") do + response.should have_tag("div#header_right") do with_tag("a[href*=?]", /charity-commission.gov.uk.*RegisteredCharityNumber=12345$/) end end @@ -80,7 +81,7 @@ describe "when viewing a body" do @pb.stub!(:get_tag_values).and_return(['SC1234']) render "public_body/show" - response.should have_tag("div#request_sidebar") do + response.should have_tag("div#header_right") do with_tag("a[href*=?]", /www.oscr.org.uk.*id=SC1234$/) end end @@ -88,7 +89,7 @@ describe "when viewing a body" do it "should not link to Charity Commission site if we don't have number" do render "public_body/show" - response.should have_tag("div#request_sidebar") do + response.should have_tag("div#header_right") do without_tag("a[href*=?]", /charity-commission.gov.uk/) end end diff --git a/spec/views/request/list.rhtml_spec.rb b/spec/views/request/list.rhtml_spec.rb index 578bd5cc8..60a28eec5 100644 --- a/spec/views/request/list.rhtml_spec.rb +++ b/spec/views/request/list.rhtml_spec.rb @@ -5,7 +5,8 @@ describe "when listing recent requests" do before do assigns[:page] = 1 assigns[:per_page] = 10 - + # work round a bug in ActionController::TestRequest; allows request.query_string to work in the template + request.env["REQUEST_URI"] = "" # we're not testing the interlock plugin's cache template.stub!(:view_cache).and_yield end @@ -32,9 +33,7 @@ describe "when listing recent requests" do it "should be successful" do assigns[:list_results] = [ make_mock_event, make_mock_event ] assigns[:matches_estimated] = 2 - render "request/list" - response.should have_tag("div.request_listing") response.should_not have_tag("p", /No requests of this sort yet/m) end @@ -42,7 +41,6 @@ describe "when listing recent requests" do it "should cope with no results" do assigns[:list_results] = [ ] assigns[:matches_estimated] = 0 - render "request/list" response.should have_tag("p", /No requests of this sort yet/m) response.should_not have_tag("div.request_listing") diff --git a/vendor/gems/fast_gettext-0.5.10/.specification b/vendor/gems/fast_gettext-0.5.10/.specification index 7e1bcf3dc..7e241fff7 100644 --- a/vendor/gems/fast_gettext-0.5.10/.specification +++ b/vendor/gems/fast_gettext-0.5.10/.specification @@ -2,7 +2,7 @@ name: fast_gettext version: !ruby/object:Gem::Version hash: 31 - prerelease: false + prerelease: segments: - 0 - 5 @@ -127,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement requirements: [] rubyforge_project: -rubygems_version: 1.3.7 +rubygems_version: 1.4.2 signing_key: specification_version: 3 summary: A simple, fast and threadsafe implementation of GetText diff --git a/vendor/gems/gettext-2.1.0/.specification b/vendor/gems/gettext-2.1.0/.specification index 43cf26fff..d318db351 100644 --- a/vendor/gems/gettext-2.1.0/.specification +++ b/vendor/gems/gettext-2.1.0/.specification @@ -1,6 +1,12 @@ --- !ruby/object:Gem::Specification name: gettext version: !ruby/object:Gem::Version + hash: 11 + prerelease: + segments: + - 2 + - 1 + - 0 version: 2.1.0 platform: ruby authors: @@ -14,15 +20,21 @@ default_executable: dependencies: - !ruby/object:Gem::Dependency name: locale - type: :runtime - version_requirement: - version_requirements: !ruby/object:Gem::Requirement + prerelease: false + requirement: &id001 !ruby/object:Gem::Requirement + none: false requirements: - - ">=" - !ruby/object:Gem::Version + hash: 5 + segments: + - 2 + - 0 + - 5 version: 2.0.5 - version: -description: Ruby-GetText-Package is a GNU GetText-like program for Ruby. The catalog file(po-file) is same format with GNU GetText. So you can use GNU GetText tools for maintaining. + type: :runtime + version_requirements: *id001 +description: " Ruby-GetText-Package is a GNU GetText-like program for Ruby.\n The catalog file(po-file) is same format with GNU GetText.\n So you can use GNU GetText tools for maintaining.\n" email: mutomasa at gmail.com executables: - rmsgmerge @@ -791,27 +803,35 @@ files: - samples/hello.rb has_rdoc: true homepage: http://gettext.rubyforge.org/ +licenses: [] + post_install_message: rdoc_options: [] require_paths: - lib required_ruby_version: !ruby/object:Gem::Requirement + none: false requirements: - - ">=" - !ruby/object:Gem::Version + hash: 3 + segments: + - 0 version: "0" - version: required_rubygems_version: !ruby/object:Gem::Requirement + none: false requirements: - - ">=" - !ruby/object:Gem::Version + hash: 3 + segments: + - 0 version: "0" - version: requirements: [] rubyforge_project: gettext -rubygems_version: 1.2.0 +rubygems_version: 1.4.2 signing_key: specification_version: 3 summary: Ruby-GetText-Package is a libary and tools to localize messages. diff --git a/vendor/gems/json-1.5.1/.specification b/vendor/gems/json-1.5.1/.specification index 26813246a..323455f68 100644 --- a/vendor/gems/json-1.5.1/.specification +++ b/vendor/gems/json-1.5.1/.specification @@ -36,6 +36,7 @@ post_install_message: rdoc_options: [] require_paths: +- bin - lib required_ruby_version: !ruby/object:Gem::Requirement requirements: @@ -56,10 +57,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement requirements: [] rubyforge_project: json -rubygems_version: 1.3.7 +rubygems_version: 1.4.2 signing_key: specification_version: 3 summary: JSON Implementation for Ruby test_files: [] - diff --git a/vendor/gems/locale-2.0.5/.specification b/vendor/gems/locale-2.0.5/.specification index 7d3263441..0150358f4 100644 --- a/vendor/gems/locale-2.0.5/.specification +++ b/vendor/gems/locale-2.0.5/.specification @@ -1,6 +1,12 @@ --- !ruby/object:Gem::Specification name: locale version: !ruby/object:Gem::Version + hash: 5 + prerelease: + segments: + - 2 + - 0 + - 5 version: 2.0.5 platform: ruby authors: @@ -13,7 +19,7 @@ date: 2009-11-13 00:00:00 +00:00 default_executable: dependencies: [] -description: Ruby-Locale is the pure ruby library which provides basic APIs for localization. +description: " Ruby-Locale is the pure ruby library which provides basic APIs for localization.\n" email: mutomasa at gmail.com executables: [] @@ -70,27 +76,35 @@ files: - samples/sample_1.rb has_rdoc: true homepage: http://locale.rubyforge.org/ +licenses: [] + post_install_message: rdoc_options: [] require_paths: - lib required_ruby_version: !ruby/object:Gem::Requirement + none: false requirements: - - ">=" - !ruby/object:Gem::Version + hash: 3 + segments: + - 0 version: "0" - version: required_rubygems_version: !ruby/object:Gem::Requirement + none: false requirements: - - ">=" - !ruby/object:Gem::Version + hash: 3 + segments: + - 0 version: "0" - version: requirements: [] rubyforge_project: locale -rubygems_version: 1.2.0 +rubygems_version: 1.4.2 signing_key: specification_version: 3 summary: Ruby-Locale is the pure ruby library which provides basic APIs for localization. diff --git a/vendor/gems/rack-1.1.0/.specification b/vendor/gems/rack-1.1.0/.specification index 1e78d1e42..b0c27ec96 100644 --- a/vendor/gems/rack-1.1.0/.specification +++ b/vendor/gems/rack-1.1.0/.specification @@ -263,7 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement requirements: [] rubyforge_project: rack -rubygems_version: 1.3.7 +rubygems_version: 1.4.2 signing_key: specification_version: 3 summary: a modular Ruby webserver interface diff --git a/vendor/gems/recaptcha-0.3.1/.specification b/vendor/gems/recaptcha-0.3.1/.specification index b7234754d..d021eabbb 100644 --- a/vendor/gems/recaptcha-0.3.1/.specification +++ b/vendor/gems/recaptcha-0.3.1/.specification @@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement requirements: [] rubyforge_project: -rubygems_version: 1.3.7 +rubygems_version: 1.4.2 signing_key: specification_version: 3 summary: Helpers for the reCAPTCHA API diff --git a/vendor/gems/rspec-1.3.1/.specification b/vendor/gems/rspec-1.3.1/.specification index bdc08e236..3022d067d 100644 --- a/vendor/gems/rspec-1.3.1/.specification +++ b/vendor/gems/rspec-1.3.1/.specification @@ -566,7 +566,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement requirements: [] rubyforge_project: rspec -rubygems_version: 1.3.7 +rubygems_version: 1.4.2 signing_key: specification_version: 3 summary: rspec 1.3.1 diff --git a/vendor/gems/rspec-rails-1.3.3/.specification b/vendor/gems/rspec-rails-1.3.3/.specification index d6eb1f0b7..f1f280090 100644 --- a/vendor/gems/rspec-rails-1.3.3/.specification +++ b/vendor/gems/rspec-rails-1.3.3/.specification @@ -305,7 +305,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement requirements: [] rubyforge_project: rspec -rubygems_version: 1.3.7 +rubygems_version: 1.4.2 signing_key: specification_version: 3 summary: rspec-rails 1.3.3 diff --git a/vendor/gems/will_paginate-2.3.15/.specification b/vendor/gems/will_paginate-2.3.15/.specification index 68e2cfca2..c1f3064e2 100644 --- a/vendor/gems/will_paginate-2.3.15/.specification +++ b/vendor/gems/will_paginate-2.3.15/.specification @@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement requirements: [] rubyforge_project: -rubygems_version: 1.3.7 +rubygems_version: 1.4.2 signing_key: specification_version: 3 summary: Pagination for Rails diff --git a/vendor/plugins/action_mailer_layouts/CHANGELOG b/vendor/plugins/action_mailer_layouts/CHANGELOG deleted file mode 100644 index 0b3f47667..000000000 --- a/vendor/plugins/action_mailer_layouts/CHANGELOG +++ /dev/null @@ -1,21 +0,0 @@ -2008-06-03 -* Added support for Rails 2.0 and 2.1. Thanks to Scott Windsor. - -2008-02-08 -* Added support for *.<format>.erb layouts and templates. Thanks to Eric Wollensen. - -2007-12-20 -* Fixed a bug present when specifying the layout with a string (eg: layout 'subdir/layout_template') in a multipart mail, which caused the plugin to only render one part and not the other. Thanks to Andres Koetsier. - -2007-12-12 -* Now works with Rails 2.0. - -2007-11-27 -* Now supports helpers defined in the mailer class. Thanks to Marshall Roch. - -2007-24-07 -* Now requires actionmailer-1.3.3. - -2007-05-07 -* No longer have to specify a :layout. The layout name is now inferred from the mailer class name. Thanks to Peter Boctor. -* Helper methods are now available to action mailer layouts. Thanks to Peter Boctor.
\ No newline at end of file diff --git a/vendor/plugins/action_mailer_layouts/README b/vendor/plugins/action_mailer_layouts/README deleted file mode 100644 index 92b19a69d..000000000 --- a/vendor/plugins/action_mailer_layouts/README +++ /dev/null @@ -1,35 +0,0 @@ -== Action Mailer Layouts - -Original Homepage: http://cardboardrocket.com/pages/action_mailer_layouts -Original svn: http://svn.cardboardrocket.com/action_mailer_layouts - -A plugin to enable layouts for ActionMailer templates. - -Adds a new 'layout' property to the ActionMailer::Base class. Specify the name -of the layout you want to use. The plugin will look in app/views/layouts for your -layout. If no layout is specified, the plugin will look for a layout that matches -the name of your mailer class. - -For example: - -If your mailer class is called UserNotifier and you are rendering the activation.rhtml -template, then the plugin will attempt to load the user_notifier.rhtml layout. If you are -rendering the activation.text.html.rhtml template, the plugin will look for the -user_notifier.text.html.rhtml layout. In other words, the plugin attempts to load the -layout named after the your ActionMailer class. - -You can overload this behavior by setting the layout property of your mailer: - -class UserNotfier < ActionMailer::Base - def activation(user) - @recipients = user.email - @from = 'you@domain.com' - @sent_on = Time.now - @subject = 'Activate your account!' - @layout = :email - end -end - -This arrangement will cause the plugin to render the content in -views/user_notifier/activation.text.html.rhtml in the views/layouts/email.text.html.rhtml -layout.
\ No newline at end of file diff --git a/vendor/plugins/action_mailer_layouts/init.rb b/vendor/plugins/action_mailer_layouts/init.rb deleted file mode 100644 index 8289c4eb9..000000000 --- a/vendor/plugins/action_mailer_layouts/init.rb +++ /dev/null @@ -1,7 +0,0 @@ -begin - require File.join(File.dirname(__FILE__), 'plugin.rb') - ActionController::Base.logger.fatal '** Loaded layouts plugin for ActionMailer' -rescue Exception => e - puts e.inspect - ActionController::Base.logger.fatal e if ActionController::Base.logger -end
\ No newline at end of file diff --git a/vendor/plugins/action_mailer_layouts/plugin.rb b/vendor/plugins/action_mailer_layouts/plugin.rb deleted file mode 100644 index ef0cbc37c..000000000 --- a/vendor/plugins/action_mailer_layouts/plugin.rb +++ /dev/null @@ -1,48 +0,0 @@ -module ActionMailer - class Base - - # Specify the layout name - adv_attr_accessor :layout - - alias_method :render_message_without_layouts, :render_message - - def render_message(method_name, body) - layout = @layout ? @layout.to_s.clone : self.class.to_s.underscore - - filename = if method_name.respond_to?(:filename) - method_name.filename - else - method_name - end - - md = /([^\.]+)\.([^\.]+\.[^\.]+)\.(erb|rhtml|rxml)$/.match(filename) - - layout << ".#{md.captures[1]}" if md && md.captures[1] - layout << ".#{md.captures[2]}" if md && md.captures[2] - - if File.exists?(File.join(layouts_path, layout)) - body[:content_for_layout] = render_message_without_layouts(method_name, body) - - # TODO: extract content_for blocks and somehow put them in body[:content_for_...] - - initialize_layout_template_class(body).render(:file => "/#{layout}") - else - render_message_without_layouts(method_name, body) - end - end - - def initialize_layout_template_class(assigns) - # for Rails 2.1 (and greater), we have to process view paths first! - ActionView::TemplateFinder.process_view_paths(layouts_path) if defined?(ActionView::TemplateFinder) - - returning(template = ActionView::Base.new(layouts_path, assigns, self)) do - template.extend self.class.master_helper_module - template.extend ActionView::Helpers::CaptureHelper - end - end - - def layouts_path - File.join(template_root, 'layouts') - end - end -end
\ No newline at end of file diff --git a/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb b/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb index 43f0764ca..4671b79da 100644 --- a/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb +++ b/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb @@ -668,8 +668,8 @@ module ActsAsXapian self.class.to_s + "-" + self.id.to_s end - def xapian_value(field, type = nil) - if self.respond_to?("translations") + def xapian_value(field, type = nil, index_translations = false) + if index_translations && self.respond_to?("translations") if type == :date or type == :boolean value = single_xapian_value(field, type = type) else @@ -756,7 +756,7 @@ module ActsAsXapian for text in self.xapian_options[:texts] ActsAsXapian.term_generator.increase_termpos # stop phrases spanning different text fields # XXX the "1" here is a weight that could be varied for a boost function - ActsAsXapian.term_generator.index_text(xapian_value(text), 1) + ActsAsXapian.term_generator.index_text(xapian_value(text, nil, true), 1) end end |
