diff options
163 files changed, 6581 insertions, 984 deletions
@@ -29,7 +29,6 @@ then \. "${rvm_path:-$HOME/.rvm}/hooks/after_use" || true if [[ $- == *i* ]] # check for interactive shells then echo "Using: $(tput setaf 2)$GEM_HOME$(tput sgr0)" # show the user the ruby and gemset they are using in green - else echo "Using: $GEM_HOME" # don't use colors in non-interactive shells fi else # If the environment file has not yet been created, use the RVM CLI to select. diff --git a/.travis.yml b/.travis.yml index 4c8fbef6a..497a03159 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ before_install: - git submodule update --init --recursive - psql -c "create database foi_test template template0 encoding 'SQL_ASCII';" -U postgres - cp config/database.yml-test config/database.yml + - cp config/memcached.yml-test config/memcached.yml - sudo apt-get update - export DEBIAN_FRONTEND=noninteractive - sudo apt-get -y install exim4-daemon-light @@ -22,4 +23,4 @@ notifications: irc: "irc.freenode.org#alaveteli" email: recipients: - - seb.bacon@gmail.com + - cron-whatdotheyknow@mysociety.org diff --git a/app/controllers/admin_censor_rule_controller.rb b/app/controllers/admin_censor_rule_controller.rb index 52df8dfc1..dca312b8b 100644 --- a/app/controllers/admin_censor_rule_controller.rb +++ b/app/controllers/admin_censor_rule_controller.rb @@ -3,8 +3,6 @@ # # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: admin_censor_rule_controller.rb,v 1.7 2009-06-30 14:28:25 francis Exp $ class AdminCensorRuleController < AdminController def new diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index 08528f8a8..dd966c4af 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -3,8 +3,6 @@ # # Copyright (c) 2009 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: admin_controller.rb,v 1.29 2009-09-17 10:24:35 francis Exp $ require 'fileutils' @@ -48,7 +46,7 @@ class AdminController < ApplicationController end def authenticate - if MySociety::Config.get('SKIP_ADMIN_AUTH', false) + if Configuration::skip_admin_auth session[:using_admin] = 1 return else @@ -70,10 +68,8 @@ class AdminController < ApplicationController end end else - config_username = MySociety::Config.get('ADMIN_USERNAME', '') - config_password = MySociety::Config.get('ADMIN_PASSWORD', '') authenticate_or_request_with_http_basic do |user_name, password| - if user_name == config_username && password == config_password + if user_name == Configuration::admin_username && password == Configuration::admin_password session[:using_admin] = 1 request.env['REMOTE_USER'] = user_name else diff --git a/app/controllers/admin_general_controller.rb b/app/controllers/admin_general_controller.rb index 7e8498d8a..5176eb8db 100644 --- a/app/controllers/admin_general_controller.rb +++ b/app/controllers/admin_general_controller.rb @@ -3,8 +3,6 @@ # # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: admin_general_controller.rb,v 1.12 2009-10-03 01:28:33 francis Exp $ class AdminGeneralController < AdminController def index diff --git a/app/controllers/admin_public_body_controller.rb b/app/controllers/admin_public_body_controller.rb index 30a43bb81..e64925bde 100644 --- a/app/controllers/admin_public_body_controller.rb +++ b/app/controllers/admin_public_body_controller.rb @@ -3,8 +3,6 @@ # # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: admin_public_body_controller.rb,v 1.23 2009-08-26 00:58:29 francis Exp $ require "public_body_categories" diff --git a/app/controllers/admin_request_controller.rb b/app/controllers/admin_request_controller.rb index 7cf23e61e..c97ef7f1e 100644 --- a/app/controllers/admin_request_controller.rb +++ b/app/controllers/admin_request_controller.rb @@ -3,8 +3,6 @@ # # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: admin_request_controller.rb,v 1.42 2009-10-03 01:28:33 francis Exp $ require 'ostruct' @@ -42,9 +40,9 @@ class AdminRequestController < AdminController # XXX is this *really* the only way to render a template to a # variable, rather than to the response? vars = OpenStruct.new(:name_to => @info_request.user_name, - :name_from => MySociety::Config.get("CONTACT_NAME", 'Alaveteli'), + :name_from => Configuration::contact_name, :info_request => @info_request, :reason => params[:reason], - :info_request_url => 'http://' + MySociety::Config.get('DOMAIN') + request_url(@info_request), + :info_request_url => 'http://' + Configuration::domain + request_url(@info_request), :site_name => site_name) template = File.read(File.join(File.dirname(__FILE__), "..", "views", "admin_request", "hidden_user_explanation.rhtml")) @request_hidden_user_explanation = ERB.new(template).result(vars.instance_eval { binding }) @@ -71,6 +69,7 @@ class AdminRequestController < AdminController old_allow_new_responses_from = @info_request.allow_new_responses_from old_handle_rejected_responses = @info_request.handle_rejected_responses old_tag_string = @info_request.tag_string + old_comments_allowed = @info_request.comments_allowed @info_request.title = params[:info_request][:title] @info_request.prominence = params[:info_request][:prominence] @@ -81,6 +80,7 @@ class AdminRequestController < AdminController @info_request.allow_new_responses_from = params[:info_request][:allow_new_responses_from] @info_request.handle_rejected_responses = params[:info_request][:handle_rejected_responses] @info_request.tag_string = params[:info_request][:tag_string] + @info_request.comments_allowed = params[:info_request][:comments_allowed] == "true" ? true : false if @info_request.valid? @info_request.save! @@ -92,7 +92,8 @@ class AdminRequestController < AdminController :old_awaiting_description => old_awaiting_description, :awaiting_description => @info_request.awaiting_description, :old_allow_new_responses_from => old_allow_new_responses_from, :allow_new_responses_from => @info_request.allow_new_responses_from, :old_handle_rejected_responses => old_handle_rejected_responses, :handle_rejected_responses => @info_request.handle_rejected_responses, - :old_tag_string => old_tag_string, :tag_string => @info_request.tag_string + :old_tag_string => old_tag_string, :tag_string => @info_request.tag_string, + :old_comments_allowed => old_comments_allowed, :comments_allowed => @info_request.comments_allowed }) # expire cached files expire_for_request(@info_request) diff --git a/app/controllers/admin_track_controller.rb b/app/controllers/admin_track_controller.rb index 7142dc18e..03217da45 100644 --- a/app/controllers/admin_track_controller.rb +++ b/app/controllers/admin_track_controller.rb @@ -3,8 +3,6 @@ # # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: admin_track_controller.rb,v 1.5 2009-01-29 12:10:10 francis Exp $ class AdminTrackController < AdminController def list diff --git a/app/controllers/admin_user_controller.rb b/app/controllers/admin_user_controller.rb index 4059ac0bb..ed20ddcf4 100644 --- a/app/controllers/admin_user_controller.rb +++ b/app/controllers/admin_user_controller.rb @@ -3,8 +3,6 @@ # # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: admin_user_controller.rb,v 1.13 2009-07-28 12:53:54 francis Exp $ class AdminUserController < AdminController def index diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb index 409a432eb..aa5e85db3 100644 --- a/app/controllers/api_controller.rb +++ b/app/controllers/api_controller.rb @@ -248,6 +248,6 @@ class ApiController < ApplicationController private def make_url(*args) - "http://" + MySociety::Config.get("DOMAIN", '127.0.0.1:3000') + "/" + args.join("/") + "http://" + Configuration::domain + "/" + args.join("/") end end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index ce18e6ef5..f29015c63 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -6,8 +6,6 @@ # # 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' @@ -56,7 +54,7 @@ class ApplicationController < ActionController::Base end def set_gettext_locale - if MySociety::Config.get('USE_DEFAULT_BROWSER_LANGUAGE', true) + if Configuration::use_default_browser_language requested_locale = params[:locale] || session[:locale] || cookies[:locale] || request.env['HTTP_ACCEPT_LANGUAGE'] || I18n.default_locale else requested_locale = params[:locale] || session[:locale] || cookies[:locale] || I18n.default_locale @@ -89,7 +87,7 @@ class ApplicationController < ActionController::Base # egrep "CONSUME MEMORY: [0-9]{7} KB" production.log around_filter :record_memory def record_memory - record_memory = MySociety::Config.get('DEBUG_RECORD_MEMORY', false) + record_memory = Configuration::debug_record_memory if record_memory logger.info "Processing request for #{request.url} with Rails process #{Process.pid}" File.read("/proc/#{Process.pid}/status").match(/VmRSS:\s+(\d+)/) @@ -333,11 +331,10 @@ class ApplicationController < ActionController::Base # def check_read_only - read_only = MySociety::Config.get('READ_ONLY', '') - if !read_only.empty? + if !Configuration::read_only.empty? flash[:notice] = _("<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>", :site_name => site_name, - :read_only => read_only) + :read_only => Configuration::read_only) redirect_to frontpage_url end @@ -557,13 +554,11 @@ class ApplicationController < ActionController::Base end def country_from_ip - gaze = MySociety::Config.get('GAZE_URL', '') - default = MySociety::Config.get('ISO_COUNTRY_CODE', '') country = "" - if !gaze.empty? - country = quietly_try_to_open("#{gaze}/gaze-rest?f=get_country_from_ip;ip=#{request.remote_ip}") + if !Configuration::gaze_url.empty? + country = quietly_try_to_open("#{Configuration::gaze_url}/gaze-rest?f=get_country_from_ip;ip=#{request.remote_ip}") end - country = default if country.empty? + country = Configuration::iso_country_code if country.empty? return country end diff --git a/app/controllers/comment_controller.rb b/app/controllers/comment_controller.rb index 1552017c2..ed249d6cc 100644 --- a/app/controllers/comment_controller.rb +++ b/app/controllers/comment_controller.rb @@ -3,8 +3,6 @@ # # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: comment_controller.rb,v 1.9 2009-03-09 01:17:04 francis Exp $ class CommentController < ApplicationController before_filter :check_read_only, :only => [ :new ] @@ -23,6 +21,13 @@ class CommentController < ApplicationController else raise "Unknown type " + params[:type] end + + # Are comments disabled on this request? + # + # There is no “add comment” link when comments are disabled, so users should + # not usually hit this unless they are explicitly attempting to avoid the comment + # block, so we just raise an exception. + raise "Comments are not allowed on this request" if !@info_request.comments_allowed? # Banned from adding comments? if !authenticated_user.nil? && !authenticated_user.can_make_comments? diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb index 839064fcd..150b433ec 100644 --- a/app/controllers/general_controller.rb +++ b/app/controllers/general_controller.rb @@ -4,8 +4,6 @@ # # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: general_controller.rb,v 1.57 2009-10-03 10:23:43 francis Exp $ begin require 'xmlsimple' @@ -24,7 +22,7 @@ class GeneralController < ApplicationController behavior_cache :tag => [session[:user_id], request.url] do # get some example searches and public bodies to display # either from config, or based on a (slow!) query if not set - body_short_names = MySociety::Config.get('FRONTPAGE_PUBLICBODY_EXAMPLES', '').split(/\s*;\s*/).map{|s| "'%s'" % s.gsub(/'/, "''") }.join(", ") + body_short_names = Configuration::frontpage_publicbody_examples.split(/\s*;\s*/).map{|s| "'%s'" % s.gsub(/'/, "''") }.join(", ") @locale = self.locale_from_params() locale_condition = 'public_body_translations.locale = ?' conditions = [locale_condition, @locale] @@ -32,8 +30,7 @@ class GeneralController < ApplicationController if body_short_names.empty? # This is too slow @popular_bodies = PublicBody.find(:all, - :select => "public_bodies.*, (select count(*) from info_requests where info_requests.public_body_id = public_bodies.id) as c", - :order => "c desc", + :order => "info_requests_count desc", :limit => 32, :conditions => conditions, :joins => :translations @@ -56,10 +53,13 @@ class GeneralController < ApplicationController # If there are not yet enough successful requests, fill out the list with # other requests if @request_events.count < max_count + @request_events_all_successful = false 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 + else + @request_events_all_successful = true end rescue @request_events = [] @@ -71,7 +71,7 @@ class GeneralController < ApplicationController def blog medium_cache @feed_autodetect = [] - @feed_url = "#{MySociety::Config.get('BLOG_FEED', '')}?lang=#{self.locale_from_params()}" + @feed_url = "#{Configuration::blog_feed}?lang=#{self.locale_from_params()}" @blog_items = [] if not @feed_url.empty? content = quietly_try_to_open(@feed_url) @@ -82,7 +82,7 @@ class GeneralController < ApplicationController @feed_autodetect = [{:url => @feed_url, :title => "#{site_name} blog"}] end end - @twitter_user = MySociety::Config.get('TWITTER_USERNAME', '') + @twitter_user = Configuration::twitter_username end # Just does a redirect from ?query= search to /query diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb index c7affd57c..cf90f45bb 100644 --- a/app/controllers/help_controller.rb +++ b/app/controllers/help_controller.rb @@ -3,8 +3,6 @@ # # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: help_controller.rb,v 1.12 2009-07-14 23:30:37 francis Exp $ class HelpController < ApplicationController @@ -20,7 +18,7 @@ class HelpController < ApplicationController end def contact - @contact_email = MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost') + @contact_email = Configuration::contact_email @contact_email = @contact_email.gsub(/@/, "@") # if they clicked remove for link to request/body, remove it diff --git a/app/controllers/holiday_controller.rb b/app/controllers/holiday_controller.rb index 7f62aa26d..3101c07e3 100644 --- a/app/controllers/holiday_controller.rb +++ b/app/controllers/holiday_controller.rb @@ -3,8 +3,6 @@ # # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: holiday_controller.rb,v 1.2 2009-10-26 17:52:39 francis Exp $ class HolidayController < ApplicationController @@ -14,7 +12,7 @@ class HolidayController < ApplicationController def due_date if params[:holiday] @request_date = Date.strptime(params[:holiday]) or raise "Invalid date" - @due_date = Holiday.due_date_from(@request_date, 20) + @due_date = Holiday.due_date_from(@request_date, Configuration::reply_late_after_days, Configuration::working_or_calendar_days) @skipped = Holiday.all( :conditions => [ 'day >= ? AND day <= ?', @request_date.strftime("%F"), @due_date.strftime("%F") diff --git a/app/controllers/public_body_controller.rb b/app/controllers/public_body_controller.rb index b8ea82a66..b34e89b8d 100644 --- a/app/controllers/public_body_controller.rb +++ b/app/controllers/public_body_controller.rb @@ -4,8 +4,6 @@ # # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: public_body_controller.rb,v 1.8 2009-09-14 13:27:00 francis Exp $ require 'fastercsv' diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index 268ecc73a..396e6593a 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.rb @@ -3,8 +3,6 @@ # # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: request_controller.rb,v 1.192 2009-10-19 19:26:40 francis Exp $ require 'alaveteli_file_types' require 'zip/zip' @@ -30,7 +28,7 @@ class RequestController < ApplicationController 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?( + if Configuration::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") @@ -46,7 +44,7 @@ class RequestController < ApplicationController end def show - if !MySociety::Config.get('VARNISH_HOST').nil? + if !Configuration::varnish_host.nil? # If varnish is set up to accept PURGEs, then cache for a # long time long_cache @@ -369,7 +367,7 @@ class RequestController < ApplicationController replied by then.</p> <p>If you write about this request (for example in a forum or a blog) please link to this page, and add an annotation below telling people about your writing.</p>",:law_used_full=>@info_request.law_used_full, - :late_number_of_days => MySociety::Config.get('REPLY_LATE_AFTER_DAYS', 20)) + :late_number_of_days => Configuration::reply_late_after_days) redirect_to show_new_request_path(:url_title => @info_request.url_title) end @@ -457,7 +455,7 @@ class RequestController < ApplicationController flash[:notice] = _("<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>",:date_response_required_by=>simple_date(@info_request.date_response_required_by)) redirect_to request_url(@info_request) elsif @info_request.calculate_status == 'waiting_response_very_overdue' - flash[:notice] = _("<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>", :very_late_number_of_days => MySociety::Config.get('REPLY_VERY_LATE_AFTER_DAYS', 40), :late_number_of_days => MySociety::Config.get('REPLY_LATE_AFTER_DAYS', 20)) + flash[:notice] = _("<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>", :very_late_number_of_days => Configuration::reply_very_late_after_days, :late_number_of_days => Configuration::reply_late_after_days) redirect_to unhappy_url(@info_request) elsif @info_request.calculate_status == 'not_held' flash[:notice] = _("<p>Thank you! Here are some ideas on what to do next:</p> @@ -489,7 +487,7 @@ class RequestController < ApplicationController elsif @info_request.calculate_status == 'gone_postal' redirect_to respond_to_last_url(@info_request) + "?gone_postal=1" elsif @info_request.calculate_status == 'internal_review' - flash[:notice] = _("<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>",:late_number_of_days => MySociety::Config.get('REPLY_LATE_AFTER_DAYS', 20), :review_url => unhappy_url(@info_request) + "#internal_review") + flash[:notice] = _("<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>",:late_number_of_days => Configuration.reply_late_after_days, :review_url => unhappy_url(@info_request) + "#internal_review") redirect_to request_url(@info_request) elsif @info_request.calculate_status == 'error_message' flash[:notice] = _("<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>") @@ -875,11 +873,10 @@ class RequestController < ApplicationController if !File.exists?(file_path) FileUtils.mkdir_p(File.dirname(file_path)) Zip::ZipFile.open(file_path, Zip::ZipFile::CREATE) { |zipfile| - convert_command = MySociety::Config.get("HTML_TO_PDF_COMMAND") + convert_command = Configuration::html_to_pdf_command done = false if File.exists?(convert_command) - domain = MySociety::Config.get("DOMAIN") - url = "http://#{domain}#{request_url(info_request)}?print_stylesheet=1" + url = "http://#{Configuration::domain}#{request_url(info_request)}?print_stylesheet=1" tempfile = Tempfile.new('foihtml2pdf') output = AlaveteliExternalCommand.run(convert_command, url, tempfile.path) if !output.nil? diff --git a/app/controllers/request_game_controller.rb b/app/controllers/request_game_controller.rb index f22652dd1..4b6f02970 100644 --- a/app/controllers/request_game_controller.rb +++ b/app/controllers/request_game_controller.rb @@ -3,8 +3,6 @@ # # Copyright (c) 2009 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: request_game_controller.rb,v 1.9 2009-10-19 22:06:54 francis Exp $ class RequestGameController < ApplicationController diff --git a/app/controllers/services_controller.rb b/app/controllers/services_controller.rb index 40e0faaf7..ead5d73b7 100644 --- a/app/controllers/services_controller.rb +++ b/app/controllers/services_controller.rb @@ -6,7 +6,7 @@ class ServicesController < ApplicationController def other_country_message text = "" - iso_country_code = MySociety::Config.get('ISO_COUNTRY_CODE').downcase + iso_country_code = Configuration::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] @@ -36,9 +36,9 @@ class ServicesController < ApplicationController :content_type => "text/plain", :layout => false, :locals => {:name_to => info_request.user_name, - :name_from => MySociety::Config.get("CONTACT_NAME", 'Alaveteli'), + :name_from => Configuration::contact_name, :info_request => info_request, :reason => params[:reason], - :info_request_url => 'http://' + MySociety::Config.get('DOMAIN') + request_url(info_request), + :info_request_url => 'http://' + Configuration::domain + request_url(info_request), :site_name => site_name} end diff --git a/app/controllers/track_controller.rb b/app/controllers/track_controller.rb index 1a21491b1..8e76b4c9f 100644 --- a/app/controllers/track_controller.rb +++ b/app/controllers/track_controller.rb @@ -4,8 +4,6 @@ # # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: track_controller.rb,v 1.31 2009-09-02 14:18:26 francis Exp $ class TrackController < ApplicationController diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 0a9e1d781..810b3321e 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -3,8 +3,6 @@ # # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: user_controller.rb,v 1.71 2009-09-17 07:51:47 francis Exp $ require 'set' @@ -138,7 +136,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') + @request_from_foreign_country = country_from_ip != Configuration::iso_country_code # make sure we have cookies if session.instance_variable_get(:@dbman) if not session.instance_variable_get(:@dbman).instance_variable_get(:@original) @@ -192,7 +190,7 @@ 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') + @request_from_foreign_country = country_from_ip != Configuration::iso_country_code # Make the user and try to save it @user_signup = User.new(params[:user_signup]) error = false diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 278df5a3b..090359f1f 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -4,8 +4,7 @@ # # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: application_helper.rb,v 1.22 2008-07-09 07:24:50 francis Exp $ + require 'languages' module ApplicationHelper diff --git a/app/helpers/config_helper.rb b/app/helpers/config_helper.rb index 543b60256..73e12172f 100644 --- a/app/helpers/config_helper.rb +++ b/app/helpers/config_helper.rb @@ -1,9 +1,5 @@ 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) + Configuration::site_name 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 cae17ebd3..994da0e87 100755 --- a/app/helpers/link_to_helper.rb +++ b/app/helpers/link_to_helper.rb @@ -4,8 +4,6 @@ # # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: link_to_helper.rb,v 1.52 2009-04-08 05:34:51 francis Exp $ module LinkToHelper @@ -221,9 +219,8 @@ module LinkToHelper # Admin pages def admin_url(relative_path) - admin_url_prefix = MySociety::Config.get("ADMIN_BASE_URL", "") - admin_url_prefix = admin_general_index_path+"/" if admin_url_prefix.empty? - return admin_url_prefix + relative_path + admin_url_prefix = Configuration::admin_base_url + (admin_url_prefix.empty? ? admin_general_index_url + '/' : admin_url_prefix) + relative_path end # About page URLs @@ -241,7 +238,7 @@ module LinkToHelper def main_url(relative_path, append = nil) - url_prefix = "http://" + MySociety::Config.get("DOMAIN", '127.0.0.1:3000') + url_prefix = "http://" + Configuration::domain url = url_prefix + relative_path if !append.nil? begin diff --git a/app/helpers/mailer_helper.rb b/app/helpers/mailer_helper.rb index c0a950d47..be2ce47aa 100644 --- a/app/helpers/mailer_helper.rb +++ b/app/helpers/mailer_helper.rb @@ -1,7 +1,5 @@ module MailerHelper def contact_from_name_and_email - contact_name = MySociety::Config.get("CONTACT_NAME", 'Alaveteli') - contact_email = MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost') - return "#{contact_name} <#{contact_email}>" + "#{Configuration::contact_name} <#{Configuration::contact_email}>" end end diff --git a/app/models/about_me_validator.rb b/app/models/about_me_validator.rb index 67b81bc9c..5e04c2761 100644 --- a/app/models/about_me_validator.rb +++ b/app/models/about_me_validator.rb @@ -11,8 +11,6 @@ # # Copyright (c) 2010 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: contact_validator.rb,v 1.32 2009-09-17 21:10:05 francis Exp $ class AboutMeValidator < ActiveRecord::BaseWithoutTable strip_attributes! diff --git a/app/models/application_mailer.rb b/app/models/application_mailer.rb index 044006f7c..cdb279c3c 100644 --- a/app/models/application_mailer.rb +++ b/app/models/application_mailer.rb @@ -3,9 +3,8 @@ # # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: application_mailer.rb,v 1.8 2009-02-09 10:37:12 francis Exp $ +require 'action_mailer/version' class ApplicationMailer < ActionMailer::Base # Include all the functions views get, as emails call similar things. helper :application @@ -16,7 +15,7 @@ class ApplicationMailer < ActionMailer::Base self.raise_delivery_errors = true def blackhole_email - MySociety::Config.get("BLACKHOLE_PREFIX", 'do-not-reply-to-this-address')+"@"+MySociety::Config.get("INCOMING_EMAIL_DOMAIN", "localhost") + Configuration::blackhole_prefix+"@"+Configuration::incoming_email_domain end # URL generating functions are needed by all controllers (for redirects), @@ -26,5 +25,126 @@ class ApplicationMailer < ActionMailer::Base # Site-wide access to configuration settings include ConfigHelper + + # Instantiate a new mailer object. If +method_name+ is not +nil+, the mailer + # will be initialized according to the named method. If not, the mailer will + # remain uninitialized (useful when you only need to invoke the "receive" + # method, for instance). + def initialize(method_name=nil, *parameters) #:nodoc: + create!(method_name, *parameters) if method_name + end + + # For each multipart template (e.g. "the_template_file.text.html.erb") available, + # add the one from the view path with the highest priority as a part to the mail + def render_multipart_templates + added_content_types = {} + self.view_paths.each do |view_path| + Dir.glob("#{view_path}/#{mailer_name}/#{@template}.*").each do |path| + template = view_path["#{mailer_name}/#{File.basename(path)}"] + + # Skip unless template has a multipart format + next unless template && template.multipart? + next if added_content_types[template.content_type] == true + @parts << Part.new( + :content_type => template.content_type, + :disposition => "inline", + :charset => charset, + :body => render_message(template, @body) + ) + added_content_types[template.content_type] = true + end + end + end + + # Look for the current template in each element of view_paths in order, + # return the first + def find_template + self.view_paths.each do |view_path| + if template = view_path["#{mailer_name}/#{@template}"] + return template + end + end + return nil + end + + if ActionMailer::VERSION::MAJOR == 2 + + # This method is a customised version of ActionMailer::Base.create! + # modified to allow templates to be selected correctly for multipart + # mails when themes have added to the view_paths. The problem from our + # point of view with ActionMailer::Base is that it sets template_root to + # the first element of the view_paths array and then uses only that (directly + # and via template_path, which is created from it) in the create! method when + # looking for templates. Our modified version looks for templates in the view_paths + # in order. + # Changed lines marked with *** + + # Initialize the mailer via the given +method_name+. The body will be + # rendered and a new TMail::Mail object created. + def create!(method_name, *parameters) #:nodoc: + initialize_defaults(method_name) + __send__(method_name, *parameters) + + # If an explicit, textual body has not been set, we check assumptions. + unless String === @body + # First, we look to see if there are any likely templates that match, + # which include the content-type in their file name (i.e., + # "the_template_file.text.html.erb", etc.). Only do this if parts + # have not already been specified manually. + if @parts.empty? + # *** render_multipart_templates replaces the following code + # Dir.glob("#{template_path}/#{@template}.*").each do |path| + # template = template_root["#{mailer_name}/#{File.basename(path)}"] + # + # # Skip unless template has a multipart format + # next unless template && template.multipart? + # + # @parts << Part.new( + # :content_type => template.content_type, + # :disposition => "inline", + # :charset => charset, + # :body => render_message(template, @body) + # ) + # end + render_multipart_templates + + unless @parts.empty? + @content_type = "multipart/alternative" if @content_type !~ /^multipart/ + @parts = sort_parts(@parts, @implicit_parts_order) + end + end + + # Then, if there were such templates, we check to see if we ought to + # also render a "normal" template (without the content type). If a + # normal template exists (or if there were no implicit parts) we render + # it. + template_exists = @parts.empty? + + # *** find_template replaces template_root call + # template_exists ||= template_root["#{mailer_name}/#{@template}"] + template_exists ||= find_template + + @body = render_message(@template, @body) if template_exists + + # Finally, if there are other message parts and a textual body exists, + # we shift it onto the front of the parts and set the body to nil (so + # that create_mail doesn't try to render it in addition to the parts). + if !@parts.empty? && String === @body + @parts.unshift ActionMailer::Part.new(:charset => charset, :body => @body) + @body = nil + end + end + + # If this is a multipart e-mail add the mime_version if it is not + # already set. + @mime_version ||= "1.0" if !@parts.empty? + + # build the mail object itself + @mail = create_mail + end + else + raise "ApplicationMailer.create! is obsolete - find another way to ensure that themes can override mail templates for multipart mails" + end + end diff --git a/app/models/censor_rule.rb b/app/models/censor_rule.rb index da3f49760..f40ab6fbb 100644 --- a/app/models/censor_rule.rb +++ b/app/models/censor_rule.rb @@ -1,5 +1,5 @@ # == Schema Information -# Schema version: 114 +# Schema version: 20120919140404 # # Table name: censor_rules # @@ -9,11 +9,11 @@ # public_body_id :integer # text :text not null # replacement :text not null -# regexp :boolean # last_edit_editor :string(255) not null # last_edit_comment :text not null # created_at :datetime not null # updated_at :datetime not null +# regexp :boolean # # models/censor_rule.rb: @@ -21,8 +21,6 @@ # # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: censor_rule.rb,v 1.14 2009-09-17 21:10:04 francis Exp $ class CensorRule < ActiveRecord::Base belongs_to :info_request diff --git a/app/models/change_email_validator.rb b/app/models/change_email_validator.rb index 0395ab6d5..9ef25217d 100644 --- a/app/models/change_email_validator.rb +++ b/app/models/change_email_validator.rb @@ -14,8 +14,6 @@ # # Copyright (c) 2010 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: contact_validator.rb,v 1.32 2009-09-17 21:10:05 francis Exp $ class ChangeEmailValidator < ActiveRecord::BaseWithoutTable strip_attributes! diff --git a/app/models/comment.rb b/app/models/comment.rb index 6edfaa24f..5507910e2 100644 --- a/app/models/comment.rb +++ b/app/models/comment.rb @@ -19,8 +19,6 @@ # # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: comment.rb,v 1.18 2009-09-17 21:10:05 francis Exp $ class Comment < ActiveRecord::Base strip_attributes! diff --git a/app/models/contact_mailer.rb b/app/models/contact_mailer.rb index 6e781d48c..16aae2f15 100644 --- a/app/models/contact_mailer.rb +++ b/app/models/contact_mailer.rb @@ -3,8 +3,6 @@ # # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: contact_mailer.rb,v 1.10 2009-02-09 10:37:12 francis Exp $ class ContactMailer < ApplicationMailer @@ -52,7 +50,7 @@ class ContactMailer < ApplicationMailer :from_user => @from, :recipient_user => recipient_user, } - bcc MySociety::Config::get("CONTACT_EMAIL") + bcc Configuration::contact_email end end diff --git a/app/models/contact_validator.rb b/app/models/contact_validator.rb index a9748a739..d277161f9 100644 --- a/app/models/contact_validator.rb +++ b/app/models/contact_validator.rb @@ -14,8 +14,6 @@ # # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: contact_validator.rb,v 1.32 2009-09-17 21:10:05 francis Exp $ class ContactValidator < ActiveRecord::BaseWithoutTable strip_attributes! diff --git a/app/models/exim_log.rb b/app/models/exim_log.rb index 82000efa1..abe198493 100644 --- a/app/models/exim_log.rb +++ b/app/models/exim_log.rb @@ -17,8 +17,6 @@ # # Copyright (c) 2009 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: exim_log.rb,v 1.14 2009-09-17 21:10:05 francis Exp $ class EximLog < ActiveRecord::Base belongs_to :info_request @@ -63,7 +61,7 @@ class EximLog < ActiveRecord::Base order = 0 for line in f order = order + 1 - email_domain = MySociety::Config.get("INCOMING_EMAIL_DOMAIN", "localhost") + email_domain = Configuration::incoming_email_domain emails = line.scan(/request-[^\s]+@#{email_domain}/).sort.uniq for email in emails info_request = InfoRequest.find_by_incoming_email(email) diff --git a/app/models/exim_log_done.rb b/app/models/exim_log_done.rb index 3cedc1379..86574a4cd 100644 --- a/app/models/exim_log_done.rb +++ b/app/models/exim_log_done.rb @@ -15,8 +15,6 @@ # # Copyright (c) 2009 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: exim_log_done.rb,v 1.8 2009-09-17 21:10:05 francis Exp $ class EximLogDone < ActiveRecord::Base has_many :exim_logs diff --git a/app/models/holiday.rb b/app/models/holiday.rb index debd88dec..d2437f438 100644 --- a/app/models/holiday.rb +++ b/app/models/holiday.rb @@ -20,23 +20,37 @@ # # Copyright (c) 2009 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: holiday.rb,v 1.10 2009-10-26 17:52:39 francis Exp $ class Holiday < ActiveRecord::Base - # Calculate the date on which a request made on a given date falls due. + def Holiday.weekend_or_holiday?(date) + # TODO only fetch holidays after the start_date + holidays = self.all.collect { |h| h.day }.to_set + + date.wday == 0 || date.wday == 6 || holidays.include?(date) + end + + def Holiday.due_date_from(start_date, days, type_of_days) + case type_of_days + when "working" + Holiday.due_date_from_working_days(start_date, days) + when "calendar" + Holiday.due_date_from_calendar_days(start_date, days) + else + raise "Unexpected value for type_of_days: #{type_of_days}" + end + end + + # Calculate the date on which a request made on a given date falls due when + # days are given in working days # i.e. it is due by the end of that day. - def Holiday.due_date_from(start_date, working_days) + def Holiday.due_date_from_working_days(start_date, working_days) # convert date/times into dates start_date = start_date.to_date - # TODO only fetch holidays after the start_date - holidays = self.all.collect { |h| h.day }.to_set - - # Count forward (20) working days. We start with today as "day zero". The - # first of the twenty full working days is the next day. We return the - # date of the last of the twenty. + # Count forward the number of working days. We start with today as "day zero". The + # first of the full working days is the next day. We return the + # date of the last of the number of working days. # This response for example of a public authority complains that we had # it wrong. We didn't (even thought I changed the code for a while, @@ -46,15 +60,27 @@ class Holiday < ActiveRecord::Base days_passed = 0 response_required_by = start_date - # Now step forward into each of the 20 days. + # Now step forward into each of the working days. while days_passed < working_days - response_required_by += 1.day - next if response_required_by.wday == 0 || response_required_by.wday == 6 # weekend - next if holidays.include?(response_required_by) - days_passed += 1 + response_required_by += 1 + days_passed += 1 unless weekend_or_holiday?(response_required_by) end - return response_required_by + response_required_by end + # Calculate the date on which a request made on a given date falls due when + # the days are given in calendar days (rather than working days) + # If the due date falls on a weekend or a holiday then the due date is the next + # weekday that isn't a holiday. + def Holiday.due_date_from_calendar_days(start_date, days) + # convert date/times into dates + start_date = start_date.to_date + + response_required_by = start_date + days + while weekend_or_holiday?(response_required_by) + response_required_by += 1 + end + response_required_by + end end diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb index 1a7bb1bfd..fcb4671c5 100644 --- a/app/models/incoming_message.rb +++ b/app/models/incoming_message.rb @@ -27,8 +27,6 @@ # # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: incoming_message.rb,v 1.228 2009-10-21 11:24:14 francis Exp $ # TODO # Move some of the (e.g. quoting) functions here into rblib, as they feel @@ -253,7 +251,7 @@ class IncomingMessage < ActiveRecord::Base text.gsub!(self.info_request.public_body.request_email, _("[{{public_body}} request email]", :public_body => self.info_request.public_body.short_or_long_name)) end text.gsub!(self.info_request.incoming_email, _('[FOI #{{request}} email]', :request => self.info_request.id.to_s) ) - text.gsub!(MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost'), _("[{{site_name}} contact email]", :site_name => MySociety::Config.get('SITE_NAME', 'Alaveteli')) ) + text.gsub!(Configuration::contact_email, _("[{{site_name}} contact email]", :site_name => Configuration::site_name) ) end # Replaces all email addresses in (possibly binary data) with equal length alternative ones. @@ -279,7 +277,7 @@ class IncomingMessage < ActiveRecord::Base if censored_uncompressed_text != uncompressed_text # then use the altered file (recompressed) recompressed_text = nil - if MySociety::Config.get('USE_GHOSTSCRIPT_COMPRESSION') == true + if Configuration::use_ghostscript_compression == true command = ["gs", "-sDEVICE=pdfwrite", "-dCompatibilityLevel=1.4", "-dPDFSETTINGS=/screen", "-dNOPAUSE", "-dQUIET", "-dBATCH", "-sOutputFile=-", "-"] else command = ["pdftk", "-", "output", "-", "compress"] @@ -376,8 +374,7 @@ class IncomingMessage < ActiveRecord::Base text.gsub!(/(Mobile|Mob)([\s\/]*(Fax|Tel))*\s*:?[\s\d]*\d/, "[mobile number]") # Remove WhatDoTheyKnow signup links - domain = MySociety::Config.get('DOMAIN') - text.gsub!(/http:\/\/#{domain}\/c\/[^\s]+/, "[WDTK login link]") + text.gsub!(/http:\/\/#{Configuration::domain}\/c\/[^\s]+/, "[WDTK login link]") # Remove things from censor rules self.info_request.apply_censor_rules_to_text!(text) @@ -650,7 +647,7 @@ class IncomingMessage < ActiveRecord::Base source_charset = 'utf-8' if source_charset.nil? text = Iconv.conv('utf-8//IGNORE', source_charset, text) + _("\n\n[ {{site_name}} note: The above text was badly encoded, and has had strange characters removed. ]", - :site_name => MySociety::Config.get('SITE_NAME', 'Alaveteli')) + :site_name => Configuration::site_name) rescue Iconv::InvalidEncoding, Iconv::IllegalSequence if source_charset != "utf-8" source_charset = "utf-8" diff --git a/app/models/info_request.rb b/app/models/info_request.rb index 2e16d0f58..85168e6d4 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -1,4 +1,5 @@ # == Schema Information +# Schema version: 20120919140404 # # Table name: info_requests # @@ -19,6 +20,7 @@ # external_user_name :string(255) # external_url :string(255) # attention_requested :boolean default(FALSE) +# comments_allowed :boolean default(TRUE), not null # require 'digest/sha1' @@ -687,21 +689,18 @@ public # last_event_forming_initial_request. There may be more obscure # things, e.g. fees, not properly covered. def date_response_required_by - days_later = MySociety::Config.get('REPLY_LATE_AFTER_DAYS', 20) - return Holiday.due_date_from(self.date_initial_request_last_sent_at, days_later) + Holiday.due_date_from(self.date_initial_request_last_sent_at, Configuration::reply_late_after_days, Configuration::working_or_calendar_days) end # This is a long stop - even with UK public interest test extensions, 40 # days is a very long time. def date_very_overdue_after last_sent = last_event_forming_initial_request - very_late_days_later = MySociety::Config.get('REPLY_VERY_LATE_AFTER_DAYS', 40) - school_very_late_days_later = MySociety::Config.get('SPECIAL_REPLY_VERY_LATE_AFTER_DAYS', 60) if self.public_body.is_school? # schools have 60 working days maximum (even over a long holiday) - return Holiday.due_date_from(self.date_initial_request_last_sent_at, 60) + Holiday.due_date_from(self.date_initial_request_last_sent_at, Configuration::special_reply_very_late_after_days, Configuration::working_or_calendar_days) else # public interest test ICO guidance gives 40 working maximum - return Holiday.due_date_from(self.date_initial_request_last_sent_at, 40) + Holiday.due_date_from(self.date_initial_request_last_sent_at, Configuration::reply_very_late_after_days, Configuration::working_or_calendar_days) end end @@ -901,10 +900,10 @@ public end def InfoRequest.magic_email_for_id(prefix_part, id) - magic_email = MySociety::Config.get("INCOMING_EMAIL_PREFIX", "") + magic_email = Configuration::incoming_email_prefix magic_email += prefix_part + id.to_s magic_email += "-" + InfoRequest.hash_from_id(id) - magic_email += "@" + MySociety::Config.get("INCOMING_EMAIL_DOMAIN", "localhost") + magic_email += "@" + Configuration::incoming_email_domain return magic_email end @@ -915,7 +914,7 @@ public end def InfoRequest.hash_from_id(id) - return Digest::SHA1.hexdigest(id.to_s + MySociety::Config.get("INCOMING_EMAIL_SECRET", 'dummysecret'))[0,8] + return Digest::SHA1.hexdigest(id.to_s + Configuration::incoming_email_secret)[0,8] end # Called by find_by_incoming_email - and used to be called by separate @@ -1139,7 +1138,7 @@ public before_save :purge_in_cache def purge_in_cache - if !MySociety::Config.get('VARNISH_HOST').nil? && !self.id.nil? + if !Configuration::varnish_host.nil? && !self.id.nil? # we only do this for existing info_requests (new ones have a nil id) path = url_for(:controller => 'request', :action => 'show', :url_title => self.url_title, :only_path => true, :locale => :none) req = PurgeRequest.find_by_url(path) diff --git a/app/models/info_request_event.rb b/app/models/info_request_event.rb index 54d2f5ef7..5a8e3416f 100644 --- a/app/models/info_request_event.rb +++ b/app/models/info_request_event.rb @@ -21,8 +21,6 @@ # # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: info_request_event.rb,v 1.96 2009-10-19 22:06:55 francis Exp $ class InfoRequestEvent < ActiveRecord::Base belongs_to :info_request diff --git a/app/models/outgoing_mailer.rb b/app/models/outgoing_mailer.rb index 8562c5b68..a307bb778 100644 --- a/app/models/outgoing_mailer.rb +++ b/app/models/outgoing_mailer.rb @@ -3,8 +3,6 @@ # # Copyright (c) 2009 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: outgoing_mailer.rb,v 1.1 2009-10-04 21:53:54 francis Exp $ # Note: The layout for this wraps messages by lines rather than (blank line # separated) paragraphs, as is the convention for all the other mailers. This @@ -24,7 +22,7 @@ class OutgoingMailer < ApplicationMailer @subject = info_request.email_subject_request @headers["message-id"] = OutgoingMailer.id_for_message(outgoing_message) @body = {:info_request => info_request, :outgoing_message => outgoing_message, - :contact_email => MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost') } + :contact_email => Configuration::contact_email } end # Later message to public body regarding existing request @@ -36,7 +34,7 @@ class OutgoingMailer < ApplicationMailer @headers["message-id"] = OutgoingMailer.id_for_message(outgoing_message) @body = {:info_request => info_request, :outgoing_message => outgoing_message, :incoming_message_followup => incoming_message_followup, - :contact_email => MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost') } + :contact_email => Configuration::contact_email } end # XXX the condition checking valid_to_reply_to? also appears in views/request/_followup.rhtml, @@ -91,7 +89,7 @@ class OutgoingMailer < ApplicationMailer message_id = "ogm-" + outgoing_message.id.to_s t = Time.now message_id += "+" + '%08x%05x-%04x' % [t.to_i, t.tv_usec, rand(0xffff)] - message_id += "@" + MySociety::Config.get("INCOMING_EMAIL_DOMAIN", "localhost") + message_id += "@" + Configuration::incoming_email_domain return "<" + message_id + ">" end diff --git a/app/models/outgoing_message.rb b/app/models/outgoing_message.rb index 0ce1ee11c..0e547d493 100644 --- a/app/models/outgoing_message.rb +++ b/app/models/outgoing_message.rb @@ -21,8 +21,6 @@ # # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: outgoing_message.rb,v 1.95 2009-10-04 21:53:54 francis Exp $ class OutgoingMessage < ActiveRecord::Base strip_attributes! @@ -87,7 +85,7 @@ class OutgoingMessage < ActiveRecord::Base "'" + self.info_request.title + "'." + "\n\n\n\n [ " + self.get_internal_review_insert_here_note + " ] \n\n\n\n" + "A full history of my FOI request and all correspondence is available on the Internet at this address:\n" + - "http://" + MySociety::Config.get("DOMAIN", '127.0.0.1:3000') + "/request/" + self.info_request.url_title + "http://" + Configuration::domain + "/request/" + self.info_request.url_title else "" end diff --git a/app/models/post_redirect.rb b/app/models/post_redirect.rb index f613fc58d..31f08c21a 100644 --- a/app/models/post_redirect.rb +++ b/app/models/post_redirect.rb @@ -25,8 +25,6 @@ # # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: post_redirect.rb,v 1.51 2009-09-17 21:10:05 francis Exp $ require 'openssl' # for random bytes function diff --git a/app/models/profile_photo.rb b/app/models/profile_photo.rb index 72bfe954f..6e605651d 100644 --- a/app/models/profile_photo.rb +++ b/app/models/profile_photo.rb @@ -14,9 +14,6 @@ # # Copyright (c) 2009 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: profile_photo.rb,v 1.2 2009-09-17 21:10:05 francis Exp $ -# class ProfilePhoto < ActiveRecord::Base WIDTH = 96 diff --git a/app/models/public_body.rb b/app/models/public_body.rb index 77da81d4c..34bcd332c 100644 --- a/app/models/public_body.rb +++ b/app/models/public_body.rb @@ -1,32 +1,27 @@ -# -*- coding: utf-8 -*- # == Schema Information +# Schema version: 20120919140404 # # Table name: public_bodies # -# id :integer not null, primary key -# name :text not null -# short_name :text not null -# request_email :text not null -# version :integer not null -# last_edit_editor :string(255) not null -# last_edit_comment :text not null -# created_at :datetime not null -# updated_at :datetime not null -# url_name :text not null -# home_page :text default(""), not null -# notes :text default(""), not null -# first_letter :string(255) not null -# publication_scheme :text default(""), not null -# api_key :string(255) not null -# -# models/public_body.rb: -# A public body, from which information can be requested. -# -# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. -# Email: francis@mysociety.org; WWW: http://www.mysociety.org/ +# id :integer not null, primary key +# name :text not null +# short_name :text not null +# request_email :text not null +# version :integer not null +# last_edit_editor :string(255) not null +# last_edit_comment :text not null +# created_at :datetime not null +# updated_at :datetime not null +# url_name :text not null +# home_page :text default(""), not null +# notes :text default(""), not null +# first_letter :string(255) not null +# publication_scheme :text default(""), not null +# api_key :string(255) +# info_requests_count :integer default(0), not null # -# $Id: public_body.rb,v 1.160 2009-10-02 22:56:35 francis Exp $ +# -*- coding: utf-8 -*- require 'csv' require 'securerandom' require 'set' @@ -341,7 +336,7 @@ class PublicBody < ActiveRecord::Base pb = PublicBody.new( :name => 'Internal admin authority', :short_name => "", - :request_email => MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost'), + :request_email => Configuration::contact_email, :home_page => "", :notes => "", :publication_scheme => "", @@ -514,6 +509,20 @@ class PublicBody < ActiveRecord::Base return self.request_email_domain end + # Returns nil if configuration variable not set + def override_request_email + e = Configuration::override_all_public_body_request_emails + e if e != "" + end + + def request_email + if override_request_email + override_request_email + else + read_attribute(:request_email) + end + end + # Domain name of the request email def request_email_domain return PublicBody.extract_domain_from_email(self.request_email) diff --git a/app/models/raw_email.rb b/app/models/raw_email.rb index 3bb794684..bae144931 100644 --- a/app/models/raw_email.rb +++ b/app/models/raw_email.rb @@ -11,8 +11,6 @@ # # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: raw_email.rb,v 1.12 2009-09-17 21:10:05 francis Exp $ class RawEmail < ActiveRecord::Base # deliberately don't strip_attributes, so keeps raw email properly @@ -28,8 +26,7 @@ class RawEmail < ActiveRecord::Base if ENV["RAILS_ENV"] == "test" return File.join(Rails.root, 'files/raw_email_test') else - return File.join(MySociety::Config.get('RAW_EMAILS_LOCATION', - 'files/raw_emails'), + return File.join(Configuration::raw_emails_location, request_id[0..2], request_id) end end diff --git a/app/models/request_classification.rb b/app/models/request_classification.rb index 678b6cd16..f5a1b4bee 100644 --- a/app/models/request_classification.rb +++ b/app/models/request_classification.rb @@ -1,3 +1,15 @@ +# == Schema Information +# Schema version: 20120919140404 +# +# Table name: request_classifications +# +# id :integer not null, primary key +# user_id :integer +# info_request_event_id :integer +# created_at :datetime +# updated_at :datetime +# + class RequestClassification < ActiveRecord::Base belongs_to :user @@ -13,4 +25,4 @@ class RequestClassification < ActiveRecord::Base :include => :user) end -end
\ No newline at end of file +end diff --git a/app/models/request_mailer.rb b/app/models/request_mailer.rb index ba9285fc6..413e93e25 100644 --- a/app/models/request_mailer.rb +++ b/app/models/request_mailer.rb @@ -3,8 +3,6 @@ # # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: request_mailer.rb,v 1.89 2009-10-04 21:53:54 francis Exp $ require 'alaveteli_file_types' @@ -50,12 +48,12 @@ class RequestMailer < ApplicationMailer headers 'Return-Path' => blackhole_email, 'Reply-To' => @from, # we don't care about bounces, likely from spammers 'Auto-Submitted' => 'auto-replied' # http://tools.ietf.org/html/rfc3834 @recipients = email.from_addrs[0].to_s - @subject = "Your response to an FOI request was not delivered" + @subject = _("Your response to an FOI request was not delivered") attachment :content_type => 'message/rfc822', :body => raw_email_data, :filename => "original.eml", :transfer_encoding => '7bit', :content_disposition => 'inline' @body = { :info_request => info_request, - :contact_email => MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost') + :contact_email => Configuration::contact_email } end @@ -154,7 +152,7 @@ class RequestMailer < ApplicationMailer 'Auto-Submitted' => 'auto-generated', # http://tools.ietf.org/html/rfc3834 'X-Auto-Response-Suppress' => 'OOF' @recipients = info_request.user.name_and_email - @subject = "Someone has updated the status of your request" + @subject = _("Someone has updated the status of your request") url = main_url(request_url(info_request)) @body = {:info_request => info_request, :url => url} end @@ -303,7 +301,7 @@ class RequestMailer < ApplicationMailer # Send email alerts for new responses which haven't been classified. By default, # it goes out 3 days after last update of event, then after 10, then after 24. def self.alert_new_response_reminders - MySociety::Config.get("NEW_RESPONSE_REMINDER_AFTER_DAYS", [3, 10, 24]).each_with_index do |days, i| + Configuration::new_response_reminder_after_days.each_with_index do |days, i| self.alert_new_response_reminders_internal(days, "new_response_reminder_#{i+1}") end end diff --git a/app/models/track_mailer.rb b/app/models/track_mailer.rb index 92da7c376..7dfa87f52 100644 --- a/app/models/track_mailer.rb +++ b/app/models/track_mailer.rb @@ -3,8 +3,6 @@ # # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: track_mailer.rb,v 1.23 2009-10-03 02:50:11 francis Exp $ class TrackMailer < ApplicationMailer def event_digest(user, email_about_things) @@ -27,9 +25,7 @@ class TrackMailer < ApplicationMailer end def contact_from_name_and_email - contact_name = MySociety::Config.get("TRACK_SENDER_NAME", 'Alaveteli') - contact_email = MySociety::Config.get("TRACK_SENDER_EMAIL", 'contact@localhost') - return "#{contact_name} <#{contact_email}>" + "#{Configuration::track_sender_name} <#{Configuration::track_sender_email}>" end # Send email alerts for tracked things. Never more than one email diff --git a/app/models/track_thing.rb b/app/models/track_thing.rb index d0fc62e12..d1cef4d4d 100644 --- a/app/models/track_thing.rb +++ b/app/models/track_thing.rb @@ -20,8 +20,7 @@ # # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # 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 @@ -51,15 +50,15 @@ class TrackThing < ActiveRecord::Base def TrackThing.track_type_description(track_type) if track_type == 'request_updates' - "Individual requests" + _("Individual requests") elsif track_type == 'all_new_requests' || track_type == "all_successful_requests" - "Many requests" + _("Many requests") elsif track_type == 'public_body_updates' - "Public authorities" + _("Public authorities") elsif track_type == 'user_updates' - "People" + _("People") elsif track_type == 'search_query' - "Search queries" + _("Search queries") else raise "internal error " + track_type end @@ -195,7 +194,7 @@ class TrackThing < ActiveRecord::Base if self.track_type == 'request_updates' @params = { # Website - :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 + :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 => _("Follow this request"), :verb_on_page_already => _("You are already following this request"), # Email @@ -246,14 +245,14 @@ class TrackThing < ActiveRecord::Base elsif self.track_type == 'public_body_updates' @params = { # Website - :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 + :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 => _("Follow requests to {{public_body_name}}",:public_body_name=>CGI.escapeHTML(self.public_body.name)), :verb_on_page_already => _("You are already following requests to {{public_body_name}}", :public_body_name=>CGI.escapeHTML(self.public_body.name)), # Email :title_in_email => self.public_body.law_only_short + " requests to '" + self.public_body.name + "'", :title_in_rss => self.public_body.law_only_short + " requests to '" + self.public_body.name + "'", # Authentication - :web => _("To follow requests made using {{site_name}} to the public authority '{{public_body_name}}'", :site_name=>MySociety::Config.get('SITE_NAME', 'Alaveteli'), :public_body_name=>CGI.escapeHTML(self.public_body.name)), + :web => _("To follow requests made using {{site_name}} to the public authority '{{public_body_name}}'", :site_name=>Configuration::site_name, :public_body_name=>CGI.escapeHTML(self.public_body.name)), :email => _("Then you will be notified whenever someone requests something or gets a response from '{{public_body_name}}'.", :public_body_name=>CGI.escapeHTML(self.public_body.name)), :email_subject => _("Confirm you want to follow requests to '{{public_body_name}}'", :public_body_name=>self.public_body.name), # RSS sorting @@ -262,7 +261,7 @@ class TrackThing < ActiveRecord::Base elsif self.track_type == 'user_updates' @params = { # Website - :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 + :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 => _("Follow this person"), :verb_on_page_already => _("You are already following this person"), # Email @@ -278,7 +277,7 @@ class TrackThing < ActiveRecord::Base elsif self.track_type == 'search_query' @params = { # Website - :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 + :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 => _("Follow things matching this search"), :verb_on_page_already => _("You are already following things matching this search"), # Email diff --git a/app/models/track_things_sent_email.rb b/app/models/track_things_sent_email.rb index 24297f57b..a0a4c0f0c 100644 --- a/app/models/track_things_sent_email.rb +++ b/app/models/track_things_sent_email.rb @@ -17,8 +17,6 @@ # # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: track_things_sent_email.rb,v 1.22 2009-09-17 21:10:05 francis Exp $ class TrackThingsSentEmail < ActiveRecord::Base belongs_to :info_request_event diff --git a/app/models/user.rb b/app/models/user.rb index 657ea2a4a..59f6c971c 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,4 +1,5 @@ # == Schema Information +# Schema version: 20120919140404 # # Table name: users # @@ -21,13 +22,6 @@ # no_limit :boolean default(FALSE), not null # receive_email_alerts :boolean default(TRUE), not null # -# models/user.rb: -# Model of people who use the site to file requests, make comments etc. -# -# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. -# Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: user.rb,v 1.106 2009-10-01 01:43:36 francis Exp $ require 'digest/sha1' @@ -214,13 +208,12 @@ class User < ActiveRecord::Base # The "internal admin" is a special user for internal use. def User.internal_admin_user - contact_email = MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost') - u = User.find_by_email(contact_email) + u = User.find_by_email(Configuration::contact_email) if u.nil? password = PostRedirect.generate_random_token u = User.new( :name => 'Internal admin user', - :email => contact_email, + :email => Configuration::contact_email, :password => password, :password_confirmation => password ) @@ -288,18 +281,16 @@ class User < ActiveRecord::Base return false if self.no_limit # Has the user issued as many as MAX_REQUESTS_PER_USER_PER_DAY requests in the past 24 hours? - daily_limit = MySociety::Config.get("MAX_REQUESTS_PER_USER_PER_DAY") - return false if daily_limit.nil? + return false if Configuration::max_requests_per_user_per_day.nil? recent_requests = InfoRequest.count(:conditions => ["user_id = ? and created_at > now() - '1 day'::interval", self.id]) - return (recent_requests >= daily_limit) + return (recent_requests >= Configuration::max_requests_per_user_per_day) end def next_request_permitted_at return nil if self.no_limit - daily_limit = MySociety::Config.get("MAX_REQUESTS_PER_USER_PER_DAY") - n_most_recent_requests = InfoRequest.all(:conditions => ["user_id = ? and created_at > now() - '1 day'::interval", self.id], :order => "created_at DESC", :limit => daily_limit) - return nil if n_most_recent_requests.size < daily_limit + n_most_recent_requests = InfoRequest.all(:conditions => ["user_id = ? and created_at > now() - '1 day'::interval", self.id], :order => "created_at DESC", :limit => Configuration::max_requests_per_user_per_day) + return nil if n_most_recent_requests.size < Configuration::max_requests_per_user_per_day nth_most_recent_request = n_most_recent_requests[-1] return nth_most_recent_request.created_at + 1.day diff --git a/app/models/user_info_request_sent_alert.rb b/app/models/user_info_request_sent_alert.rb index a97fd5d44..cf20bcbf5 100644 --- a/app/models/user_info_request_sent_alert.rb +++ b/app/models/user_info_request_sent_alert.rb @@ -16,8 +16,6 @@ # # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: user_info_request_sent_alert.rb,v 1.34 2009-10-03 02:22:18 francis Exp $ class UserInfoRequestSentAlert < ActiveRecord::Base belongs_to :user diff --git a/app/models/user_mailer.rb b/app/models/user_mailer.rb index 7adf5b63c..1be4f8aa3 100644 --- a/app/models/user_mailer.rb +++ b/app/models/user_mailer.rb @@ -3,8 +3,6 @@ # # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: user_mailer.rb,v 1.8 2009-02-09 10:37:12 francis Exp $ class UserMailer < ApplicationMailer def confirm_login(user, reasons, url) diff --git a/app/views/admin_request/edit.rhtml b/app/views/admin_request/edit.rhtml index 808028b47..8fa2a1fe2 100644 --- a/app/views/admin_request/edit.rhtml +++ b/app/views/admin_request/edit.rhtml @@ -28,6 +28,10 @@ <br/>(don't forget to change 'awaiting description' when you set described state)<br/> </p> + <p><label for="info_request_comments_allowed"><strong>Are comments allowed?</strong></label> + <%= select('info_request', "comments_allowed", [["Yes – comments allowed", true], ["No – comments disabled", false]]) %> + </p> + <p><label for="info_request_tag_string"><strong>Tags</strong> <small>(space separated, can use key:value)</small></label><br/> <%= text_field 'info_request', 'tag_string', :size => 60 %></p> diff --git a/app/views/contact_mailer/user_message.rhtml b/app/views/contact_mailer/user_message.rhtml index fe1f47518..b1d6e81ae 100644 --- a/app/views/contact_mailer/user_message.rhtml +++ b/app/views/contact_mailer/user_message.rhtml @@ -1,7 +1,8 @@ --------------------------------------------------------------------- <%= _('{{user_name}} has used {{site_name}} to send you the message below.', :user_name=>@from_user.name, :site_name=>site_name) %> -<%= _('Your details have not been given to anyone, unless you choose to reply to this -message, which will then go directly to the person who wrote the message.')%> +<%= _('Your details, including your email address, have not been given to anyone.') %> +<%= _('If you reply to this message it will go directly to {{user_name}}, who will +learn your email address. Only reply if that is okay.', :user_name => @from_user.name) %> --------------------------------------------------------------------- <%= @message.strip %> diff --git a/app/views/general/_advanced_search_tips.rhtml b/app/views/general/_advanced_search_tips.rhtml index 520cce89b..914abc1af 100644 --- a/app/views/general/_advanced_search_tips.rhtml +++ b/app/views/general/_advanced_search_tips.rhtml @@ -13,7 +13,7 @@ <li><%= _('<strong><code>request:</code></strong> to restrict to a specific request, typing the title as in the URL.')%> <li><%= _('<strong><code>filetype:pdf</code></strong> to find all responses with PDF attachments. Or try these: <code>{{list_of_file_extensions}}</code>', :list_of_file_extensions => IncomingMessage.get_all_file_extensions)%></li> <li><%= _('Type <strong><code>01/01/2008..14/01/2008</code></strong> to only show things that happened in the first two weeks of January.')%></li> - <li><%= _('<strong><code>tag:charity</code></strong> to find all public bodies or requests with a given tag. You can include multiple tags, + <li><%= _('<strong><code>tag:charity</code></strong> to find all public authorities or requests with a given tag. You can include multiple tags, and tag values, e.g. <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.')%></li> <li><%= _('Read about <a href="{{advanced_search_url}}">advanced search operators</a>, such as proximity and wildcards.', :advanced_search_url => "http://www.xapian.org/docs/queryparser.html") %></li> diff --git a/app/views/general/_footer.rhtml b/app/views/general/_footer.rhtml index efcd8f96b..ab5ab2c47 100644 --- a/app/views/general/_footer.rhtml +++ b/app/views/general/_footer.rhtml @@ -1,6 +1,6 @@ <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="https://twitter.com/<%= MySociety::Config.get('TWITTER_USERNAME') %>"><%= _("Follow us on twitter") %></a> +| <img src="/images/twitter-16.png" alt="twitter icon" class="twitter-icon"> <a href="https://twitter.com/<%= Configuration::twitter_username %>"><%= _("Follow us on twitter") %></a> <%= render :partial => 'general/credits' %> </div> <div class="after-footer"> </div> diff --git a/app/views/general/_frontpage_search_examples.es.rhtml b/app/views/general/_frontpage_search_examples.es.rhtml deleted file mode 100644 index 63c7c3c1e..000000000 --- a/app/views/general/_frontpage_search_examples.es.rhtml +++ /dev/null @@ -1 +0,0 @@ -por ejemplo <a href="/es/search/El%20Geraldine%20Quango">El Geraldine Quango</a>, <a href="/search/fancy%20dog">Fancy Dog</a>. diff --git a/app/views/general/_frontpage_search_examples.rhtml b/app/views/general/_frontpage_search_examples.rhtml deleted file mode 100644 index 359a132e2..000000000 --- a/app/views/general/_frontpage_search_examples.rhtml +++ /dev/null @@ -1 +0,0 @@ -for example <a href="/search/Geraldine%20Quango">Geraldine Quango</a> or <a href="/search/fancy%20dog">Fancy Dog</a>. diff --git a/app/views/general/_stylesheet_includes.rhtml b/app/views/general/_stylesheet_includes.rhtml index 2ffa5dadf..7a03680f8 100644 --- a/app/views/general/_stylesheet_includes.rhtml +++ b/app/views/general/_stylesheet_includes.rhtml @@ -16,6 +16,6 @@ <![endif]--> <!-- the following method for customising CSS is deprecated; see `doc/THEMES.md` for detail --> <%= stylesheet_link_tag 'custom', :title => "Main", :rel => "stylesheet" %> - <% if force_registration_on_new_request %> + <% if Configuration::force_registration_on_new_request %> <%= stylesheet_link_tag 'jquery.fancybox-1.3.4', :rel => "stylesheet" %> <% end %> diff --git a/app/views/general/advanced_search.rhtml b/app/views/general/advanced_search.rhtml deleted file mode 100644 index e69de29bb..000000000 --- a/app/views/general/advanced_search.rhtml +++ /dev/null diff --git a/app/views/general/frontpage.rhtml b/app/views/general/frontpage.rhtml index 38133e7ab..e2d74a5e2 100644 --- a/app/views/general/frontpage.rhtml +++ b/app/views/general/frontpage.rhtml @@ -40,7 +40,7 @@ <ul> <% for popular_body in @popular_bodies %> <li><%=public_body_link(popular_body)%> - <%= n_('%d request', '%d requests', popular_body.info_requests.count) % popular_body.info_requests.count %> + <%= n_('%d request', '%d requests', popular_body.info_requests_count) % popular_body.info_requests_count %> </li> <% end%> </ul> @@ -51,20 +51,32 @@ <% end %> <div id="examples_1"> - <h3><%= _("What information has been released?") %></h3> - <%= _("{{site_name}} users have made {{number_of_requests}} requests, including:", + <h3> + <% if @request_events_all_successful %> + <%= _("What information has been released?") %> + <% else %> + <%= _("What information has been requested?") %> + <% end %> + </h3> + <%= _("{{site_name}} users have made {{number_of_requests}} requests, including:", :site_name => site_name, :number_of_requests => InfoRequest.count) %> <ul> <% 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)) %> + <%=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.search_text_main(true), "", 200) %></p> </li> <% end %> </ul> - <p><strong><%=link_to _('More successful requests...'), request_list_successful_url %></strong></p> + <p><strong> + <% if @request_events_all_successful %> + <%=link_to _('More successful requests...'), request_list_successful_url %> + <% else %> + <%=link_to _('More requests...'), request_list_all_url %> + <% end %> + </strong></p> </div> </div> diff --git a/app/views/help/_sidebar.rhtml b/app/views/help/_sidebar.rhtml index 21038e8df..783d35983 100644 --- a/app/views/help/_sidebar.rhtml +++ b/app/views/help/_sidebar.rhtml @@ -8,7 +8,7 @@ <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> + <li><%= link_to_unless_current "Advanced search", "/advancedsearch" %></li> </ul> <h2 id="contact">Contact us</h2> diff --git a/app/views/help/contact.rhtml b/app/views/help/contact.rhtml index dd49f7951..37df68f49 100644 --- a/app/views/help/contact.rhtml +++ b/app/views/help/contact.rhtml @@ -10,27 +10,18 @@ <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> + from public authorities.</li> <li> Asking for private information about yourself? - Please read our help page about - <a href="/help/requesting#data_protection">data protection</a>. + Please read our + <a href="/help/requesting#data_protection">help page</a>. </li> </ul> - <h2>Take up an issue with Government</h2> - - <ul> - <li><a href="http://www.writetothem.com">Write to your MP, - local councillor or other representative</a>. - <li><a href="http://www.number10.gov.uk/">Number 10</a> is a good place to start if you would like to take an issue up with central government. </li> - </ul> - - <% end %> - <h2>Contact the WhatDoTheyKnow team</h2> + <h2>Contact the <%= site_name %> team</h2> <% if !flash[:notice] %> <ul> <li> @@ -91,8 +82,7 @@ <p class="form_note"> We can only help you with <strong>technical problems</strong>, or questions - about Freedom of Information. See the top of this page if you would like to - contact the Government. + about Freedom of Information. </P> diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml index e4022661f..0dd493fd0 100644 --- a/app/views/layouts/default.rhtml +++ b/app/views/layouts/default.rhtml @@ -42,7 +42,7 @@ <%= render :partial => 'general/before_head_end' %> </head> <body class="<%= 'admin' if is_admin? %> <%= 'front' if params[:action] == 'frontpage' %>"> - <% if force_registration_on_new_request && !@user %> + <% if Configuration::force_registration_on_new_request && !@user %> <%= javascript_include_tag 'jquery.fancybox-1.3.4.pack' %> <script type="text/javascript"> $(document).ready(function() { @@ -139,15 +139,13 @@ <input type="text"> </div> <% - ga_code = MySociety::Config.get('GA_CODE', '') - - unless ga_code.empty? %> + unless Configuration::ga_code.empty? %> <script> var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); </script> <script> - var pageTracker = _gat._getTracker("<%=ga_code%>"); + var pageTracker = _gat._getTracker("<%= Configuration::ga_code %>"); pageTracker._trackPageview(); </script> diff --git a/app/views/public_body/_list_sidebar_extra.rhtml b/app/views/public_body/_list_sidebar_extra.rhtml new file mode 100644 index 000000000..6857a7eb5 --- /dev/null +++ b/app/views/public_body/_list_sidebar_extra.rhtml @@ -0,0 +1,6 @@ +<p> + <%= _('<a href="%s">Are we missing a public authority?</a>') % [help_requesting_path + '#missing_body'] %> +</p> +<p> + <%= link_to _('List of all authorities (CSV)'), all_public_bodies_csv_url() %> +</p> diff --git a/app/views/public_body/list.rhtml b/app/views/public_body/list.rhtml index 8cb207bd4..3a64de1f7 100644 --- a/app/views/public_body/list.rhtml +++ b/app/views/public_body/list.rhtml @@ -25,15 +25,10 @@ <% if not first_row %> </ul> <% end %> - <p> - <%= _('<a href="%s">Are we missing a public authority?</a>.') % [help_requesting_path + '#missing_body'] %> - </p> - <p> - <%= link_to _('List of all authorities (CSV)'), all_public_bodies_csv_url() %> - </p> + <%= render :partial => "list_sidebar_extra" %> </div> -<% @title = _("Public authorities - {{description}}", :description => @description) %> +<% @title = @description.empty? ? _("Public authorities") : _("Public authorities - {{description}}", :description => @description) %> <div id="left_column_flip"> <h1><%= _('Public authorities') %></h1> @@ -44,7 +39,7 @@ </div> <% end %> -<h2 class="publicbody_results"><%= _('Found {{count}} public bodies {{description}}', :count=>@public_bodies.total_entries, :description=>@description) %></h2> +<h2 class="publicbody_results"><%= n_('Found %d public authority %s', 'Found %d public authorities %s', @public_bodies.total_entries) % [@public_bodies.total_entries, @description] %></h2> <%= render :partial => 'body_listing', :locals => { :public_bodies => @public_bodies } %> <%= will_paginate(@public_bodies) %><br/> diff --git a/app/views/public_body/show.rhtml b/app/views/public_body/show.rhtml index 63bd5f7fc..b56556d5d 100644 --- a/app/views/public_body/show.rhtml +++ b/app/views/public_body/show.rhtml @@ -64,6 +64,12 @@ <% else %> <%= _('For an unknown reason, it is not possible to make a request to this authority.')%> <% end %> + + <% if @public_body.override_request_email %> + <p> + <%= _("<strong>Note:</strong> Because we're testing, requests are being sent to {{email}} rather than to the actual authority.", :email => @public_body.override_request_email) %> + </p> + <% end %> </div> </div> diff --git a/app/views/request/_after_actions.rhtml b/app/views/request/_after_actions.rhtml index 15ca6302e..580ff0e87 100644 --- a/app/views/request/_after_actions.rhtml +++ b/app/views/request/_after_actions.rhtml @@ -5,9 +5,11 @@ <div id="anyone_actions"> <strong><%= _('Anyone:') %></strong> <ul> - <li> - <%= _('<a href="%s">Add an annotation</a> (to help the requester or others)') % [new_comment_url(:url_title => @info_request.url_title)] %> - </li> + <% if @info_request.comments_allowed? %> + <li> + <%= _('<a href="%s">Add an annotation</a> (to help the requester or others)') % [new_comment_url(:url_title => @info_request.url_title)] %> + </li> + <% end %> <% if @old_unclassified %> <li> <%= link_to _('Update the status of this request'), '#describe_state_form_1' %> diff --git a/app/views/request/_sidebar.rhtml b/app/views/request/_sidebar.rhtml index 731bfb34e..18684943a 100644 --- a/app/views/request/_sidebar.rhtml +++ b/app/views/request/_sidebar.rhtml @@ -24,19 +24,19 @@ <% end %> <% else %> <p><%= _('Requests for personal information and vexatious requests are not considered valid for FOI purposes (<a href="/help/about">read more</a>).') %></p> - <p><%= ('If you believe this request is not suitable, you can report it for attention by the site administrators') %></p> + <p><%= _('If you believe this request is not suitable, you can report it for attention by the site administrators') %></p> <%= link_to _("Report this request"), report_path, :class => "link_button_green", :method => "POST" %> <% end %> <% end %> <h2><%= _("Act on what you've learnt") %></h2> <div class="act_link"> - <% tweet_link = "https://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 %> + <% tweet_link = "https://twitter.com/share?url=#{h(request.url)}&via=#{h(Configuration::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/wordpress.png" alt="" class="rss">', "http://wordpress.com/"%> + <%= link_to '<img src="/images/wordpress.png" alt="" class="rss">', "http://wordpress.com/"%> <%= link_to _("Start your own blog"), "http://wordpress.com/"%> </div> diff --git a/app/views/request/_summary_suggestion.rhtml b/app/views/request/_summary_suggestion.rhtml new file mode 100644 index 000000000..a5da09cda --- /dev/null +++ b/app/views/request/_summary_suggestion.rhtml @@ -0,0 +1,5 @@ +<% if @info_request.law_used == 'eir' %> + <%= _("'Pollution levels over time for the River Tyne'") %> +<% else %> + <%= _("'Crime statistics by ward level for Wales'") %> +<% end %> diff --git a/app/views/request/new.rhtml b/app/views/request/new.rhtml index 23212fc0b..fe4c2067d 100644 --- a/app/views/request/new.rhtml +++ b/app/views/request/new.rhtml @@ -86,12 +86,7 @@ </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 %> - ) + <%= render :partial => "summary_suggestion" %>) </div> </div> @@ -121,7 +116,7 @@ will be <strong>displayed publicly</strong> on this website forever (<a href="%s">why?</a>).') % [help_privacy_path+"#public_request"] %> <%= _('If you are thinking of using a pseudonym, - please <a href="%s">read this first</a>.') % [help_privacy_path+"#public_request"] %> + please <a href="%s">read this first</a>.') % [help_privacy_path+"#real_name"] %> </p> <% else %> <p class="form_note"> diff --git a/app/views/request/simple_correspondence.rhtml b/app/views/request/simple_correspondence.rhtml index bcbc795e7..0da9ef172 100644 --- a/app/views/request/simple_correspondence.rhtml +++ b/app/views/request/simple_correspondence.rhtml @@ -1,4 +1,4 @@ -<%= _('This is a plain-text version of the Freedom of Information request "{{request_title}}". The latest, full version is available online at {{full_url}}', :request_title => @info_request.title, :full_url => "http://#{MySociety::Config.get('DOMAIN')}#{show_request_path(:url_title=>@info_request.url_title)}") %>. +<%= _('This is a plain-text version of the Freedom of Information request "{{request_title}}". The latest, full version is available online at {{full_url}}', :request_title => @info_request.title, :full_url => "http://#{Configuration::domain}#{show_request_path(:url_title=>@info_request.url_title)}") %>. <% for info_request_event in @info_request_events %> <% diff --git a/app/views/request/upload_response.rhtml b/app/views/request/upload_response.rhtml index 697ff99aa..bc129426d 100644 --- a/app/views/request/upload_response.rhtml +++ b/app/views/request/upload_response.rhtml @@ -43,7 +43,7 @@ <p> <%= hidden_field_tag 'submitted_upload_response', 1 %> - <%= submit_tag "Upload FOI response" %> + <%= submit_tag _("Upload FOI response") %> <%= _(' (<strong>patience</strong>, especially for large files, it may take a while!)')%> </p> <% end %> diff --git a/app/views/track/_tracking_links.rhtml b/app/views/track/_tracking_links.rhtml index 39f346eff..3ba9d15e2 100644 --- a/app/views/track/_tracking_links.rhtml +++ b/app/views/track/_tracking_links.rhtml @@ -4,12 +4,12 @@ end %> -<% if own_request %> +<% if own_request %> <p><%= _('This is your own request, so you will be automatically emailed when new responses arrive.')%></p> -<% elsif existing_track %> +<% elsif existing_track %> <p><%= track_thing.params[:verb_on_page_already] %></p> <div class="feed_link feed_link_<%=location%>"> - <%= link_to "Unsubscribe", {:controller => 'track', :action => 'update', :track_id => existing_track.id, :track_medium => "delete", :r => request.request_uri}, :class => "link_button_green" %> + <%= link_to _("Unsubscribe"), {:controller => 'track', :action => 'update', :track_id => existing_track.id, :track_medium => "delete", :r => request.request_uri}, :class => "link_button_green" %> </div> <% elsif track_thing %> <div class="feed_link feed_link_<%=location%>"> @@ -19,9 +19,9 @@ <%= link_to _("Follow"), do_track_url(track_thing), :class => "link_button_green" %> <% end %> </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 '<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 %> diff --git a/app/views/user/_signin.rhtml b/app/views/user/_signin.rhtml index 4fe98ee41..c4d917991 100644 --- a/app/views/user/_signin.rhtml +++ b/app/views/user/_signin.rhtml @@ -9,27 +9,27 @@ <p> <label class="form_label" for="user_signin_email"><%= _('Your e-mail:')%></label> - <%= text_field 'user_signin', 'email', { :size => 20 } %> + <%= text_field 'user_signin', 'email', { :size => 20, :tabindex => 10 } %> </p> <p> <label class="form_label" for="user_signin_password"><%= _('Password:')%></label> - <%= password_field 'user_signin', 'password', { :size => 15 } %> + <%= password_field 'user_signin', 'password', { :size => 15, :tabindex => 20 } %> </p> <p class="form_note"> - <%= link_to _('Forgotten your password?'), signchangepassword_url + "?pretoken=" + h(params[:token]) %> + <%= link_to _('Forgotten your password?'), signchangepassword_url + "?pretoken=" + h(params[:token]), :tabindex => 30 %> </p> <p class="form_checkbox"> - <%= check_box_tag 'remember_me', "1" %> + <%= check_box_tag 'remember_me', "1", false, :tabindex => 40 %> <label for="remember_me"><%= _('Remember me</label> (keeps you signed in longer; do not use on a public computer) ')%></p> <div class="form_button"> <%= hidden_field_tag 'token', params[:token], {:id => 'signin_token' } %> <%= hidden_field_tag :modal, params[:modal], {:id => 'signin_modal' } %> - <%= submit_tag _('Sign in') %> + <%= submit_tag _('Sign in'), :tabindex => 50 %> </div> <% end %> diff --git a/app/views/user/_signup.rhtml b/app/views/user/_signup.rhtml index 9c0132f26..bb93b9617 100644 --- a/app/views/user/_signup.rhtml +++ b/app/views/user/_signup.rhtml @@ -7,7 +7,7 @@ <p> <label class="form_label" for="user_signup_email"><%= _('Your e-mail:')%></label> - <%= text_field 'user_signup', 'email', { :size => 20 } %> + <%= text_field 'user_signup', 'email', { :size => 20, :tabindex => 60 } %> </p> <div class="form_item_note"> <%= _('We will not reveal your email address to anybody unless you or @@ -16,7 +16,7 @@ <p> <label class="form_label" for="user_signup_name"> <%= _('Your name:')%></label> - <%= text_field 'user_signup', 'name', { :size => 20 } %> + <%= text_field 'user_signup', 'name', { :size => 20, :tabindex => 70 } %> </p> <div class="form_item_note"> <%= _('Your <strong>name will appear publicly</strong> @@ -28,12 +28,12 @@ <p> <label class="form_label" for="user_signup_password"> <%= _('Password:')%></label> - <%= password_field 'user_signup', 'password', { :size => 15 } %> + <%= password_field 'user_signup', 'password', { :size => 15, :tabindex => 80 } %> </p> <p> <label class="form_label" for="user_signup_password_confirmation"> <%= _('Password: (again)')%></label> - <%= password_field 'user_signup', 'password_confirmation', { :size => 15 } %> + <%= password_field 'user_signup', 'password_confirmation', { :size => 15, :tabindex => 90 } %> </p> <% if @request_from_foreign_country %> @@ -43,7 +43,7 @@ <div class="form_button"> <%= hidden_field_tag 'token', params[:token], {:id => 'signup_token' } %> <%= hidden_field_tag :modal, params[:modal], {:id => 'signup_modal' } %> - <%= submit_tag _('Sign up') %> + <%= submit_tag _('Sign up'), :tabindex => 100 %> </div> <% end %> diff --git a/app/views/user/rate_limited.rhtml b/app/views/user/rate_limited.rhtml index d5accf114..d52deebab 100644 --- a/app/views/user/rate_limited.rhtml +++ b/app/views/user/rate_limited.rhtml @@ -2,7 +2,7 @@ <h1><%=@title%></h1> -<p><%= _("You have hit the rate limit on new requests. Users are ordinarily limited to {{max_requests_per_user_per_day}} requests in any rolling 24-hour period. You will be able to make another request in {{can_make_another_request}}.", :max_requests_per_user_per_day => MySociety::Config.get("MAX_REQUESTS_PER_USER_PER_DAY"), :can_make_another_request => distance_of_time_in_words(Time.now, @next_request_permitted_at))%></p> +<p><%= _("You have hit the rate limit on new requests. Users are ordinarily limited to {{max_requests_per_user_per_day}} requests in any rolling 24-hour period. You will be able to make another request in {{can_make_another_request}}.", :max_requests_per_user_per_day => Configuration::max_requests_per_user_per_day, :can_make_another_request => distance_of_time_in_words(Time.now, @next_request_permitted_at))%></p> <p><%= _("There is a limit on the number of requests you can make in a day, because we don’t want public authorities to be bombarded with large numbers of inappropriate requests. If you feel you have a good reason to ask for the limit to be lifted in your case, please <a href='{{help_contact_path}}'>get in touch</a>.", :help_contact_path => help_contact_path) %></p> diff --git a/app/views/user/set_profile_about_me.rhtml b/app/views/user/set_profile_about_me.rhtml index 8d8b32758..4fe1047da 100644 --- a/app/views/user/set_profile_about_me.rhtml +++ b/app/views/user/set_profile_about_me.rhtml @@ -26,7 +26,7 @@ <%= _(' Include relevant links, such as to a campaign page, your blog or a twitter account. They will be made clickable. e.g.')%> - <a href="https://twitter.com/<%= MySociety::Config.get('TWITTER_USERNAME') %>">https://twitter.com/<%= MySociety::Config.get('TWITTER_USERNAME') %></a> + <a href="https://twitter.com/<%= Configuration::twitter_username %>">https://twitter.com/<%= Configuration::twitter_username %></a> </p> </div> diff --git a/config/alert-tracks-debian.ugly b/config/alert-tracks-debian.ugly index 5bd146061..2b52ad840 100644 --- a/config/alert-tracks-debian.ugly +++ b/config/alert-tracks-debian.ugly @@ -4,7 +4,7 @@ # Provides: alert-tracks # Required-Start: $local_fs $syslog # Required-Stop: $local_fs $syslog -# Default-Start: 2 3 4 5 +# Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: alert-tracks is a daemon running the Alaveteli email alerts # Description: alert-tracks send Alaveteli email alerts as required @@ -13,11 +13,14 @@ # !!(*= $daemon_name *)!! Start the Alaveteli email alert daemon NAME=!!(*= $daemon_name *)!! -DAEMON=/data/vhost/!!(*= $vhost *)!!/alaveteli/script/runner +DAEMON=!!(*= $vhost_dir *)!!/alaveteli/script/runner DAEMON_ARGS="--daemon TrackMailer.alert_tracks_loop" -PIDFILE=/data/vhost/!!(*= $vhost *)!!/alert-tracks.pid -LOGFILE=/data/vhost/!!(*= $vhost *)!!/logs/alert-tracks.log +PIDFILE=!!(*= $vhost_dir *)!!/alert-tracks.pid +LOGFILE=!!(*= $vhost_dir *)!!/logs/alert-tracks.log DUSER=!!(*= $user *)!! +# Set RAILS_ENV - not needed if using config/rails_env.rb +# RAILS_ENV=your_rails_env +# export RAILS_ENV trap "" 1 @@ -48,17 +51,17 @@ case "$1" in exit 0 fi ;; - + start) echo -n "Starting Alaveteli alert daemon: $NAME" start_daemon ;; - + stop) echo -n "Stopping Alaveteli alert daemon: $NAME" stop_daemon ;; - + restart) echo -n "Restarting Alaveteli alert daemon: $NAME" stop_daemon diff --git a/config/crontab.ugly b/config/crontab.ugly index dc660e18f..3e44f6153 100644 --- a/config/crontab.ugly +++ b/config/crontab.ugly @@ -3,8 +3,6 @@ # # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org. WWW: http://www.mysociety.org/ -# -# $Id: crontab.ugly,v 1.36 2009-09-20 10:29:36 francis Exp $ PATH=/usr/local/bin:/usr/bin:/bin MAILTO=cron-!!(*= $site *)!!@mysociety.org diff --git a/config/deploy.rb b/config/deploy.rb index 888710f83..5e1c3aa0d 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -48,6 +48,10 @@ namespace :deploy do links = { "#{release_path}/config/database.yml" => "#{shared_path}/database.yml", "#{release_path}/config/general.yml" => "#{shared_path}/general.yml", + "#{release_path}/config/memcached.yml" => "#{shared_path}/memcached.yml", + "#{release_path}/config/rails_env.rb" => "#{shared_path}/rails_env.rb", + "#{release_path}/public/foi-live-creation.png" => "#{shared_path}/foi-live-creation.png", + "#{release_path}/public/foi-user-use.png" => "#{shared_path}/foi-user-use.png", "#{release_path}/files" => "#{shared_path}/files", "#{release_path}/cache" => "#{shared_path}/cache", "#{release_path}/vendor/plugins/acts_as_xapian/xapiandbs" => "#{shared_path}/xapiandbs", diff --git a/config/environment.rb b/config/environment.rb index 250d3eed0..db537c14e 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -29,10 +29,10 @@ load "util.rb" # without effecting method behaviour # and adds fallback gem call removed in https://github.com/rails/rails/commit/4c3725723f15fab0a424cb1318b82b460714b72f require File.join(File.dirname(__FILE__), '../lib/old_rubygems_patch') - +require 'configuration' # Application version -ALAVETELI_VERSION = '0.6.6' +ALAVETELI_VERSION = '0.6.7' Rails::Initializer.run do |config| # Load intial mySociety config @@ -78,8 +78,8 @@ Rails::Initializer.run do |config| end # See Rails::Configuration for more options - ENV['RECAPTCHA_PUBLIC_KEY'] = MySociety::Config::get("RECAPTCHA_PUBLIC_KEY", 'x'); - ENV['RECAPTCHA_PRIVATE_KEY'] = MySociety::Config::get("RECAPTCHA_PRIVATE_KEY", 'x'); + ENV['RECAPTCHA_PUBLIC_KEY'] = Configuration::recaptcha_public_key + ENV['RECAPTCHA_PRIVATE_KEY'] = Configuration::recaptcha_private_key end # Add new inflection rules using the following format @@ -98,22 +98,22 @@ end # The Rails cache is set up by the Interlock plugin to use memcached # Domain for URLs (so can work for scripts, not just web pages) -ActionMailer::Base.default_url_options[:host] = MySociety::Config.get("DOMAIN", 'localhost:3000') +ActionMailer::Base.default_url_options[:host] = Configuration::domain # So that javascript assets use full URL, so proxied admin URLs read javascript OK -if (MySociety::Config.get("DOMAIN", "") != "") +if (Configuration::domain != "") ActionController::Base.asset_host = Proc.new { |source, request| if ENV["RAILS_ENV"] != "test" && request.fullpath.match(/^\/admin\//) - MySociety::Config.get("ADMIN_PUBLIC_URL", "") + Configuration::admin_public_url else - MySociety::Config.get("DOMAIN", 'localhost:3000') + Configuration::domain end } end # fallback locale and available locales -available_locales = MySociety::Config.get('AVAILABLE_LOCALES', '').split(/ /) -default_locale = MySociety::Config.get('DEFAULT_LOCALE', '') +available_locales = Configuration::available_locales.split(/ /) +default_locale = Configuration::default_locale FastGettext.default_available_locales = available_locales I18n.locale = default_locale @@ -140,5 +140,5 @@ require 'world_foi_websites.rb' require 'alaveteli_external_command.rb' require 'quiet_opener.rb' -ExceptionNotification::Notifier.sender_address = MySociety::Config::get('EXCEPTION_NOTIFICATIONS_FROM') -ExceptionNotification::Notifier.exception_recipients = MySociety::Config::get('EXCEPTION_NOTIFICATIONS_TO') +ExceptionNotification::Notifier.sender_address = Configuration::exception_notifications_from +ExceptionNotification::Notifier.exception_recipients = Configuration::exception_notifications_to diff --git a/config/general.yml-example b/config/general.yml-example index ad6982670..6c8878cd6 100644 --- a/config/general.yml-example +++ b/config/general.yml-example @@ -30,8 +30,12 @@ REPLY_LATE_AFTER_DAYS: 20 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 +# Whether the days above are given in working or calendar days. Value can be "working" or "calendar". +# Default is "working". +WORKING_OR_CALENDAR_DAYS: working # example public bodies for the home page, semicolon delimited - short_names +# Comment out if you want this to be auto-generated. WARNING: this is slow & don't use production! FRONTPAGE_PUBLICBODY_EXAMPLES: 'tgq' # URLs of themes to download and use (when running rails-post-deploy @@ -79,7 +83,8 @@ TRACK_SENDER_NAME: 'Alaveteli Webmaster' # this up! RAW_EMAILS_LOCATION: 'files/raw_emails' -# The base URL for admin pages. +# The base URL for admin pages, must always end with a '/' +# e.g. https://www.example.com/secure/alaveteli-admin/ # If not specified, it will default to the path to the admin controller, # which is usually what you want. It is useful in situations where admin # requests are proxied via a secure server, for example. @@ -162,3 +167,14 @@ GA_CODE: '' # system will cry. SURVEY_SECRET: '' SURVEY_URL: '' + +# If you want to override *all* the public body request emails with your own +# email so that request emails that would normally go to the public body +# go to you, then uncomment below and fill in your email. +# Useful for a staging server to play with the whole process of sending requests +# without inadvertently sending an email to a real authority +#OVERRIDE_ALL_PUBLIC_BODY_REQUEST_EMAILS: test-email@foo.com + +# Search path for external commandline utilities (such as pdftohtml, pdftk, unrtf) +UTILITY_SEARCH_PATH: ["/usr/bin", "/usr/local/bin"] + diff --git a/config/httpd.conf b/config/httpd.conf index 129b1577b..440da0d87 100644 --- a/config/httpd.conf +++ b/config/httpd.conf @@ -5,8 +5,6 @@ # # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org -# -# $Id: httpd.conf,v 1.31 2009-09-02 13:05:48 matthew Exp $ # This is needed for the PHP spell checker <Location /fcgi> diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index a05d2c7d1..8cfa333f2 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -7,7 +7,7 @@ ActionController::Base.session = { :key => '_wdtk_cookie_session', - :secret => MySociety::Config.get("COOKIE_STORE_SESSION_SECRET", 'this default is insecure as code is open source, please override for live sites in config/general; this will do for local development') + :secret => Configuration::cookie_store_session_secret } ActionController::Base.session_store = :cookie_store diff --git a/config/initializers/theme_loader.rb b/config/initializers/theme_loader.rb index 8908dc07e..877149e9d 100644 --- a/config/initializers/theme_loader.rb +++ b/config/initializers/theme_loader.rb @@ -2,9 +2,8 @@ # It is used by our config/routes.rb to decide which route extension files to load. $alaveteli_route_extensions = [] -theme_urls = MySociety::Config.get("THEME_URLS", []) if ENV["RAILS_ENV"] != "test" # Don't let the themes interfere with Alaveteli specs - for url in theme_urls.reverse + for url in Configuration::theme_urls.reverse theme_name = url.sub(/.*\/(.*).git/, "\\1") theme_main_include = File.expand_path "../../../vendor/plugins/#{theme_name}/lib/alavetelitheme.rb", __FILE__ if File.exists? theme_main_include diff --git a/config/memcached.yml-test b/config/memcached.yml-test new file mode 100644 index 000000000..18d959876 --- /dev/null +++ b/config/memcached.yml-test @@ -0,0 +1,2 @@ +test: + disabled: true
\ No newline at end of file diff --git a/config/purge-varnish-debian.ugly b/config/purge-varnish-debian.ugly index 1a9259da8..af32650a8 100644 --- a/config/purge-varnish-debian.ugly +++ b/config/purge-varnish-debian.ugly @@ -4,7 +4,7 @@ # Provides: purge-varnish # Required-Start: $local_fs $syslog # Required-Stop: $local_fs $syslog -# Default-Start: 2 3 4 5 +# Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: purge-varnish is a daemon purging the Alaveteli varnish cache # Description: purge-varnish purge the Alaveteli varnish cache @@ -13,11 +13,14 @@ # !!(*= $daemon_name *)!! Start the Alaveteli email purge-varnish daemon NAME=!!(*= $daemon_name *)!! -DAEMON=/data/vhost/!!(*= $vhost *)!!/alaveteli/script/runner +DAEMON=!!(*= $vhost_dir *)!!/alaveteli/script/runner DAEMON_ARGS="--daemon PurgeRequest.purge_all_loop" -PIDFILE=/data/vhost/!!(*= $vhost *)!!/purge-varnish.pid -LOGFILE=/data/vhost/!!(*= $vhost *)!!/logs/purge-varnish.log +PIDFILE=!!(*= $vhost_dir *)!!/purge-varnish.pid +LOGFILE=!!(*= $vhost_dir *)!!/logs/purge-varnish.log DUSER=!!(*= $user *)!! +# Set RAILS_ENV - not needed if using config/rails_env.rb +# RAILS_ENV=your_rails_env +# export RAILS_ENV trap "" 1 @@ -48,17 +51,17 @@ case "$1" in exit 0 fi ;; - + start) echo -n "Starting Alaveteli purge-varnish daemon: $NAME" start_daemon ;; - + stop) echo -n "Stopping Alaveteli purge-varnish daemon: $NAME" stop_daemon ;; - + restart) echo -n "Restarting Alaveteli purge-varnish daemon: $NAME" stop_daemon diff --git a/config/routes.rb b/config/routes.rb index 34232b55b..5fc0075a4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,8 +3,6 @@ # # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: routes.rb,v 1.92 2009-10-14 22:01:27 francis Exp $ # Allow easy extension from themes. Note these will have the highest priority. $alaveteli_route_extensions.each do |f| diff --git a/config/test.yml b/config/test.yml index 5811b1785..ef270dcf2 100644 --- a/config/test.yml +++ b/config/test.yml @@ -72,7 +72,7 @@ CONTACT_NAME: 'Alaveteli Webmaster' RAW_EMAILS_LOCATION: 'files/raw_emails' # The base URL for admin pages. You probably don't want to change this. -ADMIN_BASE_URL: '/admin/' +ADMIN_BASE_URL: '' # Where /stylesheets sits under for admin pages. See asset_host in # config/environment.rb. Can be full domain or relative path (not an @@ -125,4 +125,4 @@ EXCEPTION_NOTIFICATIONS_TO: MAX_REQUESTS_PER_USER_PER_DAY: 2 VARNISH_HOST: varnish.localdomain -SKIP_ADMIN_AUTH: true
\ No newline at end of file +SKIP_ADMIN_AUTH: true diff --git a/db/migrate/074_create_holidays.rb b/db/migrate/074_create_holidays.rb index 46b1ab684..f2197e89e 100644 --- a/db/migrate/074_create_holidays.rb +++ b/db/migrate/074_create_holidays.rb @@ -59,7 +59,7 @@ class CreateHolidays < ActiveRecord::Migration '2010-12-28' => "Boxing Day" } - holidays.sort.each { |date, desc| + holidays.sort.each { |date, desc| Holiday.create :day => date, :description => desc } diff --git a/db/migrate/101_add_hash_to_info_request.rb b/db/migrate/101_add_hash_to_info_request.rb index 20608aac1..e21bf0989 100644 --- a/db/migrate/101_add_hash_to_info_request.rb +++ b/db/migrate/101_add_hash_to_info_request.rb @@ -6,7 +6,7 @@ class AddHashToInfoRequest < ActiveRecord::Migration # Create the missing events for requests already sent InfoRequest.find(:all).each do |info_request| - info_request.idhash = Digest::SHA1.hexdigest(info_request.id.to_s + MySociety::Config.get("INCOMING_EMAIL_SECRET", 'dummysecret'))[0,8] + info_request.idhash = Digest::SHA1.hexdigest(info_request.id.to_s + Configuration::incoming_email_secret)[0,8] info_request.save! puts info_request.idhash end diff --git a/db/migrate/20120912170035_add_info_requests_count_to_public_bodies.rb b/db/migrate/20120912170035_add_info_requests_count_to_public_bodies.rb index d77dbaa64..d187dcfa5 100644 --- a/db/migrate/20120912170035_add_info_requests_count_to_public_bodies.rb +++ b/db/migrate/20120912170035_add_info_requests_count_to_public_bodies.rb @@ -2,11 +2,10 @@ class AddInfoRequestsCountToPublicBodies < ActiveRecord::Migration def self.up add_column :public_bodies, :info_requests_count, :integer, :null => false, :default => 0 - PublicBody.reset_column_information + PublicBody.connection.execute("UPDATE public_bodies + SET info_requests_count = (SELECT COUNT(*) FROM info_requests + WHERE public_body_id = public_bodies.id);") - PublicBody.find_each do |public_body| - public_body.update_attribute :info_requests_count, public_body.info_requests.length - end end diff --git a/db/migrate/20120919140404_add_comments_allowed_to_info_request.rb b/db/migrate/20120919140404_add_comments_allowed_to_info_request.rb new file mode 100644 index 000000000..4ae0bce18 --- /dev/null +++ b/db/migrate/20120919140404_add_comments_allowed_to_info_request.rb @@ -0,0 +1,9 @@ +class AddCommentsAllowedToInfoRequest < ActiveRecord::Migration + def self.up + add_column :info_requests, :comments_allowed, :boolean, :null => false, :default => true + end + + def self.down + remove_column :info_requests, :comments_allowed + end +end diff --git a/doc/CHANGES.md b/doc/CHANGES.md index 15df1dce5..d3faa101d 100644 --- a/doc/CHANGES.md +++ b/doc/CHANGES.md @@ -1,3 +1,20 @@ +# Version 0.6.7 +## Highlighted features +* The ability to calculate due dates using calendar, not working days (Matthew Landauer) +* A refactor and standardization of the configuation variables and defaults using a central module (Matthew Landauer) +* The use of full URLs in admin attention emails, and associated modification of the admin_url helper to always return full urls (Henare Degan) +* The ability to disable comments on a request (Robin Houston) +* Some previously missed strings for translation, courtesy of the Czech translation team + +* [List of issues on github](https://github.com/mysociety/alaveteli/issues?milestone=23&state=closed) + + +## Upgrade notes + +* Themes created for 0.6.6 and below should be updated to use the new Configuration module wherever they used Config.get directly previously. +* Check out this version and run `rails-post-deploy` as usual. + + # Version 0.6.6 ## Highlighted features * Adds deployment via Capistrano - see DEPLOY.md for details diff --git a/doc/DEPLOY.md b/doc/DEPLOY.md index adeb0e113..767f720fd 100644 --- a/doc/DEPLOY.md +++ b/doc/DEPLOY.md @@ -19,7 +19,8 @@ These are the general steps required to get your staging server up and running: * Run `cap deploy:update_code` so that we've got a copy of the example config on the server. This process will take a long time installing gems, etc. it will also fail on `rake:themes:install` but that's OK * SSH to the server, change to the `deploy_to` directory * `cp releases/[SOME_DATE]/config/general.yml-example shared/general.yml` -* `cp releases/[SOME_DATE]/config/general.yml-example shared/general.yml` +* `cp releases/[SOME_DATE]/config/database.yml-example shared/database.yml` +* `cp releases/[SOME_DATE]/config/memcached.yml-example shared/memcached.yml` * Edit those files to match your required settings * Back on your machine run `cap deploy` and it should successfully deploy * Run the DB migrations `cap deploy:migrate` diff --git a/doc/INSTALL.md b/doc/INSTALL.md index 62c5071ca..b805ee0c5 100644 --- a/doc/INSTALL.md +++ b/doc/INSTALL.md @@ -25,6 +25,18 @@ master branch (which always contains the latest stable release): git checkout master +# Package pinning + +You need to configure [apt-pinning](http://wiki.debian.org/AptPreferences#Pinning-1) preferences in order to prevent packages being pulled from the debian testing distribution in preference to the stable distribution once you have added the testing repository as described below. + +In order to configure apt-pinning and to keep most packages coming from the Debian stable repository while installing the ones required from testing and the mySociety repository you need to run the following commands: + + echo "Package: *" >> /tmp/preferences + echo "Pin: release a=testing">> /tmp/preferences + echo "Pin-Priority: 50" >> /tmp/preferences + sudo cp /tmp/preferences /etc/apt/ + rm /tmp/preferences + # Install system dependencies These are packages that the software depends on: third-party software @@ -39,7 +51,7 @@ If you are running Debian, add the following repositories to deb http://ftp.debian.org/debian/ testing main non-free contrib The repositories above allow us to install the packages -`wkthmltopdf-static` and `bundler` using `apt`; so if you're running +`wkhtmltopdf-static` and `bundler` using `apt`; so if you're running Ubuntu, you won't be able to use the above repositories, and you will need to comment out those two lines in `config/packages` before following the next step (and install bundler manually). @@ -296,7 +308,7 @@ in the front end. It is possible completely to override the administrator authentication by setting `SKIP_ADMIN_AUTH` to `true` in `general.yml`. -# Cron jobs +# Cron jobs and init scripts `config/crontab.ugly` contains the cronjobs run on WhatDoTheyKnow. It's in a strange templating format they use in mySociety. mySociety @@ -311,6 +323,10 @@ like `!!(*= $this *)!!`. The variables are: `/data/vhost/!!(*= $vhost *)!!` -- you should replace that whole port with a path to the directory where your Alaveteli software installation lives, e.g. `/var/www/` +* `vhost_dir`: the entire path to the directory where the software is + served from. -- you should replace this with a path to the + directory where your Alaveteli software installation lives, + e.g. `/var/www/` * `vcspath`: the name of the alaveteli checkout, e.g. `alaveteli`. Thus, `/data/vhost/!!(*= $vhost *)!!/!!(*= $vcspath *)!!` might be replaced with `/var/www/alaveteli` in your cron tab @@ -324,14 +340,22 @@ One of the cron jobs refers to a script at `/etc/init.d/foi-alert-tracks`. This is an init script, a copy of which lives in `config/alert-tracks-debian.ugly`. As with the cron jobs above, replace the variables (and/or bits near the variables) -with paths to your software. `config/purge-varnish-debian.ugly` is a +with paths to your software. You can use the rake task `rake +config_files:convert_init_script` to do this. +`config/purge-varnish-debian.ugly` is a similar init script, which is optional and not required if you choose -not to run your site behind Varnish (see below). +not to run your site behind Varnish (see below). Either tweak the file +permissions to make the scripts executable by your deploy user, or add the +following line to your sudoers file to allow these to be run by your deploy +user (named `deploy` in this case): + + deploy ALL = NOPASSWD: /etc/init.d/foi-alert-tracks, /etc/init.d/foi-purge-varnish The cron jobs refer to a program `run-with-lockfile`. See [this issue](https://github.com/mysociety/alaveteli/issues/112) for a discussion of where to find this program, and how you might replace -it. +it. This [one line script](https://gist.github.com/3741194) can install +this program system-wide. # Set up production web server diff --git a/doc/THEMES.md b/doc/THEMES.md index 6c22764fc..c5e4a3eee 100644 --- a/doc/THEMES.md +++ b/doc/THEMES.md @@ -123,7 +123,7 @@ do this in the `alavetelitheme`. To do add states, create two modules in your theme, `InfoRequestCustomStates` and `RequestControllerCustomStates`. The -former must have these two methods: +former must have these methods: * `theme_calculate_status`: return a tag to identify the current state of the request * `theme_extra_states`: return a list of tags which identify the extra states you'd like to support diff --git a/lib/activesupport_cache_extensions.rb b/lib/activesupport_cache_extensions.rb index 5a894b64b..f15d72894 100644 --- a/lib/activesupport_cache_extensions.rb +++ b/lib/activesupport_cache_extensions.rb @@ -3,8 +3,6 @@ # # Copyright (c) 2009 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: activesupport_cache_extensions.rb,v 1.1 2009-07-01 11:07:32 francis Exp $ # Monkeypatch! ./activesupport/lib/active_support/cache/file_store.rb diff --git a/lib/alaveteli_external_command.rb b/lib/alaveteli_external_command.rb index 7d32be904..3bfc34e3a 100644 --- a/lib/alaveteli_external_command.rb +++ b/lib/alaveteli_external_command.rb @@ -14,16 +14,15 @@ module AlaveteliExternalCommand if program_name =~ %r(^/) program_path = program_name else - utility_search_path = MySociety::Config.get("UTILITY_SEARCH_PATH", ["/usr/bin", "/usr/local/bin"]) found = false - utility_search_path.each do |d| + Configuration::utility_search_path.each do |d| program_path = File.join(d, program_name) if File.file? program_path and File.executable? program_path found = true break end end - raise "Could not find #{program_name} in any of #{utility_search_path.join(', ')}" if !found + raise "Could not find #{program_name} in any of #{Configuration::utility_search_path.join(', ')}" if !found end xc = ExternalCommand.new(program_path, *args) diff --git a/lib/configuration.rb b/lib/configuration.rb new file mode 100644 index 000000000..5f761a1f6 --- /dev/null +++ b/lib/configuration.rb @@ -0,0 +1,65 @@ +# Configuration values with defaults + +# TODO: Make this return different values depending on the current rails environment + +module Configuration + DEFAULTS = { + :ADMIN_BASE_URL => '', + :ADMIN_PASSWORD => '', + :ADMIN_PUBLIC_URL => '', + :ADMIN_USERNAME => '', + :AVAILABLE_LOCALES => '', + :BLACKHOLE_PREFIX => 'do-not-reply-to-this-address', + :BLOG_FEED => '', + :CONTACT_EMAIL => 'contact@localhost', + :CONTACT_NAME => 'Alaveteli', + :COOKIE_STORE_SESSION_SECRET => 'this default is insecure as code is open source, please override for live sites in config/general; this will do for local development', + :DEBUG_RECORD_MEMORY => false, + :DEFAULT_LOCALE => '', + :DOMAIN => 'localhost:3000', + :EXCEPTION_NOTIFICATIONS_FROM => nil, + :EXCEPTION_NOTIFICATIONS_TO => nil, + :FORCE_REGISTRATION_ON_NEW_REQUEST => false, + :FORWARD_NONBOUNCE_RESPONSES_TO => 'user-support@localhost', + :FRONTPAGE_PUBLICBODY_EXAMPLES => '', + :GA_CODE => '', + :GAZE_URL => '', + :HTML_TO_PDF_COMMAND => nil, + :INCOMING_EMAIL_DOMAIN => 'localhost', + :INCOMING_EMAIL_PREFIX => '', + :INCOMING_EMAIL_SECRET => 'dummysecret', + :ISO_COUNTRY_CODE => 'GB', + :MAX_REQUESTS_PER_USER_PER_DAY => nil, + :NEW_RESPONSE_REMINDER_AFTER_DAYS => [3, 10, 24], + :OVERRIDE_ALL_PUBLIC_BODY_REQUEST_EMAILS => '', + :RAW_EMAILS_LOCATION => 'files/raw_emails', + :READ_ONLY => '', + :RECAPTCHA_PRIVATE_KEY => 'x', + :RECAPTCHA_PUBLIC_KEY => 'x', + :REPLY_LATE_AFTER_DAYS => 20, + :REPLY_VERY_LATE_AFTER_DAYS => 40, + :SITE_NAME => 'Alaveteli', + :SKIP_ADMIN_AUTH => false, + :SPECIAL_REPLY_VERY_LATE_AFTER_DAYS => 60, + :THEME_URL => "", + :THEME_URLS => [], + :TRACK_SENDER_EMAIL => 'contact@localhost', + :TRACK_SENDER_NAME => 'Alaveteli', + :TWITTER_USERNAME => '', + :USE_DEFAULT_BROWSER_LANGUAGE => true, + :USE_GHOSTSCRIPT_COMPRESSION => nil, + :UTILITY_SEARCH_PATH => ["/usr/bin", "/usr/local/bin"], + :VARNISH_HOST => nil, + :WORKING_OR_CALENDAR_DAYS => 'working', + } + + def Configuration.method_missing(name) + key = name.to_s.upcase + if DEFAULTS.has_key?(key.to_sym) + MySociety::Config.get(key, DEFAULTS[key.to_sym]) + else + super + end + end +end + diff --git a/lib/public_body_categories.rb b/lib/public_body_categories.rb index b4aa71a40..c6f0a6690 100644 --- a/lib/public_body_categories.rb +++ b/lib/public_body_categories.rb @@ -3,8 +3,6 @@ # # Copyright (c) 2009 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: public_body_categories.rb,v 1.1 2009-09-14 14:45:48 francis Exp $ class PublicBodyCategories diff --git a/lib/tasks/config_files.rake b/lib/tasks/config_files.rake new file mode 100644 index 000000000..d3843f3a4 --- /dev/null +++ b/lib/tasks/config_files.rake @@ -0,0 +1,56 @@ +require File.join(File.dirname(__FILE__), 'usage') +namespace :config_files do + + include Usage + + def convert_ugly(file, replacements) + converted_lines = [] + ugly_var = /\!\!\(\*= \$([^ ]+) \*\)\!\!/ + File.open(file, 'r').each do |line| + line = line.gsub(ugly_var) do |match| + var = $1.to_sym + replacement = replacements[var] + if replacement == nil + if ! (skip[var] == true) + raise "Unhandled variable in .ugly file: $#{var}" + else + match + end + else + replacements[var] + end + end + converted_lines << line + end + converted_lines + end + + desc 'Convert Debian .ugly init script in config to a form suitable for installing in /etc/init.d' + task :convert_init_script => :environment do + example = 'rake config_files:convert_init_script DEPLOY_USER=deploy VHOST_DIR=/dir/above/alaveteli SCRIPT_FILE=config/alert-tracks-debian.ugly ' + check_for_env_vars(['DEPLOY_USER', 'VHOST_DIR', 'SCRIPT_FILE'], example) + + deploy_user = ENV['DEPLOY_USER'] + vhost_dir = ENV['VHOST_DIR'] + script_file = ENV['SCRIPT_FILE'] + + replacements = { :user => deploy_user, + :vhost_dir => vhost_dir } + + daemon_name = File.basename(script_file, '-debian.ugly') + replacements.update(:daemon_name => "foi-#{daemon_name}") + converted = convert_ugly(script_file, replacements) + rails_env_file = File.expand_path(File.join(Rails.root, 'config', 'rails_env.rb')) + if !File.exists?(rails_env_file) + converted.each do |line| + line.gsub!(/^#\s*RAILS_ENV=your_rails_env/, "RAILS_ENV=#{Rails.env}") + line.gsub!(/^#\s*export RAILS_ENV/, "export RAILS_ENV") + end + end + converted.each do |line| + puts line + end + end + + +end
\ No newline at end of file diff --git a/lib/tasks/themes.rake b/lib/tasks/themes.rake index 6eb64b4b0..f06cf6312 100644 --- a/lib/tasks/themes.rake +++ b/lib/tasks/themes.rake @@ -86,12 +86,10 @@ namespace :themes do desc "Install themes specified in the config file's THEME_URLS" task :install => :environment do verbose = true - theme_urls = MySociety::Config.get("THEME_URLS", []) - theme_urls.each{ |theme_url| install_theme(theme_url, verbose) } - theme_url = MySociety::Config.get("THEME_URL", "") - if ! theme_url.blank? + Configuration::theme_urls.each{ |theme_url| install_theme(theme_url, verbose) } + if ! Configuration::theme_url.blank? # Old version of the above, for backwards compatibility - install_theme(theme_url, verbose, deprecated=true) + install_theme(Configuration::theme_url, verbose, deprecated=true) end end end
\ No newline at end of file diff --git a/lib/tasks/translation.rake b/lib/tasks/translation.rake new file mode 100644 index 000000000..f6611cc80 --- /dev/null +++ b/lib/tasks/translation.rake @@ -0,0 +1,192 @@ +require File.join(File.dirname(__FILE__), 'usage') +namespace :translation do + + include Usage + + def write_email(email, email_description, output_file) + mail_object = TMail::Mail.parse(email.to_s) + output_file.write("\n") + output_file.write("Description of email: #{email_description}\n") + output_file.write("Subject line: #{mail_object.subject}\n") + output_file.write("\n") + if mail_object.parts.empty? + output_file.write(mail_object.to_s) + else + mail_object.parts.each do |part| + output_file.write("Message part **\n") + output_file.write(part.body.to_s) + end + end + output_file.write("\n") + output_file.write("********\n") + end + + desc "Create previews of translated emails" + task :preview_emails => :environment do + check_for_env_vars(['INFO_REQUEST_ID', + 'FOLLOW_UP_ID', + 'INCOMING_MESSAGE_ID', + 'COMMENT_ID', + 'TRACK_THING_ID', + 'DIR'], nil) + info_request = InfoRequest.find(ENV['INFO_REQUEST_ID']) + if info_request.outgoing_messages.empty? + raise "Info request #{info_request.id} does not have any outgoing messages" + end + initial_request = info_request.outgoing_messages.first + follow_up = OutgoingMessage.find(ENV['FOLLOW_UP_ID']) + incoming_message = IncomingMessage.find(ENV['INCOMING_MESSAGE_ID']) + comment = Comment.find(ENV['COMMENT_ID']) + track_thing = TrackThing.find(ENV['TRACK_THING_ID']) + + output_file = File.open(File.join(ENV['DIR'], 'message_preview.txt'), 'w') + + # outgoing mailer + request_email = OutgoingMailer.create_initial_request(info_request, initial_request) + write_email(request_email, 'Initial Request', output_file) + + followup_email = OutgoingMailer.create_followup(info_request, follow_up, nil) + write_email(followup_email, 'Follow up', output_file) + + # contact mailer + contact_email = ContactMailer.create_message(info_request.user_name, + info_request.user.email, + 'A test message', + 'Hello!', + info_request.user, + info_request, + info_request.public_body) + + write_email(contact_email, 'Contact email (to admin)', output_file) + + user_contact_email = ContactMailer.create_user_message(info_request.user, + info_request.user, + 'http://www.example.com/user', + 'A test message', + 'Hello!') + write_email(user_contact_email, 'Contact email (user to user)', output_file) + + admin_contact_email = ContactMailer.create_from_admin_message(info_request.user, + 'A test message', + 'Hello!') + write_email(admin_contact_email, 'Contact email (admin to user)', output_file) + + # request mailer + fake_response_email = RequestMailer.create_fake_response(info_request, + info_request.user, + "test body", + "attachment.txt", + "test attachment text") + write_email(fake_response_email, + 'Email created when someone uploads a response directly', + output_file) + + content = File.read(File.join(Rails.root, + 'spec', + 'fixtures', + 'files', + 'incoming-request-plain.email')) + response_mail = TMail::Mail.parse(content) + + response_mail.from = "authority@example.com" + stopped_responses_email = RequestMailer.create_stopped_responses(info_request, + response_mail, + content) + write_email(stopped_responses_email, + 'Bounce if someone sends email to a request that has had responses stopped', + output_file) + + requires_admin_email = RequestMailer.create_requires_admin(info_request) + write_email(requires_admin_email, 'Drawing admin attention to a response', output_file) + + + new_response_email = RequestMailer.create_new_response(info_request, incoming_message) + write_email(new_response_email, + 'Telling the requester that a new response has arrived', + output_file) + + overdue_alert_email = RequestMailer.create_overdue_alert(info_request, info_request.user) + write_email(overdue_alert_email, + 'Telling the requester that the public body is late in replying', + output_file) + + very_overdue_alert_email = RequestMailer.create_very_overdue_alert(info_request, info_request.user) + write_email(very_overdue_alert_email, + 'Telling the requester that the public body is very late in replying', + output_file) + + response_reminder_alert_email = RequestMailer.create_new_response_reminder_alert(info_request, + incoming_message) + write_email(response_reminder_alert_email, + 'Telling the requester that they need to say if the new response contains info or not', + output_file) + + old_unclassified_email = RequestMailer.create_old_unclassified_updated(info_request) + write_email(old_unclassified_email, + 'Telling the requester that someone updated their old unclassified request', + output_file) + + not_clarified_alert_email = RequestMailer.create_not_clarified_alert(info_request, incoming_message) + write_email(not_clarified_alert_email, + 'Telling the requester that they need to clarify their request', + output_file) + + comment_on_alert_email = RequestMailer.create_comment_on_alert(info_request, comment) + write_email(comment_on_alert_email, + 'Telling requester that somebody added an annotation to their request', + output_file) + + comment_on_alert_plural_email = RequestMailer.create_comment_on_alert_plural(info_request, 2, comment) + write_email(comment_on_alert_plural_email, + 'Telling requester that somebody added multiple annotations to their request', + output_file) + + # track mailer + xapian_object = InfoRequest.full_search([InfoRequestEvent], + track_thing.track_query, + 'described_at', + true, + nil, + 100, + 1) + event_digest_email = TrackMailer.create_event_digest(info_request.user, + [[track_thing, + xapian_object.results, + xapian_object]]) + write_email(event_digest_email, 'Alerts on things the user is tracking', output_file) + + # user mailer + site_name = Configuration::site_name + reasons = { + :web => "", + :email => _("Then you can sign in to {{site_name}}", :site_name => site_name), + :email_subject => _("Confirm your account on {{site_name}}", :site_name => site_name) + } + confirm_login_email = UserMailer.create_confirm_login(info_request.user, + reasons, + 'http://www.example.com') + write_email(confirm_login_email, 'Confirm a user login', output_file) + + already_registered_email = UserMailer.create_already_registered(info_request.user, + reasons, + 'http://www.example.com') + write_email(already_registered_email, 'Tell a user they are already registered', output_file) + + new_email = 'new_email@example.com' + changeemail_confirm_email = UserMailer.create_changeemail_confirm(info_request.user, + new_email, + 'http://www.example.com') + write_email(changeemail_confirm_email, + 'Confirm that the user wants to change their email', + output_file) + + changeemail_already_used = UserMailer.create_changeemail_already_used('old_email@example.com', + new_email) + write_email(changeemail_already_used, + 'Tell a user that the email they want to change to is already used', + output_file) + + output_file.close + end + +end
\ No newline at end of file diff --git a/lib/tasks/usage.rb b/lib/tasks/usage.rb new file mode 100644 index 000000000..d6aac454d --- /dev/null +++ b/lib/tasks/usage.rb @@ -0,0 +1,26 @@ +module Usage + + def usage_message message + puts '' + puts message + puts '' + exit 0 + end + + def check_for_env_vars(env_vars, example) + missing = [] + env_vars.each do |env_var| + unless ENV[env_var] + missing << env_var + end + end + if !missing.empty? + usage = "Usage: This task requires #{env_vars.to_sentence} - missing #{missing.to_sentence}" + if example + usage += "\nExample: #{example}" + end + usage_message usage + end + end + +end
\ No newline at end of file diff --git a/lib/tmail_extensions.rb b/lib/tmail_extensions.rb index f35565352..6a533e658 100644 --- a/lib/tmail_extensions.rb +++ b/lib/tmail_extensions.rb @@ -3,8 +3,7 @@ # # Copyright (c) 2009 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: tmail_extensions.rb,v 1.7 2009-10-02 23:31:01 francis Exp $ + require 'racc/parser' require 'tmail' require 'tmail/scanner' diff --git a/lib/world_foi_websites.rb b/lib/world_foi_websites.rb index fec40ed64..f175afd3d 100644 --- a/lib/world_foi_websites.rb +++ b/lib/world_foi_websites.rb @@ -13,7 +13,7 @@ class WorldFOIWebsites {:name => "Ask The EU", :country_name => "European Union", :country_iso_code => "", - :url => "http://asktheu.org"}, + :url => "http://asktheeu.org"}, {:name => "MuckRock.com", :country_name => "United States of America", :country_iso_code => "US", @@ -45,7 +45,7 @@ class WorldFOIWebsites {:name => "Acceso Intelligente", :country_name => "Chile", :country_iso_code => "CL", - :url => "accesointeligente.org"}] + :url => "http://accesointeligente.org"}] return world_foi_websites end diff --git a/locale/aln/app.po b/locale/aln/app.po index 0b07e2754..9562b2eb3 100644 --- a/locale/aln/app.po +++ b/locale/aln/app.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-09-19 09:37+0100\n" -"PO-Revision-Date: 2012-09-19 08:48+0000\n" +"POT-Creation-Date: 2012-10-11 10:18+0100\n" +"PO-Revision-Date: 2012-10-11 09:49+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -175,7 +175,7 @@ msgstr "" msgid "<a href=\"%s\">Add an annotation</a> (to help the requester or others)" msgstr "" -msgid "<a href=\"%s\">Are we missing a public authority?</a>." +msgid "<a href=\"%s\">Are we missing a public authority?</a>" msgstr "" msgid "" @@ -359,7 +359,7 @@ msgid "" msgstr "" msgid "" -"<strong><code>tag:charity</code></strong> to find all public bodies or requests with a given tag. You can include multiple tags, \n" +"<strong><code>tag:charity</code></strong> to find all public authorities 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 "" @@ -405,6 +405,11 @@ msgid "" msgstr "" msgid "" +"<strong>Note:</strong> Because we're testing, requests are being sent to " +"{{email}} rather than to the actual authority." +msgstr "" + +msgid "" "<strong>Note:</strong> You're sending a message to yourself, presumably\n" " to try out how it works." msgstr "" @@ -1051,8 +1056,10 @@ msgstr "" msgid "Forgotten your password?" msgstr "" -msgid "Found {{count}} public bodies {{description}}" -msgstr "" +msgid "Found %d public authority %s" +msgid_plural "Found %d public authorities %s" +msgstr[0] "" +msgstr[1] "" msgid "Freedom of Information" msgstr "" @@ -1234,6 +1241,11 @@ msgid "If you are {{user_link}}, please" msgstr "" msgid "" +"If you believe this request is not suitable, you can report it for attention" +" by the site administrators" +msgstr "" + +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." @@ -1261,6 +1273,11 @@ msgid "" msgstr "" msgid "" +"If you reply to this message it will go directly to {{user_name}}, who will\n" +"learn your email address. Only reply if that is okay." +msgstr "" + +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 "" @@ -1311,6 +1328,9 @@ msgstr "" msgid "IncomingMessage|Valid to reply to" msgstr "" +msgid "Individual requests" +msgstr "" + msgid "Info request" msgstr "" @@ -1344,6 +1364,9 @@ msgstr "" msgid "InfoRequest|Awaiting description" msgstr "" +msgid "InfoRequest|Comments allowed" +msgstr "" + msgid "InfoRequest|Described state" msgstr "" @@ -1468,6 +1491,9 @@ msgstr "" msgid "Make your own request" msgstr "" +msgid "Many requests" +msgstr "" + msgid "Message" msgstr "" @@ -1480,6 +1506,9 @@ msgstr "" msgid "More about this authority" msgstr "" +msgid "More requests..." +msgstr "" + msgid "More similar requests" msgstr "" @@ -1668,6 +1697,9 @@ msgstr "" msgid "Paste this link into emails, tweets, and anywhere else:" msgstr "" +msgid "People" +msgstr "" + msgid "People {{start_count}} to {{end_count}} of {{total_count}}" msgstr "" @@ -2152,6 +2184,9 @@ msgid "" " <strong>{{number_of_authorities}} authorities</strong>" msgstr "" +msgid "Search queries" +msgstr "" + msgid "Search results" msgstr "" @@ -2248,6 +2283,9 @@ msgstr "" msgid "Somebody added a note to your FOI request - " msgstr "" +msgid "Someone has updated the status of your request" +msgstr "" + msgid "" "Someone, perhaps you, just tried to change their email address on\n" "{{site_name}} from {{old_email}} to {{new_email}}." @@ -2940,6 +2978,9 @@ msgstr "" msgid "Unknown" msgstr "" +msgid "Unsubscribe" +msgstr "" + msgid "Unusual response." msgstr "" @@ -2949,6 +2990,9 @@ msgstr "" msgid "Update the status of your request to " msgstr "" +msgid "Upload FOI response" +msgstr "" + msgid "" "Use OR (in capital letters) where you don't mind which word, e.g. " "<strong><code>commons OR lords</code></strong>" @@ -3121,6 +3165,9 @@ msgstr "" msgid "What information has been released?" msgstr "" +msgid "What information has been requested?" +msgstr "" + msgid "" "When you get there, please update the status to say if the response \n" "contains any useful information." @@ -3347,8 +3394,7 @@ msgid "Your annotations" msgstr "" 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." +"Your details, including your email address, have not been given to anyone." msgstr "" msgid "Your e-mail:" @@ -3414,6 +3460,9 @@ msgstr "" msgid "Your request:" msgstr "" +msgid "Your response to an FOI request was not delivered" +msgstr "" + msgid "" "Your response will <strong>appear on the Internet</strong>, <a " "href=\"%s\">read why</a> and answers to other questions." diff --git a/locale/app.pot b/locale/app.pot index d927a0cb7..084d6ef58 100644 --- a/locale/app.pot +++ b/locale/app.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: version 0.0.1\n" -"POT-Creation-Date: 2012-09-19 09:37+0100\n" +"POT-Creation-Date: 2012-10-11 10:18+0100\n" "PO-Revision-Date: 2011-10-09 01:10+0200\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -160,7 +160,7 @@ msgstr "" msgid "<a href=\"%s\">Add an annotation</a> (to help the requester or others)" msgstr "" -msgid "<a href=\"%s\">Are we missing a public authority?</a>." +msgid "<a href=\"%s\">Are we missing a public authority?</a>" msgstr "" msgid "" @@ -292,7 +292,7 @@ msgid "<strong><code>status:</code></strong> to select based on the status or hi msgstr "" msgid "" -"<strong><code>tag:charity</code></strong> to find all public bodies or requests with a given tag. You can include multiple tags, \n" +"<strong><code>tag:charity</code></strong> to find all public authorities 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 "" @@ -332,6 +332,9 @@ msgid "" " instructions in it to confirm changing your email." msgstr "" +msgid "<strong>Note:</strong> Because we're testing, requests are being sent to {{email}} rather than to the actual authority." +msgstr "" + msgid "" "<strong>Note:</strong> You're sending a message to yourself, presumably\n" " to try out how it works." @@ -919,8 +922,10 @@ msgstr "" msgid "Forgotten your password?" msgstr "" -msgid "Found {{count}} public bodies {{description}}" -msgstr "" +msgid "Found %d public authority %s" +msgid_plural "Found %d public authorities %s" +msgstr[0] "" +msgstr[1] "" msgid "Freedom of Information" msgstr "" @@ -1091,6 +1096,9 @@ msgstr "" msgid "If you are {{user_link}}, please" msgstr "" +msgid "If you believe this request is not suitable, you can report it for attention by the site administrators" +msgstr "" + 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" @@ -1114,6 +1122,11 @@ msgid "If you have not done so already, please write a message below telling the msgstr "" msgid "" +"If you reply to this message it will go directly to {{user_name}}, who will\n" +"learn your email address. Only reply if that is okay." +msgstr "" + +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 "" @@ -1164,6 +1177,9 @@ msgstr "" msgid "IncomingMessage|Valid to reply to" msgstr "" +msgid "Individual requests" +msgstr "" + msgid "Info request" msgstr "" @@ -1197,6 +1213,9 @@ msgstr "" msgid "InfoRequest|Awaiting description" msgstr "" +msgid "InfoRequest|Comments allowed" +msgstr "" + msgid "InfoRequest|Described state" msgstr "" @@ -1313,6 +1332,9 @@ msgstr "" msgid "Make your own request" msgstr "" +msgid "Many requests" +msgstr "" + msgid "Message" msgstr "" @@ -1325,6 +1347,9 @@ msgstr "" msgid "More about this authority" msgstr "" +msgid "More requests..." +msgstr "" + msgid "More similar requests" msgstr "" @@ -1502,6 +1527,9 @@ msgstr "" msgid "Paste this link into emails, tweets, and anywhere else:" msgstr "" +msgid "People" +msgstr "" + msgid "People {{start_count}} to {{end_count}} of {{total_count}}" msgstr "" @@ -1955,6 +1983,9 @@ msgid "" " <strong>{{number_of_authorities}} authorities</strong>" msgstr "" +msgid "Search queries" +msgstr "" + msgid "Search results" msgstr "" @@ -2051,6 +2082,9 @@ msgstr "" msgid "Somebody added a note to your FOI request - " msgstr "" +msgid "Someone has updated the status of your request" +msgstr "" + msgid "" "Someone, perhaps you, just tried to change their email address on\n" "{{site_name}} from {{old_email}} to {{new_email}}." @@ -2668,6 +2702,9 @@ msgstr "" msgid "Unknown" msgstr "" +msgid "Unsubscribe" +msgstr "" + msgid "Unusual response." msgstr "" @@ -2677,6 +2714,9 @@ msgstr "" msgid "Update the status of your request to " msgstr "" +msgid "Upload FOI response" +msgstr "" + msgid "Use OR (in capital letters) where you don't mind which word, e.g. <strong><code>commons OR lords</code></strong>" msgstr "" @@ -2838,6 +2878,9 @@ msgstr "" msgid "What information has been released?" msgstr "" +msgid "What information has been requested?" +msgstr "" + msgid "" "When you get there, please update the status to say if the response \n" "contains any useful information." @@ -3042,9 +3085,7 @@ msgstr "" msgid "Your annotations" msgstr "" -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." +msgid "Your details, including your email address, have not been given to anyone." msgstr "" msgid "Your e-mail:" @@ -3102,6 +3143,9 @@ msgstr "" msgid "Your request:" msgstr "" +msgid "Your response to an FOI request was not delivered" +msgstr "" + msgid "Your response will <strong>appear on the Internet</strong>, <a href=\"%s\">read why</a> and answers to other questions." msgstr "" diff --git a/locale/bs/app.po b/locale/bs/app.po index 50f53128b..f29206e28 100644 --- a/locale/bs/app.po +++ b/locale/bs/app.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-09-19 09:37+0100\n" -"PO-Revision-Date: 2012-09-19 08:48+0000\n" +"POT-Creation-Date: 2012-10-11 10:18+0100\n" +"PO-Revision-Date: 2012-10-11 09:49+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -180,8 +180,8 @@ msgstr "<a class=\"link_button_green\" href=\"{{url}}\">{{text}}</a>" msgid "<a href=\"%s\">Add an annotation</a> (to help the requester or others)" msgstr "<a href=\"%s\">Dodaj napomenu</a> (da bi se pomoglo podnosiocu zahtjeva ili drugima)" -msgid "<a href=\"%s\">Are we missing a public authority?</a>." -msgstr "<a href=\"%s\">Da li nam nedostaje javna ustanova?</a>." +msgid "<a href=\"%s\">Are we missing a public authority?</a>" +msgstr "" msgid "" "<a href=\"%s\">Are you the owner of\n" @@ -365,7 +365,7 @@ msgid "" msgstr "<strong><code>status:</code></strong> da biste birali zasnovano na statusu ili historiji statusa zahtjeva, pogledajte <a href=\"{{statuses_url}}\">tabelu statusa</a> below." msgid "" -"<strong><code>tag:charity</code></strong> to find all public bodies or requests with a given tag. You can include multiple tags, \n" +"<strong><code>tag:charity</code></strong> to find all public authorities 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 "" @@ -411,6 +411,11 @@ msgid "" msgstr "<strong>Napomena:</strong>\n Poslati ćemo e-mail na Vašu novu adresu. Pratite\n upute u njemu da bi potvrdili promjenu vašeg e-maila." msgid "" +"<strong>Note:</strong> Because we're testing, requests are being sent to " +"{{email}} rather than to the actual authority." +msgstr "" + +msgid "" "<strong>Note:</strong> You're sending a message to yourself, presumably\n" " to try out how it works." msgstr "" @@ -1057,8 +1062,11 @@ msgstr "Iz nepoznatog razloga, nije moguće podnijeti zahtjev ovoj ustanovi." msgid "Forgotten your password?" msgstr "Zaboravili ste Vaš password?" -msgid "Found {{count}} public bodies {{description}}" -msgstr "Pronađeno {{count}} javnih tijela {{description}}" +msgid "Found %d public authority %s" +msgid_plural "Found %d public authorities %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" msgid "Freedom of Information" msgstr "" @@ -1240,6 +1248,11 @@ msgid "If you are {{user_link}}, please" msgstr "Ako ste {{user_link}}, molimo" msgid "" +"If you believe this request is not suitable, you can report it for attention" +" by the site administrators" +msgstr "" + +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." @@ -1267,6 +1280,11 @@ msgid "" msgstr "Ako niste već, molimo napišite poruku ispod u kojoj napominjete ustanovu da ste povukli Vaš zahtjev. U protivnom neće znati da je zahtjev povučen." msgid "" +"If you reply to this message it will go directly to {{user_name}}, who will\n" +"learn your email address. Only reply if that is okay." +msgstr "" + +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 "Ako koristite neke od web mail servisa ili imate filtere za \"junk mail\", provjerite u Vašim\nbulk/spam folderima. Ponekad su naše poruke označene tako." @@ -1317,6 +1335,9 @@ msgstr "Nadolazeća poruka|Tema" msgid "IncomingMessage|Valid to reply to" msgstr "Nadolazeća poruka|Validna za odgovor za" +msgid "Individual requests" +msgstr "" + msgid "Info request" msgstr "" @@ -1350,6 +1371,9 @@ msgstr "" msgid "InfoRequest|Awaiting description" msgstr "" +msgid "InfoRequest|Comments allowed" +msgstr "" + msgid "InfoRequest|Described state" msgstr "" @@ -1474,6 +1498,9 @@ msgstr "Napravi i pretraži Zahtjeve za slobodan pristup informacijama" msgid "Make your own request" msgstr "Načinite Vaš zahtjev" +msgid "Many requests" +msgstr "" + msgid "Message" msgstr "" @@ -1486,6 +1513,9 @@ msgstr "Nedostaju detalji kontakta za '" msgid "More about this authority" msgstr "Više o ovoj ustanovi" +msgid "More requests..." +msgstr "" + msgid "More similar requests" msgstr "Više sličnih zahtjeva" @@ -1674,6 +1704,9 @@ msgstr "Password: (ponovo)" msgid "Paste this link into emails, tweets, and anywhere else:" msgstr "Nalijepite ovaj link na e-mailove, tweets-e i na druga mjesta:" +msgid "People" +msgstr "" + msgid "People {{start_count}} to {{end_count}} of {{total_count}}" msgstr "" @@ -2158,6 +2191,9 @@ msgid "" " <strong>{{number_of_authorities}} authorities</strong>" msgstr "" +msgid "Search queries" +msgstr "" + msgid "Search results" msgstr "Rezultati pretrage" @@ -2255,6 +2291,9 @@ msgstr "Neki od podnosioca zahtjeva nas nisu obavijestili da li su njihovi zahtj msgid "Somebody added a note to your FOI request - " msgstr "Neko je dodao komentar na Vaš Zahtjev za slobodan pristup informacijama." +msgid "Someone has updated the status of your request" +msgstr "" + msgid "" "Someone, perhaps you, just tried to change their email address on\n" "{{site_name}} from {{old_email}} to {{new_email}}." @@ -2950,6 +2989,9 @@ msgstr "Nažalost, ne posjedujemo ispravnu {{info_request_law_used_full}}\nadres msgid "Unknown" msgstr "Nepoznat" +msgid "Unsubscribe" +msgstr "" + msgid "Unusual response." msgstr "Neobičan odgovor." @@ -2959,6 +3001,9 @@ msgstr "Ažurirajte status ovog zahtjeva" msgid "Update the status of your request to " msgstr "Ažurirajte status Vašeg zahtjeva" +msgid "Upload FOI response" +msgstr "" + msgid "" "Use OR (in capital letters) where you don't mind which word, e.g. " "<strong><code>commons OR lords</code></strong>" @@ -3131,6 +3176,9 @@ msgstr "Šta najbolje opisuje status ovog zahtjeva sada?" msgid "What information has been released?" msgstr "" +msgid "What information has been requested?" +msgstr "" + msgid "" "When you get there, please update the status to say if the response \n" "contains any useful information." @@ -3359,9 +3407,8 @@ msgid "Your annotations" msgstr "Vaše napomene" 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 "Vaši podatci nisu dati nikome, osim ako odaberete da odgovorite na ovu poruku, koja će u tom slučaju ići direktno osobi kaoja je napisala poruku." +"Your details, including your email address, have not been given to anyone." +msgstr "" msgid "Your e-mail:" msgstr "Vaš e-mail:" @@ -3426,6 +3473,9 @@ msgstr "Naziv Vašeg zahtjeva je {{info_request}}. Obavijest o tome da li ste do msgid "Your request:" msgstr "Vaš zahtjev:" +msgid "Your response to an FOI request was not delivered" +msgstr "" + msgid "" "Your response will <strong>appear on the Internet</strong>, <a " "href=\"%s\">read why</a> and answers to other questions." diff --git a/locale/ca/app.po b/locale/ca/app.po index 570e8ae50..67efcc345 100644 --- a/locale/ca/app.po +++ b/locale/ca/app.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-09-19 09:37+0100\n" -"PO-Revision-Date: 2012-09-19 08:48+0000\n" +"POT-Creation-Date: 2012-10-11 10:18+0100\n" +"PO-Revision-Date: 2012-10-11 09:51+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -177,8 +177,8 @@ msgstr "<a class=\"link_button_green\" href=\"{{url}}\">{{text}}</a>" msgid "<a href=\"%s\">Add an annotation</a> (to help the requester or others)" msgstr "<a href=\"%s\">Afegeixi un comentari</a> (per ajudar al peticionari o a altres)" -msgid "<a href=\"%s\">Are we missing a public authority?</a>." -msgstr "<a href=\"%s\"> Ens falta algun organisme públic?</a>." +msgid "<a href=\"%s\">Are we missing a public authority?</a>" +msgstr "" msgid "" "<a href=\"%s\">Are you the owner of\n" @@ -361,7 +361,7 @@ msgid "" msgstr "<strong><code>status:</code></strong> para filtrar en función del estado actual o histórico de la solicitud, consulte la <a href=\"{{statuses_url}}\">tabla de estados</a> a continuación." msgid "" -"<strong><code>tag:charity</code></strong> to find all public bodies or requests with a given tag. You can include multiple tags, \n" +"<strong><code>tag:charity</code></strong> to find all public authorities 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>tag:salud</code></strong> para buscar todos los organismos públicos o solicitudes con la etiqueta dada. Puedes incluir múltiples etiquetas, \n 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ñade <code>AND</code> explícitamente si sólo quiere resultados con todas ellas presentes." @@ -407,6 +407,11 @@ msgid "" msgstr "<strong>Nota:</strong>\n Enviarem un correu a la nova direcció de correu. Segueix\n les seves instruccions per confirmar la nova direcció." msgid "" +"<strong>Note:</strong> Because we're testing, requests are being sent to " +"{{email}} rather than to the actual authority." +msgstr "" + +msgid "" "<strong>Note:</strong> You're sending a message to yourself, presumably\n" " to try out how it works." msgstr "" @@ -1053,8 +1058,10 @@ msgstr "No es posible hacer una solicitud a este organismo, por motivos desconoc msgid "Forgotten your password?" msgstr "¿Has olvidado tu contraseña?" -msgid "Found {{count}} public bodies {{description}}" -msgstr "Encontrados {{count}} organismos públicos {{description}}" +msgid "Found %d public authority %s" +msgid_plural "Found %d public authorities %s" +msgstr[0] "" +msgstr[1] "" msgid "Freedom of Information" msgstr "Acceso a la Información" @@ -1236,6 +1243,11 @@ msgid "If you are {{user_link}}, please" msgstr "Si es {{user_link}}, por favor" msgid "" +"If you believe this request is not suitable, you can report it for attention" +" by the site administrators" +msgstr "" + +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." @@ -1263,6 +1275,11 @@ msgid "" msgstr "Si no lo has hecho ya, por favor escribe un mensaje a continuación informando al organismo público de que has retirado su solicitud. De lo contrario no sabrán que lo has hecho." msgid "" +"If you reply to this message it will go directly to {{user_name}}, who will\n" +"learn your email address. Only reply if that is okay." +msgstr "" + +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 "Si usas correo web o tiene filtros \"anti spam\", por favor comprueba\ntus carpetas de spam. A veces, nuestros mensajes se marcan así por error." @@ -1313,6 +1330,9 @@ msgstr "IncomingMessage|Subject" msgid "IncomingMessage|Valid to reply to" msgstr "IncomingMessage|Valid to reply to" +msgid "Individual requests" +msgstr "" + msgid "Info request" msgstr "" @@ -1346,6 +1366,9 @@ msgstr "" msgid "InfoRequest|Awaiting description" msgstr "InfoRequest|Awaiting description" +msgid "InfoRequest|Comments allowed" +msgstr "" + msgid "InfoRequest|Described state" msgstr "InfoRequest|Described state" @@ -1470,6 +1493,9 @@ msgstr "Realiza una solicitud de información o mira las ya realizadas" msgid "Make your own request" msgstr "Hacer mi propia solicitud" +msgid "Many requests" +msgstr "" + msgid "Message" msgstr "" @@ -1482,6 +1508,9 @@ msgstr "Faltan datos de contacto para '" msgid "More about this authority" msgstr "Más información sobre este organismo" +msgid "More requests..." +msgstr "" + msgid "More similar requests" msgstr "Más solicitudes similares" @@ -1670,6 +1699,9 @@ msgstr "Contraseña: (de nuevo)" msgid "Paste this link into emails, tweets, and anywhere else:" msgstr "Pegue este enlace en correos, tweets, o cualquier otro sitio:" +msgid "People" +msgstr "" + msgid "People {{start_count}} to {{end_count}} of {{total_count}}" msgstr "Personas {{start_count}} a {{end_count}} de {{total_count}}" @@ -2154,6 +2186,9 @@ msgid "" " <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>" +msgid "Search queries" +msgstr "" + msgid "Search results" msgstr "Resultados de la búsqueda" @@ -2250,6 +2285,9 @@ msgstr "Algunas personas que hicieron solicitudes no nos han hecho saber si tuvi msgid "Somebody added a note to your FOI request - " msgstr "Nuevo comentario en tu solicitud de acceso a información - " +msgid "Someone has updated the status of your request" +msgstr "" + msgid "" "Someone, perhaps you, just tried to change their email address on\n" "{{site_name}} from {{old_email}} to {{new_email}}." @@ -2942,6 +2980,9 @@ msgstr "Desgraciadamente, no tenemos una dirección de correo válida para" msgid "Unknown" msgstr "Desconocido" +msgid "Unsubscribe" +msgstr "" + msgid "Unusual response." msgstr "Respuesta no habitual." @@ -2951,6 +2992,9 @@ msgstr "Actualizar el estado de esta solicitud" msgid "Update the status of your request to " msgstr "Actualizar el estado de la solicitud a " +msgid "Upload FOI response" +msgstr "" + msgid "" "Use OR (in capital letters) where you don't mind which word, e.g. " "<strong><code>commons OR lords</code></strong>" @@ -3123,6 +3167,9 @@ msgstr "¿Cómo describiría el estado de esta solicitud ahora?" msgid "What information has been released?" msgstr "¿Qué información se ha solicitado?" +msgid "What information has been requested?" +msgstr "" + msgid "" "When you get there, please update the status to say if the response \n" "contains any useful information." @@ -3349,9 +3396,8 @@ msgid "Your annotations" msgstr "Tus comentarios" 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 "Tu dirección de correo no ha sido compartida con nadie, salve que elijas contestar a este\nmensaje, que irá directamente a la persona que escribió el mensaje." +"Your details, including your email address, have not been given to anyone." +msgstr "" msgid "Your e-mail:" msgstr "Tu correo:" @@ -3416,6 +3462,9 @@ msgstr "Tu solicitud se llamaba {{info_request}}. Haznos saber si has recibido l msgid "Your request:" msgstr "Tu solicitud:" +msgid "Your response to an FOI request was not delivered" +msgstr "" + msgid "" "Your response will <strong>appear on the Internet</strong>, <a " "href=\"%s\">read why</a> and answers to other questions." diff --git a/locale/cs/app.po b/locale/cs/app.po index a0f227b48..58780f465 100644 --- a/locale/cs/app.po +++ b/locale/cs/app.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <appukonrad@gmail.com>, 2012. # Hana Huntova <>, 2012. # Jana Kneschke <>, 2012. # <jana.kneschke@gmail.com>, 2012. @@ -11,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-09-19 09:37+0100\n" -"PO-Revision-Date: 2012-09-19 08:48+0000\n" -"Last-Translator: louisecrow <louise@mysociety.org>\n" +"POT-Creation-Date: 2012-10-11 10:18+0100\n" +"PO-Revision-Date: 2012-10-16 10:02+0000\n" +"Last-Translator: Hana Huntova <>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,7 +31,7 @@ msgstr "\n\n[ {{site_name}} Poznámka: výše uvedený text byl špatně kódov 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 " Toto se objeví na vašem {{site_name}} profilu, abyste mohli svůj dotaz snadno sdílet s ostaními." +msgstr " Toto se objeví na vašem profilu na stránkách {{site_name}}, abyste mohli svůj dotaz snadno sdílet s ostaními." msgid "" " (<strong>no ranty</strong> politics, read our <a href=\"%s\">moderation " @@ -55,7 +56,7 @@ msgid "" " <strong>Note:</strong>\n" " We will send you an email. Follow the instructions in it to change\n" " your password." -msgstr " <strong>Upozornění:</strong>\n Pošleme vám e-mail s návodem, jak změnit heslo." +msgstr " <strong>Upozornění:</strong>\nNa tento e-mail zašleme návod, jak změnit heslo." msgid " <strong>Privacy note:</strong> Your email address will be given to" msgstr " <strong>Ochrana soukromí:</strong> Vaše e-mailová adresa bude předána" @@ -122,9 +123,9 @@ msgstr " když tuto zprávu pošlete." msgid "%d Freedom of Information request to %s" msgid_plural "%d Freedom of Information requests to %s" -msgstr[0] "%d dotaz podle svobodného přístupu k informacím %s" -msgstr[1] "%d dotazy podle svobodného přístupu k informacím %s" -msgstr[2] "%d dotazů podle svobodného přístupu k informacím %s" +msgstr[0] "%d dotaz vznesený podle zákona 106/1999 Sb. na instituci %s" +msgstr[1] "%d dotazy vznesené podle zákona 106/1999 Sb. na instituci %s" +msgstr[2] "%d dotazů vznesených podle zákona 106/1999 Sb. na instituci %s" msgid "%d request" msgid_plural "%d requests" @@ -181,8 +182,8 @@ msgstr "<a class=\"link_button_green\" href=\"{{url}}\">{{text}}</a>" msgid "<a href=\"%s\">Add an annotation</a> (to help the requester or others)" msgstr "<a href=\"%s\">Přidat poznámku</a> (pomůžete tím dalšímu tázajícímu)" -msgid "<a href=\"%s\">Are we missing a public authority?</a>." -msgstr "<a href=\"%s\">Chybí zde nějaká veřejná instituce?</a>" +msgid "<a href=\"%s\">Are we missing a public authority?</a>" +msgstr "<a href=\"%s\">Chybí nám nějaká instituce?</a>" msgid "" "<a href=\"%s\">Are you the owner of\n" @@ -198,7 +199,7 @@ msgstr "<a href=\"%s\">Nemůžete najít, co hledáte?</a>" msgid "" "<a href=\"%s\">Sign in</a> to change password, subscriptions and more " "({{user_name}} only)" -msgstr "<a href=\"%s\">Přihlašte se/a> pro změnu hesla, pro odběr zpráv atd. ({{user_name}} only)" +msgstr "<a href=\"%s\">Přihlašte se/a> pro změnu hesla, pro odběr zpráv atd., pouze ({{user_name}})" msgid "<a href=\"%s\">details</a>" msgstr "<a href=\"%s\">detaily</a>" @@ -210,7 +211,7 @@ 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 "<p>Hotovo! Děkujeme za vaši pomoc.</p><p>Můžete nám <a href=\"{{helpus_url}}\"> také pomoci s:</a> {{site_name}}</p>" +msgstr "<p>Hotovo! Děkujeme za vaši pomoc.</p><p>Můžete nám <a href=\"{{helpus_url}}\"> také pomoci se stránkami</a> {{site_name}}</p>" msgid "" "<p>Thank you! Here are some ideas on what to do next:</p>\n" @@ -263,7 +264,7 @@ msgstr "<p>Děkujeme vám za změnu textu ve vašem profilu.</p>\n <p 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 "<p>Děkujeme za aktualizaci fotografie.</p>\n <p><strong>Dále..</strong> Můžete na svůj profil vložit text o sobě a zvých dotazech.</p>" +msgstr "<p>Děkujeme za aktualizaci fotografie.</p>\n <p><strong>Dále...</strong> Můžete na svůj profil vložit text o sobě a zvých dotazech.</p>" msgid "" "<p>We recommend that you edit your request and remove the email address.\n" @@ -283,7 +284,7 @@ msgid "" "{{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>Jsme rádi, že jste obdrželi alespoň částečnou odpověď na vznesený dotaz. Pokud považujete stránky{{site_name}} za užitečné, <a href=\"{{donation_url}}\">podpořte nás</a>.</p><p>Pokud chcete získat doplňující informace, zde je návod.</p>" +msgstr "<p>Jsme rádi, že jste obdrželi alespoň částečnou odpověď na vznesený dotaz. Pokud považujete stránky {{site_name}} za užitečné, <a href=\"{{donation_url}}\">podpořte nás</a>.</p><p>Pokud chcete získat doplňující informace, zde je návod.</p>" msgid "" "<p>You do not need to include your email in the request in order to get a " @@ -314,7 +315,7 @@ 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}} právě provádí údržbu. Můžete si pouze prohlížet již vznesené dotazy. Nelze podávat nové dotazy, přidávat poznámky či odpovědi, nebo jiným způsobem upravovat databázi</p> <p>{{read_only}}</p>" +msgstr "<p>Stránky {{site_name}} jsou právě v údržbě. Můžete si pouze prohlížet již vznesené dotazy. Nelze vznášet nové dotazy, přidávat poznámky či odpovědi, nebo jiným způsobem upravovat databázi</p> <p>{{read_only}}</p>" msgid "" "<small>If you use web-based email or have \"junk mail\" filters, also check your\n" @@ -366,10 +367,10 @@ msgid "" msgstr "<strong><code>stav:</code></strong> pro výběr dotazů podle současného či minulého stavu, navštivte <a href=\"{{statuses_url}}\">Tabulku stavů</a> below." msgid "" -"<strong><code>tag:charity</code></strong> to find all public bodies or requests with a given tag. You can include multiple tags, \n" +"<strong><code>tag:charity</code></strong> to find all public authorities 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>štítek:charita</code></strong> najde všechny instituce nebo dotazy s daným štítkem. Můžete přidat více štítků \n a významů, např. <code>štítek:místní AND štítek:financial_transaction:335633</code>. Všimněte si že štítků může být více, ale musí obsahovat slůvko<code>AND</code> aby se vám zobrazily odpovídající výsledky." +msgstr "<strong><code>Tagujte:charity</code></strong> umožní vám najít instituce nebo žádosti s daným tagem. Můžete použít více tagů, ⏎ a hodnot tagů, např. <code>tag:openlylocal AND tag:financial_transaction:335633</code>. Jakýkoliv tag může být zahrnut⏎ je třeba vložit <code>AND</code> pokud chcete výsledek, který zahrnuje všechny tagy." msgid "" "<strong><code>variety:</code></strong> to select type of thing to search " @@ -395,7 +396,7 @@ msgid "" "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 "<strong>Varování!</strong>Aby s daty na {{site_name}} bylo správně zacházeno, je nutné mít základy slušného chování uživatelů internetu. Třídění vznesených dotazů není zas tak jednoduché a mohou \nvzniknout chyby a dojít k různým nejednoznačnostem. Musíte\ntaké rozumět zákonu o svobodném přístupu k informacím\na způsobu, jakým jej instituce používají. A ke všemu být elitní statistik. Prosíme\n<a href=\"{{contact_path}}\">kontaktujte nás</a>, pokud máte otázky." +msgstr "<strong>Varování!</strong>Aby datay na stránkách {{site_name}} byla správně seřazena, je vhodné chovat se podle zásad slušného jednání a netikety. Třídění vznesených dotazů není zas tak jednoduché a mohou \nvzniknout chyby a dojít k různým nejednoznačnostem. Musíte\ntaké rozumět zákonu o svobodném přístupu k informacím\na způsobu, jakým jej instituce používají. A ke všemu být vynikající statistik. Prosíme\n<a href=\"{{contact_path}}\">kontaktujte nás</a>, pokud máte otázky." msgid "<strong>Clarification</strong> has been requested" msgstr "Bylo vyžádáno <strong>upřesnění</strong> " @@ -412,6 +413,11 @@ msgid "" msgstr "<strong>Poznámka:</strong>\n Pošleme vám zprávu na vaši e-mailovou adresu. Pro změnu\n vaší e-mailové adresy postupujte podle instrukcí." msgid "" +"<strong>Note:</strong> Because we're testing, requests are being sent to " +"{{email}} rather than to the actual authority." +msgstr "<strong>Note:</strong> Protože testujeme, žádosti jsou posílány na {{email}} a ne příslušné autoritě." + +msgid "" "<strong>Note:</strong> You're sending a message to yourself, presumably\n" " to try out how it works." msgstr "<strong>Upozornění:</strong> Posíláte zprávu sami sobě." @@ -470,7 +476,7 @@ msgid "A response will be sent <strong>by post</strong>" msgstr "Odpověď bude zaslána <strong>poštou</strong>" msgid "A strange reponse, required attention by the {{site_name}} team" -msgstr "Neobvyklá reakce, která vyžaduje pozornost {{site_name}} týmu" +msgstr "Neobvyklá reakce, která vyžaduje pozornost týmu stránek {{site_name}}." msgid "A {{site_name}} user" msgstr "Uživatel stránek {{site_name}} " @@ -541,7 +547,7 @@ msgid "Also send me alerts by email" msgstr "Upozornění posílat také e-mailem." msgid "Alter your subscription" -msgstr "Změnit své odběry" +msgstr "Upravit sledování dotazů" msgid "" "Although all responses are automatically published, we depend on\n" @@ -636,10 +642,10 @@ msgid "" msgstr "Podle zákona, by měla instituce {{public_body_link}} odpovědět okamžitě" msgid "Cancel a {{site_name}} alert" -msgstr "Zrušte tato {{site_name}} upozornění" +msgstr "Zrušte tato upozornění stránek {{site_name}}" msgid "Cancel some {{site_name}} alerts" -msgstr "Zrušte tato {{site_name}} upozornění" +msgstr "Zrušte tato upozornění stránek {{site_name}}" msgid "Cancel, return to your profile page" msgstr "Zrušit, návrat zpět do stránky s profilem" @@ -663,31 +669,31 @@ msgid "CensorRule|Text" msgstr "Cenzorova pravidla | Text" msgid "Change email on {{site_name}}" -msgstr "Změnit e-mail na {{site_name}}" +msgstr "Změnit e-mail na stránkách {{site_name}}" msgid "Change password on {{site_name}}" -msgstr "Změňte heslo na {{site_name}}" +msgstr "Změňte heslo na stránkách {{site_name}}" msgid "Change profile photo" msgstr "Změňte své profilové foto" msgid "Change the text about you on your profile at {{site_name}}" -msgstr "Změňte text svého profilu na {{site_name}}" +msgstr "Změňte text svého profilu na stránkách {{site_name}}" msgid "Change your email" msgstr "Změňte svůj e-mail" msgid "Change your email address used on {{site_name}}" -msgstr "Změňte svou adresu na {{site_name}}" +msgstr "Změňte svou adresu na stránkách {{site_name}}" msgid "Change your password" msgstr "Změňte své heslo" msgid "Change your password on {{site_name}}" -msgstr "Změňte své heslo na {{site_name}}" +msgstr "Změňte své heslo na stránkách {{site_name}}" msgid "Change your password {{site_name}}" -msgstr "Změňte heslo {{site_name}}" +msgstr "Změňte heslo na stránkách {{site_name}}" msgid "Charity registration" msgstr "Registrace dobročinné společnosti" @@ -705,7 +711,7 @@ msgid "Clarification" msgstr "Vysvětlení" msgid "Clarify your FOI request - " -msgstr "Upřesněte svůj dotaz" +msgstr "Upřesněte svůj dotaz – " msgid "Classify an FOI response from " msgstr "Zařaďte dotaz od " @@ -716,12 +722,12 @@ msgstr "Smazat fotografii" 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 "Pokud chcete poslat zprávu pro {{public_body_name}} klikněte na níže uvedený odkaz a napište jim, že požadujete odpověď na svůj vznesený dotaz. Můžete je také požádat o kontrolu, proč zodpovězení vašeho dotazů tak dlouho trvá." +msgstr "Pokud chcete poslat upomínku instituci {{public_body_name}}, klikněte na níže uvedený odkaz a napište, že vyžadujete odpověď na svůj již dříve vznesený dotaz. Můžete je také požádat o kontrolu, proč zodpovězení vašeho dotazů tak dlouho trvá." msgid "" "Click on the link below to send a message to {{public_body}} reminding them " "to reply to your request." -msgstr "Pro poslání upomínky klikněte na níže uvedený odkaz {{public_body}}. " +msgstr "Pro poslání upomínky klikněte na níže uvedený odkaz instituce {{public_body}}. " msgid "Close" msgstr "Zavřít" @@ -752,7 +758,7 @@ msgid "" msgstr "Potvrďte, že chcete být informováni o nově vznesených dotazech a odpovědích, které se týkají zvolených témat." msgid "Confirm you want to follow requests by '{{user_name}}'" -msgstr "Potvrďte, že chcete být informováni o nově vznesených dotazech vznesených uživatelem '{{user_name}}'" +msgstr "Potvrďte, že chcete být informováni o nových dotazech vznesených uživatelem '{{user_name}}'" msgid "Confirm you want to follow requests to '{{public_body_name}}'" msgstr "Potvrďte, že chcete být informováni o dotazech vznesených na instituci '{{public_body_name}}'" @@ -764,7 +770,7 @@ msgid "Confirm your FOI request to " msgstr "Potvrďte svůj dotaz vznesený na" msgid "Confirm your account on {{site_name}}" -msgstr "Potvďte svou registraci na {{site_name}}" +msgstr "Potvďte svou registraci na stránkách {{site_name}}" msgid "Confirm your annotation to {{info_request_title}}" msgstr "Potvrďte svou poznámku pro {{info_request_title}}" @@ -773,7 +779,7 @@ msgid "Confirm your email address" msgstr "Potvrďte svou e-mailovou adresu" msgid "Confirm your new email address on {{site_name}}" -msgstr "Potvrďte novou e-mailovou adresu na {{site_name}}" +msgstr "Potvrďte novou e-mailovou adresu na stránkách {{site_name}}" msgid "" "Considered by administrators as not an FOI request and hidden from site." @@ -786,7 +792,7 @@ msgid "Contact {{recipient}}" msgstr "Kontaktovat {{recipient}} ??" msgid "Contact {{site_name}}" -msgstr "Kontaktujte {{site_name}}" +msgstr "Kontaktujte stránky {{site_name}}" msgid "Could not identify the request from the email address" msgstr "Dotaz z této e-mailové adresy nemohl být identifikován" @@ -807,7 +813,7 @@ msgstr "Kulturní památky (které mohou být ovlivěny tak, \n jak j msgid "" "Currently <strong>waiting for a response</strong> from {{public_body_link}}," " they must respond promptly and" -msgstr "V současnosti <strong> čeká na odpověď</strong> od {{public_body_link}}, musí odpovědět co nejdříve a" +msgstr "V současnosti <strong> se čeká na odpověď</strong> od {{public_body_link}}, musí odpovědět co nejdříve a" msgid "Date:" msgstr "Datum:" @@ -816,7 +822,7 @@ msgid "Dear {{public_body_name}}," msgstr "Vážená paní, vážený pane\n{{public_body_name}}," msgid "Delayed response to your FOI request - " -msgstr "Zpožděná odpověď na váš dotaz" +msgstr "Zpožděná odpověď na váš dotaz –" msgid "Delayed." msgstr "Zpoždění." @@ -833,7 +839,7 @@ msgstr "Chtěli jste {{correction}}" msgid "" "Disclaimer: This message and any reply that you make will be published on " "the internet. Our privacy and copyright policies:" -msgstr "Vyloučení odpovědnosti: Tato zpráva a jakékoliv odpovědi na ni bude uveřejněna na internetu. Naše pravidla o ochraně osobních údajů a autorských právech:" +msgstr "Vyloučení odpovědnosti: Tato zpráva a jakékoliv odpovědi na ni budou uveřejněny na stránkách Informace pro všechny. Naše pravidla o ochraně osobních údajů a autorských právech si přečtěte:" msgid "" "Don't want to address your message to {{person_or_body}}? You can also " @@ -942,7 +948,7 @@ msgid "FOI" msgstr "dotaz" msgid "FOI email address for {{public_body}}" -msgstr "E-mailová adresa podatelny pro {{public_body}}" +msgstr "E-mailová adresa podatelny pro instituci {{public_body}}" msgid "FOI requests" msgstr "Dotazy" @@ -1019,7 +1025,7 @@ msgid "Follow this authority" msgstr "Sledovat tuto instituci" msgid "Follow this link to see the request:" -msgstr "Pro prohlížení dotazu přejděte na tento odkaz:" +msgstr "Pro úpravu statusu dotazu přejděte na tento odkaz:" msgid "Follow this person" msgstr "Sledovat tohoto uživatele" @@ -1048,7 +1054,7 @@ msgstr "Sledujte Informace pro všechny na Twitteru" msgid "" "Followups cannot be sent for this request, as it was made externally, and " "published here by {{public_body_name}} on the requester's behalf." -msgstr "Není možné sledovat tento dotaz, neboť nebyl vznesen pomocí stránek Informace pro všechny a byl byl zveřejněn na žádost instituce {{public_body_name}}." +msgstr "Není možné sledovat tento dotaz, neboť nebyl vznesen pomocí stránek Informace pro všechny a byl zveřejněn na žádost instituce {{public_body_name}}." msgid "" "For an unknown reason, it is not possible to make a request to this " @@ -1058,14 +1064,17 @@ msgstr "Z neznámého důvodu není možné vznést dotaz na tuto instituci. " msgid "Forgotten your password?" msgstr "Zapomněli jste heslo?" -msgid "Found {{count}} public bodies {{description}}" -msgstr "Celkem {{count}} institucí {{description}}" +msgid "Found %d public authority %s" +msgid_plural "Found %d public authorities %s" +msgstr[0] "Nalezena %d instituce %s" +msgstr[1] "Nalezeny %d instituce %s" +msgstr[2] "Nalezeno %d institucí %s" msgid "Freedom of Information" -msgstr "Svobodný přístup k informacím" +msgstr "dotaz" msgid "Freedom of Information Act" -msgstr "Zákon o svobodném přístupu k informacím" +msgstr "zákona č. 106/1999 Sb." msgid "" "Freedom of Information law does not apply to this authority, so you cannot make\n" @@ -1090,7 +1099,7 @@ msgid "Freedom of Information requests made by you" msgstr "Moje dotazy" msgid "Freedom of Information requests made using this site" -msgstr "Dotazy vznesené pomocí serveru Informace pro všechny. " +msgstr "Dotazy vznesené pomocí stránek Informace pro všechny. " msgid "Freedom of information requests to" msgstr "Dotaz vznesený na" @@ -1129,7 +1138,7 @@ msgid "" "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 "Tento <strong>popis</strong> znamená, že uživatel upravil status dotazu.\n<strong>V procesué</strong> je pak status na {{site_name}} určený pro přechodný stav bez popisu.\nPro lepší porozumění se podívejte na <a href=\"{{search_path}}\">tipy pro vyhledávání</a> týkající se jednotlivých stavů dotazu." +msgstr "Tento <strong>popis</strong> znamená, že uživatel upravil status dotazu.\n<strong>V procesu</strong> je pak status na stránkách {{site_name}} určený pro přechodný stav bez popisu.\nPro lepší porozumění se podívejte na <a href=\"{{search_path}}\">tipy pro vyhledávání</a> týkající se jednotlivých stavů dotazu." msgid "" "Here is the message you wrote, in case you would like to copy the text and " @@ -1216,7 +1225,7 @@ 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 "Pokud to není správně, nebo chcete poslat opožděnou odpověď \nna tento dotaz, nebo napsat {{user}} něco jiného, prosíme\nnapište {{contact_email}} pro pomoc." +msgstr "Pokud se stala chyba nebo chcete poslat opožděnou odpověď \nna tento dotaz, nebo napsat uživateli {{user}} něco jiného, prosíme\nvyužijte adresu {{contact_email}}." msgid "" "If you are dissatisfied by the response you got from\n" @@ -1241,6 +1250,11 @@ msgid "If you are {{user_link}}, please" msgstr "Pokud jste {{user_link}}, prosíme" msgid "" +"If you believe this request is not suitable, you can report it for attention" +" by the site administrators" +msgstr "Pokud se domníváte, že je tato žádost nevhodná, můžete ji nahlásit administrátorům stránky. " + +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." @@ -1254,7 +1268,7 @@ msgstr "Pokud můžete, oskenujte nebo vyfotografujte odpověď a \n<strong>poš 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 "Pokud jste poskytovatel informací a považujete naši službu za užitečnou, požádejte IT nebo oddělení spravující vaše webové stránky o propojení s našimi stránkami – ideálně tam, kde uveřejňujete povinné informace." +msgstr "Pokud jste poskytovatelem informací a považujete naši službu za užitečnou, požádejte IT nebo oddělení spravující vaše webové stránky o propojení s našimi stránkami – ideálně tam, kde uveřejňujete povinné informace." msgid "" "If you got the email <strong>more than six months ago</strong>, then this login link won't work any\n" @@ -1268,9 +1282,14 @@ msgid "" msgstr "Pokud jste tak ještě neučinili, prosíme napište instituci zprávu, že jste svůj dotaz stáhli. Jinak se o stažení dotazu nedozví. " msgid "" +"If you reply to this message it will go directly to {{user_name}}, who will\n" +"learn your email address. Only reply if that is okay." +msgstr "Pokud odpovíte na tuto zprávu, bude odeslána přímo {{user_name}}, který⏎ uvidí vaši e-mailovou adresu. " + +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 "Pokud používáte e-mailové služby zdarma nebo máte filtr nevyžádané pošty, zkontrolujte také příslušné složky ve své poště. Někdy jsou zprávy zařazeny jako nevyžádané. " +msgstr "Pokud používáte bzplatnou e-mailovou službu nebo máte filtr nevyžádané pošty, zkontrolujte také příslušné složky ve své poště. Někdy jsou zprávy ze stránek Informace pro všechny zařazeny jako spam. " msgid "" "If you would like us to lift this ban, then you may politely\n" @@ -1278,10 +1297,10 @@ msgid "" msgstr "Pokud chcete, abychom tento zákaz zrušili, tak nás prosíme <a href=\"/help/contact\">kontaktujte</a> s vysvětlením.\n" msgid "If you're new to {{site_name}}" -msgstr "Pokud jste na {{site_name}} poprvé" +msgstr "Pokud jste na stránkách {{site_name}} poprvé" msgid "If you've used {{site_name}} before" -msgstr "Pokud jste {{site_name}} již v minulosti využili" +msgstr "Pokud jste stránky {{site_name}} již v minulosti využili" msgid "" "If your browser is set to accept cookies and you are seeing this message,\n" @@ -1318,6 +1337,9 @@ msgstr "IncomingMessage | Předmět" msgid "IncomingMessage|Valid to reply to" msgstr "IncomingMessage | Platná zpráva pro" +msgid "Individual requests" +msgstr "Jednotlivé žádosti" + msgid "Info request" msgstr "Žádost o informaci" @@ -1351,6 +1373,9 @@ msgstr "InfoRequestEvent | Podle zákona ??" msgid "InfoRequest|Awaiting description" msgstr "InfoRequestEvent | Očekává se popis" +msgid "InfoRequest|Comments allowed" +msgstr "Info o žádosti|Komentáře dovoleny" + msgid "InfoRequest|Described state" msgstr "InfoRequestEvent | Popsaný status" @@ -1409,7 +1434,7 @@ msgid "Joined in" msgstr "Zapojen v" msgid "Joined {{site_name}} in" -msgstr "Registrace na {{site_name}} od" +msgstr "Registrován/a na stránkách {{site_name}} od" msgid "" "Keep it <strong>focused</strong>, you'll be more likely to get what you want" @@ -1454,7 +1479,7 @@ msgstr "Vzneste dotaz týkající se <strong>životního prostředí</strong> " msgid "" "Make a new <strong>Freedom of Information</strong> request to " "{{public_body}}" -msgstr "Vzneste dotaz <strong>podle zákona o svobodném přístupu k informacím</strong> na {{public_body}}" +msgstr "Vzneste dotaz <strong>podle zákona o svobodném přístupu k informacím</strong> na instituci {{public_body}}" msgid "" "Make a new<br/>\n" @@ -1475,6 +1500,9 @@ msgstr "Vzneste dotaz týkajcí se o informací (ŽoI) nebo procházejte dotazy msgid "Make your own request" msgstr "Vzneste vlastní dotaz" +msgid "Many requests" +msgstr "Mnoho žádostí" + msgid "Message" msgstr "Zpráva" @@ -1487,11 +1515,14 @@ msgstr "Chybějící kontakt pro" msgid "More about this authority" msgstr "Více o této instituci" +msgid "More requests..." +msgstr "Více žádostí..." + msgid "More similar requests" msgstr "Více podobných dotazů" msgid "More successful requests..." -msgstr "Více úspěšně zodpovězených dotazů..." +msgstr "Zobrazit více úspěšně zodpovězených dotazů..." msgid "My profile" msgstr "Můj profil" @@ -1530,10 +1561,10 @@ msgid "New response to '{{title}}'" msgstr "Nová odpověď na '{{title}}'" msgid "New response to your FOI request - " -msgstr "Nová odpověď na váš dotaz -" +msgstr "Nová odpověď na váš dotaz - " msgid "New response to your request" -msgstr "Nová odpověď na váš dotaz" +msgstr "Nová odpověď na váš dotaz " msgid "New response to {{law_used_short}} request" msgstr "Nové odpovědi na {{law_used_short}} dotaz" @@ -1621,7 +1652,7 @@ msgid "One public authority found" msgstr "Nalezena jedna instituce" msgid "Only requests made using {{site_name}} are shown." -msgstr "Zobrazí se pouze dotazy vznesené za použití {{site_name}}" +msgstr "Zobrazí se pouze dotazy vznesené prostřednictvím stránek {{site_name}}" msgid "" "Only the authority can reply to this request, and I don't recognise the " @@ -1675,6 +1706,9 @@ msgstr "Heslo (znovu):" msgid "Paste this link into emails, tweets, and anywhere else:" msgstr "Vložte tento odkaz do e-mailů, tweetů či kamkoliv jinam:" +msgid "People" +msgstr "Lidé" + msgid "People {{start_count}} to {{end_count}} of {{total_count}}" msgstr "Lidé od {{start_count}} do {{end_count}} z {{total_count}}" @@ -1738,7 +1772,7 @@ 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 "Potvrďte kliknutím na níže uvedený odkaz, \nže chcete změnit e-mailovou adresu, kterou používáte pro potřeby stránek {{site_name}}\nz {{old_email}} na {{new_email}}" +msgstr "Potvrďte kliknutím na níže uvedený odkaz, \nže chcete změnit e-mailovou adresu, kterou používáte pro potřeby stránek {{site_name}}\nz {{old_email}} na {{new_email}}." msgid "Please click on the link below to confirm your email address." msgstr "Potvrďte svou e-mailovou adresu kliknutím na přiložený odkaz." @@ -1787,7 +1821,7 @@ msgid "Please enter your letter requesting information" msgstr "Vložte svůj dopis s vzneseným dotazem. " msgid "Please enter your name" -msgstr "Vložtee své jméno. " +msgstr "Vložte své jméno. " msgid "Please enter your name, not your email address, in the name field." msgstr "Vložte do tohoto řádku své jméno, ne e-mailovou adresu. " @@ -1976,7 +2010,7 @@ msgid "PublicBody|Home page" msgstr "PublicBody | Domovská stránka" msgid "PublicBody|Info requests count" -msgstr "" +msgstr "Veřejný orgán | Info o počtu žádostí" msgid "PublicBody|Last edit comment" msgstr "PublicBody | Naposled aktualizovaný komentář" @@ -2049,16 +2083,16 @@ msgstr "Odmítnuto." msgid "" "Remember me</label> (keeps you signed in longer;\n" " do not use on a public computer) " -msgstr "Zapamatovat si mne </label> (zůstanete déle přihlášeni;\n nepoužívejte na veřejně přístupných počítačích) " +msgstr "Zapamatovat mé údaje </label> (zašrktněte, pokud chcete být déle přihlášeni;\nnezaškrtávejte, pokud jste na veřejně přístupném počítači)." msgid "Report abuse" msgstr "Nahlásit zneužití" msgid "Report an offensive or unsuitable request" -msgstr "Upozornit na nevhodný obsah dotazu" +msgstr "Nahlásit nevhodný obsah dotazu" msgid "Report this request" -msgstr "Upozornit na tento dotaz" +msgstr "Nahlásit tento dotaz" msgid "Reported for administrator attention." msgstr "Administrátor byl již upozorněn." @@ -2159,6 +2193,9 @@ msgid "" " <strong>{{number_of_authorities}} authorities</strong>" msgstr "Prohledávejte více než<br/>\n <strong>{{number_of_requests}} dotazů</strong> <span>a</span><br/>\n <strong>{{number_of_authorities}} institucí</strong>" +msgid "Search queries" +msgstr "Prohledávejte žádosti" + msgid "Search results" msgstr "Výsledky vyhledávání" @@ -2226,13 +2263,13 @@ msgid "Sign in or make a new account" msgstr "Přihlašte se nebo vytvořte nový účet" msgid "Sign in or sign up" -msgstr "Přihlášení | Registrace" +msgstr "Přihlásit nebo registrovat" msgid "Sign out" msgstr "Odhlásit" msgid "Sign up" -msgstr "Registrace" +msgstr "Registovat" msgid "Similar requests" msgstr "Podobné dotazy" @@ -2241,7 +2278,7 @@ msgid "Simple search" msgstr "Jednoduché hledání" msgid "Some notes have been added to your FOI request - " -msgstr "K vašemu dotazu byly přidány nějaké poznámky" +msgstr "K vašemu dotazu byly přidány nějaké poznámky – " msgid "Some of the information requested has been received" msgstr "Některé z požadovaných informací byly obdrženy" @@ -2254,12 +2291,15 @@ msgid "" msgstr "Někteří tazatelé nás neinformovali, zda a nakolik byli se svým dotazem úspěšní. Potřebujeme <strong>your</strong> vaši pomoc –\nvyberte si dotaz, přečtěte si ji a rozhodněte, zda byl zodpovězen.\nVšichni vám budou vděční." msgid "Somebody added a note to your FOI request - " -msgstr "Někdo přidal poznámku k vašemu dotazu" +msgstr "Někdo přidal poznámku k vašemu dotazu – " + +msgid "Someone has updated the status of your request" +msgstr "Někdo aktualizovat status vaší žádosti" msgid "" "Someone, perhaps you, just tried to change their email address on\n" "{{site_name}} from {{old_email}} to {{new_email}}." -msgstr "Někdo, možná vy, zkusil změnit svou e-mailovou adresu on\n{{site_name}} z {{old_email}} na {{new_email}}." +msgstr "Někdo, možná vy, zkusil změnit svou e-mailovou adresu na stránkách\n{{site_name}} z {{old_email}} na {{new_email}}." msgid "" "Sorry - you cannot respond to this request via {{site_name}}, because this " @@ -2267,7 +2307,7 @@ msgid "" msgstr "Omlouváme se, ale není možné odpovědět na tento dotaz pomocí stránek {{site_name}}, neboť se jedná o kopii originálního dotazu {{link_to_original_request}}." msgid "Sorry, but only {{user_name}} is allowed to do that." -msgstr "Omlouváme se, toto může provést pouze {{user_name}}." +msgstr "Omlouváme se, toto může provést pouze uživatel {{user_name}}." msgid "Sorry, there was a problem processing this page" msgstr "Omlouváme se, došlo k problému " @@ -2300,7 +2340,7 @@ msgid "Subject:" msgstr "Předmět:" msgid "Submit" -msgstr "Odeslání" +msgstr "Odeslat" msgid "Submit status" msgstr "Odešlete status" @@ -2414,7 +2454,7 @@ 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 "E-mail, který jste v zastoupení {{public_body}} poslali, odeslaný pro\n{{user}} jako odpověď na dotaz o poskytnutí informací podle zákona 106/1999 Sb. {{law_used_short}} nebyl doručen." +msgstr "E-mail, který jste poslali v zastoupení instituce {{public_body}}, uživateli\n{{user}} jako odpověď na dotaz o poskytnutí informací podle zákona 106/1999 Sb. {{law_used_short}} nebyl doručen." msgid "The page doesn't exist. Things you can try now:" msgstr "Stránka neexistuje. Zkuste toto:" @@ -2489,10 +2529,10 @@ msgid "Then you can cancel the alerts." msgstr "Pak můžete upozornění zrušit." msgid "Then you can change your email address used on {{site_name}}" -msgstr "Poté můžete změnit svou e-mailovou adresu použitou na {{site_name}}" +msgstr "Poté můžete změnit svou e-mailovou adresu použitou na stránkách {{site_name}}" msgid "Then you can change your password on {{site_name}}" -msgstr "Poté můžete změnit heslo na {{site_name}}" +msgstr "Poté můžete změnit heslo na stránkách {{site_name}}" msgid "Then you can classify the FOI response you have got from " msgstr "Můžete zatřídit odpověď na dotaz od" @@ -2501,19 +2541,19 @@ msgid "Then you can download a zip file of {{info_request_title}}." msgstr "Poté si můžete stáhnout komprimovaný soubor {{info_request_title}}." msgid "Then you can log into the administrative interface" -msgstr "Poté se můžete přihlásit do administrátorské sekce. ??" +msgstr "Poté se můžete přihlásit do administrátorské sekce." msgid "Then you can play the request categorisation game." msgstr "Poté si můžete zahrát hru na kategorizaci dotazů. " msgid "Then you can report the request '{{title}}'" -msgstr "Poté můžete nahlásit nevhodný dotaz '{{title}}'. ??" +msgstr "Poté můžete nahlásit nevhodný dotaz '{{title}}'." msgid "Then you can send a message to " -msgstr "Poté můžete poslat zprávu pro" +msgstr "Poté můžete poslat zprávu uživateli nebo instituci" msgid "Then you can sign in to {{site_name}}" -msgstr "Poté se můžete přihlásit na {{site_name}}" +msgstr "Poté se můžete přihlásit na stránkách {{site_name}}" msgid "Then you can update the status of your request to " msgstr "Poté můžete aktualizovat status svého dotazu na" @@ -2522,13 +2562,13 @@ msgid "Then you can upload an FOI response. " msgstr "Poté můžete nahrát odpověď na váš dotaz." msgid "Then you can write follow up message to " -msgstr "Poté můžete napsat odpověď na zprávu pro " +msgstr "Poté můžete napsat odpověď na zprávu uživateli nebo instituci" msgid "Then you can write your reply to " -msgstr "Poté můžete odpovědět na zprávu od" +msgstr "Poté můžete odpovědět na zprávu od uživatele nebo instituce" msgid "Then you will be following all new FOI requests." -msgstr "Poté budete sledovat všechny nově vznesené dotazy. ??" +msgstr "Poté budete sledovat všechny nově vznesené dotazy." msgid "" "Then you will be notified whenever '{{user_name}}' requests something or " @@ -2557,7 +2597,7 @@ msgid "Then you'll be allowed to send FOI requests." msgstr "Pak můžete vznést dotaz." msgid "Then your FOI request to {{public_body_name}} will be sent." -msgstr "Poté bude váš dotaz pro {{public_body_name}} poslán." +msgstr "Poté bude váš dotaz instituci {{public_body_name}} zaslán." msgid "Then your annotation to {{info_request_title}} will be posted." msgstr "Vaše anotace pro {{info_request_title}} bude odeslána." @@ -2565,7 +2605,7 @@ msgstr "Vaše anotace pro {{info_request_title}} bude odeslána." msgid "" "There are {{count}} new annotations on your {{info_request}} request. Follow" " this link to see what they wrote." -msgstr "Jsou tu {{count}} nové anotace {{info_request}} vztahující se ka vašemu dotazu. Pro jejich přečtení použijte tento odkaz." +msgstr "Jsou tu {{count}} nové anotace, vztahující se ka vašemu dotazu. Pro jejich přečtení použijte tento odkaz." msgid "There is %d person following this request" msgid_plural "There are %d people following this request" @@ -2589,7 +2629,7 @@ msgstr "Počet dotazů za jeden den je limitován. Nechceme, aby byly instituce msgid "" "There was a <strong>delivery error</strong> or similar, which needs fixing " "by the {{site_name}} team." -msgstr "Vyskytla se <strong>chyba při doručení</strong> nebo něco podobného, co potřebuje pozornost {{site_name}} týmu." +msgstr "Vyskytla se <strong>chyba při doručení</strong> nebo něco podobného, co potřebuje pozornost týmu stránek {{site_name}}." msgid "There was an error with the words you entered, please try again." msgstr "Nastala chyba, prosíme zkuste to znovu." @@ -2614,7 +2654,7 @@ msgstr "Obdrželi následující vysvětlení:" msgid "" "They have not replied to your {{law_used_short}} request {{title}} promptly," " as normally required by law" -msgstr "Neodpověděli vám {{law_used_short}} na dotaz {{title}} v zákonem daném termínu" +msgstr "Neodpověděli na dotaz {{title}} v zákonem daném termínu" msgid "" "They have not replied to your {{law_used_short}} request {{title}}, \n" @@ -2628,7 +2668,7 @@ msgid "Things you're following" msgstr "Sledujete:" msgid "This authority no longer exists, so you cannot make a request to it." -msgstr "Tato instituce již neexistuje, nelze na niproto vznést dotaz. " +msgstr "Tato instituce již neexistuje, nelze na ni proto vznést dotaz. " msgid "" "This comment has been hidden. See annotations to\n" @@ -2657,7 +2697,7 @@ msgstr "Toto je HTML verze přílohy k vznesenému dotazu. " msgid "" "This is because {{title}} is an old request that has been\n" "marked to no longer receive responses." -msgstr "Je to proto, že {{title}} je starší dotaz, na nějž\nse odpovědi dále nepřijímají." +msgstr "Důvodem je, že dotaz s názvem {{title}} je staršího data a byl uzavřen, tudíž, na něj již nelze odpovědět." msgid "" "This is your own request, so you will be automatically emailed when new " @@ -2725,7 +2765,7 @@ msgid "" "This request has been marked for review by the site administrators, who have" " not hidden it at this time. If you believe it should be hidden, please <a " "href=\"%s\">contact us</a>." -msgstr "This request has been marked for review by the site administrators, who have not hidden it at this time. If you believe it should be hidden, please <a href=\"%s\">contact us</a>." +msgstr "Tento dotaz byl označen administrátory ke kontrole. Pokud si myslíte, že by měl být skryt, <a href=\"%s\">kontaktujte nás</a>." msgid "This request has been reported for administrator attention" msgstr "Odesláno administrátorovi" @@ -2738,7 +2778,7 @@ msgstr "Tento dotaz byl poslán administrátorovi, aby \"povolil nové odpovědi msgid "" "This request has had an unusual response, and <strong>requires " "attention</strong> from the {{site_name}} team." -msgstr "S dotazem byla provedena neznámá operace, která <strong>vyžaduje pozornost</strong>administrátorů {{site_name}}." +msgstr "S dotazem byla provedena neznámá operace, která <strong>vyžaduje pozornost</strong>administrátorů stránek {{site_name}}." msgid "" "This request has prominence 'hidden'. You can only see it because you are logged\n" @@ -2766,15 +2806,15 @@ msgid "" "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 "Tato tabulka ukazuje technické detaily související s tímto dotazem vzneseným na {{site_name}}. Tento přehled lze použít k analýze rychlosti, s jakou instituce odpovídají na dotazy, pro počet dotazů, které byly zodpovězeny poštou atd. " +msgstr "Tato tabulka ukazuje technické detaily související s tímto dotazem vzneseným na stránkách {{site_name}}. Tento přehled lze použít k analýze rychlosti, s jakou instituce odpovídají na dotazy, počtu dotazů, které byly zodpovězeny poštou atd. " msgid "This user has been banned from {{site_name}} " -msgstr "Tomuto uživateli byl vstup na {{site_name}} zakázán." +msgstr "Tomuto uživateli byl vstup na stránky {{site_name}} zakázán." msgid "" "This was not possible because there is already an account using \n" "the email address {{email}}." -msgstr "Nepodařilo se, protože už jeden účet \ne-mailovou adresu {{email}} používá." +msgstr "Nepodařilo se, protože už jeden účet \npoužívá e-mailovou adresu {{email}}." msgid "To cancel these alerts" msgstr "Pro zrušení těchto upozornění" @@ -2785,10 +2825,10 @@ msgstr "Zrušit toto upozornění" 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 "Pro pokračování je třeba se přihlásit nebo zaregistrovat. Bohužel se\nvyskytl technický problém." +msgstr "Pro pokračování je nutné se přihlásit nebo zaregistrovat. Bohužel se\nvyskytl technický problém." msgid "To change your email address used on {{site_name}}" -msgstr "Změnit e-mailovou adresu, kterou používáte na {{site_name}}" +msgstr "Změnit e-mailovou adresu, kterou používáte na stránkách {{site_name}}" msgid "To classify the response to this FOI request" msgstr "Pro zatřídění dotazů" @@ -2809,7 +2849,7 @@ msgid "To follow new requests" msgstr "Sledovat nově vznesené dotazy." msgid "To follow requests and responses matching your search" -msgstr "Pro sledování dotazů a odpovědí podle zadaného vyhledávání" +msgstr "Pro sledování dotazů a odpovědí podle zadaných kritérií" msgid "To follow requests by '{{user_name}}'" msgstr "Sledovat dotazy vznesené uživatelem '{{user_name}}'" @@ -2825,7 +2865,7 @@ msgstr "Sledovat dotaz '{{request_title}}'" 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 "Abychom udržovali stránky přehledné, někdo jiný upravil dotaz {{title}} vznesený na{{public_body}}, z \"{{display_status}}\". Pokud s touto úpravou nesouhlasíte, prosíme aktualizujte tento status znovu tak, jak si myslíte, že je to správné. " +msgstr "Abychom udržovali stránky přehledné, někdo jiný upravil status vašeho dotazu {{title}} vznesený na instituci {{public_body}}, na \"{{display_status}}\". Pokud s touto úpravou nesouhlasíte, prosíme aktualizujte tento status tak, jak si myslíte, že je to správné. " msgid "" "To let everyone know, follow this link and then select the appropriate box." @@ -2923,7 +2963,7 @@ msgid "URL name can't be blank" msgstr "Název URL nemůže zůstat prázdný" msgid "Unable to change email address on {{site_name}}" -msgstr "Nelze změnit e-mailovou adresu na {{site_name}}" +msgstr "Nelze změnit e-mailovou adresu na stránkách {{site_name}}" msgid "Unable to send a reply to {{username}}" msgstr "Nelze poslat odpověď uživateli {{username}}" @@ -2951,6 +2991,9 @@ msgstr "Bohužel nemáme funkční adresu pro zaslání {{info_request_law_used_ msgid "Unknown" msgstr "Neznámé" +msgid "Unsubscribe" +msgstr "Odhlásit odběr" + msgid "Unusual response." msgstr "Neobvyklá odpověď." @@ -2960,6 +3003,9 @@ msgstr "Aktualizovat stav tohoto dotazu" msgid "Update the status of your request to " msgstr "Aktualizujte stav svého dotazu vzneseného na " +msgid "Upload FOI response" +msgstr "Nahrajte odpověď na žádost" + msgid "" "Use OR (in capital letters) where you don't mind which word, e.g. " "<strong><code>commons OR lords</code></strong>" @@ -3040,7 +3086,7 @@ msgid "View FOI email address for {{public_body_name}}" msgstr "Zobrazit e-mailovou adresu pro dotazy vznesené na {{public_body_name}}" msgid "View Freedom of Information requests made by {{user_name}}:" -msgstr "Prohlédněte si dotazy podané uživatelem {{user_name}}:" +msgstr "Prohlédněte si dotazy vznesené uživatelem {{user_name}}:" msgid "View and search requests" msgstr "Prohledávejte a prohlížejte dotazy" @@ -3095,7 +3141,7 @@ msgstr "Vaši e-mailovou adresu nikomu nepředáme, pokud o to nebudeme\nze zák 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 "Nebudeme vaši e-mailovou adresu nikomu dávat, pokud nám tak neřeknete vy, nebo nám nepřikáže zákon (<a href=\"%s\">podrobnosti</a>). " +msgstr "Vaši e-mailovou adresu nikomu nepředáme, pokud o to nebudeme\nze zákonem daných důvodů požádáni. (<a href=\"%s\">podrobnosti</a>). " msgid "" "We will not reveal your email addresses to anybody unless you\n" @@ -3121,7 +3167,7 @@ msgstr "Poslali jsme vám e-mail s odkazem. Pro pokračování je třeba kliknou msgid "" "We've sent you an email, click the link in it, then you can change your " "password." -msgstr "Poslali jsme vám e-mail. Klikněte na odkaz, pak můžete změnit heslo." +msgstr "Poslali jsme vám e-mail s instrukcemi, jak změnit heslo." msgid "What are you doing?" msgstr "Co děláte?" @@ -3132,10 +3178,13 @@ msgstr "Co nejlépe vystihuje stav tohoto dotazu?" msgid "What information has been released?" msgstr "Jaké informace byly uveřejněny?" +msgid "What information has been requested?" +msgstr "Jaká informace byla požadována?" + msgid "" "When you get there, please update the status to say if the response \n" "contains any useful information." -msgstr "Až se přihlásíte ??, aktualizujte status podle toho,\nzda odpověď je dostačující či nokoliv." +msgstr "Až se přihlásíte, aktualizujte status s ohledem na to,\nzda odpověď je dostačující či nikoliv." msgid "" "When you receive the paper response, please help\n" @@ -3217,7 +3266,7 @@ msgstr "Můžete si <strong>stěžovat</strong> " msgid "" "You can change the requests and users you are following on <a " "href=\"{{profile_url}}\">your profile page</a>." -msgstr "Můžete změnit sledované dotazy a uživatele <a href=\"{{profile_url}}\">ve svém profilu</a>." +msgstr "Můžete upravit sledované dotazy a uživatele <a href=\"{{profile_url}}\">ve svém profilu</a>." msgid "" "You can get this page in computer-readable format as part of the main JSON\n" @@ -3249,7 +3298,7 @@ msgid "You have now changed the text about you on your profile." msgstr "Nyní jste změnili text svého profilu " msgid "You have now changed your email address used on {{site_name}}" -msgstr "Právě jste změnili svou e-mailovou adresu na {{site_name}}" +msgstr "Právě jste změnili svou e-mailovou adresu na stránkách {{site_name}}" msgid "" "You just tried to sign up to {{site_name}}, when you\n" @@ -3257,7 +3306,7 @@ msgid "" "left as they previously were.\n" "\n" "Please click on the link below." -msgstr "Právě jste se pokusili registrovat na {{site_name}}, kde již máte účet. Vaše jméno a heslo zůstalo původní.\n\nProsíme klikněte na tento odkaz." +msgstr "Právě jste se pokusili registrovat na stránkách {{site_name}}, kde již máte vytvořený účet. Vaše jméno a heslo je zachováno z první registrace.\n\nProsíme klikněte na tento odkaz." msgid "" "You know what caused the error, and can <strong>suggest a solution</strong>," @@ -3328,7 +3377,7 @@ msgid "" msgstr "Odpověď na váš dotaz obdržíte, pouze pokud odpovíte \nbližším vysvětlením." msgid "You're long overdue a response to your FOI request - " -msgstr "Dlouho jste nereagovali na odpověď k vašemu dotazu" +msgstr "Dlouho jste nereagovali na odpověď k vašemu dotazu –" msgid "You're not following anything." msgstr "Nesledujete žádný vznesený dotaz." @@ -3360,9 +3409,8 @@ msgid "Your annotations" msgstr "Vaše poznámky" 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 "Vaše kontaktní údaje nebyly nikomu předány. Pokud se rozhodnete odpovědět na tuto zprávu, bude odeslána přímo autorovi zprávy spolu s vaším kontaktem." +"Your details, including your email address, have not been given to anyone." +msgstr "Nikomu jsme nepředali vaše osobní údaje, včetně vaší emailové adresy. " msgid "Your e-mail:" msgstr "Váš e-mail:" @@ -3422,11 +3470,14 @@ msgstr "<strong>Důležité upozornění:</strong> Vaše fotografie bude zveřej msgid "" "Your request was called {{info_request}}. Letting everyone know whether you " "got the information will help us keep tabs on" -msgstr "Váš dotaz se jmenoval {{info_request}}. Když budete všechny informovat zda jste požadovanou informaci obdrželi, budeme mít přehled o" +msgstr "Informace se týká vašeho dotazu {{info_request}}. Můžete všechny informovat, zda jste požadovanou informaci obdrželi a budeme mít přehled o odpovědích instituce" msgid "Your request:" msgstr "Váš dotaz:" +msgid "Your response to an FOI request was not delivered" +msgstr "Vaše odpověď na žádost nebyla doručena" + msgid "" "Your response will <strong>appear on the Internet</strong>, <a " "href=\"%s\">read why</a> and answers to other questions." @@ -3435,10 +3486,10 @@ msgstr "Vaše odpověď <strong>bude uveřejněna na internetu</strong>, <a href msgid "" "Your thoughts on what the {{site_name}} <strong>administrators</strong> " "should do about the request." -msgstr "Vaše doporučení co by {{site_name}} <strong>administrátor</strong> měl udělat s tímto dotazem." +msgstr "Vaše doporučení co by <strong>administrátor</strong> stránek {{site_name}} měl udělat s tímto dotazem." msgid "Your {{site_name}} email alert" -msgstr "Vaše {{site_name}} e-mailové upozornění" +msgstr "Upozornění ze stránek {{site_name}}" msgid "Yours faithfully," msgstr "S přátelským pozdravem," @@ -3450,7 +3501,7 @@ msgid "[FOI #{{request}} email]" msgstr "[FOI #{{request}} e-mail] ??" msgid "[{{public_body}} request email]" -msgstr "[{{public_body}} request e-mail] ??" +msgstr "Instituce [{{public_body}} vyžaduje e-mail]" msgid "[{{site_name}} contact email]" msgstr "[{{site_name}} kontaktní e-mail]" @@ -3470,7 +3521,7 @@ msgid "also called {{public_body_short_name}}" msgstr "také se nazývá {{public_body_short_name}}" msgid "an anonymous user" -msgstr "" +msgstr "anonymní uživatel" msgid "and" msgstr "a" @@ -3499,7 +3550,7 @@ msgid "anything" msgstr "vše" msgid "are long overdue." -msgstr "jsou dlouho po zákonem daném termínu." +msgstr "– tato instituce výrazně překročila zákonem daný termín." msgid "authorities" msgstr "instituce" @@ -3558,7 +3609,7 @@ msgid "has reported an" msgstr "nahlásil" msgid "have delayed." -msgstr "je zpoždění" +msgstr "má zpoždění." msgid "hide quoted sections" msgstr "skrýt citované pasáže" @@ -3607,7 +3658,7 @@ msgid "" msgstr "již neexistuje. Pokud se pokoušíte\n Ze stránky pro vznesení dotazu, pokuste se odpovědět na vybranou zprávu místo podávání obecné odpovědi. Pokud potřebujete poslat obecnou zprávu a znáte správný e-mail, na který to poslat, prosíme <a href=\"%s\">pošlete nám jej</a>." msgid "normally" -msgstr "běžně" +msgstr "to" msgid "please sign in as " msgstr "prosíme přihlašte se jako" @@ -3639,7 +3690,7 @@ msgid "sign in" msgstr "přihlásit se" msgid "simple_date_format" -msgstr "simple_date_format ??" +msgstr "%e/%-m/%Y" msgid "successful" msgstr "úspěšné" @@ -3648,19 +3699,19 @@ msgid "successful requests" msgstr "úspěšně zodpovězené dotazy" msgid "that you made to" -msgstr "kterou jste žádali u" +msgstr "kterou jste vznesli na" msgid "the main FOI contact address for {{public_body}}" -msgstr "hlavní kontaktní adresa pro poskytování informací {{public_body}}" +msgstr "hlavní kontaktní adresa pro poskytování informací institucí {{public_body}}" msgid "the main FOI contact at {{public_body}}" -msgstr "hlavní kontakt pro vznesení dotazu na {{public_body}}" +msgstr "hlavní kontakt pro vznesení dotazu na instituci {{public_body}}" msgid "the requester" msgstr "tazatel" msgid "the {{site_name}} team" -msgstr "{{site_name}} tým" +msgstr "Tým stránek {{site_name}}" msgid "to read" msgstr "číst" @@ -3669,7 +3720,7 @@ msgid "to send a follow up message." msgstr "poslat odpověď" msgid "to {{public_body}}" -msgstr "pro {{public_body}}" +msgstr "pro instituci {{public_body}}" msgid "unexpected prominence on request event" msgstr "neočekávaná operace s dotazem" @@ -3714,13 +3765,13 @@ msgid "{{info_request_user_name}} only:" msgstr "Pouze {{info_request_user_name}}:" msgid "{{law_used_full}} request - {{title}}" -msgstr "{{law_used_full}} dotaz - {{title}}" +msgstr "Dotaz podle {{law_used_full}} - {{title}}" msgid "{{law_used_full}} request GQ - {{title}}" msgstr "{{law_used_full}} žádejte GQ - {{title}} ??" msgid "{{law_used}} requests at {{public_body}}" -msgstr "{{law_used}} dotazy vznesené na instituci{{public_body}}" +msgstr "{{law_used}} dotazy vznesené na instituci {{public_body}}" msgid "{{length_of_time}} ago" msgstr "před {{length_of_time}}" @@ -3736,59 +3787,59 @@ msgstr "Pouze {{public_body_name}}:" msgid "" "{{public_body}} has asked you to explain part of your {{law_used}} request." -msgstr "{{public_body}} vás žádá o doplnění vzneseného dotazu {{law_used}}." +msgstr "Instituce {{public_body}} vás žádá o doplnění vzneseného dotazu." msgid "{{public_body}} sent a response to {{user_name}}" -msgstr "{{public_body}} zaslal odpověď pro {{user_name}}" +msgstr "Instituce {{public_body}} zaslal odpověď pro uživatele {{user_name}}" msgid "{{search_results}} matching '{{query}}'" msgstr "{{search_results}} odpovídající '{{query}}'" msgid "{{site_name}} blog and tweets" -msgstr "{{site_name}} blog a tweety" +msgstr "Blog a tweety stránek {{site_name}}" msgid "" "{{site_name}} covers requests to {{number_of_authorities}} authorities, " "including:" -msgstr "{{site_name}} zahrnuje dotazy vnzesené na {{number_of_authorities}} institucí, včetně:" +msgstr "Stránky {{site_name}} zahrnují dotazy vznesené na {{number_of_authorities}} institucí, včetně:" msgid "" "{{site_name}} sends new requests to <strong>{{request_email}}</strong> for " "this authority." -msgstr "{{site_name}} vznáší nové dotazy na <strong>{{request_email}}</strong> tuto instituci." +msgstr "Stránky {{site_name}} vznáší nové dotazy na <strong>{{request_email}}</strong> tuto instituci." msgid "" "{{site_name}} users have made {{number_of_requests}} requests, including:" -msgstr "{{site_name}} tazatelé podali {{number_of_requests}} dotazů, včetně:" +msgstr "Na stránkách {{site_name}} tazatelé podali {{number_of_requests}} dotazů, včetně:" msgid "{{title}} - a Freedom of Information request to {{public_body}}" msgstr "{{title}} - dotaz vznesený podle zákona 106/1999 Sb., o svobodném přístupu k informacím na instituci {{public_body}}" msgid "{{user_name}} (Account suspended)" -msgstr "{{user_name}} (Účet pozastaven)" +msgstr "Uživatel {{user_name}} (Účet pozastaven)" msgid "{{user_name}} - Freedom of Information requests" -msgstr "{{user_name}} - dotaz podle zákona 106/1999 Sb., o svobodném přístupu k informacím" +msgstr "Uživatel {{user_name}} - dotaz podle zákona 106/1999 Sb., o svobodném přístupu k informacím" msgid "{{user_name}} - user profile" msgstr "{{user_name}} - uživatelský profil" msgid "{{user_name}} added an annotation" -msgstr "{{user_name}} přidal poznámku" +msgstr "Uživatel {{user_name}} přidal poznámku" msgid "" "{{user_name}} has annotated your {{law_used_short}} \n" "request. Follow this link to see what they wrote." -msgstr "{{user_name}} uložil poznámku k vaší {{law_used_short}} . \nKlikněte na odkaz a přečtěte si ji." +msgstr "Uživatel {{user_name}} uložil poznámku k vašemu dotazu. \nKliknutím na dotaz si ji přečtete." msgid "{{user_name}} has used {{site_name}} to send you the message below." -msgstr "{{user_name}} použil {{site_name}} pro zaslání níže uvedené zprávy" +msgstr "Uživatel {{user_name}} využil stránek {{site_name}} pro zaslání níže uvedené zprávy:" msgid "{{user_name}} sent a follow up message to {{public_body}}" -msgstr "{{user_name}} pošlete odpověď pro {{public_body}}" +msgstr "Vážený uživateli {{user_name}}, pošlete odpověď instituci {{public_body}}" msgid "{{user_name}} sent a request to {{public_body}}" -msgstr "{{user_name}} vznesl dotaz {{public_body}}" +msgstr "Uživatel {{user_name}} vznesl dotaz na instituci {{public_body}}" msgid "{{username}} left an annotation:" msgstr "{{username}} zanechal poznámku:" diff --git a/locale/cy/app.po b/locale/cy/app.po index f129d3685..653668f90 100644 --- a/locale/cy/app.po +++ b/locale/cy/app.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-09-19 09:37+0100\n" -"PO-Revision-Date: 2012-09-19 08:48+0000\n" +"POT-Creation-Date: 2012-10-11 10:18+0100\n" +"PO-Revision-Date: 2012-10-11 09:49+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -181,7 +181,7 @@ msgstr "" msgid "<a href=\"%s\">Add an annotation</a> (to help the requester or others)" msgstr "" -msgid "<a href=\"%s\">Are we missing a public authority?</a>." +msgid "<a href=\"%s\">Are we missing a public authority?</a>" msgstr "" msgid "" @@ -367,7 +367,7 @@ msgid "" msgstr "" msgid "" -"<strong><code>tag:charity</code></strong> to find all public bodies or requests with a given tag. You can include multiple tags, \n" +"<strong><code>tag:charity</code></strong> to find all public authorities 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 "" @@ -413,6 +413,11 @@ msgid "" msgstr "" msgid "" +"<strong>Note:</strong> Because we're testing, requests are being sent to " +"{{email}} rather than to the actual authority." +msgstr "" + +msgid "" "<strong>Note:</strong> You're sending a message to yourself, presumably\n" " to try out how it works." msgstr "" @@ -1059,8 +1064,12 @@ msgstr "" msgid "Forgotten your password?" msgstr "" -msgid "Found {{count}} public bodies {{description}}" -msgstr "" +msgid "Found %d public authority %s" +msgid_plural "Found %d public authorities %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" msgid "Freedom of Information" msgstr "" @@ -1242,6 +1251,11 @@ msgid "If you are {{user_link}}, please" msgstr "" msgid "" +"If you believe this request is not suitable, you can report it for attention" +" by the site administrators" +msgstr "" + +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." @@ -1269,6 +1283,11 @@ msgid "" msgstr "" msgid "" +"If you reply to this message it will go directly to {{user_name}}, who will\n" +"learn your email address. Only reply if that is okay." +msgstr "" + +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 "" @@ -1319,6 +1338,9 @@ msgstr "" msgid "IncomingMessage|Valid to reply to" msgstr "" +msgid "Individual requests" +msgstr "" + msgid "Info request" msgstr "" @@ -1352,6 +1374,9 @@ msgstr "" msgid "InfoRequest|Awaiting description" msgstr "" +msgid "InfoRequest|Comments allowed" +msgstr "" + msgid "InfoRequest|Described state" msgstr "" @@ -1476,6 +1501,9 @@ msgstr "" msgid "Make your own request" msgstr "" +msgid "Many requests" +msgstr "" + msgid "Message" msgstr "" @@ -1488,6 +1516,9 @@ msgstr "" msgid "More about this authority" msgstr "" +msgid "More requests..." +msgstr "" + msgid "More similar requests" msgstr "" @@ -1676,6 +1707,9 @@ msgstr "" msgid "Paste this link into emails, tweets, and anywhere else:" msgstr "" +msgid "People" +msgstr "" + msgid "People {{start_count}} to {{end_count}} of {{total_count}}" msgstr "" @@ -2160,6 +2194,9 @@ msgid "" " <strong>{{number_of_authorities}} authorities</strong>" msgstr "" +msgid "Search queries" +msgstr "" + msgid "Search results" msgstr "" @@ -2258,6 +2295,9 @@ msgstr "" msgid "Somebody added a note to your FOI request - " msgstr "" +msgid "Someone has updated the status of your request" +msgstr "" + msgid "" "Someone, perhaps you, just tried to change their email address on\n" "{{site_name}} from {{old_email}} to {{new_email}}." @@ -2956,6 +2996,9 @@ msgstr "" msgid "Unknown" msgstr "" +msgid "Unsubscribe" +msgstr "" + msgid "Unusual response." msgstr "" @@ -2965,6 +3008,9 @@ msgstr "" msgid "Update the status of your request to " msgstr "" +msgid "Upload FOI response" +msgstr "" + msgid "" "Use OR (in capital letters) where you don't mind which word, e.g. " "<strong><code>commons OR lords</code></strong>" @@ -3137,6 +3183,9 @@ msgstr "" msgid "What information has been released?" msgstr "" +msgid "What information has been requested?" +msgstr "" + msgid "" "When you get there, please update the status to say if the response \n" "contains any useful information." @@ -3367,8 +3416,7 @@ msgid "Your annotations" msgstr "" 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." +"Your details, including your email address, have not been given to anyone." msgstr "" msgid "Your e-mail:" @@ -3434,6 +3482,9 @@ msgstr "" msgid "Your request:" msgstr "" +msgid "Your response to an FOI request was not delivered" +msgstr "" + msgid "" "Your response will <strong>appear on the Internet</strong>, <a " "href=\"%s\">read why</a> and answers to other questions." diff --git a/locale/de/app.po b/locale/de/app.po index a890a48a1..82f5af592 100644 --- a/locale/de/app.po +++ b/locale/de/app.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-09-19 09:37+0100\n" -"PO-Revision-Date: 2012-09-19 08:48+0000\n" +"POT-Creation-Date: 2012-10-11 10:18+0100\n" +"PO-Revision-Date: 2012-10-11 09:52+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -178,8 +178,8 @@ msgstr "<a class=\"link_button_green\" href=\"{{url}}\">{{text}}</a>" 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)" -msgid "<a href=\"%s\">Are we missing a public authority?</a>." -msgstr "<a href=\"%s\">Fehlt eine Behörde?</a>." +msgid "<a href=\"%s\">Are we missing a public authority?</a>" +msgstr "" msgid "" "<a href=\"%s\">Are you the owner of\n" @@ -362,7 +362,7 @@ msgid "" msgstr "<strong><code>Status:</code></strong> um eine Auswahl nach Status oder historischem Status der Anfrage zu treffen, gehen Sie zur unten angezeigten<a href=\"{{statuses_url}}\">Statusübersicht</a> ." msgid "" -"<strong><code>tag:charity</code></strong> to find all public bodies or requests with a given tag. You can include multiple tags, \n" +"<strong><code>tag:charity</code></strong> to find all public authorities 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." @@ -408,6 +408,11 @@ msgid "" msgstr "<strong>Note:</strong>\n Es wird eine Email an Ihre neue Emailadresse versendet. Folgen Sie den darin angegebenen Schritten, um die Änderung Ihrer Emailadresse zu bestätigen." msgid "" +"<strong>Note:</strong> Because we're testing, requests are being sent to " +"{{email}} rather than to the actual authority." +msgstr "" + +msgid "" "<strong>Note:</strong> You're sending a message to yourself, presumably\n" " to try out how it works." msgstr "" @@ -1054,8 +1059,10 @@ msgstr "Aus unbekannten Gründen ist es nicht möglich eine Anfrage a diese Beh msgid "Forgotten your password?" msgstr "Passwort vergessen?" -msgid "Found {{count}} public bodies {{description}}" -msgstr " {{count}} Behörden {{description}} gefunden" +msgid "Found %d public authority %s" +msgid_plural "Found %d public authorities %s" +msgstr[0] "" +msgstr[1] "" msgid "Freedom of Information" msgstr "" @@ -1237,6 +1244,11 @@ msgid "If you are {{user_link}}, please" msgstr "Wenn Sie {{user_link}} sind, bitte" msgid "" +"If you believe this request is not suitable, you can report it for attention" +" by the site administrators" +msgstr "" + +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." @@ -1264,6 +1276,11 @@ msgid "" msgstr "Falls noch nicht geschehen, senden Sie bitte eine Nachricht, um die Behörde zu informieren, dass Sie Ihre Anfrage zurückgezogen haben. Anderenfalls weiss diese nicht, dass dies geschehen ist. " msgid "" +"If you reply to this message it will go directly to {{user_name}}, who will\n" +"learn your email address. Only reply if that is okay." +msgstr "" + +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 "Sollten Sie ein webbasiertes Emailkonto oder Spamfilter benutzen, überrpüfen Sie Ihre Bulk-, Spamordner. Unsere Nachrichten landen teilweise in diese Ordnern. " @@ -1314,6 +1331,9 @@ msgstr "IncomingMessage|Subject" msgid "IncomingMessage|Valid to reply to" msgstr "IncomingMessage|Valid to reply to" +msgid "Individual requests" +msgstr "" + msgid "Info request" msgstr "" @@ -1347,6 +1367,9 @@ msgstr "" msgid "InfoRequest|Awaiting description" msgstr "InfoAnfrage | Beschreibung wird erwartet" +msgid "InfoRequest|Comments allowed" +msgstr "" + msgid "InfoRequest|Described state" msgstr "InfoRequest|Described state" @@ -1471,6 +1494,9 @@ msgstr "Hier können Sie Anfragen an das Informationsgesetz (IFG)stellen und bes msgid "Make your own request" msgstr "Eigene Anfrage stellen" +msgid "Many requests" +msgstr "" + msgid "Message" msgstr "" @@ -1483,6 +1509,9 @@ msgstr "Folgende Kontaktdetails fehlen:" msgid "More about this authority" msgstr "Weitere Informationen zu dieser Behörde" +msgid "More requests..." +msgstr "" + msgid "More similar requests" msgstr "Weitere ähnliche Anfragen" @@ -1671,6 +1700,9 @@ msgstr "Passwort: (nochmal eingeben)" msgid "Paste this link into emails, tweets, and anywhere else:" msgstr "Nutzen Sie diesen Link in Emails, tweets und beliebigen weiteren Optionen:" +msgid "People" +msgstr "" + msgid "People {{start_count}} to {{end_count}} of {{total_count}}" msgstr "Leute {{start_count}} bis {{end_count}} von {{total_count}}" @@ -2155,6 +2187,9 @@ msgid "" " <strong>{{number_of_authorities}} authorities</strong>" msgstr "Suchen Sie in mehr als<br/>\n <strong>{{number_of_requests}} Anfragen</strong> <span>und</span><br/>\n <strong>{{number_of_authorities}} Behörden</strong>" +msgid "Search queries" +msgstr "" + msgid "Search results" msgstr "" @@ -2251,6 +2286,9 @@ msgstr "Nicht alle Anfragensteller haben uns über den Erfolg Ihrer Anfragen inf msgid "Somebody added a note to your FOI request - " msgstr "" +msgid "Someone has updated the status of your request" +msgstr "" + msgid "" "Someone, perhaps you, just tried to change their email address on\n" "{{site_name}} from {{old_email}} to {{new_email}}." @@ -2943,6 +2981,9 @@ msgstr "Wir haben leider keine funktionierende Email-Adresse für {{info_request msgid "Unknown" msgstr "Unbekannt" +msgid "Unsubscribe" +msgstr "" + msgid "Unusual response." msgstr "Ungewöhnliche Antwort." @@ -2952,6 +2993,9 @@ msgstr "Status der Anfrage aktualisieren" msgid "Update the status of your request to " msgstr "Aktualisieren Sie den Status Ihrer Anfrage an" +msgid "Upload FOI response" +msgstr "" + msgid "" "Use OR (in capital letters) where you don't mind which word, e.g. " "<strong><code>commons OR lords</code></strong>" @@ -3124,6 +3168,9 @@ msgstr "Was ist die beste Beschreibung für diese Anfrage?" msgid "What information has been released?" msgstr "Welche Informationen wurden veröffentlicht?" +msgid "What information has been requested?" +msgstr "" + msgid "" "When you get there, please update the status to say if the response \n" "contains any useful information." @@ -3350,9 +3397,8 @@ msgid "Your annotations" msgstr "Ihre Anmerkungen" 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 "Ihre Details wurden nicht weitergegeben, ausser wenn Sie sich entschieden haben auf diese Nachricht zu antworten. Ihre Antwort geht dann direkt an die Person, welche die Nachricht geschrieben hat. " +"Your details, including your email address, have not been given to anyone." +msgstr "" msgid "Your e-mail:" msgstr "Ihre Email:" @@ -3417,6 +3463,9 @@ msgstr "Ihre Anfrage hat den folgenden Titel: {{info_request}}. Bitte informiere msgid "Your request:" msgstr "Ihre Anfrage:" +msgid "Your response to an FOI request was not delivered" +msgstr "" + msgid "" "Your response will <strong>appear on the Internet</strong>, <a " "href=\"%s\">read why</a> and answers to other questions." diff --git a/locale/en/app.po b/locale/en/app.po index 2129ccb8c..37366082f 100644 --- a/locale/en/app.po +++ b/locale/en/app.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: version 0.0.1\n" -"POT-Creation-Date: 2012-09-19 09:37+0100\n" +"POT-Creation-Date: 2012-10-11 10:18+0100\n" "PO-Revision-Date: 2011-02-24 07:11-0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -159,7 +159,7 @@ msgstr "" msgid "<a href=\"%s\">Add an annotation</a> (to help the requester or others)" msgstr "" -msgid "<a href=\"%s\">Are we missing a public authority?</a>." +msgid "<a href=\"%s\">Are we missing a public authority?</a>" msgstr "" msgid "" @@ -291,7 +291,7 @@ msgid "<strong><code>status:</code></strong> to select based on the status or hi msgstr "" msgid "" -"<strong><code>tag:charity</code></strong> to find all public bodies or requests with a given tag. You can include multiple tags, \n" +"<strong><code>tag:charity</code></strong> to find all public authorities 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 "" @@ -331,6 +331,9 @@ msgid "" " instructions in it to confirm changing your email." msgstr "" +msgid "<strong>Note:</strong> Because we're testing, requests are being sent to {{email}} rather than to the actual authority." +msgstr "" + msgid "" "<strong>Note:</strong> You're sending a message to yourself, presumably\n" " to try out how it works." @@ -918,8 +921,10 @@ msgstr "" msgid "Forgotten your password?" msgstr "" -msgid "Found {{count}} public bodies {{description}}" -msgstr "" +msgid "Found %d public authority %s" +msgid_plural "Found %d public authorities %s" +msgstr[0] "" +msgstr[1] "" msgid "Freedom of Information" msgstr "" @@ -1090,6 +1095,9 @@ msgstr "" msgid "If you are {{user_link}}, please" msgstr "" +msgid "If you believe this request is not suitable, you can report it for attention by the site administrators" +msgstr "" + 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" @@ -1113,6 +1121,11 @@ msgid "If you have not done so already, please write a message below telling the msgstr "" msgid "" +"If you reply to this message it will go directly to {{user_name}}, who will\n" +"learn your email address. Only reply if that is okay." +msgstr "" + +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 "" @@ -1163,6 +1176,9 @@ msgstr "" msgid "IncomingMessage|Valid to reply to" msgstr "" +msgid "Individual requests" +msgstr "" + msgid "Info request" msgstr "" @@ -1196,6 +1212,9 @@ msgstr "" msgid "InfoRequest|Awaiting description" msgstr "" +msgid "InfoRequest|Comments allowed" +msgstr "" + msgid "InfoRequest|Described state" msgstr "" @@ -1312,6 +1331,9 @@ msgstr "" msgid "Make your own request" msgstr "" +msgid "Many requests" +msgstr "" + msgid "Message" msgstr "" @@ -1324,6 +1346,9 @@ msgstr "" msgid "More about this authority" msgstr "" +msgid "More requests..." +msgstr "" + msgid "More similar requests" msgstr "" @@ -1501,6 +1526,9 @@ msgstr "" msgid "Paste this link into emails, tweets, and anywhere else:" msgstr "" +msgid "People" +msgstr "" + msgid "People {{start_count}} to {{end_count}} of {{total_count}}" msgstr "" @@ -1954,6 +1982,9 @@ msgid "" " <strong>{{number_of_authorities}} authorities</strong>" msgstr "" +msgid "Search queries" +msgstr "" + msgid "Search results" msgstr "" @@ -2050,6 +2081,9 @@ msgstr "" msgid "Somebody added a note to your FOI request - " msgstr "" +msgid "Someone has updated the status of your request" +msgstr "" + msgid "" "Someone, perhaps you, just tried to change their email address on\n" "{{site_name}} from {{old_email}} to {{new_email}}." @@ -2667,6 +2701,9 @@ msgstr "" msgid "Unknown" msgstr "" +msgid "Unsubscribe" +msgstr "" + msgid "Unusual response." msgstr "" @@ -2676,6 +2713,9 @@ msgstr "" msgid "Update the status of your request to " msgstr "" +msgid "Upload FOI response" +msgstr "" + msgid "Use OR (in capital letters) where you don't mind which word, e.g. <strong><code>commons OR lords</code></strong>" msgstr "" @@ -2837,6 +2877,9 @@ msgstr "" msgid "What information has been released?" msgstr "" +msgid "What information has been requested?" +msgstr "" + msgid "" "When you get there, please update the status to say if the response \n" "contains any useful information." @@ -3041,9 +3084,7 @@ msgstr "" msgid "Your annotations" msgstr "" -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." +msgid "Your details, including your email address, have not been given to anyone." msgstr "" msgid "Your e-mail:" @@ -3101,6 +3142,9 @@ msgstr "" msgid "Your request:" msgstr "" +msgid "Your response to an FOI request was not delivered" +msgstr "" + msgid "Your response will <strong>appear on the Internet</strong>, <a href=\"%s\">read why</a> and answers to other questions." msgstr "" diff --git a/locale/en_IE/app.po b/locale/en_IE/app.po index dfc576c0b..1e7147d4c 100644 --- a/locale/en_IE/app.po +++ b/locale/en_IE/app.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-09-19 09:37+0100\n" -"PO-Revision-Date: 2012-09-19 08:48+0000\n" +"POT-Creation-Date: 2012-10-11 10:18+0100\n" +"PO-Revision-Date: 2012-10-11 09:49+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -175,7 +175,7 @@ msgstr "" msgid "<a href=\"%s\">Add an annotation</a> (to help the requester or others)" msgstr "" -msgid "<a href=\"%s\">Are we missing a public authority?</a>." +msgid "<a href=\"%s\">Are we missing a public authority?</a>" msgstr "" msgid "" @@ -359,7 +359,7 @@ msgid "" msgstr "" msgid "" -"<strong><code>tag:charity</code></strong> to find all public bodies or requests with a given tag. You can include multiple tags, \n" +"<strong><code>tag:charity</code></strong> to find all public authorities 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 "" @@ -405,6 +405,11 @@ msgid "" msgstr "" msgid "" +"<strong>Note:</strong> Because we're testing, requests are being sent to " +"{{email}} rather than to the actual authority." +msgstr "" + +msgid "" "<strong>Note:</strong> You're sending a message to yourself, presumably\n" " to try out how it works." msgstr "" @@ -1051,8 +1056,10 @@ msgstr "" msgid "Forgotten your password?" msgstr "" -msgid "Found {{count}} public bodies {{description}}" -msgstr "" +msgid "Found %d public authority %s" +msgid_plural "Found %d public authorities %s" +msgstr[0] "" +msgstr[1] "" msgid "Freedom of Information" msgstr "" @@ -1234,6 +1241,11 @@ msgid "If you are {{user_link}}, please" msgstr "" msgid "" +"If you believe this request is not suitable, you can report it for attention" +" by the site administrators" +msgstr "" + +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." @@ -1261,6 +1273,11 @@ msgid "" msgstr "" msgid "" +"If you reply to this message it will go directly to {{user_name}}, who will\n" +"learn your email address. Only reply if that is okay." +msgstr "" + +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 "" @@ -1311,6 +1328,9 @@ msgstr "" msgid "IncomingMessage|Valid to reply to" msgstr "" +msgid "Individual requests" +msgstr "" + msgid "Info request" msgstr "" @@ -1344,6 +1364,9 @@ msgstr "" msgid "InfoRequest|Awaiting description" msgstr "" +msgid "InfoRequest|Comments allowed" +msgstr "" + msgid "InfoRequest|Described state" msgstr "" @@ -1468,6 +1491,9 @@ msgstr "" msgid "Make your own request" msgstr "" +msgid "Many requests" +msgstr "" + msgid "Message" msgstr "" @@ -1480,6 +1506,9 @@ msgstr "" msgid "More about this authority" msgstr "" +msgid "More requests..." +msgstr "" + msgid "More similar requests" msgstr "" @@ -1668,6 +1697,9 @@ msgstr "" msgid "Paste this link into emails, tweets, and anywhere else:" msgstr "" +msgid "People" +msgstr "" + msgid "People {{start_count}} to {{end_count}} of {{total_count}}" msgstr "" @@ -2152,6 +2184,9 @@ msgid "" " <strong>{{number_of_authorities}} authorities</strong>" msgstr "" +msgid "Search queries" +msgstr "" + msgid "Search results" msgstr "" @@ -2248,6 +2283,9 @@ msgstr "" msgid "Somebody added a note to your FOI request - " msgstr "" +msgid "Someone has updated the status of your request" +msgstr "" + msgid "" "Someone, perhaps you, just tried to change their email address on\n" "{{site_name}} from {{old_email}} to {{new_email}}." @@ -2940,6 +2978,9 @@ msgstr "" msgid "Unknown" msgstr "" +msgid "Unsubscribe" +msgstr "" + msgid "Unusual response." msgstr "" @@ -2949,6 +2990,9 @@ msgstr "" msgid "Update the status of your request to " msgstr "" +msgid "Upload FOI response" +msgstr "" + msgid "" "Use OR (in capital letters) where you don't mind which word, e.g. " "<strong><code>commons OR lords</code></strong>" @@ -3121,6 +3165,9 @@ msgstr "" msgid "What information has been released?" msgstr "" +msgid "What information has been requested?" +msgstr "" + msgid "" "When you get there, please update the status to say if the response \n" "contains any useful information." @@ -3347,8 +3394,7 @@ msgid "Your annotations" msgstr "" 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." +"Your details, including your email address, have not been given to anyone." msgstr "" msgid "Your e-mail:" @@ -3414,6 +3460,9 @@ msgstr "" msgid "Your request:" msgstr "" +msgid "Your response to an FOI request was not delivered" +msgstr "" + msgid "" "Your response will <strong>appear on the Internet</strong>, <a " "href=\"%s\">read why</a> and answers to other questions." diff --git a/locale/es/app.po b/locale/es/app.po index 5e571502c..8614e9b5e 100644 --- a/locale/es/app.po +++ b/locale/es/app.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-09-19 09:37+0100\n" -"PO-Revision-Date: 2012-09-19 08:48+0000\n" +"POT-Creation-Date: 2012-10-11 10:18+0100\n" +"PO-Revision-Date: 2012-10-11 09:55+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -179,8 +179,8 @@ msgstr "<a class=\"link_button_green\" href=\"{{url}}\">{{text}}</a>" msgid "<a href=\"%s\">Add an annotation</a> (to help the requester or others)" msgstr "<a href=\"%s\">Añade un comentario</a> (para ayudar al solicitante o a otros)" -msgid "<a href=\"%s\">Are we missing a public authority?</a>." -msgstr "<a href=\"%s\">¿Nos falta algún organismo público?</a>." +msgid "<a href=\"%s\">Are we missing a public authority?</a>" +msgstr "" msgid "" "<a href=\"%s\">Are you the owner of\n" @@ -363,7 +363,7 @@ msgid "" msgstr "<strong><code>status:</code></strong> para filtrar en función del estado actual o histórico de la solicitud, consulte la <a href=\"{{statuses_url}}\">tabla de estados</a> a continuación." msgid "" -"<strong><code>tag:charity</code></strong> to find all public bodies or requests with a given tag. You can include multiple tags, \n" +"<strong><code>tag:charity</code></strong> to find all public authorities 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>tag:salud</code></strong> para buscar todos los organismos públicos o solicitudes con la etiqueta dada. Puedes incluir múltiples etiquetas, \n 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ñade <code>AND</code> explícitamente si sólo quiere resultados con todas ellas presentes." @@ -409,6 +409,11 @@ msgid "" msgstr "<strong>Nota:</strong>\n Enviaremos un correo a la nueva dirección de correo. Sigue\n sus instrucciones para confirmar la nueva dirección." msgid "" +"<strong>Note:</strong> Because we're testing, requests are being sent to " +"{{email}} rather than to the actual authority." +msgstr "" + +msgid "" "<strong>Note:</strong> You're sending a message to yourself, presumably\n" " to try out how it works." msgstr "" @@ -1055,8 +1060,10 @@ msgstr "No es posible hacer una solicitud a este organismo, por motivos desconoc msgid "Forgotten your password?" msgstr "¿Has olvidado tu contraseña?" -msgid "Found {{count}} public bodies {{description}}" -msgstr "Encontrados {{count}} organismos públicos {{description}}" +msgid "Found %d public authority %s" +msgid_plural "Found %d public authorities %s" +msgstr[0] "" +msgstr[1] "" msgid "Freedom of Information" msgstr "acceso a la información" @@ -1238,6 +1245,11 @@ msgid "If you are {{user_link}}, please" msgstr "Si es {{user_link}}, por favor" msgid "" +"If you believe this request is not suitable, you can report it for attention" +" by the site administrators" +msgstr "" + +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." @@ -1265,6 +1277,11 @@ msgid "" msgstr "Si no lo has hecho ya, por favor escribe un mensaje a continuación informando al organismo público de que has retirado su solicitud. De lo contrario no sabrán que lo has hecho." msgid "" +"If you reply to this message it will go directly to {{user_name}}, who will\n" +"learn your email address. Only reply if that is okay." +msgstr "" + +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 "Si usas correo web o tiene filtros \"anti spam\", por favor comprueba\ntus carpetas de spam. A veces, nuestros mensajes se marcan así por error." @@ -1315,6 +1332,9 @@ msgstr "IncomingMessage|Subject" msgid "IncomingMessage|Valid to reply to" msgstr "IncomingMessage|Valid to reply to" +msgid "Individual requests" +msgstr "" + msgid "Info request" msgstr "Solicitud de informacion" @@ -1348,6 +1368,9 @@ msgstr "Solicitud/ se requiere " msgid "InfoRequest|Awaiting description" msgstr "InfoRequest|Awaiting description" +msgid "InfoRequest|Comments allowed" +msgstr "" + msgid "InfoRequest|Described state" msgstr "InfoRequest|Described state" @@ -1472,6 +1495,9 @@ msgstr "Realiza una solicitud de información o mira las ya realizadas" msgid "Make your own request" msgstr "Hacer mi propia solicitud" +msgid "Many requests" +msgstr "" + msgid "Message" msgstr "" @@ -1484,6 +1510,9 @@ msgstr "Faltan datos de contacto para '" msgid "More about this authority" msgstr "Más información sobre este organismo" +msgid "More requests..." +msgstr "" + msgid "More similar requests" msgstr "Más solicitudes similares" @@ -1672,6 +1701,9 @@ msgstr "Contraseña: (otra vez)" msgid "Paste this link into emails, tweets, and anywhere else:" msgstr "Pegue este enlace en correos, tweets, o cualquier otro sitio:" +msgid "People" +msgstr "" + msgid "People {{start_count}} to {{end_count}} of {{total_count}}" msgstr "Personas {{start_count}} a {{end_count}} de {{total_count}}" @@ -2156,6 +2188,9 @@ msgid "" " <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>" +msgid "Search queries" +msgstr "" + msgid "Search results" msgstr "Resultados de la búsqueda" @@ -2252,6 +2287,9 @@ msgstr "Algunas personas que hicieron solicitudes no nos han hecho saber si tuvi msgid "Somebody added a note to your FOI request - " msgstr "Nuevo comentario en tu solicitud de acceso a información - " +msgid "Someone has updated the status of your request" +msgstr "" + msgid "" "Someone, perhaps you, just tried to change their email address on\n" "{{site_name}} from {{old_email}} to {{new_email}}." @@ -2944,6 +2982,9 @@ msgstr "Desgraciadamente, no tenemos una dirección de correo válida para" msgid "Unknown" msgstr "Desconocido" +msgid "Unsubscribe" +msgstr "" + msgid "Unusual response." msgstr "Respuesta no habitual." @@ -2953,6 +2994,9 @@ msgstr "Actualiza el estado de esta solicitud" msgid "Update the status of your request to " msgstr "Actualizar el estado de la solicitud a " +msgid "Upload FOI response" +msgstr "" + msgid "" "Use OR (in capital letters) where you don't mind which word, e.g. " "<strong><code>commons OR lords</code></strong>" @@ -3125,6 +3169,9 @@ msgstr "¿Cómo describirías el estado de esta solicitud ahora?" msgid "What information has been released?" msgstr "¿Qué información se ha solicitado?" +msgid "What information has been requested?" +msgstr "" + msgid "" "When you get there, please update the status to say if the response \n" "contains any useful information." @@ -3351,9 +3398,8 @@ msgid "Your annotations" msgstr "Tus comentarios" 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 "Tu dirección de correo no ha sido compartida con nadie, salve que elijas contestar a este\nmensaje, que irá directamente a la persona que escribió el mensaje." +"Your details, including your email address, have not been given to anyone." +msgstr "" msgid "Your e-mail:" msgstr "Tu correo:" @@ -3418,6 +3464,9 @@ msgstr "Tu solicitud se llamaba {{info_request}}. Haznos saber si has recibido l msgid "Your request:" msgstr "Tu solicitud:" +msgid "Your response to an FOI request was not delivered" +msgstr "" + msgid "" "Your response will <strong>appear on the Internet</strong>, <a " "href=\"%s\">read why</a> and answers to other questions." diff --git a/locale/eu/app.po b/locale/eu/app.po index 6bceee0df..45d4d0957 100644 --- a/locale/eu/app.po +++ b/locale/eu/app.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-09-19 09:37+0100\n" -"PO-Revision-Date: 2012-09-19 08:48+0000\n" +"POT-Creation-Date: 2012-10-11 10:18+0100\n" +"PO-Revision-Date: 2012-10-11 09:54+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -176,8 +176,8 @@ msgstr "<a class=\"link_button_green\" href=\"{{url}}\">{{text}}</a>" msgid "<a href=\"%s\">Add an annotation</a> (to help the requester or others)" msgstr "<a href=\"%s\">Gehitu azalpenen bat</a> (eskatzaileari edo besteei laguntzearren)" -msgid "<a href=\"%s\">Are we missing a public authority?</a>." -msgstr "<a href=\"%s\">Erakunde publikoren bat ez da agertzen?</a>." +msgid "<a href=\"%s\">Are we missing a public authority?</a>" +msgstr "" msgid "" "<a href=\"%s\">Are you the owner of\n" @@ -360,7 +360,7 @@ msgid "" msgstr "<strong><code>egoera:</code></strong> eskabidearen oraingo egoera edo egoera historikoaren arabera iragazteko, kontsulta ezazu ondoko <a href=\"{{statuses_url}}\">egoeren taula</a>." msgid "" -"<strong><code>tag:charity</code></strong> to find all public bodies or requests with a given tag. You can include multiple tags, \n" +"<strong><code>tag:charity</code></strong> to find all public authorities 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>tag:osasuna</code></strong> etiketa hau daukaten erakunde publiko zein eskabide guztiak bilatzeko. Etiketa eta balio ugari sar ditzakezu, e.g. <code>tag:osasuna AND tag:financial_transaction:335633</code>. Edozein etiketa agertzearekin nahiko da, lehenetsita dago, etiketa guztiak dakartzaten emaitzak nahi baldin badituzu zehazki <code>AND</code> gehitu beharko duzu." @@ -406,6 +406,11 @@ msgid "" msgstr "<strong>Oharra:</strong>\n Posta bat bidaliko dugu posta helbide berrira. Jarraitu argibideei helbide berria egiaztatzeko." msgid "" +"<strong>Note:</strong> Because we're testing, requests are being sent to " +"{{email}} rather than to the actual authority." +msgstr "" + +msgid "" "<strong>Note:</strong> You're sending a message to yourself, presumably\n" " to try out how it works." msgstr "" @@ -1052,8 +1057,10 @@ msgstr "Ez dakigun arrazoia dela eta, erakunde honi eskabidea egitea ezinezkoa d msgid "Forgotten your password?" msgstr "Zure pasahitza ahaztu al duzu?" -msgid "Found {{count}} public bodies {{description}}" -msgstr "{{count}} erakunde publiko {{description}} aurkitu dira." +msgid "Found %d public authority %s" +msgid_plural "Found %d public authorities %s" +msgstr[0] "" +msgstr[1] "" msgid "Freedom of Information" msgstr "Informaziorako sarbidea" @@ -1235,6 +1242,11 @@ msgid "If you are {{user_link}}, please" msgstr "Zu {{user_link}} baldin bazara, mesedez" msgid "" +"If you believe this request is not suitable, you can report it for attention" +" by the site administrators" +msgstr "" + +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." @@ -1262,6 +1274,11 @@ msgid "" msgstr "Ez baduzu jadanik egin, mesedez idatz ezazu jarraian mezu bat, erakunde publikoari eskabidea kendu duzula jakinaraziz. Bestela ez dute jakingo egin duzuna." msgid "" +"If you reply to this message it will go directly to {{user_name}}, who will\n" +"learn your email address. Only reply if that is okay." +msgstr "" + +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 "Web posta erabiltzen baduzu edo \"spamaren kontrako\" iragazkiak badituzu, mesedez, ikus ezazu zure spam karpeta. Batzutan gure mezuak honela markatzen dira, erroreagatik." @@ -1312,6 +1329,9 @@ msgstr "IncomingMessage|Subject" msgid "IncomingMessage|Valid to reply to" msgstr "IncomingMessage|Valid to reply to" +msgid "Individual requests" +msgstr "" + msgid "Info request" msgstr "" @@ -1345,6 +1365,9 @@ msgstr "" msgid "InfoRequest|Awaiting description" msgstr "InfoRequest|Awaiting description" +msgid "InfoRequest|Comments allowed" +msgstr "" + msgid "InfoRequest|Described state" msgstr "InfoRequest|Described state" @@ -1469,6 +1492,9 @@ msgstr "Egin ezazu informazio eskabide bat edo ikus itzazu jadanik eginda dauden msgid "Make your own request" msgstr "Egin nire eskabidea" +msgid "Many requests" +msgstr "" + msgid "Message" msgstr "" @@ -1481,6 +1507,9 @@ msgstr "Kontaktuaren datuak falta dira '" msgid "More about this authority" msgstr "Erakunde honi buruzko informazio gehiago" +msgid "More requests..." +msgstr "" + msgid "More similar requests" msgstr "Antzeko eskabide gehiago" @@ -1669,6 +1698,9 @@ msgstr "Pasahitza: (berriro)" msgid "Paste this link into emails, tweets, and anywhere else:" msgstr "Itsatsi esteka hau posta elektronikoan, tweetean edo beste edozein lekutan:" +msgid "People" +msgstr "" + msgid "People {{start_count}} to {{end_count}} of {{total_count}}" msgstr "Pertsonak, {{start_count}}-tik {{end_count}}-ra, guztira {{total_count}}" @@ -2153,6 +2185,9 @@ msgid "" " <strong>{{number_of_authorities}} authorities</strong>" msgstr "Bilatu<br/>\n <strong>{{number_of_requests}} eskabide</strong> <span>eta</span><br/>\n <strong>{{number_of_authorities}} erakunderen</strong> artean" +msgid "Search queries" +msgstr "" + msgid "Search results" msgstr "Bilaketaren emaitzak" @@ -2249,6 +2284,9 @@ msgstr "Eskabidea egin zuten zenbaitek ez digute jakinarazi arrakasta izan zuten msgid "Somebody added a note to your FOI request - " msgstr "Zure informaziorako sarbidearen eskabideari egindako iruzkin berria - " +msgid "Someone has updated the status of your request" +msgstr "" + msgid "" "Someone, perhaps you, just tried to change their email address on\n" "{{site_name}} from {{old_email}} to {{new_email}}." @@ -2941,6 +2979,9 @@ msgstr "Zoritxarrez ez dugu posta helbide baliagarria honentzat: {{info_request_ msgid "Unknown" msgstr "Ezezaguna" +msgid "Unsubscribe" +msgstr "" + msgid "Unusual response." msgstr "Ez-ohiko erantzuna." @@ -2950,6 +2991,9 @@ msgstr "Gaurkotu eskabide honen egoera" msgid "Update the status of your request to " msgstr "Gaurkotu ________-ri egindako eskabidearen egoera" +msgid "Upload FOI response" +msgstr "" + msgid "" "Use OR (in capital letters) where you don't mind which word, e.g. " "<strong><code>commons OR lords</code></strong>" @@ -3122,6 +3166,9 @@ msgstr "Nola deskribatuko zenuke eskabide honen oraingo egoera?" msgid "What information has been released?" msgstr "Zein da eskatu duzun informazioa?" +msgid "What information has been requested?" +msgstr "" + msgid "" "When you get there, please update the status to say if the response \n" "contains any useful information." @@ -3348,9 +3395,8 @@ msgid "Your annotations" msgstr "Zure iruzkinak" 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 "Zure helbide elektronikoa ez zaio inori eman, mezu honi erantzutea erabakitzen baduzu, orduan mezua idatzi duen pertsonari zuzenean joango zaio zure helbidea." +"Your details, including your email address, have not been given to anyone." +msgstr "" msgid "Your e-mail:" msgstr "Zure helbide elektronikoa:" @@ -3415,6 +3461,9 @@ msgstr "Zure eskabidearen izenburua {{info_request}} zen. Jakinarazi informazio msgid "Your request:" msgstr "Zure eskabidea:" +msgid "Your response to an FOI request was not delivered" +msgstr "" + msgid "" "Your response will <strong>appear on the Internet</strong>, <a " "href=\"%s\">read why</a> and answers to other questions." diff --git a/locale/fr/app.po b/locale/fr/app.po index 2234e2f4b..5c222a3ef 100644 --- a/locale/fr/app.po +++ b/locale/fr/app.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-09-19 09:37+0100\n" -"PO-Revision-Date: 2012-09-19 08:48+0000\n" +"POT-Creation-Date: 2012-10-11 10:18+0100\n" +"PO-Revision-Date: 2012-10-11 09:50+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -180,7 +180,7 @@ msgstr "" msgid "<a href=\"%s\">Add an annotation</a> (to help the requester or others)" msgstr "" -msgid "<a href=\"%s\">Are we missing a public authority?</a>." +msgid "<a href=\"%s\">Are we missing a public authority?</a>" msgstr "" msgid "" @@ -364,7 +364,7 @@ msgid "" msgstr "" msgid "" -"<strong><code>tag:charity</code></strong> to find all public bodies or requests with a given tag. You can include multiple tags, \n" +"<strong><code>tag:charity</code></strong> to find all public authorities 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>tag:charity</code></strong> pour trouvez tous les institutions publiques ou les sollicitudes avec la même étiquette. Vous pouvez inclure plusieurs étiquettes,\\n ou plusieurs étiquettes, ex. <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." @@ -410,6 +410,11 @@ msgid "" msgstr "" msgid "" +"<strong>Note:</strong> Because we're testing, requests are being sent to " +"{{email}} rather than to the actual authority." +msgstr "" + +msgid "" "<strong>Note:</strong> You're sending a message to yourself, presumably\n" " to try out how it works." msgstr "" @@ -1056,8 +1061,10 @@ msgstr "Par des raisons que nous ne pouvons pas déterminer, il est impossible d msgid "Forgotten your password?" msgstr "" -msgid "Found {{count}} public bodies {{description}}" -msgstr "" +msgid "Found %d public authority %s" +msgid_plural "Found %d public authorities %s" +msgstr[0] "" +msgstr[1] "" msgid "Freedom of Information" msgstr "" @@ -1239,6 +1246,11 @@ msgid "If you are {{user_link}}, please" msgstr "Si vous êtes {{user_link}}, merci de " msgid "" +"If you believe this request is not suitable, you can report it for attention" +" by the site administrators" +msgstr "" + +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." @@ -1266,6 +1278,11 @@ msgid "" msgstr "" msgid "" +"If you reply to this message it will go directly to {{user_name}}, who will\n" +"learn your email address. Only reply if that is okay." +msgstr "" + +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 "" @@ -1316,6 +1333,9 @@ msgstr "" msgid "IncomingMessage|Valid to reply to" msgstr "" +msgid "Individual requests" +msgstr "" + msgid "Info request" msgstr "" @@ -1349,6 +1369,9 @@ msgstr "" msgid "InfoRequest|Awaiting description" msgstr "" +msgid "InfoRequest|Comments allowed" +msgstr "" + msgid "InfoRequest|Described state" msgstr "" @@ -1473,6 +1496,9 @@ msgstr "Envoyer et rechercher des sollicitudes d'accès à lìnformation" msgid "Make your own request" msgstr "" +msgid "Many requests" +msgstr "" + msgid "Message" msgstr "" @@ -1485,6 +1511,9 @@ msgstr "" msgid "More about this authority" msgstr "Plus d'infos sur cet administration" +msgid "More requests..." +msgstr "" + msgid "More similar requests" msgstr "" @@ -1673,6 +1702,9 @@ msgstr "Mot de passe : (confirmation)" msgid "Paste this link into emails, tweets, and anywhere else:" msgstr "" +msgid "People" +msgstr "" + msgid "People {{start_count}} to {{end_count}} of {{total_count}}" msgstr "" @@ -2157,6 +2189,9 @@ msgid "" " <strong>{{number_of_authorities}} authorities</strong>" msgstr "" +msgid "Search queries" +msgstr "" + msgid "Search results" msgstr "" @@ -2253,6 +2288,9 @@ msgstr "" msgid "Somebody added a note to your FOI request - " msgstr "" +msgid "Someone has updated the status of your request" +msgstr "" + msgid "" "Someone, perhaps you, just tried to change their email address on\n" "{{site_name}} from {{old_email}} to {{new_email}}." @@ -2945,6 +2983,9 @@ msgstr "" msgid "Unknown" msgstr "" +msgid "Unsubscribe" +msgstr "" + msgid "Unusual response." msgstr "" @@ -2954,6 +2995,9 @@ msgstr "" msgid "Update the status of your request to " msgstr "" +msgid "Upload FOI response" +msgstr "" + msgid "" "Use OR (in capital letters) where you don't mind which word, e.g. " "<strong><code>commons OR lords</code></strong>" @@ -3126,6 +3170,9 @@ msgstr "" msgid "What information has been released?" msgstr "Quelles informations ont été rendues publiques ?" +msgid "What information has been requested?" +msgstr "" + msgid "" "When you get there, please update the status to say if the response \n" "contains any useful information." @@ -3352,8 +3399,7 @@ msgid "Your annotations" msgstr "" 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." +"Your details, including your email address, have not been given to anyone." msgstr "" msgid "Your e-mail:" @@ -3419,6 +3465,9 @@ msgstr "" msgid "Your request:" msgstr "" +msgid "Your response to an FOI request was not delivered" +msgstr "" + msgid "" "Your response will <strong>appear on the Internet</strong>, <a " "href=\"%s\">read why</a> and answers to other questions." diff --git a/locale/gl/app.po b/locale/gl/app.po index 269505180..d14b1b886 100644 --- a/locale/gl/app.po +++ b/locale/gl/app.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-09-19 09:37+0100\n" -"PO-Revision-Date: 2012-09-19 08:48+0000\n" +"POT-Creation-Date: 2012-10-11 10:18+0100\n" +"PO-Revision-Date: 2012-10-11 09:55+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -175,8 +175,8 @@ msgstr "<a class=\"link_button_green\" href=\"{{url}}\">{{text}}</a>" 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)" -msgid "<a href=\"%s\">Are we missing a public authority?</a>." -msgstr "<a href=\"%s\">¿Nos falta algún organismo público?</a>." +msgid "<a href=\"%s\">Are we missing a public authority?</a>" +msgstr "" msgid "" "<a href=\"%s\">Are you the owner of\n" @@ -359,7 +359,7 @@ msgid "" msgstr "<strong><code>status:</code></strong> para filtrar en función del estado actual o histórico de la solicitud, consulte la <a href=\"{{statuses_url}}\">tabla de estados</a> a continuación." msgid "" -"<strong><code>tag:charity</code></strong> to find all public bodies or requests with a given tag. You can include multiple tags, \n" +"<strong><code>tag:charity</code></strong> to find all public authorities 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>tag:salud</code></strong> para buscar todos los organismos públicos o solicitudes con la etiqueta dada. Puedes incluir múltiples etiquetas, \n 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ñade <code>AND</code> explícitamente si sólo quiere resultados con todas ellas presentes." @@ -405,6 +405,11 @@ msgid "" msgstr "<strong>Nota:</strong>\n Enviaremos un correo a la nueva dirección de correo. Sigue\n sus instrucciones para confirmar la nueva dirección." msgid "" +"<strong>Note:</strong> Because we're testing, requests are being sent to " +"{{email}} rather than to the actual authority." +msgstr "" + +msgid "" "<strong>Note:</strong> You're sending a message to yourself, presumably\n" " to try out how it works." msgstr "" @@ -1051,8 +1056,10 @@ msgstr "No es posible hacer una solicitud a este organismo, por motivos desconoc msgid "Forgotten your password?" msgstr "¿Has olvidado tu contraseña?" -msgid "Found {{count}} public bodies {{description}}" -msgstr "Encontrados {{count}} organismos públicos {{description}}" +msgid "Found %d public authority %s" +msgid_plural "Found %d public authorities %s" +msgstr[0] "" +msgstr[1] "" msgid "Freedom of Information" msgstr "Acceso a la Información" @@ -1234,6 +1241,11 @@ msgid "If you are {{user_link}}, please" msgstr "Si es {{user_link}}, por favor" msgid "" +"If you believe this request is not suitable, you can report it for attention" +" by the site administrators" +msgstr "" + +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." @@ -1261,6 +1273,11 @@ msgid "" msgstr "Si no lo has hecho ya, por favor escribe un mensaje a continuación informando al organismo público de que has retirado su solicitud. De lo contrario no sabrán que lo has hecho." msgid "" +"If you reply to this message it will go directly to {{user_name}}, who will\n" +"learn your email address. Only reply if that is okay." +msgstr "" + +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 "Si usas correo web o tiene filtros \"anti spam\", por favor comprueba\ntus carpetas de spam. A veces, nuestros mensajes se marcan así por error." @@ -1311,6 +1328,9 @@ msgstr "IncomingMessage|Subject" msgid "IncomingMessage|Valid to reply to" msgstr "IncomingMessage|Valid to reply to" +msgid "Individual requests" +msgstr "" + msgid "Info request" msgstr "" @@ -1344,6 +1364,9 @@ msgstr "" msgid "InfoRequest|Awaiting description" msgstr "InfoRequest|Awaiting description" +msgid "InfoRequest|Comments allowed" +msgstr "" + msgid "InfoRequest|Described state" msgstr "InfoRequest|Described state" @@ -1468,6 +1491,9 @@ msgstr "Realiza una solicitud de información o mira las ya realizadas" msgid "Make your own request" msgstr "Hacer mi propia solicitud" +msgid "Many requests" +msgstr "" + msgid "Message" msgstr "" @@ -1480,6 +1506,9 @@ msgstr "Faltan datos de contacto para '" msgid "More about this authority" msgstr "Más información sobre este organismo" +msgid "More requests..." +msgstr "" + msgid "More similar requests" msgstr "Más solicitudes similares" @@ -1668,6 +1697,9 @@ msgstr "Contraseña: (de nuevo)" msgid "Paste this link into emails, tweets, and anywhere else:" msgstr "Pegue este enlace en correos, tweets, o cualquier otro sitio:" +msgid "People" +msgstr "" + msgid "People {{start_count}} to {{end_count}} of {{total_count}}" msgstr "Personas {{start_count}} a {{end_count}} de {{total_count}}" @@ -2152,6 +2184,9 @@ msgid "" " <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>" +msgid "Search queries" +msgstr "" + msgid "Search results" msgstr "Resultados de la búsqueda" @@ -2248,6 +2283,9 @@ msgstr "Algunas personas que hicieron solicitudes no nos han hecho saber si tuvi msgid "Somebody added a note to your FOI request - " msgstr "Nuevo comentario en tu solicitud de acceso a información - " +msgid "Someone has updated the status of your request" +msgstr "" + msgid "" "Someone, perhaps you, just tried to change their email address on\n" "{{site_name}} from {{old_email}} to {{new_email}}." @@ -2940,6 +2978,9 @@ msgstr "Desgraciadamente, no tenemos una dirección de correo válida para" msgid "Unknown" msgstr "Desconocido" +msgid "Unsubscribe" +msgstr "" + msgid "Unusual response." msgstr "Respuesta no habitual." @@ -2949,6 +2990,9 @@ msgstr "Actualizar el estado de esta solicitud" msgid "Update the status of your request to " msgstr "Actualizar el estado de la solicitud a " +msgid "Upload FOI response" +msgstr "" + msgid "" "Use OR (in capital letters) where you don't mind which word, e.g. " "<strong><code>commons OR lords</code></strong>" @@ -3121,6 +3165,9 @@ msgstr "¿Cómo describiría el estado de esta solicitud ahora?" msgid "What information has been released?" msgstr "¿Qué información se ha solicitado?" +msgid "What information has been requested?" +msgstr "" + msgid "" "When you get there, please update the status to say if the response \n" "contains any useful information." @@ -3347,9 +3394,8 @@ msgid "Your annotations" msgstr "Tus comentarios" 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 "Tu dirección de correo no ha sido compartida con nadie, salve que elijas contestar a este\nmensaje, que irá directamente a la persona que escribió el mensaje." +"Your details, including your email address, have not been given to anyone." +msgstr "" msgid "Your e-mail:" msgstr "Tu correo:" @@ -3414,6 +3460,9 @@ msgstr "Tu solicitud se llamaba {{info_request}}. Haznos saber si has recibido l msgid "Your request:" msgstr "Tu solicitud:" +msgid "Your response to an FOI request was not delivered" +msgstr "" + msgid "" "Your response will <strong>appear on the Internet</strong>, <a " "href=\"%s\">read why</a> and answers to other questions." diff --git a/locale/hu_HU/app.po b/locale/hu_HU/app.po index 286237b84..d47b5d552 100644 --- a/locale/hu_HU/app.po +++ b/locale/hu_HU/app.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-09-19 09:37+0100\n" -"PO-Revision-Date: 2012-09-19 08:48+0000\n" +"POT-Creation-Date: 2012-10-11 10:18+0100\n" +"PO-Revision-Date: 2012-10-11 09:52+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -175,8 +175,8 @@ msgstr "<a class=\"link_button_green\" href=\"{{url}}\">{{text}}</a> " msgid "<a href=\"%s\">Add an annotation</a> (to help the requester or others)" msgstr "<a href=\"%s\">Kommentálhatja az igénylést</a> - amivel segítségére lehet az igénylőnek, valamint a téma iránt érdelődőknek." -msgid "<a href=\"%s\">Are we missing a public authority?</a>." -msgstr "<a href=\"%s\">Hiányzik valamely adatgazda?</a>. " +msgid "<a href=\"%s\">Are we missing a public authority?</a>" +msgstr "" msgid "" "<a href=\"%s\">Are you the owner of\n" @@ -359,7 +359,7 @@ msgid "" msgstr "<strong><code>status:</code></strong> az igénylés állapota vagy korábbi állapota alapján történő kiválasztáshoz, lásd az alábbi <a href=\"{{statuses_url}}\">állapottáblázatot</a>. " msgid "" -"<strong><code>tag:charity</code></strong> to find all public bodies or requests with a given tag. You can include multiple tags, \n" +"<strong><code>tag:charity</code></strong> to find all public authorities 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>tag:charity</code></strong> az összes adatgazda vagy igénylés kikereséséhez egy adott címkén belül. Több címkét \n és címkeértéket is szerepeltethet, pl. <code>tag:openlylocal AND tag:financial_transaction:335633</code>. Ne feledje, hogy alapértelmezés szerint bármely címke\n szerepelhet; világosan fel kell tüntetnie az <code>AND</code> kódot, ha az összes eredményt meg kívánja jeleníteni. " @@ -405,6 +405,11 @@ msgid "" msgstr "<strong>Megjegyzés:</strong>\n E-mailt küldünk új e-mail címére. Kövesse az\n abban található utasításokat az e-mail cím módosításának megerősítéséhez!" msgid "" +"<strong>Note:</strong> Because we're testing, requests are being sent to " +"{{email}} rather than to the actual authority." +msgstr "" + +msgid "" "<strong>Note:</strong> You're sending a message to yourself, presumably\n" " to try out how it works." msgstr "" @@ -1051,8 +1056,10 @@ msgstr "Ismeretlen okból kifolyólag ennek a közintézménynek nem lehet igén msgid "Forgotten your password?" msgstr "Elfelejtette jelszavát? " -msgid "Found {{count}} public bodies {{description}}" -msgstr " {{description}} összesen {{count}} adatgazda található a rendszerünkben" +msgid "Found %d public authority %s" +msgid_plural "Found %d public authorities %s" +msgstr[0] "" +msgstr[1] "" msgid "Freedom of Information" msgstr "Közérdekűadat" @@ -1234,6 +1241,11 @@ msgid "If you are {{user_link}}, please" msgstr "Ha ön {{user_link}}, kérjük, " msgid "" +"If you believe this request is not suitable, you can report it for attention" +" by the site administrators" +msgstr "" + +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." @@ -1261,6 +1273,11 @@ msgid "" msgstr "Ha még nem tette meg eddig, írjon alább üzenetet, amelyben tájékoztatja a közintézményt, hogy igénylését visszavonta. Máskülönben nem fogják tudni, hogy az igénylés vissza lett vonva. " msgid "" +"If you reply to this message it will go directly to {{user_name}}, who will\n" +"learn your email address. Only reply if that is okay." +msgstr "" + +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 "Amennyiben webes levelező rendszert használ vagy spamszűrő van beállítva, ellenőrizze a\nlevélszemetet tartalmazó mappákat is! Előfordulhat, hogy üzeneteink ide kerülnek." @@ -1311,6 +1328,9 @@ msgstr "IncomingMessage|Subject" msgid "IncomingMessage|Valid to reply to" msgstr "IncomingMessage|Valid to reply to" +msgid "Individual requests" +msgstr "" + msgid "Info request" msgstr "" @@ -1344,6 +1364,9 @@ msgstr "" msgid "InfoRequest|Awaiting description" msgstr "InfoRequest|Awaiting description" +msgid "InfoRequest|Comments allowed" +msgstr "" + msgid "InfoRequest|Described state" msgstr "InfoRequest|Described state" @@ -1468,6 +1491,9 @@ msgstr "Közérdekűadat-igénylések létrehozása és böngészése " msgid "Make your own request" msgstr "Adatigénylés létrehozása " +msgid "Many requests" +msgstr "" + msgid "Message" msgstr "" @@ -1480,6 +1506,9 @@ msgstr "Hiányzó kapcsolattartási adatok: " msgid "More about this authority" msgstr "További információ erről az adatgazdáról" +msgid "More requests..." +msgstr "" + msgid "More similar requests" msgstr "Több hasonló igénylés " @@ -1668,6 +1697,9 @@ msgstr "Jelszó: (újból) " msgid "Paste this link into emails, tweets, and anywhere else:" msgstr "Másolja be ezt a hivatkozást e-mailbe, tweetbe és máshova: " +msgid "People" +msgstr "" + msgid "People {{start_count}} to {{end_count}} of {{total_count}}" msgstr "Személyek: {{start_count}} - {{end_count}}, összesen: {{total_count}} " @@ -2152,6 +2184,9 @@ msgid "" " <strong>{{number_of_authorities}} authorities</strong>" msgstr "<br/>\n <strong>{{number_of_requests}} adatigénylés</strong> <span>és</span><br/>\n <strong>{{number_of_authorities}} adatgazda</strong> között böngészhet pillanatnyilag a rendszerünkben." +msgid "Search queries" +msgstr "" + msgid "Search results" msgstr "A keresés eredménye" @@ -2248,6 +2283,9 @@ msgstr "Néhányan, akik adatigénylést nyújtottak be, nem tájékoztattak ben msgid "Somebody added a note to your FOI request - " msgstr "Közérdekűadat-igényléséhez valaki hozzászólt - " +msgid "Someone has updated the status of your request" +msgstr "" + msgid "" "Someone, perhaps you, just tried to change their email address on\n" "{{site_name}} from {{old_email}} to {{new_email}}." @@ -2940,6 +2978,9 @@ msgstr "Sajnos nem ismerjük a következő adatgazda működő {{info_request_la msgid "Unknown" msgstr "Ismeretlen" +msgid "Unsubscribe" +msgstr "" + msgid "Unusual response." msgstr "Szokatlan válasz" @@ -2949,6 +2990,9 @@ msgstr "Az adatigénylés státuszának frissítése" msgid "Update the status of your request to " msgstr "Igénylése állapotának frissítése a következőre: " +msgid "Upload FOI response" +msgstr "" + msgid "" "Use OR (in capital letters) where you don't mind which word, e.g. " "<strong><code>commons OR lords</code></strong>" @@ -3121,6 +3165,9 @@ msgstr "Mi áll a legközelebb ezen igénylés állapotához? " msgid "What information has been released?" msgstr "Mire voltak kíváncsiak mások? " +msgid "What information has been requested?" +msgstr "" + msgid "" "When you get there, please update the status to say if the response \n" "contains any useful information." @@ -3347,9 +3394,8 @@ msgid "Your annotations" msgstr "Hozzászólásaim" 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 "Adatait senkinek nem adtuk ki - kivéve, ha ön úgy dönt, hogy erre az üzenetre\nválaszol, és akkor a választ közvetlenül az üzenet küldője kapja meg. " +"Your details, including your email address, have not been given to anyone." +msgstr "" msgid "Your e-mail:" msgstr "Az ön e-mail címe: " @@ -3414,6 +3460,9 @@ msgstr "Igénylésének címe: {{info_request}}. Ha megkapta az információt, msgid "Your request:" msgstr "Az ön igénylése: " +msgid "Your response to an FOI request was not delivered" +msgstr "" + msgid "" "Your response will <strong>appear on the Internet</strong>, <a " "href=\"%s\">read why</a> and answers to other questions." diff --git a/locale/id/app.po b/locale/id/app.po index dd56d7be6..64d791c27 100644 --- a/locale/id/app.po +++ b/locale/id/app.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-09-19 09:37+0100\n" -"PO-Revision-Date: 2012-09-19 08:48+0000\n" +"POT-Creation-Date: 2012-10-11 10:18+0100\n" +"PO-Revision-Date: 2012-10-11 09:55+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -174,8 +174,8 @@ msgstr "<a class=\"link_button_green\" href=\"{{url}}\">{{text}}</a>" msgid "<a href=\"%s\">Add an annotation</a> (to help the requester or others)" msgstr "<a href=\"%s\">Tambahkan anotasi</a> (untuk membantu peminta informasi atau yang lain)" -msgid "<a href=\"%s\">Are we missing a public authority?</a>." -msgstr "<a href=\"%s\">Apakah kami kehilangan sebuah otoritas publik?</a>." +msgid "<a href=\"%s\">Are we missing a public authority?</a>" +msgstr "" msgid "" "<a href=\"%s\">Are you the owner of\n" @@ -357,7 +357,7 @@ msgid "" msgstr "<strong><code>status:</code></strong> untuk memilih berdasarkan status atau status historical dari permintaan, lihat <a href=\"{{statuses_url}}\">table status </a> di bawah." msgid "" -"<strong><code>tag:charity</code></strong> to find all public bodies or requests with a given tag. You can include multiple tags, \n" +"<strong><code>tag:charity</code></strong> to find all public authorities 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>label:derma</code></strong> untuk mendapatkan semua badan publik atau permintaan-permintaan dengan label yang diberikan. Anda dapat menyertakan beberapa label sekaligus, \n dan menambahkan nilai label, misalnya <code>label:openlylocal DAN label:transaksi_keuangan:335633</code>. Perhatikan bahwa secara default setiap label \n dapat muncul, Anda harus menaruh <code>DAN</code> secara eksplisit jika Anda hanya ingin hasil yang mereka semua tampilkan." @@ -403,6 +403,11 @@ msgid "" msgstr "<strong>Catatan:</strong>\n Kami akan mengirimkan email ke alamat email Anda yang baru. Ikutilah\n instruksi di dalamnya untuk mengkonfirmasi perubahan email Anda." msgid "" +"<strong>Note:</strong> Because we're testing, requests are being sent to " +"{{email}} rather than to the actual authority." +msgstr "" + +msgid "" "<strong>Note:</strong> You're sending a message to yourself, presumably\n" " to try out how it works." msgstr "" @@ -1049,8 +1054,9 @@ msgstr "Untuk alasan yang tidak diketahui, Anda tidak dapat mengajukan permintaa msgid "Forgotten your password?" msgstr "Lupa kode sandi Anda?" -msgid "Found {{count}} public bodies {{description}}" -msgstr "Ditemukan{{count}} badan publik{{description}}" +msgid "Found %d public authority %s" +msgid_plural "Found %d public authorities %s" +msgstr[0] "" msgid "Freedom of Information" msgstr "Freedom of Information" @@ -1232,6 +1238,11 @@ msgid "If you are {{user_link}}, please" msgstr "Jika Anda adalah {{user_link}}, silakan" msgid "" +"If you believe this request is not suitable, you can report it for attention" +" by the site administrators" +msgstr "" + +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." @@ -1259,6 +1270,11 @@ msgid "" msgstr "Jika Anda belum melakukannya, silakan tulis pesan di bawah untuk member tahu otoritas bahwa Anda telah menarik permintaan Anda. Jika tidak, mereka tidak akan tahu bahwa permintaan tersebut telah ditarik." msgid "" +"If you reply to this message it will go directly to {{user_name}}, who will\n" +"learn your email address. Only reply if that is okay." +msgstr "" + +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 "Jika Anda menggunakan email berbasis web atau memiliki filter \"junk mail\", juga periksa \nfolder surat bulk/spam Anda. Terkadang, pesan-pesan kami ditandai seperti itu." @@ -1309,6 +1325,9 @@ msgstr "IncomingMessage|Subject" msgid "IncomingMessage|Valid to reply to" msgstr "IncomingMessage|Valid to reply to" +msgid "Individual requests" +msgstr "" + msgid "Info request" msgstr "Info permintaan" @@ -1342,6 +1361,9 @@ msgstr "InfoRequest|Attention requested" msgid "InfoRequest|Awaiting description" msgstr "InfoRequest|Awaiting description" +msgid "InfoRequest|Comments allowed" +msgstr "" + msgid "InfoRequest|Described state" msgstr "InfoRequest|Described state" @@ -1466,6 +1488,9 @@ msgstr "Buat dan melihat permintaan Freedom of Information (FOI)" msgid "Make your own request" msgstr "Buat permintaan Anda sendiri" +msgid "Many requests" +msgstr "" + msgid "Message" msgstr "" @@ -1478,6 +1503,9 @@ msgstr "Kehilangan rincian kontak untuk '" msgid "More about this authority" msgstr "Lebih jauh tentang otoritas ini" +msgid "More requests..." +msgstr "" + msgid "More similar requests" msgstr "Lebih banyak permintaan serupa" @@ -1666,6 +1694,9 @@ msgstr "Kode sandi: (ulangi)" msgid "Paste this link into emails, tweets, and anywhere else:" msgstr "Paste tautan ini ke email, tweets, dan tempat lain:" +msgid "People" +msgstr "" + msgid "People {{start_count}} to {{end_count}} of {{total_count}}" msgstr "Orang{{start_count}} ke{{end_count}} dari{{total_count}}" @@ -2150,6 +2181,9 @@ msgid "" " <strong>{{number_of_authorities}} authorities</strong>" msgstr "Cari lagi<br/>\n <strong>{{number_of_requests}} permintaan</strong> <span>dan</span><br/>\n <strong>{{number_of_authorities}} otoritas</strong>" +msgid "Search queries" +msgstr "" + msgid "Search results" msgstr "Hasil pencarian" @@ -2245,6 +2279,9 @@ msgstr "Beberapa orang yang mengajukan peermintaan telah memberitahu kami apakah msgid "Somebody added a note to your FOI request - " msgstr "Seseorang menambahkan catatan kepada permintaan FOI Anda -" +msgid "Someone has updated the status of your request" +msgstr "" + msgid "" "Someone, perhaps you, just tried to change their email address on\n" "{{site_name}} from {{old_email}} to {{new_email}}." @@ -2934,6 +2971,9 @@ msgstr "Sayangnya, kami tidak memiliki alamat {{info_request_law_used_full}}\nke msgid "Unknown" msgstr "Tidak diketahui" +msgid "Unsubscribe" +msgstr "" + msgid "Unusual response." msgstr "Respon yang tidak biasa." @@ -2943,6 +2983,9 @@ msgstr "Memperbarui status untuk permintaan ini" msgid "Update the status of your request to " msgstr "Memperbarui status permintaan Anda kepada" +msgid "Upload FOI response" +msgstr "" + msgid "" "Use OR (in capital letters) where you don't mind which word, e.g. " "<strong><code>commons OR lords</code></strong>" @@ -3115,6 +3158,9 @@ msgstr "Apa yang paling tepat untuk menggambarkan status dari permintaan ini sek msgid "What information has been released?" msgstr "Informasi apa yang sudah dirilis?" +msgid "What information has been requested?" +msgstr "" + msgid "" "When you get there, please update the status to say if the response \n" "contains any useful information." @@ -3339,9 +3385,8 @@ msgid "Your annotations" msgstr "anotasi Anda" 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 "Rincian tentang Anda belum diberikan kepada siapapun, kecuali Anda memilih untuk membalas \npesan ini, yang kemudian akan dikirimkan langsung kepada orang yang menulis pesan." +"Your details, including your email address, have not been given to anyone." +msgstr "" msgid "Your e-mail:" msgstr "Email Anda:" @@ -3406,6 +3451,9 @@ msgstr "Permintaan Anda disebut {{info_request}}. Memberitahukan semua orang apa msgid "Your request:" msgstr "Permintaan Anda :" +msgid "Your response to an FOI request was not delivered" +msgstr "" + msgid "" "Your response will <strong>appear on the Internet</strong>, <a " "href=\"%s\">read why</a> and answers to other questions." diff --git a/locale/model_attributes.rb b/locale/model_attributes.rb index 9944bd11d..9620a5494 100644 --- a/locale/model_attributes.rb +++ b/locale/model_attributes.rb @@ -41,6 +41,7 @@ _('Info request') _('InfoRequest|Allow new responses from') _('InfoRequest|Attention requested') _('InfoRequest|Awaiting description') +_('InfoRequest|Comments allowed') _('InfoRequest|Described state') _('InfoRequest|External url') _('InfoRequest|External user name') diff --git a/locale/nb_NO/app.po b/locale/nb_NO/app.po index 352e04bfe..b5b169298 100644 --- a/locale/nb_NO/app.po +++ b/locale/nb_NO/app.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: version 0.0.1\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-09-19 09:37+0100\n" +"POT-Creation-Date: 2012-10-11 10:18+0100\n" "PO-Revision-Date: 2011-03-09 17:48+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -160,7 +160,7 @@ msgstr "" msgid "<a href=\"%s\">Add an annotation</a> (to help the requester or others)" msgstr "" -msgid "<a href=\"%s\">Are we missing a public authority?</a>." +msgid "<a href=\"%s\">Are we missing a public authority?</a>" msgstr "" msgid "" @@ -292,7 +292,7 @@ msgid "<strong><code>status:</code></strong> to select based on the status or hi msgstr "" msgid "" -"<strong><code>tag:charity</code></strong> to find all public bodies or requests with a given tag. You can include multiple tags, \n" +"<strong><code>tag:charity</code></strong> to find all public authorities 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 "" @@ -332,6 +332,9 @@ msgid "" " instructions in it to confirm changing your email." msgstr "" +msgid "<strong>Note:</strong> Because we're testing, requests are being sent to {{email}} rather than to the actual authority." +msgstr "" + msgid "" "<strong>Note:</strong> You're sending a message to yourself, presumably\n" " to try out how it works." @@ -919,8 +922,10 @@ msgstr "" msgid "Forgotten your password?" msgstr "" -msgid "Found {{count}} public bodies {{description}}" -msgstr "" +msgid "Found %d public authority %s" +msgid_plural "Found %d public authorities %s" +msgstr[0] "" +msgstr[1] "" msgid "Freedom of Information" msgstr "" @@ -1091,6 +1096,9 @@ msgstr "" msgid "If you are {{user_link}}, please" msgstr "" +msgid "If you believe this request is not suitable, you can report it for attention by the site administrators" +msgstr "" + 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" @@ -1114,6 +1122,11 @@ msgid "If you have not done so already, please write a message below telling the msgstr "" msgid "" +"If you reply to this message it will go directly to {{user_name}}, who will\n" +"learn your email address. Only reply if that is okay." +msgstr "" + +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 "" @@ -1164,6 +1177,9 @@ msgstr "" msgid "IncomingMessage|Valid to reply to" msgstr "" +msgid "Individual requests" +msgstr "" + msgid "Info request" msgstr "" @@ -1197,6 +1213,9 @@ msgstr "" msgid "InfoRequest|Awaiting description" msgstr "" +msgid "InfoRequest|Comments allowed" +msgstr "" + msgid "InfoRequest|Described state" msgstr "" @@ -1313,6 +1332,9 @@ msgstr "" msgid "Make your own request" msgstr "" +msgid "Many requests" +msgstr "" + msgid "Message" msgstr "" @@ -1325,6 +1347,9 @@ msgstr "" msgid "More about this authority" msgstr "" +msgid "More requests..." +msgstr "" + msgid "More similar requests" msgstr "" @@ -1502,6 +1527,9 @@ msgstr "" msgid "Paste this link into emails, tweets, and anywhere else:" msgstr "" +msgid "People" +msgstr "" + msgid "People {{start_count}} to {{end_count}} of {{total_count}}" msgstr "" @@ -1955,6 +1983,9 @@ msgid "" " <strong>{{number_of_authorities}} authorities</strong>" msgstr "" +msgid "Search queries" +msgstr "" + msgid "Search results" msgstr "" @@ -2051,6 +2082,9 @@ msgstr "" msgid "Somebody added a note to your FOI request - " msgstr "" +msgid "Someone has updated the status of your request" +msgstr "" + msgid "" "Someone, perhaps you, just tried to change their email address on\n" "{{site_name}} from {{old_email}} to {{new_email}}." @@ -2668,6 +2702,9 @@ msgstr "" msgid "Unknown" msgstr "" +msgid "Unsubscribe" +msgstr "" + msgid "Unusual response." msgstr "" @@ -2677,6 +2714,9 @@ msgstr "" msgid "Update the status of your request to " msgstr "" +msgid "Upload FOI response" +msgstr "" + msgid "Use OR (in capital letters) where you don't mind which word, e.g. <strong><code>commons OR lords</code></strong>" msgstr "" @@ -2838,6 +2878,9 @@ msgstr "" msgid "What information has been released?" msgstr "" +msgid "What information has been requested?" +msgstr "" + msgid "" "When you get there, please update the status to say if the response \n" "contains any useful information." @@ -3042,9 +3085,7 @@ msgstr "" msgid "Your annotations" msgstr "" -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." +msgid "Your details, including your email address, have not been given to anyone." msgstr "" msgid "Your e-mail:" @@ -3102,6 +3143,9 @@ msgstr "" msgid "Your request:" msgstr "" +msgid "Your response to an FOI request was not delivered" +msgstr "" + msgid "Your response will <strong>appear on the Internet</strong>, <a href=\"%s\">read why</a> and answers to other questions." msgstr "" diff --git a/locale/pt_BR/app.po b/locale/pt_BR/app.po index 82b3a0447..74e1c2773 100644 --- a/locale/pt_BR/app.po +++ b/locale/pt_BR/app.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-09-19 09:37+0100\n" -"PO-Revision-Date: 2012-09-19 08:48+0000\n" +"POT-Creation-Date: 2012-10-11 10:18+0100\n" +"PO-Revision-Date: 2012-10-11 09:50+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -188,8 +188,8 @@ msgstr "<a class=\"link_button_green\" href=\"{{url}}\">{{text}}</a>" msgid "<a href=\"%s\">Add an annotation</a> (to help the requester or others)" msgstr "<a href=\"%s\">Adicione um comentário</a> (para ajudar o solicitante ou outros)" -msgid "<a href=\"%s\">Are we missing a public authority?</a>." -msgstr "<a href=\"%s\">Está faltando algum órgão público?</a> ." +msgid "<a href=\"%s\">Are we missing a public authority?</a>" +msgstr "" msgid "" "<a href=\"%s\">Are you the owner of\n" @@ -372,7 +372,7 @@ msgid "" msgstr "<strong><code>situação:</code></strong> para selecionar com base na situação ou no histórico de situações do pedido, veja a <a href=\"{{statuses_url}}\">tabela de situações</a> abaixo." msgid "" -"<strong><code>tag:charity</code></strong> to find all public bodies or requests with a given tag. You can include multiple tags, \n" +"<strong><code>tag:charity</code></strong> to find all public authorities 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>tag:saude</code></strong> para encontrar órgãos públicos ou pedidos com uma tag específica. Você pode incluir múltiplas tags ⏎\n e valores, por exemplo <code>tag:saude E tag:transacao_financeira:335633</code>. Perceba que, por padrão, qualquer uma das tags⏎\n pode estar presente em um resultado, e você deve colocar <code>E</code> para explicitar que deseja resultados com todas as tags presentes." @@ -418,6 +418,11 @@ msgid "" msgstr "<strong>Atenção:</strong> Vamos enviar um email para você. Siga as instruções para confirmar a alteração o seu e-mail." msgid "" +"<strong>Note:</strong> Because we're testing, requests are being sent to " +"{{email}} rather than to the actual authority." +msgstr "" + +msgid "" "<strong>Note:</strong> You're sending a message to yourself, presumably\n" " to try out how it works." msgstr "" @@ -1064,8 +1069,10 @@ msgstr "Devido a um erro desconhecido, não foi possível realizar seu pedido pa msgid "Forgotten your password?" msgstr "Esqueceu a sua senha?" -msgid "Found {{count}} public bodies {{description}}" -msgstr "{{count}} orgãos encontrados {{description}}" +msgid "Found %d public authority %s" +msgid_plural "Found %d public authorities %s" +msgstr[0] "" +msgstr[1] "" msgid "Freedom of Information" msgstr "Liberdade de Informação" @@ -1247,6 +1254,11 @@ msgid "If you are {{user_link}}, please" msgstr "Se você é {{user_link}}, por favor" msgid "" +"If you believe this request is not suitable, you can report it for attention" +" by the site administrators" +msgstr "" + +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." @@ -1274,6 +1286,11 @@ msgid "" msgstr "Se você ainda não fez, por favor escreva uma mensagem explicando para o orgão que você esta removendo seu pedido. Do contrario eles não vão saber que o pedido foi removido." msgid "" +"If you reply to this message it will go directly to {{user_name}}, who will\n" +"learn your email address. Only reply if that is okay." +msgstr "" + +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 "Se você usar seu e-mail por algum site da web ou se tiver filtros para mensagens indesejadas, verifique também suas pastas de spam. Às vezes, nossas mensagens podem ser marcadas dessa forma pelo seu provedor." @@ -1324,6 +1341,9 @@ msgstr "IncomingMessage | Assunto" msgid "IncomingMessage|Valid to reply to" msgstr "IncomingMessage | Vale a pena responder para" +msgid "Individual requests" +msgstr "" + msgid "Info request" msgstr "" @@ -1357,6 +1377,9 @@ msgstr "" msgid "InfoRequest|Awaiting description" msgstr "InfoRequest | Aguardando descrição" +msgid "InfoRequest|Comments allowed" +msgstr "" + msgid "InfoRequest|Described state" msgstr "InfoRequest | estado descrito" @@ -1481,6 +1504,9 @@ msgstr "Faça e busque pedidos de acesso à informação" msgid "Make your own request" msgstr "Faça seu próprio pedido" +msgid "Many requests" +msgstr "" + msgid "Message" msgstr "Mensagem" @@ -1493,6 +1519,9 @@ msgstr "Faltam dados de contato para '" msgid "More about this authority" msgstr "Mais informações sobre este órgão público" +msgid "More requests..." +msgstr "" + msgid "More similar requests" msgstr "Outros pedidos semelhantes" @@ -1681,6 +1710,9 @@ msgstr "Senha: (de novo)" msgid "Paste this link into emails, tweets, and anywhere else:" msgstr "Utilize este link para divulgar seu pedido por meio de e-mails, tweets etc:" +msgid "People" +msgstr "" + msgid "People {{start_count}} to {{end_count}} of {{total_count}}" msgstr "Pessoas {{start_count}} para {{end_count}} de {{total_count}}" @@ -2165,6 +2197,9 @@ msgid "" " <strong>{{number_of_authorities}} authorities</strong>" msgstr "Pesquisar <br/> <strong>{{number_of_requests}} pedidos</strong> <span>e</span> <br/> <strong>{{number_of_authorities}} órgãos públicos </strong>" +msgid "Search queries" +msgstr "" + msgid "Search results" msgstr "Resultados da busca" @@ -2261,6 +2296,9 @@ msgstr "Algumas pessoas que fizeram pedidos não comunicaram se eles foram bem s msgid "Somebody added a note to your FOI request - " msgstr "Alguém adicionou uma nota ao seu pedido de acesso à informação -" +msgid "Someone has updated the status of your request" +msgstr "" + msgid "" "Someone, perhaps you, just tried to change their email address on\n" "{{site_name}} from {{old_email}} to {{new_email}}." @@ -2953,6 +2991,9 @@ msgstr "Infelizmente, nós não temos um email válido de " msgid "Unknown" msgstr "Desconhecido" +msgid "Unsubscribe" +msgstr "" + msgid "Unusual response." msgstr "Outra resposta." @@ -2962,6 +3003,9 @@ msgstr "Alterar a situação deste pedido" msgid "Update the status of your request to " msgstr "Atualize a situação de seu pedido para " +msgid "Upload FOI response" +msgstr "" + msgid "" "Use OR (in capital letters) where you don't mind which word, e.g. " "<strong><code>commons OR lords</code></strong>" @@ -3134,6 +3178,9 @@ msgstr "Qual a situação do seu pedido agora?" msgid "What information has been released?" msgstr "Últimas respostas" +msgid "What information has been requested?" +msgstr "" + msgid "" "When you get there, please update the status to say if the response \n" "contains any useful information." @@ -3360,9 +3407,8 @@ msgid "Your annotations" msgstr "Seus comentários" 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 "Suas informações não foram dadas para ninguém, a não ser que você decida responder essa mensagem, nesse caso as informações irão diretamente para quem escrever a mensagem." +"Your details, including your email address, have not been given to anyone." +msgstr "" msgid "Your e-mail:" msgstr "Seu e-mail:" @@ -3427,6 +3473,9 @@ msgstr "" msgid "Your request:" msgstr "Seu pedido:" +msgid "Your response to an FOI request was not delivered" +msgstr "" + msgid "" "Your response will <strong>appear on the Internet</strong>, <a " "href=\"%s\">read why</a> and answers to other questions." diff --git a/locale/ro_RO/app.po b/locale/ro_RO/app.po new file mode 100644 index 000000000..164716773 --- /dev/null +++ b/locale/ro_RO/app.po @@ -0,0 +1,3851 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# <andreicristianpetcu@gmail.com>, 2012. +# <copyratul@gmail.com>, 2012. +msgid "" +msgstr "" +"Project-Id-Version: alaveteli\n" +"Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" +"POT-Creation-Date: 2012-10-11 10:18+0100\n" +"PO-Revision-Date: 2012-10-11 09:49+0000\n" +"Last-Translator: louisecrow <louise@mysociety.org>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ro_RO\n" +"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" + +msgid "" +"\n" +"\n" +"[ {{site_name}} note: The above text was badly encoded, and has had strange characters removed. ]" +msgstr "\n[ {{site_name}} notă: Codul de mai sus este encodat greșit și i-au fost scoase caracterele greșite. ]" + +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 " Aceasta o să apară pe profilul tău de pe situl {{site_name}} , pentru a fi mai ușor altora să se implice în ceea ce faci." + +msgid "" +" (<strong>no ranty</strong> politics, read our <a href=\"%s\">moderation " +"policy</a>)" +msgstr "" + +msgid "" +" (<strong>patience</strong>, especially for large files, it may take a " +"while!)" +msgstr "" + +msgid " (you)" +msgstr "(tu)" + +msgid " - view and make Freedom of Information requests" +msgstr "" + +msgid " - wall" +msgstr "" + +msgid "" +" <strong>Note:</strong>\n" +" We will send you an email. Follow the instructions in it to change\n" +" your password." +msgstr "" + +msgid " <strong>Privacy note:</strong> Your email address will be given to" +msgstr "" + +msgid " <strong>Summarise</strong> the content of any information returned. " +msgstr "" + +msgid " Advise on how to <strong>best clarify</strong> the request." +msgstr "" + +msgid "" +" Ideas on what <strong>other documents to request</strong> which the " +"authority may hold. " +msgstr "" + +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 "" + +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 "" + +msgid "" +" Link to the information requested, if it is <strong>already " +"available</strong> on the Internet. " +msgstr "" + +msgid "" +" Offer better ways of <strong>wording the request</strong> to get the " +"information. " +msgstr "" + +msgid "" +" Say how you've <strong>used the information</strong>, with links if " +"possible." +msgstr "" + +msgid "" +" Suggest <strong>where else</strong> the requester might find the " +"information. " +msgstr "" + +msgid " What are you investigating using Freedom of Information? " +msgstr "" + +msgid " You are already being emailed updates about the request." +msgstr "" + +msgid " You will also be emailed updates about the request." +msgstr "Vei primi prin email informări cu noutăți cu privire la cererea ta." + +msgid " made by " +msgstr "făcut de" + +msgid " or " +msgstr "sau" + +msgid " when you send this message." +msgstr "când trimiți acest mesaj." + +msgid "%d Freedom of Information request to %s" +msgid_plural "%d Freedom of Information requests to %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "%d request" +msgid_plural "%d requests" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "%d request made." +msgid_plural "%d requests made." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "'Crime statistics by ward level for Wales'" +msgstr "'Crime statistics by ward level for Wales'" + +msgid "'Pollution levels over time for the River Tyne'" +msgstr "'Pollution levels over time for the River Tyne'" + +msgid "'{{link_to_authority}}', a public authority" +msgstr "'{{link_to_authority}}', o autoritate publică" + +msgid "'{{link_to_request}}', a request" +msgstr "'{{link_to_request}}', o cerere" + +msgid "'{{link_to_user}}', a person" +msgstr "'{{link_to_user}}', o persoană" + +msgid "" +",\n" +"\n" +"\n" +"\n" +"Yours,\n" +"\n" +"{{user_name}}" +msgstr " , Al dvs., {{user_name}}" + +msgid "- or -" +msgstr "- sau -" + +msgid "1. Select an authority" +msgstr "1. Selectează o autoritate" + +msgid "2. Ask for Information" +msgstr "2. Cere o informație" + +msgid "3. Now check your request" +msgstr "3. Verifică cererea făcută" + +msgid "<a class=\"link_button_green\" href=\"{{url}}\">{{text}}</a>" +msgstr "<a class=\"link_button_green\" href=\"{{url}}\">{{text}}</a>" + +msgid "<a href=\"%s\">Add an annotation</a> (to help the requester or others)" +msgstr "<a href=\"%s\">Adaugă o notă</a> (pentru a ajuta petentul sau pe alții)" + +msgid "<a href=\"%s\">Are we missing a public authority?</a>" +msgstr "" + +msgid "" +"<a href=\"%s\">Are you the owner of\n" +" any commercial copyright on this page?</a>" +msgstr "<a href=\"%s\">Ai un drept de Proprietate Intelectuală asupra vreunei mărci de pe pagina aceasta?</a>" + +msgid "<a href=\"%s\">Browse all</a> or <a href=\"%s\">ask us to add one</a>." +msgstr "<a href=\"%s\">Caută toate</a> sau <a href=\"%s\">cere-ne nouă să adăugăm una</a>." + +msgid "<a href=\"%s\">Can't find the one you want?</a>" +msgstr "<a href=\"%s\">Nu găsești persoana căutată?</a>" + +msgid "" +"<a href=\"%s\">Sign in</a> to change password, subscriptions and more " +"({{user_name}} only)" +msgstr "<a href=\"%s\">Loghează-te</a> pentru schimbarea parolei, abonării și altele ({{user_name}} only)" + +msgid "<a href=\"%s\">details</a>" +msgstr "<a href=\"%s\">detalii</a>" + +msgid "<a href=\"%s\">what's that?</a>" +msgstr "<a href=\"%s\">ce este aceasta?</a>" + +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 "<p>Gata! Mulțumesc pentru ajutorul tău.</p><p>Sunt aici <a href=\"{{helpus_url}}\">mai multe lucruri pe care le poți face</a> pentru a ajuta {{site_name}}.</p>" + +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 "" + +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 "" + +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 "" + +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 "" + +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 "" + +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 "" + +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 "" + +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 "" + +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 "" + +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 "" + +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 "" + +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 "" + +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 "" + +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 "" + +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 {{late_number_of_days}} 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 "" + +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 "" + +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 "" + +msgid "<span id='follow_count'>%d</span> person is following this authority" +msgid_plural "" +"<span id='follow_count'>%d</span> people are following this authority" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "" +"<strong> Can I request information about myself?</strong>\n" +"\t\t\t<a href=\"%s\">No! (Click here for details)</a>" +msgstr "" + +msgid "" +"<strong><code>commented_by:tony_bowden</code></strong> to search annotations" +" made by Tony Bowden, typing the name as in the URL." +msgstr "" + +msgid "" +"<strong><code>filetype:pdf</code></strong> to find all responses with PDF " +"attachments. Or try these: <code>{{list_of_file_extensions}}</code>" +msgstr "" + +msgid "" +"<strong><code>request:</code></strong> to restrict to a specific request, " +"typing the title as in the URL." +msgstr "" + +msgid "" +"<strong><code>requested_by:julian_todd</code></strong> to search requests " +"made by Julian Todd, typing the name as in the URL." +msgstr "" + +msgid "" +"<strong><code>requested_from:home_office</code></strong> to search requests " +"from the Home Office, typing the name as in the URL." +msgstr "" + +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 "" + +msgid "" +"<strong><code>tag:charity</code></strong> to find all public authorities 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 "" + +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 "" + +msgid "" +"<strong>Advice</strong> on how to get a response that will satisfy the " +"requester. </li>" +msgstr "" + +msgid "<strong>All the information</strong> has been sent" +msgstr "" + +msgid "" +"<strong>Anything else</strong>, such as clarifying, prompting, thanking" +msgstr "" + +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 "" + +msgid "<strong>Clarification</strong> has been requested" +msgstr "" + +msgid "" +"<strong>No response</strong> has been received\n" +" <small>(maybe there's just an acknowledgement)</small>" +msgstr "" + +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 "" + +msgid "" +"<strong>Note:</strong> Because we're testing, requests are being sent to " +"{{email}} rather than to the actual authority." +msgstr "" + +msgid "" +"<strong>Note:</strong> You're sending a message to yourself, presumably\n" +" to try out how it works." +msgstr "" + +msgid "" +"<strong>Privacy note:</strong> If you want to request private information about\n" +" yourself then <a href=\"%s\">click here</a>." +msgstr "" + +msgid "" +"<strong>Privacy note:</strong> Your photo will be shown in public on the Internet,\n" +" wherever you do something on {{site_name}}." +msgstr "" + +msgid "" +"<strong>Privacy warning:</strong> Your message, and any response\n" +" to it, will be displayed publicly on this website." +msgstr "" + +msgid "<strong>Some of the information</strong> has been sent " +msgstr "" + +msgid "<strong>Thank</strong> the public authority or " +msgstr "" + +msgid "<strong>did not have</strong> the information requested." +msgstr "" + +msgid "" +"A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> " +"was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." +msgstr "" + +msgid "" +"A <a href=\"{{request_url}}\">response</a> to <em>{{request_title}}</em> was" +" sent by {{public_body_name}} to {{info_request_user}} on {{date}}. The " +"request status is: {{request_status}}" +msgstr "" + +msgid "" +"A <strong>summary</strong> of the response if you have received it by post. " +msgstr "" + +msgid "A Freedom of Information request" +msgstr "" + +msgid "" +"A new request, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, " +"was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." +msgstr "" + +msgid "A public authority" +msgstr "" + +msgid "A response will be sent <strong>by post</strong>" +msgstr "" + +msgid "A strange reponse, required attention by the {{site_name}} team" +msgstr "" + +msgid "A {{site_name}} user" +msgstr "" + +msgid "About you:" +msgstr "" + +msgid "Act on what you've learnt" +msgstr "" + +msgid "Add an annotation" +msgstr "" + +msgid "" +"Add an annotation to your request with choice quotes, or\n" +" a <strong>summary of the response</strong>." +msgstr "" + +msgid "Added on {{date}}" +msgstr "" + +msgid "Admin level is not included in list" +msgstr "" + +msgid "Administration URL:" +msgstr "" + +msgid "Advanced search" +msgstr "" + +msgid "Advanced search tips" +msgstr "" + +msgid "" +"Advise on whether the <strong>refusal is legal</strong>, and how to complain" +" about it if not." +msgstr "" + +msgid "" +"Air, water, soil, land, flora and fauna (including how these effect\n" +" human beings)" +msgstr "" + +msgid "All of the information requested has been received" +msgstr "" + +msgid "" +"All the options below can use <strong>status</strong> or " +"<strong>latest_status</strong> before the colon. For example, " +"<strong>status:not_held</strong> will match requests which have " +"<em>ever</em> been marked as not held; " +"<strong>latest_status:not_held</strong> will match only requests that are " +"<em>currently</em> marked as not held." +msgstr "" + +msgid "" +"All the options below can use <strong>variety</strong> or " +"<strong>latest_variety</strong> before the colon. For example, " +"<strong>variety:sent</strong> will match requests which have <em>ever</em> " +"been sent; <strong>latest_variety:sent</strong> will match only requests " +"that are <em>currently</em> marked as sent." +msgstr "" + +msgid "Also called {{other_name}}." +msgstr "" + +msgid "Also send me alerts by email" +msgstr "" + +msgid "Alter your subscription" +msgstr "" + +msgid "" +"Although all responses are automatically published, we depend on\n" +"you, the original requester, to evaluate them." +msgstr "" + +msgid "" +"An <a href=\"{{request_url}}\">annotation</a> to <em>{{request_title}}</em> " +"was made by {{event_comment_user}} on {{date}}" +msgstr "" + +msgid "An <strong>error message</strong> has been received" +msgstr "" + +msgid "An Environmental Information Regulations request" +msgstr "" + +msgid "An anonymous user" +msgstr "" + +msgid "Annotation added to request" +msgstr "" + +msgid "Annotations" +msgstr "" + +msgid "" +"Annotations are so anyone, including you, can help the requester with their " +"request. For example:" +msgstr "" + +msgid "" +"Annotations will be posted publicly here, and are\n" +" <strong>not</strong> sent to {{public_body_name}}." +msgstr "" + +msgid "Anonymous user" +msgstr "" + +msgid "Anyone:" +msgstr "" + +msgid "" +"Ask for <strong>specific</strong> documents or information, this site is not" +" suitable for general enquiries." +msgstr "" + +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 "" + +msgid "Attachment (optional):" +msgstr "" + +msgid "Attachment:" +msgstr "" + +msgid "Awaiting classification." +msgstr "" + +msgid "Awaiting internal review." +msgstr "" + +msgid "Awaiting response." +msgstr "" + +msgid "Beginning with" +msgstr "" + +msgid "" +"Browse <a href='{{url}}'>other requests</a> for examples of how to word your" +" request." +msgstr "" + +msgid "" +"Browse <a href='{{url}}'>other requests</a> to '{{public_body_name}}' for " +"examples of how to word your request." +msgstr "" + +msgid "Browse all authorities..." +msgstr "" + +msgid "" +"By law, under all circumstances, {{public_body_link}} should have responded " +"by now" +msgstr "" + +msgid "" +"By law, {{public_body_link}} should normally have responded " +"<strong>promptly</strong> and" +msgstr "" + +msgid "Cancel a {{site_name}} alert" +msgstr "" + +msgid "Cancel some {{site_name}} alerts" +msgstr "" + +msgid "Cancel, return to your profile page" +msgstr "" + +msgid "Censor rule" +msgstr "" + +msgid "CensorRule|Last edit comment" +msgstr "" + +msgid "CensorRule|Last edit editor" +msgstr "" + +msgid "CensorRule|Regexp" +msgstr "" + +msgid "CensorRule|Replacement" +msgstr "" + +msgid "CensorRule|Text" +msgstr "" + +msgid "Change email on {{site_name}}" +msgstr "" + +msgid "Change password on {{site_name}}" +msgstr "" + +msgid "Change profile photo" +msgstr "" + +msgid "Change the text about you on your profile at {{site_name}}" +msgstr "" + +msgid "Change your email" +msgstr "" + +msgid "Change your email address used on {{site_name}}" +msgstr "" + +msgid "Change your password" +msgstr "" + +msgid "Change your password on {{site_name}}" +msgstr "" + +msgid "Change your password {{site_name}}" +msgstr "" + +msgid "Charity registration" +msgstr "" + +msgid "Check for mistakes if you typed or copied the address." +msgstr "" + +msgid "Check you haven't included any <strong>personal information</strong>." +msgstr "" + +msgid "Choose your profile photo" +msgstr "" + +msgid "Clarification" +msgstr "" + +msgid "Clarify your FOI request - " +msgstr "" + +msgid "Classify an FOI response from " +msgstr "" + +msgid "Clear photo" +msgstr "" + +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 "" + +msgid "" +"Click on the link below to send a message to {{public_body}} reminding them " +"to reply to your request." +msgstr "" + +msgid "Close" +msgstr "" + +msgid "Comment" +msgstr "" + +msgid "Comment|Body" +msgstr "" + +msgid "Comment|Comment type" +msgstr "" + +msgid "Comment|Locale" +msgstr "" + +msgid "Comment|Visible" +msgstr "" + +msgid "Confirm you want to follow all successful FOI requests" +msgstr "" + +msgid "Confirm you want to follow new requests" +msgstr "" + +msgid "" +"Confirm you want to follow new requests or responses matching your search" +msgstr "" + +msgid "Confirm you want to follow requests by '{{user_name}}'" +msgstr "" + +msgid "Confirm you want to follow requests to '{{public_body_name}}'" +msgstr "" + +msgid "Confirm you want to follow the request '{{request_title}}'" +msgstr "" + +msgid "Confirm your FOI request to " +msgstr "" + +msgid "Confirm your account on {{site_name}}" +msgstr "" + +msgid "Confirm your annotation to {{info_request_title}}" +msgstr "" + +msgid "Confirm your email address" +msgstr "" + +msgid "Confirm your new email address on {{site_name}}" +msgstr "" + +msgid "" +"Considered by administrators as not an FOI request and hidden from site." +msgstr "" + +msgid "Considered by administrators as vexatious and hidden from site." +msgstr "" + +msgid "Contact {{recipient}}" +msgstr "" + +msgid "Contact {{site_name}}" +msgstr "" + +msgid "Could not identify the request from the email address" +msgstr "" + +msgid "" +"Couldn't understand the image file that you uploaded. PNG, JPEG, GIF and " +"many other common image file formats are supported." +msgstr "" + +msgid "Crop your profile photo" +msgstr "" + +msgid "" +"Cultural sites and built structures (as they may be affected by the\n" +" environmental factors listed above)" +msgstr "" + +msgid "" +"Currently <strong>waiting for a response</strong> from {{public_body_link}}," +" they must respond promptly and" +msgstr "" + +msgid "Date:" +msgstr "" + +msgid "Dear {{public_body_name}}," +msgstr "" + +msgid "Delayed response to your FOI request - " +msgstr "" + +msgid "Delayed." +msgstr "" + +msgid "Delivery error" +msgstr "" + +msgid "Details of request '" +msgstr "" + +msgid "Did you mean: {{correction}}" +msgstr "" + +msgid "" +"Disclaimer: This message and any reply that you make will be published on " +"the internet. Our privacy and copyright policies:" +msgstr "" + +msgid "" +"Don't want to address your message to {{person_or_body}}? You can also " +"write to:" +msgstr "" + +msgid "Done" +msgstr "" + +msgid "Done >>" +msgstr "" + +msgid "Download a zip file of all correspondence" +msgstr "" + +msgid "Download original attachment" +msgstr "" + +msgid "EIR" +msgstr "" + +msgid "" +"Edit and add <strong>more details</strong> to the message above,\n" +" explaining why you are dissatisfied with their response." +msgstr "" + +msgid "Edit language version:" +msgstr "" + +msgid "Edit text about you" +msgstr "" + +msgid "Edit this request" +msgstr "" + +msgid "Either the email or password was not recognised, please try again." +msgstr "" + +msgid "" +"Either the email or password was not recognised, please try again. Or create" +" a new account using the form on the right." +msgstr "" + +msgid "Email doesn't look like a valid address" +msgstr "" + +msgid "Email me future updates to this request" +msgstr "" + +msgid "" +"Enter words that you want to find separated by spaces, e.g. <strong>climbing" +" lane</strong>" +msgstr "" + +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 "" + +msgid "Environmental Information Regulations" +msgstr "" + +msgid "Environmental Information Regulations requests made" +msgstr "" + +msgid "Environmental Information Regulations requests made using this site" +msgstr "" + +msgid "Event history" +msgstr "" + +msgid "Event history details" +msgstr "" + +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 "" + +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 "" + +msgid "Exim log" +msgstr "" + +msgid "Exim log done" +msgstr "" + +msgid "EximLogDone|Filename" +msgstr "" + +msgid "EximLogDone|Last stat" +msgstr "" + +msgid "EximLog|Line" +msgstr "" + +msgid "EximLog|Order" +msgstr "" + +msgid "FOI" +msgstr "" + +msgid "FOI email address for {{public_body}}" +msgstr "" + +msgid "FOI requests" +msgstr "" + +msgid "FOI requests by '{{user_name}}'" +msgstr "" + +msgid "FOI requests {{start_count}} to {{end_count}} of {{total_count}}" +msgstr "" + +msgid "FOI response requires admin ({{reason}}) - {{title}}" +msgstr "" + +msgid "Failed to convert image to a PNG" +msgstr "" + +msgid "" +"Failed to convert image to the correct size: at %{cols}x%{rows}, need " +"%{width}x%{height}" +msgstr "" + +msgid "Filter" +msgstr "" + +msgid "" +"First, type in the <strong>name of the UK public authority</strong> you'd \n" +" like information from. <strong>By law, they have to respond</strong>\n" +" (<a href=\"%s#%s\">why?</a>)." +msgstr "" + +msgid "Foi attachment" +msgstr "" + +msgid "FoiAttachment|Charset" +msgstr "" + +msgid "FoiAttachment|Content type" +msgstr "" + +msgid "FoiAttachment|Display size" +msgstr "" + +msgid "FoiAttachment|Filename" +msgstr "" + +msgid "FoiAttachment|Hexdigest" +msgstr "" + +msgid "FoiAttachment|Url part number" +msgstr "" + +msgid "FoiAttachment|Within rfc822 subject" +msgstr "" + +msgid "Follow" +msgstr "" + +msgid "Follow all new requests" +msgstr "" + +msgid "Follow new successful responses" +msgstr "" + +msgid "Follow requests to {{public_body_name}}" +msgstr "" + +msgid "Follow these requests" +msgstr "" + +msgid "Follow things matching this search" +msgstr "" + +msgid "Follow this authority" +msgstr "" + +msgid "Follow this link to see the request:" +msgstr "" + +msgid "Follow this person" +msgstr "" + +msgid "Follow this request" +msgstr "" + +msgid "Follow up" +msgstr "" + +msgid "Follow up message sent by requester" +msgstr "" + +msgid "Follow up messages to existing requests are sent to " +msgstr "" + +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 "" + +msgid "Follow us on twitter" +msgstr "" + +msgid "" +"Followups cannot be sent for this request, as it was made externally, and " +"published here by {{public_body_name}} on the requester's behalf." +msgstr "" + +msgid "" +"For an unknown reason, it is not possible to make a request to this " +"authority." +msgstr "" + +msgid "Forgotten your password?" +msgstr "" + +msgid "Found %d public authority %s" +msgid_plural "Found %d public authorities %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "Freedom of Information" +msgstr "" + +msgid "Freedom of Information Act" +msgstr "" + +msgid "" +"Freedom of Information law does not apply to this authority, so you cannot make\n" +" a request to it." +msgstr "" + +msgid "Freedom of Information law no longer applies to" +msgstr "" + +msgid "" +"Freedom of Information law no longer applies to this authority.Follow up " +"messages to existing requests are sent to " +msgstr "" + +msgid "Freedom of Information requests made" +msgstr "" + +msgid "Freedom of Information requests made by this person" +msgstr "" + +msgid "Freedom of Information requests made by you" +msgstr "" + +msgid "Freedom of Information requests made using this site" +msgstr "" + +msgid "Freedom of information requests to" +msgstr "" + +msgid "From" +msgstr "" + +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 "" + +msgid "From:" +msgstr "" + +msgid "GIVE DETAILS ABOUT YOUR COMPLAINT HERE" +msgstr "" + +msgid "Handled by post." +msgstr "" + +msgid "" +"Hello! You can make Freedom of Information requests within {{country_name}} " +"at {{link_to_website}}" +msgstr "" + +msgid "Hello, {{username}}!" +msgstr "" + +msgid "Help" +msgstr "" + +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 "" + +msgid "" +"Here is the message you wrote, in case you would like to copy the text and " +"save it for later." +msgstr "" + +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 "" + +msgid "Holiday" +msgstr "" + +msgid "Holiday|Day" +msgstr "" + +msgid "Holiday|Description" +msgstr "" + +msgid "Home" +msgstr "" + +msgid "Home page of authority" +msgstr "" + +msgid "" +"However, you have the right to request environmental\n" +" information under a different law" +msgstr "" + +msgid "Human health and safety" +msgstr "" + +msgid "I am asking for <strong>new information</strong>" +msgstr "" + +msgid "I am requesting an <strong>internal review</strong>" +msgstr "" + +msgid "I don't like these ones — give me some more!" +msgstr "" + +msgid "I don't want to do any more tidying now!" +msgstr "" + +msgid "I like this request" +msgstr "" + +msgid "I would like to <strong>withdraw this request</strong>" +msgstr "" + +msgid "" +"I'm still <strong>waiting</strong> for my information\n" +" <small>(maybe you got an acknowledgement)</small>" +msgstr "" + +msgid "I'm still <strong>waiting</strong> for the internal review" +msgstr "" + +msgid "I'm waiting for an <strong>internal review</strong> response" +msgstr "" + +msgid "I've been asked to <strong>clarify</strong> my request" +msgstr "" + +msgid "I've received <strong>all the information" +msgstr "" + +msgid "I've received <strong>some of the information</strong>" +msgstr "" + +msgid "I've received an <strong>error message</strong>" +msgstr "" + +msgid "" +"If the address is wrong, or you know a better address, please <a " +"href=\"%s\">contact us</a>." +msgstr "" + +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 "" + +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 "" + +msgid "If you are still having trouble, please <a href=\"%s\">contact us</a>." +msgstr "" + +msgid "" +"If you are the requester, then you may <a href=\"%s\">sign in</a> to view " +"the request." +msgstr "" + +msgid "" +"If you are thinking of using a pseudonym,\n" +" please <a href=\"%s\">read this first</a>." +msgstr "" + +msgid "If you are {{user_link}}, please" +msgstr "" + +msgid "" +"If you believe this request is not suitable, you can report it for attention" +" by the site administrators" +msgstr "" + +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 "" + +msgid "" +"If you can, scan in or photograph the response, and <strong>send us\n" +" a copy to upload</strong>." +msgstr "" + +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 "" + +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 "" + +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 "" + +msgid "" +"If you reply to this message it will go directly to {{user_name}}, who will\n" +"learn your email address. Only reply if that is okay." +msgstr "" + +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 "" + +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 "" + +msgid "If you're new to {{site_name}}" +msgstr "" + +msgid "If you've used {{site_name}} before" +msgstr "" + +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 "" + +msgid "Incoming message" +msgstr "" + +msgid "IncomingMessage|Cached attachment text clipped" +msgstr "" + +msgid "IncomingMessage|Cached main body text folded" +msgstr "" + +msgid "IncomingMessage|Cached main body text unfolded" +msgstr "" + +msgid "IncomingMessage|Last parsed" +msgstr "" + +msgid "IncomingMessage|Mail from" +msgstr "" + +msgid "IncomingMessage|Mail from domain" +msgstr "" + +msgid "IncomingMessage|Sent at" +msgstr "" + +msgid "IncomingMessage|Subject" +msgstr "" + +msgid "IncomingMessage|Valid to reply to" +msgstr "" + +msgid "Individual requests" +msgstr "" + +msgid "Info request" +msgstr "" + +msgid "Info request event" +msgstr "" + +msgid "InfoRequestEvent|Calculated state" +msgstr "" + +msgid "InfoRequestEvent|Described state" +msgstr "" + +msgid "InfoRequestEvent|Event type" +msgstr "" + +msgid "InfoRequestEvent|Last described at" +msgstr "" + +msgid "InfoRequestEvent|Params yaml" +msgstr "" + +msgid "InfoRequestEvent|Prominence" +msgstr "" + +msgid "InfoRequest|Allow new responses from" +msgstr "" + +msgid "InfoRequest|Attention requested" +msgstr "" + +msgid "InfoRequest|Awaiting description" +msgstr "" + +msgid "InfoRequest|Comments allowed" +msgstr "" + +msgid "InfoRequest|Described state" +msgstr "" + +msgid "InfoRequest|External url" +msgstr "" + +msgid "InfoRequest|External user name" +msgstr "" + +msgid "InfoRequest|Handle rejected responses" +msgstr "" + +msgid "InfoRequest|Idhash" +msgstr "" + +msgid "InfoRequest|Law used" +msgstr "" + +msgid "InfoRequest|Prominence" +msgstr "" + +msgid "InfoRequest|Title" +msgstr "" + +msgid "InfoRequest|Url title" +msgstr "" + +msgid "Information not held." +msgstr "" + +msgid "" +"Information on emissions and discharges (e.g. noise, energy,\n" +" radiation, waste materials)" +msgstr "" + +msgid "Internal review request" +msgstr "" + +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 "" + +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 "" + +msgid "" +"Items matching the following conditions are currently displayed on your " +"wall." +msgstr "" + +msgid "Joined in" +msgstr "" + +msgid "Joined {{site_name}} in" +msgstr "" + +msgid "" +"Keep it <strong>focused</strong>, you'll be more likely to get what you want" +" (<a href=\"%s\">why?</a>)." +msgstr "" + +msgid "Keywords" +msgstr "" + +msgid "Last authority viewed: " +msgstr "" + +msgid "Last request viewed: " +msgstr "" + +msgid "" +"Let us know what you were doing when this message\n" +"appeared and your browser and operating system type and version." +msgstr "" + +msgid "Link to this" +msgstr "" + +msgid "List of all authorities (CSV)" +msgstr "" + +msgid "Log in to download a zip file of {{info_request_title}}" +msgstr "" + +msgid "Log into the admin interface" +msgstr "" + +msgid "Long overdue." +msgstr "" + +msgid "Made between" +msgstr "" + +msgid "Make a new <strong>Environmental Information</strong> request" +msgstr "" + +msgid "" +"Make a new <strong>Freedom of Information</strong> request to " +"{{public_body}}" +msgstr "" + +msgid "" +"Make a new<br/>\n" +" <strong>Freedom <span>of</span><br/>\n" +" Information<br/>\n" +" request</strong>" +msgstr "" + +msgid "Make a request" +msgstr "" + +msgid "Make an {{law_used_short}} request to '{{public_body_name}}'" +msgstr "" + +msgid "Make and browse Freedom of Information (FOI) requests" +msgstr "" + +msgid "Make your own request" +msgstr "" + +msgid "Many requests" +msgstr "" + +msgid "Message" +msgstr "" + +msgid "Message sent using {{site_name}} contact form, " +msgstr "" + +msgid "Missing contact details for '" +msgstr "" + +msgid "More about this authority" +msgstr "" + +msgid "More requests..." +msgstr "" + +msgid "More similar requests" +msgstr "" + +msgid "More successful requests..." +msgstr "" + +msgid "My profile" +msgstr "" + +msgid "My request has been <strong>refused</strong>" +msgstr "" + +msgid "My requests" +msgstr "" + +msgid "My wall" +msgstr "" + +msgid "Name can't be blank" +msgstr "" + +msgid "Name is already taken" +msgstr "" + +msgid "New Freedom of Information requests" +msgstr "" + +msgid "New e-mail:" +msgstr "" + +msgid "New email doesn't look like a valid address" +msgstr "" + +msgid "New password:" +msgstr "" + +msgid "New password: (again)" +msgstr "" + +msgid "New response to '{{title}}'" +msgstr "" + +msgid "New response to your FOI request - " +msgstr "" + +msgid "New response to your request" +msgstr "" + +msgid "New response to {{law_used_short}} request" +msgstr "" + +msgid "New updates for the request '{{request_title}}'" +msgstr "" + +msgid "Newest results first" +msgstr "" + +msgid "Next" +msgstr "" + +msgid "Next, crop your photo >>" +msgstr "" + +msgid "No requests of this sort yet." +msgstr "" + +msgid "No results found." +msgstr "" + +msgid "No similar requests found." +msgstr "" + +msgid "" +"Nobody has made any Freedom of Information requests to {{public_body_name}} " +"using this site yet." +msgstr "" + +msgid "None found." +msgstr "" + +msgid "None made." +msgstr "" + +msgid "" +"Note that the requester will not be notified about your annotation, because " +"the request was published by {{public_body_name}} on their behalf." +msgstr "" + +msgid "Now check your email!" +msgstr "" + +msgid "Now preview your annotation" +msgstr "" + +msgid "Now preview your follow up" +msgstr "" + +msgid "Now preview your message asking for an internal review" +msgstr "" + +msgid "OR remove the existing photo" +msgstr "" + +msgid "Offensive? Unsuitable?" +msgstr "" + +msgid "" +"Oh no! Sorry to hear that your request was refused. Here is what to do now." +msgstr "" + +msgid "Old e-mail:" +msgstr "" + +msgid "" +"Old email address isn't the same as the address of the account you are " +"logged in with" +msgstr "" + +msgid "Old email doesn't look like a valid address" +msgstr "" + +msgid "On this page" +msgstr "" + +msgid "One FOI request found" +msgstr "" + +msgid "One person found" +msgstr "" + +msgid "One public authority found" +msgstr "" + +msgid "Only requests made using {{site_name}} are shown." +msgstr "" + +msgid "" +"Only the authority can reply to this request, and I don't recognise the " +"address this reply was sent from" +msgstr "" + +msgid "" +"Only the authority can reply to this request, but there is no \"From\" " +"address to check against" +msgstr "" + +msgid "Or search in their website for this information." +msgstr "" + +msgid "Original request sent" +msgstr "" + +msgid "Other:" +msgstr "" + +msgid "Outgoing message" +msgstr "" + +msgid "OutgoingMessage|Body" +msgstr "" + +msgid "OutgoingMessage|Last sent at" +msgstr "" + +msgid "OutgoingMessage|Message type" +msgstr "" + +msgid "OutgoingMessage|Status" +msgstr "" + +msgid "OutgoingMessage|What doing" +msgstr "" + +msgid "Partially successful." +msgstr "" + +msgid "Password is not correct" +msgstr "" + +msgid "Password:" +msgstr "" + +msgid "Password: (again)" +msgstr "" + +msgid "Paste this link into emails, tweets, and anywhere else:" +msgstr "" + +msgid "People" +msgstr "" + +msgid "People {{start_count}} to {{end_count}} of {{total_count}}" +msgstr "" + +msgid "Photo of you:" +msgstr "" + +msgid "Plans and administrative measures that affect these matters" +msgstr "" + +msgid "Play the request categorisation game" +msgstr "" + +msgid "Play the request categorisation game!" +msgstr "" + +msgid "Please" +msgstr "" + +msgid "Please <a href=\"%s\">get in touch</a> with us so we can fix it." +msgstr "" + +msgid "" +"Please <strong>answer the question above</strong> so we know whether the " +msgstr "" + +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 "" + +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 "" + +msgid "Please ask for environmental information only" +msgstr "" + +msgid "" +"Please check the URL (i.e. the long code of letters and numbers) is copied\n" +"correctly from your email." +msgstr "" + +msgid "Please choose a file containing your photo." +msgstr "" + +msgid "Please choose what sort of reply you are making." +msgstr "" + +msgid "" +"Please choose whether or not you got some of the information that you " +"wanted." +msgstr "" + +msgid "Please click on the link below to cancel or alter these emails." +msgstr "" + +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 "" + +msgid "Please click on the link below to confirm your email address." +msgstr "" + +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 "" + +msgid "" +"Please don't upload offensive pictures. We will take down images\n" +" that we consider inappropriate." +msgstr "" + +msgid "Please enable \"cookies\" to carry on" +msgstr "" + +msgid "Please enter a password" +msgstr "" + +msgid "Please enter a subject" +msgstr "" + +msgid "Please enter a summary of your request" +msgstr "" + +msgid "Please enter a valid email address" +msgstr "" + +msgid "Please enter the message you want to send" +msgstr "" + +msgid "Please enter the same password twice" +msgstr "" + +msgid "Please enter your annotation" +msgstr "" + +msgid "Please enter your email address" +msgstr "" + +msgid "Please enter your follow up message" +msgstr "" + +msgid "Please enter your letter requesting information" +msgstr "" + +msgid "Please enter your name" +msgstr "" + +msgid "Please enter your name, not your email address, in the name field." +msgstr "" + +msgid "Please enter your new email address" +msgstr "" + +msgid "Please enter your old email address" +msgstr "" + +msgid "Please enter your password" +msgstr "" + +msgid "Please give details explaining why you want a review" +msgstr "" + +msgid "Please keep it shorter than 500 characters" +msgstr "" + +msgid "" +"Please keep the summary short, like in the subject of an email. You can use " +"a phrase, rather than a full sentence." +msgstr "" + +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 "" + +msgid "" +"Please select each of these requests in turn, and <strong>let everyone know</strong>\n" +"if they are successful yet or not." +msgstr "" + +msgid "" +"Please sign at the bottom with your name, or alter the \"%{signoff}\" " +"signature" +msgstr "" + +msgid "Please sign in as " +msgstr "" + +msgid "Please type a message and/or choose a file containing your response." +msgstr "" + +msgid "Please use the form below to tell us more." +msgstr "" + +msgid "Please use this email address for all replies to this request:" +msgstr "" + +msgid "Please write a summary with some text in it" +msgstr "" + +msgid "" +"Please write the summary using a mixture of capital and lower case letters. " +"This makes it easier for others to read." +msgstr "" + +msgid "" +"Please write your annotation using a mixture of capital and lower case " +"letters. This makes it easier for others to read." +msgstr "" + +msgid "" +"Please write your follow up message containing the necessary clarifications " +"below." +msgstr "" + +msgid "" +"Please write your message using a mixture of capital and lower case letters." +" This makes it easier for others to read." +msgstr "" + +msgid "" +"Point to <strong>related information</strong>, campaigns or forums which may" +" be useful." +msgstr "" + +msgid "Possibly related requests:" +msgstr "" + +msgid "Post annotation" +msgstr "" + +msgid "Post redirect" +msgstr "" + +msgid "PostRedirect|Circumstance" +msgstr "" + +msgid "PostRedirect|Email token" +msgstr "" + +msgid "PostRedirect|Post params yaml" +msgstr "" + +msgid "PostRedirect|Reason params yaml" +msgstr "" + +msgid "PostRedirect|Token" +msgstr "" + +msgid "PostRedirect|Uri" +msgstr "" + +msgid "Posted on {{date}} by {{author}}" +msgstr "" + +msgid "Powered by <a href=\"http://www.alaveteli.org/\">Alaveteli</a>" +msgstr "" + +msgid "Prev" +msgstr "" + +msgid "Preview follow up to '" +msgstr "" + +msgid "Preview new annotation on '{{info_request_title}}'" +msgstr "" + +msgid "Preview your annotation" +msgstr "" + +msgid "Preview your message" +msgstr "" + +msgid "Preview your public request" +msgstr "" + +msgid "Profile photo" +msgstr "" + +msgid "ProfilePhoto|Data" +msgstr "" + +msgid "ProfilePhoto|Draft" +msgstr "" + +msgid "Public authorities" +msgstr "" + +msgid "Public authorities - {{description}}" +msgstr "" + +msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" +msgstr "" + +msgid "Public body" +msgstr "" + +msgid "Public body/translation" +msgstr "" + +msgid "PublicBody::Translation|First letter" +msgstr "" + +msgid "PublicBody::Translation|Locale" +msgstr "" + +msgid "PublicBody::Translation|Name" +msgstr "" + +msgid "PublicBody::Translation|Notes" +msgstr "" + +msgid "PublicBody::Translation|Publication scheme" +msgstr "" + +msgid "PublicBody::Translation|Request email" +msgstr "" + +msgid "PublicBody::Translation|Short name" +msgstr "" + +msgid "PublicBody::Translation|Url name" +msgstr "" + +msgid "PublicBody|Api key" +msgstr "" + +msgid "PublicBody|First letter" +msgstr "" + +msgid "PublicBody|Home page" +msgstr "" + +msgid "PublicBody|Info requests count" +msgstr "" + +msgid "PublicBody|Last edit comment" +msgstr "" + +msgid "PublicBody|Last edit editor" +msgstr "" + +msgid "PublicBody|Name" +msgstr "" + +msgid "PublicBody|Notes" +msgstr "" + +msgid "PublicBody|Publication scheme" +msgstr "" + +msgid "PublicBody|Request email" +msgstr "" + +msgid "PublicBody|Short name" +msgstr "" + +msgid "PublicBody|Url name" +msgstr "" + +msgid "PublicBody|Version" +msgstr "" + +msgid "Publication scheme" +msgstr "" + +msgid "Purge request" +msgstr "" + +msgid "PurgeRequest|Model" +msgstr "" + +msgid "PurgeRequest|Url" +msgstr "" + +msgid "RSS feed" +msgstr "" + +msgid "RSS feed of updates" +msgstr "" + +msgid "Re-edit this annotation" +msgstr "" + +msgid "Re-edit this message" +msgstr "" + +msgid "" +"Read about <a href=\"{{advanced_search_url}}\">advanced search " +"operators</a>, such as proximity and wildcards." +msgstr "" + +msgid "Read blog" +msgstr "" + +msgid "Received an error message, such as delivery failure." +msgstr "" + +msgid "Recently described results first" +msgstr "" + +msgid "Refused." +msgstr "" + +msgid "" +"Remember me</label> (keeps you signed in longer;\n" +" do not use on a public computer) " +msgstr "" + +msgid "Report abuse" +msgstr "" + +msgid "Report an offensive or unsuitable request" +msgstr "" + +msgid "Report this request" +msgstr "" + +msgid "Reported for administrator attention." +msgstr "" + +msgid "Request an internal review" +msgstr "" + +msgid "Request an internal review from {{person_or_body}}" +msgstr "" + +msgid "Request has been removed" +msgstr "" + +msgid "" +"Request sent to {{public_body_name}} by {{info_request_user}} on {{date}}." +msgstr "" + +msgid "" +"Request to {{public_body_name}} by {{info_request_user}}. Annotated by " +"{{event_comment_user}} on {{date}}." +msgstr "" + +msgid "" +"Requested from {{public_body_name}} by {{info_request_user}} on {{date}}" +msgstr "" + +msgid "Requested on {{date}}" +msgstr "" + +msgid "" +"Requests for personal information and vexatious requests are not considered " +"valid for FOI purposes (<a href=\"/help/about\">read more</a>)." +msgstr "" + +msgid "Requests or responses matching your saved search" +msgstr "" + +msgid "Respond by email" +msgstr "" + +msgid "Respond to request" +msgstr "" + +msgid "Respond to the FOI request" +msgstr "" + +msgid "Respond using the web" +msgstr "" + +msgid "Response" +msgstr "" + +msgid "Response from a public authority" +msgstr "" + +msgid "Response to '{{title}}'" +msgstr "" + +msgid "Response to this request is <strong>delayed</strong>." +msgstr "" + +msgid "Response to this request is <strong>long overdue</strong>." +msgstr "" + +msgid "Response to your request" +msgstr "" + +msgid "Response:" +msgstr "" + +msgid "Restrict to" +msgstr "" + +msgid "Results page {{page_number}}" +msgstr "" + +msgid "Save" +msgstr "" + +msgid "Search" +msgstr "" + +msgid "Search Freedom of Information requests, public authorities and users" +msgstr "" + +msgid "Search contributions by this person" +msgstr "" + +msgid "Search for words in:" +msgstr "" + +msgid "Search in" +msgstr "" + +msgid "" +"Search over<br/>\n" +" <strong>{{number_of_requests}} requests</strong> <span>and</span><br/>\n" +" <strong>{{number_of_authorities}} authorities</strong>" +msgstr "" + +msgid "Search queries" +msgstr "" + +msgid "Search results" +msgstr "" + +msgid "Search the site to find what you were looking for." +msgstr "" + +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] "" +msgstr[2] "" + +msgid "Search your contributions" +msgstr "" + +msgid "Select one to see more information about the authority." +msgstr "" + +msgid "Select the authority to write to" +msgstr "" + +msgid "Send a followup" +msgstr "" + +msgid "Send a message to " +msgstr "" + +msgid "Send a public follow up message to {{person_or_body}}" +msgstr "" + +msgid "Send a public reply to {{person_or_body}}" +msgstr "" + +msgid "Send follow up to '{{title}}'" +msgstr "" + +msgid "Send message" +msgstr "" + +msgid "Send message to " +msgstr "" + +msgid "Send request" +msgstr "" + +msgid "Set your profile photo" +msgstr "" + +msgid "Short name is already taken" +msgstr "" + +msgid "Show most relevant results first" +msgstr "" + +msgid "Show only..." +msgstr "" + +msgid "Showing" +msgstr "" + +msgid "Sign in" +msgstr "" + +msgid "Sign in or make a new account" +msgstr "" + +msgid "Sign in or sign up" +msgstr "" + +msgid "Sign out" +msgstr "" + +msgid "Sign up" +msgstr "" + +msgid "Similar requests" +msgstr "" + +msgid "Simple search" +msgstr "" + +msgid "Some notes have been added to your FOI request - " +msgstr "" + +msgid "Some of the information requested has been received" +msgstr "" + +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 "" + +msgid "Somebody added a note to your FOI request - " +msgstr "" + +msgid "Someone has updated the status of your request" +msgstr "" + +msgid "" +"Someone, perhaps you, just tried to change their email address on\n" +"{{site_name}} from {{old_email}} to {{new_email}}." +msgstr "" + +msgid "" +"Sorry - you cannot respond to this request via {{site_name}}, because this " +"is a copy of the request originally at {{link_to_original_request}}." +msgstr "" + +msgid "Sorry, but only {{user_name}} is allowed to do that." +msgstr "" + +msgid "Sorry, there was a problem processing this page" +msgstr "" + +msgid "Sorry, we couldn't find that page" +msgstr "" + +msgid "Special note for this authority!" +msgstr "" + +msgid "Start" +msgstr "" + +msgid "Start now »" +msgstr "" + +msgid "Start your own blog" +msgstr "" + +msgid "Stay up to date" +msgstr "" + +msgid "Still awaiting an <strong>internal review</strong>" +msgstr "" + +msgid "Subject" +msgstr "" + +msgid "Subject:" +msgstr "" + +msgid "Submit" +msgstr "" + +msgid "Submit status" +msgstr "" + +msgid "Subscribe to blog" +msgstr "" + +msgid "Successful Freedom of Information requests" +msgstr "" + +msgid "Successful." +msgstr "" + +msgid "" +"Suggest how the requester can find the <strong>rest of the " +"information</strong>." +msgstr "" + +msgid "Summary:" +msgstr "" + +msgid "Table of statuses" +msgstr "" + +msgid "Table of varieties" +msgstr "" + +msgid "Tags (separated by a space):" +msgstr "" + +msgid "Tags:" +msgstr "" + +msgid "Technical details" +msgstr "" + +msgid "Thank you for helping us keep the site tidy!" +msgstr "" + +msgid "Thank you for making an annotation!" +msgstr "" + +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 "" + +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 "" + +msgid "Thank you for updating this request!" +msgstr "" + +msgid "Thank you for updating your profile photo" +msgstr "" + +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 "" + +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 "" + +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 "" + +msgid "" +"That doesn't look like a valid email address. Please check you have typed it" +" correctly." +msgstr "" + +msgid "The <strong>review has finished</strong> and overall:" +msgstr "" + +msgid "The Freedom of Information Act <strong>does not apply</strong> to" +msgstr "" + +msgid "The accounts have been left as they previously were." +msgstr "" + +msgid "" +"The authority do <strong>not have</strong> the information <small>(maybe " +"they say who does)" +msgstr "" + +msgid "" +"The authority only has a <strong>paper copy</strong> of the information." +msgstr "" + +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 "" + +msgid "" +"The authority would like to / has <strong>responded by post</strong> to this" +" request." +msgstr "" + +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 "" + +msgid "The page doesn't exist. Things you can try now:" +msgstr "" + +msgid "The public authority does not have the information requested" +msgstr "" + +msgid "The public authority would like part of the request explained" +msgstr "" + +msgid "The public authority would like to / has responded by post" +msgstr "" + +msgid "The request has been <strong>refused</strong>" +msgstr "" + +msgid "" +"The request has been updated since you originally loaded this page. Please " +"check for any new incoming messages below, and try again." +msgstr "" + +msgid "The request is <strong>waiting for clarification</strong>." +msgstr "" + +msgid "The request was <strong>partially successful</strong>." +msgstr "" + +msgid "The request was <strong>refused</strong> by" +msgstr "" + +msgid "The request was <strong>successful</strong>." +msgstr "" + +msgid "The request was refused by the public authority" +msgstr "" + +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 "" + +msgid "The requester has abandoned this request for some reason" +msgstr "" + +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 "" + +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 "" + +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 "" + +msgid "" +"The search index is currently offline, so we can't show the Freedom of " +"Information requests this person has made." +msgstr "" + +msgid "Then you can cancel the alert." +msgstr "" + +msgid "Then you can cancel the alerts." +msgstr "" + +msgid "Then you can change your email address used on {{site_name}}" +msgstr "" + +msgid "Then you can change your password on {{site_name}}" +msgstr "" + +msgid "Then you can classify the FOI response you have got from " +msgstr "" + +msgid "Then you can download a zip file of {{info_request_title}}." +msgstr "" + +msgid "Then you can log into the administrative interface" +msgstr "" + +msgid "Then you can play the request categorisation game." +msgstr "" + +msgid "Then you can report the request '{{title}}'" +msgstr "" + +msgid "Then you can send a message to " +msgstr "" + +msgid "Then you can sign in to {{site_name}}" +msgstr "" + +msgid "Then you can update the status of your request to " +msgstr "" + +msgid "Then you can upload an FOI response. " +msgstr "" + +msgid "Then you can write follow up message to " +msgstr "" + +msgid "Then you can write your reply to " +msgstr "" + +msgid "Then you will be following all new FOI requests." +msgstr "" + +msgid "" +"Then you will be notified whenever '{{user_name}}' requests something or " +"gets a response." +msgstr "" + +msgid "" +"Then you will be notified whenever a new request or response matches your " +"search." +msgstr "" + +msgid "Then you will be notified whenever an FOI request succeeds." +msgstr "" + +msgid "" +"Then you will be notified whenever someone requests something or gets a " +"response from '{{public_body_name}}'." +msgstr "" + +msgid "" +"Then you will be updated whenever the request '{{request_title}}' is " +"updated." +msgstr "" + +msgid "Then you'll be allowed to send FOI requests." +msgstr "" + +msgid "Then your FOI request to {{public_body_name}} will be sent." +msgstr "" + +msgid "Then your annotation to {{info_request_title}} will be posted." +msgstr "" + +msgid "" +"There are {{count}} new annotations on your {{info_request}} request. Follow" +" this link to see what they wrote." +msgstr "" + +msgid "There is %d person following this request" +msgid_plural "There are %d people following this request" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +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 "" + +msgid "" +"There is a limit on the number of requests you can make in a day, because we" +" don’t want public authorities to be bombarded with large numbers of " +"inappropriate requests. If you feel you have a good reason to ask for the " +"limit to be lifted in your case, please <a href='{{help_contact_path}}'>get " +"in touch</a>." +msgstr "" + +msgid "" +"There was a <strong>delivery error</strong> or similar, which needs fixing " +"by the {{site_name}} team." +msgstr "" + +msgid "There was an error with the words you entered, please try again." +msgstr "" + +msgid "There were no requests matching your query." +msgstr "" + +msgid "There were no results matching your query." +msgstr "" + +msgid "They are going to reply <strong>by post</strong>" +msgstr "" + +msgid "" +"They do <strong>not have</strong> the information <small>(maybe they say who" +" does)</small>" +msgstr "" + +msgid "They have been given the following explanation:" +msgstr "" + +msgid "" +"They have not replied to your {{law_used_short}} request {{title}} promptly," +" as normally required by law" +msgstr "" + +msgid "" +"They have not replied to your {{law_used_short}} request {{title}}, \n" +"as required by law" +msgstr "" + +msgid "Things to do with this request" +msgstr "" + +msgid "Things you're following" +msgstr "" + +msgid "This authority no longer exists, so you cannot make a request to it." +msgstr "" + +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 "" + +msgid "" +"This covers a very wide spectrum of information about the state of\n" +" the <strong>natural and built environment</strong>, such as:" +msgstr "" + +msgid "This external request has been hidden" +msgstr "" + +msgid "" +"This is a plain-text version of the Freedom of Information request " +"\"{{request_title}}\". The latest, full version is available online at " +"{{full_url}}" +msgstr "" + +msgid "" +"This is an HTML version of an attachment to the Freedom of Information " +"request" +msgstr "" + +msgid "" +"This is because {{title}} is an old request that has been\n" +"marked to no longer receive responses." +msgstr "" + +msgid "" +"This is your own request, so you will be automatically emailed when new " +"responses arrive." +msgstr "" + +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 "" + +msgid "This particular request is finished:" +msgstr "" + +msgid "" +"This person has made no Freedom of Information requests using this site." +msgstr "" + +msgid "This person's %d Freedom of Information request" +msgid_plural "This person's %d Freedom of Information requests" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "This person's %d annotation" +msgid_plural "This person's %d annotations" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "This person's annotations" +msgstr "" + +msgid "This request <strong>requires administrator attention</strong>" +msgstr "" + +msgid "This request has already been reported for administrator attention" +msgstr "" + +msgid "This request has an <strong>unknown status</strong>." +msgstr "" + +msgid "" +"This request has been <strong>hidden</strong> from the site, because an " +"administrator considers it not to be an FOI request" +msgstr "" + +msgid "" +"This request has been <strong>hidden</strong> from the site, because an " +"administrator considers it vexatious" +msgstr "" + +msgid "" +"This request has been <strong>reported</strong> as needing administrator " +"attention (perhaps because it is vexatious, or a request for personal " +"information)" +msgstr "" + +msgid "" +"This request has been <strong>withdrawn</strong> by the person who made it.\n" +" There may be an explanation in the correspondence below." +msgstr "" + +msgid "" +"This request has been marked for review by the site administrators, who have" +" not hidden it at this time. If you believe it should be hidden, please <a " +"href=\"%s\">contact us</a>." +msgstr "" + +msgid "This request has been reported for administrator attention" +msgstr "" + +msgid "" +"This request has been set by an administrator to \"allow new responses from " +"nobody\"" +msgstr "" + +msgid "" +"This request has had an unusual response, and <strong>requires " +"attention</strong> from the {{site_name}} team." +msgstr "" + +msgid "" +"This request has prominence 'hidden'. You can only see it because you are logged\n" +" in as a super user." +msgstr "" + +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 "" + +msgid "This request is still in progress:" +msgstr "" + +msgid "This request was not made via {{site_name}}" +msgstr "" + +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 "" + +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 "" + +msgid "This user has been banned from {{site_name}} " +msgstr "" + +msgid "" +"This was not possible because there is already an account using \n" +"the email address {{email}}." +msgstr "" + +msgid "To cancel these alerts" +msgstr "" + +msgid "To cancel this alert" +msgstr "" + +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 "" + +msgid "To change your email address used on {{site_name}}" +msgstr "" + +msgid "To classify the response to this FOI request" +msgstr "" + +msgid "To do that please send a private email to " +msgstr "" + +msgid "To do this, first click on the link below." +msgstr "" + +msgid "To download the zip file" +msgstr "" + +msgid "To follow all successful requests" +msgstr "" + +msgid "To follow new requests" +msgstr "" + +msgid "To follow requests and responses matching your search" +msgstr "" + +msgid "To follow requests by '{{user_name}}'" +msgstr "" + +msgid "" +"To follow requests made using {{site_name}} to the public authority " +"'{{public_body_name}}'" +msgstr "" + +msgid "To follow the request '{{request_title}}'" +msgstr "" + +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 "" + +msgid "" +"To let everyone know, follow this link and then select the appropriate box." +msgstr "" + +msgid "To log into the administrative interface" +msgstr "" + +msgid "To play the request categorisation game" +msgstr "" + +msgid "To post your annotation" +msgstr "" + +msgid "To reply to " +msgstr "" + +msgid "To report this FOI request" +msgstr "" + +msgid "To send a follow up message to " +msgstr "" + +msgid "To send a message to " +msgstr "" + +msgid "To send your FOI request" +msgstr "" + +msgid "To update the status of this FOI request" +msgstr "" + +msgid "" +"To upload a response, you must be logged in using an email address from " +msgstr "" + +msgid "" +"To use the advanced search, combine phrases and labels as described in the " +"search tips below." +msgstr "" + +msgid "" +"To view the email address that we use to send FOI requests to " +"{{public_body_name}}, please enter these words." +msgstr "" + +msgid "To view the response, click on the link below." +msgstr "" + +msgid "To {{public_body_link_absolute}}" +msgstr "" + +msgid "To:" +msgstr "" + +msgid "Today" +msgstr "" + +msgid "Too many requests" +msgstr "" + +msgid "Top search results:" +msgstr "" + +msgid "Track thing" +msgstr "" + +msgid "Track this person" +msgstr "" + +msgid "Track this search" +msgstr "" + +msgid "TrackThing|Track medium" +msgstr "" + +msgid "TrackThing|Track query" +msgstr "" + +msgid "TrackThing|Track type" +msgstr "" + +msgid "Turn off email alerts" +msgstr "" + +msgid "Tweet this request" +msgstr "" + +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 "" + +msgid "URL name can't be blank" +msgstr "" + +msgid "Unable to change email address on {{site_name}}" +msgstr "" + +msgid "Unable to send a reply to {{username}}" +msgstr "" + +msgid "Unable to send follow up message to {{username}}" +msgstr "" + +msgid "Unexpected search result type" +msgstr "" + +msgid "Unexpected search result type " +msgstr "" + +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 "" + +msgid "" +"Unfortunately, we do not have a working {{info_request_law_used_full}}\n" +"address for" +msgstr "" + +msgid "Unknown" +msgstr "" + +msgid "Unsubscribe" +msgstr "" + +msgid "Unusual response." +msgstr "" + +msgid "Update the status of this request" +msgstr "" + +msgid "Update the status of your request to " +msgstr "" + +msgid "Upload FOI response" +msgstr "" + +msgid "" +"Use OR (in capital letters) where you don't mind which word, e.g. " +"<strong><code>commons OR lords</code></strong>" +msgstr "" + +msgid "" +"Use quotes when you want to find an exact phrase, e.g. " +"<strong><code>\"Liverpool City Council\"</code></strong>" +msgstr "" + +msgid "User" +msgstr "" + +msgid "User info request sent alert" +msgstr "" + +msgid "UserInfoRequestSentAlert|Alert type" +msgstr "" + +msgid "User|About me" +msgstr "" + +msgid "User|Address" +msgstr "" + +msgid "User|Admin level" +msgstr "" + +msgid "User|Ban text" +msgstr "" + +msgid "User|Dob" +msgstr "" + +msgid "User|Email" +msgstr "" + +msgid "User|Email bounce message" +msgstr "" + +msgid "User|Email bounced at" +msgstr "" + +msgid "User|Email confirmed" +msgstr "" + +msgid "User|Hashed password" +msgstr "" + +msgid "User|Last daily track email" +msgstr "" + +msgid "User|Locale" +msgstr "" + +msgid "User|Name" +msgstr "" + +msgid "User|No limit" +msgstr "" + +msgid "User|Receive email alerts" +msgstr "" + +msgid "User|Salt" +msgstr "" + +msgid "User|Url name" +msgstr "" + +msgid "View FOI email address" +msgstr "" + +msgid "View FOI email address for '{{public_body_name}}'" +msgstr "" + +msgid "View FOI email address for {{public_body_name}}" +msgstr "" + +msgid "View Freedom of Information requests made by {{user_name}}:" +msgstr "" + +msgid "View and search requests" +msgstr "" + +msgid "View authorities" +msgstr "" + +msgid "View email" +msgstr "" + +msgid "View requests" +msgstr "" + +msgid "Waiting clarification." +msgstr "" + +msgid "" +"Waiting for an <strong>internal review</strong> by {{public_body_link}} of " +"their handling of this request." +msgstr "" + +msgid "" +"Waiting for the public authority to complete an internal review of their " +"handling of the request" +msgstr "" + +msgid "Waiting for the public authority to reply" +msgstr "" + +msgid "Was the response you got to your FOI request any good?" +msgstr "" + +msgid "We do not have a working request email address for this authority." +msgstr "" + +msgid "" +"We do not have a working {{law_used_full}} address for {{public_body_name}}." +msgstr "" + +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 "" + +msgid "" +"We will not reveal your email address to anybody unless you\n" +"or the law tell us to." +msgstr "" + +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 "" + +msgid "" +"We will not reveal your email addresses to anybody unless you\n" +"or the law tell us to." +msgstr "" + +msgid "We're waiting for" +msgstr "" + +msgid "We're waiting for someone to read" +msgstr "" + +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 "" + +msgid "" +"We've sent you an email, and you'll need to click the link in it before you can\n" +"continue." +msgstr "" + +msgid "" +"We've sent you an email, click the link in it, then you can change your " +"password." +msgstr "" + +msgid "What are you doing?" +msgstr "" + +msgid "What best describes the status of this request now?" +msgstr "" + +msgid "What information has been released?" +msgstr "" + +msgid "What information has been requested?" +msgstr "" + +msgid "" +"When you get there, please update the status to say if the response \n" +"contains any useful information." +msgstr "" + +msgid "" +"When you receive the paper response, please help\n" +" others find out what it says:" +msgstr "" + +msgid "" +"When you're done, <strong>come back here</strong>, <a href=\"%s\">reload " +"this page</a> and file your new request." +msgstr "" + +msgid "Which of these is happening?" +msgstr "" + +msgid "Who can I request information from?" +msgstr "" + +msgid "Withdrawn by the requester." +msgstr "" + +msgid "Wk" +msgstr "" + +msgid "Would you like to see a website like this in your country?" +msgstr "" + +msgid "Write a reply" +msgstr "" + +msgid "Write a reply to " +msgstr "" + +msgid "Write your FOI follow up message to " +msgstr "" + +msgid "Write your request in <strong>simple, precise language</strong>." +msgstr "" + +msgid "You" +msgstr "" + +msgid "You are already following new requests" +msgstr "" + +msgid "You are already following requests to {{public_body_name}}" +msgstr "" + +msgid "You are already following things matching this search" +msgstr "" + +msgid "You are already following this person" +msgstr "" + +msgid "You are already following this request" +msgstr "" + +msgid "You are already following updates about {{track_description}}" +msgstr "" + +msgid "" +"You are currently receiving notification of new activity on your wall by " +"email." +msgstr "" + +msgid "You are following all new successful responses" +msgstr "" + +msgid "You are no longer following {{track_description}}" +msgstr "" + +msgid "" +"You are now <a href=\"{{wall_url_user}}\">following</a> updates about " +"{{track_description}}" +msgstr "" + +msgid "You can <strong>complain</strong> by" +msgstr "" + +msgid "" +"You can change the requests and users you are following on <a " +"href=\"{{profile_url}}\">your profile page</a>." +msgstr "" + +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 "" + +msgid "" +"You can only request information about the environment from this authority." +msgstr "" + +msgid "You have a new response to the {{law_used_full}} request " +msgstr "" + +msgid "" +"You have found a bug. Please <a href=\"{{contact_url}}\">contact us</a> to " +"tell us about the problem" +msgstr "" + +msgid "" +"You have hit the rate limit on new requests. Users are ordinarily limited to" +" {{max_requests_per_user_per_day}} requests in any rolling 24-hour period. " +"You will be able to make another request in {{can_make_another_request}}." +msgstr "" + +msgid "You have made no Freedom of Information requests using this site." +msgstr "" + +msgid "You have now changed the text about you on your profile." +msgstr "" + +msgid "You have now changed your email address used on {{site_name}}" +msgstr "" + +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 "" + +msgid "" +"You know what caused the error, and can <strong>suggest a solution</strong>," +" such as a working email address." +msgstr "" + +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 "" + +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 "" + +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 "" + +msgid "You need to be logged in to change the text about you on your profile." +msgstr "" + +msgid "You need to be logged in to change your profile photo." +msgstr "" + +msgid "You need to be logged in to clear your profile photo." +msgstr "" + +msgid "You need to be logged in to edit your profile." +msgstr "" + +msgid "" +"You previously submitted that exact follow up message for this request." +msgstr "" + +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 "" + +msgid "" +"You want to <strong>give your postal address</strong> to the authority in " +"private." +msgstr "" + +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 "" + +msgid "You will no longer be emailed updates for those alerts" +msgstr "" + +msgid "" +"You will now be emailed updates about {{track_description}}. <a " +"href=\"{{change_email_alerts_url}}\">Prefer not to receive emails?</a>" +msgstr "" + +msgid "" +"You will only get an answer to your request if you follow up\n" +"with the clarification." +msgstr "" + +msgid "You're long overdue a response to your FOI request - " +msgstr "" + +msgid "You're not following anything." +msgstr "" + +msgid "You've now cleared your profile photo" +msgstr "" + +msgid "Your %d Freedom of Information request" +msgid_plural "Your %d Freedom of Information requests" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "Your %d annotation" +msgid_plural "Your %d annotations" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +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 "" + +msgid "Your annotations" +msgstr "" + +msgid "" +"Your details, including your email address, have not been given to anyone." +msgstr "" + +msgid "Your e-mail:" +msgstr "" + +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 "" + +msgid "Your follow up message has been sent on its way." +msgstr "" + +msgid "Your internal review request has been sent on its way." +msgstr "" + +msgid "" +"Your message has been sent. Thank you for getting in touch! We'll get back " +"to you soon." +msgstr "" + +msgid "Your message to {{recipient_user_name}} has been sent" +msgstr "" + +msgid "Your message to {{recipient_user_name}} has been sent!" +msgstr "" + +msgid "Your message will appear in <strong>search engines</strong>" +msgstr "" + +msgid "" +"Your name and annotation will appear in <strong>search engines</strong>." +msgstr "" + +msgid "" +"Your name, request and any responses will appear in <strong>search engines</strong>\n" +" (<a href=\"%s\">details</a>)." +msgstr "" + +msgid "Your name:" +msgstr "" + +msgid "Your original message is attached." +msgstr "" + +msgid "Your password has been changed." +msgstr "" + +msgid "Your password:" +msgstr "" + +msgid "" +"Your photo will be shown in public <strong>on the Internet</strong>,\n" +" wherever you do something on {{site_name}}." +msgstr "" + +msgid "" +"Your request was called {{info_request}}. Letting everyone know whether you " +"got the information will help us keep tabs on" +msgstr "" + +msgid "Your request:" +msgstr "" + +msgid "Your response to an FOI request was not delivered" +msgstr "" + +msgid "" +"Your response will <strong>appear on the Internet</strong>, <a " +"href=\"%s\">read why</a> and answers to other questions." +msgstr "" + +msgid "" +"Your thoughts on what the {{site_name}} <strong>administrators</strong> " +"should do about the request." +msgstr "" + +msgid "Your {{site_name}} email alert" +msgstr "" + +msgid "Yours faithfully," +msgstr "" + +msgid "Yours sincerely," +msgstr "" + +msgid "[FOI #{{request}} email]" +msgstr "" + +msgid "[{{public_body}} request email]" +msgstr "" + +msgid "[{{site_name}} contact email]" +msgstr "" + +msgid "" +"a one line summary of the information you are requesting, \n" +"\t\t\te.g." +msgstr "" + +msgid "admin" +msgstr "" + +msgid "all requests" +msgstr "" + +msgid "also called {{public_body_short_name}}" +msgstr "" + +msgid "an anonymous user" +msgstr "" + +msgid "and" +msgstr "" + +msgid "" +"and update the status accordingly. Perhaps <strong>you</strong> might like " +"to help out by doing that?" +msgstr "" + +msgid "and update the status." +msgstr "" + +msgid "and we'll suggest <strong>what to do next</strong>" +msgstr "" + +msgid "answered a request about" +msgstr "" + +msgid "any <a href=\"/list\">new requests</a>" +msgstr "" + +msgid "any <a href=\"/list/successful\">successful requests</a>" +msgstr "" + +msgid "anything" +msgstr "" + +msgid "are long overdue." +msgstr "" + +msgid "authorities" +msgstr "" + +msgid "awaiting a response" +msgstr "" + +msgid "beginning with ‘{{first_letter}}’" +msgstr "" + +msgid "between two dates" +msgstr "" + +msgid "by" +msgstr "" + +msgid "by <strong>{{date}}</strong>" +msgstr "" + +msgid "by {{public_body_name}} to {{info_request_user}} on {{date}}." +msgstr "" + +msgid "by {{user_link_absolute}}" +msgstr "" + +msgid "comments" +msgstr "" + +msgid "" +"containing your postal address, and asking them to reply to this request.\n" +" Or you could phone them." +msgstr "" + +msgid "details" +msgstr "" + +msgid "display_status only works for incoming and outgoing messages right now" +msgstr "" + +msgid "during term time" +msgstr "" + +msgid "edit text about you" +msgstr "" + +msgid "even during holidays" +msgstr "" + +msgid "everything" +msgstr "" + +msgid "external" +msgstr "" + +msgid "has reported an" +msgstr "" + +msgid "have delayed." +msgstr "" + +msgid "hide quoted sections" +msgstr "" + +msgid "in term time" +msgstr "" + +msgid "in the category ‘{{category_name}}’" +msgstr "" + +msgid "internal error" +msgstr "" + +msgid "internal reviews" +msgstr "" + +msgid "is <strong>waiting for your clarification</strong>." +msgstr "" + +msgid "just to see how it works" +msgstr "" + +msgid "left an annotation" +msgstr "" + +msgid "made." +msgstr "" + +msgid "matching the tag ‘{{tag_name}}’" +msgstr "" + +msgid "messages from authorities" +msgstr "" + +msgid "messages from users" +msgstr "" + +msgid "no later than" +msgstr "" + +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 "" + +msgid "normally" +msgstr "" + +msgid "please sign in as " +msgstr "" + +msgid "requesting an internal review" +msgstr "" + +msgid "requests" +msgstr "" + +msgid "requests which are {{list_of_statuses}}" +msgstr "" + +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 "" + +msgid "send a follow up message" +msgstr "" + +msgid "sent to {{public_body_name}} by {{info_request_user}} on {{date}}." +msgstr "" + +msgid "show quoted sections" +msgstr "" + +msgid "sign in" +msgstr "" + +msgid "simple_date_format" +msgstr "" + +msgid "successful" +msgstr "" + +msgid "successful requests" +msgstr "" + +msgid "that you made to" +msgstr "" + +msgid "the main FOI contact address for {{public_body}}" +msgstr "" + +msgid "the main FOI contact at {{public_body}}" +msgstr "" + +msgid "the requester" +msgstr "" + +msgid "the {{site_name}} team" +msgstr "" + +msgid "to read" +msgstr "" + +msgid "to send a follow up message." +msgstr "" + +msgid "to {{public_body}}" +msgstr "" + +msgid "unexpected prominence on request event" +msgstr "" + +msgid "unknown reason " +msgstr "" + +msgid "unknown status " +msgstr "" + +msgid "unresolved requests" +msgstr "" + +msgid "unsubscribe" +msgstr "" + +msgid "unsubscribe all" +msgstr "" + +msgid "unsuccessful" +msgstr "" + +msgid "unsuccessful requests" +msgstr "" + +msgid "useful information." +msgstr "" + +msgid "users" +msgstr "" + +msgid "{{count}} FOI requests found" +msgstr "" + +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 "" + +msgid "{{info_request_user_name}} only:" +msgstr "" + +msgid "{{law_used_full}} request - {{title}}" +msgstr "" + +msgid "{{law_used_full}} request GQ - {{title}}" +msgstr "" + +msgid "{{law_used}} requests at {{public_body}}" +msgstr "" + +msgid "{{length_of_time}} ago" +msgstr "" + +msgid "{{list_of_things}} matching text '{{search_query}}'" +msgstr "" + +msgid "{{number_of_comments}} comments" +msgstr "" + +msgid "{{public_body_name}} only:" +msgstr "" + +msgid "" +"{{public_body}} has asked you to explain part of your {{law_used}} request." +msgstr "" + +msgid "{{public_body}} sent a response to {{user_name}}" +msgstr "" + +msgid "{{search_results}} matching '{{query}}'" +msgstr "" + +msgid "{{site_name}} blog and tweets" +msgstr "" + +msgid "" +"{{site_name}} covers requests to {{number_of_authorities}} authorities, " +"including:" +msgstr "" + +msgid "" +"{{site_name}} sends new requests to <strong>{{request_email}}</strong> for " +"this authority." +msgstr "" + +msgid "" +"{{site_name}} users have made {{number_of_requests}} requests, including:" +msgstr "" + +msgid "{{title}} - a Freedom of Information request to {{public_body}}" +msgstr "" + +msgid "{{user_name}} (Account suspended)" +msgstr "" + +msgid "{{user_name}} - Freedom of Information requests" +msgstr "" + +msgid "{{user_name}} - user profile" +msgstr "" + +msgid "{{user_name}} added an annotation" +msgstr "" + +msgid "" +"{{user_name}} has annotated your {{law_used_short}} \n" +"request. Follow this link to see what they wrote." +msgstr "" + +msgid "{{user_name}} has used {{site_name}} to send you the message below." +msgstr "" + +msgid "{{user_name}} sent a follow up message to {{public_body}}" +msgstr "" + +msgid "{{user_name}} sent a request to {{public_body}}" +msgstr "" + +msgid "{{username}} left an annotation:" +msgstr "" + +msgid "" +"{{user}} ({{user_admin_link}}) 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 "" + +msgid "{{user}} made this {{law_used_full}} request" +msgstr "" diff --git a/locale/sq/app.po b/locale/sq/app.po index c9174ccdd..525ad1959 100644 --- a/locale/sq/app.po +++ b/locale/sq/app.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-09-19 09:37+0100\n" -"PO-Revision-Date: 2012-09-19 08:48+0000\n" +"POT-Creation-Date: 2012-10-11 10:18+0100\n" +"PO-Revision-Date: 2012-10-11 09:51+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -180,8 +180,8 @@ msgstr "<a class=\"link_button_green\" href=\"{{url}}\">{{text}}</a>" msgid "<a href=\"%s\">Add an annotation</a> (to help the requester or others)" msgstr "<a href=\"%s\">Shto një shënim</a> (për të ndihmuar kërkuesin ose përdoruesit e tjerë)" -msgid "<a href=\"%s\">Are we missing a public authority?</a>." -msgstr "<a href=\"%s\">A po mungon ndonjë autoritet publik?</a>" +msgid "<a href=\"%s\">Are we missing a public authority?</a>" +msgstr "" msgid "" "<a href=\"%s\">Are you the owner of\n" @@ -364,7 +364,7 @@ msgid "" msgstr "<strong><code>status:</code></strong>për të selektuar në bazë të statusit apo historisë së statusit të kërkesës, shih<a href=\"{{statuses_url}}\">tabelën e statuseve</a> më poshtë." msgid "" -"<strong><code>tag:charity</code></strong> to find all public bodies or requests with a given tag. You can include multiple tags, \n" +"<strong><code>tag:charity</code></strong> to find all public authorities 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>etiketa:organizatë</code></strong> për të gjetur të gjitha institucionet apo kërkesat me etiketën e dhënë. Mund të përfshihen edhe disa etiketa, \n dhe vlera të etiketave, psh. <code>tag:openlylocal AND tag:financial_transaction:335633</code>. Secila nga etiketat mund të jetë\n prezente, duhet të shkruash <code>AND</code> në mënyrë eksplicite nëse do që vetëm ato te përfshihen." @@ -410,6 +410,11 @@ msgid "" msgstr "<strong>Shenim:</strong>\n Do të dërgojmë email në adresën tënde të re. Përcjelli\n udhëzimet për të konfirmuar ndërrimin e emailit." msgid "" +"<strong>Note:</strong> Because we're testing, requests are being sent to " +"{{email}} rather than to the actual authority." +msgstr "" + +msgid "" "<strong>Note:</strong> You're sending a message to yourself, presumably\n" " to try out how it works." msgstr "" @@ -1056,8 +1061,10 @@ msgstr "Për një arsye të panjohur, nuk është e mundur për të bërë një msgid "Forgotten your password?" msgstr "Ke harru fjalëkalimin?" -msgid "Found {{count}} public bodies {{description}}" -msgstr "U gjetën {{count}} autoritete publike - {{description}}" +msgid "Found %d public authority %s" +msgid_plural "Found %d public authorities %s" +msgstr[0] "" +msgstr[1] "" msgid "Freedom of Information" msgstr "Informata Zyrtare" @@ -1239,6 +1246,11 @@ msgid "If you are {{user_link}}, please" msgstr "Nëse ti je {{user_link}}, të lutem" msgid "" +"If you believe this request is not suitable, you can report it for attention" +" by the site administrators" +msgstr "" + +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." @@ -1266,6 +1278,11 @@ msgid "" msgstr "Nëse nuk e ke bërë këtë deri tani, të lutem shkruaj një mesazh më poshtë për ti treguar autoritetit që ti e ke tërheq kërkesën tënde. Përndryshe ata nuk do të dinë se është e tërhequr kërkesa." msgid "" +"If you reply to this message it will go directly to {{user_name}}, who will\n" +"learn your email address. Only reply if that is okay." +msgstr "" + +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 "Nëse ti përdor \"web-based\" email klient (p.sh. hotmail.com) ose ke \"junk mail\" filtra, kontrollo edhe bulk/spam folderët. Ndonjëherë, mesazhet tona janë të shenjuara në këtë mënyrë." @@ -1316,6 +1333,9 @@ msgstr "IncomingMessage | Lënda" msgid "IncomingMessage|Valid to reply to" msgstr "IncomingMessage | Valide për t'iu përgjigjur te" +msgid "Individual requests" +msgstr "" + msgid "Info request" msgstr "" @@ -1349,6 +1369,9 @@ msgstr "" msgid "InfoRequest|Awaiting description" msgstr "InfoRequest|Awaiting description" +msgid "InfoRequest|Comments allowed" +msgstr "" + msgid "InfoRequest|Described state" msgstr "InfoRequest|Described state" @@ -1473,6 +1496,9 @@ msgstr "Bëj dhe shfleto kërkesa për Informata Zyrtare" msgid "Make your own request" msgstr "Bëj kërkesën tënde" +msgid "Many requests" +msgstr "" + msgid "Message" msgstr "" @@ -1485,6 +1511,9 @@ msgstr "Mungojnë të dhënat për '" msgid "More about this authority" msgstr "Më shumë për këtë autoritet" +msgid "More requests..." +msgstr "" + msgid "More similar requests" msgstr "Më shumë kërkesa të ngjashme" @@ -1673,6 +1702,9 @@ msgstr "Fjalëkalimi: (përsërite)" msgid "Paste this link into emails, tweets, and anywhere else:" msgstr "Kopjo (paste) këtë vegzë në emaila, tweeta dhe kudo tjetër:" +msgid "People" +msgstr "" + msgid "People {{start_count}} to {{end_count}} of {{total_count}}" msgstr "Personat {{start_count}} deri {{end_count}} prej {{total_count}}" @@ -2157,6 +2189,9 @@ msgid "" " <strong>{{number_of_authorities}} authorities</strong>" msgstr "Gjej mbi<br/>\n <strong>{{number_of_requests}} kërkesa</strong> <span>dhe</span><br/>\n <strong>{{number_of_authorities}} autoritete publike</strong>" +msgid "Search queries" +msgstr "" + msgid "Search results" msgstr "Rezultatet e kërkimit" @@ -2253,6 +2288,9 @@ msgstr "Disa individë që kanë bërë kërkesa nuk kanë treguar se a ishin at msgid "Somebody added a note to your FOI request - " msgstr "Dikush ka shtuar një shënim në kërkesën tënde -" +msgid "Someone has updated the status of your request" +msgstr "" + msgid "" "Someone, perhaps you, just tried to change their email address on\n" "{{site_name}} from {{old_email}} to {{new_email}}." @@ -2945,6 +2983,9 @@ msgstr "Për fat të keq, ne nuk kemi një adresë funksionale {{info_request_la msgid "Unknown" msgstr "I/e panjohur" +msgid "Unsubscribe" +msgstr "" + msgid "Unusual response." msgstr "përgjigje e pazakonshme." @@ -2954,6 +2995,9 @@ msgstr "Aktualizo statusin e kësaj kërkese" msgid "Update the status of your request to " msgstr "Aktualizo statusin e kërkesës tënde për " +msgid "Upload FOI response" +msgstr "" + msgid "" "Use OR (in capital letters) where you don't mind which word, e.g. " "<strong><code>commons OR lords</code></strong>" @@ -3126,6 +3170,9 @@ msgstr "Çfarë përshkruan më së miri statusin e kësaj kërkese tani?" msgid "What information has been released?" msgstr "Çfarë informata janë publikuar?" +msgid "What information has been requested?" +msgstr "" + msgid "" "When you get there, please update the status to say if the response \n" "contains any useful information." @@ -3352,9 +3399,8 @@ msgid "Your annotations" msgstr "Shënimet tua" 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 "Të dhënat tuaja nuk iu kanë dhënë askujt, përveç nëse ju vendos të përgjigjesh në këtë\nmesazh, i cili pastaj do të shkon direkt tek personi i cili shkroi mesazhin." +"Your details, including your email address, have not been given to anyone." +msgstr "" msgid "Your e-mail:" msgstr "Emaili yt:" @@ -3419,6 +3465,9 @@ msgstr "Kërkesa yte qe emëruar {{info_request}}. Nëse i lejoni të tjerër ta msgid "Your request:" msgstr "Kërkesa yte:" +msgid "Your response to an FOI request was not delivered" +msgstr "" + msgid "" "Your response will <strong>appear on the Internet</strong>, <a " "href=\"%s\">read why</a> and answers to other questions." diff --git a/locale/sq/app__.po b/locale/sq/app__.po index 502bed447..2583d4e77 100644 --- a/locale/sq/app__.po +++ b/locale/sq/app__.po @@ -441,7 +441,7 @@ 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" +"<strong><code>tag:charity</code></strong> to find all public authorities 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 "" diff --git a/locale/sq/app_old3.po b/locale/sq/app_old3.po index 07463d4e7..efca51075 100644 --- a/locale/sq/app_old3.po +++ b/locale/sq/app_old3.po @@ -469,7 +469,7 @@ msgstr "" #: app/views/general/search.rhtml:134 msgid "" -"<strong><code>tag:charity</code></strong> to find all public bodies or " +"<strong><code>tag:charity</code></strong> to find all public authorities 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" diff --git a/locale/sq/app_old4.po b/locale/sq/app_old4.po index d80e13397..a3a4b8534 100644 --- a/locale/sq/app_old4.po +++ b/locale/sq/app_old4.po @@ -459,7 +459,7 @@ 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" +"<strong><code>tag:charity</code></strong> to find all public authorities 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 "" diff --git a/locale/sq/app_old5.po b/locale/sq/app_old5.po index 40b79ed7b..7c19a89c0 100644 --- a/locale/sq/app_old5.po +++ b/locale/sq/app_old5.po @@ -487,7 +487,7 @@ 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" +"<strong><code>tag:charity</code></strong> to find all public authorities 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 "" diff --git a/locale/sr@latin/app.po b/locale/sr@latin/app.po index 88291fcbf..0d4391aa1 100644 --- a/locale/sr@latin/app.po +++ b/locale/sr@latin/app.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-09-19 09:37+0100\n" -"PO-Revision-Date: 2012-09-19 08:48+0000\n" +"POT-Creation-Date: 2012-10-11 10:18+0100\n" +"PO-Revision-Date: 2012-10-11 09:49+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -179,8 +179,8 @@ msgstr "<a class=\"link_button_green\" href=\"{{url}}\">{{text}}</a>" msgid "<a href=\"%s\">Add an annotation</a> (to help the requester or others)" msgstr "<a href=\"%s\">Dodaj napomenu</a> (da bi se pomoglo podnosiocu zahteva ili drugima)" -msgid "<a href=\"%s\">Are we missing a public authority?</a>." -msgstr "<a href=\"%s\">Da li nam nedostaje javna ustanova?</a>." +msgid "<a href=\"%s\">Are we missing a public authority?</a>" +msgstr "" msgid "" "<a href=\"%s\">Are you the owner of\n" @@ -364,7 +364,7 @@ msgid "" msgstr "<strong><code>status:</code></strong> da biste birali zasnovano na statusu ili historiji statusa zahteva, pogledajte <a href=\"{{statuses_url}}\">tabelu statusa</a> below." msgid "" -"<strong><code>tag:charity</code></strong> to find all public bodies or requests with a given tag. You can include multiple tags, \n" +"<strong><code>tag:charity</code></strong> to find all public authorities 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 "" @@ -410,6 +410,11 @@ msgid "" msgstr "<strong>Napomena:</strong>\n Poslati ćemo e-mail na Vašu novu adresu. Pratite\n upute u njemu da bi potvrdili promjenu vašeg e-maila." msgid "" +"<strong>Note:</strong> Because we're testing, requests are being sent to " +"{{email}} rather than to the actual authority." +msgstr "" + +msgid "" "<strong>Note:</strong> You're sending a message to yourself, presumably\n" " to try out how it works." msgstr "" @@ -1056,8 +1061,11 @@ msgstr "Iz nepoznatog razloga, nije moguće podneti zahtev ovoj ustanovi." msgid "Forgotten your password?" msgstr "Zaboravili ste Vaš password?" -msgid "Found {{count}} public bodies {{description}}" -msgstr "Pronađeno {{count}} javnih tela {{description}}" +msgid "Found %d public authority %s" +msgid_plural "Found %d public authorities %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" msgid "Freedom of Information" msgstr "" @@ -1239,6 +1247,11 @@ msgid "If you are {{user_link}}, please" msgstr "Ako ste {{user_link}}, molimo" msgid "" +"If you believe this request is not suitable, you can report it for attention" +" by the site administrators" +msgstr "" + +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." @@ -1266,6 +1279,11 @@ msgid "" msgstr "Ako niste već, molimo napišite poruku ispod u kojoj napominjete ustanovu da ste povukli Vaš zahtev. U protivnom neće znati da je zahtev povučen." msgid "" +"If you reply to this message it will go directly to {{user_name}}, who will\n" +"learn your email address. Only reply if that is okay." +msgstr "" + +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 "Ako koristite neke od web mail servisa ili imate filtere za \"junk mail\", provjerite u Vašim\nbulk/spam folderima. Ponekad su naše poruke označene tako." @@ -1316,6 +1334,9 @@ msgstr "Nadolazeća poruka|Tema" msgid "IncomingMessage|Valid to reply to" msgstr "Nadolazeća poruka|Validna za odgovor za" +msgid "Individual requests" +msgstr "" + msgid "Info request" msgstr "" @@ -1349,6 +1370,9 @@ msgstr "" msgid "InfoRequest|Awaiting description" msgstr "" +msgid "InfoRequest|Comments allowed" +msgstr "" + msgid "InfoRequest|Described state" msgstr "" @@ -1473,6 +1497,9 @@ msgstr "Napravi i pretraži Zahteve za slobodan pristup informacijama" msgid "Make your own request" msgstr "Načinite Vaš zahtev" +msgid "Many requests" +msgstr "" + msgid "Message" msgstr "" @@ -1485,6 +1512,9 @@ msgstr "Nedostaju detalji kontakta za '" msgid "More about this authority" msgstr "Više o ovoj ustanovi" +msgid "More requests..." +msgstr "" + msgid "More similar requests" msgstr "Više sličnih zahteva" @@ -1673,6 +1703,9 @@ msgstr "Password: (ponovo)" msgid "Paste this link into emails, tweets, and anywhere else:" msgstr "Nalijepite ovaj link na e-mailove, tweets-e i na druga mjesta:" +msgid "People" +msgstr "" + msgid "People {{start_count}} to {{end_count}} of {{total_count}}" msgstr "" @@ -2157,6 +2190,9 @@ msgid "" " <strong>{{number_of_authorities}} authorities</strong>" msgstr "Traži preko<br/>\n <strong>{{number_of_requests}} zahteva</strong> <span>i</span><br/>\n <strong>{{number_of_authorities}} ustanova</strong>" +msgid "Search queries" +msgstr "" + msgid "Search results" msgstr "Rezultati pretrage" @@ -2254,6 +2290,9 @@ msgstr "Neki od podnosioca zahteva nas nisu obavestili da li su njihovi zahtevi msgid "Somebody added a note to your FOI request - " msgstr "Neko je dodao komentar na Vaš Zahtev za slobodan pristup informacijama." +msgid "Someone has updated the status of your request" +msgstr "" + msgid "" "Someone, perhaps you, just tried to change their email address on\n" "{{site_name}} from {{old_email}} to {{new_email}}." @@ -2949,6 +2988,9 @@ msgstr "Nažalost, ne posedujemo ispravnu {{info_request_law_used_full}}\nadresu msgid "Unknown" msgstr "Nepoznat" +msgid "Unsubscribe" +msgstr "" + msgid "Unusual response." msgstr "Neobičan odgovor." @@ -2958,6 +3000,9 @@ msgstr "Ažurirajte status ovog zahteva" msgid "Update the status of your request to " msgstr "Ažurirajte status Vašeg zahteva za " +msgid "Upload FOI response" +msgstr "" + msgid "" "Use OR (in capital letters) where you don't mind which word, e.g. " "<strong><code>commons OR lords</code></strong>" @@ -3130,6 +3175,9 @@ msgstr "Šta najbolje opisuje status ovog zahteva sada?" msgid "What information has been released?" msgstr "Koje informacije su objavljene?" +msgid "What information has been requested?" +msgstr "" + msgid "" "When you get there, please update the status to say if the response \n" "contains any useful information." @@ -3358,9 +3406,8 @@ msgid "Your annotations" msgstr "Vaše napomene" 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 "Vaši podatci nisu dati nikome, osim ako odaberete da odgovorite na ovu poruku, koja će u tom slučaju ići direktno osobi kaoja je napisala poruku." +"Your details, including your email address, have not been given to anyone." +msgstr "" msgid "Your e-mail:" msgstr "Vaš e-mail:" @@ -3425,6 +3472,9 @@ msgstr "Naziv Vašeg zahteva je {{info_request}}. Obavest o tome da li ste dobil msgid "Your request:" msgstr "Vaš zahtev:" +msgid "Your response to an FOI request was not delivered" +msgstr "" + msgid "" "Your response will <strong>appear on the Internet</strong>, <a " "href=\"%s\">read why</a> and answers to other questions." diff --git a/locale/uk/app.po b/locale/uk/app.po index 98490f9ef..e982953a9 100644 --- a/locale/uk/app.po +++ b/locale/uk/app.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-09-19 09:37+0100\n" -"PO-Revision-Date: 2012-09-19 08:48+0000\n" -"Last-Translator: louisecrow <louise@mysociety.org>\n" +"POT-Creation-Date: 2012-10-11 10:18+0100\n" +"PO-Revision-Date: 2012-10-14 14:10+0000\n" +"Last-Translator: hiiri <murahoid@gmail.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -177,10 +177,10 @@ msgid "<a class=\"link_button_green\" href=\"{{url}}\">{{text}}</a>" msgstr "<a class=\"link_button_green\" href=\"{{url}}\">{{text}}</a>" msgid "<a href=\"%s\">Add an annotation</a> (to help the requester or others)" -msgstr "<a href=\"%s\">Додайте анотацію</a> (щоб допомогти авторам цього та інших запитів)" +msgstr "<a href=\"%s\">Додайте коментар</a> (щоб допомогти авторам цього та інших запитів)" -msgid "<a href=\"%s\">Are we missing a public authority?</a>." -msgstr "<a href=\"%s\">Ми когось забули?</a>." +msgid "<a href=\"%s\">Are we missing a public authority?</a>" +msgstr "" msgid "" "<a href=\"%s\">Are you the owner of\n" @@ -227,7 +227,7 @@ 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 "<p>Дякуємо! Сподіваємось, вам не доведеться чекати довше.</p> <p>Згідно з законодавством, ви маєте отримати відповідь швидко, не пізніше <strong>{{date_response_required_by}}</strong>.</p>" +msgstr "<p>Дякуємо! Сподіваємось, вам не доведеться чекати довше.</p> <p>Згідно з законодавством, ви маєте отримати відповідь швидко, не пізніше цієї дати: <strong>{{date_response_required_by}}</strong>.</p>" 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" @@ -274,14 +274,14 @@ msgid "" " 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 "<p>Ми раді, що ви отримали всю потрібну інформацію. Якщо ви напишете про це або використаєте цю інформацію в будь-який спосіб, поверніться та додайте анотацію про це внизу.</p><p>Якщо {{site_name}} видався вам корисним, <a href=\"{{donation_url}}\">ви можете допомогти фінансово</a> громадській організації, що займається його підтримкою.</p>" +msgstr "<p>Ми раді, що ви отримали всю потрібну інформацію. Якщо ви напишете про це або використаєте цю інформацію в будь-який спосіб, поверніться та додайте коментар про це внизу.</p><p>Якщо {{site_name}} видався вам корисним, <a href=\"{{donation_url}}\">ви можете допомогти фінансово</a> громадській організації, що займається його підтримкою.</p>" 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>Ми раді, що ви отримали дещо з потрібної вам інформації. Якщо ви напишете про це або використаєте цю інформацію в будь-який спосіб, поверніться та додайте анотацію про це внизу.</p><p>Якщо {{site_name}} видався вам корисним, <a href=\"{{donation_url}}\">ви можете допомогти фінансово</a> громадській організації, що займається його підтримкою.</p><p>Якщо ви хочете спробувати отримати решту інформацію, вам слід зробити наступне.</p>" +msgstr "<p>Ми раді, що ви отримали дещо з потрібної вам інформації. Якщо ви напишете про це або використаєте цю інформацію в будь-який спосіб, поверніться та додайте коментар про це внизу.</p><p>Якщо {{site_name}} видався вам корисним, <a href=\"{{donation_url}}\">ви можете допомогти фінансово</a> громадській організації, що займається його підтримкою.</p><p>Якщо ви хочете спробувати отримати решту інформацію, вам слід зробити наступне.</p>" msgid "" "<p>You do not need to include your email in the request in order to get a " @@ -306,13 +306,13 @@ msgid "" " 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 "<p>Ваш {{law_used_full}} запит <strong>було відправлено</strong>!</p>\n<p><strong>Ми повідомимо вам</strong> коли з’явиться відповідь або якщо розпорядник інформації не надасть її в межах {{late_number_of_days}} робочих днів.</p>\n<p>Якщо ви збираєтесь написати про цей запит (наприклад, у форумі або в блозі), будь ласка, дайте посилання на цю сторінку та додайте анотацію про це внизу.</p>" +msgstr "<p>Ваш {{law_used_full}} запит <strong>було відправлено</strong>!</p>\n<p><strong>Ми повідомимо вам</strong> коли з’явиться відповідь або якщо розпорядник інформації не надасть її в межах {{late_number_of_days}} робочих днів.</p>\n<p>Якщо ви збираєтесь написати про цей запит (наприклад, у форумі або в блозі), будь ласка, дайте посилання на цю сторінку та додайте коментар про це внизу.</p>" 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}} знаходиться на обслуговуванні. Ви можете переглядати зроблені раніше запити, але не можете робити нові, додавати анотації чи будь-яким іншим чином змінювати базу даних.</p> <p>{{read_only}}</p>" +msgstr "<p>{{site_name}} знаходиться на обслуговуванні. Ви можете переглядати зроблені раніше запити, але не можете робити нові, додавати коментарі чи будь-яким іншим чином змінювати базу даних.</p> <p>{{read_only}}</p>" msgid "" "<small>If you use web-based email or have \"junk mail\" filters, also check your\n" @@ -364,7 +364,7 @@ msgid "" msgstr "<strong><code>статус:</code></strong> щоб обрати на основі статусу або історичного статусу запиту, перейдіть до <a href=\"{{statuses_url}}\">таблиці статусів</a> унизу." msgid "" -"<strong><code>tag:charity</code></strong> to find all public bodies or requests with a given tag. You can include multiple tags, \n" +"<strong><code>tag:charity</code></strong> to find all public authorities 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 "" @@ -393,7 +393,7 @@ msgid "" "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 "" +msgstr "<strong>Caveat emptor!</strong> Щоб використати ці дані належним чином, вам \nзнадобиться знання поведінки користувачів сайт. Катигоризація запитів (як, чому і ким) \nне самоочевидна, трапляються помилки користувачів, неоднозначності тощо.\nТакож ви маєте розуміти законодавство та особливості його застосування.\nА ще вам потрібне знання статистики. Будь ласка,\n<a href=\"{{contact_path}}\">звертайтесь до нас</a> із запитаннями." msgid "<strong>Clarification</strong> has been requested" msgstr "Надійшло прохання про <strong>уточнення</strong>" @@ -410,6 +410,11 @@ msgid "" msgstr "<strong>Увага:</strong>\n Ми надішлемо на нову адресу листа\n з інструкціями щодо підтвердження зміни адреси." msgid "" +"<strong>Note:</strong> Because we're testing, requests are being sent to " +"{{email}} rather than to the actual authority." +msgstr "" + +msgid "" "<strong>Note:</strong> You're sending a message to yourself, presumably\n" " to try out how it works." msgstr "<strong>Зважайте:</strong> ви надсилаєте повідомлення собі (вочевидь, щоб спробувати, як це працює)" @@ -422,12 +427,12 @@ msgstr "<strong>Заувага щодо приватності:</strong> Якщ msgid "" "<strong>Privacy note:</strong> Your photo will be shown in public on the Internet,\n" " wherever you do something on {{site_name}}." -msgstr "" +msgstr "<strong>Заувага щодо приватності:</strong> Ваше фото з’явиться в публічному доступі." msgid "" "<strong>Privacy warning:</strong> Your message, and any response\n" " to it, will be displayed publicly on this website." -msgstr "<strong>Попередження:</strong> Ваше повідомлення та відповідь на нього\nбудуть розміщені на цьом сайті у вільному доступі." +msgstr "<strong>Попередження:</strong> Ваше повідомлення та відповідь на нього\nбудуть розміщені на цьом сайті у публічному доступі." msgid "<strong>Some of the information</strong> has been sent " msgstr "Інформація була надіслана частково." @@ -436,12 +441,12 @@ msgid "<strong>Thank</strong> the public authority or " msgstr "<strong>Подякуйте</strong> розпоряднику інформації або " msgid "<strong>did not have</strong> the information requested." -msgstr "" +msgstr "<strong>не володіють</strong> запитаною інформацією." msgid "" "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> " "was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." -msgstr "" +msgstr "<a href=\"{{request_url}}\">Додатковий запит</a> щодо <em>{{request_title}}</em> було надіслано {{public_body_name}} користувачем {{info_request_user}}. Дата: {{date}}." msgid "" "A <a href=\"{{request_url}}\">response</a> to <em>{{request_title}}</em> was" @@ -480,7 +485,7 @@ msgid "Act on what you've learnt" msgstr "Дійте, спираючись на отриману інформацію" msgid "Add an annotation" -msgstr "Додайте анотацію" +msgstr "Додайте коментар" msgid "" "Add an annotation to your request with choice quotes, or\n" @@ -488,7 +493,7 @@ msgid "" msgstr "" msgid "Added on {{date}}" -msgstr "Додано {{date}}" +msgstr "Дата додання: {{date}}" msgid "Admin level is not included in list" msgstr "" @@ -536,7 +541,7 @@ msgid "Also called {{other_name}}." msgstr "" msgid "Also send me alerts by email" -msgstr "" +msgstr "Також надсилайте мені сповіщення на мейл" msgid "Alter your subscription" msgstr "Змінити свою підписку" @@ -549,7 +554,7 @@ msgstr "Хоча всі відповіді автоматично публіку msgid "" "An <a href=\"{{request_url}}\">annotation</a> to <em>{{request_title}}</em> " "was made by {{event_comment_user}} on {{date}}" -msgstr "<a href=\"{{request_url}}\">Анотація</a> на <em>{{request_title}}</em> була додана {{event_comment_user}} {{date}}" +msgstr "<a href=\"{{request_url}}\">Коментар</a> на <em>{{request_title}}</em> додано користувачем {{event_comment_user}}. Дата: {{date}}" msgid "An <strong>error message</strong> has been received" msgstr "Отримано повідомлення про помилку" @@ -561,26 +566,26 @@ msgid "An anonymous user" msgstr "Анонімний користувач" msgid "Annotation added to request" -msgstr "До запиту додано анотацію" +msgstr "До запиту додано коментар" msgid "Annotations" -msgstr "Анотації" +msgstr "Коментарі" msgid "" "Annotations are so anyone, including you, can help the requester with their " "request. For example:" -msgstr "" +msgstr "Коментарі покликані допомагати авторам запитів. Наприклад:" msgid "" "Annotations will be posted publicly here, and are\n" " <strong>not</strong> sent to {{public_body_name}}." -msgstr "" +msgstr "Коментарі з’являються в публічному доступі, але\n <strong>не</strong> надсилаються до розпорядника інформації." msgid "Anonymous user" msgstr "Анонімний користувач" msgid "Anyone:" -msgstr "Будь-хто:" +msgstr "Будь-хто з користувачів:" msgid "" "Ask for <strong>specific</strong> documents or information, this site is not" @@ -706,7 +711,7 @@ msgid "Clarify your FOI request - " msgstr "Уточніть ваш інформаційний запит - " msgid "Classify an FOI response from " -msgstr "" +msgstr "Класифікуйте відповідь від " msgid "Clear photo" msgstr "" @@ -714,7 +719,7 @@ msgstr "" 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 "" +msgstr "Натисність на посилання внизу, щоб відправити повідомлення {{public_body_name}} з проханням дати відповідь на ваш запит. Ви можете попросити провести\nвнутрішню перевірку для з’ясування, чому відповідь не приходить так довго." msgid "" "Click on the link below to send a message to {{public_body}} reminding them " @@ -765,7 +770,7 @@ msgid "Confirm your account on {{site_name}}" msgstr "Підтвердіть ваш акаунт" msgid "Confirm your annotation to {{info_request_title}}" -msgstr "Підтвердіть вашу анотацію до {{info_request_title}}" +msgstr "Підтвердіть ваш коментар до {{info_request_title}}" msgid "Confirm your email address" msgstr "Підтвердіть вашу електронну адресу" @@ -778,7 +783,7 @@ msgid "" msgstr "Адміністратори прийняли рішення, що це не є інформаційним запитом і має бути приховано" msgid "Considered by administrators as vexatious and hidden from site." -msgstr "" +msgstr "Приховано адміністраторами сайту." msgid "Contact {{recipient}}" msgstr "" @@ -805,7 +810,7 @@ msgstr "" msgid "" "Currently <strong>waiting for a response</strong> from {{public_body_link}}," " they must respond promptly and" -msgstr "" +msgstr "На даний момент відповідь від {{public_body_link}} <strong>очікується</strong>, вони мають відповісти швидко і" msgid "Date:" msgstr "Дата:" @@ -814,10 +819,10 @@ msgid "Dear {{public_body_name}}," msgstr "Шановний {{public_body_name}}," msgid "Delayed response to your FOI request - " -msgstr "" +msgstr "Відстрочена відповідь на ваш запит - " msgid "Delayed." -msgstr "" +msgstr "Затримується" msgid "Delivery error" msgstr "Помилка доставки" @@ -836,7 +841,7 @@ msgstr "Увага! Це повідомлення та будь-яка відп msgid "" "Don't want to address your message to {{person_or_body}}? You can also " "write to:" -msgstr "" +msgstr "Не хочете надсилати повідомлення на адресу {{person_or_body}}? Ви можете також написати за цією адресою:" msgid "Done" msgstr "Зроблено" @@ -901,10 +906,10 @@ msgid "Environmental Information Regulations requests made using this site" msgstr "" msgid "Event history" -msgstr "" +msgstr "Історія" msgid "Event history details" -msgstr "" +msgstr "Історія (деталі)" msgid "" "Everything that you enter on this page \n" @@ -940,16 +945,16 @@ msgid "FOI" msgstr "" msgid "FOI email address for {{public_body}}" -msgstr "" +msgstr "Електронна адреса розпорядника '{public_body}}'" msgid "FOI requests" -msgstr "" +msgstr "Інформаційні запити" msgid "FOI requests by '{{user_name}}'" -msgstr "" +msgstr "Інформаційні запити користувача '{{user_name}}'" msgid "FOI requests {{start_count}} to {{end_count}} of {{total_count}}" -msgstr "" +msgstr "Інформаційні запити від {{start_count}} по {{end_count}} з {{total_count}}" msgid "FOI response requires admin ({{reason}}) - {{title}}" msgstr "" @@ -1017,7 +1022,7 @@ msgid "Follow this authority" msgstr "Відслідковувати цього розпорядника інформації" msgid "Follow this link to see the request:" -msgstr "" +msgstr "Пройдіть за посиланням, щоб побачити запит:" msgid "Follow this person" msgstr "Відслідковувати цю людину" @@ -1026,19 +1031,19 @@ msgid "Follow this request" msgstr "Відслідковувати цей запит" msgid "Follow up" -msgstr "" +msgstr "Додатковий запит" msgid "Follow up message sent by requester" msgstr "" msgid "Follow up messages to existing requests are sent to " -msgstr "" +msgstr "Додаткові запити щодо наявних запитів відіслано до " 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 "" +msgstr "Надсилання додаткових запитів та нових відповідей на цей запит припинено, щоб попередити спам. Будь ласка, <a href=\"{{url}}\">зверніться до нас</a> якщо ви {{user_link}} і хочете надіслати додатковий запит." msgid "Follow us on twitter" msgstr "" @@ -1056,8 +1061,11 @@ msgstr "З невідомих причин, зробити запит до ць msgid "Forgotten your password?" msgstr "Забули пароль?" -msgid "Found {{count}} public bodies {{description}}" -msgstr "" +msgid "Found %d public authority %s" +msgid_plural "Found %d public authorities %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" msgid "Freedom of Information" msgstr "" @@ -1068,7 +1076,7 @@ msgstr "" msgid "" "Freedom of Information law does not apply to this authority, so you cannot make\n" " a request to it." -msgstr "" +msgstr "Ви не можете зробити запит до цього органу влади, оскільки до нього не застосовується\nзаконодавство про доступ до інформації." msgid "Freedom of Information law no longer applies to" msgstr "" @@ -1076,7 +1084,7 @@ msgstr "" msgid "" "Freedom of Information law no longer applies to this authority.Follow up " "messages to existing requests are sent to " -msgstr "" +msgstr "Законодавство про доступ до інформації більше не застосовне до цього органу влади.Уточнення щодо існуючих запитів надіслані до: " msgid "Freedom of Information requests made" msgstr "Запити зроблені" @@ -1139,7 +1147,7 @@ msgid "" " 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 "" +msgstr "Нам потрібна ваша допомога. Автор цього запиту не повідомив, чи\n був цей запит успішним. Чи не могли б ви приділити трохи часу,\n щоб прочитати його і допомогти нам у впорядкуванні цього сайту?\n Спасибі." msgid "Holiday" msgstr "" @@ -1165,33 +1173,33 @@ msgid "Human health and safety" msgstr "" msgid "I am asking for <strong>new information</strong>" -msgstr "" +msgstr "Я прошу <strong>нову інформацію</strong>" msgid "I am requesting an <strong>internal review</strong>" -msgstr "" +msgstr "Я прошу про <strong>внутрішню перевірку</strong>" msgid "I don't like these ones — give me some more!" -msgstr "" +msgstr "Ці мені не подобаються — дайте якихось інших!" msgid "I don't want to do any more tidying now!" -msgstr "" +msgstr "Я більше не хочу займатися впорядковуванням" msgid "I like this request" msgstr "Мені подобається цей запит" msgid "I would like to <strong>withdraw this request</strong>" -msgstr "Мені б хотілося <strong>усунути цей запит</strong>" +msgstr "Мені б хотілося <strong>відмовитись від цього запиту</strong>" msgid "" "I'm still <strong>waiting</strong> for my information\n" " <small>(maybe you got an acknowledgement)</small>" -msgstr "" +msgstr "Я все ще чекаю на відповідь" msgid "I'm still <strong>waiting</strong> for the internal review" -msgstr "" +msgstr "Я все ще <strong>чекаю</strong> на внутрішню перевірку" msgid "I'm waiting for an <strong>internal review</strong> response" -msgstr "" +msgstr "Я чекаю на відповідь щодо <strong>внутрішньої перевірки</strong>" msgid "I've been asked to <strong>clarify</strong> my request" msgstr "Мене попросили <strong>уточнити</strong> мій запит" @@ -1233,16 +1241,21 @@ msgstr "Якщо ви автор запиту, ви можете <a href=\"%s\"> msgid "" "If you are thinking of using a pseudonym,\n" " please <a href=\"%s\">read this first</a>." -msgstr "" +msgstr "Якщо ви збираєтесь використати псевдонім,\n <a href=\"%s\">прочитайте спершу це</a>." msgid "If you are {{user_link}}, please" +msgstr "Якщо ви {{user_link}}, будь ласка" + +msgid "" +"If you believe this request is not suitable, you can report it for attention" +" by the site administrators" msgstr "" 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 "" +msgstr "Якщо ви не можете перейти за посиланням в листі,<strong>виділіть і скопіюйте\nйого</strong> в рядок адреси в браузері." msgid "" "If you can, scan in or photograph the response, and <strong>send us\n" @@ -1263,6 +1276,11 @@ 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 "Якщо ви ще цього не зробили, напишіть, будь ласка, розпоряднику інформації повідомлення (нижче), про те, що ви відмовились від запиту. Інакше вони не знатимуть, що відповідати на нього вже не потрібно." + +msgid "" +"If you reply to this message it will go directly to {{user_name}}, who will\n" +"learn your email address. Only reply if that is okay." msgstr "" msgid "" @@ -1316,6 +1334,9 @@ msgstr "" msgid "IncomingMessage|Valid to reply to" msgstr "" +msgid "Individual requests" +msgstr "" + msgid "Info request" msgstr "" @@ -1349,6 +1370,9 @@ msgstr "" msgid "InfoRequest|Awaiting description" msgstr "" +msgid "InfoRequest|Comments allowed" +msgstr "" + msgid "InfoRequest|Described state" msgstr "" @@ -1412,7 +1436,7 @@ msgstr "Користувач долучився до {{site_name}} у" msgid "" "Keep it <strong>focused</strong>, you'll be more likely to get what you want" " (<a href=\"%s\">why?</a>)." -msgstr "" +msgstr "Конкретизуйте ваш запит, так ви маєте більше шансів отримати потрібну інформацію (<a href=\"%s\">чому?</a>)." msgid "Keywords" msgstr "Ключові слова" @@ -1473,6 +1497,9 @@ msgstr "Надсилайте та переглядайте інформацій msgid "Make your own request" msgstr "Зробіть власний запит" +msgid "Many requests" +msgstr "" + msgid "Message" msgstr "Повідомлення" @@ -1485,6 +1512,9 @@ msgstr "" msgid "More about this authority" msgstr "Більше про цього розпорядника інформації" +msgid "More requests..." +msgstr "" + msgid "More similar requests" msgstr "Більше подібних запитів" @@ -1566,7 +1596,7 @@ msgid "None found." msgstr "Нічого не знайдено." msgid "None made." -msgstr "Не зроблено жодного." +msgstr "Не зроблено жодної." msgid "" "Note that the requester will not be notified about your annotation, because " @@ -1577,7 +1607,7 @@ msgid "Now check your email!" msgstr "Тепер перевірте вашу пошту!" msgid "Now preview your annotation" -msgstr "Попередній перегляд анотації" +msgstr "Попередній перегляд коментаря" msgid "Now preview your follow up" msgstr "" @@ -1589,7 +1619,7 @@ msgid "OR remove the existing photo" msgstr "АБО видалити існуюче фото" msgid "Offensive? Unsuitable?" -msgstr "" +msgstr "Образливо? Недоречно?" msgid "" "Oh no! Sorry to hear that your request was refused. Here is what to do now." @@ -1673,6 +1703,9 @@ msgstr "Пароль (ще раз):" msgid "Paste this link into emails, tweets, and anywhere else:" msgstr "Ви можете вставити цей лінк в листи, твіти чи куди захочете:" +msgid "People" +msgstr "" + msgid "People {{start_count}} to {{end_count}} of {{total_count}}" msgstr "" @@ -1708,7 +1741,7 @@ msgid "" "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 "" +msgstr "Будь ласка, включайте в своє повідомлення <strong>тільки</strong> інформацію,що безпосередньо стосується запиту {{request_link}}. Якщо вам потрібна інформація, що не була включена в початковий запит, <a href=\"{{new_request_link}}\">зробіть новий</a>." msgid "Please ask for environmental information only" msgstr "" @@ -1832,7 +1865,7 @@ msgid "Please type a message and/or choose a file containing your response." msgstr "Будь ласка, введіть повідомлення або оберіть файл, що містить вашу відповідь." msgid "Please use the form below to tell us more." -msgstr "Скористайтесь формою внизу, щоб повідомити нам більше" +msgstr "Скористайтесь формою внизу, щоб написати нам" msgid "Please use this email address for all replies to this request:" msgstr "Будь ласка, використовуйте цю електронну адресу для всіх відповідей на цей запит." @@ -1848,12 +1881,12 @@ msgstr "" msgid "" "Please write your annotation using a mixture of capital and lower case " "letters. This makes it easier for others to read." -msgstr "Будь ласка, використовуйте у своїй анотації валикі та малі літери. Так її легше читати." +msgstr "Будь ласка, використовуйте у своєму коментарі валикі та малі літери. Так його легше читати." msgid "" "Please write your follow up message containing the necessary clarifications " "below." -msgstr "" +msgstr "Будь ласка, напишіть додаткового листа, що містить необхідні уточнення" msgid "" "Please write your message using a mixture of capital and lower case letters." @@ -1863,7 +1896,7 @@ msgstr "" msgid "" "Point to <strong>related information</strong>, campaigns or forums which may" " be useful." -msgstr "" +msgstr "Вкажіть на дотичну інформацію, корисні форуми, кампанії тощо." msgid "Possibly related requests:" msgstr "" @@ -1908,7 +1941,7 @@ msgid "Preview new annotation on '{{info_request_title}}'" msgstr "" msgid "Preview your annotation" -msgstr "Попередній перегляд анотації" +msgstr "Попередній перегляд коментаря" msgid "Preview your message" msgstr "Попередній перегляд повідомлення" @@ -2022,7 +2055,7 @@ msgid "RSS feed of updates" msgstr "Стрічка або оновлення RSS" msgid "Re-edit this annotation" -msgstr "Відредагуйте цю анотацію" +msgstr "Відредагуйте цей коментар" msgid "Re-edit this message" msgstr "Відредагуйте це повідомлення" @@ -2047,25 +2080,25 @@ msgstr "Відмовлено" msgid "" "Remember me</label> (keeps you signed in longer;\n" " do not use on a public computer) " -msgstr "" +msgstr "Запам’ятати мене</label> (не використовуйте на \nкомп’ютерах загального користування) " msgid "Report abuse" -msgstr "" +msgstr "Повідомте про зловживання" msgid "Report an offensive or unsuitable request" -msgstr "" +msgstr "Повідомте про образливий або недоречний запит" msgid "Report this request" -msgstr "" +msgstr "Повідомити" msgid "Reported for administrator attention." msgstr "" msgid "Request an internal review" -msgstr "" +msgstr "Зробити запит на внутрішню перевірку" msgid "Request an internal review from {{person_or_body}}" -msgstr "" +msgstr "Зробити запит на внутрішню перевірку від {{person_or_body}}" msgid "Request has been removed" msgstr "Запит було видалено" @@ -2089,7 +2122,7 @@ msgstr "" msgid "" "Requests for personal information and vexatious requests are not considered " "valid for FOI purposes (<a href=\"/help/about\">read more</a>)." -msgstr "" +msgstr "Запити про особисту інформацію або беззмістовні запити відповідають принципам цього сайту (<a href=\"/help/about\">читати більше</a>)" msgid "Requests or responses matching your saved search" msgstr "" @@ -2116,7 +2149,7 @@ msgid "Response to '{{title}}'" msgstr "Відповідь на '{{title}}'" msgid "Response to this request is <strong>delayed</strong>." -msgstr "Відповідь на цей запит затримується" +msgstr "Відповідь на цей запит затримується. " msgid "Response to this request is <strong>long overdue</strong>." msgstr "Відповідь на цей запит прострочена" @@ -2143,7 +2176,7 @@ msgid "Search Freedom of Information requests, public authorities and users" msgstr "Пошук запитів, розпорядників інформації та користувачів" msgid "Search contributions by this person" -msgstr "" +msgstr "Шукати зроблене цим користувачем" msgid "Search for words in:" msgstr "" @@ -2157,6 +2190,9 @@ msgid "" " <strong>{{number_of_authorities}} authorities</strong>" msgstr "" +msgid "Search queries" +msgstr "" + msgid "Search results" msgstr "Результати пошуку" @@ -2179,16 +2215,16 @@ msgid "Select the authority to write to" msgstr "Оберіть розпорядника інформації, якому хочете написати" msgid "Send a followup" -msgstr "" +msgstr "Надішліть додатковий запит" msgid "Send a message to " -msgstr "Надіслати повідомлення до" +msgstr "Надіслати повідомлення до " msgid "Send a public follow up message to {{person_or_body}}" -msgstr "" +msgstr "Надішліть публічний уточнювальний запит" msgid "Send a public reply to {{person_or_body}}" -msgstr "" +msgstr "Надіслати публічну відповідь. Адресат: {{person_or_body}}" msgid "Send follow up to '{{title}}'" msgstr "" @@ -2197,7 +2233,7 @@ msgid "Send message" msgstr "Надіслати повідомлення" msgid "Send message to " -msgstr "Надіслати повідомлення до" +msgstr "Надіслати повідомлення до " msgid "Send request" msgstr "Надіслати запит" @@ -2254,6 +2290,9 @@ msgstr "" msgid "Somebody added a note to your FOI request - " msgstr "" +msgid "Someone has updated the status of your request" +msgstr "" + msgid "" "Someone, perhaps you, just tried to change their email address on\n" "{{site_name}} from {{old_email}} to {{new_email}}." @@ -2301,7 +2340,7 @@ msgid "Submit" msgstr "Відправити" msgid "Submit status" -msgstr "" +msgstr "Оновити статус" msgid "Subscribe to blog" msgstr "" @@ -2315,7 +2354,7 @@ msgstr "Успішно." msgid "" "Suggest how the requester can find the <strong>rest of the " "information</strong>." -msgstr "" +msgstr "Підкажіть, де автор запиту може знайти <strong>більше інформації</strong>." msgid "Summary:" msgstr "" @@ -2339,7 +2378,7 @@ msgid "Thank you for helping us keep the site tidy!" msgstr "" msgid "Thank you for making an annotation!" -msgstr "Дякуємо, що зробили анотацію" +msgstr "Дякуємо, що додали коментар" msgid "" "Thank you for responding to this FOI request! Your response has been " @@ -2511,10 +2550,10 @@ msgid "Then you can send a message to " msgstr "" msgid "Then you can sign in to {{site_name}}" -msgstr "" +msgstr "Далі ви можете увійти на сайт" msgid "Then you can update the status of your request to " -msgstr "" +msgstr "Далі ви можете змінити статус свого запиту на " msgid "Then you can upload an FOI response. " msgstr "" @@ -2567,9 +2606,9 @@ msgstr "" msgid "There is %d person following this request" msgid_plural "There are %d people following this request" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "Цей запит ніхто не відслідковує" +msgstr[1] "Цей запит відслідковує 1 людина" +msgstr[2] "Цей запит відслідковує така кількість людей: %d" msgid "" "There is <strong>more than one person</strong> who uses this site and has this name.\n" @@ -2604,7 +2643,7 @@ msgstr "Вони збираються відповісти поштою." msgid "" "They do <strong>not have</strong> the information <small>(maybe they say who" " does)</small>" -msgstr "" +msgstr "У них немає інформації <small>(але, можливо, підказують, в кого її можна отримати)</small>" msgid "They have been given the following explanation:" msgstr "Вони надали таке пояснення:" @@ -2668,7 +2707,7 @@ msgid "" msgstr "" msgid "This particular request is finished:" -msgstr "" +msgstr "Переписка щодо цього запиту завершена:" msgid "" "This person has made no Freedom of Information requests using this site." @@ -2682,37 +2721,37 @@ msgstr[2] "Ця людина має %d запитів (запити)" msgid "This person's %d annotation" msgid_plural "This person's %d annotations" -msgstr[0] "Ця людина має %d анотацій" -msgstr[1] "Ця людина має %d анотацію" -msgstr[2] "Ця людина має %d анотації" +msgstr[0] "Ця людина має %d коментарів" +msgstr[1] "Ця людина має %d коментар" +msgstr[2] "Ця людина має %d коментарів" msgid "This person's annotations" -msgstr "Анотації цієї людини" +msgstr "Коментарі цієї людини" msgid "This request <strong>requires administrator attention</strong>" -msgstr "" +msgstr "Цей запит потребує уваги адміністрації сайту" msgid "This request has already been reported for administrator attention" -msgstr "" +msgstr "Про цей запит вже було повідомлено адміністрації сайту" msgid "This request has an <strong>unknown status</strong>." -msgstr "" +msgstr "Статус цього запиту невідомий." msgid "" "This request has been <strong>hidden</strong> from the site, because an " "administrator considers it not to be an FOI request" -msgstr "" +msgstr "Цей запит було приховано, оскільки адміністратори сайту вирішили, що він не є запитом щодо публічної інформації" msgid "" "This request has been <strong>hidden</strong> from the site, because an " "administrator considers it vexatious" -msgstr "" +msgstr "Цей запит було приховано, оскільки адміністратори сайту вирішили, що він є недоречним" msgid "" "This request has been <strong>reported</strong> as needing administrator " "attention (perhaps because it is vexatious, or a request for personal " "information)" -msgstr "" +msgstr "Про цей запит було повідомлено адміністраторам (оскільки він порушує правила сайту)" msgid "" "This request has been <strong>withdrawn</strong> by the person who made it.\n" @@ -2749,7 +2788,7 @@ msgid "" msgstr "" msgid "This request is still in progress:" -msgstr "" +msgstr "Переписка з розпорядником інформації триває:" msgid "This request was not made via {{site_name}}" msgstr "" @@ -2823,7 +2862,7 @@ msgstr "" 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 "" +msgstr "Для впорядкування сайту хтось інший змінив статус вашого запиту {{title}} на \"{{display_status}}\". Якщо ви не погоджуєтесь з таким рішенням, змініть статус ще раз самостійно на більш підходящий. " msgid "" "To let everyone know, follow this link and then select the appropriate box." @@ -2871,10 +2910,10 @@ msgid "" msgstr "" msgid "To view the response, click on the link below." -msgstr "" +msgstr "Щоб ознайомитись із відповіддю, натисність посилання нижче." msgid "To {{public_body_link_absolute}}" -msgstr "" +msgstr "До {{public_body_link_absolute}}" msgid "To:" msgstr "Кому:" @@ -2949,13 +2988,19 @@ msgstr "" msgid "Unknown" msgstr "" +msgid "Unsubscribe" +msgstr "" + msgid "Unusual response." msgstr "" msgid "Update the status of this request" -msgstr "" +msgstr "Оновіть статус цього запиту" msgid "Update the status of your request to " +msgstr "Змініть статус цього запиту на: " + +msgid "Upload FOI response" msgstr "" msgid "" @@ -3088,12 +3133,12 @@ msgstr "" msgid "" "We will not reveal your email address to anybody unless you\n" "or the law tell us to." -msgstr "" +msgstr "Ми не передамо вашу адресу нікому, якщо нас до цього не спонукаєте\nви або законодавство." 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 "" +msgstr "Ми не передамо вашу адресу нікому, якщо нас до цього не спонукаєте\nви або законодавство (<a href=\"%s\">деталі</a>)." msgid "" "We will not reveal your email addresses to anybody unless you\n" @@ -3122,18 +3167,21 @@ msgid "" msgstr "" msgid "What are you doing?" -msgstr "Що ви робите?" +msgstr "Що саме ви робите?" msgid "What best describes the status of this request now?" -msgstr "" +msgstr "Яким є стан цього запиту зараз?" msgid "What information has been released?" msgstr "Яку інформацію було оприлюднено?" +msgid "What information has been requested?" +msgstr "" + msgid "" "When you get there, please update the status to say if the response \n" "contains any useful information." -msgstr "" +msgstr "Після ознайомлення із відповіддю, оновіть, будь ласка, статус запиту \n залежно від того, чи був він для вас корисним." msgid "" "When you receive the paper response, please help\n" @@ -3146,13 +3194,13 @@ msgid "" msgstr "" msgid "Which of these is happening?" -msgstr "" +msgstr "Що відбувається?" msgid "Who can I request information from?" msgstr "" msgid "Withdrawn by the requester." -msgstr "" +msgstr "Автор запиту відмовився від нього." msgid "Wk" msgstr "" @@ -3161,10 +3209,10 @@ msgid "Would you like to see a website like this in your country?" msgstr "" msgid "Write a reply" -msgstr "" +msgstr "Напишіть відповідь" msgid "Write a reply to " -msgstr "" +msgstr "Напишіть відповідь " msgid "Write your FOI follow up message to " msgstr "" @@ -3188,7 +3236,7 @@ msgid "You are already following this person" msgstr "" msgid "You are already following this request" -msgstr "" +msgstr "Ви вже відслідковуєте цей запит" msgid "You are already following updates about {{track_description}}" msgstr "" @@ -3227,7 +3275,7 @@ msgid "" msgstr "" msgid "You have a new response to the {{law_used_full}} request " -msgstr "" +msgstr "Ви отримали нову відповідь на свій запит" msgid "" "You have found a bug. Please <a href=\"{{contact_url}}\">contact us</a> to " @@ -3280,16 +3328,16 @@ msgid "" msgstr "" msgid "You need to be logged in to change the text about you on your profile." -msgstr "" +msgstr "Ви маєте увійти в систему, щоб мати можливість змінити інформацію про себе в профілі." msgid "You need to be logged in to change your profile photo." -msgstr "" +msgstr "Ви маєте увійти в систему, щоб мати можливість змінити фото в профілі." msgid "You need to be logged in to clear your profile photo." msgstr "" msgid "You need to be logged in to edit your profile." -msgstr "" +msgstr "Ви маєте увійти в систему, щоб мати можливість редагувати свій профіль." msgid "" "You previously submitted that exact follow up message for this request." @@ -3352,18 +3400,17 @@ msgid "" " 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 "" +msgstr "Ваше <strong>ім’я з’явиться в публічному доступі</strong> \n (<a href=\"%s\">чому?</a>)\n на цьому сайті та в пошукових системах. Якщо ви\n збираєтесь використати псевдонім, \n <a href=\"%s\">прочитайте спершу це</a>." msgid "Your annotations" -msgstr "Ваші анотації" +msgstr "Ваші коментарі" 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." +"Your details, including your email address, have not been given to anyone." msgstr "" msgid "Your e-mail:" -msgstr "Ваша електронна адреса:" +msgstr "Електронна адреса:" msgid "" "Your follow up has not been sent because this request has been stopped to " @@ -3372,33 +3419,33 @@ msgid "" msgstr "" msgid "Your follow up message has been sent on its way." -msgstr "" +msgstr "Ваш додатковий лист надіслано." msgid "Your internal review request has been sent on its way." -msgstr "" +msgstr "Ваш запит про внутрішню перевірку було відправлено." msgid "" "Your message has been sent. Thank you for getting in touch! We'll get back " "to you soon." -msgstr "" +msgstr "Спасибі, ваше повідомлення було відправлене. Ми скоро з вами зв’яжемось." msgid "Your message to {{recipient_user_name}} has been sent" -msgstr "" +msgstr "Ваше повідомлення було відправлено!" msgid "Your message to {{recipient_user_name}} has been sent!" -msgstr "" +msgstr "Ваше повідомлення було відправлено!" msgid "Your message will appear in <strong>search engines</strong>" -msgstr "" +msgstr "Ваше повідомлення з’явиться в пошукових системах" msgid "" "Your name and annotation will appear in <strong>search engines</strong>." -msgstr "" +msgstr "Ваше ім’я та коментарі з’являться у <strong>пошукових системах</strong>." msgid "" "Your name, request and any responses will appear in <strong>search engines</strong>\n" " (<a href=\"%s\">details</a>)." -msgstr "" +msgstr "Ваше ім’я, запит та будь-які відповіді з’являться в пошукових системах\n (<a href=\"%s\">деталі</a>)." msgid "Your name:" msgstr "Ваше ім’я:" @@ -3407,15 +3454,15 @@ msgid "Your original message is attached." msgstr "" msgid "Your password has been changed." -msgstr "" +msgstr "Ваш пароль було змінено." msgid "Your password:" -msgstr "" +msgstr "Ваш пароль:" msgid "" "Your photo will be shown in public <strong>on the Internet</strong>,\n" " wherever you do something on {{site_name}}." -msgstr "" +msgstr "Ваше фото з’явиться в загальному доступі в інтернеті." msgid "" "Your request was called {{info_request}}. Letting everyone know whether you " @@ -3425,6 +3472,9 @@ msgstr "" msgid "Your request:" msgstr "" +msgid "Your response to an FOI request was not delivered" +msgstr "" + msgid "" "Your response will <strong>appear on the Internet</strong>, <a " "href=\"%s\">read why</a> and answers to other questions." @@ -3468,7 +3518,7 @@ msgid "also called {{public_body_short_name}}" msgstr "" msgid "an anonymous user" -msgstr "" +msgstr "анонімний користувач" msgid "and" msgstr "і" @@ -3482,10 +3532,10 @@ msgid "and update the status." msgstr "" msgid "and we'll suggest <strong>what to do next</strong>" -msgstr "" +msgstr "і ми підкажемо, <strong>що робити далі</strong>" msgid "answered a request about" -msgstr "" +msgstr "надав(-ла) відповідь на запит про " msgid "any <a href=\"/list\">new requests</a>" msgstr "" @@ -3553,7 +3603,7 @@ msgid "external" msgstr "" msgid "has reported an" -msgstr "" +msgstr "повідомив про" msgid "have delayed." msgstr "" @@ -3565,37 +3615,37 @@ msgid "in term time" msgstr "" msgid "in the category ‘{{category_name}}’" -msgstr "" +msgstr "в категорії ‘{{category_name}}’" msgid "internal error" -msgstr "" +msgstr "внутрішня помилка" msgid "internal reviews" -msgstr "" +msgstr "внутрішні перевірки" msgid "is <strong>waiting for your clarification</strong>." -msgstr "" +msgstr "чекає на <strong>уточнення або роз’яснення</strong>." msgid "just to see how it works" msgstr "просто щоб побачити, як це працює" msgid "left an annotation" -msgstr "" +msgstr "залишив(-ла) коментар" msgid "made." -msgstr "" +msgstr "зроблено" msgid "matching the tag ‘{{tag_name}}’" msgstr "" msgid "messages from authorities" -msgstr "" +msgstr "повідомлення від органів влади" msgid "messages from users" -msgstr "" +msgstr "повідомлення від користувачів" msgid "no later than" -msgstr "" +msgstr "не пізніше, ніж" msgid "" "no longer exists. If you are trying to make\n" @@ -3608,16 +3658,16 @@ msgid "normally" msgstr "" msgid "please sign in as " -msgstr "" +msgstr "будь ласка, увійдіть як " msgid "requesting an internal review" -msgstr "" +msgstr "прошу про внутрішню перевірку" msgid "requests" -msgstr "" +msgstr "запити" msgid "requests which are {{list_of_statuses}}" -msgstr "" +msgstr "такі запити: {{list_of_statuses}}" msgid "" "response as needing administrator attention. Take a look, and reply to this\n" @@ -3640,43 +3690,43 @@ msgid "simple_date_format" msgstr "" msgid "successful" -msgstr "" +msgstr "успішні" msgid "successful requests" msgstr "успішні запити" msgid "that you made to" -msgstr "" +msgstr "зроблений вам до такого розпорядника інформації:" msgid "the main FOI contact address for {{public_body}}" -msgstr "" +msgstr "основна адреса для інформаційних запитів до розпорядника '{{public_body}}'" msgid "the main FOI contact at {{public_body}}" msgstr "" msgid "the requester" -msgstr "" +msgstr "автор запиту" msgid "the {{site_name}} team" -msgstr "" +msgstr "команда сайту {{site_name}}" msgid "to read" -msgstr "" +msgstr "прочитати" msgid "to send a follow up message." msgstr "" msgid "to {{public_body}}" -msgstr "" +msgstr "до {{public_body}}" msgid "unexpected prominence on request event" msgstr "" msgid "unknown reason " -msgstr "" +msgstr "невідома причина" msgid "unknown status " -msgstr "" +msgstr "невідомий статус " msgid "unresolved requests" msgstr "" @@ -3709,7 +3759,7 @@ msgid "" msgstr "" msgid "{{info_request_user_name}} only:" -msgstr "" +msgstr "Тільки {{info_request_user_name}}:" msgid "{{law_used_full}} request - {{title}}" msgstr "" @@ -3721,23 +3771,23 @@ msgid "{{law_used}} requests at {{public_body}}" msgstr "" msgid "{{length_of_time}} ago" -msgstr "" +msgstr "{{length_of_time}} тому" msgid "{{list_of_things}} matching text '{{search_query}}'" msgstr "" msgid "{{number_of_comments}} comments" -msgstr "" +msgstr "{{number_of_comments}} коментарів" msgid "{{public_body_name}} only:" -msgstr "" +msgstr "Тільки {{public_body_name}}:" msgid "" "{{public_body}} has asked you to explain part of your {{law_used}} request." -msgstr "" +msgstr "{{public_body}} попросив(-ла) пояснити дещо у вашому запиті." msgid "{{public_body}} sent a response to {{user_name}}" -msgstr "" +msgstr "{{public_body}} відповів(-ла) користувачу {{user_name}}" msgid "{{search_results}} matching '{{query}}'" msgstr "" @@ -3757,39 +3807,39 @@ msgstr "" msgid "" "{{site_name}} users have made {{number_of_requests}} requests, including:" -msgstr "" +msgstr "Користувачі сайту {{site_name}} зробили таку кількість запитів: {{number_of_requests}}, зокрема:" msgid "{{title}} - a Freedom of Information request to {{public_body}}" -msgstr "" +msgstr "{{title}} - запит до: {{public_body}}" msgid "{{user_name}} (Account suspended)" -msgstr "" +msgstr "{{user_name}} (дію акаунта припинено)" msgid "{{user_name}} - Freedom of Information requests" -msgstr "" +msgstr "{{user_name}} - запити" msgid "{{user_name}} - user profile" -msgstr "" +msgstr "{{user_name}} - профіль користувача" msgid "{{user_name}} added an annotation" -msgstr "" +msgstr "{{user_name}} залишив коментар" msgid "" "{{user_name}} has annotated your {{law_used_short}} \n" "request. Follow this link to see what they wrote." -msgstr "" +msgstr "{{user_name}} відкоментував ваш запит \nВи можете прочитати коментар за цим посиланням." msgid "{{user_name}} has used {{site_name}} to send you the message below." -msgstr "" +msgstr "{{user_name}} використав сайт {{site_name}}, щоб надіслати вам це повідомлення." msgid "{{user_name}} sent a follow up message to {{public_body}}" -msgstr "" +msgstr "{{user_name}} відправив додаткового листа до: {{public_body}}" msgid "{{user_name}} sent a request to {{public_body}}" -msgstr "" +msgstr "{{user_name}} відправив запит до: {{public_body}}" msgid "{{username}} left an annotation:" -msgstr "" +msgstr "{{username}} залишив коментар:" msgid "" "{{user}} ({{user_admin_link}}) made this {{law_used_full}} request (<a " @@ -3798,4 +3848,4 @@ msgid "" msgstr "" msgid "{{user}} made this {{law_used_full}} request" -msgstr "" +msgstr "{{user}} зробив цей запит" diff --git a/script/handle-mail-replies.rb b/script/handle-mail-replies.rb index eba6f44cf..d354a9266 100755 --- a/script/handle-mail-replies.rb +++ b/script/handle-mail-replies.rb @@ -15,6 +15,8 @@ $alaveteli_dir = File.expand_path(File.join(File.dirname(__FILE__), '..')) $:.push(File.join($alaveteli_dir, "commonlib", "rblib")) load "config.rb" +$:.push(File.join($alaveteli_dir, "lib")) +load "configuration.rb" MySociety::Config.set_file(File.join($alaveteli_dir, 'config', 'general'), true) MySociety::Config.load_default @@ -30,7 +32,7 @@ def main(in_test_mode) forward_on(raw_message) unless in_test_mode return 0 end - + pfas = permanently_failed_addresses(message) if !pfas.empty? if in_test_mode @@ -42,25 +44,25 @@ def main(in_test_mode) end return 1 end - + # If we are still here, there are no permanent failures, # so if the message is a multipart/report then it must be # reporting a temporary failure. In this case we discard it if message.content_type == "multipart/report" return 1 end - + # Another style of temporary failure message subject = message.header_string("Subject") if message.content_type == "multipart/mixed" && subject == "Delivery Status Notification (Delay)" return 1 end - + # Discard out-of-office messages if is_oof?(message) return 2 # Use a different return code, to distinguish OOFs from bounces end - + # Otherwise forward the message on forward_on(raw_message) unless in_test_mode return 0 @@ -70,7 +72,7 @@ end def permanently_failed_addresses(message) if message.header_string("Return-Path") == "<>" # Some sort of auto-response - + # Check for Exim’s X-Failed-Recipients header failed_recipients = message.header_string("X-Failed-Recipients") if !failed_recipients.nil? @@ -81,7 +83,7 @@ def permanently_failed_addresses(message) return failed_recipients.split(/,\s*/) end end - + # Next, look for multipart/report if message.content_type == "multipart/report" permanently_failed_recipients = [] @@ -89,7 +91,7 @@ def permanently_failed_addresses(message) if part.content_type == "message/delivery-status" sections = part.body.split(/\r?\n\r?\n/) # The first section is a generic header; subsequent sections - # represent a particular recipient. Since we + # represent a particular recipient. Since we sections[1..-1].each do |section| if section !~ /^Status: (\d)/ || $1 != '5' # Either we couldn’t find the Status field, or it was a transient failure @@ -106,7 +108,7 @@ def permanently_failed_addresses(message) end end end - + subject = message.header_string("Subject") # Then look for the style we’ve seen in WebShield bounces # (These do not have a return path of <> in the cases I have seen.) @@ -121,11 +123,11 @@ end def is_oof?(message) # Check for out-of-office - + if message.header_string("X-POST-MessageClass") == "9; Autoresponder" return true end - + subject = message.header_string("Subject").downcase if message.header_string("Return-Path") == "<>" if subject.start_with? "out of office: " @@ -135,13 +137,13 @@ def is_oof?(message) return true end end - + if message.header_string("Auto-Submitted") == "auto-generated" if subject =~ /out of( the)? office/ return true end end - + if subject.start_with? "out of office autoreply:" return true end @@ -158,8 +160,7 @@ def is_oof?(message) end def forward_on(raw_message) - forward_non_bounces_to = MySociety::Config.get("FORWARD_NONBOUNCE_RESPONSES_TO", "user-support@localhost") - IO.popen("/usr/sbin/sendmail -i #{forward_non_bounces_to}", "w") do |f| + IO.popen("/usr/sbin/sendmail -i #{Configuration::forward_nonbounce_responses_to}", "w") do |f| f.write(raw_message); f.close; end diff --git a/script/rails-post-deploy b/script/rails-post-deploy index 977805eb5..67752b0bc 100755 --- a/script/rails-post-deploy +++ b/script/rails-post-deploy @@ -7,9 +7,6 @@ # # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: rails-post-deploy,v 1.18 2009-09-03 23:44:50 francis Exp $ -# set -e #set -x # debug diff --git a/script/request-creation-graph b/script/request-creation-graph index 3b7741ee2..499e7371e 100755 --- a/script/request-creation-graph +++ b/script/request-creation-graph @@ -4,8 +4,6 @@ # # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org. WWW: http://www.mysociety.org/ -# -# $Id: request-creation-graph,v 1.9 2009-08-11 17:21:20 francis Exp $ GPLOT_OUTPUT="set terminal png font 'Vera.ttf' 9 size 1600,600" EXTENSION=".png" diff --git a/script/user-use-graph b/script/user-use-graph index 4e5876239..1cf409cb2 100755 --- a/script/user-use-graph +++ b/script/user-use-graph @@ -4,8 +4,6 @@ # # Copyright (c) 2009 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org. WWW: http://www.mysociety.org/ -# -# $Id: user-use-graph,v 1.1 2009-02-12 20:01:31 root Exp $ GPLOT_OUTPUT="set terminal png font 'Vera.ttf' 9 size 1200,400" EXTENSION=".png" diff --git a/spec/controllers/comment_controller_spec.rb b/spec/controllers/comment_controller_spec.rb index b71bc0aea..4a7acee23 100644 --- a/spec/controllers/comment_controller_spec.rb +++ b/spec/controllers/comment_controller_spec.rb @@ -53,6 +53,17 @@ describe CommentController, "when commenting on a request" do response.should render_template('new') end + + it "should not allow comments if comments are not allowed" do + session[:user_id] = users(:silly_name_user).id + + expect { + post :new, :url_title => info_requests(:spam_1_request).url_title, + :comment => { :body => "I demand to be heard!" }, + :type => 'request', :submitted_comment => 1, :preview => 0 + }.to raise_error("Comments are not allowed on this request") + + end describe 'when commenting on an external request' do diff --git a/spec/controllers/request_controller_spec.rb b/spec/controllers/request_controller_spec.rb index 95737a250..77f43b618 100644 --- a/spec/controllers/request_controller_spec.rb +++ b/spec/controllers/request_controller_spec.rb @@ -238,6 +238,22 @@ describe RequestController, "when showing one request" do response.should have_tag('div#owner_actions') end + describe 'when the request does allow comments' do + it 'should have a comment link' do + get :show, { :url_title => 'why_do_you_have_such_a_fancy_dog' }, + { :user_id => users(:admin_user).id } + response.should have_tag('#anyone_actions', /Add an annotation/) + end + end + + describe 'when the request does not allow comments' do + it 'should not have a comment link' do + get :show, { :url_title => 'spam_1' }, + { :user_id => users(:admin_user).id } + response.should_not have_tag('#anyone_actions', /Add an annotation/) + end + end + describe 'when the request is being viewed by an admin' do describe 'if the request is awaiting description' do diff --git a/spec/controllers/user_controller_spec.rb b/spec/controllers/user_controller_spec.rb index 32398c053..386d1b04b 100644 --- a/spec/controllers/user_controller_spec.rb +++ b/spec/controllers/user_controller_spec.rb @@ -337,7 +337,7 @@ describe UserController, "when sending another user a message" do deliveries = ActionMailer::Base.deliveries deliveries.size.should == 1 mail = deliveries[0] - mail.body.should include("Bob Smith has used #{MySociety::Config.get('SITE_NAME')} to send you the message below") + mail.body.should include("Bob Smith has used #{Configuration::site_name} to send you the message below") mail.body.should include("Just a test!") #mail.to_addrs.first.to_s.should == users(:silly_name_user).name_and_email # XXX fix some nastiness with quoting name_and_email mail.from_addrs.first.to_s.should == users(:bob_smith_user).name_and_email diff --git a/spec/fixtures/info_requests.yml b/spec/fixtures/info_requests.yml index 079a44cd0..9361ec486 100644 --- a/spec/fixtures/info_requests.yml +++ b/spec/fixtures/info_requests.yml @@ -8,6 +8,7 @@ fancy_dog_request: user_id: 1 described_state: waiting_response awaiting_description: true + comments_allowed: true idhash: 50929748 naughty_chicken_request: id: 103 @@ -19,6 +20,7 @@ naughty_chicken_request: user_id: 1 described_state: waiting_response awaiting_description: false + comments_allowed: true idhash: e8d18c84 badger_request: id: 104 @@ -30,6 +32,7 @@ badger_request: user_id: 1 described_state: waiting_response awaiting_description: false + comments_allowed: true idhash: e8d18c84 boring_request: id: 105 @@ -41,6 +44,7 @@ boring_request: user_id: 1 described_state: successful awaiting_description: false + comments_allowed: true idhash: 173fd003 another_boring_request: id: 106 @@ -52,6 +56,7 @@ another_boring_request: user_id: 1 described_state: successful awaiting_description: false + comments_allowed: true idhash: 173fd004 # A pair of identical requests (with url_title differing only in the numeric suffix) @@ -66,6 +71,7 @@ spam_1_request: user_id: 5 described_state: successful awaiting_description: false + comments_allowed: false idhash: 173fd005 spam_2_request: id: 108 @@ -77,6 +83,7 @@ spam_2_request: user_id: 5 described_state: successful awaiting_description: false + comments_allowed: true idhash: 173fd005 external_request: id: 109 @@ -87,6 +94,7 @@ external_request: public_body_id: 2 described_state: waiting_response awaiting_description: false + comments_allowed: true idhash: a1234567 anonymous_external_request: id: 110 @@ -97,4 +105,5 @@ anonymous_external_request: public_body_id: 2 described_state: waiting_response awaiting_description: false - idhash: 7654321a
\ No newline at end of file + comments_allowed: true + idhash: 7654321a diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po index 5c40446d8..91af9b72b 100644 --- a/spec/fixtures/locale/en/app.po +++ b/spec/fixtures/locale/en/app.po @@ -356,7 +356,7 @@ msgstr "" #: app/views/general/_advanced_search_tips.rhtml:16 msgid "" -"<strong><code>tag:charity</code></strong> to find all public bodies or requests with a given tag. You can include multiple tags, \n" +"<strong><code>tag:charity</code></strong> to find all public authorities 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 "" @@ -1098,7 +1098,7 @@ msgid "Forgotten your password?" msgstr "" #: app/views/public_body/list.rhtml:47 -msgid "Found {{count}} public bodies {{description}}" +msgid "Found {{count}} public authorities {{description}}" msgstr "" #: app/models/info_request.rb:257 diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po index 5c40446d8..91af9b72b 100644 --- a/spec/fixtures/locale/en_GB/app.po +++ b/spec/fixtures/locale/en_GB/app.po @@ -356,7 +356,7 @@ msgstr "" #: app/views/general/_advanced_search_tips.rhtml:16 msgid "" -"<strong><code>tag:charity</code></strong> to find all public bodies or requests with a given tag. You can include multiple tags, \n" +"<strong><code>tag:charity</code></strong> to find all public authorities 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 "" @@ -1098,7 +1098,7 @@ msgid "Forgotten your password?" msgstr "" #: app/views/public_body/list.rhtml:47 -msgid "Found {{count}} public bodies {{description}}" +msgid "Found {{count}} public authorities {{description}}" msgstr "" #: app/models/info_request.rb:257 diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po index dd8e10969..4e54a1d40 100644 --- a/spec/fixtures/locale/es/app.po +++ b/spec/fixtures/locale/es/app.po @@ -424,7 +424,7 @@ msgstr "<strong><code>status:</code></strong> para filtrar en función del estad #: app/views/general/_advanced_search_tips.rhtml:16 msgid "" -"<strong><code>tag:charity</code></strong> to find all public bodies or requests with a given tag. You can include multiple tags, \n" +"<strong><code>tag:charity</code></strong> to find all public authorities 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>tag:salud</code></strong> para buscar todos los organismos públicos o solicitudes con la etiqueta dada. Puedes incluir múltiples etiquetas, \n 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ñade <code>AND</code> explícitamente si sólo quiere resultados con todas ellas presentes." @@ -1221,7 +1221,7 @@ msgid "Forgotten your password?" msgstr "¿Has olvidado tu contraseña?" #: app/views/public_body/list.rhtml:47 -msgid "Found {{count}} public bodies {{description}}" +msgid "Found {{count}} public authorities {{description}}" msgstr "Encontrados {{count}} organismos públicos {{description}}" #: app/models/info_request.rb:257 diff --git a/spec/fixtures/theme_views/core/application_mailer/core_only.rhtml b/spec/fixtures/theme_views/core/application_mailer/core_only.rhtml new file mode 100644 index 000000000..53b7798ec --- /dev/null +++ b/spec/fixtures/theme_views/core/application_mailer/core_only.rhtml @@ -0,0 +1 @@ +Core only
\ No newline at end of file diff --git a/spec/fixtures/theme_views/core/application_mailer/multipart_core_only.rhtml b/spec/fixtures/theme_views/core/application_mailer/multipart_core_only.rhtml new file mode 100644 index 000000000..646a349f8 --- /dev/null +++ b/spec/fixtures/theme_views/core/application_mailer/multipart_core_only.rhtml @@ -0,0 +1 @@ +Core multipart
\ No newline at end of file diff --git a/spec/fixtures/theme_views/core/application_mailer/simple.rhtml b/spec/fixtures/theme_views/core/application_mailer/simple.rhtml new file mode 100644 index 000000000..a3937c940 --- /dev/null +++ b/spec/fixtures/theme_views/core/application_mailer/simple.rhtml @@ -0,0 +1 @@ +Core simple
\ No newline at end of file diff --git a/spec/fixtures/theme_views/theme_one/application_mailer/multipart_theme_only.rhtml b/spec/fixtures/theme_views/theme_one/application_mailer/multipart_theme_only.rhtml new file mode 100644 index 000000000..d6423fbb4 --- /dev/null +++ b/spec/fixtures/theme_views/theme_one/application_mailer/multipart_theme_only.rhtml @@ -0,0 +1 @@ +Theme multipart
\ No newline at end of file diff --git a/spec/fixtures/theme_views/theme_one/application_mailer/simple.rhtml b/spec/fixtures/theme_views/theme_one/application_mailer/simple.rhtml new file mode 100644 index 000000000..ad43e0c87 --- /dev/null +++ b/spec/fixtures/theme_views/theme_one/application_mailer/simple.rhtml @@ -0,0 +1 @@ +Theme simple
\ No newline at end of file diff --git a/spec/fixtures/theme_views/theme_one/application_mailer/theme_only.rhtml b/spec/fixtures/theme_views/theme_one/application_mailer/theme_only.rhtml new file mode 100644 index 000000000..865445815 --- /dev/null +++ b/spec/fixtures/theme_views/theme_one/application_mailer/theme_only.rhtml @@ -0,0 +1 @@ +Theme only
\ No newline at end of file diff --git a/spec/helpers/link_to_helper_spec.rb b/spec/helpers/link_to_helper_spec.rb index 9ec0afce1..ef89e8bf9 100644 --- a/spec/helpers/link_to_helper_spec.rb +++ b/spec/helpers/link_to_helper_spec.rb @@ -48,4 +48,29 @@ describe LinkToHelper do end + describe 'admin_url' do + context 'with no ADMIN_BASE_URL set' do + it 'should prepend the admin general index path to a simple string' do + admin_url('unclassified').should == 'http://test.host/en/admin/unclassified' + end + + it 'should prepend the admin general index path to a deeper URL' do + admin_url('request/show/123').should == 'http://test.host/en/admin/request/show/123' + end + end + + context 'with ADMIN_BASE_URL set' do + before(:each) do + Configuration::should_receive(:admin_base_url).and_return('https://www.example.com/secure/alaveteli-admin/') + end + + it 'should prepend the admin base URL to a simple string' do + admin_url('unclassified').should == 'https://www.example.com/secure/alaveteli-admin/unclassified' + end + + it 'should prepend the admin base URL to a deeper URL' do + admin_url('request/show/123').should == 'https://www.example.com/secure/alaveteli-admin/request/show/123' + end + end + end end diff --git a/spec/integration/admin_spec.rb b/spec/integration/admin_spec.rb index caf741749..e148ea3ca 100644 --- a/spec/integration/admin_spec.rb +++ b/spec/integration/admin_spec.rb @@ -12,10 +12,8 @@ describe "When administering the site" do response.should be_success # Now fetch the "log in as" link to log in as Bob - admin_username = MySociety::Config.get('ADMIN_USERNAME') - admin_password = MySociety::Config.get('ADMIN_PASSWORD') get_via_redirect "/admin/user/login_as/#{users(:bob_smith_user).id}", nil, { - "Authorization" => "Basic " + Base64.encode64("#{admin_username}:#{admin_password}").strip + "Authorization" => "Basic " + Base64.encode64("#{Configuration::admin_username}:#{Configuration::admin_password}").strip } response.should be_success session[:user_id].should == users(:bob_smith_user).id diff --git a/spec/models/application_mailer_spec.rb b/spec/models/application_mailer_spec.rb index 12527c6e8..a90f79c01 100644 --- a/spec/models/application_mailer_spec.rb +++ b/spec/models/application_mailer_spec.rb @@ -1,8 +1,160 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') -describe ApplicationMailer, " when blah" do - before do + +describe ApplicationMailer do + + context 'when using plugins' do + + def set_base_views + ApplicationMailer.class_eval do + @previous_view_paths = self.view_paths.dup + self.view_paths.clear + self.view_paths << File.join(Rails.root, 'spec', 'fixtures', 'theme_views', 'core') + end + end + + def add_mail_methods(method_names) + method_names.each{ |method_name| ApplicationMailer.send(:define_method, method_name){} } + end + + def remove_mail_methods(method_names) + method_names.each do |method_name| + if ApplicationMailer.respond_to?(method_name) + ApplicationMailer.send(:remove_method, method_name) + end + end + end + + def prepend_theme_views(theme_name) + ApplicationMailer.class_eval do + view_paths.unshift File.join(Rails.root, 'spec', 'fixtures', 'theme_views', theme_name) + end + end + + def append_theme_views(theme_name) + ApplicationMailer.class_eval do + view_paths << File.join(Rails.root, 'spec', 'fixtures', 'theme_views', theme_name) + end + end + + def reset_views + ApplicationMailer.class_eval do + self.view_paths = @previous_view_paths + end + end + + def create_multipart_method(method_name) + ApplicationMailer.send(:define_method, method_name) do + attachment :content_type => 'message/rfc822', + :body => 'xxx', + :filename => "original.eml", + :transfer_encoding => '7bit', + :content_disposition => 'inline' + end + end + + before do + set_base_views + add_mail_methods(['simple', 'theme_only', 'core_only', 'neither']) + end + + describe 'when a plugin prepends its mail templates to the view paths' do + + it 'should render a theme template in preference to a core template' do + prepend_theme_views('theme_one') + @mail = ApplicationMailer.create_simple() + @mail.body.should match('Theme simple') + end + + it 'should render the template provided by the theme if no template is available in core' do + prepend_theme_views('theme_one') + @mail = ApplicationMailer.create_theme_only() + @mail.body.should match('Theme only') + end + + it 'should render the template provided by core if there is no theme template' do + prepend_theme_views('theme_one') + @mail = ApplicationMailer.create_core_only() + @mail.body.should match('Core only') + end + + it 'should raise an error if the template is in neither core nor theme' do + prepend_theme_views('theme_one') + lambda{ ApplicationMailer.create_neither() }.should raise_error('Missing template application_mailer/neither.erb in view path spec/fixtures/theme_views/theme_one:spec/fixtures/theme_views/core') + end + + it 'should render a multipart email using a theme template' do + prepend_theme_views('theme_one') + create_multipart_method('multipart_theme_only') + @mail = ApplicationMailer.create_multipart_theme_only() + @mail.parts.size.should == 2 + message_part = @mail.parts[0].to_s + message_part.should match("Theme multipart") + end + + it 'should render a multipart email using a core template' do + prepend_theme_views('theme_one') + create_multipart_method('multipart_core_only') + @mail = ApplicationMailer.create_multipart_core_only() + @mail.parts.size.should == 2 + message_part = @mail.parts[0].to_s + message_part.should match("Core multipart") + end + + end + + describe 'when a plugin appends its mail templates to the view paths' do + + it 'should render a core template in preference to a theme template' do + append_theme_views('theme_one') + @mail = ApplicationMailer.create_simple() + @mail.body.should match('Core simple') + end + + it 'should render the template provided by the theme if no template is available in core' do + append_theme_views('theme_one') + @mail = ApplicationMailer.create_theme_only() + @mail.body.should match('Theme only') + end + + it 'should render the template provided by core if there is no theme template' do + append_theme_views('theme_one') + @mail = ApplicationMailer.create_core_only() + @mail.body.should match('Core only') + end + + it 'should raise an error if the template is in neither core nor theme' do + append_theme_views('theme_one') + lambda{ ApplicationMailer.create_neither() }.should raise_error('Missing template application_mailer/neither.erb in view path spec/fixtures/theme_views/core:spec/fixtures/theme_views/theme_one') + end + + it 'should render a multipart email using a core template' do + append_theme_views('theme_one') + create_multipart_method('multipart_core_only') + @mail = ApplicationMailer.create_multipart_core_only() + @mail.parts.size.should == 2 + message_part = @mail.parts[0].to_s + message_part.should match("Core multipart") + end + + it 'should render a multipart email using a theme template' do + append_theme_views('theme_one') + create_multipart_method('multipart_theme_only') + @mail = ApplicationMailer.create_multipart_theme_only() + @mail.parts.size.should == 2 + message_part = @mail.parts[0].to_s + message_part.should match("Theme multipart") + end + + end + + after do + reset_views + remove_mail_methods(['simple', 'theme_only', 'core_only', 'neither', 'multipart']) + end end + end + diff --git a/spec/models/customstates.rb b/spec/models/customstates.rb index 3488e6730..bffbe86fb 100644 --- a/spec/models/customstates.rb +++ b/spec/models/customstates.rb @@ -13,7 +13,7 @@ module InfoRequestCustomStates return 'deadline_extended' if Time.now.strftime("%Y-%m-%d") < self.date_deadline_extended.strftime("%Y-%m-%d") return 'waiting_response_very_overdue' if - Time.now.strftime("%Y-%m-%d") > Holiday.due_date_from(self.date_deadline_extended, 15).strftime("%Y-%m-%d") + Time.now.strftime("%Y-%m-%d") > Holiday.due_date_from_working_days(self.date_deadline_extended, 15).strftime("%Y-%m-%d") return 'waiting_response_overdue' end return 'waiting_response_very_overdue' if @@ -27,7 +27,7 @@ module InfoRequestCustomStates # XXX shouldn't this be 15 days after the date the status was # changed to "deadline extended"? Or perhaps 15 days ater the # initial request due date? - return Holiday.due_date_from(self.date_response_required_by, 15) + return Holiday.due_date_from_working_days(self.date_response_required_by, 15) end module ClassMethods diff --git a/spec/models/holiday_spec.rb b/spec/models/holiday_spec.rb index 00ebc7279..5d3f76d24 100644 --- a/spec/models/holiday_spec.rb +++ b/spec/models/holiday_spec.rb @@ -3,47 +3,84 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe Holiday, " when calculating due date" do def due_date(ymd) - return Holiday.due_date_from(Date.strptime(ymd), 20).strftime("%F") + return Holiday.due_date_from_working_days(Date.strptime(ymd), 20).strftime("%F") end - it "handles no holidays" do - due_date('2008-10-01').should == '2008-10-29' - end + context "in working days" do + it "handles no holidays" do + due_date('2008-10-01').should == '2008-10-29' + end - it "handles non leap years" do - due_date('2007-02-01').should == '2007-03-01' - end + it "handles non leap years" do + due_date('2007-02-01').should == '2007-03-01' + end - it "handles leap years" do - due_date('2008-02-01').should == '2008-02-29' - end + it "handles leap years" do + due_date('2008-02-01').should == '2008-02-29' + end - it "handles Thursday start" do - due_date('2009-03-12').should == '2009-04-14' - end + it "handles Thursday start" do + due_date('2009-03-12').should == '2009-04-14' + end - it "handles Friday start" do - due_date('2009-03-13').should == '2009-04-15' - end + it "handles Friday start" do + due_date('2009-03-13').should == '2009-04-15' + end - # Delivery at the weekend ends up the same due day as if it had arrived on - # the Friday before. This is because the next working day (Monday) counts - # as day 1. - # See http://www.whatdotheyknow.com/help/officers#days - it "handles Saturday start" do - due_date('2009-03-14').should == '2009-04-15' - end - it "handles Sunday start" do - due_date('2009-03-15').should == '2009-04-15' - end + # Delivery at the weekend ends up the same due day as if it had arrived on + # the Friday before. This is because the next working day (Monday) counts + # as day 1. + # See http://www.whatdotheyknow.com/help/officers#days + it "handles Saturday start" do + due_date('2009-03-14').should == '2009-04-15' + end + it "handles Sunday start" do + due_date('2009-03-15').should == '2009-04-15' + end - it "handles Monday start" do - due_date('2009-03-16').should == '2009-04-16' - end + it "handles Monday start" do + due_date('2009-03-16').should == '2009-04-16' + end - it "handles Time objects" do - Holiday.due_date_from(Time.utc(2009, 03, 16, 12, 0, 0), 20).strftime('%F').should == '2009-04-16' + it "handles Time objects" do + Holiday.due_date_from_working_days(Time.utc(2009, 03, 16, 12, 0, 0), 20).strftime('%F').should == '2009-04-16' + end end + context "in calendar days" do + it "handles no holidays" do + Holiday.due_date_from_calendar_days(Date.new(2008, 10, 1), 20).should == Date.new(2008, 10, 21) + end + + it "handles the due date falling on a Friday" do + Holiday.due_date_from_calendar_days(Date.new(2008, 10, 4), 20).should == Date.new(2008, 10, 24) + end + + # If the due date would fall on a Saturday it should in fact fall on the next day that isn't a weekend + # or a holiday + it "handles the due date falling on a Saturday" do + Holiday.due_date_from_calendar_days(Date.new(2008, 10, 5), 20).should == Date.new(2008, 10, 27) + end + + it "handles the due date falling on a Sunday" do + Holiday.due_date_from_calendar_days(Date.new(2008, 10, 6), 20).should == Date.new(2008, 10, 27) + end + + it "handles the due date falling on a Monday" do + Holiday.due_date_from_calendar_days(Date.new(2008, 10, 7), 20).should == Date.new(2008, 10, 27) + end + + it "handles the due date falling on a day before a Holiday" do + Holiday.due_date_from_calendar_days(Date.new(2008, 12, 4), 20).should == Date.new(2008, 12, 24) + end + + it "handles the due date falling on a Holiday" do + Holiday.due_date_from_calendar_days(Date.new(2008, 12, 5), 20).should == Date.new(2008, 12, 29) + end + + it "handles Time objects" do + Holiday.due_date_from_calendar_days(Time.utc(2009, 03, 17, 12, 0, 0), 20).should == Date.new(2009, 4, 6) + end + end end diff --git a/spec/models/incoming_message_spec.rb b/spec/models/incoming_message_spec.rb index a00e85fbc..cf84b4595 100644 --- a/spec/models/incoming_message_spec.rb +++ b/spec/models/incoming_message_spec.rb @@ -322,8 +322,7 @@ describe IncomingMessage, " when censoring data" do end it "should apply hard-coded privacy rules to HTML files" do - domain = MySociety::Config.get('DOMAIN') - data = "http://#{domain}/c/cheese" + data = "http://#{Configuration::domain}/c/cheese" @im.html_mask_stuff!(data) data.should == "[WDTK login link]" end diff --git a/spec/models/public_body_spec.rb b/spec/models/public_body_spec.rb index 011824190..c2e0a6353 100644 --- a/spec/models/public_body_spec.rb +++ b/spec/models/public_body_spec.rb @@ -453,3 +453,11 @@ describe PublicBody do end end + +describe PublicBody, " when override all public body request emails set" do + it "should return the overridden request email" do + MySociety::Config.should_receive(:get).with("OVERRIDE_ALL_PUBLIC_BODY_REQUEST_EMAILS", "").twice.and_return("catch_all_test_email@foo.com") + @geraldine = public_bodies(:geraldine_public_body) + @geraldine.request_email.should == "catch_all_test_email@foo.com" + end +end diff --git a/spec/models/request_mailer_spec.rb b/spec/models/request_mailer_spec.rb index 98681a9e9..906756784 100644 --- a/spec/models/request_mailer_spec.rb +++ b/spec/models/request_mailer_spec.rb @@ -33,7 +33,7 @@ describe RequestMailer, " when receiving incoming mail" do deliveries = ActionMailer::Base.deliveries deliveries.size.should == 1 mail = deliveries[0] - mail.to.should == [ MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost') ] + mail.to.should == [ Configuration::contact_email ] deliveries.clear end @@ -53,7 +53,7 @@ describe RequestMailer, " when receiving incoming mail" do deliveries = ActionMailer::Base.deliveries deliveries.size.should == 1 mail = deliveries[0] - mail.to.should == [ MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost') ] + mail.to.should == [ Configuration::contact_email ] deliveries.clear end @@ -73,7 +73,7 @@ describe RequestMailer, " when receiving incoming mail" do deliveries = ActionMailer::Base.deliveries deliveries.size.should == 1 mail = deliveries[0] - mail.to.should == [ MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost') ] + mail.to.should == [ Configuration::contact_email ] deliveries.clear end @@ -97,10 +97,12 @@ describe RequestMailer, " when receiving incoming mail" do # check attached bounce is good copy of incoming-request-plain.email mail.multipart?.should == true mail.parts.size.should == 2 + message_part = mail.parts[0].to_s bounced_mail = TMail::Mail.parse(mail.parts[1].body) bounced_mail.to.should == [ ir.incoming_email ] bounced_mail.from.should == [ 'geraldinequango@localhost' ] - bounced_mail.body.include?("That's so totally a rubbish question") + bounced_mail.body.include?("That's so totally a rubbish question").should be_true + message_part.include?("marked to no longer receive responses").should be_true deliveries.clear end @@ -157,7 +159,7 @@ describe RequestMailer, " when receiving incoming mail" do deliveries = ActionMailer::Base.deliveries deliveries.size.should == 1 mail = deliveries[0] - mail.to.should == [ MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost') ] + mail.to.should == [ Configuration::contact_email ] deliveries.clear end @@ -324,3 +326,34 @@ describe RequestMailer, 'when sending mail when someone has updated an old uncla end end + +describe RequestMailer, 'requires_admin' do + before(:each) do + user = mock_model(User, :name_and_email => 'Bruce Jones', + :name => 'Bruce Jones') + @info_request = mock_model(InfoRequest, :user => user, + :described_state => 'error_message', + :title => 'Test request', + :url_title => 'test_request', + :law_used_short => 'FOI', + :id => 123) + end + + it 'body should contain the full admin URL' do + mail = RequestMailer.deliver_requires_admin(@info_request) + + mail.body.should include('http://test.host/en/admin/request/show/123') + end + + context 'has an ADMIN_BASE_URL set' do + before(:each) do + Configuration::should_receive(:admin_base_url).and_return('http://our.proxy.server/admin/alaveteli/') + end + + it 'body should contain the full admin URL' do + mail = RequestMailer.deliver_requires_admin(@info_request) + + mail.body.should include('http://our.proxy.server/admin/alaveteli/request/show/123') + end + end +end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 6a4d0f2d5..248dff70e 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -143,15 +143,14 @@ def validate_as_body(html) end def basic_auth_login(request, username = nil, password = nil) - username = MySociety::Config.get('ADMIN_USERNAME') if username.nil? - password = MySociety::Config.get('ADMIN_PASSWORD') if password.nil? + username = Configuration::admin_username if username.nil? + password = Configuration::admin_password if password.nil? request.env["HTTP_AUTHORIZATION"] = "Basic " + Base64::encode64("#{username}:#{password}") end # Monkeypatch! Validate HTML in tests. -utility_search_path = MySociety::Config.get("UTILITY_SEARCH_PATH", ["/usr/bin", "/usr/local/bin"]) $html_validation_script_found = false -utility_search_path.each do |d| +Configuration::utility_search_path.each do |d| $html_validation_script = File.join(d, "validate") $html_validation_script_options = ["--charset=utf-8"] if File.file? $html_validation_script and File.executable? $html_validation_script diff --git a/spec/views/public_body/show.rhtml_spec.rb b/spec/views/public_body/show.rhtml_spec.rb index 1d21f80c4..a42516d72 100644 --- a/spec/views/public_body/show.rhtml_spec.rb +++ b/spec/views/public_body/show.rhtml_spec.rb @@ -12,6 +12,7 @@ describe "when viewing a body" do :info_requests => [1, 2, 3, 4], # out of sync with Xapian :publication_scheme => '', :calculated_home_page => '') + @pb.stub!(:override_request_email).and_return(nil) @pb.stub!(:is_requestable?).and_return(true) @pb.stub!(:has_notes?).and_return(false) @pb.stub!(:has_tag?).and_return(false) diff --git a/spec/views/request/_after_actions.rhtml_spec.rb b/spec/views/request/_after_actions.rhtml_spec.rb index d04db3fc2..5b4734c52 100644 --- a/spec/views/request/_after_actions.rhtml_spec.rb +++ b/spec/views/request/_after_actions.rhtml_spec.rb @@ -1,85 +1,86 @@ require File.expand_path(File.join('..', '..', '..', 'spec_helper'), __FILE__) -describe 'when displaying actions that can be taken with regard to a request' do - - before do - @mock_body = mock_model(PublicBody, :name => 'test public body', +describe 'when displaying actions that can be taken with regard to a request' do + + before do + @mock_body = mock_model(PublicBody, :name => 'test public body', :url_name => 'test_public_body') - @mock_user = mock_model(User, :name => 'test user', + @mock_user = mock_model(User, :name => 'test user', :url_name => 'test_user') - @mock_request = mock_model(InfoRequest, :title => 'test request', - :user => @mock_user, - :user_name => @mock_user.name, + @mock_request = mock_model(InfoRequest, :title => 'test request', + :user => @mock_user, + :user_name => @mock_user.name, :is_external? => false, - :public_body => @mock_body, + :public_body => @mock_body, + :comments_allowed? => true, :url_title => 'test_request') assigns[:info_request] = @mock_request end - + def do_render render :partial => 'request/after_actions' end - + def expect_owner_div do_render response.should have_tag('div#owner_actions'){ yield } end - + def expect_anyone_div do_render response.should have_tag('div#anyone_actions'){ yield } end - + def expect_owner_link(text) expect_owner_div{ with_tag('a', :text => text) } end - + def expect_no_owner_link(text) expect_owner_div{ without_tag('a', :text => text) } end - + def expect_anyone_link(text) expect_anyone_div{ with_tag('a', :text => text) } end - + def expect_no_anyone_link(text) expect_anyone_div{ without_tag('a', :text => text) } end - - describe 'if the request is old and unclassified' do - - before do + + describe 'if the request is old and unclassified' do + + before do assigns[:old_unclassified] = true end - - it 'should not display a link for the request owner to update the status of the request' do + + it 'should not display a link for the request owner to update the status of the request' do expect_no_owner_link('Update the status of this request') end - - it 'should display a link for anyone to update the status of the request' do + + it 'should display a link for anyone to update the status of the request' do expect_anyone_link('Update the status of this request') end - + end - - describe 'if the request is not old and unclassified' do - - before do + + describe 'if the request is not old and unclassified' do + + before do assigns[:old_unclassified] = false end - - it 'should display a link for the request owner to update the status of the request' do + + it 'should display a link for the request owner to update the status of the request' do expect_owner_link('Update the status of this request') end - - it 'should not display a link for anyone to update the status of the request' do + + it 'should not display a link for anyone to update the status of the request' do expect_no_anyone_link('Update the status of this request') end - + end it 'should display a link for the request owner to request a review' do expect_owner_link('Request an internal review') end - + end diff --git a/vendor/plugins/acts_as_xapian/init.rb b/vendor/plugins/acts_as_xapian/init.rb index 20b7b24a5..36b43ac0b 100644 --- a/vendor/plugins/acts_as_xapian/init.rb +++ b/vendor/plugins/acts_as_xapian/init.rb @@ -2,8 +2,6 @@ # # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: init.rb,v 1.1 2008-04-23 13:33:50 francis Exp $ require 'acts_as_xapian' |