diff options
88 files changed, 8465 insertions, 4342 deletions
diff --git a/app/controllers/admin_general_controller.rb b/app/controllers/admin_general_controller.rb index 5073cdc5b..ae51e0923 100644 --- a/app/controllers/admin_general_controller.rb +++ b/app/controllers/admin_general_controller.rb @@ -8,6 +8,13 @@ class AdminGeneralController < AdminController def index + # ensure we have a trailing slash + current_uri = request.env['REQUEST_URI'] + if params[:suppress_redirect].nil? && !(current_uri =~ /\/$/) + redirect_to admin_general_index_url + "/" + return + end + # Overview counts of things @public_body_count = PublicBody.count diff --git a/app/controllers/admin_public_body_controller.rb b/app/controllers/admin_public_body_controller.rb index f88b25572..021122734 100644 --- a/app/controllers/admin_public_body_controller.rb +++ b/app/controllers/admin_public_body_controller.rb @@ -154,10 +154,10 @@ class AdminPublicBodyController < AdminController else raise "internal error, unknown button label" end - + # Try with dry run first csv_contents = params[:csv_file].read - en = PublicBody.import_csv(csv_contents, params[:tag], true, admin_http_auth_user()) + en = PublicBody.import_csv(csv_contents, params[:tag], true, admin_http_auth_user(), I18n.available_locales) errors = en[0] notes = en[1] @@ -166,7 +166,7 @@ class AdminPublicBodyController < AdminController notes.push("Dry run was successful, real run would do as above.") else # And if OK, with real run - en = PublicBody.import_csv(csv_contents, params[:tag], false, admin_http_auth_user()) + en = PublicBody.import_csv(csv_contents, params[:tag], false, admin_http_auth_user(), available_locales) errors = en[0] notes = en[1] if errors.size != 0 diff --git a/app/controllers/admin_request_controller.rb b/app/controllers/admin_request_controller.rb index d5bd4c4d6..e5de4f8b7 100644 --- a/app/controllers/admin_request_controller.rb +++ b/app/controllers/admin_request_controller.rb @@ -177,7 +177,7 @@ class AdminRequestController < AdminController raw_email_data = incoming_message.raw_email.data mail = TMail::Mail.parse(raw_email_data) mail.base64_decode - destination_request.receive(mail, raw_email_data) + destination_request.receive(mail, raw_email_data, true) incoming_message_id = incoming_message.id incoming_message.fully_destroy @@ -275,7 +275,6 @@ class AdminRequestController < AdminController def show_raw_email @raw_email = RawEmail.find(params[:id]) - # For the holding pen, try to guess where it should be ... @holding_pen = false if (@raw_email.incoming_message.info_request == InfoRequest.holding_pen_request && !@raw_email.incoming_message.mail.from_addrs.nil? && @raw_email.incoming_message.mail.from_addrs.size > 0) @@ -294,15 +293,11 @@ class AdminRequestController < AdminController end # 2. Match the email address in the message without matching the hash - @info_requests = [] - addresses = - (@raw_email.incoming_message.mail.to || []) + - (@raw_email.incoming_message.mail.cc || []) + - (@raw_email.incoming_message.mail.envelope_to || []) - addresses.uniq! - for address in addresses - @info_requests += InfoRequest.guess_by_incoming_email(address) - end + @info_requests = InfoRequest.guess_by_incoming_email(@raw_email.incoming_message) + + # 3. Give a reason why it's in the holding pen + last_event = InfoRequestEvent.find_by_incoming_message_id(@raw_email.incoming_message.id) + @rejected_reason = last_event.params[:rejected_reason] end end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 4e6ad5efb..8ef23f49d 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -42,18 +42,18 @@ class ApplicationController < ActionController::Base end def set_gettext_locale - requested_locale = params[:locale] || session[:locale] || cookies[:locale] || request.env['HTTP_ACCEPT_LANGUAGE'] + if MySociety::Config.get('USE_DEFAULT_BROWSER_LANGUAGE', true) + 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 + end session[:locale] = FastGettext.set_locale(requested_locale) end # scrub sensitive parameters from the logs filter_parameter_logging :password - helper_method :site_name, :locale_from_params - def site_name - site_name = MySociety::Config.get('SITE_NAME', 'Alaveteli') - return site_name - end + helper_method :locale_from_params # Help work out which request causes RAM spike. # http://www.codeweblog.com/rails-to-monitor-the-process-of-memory-leaks-skills/ @@ -223,7 +223,11 @@ class ApplicationController < ActionController::Base if session[:user_id].nil? return nil else - return User.find(session[:user_id]) + begin + return User.find(session[:user_id]) + rescue ActiveRecord::RecordNotFound + return nil + end end end @@ -274,7 +278,9 @@ class ApplicationController < ActionController::Base def check_read_only read_only = MySociety::Config.get('READ_ONLY', '') if !read_only.empty? - flash[:notice] = "<p>WhatDoTheyKnow 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>" + 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) redirect_to frontpage_url end @@ -349,6 +355,9 @@ class ApplicationController < ActionController::Base # views (for links) and mailers (for use in emails), so include them into # all of all. include LinkToHelper + + # Site-wide access to configuration settings + include ConfigHelper end diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb index ffc97237a..4fa603aab 100644 --- a/app/controllers/general_controller.rb +++ b/app/controllers/general_controller.rb @@ -63,7 +63,7 @@ class GeneralController < ApplicationController end end - # Display WhatDoTheyKnow category from mySociety blog + # Display blog entries def blog medium_cache @feed_autodetect = [] @@ -73,7 +73,7 @@ class GeneralController < ApplicationController @data = XmlSimple.xml_in(content) @channel = @data['channel'][0] @blog_items = @channel['item'] - @feed_autodetect = [ { :url => feed_url, :title => "WhatDoTheyKnow blog"} ] + @feed_autodetect = [{:url => feed_url, :title => "#{site_name} blog"}] else @blog_items = [] end diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index 88fb9be6c..fac57c7e0 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.rb @@ -402,24 +402,26 @@ class RequestController < ApplicationController elsif @info_request.calculate_status == 'not_held' flash[:notice] = _("<p>Thank you! Here are some ideas on what to do next:</p> <ul> - <li>To send your request to another authority, first copy the text of your request below, then <a href=\"%s\">find the other authority</a>.</li> + <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> <li>If you would like to contest the authority's claim that they do not hold the information, here is - <a href=\"%s\">how to complain</a>. + <a href=\"{{complain_url}}\">how to complain</a>. </li> - <li>We have <a href=\"%s\">suggestions</a> + <li>We have <a href=\"{{other_means_url}}\">suggestions</a> on other means to answer your question. </li> - </ul> - ") % ["/new",CGI.escapeHTML(unhappy_url(@info_request)),CGI.escapeHTML(unhappy_url(@info_request)) + "#other_means"] + </ul>", + :find_authority_url => "/new", + :complain_url => CGI.escapeHTML(unhappy_url(@info_request)), + :other_means_url => CGI.escapeHTML(unhappy_url(@info_request)) + "#other_means") redirect_to request_url(@info_request) elsif @info_request.calculate_status == 'rejected' flash[:notice] = _("Oh no! Sorry to hear that your request was refused. Here is what to do now.") redirect_to unhappy_url(@info_request) elsif @info_request.calculate_status == 'successful' - flash[:notice] = _("<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 WhatDoTheyKnow useful, <a href=\"%s\">make a donation</a> to the charity which runs it.</p>") % ["http://www.mysociety.org/donate/"] + flash[:notice] = _("<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>", :site_name=>site_name, :donation_url => "http://www.mysociety.org/donate/") redirect_to request_url(@info_request) elsif @info_request.calculate_status == 'partially_successful' - flash[:notice] = _("<p>We're glad you got some of the information that you wanted. If you found WhatDoTheyKnow useful, <a href=\"%s\">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>") % ["http://www.mysociety.org/donate/"] + flash[:notice] = _("<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>", :site_name=>site_name, :donation_url=>"http://www.mysociety.org/donate/") redirect_to unhappy_url(@info_request) elsif @info_request.calculate_status == 'waiting_clarification' flash[:notice] = _("Please write your follow up message containing the necessary clarifications below.") @@ -427,7 +429,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 20 days, or be told if it will take longer (<a href=\"%s\">details</a>).</p>") % [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 20 days, or be told if it will take longer (<a href=\"{{review_url}}\">details</a>).</p>", :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>") diff --git a/app/controllers/request_game_controller.rb b/app/controllers/request_game_controller.rb index b9440a906..8a84575bb 100644 --- a/app/controllers/request_game_controller.rb +++ b/app/controllers/request_game_controller.rb @@ -20,7 +20,9 @@ class RequestGameController < ApplicationController @requests = old.sort_by{ rand }.slice(0..2) if @missing == 0 - flash[:notice] = _('<p>All done! Thank you very much for your help.</p><p>There are <a href="%s">more things you can do</a> to help WhatDoTheyKnow.</p>') % [help_credits_path+"#helpus"] + flash[:notice] = _('<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>', + :helpus_url => help_credits_path+"#helpus", + :site_name => site_name) end @league_table_28_days = InfoRequestEvent.make_league_table( diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 9bdcb98cd..ec56566a9 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -14,6 +14,9 @@ module ApplicationHelper # all of all. include LinkToHelper + # Site-wide access to configuration settings + include ConfigHelper + # Copied from error_messages_for in active_record_helper.rb def foi_error_messages_for(*params) options = params.last.is_a?(Hash) ? params.pop.symbolize_keys : {} @@ -45,7 +48,7 @@ module ApplicationHelper '' end end - + # Highlight words, also escapes HTML (other than spans that we add) def highlight_words(t, words, html = true) if html diff --git a/app/helpers/config_helper.rb b/app/helpers/config_helper.rb new file mode 100644 index 000000000..80f2deed2 --- /dev/null +++ b/app/helpers/config_helper.rb @@ -0,0 +1,5 @@ +module ConfigHelper + def site_name + MySociety::Config.get('SITE_NAME', 'Alaveteli') + end +end
\ No newline at end of file diff --git a/app/models/application_mailer.rb b/app/models/application_mailer.rb index 508ff2016..9628d7339 100644 --- a/app/models/application_mailer.rb +++ b/app/models/application_mailer.rb @@ -28,5 +28,8 @@ class ApplicationMailer < ActionMailer::Base # views (for links) and mailers (for use in emails), so include them into # all of all. include LinkToHelper + + # Site-wide access to configuration settings + include ConfigHelper end diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb index 581c73f8b..ae7d1201e 100644 --- a/app/models/incoming_message.rb +++ b/app/models/incoming_message.rb @@ -431,7 +431,7 @@ class IncomingMessage < ActiveRecord::Base text.gsub!(self.info_request.public_body.request_email, "[" + self.info_request.public_body.short_or_long_name + " request email]") end text.gsub!(self.info_request.incoming_email, "[FOI #" + self.info_request.id.to_s + " email]") - text.gsub!(MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost'), "[WhatDoTheyKnow contact email]") + text.gsub!(MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost'), "[#{MySociety::Config.get('SITE_NAME', 'Alaveteli')} contact email]") end # Replaces all email addresses in (possibly binary data) with equal length alternative ones. @@ -461,11 +461,23 @@ class IncomingMessage < ActiveRecord::Base if censored_uncompressed_text != uncompressed_text # then use the altered file (recompressed) recompressed_text = nil - IO.popen("/usr/bin/pdftk - output - compress", "r+") do |child| + if MySociety::Config.get('USE_GHOSTSCRIPT_COMPRESSION') == true + command = "gs -sDEVICE=pdfwrite -dCompatibilityLevel=1.4 -dPDFSETTINGS=/screen -dNOPAUSE -dQUIET -dBATCH -sOutputFile=- -" + else + command = "/usr/bin/pdftk - output - compress" + end + IO.popen(command, "r+") do |child| child.write(censored_uncompressed_text) child.close_write() recompressed_text = child.read() end + if recompressed_text.nil? || recompressed_text.empty? + # buggy versions of pdftk sometimes fail on + # compression, I don't see it's a disaster in + # these cases to save an uncompressed version? + recompressed_text = censored_uncompressed_text + logger.warn "Unable to compress PDF; problem with your pdftk version?" + end if !recompressed_text.nil? && !recompressed_text.empty? text[0..-1] = recompressed_text # [0..-1] makes it change the 'text' string in place end @@ -850,7 +862,9 @@ class IncomingMessage < ActiveRecord::Base text = Iconv.conv('utf-8', 'windows-1252', text) rescue Iconv::IllegalSequence # Text looks like unlabelled nonsense, strip out anything that isn't UTF-8 - text = Iconv.conv('utf-8//IGNORE', 'utf-8', text) + "\n\n[ WhatDoTheyKnow note: The above text was badly encoded, and has had strange characters removed. ]" + text = Iconv.conv('utf-8//IGNORE', 'utf-8', 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')) end end end @@ -1119,7 +1133,7 @@ class IncomingMessage < ActiveRecord::Base external_command("/usr/bin/catdoc", tempfile.path, :append_to => text) elsif content_type == 'text/html' # lynx wordwraps links in its output, which then don't get formatted properly - # by WhatDoTheyKnow. We use elinks instead, which doesn't do that. + # by Alaveteli. We use elinks instead, which doesn't do that. external_command("/usr/bin/elinks", "-dump-charset", "utf-8", "-force-html", "-dump", tempfile.path, :append_to => text) elsif content_type == 'application/vnd.ms-excel' @@ -1237,9 +1251,8 @@ class IncomingMessage < ActiveRecord::Base info_request_event.track_things_sent_emails.each { |a| a.destroy } info_request_event.user_info_request_sent_alerts.each { |a| a.destroy } info_request_event.destroy - raw_email = self.raw_email + self.raw_email.destroy_file_representation! self.destroy - self.raw_email.destroy end end diff --git a/app/models/info_request.rb b/app/models/info_request.rb index 209954b16..419546c99 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -17,7 +17,6 @@ # allow_new_responses_from :string(255) default("anybody"), not null # handle_rejected_responses :string(255) default("bounce"), not null # - # models/info_request.rb: # A Freedom of Information request. # @@ -309,13 +308,20 @@ public # Return list of info requests which *might* be right given email address # e.g. For the id-hash email addresses, don't match the hash. - def InfoRequest.guess_by_incoming_email(incoming_email) - id, hash = InfoRequest._extract_id_hash_from_email(incoming_email) - begin - return [InfoRequest.find(id)] - rescue ActiveRecord::RecordNotFound - return [] + def InfoRequest.guess_by_incoming_email(incoming_message) + guesses = [] + # 1. Try to guess based on the email address(es) + addresses = + (incoming_message.mail.to || []) + + (incoming_message.mail.cc || []) + + (incoming_message.mail.envelope_to || []) + addresses.uniq! + for address in addresses + id, hash = InfoRequest._extract_id_hash_from_email(address) + guesses.push(InfoRequest.find_by_id(id)) + guesses.push(InfoRequest.find_by_idhash(hash)) end + return guesses.select{|x| !x.nil?}.uniq end # Internal function used by find_by_magic_email and guess_by_incoming_email @@ -326,7 +332,7 @@ public # The optional bounce- dates from when we used to have separate emails for the envelope from. # (that was abandoned because councils would send hand written responses to them, not just # bounce messages) - incoming_email =~ /request-(?:bounce-)?(\d+)-([a-z0-9]+)/ + incoming_email =~ /request-(?:bounce-)?([a-z0-9]+)-([a-z0-9]+)/ id = $1.to_i hash = $2 @@ -379,21 +385,24 @@ public end # A new incoming email to this request - def receive(email, raw_email_data, override_stop_new_responses = false) + def receive(email, raw_email_data, override_stop_new_responses = false, rejected_reason = "") if !override_stop_new_responses allow = nil - + reason = nil # See if new responses are prevented for spam reasons if self.allow_new_responses_from == 'nobody' allow = false + reason = _('This request has been set by an administrator to "allow new responses from nobody"') elsif self.allow_new_responses_from == 'anybody' allow = true elsif self.allow_new_responses_from == 'authority_only' if email.from_addrs.nil? || email.from_addrs.size == 0 allow = false + reason = _('Only the authority can reply to this request, but there is no "From" address to check against') else sender_email = email.from_addrs[0].spec sender_domain = PublicBody.extract_domain_from_email(sender_email) + reason = _("Only the authority can reply to this request, and I don't recognise the address this reply was sent from") allow = false # Allow any domain that has already sent reply for row in self.who_can_followup_to @@ -411,7 +420,7 @@ public if self.handle_rejected_responses == 'bounce' RequestMailer.deliver_stopped_responses(self, email, raw_email_data) elsif self.handle_rejected_responses == 'holding_pen' - InfoRequest.holding_pen_request.receive(email, raw_email_data) + InfoRequest.holding_pen_request.receive(email, raw_email_data, false, reason) elsif self.handle_rejected_responses == 'blackhole' # do nothing - just lose the message (Note: a copy will be # in the backup mailbox if the server is configured to send @@ -435,7 +444,11 @@ public raw_email.save! self.awaiting_description = true - self.log_event("response", { :incoming_message_id => incoming_message.id }) + params = { :incoming_message_id => incoming_message.id } + if !rejected_reason.empty? + params[:rejected_reason] = rejected_reason + end + self.log_event("response", params) self.save! end @@ -671,6 +684,7 @@ public end end return nil + end def get_last_response_event for e in self.info_request_events.reverse @@ -831,15 +845,25 @@ public def InfoRequest.magic_email_for_id(prefix_part, id) magic_email = MySociety::Config.get("INCOMING_EMAIL_PREFIX", "") magic_email += prefix_part + id.to_s - magic_email += "-" + Digest::SHA1.hexdigest(id.to_s + MySociety::Config.get("INCOMING_EMAIL_SECRET", 'dummysecret'))[0,8] + magic_email += "-" + InfoRequest.hash_from_id(id) magic_email += "@" + MySociety::Config.get("INCOMING_EMAIL_DOMAIN", "localhost") return magic_email end + before_validation :compute_idhash + + def compute_idhash + self.idhash = InfoRequest.hash_from_id(self.id) + end + + def InfoRequest.hash_from_id(id) + return Digest::SHA1.hexdigest(id.to_s + MySociety::Config.get("INCOMING_EMAIL_SECRET", 'dummysecret'))[0,8] + end + # Called by find_by_incoming_email - and used to be called by separate # function for envelope from address, until we abandoned it. def InfoRequest.find_by_magic_email(id, hash) - expected_hash = Digest::SHA1.hexdigest(id.to_s + MySociety::Config.get("INCOMING_EMAIL_SECRET", 'dummysecret'))[0,8] + expected_hash = InfoRequest.hash_from_id(id) #print "expected: " + expected_hash + "\nhash: " + hash + "\n" if hash != expected_hash return nil diff --git a/app/models/info_request_event.rb b/app/models/info_request_event.rb index 02b9a34ac..d79647c98 100644 --- a/app/models/info_request_event.rb +++ b/app/models/info_request_event.rb @@ -121,7 +121,12 @@ class InfoRequestEvent < ActiveRecord::Base self.info_request.user.url_name end def requested_from - self.info_request.public_body.url_name + # acts_as_xapian will detect translated fields via Globalize and add all the + # available locales to the index. But 'requested_from' is not translated directly, + # although it relies on a translated field in PublicBody. Hence, we need to + # manually add all the localized values to the index (Xapian can handle a list + # of values in a term, btw) + self.info_request.public_body.translations.map {|t| t.url_name} end def commented_by if self.event_type == 'comment' diff --git a/app/models/public_body.rb b/app/models/public_body.rb index 0e32a5164..ef1d60e26 100644 --- a/app/models/public_body.rb +++ b/app/models/public_body.rb @@ -310,29 +310,39 @@ class PublicBody < ActiveRecord::Base # Import from CSV. Just tests things and returns messages if dry_run is true. # Returns an array of [array of errors, array of notes]. If there are errors, # always rolls back (as with dry_run). - def self.import_csv(csv, tag, dry_run, editor) + def self.import_csv(csv, tag, dry_run, editor, additional_locales = []) errors = [] notes = [] begin ActiveRecord::Base.transaction do - existing_bodies = PublicBody.find_by_tag(tag) - + # Use the default locale when retrieving existing bodies; otherwise + # matching names won't work afterwards, and we'll create new bodies instead + # of updating them bodies_by_name = {} set_of_existing = Set.new() - for existing_body in existing_bodies - bodies_by_name[existing_body.name] = existing_body - set_of_existing.add(existing_body.name) + PublicBody.with_locale(I18n.default_locale) do + for existing_body in PublicBody.find_by_tag(tag) + bodies_by_name[existing_body.name] = existing_body + set_of_existing.add(existing_body.name) + end end - + set_of_importing = Set.new() + field_names = { 'name'=>1, 'email'=>2 } # Default values in case no field list is given line = 0 - CSV::Reader.parse(csv) do |row| line = line + 1 - name = row[1] - email = row[2] + # Parse the first line as a field list if it starts with '#' + if line==1 and row.to_s =~ /^#(.*)$/ + row[0] = row[0][1..-1] # Remove the # sign on first field + row.each_with_index {|field, i| field_names[field] = i} + next + end + + name = row[field_names['name']] + email = row[field_names['email']] next if name.nil? if email.nil? email = '' # unknown/bad contact is empty string @@ -353,15 +363,38 @@ class PublicBody < ActiveRecord::Base notes.push "line " + line.to_s + ": updating email for '" + name + "' from " + public_body.request_email + " to " + email public_body.request_email = email public_body.last_edit_editor = editor - public_body.last_edit_comment = 'Updated from spreadsheet' + public_body.last_edit_comment = 'Updated from spreadsheet' public_body.save! end + + additional_locales.each do |locale| + localized_name = field_names["name.#{locale}"] && row[field_names["name.#{locale}"]] + PublicBody.with_locale(locale) do + if !localized_name.nil? and public_body.name != localized_name + notes.push "line " + line.to_s + ": updating name for '#{name}' from '#{public_body.name}' to '#{localized_name}' (locale: #{locale})." + public_body.name = localized_name + public_body.save! + end + end + end else # New public body notes.push "line " + line.to_s + ": new authority '" + name + "' with email " + email public_body = PublicBody.new(:name => name, :request_email => email, :short_name => "", :home_page => "", :publication_scheme => "", :notes => "", :last_edit_editor => editor, :last_edit_comment => 'Created from spreadsheet') public_body.tag_string = tag public_body.save! + + additional_locales.each do |locale| + localized_name = field_names["name.#{locale}"] && row[field_names["name.#{locale}"]] + if !localized_name.nil? + PublicBody.with_locale(locale) do + notes.push "line " + line.to_s + ": (aka '#{localized_name}' in locale #{locale})" + public_body.name = localized_name + public_body.publication_scheme = "" + public_body.save! + end + end + end end set_of_importing.add(name) diff --git a/app/models/raw_email.rb b/app/models/raw_email.rb index eb36053c1..c6066cbf4 100644 --- a/app/models/raw_email.rb +++ b/app/models/raw_email.rb @@ -20,8 +20,6 @@ class RawEmail < ActiveRecord::Base has_one :incoming_message - before_destroy :destroy_file_representation! - # We keep the old data_text field (which is of type text) for backwards # compatibility. We use the new data_binary field because only it works # properly in recent versions of PostgreSQL (get seg faults escaping diff --git a/app/models/request_mailer.rb b/app/models/request_mailer.rb index e73b153b9..fc317d20d 100644 --- a/app/models/request_mailer.rb +++ b/app/models/request_mailer.rb @@ -205,10 +205,11 @@ class RequestMailer < ApplicationMailer def receive(email, raw_email) # Find which info requests the email is for reply_info_requests = self.requests_matching_email(email) - # Nothing found, so save in holding pen if reply_info_requests.size == 0 - InfoRequest.holding_pen_request.receive(email, raw_email) + reason = _("Could not identify the request from the email address") + request = InfoRequest.holding_pen_request + request.receive(email, raw_email, false, reason) return end diff --git a/app/models/track_mailer.rb b/app/models/track_mailer.rb index 6901a834d..4b7c603a7 100644 --- a/app/models/track_mailer.rb +++ b/app/models/track_mailer.rb @@ -22,7 +22,7 @@ class TrackMailer < ApplicationMailer # etc. don't decide we are spammers.) @recipients = user.name_and_email - @subject = "Your WhatDoTheyKnow.com email alert" + @subject = _("Your {{site_name}} email alert", :site_name => site_name) @body = { :user => user, :email_about_things => email_about_things, :unsubscribe_url => unsubscribe_url } end diff --git a/app/models/track_thing.rb b/app/models/track_thing.rb index aee1ed1da..16a0dab87 100644 --- a/app/models/track_thing.rb +++ b/app/models/track_thing.rb @@ -120,8 +120,8 @@ class TrackThing < ActiveRecord::Base @params = { # Website :list_description => "'<a href=\"/request/" + CGI.escapeHTML(self.info_request.url_title) + "\">" + CGI.escapeHTML(self.info_request.title) + "</a>', a request", # XXX yeuch, sometimes I just want to call view helpers from the model, sorry! can't work out how - :verb_on_page => "Track this request by email", - :verb_on_page_already => "You are already tracking this request by email", + :verb_on_page => _("Track this request by email"), + :verb_on_page_already => _("You are already tracking this request by email"), # Email :title_in_email => "New updates for the request '" + self.info_request.title + "'", :title_in_rss => "New updates for the request '" + self.info_request.title + "'", @@ -135,23 +135,23 @@ class TrackThing < ActiveRecord::Base elsif self.track_type == 'all_new_requests' @params = { # Website - :list_description => "any <a href=\"/list\">new requests</a>", - :verb_on_page => "Email me when there are new requests", - :verb_on_page_already => "You are being emailed when there are new requests", + :list_description => _("any <a href=\"/list\">new requests</a>"), + :verb_on_page => _("Email me when there are new requests"), + :verb_on_page_already => _("You are being emailed when there are new requests"), # Email - :title_in_email => "New Freedom of Information requests", - :title_in_rss => "New Freedom of Information requests", + :title_in_email => _("New Freedom of Information requests"), + :title_in_rss => _("New Freedom of Information requests"), # Authentication - :web => "To be emailed about any new requests", - :email => "Then you will be emailed whenever anyone makes a new FOI request.", - :email_subject => "Confirm you want to be emailed about new requests", + :web => _("To be emailed about any new requests"), + :email => _("Then you will be emailed whenever anyone makes a new FOI request."), + :email_subject => _("Confirm you want to be emailed about new requests"), # RSS sorting :feed_sortby => 'newest' } elsif self.track_type == 'all_successful_requests' @params = { # Website - :list_description => "any <a href=\"/list/successful\">successful requests</a>", + :list_description => _("any <a href=\"/list/successful\">successful requests</a>"), :verb_on_page => _("Email me new successful responses "), :verb_on_page_already => _("You are being emailed about any new successful responses"), # Email @@ -172,14 +172,14 @@ class TrackThing < ActiveRecord::Base # Website :list_description => "'<a href=\"/body/" + CGI.escapeHTML(self.public_body.url_name) + "\">" + CGI.escapeHTML(self.public_body.name) + "</a>', a public authority", # XXX yeuch, sometimes I just want to call view helpers from the model, sorry! can't work out how :verb_on_page => _("Track requests to {{public_body_name}} by email",:public_body_name=>CGI.escapeHTML(self.public_body.name)), - :verb_on_page_already => "You are already tracking requests to " + CGI.escapeHTML(self.public_body.name) + " by email", + :verb_on_page_already => _("You are already tracking requests to {{public_body_name}} by email", :public_body_name=>CGI.escapeHTML(self.public_body.name)), # Email :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 be emailed about requests made using WhatDoTheyKnow to the public authority '" + CGI.escapeHTML(self.public_body.name) + "'", - :email => "Then you will be emailed whenever someone requests something or gets a response from '" + CGI.escapeHTML(self.public_body.name) + "'.", - :email_subject => "Confirm you want to be emailed about requests to '" + self.public_body.name + "'", + :web => _("To be emailed about 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)), + :email => _("Then you will be emailed 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 be emailed about requests to '{{public_body_name}}'", :public_body_name=>self.public_body.name), # RSS sorting :feed_sortby => 'newest' } @@ -187,15 +187,15 @@ class TrackThing < ActiveRecord::Base @params = { # Website :list_description => "'<a href=\"/user/" + CGI.escapeHTML(self.tracked_user.url_name) + "\">" + CGI.escapeHTML(self.tracked_user.name) + "</a>', a person", # XXX yeuch, sometimes I just want to call view helpers from the model, sorry! can't work out how - :verb_on_page => "Track this person by email", - :verb_on_page_already => "You are already tracking this person by email", + :verb_on_page => _("Track this person by email"), + :verb_on_page_already => _("You are already tracking this person by email"), # Email - :title_in_email => "FOI requests by '" + self.tracked_user.name + "'", - :title_in_rss => "FOI requests by '" + self.tracked_user.name + "'", + :title_in_email => _("FOI requests by '{{user_name}}'", :user_name=>self.tracked_user.name), + :title_in_rss => _("FOI requests by '{{user_name}}'", :user_name=>self.tracked_user.name), # Authentication - :web => "To be emailed about requests by '" + CGI.escapeHTML(self.tracked_user.name) + "'", - :email => "Then you will be emailed whenever '" + CGI.escapeHTML(self.tracked_user.name) + "' requests something or gets a response.", - :email_subject => "Confirm you want to be emailed about requests by '" + self.tracked_user.name + "'", + :web => _("To be emailed about requests by '{{user_name}}'", :user_name=>CGI.escapeHTML(self.tracked_user.name)), + :email => _("Then you will be emailed whenever '{{user_name}}' requests something or gets a response.", :user_name=>CGI.escapeHTML(self.tracked_user.name)), + :email_subject => _("Confirm you want to be emailed about requests by '{{user_name}}'", :user_name=>self.tracked_user.name), # RSS sorting :feed_sortby => 'newest' } @@ -203,15 +203,15 @@ class TrackThing < ActiveRecord::Base @params = { # Website :list_description => "'<a href=\"/search/" + CGI.escapeHTML(self.track_query) + "/newest\">" + CGI.escapeHTML(self.track_query) + "</a>' in new requests/responses", # XXX yeuch, sometimes I just want to call view helpers from the model, sorry! can't work out how - :verb_on_page => "Track things matching '" + CGI.escapeHTML(self.track_query) + "' by email", - :verb_on_page_already => "You are already tracking things matching '" + CGI.escapeHTML(self.track_query) + "' by email", + :verb_on_page => _("Track things matching '{{query}}' by email", :query=>CGI.escapeHTML(self.track_query)), + :verb_on_page_already => _("You are already tracking things matching '{{query}}' by email", :query=>CGI.escapeHTML(self.track_query)), # Email - :title_in_email => "Requests or responses matching '" + self.track_query + "'", - :title_in_rss => "Requests or responses matching '" + self.track_query + "'", + :title_in_email => _("Requests or responses matching '{{query}}'", :query=>self.track_query), + :title_in_rss => _("Requests or responses matching '{{query}}'", :query=>self.track_query), # Authentication - :web => "To follow requests and responses matching '" + CGI.escapeHTML(self.track_query) + "'", - :email => "Then you will be emailed whenever a new request or response matches '" + CGI.escapeHTML(self.track_query) + "'.", - :email_subject => "Confirm you want to be emailed about new requests or responses matching '" + self.track_query + "'", + :web => _("To follow requests and responses matching '{{query}}'", :query=>CGI.escapeHTML(self.track_query)), + :email => _("Then you will be emailed whenever a new request or response matches '{{query}}'.", :query=>CGI.escapeHTML(self.track_query)), + :email_subject => _("Confirm you want to be emailed about new requests or responses matching '{{query}}'", :query=>self.track_query), # RSS sorting - XXX hmmm, we don't really know which to use # here for sorting. Might be a query term (e.g. 'cctv'), in # which case newest is good, or might be something like diff --git a/app/models/user_mailer.rb b/app/models/user_mailer.rb index f164f684e..0972e167d 100644 --- a/app/models/user_mailer.rb +++ b/app/models/user_mailer.rb @@ -31,7 +31,7 @@ class UserMailer < ApplicationMailer @from = contact_from_name_and_email headers 'Return-Path' => blackhole_email, 'Reply-To' => @from # we don't care about bounces when people are fiddling with their account @recipients = new_email - @subject = _("Confirm your new email address on WhatDoTheyKnow.com") + @subject = _("Confirm your new email address on {{site_name}}", :site_name=>site_name) @body[:name] = user.name @body[:url] = url @body[:old_email] = user.email @@ -42,7 +42,7 @@ class UserMailer < ApplicationMailer @from = contact_from_name_and_email headers 'Return-Path' => blackhole_email, 'Reply-To' => @from # we don't care about bounces when people are fiddling with their account @recipients = new_email - @subject = _("Unable to change email address on WhatDoTheyKnow.com") + @subject = _("Unable to change email address on {{site_name}}", :site_name=>site_name) @body[:old_email] = old_email @body[:new_email] = new_email end diff --git a/app/views/admin_public_body/import_csv.rhtml b/app/views/admin_public_body/import_csv.rhtml index 75981a501..50a4b951a 100644 --- a/app/views/admin_public_body/import_csv.rhtml +++ b/app/views/admin_public_body/import_csv.rhtml @@ -17,10 +17,21 @@ </p> <p> - <label for="csv_file">CSV file (no header rows; unused first column; name second column; email third column):</label> - <br/> - <%= file_field_tag :csv_file, :size => 60 %> + <label for="csv_file">CSV file:</label> + <%= file_field_tag :csv_file, :size => 40 %> </p> + + <p><strong>CSV file format:</strong> A first row with the list of fields, + starting with '#', is optional but highly recommended. The fields 'name' + and 'email' are required; additionaly, translated values are supported by + adding the locale name to the field name, e.g. 'name.es', 'name.de'... Example: + </p> + + <blockquote> + #id,name,email,name.es<br/> + 1,An Authority,a@example.com,Un organismo<br/> + 2,Another One,another@example.com,Otro organismo<br/> + </blockquote> <p><strong>Note:</strong> Choose <strong>dry run</strong> to test, without actually altering the database. Choose <strong>upload</strong> to actually diff --git a/app/views/admin_request/show_raw_email.rhtml b/app/views/admin_request/show_raw_email.rhtml index 10b97f4fd..fa1470e77 100644 --- a/app/views/admin_request/show_raw_email.rhtml +++ b/app/views/admin_request/show_raw_email.rhtml @@ -3,8 +3,9 @@ <h1>Incoming message <%=@raw_email.incoming_message.id.to_s %></h1> <p> - FOI request: <%= link_to request_both_links(@raw_email.incoming_message.info_request) %> + FOI request: <%= request_both_links(@raw_email.incoming_message.info_request) %> <% if @holding_pen %> + <br>This is in the holding pen because: <strong><%= @rejected_reason %></strong> <% if @public_bodies.size > 0 %> <br>Guessed authority: <% for public_body in @public_bodies %> @@ -30,7 +31,7 @@ <h2>Raw email</h2> -<%= link_to "Download", "../download_raw_email/" + @raw_email.id.to_s %> +<p><%= link_to "Download", "../download_raw_email/" + @raw_email.id.to_s %></p> <pre><%=h(@raw_email.data).gsub(/\n/, '<br>') %></pre> diff --git a/app/views/comment/new.rhtml b/app/views/comment/new.rhtml index 25380d23f..1a4f2c0dc 100644 --- a/app/views/comment/new.rhtml +++ b/app/views/comment/new.rhtml @@ -59,7 +59,7 @@ <li> <%= _('You know what caused the error, and can <strong>suggest a solution</strong>, such as a working email address.')%> </li> <% end %> <% if [ 'requires_admin' ].include?(@info_request.described_state) %> - <li> <%= _('Your thoughts on what the WhatDoTheyKnow <strong>administrators</strong> should do about the request.') %> </li> + <li> <%= _('Your thoughts on what the {{site_name}} <strong>administrators</strong> should do about the request.', :site_name=>site_name) %> </li> <% end %> diff --git a/app/views/contact_mailer/message.rhtml b/app/views/contact_mailer/message.rhtml index a28d9603b..9c0a74c02 100644 --- a/app/views/contact_mailer/message.rhtml +++ b/app/views/contact_mailer/message.rhtml @@ -1,7 +1,7 @@ <%= @message.strip %> --------------------------------------------------------------------- -<%= _('Message sent using WhatDoTheyKnow contact form, ')%> +<%= _('Message sent using {{site_name}} contact form, ', :site_name=>site_name)%> <%=(@logged_in_user ? ("logged in as user " + main_url(user_url(@logged_in_user))) : "not logged in")%><% if !@last_request.nil? %> <%= _('Last request viewed: ')%><%= main_url(request_url(@last_request)) %> diff --git a/app/views/contact_mailer/user_message.rhtml b/app/views/contact_mailer/user_message.rhtml index 7a685c452..fe1f47518 100644 --- a/app/views/contact_mailer/user_message.rhtml +++ b/app/views/contact_mailer/user_message.rhtml @@ -1,5 +1,5 @@ --------------------------------------------------------------------- -<%=@from_user.name%> has used WhatDoTheyKnow to send you the message below. +<%= _('{{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.')%> --------------------------------------------------------------------- @@ -7,6 +7,6 @@ message, which will then go directly to the person who wrote the message.')%> <%= @message.strip %> --------------------------------------------------------------------- -<%= _('View Freedom of Information requests made by')%> <%=@from_user.name %>: +<%= _('View Freedom of Information requests made by {{user_name}}:', :user_name=>@from_user.name)%> <%= @from_user_url %> --------------------------------------------------------------------- diff --git a/app/views/general/search.rhtml b/app/views/general/search.rhtml index a4680c0f6..ec12b2bf3 100644 --- a/app/views/general/search.rhtml +++ b/app/views/general/search.rhtml @@ -123,8 +123,8 @@ <li><%= _("Enter words that you want to find separated by spaces, e.g. <strong>climbing lane</strong>") %></li> <li><%= _('Use OR (in capital letters) where you don\'t mind which word, e.g. <strong><code>commons OR lords</code></strong>') %> <li><%= _('Use quotes when you want to find an exact phrase, e.g. <strong><code>"Liverpool City Council"</code></strong>') %></li> - <li><%= _('<strong><code>status:</code></strong> to select based on the status or historical status of the request, see the <a href="%s">table of statuses</a> below.') % "#statuses" %></li> - <li><%= _('<strong><code>variety:</code></strong> to select type of thing to search for, see the <a href="%s">table of varieties</a> below.') % "#varieties" %></li> + <li><%= _('<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.', :statuses_url => "#statuses") %></li> + <li><%= _('<strong><code>variety:</code></strong> to select type of thing to search for, see the <a href="{{varieties_url}}">table of varieties</a> below.', :varieties_url => "#varieties") %></li> <li><%= _('<strong><code>requested_from:home_office</code></strong> to search requests from the Home Office, typing the name as in the URL.')%></li> <li><%= _('<strong><code>requested_by:julian_todd</code></strong> to search requests made by Julian Todd, typing the name as in the URL.') %></li> <li><%= _('<strong><code>commented_by:tony_bowden</code></strong> to search annotations made by Tony Bowden, typing the name as in the URL.')%></li> @@ -134,33 +134,33 @@ <li><%= _('<strong><code>tag:charity</code></strong> to find all public bodies 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="%s">advanced search operators</a>, such as proximity and wildcards.') % "http://www.xapian.org/docs/queryparser.html" %></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> </ul> <h2 id="statuses"><%= _('Table of statuses') %></h2> <table class="status_table"> - <tr><td><strong><%=search_link('status:waiting_response')%></strong></td><td> Waiting for the public authority to reply </td></tr> - <tr><td><strong><%=search_link('status:not_held')%></strong></td><td> The public authority does not have the information requested </td></tr> - <tr><td><strong><%=search_link('status:rejected')%></strong></td><td> The request was refused by the public authority </td></tr> - <tr><td><strong><%=search_link('status:partially_successful')%></strong></td><td> Some of the information requested has been received </td></tr> - <tr><td><strong><%=search_link('status:successful')%></strong></td><td> All of the information requested has been received </td></tr> - <tr><td><strong><%=search_link('status:waiting_clarification')%></strong></td><td> The public authority would like part of the request explained </td></tr> - <tr><td><strong><%=search_link('status:gone_postal')%></strong></td><td> The public authority would like to / has responded by post </td></tr> - <tr><td><strong><%=search_link('status:internal_review')%></strong></td><td> Waiting for the public authority to complete an internal review of their handling of the request</td></tr> - <tr><td><strong><%=search_link('status:error_message')%></strong></td><td> Received an error message, such as delivery failure.</td></tr> - <tr><td><strong><%=search_link('status:requires_admin')%></strong></td><td> A strange reponse, required attention by the WhatDoTheyKnow team </td></tr> - <tr><td><strong><%=search_link('status:user_withdrawn')%></strong></td><td> The requester has abandoned this request for some reason </td></tr> + <tr><td><strong><%=search_link('status:waiting_response')%></strong></td><td><%= _('Waiting for the public authority to reply') %></td></tr> + <tr><td><strong><%=search_link('status:not_held')%></strong></td><td><%= _('The public authority does not have the information requested') %></td></tr> + <tr><td><strong><%=search_link('status:rejected')%></strong></td><td><%= _('The request was refused by the public authority') %></td></tr> + <tr><td><strong><%=search_link('status:partially_successful')%></strong></td><td><%= _('Some of the information requested has been received') %></td></tr> + <tr><td><strong><%=search_link('status:successful')%></strong></td><td><%= _('All of the information requested has been received') %></td></tr> + <tr><td><strong><%=search_link('status:waiting_clarification')%></strong></td><td><%= _('The public authority would like part of the request explained') %></td></tr> + <tr><td><strong><%=search_link('status:gone_postal')%></strong></td><td><%= _('The public authority would like to / has responded by post') %></td></tr> + <tr><td><strong><%=search_link('status:internal_review')%></strong></td><td><%= _('Waiting for the public authority to complete an internal review of their handling of the request') %></td></tr> + <tr><td><strong><%=search_link('status:error_message')%></strong></td><td><%= _('Received an error message, such as delivery failure.') %></td></tr> + <tr><td><strong><%=search_link('status:requires_admin')%></strong></td><td><%= _('A strange reponse, required attention by the {{site_name}} team', :site_name=>site_name) %></td></tr> + <tr><td><strong><%=search_link('status:user_withdrawn')%></strong></td><td><%= _('The requester has abandoned this request for some reason') %></td></tr> </table> <h2 id="varieties">Table of varieties</h2> <table class="status_table"> - <tr><td><strong><%=search_link('variety:sent')%></strong></td><td> Original request sent</td></tr> - <tr><td><strong><%=search_link('variety:followup_sent')%></strong></td><td> Follow up message sent by requester</td></tr> - <tr><td><strong><%=search_link('variety:response')%></strong></td><td> Response from a public authority </td></tr> - <tr><td><strong><%=search_link('variety:comment')%></strong></td><td> Annotation added to request</td></tr> - <tr><td><strong><%=search_link('variety:authority')%></strong></td><td> A public authority </td></tr> - <tr><td><strong><%=search_link('variety:user')%></strong></td><td> A WhatDoTheyKnow user </td></tr> + <tr><td><strong><%=search_link('variety:sent')%></strong></td><td><%= _('Original request sent') %></td></tr> + <tr><td><strong><%=search_link('variety:followup_sent')%></strong></td><td><%= _('Follow up message sent by requester') %></td></tr> + <tr><td><strong><%=search_link('variety:response')%></strong></td><td><%= _('Response from a public authority') %></td></tr> + <tr><td><strong><%=search_link('variety:comment')%></strong></td><td><%= _('Annotation added to request') %></td></tr> + <tr><td><strong><%=search_link('variety:authority')%></strong></td><td><%= _('A public authority') %></td></tr> + <tr><td><strong><%=search_link('variety:user')%></strong></td><td><%= _('A {{site_name}} user', :site_name=>site_name) %></td></tr> </table> <% end %> diff --git a/app/views/layouts/admin.rhtml b/app/views/layouts/admin.rhtml index 5fe75fc97..f0e9a7019 100644 --- a/app/views/layouts/admin.rhtml +++ b/app/views/layouts/admin.rhtml @@ -2,7 +2,7 @@ <html lang="en-gb"> <head> <meta http-equiv="content-type" content="text/html;charset=UTF-8" > - <title>WhatDoTheyKnow admin<%= @title ? ":" : "" %> <%=@title%></title> + <title><%= site_name %> admin<%= @title ? ":" : "" %> <%=@title%></title> <%= stylesheet_link_tag 'admin', :title => "Main", :rel => "stylesheet" %> </head> <body> diff --git a/app/views/outgoing_mailer/initial_request.rhtml b/app/views/outgoing_mailer/initial_request.rhtml index 13b356c6e..83e5b794b 100644 --- a/app/views/outgoing_mailer/initial_request.rhtml +++ b/app/views/outgoing_mailer/initial_request.rhtml @@ -5,7 +5,7 @@ <%= _('Please use this email address for all replies to this request:')%> <%= @info_request.incoming_email %> -<%= _('Is {{email_address}} the wrong address for {{type_of_request}} requests tp {{public_body_name}}? If so, please contact us using this form:', :email_address => @info_request.public_body.request_email, :type_of_request => @info_request.law_used_full, :public_body_name => @info_request.public_body.name)%> +<%= _('Is {{email_address}} the wrong address for {{type_of_request}} requests to {{public_body_name}}? If so, please contact us using this form:', :email_address => @info_request.public_body.request_email, :type_of_request => @info_request.law_used_full, :public_body_name => @info_request.public_body.name)%> <%= render :partial => 'followup_footer' %> diff --git a/app/views/public_body/_body_listing_single.rhtml b/app/views/public_body/_body_listing_single.rhtml index 97cfd2e71..7637a1077 100644 --- a/app/views/public_body/_body_listing_single.rhtml +++ b/app/views/public_body/_body_listing_single.rhtml @@ -9,7 +9,7 @@ <span class="desc"> <% if !public_body.short_name.empty? || !public_body.notes_without_html.empty? %> <% if !public_body.short_name.empty? %> - Also called <%=highlight_words(public_body.short_name, @highlight_words) %>. + <%= _("Also called {{other_name}}.", :other_name => highlight_words(public_body.short_name, @highlight_words)) %> <% end %> <% if !public_body.notes_without_html.empty? %> <%= highlight_and_excerpt(public_body.notes_without_html, @highlight_words, 150) %> @@ -18,12 +18,12 @@ <% end %> </span> <span class="bottomline"> - <%= pluralize(public_body.info_requests.size, "request") %> made. + <%= n_('%d request made.', '%d requests made.', public_body.info_requests.size) % public_body.info_requests.size %> <% if !@include_request_link_in_authority_listing.nil? %> <%= link_to _("Make your own request"), public_body_url(public_body) %>. <% end %> <br> - Added on <%= simple_date(public_body.created_at) %>. + <%= _("Added on {{date}}", :date => simple_date(public_body.created_at)) %>. </span> </div> diff --git a/app/views/public_body/show.rhtml b/app/views/public_body/show.rhtml index 78a326d72..406c1479e 100644 --- a/app/views/public_body/show.rhtml +++ b/app/views/public_body/show.rhtml @@ -78,7 +78,7 @@ <% if @public_body.eir_only? %> <%= pluralize(@public_body.info_requests.size, "Environmental Information Regulations request made using this site") %> <% else %> - <%= n_('%d Freedom of Information request', '%d Freedom of Information requests', @public_body.info_requests.size) % @public_body.info_requests.size %> made using this site + <%= n_('%d Freedom of Information request made using this site', '%d Freedom of Information requests made using this site', @public_body.info_requests.size) % @public_body.info_requests.size %> <% end %> <%= @page_desc %> </h2> diff --git a/app/views/public_body/view_email.rhtml b/app/views/public_body/view_email.rhtml index d6c8d85fe..50601069f 100644 --- a/app/views/public_body/view_email.rhtml +++ b/app/views/public_body/view_email.rhtml @@ -4,7 +4,7 @@ <p> <% if @public_body.is_requestable? %> -<%= _('WhatDoTheyKnow sends new requests to <strong>{{request_email}}</strong> for this authority.',:request_email=> h(@public_body.request_email))%> +<%= _('{{site_name}} sends new requests to <strong>{{request_email}}</strong> for this authority.', :site_name=>site_name, :request_email=> h(@public_body.request_email))%> <% else %> <% if @public_body.not_requestable_reason == 'not_apply' %> <p><%= _('Freedom of Information law no longer applies to this authority.Follow up messages to existing requests are sent to ')%><strong><%=h @public_body.request_email%></strong>. diff --git a/app/views/request/details.rhtml b/app/views/request/details.rhtml index 94d87306d..d4c63902f 100644 --- a/app/views/request/details.rhtml +++ b/app/views/request/details.rhtml @@ -4,17 +4,17 @@ <h2><%= _('Event history') %></h2> <p><%= _('This table shows the technical details of the internal events that happened -to this request on WhatDoTheyKnow. This could be used to generate information about +to this request on {{site_name}}. This could be used to generate information about the speed with which authorities respond to requests, the number of requests -which require a postal response and much more.') %> +which require a postal response and much more.', :site_name=>site_name) %> </p> <p><%= _('<strong>Caveat emptor!</strong> To use this data in an honourable way, you will need -a good internal knowledge of user behaviour on WhatDoTheyKnow. How, +a good internal knowledge of user behaviour on {{site_name}}. How, why and by whom requests are categorised is not straightforward, and there will be user error and ambiguity. You will also need to understand FOI law, and the way authorities use it. Plus you\'ll need to be an elite statistician. Please -<a href="%s">contact us</a> with questions.') % [help_contact_path] %> +<a href="{{contact_path}}">contact us</a> with questions.', :site_name=>site_name, :contact_path=>help_contact_path) %> </p> <% columns = ['id', 'event_type', 'created_at', 'described_state', 'calculated_state', 'last_described_at' ] %> @@ -49,11 +49,12 @@ way authorities use it. Plus you\'ll need to be an elite statistician. Please <p> <%= _('Here <strong>described</strong> means when a user selected a status for the request, and the most recent event had its status updated to that value. <strong>calculated</strong> is then inferred by -WhatDoTheyKnow for intermediate events, which weren\'t given an explicit -description by a user. See the <a href="%s">search tips</a> for description of the states.') % [search_redirect_path] %> +{{site_name}} for intermediate events, which weren\'t given an explicit +description by a user. See the <a href="{{search_path}}">search tips</a> for description of the states.', +:site_name=>site_name, :search_path=>search_redirect_path) %> </p> <p> <%= _('You can get this page in computer-readable format as part of the main JSON -page for the request. See the <a href="%s">API documentation</a>.') % [help_api_path] %> +page for the request. See the <a href="{{api_path}}">API documentation</a>.', :api_path=>help_api_path) %> </p> diff --git a/app/views/request/show.rhtml b/app/views/request/show.rhtml index 1993ee6b2..2897a3564 100644 --- a/app/views/request/show.rhtml +++ b/app/views/request/show.rhtml @@ -110,9 +110,9 @@ <% elsif @status == 'internal_review' %> <%= _('Waiting for an <strong>internal review</strong> by {{public_body_link}} of their handling of this request.',:public_body_link=>public_body_link(@info_request.public_body)) %> <% elsif @status == 'error_message' %> - <%= _('There was a <strong>delivery error</strong> or similar, which needs fixing by the WhatDoTheyKnow team.') %> + <%= _('There was a <strong>delivery error</strong> or similar, which needs fixing by the {{site_name}} team.', :site_name=>site_name) %> <% elsif @status == 'requires_admin' %> - <%= _('This request has had an unusual response, and <strong>requires attention</strong> from the WhatDoTheyKnow team.') %> + <%= _('This request has had an unusual response, and <strong>requires attention</strong> from the {{site_name}} team.', :site_name=>site_name) %> <% elsif @status == 'user_withdrawn' %> <%= _('This request has been <strong>withdrawn</strong> by the person who made it. There may be an explanation in the correspondence below.') %> diff --git a/app/views/request_mailer/comment_on_alert.rhtml b/app/views/request_mailer/comment_on_alert.rhtml index 46cee3b1a..691e6f9bb 100644 --- a/app/views/request_mailer/comment_on_alert.rhtml +++ b/app/views/request_mailer/comment_on_alert.rhtml @@ -3,4 +3,4 @@ request. Follow this link to see what they wrote.',:user_name=>@comment.user.nam <%=@url%> --- <%= _('the WhatDoTheyKnow team') %> +-- <%= _('the {{site_name}} team', :site_name=>site_name) %> diff --git a/app/views/request_mailer/comment_on_alert_plural.rhtml b/app/views/request_mailer/comment_on_alert_plural.rhtml index 3871a9598..a495b8e08 100644 --- a/app/views/request_mailer/comment_on_alert_plural.rhtml +++ b/app/views/request_mailer/comment_on_alert_plural.rhtml @@ -2,6 +2,6 @@ <%=@url%> --- <%= _('the WhatDoTheyKnow team') %> +-- <%= _('the {{site_name}} team', :site_name=>site_name) %> diff --git a/app/views/request_mailer/new_response.rhtml b/app/views/request_mailer/new_response.rhtml index c3e979cd6..083f873b4 100644 --- a/app/views/request_mailer/new_response.rhtml +++ b/app/views/request_mailer/new_response.rhtml @@ -12,6 +12,6 @@ contains any useful information.' )%> <%= _('Although all responses are automatically published, we depend on you, the original requester, to evaluate them.')%> --- <%= _('the WhatDoTheyKnow team') %> +-- <%= _('the {{site_name}} team', :site_name=>site_name) %> diff --git a/app/views/request_mailer/new_response_reminder_alert.rhtml b/app/views/request_mailer/new_response_reminder_alert.rhtml index cde7851db..5f07e8559 100644 --- a/app/views/request_mailer/new_response_reminder_alert.rhtml +++ b/app/views/request_mailer/new_response_reminder_alert.rhtml @@ -5,6 +5,6 @@ <%= _('Your request was called {{info_request}}. Letting everyone know whether you got the information will help us keep tabs on',:info_request=>@info_request.title)%> <%= @info_request.public_body.name %>. --- <%= _('the WhatDoTheyKnow team') %> +-- <%= _('the {{site_name}} team', :site_name=>site_name) %> diff --git a/app/views/request_mailer/not_clarified_alert.rhtml b/app/views/request_mailer/not_clarified_alert.rhtml index 2e6cf6a05..82d15ba76 100644 --- a/app/views/request_mailer/not_clarified_alert.rhtml +++ b/app/views/request_mailer/not_clarified_alert.rhtml @@ -6,4 +6,4 @@ <%= _('You will only get an answer to your request if you follow up with the clarification.')%> --- <%= _('the WhatDoTheyKnow team') %> +-- <%= _('the {{site_name}} team', :site_name=>site_name) %> diff --git a/app/views/request_mailer/old_unclassified_updated.rhtml b/app/views/request_mailer/old_unclassified_updated.rhtml index afaa0cf1c..5b8534832 100644 --- a/app/views/request_mailer/old_unclassified_updated.rhtml +++ b/app/views/request_mailer/old_unclassified_updated.rhtml @@ -5,5 +5,5 @@ <%= @url %> --- <%= _('the WhatDoTheyKnow team') %> +-- <%= _('the {{site_name}} team', :site_name=>site_name) %> diff --git a/app/views/request_mailer/overdue_alert.rhtml b/app/views/request_mailer/overdue_alert.rhtml index 70b6ffcf1..b8a9ba525 100644 --- a/app/views/request_mailer/overdue_alert.rhtml +++ b/app/views/request_mailer/overdue_alert.rhtml @@ -6,6 +6,6 @@ <%=@url%> --- <%= _('the WhatDoTheyKnow team') %> +-- <%= _('the {{site_name}} team', :site_name=>site_name) %> diff --git a/app/views/request_mailer/stopped_responses.rhtml b/app/views/request_mailer/stopped_responses.rhtml index eb53cee1c..9cd156860 100644 --- a/app/views/request_mailer/stopped_responses.rhtml +++ b/app/views/request_mailer/stopped_responses.rhtml @@ -13,7 +13,7 @@ email {{contact_email}} for help.',:user=>@info_request.user.name,:contact_email <%= _('Your original message is attached.')%> --- <%= _('the WhatDoTheyKnow team') %> +-- <%= _('the {{site_name}} team', :site_name=>site_name) %> diff --git a/app/views/request_mailer/very_overdue_alert.rhtml b/app/views/request_mailer/very_overdue_alert.rhtml index e61b3a206..6abd198a0 100644 --- a/app/views/request_mailer/very_overdue_alert.rhtml +++ b/app/views/request_mailer/very_overdue_alert.rhtml @@ -8,4 +8,4 @@ review, asking them to find out why response to the request has been so slow.',: <%=@url%> --- <%= _('the WhatDoTheyKnow team') %> +-- <%= _('the {{site_name}} team', :site_name=>site_name) %> diff --git a/app/views/track_mailer/event_digest.rhtml b/app/views/track_mailer/event_digest.rhtml index df27a5cbd..46f230da1 100644 --- a/app/views/track_mailer/event_digest.rhtml +++ b/app/views/track_mailer/event_digest.rhtml @@ -63,4 +63,4 @@ Please click on the link below to cancel or alter these emails. <%=@unsubscribe_url%> --- the WhatDoTheyKnow team +-- <%= _('the {{site_name}} team', :site_name=>site_name) %> diff --git a/app/views/user/_signin.rhtml b/app/views/user/_signin.rhtml index 49f604ca5..1c19ac05c 100644 --- a/app/views/user/_signin.rhtml +++ b/app/views/user/_signin.rhtml @@ -4,7 +4,7 @@ <%= foi_error_messages_for :user_signin %> <% if not sign_in_as_existing_user %> - <h2><%= _('If you\'ve used WhatDoTheyKnow before')%></h2> + <h2><%= _('If you\'ve used {{site_name}} before', :site_name=>site_name)%></h2> <% end %> <p> diff --git a/app/views/user/_signup.rhtml b/app/views/user/_signup.rhtml index c3c286151..02abede5d 100644 --- a/app/views/user/_signup.rhtml +++ b/app/views/user/_signup.rhtml @@ -3,7 +3,7 @@ <% form_tag({:action => "signup"}, {:id => "signup_form"}) do %> <%= foi_error_messages_for :user_signup %> - <h2><%= _('If you\'re new to WhatDoTheyKnow')%></h2> + <h2><%= _('If you\'re new to {{site_name}}', :site_name=>site_name)%></h2> <p> <label class="form_label" for="user_signup_email"><%= _('Your e-mail:')%></label> diff --git a/app/views/user/set_crop_profile_photo.rhtml b/app/views/user/set_crop_profile_photo.rhtml index 33b78e193..db18d10a1 100644 --- a/app/views/user/set_crop_profile_photo.rhtml +++ b/app/views/user/set_crop_profile_photo.rhtml @@ -33,7 +33,7 @@ <%= hidden_field_tag 'draft_profile_photo_id', @draft_profile_photo.id %> <p><%= _('<strong>Privacy note:</strong> Your photo will be shown in public on the Internet, - wherever you do something on WhatDoTheyKnow.')%> + wherever you do something on {{site_name}}.', :site_name=>site_name)%> <p> <%= hidden_field_tag 'submitted_crop_profile_photo', 1 %> diff --git a/app/views/user/set_draft_profile_photo.rhtml b/app/views/user/set_draft_profile_photo.rhtml index b6a39df5e..70d27074b 100644 --- a/app/views/user/set_draft_profile_photo.rhtml +++ b/app/views/user/set_draft_profile_photo.rhtml @@ -16,7 +16,7 @@ <ul> <li><%= _('Your photo will be shown in public <strong>on the Internet</strong>, - wherever you do something on WhatDoTheyKnow.')%> + wherever you do something on {{site_name}}.', :site_name=>site_name)%> </li> <li><%= _('Please don\'t upload offensive pictures. We will take down images diff --git a/app/views/user/set_profile_about_me.rhtml b/app/views/user/set_profile_about_me.rhtml index aa53d6720..af6433e89 100644 --- a/app/views/user/set_profile_about_me.rhtml +++ b/app/views/user/set_profile_about_me.rhtml @@ -1,4 +1,4 @@ -<% @title = _('Change the text about you on your profile at WhatDoTheyKnow.com') %> +<% @title = _('Change the text about you on your profile at {{site_name}}', :site_name=>site_name) %> <% raise _('internal error') if not @user %> @@ -11,8 +11,8 @@ <%= _(' What are you investigating using Freedom of Information? ')%> </p> <p> - <%= _(' This will appear on your WhatDoTheyKnow profile, to make it - easier for others to get involved with what you\'re doing.')%> + <%= _(' This will appear on your {{site_name}} profile, to make it + easier for others to get involved with what you\'re doing.', :site_name=>site_name)%> </p> </div> diff --git a/app/views/user/show.rhtml b/app/views/user/show.rhtml index 09bf3de5f..5e2c29d84 100644 --- a/app/views/user/show.rhtml +++ b/app/views/user/show.rhtml @@ -59,7 +59,7 @@ <h1> <%= h(@display_user.name) + (@is_you ? _(" (you)") : "") %></h1> <p class="subtitle"> - <%= _('Joined WhatDoTheyKnow in') %> <%= year_from_date(@display_user.created_at) %> + <%= _('Joined {{site_name}} in', :site_name=>site_name) %> <%= year_from_date(@display_user.created_at) %> <% if !@user.nil? && @user.admin_page_links? %> (<%= link_to "admin", user_admin_url(@display_user) %>) <% end %> @@ -76,7 +76,7 @@ <div id="user_public_banned"> <p> <strong> - <%= _('This user has been banned from WhatDoTheyKnow.com ')%> + <%= _('This user has been banned from {{site_name}} ', :site_name=>site_name)%> </strong> </p> <p> diff --git a/app/views/user/signchangeemail.rhtml b/app/views/user/signchangeemail.rhtml index c0c559380..0f8b76bc5 100644 --- a/app/views/user/signchangeemail.rhtml +++ b/app/views/user/signchangeemail.rhtml @@ -34,7 +34,7 @@ <div class="form_button"> <%= hidden_field_tag 'submitted_signchangeemail_do', 1 %> - <%= submit_tag "Change email on WhatDoTheyKnow.com" %> + <%= submit_tag _("Change email on {{site_name}}", :site_name=>site_name) %> </div> <% end %> diff --git a/app/views/user_mailer/already_registered.rhtml b/app/views/user_mailer/already_registered.rhtml index 3bdb3d04b..59ffcbf94 100644 --- a/app/views/user_mailer/already_registered.rhtml +++ b/app/views/user_mailer/already_registered.rhtml @@ -1,11 +1,11 @@ <%= @name %>, -<%= _('You just tried to sign up to WhatDoTheyKnow.com, when you +<%= _('You just tried to sign up to {{site_name}}, when you already have an account. Your name and password have been left as they previously were. -Please click on the link below.')%> <%=@reasons[:email]%> +Please click on the link below.', :site_name=>site_name)%> <%=@reasons[:email]%> <%=@url%> --- <%= _('the WhatDoTheyKnow team') %> +-- <%= _('the {{site_name}} team', :site_name=>site_name) %> diff --git a/app/views/user_mailer/changeemail_already_used.rhtml b/app/views/user_mailer/changeemail_already_used.rhtml index 011c6ee81..1d74dda35 100644 --- a/app/views/user_mailer/changeemail_already_used.rhtml +++ b/app/views/user_mailer/changeemail_already_used.rhtml @@ -1,9 +1,10 @@ <%= _('Someone, perhaps you, just tried to change their email address on -WhatDoTheyKnow.com from ')%><%=@old_email%> <%= _('to')%> <%=@new_email%>. +{{site_name}} from {{old_email}} to {{new_email}}.', :site_name=>site_name, +:old_email=>@old_email, :new_email=>@new_email) %> <%= _('This was not possible because there is already an account using -the email address ')%><%=@new_email%>. +the email address {{email}}.', :email=>@new_email)%>. <%= _('The accounts have been left as they previously were.')%> --- <%= _('the WhatDoTheyKnow team') %> +-- <%= _('the {{site_name}} team', :site_name=>site_name) %> diff --git a/app/views/user_mailer/changeemail_confirm.rhtml b/app/views/user_mailer/changeemail_confirm.rhtml index b7eff308d..ffb9737f7 100644 --- a/app/views/user_mailer/changeemail_confirm.rhtml +++ b/app/views/user_mailer/changeemail_confirm.rhtml @@ -1,12 +1,13 @@ <%= @name %>, <%= _('Please click on the link below to confirm that you want to -change the email address that you use for WhatDoTheyKnow -from ')%><%=@old_email%> <%= _('to ')%><%=@new_email%> +change the email address that you use for {{site_name}} +from {{old_email}} to {{new_email}}', +:site_name=>site_name, :old_email=>@old_email, :new_email=>@new_email) %> <%=@url%> <%= _('We will not reveal your email addresses to anybody unless you or the law tell us to.')%> --- <%= _('the WhatDoTheyKnow team') %> +-- <%= _('the {{site_name}} team', :site_name=>site_name) %> diff --git a/app/views/user_mailer/confirm_login.rhtml b/app/views/user_mailer/confirm_login.rhtml index b68e9abb1..6f4feff00 100644 --- a/app/views/user_mailer/confirm_login.rhtml +++ b/app/views/user_mailer/confirm_login.rhtml @@ -8,4 +8,4 @@ <%= _('We will not reveal your email address to anybody unless you or the law tell us to.')%> --- <%= _('the WhatDoTheyKnow team') %> +-- <%= _('the {{site_name}} team', :site_name=>site_name) %> diff --git a/config/alert-tracks-debian.ugly b/config/alert-tracks-debian.ugly index e4cc12b38..730a125b4 100644 --- a/config/alert-tracks-debian.ugly +++ b/config/alert-tracks-debian.ugly @@ -6,11 +6,11 @@ # Required-Stop: $local_fs $syslog # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 -# Short-Description: alert-tracks is a daemon running the WhatDoTheyKnow email alerts -# Description: alert-tracks send WhatDoTheyKnow email alerts as required +# Short-Description: alert-tracks is a daemon running the Alaveteli email alerts +# Description: alert-tracks send Alaveteli email alerts as required ### END INIT INFO # -# !!(*= $daemon_name *)!! Start the WhatDoTheyKnow email alert daemon +# !!(*= $daemon_name *)!! Start the Alaveteli email alert daemon NAME=!!(*= $daemon_name *)!! DAEMON=/data/vhost/!!(*= $vhost *)!!/alaveteli/script/runner @@ -42,7 +42,7 @@ case "$1" in quietly_start_daemon if [ $? -ne 1 ] then - echo "WhatDoTheyKnow alert daemon was not running; now restarted" + echo "Alaveteli alert daemon was not running; now restarted" exit 1 else exit 0 @@ -50,17 +50,17 @@ case "$1" in ;; start) - echo -n "Starting WhatDoTheyKnow alert daemon: $NAME" + echo -n "Starting Alaveteli alert daemon: $NAME" start_daemon ;; stop) - echo -n "Stopping WhatDoTheyKnow alert daemon: $NAME" + echo -n "Stopping Alaveteli alert daemon: $NAME" stop_daemon ;; restart) - echo -n "Restarting WhatDoTheyKnow alert daemon: $NAME" + echo -n "Restarting Alaveteli alert daemon: $NAME" stop_daemon start_daemon ;; diff --git a/config/crontab.ugly b/config/crontab.ugly index 5820151a0..ecd3151ff 100644 --- a/config/crontab.ugly +++ b/config/crontab.ugly @@ -27,6 +27,9 @@ MAILTO=cron-!!(*= $site *)!!@mysociety.org 0 8 * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/alert-not-clarified-request.lock /data/vhost/!!(*= $vhost *)!!/!!(*= $vcspath *)!!/script/alert-not-clarified-request || echo "stalled?" 2 4 * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/check-recent-requests-sent.lock /data/vhost/!!(*= $vhost *)!!/!!(*= $vcspath *)!!/script/check-recent-requests-sent || echo "stalled?" 45 3 * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/stop-new-responses-on-old-requests.lock /data/vhost/!!(*= $vhost *)!!/!!(*= $vcspath *)!!/script/stop-new-responses-on-old-requests || echo "stalled?" +# Only root can restart apache +31 1 * * * root run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/compact-xapian-database.lock /data/vhost/!!(*= $vhost *)!!/!!(*= $vcspath *)!!/script/compact-xapian-database production || echo "stalled?" + # Once a day on all servers 43 2 * * * !!(*= $user *)!! /data/vhost/!!(*= $vhost *)!!/!!(*= $vcspath *)!!/script/request-creation-graph diff --git a/config/environment.rb b/config/environment.rb index a40c2df4e..17a16efed 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -122,6 +122,7 @@ else end FastGettext.default_available_locales = available_locales +I18n.locale = default_locale I18n.available_locales = available_locales I18n.default_locale = default_locale diff --git a/config/general.yml-example b/config/general.yml-example index 9db95c4d0..c832111c7 100644 --- a/config/general.yml-example +++ b/config/general.yml-example @@ -19,6 +19,7 @@ TWITTER_USERNAME: 'whatdotheyknow' # Locales we wish to support in this app, space-delimited AVAILABLE_LOCALES: 'en es' DEFAULT_LOCALE: 'en' +USE_DEFAULT_BROWSER_LANGUAGE: true # How many days should have passed before an answer to a request is officially late? REPLY_LATE_AFTER_DAYS: 20 @@ -93,3 +94,12 @@ RECAPTCHA_PRIVATE_KEY: 'x' # existing process previously served a larger request, this won't # show any consumption for the later request. DEBUG_RECORD_MEMORY: false + +# Currently we default to using pdftk to compress PDFs. You can +# optionally try Ghostscript, which should do a better job of +# compression. Some versions of pdftk are buggy with respect to +# compression, in which case Alaveteli doesn't recompress the PDFs at +# all and logs a warning message "Unable to compress PDF"; which would +# be another reason to try this setting. +USE_GHOSTSCRIPT_COMPRESSION: true + diff --git a/config/packages b/config/packages index 4695ea828..a42785824 100644 --- a/config/packages +++ b/config/packages @@ -17,6 +17,7 @@ elinks unrtf xlhtml libxapian-ruby1.8 +xapian-tools gnuplot-nox php5-cli # ttf-bitstream-vera diff --git a/db/migrate/101_add_hash_to_info_request.rb b/db/migrate/101_add_hash_to_info_request.rb new file mode 100644 index 000000000..20608aac1 --- /dev/null +++ b/db/migrate/101_add_hash_to_info_request.rb @@ -0,0 +1,22 @@ +require 'digest/sha1' + +class AddHashToInfoRequest < ActiveRecord::Migration + def self.up + add_column :info_requests, :idhash, :string + + # 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.save! + puts info_request.idhash + end + change_column :info_requests, :idhash, :string, :null => false + puts InfoRequest.find_by_idhash + end + def self.down + remove_column :info_requests, :idhash + end +end + + + diff --git a/doc/INSTALL.md b/doc/INSTALL.md index e6f7caec7..eb0a77dd9 100644 --- a/doc/INSTALL.md +++ b/doc/INSTALL.md @@ -110,7 +110,7 @@ If you want some dummy data to play with, you can try loading the fixtures that the test suite uses into your development database. You can do this with: - rake spec:db:fixtures:load + ./script/load-sample-data Next we need to create the index for the search engine (Xapian): diff --git a/locale/app.pot b/locale/app.pot index 87154b326..fc579bd69 100644 --- a/locale/app.pot +++ b/locale/app.pot @@ -7,19 +7,27 @@ msgid "" msgstr "" "Project-Id-Version: version 0.0.1\n" -"POT-Creation-Date: 2011-07-12 15:18+0100\n" +"POT-Creation-Date: 2011-08-11 12:30+0200\n" "PO-Revision-Date: 2011-07-12 14:41+0100\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" +#: app/models/incoming_message.rb:866 +msgid "" +"\n" +"\n" +"[ {{site_name}} note: The above text was badly encoded, and has had strange " +"characters removed. ]" +msgstr "" + #: app/views/user/set_profile_about_me.rhtml:14 msgid "" -" This will appear on your WhatDoTheyKnow profile, to make it\n" +" This will appear on your {{site_name}} profile, to make it\n" " easier for others to get involved with what you're doing." msgstr "" @@ -132,8 +140,8 @@ msgid " when you send this message." msgstr "" #: app/views/public_body/show.rhtml:80 -msgid "%d Freedom of Information request" -msgid_plural "%d Freedom of Information requests" +msgid "%d Freedom of Information request made using this site" +msgid_plural "%d Freedom of Information requests made using this site" msgstr[0] "" msgstr[1] "" @@ -143,6 +151,12 @@ msgid_plural "%d requests" msgstr[0] "" msgstr[1] "" +#: app/views/public_body/_body_listing_single.rhtml:21 +msgid "%d request made." +msgid_plural "%d requests made." +msgstr[0] "" +msgstr[1] "" + #: app/views/request/new.rhtml:102 msgid "'Crime statistics by ward level for Wales'" msgstr "" @@ -151,7 +165,7 @@ msgstr "" msgid "'Pollution levels over time for the River Tyne'" msgstr "" -#: app/controllers/user_controller.rb:354 +#: app/controllers/user_controller.rb:355 msgid "" ",\n" "\n" @@ -184,142 +198,141 @@ msgstr "" msgid "<a href=\"%s\">Contact us</a> to tell us about the problem</li>" msgstr "" -#: app/views/public_body/show.rhtml:50 -msgid "" -"<a href=\"%s\">Make a new Freedom of Information request</a> to " -"{{public_body_name}}" -msgstr "" - #: app/views/public_body/list.rhtml:43 msgid "<a href=\"%s\">can't find the one you want?</a>" msgstr "" -#: app/views/request/_followup.rhtml:42 app/views/request/_followup.rhtml:49 -#: app/views/request/show.rhtml:76 app/views/request/show.rhtml:80 +#: app/views/request/_followup.rhtml:39 app/views/request/_followup.rhtml:46 +#: app/views/request/show.rhtml:83 app/views/request/show.rhtml:87 msgid "<a href=\"%s\">details</a>" msgstr "" -#: app/views/request/_followup.rhtml:77 +#: app/views/request/_followup.rhtml:74 msgid "<a href=\"%s\">what's that?</a>" msgstr "" +#: app/views/public_body/show.rhtml:50 +msgid "" +"<a href=\"{{url}}\">Make a new Freedom of Information request</a> to " +"{{public_body_name}}" +msgstr "" + #: app/controllers/request_game_controller.rb:23 msgid "" -"<p>All done! Thank you very much for your help.</p><p>There are <a href=\"%s" -"\">more things you can do</a> to help WhatDoTheyKnow.</p>" +"<p>All done! Thank you very much for your help.</p><p>There are <a href=" +"\"{{helpus_url}}\">more things you can do</a> to help {{site_name}}.</p>" msgstr "" -#: app/controllers/request_controller.rb:394 +#: app/controllers/request_controller.rb:399 msgid "" "<p>Thank you! Here are some ideas on what to do next:</p>\n" " <ul>\n" " <li>To send your request to another authority, first copy the " -"text of your request below, then <a href=\"%s\">find the other authority</a>." -"</li>\n" +"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=\"%s\">how to complain</a>.\n" +" <a href=\"{{complain_url}}\">how to complain</a>.\n" " </li>\n" -" <li>We have <a href=\"%s\">suggestions</a>\n" +" <li>We have <a href=\"{{other_means_url}}\">suggestions</a>\n" " on other means to answer your question.\n" " </li>\n" -" </ul>\n" -" " +" </ul>" msgstr "" -#: app/controllers/request_controller.rb:388 +#: app/controllers/request_controller.rb:393 msgid "" "<p>Thank you! Hope you don't have to wait much longer.</p> <p>By law, you " "should have got a response promptly, and normally before the end of <strong>" "{{date_response_required_by}}</strong>.</p>" msgstr "" -#: app/controllers/request_controller.rb:384 +#: app/controllers/request_controller.rb:389 msgid "" "<p>Thank you! Hopefully your wait isn't too long.</p> <p>By law, you should " "get a response promptly, and normally before the end of <strong>\n" "{{date_response_required_by}}</strong>.</p>" msgstr "" -#: app/controllers/request_controller.rb:421 +#: app/controllers/request_controller.rb:428 msgid "" "<p>Thank you! Hopefully your wait isn't too long.</p><p>You should get a " -"response within 20 days, or be told if it will take longer (<a href=\"%s" -"\">details</a>).</p>" +"response within 20 days, or be told if it will take longer (<a href=" +"\"{{review_url}}\">details</a>).</p>" msgstr "" -#: app/controllers/request_controller.rb:424 +#: app/controllers/request_controller.rb:431 msgid "" "<p>Thank you! We'll look into what happened and try and fix it up.</p><p>If " "the error was a delivery failure, and you can find an up to date FOI email " "address for the authority, please tell us using the form below.</p>" msgstr "" -#: app/controllers/request_controller.rb:391 +#: app/controllers/request_controller.rb:396 msgid "" "<p>Thank you! Your request is long overdue, by more than 40 working days. " "Most requests should be answered within 20 working days. You might like to " "complain about this, see below.</p>" msgstr "" -#: app/controllers/user_controller.rb:494 +#: app/controllers/user_controller.rb:495 msgid "" "<p>Thanks for changing the text about you on your profile.</p>\n" " <p><strong>Next...</strong> You can upload a profile photograph " "too.</p>" msgstr "" -#: app/controllers/user_controller.rb:416 +#: app/controllers/user_controller.rb:417 msgid "" "<p>Thanks for updating your profile photo.</p>\n" " <p><strong>Next...</strong> You can put some text about you " "and your research on your profile.</p>" msgstr "" -#: app/controllers/request_controller.rb:279 +#: app/controllers/request_controller.rb:284 msgid "" "<p>We recommend that you edit your request and remove the email address.\n" " If you leave it, the email address will be sent to the " "authority, but will not be displayed on the site.</p>" msgstr "" -#: app/controllers/request_controller.rb:410 +#: app/controllers/request_controller.rb:417 msgid "" "<p>We're glad you got all the information that you wanted. If you write " "about or make use of the information, please come back and add an annotation " -"below saying what you did.</p><p>If you found WhatDoTheyKnow useful, <a href=" -"\"%s\">make a donation</a> to the charity which runs it.</p>" +"below saying what you did.</p><p>If you found {{site_name}} useful, <a href=" +"\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p>" msgstr "" -#: app/controllers/request_controller.rb:413 +#: app/controllers/request_controller.rb:420 msgid "" "<p>We're glad you got some of the information that you wanted. If you found " -"WhatDoTheyKnow useful, <a href=\"%s\">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>" +"{{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to " +"the charity which runs it.</p><p>If you want to try and get the rest of the " +"information, here's what to do now.</p>" msgstr "" -#: app/controllers/request_controller.rb:277 +#: app/controllers/request_controller.rb:282 msgid "" "<p>You do not need to include your email in the request in order to get a " "reply (<a href=\"%s\">details</a>).</p>" msgstr "" -#: app/controllers/request_controller.rb:275 +#: app/controllers/request_controller.rb:280 msgid "" "<p>You do not need to include your email in the request in order to get a " "reply, as we will ask for it on the next screen (<a href=\"%s\">details</a>)." "</p>" msgstr "" -#: app/controllers/request_controller.rb:283 +#: app/controllers/request_controller.rb:288 msgid "" "<p>Your request contains a <strong>postcode</strong>. Unless it directly " "relates to the subject of your request, please remove any address as it will " "<strong>appear publicly on the Internet</strong>.</p>" msgstr "" -#: app/controllers/request_controller.rb:306 +#: app/controllers/request_controller.rb:311 msgid "" "<p>Your {{law_used_full}} request has been <strong>sent on its way</strong>!" "</p>\n" @@ -331,6 +344,13 @@ msgid "" " annotation below telling people about your writing.</p>" msgstr "" +#: app/controllers/application_controller.rb:279 +msgid "" +"<p>{{site_name}} is currently in maintenance. You can only view existing " +"requests. You cannot make new ones, add followups or annotations, or " +"otherwise change the database.</p> <p>{{read_only}}</p>" +msgstr "" + #: app/views/user/confirm.rhtml:11 msgid "" "<small>If you use web-based email or have \"junk mail\" filters, also check " @@ -379,8 +399,8 @@ msgstr "" #: app/views/general/search.rhtml:126 msgid "" "<strong><code>status:</code></strong> to select based on the status or " -"historical status of the request, see the <a href=\"%s\">table of statuses</" -"a> below." +"historical status of the request, see the <a href=\"{{statuses_url}}\">table " +"of statuses</a> below." msgstr "" #: app/views/general/search.rhtml:134 @@ -396,7 +416,7 @@ msgstr "" #: app/views/general/search.rhtml:127 msgid "" "<strong><code>variety:</code></strong> to select type of thing to search " -"for, see the <a href=\"%s\">table of varieties</a> below." +"for, see the <a href=\"{{varieties_url}}\">table of varieties</a> below." msgstr "" #: app/views/comment/new.rhtml:56 @@ -409,7 +429,7 @@ msgstr "" msgid "<strong>All the information</strong> has been sent" msgstr "" -#: app/views/request/_followup.rhtml:82 +#: app/views/request/_followup.rhtml:79 msgid "<strong>Anything else</strong>, such as clarifying, prompting, thanking" msgstr "" @@ -417,14 +437,14 @@ 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 WhatDoTheyKnow. How, \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=\"%s\">contact us</a> with questions." +"<a href=\"{{contact_path}}\">contact us</a> with questions." msgstr "" #: app/views/request/_other_describe_state.rhtml:28 @@ -461,7 +481,7 @@ msgstr "" msgid "" "<strong>Privacy note:</strong> Your photo will be shown in public on the " "Internet, \n" -" wherever you do something on WhatDoTheyKnow." +" wherever you do something on {{site_name}}." msgstr "" #: app/views/request/followup_preview.rhtml:37 @@ -488,7 +508,7 @@ msgid "" "a> or <strong>search</strong> their web site ..." msgstr "" -#: app/views/request/show.rhtml:84 +#: app/views/request/show.rhtml:91 msgid "<strong>did not have</strong> the information requested." msgstr "" @@ -501,15 +521,27 @@ msgid "" "A <strong>summary</strong> of the response if you have received it by post. " msgstr "" +#: app/views/general/search.rhtml:162 +msgid "A public authority" +msgstr "" + #: app/views/request/_other_describe_state.rhtml:34 msgid "A response will be sent <strong>by post</strong>" msgstr "" +#: app/views/general/search.rhtml:151 +msgid "A strange reponse, required attention by the {{site_name}} team" +msgstr "" + +#: app/views/general/search.rhtml:163 +msgid "A {{site_name}} user" +msgstr "" + #: app/views/user/set_profile_about_me.rhtml:20 msgid "About you:" msgstr "" -#: app/models/info_request_event.rb:288 +#: app/models/info_request_event.rb:293 msgid "Acknowledgement" msgstr "" @@ -527,6 +559,10 @@ msgid "" " a <strong>summary of the response</strong>." msgstr "" +#: app/views/public_body/_body_listing_single.rhtml:26 +msgid "Added on {{date}}" +msgstr "" + #: app/models/user.rb:54 msgid "Admin level is not included in list" msgstr "" @@ -551,14 +587,22 @@ msgid "" " human beings)" msgstr "" -#: app/models/info_request_event.rb:304 +#: app/models/info_request_event.rb:309 msgid "All information sent" msgstr "" +#: app/views/general/search.rhtml:146 +msgid "All of the information requested has been received" +msgstr "" + #: app/views/public_body/list.rhtml:5 msgid "Alphabet" msgstr "" +#: app/views/public_body/_body_listing_single.rhtml:12 +msgid "Also called {{other_name}}." +msgstr "" + #: app/views/request_mailer/new_response.rhtml:12 msgid "" "Although all responses are automatically published, we depend on\n" @@ -569,6 +613,10 @@ msgstr "" msgid "An <strong>error message</strong> has been received" msgstr "" +#: app/views/general/search.rhtml:161 +msgid "Annotation added to request" +msgstr "" + #: app/views/user/show.rhtml:34 msgid "Annotations" msgstr "" @@ -606,15 +654,15 @@ msgstr "" msgid "Attachment (optional):" msgstr "" -#: app/models/info_request.rb:776 +#: app/models/info_request.rb:783 msgid "Awaiting classification." msgstr "" -#: app/models/info_request.rb:796 +#: app/models/info_request.rb:803 msgid "Awaiting internal review." msgstr "" -#: app/models/info_request.rb:778 +#: app/models/info_request.rb:785 msgid "Awaiting response." msgstr "" @@ -626,17 +674,17 @@ msgstr "" #: app/views/request/new.rhtml:41 msgid "" -"Browse <a href='%s'>other requests</a> to '{{public_body_name}}' for " +"Browse <a href='{{url}}'>other requests</a> to '{{public_body_name}}' for " "examples of how to word your request." msgstr "" -#: app/views/request/show.rhtml:79 +#: app/views/request/show.rhtml:86 msgid "" "By law, under all circumstances, {{public_body_link}} should have responded " "by now" msgstr "" -#: app/views/request/show.rhtml:71 +#: app/views/request/show.rhtml:78 msgid "" "By law, {{public_body_link}} should normally have responded " "<strong>promptly</strong> and" @@ -648,27 +696,27 @@ msgid "" "it</a>." msgstr "" -#: app/controllers/track_controller.rb:143 +#: app/controllers/track_controller.rb:145 msgid "Cancel a {{site_name}} alert" msgstr "" -#: app/controllers/track_controller.rb:173 +#: app/controllers/track_controller.rb:175 msgid "Cancel some {{site_name}} alerts" msgstr "" -#: locale/model_attributes.rb:46 +#: locale/model_attributes.rb:39 msgid "CensorRule|Last edit comment" msgstr "" -#: locale/model_attributes.rb:45 +#: locale/model_attributes.rb:38 msgid "CensorRule|Last edit editor" msgstr "" -#: locale/model_attributes.rb:44 +#: locale/model_attributes.rb:37 msgid "CensorRule|Replacement" msgstr "" -#: locale/model_attributes.rb:43 +#: locale/model_attributes.rb:36 msgid "CensorRule|Text" msgstr "" @@ -676,6 +724,10 @@ msgstr "" msgid "Central government" msgstr "" +#: app/views/user/signchangeemail.rhtml:37 +msgid "Change email on {{site_name}}" +msgstr "" + #: app/views/user/signchangepassword.rhtml:27 msgid "Change password on {{site_name}}" msgstr "" @@ -685,14 +737,14 @@ msgid "Change profile photo" msgstr "" #: app/views/user/set_profile_about_me.rhtml:1 -msgid "Change the text about you on your profile at WhatDoTheyKnow.com" +msgid "Change the text about you on your profile at {{site_name}}" msgstr "" #: app/views/user/show.rhtml:107 msgid "Change your email" msgstr "" -#: app/controllers/user_controller.rb:249 +#: app/controllers/user_controller.rb:250 #: app/views/user/signchangeemail.rhtml:1 #: app/views/user/signchangeemail.rhtml:11 msgid "Change your email address used on {{site_name}}" @@ -709,7 +761,7 @@ msgstr "" msgid "Change your password on {{site_name}}" msgstr "" -#: app/controllers/user_controller.rb:203 +#: app/controllers/user_controller.rb:204 msgid "Change your password {{site_name}}" msgstr "" @@ -721,20 +773,20 @@ msgstr "" msgid "Check for mistakes if you typed or copied the address." msgstr "" -#: app/views/request/preview.rhtml:7 #: app/views/request/followup_preview.rhtml:14 +#: app/views/request/preview.rhtml:7 msgid "Check you haven't included any <strong>personal information</strong>." msgstr "" -#: app/models/info_request_event.rb:326 +#: app/models/info_request_event.rb:331 msgid "Clarification" msgstr "" -#: app/models/info_request_event.rb:290 +#: app/models/info_request_event.rb:295 msgid "Clarification required" msgstr "" -#: app/controllers/request_controller.rb:334 +#: app/controllers/request_controller.rb:339 msgid "Classify an FOI response from " msgstr "" @@ -751,32 +803,50 @@ msgid "" "to reply to your request." msgstr "" -#: locale/model_attributes.rb:28 +#: locale/model_attributes.rb:22 msgid "Comment|Body" msgstr "" -#: locale/model_attributes.rb:27 +#: locale/model_attributes.rb:21 msgid "Comment|Comment type" msgstr "" -#: locale/model_attributes.rb:30 +#: locale/model_attributes.rb:24 msgid "Comment|Locale" msgstr "" -#: locale/model_attributes.rb:29 +#: locale/model_attributes.rb:23 msgid "Comment|Visible" msgstr "" +#: app/models/track_thing.rb:147 +msgid "Confirm you want to be emailed about new requests" +msgstr "" + +#: app/models/track_thing.rb:214 +msgid "" +"Confirm you want to be emailed about new requests or responses matching " +"'{{query}}'" +msgstr "" + +#: app/models/track_thing.rb:198 +msgid "Confirm you want to be emailed about requests by '{{user_name}}'" +msgstr "" + +#: app/models/track_thing.rb:182 +msgid "Confirm you want to be emailed about requests to '{{public_body_name}}'" +msgstr "" + #: app/models/track_thing.rb:163 msgid "Confirm you want to be emailed when an FOI request succeeds" msgstr "" -#: app/controllers/request_controller.rb:295 +#: app/controllers/request_controller.rb:300 msgid "Confirm your FOI request to " msgstr "" -#: app/controllers/request_controller.rb:696 -#: app/controllers/user_controller.rb:514 +#: app/controllers/request_controller.rb:703 +#: app/controllers/user_controller.rb:515 msgid "Confirm your account on {{site_name}}" msgstr "" @@ -785,13 +855,17 @@ msgid "Confirm your annotation to {{info_request_title}}" msgstr "" #: app/models/user_mailer.rb:34 -msgid "Confirm your new email address on WhatDoTheyKnow.com" +msgid "Confirm your new email address on {{site_name}}" msgstr "" -#: app/views/layouts/default.rhtml:146 +#: app/views/layouts/default.rhtml:127 msgid "Contact {{site_name}}" msgstr "" +#: app/models/request_mailer.rb:210 +msgid "Could not identify the request from the email address" +msgstr "" + #: app/models/profile_photo.rb:96 msgid "" "Couldn't understand the image file that you uploaded. PNG, JPEG, GIF and " @@ -808,13 +882,13 @@ msgid "" " environmental factors listed above)" msgstr "" -#: app/views/request/show.rhtml:61 +#: app/views/request/show.rhtml:68 msgid "" "Currently <strong>waiting for a response</strong> from {{public_body_link}}, " "they must respond promptly and" msgstr "" -#: app/models/info_request_event.rb:294 +#: app/models/info_request_event.rb:299 msgid "Deadline Extended" msgstr "" @@ -822,11 +896,11 @@ msgstr "" msgid "Dear " msgstr "" -#: app/models/info_request.rb:780 +#: app/models/info_request.rb:787 msgid "Delayed." msgstr "" -#: app/models/info_request.rb:798 app/models/info_request_event.rb:310 +#: app/models/info_request.rb:805 app/models/info_request_event.rb:315 msgid "Delivery error" msgstr "" @@ -848,7 +922,7 @@ msgstr "" msgid "Download original attachment" msgstr "" -#: app/views/request/_followup.rhtml:88 +#: app/views/request/_followup.rhtml:85 msgid "" "Edit and add <strong>more details</strong> to the message above,\n" " explaining why you are dissatisfied with their response." @@ -862,11 +936,11 @@ msgstr "" msgid "Edit text about you" msgstr "" -#: app/models/user.rb:132 +#: app/models/user.rb:135 msgid "Either the email or password was not recognised, please try again." msgstr "" -#: app/models/user.rb:134 +#: app/models/user.rb:137 msgid "" "Either the email or password was not recognised, please try again. Or create " "a new account using the form on the right." @@ -884,6 +958,10 @@ msgstr "" msgid "Email me new successful responses " msgstr "" +#: app/models/track_thing.rb:139 +msgid "Email me when there are new requests" +msgstr "" + #: app/views/user/show.rhtml:36 msgid "Email subscriptions" msgstr "" @@ -931,19 +1009,19 @@ msgid "" " this website forever (<a href=\"%s\">why?</a>)." msgstr "" -#: locale/model_attributes.rb:61 +#: locale/model_attributes.rb:60 msgid "EximLogDone|Filename" msgstr "" -#: locale/model_attributes.rb:62 +#: locale/model_attributes.rb:61 msgid "EximLogDone|Last stat" msgstr "" -#: locale/model_attributes.rb:16 +#: locale/model_attributes.rb:19 msgid "EximLog|Line" msgstr "" -#: locale/model_attributes.rb:15 +#: locale/model_attributes.rb:18 msgid "EximLog|Order" msgstr "" @@ -955,14 +1033,18 @@ msgstr "" msgid "FOI requests" msgstr "" +#: app/models/track_thing.rb:193 app/models/track_thing.rb:194 +msgid "FOI requests by '{{user_name}}'" +msgstr "" + #: app/models/profile_photo.rb:101 msgid "Failed to convert image to a PNG" msgstr "" #: app/models/profile_photo.rb:105 msgid "" -"Failed to convert image to the correct size: at %{cols}x%{rows}, need " -"%{width}x%{height}" +"Failed to convert image to the correct size: at %{cols}x%{rows}, need %" +"{width}x%{height}" msgstr "" #: app/views/request/new.rhtml:21 @@ -981,10 +1063,14 @@ msgstr "" msgid "Follow this link to see the request:" msgstr "" -#: app/models/info_request_event.rb:330 +#: app/models/info_request_event.rb:335 msgid "Follow up" msgstr "" +#: app/views/general/search.rhtml:159 +msgid "Follow up message sent by requester" +msgstr "" + #: app/views/public_body/view_email.rhtml:14 msgid "Follow up messages to existing requests are sent to " msgstr "" @@ -992,9 +1078,8 @@ msgstr "" #: app/views/request/_followup.rhtml:16 msgid "" "Follow ups and new responses to this request have been stopped to prevent " -"spam. Please\n" -" <a href=\"%s\">contact us</a> if you are {{user_link}} and need to " -"send a follow up." +"spam. Please <a href=\"{{url}}\">contact us</a> if you are {{user_link}} and " +"need to send a follow up." msgstr "" #: app/views/public_body/show.rhtml:61 @@ -1057,23 +1142,23 @@ msgstr "" msgid "Go to our <a href=\"%s\">front page</a></li>" msgstr "" -#: app/models/info_request_event.rb:292 +#: app/models/info_request_event.rb:297 msgid "Handled by post" msgstr "" -#: app/models/info_request.rb:794 +#: app/models/info_request.rb:801 msgid "Handled by post." msgstr "" -#: app/views/layouts/default.rhtml:121 +#: app/views/layouts/default.rhtml:102 msgid "Hello!" msgstr "" -#: app/views/layouts/default.rhtml:118 +#: app/views/layouts/default.rhtml:99 msgid "Hello, {{username}}!" msgstr "" -#: app/views/layouts/default.rhtml:113 +#: app/views/layouts/default.rhtml:94 msgid "Help" msgstr "" @@ -1083,9 +1168,9 @@ msgid "" "request, and\n" "the most recent event had its status updated to that value. " "<strong>calculated</strong> is then inferred by\n" -"WhatDoTheyKnow for intermediate events, which weren't given an explicit\n" -"description by a user. See the <a href=\"%s\">search tips</a> for " -"description of the states." +"{{site_name}} for intermediate events, which weren't given an explicit\n" +"description by a user. See the <a href=\"{{search_path}}\">search tips</a> " +"for description of the states." msgstr "" #: app/views/request/_other_describe_state.rhtml:4 @@ -1096,11 +1181,11 @@ msgid "" " Thanks." msgstr "" -#: locale/model_attributes.rb:58 +#: locale/model_attributes.rb:57 msgid "Holiday|Day" msgstr "" -#: locale/model_attributes.rb:59 +#: locale/model_attributes.rb:58 msgid "Holiday|Description" msgstr "" @@ -1118,11 +1203,11 @@ msgstr "" msgid "Human health and safety" msgstr "" -#: app/views/request/_followup.rhtml:71 +#: app/views/request/_followup.rhtml:68 msgid "I am asking for <strong>new information</strong>" msgstr "" -#: app/views/request/_followup.rhtml:76 +#: app/views/request/_followup.rhtml:73 msgid "I am requesting an <strong>internal review</strong>" msgstr "" @@ -1182,7 +1267,7 @@ msgid "" "email {{contact_email}} for help." msgstr "" -#: app/views/request/_followup.rhtml:21 +#: app/views/request/_followup.rhtml:20 msgid "" "If you are dissatisfied by the response you got from\n" " the public authority, you have the right to\n" @@ -1205,7 +1290,7 @@ msgid "" " please <a href=\"%s\">read this first</a>." msgstr "" -#: app/views/request/show.rhtml:98 +#: app/views/request/show.rhtml:105 msgid "If you are {{user_link}}, please" msgstr "" @@ -1237,15 +1322,15 @@ msgid "" "more. Please try doing what you were doing from the beginning." msgstr "" -#: app/controllers/request_controller.rb:430 +#: app/controllers/request_controller.rb:437 msgid "" "If you have not done so already, please write a message below telling the " "authority that you have withdrawn your request. Otherwise they will not know " "it has been withdrawn." msgstr "" -#: app/views/user/signchangepassword_confirm.rhtml:10 #: app/views/user/signchangeemail_confirm.rhtml:11 +#: app/views/user/signchangepassword_confirm.rhtml:10 msgid "" "If you use web-based email or have \"junk mail\" filters, also check your\n" "bulk/spam mail folders. Sometimes, our messages are marked that way." @@ -1258,11 +1343,11 @@ msgid "" msgstr "" #: app/views/user/_signup.rhtml:6 -msgid "If you're new to WhatDoTheyKnow" +msgid "If you're new to {{site_name}}" msgstr "" #: app/views/user/_signin.rhtml:7 -msgid "If you've used WhatDoTheyKnow before" +msgid "If you've used {{site_name}} before" msgstr "" #: app/views/user/no_cookies.rhtml:12 @@ -1271,79 +1356,79 @@ msgid "" "then there is probably a fault with our server." msgstr "" -#: locale/model_attributes.rb:64 +#: locale/model_attributes.rb:63 msgid "IncomingMessage|Cached attachment text clipped" msgstr "" -#: locale/model_attributes.rb:65 +#: locale/model_attributes.rb:64 msgid "IncomingMessage|Cached main body text folded" msgstr "" -#: locale/model_attributes.rb:66 +#: locale/model_attributes.rb:65 msgid "IncomingMessage|Cached main body text unfolded" msgstr "" -#: locale/model_attributes.rb:39 +#: locale/model_attributes.rb:44 msgid "InfoRequestEvent|Calculated state" msgstr "" -#: locale/model_attributes.rb:38 +#: locale/model_attributes.rb:43 msgid "InfoRequestEvent|Described state" msgstr "" -#: locale/model_attributes.rb:36 +#: locale/model_attributes.rb:41 msgid "InfoRequestEvent|Event type" msgstr "" -#: locale/model_attributes.rb:40 +#: locale/model_attributes.rb:45 msgid "InfoRequestEvent|Last described at" msgstr "" -#: locale/model_attributes.rb:37 +#: locale/model_attributes.rb:42 msgid "InfoRequestEvent|Params yaml" msgstr "" -#: locale/model_attributes.rb:41 +#: locale/model_attributes.rb:46 msgid "InfoRequestEvent|Prominence" msgstr "" -#: locale/model_attributes.rb:87 +#: locale/model_attributes.rb:86 msgid "InfoRequest|Allow new responses from" msgstr "" -#: locale/model_attributes.rb:83 +#: locale/model_attributes.rb:82 msgid "InfoRequest|Awaiting description" msgstr "" -#: locale/model_attributes.rb:82 +#: locale/model_attributes.rb:81 msgid "InfoRequest|Described state" msgstr "" -#: locale/model_attributes.rb:88 +#: locale/model_attributes.rb:87 msgid "InfoRequest|Handle rejected responses" msgstr "" -#: locale/model_attributes.rb:86 +#: locale/model_attributes.rb:85 msgid "InfoRequest|Law used" msgstr "" -#: locale/model_attributes.rb:84 +#: locale/model_attributes.rb:83 msgid "InfoRequest|Prominence" msgstr "" -#: locale/model_attributes.rb:81 +#: locale/model_attributes.rb:80 msgid "InfoRequest|Title" msgstr "" -#: locale/model_attributes.rb:85 +#: locale/model_attributes.rb:84 msgid "InfoRequest|Url title" msgstr "" -#: app/models/info_request_event.rb:298 +#: app/models/info_request_event.rb:303 msgid "Information not held" msgstr "" -#: app/models/info_request.rb:784 +#: app/models/info_request.rb:791 msgid "Information not held." msgstr "" @@ -1353,17 +1438,17 @@ msgid "" " radiation, waste materials)" msgstr "" -#: app/models/info_request_event.rb:306 +#: app/models/info_request_event.rb:311 msgid "Internal review acknowledgement" msgstr "" -#: app/models/info_request_event.rb:323 +#: app/models/info_request_event.rb:328 msgid "Internal review request" msgstr "" #: app/views/outgoing_mailer/initial_request.rhtml:8 msgid "" -"Is {{email_address}} the wrong address for {{type_of_request}} requests tp " +"Is {{email_address}} the wrong address for {{type_of_request}} requests to " "{{public_body_name}}? If so, please contact us using this form:" msgstr "" @@ -1376,14 +1461,14 @@ msgid "" "browser. Then press refresh to have another go." msgstr "" -#: app/views/user/show.rhtml:62 -msgid "Joined WhatDoTheyKnow in" -msgstr "" - #: app/views/user/_user_listing_single.rhtml:21 msgid "Joined in" msgstr "" +#: app/views/user/show.rhtml:62 +msgid "Joined {{site_name}} in" +msgstr "" + #: app/views/request/new.rhtml:48 msgid "" "Keep it <strong>focused</strong>, you'll be more likely to get what you want " @@ -1417,7 +1502,7 @@ msgstr "" msgid "Local and regional" msgstr "" -#: app/models/info_request.rb:782 +#: app/models/info_request.rb:789 msgid "Long overdue." msgstr "" @@ -1433,7 +1518,7 @@ msgstr "" msgid "Make and browse Freedom of Information (FOI) requests" msgstr "" -#: app/views/layouts/default.rhtml:86 +#: app/views/layouts/default.rhtml:67 msgid "Make and explore Freedom of Information requests" msgstr "" @@ -1441,7 +1526,7 @@ msgstr "" msgid "Make or explore Freedom of Information requests" msgstr "" -#: app/views/layouts/default.rhtml:106 +#: app/views/layouts/default.rhtml:87 msgid "Make request" msgstr "" @@ -1450,7 +1535,7 @@ msgid "Make your own request" msgstr "" #: app/views/contact_mailer/message.rhtml:4 -msgid "Message sent using WhatDoTheyKnow contact form, " +msgid "Message sent using {{site_name}} contact form, " msgstr "" #: app/views/request/new_bad_contact.rhtml:1 @@ -1473,7 +1558,7 @@ msgstr "" msgid "My request has been <strong>refused</strong>" msgstr "" -#: app/views/layouts/default.rhtml:110 +#: app/views/layouts/default.rhtml:91 msgid "My requests" msgstr "" @@ -1485,6 +1570,10 @@ msgstr "" msgid "Name is already taken" msgstr "" +#: app/models/track_thing.rb:142 app/models/track_thing.rb:143 +msgid "New Freedom of Information requests" +msgstr "" + #: app/views/user/signchangeemail.rhtml:20 msgid "New e-mail:" msgstr "" @@ -1539,14 +1628,14 @@ msgid "" "using this site yet." msgstr "" -#: app/views/request/_request_listing.rhtml:2 #: app/views/public_body/_body_listing.rhtml:2 +#: app/views/request/_request_listing.rhtml:2 msgid "None found." msgstr "" +#: app/views/user/signchangeemail_confirm.rhtml:3 #: app/views/user/signchangepassword_confirm.rhtml:1 #: app/views/user/signchangepassword_confirm.rhtml:3 -#: app/views/user/signchangeemail_confirm.rhtml:3 msgid "Now check your email!" msgstr "" @@ -1576,7 +1665,7 @@ msgid "" "{{site_name}}" msgstr "" -#: app/controllers/request_controller.rb:407 +#: app/controllers/request_controller.rb:414 msgid "" "Oh no! Sorry to hear that your request was refused. Here is what to do now." msgstr "" @@ -1607,27 +1696,43 @@ msgstr "" msgid "Only requests made using {{site_name}} are shown." msgstr "" -#: locale/model_attributes.rb:21 +#: app/models/info_request.rb:405 +msgid "" +"Only the authority can reply to this request, and I don't recognise the " +"address this reply was sent from" +msgstr "" + +#: app/models/info_request.rb:401 +msgid "" +"Only the authority can reply to this request, but there is no \"From\" " +"address to check against" +msgstr "" + +#: app/views/general/search.rhtml:158 +msgid "Original request sent" +msgstr "" + +#: locale/model_attributes.rb:26 msgid "OutgoingMessage|Body" msgstr "" -#: locale/model_attributes.rb:24 +#: locale/model_attributes.rb:29 msgid "OutgoingMessage|Last sent at" msgstr "" -#: locale/model_attributes.rb:23 +#: locale/model_attributes.rb:28 msgid "OutgoingMessage|Message type" msgstr "" -#: locale/model_attributes.rb:22 +#: locale/model_attributes.rb:27 msgid "OutgoingMessage|Status" msgstr "" -#: locale/model_attributes.rb:25 +#: locale/model_attributes.rb:30 msgid "OutgoingMessage|What doing" msgstr "" -#: app/models/info_request.rb:788 +#: app/models/info_request.rb:795 msgid "Partially successful." msgstr "" @@ -1651,7 +1756,7 @@ msgstr "" msgid "Plans and administrative measures that affect these matters" msgstr "" -#: app/controllers/request_game_controller.rb:40 +#: app/controllers/request_game_controller.rb:42 msgid "Play the request categorisation game" msgstr "" @@ -1659,7 +1764,7 @@ msgstr "" msgid "Play the request categorisation game!" msgstr "" -#: app/views/request/show.rhtml:94 +#: app/views/request/show.rhtml:101 msgid "Please" msgstr "" @@ -1667,7 +1772,7 @@ msgstr "" msgid "Please <a href=\"%s\">get in touch</a> with us so we can fix it." msgstr "" -#: app/views/request/show.rhtml:45 +#: app/views/request/show.rhtml:52 msgid "" "Please <strong>answer the question above</strong> so we know whether the " msgstr "" @@ -1678,11 +1783,11 @@ msgid "" " know if there was information in the recent responses to them." msgstr "" -#: app/views/request/_followup.rhtml:28 +#: app/views/request/_followup.rhtml:27 msgid "" -"Please <strong>only</strong> write messages directly relating to your \n" -"\t\t\t\trequest {{request_link}}. If you would like to ask for information\n" -"\t\t\t\tthat was not in your original request, then <a href=\"%s\">file a " +"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 "" @@ -1704,7 +1809,7 @@ msgstr "" msgid "Please choose what sort of reply you are making." msgstr "" -#: app/controllers/request_controller.rb:341 +#: app/controllers/request_controller.rb:346 msgid "" "Please choose whether or not you got some of the information that you wanted." msgstr "" @@ -1712,15 +1817,15 @@ msgstr "" #: app/views/user_mailer/changeemail_confirm.rhtml:3 msgid "" "Please click on the link below to confirm that you want to \n" -"change the email address that you use for WhatDoTheyKnow\n" -"from " +"change the email address that you use for {{site_name}}\n" +"from {{old_email}} to {{new_email}}" msgstr "" #: app/views/user_mailer/confirm_login.rhtml:3 msgid "Please click on the link below to confirm your email address." msgstr "" -#: app/models/info_request.rb:127 +#: app/models/info_request.rb:126 msgid "" "Please describe more what the request is about in the subject. There is no " "need to say it is an FOI request, we add that on anyway." @@ -1744,7 +1849,7 @@ msgstr "" msgid "Please enter a subject" msgstr "" -#: app/models/info_request.rb:35 +#: app/models/info_request.rb:34 msgid "Please enter a summary of your request" msgstr "" @@ -1804,7 +1909,7 @@ msgstr "" msgid "Please keep it shorter than 500 characters" msgstr "" -#: app/models/info_request.rb:124 +#: app/models/info_request.rb:123 msgid "" "Please keep the summary short, like in the subject of an email. You can use " "a phrase, rather than a full sentence." @@ -1835,11 +1940,11 @@ msgstr "" msgid "Please sign in as " msgstr "" -#: app/controllers/request_controller.rb:723 +#: app/controllers/request_controller.rb:730 msgid "Please type a message and/or choose a file containing your response." msgstr "" -#: app/controllers/request_controller.rb:427 +#: app/controllers/request_controller.rb:434 msgid "Please use the form below to tell us more." msgstr "" @@ -1848,11 +1953,11 @@ msgstr "" msgid "Please use this email address for all replies to this request:" msgstr "" -#: app/models/info_request.rb:36 +#: app/models/info_request.rb:35 msgid "Please write a summary with some text in it" msgstr "" -#: app/models/info_request.rb:121 +#: app/models/info_request.rb:120 msgid "" "Please write the summary using a mixture of capital and lower case letters. " "This makes it easier for others to read." @@ -1864,7 +1969,7 @@ msgid "" "letters. This makes it easier for others to read." msgstr "" -#: app/controllers/request_controller.rb:416 +#: app/controllers/request_controller.rb:423 msgid "" "Please write your follow up message containing the necessary clarifications " "below." @@ -1886,27 +1991,27 @@ msgstr "" msgid "Post annotation" msgstr "" -#: locale/model_attributes.rb:56 +#: locale/model_attributes.rb:55 msgid "PostRedirect|Circumstance" msgstr "" -#: locale/model_attributes.rb:54 +#: locale/model_attributes.rb:53 msgid "PostRedirect|Email token" msgstr "" -#: locale/model_attributes.rb:53 +#: locale/model_attributes.rb:52 msgid "PostRedirect|Post params yaml" msgstr "" -#: locale/model_attributes.rb:55 +#: locale/model_attributes.rb:54 msgid "PostRedirect|Reason params yaml" msgstr "" -#: locale/model_attributes.rb:51 +#: locale/model_attributes.rb:50 msgid "PostRedirect|Token" msgstr "" -#: locale/model_attributes.rb:52 +#: locale/model_attributes.rb:51 msgid "PostRedirect|Uri" msgstr "" @@ -1926,7 +2031,7 @@ msgstr "" msgid "Preview your annotation" msgstr "" -#: app/views/request/_followup.rhtml:99 +#: app/views/request/_followup.rhtml:96 msgid "Preview your message" msgstr "" @@ -1934,11 +2039,11 @@ msgstr "" msgid "Preview your public request" msgstr "" -#: locale/model_attributes.rb:18 +#: locale/model_attributes.rb:15 msgid "ProfilePhoto|Data" msgstr "" -#: locale/model_attributes.rb:19 +#: locale/model_attributes.rb:16 msgid "ProfilePhoto|Draft" msgstr "" @@ -2000,12 +2105,8 @@ msgstr "" msgid "Publication scheme" msgstr "" -#: locale/model_attributes.rb:49 -msgid "RawEmail|Data binary" -msgstr "" - #: locale/model_attributes.rb:48 -msgid "RawEmail|Data text" +msgid "RawEmail|Data binary" msgstr "" #: app/views/comment/preview.rhtml:20 @@ -2022,11 +2123,11 @@ msgstr "" #: app/views/general/search.rhtml:137 msgid "" -"Read about <a href=\"%s\">advanced search operators</a>, such as proximity " -"and wildcards." +"Read about <a href=\"{{advanced_search_url}}\">advanced search operators</" +"a>, such as proximity and wildcards." msgstr "" -#: app/views/layouts/default.rhtml:112 +#: app/views/layouts/default.rhtml:93 msgid "Read blog" msgstr "" @@ -2034,11 +2135,15 @@ msgstr "" msgid "Read this before writing your {{info_request_law_used_full}} request" msgstr "" +#: app/views/general/search.rhtml:150 +msgid "Received an error message, such as delivery failure." +msgstr "" + #: app/views/general/search.rhtml:42 msgid "Recently described results first" msgstr "" -#: app/controllers/request_controller.rb:134 +#: app/controllers/request_controller.rb:139 msgid "Recently sent Freedom of Information requests" msgstr "" @@ -2046,15 +2151,15 @@ msgstr "" msgid "Recently sent requests" msgstr "" -#: app/controllers/request_controller.rb:139 +#: app/controllers/request_controller.rb:144 msgid "Recently successful responses" msgstr "" -#: app/models/info_request_event.rb:300 +#: app/models/info_request_event.rb:305 msgid "Refused" msgstr "" -#: app/models/info_request.rb:786 +#: app/models/info_request.rb:793 msgid "Refused." msgstr "" @@ -2104,6 +2209,10 @@ msgstr "" msgid "Requested on {{date}}" msgstr "" +#: app/models/track_thing.rb:209 app/models/track_thing.rb:210 +msgid "Requests or responses matching '{{query}}'" +msgstr "" + #: app/views/request/upload_response.rhtml:11 msgid "Respond by email" msgstr "" @@ -2120,11 +2229,15 @@ msgstr "" msgid "Respond using the web" msgstr "" -#: app/views/request/show.rhtml:70 +#: app/views/general/search.rhtml:160 +msgid "Response from a public authority" +msgstr "" + +#: app/views/request/show.rhtml:77 msgid "Response to this request is <strong>delayed</strong>." msgstr "" -#: app/views/request/show.rhtml:78 +#: app/views/request/show.rhtml:85 msgid "Response to this request is <strong>long overdue</strong>." msgstr "" @@ -2144,9 +2257,9 @@ msgstr "" msgid "Save" msgstr "" -#: app/views/request/new.rhtml:31 app/views/layouts/default.rhtml:99 #: app/views/general/exception_caught.rhtml:10 #: app/views/general/frontpage.rhtml:16 app/views/general/search.rhtml:29 +#: app/views/layouts/default.rhtml:80 app/views/request/new.rhtml:31 msgid "Search" msgstr "" @@ -2158,7 +2271,7 @@ msgstr "" msgid "Search the site to find what you were looking for." msgstr "" -#: app/controllers/user_controller.rb:330 +#: app/controllers/user_controller.rb:331 msgid "Send a message to " msgstr "" @@ -2198,7 +2311,7 @@ msgstr "" msgid "Show most relevant results first" msgstr "" -#: app/views/request/list.rhtml:2 app/views/public_body/list.rhtml:3 +#: app/views/public_body/list.rhtml:3 app/views/request/list.rhtml:2 msgid "Show only..." msgstr "" @@ -2210,11 +2323,11 @@ msgstr "" msgid "Sign in or make a new account" msgstr "" -#: app/views/layouts/default.rhtml:122 +#: app/views/layouts/default.rhtml:103 msgid "Sign in or sign up" msgstr "" -#: app/views/layouts/default.rhtml:119 +#: app/views/layouts/default.rhtml:100 msgid "Sign out" msgstr "" @@ -2226,10 +2339,14 @@ msgstr "" msgid "Similar requests" msgstr "" -#: app/models/info_request_event.rb:302 +#: app/models/info_request_event.rb:307 msgid "Some information sent" msgstr "" +#: app/views/general/search.rhtml:145 +msgid "Some of the information requested has been received" +msgstr "" + #: app/views/request_game/play.rhtml:31 msgid "" "Some people who've made requests haven't let us know whether they were\n" @@ -2242,7 +2359,7 @@ msgstr "" #: app/views/user_mailer/changeemail_already_used.rhtml:1 msgid "" "Someone, perhaps you, just tried to change their email address on\n" -"WhatDoTheyKnow.com from " +"{{site_name}} from {{old_email}} to {{new_email}}." msgstr "" #: app/views/general/exception_caught.rhtml:1 @@ -2257,8 +2374,8 @@ msgstr "" msgid "Still awaiting an <strong>internal review</strong>" msgstr "" -#: app/views/request/preview.rhtml:18 #: app/views/request/followup_preview.rhtml:23 +#: app/views/request/preview.rhtml:18 msgid "Subject:" msgstr "" @@ -2278,7 +2395,7 @@ msgstr "" msgid "Successful responses" msgstr "" -#: app/models/info_request.rb:790 +#: app/models/info_request.rb:797 msgid "Successful." msgstr "" @@ -2300,7 +2417,7 @@ msgstr "" msgid "Tags:" msgstr "" -#: app/controllers/request_game_controller.rb:50 +#: app/controllers/request_game_controller.rb:52 msgid "Thank you for helping us keep the site tidy!" msgstr "" @@ -2308,25 +2425,25 @@ msgstr "" msgid "Thank you for making an annotation!" msgstr "" -#: app/controllers/request_controller.rb:729 +#: app/controllers/request_controller.rb:736 msgid "" "Thank you for responding to this FOI request! Your response has been " "published below, and a link to your response has been emailed to " msgstr "" -#: app/controllers/request_controller.rb:373 +#: app/controllers/request_controller.rb:378 msgid "" -"Thank you for updating the status of the request '<a href=\"%s\">" +"Thank you for updating the status of the request '<a href=\"{{url}}\">" "{{info_request_title}}</a>'. There are some more requests below for you to " "classify." msgstr "" -#: app/controllers/request_controller.rb:376 +#: app/controllers/request_controller.rb:381 msgid "Thank you for updating this request!" msgstr "" -#: app/controllers/user_controller.rb:397 -#: app/controllers/user_controller.rb:413 +#: app/controllers/user_controller.rb:398 +#: app/controllers/user_controller.rb:414 msgid "Thank you for updating your profile photo" msgstr "" @@ -2353,7 +2470,7 @@ msgid "" " requests." msgstr "" -#: app/controllers/user_controller.rb:188 +#: app/controllers/user_controller.rb:189 msgid "" "That doesn't look like a valid email address. Please check you have typed it " "correctly." @@ -2368,7 +2485,7 @@ msgstr "" msgid "The Freedom of Information Act <strong>does not apply</strong> to" msgstr "" -#: app/views/user_mailer/changeemail_already_used.rhtml:7 +#: app/views/user_mailer/changeemail_already_used.rhtml:8 msgid "The accounts have been left as they previously were." msgstr "" @@ -2390,7 +2507,7 @@ msgid "" "request" msgstr "" -#: app/views/request/show.rhtml:102 +#: app/views/request/show.rhtml:109 msgid "" "The authority would like to / has <strong>responded by post</strong> to this " "request." @@ -2416,32 +2533,48 @@ msgstr "" msgid "The page either doesn't exist, or is broken. Things you can try now:" msgstr "" +#: app/views/general/search.rhtml:143 +msgid "The public authority does not have the information requested" +msgstr "" + +#: app/views/general/search.rhtml:147 +msgid "The public authority would like part of the request explained" +msgstr "" + +#: app/views/general/search.rhtml:148 +msgid "The public authority would like to / has responded by post" +msgstr "" + #: app/views/request/_other_describe_state.rhtml:60 msgid "The request has been <strong>refused</strong>" msgstr "" -#: app/controllers/request_controller.rb:347 +#: app/controllers/request_controller.rb:352 msgid "" "The request has been updated since you originally loaded this page. Please " "check for any new incoming messages below, and try again." msgstr "" -#: app/views/request/show.rhtml:97 +#: app/views/request/show.rhtml:104 msgid "The request is <strong>waiting for clarification</strong>." msgstr "" -#: app/views/request/show.rhtml:90 +#: app/views/request/show.rhtml:97 msgid "The request was <strong>partially successful</strong>." msgstr "" -#: app/views/request/show.rhtml:86 +#: app/views/request/show.rhtml:93 msgid "The request was <strong>refused</strong> by" msgstr "" -#: app/views/request/show.rhtml:88 +#: app/views/request/show.rhtml:95 msgid "The request was <strong>successful</strong>." msgstr "" +#: app/views/general/search.rhtml:144 +msgid "The request was refused by the public authority" +msgstr "" + #: app/views/request/hidden.rhtml:9 msgid "" "The request you have tried to view has been removed. There are\n" @@ -2450,7 +2583,11 @@ msgid "" " href=\"%s\">contact us</a> if you have any questions." msgstr "" -#: app/views/request/_followup.rhtml:35 +#: app/views/general/search.rhtml:152 +msgid "The requester has abandoned this request for some reason" +msgstr "" + +#: app/views/request/_followup.rhtml:32 msgid "" "The response to your request has been <strong>delayed</strong>. You can say " "that, \n" @@ -2458,7 +2595,7 @@ msgid "" " <strong>promptly</strong> and" msgstr "" -#: app/views/request/_followup.rhtml:47 +#: app/views/request/_followup.rhtml:44 msgid "" "The response to your request is <strong>long overdue</strong>. You can say " "that, by \n" @@ -2479,59 +2616,81 @@ msgid "" "Information requests this person has made." msgstr "" -#: app/controllers/track_controller.rb:142 +#: app/controllers/track_controller.rb:144 msgid "Then you can cancel the alert." msgstr "" -#: app/controllers/track_controller.rb:172 +#: app/controllers/track_controller.rb:174 msgid "Then you can cancel the alerts." msgstr "" -#: app/controllers/user_controller.rb:248 +#: app/controllers/user_controller.rb:249 msgid "Then you can change your email address used on {{site_name}}" msgstr "" -#: app/controllers/user_controller.rb:202 +#: app/controllers/user_controller.rb:203 msgid "Then you can change your password on {{site_name}}" msgstr "" -#: app/controllers/request_controller.rb:333 +#: app/controllers/request_controller.rb:338 msgid "Then you can classify the FOI response you have got from " msgstr "" -#: app/controllers/request_game_controller.rb:39 +#: app/controllers/request_game_controller.rb:41 msgid "Then you can play the request categorisation game." msgstr "" -#: app/controllers/user_controller.rb:329 +#: app/controllers/user_controller.rb:330 msgid "Then you can send a message to " msgstr "" -#: app/controllers/user_controller.rb:513 +#: app/controllers/user_controller.rb:514 msgid "Then you can sign in to {{site_name}}" msgstr "" -#: app/controllers/request_controller.rb:59 +#: app/controllers/request_controller.rb:61 msgid "Then you can update the status of your request to " msgstr "" -#: app/controllers/request_controller.rb:695 +#: app/controllers/request_controller.rb:702 msgid "Then you can upload an FOI response. " msgstr "" -#: app/controllers/request_controller.rb:538 +#: app/controllers/request_controller.rb:545 msgid "Then you can write follow up message to " msgstr "" -#: app/controllers/request_controller.rb:539 +#: app/controllers/request_controller.rb:546 msgid "Then you can write your reply to " msgstr "" +#: app/models/track_thing.rb:197 +msgid "" +"Then you will be emailed whenever '{{user_name}}' requests something or gets " +"a response." +msgstr "" + +#: app/models/track_thing.rb:213 +msgid "" +"Then you will be emailed whenever a new request or response matches " +"'{{query}}'." +msgstr "" + #: app/models/track_thing.rb:162 msgid "Then you will be emailed whenever an FOI request succeeds." msgstr "" -#: app/controllers/request_controller.rb:294 +#: app/models/track_thing.rb:146 +msgid "Then you will be emailed whenever anyone makes a new FOI request." +msgstr "" + +#: app/models/track_thing.rb:181 +msgid "" +"Then you will be emailed whenever someone requests something or gets a " +"response from '{{public_body_name}}'." +msgstr "" + +#: app/controllers/request_controller.rb:299 msgid "Then your FOI request to {{public_body_name}} will be sent." msgstr "" @@ -2552,13 +2711,13 @@ msgid "" " One of them is shown below, you may mean a different one:" msgstr "" -#: app/views/request/show.rhtml:106 +#: app/views/request/show.rhtml:113 msgid "" "There was a <strong>delivery error</strong> or similar, which needs fixing " -"by the WhatDoTheyKnow team." +"by the {{site_name}} team." msgstr "" -#: app/controllers/public_body_controller.rb:76 +#: app/controllers/public_body_controller.rb:77 msgid "There was an error with the words you entered, please try again." msgstr "" @@ -2599,8 +2758,8 @@ msgstr "" #: app/views/request/_hidden_correspondence.rhtml:23 msgid "" "This comment has been hidden. See annotations to\n" -" find out why. If you are the requester, then you may <a href=" -"\"%s\">sign in</a> to view the response." +" find out why. If you are the requester, then you may <a href=\"%" +"s\">sign in</a> to view the response." msgstr "" #: app/views/request/new.rhtml:65 @@ -2630,8 +2789,8 @@ msgstr "" #: app/views/request/_hidden_correspondence.rhtml:17 msgid "" "This outgoing message has been hidden. See annotations to\n" -"\t\t\t\t\t\tfind out why. If you are the requester, then you may <a href=" -"\"%s\">sign in</a> to view the response." +"\t\t\t\t\t\tfind out why. If you are the requester, then you may <a href=\"%" +"s\">sign in</a> to view the response." msgstr "" #: app/views/user/show.rhtml:122 @@ -2646,21 +2805,27 @@ msgstr "" msgid "This request <strong>requires administrator attention</strong>" msgstr "" -#: app/views/request/show.rhtml:48 +#: app/views/request/show.rhtml:55 msgid "This request has an <strong>unknown status</strong>." msgstr "" -#: app/views/request/show.rhtml:110 +#: app/views/request/show.rhtml:117 msgid "" "This request has been <strong>withdrawn</strong> by the person who made " "it. \n" " \t There may be an explanation in the correspondence below." msgstr "" -#: app/views/request/show.rhtml:108 +#: app/models/info_request.rb:395 +msgid "" +"This request has been set by an administrator to \"allow new responses from " +"nobody\"" +msgstr "" + +#: app/views/request/show.rhtml:115 msgid "" "This request has had an unusual response, and <strong>requires attention</" -"strong> from the WhatDoTheyKnow team." +"strong> from the {{site_name}} team." msgstr "" #: app/views/request/show.rhtml:5 @@ -2692,32 +2857,46 @@ msgstr "" #: app/views/request/details.rhtml:6 msgid "" "This table shows the technical details of the internal events that happened\n" -"to this request on WhatDoTheyKnow. This could be used to generate " -"information about\n" +"to this request on {{site_name}}. This could be used to generate information " +"about\n" "the speed with which authorities respond to requests, the number of " "requests\n" "which require a postal response and much more." msgstr "" #: app/views/user/show.rhtml:79 -msgid "This user has been banned from WhatDoTheyKnow.com " +msgid "This user has been banned from {{site_name}} " msgstr "" -#: app/views/user_mailer/changeemail_already_used.rhtml:4 +#: app/views/user_mailer/changeemail_already_used.rhtml:5 msgid "" "This was not possible because there is already an account using \n" -"the email address " +"the email address {{email}}." +msgstr "" + +#: app/models/track_thing.rb:145 +msgid "To be emailed about any new requests" msgstr "" #: app/models/track_thing.rb:161 msgid "To be emailed about any successful requests" msgstr "" -#: app/controllers/track_controller.rb:171 +#: app/models/track_thing.rb:196 +msgid "To be emailed about requests by '{{user_name}}'" +msgstr "" + +#: app/models/track_thing.rb:180 +msgid "" +"To be emailed about requests made using {{site_name}} to the public " +"authority '{{public_body_name}}'" +msgstr "" + +#: app/controllers/track_controller.rb:173 msgid "To cancel these alerts" msgstr "" -#: app/controllers/track_controller.rb:141 +#: app/controllers/track_controller.rb:143 msgid "To cancel this alert" msgstr "" @@ -2727,11 +2906,11 @@ msgid "" "was a technical problem trying to do this." msgstr "" -#: app/controllers/user_controller.rb:247 +#: app/controllers/user_controller.rb:248 msgid "To change your email address used on {{site_name}}" msgstr "" -#: app/controllers/request_controller.rb:332 +#: app/controllers/request_controller.rb:337 msgid "To classify the response to this FOI request" msgstr "" @@ -2743,6 +2922,10 @@ msgstr "" msgid "To do this, first click on the link below." msgstr "" +#: app/models/track_thing.rb:212 +msgid "To follow requests and responses matching '{{query}}'" +msgstr "" + #: app/views/request_mailer/old_unclassified_updated.rhtml:1 msgid "" "To help us keep the site tidy, someone else has updated the status of the \n" @@ -2755,7 +2938,7 @@ msgstr "" msgid "To let us know, follow this link and then select the appropriate box." msgstr "" -#: app/controllers/request_game_controller.rb:38 +#: app/controllers/request_game_controller.rb:40 msgid "To play the request categorisation game" msgstr "" @@ -2763,27 +2946,27 @@ msgstr "" msgid "To post your annotation" msgstr "" -#: app/controllers/request_controller.rb:536 +#: app/controllers/request_controller.rb:543 msgid "To reply to " msgstr "" -#: app/controllers/request_controller.rb:535 +#: app/controllers/request_controller.rb:542 msgid "To send a follow up message to " msgstr "" -#: app/controllers/user_controller.rb:328 +#: app/controllers/user_controller.rb:329 msgid "To send a message to " msgstr "" -#: app/controllers/request_controller.rb:293 +#: app/controllers/request_controller.rb:298 msgid "To send your FOI request" msgstr "" -#: app/controllers/request_controller.rb:58 +#: app/controllers/request_controller.rb:60 msgid "To update the status of this FOI request" msgstr "" -#: app/controllers/request_controller.rb:694 +#: app/controllers/request_controller.rb:701 msgid "" "To upload a response, you must be logged in using an email address from " msgstr "" @@ -2802,8 +2985,8 @@ msgstr "" msgid "To {{public_body_link_absolute}}" msgstr "" -#: app/views/request/preview.rhtml:17 #: app/views/request/followup_preview.rhtml:22 app/views/request/new.rhtml:88 +#: app/views/request/preview.rhtml:17 msgid "To:" msgstr "" @@ -2811,6 +2994,10 @@ msgstr "" msgid "Track requests to {{public_body_name}} by email" msgstr "" +#: app/models/track_thing.rb:206 +msgid "Track things matching '{{query}}' by email" +msgstr "" + #: app/views/public_body/show.rhtml:3 msgid "Track this authority" msgstr "" @@ -2819,10 +3006,18 @@ msgstr "" msgid "Track this person" msgstr "" +#: app/models/track_thing.rb:190 +msgid "Track this person by email" +msgstr "" + #: app/views/request/_sidebar.rhtml:2 msgid "Track this request" msgstr "" +#: app/models/track_thing.rb:123 +msgid "Track this request by email" +msgstr "" + #: locale/model_attributes.rb:33 msgid "TrackThing|Track medium" msgstr "" @@ -2846,7 +3041,7 @@ msgid "URL name can't be blank" msgstr "" #: app/models/user_mailer.rb:45 -msgid "Unable to change email address on WhatDoTheyKnow.com" +msgid "Unable to change email address on {{site_name}}" msgstr "" #: app/views/request/followup_bad.rhtml:4 @@ -2882,11 +3077,11 @@ msgstr "" msgid "Unknown" msgstr "" -#: app/models/info_request_event.rb:312 +#: app/models/info_request_event.rb:317 msgid "Unusual response" msgstr "" -#: app/models/info_request.rb:800 +#: app/models/info_request.rb:807 msgid "Unusual response." msgstr "" @@ -2895,7 +3090,7 @@ msgstr "" msgid "Update the status of this request" msgstr "" -#: app/controllers/request_controller.rb:60 +#: app/controllers/request_controller.rb:62 msgid "Update the status of your request to " msgstr "" @@ -2911,47 +3106,47 @@ msgid "" "\"Liverpool City Council\"</code></strong>" msgstr "" -#: locale/model_attributes.rb:68 +#: locale/model_attributes.rb:67 msgid "UserInfoRequestSentAlert|Alert type" msgstr "" -#: locale/model_attributes.rb:79 +#: locale/model_attributes.rb:78 msgid "User|About me" msgstr "" -#: locale/model_attributes.rb:77 +#: locale/model_attributes.rb:76 msgid "User|Admin level" msgstr "" -#: locale/model_attributes.rb:78 +#: locale/model_attributes.rb:77 msgid "User|Ban text" msgstr "" -#: locale/model_attributes.rb:70 +#: locale/model_attributes.rb:69 msgid "User|Email" msgstr "" -#: locale/model_attributes.rb:74 +#: locale/model_attributes.rb:73 msgid "User|Email confirmed" msgstr "" -#: locale/model_attributes.rb:72 +#: locale/model_attributes.rb:71 msgid "User|Hashed password" msgstr "" -#: locale/model_attributes.rb:76 +#: locale/model_attributes.rb:75 msgid "User|Last daily track email" msgstr "" -#: locale/model_attributes.rb:71 +#: locale/model_attributes.rb:70 msgid "User|Name" msgstr "" -#: locale/model_attributes.rb:73 +#: locale/model_attributes.rb:72 msgid "User|Salt" msgstr "" -#: locale/model_attributes.rb:75 +#: locale/model_attributes.rb:74 msgid "User|Url name" msgstr "" @@ -2968,10 +3163,10 @@ msgid "View FOI email address for {{public_body_name}}" msgstr "" #: app/views/contact_mailer/user_message.rhtml:10 -msgid "View Freedom of Information requests made by" +msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "" -#: app/views/layouts/default.rhtml:108 +#: app/views/layouts/default.rhtml:89 msgid "View authorities" msgstr "" @@ -2979,20 +3174,30 @@ msgstr "" msgid "View email" msgstr "" -#: app/views/layouts/default.rhtml:107 +#: app/views/layouts/default.rhtml:88 msgid "View requests" msgstr "" -#: app/models/info_request.rb:792 +#: app/models/info_request.rb:799 msgid "Waiting clarification." msgstr "" -#: app/views/request/show.rhtml:104 +#: app/views/request/show.rhtml:111 msgid "" "Waiting for an <strong>internal review</strong> by {{public_body_link}} of " "their handling of this request." msgstr "" +#: app/views/general/search.rhtml:149 +msgid "" +"Waiting for the public authority to complete an internal review of their " +"handling of the request" +msgstr "" + +#: app/views/general/search.rhtml:142 +msgid "Waiting for the public authority to reply" +msgstr "" + #: app/views/public_body/view_email.rhtml:17 msgid "We do not have a working request email address for this authority." msgstr "" @@ -3007,7 +3212,7 @@ 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=\"%s\">sign in</a> and let " +"\tif you are {{user_link}} please <a href=\"{{url}}\">sign in</a> and let " "everyone know." msgstr "" @@ -3017,17 +3222,17 @@ msgid "" "or the law tell us to." msgstr "" -#: app/views/user_mailer/changeemail_confirm.rhtml:9 +#: app/views/user_mailer/changeemail_confirm.rhtml:10 msgid "" "We will not reveal your email addresses to anybody unless you\n" "or the law tell us to." msgstr "" -#: app/views/request/show.rhtml:54 +#: app/views/request/show.rhtml:61 msgid "We're waiting for" msgstr "" -#: app/views/request/show.rhtml:50 +#: app/views/request/show.rhtml:57 msgid "We're waiting for someone to read" msgstr "" @@ -3051,7 +3256,7 @@ msgid "" "password." msgstr "" -#: app/views/request/_followup.rhtml:61 +#: app/views/request/_followup.rhtml:58 msgid "What are you doing?" msgstr "" @@ -3059,12 +3264,6 @@ msgstr "" msgid "What best describes the status of this request now?" msgstr "" -#: app/views/public_body/view_email.rhtml:7 -msgid "" -"WhatDoTheyKnow sends new requests to <strong>{{request_email}}</strong> for " -"this authority." -msgstr "" - #: app/views/request_mailer/new_response.rhtml:9 msgid "" "When you get there, please update the status to say if the response \n" @@ -3087,19 +3286,19 @@ msgstr "" msgid "Which of these is happening?" msgstr "" -#: app/models/info_request_event.rb:308 +#: app/models/info_request_event.rb:313 msgid "Withdrawn by requester" msgstr "" -#: app/models/info_request.rb:802 +#: app/models/info_request.rb:809 msgid "Withdrawn by the requester." msgstr "" -#: app/controllers/request_controller.rb:542 +#: app/controllers/request_controller.rb:549 msgid "Write a reply to " msgstr "" -#: app/controllers/request_controller.rb:541 +#: app/controllers/request_controller.rb:548 msgid "Write your FOI follow up message to " msgstr "" @@ -3107,7 +3306,7 @@ msgstr "" msgid "Write your request in <strong>simple, precise language</strong>." msgstr "" -#: app/models/info_request_event.rb:296 +#: app/models/info_request_event.rb:301 msgid "Wrong Response" msgstr "" @@ -3115,22 +3314,43 @@ msgstr "" msgid "You" msgstr "" -#: app/controllers/track_controller.rb:96 +#: app/controllers/track_controller.rb:98 msgid "You are already being emailed updates about " msgstr "" +#: app/models/track_thing.rb:175 +msgid "You are already tracking requests to {{public_body_name}} by email" +msgstr "" + +#: app/models/track_thing.rb:207 +msgid "You are already tracking things matching '{{query}}' by email" +msgstr "" + +#: app/models/track_thing.rb:191 +msgid "You are already tracking this person by email" +msgstr "" + +#: app/models/track_thing.rb:124 +msgid "You are already tracking this request by email" +msgstr "" + #: app/models/track_thing.rb:156 msgid "You are being emailed about any new successful responses" msgstr "" -#: app/views/request/show.rhtml:81 +#: app/models/track_thing.rb:140 +msgid "You are being emailed when there are new requests" +msgstr "" + +#: app/views/request/show.rhtml:88 msgid "You can <strong>complain</strong> by" msgstr "" -#: app/views/request/details.rhtml:57 +#: app/views/request/details.rhtml:58 msgid "" "You can get this page in computer-readable format as part of the main JSON\n" -"page for the request. See the <a href=\"%s\">API documentation</a>." +"page for the request. See the <a href=\"{{api_path}}\">API documentation</" +"a>." msgstr "" #: app/views/public_body/show.rhtml:40 @@ -3146,17 +3366,17 @@ msgstr "" msgid "You have a new response to the {{law_used_full}} request " msgstr "" -#: app/controllers/user_controller.rb:491 +#: app/controllers/user_controller.rb:492 msgid "You have now changed the text about you on your profile." msgstr "" -#: app/controllers/user_controller.rb:309 +#: app/controllers/user_controller.rb:310 msgid "You have now changed your email address used on {{site_name}}" msgstr "" #: app/views/user_mailer/already_registered.rhtml:3 msgid "" -"You just tried to sign up to WhatDoTheyKnow.com, when you\n" +"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" @@ -3189,19 +3409,19 @@ msgid "" "to find one, then please <a href=\"%s\">send it to us</a>." msgstr "" -#: app/controllers/user_controller.rb:469 +#: app/controllers/user_controller.rb:470 msgid "You need to be logged in to change the text about you on your profile." msgstr "" -#: app/controllers/user_controller.rb:370 +#: app/controllers/user_controller.rb:371 msgid "You need to be logged in to change your profile photo." msgstr "" -#: app/controllers/user_controller.rb:432 +#: app/controllers/user_controller.rb:433 msgid "You need to be logged in to clear your profile photo." msgstr "" -#: app/controllers/request_controller.rb:552 +#: app/controllers/request_controller.rb:559 msgid "You previously submitted that exact follow up message for this request." msgstr "" @@ -3229,15 +3449,15 @@ msgid "" "email alerts." msgstr "" -#: app/controllers/track_controller.rb:152 +#: app/controllers/track_controller.rb:154 msgid "You will no longer be emailed updates about " msgstr "" -#: app/controllers/track_controller.rb:181 +#: app/controllers/track_controller.rb:183 msgid "You will no longer be emailed updates for those alerts" msgstr "" -#: app/controllers/track_controller.rb:109 +#: app/controllers/track_controller.rb:111 msgid "You will now be emailed updates about " msgstr "" @@ -3247,7 +3467,7 @@ msgid "" "with the clarification." msgstr "" -#: app/controllers/user_controller.rb:441 +#: app/controllers/user_controller.rb:442 msgid "You've now cleared your profile photo" msgstr "" @@ -3271,9 +3491,8 @@ msgid "" "message, which will then go directly to the person who wrote the message." msgstr "" -#: app/views/user/_signin.rhtml:11 +#: app/views/user/_signin.rhtml:11 app/views/user/_signup.rhtml:9 #: app/views/user/signchangepassword_send_confirm.rhtml:13 -#: app/views/user/_signup.rhtml:9 msgid "Your e-mail:" msgstr "" @@ -3281,28 +3500,28 @@ msgstr "" msgid "Your email subscriptions" msgstr "" -#: app/controllers/request_controller.rb:549 +#: app/controllers/request_controller.rb:556 msgid "" "Your follow up has not been sent because this request has been stopped to " "prevent spam. Please <a href=\"%s\">contact us</a> if you really want to " "send a follow up message." msgstr "" -#: app/controllers/request_controller.rb:577 +#: app/controllers/request_controller.rb:584 msgid "Your follow up message has been sent on its way." msgstr "" -#: app/controllers/request_controller.rb:575 +#: app/controllers/request_controller.rb:582 msgid "Your internal review request has been sent on its way." msgstr "" -#: app/controllers/help_controller.rb:61 +#: app/controllers/help_controller.rb:63 msgid "" "Your message has been sent. Thank you for getting in touch! We'll get back " "to you soon." msgstr "" -#: app/controllers/user_controller.rb:348 +#: app/controllers/user_controller.rb:349 msgid "Your message to {{recipient_user_name}} has been sent!" msgstr "" @@ -3330,7 +3549,7 @@ msgstr "" msgid "Your original message is attached." msgstr "" -#: app/controllers/user_controller.rb:230 +#: app/controllers/user_controller.rb:231 msgid "Your password has been changed." msgstr "" @@ -3341,7 +3560,7 @@ msgstr "" #: app/views/user/set_draft_profile_photo.rhtml:18 msgid "" "Your photo will be shown in public <strong>on the Internet</strong>, \n" -" wherever you do something on WhatDoTheyKnow." +" wherever you do something on {{site_name}}." msgstr "" #: app/views/request_mailer/new_response_reminder_alert.rhtml:5 @@ -3362,10 +3581,14 @@ msgstr "" #: app/views/comment/new.rhtml:62 msgid "" -"Your thoughts on what the WhatDoTheyKnow <strong>administrators</strong> " +"Your thoughts on what the {{site_name}} <strong>administrators</strong> " "should do about the request." msgstr "" +#: app/models/track_mailer.rb:25 +msgid "Your {{site_name}} email alert" +msgstr "" + #: app/models/outgoing_message.rb:69 msgid "Yours faithfully," msgstr "" @@ -3392,13 +3615,13 @@ msgstr "" msgid "and sign in as " msgstr "" -#: app/views/request/show.rhtml:52 +#: app/views/request/show.rhtml:59 msgid "" "and update the status accordingly. Perhaps <strong>you</strong> might like " "to help out by doing that?" msgstr "" -#: app/views/request/show.rhtml:57 +#: app/views/request/show.rhtml:64 msgid "and update the status." msgstr "" @@ -3414,19 +3637,27 @@ msgstr "" msgid "annotations" msgstr "" +#: app/models/track_thing.rb:138 +msgid "any <a href=\"/list\">new requests</a>" +msgstr "" + +#: app/models/track_thing.rb:154 +msgid "any <a href=\"/list/successful\">successful requests</a>" +msgstr "" + #: app/views/request_mailer/very_overdue_alert.rhtml:1 msgid "are long overdue." msgstr "" -#: app/controllers/public_body_controller.rb:109 +#: app/controllers/public_body_controller.rb:111 msgid "beginning with" msgstr "" -#: app/views/request/show.rhtml:75 +#: app/views/request/show.rhtml:82 msgid "by" msgstr "" -#: app/views/request/_followup.rhtml:41 +#: app/views/request/_followup.rhtml:38 msgid "by <strong>{{date}}</strong>" msgstr "" @@ -3438,11 +3669,11 @@ msgstr "" msgid "by {{user_link_absolute}}" msgstr "" -#: locale/model_attributes.rb:42 +#: locale/model_attributes.rb:35 msgid "censor rule" msgstr "" -#: locale/model_attributes.rb:26 +#: locale/model_attributes.rb:20 msgid "comment" msgstr "" @@ -3452,7 +3683,7 @@ msgid "" " Or you could phone them." msgstr "" -#: app/models/info_request_event.rb:333 +#: app/models/info_request_event.rb:338 msgid "display_status only works for incoming and outgoing messages right now" msgstr "" @@ -3476,11 +3707,11 @@ msgstr "" msgid "even during holidays" msgstr "" -#: locale/model_attributes.rb:14 +#: locale/model_attributes.rb:17 msgid "exim log" msgstr "" -#: locale/model_attributes.rb:60 +#: locale/model_attributes.rb:59 msgid "exim log done" msgstr "" @@ -3492,12 +3723,12 @@ msgstr "" msgid "have delayed." msgstr "" -#: locale/model_attributes.rb:57 +#: locale/model_attributes.rb:56 msgid "holiday" msgstr "" -#: app/views/request/_followup.rhtml:39 app/views/request/show.rhtml:63 -#: app/views/request/show.rhtml:73 +#: app/views/request/_followup.rhtml:36 app/views/request/show.rhtml:70 +#: app/views/request/show.rhtml:80 msgid "in term time" msgstr "" @@ -3505,15 +3736,15 @@ msgstr "" msgid "in total" msgstr "" -#: locale/model_attributes.rb:63 +#: locale/model_attributes.rb:62 msgid "incoming message" msgstr "" -#: locale/model_attributes.rb:80 +#: locale/model_attributes.rb:79 msgid "info request" msgstr "" -#: locale/model_attributes.rb:35 +#: locale/model_attributes.rb:40 msgid "info request event" msgstr "" @@ -3522,7 +3753,7 @@ msgstr "" msgid "internal error" msgstr "" -#: app/views/request/show.rhtml:93 +#: app/views/request/show.rhtml:100 msgid "is <strong>waiting for your clarification</strong>." msgstr "" @@ -3539,7 +3770,7 @@ msgstr "" msgid "made." msgstr "" -#: app/views/request/show.rhtml:67 +#: app/views/request/show.rhtml:74 msgid "no later than" msgstr "" @@ -3553,7 +3784,7 @@ msgid "" "to us</a>." msgstr "" -#: app/views/request/show.rhtml:65 +#: app/views/request/show.rhtml:72 msgid "normally" msgstr "" @@ -3561,7 +3792,7 @@ msgstr "" msgid "only" msgstr "" -#: locale/model_attributes.rb:20 +#: locale/model_attributes.rb:25 msgid "outgoing message" msgstr "" @@ -3573,11 +3804,11 @@ msgstr "" msgid "please sign in or make a new account." msgstr "" -#: locale/model_attributes.rb:50 +#: locale/model_attributes.rb:49 msgid "post redirect" msgstr "" -#: locale/model_attributes.rb:17 +#: locale/model_attributes.rb:14 msgid "profile photo" msgstr "" @@ -3593,7 +3824,7 @@ msgstr "" msgid "request." msgstr "" -#: app/views/request/show.rhtml:82 +#: app/views/request/show.rhtml:89 msgid "requesting an internal review" msgstr "" @@ -3603,7 +3834,7 @@ msgid "" "email to let them know what you are going to do about it." msgstr "" -#: app/views/request/show.rhtml:95 +#: app/views/request/show.rhtml:102 msgid "send a follow up message" msgstr "" @@ -3611,7 +3842,7 @@ msgstr "" msgid "sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "" -#: app/views/request/show.rhtml:99 +#: app/views/request/show.rhtml:106 msgid "sign in" msgstr "" @@ -3623,34 +3854,27 @@ msgstr "" msgid "that you made to" msgstr "" -#: app/views/user_mailer/already_registered.rhtml:11 -#: app/views/user_mailer/confirm_login.rhtml:11 -#: app/views/user_mailer/changeemail_already_used.rhtml:9 -#: app/views/user_mailer/changeemail_confirm.rhtml:12 -#: app/views/request_mailer/stopped_responses.rhtml:16 -#: app/views/request_mailer/not_clarified_alert.rhtml:9 #: app/views/request_mailer/comment_on_alert.rhtml:6 +#: app/views/request_mailer/comment_on_alert_plural.rhtml:5 +#: app/views/request_mailer/new_response.rhtml:15 +#: app/views/request_mailer/new_response_reminder_alert.rhtml:8 +#: app/views/request_mailer/not_clarified_alert.rhtml:9 #: app/views/request_mailer/old_unclassified_updated.rhtml:8 -#: app/views/request_mailer/very_overdue_alert.rhtml:11 #: app/views/request_mailer/overdue_alert.rhtml:9 -#: app/views/request_mailer/new_response_reminder_alert.rhtml:8 -#: app/views/request_mailer/new_response.rhtml:15 -#: app/views/request_mailer/comment_on_alert_plural.rhtml:5 -msgid "the WhatDoTheyKnow team" +#: app/views/request_mailer/stopped_responses.rhtml:16 +#: app/views/request_mailer/very_overdue_alert.rhtml:11 +#: app/views/track_mailer/event_digest.rhtml:66 +#: app/views/user_mailer/already_registered.rhtml:11 +#: app/views/user_mailer/changeemail_already_used.rhtml:10 +#: app/views/user_mailer/changeemail_confirm.rhtml:13 +#: app/views/user_mailer/confirm_login.rhtml:11 +msgid "the {{site_name}} team" msgstr "" #: app/views/user/show.rhtml:140 msgid "this person" msgstr "" -#: app/views/user_mailer/changeemail_already_used.rhtml:2 -msgid "to" -msgstr "" - -#: app/views/user_mailer/changeemail_confirm.rhtml:5 -msgid "to " -msgstr "" - #: app/views/user/show.rhtml:113 msgid "" "to change password, \n" @@ -3661,15 +3885,15 @@ msgstr "" msgid "to check that the info isn't already published." msgstr "" -#: app/views/request/show.rhtml:55 +#: app/views/request/show.rhtml:62 msgid "to read" msgstr "" -#: app/views/request/show.rhtml:99 +#: app/views/request/show.rhtml:106 msgid "to send a follow up message." msgstr "" -#: app/views/request/show.rhtml:39 +#: app/views/request/show.rhtml:45 msgid "to {{public_body}}" msgstr "" @@ -3689,7 +3913,7 @@ msgstr "" msgid "unknown reason " msgstr "" -#: app/models/info_request.rb:807 app/models/info_request_event.rb:328 +#: app/models/info_request.rb:814 app/models/info_request_event.rb:333 msgid "unknown status " msgstr "" @@ -3701,15 +3925,15 @@ msgstr "" msgid "unsubscribe all" msgstr "" -#: app/views/request/show.rhtml:46 +#: app/views/request/show.rhtml:53 msgid "useful information." msgstr "" -#: locale/model_attributes.rb:69 +#: locale/model_attributes.rb:68 msgid "user" msgstr "" -#: locale/model_attributes.rb:67 +#: locale/model_attributes.rb:66 msgid "user info request sent alert" msgstr "" @@ -3737,12 +3961,33 @@ msgstr "" msgid "{{public_body_name}} only:" msgstr "" +#: app/views/public_body/view_email.rhtml:7 +msgid "" +"{{site_name}} sends new requests to <strong>{{request_email}}</strong> for " +"this authority." +msgstr "" + +#: app/models/user.rb:122 +msgid "{{user_name}} (Banned)" +msgstr "" + #: app/views/request_mailer/comment_on_alert.rhtml:1 msgid "" "{{user_name}} has annotated your {{law_used_short}} \n" "request. Follow this link to see what they wrote." msgstr "" -#: app/views/request/show.rhtml:35 +#: app/views/contact_mailer/user_message.rhtml:2 +msgid "{{user_name}} has used {{site_name}} to send you the message below." +msgstr "" + +#: app/views/request/show.rhtml:36 +msgid "" +"{{user}} (<a href=\"{{user_admin_url}}\">admin</a>) made this " +"{{law_used_full}} request (<a href=\"{{request_admin_url}}\">admin</a>) to " +"{{public_body_link}} (<a href=\"{{public_body_admin_url}}\">admin</a>)" +msgstr "" + +#: app/views/request/show.rhtml:44 msgid "{{user}} made this {{law_used_full}} request" msgstr "" diff --git a/locale/cy/app.po b/locale/cy/app.po index 45ad1d348..954f20f9f 100644 --- a/locale/cy/app.po +++ b/locale/cy/app.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2011-07-12 15:18+0100\n" -"PO-Revision-Date: 2011-07-29 18:04+0000\n" +"POT-Creation-Date: 2011-08-11 12:30+0200\n" +"PO-Revision-Date: 2011-08-12 00:21+0000\n" "Last-Translator: skenaja <alex@alexskene.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -17,9 +17,16 @@ msgstr "" "Language: cy\n" "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3\n" +#: app/models/incoming_message.rb:866 +msgid "" +"\n" +"\n" +"[ {{site_name}} note: The above text was badly encoded, and has had strange characters removed. ]" +msgstr "" + #: app/views/user/set_profile_about_me.rhtml:14 msgid "" -" This will appear on your WhatDoTheyKnow profile, to make it\n" +" This will appear on your {{site_name}} profile, to make it\n" " easier for others to get involved with what you're doing." msgstr "" @@ -130,8 +137,8 @@ msgid " when you send this message." msgstr "" #: app/views/public_body/show.rhtml:80 -msgid "%d Freedom of Information request" -msgid_plural "%d Freedom of Information requests" +msgid "%d Freedom of Information request made using this site" +msgid_plural "%d Freedom of Information requests made using this site" msgstr[0] "" msgstr[1] "" msgstr[2] "" @@ -140,6 +147,14 @@ msgstr[3] "" #: app/views/general/frontpage.rhtml:36 msgid "%d request" msgid_plural "%d requests" +msgstr[0] "Nifer o geisiadau: %d" +msgstr[1] "Nifer o geisiadau: %d" +msgstr[2] "Nifer o geisiadau: %d" +msgstr[3] "Nifer o geisiadau: %d" + +#: app/views/public_body/_body_listing_single.rhtml:21 +msgid "%d request made." +msgid_plural "%d requests made." msgstr[0] "" msgstr[1] "" msgstr[2] "" @@ -153,7 +168,7 @@ msgstr "" msgid "'Pollution levels over time for the River Tyne'" msgstr "" -#: app/controllers/user_controller.rb:354 +#: app/controllers/user_controller.rb:355 msgid "" ",\n" "\n" @@ -186,135 +201,136 @@ msgstr "" msgid "<a href=\"%s\">Contact us</a> to tell us about the problem</li>" msgstr "" -#: app/views/public_body/show.rhtml:50 -msgid "" -"<a href=\"%s\">Make a new Freedom of Information request</a> to " -"{{public_body_name}}" -msgstr "" - #: app/views/public_body/list.rhtml:43 msgid "<a href=\"%s\">can't find the one you want?</a>" msgstr "" -#: app/views/request/_followup.rhtml:42 app/views/request/_followup.rhtml:49 -#: app/views/request/show.rhtml:76 app/views/request/show.rhtml:80 +#: app/views/request/_followup.rhtml:39 app/views/request/_followup.rhtml:46 +#: app/views/request/show.rhtml:83 app/views/request/show.rhtml:87 msgid "<a href=\"%s\">details</a>" msgstr "" -#: app/views/request/_followup.rhtml:77 +#: app/views/request/_followup.rhtml:74 msgid "<a href=\"%s\">what's that?</a>" msgstr "" +#: app/views/public_body/show.rhtml:50 +msgid "" +"<a href=\"{{url}}\">Make a new Freedom of Information request</a> to " +"{{public_body_name}}" +msgstr "" + #: app/controllers/request_game_controller.rb:23 msgid "" "<p>All done! Thank you very much for your help.</p><p>There are <a " -"href=\"%s\">more things you can do</a> to help WhatDoTheyKnow.</p>" +"href=\"{{helpus_url}}\">more things you can do</a> to help " +"{{site_name}}.</p>" msgstr "" -#: app/controllers/request_controller.rb:394 +#: app/controllers/request_controller.rb:399 msgid "" "<p>Thank you! Here are some ideas on what to do next:</p>\n" " <ul>\n" -" <li>To send your request to another authority, first copy the text of your request below, then <a href=\"%s\">find the other authority</a>.</li>\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=\"%s\">how to complain</a>.\n" +" <a href=\"{{complain_url}}\">how to complain</a>.\n" " </li>\n" -" <li>We have <a href=\"%s\">suggestions</a>\n" +" <li>We have <a href=\"{{other_means_url}}\">suggestions</a>\n" " on other means to answer your question.\n" " </li>\n" -" </ul>\n" -" " +" </ul>" msgstr "" -#: app/controllers/request_controller.rb:388 +#: app/controllers/request_controller.rb:393 msgid "" "<p>Thank you! Hope you don't have to wait much longer.</p> <p>By law, you " "should have got a response promptly, and normally before the end of " "<strong>{{date_response_required_by}}</strong>.</p>" msgstr "" -#: app/controllers/request_controller.rb:384 +#: app/controllers/request_controller.rb:389 msgid "" "<p>Thank you! Hopefully your wait isn't too long.</p> <p>By law, you should get a response promptly, and normally before the end of <strong>\n" "{{date_response_required_by}}</strong>.</p>" msgstr "" -#: app/controllers/request_controller.rb:421 +#: app/controllers/request_controller.rb:428 msgid "" "<p>Thank you! Hopefully your wait isn't too long.</p><p>You should get a " "response within 20 days, or be told if it will take longer (<a " -"href=\"%s\">details</a>).</p>" +"href=\"{{review_url}}\">details</a>).</p>" msgstr "" -#: app/controllers/request_controller.rb:424 +#: app/controllers/request_controller.rb:431 msgid "" "<p>Thank you! We'll look into what happened and try and fix it up.</p><p>If " "the error was a delivery failure, and you can find an up to date FOI email " "address for the authority, please tell us using the form below.</p>" msgstr "" -#: app/controllers/request_controller.rb:391 +#: app/controllers/request_controller.rb:396 msgid "" "<p>Thank you! Your request is long overdue, by more than 40 working days. " "Most requests should be answered within 20 working days. You might like to " "complain about this, see below.</p>" msgstr "" -#: app/controllers/user_controller.rb:494 +#: app/controllers/user_controller.rb:495 msgid "" "<p>Thanks for changing the text about you on your profile.</p>\n" " <p><strong>Next...</strong> You can upload a profile photograph too.</p>" msgstr "" -#: app/controllers/user_controller.rb:416 +#: app/controllers/user_controller.rb:417 msgid "" "<p>Thanks for updating your profile photo.</p>\n" " <p><strong>Next...</strong> You can put some text about you and your research on your profile.</p>" msgstr "" -#: app/controllers/request_controller.rb:279 +#: app/controllers/request_controller.rb:284 msgid "" "<p>We recommend that you edit your request and remove the email address.\n" " If you leave it, the email address will be sent to the authority, but will not be displayed on the site.</p>" msgstr "" -#: app/controllers/request_controller.rb:410 +#: app/controllers/request_controller.rb:417 msgid "" "<p>We're glad you got all the information that you wanted. If you write " "about or make use of the information, please come back and add an annotation" -" below saying what you did.</p><p>If you found WhatDoTheyKnow useful, <a " -"href=\"%s\">make a donation</a> to the charity which runs it.</p>" +" below saying what you did.</p><p>If you found {{site_name}} useful, <a " +"href=\"{{donation_url}}\">make a donation</a> to the charity which runs " +"it.</p>" msgstr "" -#: app/controllers/request_controller.rb:413 +#: app/controllers/request_controller.rb:420 msgid "" "<p>We're glad you got some of the information that you wanted. If you found " -"WhatDoTheyKnow useful, <a href=\"%s\">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>" +"{{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to " +"the charity which runs it.</p><p>If you want to try and get the rest of the " +"information, here's what to do now.</p>" msgstr "" -#: app/controllers/request_controller.rb:277 +#: app/controllers/request_controller.rb:282 msgid "" "<p>You do not need to include your email in the request in order to get a " "reply (<a href=\"%s\">details</a>).</p>" msgstr "" -#: app/controllers/request_controller.rb:275 +#: app/controllers/request_controller.rb:280 msgid "" "<p>You do not need to include your email in the request in order to get a " "reply, as we will ask for it on the next screen (<a " "href=\"%s\">details</a>).</p>" msgstr "" -#: app/controllers/request_controller.rb:283 +#: app/controllers/request_controller.rb:288 msgid "" "<p>Your request contains a <strong>postcode</strong>. Unless it directly " "relates to the subject of your request, please remove any address as it will" " <strong>appear publicly on the Internet</strong>.</p>" msgstr "" -#: app/controllers/request_controller.rb:306 +#: app/controllers/request_controller.rb:311 msgid "" "<p>Your {{law_used_full}} request has been <strong>sent on its way</strong>!</p>\n" " <p><strong>We will email you</strong> when there is a response, or after 20 working days if the authority still hasn't\n" @@ -323,6 +339,13 @@ msgid "" " annotation below telling people about your writing.</p>" msgstr "" +#: app/controllers/application_controller.rb:279 +msgid "" +"<p>{{site_name}} is currently in maintenance. You can only view existing " +"requests. You cannot make new ones, add followups or annotations, or " +"otherwise change the database.</p> <p>{{read_only}}</p>" +msgstr "" + #: app/views/user/confirm.rhtml:11 msgid "" "<small>If you use web-based email or have \"junk mail\" filters, also check your\n" @@ -369,8 +392,8 @@ msgstr "" #: app/views/general/search.rhtml:126 msgid "" "<strong><code>status:</code></strong> to select based on the status or " -"historical status of the request, see the <a href=\"%s\">table of " -"statuses</a> below." +"historical status of the request, see the <a href=\"{{statuses_url}}\">table" +" of statuses</a> below." msgstr "" #: app/views/general/search.rhtml:134 @@ -383,7 +406,7 @@ msgstr "" #: app/views/general/search.rhtml:127 msgid "" "<strong><code>variety:</code></strong> to select type of thing to search " -"for, see the <a href=\"%s\">table of varieties</a> below." +"for, see the <a href=\"{{varieties_url}}\">table of varieties</a> below." msgstr "" #: app/views/comment/new.rhtml:56 @@ -396,7 +419,7 @@ msgstr "" msgid "<strong>All the information</strong> has been sent" msgstr "" -#: app/views/request/_followup.rhtml:82 +#: app/views/request/_followup.rhtml:79 msgid "" "<strong>Anything else</strong>, such as clarifying, prompting, thanking" msgstr "" @@ -404,11 +427,11 @@ msgstr "" #: app/views/request/details.rhtml:12 msgid "" "<strong>Caveat emptor!</strong> To use this data in an honourable way, you will need \n" -"a good internal knowledge of user behaviour on WhatDoTheyKnow. How, \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=\"%s\">contact us</a> with questions." +"<a href=\"{{contact_path}}\">contact us</a> with questions." msgstr "" #: app/views/request/_other_describe_state.rhtml:28 @@ -443,7 +466,7 @@ msgstr "" #: app/views/user/set_crop_profile_photo.rhtml:35 msgid "" "<strong>Privacy note:</strong> Your photo will be shown in public on the Internet, \n" -" wherever you do something on WhatDoTheyKnow." +" wherever you do something on {{site_name}}." msgstr "" #: app/views/request/followup_preview.rhtml:37 @@ -470,7 +493,7 @@ msgid "" "scheme</a> or <strong>search</strong> their web site ..." msgstr "" -#: app/views/request/show.rhtml:84 +#: app/views/request/show.rhtml:91 msgid "<strong>did not have</strong> the information requested." msgstr "" @@ -483,15 +506,27 @@ msgid "" "A <strong>summary</strong> of the response if you have received it by post. " msgstr "" +#: app/views/general/search.rhtml:162 +msgid "A public authority" +msgstr "" + #: app/views/request/_other_describe_state.rhtml:34 msgid "A response will be sent <strong>by post</strong>" msgstr "" +#: app/views/general/search.rhtml:151 +msgid "A strange reponse, required attention by the {{site_name}} team" +msgstr "" + +#: app/views/general/search.rhtml:163 +msgid "A {{site_name}} user" +msgstr "" + #: app/views/user/set_profile_about_me.rhtml:20 msgid "About you:" msgstr "" -#: app/models/info_request_event.rb:288 +#: app/models/info_request_event.rb:293 msgid "Acknowledgement" msgstr "" @@ -509,6 +544,10 @@ msgid "" " a <strong>summary of the response</strong>." msgstr "" +#: app/views/public_body/_body_listing_single.rhtml:26 +msgid "Added on {{date}}" +msgstr "" + #: app/models/user.rb:54 msgid "Admin level is not included in list" msgstr "" @@ -533,14 +572,22 @@ msgid "" " human beings)" msgstr "" -#: app/models/info_request_event.rb:304 +#: app/models/info_request_event.rb:309 msgid "All information sent" msgstr "" +#: app/views/general/search.rhtml:146 +msgid "All of the information requested has been received" +msgstr "" + #: app/views/public_body/list.rhtml:5 msgid "Alphabet" msgstr "" +#: app/views/public_body/_body_listing_single.rhtml:12 +msgid "Also called {{other_name}}." +msgstr "" + #: app/views/request_mailer/new_response.rhtml:12 msgid "" "Although all responses are automatically published, we depend on\n" @@ -551,6 +598,10 @@ msgstr "" msgid "An <strong>error message</strong> has been received" msgstr "" +#: app/views/general/search.rhtml:161 +msgid "Annotation added to request" +msgstr "" + #: app/views/user/show.rhtml:34 msgid "Annotations" msgstr "" @@ -587,15 +638,15 @@ msgstr "" msgid "Attachment (optional):" msgstr "" -#: app/models/info_request.rb:776 +#: app/models/info_request.rb:783 msgid "Awaiting classification." msgstr "" -#: app/models/info_request.rb:796 +#: app/models/info_request.rb:803 msgid "Awaiting internal review." msgstr "" -#: app/models/info_request.rb:778 +#: app/models/info_request.rb:785 msgid "Awaiting response." msgstr "" @@ -607,17 +658,17 @@ msgstr "" #: app/views/request/new.rhtml:41 msgid "" -"Browse <a href='%s'>other requests</a> to '{{public_body_name}}' for " +"Browse <a href='{{url}}'>other requests</a> to '{{public_body_name}}' for " "examples of how to word your request." msgstr "" -#: app/views/request/show.rhtml:79 +#: app/views/request/show.rhtml:86 msgid "" "By law, under all circumstances, {{public_body_link}} should have responded " "by now" msgstr "" -#: app/views/request/show.rhtml:71 +#: app/views/request/show.rhtml:78 msgid "" "By law, {{public_body_link}} should normally have responded " "<strong>promptly</strong> and" @@ -629,27 +680,27 @@ msgid "" " it</a>." msgstr "" -#: app/controllers/track_controller.rb:143 +#: app/controllers/track_controller.rb:145 msgid "Cancel a {{site_name}} alert" msgstr "" -#: app/controllers/track_controller.rb:173 +#: app/controllers/track_controller.rb:175 msgid "Cancel some {{site_name}} alerts" msgstr "" -#: locale/model_attributes.rb:46 +#: locale/model_attributes.rb:39 msgid "CensorRule|Last edit comment" msgstr "" -#: locale/model_attributes.rb:45 +#: locale/model_attributes.rb:38 msgid "CensorRule|Last edit editor" msgstr "" -#: locale/model_attributes.rb:44 +#: locale/model_attributes.rb:37 msgid "CensorRule|Replacement" msgstr "" -#: locale/model_attributes.rb:43 +#: locale/model_attributes.rb:36 msgid "CensorRule|Text" msgstr "" @@ -657,6 +708,10 @@ msgstr "" msgid "Central government" msgstr "" +#: app/views/user/signchangeemail.rhtml:37 +msgid "Change email on {{site_name}}" +msgstr "" + #: app/views/user/signchangepassword.rhtml:27 msgid "Change password on {{site_name}}" msgstr "Newid cyfrinair ar {{site_name}}" @@ -666,14 +721,14 @@ msgid "Change profile photo" msgstr "" #: app/views/user/set_profile_about_me.rhtml:1 -msgid "Change the text about you on your profile at WhatDoTheyKnow.com" +msgid "Change the text about you on your profile at {{site_name}}" msgstr "" #: app/views/user/show.rhtml:107 msgid "Change your email" msgstr "" -#: app/controllers/user_controller.rb:249 +#: app/controllers/user_controller.rb:250 #: app/views/user/signchangeemail.rhtml:1 #: app/views/user/signchangeemail.rhtml:11 msgid "Change your email address used on {{site_name}}" @@ -690,7 +745,7 @@ msgstr "" msgid "Change your password on {{site_name}}" msgstr "Newid eich cyfrinair ar {{site_name}}" -#: app/controllers/user_controller.rb:203 +#: app/controllers/user_controller.rb:204 msgid "Change your password {{site_name}}" msgstr "" @@ -702,20 +757,20 @@ msgstr "" msgid "Check for mistakes if you typed or copied the address." msgstr "" -#: app/views/request/preview.rhtml:7 #: app/views/request/followup_preview.rhtml:14 +#: app/views/request/preview.rhtml:7 msgid "Check you haven't included any <strong>personal information</strong>." msgstr "" -#: app/models/info_request_event.rb:326 +#: app/models/info_request_event.rb:331 msgid "Clarification" msgstr "" -#: app/models/info_request_event.rb:290 +#: app/models/info_request_event.rb:295 msgid "Clarification required" msgstr "" -#: app/controllers/request_controller.rb:334 +#: app/controllers/request_controller.rb:339 msgid "Classify an FOI response from " msgstr "" @@ -731,32 +786,51 @@ msgid "" "to reply to your request." msgstr "" -#: locale/model_attributes.rb:28 +#: locale/model_attributes.rb:22 msgid "Comment|Body" msgstr "" -#: locale/model_attributes.rb:27 +#: locale/model_attributes.rb:21 msgid "Comment|Comment type" msgstr "" -#: locale/model_attributes.rb:30 +#: locale/model_attributes.rb:24 msgid "Comment|Locale" msgstr "" -#: locale/model_attributes.rb:29 +#: locale/model_attributes.rb:23 msgid "Comment|Visible" msgstr "" +#: app/models/track_thing.rb:147 +msgid "Confirm you want to be emailed about new requests" +msgstr "" + +#: app/models/track_thing.rb:214 +msgid "" +"Confirm you want to be emailed about new requests or responses matching " +"'{{query}}'" +msgstr "" + +#: app/models/track_thing.rb:198 +msgid "Confirm you want to be emailed about requests by '{{user_name}}'" +msgstr "" + +#: app/models/track_thing.rb:182 +msgid "" +"Confirm you want to be emailed about requests to '{{public_body_name}}'" +msgstr "" + #: app/models/track_thing.rb:163 msgid "Confirm you want to be emailed when an FOI request succeeds" msgstr "" -#: app/controllers/request_controller.rb:295 +#: app/controllers/request_controller.rb:300 msgid "Confirm your FOI request to " msgstr "" -#: app/controllers/request_controller.rb:696 -#: app/controllers/user_controller.rb:514 +#: app/controllers/request_controller.rb:703 +#: app/controllers/user_controller.rb:515 msgid "Confirm your account on {{site_name}}" msgstr "" @@ -765,13 +839,17 @@ msgid "Confirm your annotation to {{info_request_title}}" msgstr "" #: app/models/user_mailer.rb:34 -msgid "Confirm your new email address on WhatDoTheyKnow.com" +msgid "Confirm your new email address on {{site_name}}" msgstr "" -#: app/views/layouts/default.rhtml:146 +#: app/views/layouts/default.rhtml:127 msgid "Contact {{site_name}}" msgstr "Cysylltwch â {{site_name}}" +#: app/models/request_mailer.rb:210 +msgid "Could not identify the request from the email address" +msgstr "" + #: app/models/profile_photo.rb:96 msgid "" "Couldn't understand the image file that you uploaded. PNG, JPEG, GIF and " @@ -788,13 +866,13 @@ msgid "" " environmental factors listed above)" msgstr "" -#: app/views/request/show.rhtml:61 +#: app/views/request/show.rhtml:68 msgid "" "Currently <strong>waiting for a response</strong> from {{public_body_link}}," " they must respond promptly and" msgstr "" -#: app/models/info_request_event.rb:294 +#: app/models/info_request_event.rb:299 msgid "Deadline Extended" msgstr "" @@ -802,11 +880,11 @@ msgstr "" msgid "Dear " msgstr "" -#: app/models/info_request.rb:780 +#: app/models/info_request.rb:787 msgid "Delayed." msgstr "" -#: app/models/info_request.rb:798 app/models/info_request_event.rb:310 +#: app/models/info_request.rb:805 app/models/info_request_event.rb:315 msgid "Delivery error" msgstr "" @@ -828,7 +906,7 @@ msgstr "" msgid "Download original attachment" msgstr "" -#: app/views/request/_followup.rhtml:88 +#: app/views/request/_followup.rhtml:85 msgid "" "Edit and add <strong>more details</strong> to the message above,\n" " explaining why you are dissatisfied with their response." @@ -842,11 +920,11 @@ msgstr "" msgid "Edit text about you" msgstr "" -#: app/models/user.rb:132 +#: app/models/user.rb:135 msgid "Either the email or password was not recognised, please try again." msgstr "" -#: app/models/user.rb:134 +#: app/models/user.rb:137 msgid "" "Either the email or password was not recognised, please try again. Or create" " a new account using the form on the right." @@ -864,6 +942,10 @@ msgstr "" msgid "Email me new successful responses " msgstr "" +#: app/models/track_thing.rb:139 +msgid "Email me when there are new requests" +msgstr "" + #: app/views/user/show.rhtml:36 msgid "Email subscriptions" msgstr "" @@ -910,19 +992,19 @@ msgid "" " this website forever (<a href=\"%s\">why?</a>)." msgstr "" -#: locale/model_attributes.rb:61 +#: locale/model_attributes.rb:60 msgid "EximLogDone|Filename" msgstr "" -#: locale/model_attributes.rb:62 +#: locale/model_attributes.rb:61 msgid "EximLogDone|Last stat" msgstr "" -#: locale/model_attributes.rb:16 +#: locale/model_attributes.rb:19 msgid "EximLog|Line" msgstr "" -#: locale/model_attributes.rb:15 +#: locale/model_attributes.rb:18 msgid "EximLog|Order" msgstr "" @@ -934,6 +1016,10 @@ msgstr "" msgid "FOI requests" msgstr "" +#: app/models/track_thing.rb:193 app/models/track_thing.rb:194 +msgid "FOI requests by '{{user_name}}'" +msgstr "" + #: app/models/profile_photo.rb:101 msgid "Failed to convert image to a PNG" msgstr "" @@ -961,18 +1047,23 @@ msgstr "" msgid "Follow this link to see the request:" msgstr "" -#: app/models/info_request_event.rb:330 +#: app/models/info_request_event.rb:335 msgid "Follow up" msgstr "" +#: app/views/general/search.rhtml:159 +msgid "Follow up message sent by requester" +msgstr "" + #: app/views/public_body/view_email.rhtml:14 msgid "Follow up messages to existing requests are sent to " msgstr "" #: app/views/request/_followup.rhtml:16 msgid "" -"Follow ups and new responses to this request have been stopped to prevent spam. Please\n" -" <a href=\"%s\">contact us</a> if you are {{user_link}} and need to send a follow up." +"Follow ups and new responses to this request have been stopped to prevent " +"spam. Please <a href=\"{{url}}\">contact us</a> if you are {{user_link}} and" +" need to send a follow up." msgstr "" #: app/views/public_body/show.rhtml:61 @@ -1032,23 +1123,23 @@ msgstr "" msgid "Go to our <a href=\"%s\">front page</a></li>" msgstr "" -#: app/models/info_request_event.rb:292 +#: app/models/info_request_event.rb:297 msgid "Handled by post" msgstr "" -#: app/models/info_request.rb:794 +#: app/models/info_request.rb:801 msgid "Handled by post." msgstr "" -#: app/views/layouts/default.rhtml:121 +#: app/views/layouts/default.rhtml:102 msgid "Hello!" msgstr "Helo!" -#: app/views/layouts/default.rhtml:118 +#: app/views/layouts/default.rhtml:99 msgid "Hello, {{username}}!" msgstr "Helo, {{username}}!" -#: app/views/layouts/default.rhtml:113 +#: app/views/layouts/default.rhtml:94 msgid "Help" msgstr "Help" @@ -1056,8 +1147,8 @@ msgstr "Help" 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" -"WhatDoTheyKnow for intermediate events, which weren't given an explicit\n" -"description by a user. See the <a href=\"%s\">search tips</a> for description of the states." +"{{site_name}} for intermediate events, which weren't given an explicit\n" +"description by a user. See the <a href=\"{{search_path}}\">search tips</a> for description of the states." msgstr "" #: app/views/request/_other_describe_state.rhtml:4 @@ -1068,11 +1159,11 @@ msgid "" " Thanks." msgstr "" -#: locale/model_attributes.rb:58 +#: locale/model_attributes.rb:57 msgid "Holiday|Day" msgstr "Gwyliau | Diwrnod" -#: locale/model_attributes.rb:59 +#: locale/model_attributes.rb:58 msgid "Holiday|Description" msgstr "Gwyliau | Disgrifiad" @@ -1090,11 +1181,11 @@ msgstr "" msgid "Human health and safety" msgstr "" -#: app/views/request/_followup.rhtml:71 +#: app/views/request/_followup.rhtml:68 msgid "I am asking for <strong>new information</strong>" msgstr "" -#: app/views/request/_followup.rhtml:76 +#: app/views/request/_followup.rhtml:73 msgid "I am requesting an <strong>internal review</strong>" msgstr "" @@ -1153,7 +1244,7 @@ msgid "" "email {{contact_email}} for help." msgstr "" -#: app/views/request/_followup.rhtml:21 +#: app/views/request/_followup.rhtml:20 msgid "" "If you are dissatisfied by the response you got from\n" " the public authority, you have the right to\n" @@ -1176,7 +1267,7 @@ msgid "" " please <a href=\"%s\">read this first</a>." msgstr "" -#: app/views/request/show.rhtml:98 +#: app/views/request/show.rhtml:105 msgid "If you are {{user_link}}, please" msgstr "" @@ -1205,15 +1296,15 @@ msgid "" "more. Please try doing what you were doing from the beginning." msgstr "" -#: app/controllers/request_controller.rb:430 +#: app/controllers/request_controller.rb:437 msgid "" "If you have not done so already, please write a message below telling the " "authority that you have withdrawn your request. Otherwise they will not know" " it has been withdrawn." msgstr "" -#: app/views/user/signchangepassword_confirm.rhtml:10 #: app/views/user/signchangeemail_confirm.rhtml:11 +#: app/views/user/signchangepassword_confirm.rhtml:10 msgid "" "If you use web-based email or have \"junk mail\" filters, also check your\n" "bulk/spam mail folders. Sometimes, our messages are marked that way." @@ -1226,11 +1317,11 @@ msgid "" msgstr "" #: app/views/user/_signup.rhtml:6 -msgid "If you're new to WhatDoTheyKnow" +msgid "If you're new to {{site_name}}" msgstr "" #: app/views/user/_signin.rhtml:7 -msgid "If you've used WhatDoTheyKnow before" +msgid "If you've used {{site_name}} before" msgstr "" #: app/views/user/no_cookies.rhtml:12 @@ -1239,79 +1330,79 @@ msgid "" "then there is probably a fault with our server." msgstr "" -#: locale/model_attributes.rb:64 +#: locale/model_attributes.rb:63 msgid "IncomingMessage|Cached attachment text clipped" msgstr "" -#: locale/model_attributes.rb:65 +#: locale/model_attributes.rb:64 msgid "IncomingMessage|Cached main body text folded" msgstr "" -#: locale/model_attributes.rb:66 +#: locale/model_attributes.rb:65 msgid "IncomingMessage|Cached main body text unfolded" msgstr "" -#: locale/model_attributes.rb:39 +#: locale/model_attributes.rb:44 msgid "InfoRequestEvent|Calculated state" msgstr "" -#: locale/model_attributes.rb:38 +#: locale/model_attributes.rb:43 msgid "InfoRequestEvent|Described state" msgstr "" -#: locale/model_attributes.rb:36 +#: locale/model_attributes.rb:41 msgid "InfoRequestEvent|Event type" msgstr "" -#: locale/model_attributes.rb:40 +#: locale/model_attributes.rb:45 msgid "InfoRequestEvent|Last described at" msgstr "" -#: locale/model_attributes.rb:37 +#: locale/model_attributes.rb:42 msgid "InfoRequestEvent|Params yaml" msgstr "" -#: locale/model_attributes.rb:41 +#: locale/model_attributes.rb:46 msgid "InfoRequestEvent|Prominence" msgstr "" -#: locale/model_attributes.rb:87 +#: locale/model_attributes.rb:86 msgid "InfoRequest|Allow new responses from" msgstr "" -#: locale/model_attributes.rb:83 +#: locale/model_attributes.rb:82 msgid "InfoRequest|Awaiting description" msgstr "" -#: locale/model_attributes.rb:82 +#: locale/model_attributes.rb:81 msgid "InfoRequest|Described state" msgstr "" -#: locale/model_attributes.rb:88 +#: locale/model_attributes.rb:87 msgid "InfoRequest|Handle rejected responses" msgstr "" -#: locale/model_attributes.rb:86 +#: locale/model_attributes.rb:85 msgid "InfoRequest|Law used" msgstr "" -#: locale/model_attributes.rb:84 +#: locale/model_attributes.rb:83 msgid "InfoRequest|Prominence" msgstr "" -#: locale/model_attributes.rb:81 +#: locale/model_attributes.rb:80 msgid "InfoRequest|Title" msgstr "" -#: locale/model_attributes.rb:85 +#: locale/model_attributes.rb:84 msgid "InfoRequest|Url title" msgstr "" -#: app/models/info_request_event.rb:298 +#: app/models/info_request_event.rb:303 msgid "Information not held" msgstr "" -#: app/models/info_request.rb:784 +#: app/models/info_request.rb:791 msgid "Information not held." msgstr "" @@ -1321,17 +1412,17 @@ msgid "" " radiation, waste materials)" msgstr "" -#: app/models/info_request_event.rb:306 +#: app/models/info_request_event.rb:311 msgid "Internal review acknowledgement" msgstr "" -#: app/models/info_request_event.rb:323 +#: app/models/info_request_event.rb:328 msgid "Internal review request" msgstr "" #: app/views/outgoing_mailer/initial_request.rhtml:8 msgid "" -"Is {{email_address}} the wrong address for {{type_of_request}} requests tp " +"Is {{email_address}} the wrong address for {{type_of_request}} requests to " "{{public_body_name}}? If so, please contact us using this form:" msgstr "" @@ -1342,14 +1433,14 @@ msgid "" "browser. Then press refresh to have another go." msgstr "" -#: app/views/user/show.rhtml:62 -msgid "Joined WhatDoTheyKnow in" -msgstr "" - #: app/views/user/_user_listing_single.rhtml:21 msgid "Joined in" msgstr "" +#: app/views/user/show.rhtml:62 +msgid "Joined {{site_name}} in" +msgstr "" + #: app/views/request/new.rhtml:48 msgid "" "Keep it <strong>focused</strong>, you'll be more likely to get what you want" @@ -1383,7 +1474,7 @@ msgstr "" msgid "Local and regional" msgstr "" -#: app/models/info_request.rb:782 +#: app/models/info_request.rb:789 msgid "Long overdue." msgstr "" @@ -1399,7 +1490,7 @@ msgstr "" msgid "Make and browse Freedom of Information (FOI) requests" msgstr "" -#: app/views/layouts/default.rhtml:86 +#: app/views/layouts/default.rhtml:67 msgid "Make and explore Freedom of Information requests" msgstr "Gwnewch geisiadau Rhyddid Gwybodaeth neu archwiliwch trwyddynt" @@ -1407,7 +1498,7 @@ msgstr "Gwnewch geisiadau Rhyddid Gwybodaeth neu archwiliwch trwyddynt" msgid "Make or explore Freedom of Information requests" msgstr "Gwnewch geisiadau Rhyddid Gwybodaeth neu archwiliwch trwyddynt" -#: app/views/layouts/default.rhtml:106 +#: app/views/layouts/default.rhtml:87 msgid "Make request" msgstr "Gwneud cais" @@ -1416,7 +1507,7 @@ msgid "Make your own request" msgstr "" #: app/views/contact_mailer/message.rhtml:4 -msgid "Message sent using WhatDoTheyKnow contact form, " +msgid "Message sent using {{site_name}} contact form, " msgstr "" #: app/views/request/new_bad_contact.rhtml:1 @@ -1439,7 +1530,7 @@ msgstr "Mwy o geisiadau llwyddiannus..." msgid "My request has been <strong>refused</strong>" msgstr "" -#: app/views/layouts/default.rhtml:110 +#: app/views/layouts/default.rhtml:91 msgid "My requests" msgstr "" @@ -1451,6 +1542,10 @@ msgstr "" msgid "Name is already taken" msgstr "" +#: app/models/track_thing.rb:142 app/models/track_thing.rb:143 +msgid "New Freedom of Information requests" +msgstr "" + #: app/views/user/signchangeemail.rhtml:20 msgid "New e-mail:" msgstr "" @@ -1505,14 +1600,14 @@ msgid "" "using this site yet." msgstr "" -#: app/views/request/_request_listing.rhtml:2 #: app/views/public_body/_body_listing.rhtml:2 +#: app/views/request/_request_listing.rhtml:2 msgid "None found." msgstr "" +#: app/views/user/signchangeemail_confirm.rhtml:3 #: app/views/user/signchangepassword_confirm.rhtml:1 #: app/views/user/signchangepassword_confirm.rhtml:3 -#: app/views/user/signchangeemail_confirm.rhtml:3 msgid "Now check your email!" msgstr "" @@ -1544,7 +1639,7 @@ msgstr "" "NEU, <strong>chwiliwch</strong> am wybodaeth y mae pobl eraill wedi gofyn " "amdani gan ddefnyddio {{site_name}}" -#: app/controllers/request_controller.rb:407 +#: app/controllers/request_controller.rb:414 msgid "" "Oh no! Sorry to hear that your request was refused. Here is what to do now." msgstr "" @@ -1575,27 +1670,43 @@ msgstr "" msgid "Only requests made using {{site_name}} are shown." msgstr "" -#: locale/model_attributes.rb:21 +#: app/models/info_request.rb:405 +msgid "" +"Only the authority can reply to this request, and I don't recognise the " +"address this reply was sent from" +msgstr "" + +#: app/models/info_request.rb:401 +msgid "" +"Only the authority can reply to this request, but there is no \"From\" " +"address to check against" +msgstr "" + +#: app/views/general/search.rhtml:158 +msgid "Original request sent" +msgstr "" + +#: locale/model_attributes.rb:26 msgid "OutgoingMessage|Body" msgstr "" -#: locale/model_attributes.rb:24 +#: locale/model_attributes.rb:29 msgid "OutgoingMessage|Last sent at" msgstr "" -#: locale/model_attributes.rb:23 +#: locale/model_attributes.rb:28 msgid "OutgoingMessage|Message type" msgstr "" -#: locale/model_attributes.rb:22 +#: locale/model_attributes.rb:27 msgid "OutgoingMessage|Status" msgstr "" -#: locale/model_attributes.rb:25 +#: locale/model_attributes.rb:30 msgid "OutgoingMessage|What doing" msgstr "" -#: app/models/info_request.rb:788 +#: app/models/info_request.rb:795 msgid "Partially successful." msgstr "" @@ -1619,7 +1730,7 @@ msgstr "" msgid "Plans and administrative measures that affect these matters" msgstr "" -#: app/controllers/request_game_controller.rb:40 +#: app/controllers/request_game_controller.rb:42 msgid "Play the request categorisation game" msgstr "" @@ -1627,7 +1738,7 @@ msgstr "" msgid "Play the request categorisation game!" msgstr "" -#: app/views/request/show.rhtml:94 +#: app/views/request/show.rhtml:101 msgid "Please" msgstr "" @@ -1635,7 +1746,7 @@ msgstr "" msgid "Please <a href=\"%s\">get in touch</a> with us so we can fix it." msgstr "" -#: app/views/request/show.rhtml:45 +#: app/views/request/show.rhtml:52 msgid "" "Please <strong>answer the question above</strong> so we know whether the " msgstr "" @@ -1646,11 +1757,12 @@ msgid "" " know if there was information in the recent responses to them." msgstr "" -#: app/views/request/_followup.rhtml:28 +#: app/views/request/_followup.rhtml:27 msgid "" -"Please <strong>only</strong> write messages directly relating to your \n" -"\t\t\t\trequest {{request_link}}. If you would like to ask for information\n" -"\t\t\t\tthat was not in your original request, then <a href=\"%s\">file a new request</a>." +"Please <strong>only</strong> write messages directly relating to your " +"request {{request_link}}. If you would like to ask for information that was " +"not in your original request, then <a href=\"{{new_request_link}}\">file a " +"new request</a>." msgstr "" #: app/views/request/new.rhtml:60 @@ -1671,7 +1783,7 @@ msgstr "" msgid "Please choose what sort of reply you are making." msgstr "" -#: app/controllers/request_controller.rb:341 +#: app/controllers/request_controller.rb:346 msgid "" "Please choose whether or not you got some of the information that you " "wanted." @@ -1680,15 +1792,15 @@ msgstr "" #: app/views/user_mailer/changeemail_confirm.rhtml:3 msgid "" "Please click on the link below to confirm that you want to \n" -"change the email address that you use for WhatDoTheyKnow\n" -"from " +"change the email address that you use for {{site_name}}\n" +"from {{old_email}} to {{new_email}}" msgstr "" #: app/views/user_mailer/confirm_login.rhtml:3 msgid "Please click on the link below to confirm your email address." msgstr "" -#: app/models/info_request.rb:127 +#: app/models/info_request.rb:126 msgid "" "Please describe more what the request is about in the subject. There is no " "need to say it is an FOI request, we add that on anyway." @@ -1712,7 +1824,7 @@ msgstr "" msgid "Please enter a subject" msgstr "" -#: app/models/info_request.rb:35 +#: app/models/info_request.rb:34 msgid "Please enter a summary of your request" msgstr "" @@ -1772,7 +1884,7 @@ msgstr "" msgid "Please keep it shorter than 500 characters" msgstr "" -#: app/models/info_request.rb:124 +#: app/models/info_request.rb:123 msgid "" "Please keep the summary short, like in the subject of an email. You can use " "a phrase, rather than a full sentence." @@ -1800,11 +1912,11 @@ msgstr "" msgid "Please sign in as " msgstr "" -#: app/controllers/request_controller.rb:723 +#: app/controllers/request_controller.rb:730 msgid "Please type a message and/or choose a file containing your response." msgstr "" -#: app/controllers/request_controller.rb:427 +#: app/controllers/request_controller.rb:434 msgid "Please use the form below to tell us more." msgstr "" @@ -1813,11 +1925,11 @@ msgstr "" msgid "Please use this email address for all replies to this request:" msgstr "" -#: app/models/info_request.rb:36 +#: app/models/info_request.rb:35 msgid "Please write a summary with some text in it" msgstr "" -#: app/models/info_request.rb:121 +#: app/models/info_request.rb:120 msgid "" "Please write the summary using a mixture of capital and lower case letters. " "This makes it easier for others to read." @@ -1829,7 +1941,7 @@ msgid "" "letters. This makes it easier for others to read." msgstr "" -#: app/controllers/request_controller.rb:416 +#: app/controllers/request_controller.rb:423 msgid "" "Please write your follow up message containing the necessary clarifications " "below." @@ -1851,27 +1963,27 @@ msgstr "" msgid "Post annotation" msgstr "" -#: locale/model_attributes.rb:56 +#: locale/model_attributes.rb:55 msgid "PostRedirect|Circumstance" msgstr "" -#: locale/model_attributes.rb:54 +#: locale/model_attributes.rb:53 msgid "PostRedirect|Email token" msgstr "" -#: locale/model_attributes.rb:53 +#: locale/model_attributes.rb:52 msgid "PostRedirect|Post params yaml" msgstr "" -#: locale/model_attributes.rb:55 +#: locale/model_attributes.rb:54 msgid "PostRedirect|Reason params yaml" msgstr "" -#: locale/model_attributes.rb:51 +#: locale/model_attributes.rb:50 msgid "PostRedirect|Token" msgstr "" -#: locale/model_attributes.rb:52 +#: locale/model_attributes.rb:51 msgid "PostRedirect|Uri" msgstr "" @@ -1891,7 +2003,7 @@ msgstr "" msgid "Preview your annotation" msgstr "" -#: app/views/request/_followup.rhtml:99 +#: app/views/request/_followup.rhtml:96 msgid "Preview your message" msgstr "" @@ -1899,11 +2011,11 @@ msgstr "" msgid "Preview your public request" msgstr "" -#: locale/model_attributes.rb:18 +#: locale/model_attributes.rb:15 msgid "ProfilePhoto|Data" msgstr "" -#: locale/model_attributes.rb:19 +#: locale/model_attributes.rb:16 msgid "ProfilePhoto|Draft" msgstr "" @@ -1965,12 +2077,8 @@ msgstr "" msgid "Publication scheme" msgstr "" -#: locale/model_attributes.rb:49 -msgid "RawEmail|Data binary" -msgstr "" - #: locale/model_attributes.rb:48 -msgid "RawEmail|Data text" +msgid "RawEmail|Data binary" msgstr "" #: app/views/comment/preview.rhtml:20 @@ -1987,11 +2095,11 @@ msgstr "" #: app/views/general/search.rhtml:137 msgid "" -"Read about <a href=\"%s\">advanced search operators</a>, such as proximity " -"and wildcards." +"Read about <a href=\"{{advanced_search_url}}\">advanced search " +"operators</a>, such as proximity and wildcards." msgstr "" -#: app/views/layouts/default.rhtml:112 +#: app/views/layouts/default.rhtml:93 msgid "Read blog" msgstr "Darllen blog" @@ -1999,11 +2107,15 @@ msgstr "Darllen blog" msgid "Read this before writing your {{info_request_law_used_full}} request" msgstr "" +#: app/views/general/search.rhtml:150 +msgid "Received an error message, such as delivery failure." +msgstr "" + #: app/views/general/search.rhtml:42 msgid "Recently described results first" msgstr "" -#: app/controllers/request_controller.rb:134 +#: app/controllers/request_controller.rb:139 msgid "Recently sent Freedom of Information requests" msgstr "" @@ -2011,15 +2123,15 @@ msgstr "" msgid "Recently sent requests" msgstr "" -#: app/controllers/request_controller.rb:139 +#: app/controllers/request_controller.rb:144 msgid "Recently successful responses" msgstr "" -#: app/models/info_request_event.rb:300 +#: app/models/info_request_event.rb:305 msgid "Refused" msgstr "" -#: app/models/info_request.rb:786 +#: app/models/info_request.rb:793 msgid "Refused." msgstr "" @@ -2069,6 +2181,10 @@ msgstr "" msgid "Requested on {{date}}" msgstr "" +#: app/models/track_thing.rb:209 app/models/track_thing.rb:210 +msgid "Requests or responses matching '{{query}}'" +msgstr "" + #: app/views/request/upload_response.rhtml:11 msgid "Respond by email" msgstr "" @@ -2085,11 +2201,15 @@ msgstr "" msgid "Respond using the web" msgstr "" -#: app/views/request/show.rhtml:70 +#: app/views/general/search.rhtml:160 +msgid "Response from a public authority" +msgstr "" + +#: app/views/request/show.rhtml:77 msgid "Response to this request is <strong>delayed</strong>." msgstr "" -#: app/views/request/show.rhtml:78 +#: app/views/request/show.rhtml:85 msgid "Response to this request is <strong>long overdue</strong>." msgstr "" @@ -2109,9 +2229,9 @@ msgstr "" msgid "Save" msgstr "" -#: app/views/request/new.rhtml:31 app/views/layouts/default.rhtml:99 #: app/views/general/exception_caught.rhtml:10 #: app/views/general/frontpage.rhtml:16 app/views/general/search.rhtml:29 +#: app/views/layouts/default.rhtml:80 app/views/request/new.rhtml:31 msgid "Search" msgstr "Chwilio" @@ -2124,7 +2244,7 @@ msgstr "" msgid "Search the site to find what you were looking for." msgstr "" -#: app/controllers/user_controller.rb:330 +#: app/controllers/user_controller.rb:331 msgid "Send a message to " msgstr "" @@ -2164,7 +2284,7 @@ msgstr "" msgid "Show most relevant results first" msgstr "" -#: app/views/request/list.rhtml:2 app/views/public_body/list.rhtml:3 +#: app/views/public_body/list.rhtml:3 app/views/request/list.rhtml:2 msgid "Show only..." msgstr "" @@ -2174,13 +2294,13 @@ msgstr "" #: app/views/user/sign.rhtml:20 msgid "Sign in or make a new account" -msgstr "" +msgstr "Mewngofnodi neu gofrestru" -#: app/views/layouts/default.rhtml:122 +#: app/views/layouts/default.rhtml:103 msgid "Sign in or sign up" -msgstr "" +msgstr "Mewngofnodi neu gofrestru" -#: app/views/layouts/default.rhtml:119 +#: app/views/layouts/default.rhtml:100 msgid "Sign out" msgstr "" @@ -2192,10 +2312,14 @@ msgstr "" msgid "Similar requests" msgstr "" -#: app/models/info_request_event.rb:302 +#: app/models/info_request_event.rb:307 msgid "Some information sent" msgstr "" +#: app/views/general/search.rhtml:145 +msgid "Some of the information requested has been received" +msgstr "" + #: app/views/request_game/play.rhtml:31 msgid "" "Some people who've made requests haven't let us know whether they were\n" @@ -2207,7 +2331,7 @@ msgstr "" #: app/views/user_mailer/changeemail_already_used.rhtml:1 msgid "" "Someone, perhaps you, just tried to change their email address on\n" -"WhatDoTheyKnow.com from " +"{{site_name}} from {{old_email}} to {{new_email}}." msgstr "" #: app/views/general/exception_caught.rhtml:1 @@ -2222,8 +2346,8 @@ msgstr "" msgid "Still awaiting an <strong>internal review</strong>" msgstr "" -#: app/views/request/preview.rhtml:18 #: app/views/request/followup_preview.rhtml:23 +#: app/views/request/preview.rhtml:18 msgid "Subject:" msgstr "" @@ -2243,7 +2367,7 @@ msgstr "" msgid "Successful responses" msgstr "" -#: app/models/info_request.rb:790 +#: app/models/info_request.rb:797 msgid "Successful." msgstr "" @@ -2265,7 +2389,7 @@ msgstr "" msgid "Tags:" msgstr "" -#: app/controllers/request_game_controller.rb:50 +#: app/controllers/request_game_controller.rb:52 msgid "Thank you for helping us keep the site tidy!" msgstr "" @@ -2273,25 +2397,25 @@ msgstr "" msgid "Thank you for making an annotation!" msgstr "" -#: app/controllers/request_controller.rb:729 +#: app/controllers/request_controller.rb:736 msgid "" "Thank you for responding to this FOI request! Your response has been " "published below, and a link to your response has been emailed to " msgstr "" -#: app/controllers/request_controller.rb:373 +#: app/controllers/request_controller.rb:378 msgid "" "Thank you for updating the status of the request '<a " -"href=\"%s\">{{info_request_title}}</a>'. There are some more requests below " -"for you to classify." +"href=\"{{url}}\">{{info_request_title}}</a>'. There are some more requests " +"below for you to classify." msgstr "" -#: app/controllers/request_controller.rb:376 +#: app/controllers/request_controller.rb:381 msgid "Thank you for updating this request!" msgstr "" -#: app/controllers/user_controller.rb:397 -#: app/controllers/user_controller.rb:413 +#: app/controllers/user_controller.rb:398 +#: app/controllers/user_controller.rb:414 msgid "Thank you for updating your profile photo" msgstr "" @@ -2315,7 +2439,7 @@ msgid "" " requests." msgstr "" -#: app/controllers/user_controller.rb:188 +#: app/controllers/user_controller.rb:189 msgid "" "That doesn't look like a valid email address. Please check you have typed it" " correctly." @@ -2330,7 +2454,7 @@ msgstr "" msgid "The Freedom of Information Act <strong>does not apply</strong> to" msgstr "" -#: app/views/user_mailer/changeemail_already_used.rhtml:7 +#: app/views/user_mailer/changeemail_already_used.rhtml:8 msgid "The accounts have been left as they previously were." msgstr "" @@ -2351,7 +2475,7 @@ msgid "" " address</strong>, not just an email, for it to be a valid FOI request" msgstr "" -#: app/views/request/show.rhtml:102 +#: app/views/request/show.rhtml:109 msgid "" "The authority would like to / has <strong>responded by post</strong> to this" " request." @@ -2375,32 +2499,48 @@ msgstr "" msgid "The page either doesn't exist, or is broken. Things you can try now:" msgstr "" +#: app/views/general/search.rhtml:143 +msgid "The public authority does not have the information requested" +msgstr "" + +#: app/views/general/search.rhtml:147 +msgid "The public authority would like part of the request explained" +msgstr "" + +#: app/views/general/search.rhtml:148 +msgid "The public authority would like to / has responded by post" +msgstr "" + #: app/views/request/_other_describe_state.rhtml:60 msgid "The request has been <strong>refused</strong>" msgstr "" -#: app/controllers/request_controller.rb:347 +#: app/controllers/request_controller.rb:352 msgid "" "The request has been updated since you originally loaded this page. Please " "check for any new incoming messages below, and try again." msgstr "" -#: app/views/request/show.rhtml:97 +#: app/views/request/show.rhtml:104 msgid "The request is <strong>waiting for clarification</strong>." msgstr "" -#: app/views/request/show.rhtml:90 +#: app/views/request/show.rhtml:97 msgid "The request was <strong>partially successful</strong>." msgstr "" -#: app/views/request/show.rhtml:86 +#: app/views/request/show.rhtml:93 msgid "The request was <strong>refused</strong> by" msgstr "" -#: app/views/request/show.rhtml:88 +#: app/views/request/show.rhtml:95 msgid "The request was <strong>successful</strong>." msgstr "" +#: app/views/general/search.rhtml:144 +msgid "The request was refused by the public authority" +msgstr "" + #: app/views/request/hidden.rhtml:9 msgid "" "The request you have tried to view has been removed. There are\n" @@ -2408,14 +2548,18 @@ msgid "" " href=\"%s\">contact us</a> if you have any questions." msgstr "" -#: app/views/request/_followup.rhtml:35 +#: app/views/general/search.rhtml:152 +msgid "The requester has abandoned this request for some reason" +msgstr "" + +#: app/views/request/_followup.rhtml:32 msgid "" "The response to your request has been <strong>delayed</strong>. You can say that, \n" " by law, the authority should normally have responded\n" " <strong>promptly</strong> and" msgstr "" -#: app/views/request/_followup.rhtml:47 +#: app/views/request/_followup.rhtml:44 msgid "" "The response to your request is <strong>long overdue</strong>. You can say that, by \n" " law, under all circumstances, the authority should have responded\n" @@ -2434,59 +2578,81 @@ msgid "" "Information requests this person has made." msgstr "" -#: app/controllers/track_controller.rb:142 +#: app/controllers/track_controller.rb:144 msgid "Then you can cancel the alert." msgstr "" -#: app/controllers/track_controller.rb:172 +#: app/controllers/track_controller.rb:174 msgid "Then you can cancel the alerts." msgstr "" -#: app/controllers/user_controller.rb:248 +#: app/controllers/user_controller.rb:249 msgid "Then you can change your email address used on {{site_name}}" msgstr "" -#: app/controllers/user_controller.rb:202 +#: app/controllers/user_controller.rb:203 msgid "Then you can change your password on {{site_name}}" msgstr "" -#: app/controllers/request_controller.rb:333 +#: app/controllers/request_controller.rb:338 msgid "Then you can classify the FOI response you have got from " msgstr "" -#: app/controllers/request_game_controller.rb:39 +#: app/controllers/request_game_controller.rb:41 msgid "Then you can play the request categorisation game." msgstr "" -#: app/controllers/user_controller.rb:329 +#: app/controllers/user_controller.rb:330 msgid "Then you can send a message to " msgstr "" -#: app/controllers/user_controller.rb:513 +#: app/controllers/user_controller.rb:514 msgid "Then you can sign in to {{site_name}}" msgstr "" -#: app/controllers/request_controller.rb:59 +#: app/controllers/request_controller.rb:61 msgid "Then you can update the status of your request to " msgstr "" -#: app/controllers/request_controller.rb:695 +#: app/controllers/request_controller.rb:702 msgid "Then you can upload an FOI response. " msgstr "" -#: app/controllers/request_controller.rb:538 +#: app/controllers/request_controller.rb:545 msgid "Then you can write follow up message to " msgstr "" -#: app/controllers/request_controller.rb:539 +#: app/controllers/request_controller.rb:546 msgid "Then you can write your reply to " msgstr "" +#: app/models/track_thing.rb:197 +msgid "" +"Then you will be emailed whenever '{{user_name}}' requests something or gets" +" a response." +msgstr "" + +#: app/models/track_thing.rb:213 +msgid "" +"Then you will be emailed whenever a new request or response matches " +"'{{query}}'." +msgstr "" + #: app/models/track_thing.rb:162 msgid "Then you will be emailed whenever an FOI request succeeds." msgstr "" -#: app/controllers/request_controller.rb:294 +#: app/models/track_thing.rb:146 +msgid "Then you will be emailed whenever anyone makes a new FOI request." +msgstr "" + +#: app/models/track_thing.rb:181 +msgid "" +"Then you will be emailed whenever someone requests something or gets a " +"response from '{{public_body_name}}'." +msgstr "" + +#: app/controllers/request_controller.rb:299 msgid "Then your FOI request to {{public_body_name}} will be sent." msgstr "" @@ -2506,13 +2672,13 @@ msgid "" " One of them is shown below, you may mean a different one:" msgstr "" -#: app/views/request/show.rhtml:106 +#: app/views/request/show.rhtml:113 msgid "" "There was a <strong>delivery error</strong> or similar, which needs fixing " -"by the WhatDoTheyKnow team." +"by the {{site_name}} team." msgstr "" -#: app/controllers/public_body_controller.rb:76 +#: app/controllers/public_body_controller.rb:77 msgid "There was an error with the words you entered, please try again." msgstr "" @@ -2598,20 +2764,26 @@ msgstr "" msgid "This request <strong>requires administrator attention</strong>" msgstr "" -#: app/views/request/show.rhtml:48 +#: app/views/request/show.rhtml:55 msgid "This request has an <strong>unknown status</strong>." msgstr "" -#: app/views/request/show.rhtml:110 +#: app/views/request/show.rhtml:117 msgid "" "This request has been <strong>withdrawn</strong> by the person who made it. \n" " \t There may be an explanation in the correspondence below." msgstr "" -#: app/views/request/show.rhtml:108 +#: app/models/info_request.rb:395 +msgid "" +"This request has been set by an administrator to \"allow new responses from " +"nobody\"" +msgstr "" + +#: app/views/request/show.rhtml:115 msgid "" "This request has had an unusual response, and <strong>requires " -"attention</strong> from the WhatDoTheyKnow team." +"attention</strong> from the {{site_name}} team." msgstr "" #: app/views/request/show.rhtml:5 @@ -2641,30 +2813,44 @@ msgstr "" #: app/views/request/details.rhtml:6 msgid "" "This table shows the technical details of the internal events that happened\n" -"to this request on WhatDoTheyKnow. This could be used to generate information about\n" +"to this request on {{site_name}}. This could be used to generate information about\n" "the speed with which authorities respond to requests, the number of requests\n" "which require a postal response and much more." msgstr "" #: app/views/user/show.rhtml:79 -msgid "This user has been banned from WhatDoTheyKnow.com " +msgid "This user has been banned from {{site_name}} " msgstr "" -#: app/views/user_mailer/changeemail_already_used.rhtml:4 +#: app/views/user_mailer/changeemail_already_used.rhtml:5 msgid "" "This was not possible because there is already an account using \n" -"the email address " +"the email address {{email}}." +msgstr "" + +#: app/models/track_thing.rb:145 +msgid "To be emailed about any new requests" msgstr "" #: app/models/track_thing.rb:161 msgid "To be emailed about any successful requests" msgstr "" -#: app/controllers/track_controller.rb:171 +#: app/models/track_thing.rb:196 +msgid "To be emailed about requests by '{{user_name}}'" +msgstr "" + +#: app/models/track_thing.rb:180 +msgid "" +"To be emailed about requests made using {{site_name}} to the public " +"authority '{{public_body_name}}'" +msgstr "" + +#: app/controllers/track_controller.rb:173 msgid "To cancel these alerts" msgstr "" -#: app/controllers/track_controller.rb:141 +#: app/controllers/track_controller.rb:143 msgid "To cancel this alert" msgstr "" @@ -2674,11 +2860,11 @@ msgid "" "was a technical problem trying to do this." msgstr "" -#: app/controllers/user_controller.rb:247 +#: app/controllers/user_controller.rb:248 msgid "To change your email address used on {{site_name}}" msgstr "" -#: app/controllers/request_controller.rb:332 +#: app/controllers/request_controller.rb:337 msgid "To classify the response to this FOI request" msgstr "" @@ -2690,6 +2876,10 @@ msgstr "" msgid "To do this, first click on the link below." msgstr "" +#: app/models/track_thing.rb:212 +msgid "To follow requests and responses matching '{{query}}'" +msgstr "" + #: app/views/request_mailer/old_unclassified_updated.rhtml:1 msgid "" "To help us keep the site tidy, someone else has updated the status of the \n" @@ -2700,7 +2890,7 @@ msgstr "" msgid "To let us know, follow this link and then select the appropriate box." msgstr "" -#: app/controllers/request_game_controller.rb:38 +#: app/controllers/request_game_controller.rb:40 msgid "To play the request categorisation game" msgstr "" @@ -2708,27 +2898,27 @@ msgstr "" msgid "To post your annotation" msgstr "" -#: app/controllers/request_controller.rb:536 +#: app/controllers/request_controller.rb:543 msgid "To reply to " msgstr "" -#: app/controllers/request_controller.rb:535 +#: app/controllers/request_controller.rb:542 msgid "To send a follow up message to " msgstr "" -#: app/controllers/user_controller.rb:328 +#: app/controllers/user_controller.rb:329 msgid "To send a message to " msgstr "" -#: app/controllers/request_controller.rb:293 +#: app/controllers/request_controller.rb:298 msgid "To send your FOI request" msgstr "" -#: app/controllers/request_controller.rb:58 +#: app/controllers/request_controller.rb:60 msgid "To update the status of this FOI request" msgstr "" -#: app/controllers/request_controller.rb:694 +#: app/controllers/request_controller.rb:701 msgid "" "To upload a response, you must be logged in using an email address from " msgstr "" @@ -2747,8 +2937,8 @@ msgstr "" msgid "To {{public_body_link_absolute}}" msgstr "" -#: app/views/request/preview.rhtml:17 #: app/views/request/followup_preview.rhtml:22 app/views/request/new.rhtml:88 +#: app/views/request/preview.rhtml:17 msgid "To:" msgstr "" @@ -2756,6 +2946,10 @@ msgstr "" msgid "Track requests to {{public_body_name}} by email" msgstr "" +#: app/models/track_thing.rb:206 +msgid "Track things matching '{{query}}' by email" +msgstr "" + #: app/views/public_body/show.rhtml:3 msgid "Track this authority" msgstr "" @@ -2764,10 +2958,18 @@ msgstr "" msgid "Track this person" msgstr "" +#: app/models/track_thing.rb:190 +msgid "Track this person by email" +msgstr "" + #: app/views/request/_sidebar.rhtml:2 msgid "Track this request" msgstr "" +#: app/models/track_thing.rb:123 +msgid "Track this request by email" +msgstr "" + #: locale/model_attributes.rb:33 msgid "TrackThing|Track medium" msgstr "" @@ -2791,7 +2993,7 @@ msgid "URL name can't be blank" msgstr "" #: app/models/user_mailer.rb:45 -msgid "Unable to change email address on WhatDoTheyKnow.com" +msgid "Unable to change email address on {{site_name}}" msgstr "" #: app/views/request/followup_bad.rhtml:4 @@ -2827,11 +3029,11 @@ msgstr "" msgid "Unknown" msgstr "" -#: app/models/info_request_event.rb:312 +#: app/models/info_request_event.rb:317 msgid "Unusual response" msgstr "" -#: app/models/info_request.rb:800 +#: app/models/info_request.rb:807 msgid "Unusual response." msgstr "" @@ -2840,7 +3042,7 @@ msgstr "" msgid "Update the status of this request" msgstr "" -#: app/controllers/request_controller.rb:60 +#: app/controllers/request_controller.rb:62 msgid "Update the status of your request to " msgstr "" @@ -2856,47 +3058,47 @@ msgid "" "<strong><code>\"Liverpool City Council\"</code></strong>" msgstr "" -#: locale/model_attributes.rb:68 +#: locale/model_attributes.rb:67 msgid "UserInfoRequestSentAlert|Alert type" msgstr "" -#: locale/model_attributes.rb:79 +#: locale/model_attributes.rb:78 msgid "User|About me" msgstr "" -#: locale/model_attributes.rb:77 +#: locale/model_attributes.rb:76 msgid "User|Admin level" msgstr "" -#: locale/model_attributes.rb:78 +#: locale/model_attributes.rb:77 msgid "User|Ban text" msgstr "" -#: locale/model_attributes.rb:70 +#: locale/model_attributes.rb:69 msgid "User|Email" msgstr "" -#: locale/model_attributes.rb:74 +#: locale/model_attributes.rb:73 msgid "User|Email confirmed" msgstr "" -#: locale/model_attributes.rb:72 +#: locale/model_attributes.rb:71 msgid "User|Hashed password" msgstr "" -#: locale/model_attributes.rb:76 +#: locale/model_attributes.rb:75 msgid "User|Last daily track email" msgstr "" -#: locale/model_attributes.rb:71 +#: locale/model_attributes.rb:70 msgid "User|Name" msgstr "" -#: locale/model_attributes.rb:73 +#: locale/model_attributes.rb:72 msgid "User|Salt" msgstr "" -#: locale/model_attributes.rb:75 +#: locale/model_attributes.rb:74 msgid "User|Url name" msgstr "" @@ -2913,31 +3115,41 @@ msgid "View FOI email address for {{public_body_name}}" msgstr "" #: app/views/contact_mailer/user_message.rhtml:10 -msgid "View Freedom of Information requests made by" +msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "" -#: app/views/layouts/default.rhtml:108 +#: app/views/layouts/default.rhtml:89 msgid "View authorities" msgstr "Gweld yr awdurdodau" #: app/views/public_body/view_email_captcha.rhtml:12 msgid "View email" -msgstr "" +msgstr "Gweld e-bost" -#: app/views/layouts/default.rhtml:107 +#: app/views/layouts/default.rhtml:88 msgid "View requests" msgstr "Gweld ceisiadau" -#: app/models/info_request.rb:792 +#: app/models/info_request.rb:799 msgid "Waiting clarification." msgstr "" -#: app/views/request/show.rhtml:104 +#: app/views/request/show.rhtml:111 msgid "" "Waiting for an <strong>internal review</strong> by {{public_body_link}} of " "their handling of this request." msgstr "" +#: app/views/general/search.rhtml:149 +msgid "" +"Waiting for the public authority to complete an internal review of their " +"handling of the request" +msgstr "" + +#: app/views/general/search.rhtml:142 +msgid "Waiting for the public authority to reply" +msgstr "" + #: app/views/public_body/view_email.rhtml:17 msgid "We do not have a working request email address for this authority." msgstr "" @@ -2952,7 +3164,7 @@ 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=\"%s\">sign in</a> and let everyone know." +"\tif you are {{user_link}} please <a href=\"{{url}}\">sign in</a> and let everyone know." msgstr "" #: app/views/user_mailer/confirm_login.rhtml:8 @@ -2961,17 +3173,17 @@ msgid "" "or the law tell us to." msgstr "" -#: app/views/user_mailer/changeemail_confirm.rhtml:9 +#: app/views/user_mailer/changeemail_confirm.rhtml:10 msgid "" "We will not reveal your email addresses to anybody unless you\n" "or the law tell us to." msgstr "" -#: app/views/request/show.rhtml:54 +#: app/views/request/show.rhtml:61 msgid "We're waiting for" msgstr "" -#: app/views/request/show.rhtml:50 +#: app/views/request/show.rhtml:57 msgid "We're waiting for someone to read" msgstr "" @@ -2993,7 +3205,7 @@ msgid "" "password." msgstr "" -#: app/views/request/_followup.rhtml:61 +#: app/views/request/_followup.rhtml:58 msgid "What are you doing?" msgstr "" @@ -3001,12 +3213,6 @@ msgstr "" msgid "What best describes the status of this request now?" msgstr "" -#: app/views/public_body/view_email.rhtml:7 -msgid "" -"WhatDoTheyKnow sends new requests to <strong>{{request_email}}</strong> for " -"this authority." -msgstr "" - #: app/views/request_mailer/new_response.rhtml:9 msgid "" "When you get there, please update the status to say if the response \n" @@ -3029,19 +3235,19 @@ msgstr "" msgid "Which of these is happening?" msgstr "" -#: app/models/info_request_event.rb:308 +#: app/models/info_request_event.rb:313 msgid "Withdrawn by requester" msgstr "" -#: app/models/info_request.rb:802 +#: app/models/info_request.rb:809 msgid "Withdrawn by the requester." msgstr "" -#: app/controllers/request_controller.rb:542 +#: app/controllers/request_controller.rb:549 msgid "Write a reply to " msgstr "" -#: app/controllers/request_controller.rb:541 +#: app/controllers/request_controller.rb:548 msgid "Write your FOI follow up message to " msgstr "" @@ -3049,7 +3255,7 @@ msgstr "" msgid "Write your request in <strong>simple, precise language</strong>." msgstr "" -#: app/models/info_request_event.rb:296 +#: app/models/info_request_event.rb:301 msgid "Wrong Response" msgstr "" @@ -3057,22 +3263,42 @@ msgstr "" msgid "You" msgstr "" -#: app/controllers/track_controller.rb:96 +#: app/controllers/track_controller.rb:98 msgid "You are already being emailed updates about " msgstr "" +#: app/models/track_thing.rb:175 +msgid "You are already tracking requests to {{public_body_name}} by email" +msgstr "" + +#: app/models/track_thing.rb:207 +msgid "You are already tracking things matching '{{query}}' by email" +msgstr "" + +#: app/models/track_thing.rb:191 +msgid "You are already tracking this person by email" +msgstr "" + +#: app/models/track_thing.rb:124 +msgid "You are already tracking this request by email" +msgstr "" + #: app/models/track_thing.rb:156 msgid "You are being emailed about any new successful responses" msgstr "" -#: app/views/request/show.rhtml:81 +#: app/models/track_thing.rb:140 +msgid "You are being emailed when there are new requests" +msgstr "" + +#: app/views/request/show.rhtml:88 msgid "You can <strong>complain</strong> by" msgstr "" -#: app/views/request/details.rhtml:57 +#: app/views/request/details.rhtml:58 msgid "" "You can get this page in computer-readable format as part of the main JSON\n" -"page for the request. See the <a href=\"%s\">API documentation</a>." +"page for the request. See the <a href=\"{{api_path}}\">API documentation</a>." msgstr "" #: app/views/public_body/show.rhtml:40 @@ -3088,17 +3314,17 @@ msgstr "" msgid "You have a new response to the {{law_used_full}} request " msgstr "" -#: app/controllers/user_controller.rb:491 +#: app/controllers/user_controller.rb:492 msgid "You have now changed the text about you on your profile." msgstr "" -#: app/controllers/user_controller.rb:309 +#: app/controllers/user_controller.rb:310 msgid "You have now changed your email address used on {{site_name}}" msgstr "" #: app/views/user_mailer/already_registered.rhtml:3 msgid "" -"You just tried to sign up to WhatDoTheyKnow.com, when you\n" +"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" @@ -3131,19 +3357,19 @@ msgid "" "to find one, then please <a href=\"%s\">send it to us</a>." msgstr "" -#: app/controllers/user_controller.rb:469 +#: app/controllers/user_controller.rb:470 msgid "You need to be logged in to change the text about you on your profile." msgstr "" -#: app/controllers/user_controller.rb:370 +#: app/controllers/user_controller.rb:371 msgid "You need to be logged in to change your profile photo." msgstr "" -#: app/controllers/user_controller.rb:432 +#: app/controllers/user_controller.rb:433 msgid "You need to be logged in to clear your profile photo." msgstr "" -#: app/controllers/request_controller.rb:552 +#: app/controllers/request_controller.rb:559 msgid "" "You previously submitted that exact follow up message for this request." msgstr "" @@ -3168,15 +3394,15 @@ msgid "" "email alerts." msgstr "" -#: app/controllers/track_controller.rb:152 +#: app/controllers/track_controller.rb:154 msgid "You will no longer be emailed updates about " msgstr "" -#: app/controllers/track_controller.rb:181 +#: app/controllers/track_controller.rb:183 msgid "You will no longer be emailed updates for those alerts" msgstr "" -#: app/controllers/track_controller.rb:109 +#: app/controllers/track_controller.rb:111 msgid "You will now be emailed updates about " msgstr "" @@ -3186,7 +3412,7 @@ msgid "" "with the clarification." msgstr "" -#: app/controllers/user_controller.rb:441 +#: app/controllers/user_controller.rb:442 msgid "You've now cleared your profile photo" msgstr "" @@ -3209,9 +3435,8 @@ msgid "" "message, which will then go directly to the person who wrote the message." msgstr "" -#: app/views/user/_signin.rhtml:11 +#: app/views/user/_signin.rhtml:11 app/views/user/_signup.rhtml:9 #: app/views/user/signchangepassword_send_confirm.rhtml:13 -#: app/views/user/_signup.rhtml:9 msgid "Your e-mail:" msgstr "" @@ -3219,28 +3444,28 @@ msgstr "" msgid "Your email subscriptions" msgstr "" -#: app/controllers/request_controller.rb:549 +#: app/controllers/request_controller.rb:556 msgid "" "Your follow up has not been sent because this request has been stopped to " "prevent spam. Please <a href=\"%s\">contact us</a> if you really want to " "send a follow up message." msgstr "" -#: app/controllers/request_controller.rb:577 +#: app/controllers/request_controller.rb:584 msgid "Your follow up message has been sent on its way." msgstr "" -#: app/controllers/request_controller.rb:575 +#: app/controllers/request_controller.rb:582 msgid "Your internal review request has been sent on its way." msgstr "" -#: app/controllers/help_controller.rb:61 +#: app/controllers/help_controller.rb:63 msgid "" "Your message has been sent. Thank you for getting in touch! We'll get back " "to you soon." msgstr "" -#: app/controllers/user_controller.rb:348 +#: app/controllers/user_controller.rb:349 msgid "Your message to {{recipient_user_name}} has been sent!" msgstr "" @@ -3267,7 +3492,7 @@ msgstr "" msgid "Your original message is attached." msgstr "" -#: app/controllers/user_controller.rb:230 +#: app/controllers/user_controller.rb:231 msgid "Your password has been changed." msgstr "" @@ -3278,7 +3503,7 @@ msgstr "" #: app/views/user/set_draft_profile_photo.rhtml:18 msgid "" "Your photo will be shown in public <strong>on the Internet</strong>, \n" -" wherever you do something on WhatDoTheyKnow." +" wherever you do something on {{site_name}}." msgstr "" #: app/views/request_mailer/new_response_reminder_alert.rhtml:5 @@ -3299,10 +3524,14 @@ msgstr "" #: app/views/comment/new.rhtml:62 msgid "" -"Your thoughts on what the WhatDoTheyKnow <strong>administrators</strong> " +"Your thoughts on what the {{site_name}} <strong>administrators</strong> " "should do about the request." msgstr "" +#: app/models/track_mailer.rb:25 +msgid "Your {{site_name}} email alert" +msgstr "" + #: app/models/outgoing_message.rb:69 msgid "Yours faithfully," msgstr "" @@ -3329,13 +3558,13 @@ msgstr "" msgid "and sign in as " msgstr "" -#: app/views/request/show.rhtml:52 +#: app/views/request/show.rhtml:59 msgid "" "and update the status accordingly. Perhaps <strong>you</strong> might like " "to help out by doing that?" msgstr "" -#: app/views/request/show.rhtml:57 +#: app/views/request/show.rhtml:64 msgid "and update the status." msgstr "" @@ -3351,19 +3580,27 @@ msgstr "" msgid "annotations" msgstr "" +#: app/models/track_thing.rb:138 +msgid "any <a href=\"/list\">new requests</a>" +msgstr "" + +#: app/models/track_thing.rb:154 +msgid "any <a href=\"/list/successful\">successful requests</a>" +msgstr "" + #: app/views/request_mailer/very_overdue_alert.rhtml:1 msgid "are long overdue." msgstr "" -#: app/controllers/public_body_controller.rb:109 +#: app/controllers/public_body_controller.rb:111 msgid "beginning with" msgstr "" -#: app/views/request/show.rhtml:75 +#: app/views/request/show.rhtml:82 msgid "by" msgstr "" -#: app/views/request/_followup.rhtml:41 +#: app/views/request/_followup.rhtml:38 msgid "by <strong>{{date}}</strong>" msgstr "" @@ -3375,11 +3612,11 @@ msgstr "" msgid "by {{user_link_absolute}}" msgstr "" -#: locale/model_attributes.rb:42 +#: locale/model_attributes.rb:35 msgid "censor rule" msgstr "" -#: locale/model_attributes.rb:26 +#: locale/model_attributes.rb:20 msgid "comment" msgstr "" @@ -3389,7 +3626,7 @@ msgid "" " Or you could phone them." msgstr "" -#: app/models/info_request_event.rb:333 +#: app/models/info_request_event.rb:338 msgid "display_status only works for incoming and outgoing messages right now" msgstr "" @@ -3413,11 +3650,11 @@ msgstr "" msgid "even during holidays" msgstr "hyd yn oed yn ystod y gwyliau" -#: locale/model_attributes.rb:14 +#: locale/model_attributes.rb:17 msgid "exim log" msgstr "" -#: locale/model_attributes.rb:60 +#: locale/model_attributes.rb:59 msgid "exim log done" msgstr "" @@ -3429,12 +3666,12 @@ msgstr "" msgid "have delayed." msgstr "" -#: locale/model_attributes.rb:57 +#: locale/model_attributes.rb:56 msgid "holiday" msgstr "gwyliau" -#: app/views/request/_followup.rhtml:39 app/views/request/show.rhtml:63 -#: app/views/request/show.rhtml:73 +#: app/views/request/_followup.rhtml:36 app/views/request/show.rhtml:70 +#: app/views/request/show.rhtml:80 msgid "in term time" msgstr "" @@ -3442,15 +3679,15 @@ msgstr "" msgid "in total" msgstr "" -#: locale/model_attributes.rb:63 +#: locale/model_attributes.rb:62 msgid "incoming message" msgstr "" -#: locale/model_attributes.rb:80 +#: locale/model_attributes.rb:79 msgid "info request" msgstr "" -#: locale/model_attributes.rb:35 +#: locale/model_attributes.rb:40 msgid "info request event" msgstr "" @@ -3459,7 +3696,7 @@ msgstr "" msgid "internal error" msgstr "" -#: app/views/request/show.rhtml:93 +#: app/views/request/show.rhtml:100 msgid "is <strong>waiting for your clarification</strong>." msgstr "" @@ -3476,7 +3713,7 @@ msgstr "" msgid "made." msgstr "" -#: app/views/request/show.rhtml:67 +#: app/views/request/show.rhtml:74 msgid "no later than" msgstr "" @@ -3488,7 +3725,7 @@ msgid "" " an email which will go to the right place, please <a href=\"%s\">send it to us</a>." msgstr "" -#: app/views/request/show.rhtml:65 +#: app/views/request/show.rhtml:72 msgid "normally" msgstr "" @@ -3496,7 +3733,7 @@ msgstr "" msgid "only" msgstr "" -#: locale/model_attributes.rb:20 +#: locale/model_attributes.rb:25 msgid "outgoing message" msgstr "" @@ -3508,11 +3745,11 @@ msgstr "" msgid "please sign in or make a new account." msgstr "" -#: locale/model_attributes.rb:50 +#: locale/model_attributes.rb:49 msgid "post redirect" msgstr "" -#: locale/model_attributes.rb:17 +#: locale/model_attributes.rb:14 msgid "profile photo" msgstr "" @@ -3528,7 +3765,7 @@ msgstr "" msgid "request." msgstr "" -#: app/views/request/show.rhtml:82 +#: app/views/request/show.rhtml:89 msgid "requesting an internal review" msgstr "" @@ -3538,7 +3775,7 @@ msgid "" "email to let them know what you are going to do about it." msgstr "" -#: app/views/request/show.rhtml:95 +#: app/views/request/show.rhtml:102 msgid "send a follow up message" msgstr "" @@ -3546,9 +3783,9 @@ msgstr "" msgid "sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "" -#: app/views/request/show.rhtml:99 +#: app/views/request/show.rhtml:106 msgid "sign in" -msgstr "" +msgstr "Mewngofnodi neu gofrestru" #: app/views/user/wrong_user.rhtml:4 msgid "sign out" @@ -3558,34 +3795,27 @@ msgstr "" msgid "that you made to" msgstr "" -#: app/views/user_mailer/already_registered.rhtml:11 -#: app/views/user_mailer/confirm_login.rhtml:11 -#: app/views/user_mailer/changeemail_already_used.rhtml:9 -#: app/views/user_mailer/changeemail_confirm.rhtml:12 -#: app/views/request_mailer/stopped_responses.rhtml:16 -#: app/views/request_mailer/not_clarified_alert.rhtml:9 #: app/views/request_mailer/comment_on_alert.rhtml:6 +#: app/views/request_mailer/comment_on_alert_plural.rhtml:5 +#: app/views/request_mailer/new_response.rhtml:15 +#: app/views/request_mailer/new_response_reminder_alert.rhtml:8 +#: app/views/request_mailer/not_clarified_alert.rhtml:9 #: app/views/request_mailer/old_unclassified_updated.rhtml:8 -#: app/views/request_mailer/very_overdue_alert.rhtml:11 #: app/views/request_mailer/overdue_alert.rhtml:9 -#: app/views/request_mailer/new_response_reminder_alert.rhtml:8 -#: app/views/request_mailer/new_response.rhtml:15 -#: app/views/request_mailer/comment_on_alert_plural.rhtml:5 -msgid "the WhatDoTheyKnow team" +#: app/views/request_mailer/stopped_responses.rhtml:16 +#: app/views/request_mailer/very_overdue_alert.rhtml:11 +#: app/views/track_mailer/event_digest.rhtml:66 +#: app/views/user_mailer/already_registered.rhtml:11 +#: app/views/user_mailer/changeemail_already_used.rhtml:10 +#: app/views/user_mailer/changeemail_confirm.rhtml:13 +#: app/views/user_mailer/confirm_login.rhtml:11 +msgid "the {{site_name}} team" msgstr "" #: app/views/user/show.rhtml:140 msgid "this person" msgstr "" -#: app/views/user_mailer/changeemail_already_used.rhtml:2 -msgid "to" -msgstr "" - -#: app/views/user_mailer/changeemail_confirm.rhtml:5 -msgid "to " -msgstr "" - #: app/views/user/show.rhtml:113 msgid "" "to change password, \n" @@ -3596,15 +3826,15 @@ msgstr "" msgid "to check that the info isn't already published." msgstr "" -#: app/views/request/show.rhtml:55 +#: app/views/request/show.rhtml:62 msgid "to read" msgstr "" -#: app/views/request/show.rhtml:99 +#: app/views/request/show.rhtml:106 msgid "to send a follow up message." msgstr "" -#: app/views/request/show.rhtml:39 +#: app/views/request/show.rhtml:45 msgid "to {{public_body}}" msgstr "" @@ -3624,7 +3854,7 @@ msgstr "" msgid "unknown reason " msgstr "" -#: app/models/info_request.rb:807 app/models/info_request_event.rb:328 +#: app/models/info_request.rb:814 app/models/info_request_event.rb:333 msgid "unknown status " msgstr "" @@ -3636,15 +3866,15 @@ msgstr "" msgid "unsubscribe all" msgstr "" -#: app/views/request/show.rhtml:46 +#: app/views/request/show.rhtml:53 msgid "useful information." msgstr "" -#: locale/model_attributes.rb:69 +#: locale/model_attributes.rb:68 msgid "user" msgstr "" -#: locale/model_attributes.rb:67 +#: locale/model_attributes.rb:66 msgid "user info request sent alert" msgstr "" @@ -3671,13 +3901,34 @@ msgstr "{{length_of_time}} yn ôl" msgid "{{public_body_name}} only:" msgstr "" +#: app/views/public_body/view_email.rhtml:7 +msgid "" +"{{site_name}} sends new requests to <strong>{{request_email}}</strong> for " +"this authority." +msgstr "" + +#: app/models/user.rb:122 +msgid "{{user_name}} (Banned)" +msgstr "" + #: app/views/request_mailer/comment_on_alert.rhtml:1 msgid "" "{{user_name}} has annotated your {{law_used_short}} \n" "request. Follow this link to see what they wrote." msgstr "" -#: app/views/request/show.rhtml:35 +#: app/views/contact_mailer/user_message.rhtml:2 +msgid "{{user_name}} has used {{site_name}} to send you the message below." +msgstr "" + +#: app/views/request/show.rhtml:36 +msgid "" +"{{user}} (<a href=\"{{user_admin_url}}\">admin</a>) made this " +"{{law_used_full}} request (<a href=\"{{request_admin_url}}\">admin</a>) to " +"{{public_body_link}} (<a href=\"{{public_body_admin_url}}\">admin</a>)" +msgstr "" + +#: app/views/request/show.rhtml:44 msgid "{{user}} made this {{law_used_full}} request" msgstr "" diff --git a/locale/de/app.po b/locale/de/app.po index 7fa30ff21..604fcc500 100644 --- a/locale/de/app.po +++ b/locale/de/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: 2011-07-12 15:18+0100\n" -"PO-Revision-Date: 2011-07-27 21:05+0000\n" +"POT-Creation-Date: 2011-08-11 12:30+0200\n" +"PO-Revision-Date: 2011-08-12 00:21+0000\n" "Last-Translator: KerstiRu <kersti@access-info.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -18,9 +18,16 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" +#: app/models/incoming_message.rb:866 +msgid "" +"\n" +"\n" +"[ {{site_name}} note: The above text was badly encoded, and has had strange characters removed. ]" +msgstr "" + #: app/views/user/set_profile_about_me.rhtml:14 msgid "" -" This will appear on your WhatDoTheyKnow profile, to make it\n" +" This will appear on your {{site_name}} profile, to make it\n" " easier for others to get involved with what you're doing." msgstr "" @@ -35,6 +42,8 @@ msgid "" " (<strong>patience</strong>, especially for large files, it may take a " "while!)" msgstr "" +" (<strong>Geduld</strong>, speziell für größere Dateien kann es einen Moment" +" dauern!)" #: app/views/user/show.rhtml:59 msgid " (you)" @@ -55,23 +64,27 @@ msgstr "" #: app/views/comment/new.rhtml:33 msgid " <strong>Summarise</strong> the content of any information returned. " -msgstr "" +msgstr "Fassen Sie den Inhalt jeglicher erhaltenen Information zusammen. " #: app/views/comment/new.rhtml:23 msgid " Advise on how to <strong>best clarify</strong> the request." -msgstr "" +msgstr " Hilfe zur Erstellung einer guten Informationsanfrage. " #: app/views/comment/new.rhtml:49 msgid "" " Ideas on what <strong>other documents to request</strong> which the " "authority may hold. " msgstr "" +" Ideas on what <strong>other documents to request</strong> which the " +"authority may hold. " #: app/views/public_body/view_email.rhtml:30 msgid "" " If you know the address to use, then please <a href=\"%s\">send it to us</a>.\n" " You may be able to find the address on their website, or by phoning them up and asking." msgstr "" +"Sollten Sie die korrekte Adresse kennen, <a href=\"%s\">senden Sie sie uns</a>.\n" +" Sie können die Adresse wahrscheinlich auf der Webseite oder durch einen Anruf bei der Behörde herausfinden. " #: app/views/user/set_profile_about_me.rhtml:26 msgid "" @@ -79,18 +92,24 @@ msgid "" " twitter account. They will be made clickable. \n" " e.g." msgstr "" +"Fügen Sie relevanten Links ein, z.B. zu einer Kampagnenseite, Ihrem Blog " +"oder Twitterkonto. Die Links werden aktiviert widergegeben. z.B." #: app/views/comment/new.rhtml:27 msgid "" " Link to the information requested, if it is <strong>already " "available</strong> on the Internet. " msgstr "" +" Link zur angefragten Information,falls bereits online " +"<strong>verfügbar</strong>. " #: app/views/comment/new.rhtml:29 msgid "" " Offer better ways of <strong>wording the request</strong> to get the " "information. " msgstr "" +" Machen Sie bessere <strong>Formulierungsvorschläge</strong>, um die " +"gewünschten Informationen zu erhalten. " #: app/views/user/sign.rhtml:26 msgid " Please sign in or make a new account." @@ -101,24 +120,30 @@ msgid "" " Say how you've <strong>used the information</strong>, with links if " "possible." msgstr "" +"Teilen Sie uns mit, <strong>wie Sie die Informationen verwendet " +"haben</strong> - falls möglich mit Link." #: app/views/comment/new.rhtml:28 msgid "" " Suggest <strong>where else</strong> the requester might find the " "information. " msgstr "" +"Machen Sie Vorschläge wo sonst die gewünschte Information eventuell zu " +"finden ist " #: app/views/user/set_profile_about_me.rhtml:11 msgid " What are you investigating using Freedom of Information? " -msgstr "" +msgstr " Was recherchieren im Rahmen der Informationsfreiheit?" #: app/controllers/comment_controller.rb:75 msgid " You are already being emailed updates about the request." msgstr "" +"Sie haben bereits Aktualisierungen zu dieser Anfrage per Email erhalten. " #: app/controllers/comment_controller.rb:73 msgid " You will also be emailed updates about the request." msgstr "" +"Aktualisierungen zu dieser Anfrage werden Ihnen auch per Email übermittelt. " #: app/views/request/upload_response.rhtml:5 msgid " made by " @@ -126,15 +151,15 @@ msgstr "" #: app/views/user/show.rhtml:123 msgid " made no Freedom of Information requests using this site." -msgstr "" +msgstr "Keine Informationsfreiheitsanfrage über diese Seite gestellt." #: app/views/user/contact.rhtml:36 msgid " when you send this message." -msgstr "" +msgstr "wenn Sie diese Nachricht senden. " #: app/views/public_body/show.rhtml:80 -msgid "%d Freedom of Information request" -msgid_plural "%d Freedom of Information requests" +msgid "%d Freedom of Information request made using this site" +msgid_plural "%d Freedom of Information requests made using this site" msgstr[0] "" msgstr[1] "" @@ -144,6 +169,12 @@ msgid_plural "%d requests" msgstr[0] "" msgstr[1] "" +#: app/views/public_body/_body_listing_single.rhtml:21 +msgid "%d request made." +msgid_plural "%d requests made." +msgstr[0] "" +msgstr[1] "" + #: app/views/request/new.rhtml:102 msgid "'Crime statistics by ward level for Wales'" msgstr "" @@ -152,7 +183,7 @@ msgstr "" msgid "'Pollution levels over time for the River Tyne'" msgstr "" -#: app/controllers/user_controller.rb:354 +#: app/controllers/user_controller.rb:355 msgid "" ",\n" "\n" @@ -162,20 +193,29 @@ msgid "" "\n" "{{user_name}}" msgstr "" +",\n" +"\n" +"\n" +"\n" +"Mit freundlichem Gruß,\n" +"\n" +"{{user_name}}" #: app/views/request/_after_actions.rhtml:9 msgid "<a href=\"%s\">Add an annotation</a> (to help the requester or others)" msgstr "" +"<a href=\"%s\">Kommentar hinzufügen</a> (um den Anfragensteller oder andere " +"Nutzern zu unterstützen)" #: app/views/public_body/list.rhtml:29 msgid "<a href=\"%s\">Are we missing a public authority?</a>." -msgstr "" +msgstr "<a href=\"%s\">Fehlt eine Behörde?</a>." #: app/views/request/_sidebar.rhtml:45 msgid "" "<a href=\"%s\">Are you the owner of\n" " any commercial copyright on this page?</a>" -msgstr "" +msgstr "<a href=\"%s\">Halten Sie die Urheberrechte dieser Seite?</a>" #: app/views/general/search.rhtml:53 msgid "<a href=\"%s\">Browse all</a> or <a href=\"%s\">ask us to add one</a>." @@ -184,12 +224,7 @@ msgstr "<a href=\"%s\">Alle durchsuchen</a> or <a href=\"%s\">ask us to add one< #: app/views/general/exception_caught.rhtml:13 msgid "<a href=\"%s\">Contact us</a> to tell us about the problem</li>" msgstr "" - -#: app/views/public_body/show.rhtml:50 -msgid "" -"<a href=\"%s\">Make a new Freedom of Information request</a> to " -"{{public_body_name}}" -msgstr "<a href=\"%s\">Neue Anfrage starten</a> to {{public_body_name}}" +"<a href=\"%s\">Kontaktieren Sie uns</a>, um das Problem zu beschreiben</li>" #: app/views/public_body/list.rhtml:43 msgid "<a href=\"%s\">can't find the one you want?</a>" @@ -197,83 +232,103 @@ msgstr "" "<a href=\"%s\">Können Sie die von Ihnen benötigte Information nicht " "finden?</a>" -#: app/views/request/_followup.rhtml:42 app/views/request/_followup.rhtml:49 -#: app/views/request/show.rhtml:76 app/views/request/show.rhtml:80 +#: app/views/request/_followup.rhtml:39 app/views/request/_followup.rhtml:46 +#: app/views/request/show.rhtml:83 app/views/request/show.rhtml:87 msgid "<a href=\"%s\">details</a>" msgstr "<a href=\"%s\">Details</a>" -#: app/views/request/_followup.rhtml:77 +#: app/views/request/_followup.rhtml:74 msgid "<a href=\"%s\">what's that?</a>" +msgstr "<a href=\"%s\">Was ist das?</a>" + +#: app/views/public_body/show.rhtml:50 +msgid "" +"<a href=\"{{url}}\">Make a new Freedom of Information request</a> to " +"{{public_body_name}}" msgstr "" #: app/controllers/request_game_controller.rb:23 msgid "" "<p>All done! Thank you very much for your help.</p><p>There are <a " -"href=\"%s\">more things you can do</a> to help WhatDoTheyKnow.</p>" +"href=\"{{helpus_url}}\">more things you can do</a> to help " +"{{site_name}}.</p>" msgstr "" -#: app/controllers/request_controller.rb:394 +#: app/controllers/request_controller.rb:399 msgid "" "<p>Thank you! Here are some ideas on what to do next:</p>\n" " <ul>\n" -" <li>To send your request to another authority, first copy the text of your request below, then <a href=\"%s\">find the other authority</a>.</li>\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=\"%s\">how to complain</a>.\n" +" <a href=\"{{complain_url}}\">how to complain</a>.\n" " </li>\n" -" <li>We have <a href=\"%s\">suggestions</a>\n" +" <li>We have <a href=\"{{other_means_url}}\">suggestions</a>\n" " on other means to answer your question.\n" " </li>\n" -" </ul>\n" -" " +" </ul>" msgstr "" -#: app/controllers/request_controller.rb:388 +#: app/controllers/request_controller.rb:393 msgid "" "<p>Thank you! Hope you don't have to wait much longer.</p> <p>By law, you " "should have got a response promptly, and normally before the end of " "<strong>{{date_response_required_by}}</strong>.</p>" msgstr "" +"<p>Vielen Dank! Wir hoffen Sie müssen nicht viel länger warten.</p> <p>Nach " +"gesetzlicher Vorschrift hätten Sie sofort oder vor Ende " +"<strong>{{date_response_required_by}}</strong> erhalten sollen. </p>" -#: app/controllers/request_controller.rb:384 +#: app/controllers/request_controller.rb:389 msgid "" "<p>Thank you! Hopefully your wait isn't too long.</p> <p>By law, you should get a response promptly, and normally before the end of <strong>\n" "{{date_response_required_by}}</strong>.</p>" msgstr "" +"<p>Vielen Dank! Wir hoffen Sie müssen nicht zu lange warten.</p> <p>Nach " +"gesetzlicher Vorschrift hätten Sie sofort oder vor Ende " +"<strong>{{date_response_required_by}}</strong> erhalten sollen. </p>" -#: app/controllers/request_controller.rb:421 +#: app/controllers/request_controller.rb:428 msgid "" "<p>Thank you! Hopefully your wait isn't too long.</p><p>You should get a " "response within 20 days, or be told if it will take longer (<a " -"href=\"%s\">details</a>).</p>" +"href=\"{{review_url}}\">details</a>).</p>" msgstr "" -#: app/controllers/request_controller.rb:424 +#: app/controllers/request_controller.rb:431 msgid "" "<p>Thank you! We'll look into what happened and try and fix it up.</p><p>If " "the error was a delivery failure, and you can find an up to date FOI email " "address for the authority, please tell us using the form below.</p>" msgstr "" +"<p>Vielen Dank! Wir überprüfen das Problem und werden versuchen es zu " +"beheben.</p><p>Sollte es sich um einen Übertragungsfehler gehandelt haben " +"und Sie können eine aktuelle IFG Email-Adresse dieser Behörde finden, teilen" +" Sie uns diese bitte mit Hilfe des unten angezeigten Formulars mit.</p>" -#: app/controllers/request_controller.rb:391 +#: app/controllers/request_controller.rb:396 msgid "" "<p>Thank you! Your request is long overdue, by more than 40 working days. " "Most requests should be answered within 20 working days. You might like to " "complain about this, see below.</p>" msgstr "" -#: app/controllers/user_controller.rb:494 +#: app/controllers/user_controller.rb:495 msgid "" "<p>Thanks for changing the text about you on your profile.</p>\n" " <p><strong>Next...</strong> You can upload a profile photograph too.</p>" msgstr "" +"<p>Vielen Dank für die Änderung Ihres Profiltextes.</p>\n" +" <p><strong>Weiter...</strong> Sie können auch ein Profilbild hochladen.</p>" -#: app/controllers/user_controller.rb:416 +#: app/controllers/user_controller.rb:417 msgid "" "<p>Thanks for updating your profile photo.</p>\n" " <p><strong>Next...</strong> You can put some text about you and your research on your profile.</p>" msgstr "" +"<p>Danke für die Aktualisierung Ihres Profilbildes.</p>\n" +" <p><strong>Nächster Schritt...</strong> Sie können Informationen zu Ihrer Person und Ihrer Suchanfrage zu Ihrem Profil hinzufügen.</p>" -#: app/controllers/request_controller.rb:279 +#: app/controllers/request_controller.rb:284 msgid "" "<p>We recommend that you edit your request and remove the email address.\n" " If you leave it, the email address will be sent to the authority, but will not be displayed on the site.</p>" @@ -281,23 +336,24 @@ msgstr "" "<p>Wir empfehlen Ihnen Ihre Anfrage zu bearbeiten und Ihre Emailadresse zu entfernen.\n" " Sollten Sie die Emaildresse nicht entfernen, wir diese an die entsprechende Behörde gesendet, jedoch nicht auf der Seite angezeigt.</p>" -#: app/controllers/request_controller.rb:410 +#: app/controllers/request_controller.rb:417 msgid "" "<p>We're glad you got all the information that you wanted. If you write " "about or make use of the information, please come back and add an annotation" -" below saying what you did.</p><p>If you found WhatDoTheyKnow useful, <a " -"href=\"%s\">make a donation</a> to the charity which runs it.</p>" +" below saying what you did.</p><p>If you found {{site_name}} useful, <a " +"href=\"{{donation_url}}\">make a donation</a> to the charity which runs " +"it.</p>" msgstr "" -#: app/controllers/request_controller.rb:413 +#: app/controllers/request_controller.rb:420 msgid "" "<p>We're glad you got some of the information that you wanted. If you found " -"WhatDoTheyKnow useful, <a href=\"%s\">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>" +"{{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to " +"the charity which runs it.</p><p>If you want to try and get the rest of the " +"information, here's what to do now.</p>" msgstr "" -#: app/controllers/request_controller.rb:277 +#: app/controllers/request_controller.rb:282 msgid "" "<p>You do not need to include your email in the request in order to get a " "reply (<a href=\"%s\">details</a>).</p>" @@ -305,14 +361,17 @@ msgstr "" "<p> Es ist nicht erfoderlich Ihre Emailadresse in der Anfrage zu nennen, um " "eine Antwort zu erhalten (<a href=\"%s\">details</a>).</p>" -#: app/controllers/request_controller.rb:275 +#: app/controllers/request_controller.rb:280 msgid "" "<p>You do not need to include your email in the request in order to get a " "reply, as we will ask for it on the next screen (<a " "href=\"%s\">details</a>).</p>" msgstr "" +"<p>Um eine Antwort zu erhalten, müssen Sie Ihre Email-Adresse nicht in Ihre " +"Anfrage einfügen, da wir diese auf der folgenden Seite erfragen werden (<a " +"href=\"%s\">Details</a>).</p>" -#: app/controllers/request_controller.rb:283 +#: app/controllers/request_controller.rb:288 msgid "" "<p>Your request contains a <strong>postcode</strong>. Unless it directly " "relates to the subject of your request, please remove any address as it will" @@ -323,7 +382,7 @@ msgstr "" "diese zu entfern en, da diese ansonsten<strong>im Internet veröffentlicht " "wird </strong>.</p>" -#: app/controllers/request_controller.rb:306 +#: app/controllers/request_controller.rb:311 msgid "" "<p>Your {{law_used_full}} request has been <strong>sent on its way</strong>!</p>\n" " <p><strong>We will email you</strong> when there is a response, or after 20 working days if the authority still hasn't\n" @@ -332,12 +391,22 @@ msgid "" " annotation below telling people about your writing.</p>" msgstr "" +#: app/controllers/application_controller.rb:279 +msgid "" +"<p>{{site_name}} is currently in maintenance. You can only view existing " +"requests. You cannot make new ones, add followups or annotations, or " +"otherwise change the database.</p> <p>{{read_only}}</p>" +msgstr "" + #: app/views/user/confirm.rhtml:11 msgid "" "<small>If you use web-based email or have \"junk mail\" filters, also check your\n" "bulk/spam mail folders. Sometimes, our messages are marked that way.</small>\n" "</p>" msgstr "" +"Sollten Sie eine webbasierten Emailanbieter oder ´junk mail´ Filter nutzen, " +"prüfen Sie Ihren Spamordner. Es kommt vor, dass unsere Nachrichten dort " +"landen. " #: app/views/request/new.rhtml:131 msgid "" @@ -358,12 +427,17 @@ msgid "" "<strong><code>filetype:pdf</code></strong> to find all responses with PDF " "attachments. Or try these: <code>{{list_of_file_extensions}}</code>" msgstr "" +"<strong><code>Dateityp:PDF</code></strong> um alle Antworten mit PDF-Anhang " +"zu finden. Oder versuchen Sie es hiermit: " +"<code>{{list_of_file_extensions}}</code>" #: app/views/general/search.rhtml:131 msgid "" "<strong><code>request:</code></strong> to restrict to a specific request, " "typing the title as in the URL." msgstr "" +"<strong><code>Anfrage:</code></strong> um die Suchanfrage zu begrenzen, " +"geben Sie den Titel wie in der URL ein." #: app/views/general/search.rhtml:129 msgid "" @@ -380,8 +454,8 @@ msgstr "" #: app/views/general/search.rhtml:126 msgid "" "<strong><code>status:</code></strong> to select based on the status or " -"historical status of the request, see the <a href=\"%s\">table of " -"statuses</a> below." +"historical status of the request, see the <a href=\"{{statuses_url}}\">table" +" of statuses</a> below." msgstr "" #: app/views/general/search.rhtml:134 @@ -394,10 +468,8 @@ msgstr "" #: app/views/general/search.rhtml:127 msgid "" "<strong><code>variety:</code></strong> to select type of thing to search " -"for, see the <a href=\"%s\">table of varieties</a> below." +"for, see the <a href=\"{{varieties_url}}\">table of varieties</a> below." msgstr "" -"<strong><code>variety:</code></strong> Um Ihre Suchauswahl zu treffen, gehen" -" Sie zu <a href=\"%s\">Auswahlliste</a> am Ende der Seite." #: app/views/comment/new.rhtml:56 msgid "" @@ -407,9 +479,9 @@ msgstr "" #: app/views/request/_other_describe_state.rhtml:56 msgid "<strong>All the information</strong> has been sent" -msgstr "" +msgstr "Informationen wurden vollständig gesendet" -#: app/views/request/_followup.rhtml:82 +#: app/views/request/_followup.rhtml:79 msgid "" "<strong>Anything else</strong>, such as clarifying, prompting, thanking" msgstr "" @@ -417,16 +489,16 @@ msgstr "" #: app/views/request/details.rhtml:12 msgid "" "<strong>Caveat emptor!</strong> To use this data in an honourable way, you will need \n" -"a good internal knowledge of user behaviour on WhatDoTheyKnow. How, \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=\"%s\">contact us</a> with questions." +"<a href=\"{{contact_path}}\">contact us</a> with questions." msgstr "" #: app/views/request/_other_describe_state.rhtml:28 msgid "<strong>Clarification</strong> has been requested" -msgstr "" +msgstr "Klärung der Angelegenheit wurde angefragt" #: app/views/request/_other_describe_state.rhtml:14 msgid "" @@ -448,6 +520,8 @@ msgid "" "<strong>Note:</strong> You're sending a message to yourself, presumably\n" " to try out how it works." msgstr "" +"<strong>Achtung:</strong> Sie senden eine Nachricht an sich selbst, " +"vermutlich um herauszufinden, wie es funktioniert. " #: app/views/request/preview.rhtml:31 msgid "" @@ -460,7 +534,7 @@ msgstr "" #: app/views/user/set_crop_profile_photo.rhtml:35 msgid "" "<strong>Privacy note:</strong> Your photo will be shown in public on the Internet, \n" -" wherever you do something on WhatDoTheyKnow." +" wherever you do something on {{site_name}}." msgstr "" #: app/views/request/followup_preview.rhtml:37 @@ -473,15 +547,15 @@ msgstr "" #: app/views/request/_other_describe_state.rhtml:52 msgid "<strong>Some of the information</strong> has been sent " -msgstr "" +msgstr "Information wurde teilweise gesendet" #: app/views/general/exception_caught.rhtml:17 msgid "<strong>Technical details:</strong>" -msgstr "" +msgstr "<strong>Technische Details:</strong>" #: app/views/comment/new.rhtml:35 msgid "<strong>Thank</strong> the public authority or " -msgstr "" +msgstr "<strong>Danken Sie</strong> der Behörde oder " #: app/views/request/new.rhtml:23 msgid "" @@ -489,30 +563,44 @@ msgid "" "scheme</a> or <strong>search</strong> their web site ..." msgstr "" -#: app/views/request/show.rhtml:84 +#: app/views/request/show.rhtml:91 msgid "<strong>did not have</strong> the information requested." -msgstr "" +msgstr "Die angefragten Informationen waren <strong>nicht vorhanden</strong>." #: app/views/request/new.rhtml:25 msgid "<strong>search</strong> the authority's web site ..." -msgstr "" +msgstr "<strong>Besuchen Sie</strong> die Webseite dieser Behörde" #: app/views/comment/new.rhtml:45 msgid "" "A <strong>summary</strong> of the response if you have received it by post. " msgstr "" +"Eine <strong>Zusammenfassung</strong> of the response if you have received " +"it by post. " + +#: app/views/general/search.rhtml:162 +msgid "A public authority" +msgstr "" #: app/views/request/_other_describe_state.rhtml:34 msgid "A response will be sent <strong>by post</strong>" +msgstr "Antwort wird <strong>postalisch</strong> zugestellt" + +#: app/views/general/search.rhtml:151 +msgid "A strange reponse, required attention by the {{site_name}} team" +msgstr "" + +#: app/views/general/search.rhtml:163 +msgid "A {{site_name}} user" msgstr "" #: app/views/user/set_profile_about_me.rhtml:20 msgid "About you:" msgstr "Zu Ihrer Person:" -#: app/models/info_request_event.rb:288 +#: app/models/info_request_event.rb:293 msgid "Acknowledgement" -msgstr "" +msgstr "Bestätigung" #: app/views/request/_sidebar.rhtml:5 msgid "Act on what you've learnt" @@ -520,13 +608,19 @@ msgstr "" #: app/views/comment/new.rhtml:14 msgid "Add an annotation to " -msgstr "" +msgstr "Fügen Sie einen Kommentar hinzu" #: app/views/request/show_response.rhtml:47 msgid "" "Add an annotation to your request with choice quotes, or\n" " a <strong>summary of the response</strong>." msgstr "" +"Fügen Sie Ihrer Anfrage einen Kommentar mit Wahlzitat oder, " +"eine<strong>Zusammenfassung Ihrer Antwort</strong>hinzu. " + +#: app/views/public_body/_body_listing_single.rhtml:26 +msgid "Added on {{date}}" +msgstr "" #: app/models/user.rb:54 msgid "Admin level is not included in list" @@ -534,7 +628,7 @@ msgstr "" #: app/views/request_mailer/requires_admin.rhtml:9 msgid "Administration URL:" -msgstr "" +msgstr "Administrator URL" #: app/views/general/search.rhtml:31 app/views/general/search.rhtml:121 msgid "Advanced search tips" @@ -551,25 +645,41 @@ msgid "" "Air, water, soil, land, flora and fauna (including how these effect\n" " human beings)" msgstr "" +"Luft, Wasser, Erde, Land, Flora and Fauna (inkl. wie diese den Menschen " +"beeinflussen)" -#: app/models/info_request_event.rb:304 +#: app/models/info_request_event.rb:309 msgid "All information sent" +msgstr "Information vollständig gesendet" + +#: app/views/general/search.rhtml:146 +msgid "All of the information requested has been received" msgstr "" #: app/views/public_body/list.rhtml:5 msgid "Alphabet" msgstr "Alphabet" +#: app/views/public_body/_body_listing_single.rhtml:12 +msgid "Also called {{other_name}}." +msgstr "" + #: app/views/request_mailer/new_response.rhtml:12 msgid "" "Although all responses are automatically published, we depend on\n" "you, the original requester, to evaluate them." msgstr "" +"Obwould alle Antworten automatisch veröffentlicht werden, sind wir auf Sie " +"als ursprünglichen Antragsteller angewiesen, um diese zu bewerten" #: app/views/request/_other_describe_state.rhtml:70 msgid "An <strong>error message</strong> has been received" msgstr "Eine <strong>Fehlermeldung</strong> wurde empfangen" +#: app/views/general/search.rhtml:161 +msgid "Annotation added to request" +msgstr "" + #: app/views/user/show.rhtml:34 msgid "Annotations" msgstr "Anmerkungen" @@ -587,95 +697,113 @@ msgid "" "Annotations will be posted publicly here, and are \n" " <strong>not</strong> sent to {{public_body_name}}." msgstr "" +"Anmerkungen werden hier veröffentlicht, und werden \n" +" <strong>nicht</strong> an {{public_body_name}} gesendet." #: app/views/request/_after_actions.rhtml:6 msgid "Anyone:" -msgstr "" +msgstr "Jeder:" #: app/views/request/new.rhtml:47 msgid "" "Ask for <strong>specific</strong> documents or information, this site is not" " suitable for general enquiries." msgstr "" +"Fragen Sie nach <strong>spezifischen</strong> Dokumenten oder Informationen." +" Diese Seite ist nicht für generelle Anfragen vorgesehen. " #: app/views/request/show_response.rhtml:31 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 "" +"Am Ende der Seite können Sie eine Antwort mit der Aufforderung das Dokument einzuscannen senden\n" +" (<a href=\"%s\">weitere Details</a>)." #: app/views/request/upload_response.rhtml:33 msgid "Attachment (optional):" msgstr "Anhang (freiwillig)" -#: app/models/info_request.rb:776 +#: app/models/info_request.rb:783 msgid "Awaiting classification." -msgstr "" +msgstr "Zuordnung wird erwartet. " -#: app/models/info_request.rb:796 +#: app/models/info_request.rb:803 msgid "Awaiting internal review." -msgstr "" +msgstr "Interne Prüfung ausstehend." -#: app/models/info_request.rb:778 +#: app/models/info_request.rb:785 msgid "Awaiting response." -msgstr "" +msgstr "Antwort ausstehend. " #: app/views/request/new.rhtml:43 msgid "" "Browse <a href=\"%s\">other requests</a> for examples of how to word your " "request." msgstr "" +"Durchsuchen Sie <a href=\"%s\">andere Anfragen</a> für " +"Formulierungsbeispiele. " #: app/views/request/new.rhtml:41 msgid "" -"Browse <a href='%s'>other requests</a> to '{{public_body_name}}' for " +"Browse <a href='{{url}}'>other requests</a> to '{{public_body_name}}' for " "examples of how to word your request." msgstr "" -#: app/views/request/show.rhtml:79 +#: app/views/request/show.rhtml:86 msgid "" "By law, under all circumstances, {{public_body_link}} should have responded " "by now" msgstr "" +"Nach gesetzlicher Vorschrift sollte {{public_body_link}} Ihnen inzwischen " +"unter allen Umständen geantwortet haben. " -#: app/views/request/show.rhtml:71 +#: app/views/request/show.rhtml:78 msgid "" "By law, {{public_body_link}} should normally have responded " "<strong>promptly</strong> and" msgstr "" +"Nach gesetzlicher Vorschrift sollte {{public_body_link}} " +"<strong>umgehend</strong> geantwortet haben und" #: app/views/general/search.rhtml:17 msgid "" "Can't find it? <a href=\"%s\">Browse all</a> or <a href=\"%s\">ask us to add" " it</a>." msgstr "" +"Nicht gefunden? <a href=\"%s\">Durchsuchen Sie alle Behörden</a> oder <a " +"href=\"%s\">bitten Sie uns die Behörde hinzuzufügen</a>." -#: app/controllers/track_controller.rb:143 +#: app/controllers/track_controller.rb:145 msgid "Cancel a {{site_name}} alert" -msgstr "" +msgstr "Benachrichtigung für {{site_name}} abbestellen" -#: app/controllers/track_controller.rb:173 +#: app/controllers/track_controller.rb:175 msgid "Cancel some {{site_name}} alerts" -msgstr "" +msgstr "Einige Benachrichtigungen für {{site_name}} abbestellen" -#: locale/model_attributes.rb:46 +#: locale/model_attributes.rb:39 msgid "CensorRule|Last edit comment" msgstr "" -#: locale/model_attributes.rb:45 +#: locale/model_attributes.rb:38 msgid "CensorRule|Last edit editor" msgstr "" -#: locale/model_attributes.rb:44 +#: locale/model_attributes.rb:37 msgid "CensorRule|Replacement" msgstr "" -#: locale/model_attributes.rb:43 +#: locale/model_attributes.rb:36 msgid "CensorRule|Text" msgstr "" #: lib/public_body_categories_en.rb:14 msgid "Central government" +msgstr "Zentralregierung" + +#: app/views/user/signchangeemail.rhtml:37 +msgid "Change email on {{site_name}}" msgstr "" #: app/views/user/signchangepassword.rhtml:27 @@ -687,19 +815,18 @@ msgid "Change profile photo" msgstr "Profilbild ändern" #: app/views/user/set_profile_about_me.rhtml:1 -msgid "Change the text about you on your profile at WhatDoTheyKnow.com" +msgid "Change the text about you on your profile at {{site_name}}" msgstr "" -"Ändern Sie Angaben zu Ihrer Person in Ihrem Benutzerkonto auf AskTheEu.org" #: app/views/user/show.rhtml:107 msgid "Change your email" msgstr "Emailadresse ändern" -#: app/controllers/user_controller.rb:249 +#: app/controllers/user_controller.rb:250 #: app/views/user/signchangeemail.rhtml:1 #: app/views/user/signchangeemail.rhtml:11 msgid "Change your email address used on {{site_name}}" -msgstr "" +msgstr "Ändern Sie die unter {{site_name}} genutzte Email-Adresse" #: app/views/user/show.rhtml:106 msgid "Change your password" @@ -710,9 +837,9 @@ msgstr "Passwort ändern" #: app/views/user/signchangepassword_send_confirm.rhtml:1 #: app/views/user/signchangepassword_send_confirm.rhtml:9 msgid "Change your password on {{site_name}}" -msgstr "" +msgstr "Ändern Sie Ihr Passwort: {{site_name}}" -#: app/controllers/user_controller.rb:203 +#: app/controllers/user_controller.rb:204 msgid "Change your password {{site_name}}" msgstr "Passwort ändern{{site_name}}" @@ -723,21 +850,25 @@ msgstr "" #: app/views/general/exception_caught.rhtml:6 msgid "Check for mistakes if you typed or copied the address." msgstr "" +"Sollten Sie die Adresse eingegeben oder kopiert haben, überprüfen Sie diese " +"auf Fehler." -#: app/views/request/preview.rhtml:7 #: app/views/request/followup_preview.rhtml:14 +#: app/views/request/preview.rhtml:7 msgid "Check you haven't included any <strong>personal information</strong>." msgstr "" +"Stellen Sie sicher, dass Sie keine <strong>persönlichen " +"Informationen</strong>verwendet haben." -#: app/models/info_request_event.rb:326 +#: app/models/info_request_event.rb:331 msgid "Clarification" -msgstr "" +msgstr "Klärung" -#: app/models/info_request_event.rb:290 +#: app/models/info_request_event.rb:295 msgid "Clarification required" -msgstr "" +msgstr "Klärung notwendig" -#: app/controllers/request_controller.rb:334 +#: app/controllers/request_controller.rb:339 msgid "Classify an FOI response from " msgstr "" @@ -755,47 +886,72 @@ msgstr "" "Klicken Sie auf den unten aufgeführten Link an {{public_body}}, um eine " "Anfrageerinnerung zu versenden." -#: locale/model_attributes.rb:28 +#: locale/model_attributes.rb:22 msgid "Comment|Body" msgstr "" -#: locale/model_attributes.rb:27 +#: locale/model_attributes.rb:21 msgid "Comment|Comment type" msgstr "" -#: locale/model_attributes.rb:30 +#: locale/model_attributes.rb:24 msgid "Comment|Locale" msgstr "" -#: locale/model_attributes.rb:29 +#: locale/model_attributes.rb:23 msgid "Comment|Visible" msgstr "" +#: app/models/track_thing.rb:147 +msgid "Confirm you want to be emailed about new requests" +msgstr "" + +#: app/models/track_thing.rb:214 +msgid "" +"Confirm you want to be emailed about new requests or responses matching " +"'{{query}}'" +msgstr "" + +#: app/models/track_thing.rb:198 +msgid "Confirm you want to be emailed about requests by '{{user_name}}'" +msgstr "" + +#: app/models/track_thing.rb:182 +msgid "" +"Confirm you want to be emailed about requests to '{{public_body_name}}'" +msgstr "" + #: app/models/track_thing.rb:163 msgid "Confirm you want to be emailed when an FOI request succeeds" msgstr "" +"Bestätigen Sie, dass Sie bei erfolgreicher IFG-Anfrage eine Emailbestätigung" +" erhalten möchten" -#: app/controllers/request_controller.rb:295 +#: app/controllers/request_controller.rb:300 msgid "Confirm your FOI request to " -msgstr "" +msgstr "Bestätigen Sie Ihre IFG-Anfrage " -#: app/controllers/request_controller.rb:696 -#: app/controllers/user_controller.rb:514 +#: app/controllers/request_controller.rb:703 +#: app/controllers/user_controller.rb:515 msgid "Confirm your account on {{site_name}}" -msgstr "" +msgstr "Bestätigen Sie Ihr Nutzerkonto auf {{site_name}}" #: app/controllers/comment_controller.rb:57 msgid "Confirm your annotation to {{info_request_title}}" -msgstr "" +msgstr "Bestätigen Sie Ihre Anmerkung zu {{info_request_title}}" #: app/models/user_mailer.rb:34 -msgid "Confirm your new email address on WhatDoTheyKnow.com" -msgstr "Bestätigen Sie Ihre neue Emailadresse auf www.asktheeu.org" +msgid "Confirm your new email address on {{site_name}}" +msgstr "" -#: app/views/layouts/default.rhtml:146 +#: app/views/layouts/default.rhtml:127 msgid "Contact {{site_name}}" msgstr "Kontakt {{site_name}}" +#: app/models/request_mailer.rb:210 +msgid "Could not identify the request from the email address" +msgstr "" + #: app/models/profile_photo.rb:96 msgid "" "Couldn't understand the image file that you uploaded. PNG, JPEG, GIF and " @@ -814,13 +970,15 @@ msgid "" " environmental factors listed above)" msgstr "" -#: app/views/request/show.rhtml:61 +#: app/views/request/show.rhtml:68 msgid "" "Currently <strong>waiting for a response</strong> from {{public_body_link}}," " they must respond promptly and" msgstr "" +"<strong>Antwort</strong> von {{public_body_link}} wird erwartet. Sie sollte " +"in Kürze eine Antwort erhalten und" -#: app/models/info_request_event.rb:294 +#: app/models/info_request_event.rb:299 msgid "Deadline Extended" msgstr "Frist verlängert" @@ -828,13 +986,13 @@ msgstr "Frist verlängert" msgid "Dear " msgstr "Sehr geehrte / sehr geehrter " -#: app/models/info_request.rb:780 +#: app/models/info_request.rb:787 msgid "Delayed." -msgstr "" +msgstr "Verzögert." -#: app/models/info_request.rb:798 app/models/info_request_event.rb:310 +#: app/models/info_request.rb:805 app/models/info_request_event.rb:315 msgid "Delivery error" -msgstr "" +msgstr "Übertragungsfehler" #: app/views/request/details.rhtml:1 app/views/request/details.rhtml:2 msgid "Details of request '" @@ -849,16 +1007,20 @@ msgid "" "Disclaimer: This message and any reply that you make will be published on " "the internet. Our privacy and copyright policies:" msgstr "" +"Haftungsausschluss: Diese Nachricht und alle Antworten werden im Internet veröffentlicht. \t\n" +"Nutzungsbedingungen und Datenschutz:" #: app/views/request/_view_html_prefix.rhtml:6 msgid "Download original attachment" msgstr "Originalanhang herunterladen" -#: app/views/request/_followup.rhtml:88 +#: app/views/request/_followup.rhtml:85 msgid "" "Edit and add <strong>more details</strong> to the message above,\n" " explaining why you are dissatisfied with their response." msgstr "" +"Bearbeiten Sie Ihre Anfrage und fügen Sie <strong>weitere Details</strong> hinzu,\n" +" explaining why you are dissatisfied with their response." #: app/views/admin_public_body/_locale_selector.rhtml:2 msgid "Edit language version:" @@ -868,21 +1030,24 @@ msgstr "Sprachauswahl ändern:" msgid "Edit text about you" msgstr "Profiltext ändern" -#: app/models/user.rb:132 +#: app/models/user.rb:135 msgid "Either the email or password was not recognised, please try again." msgstr "" "Passwort oder emailadresse wurde nicht erkannt. Bitte versuchen Sie es " "erneut. " -#: app/models/user.rb:134 +#: app/models/user.rb:137 msgid "" "Either the email or password was not recognised, please try again. Or create" " a new account using the form on the right." msgstr "" +"Emailadresse oder Passwort ungültig. Bitte versuchen Sie es erneut oder " +"erstellen Sie ein neues Benutzerkonto mit dem Formular auf der rechten " +"Seite. " #: app/models/contact_validator.rb:34 msgid "Email doesn't look like a valid address" -msgstr "" +msgstr "Dies sieht nicht nach einer gültigen Email-Adresse aus" #: app/views/comment/_comment_form.rhtml:8 msgid "Email me future updates to this request" @@ -891,23 +1056,29 @@ msgstr "" #: app/models/track_thing.rb:155 msgid "Email me new successful responses " +msgstr "Neue erfolgreiche Anfragen per Email erhalten " + +#: app/models/track_thing.rb:139 +msgid "Email me when there are new requests" msgstr "" #: app/views/user/show.rhtml:36 msgid "Email subscriptions" -msgstr "" +msgstr "Email Abo" #: app/views/general/search.rhtml:123 msgid "" "Enter words that you want to find separated by spaces, e.g. <strong>climbing" " lane</strong>" -msgstr "" +msgstr "Trennen Sie Ihre Suchbegriffen durch Leerzeichen" #: app/views/request/upload_response.rhtml:23 msgid "" "Enter your response below. You may attach one file (use email, or \n" "<a href=\"%s\">contact us</a> if you need more)." msgstr "" +"Geben Sie unten Ihre Antwort ein. Sie könne eine Datei anhängen (nutzen Sie Email, oder \n" +"<a href=\"%s\">kontaktieren Sie uns</a> falls Sie mehrere Anhänge benötigen)." #: app/views/public_body/show.rhtml:96 msgid "Environmental Information Regulations requests made" @@ -919,11 +1090,11 @@ msgstr "" #: app/views/request/details.rhtml:4 msgid "Event history" -msgstr "" +msgstr "Verlaufsübersicht" #: app/views/request/_sidebar.rhtml:41 msgid "Event history details" -msgstr "" +msgstr "Details Verlaufsübersicht" #: app/views/request/new.rhtml:124 msgid "" @@ -931,6 +1102,8 @@ msgid "" " will be <strong>displayed publicly</strong> on\n" " this website forever (<a href=\"%s\">why?</a>)." msgstr "" +"Jegliche auf dieser Seite eingegebene Information wird\n" +" für immer auf dieser Internetseite <strong>veröffentlicht</strong>(<a href=\"%s\">Warum?</a>)." #: app/views/request/new.rhtml:116 msgid "" @@ -938,29 +1111,35 @@ msgid "" " will be <strong>displayed publicly</strong> on\n" " this website forever (<a href=\"%s\">why?</a>)." msgstr "" +"Jegliche auf dieser Seite eingegebene Information, inklusive <strong>Ihrem Namen</strong>, ⏎ wird\n" +" für immer auf dieser Internetseite <strong>veröffentlicht</strong>(<a href=\"%s\">Warum?</a>)." -#: locale/model_attributes.rb:61 +#: locale/model_attributes.rb:60 msgid "EximLogDone|Filename" msgstr "" -#: locale/model_attributes.rb:62 +#: locale/model_attributes.rb:61 msgid "EximLogDone|Last stat" msgstr "" -#: locale/model_attributes.rb:16 +#: locale/model_attributes.rb:19 msgid "EximLog|Line" msgstr "" -#: locale/model_attributes.rb:15 +#: locale/model_attributes.rb:18 msgid "EximLog|Order" msgstr "" #: app/views/public_body/view_email.rhtml:3 msgid "FOI email address for {{public_body}}" -msgstr "" +msgstr "IFG-Emailadresse für {{public_body}}" #: app/views/user/show.rhtml:33 msgid "FOI requests" +msgstr "IFG-Anfrage" + +#: app/models/track_thing.rb:193 app/models/track_thing.rb:194 +msgid "FOI requests by '{{user_name}}'" msgstr "" #: app/models/profile_photo.rb:101 @@ -985,13 +1164,20 @@ msgid "" " <br>like information from. <strong>By law, they have to respond</strong>\n" " (<a href=\"%s\">why?</a>)." msgstr "" +"Schritt 1, suchen Sie nach dem <strong>Namen der gewünschten Behörde. </strong> \n" +"<br><strong>Die Behörden sind gesetzlich verpflichtet Ihre Anfrage zu beantworten.</strong>\n" +" (<a href=\"%s\">Warum?</a>)." #: app/views/request_mailer/old_unclassified_updated.rhtml:4 msgid "Follow this link to see the request:" -msgstr "" +msgstr "Folgen Sie diesem Link, um die Anfrage anzusehen:" -#: app/models/info_request_event.rb:330 +#: app/models/info_request_event.rb:335 msgid "Follow up" +msgstr "Follow-up" + +#: app/views/general/search.rhtml:159 +msgid "Follow up message sent by requester" msgstr "" #: app/views/public_body/view_email.rhtml:14 @@ -1000,8 +1186,9 @@ msgstr "" #: app/views/request/_followup.rhtml:16 msgid "" -"Follow ups and new responses to this request have been stopped to prevent spam. Please\n" -" <a href=\"%s\">contact us</a> if you are {{user_link}} and need to send a follow up." +"Follow ups and new responses to this request have been stopped to prevent " +"spam. Please <a href=\"{{url}}\">contact us</a> if you are {{user_link}} and" +" need to send a follow up." msgstr "" #: app/views/public_body/show.rhtml:61 @@ -1024,17 +1211,19 @@ msgstr "" #: app/views/request/followup_bad.rhtml:11 msgid "Freedom of Information law no longer applies to" -msgstr "" +msgstr "Informationsfreiheitsgesetz ist nicht länger gültig für" #: app/views/public_body/view_email.rhtml:10 msgid "" "Freedom of Information law no longer applies to this authority.Follow up " "messages to existing requests are sent to " msgstr "" +"Das Informationsfreiheitsgesetz ist für diese Behörde nicht länger gültig. " +"Follow-up Nachrichten bestehnder Nachrichten wurden gesendet an" #: app/views/user/show.rhtml:128 msgid "Freedom of Information request" -msgstr "" +msgstr "Informationsfreiheitsanfrage" #: app/views/public_body/show.rhtml:98 msgid "Freedom of Information requests made" @@ -1042,11 +1231,11 @@ msgstr "Anfrage ausgeführt" #: app/views/user/show.rhtml:121 app/views/user/show.rhtml:140 msgid "Freedom of Information requests made by" -msgstr "" +msgstr "Informationsfreiheitsanfrage gestellt durch" #: app/views/public_body/show.rhtml:72 msgid "Freedom of Information requests made using this site" -msgstr "" +msgstr "Anfrage über diese Seite gestellt" #: app/views/request/followup_bad.rhtml:12 msgid "" @@ -1057,29 +1246,29 @@ msgstr "" #: app/models/outgoing_message.rb:73 msgid "GIVE DETAILS ABOUT YOUR COMPLAINT HERE" -msgstr "" +msgstr "HINTELASSEN SIE HIER DETAILS ZU IHRER BESCHWERDE" #: app/views/general/exception_caught.rhtml:14 msgid "Go to our <a href=\"%s\">front page</a></li>" -msgstr "" +msgstr "Gehen Sie zu unserer <a href=\"%s\">Startseite</a></li>" -#: app/models/info_request_event.rb:292 +#: app/models/info_request_event.rb:297 msgid "Handled by post" -msgstr "" +msgstr "Postalisch bearbeitet" -#: app/models/info_request.rb:794 +#: app/models/info_request.rb:801 msgid "Handled by post." -msgstr "" +msgstr "Postalisch bearbeitet." -#: app/views/layouts/default.rhtml:121 +#: app/views/layouts/default.rhtml:102 msgid "Hello!" msgstr "Hallo!" -#: app/views/layouts/default.rhtml:118 +#: app/views/layouts/default.rhtml:99 msgid "Hello, {{username}}!" msgstr "Hallo, " -#: app/views/layouts/default.rhtml:113 +#: app/views/layouts/default.rhtml:94 msgid "Help" msgstr "Hilfe" @@ -1087,8 +1276,8 @@ msgstr "Hilfe" 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" -"WhatDoTheyKnow for intermediate events, which weren't given an explicit\n" -"description by a user. See the <a href=\"%s\">search tips</a> for description of the states." +"{{site_name}} for intermediate events, which weren't given an explicit\n" +"description by a user. See the <a href=\"{{search_path}}\">search tips</a> for description of the states." msgstr "" #: app/views/request/_other_describe_state.rhtml:4 @@ -1099,11 +1288,11 @@ msgid "" " Thanks." msgstr "" -#: locale/model_attributes.rb:58 +#: locale/model_attributes.rb:57 msgid "Holiday|Day" msgstr "" -#: locale/model_attributes.rb:59 +#: locale/model_attributes.rb:58 msgid "Holiday|Description" msgstr "" @@ -1116,18 +1305,20 @@ msgid "" "However, you have the right to request environmental\n" " information under a different law" msgstr "" +"Sie haben jeoch das Recht Umweltanfragen unter einem anderen Gesetz zu " +"stellen. " #: app/views/request/new.rhtml:73 msgid "Human health and safety" msgstr "Gesundheit und Sicherheit" -#: app/views/request/_followup.rhtml:71 +#: app/views/request/_followup.rhtml:68 msgid "I am asking for <strong>new information</strong>" -msgstr "" +msgstr "Ich beantrage <strong>neue Informationen</strong>" -#: app/views/request/_followup.rhtml:76 +#: app/views/request/_followup.rhtml:73 msgid "I am requesting an <strong>internal review</strong>" -msgstr "" +msgstr "Ich stelle eine Anfrage zur <strong>internen Prüfung</strong>" #: app/views/request_game/play.rhtml:39 msgid "I don't like these ones — give me some more!" @@ -1139,25 +1330,28 @@ msgstr "" #: app/views/request/_describe_state.rhtml:91 msgid "I would like to <strong>withdraw this request</strong>" -msgstr "" +msgstr "Ich möchte diese <strong>Anfrage zurückziehen</strong>" #: app/views/request/_describe_state.rhtml:11 msgid "" "I'm still <strong>waiting</strong> for my information\n" " <small>(maybe you got an acknowledgement)</small>" msgstr "" +"Ich <strong>warte</strong>noch immer auf meine Informationen\n" +" <small>(vielleicht haben Sie eine Bestätigung erhalten)</small>" #: app/views/request/_describe_state.rhtml:18 msgid "I'm still <strong>waiting</strong> for the internal review" -msgstr "" +msgstr "Ich <strong>warte</strong> noch immer auf die interne Prüfung" #: app/views/request/_describe_state.rhtml:32 msgid "I'm waiting for an <strong>internal review</strong> response" -msgstr "" +msgstr "Ich warte auf eine Antwort der <strong>internen Prüfung</strong>" #: app/views/request/_describe_state.rhtml:25 msgid "I've been asked to <strong>clarify</strong> my request" msgstr "" +"Ich wurde gefragt meine Anfrage <strong>deutlicher zu erläutern</strong>" #: app/views/request/_describe_state.rhtml:60 msgid "I've received <strong>all the information" @@ -1176,6 +1370,8 @@ msgid "" "If the address is wrong, or you know a better address, please <a " "href=\"%s\">contact us</a>." msgstr "" +"Sollte die Adresse falsch sein oder sollten Sie eine bessere Adresse kennen," +" so <a href=\"%s\">kontaktieren Sie uns</a>bitte." #: app/views/request_mailer/stopped_responses.rhtml:10 msgid "" @@ -1184,7 +1380,7 @@ msgid "" "email {{contact_email}} for help." msgstr "" -#: app/views/request/_followup.rhtml:21 +#: app/views/request/_followup.rhtml:20 msgid "" "If you are dissatisfied by the response you got from\n" " the public authority, you have the right to\n" @@ -1204,14 +1400,18 @@ msgid "" "If you are the requester, then you may <a href=\"%s\">sign in</a> to view " "the request." msgstr "" +"Falls Sie der Antragsteller sind, <a href=\"%s\">melden Sie sich an</a>, um " +"die Anfrage anzusehen." #: app/views/request/new.rhtml:119 msgid "" "If you are thinking of using a pseudonym,\n" " please <a href=\"%s\">read this first</a>." msgstr "" +"Wenn Sie ein Pseudonym als Benutzername verwenden möchten,\n" +" bitte <a href=\"%s\">lesen Sie hier</a>." -#: app/views/request/show.rhtml:98 +#: app/views/request/show.rhtml:105 msgid "If you are {{user_link}}, please" msgstr "Wenn Sie {{user_link}} sind, bitte" @@ -1227,6 +1427,8 @@ msgid "" "If you can, scan in or photograph the response, and <strong>send us\n" " a copy to upload</strong>." msgstr "" +"Fall möglich, scannen oder photographieren Sie die Antwort und<strong>senden" +" Sie uns eine Kopie zum Upload</strong>." #: app/views/outgoing_mailer/_followup_footer.rhtml:4 msgid "" @@ -1243,15 +1445,18 @@ msgstr "" "haben</strong>, ist dieser Anmeldecode nichtmehr aktiv. Bitte nehmen Sie " "eine neue Registrierung vor. " -#: app/controllers/request_controller.rb:430 +#: app/controllers/request_controller.rb:437 msgid "" "If you have not done so already, please write a message below telling the " "authority that you have withdrawn your request. Otherwise they will not know" " it has been withdrawn." 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. " -#: app/views/user/signchangepassword_confirm.rhtml:10 #: app/views/user/signchangeemail_confirm.rhtml:11 +#: app/views/user/signchangepassword_confirm.rhtml:10 msgid "" "If you use web-based email or have \"junk mail\" filters, also check your\n" "bulk/spam mail folders. Sometimes, our messages are marked that way." @@ -1265,13 +1470,15 @@ msgid "" "If you would like us to lift this ban, then you may politely\n" "<a href=\"/help/contact\">contact us</a> giving reasons.\n" msgstr "" +"Falls Sie möchten, dass wir diese Sperre aufheben, mögen Sie uns höflich\n" +"<a href=\"/help/contact\">kontaktieren</a> und einen Grund angeben.\n" #: app/views/user/_signup.rhtml:6 -msgid "If you're new to WhatDoTheyKnow" +msgid "If you're new to {{site_name}}" msgstr "" #: app/views/user/_signin.rhtml:7 -msgid "If you've used WhatDoTheyKnow before" +msgid "If you've used {{site_name}} before" msgstr "" #: app/views/user/no_cookies.rhtml:12 @@ -1279,80 +1486,82 @@ 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 "" +"Sollte Ihr Browser Cookies zulassen und Sie trotzdem diese Nachricht " +"erhalten, gibt es wahrscheinlich ein Problem mit unserem Server." -#: locale/model_attributes.rb:64 +#: locale/model_attributes.rb:63 msgid "IncomingMessage|Cached attachment text clipped" msgstr "" -#: locale/model_attributes.rb:65 +#: locale/model_attributes.rb:64 msgid "IncomingMessage|Cached main body text folded" msgstr "" -#: locale/model_attributes.rb:66 +#: locale/model_attributes.rb:65 msgid "IncomingMessage|Cached main body text unfolded" msgstr "" -#: locale/model_attributes.rb:39 +#: locale/model_attributes.rb:44 msgid "InfoRequestEvent|Calculated state" msgstr "" -#: locale/model_attributes.rb:38 +#: locale/model_attributes.rb:43 msgid "InfoRequestEvent|Described state" msgstr "" -#: locale/model_attributes.rb:36 +#: locale/model_attributes.rb:41 msgid "InfoRequestEvent|Event type" msgstr "" -#: locale/model_attributes.rb:40 +#: locale/model_attributes.rb:45 msgid "InfoRequestEvent|Last described at" msgstr "" -#: locale/model_attributes.rb:37 +#: locale/model_attributes.rb:42 msgid "InfoRequestEvent|Params yaml" msgstr "" -#: locale/model_attributes.rb:41 +#: locale/model_attributes.rb:46 msgid "InfoRequestEvent|Prominence" msgstr "" -#: locale/model_attributes.rb:87 +#: locale/model_attributes.rb:86 msgid "InfoRequest|Allow new responses from" msgstr "" -#: locale/model_attributes.rb:83 +#: locale/model_attributes.rb:82 msgid "InfoRequest|Awaiting description" msgstr "" -#: locale/model_attributes.rb:82 +#: locale/model_attributes.rb:81 msgid "InfoRequest|Described state" msgstr "" -#: locale/model_attributes.rb:88 +#: locale/model_attributes.rb:87 msgid "InfoRequest|Handle rejected responses" msgstr "" -#: locale/model_attributes.rb:86 +#: locale/model_attributes.rb:85 msgid "InfoRequest|Law used" msgstr "" -#: locale/model_attributes.rb:84 +#: locale/model_attributes.rb:83 msgid "InfoRequest|Prominence" msgstr "" -#: locale/model_attributes.rb:81 +#: locale/model_attributes.rb:80 msgid "InfoRequest|Title" msgstr "" -#: locale/model_attributes.rb:85 +#: locale/model_attributes.rb:84 msgid "InfoRequest|Url title" msgstr "" -#: app/models/info_request_event.rb:298 +#: app/models/info_request_event.rb:303 msgid "Information not held" msgstr "Information nicht verfügbar" -#: app/models/info_request.rb:784 +#: app/models/info_request.rb:791 msgid "Information not held." msgstr "Information nicht verfügbr" @@ -1361,20 +1570,25 @@ msgid "" "Information on emissions and discharges (e.g. noise, energy,\n" " radiation, waste materials)" msgstr "" +"Informationen über emissions and discharges (e.g. noise, energy,\n" +" radiation, waste materials)" -#: app/models/info_request_event.rb:306 +#: app/models/info_request_event.rb:311 msgid "Internal review acknowledgement" msgstr "" -#: app/models/info_request_event.rb:323 +#: app/models/info_request_event.rb:328 msgid "Internal review request" -msgstr "" +msgstr "Anfrage zur internen Prüfung" #: app/views/outgoing_mailer/initial_request.rhtml:8 msgid "" -"Is {{email_address}} the wrong address for {{type_of_request}} requests tp " +"Is {{email_address}} the wrong address for {{type_of_request}} requests to " "{{public_body_name}}? If so, please contact us using this form:" msgstr "" +"Ist {{email_address}} die falsche Email-Adresse für {{type_of_request}} " +"Anfragen an {{public_body_name}}? Sollte dies der Fall sein, so kontaktieren" +" Sie uns bitte über dieses Formular:" #: app/views/user/no_cookies.rhtml:8 msgid "" @@ -1383,33 +1597,39 @@ msgid "" "browser. Then press refresh to have another go." msgstr "" -#: app/views/user/show.rhtml:62 -msgid "Joined WhatDoTheyKnow in" -msgstr "" - #: app/views/user/_user_listing_single.rhtml:21 msgid "Joined in" msgstr "Angemeldet" +#: app/views/user/show.rhtml:62 +msgid "Joined {{site_name}} in" +msgstr "" + #: app/views/request/new.rhtml:48 msgid "" "Keep it <strong>focused</strong>, you'll be more likely to get what you want" " (<a href=\"%s\">why?</a>)." msgstr "" +"Machen Sie es <strong>kurz und bündig</strong>, die Wahrscheinlichkeit die " +"gewünschten Informationen zu erhalten ist somit größer(<a " +"href=\"%s\">Warum?</a>)." #: app/views/contact_mailer/message.rhtml:10 msgid "Last authority viewed: " -msgstr "" +msgstr "Zuletzt angesehene Behörde: " #: app/views/contact_mailer/message.rhtml:7 msgid "Last request viewed: " -msgstr "" +msgstr "Zuletzt angesehene Anfrage:" #: app/views/user/no_cookies.rhtml:17 msgid "" "Let us know what you were doing when this message\n" "appeared and your browser and operating system type and version." msgstr "" +"Teilen Sie uns mit bei welchem Vorgang diese Nachricht angezeigt wurde, also" +" auch den Namen Ihres Browsers, und den Namen und die Version Ihres " +"Betriebssystems." #: app/views/request/_correspondence.rhtml:27 #: app/views/request/_correspondence.rhtml:57 @@ -1424,13 +1644,13 @@ msgstr "Liste aller Behörden (CSV)" msgid "Local and regional" msgstr "Örtlich und regional" -#: app/models/info_request.rb:782 +#: app/models/info_request.rb:789 msgid "Long overdue." -msgstr "" +msgstr "Stark verspätet." #: app/views/public_body/show.rhtml:47 msgid "Make a new Environmental Information request" -msgstr "" +msgstr "Stellen Sie eine neue Umweltanfrage" #: app/views/request/new.rhtml:1 msgid "Make an {{law_used_short}} request to '{{public_body_name}}'" @@ -1439,22 +1659,22 @@ msgstr "Stellen Sie einen {{law_used_short}} Antrag an '{{public_body_name}}'" #: app/views/layouts/default.rhtml:15 msgid "Make and browse Freedom of Information (FOI) requests" msgstr "" -"Hier können Sie Anfragen an das Informationsgesetz stellen und bestehende " -"Anfragen durchsuchen" +"Hier können Sie Anfragen an das Informationsgesetz (IFG)stellen und " +"bestehende Anfragen durchsuchen" -#: app/views/layouts/default.rhtml:86 +#: app/views/layouts/default.rhtml:67 msgid "Make and explore Freedom of Information requests" msgstr "" -"Hier können Sie Anfragen an das Informationsgesetz stellen und bestehende " +"Hier können Sie Informationsfreiheitsanfragen stellen und bestehende " "Anfragen durchsuchen" #: app/views/general/frontpage.rhtml:4 msgid "Make or explore Freedom of Information requests" msgstr "" -"Hier können Sie Anfragen an das Informationsgesetz stellen oder bestehende " +"Hier können Sie Informationsfreiheitsanfragen stellen oder bestehende " "Anfragen durchsuchen" -#: app/views/layouts/default.rhtml:106 +#: app/views/layouts/default.rhtml:87 msgid "Make request" msgstr "Anfrage stellen" @@ -1463,12 +1683,12 @@ msgid "Make your own request" msgstr "Eigene Anfrage stellen" #: app/views/contact_mailer/message.rhtml:4 -msgid "Message sent using WhatDoTheyKnow contact form, " +msgid "Message sent using {{site_name}} contact form, " msgstr "" #: app/views/request/new_bad_contact.rhtml:1 msgid "Missing contact details for '" -msgstr "" +msgstr "Folgende Kontaktdetails fehlen:" #: app/views/public_body/show.rhtml:5 msgid "More about this authority" @@ -1486,7 +1706,7 @@ msgstr "Weitere erfolgreiche Anfragen" msgid "My request has been <strong>refused</strong>" msgstr "Meine Anfrage wurde <strong>abgelehnt</strong>" -#: app/views/layouts/default.rhtml:110 +#: app/views/layouts/default.rhtml:91 msgid "My requests" msgstr "Meine Anfragen " @@ -1498,13 +1718,17 @@ msgstr "Name muss eingegeben werden " msgid "Name is already taken" msgstr "Benutzername vergeben" +#: app/models/track_thing.rb:142 app/models/track_thing.rb:143 +msgid "New Freedom of Information requests" +msgstr "" + #: app/views/user/signchangeemail.rhtml:20 msgid "New e-mail:" msgstr "Neue Email:" #: app/models/change_email_validator.rb:53 msgid "New email doesn't look like a valid address" -msgstr "" +msgstr "Die neue Email-Adresse scheint ungültig" #: app/views/user/signchangepassword.rhtml:15 msgid "New password:" @@ -1512,7 +1736,7 @@ msgstr "Neues Passwort:" #: app/views/user/signchangepassword.rhtml:20 msgid "New password: (again)" -msgstr "" +msgstr "Neues Passwort: (erneut eingeben)" #: app/views/request/show_response.rhtml:62 msgid "New response to your request" @@ -1542,7 +1766,7 @@ msgstr "Keine Behörde gefunden" #: app/views/request/list.rhtml:23 msgid "No requests of this sort yet." -msgstr "" +msgstr "Es besteht noch keine Anfrage dieser Art." #: app/views/request/similar.rhtml:7 msgid "No similar requests found." @@ -1556,47 +1780,51 @@ msgstr "" "Bisher hat niemand eine Anfrage an {{public_body_name}} über diese Seite " "gestellt." -#: app/views/request/_request_listing.rhtml:2 #: app/views/public_body/_body_listing.rhtml:2 +#: app/views/request/_request_listing.rhtml:2 msgid "None found." -msgstr "" +msgstr "Keine gefunden." +#: app/views/user/signchangeemail_confirm.rhtml:3 #: app/views/user/signchangepassword_confirm.rhtml:1 #: app/views/user/signchangepassword_confirm.rhtml:3 -#: app/views/user/signchangeemail_confirm.rhtml:3 msgid "Now check your email!" -msgstr "" +msgstr "Rufen Sie nun Ihre Emails ab. " #: app/views/comment/preview.rhtml:5 msgid "Now preview your annotation" -msgstr "" +msgstr "Überprüfen Sie Ihre Anfrage" #: app/views/request/followup_preview.rhtml:10 msgid "Now preview your follow up" -msgstr "" +msgstr "Überprüfen Sie nun Ihr Follow-up" #: app/views/request/followup_preview.rhtml:8 msgid "Now preview your message asking for an internal review" -msgstr "" +msgstr "Überprüfen Sie nun Ihre Anfrage zur internen Prüfung" #: app/views/request/preview.rhtml:5 msgid "Now preview your request" -msgstr "" +msgstr "Überprüfen Sie Ihre Anfrage" #: app/views/user/set_draft_profile_photo.rhtml:46 msgid "OR remove the existing photo" -msgstr "" +msgstr "OR entfernen Sie das bestehende Photo" #: app/views/general/frontpage.rhtml:25 msgid "" "OR, <strong>search</strong> for information others have requested using " "{{site_name}}" msgstr "" +"oder <strong>suchen Sie</strong> nach Informationen, welche von anderne " +"Nutzern angefragt wurden. {{site_name}}" -#: app/controllers/request_controller.rb:407 +#: app/controllers/request_controller.rb:414 msgid "" "Oh no! Sorry to hear that your request was refused. Here is what to do now." msgstr "" +"Oh nein! Es tut uns leid zu hören, dass Ihre Anfrage abgelehnt wurde. Lesen " +"Sie hier was Sie nun tun können. " #: app/views/user/signchangeemail.rhtml:15 msgid "Old e-mail:" @@ -1618,7 +1846,7 @@ msgstr "Auf dieser Seite" #: app/views/general/search.rhtml:71 msgid "One public authority matching ‘{{user_search_query}}’" -msgstr "" +msgstr "Eine zutreffende Behörde ‘{{user_search_query}}’" #: app/views/public_body/show.rhtml:91 msgid "Only requests made using {{site_name}} are shown." @@ -1626,29 +1854,45 @@ msgstr "" "Es werden ausschliesslich Anfragen zu folgendem Sucheintrag angezeit: " "{{site_name}} " -#: locale/model_attributes.rb:21 +#: app/models/info_request.rb:405 +msgid "" +"Only the authority can reply to this request, and I don't recognise the " +"address this reply was sent from" +msgstr "" + +#: app/models/info_request.rb:401 +msgid "" +"Only the authority can reply to this request, but there is no \"From\" " +"address to check against" +msgstr "" + +#: app/views/general/search.rhtml:158 +msgid "Original request sent" +msgstr "" + +#: locale/model_attributes.rb:26 msgid "OutgoingMessage|Body" msgstr "" -#: locale/model_attributes.rb:24 +#: locale/model_attributes.rb:29 msgid "OutgoingMessage|Last sent at" msgstr "" -#: locale/model_attributes.rb:23 +#: locale/model_attributes.rb:28 msgid "OutgoingMessage|Message type" msgstr "" -#: locale/model_attributes.rb:22 +#: locale/model_attributes.rb:27 msgid "OutgoingMessage|Status" msgstr "" -#: locale/model_attributes.rb:25 +#: locale/model_attributes.rb:30 msgid "OutgoingMessage|What doing" msgstr "" -#: app/models/info_request.rb:788 +#: app/models/info_request.rb:795 msgid "Partially successful." -msgstr "" +msgstr "Teilweise erfolgreich. " #: app/models/change_email_validator.rb:47 msgid "Password is not correct" @@ -1660,7 +1904,7 @@ msgstr "Passwort:" #: app/views/user/_signup.rhtml:35 msgid "Password: (again)" -msgstr "" +msgstr "Passwort: (nochmal eingeben)" #: app/views/user/set_draft_profile_photo.rhtml:13 msgid "Photo of you:" @@ -1670,7 +1914,7 @@ msgstr "Ihr Profilbild:" msgid "Plans and administrative measures that affect these matters" msgstr "" -#: app/controllers/request_game_controller.rb:40 +#: app/controllers/request_game_controller.rb:42 msgid "Play the request categorisation game" msgstr "" @@ -1678,18 +1922,22 @@ msgstr "" msgid "Play the request categorisation game!" msgstr "" -#: app/views/request/show.rhtml:94 +#: app/views/request/show.rhtml:101 msgid "Please" -msgstr "" +msgstr "Bitte" #: app/views/user/no_cookies.rhtml:15 msgid "Please <a href=\"%s\">get in touch</a> with us so we can fix it." msgstr "" +"Bitte<a href=\"%s\">nehmen Sie Kontakt mit uns auf</a>, damit wir das " +"Problem beheben können. " -#: app/views/request/show.rhtml:45 +#: app/views/request/show.rhtml:52 msgid "" "Please <strong>answer the question above</strong> so we know whether the " msgstr "" +"Bitte <strong>beantworten Sie die oben angezeigte Frage</strong>, damit wir " +"wissen ob" #: app/views/user/show.rhtml:12 msgid "" @@ -1697,16 +1945,17 @@ msgid "" " know if there was information in the recent responses to them." msgstr "" -#: app/views/request/_followup.rhtml:28 +#: app/views/request/_followup.rhtml:27 msgid "" -"Please <strong>only</strong> write messages directly relating to your \n" -"\t\t\t\trequest {{request_link}}. If you would like to ask for information\n" -"\t\t\t\tthat was not in your original request, then <a href=\"%s\">file a new request</a>." +"Please <strong>only</strong> write messages directly relating to your " +"request {{request_link}}. If you would like to ask for information that was " +"not in your original request, then <a href=\"{{new_request_link}}\">file a " +"new request</a>." msgstr "" #: app/views/request/new.rhtml:60 msgid "Please ask for environmental information only" -msgstr "" +msgstr "Bitte fragen Sie ausschliesslich nach Umweltinformationen" #: app/views/user/bad_token.rhtml:2 msgid "" @@ -1722,17 +1971,19 @@ msgstr "Bitte wählen Sie eine Datei mit Ihrem Foto." msgid "Please choose what sort of reply you are making." msgstr "Bitte wählen Sie, welche Art von Antwort Sie geben." -#: app/controllers/request_controller.rb:341 +#: app/controllers/request_controller.rb:346 msgid "" "Please choose whether or not you got some of the information that you " "wanted." msgstr "" +"Bitte wählen Sie ob Sie einige der erwünschten Informationen erhalten haben " +"oder ob dies nicht der Fall ist. " #: app/views/user_mailer/changeemail_confirm.rhtml:3 msgid "" "Please click on the link below to confirm that you want to \n" -"change the email address that you use for WhatDoTheyKnow\n" -"from " +"change the email address that you use for {{site_name}}\n" +"from {{old_email}} to {{new_email}}" msgstr "" #: app/views/user_mailer/confirm_login.rhtml:3 @@ -1741,24 +1992,26 @@ msgstr "" "Klicken Sie auf den unten aufgeführten Link, um Ihre Emailadresse zu " "bestätigen." -#: app/models/info_request.rb:127 +#: app/models/info_request.rb:126 msgid "" "Please describe more what the request is about in the subject. There is no " "need to say it is an FOI request, we add that on anyway." msgstr "" "Bitte beschreiben Sie im Betreff, um was es in der Anfrage geht. Sie " -"brauchen nicht sagen, dass es eine Informationsfreiheitsanfrage ist, dies " -"wird automatisch hinzugefügt." +"brauchen nicht sagen, dass es eine IFG-Anfrage ist, dies wird automatisch " +"hinzugefügt." #: app/views/user/set_draft_profile_photo.rhtml:22 msgid "" "Please don't upload offensive pictures. We will take down images\n" " that we consider inappropriate." msgstr "" +"Bitte verwenden Sie keine anstößigen Bilder. Alle unangemessenen Bilder " +"werden von uns entfernt." #: app/views/user/no_cookies.rhtml:3 msgid "Please enable \"cookies\" to carry on" -msgstr "" +msgstr "Bitte erlauben Sie Cookies, um fortzufahren" #: app/models/user.rb:38 msgid "Please enter a password" @@ -1768,7 +2021,7 @@ msgstr "Bitte geben Sie ein Passwort ein" msgid "Please enter a subject" msgstr "Bitte geben Sie einen Betreff ein" -#: app/models/info_request.rb:35 +#: app/models/info_request.rb:34 msgid "Please enter a summary of your request" msgstr "Bitte geben Sie eine Zusammenfassung Ihrer Anfrage ein" @@ -1830,7 +2083,7 @@ msgstr "Bitte machen Sie Angaben, warum Sie eine Durchsicht möchten" msgid "Please keep it shorter than 500 characters" msgstr "Bitte bleiben Sie unter 500 Zeichen" -#: app/models/info_request.rb:124 +#: app/models/info_request.rb:123 msgid "" "Please keep the summary short, like in the subject of an email. You can use " "a phrase, rather than a full sentence." @@ -1843,6 +2096,9 @@ 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 "" +"Bitte stellen Sie ausschliesslich Anfragen, welche unter dieser Kategorie " +"fallen, <strong>vergeuden Sie nicht Ihre Zeit</strong> oder die der Behörden" +" mit der Anfrage unzutreffender Informationen." #: app/views/request/new_please_describe.rhtml:5 msgid "" @@ -1860,15 +2116,17 @@ msgstr "" #: app/views/user/sign.rhtml:8 msgid "Please sign in as " -msgstr "" +msgstr "Anmelden als" -#: app/controllers/request_controller.rb:723 +#: app/controllers/request_controller.rb:730 msgid "Please type a message and/or choose a file containing your response." msgstr "" +"Bitte geben Sie eine Nachricht ein und / oder wählen Sie eine Datei aus, " +"welche Ihre Antwort enthält" -#: app/controllers/request_controller.rb:427 +#: app/controllers/request_controller.rb:434 msgid "Please use the form below to tell us more." -msgstr "" +msgstr "Bitte nutzen Sie das Formular, um uns ausführlicher zu informieren. " #: app/views/outgoing_mailer/followup.rhtml:6 #: app/views/outgoing_mailer/initial_request.rhtml:5 @@ -1876,11 +2134,11 @@ msgid "Please use this email address for all replies to this request:" msgstr "" "Bitte nutzen Sie diese Emailadresse für alle Antworten auf diese Anfrage:" -#: app/models/info_request.rb:36 +#: app/models/info_request.rb:35 msgid "Please write a summary with some text in it" msgstr "Bitte schreiben Sie eine Zusammenfassung mit etwas Text" -#: app/models/info_request.rb:121 +#: app/models/info_request.rb:120 msgid "" "Please write the summary using a mixture of capital and lower case letters. " "This makes it easier for others to read." @@ -1896,11 +2154,13 @@ msgstr "" "Bitte nutzen Sie eine Mischung aus Groß- und Kleinschreibung für Ihre " "Anmerkung. Dies vereinfacht das Lesen für andere." -#: app/controllers/request_controller.rb:416 +#: app/controllers/request_controller.rb:423 msgid "" "Please write your follow up message containing the necessary clarifications " "below." msgstr "" +"Bitte geben Sie unten Ihre Follow-up Nachricht mit den nötigen " +"Klärungsdetails ein. " #: app/models/outgoing_message.rb:159 msgid "" @@ -1915,38 +2175,40 @@ msgid "" "Point to <strong>related information</strong>, campaigns or forums which may" " be useful." msgstr "" +"Weisen Sie auf ähnliche, evtl. nütziche Informationen, Kampagnen oder Foren " +"hin" #: app/views/comment/preview.rhtml:21 msgid "Post annotation" -msgstr "" +msgstr "Anmerkung hinzufügen" -#: locale/model_attributes.rb:56 +#: locale/model_attributes.rb:55 msgid "PostRedirect|Circumstance" msgstr "" -#: locale/model_attributes.rb:54 +#: locale/model_attributes.rb:53 msgid "PostRedirect|Email token" msgstr "" -#: locale/model_attributes.rb:53 +#: locale/model_attributes.rb:52 msgid "PostRedirect|Post params yaml" msgstr "" -#: locale/model_attributes.rb:55 +#: locale/model_attributes.rb:54 msgid "PostRedirect|Reason params yaml" msgstr "" -#: locale/model_attributes.rb:51 +#: locale/model_attributes.rb:50 msgid "PostRedirect|Token" msgstr "" -#: locale/model_attributes.rb:52 +#: locale/model_attributes.rb:51 msgid "PostRedirect|Uri" msgstr "" #: app/views/general/_credits.rhtml:1 msgid "Powered by <a href=\"http://www.alaveteli.org/\">Alaveteli</a>." -msgstr "" +msgstr "Ermöglicht durch <a href=\"http://www.alaveteli.org/\">Alaveteli</a>." #: app/views/request/followup_preview.rhtml:1 msgid "Preview follow up to '" @@ -1954,13 +2216,13 @@ msgstr "" #: app/views/comment/preview.rhtml:1 msgid "Preview new annotation on '{{info_request_title}}'" -msgstr "" +msgstr "Sehen Sie den neuen Kommentar zu '{{info_request_title}}'" #: app/views/comment/_comment_form.rhtml:15 msgid "Preview your annotation" -msgstr "" +msgstr "Überprüfen Sie Ihre Anmerkung" -#: app/views/request/_followup.rhtml:99 +#: app/views/request/_followup.rhtml:96 msgid "Preview your message" msgstr "Anfrage ansehen" @@ -1968,17 +2230,17 @@ msgstr "Anfrage ansehen" msgid "Preview your public request" msgstr "Öffentliche Anfrage ansehen" -#: locale/model_attributes.rb:18 +#: locale/model_attributes.rb:15 msgid "ProfilePhoto|Data" msgstr "" -#: locale/model_attributes.rb:19 +#: locale/model_attributes.rb:16 msgid "ProfilePhoto|Draft" msgstr "" #: app/views/public_body/list.rhtml:37 msgid "Public authorities - {{description}}" -msgstr "" +msgstr "Behörden - {{description}}" #: app/views/general/search.rhtml:73 msgid "" @@ -2004,11 +2266,11 @@ msgstr "" #: locale/model_attributes.rb:3 msgid "PublicBody|Name" -msgstr "" +msgstr "Behörde|Name" #: locale/model_attributes.rb:11 msgid "PublicBody|Notes" -msgstr "" +msgstr "Behörde|Anmerkung" #: locale/model_attributes.rb:13 msgid "PublicBody|Publication scheme" @@ -2016,7 +2278,7 @@ msgstr "" #: locale/model_attributes.rb:5 msgid "PublicBody|Request email" -msgstr "" +msgstr "Behörde|Email anfragen" #: locale/model_attributes.rb:4 msgid "PublicBody|Short name" @@ -2024,27 +2286,23 @@ msgstr "" #: locale/model_attributes.rb:9 msgid "PublicBody|Url name" -msgstr "" +msgstr "Behörde|URL" #: locale/model_attributes.rb:6 msgid "PublicBody|Version" -msgstr "" +msgstr "Behörde|Version" #: app/views/public_body/show.rhtml:10 msgid "Publication scheme" msgstr "" -#: locale/model_attributes.rb:49 -msgid "RawEmail|Data binary" -msgstr "" - #: locale/model_attributes.rb:48 -msgid "RawEmail|Data text" +msgid "RawEmail|Data binary" msgstr "" #: app/views/comment/preview.rhtml:20 msgid "Re-edit this annotation" -msgstr "" +msgstr "Anmerkung erneut bearbeiten" #: app/views/request/followup_preview.rhtml:49 msgid "Re-edit this message" @@ -2056,39 +2314,45 @@ msgstr "Anfrage ändern" #: app/views/general/search.rhtml:137 msgid "" -"Read about <a href=\"%s\">advanced search operators</a>, such as proximity " -"and wildcards." +"Read about <a href=\"{{advanced_search_url}}\">advanced search " +"operators</a>, such as proximity and wildcards." msgstr "" -#: app/views/layouts/default.rhtml:112 +#: app/views/layouts/default.rhtml:93 msgid "Read blog" msgstr "Blog lesen" #: app/views/request/new.rhtml:16 msgid "Read this before writing your {{info_request_law_used_full}} request" msgstr "" +"Lesen Sie dies bevor Sie Ihre {{info_request_law_used_full}} Anfrage " +"schreiben" + +#: app/views/general/search.rhtml:150 +msgid "Received an error message, such as delivery failure." +msgstr "" #: app/views/general/search.rhtml:42 msgid "Recently described results first" -msgstr "" +msgstr "Kürzlich widergegebene Ergebnisse zuerst" -#: app/controllers/request_controller.rb:134 +#: app/controllers/request_controller.rb:139 msgid "Recently sent Freedom of Information requests" -msgstr "" +msgstr "Kürzlich gesendete Informationsfreiheitsgesetzanfragen" #: app/views/request/list.rhtml:6 msgid "Recently sent requests" msgstr "Kürzlich gestellte Anfragen" -#: app/controllers/request_controller.rb:139 +#: app/controllers/request_controller.rb:144 msgid "Recently successful responses" -msgstr "" +msgstr "Aktuelle erfolgreiche Antworten" -#: app/models/info_request_event.rb:300 +#: app/models/info_request_event.rb:305 msgid "Refused" msgstr "Abgelehnt" -#: app/models/info_request.rb:786 +#: app/models/info_request.rb:793 msgid "Refused." msgstr "Abgelehnt." @@ -2100,7 +2364,7 @@ msgstr "" #: app/views/request/_correspondence.rhtml:28 msgid "Reply to this message" -msgstr "" +msgstr "Auf diese Nachricht antworten" #: app/views/comment/_single_comment.rhtml:24 msgid "Report abuse" @@ -2108,11 +2372,11 @@ msgstr "Missbrauch melden" #: app/views/request/_after_actions.rhtml:37 msgid "Request an internal review" -msgstr "" +msgstr "Interne Prüfung anfragen" #: app/views/request/_followup.rhtml:4 msgid "Request an internal review from" -msgstr "" +msgstr "Anfrage zur internen Prüfung von" #: app/views/request/hidden.rhtml:1 msgid "Request has been removed" @@ -2130,19 +2394,26 @@ msgid "" "Request to {{public_body_name}} by {{info_request_user}}. Annotated by " "{{event_comment_user}} on {{date}}." msgstr "" +"Anfrage an {{public_body_name}} durch {{info_request_user}}. Kommentiert " +"durch {{event_comment_user}} am {{date}}." #: app/views/request/_request_listing_single.rhtml:12 msgid "" "Requested from {{public_body_name}} by {{info_request_user}} on {{date}}" msgstr "" +"Angefragt von {{public_body_name}} durch {{info_request_user}} am {{date}}" #: app/views/request/_sidebar_request_listing.rhtml:13 msgid "Requested on {{date}}" msgstr "Angefragt am {{date}}" +#: app/models/track_thing.rb:209 app/models/track_thing.rb:210 +msgid "Requests or responses matching '{{query}}'" +msgstr "" + #: app/views/request/upload_response.rhtml:11 msgid "Respond by email" -msgstr "" +msgstr "Email-Antwort senden" #: app/views/request/_after_actions.rhtml:46 msgid "Respond to request" @@ -2150,17 +2421,21 @@ msgstr "Auf Anfrage reagieren" #: app/views/request/upload_response.rhtml:5 msgid "Respond to the FOI request" -msgstr "" +msgstr "IFG-Anfrage beantworten" #: app/views/request/upload_response.rhtml:21 msgid "Respond using the web" msgstr "" -#: app/views/request/show.rhtml:70 +#: app/views/general/search.rhtml:160 +msgid "Response from a public authority" +msgstr "" + +#: app/views/request/show.rhtml:77 msgid "Response to this request is <strong>delayed</strong>." msgstr "Die Antwort auf diese Anfrage ist <strong>im Rückstand</strong>." -#: app/views/request/show.rhtml:78 +#: app/views/request/show.rhtml:85 msgid "Response to this request is <strong>long overdue</strong>." msgstr "" "Die Antwort auf diese Anfrage ist <strong>lange im Rückstand</strong>." @@ -2175,33 +2450,35 @@ msgstr "Antwort:" #: app/views/general/search.rhtml:9 msgid "Results page {{page_number}}" -msgstr "" +msgstr "Ergebnisanzeige {{page_number}}" #: app/views/user/set_profile_about_me.rhtml:35 msgid "Save" msgstr "Speichern" -#: app/views/request/new.rhtml:31 app/views/layouts/default.rhtml:99 #: app/views/general/exception_caught.rhtml:10 #: app/views/general/frontpage.rhtml:16 app/views/general/search.rhtml:29 +#: app/views/layouts/default.rhtml:80 app/views/request/new.rhtml:31 msgid "Search" msgstr "Suche" #: app/views/general/search.rhtml:4 msgid "Search Freedom of Information requests, public authorities and users" -msgstr "" +msgstr "Suchen Sie nach Informationsfreiheitsanfragen, Behörden und Nutzern" #: app/views/general/exception_caught.rhtml:7 msgid "Search the site to find what you were looking for." msgstr "" +"Duchsuchen Sie die Seite, um die von Ihnen gewünschten Informationen zu " +"finden. " -#: app/controllers/user_controller.rb:330 +#: app/controllers/user_controller.rb:331 msgid "Send a message to " msgstr "Nachricht senden an" #: app/views/request/_followup.rhtml:7 msgid "Send a public follow up message to" -msgstr "" +msgstr "Senden Sie eine öffentliche Follow-up Nachricht" #: app/views/request/_followup.rhtml:10 msgid "Send a public reply to" @@ -2209,7 +2486,7 @@ msgstr "Senden Sie eine öffentliche Antwort an" #: app/views/request/_correspondence.rhtml:58 msgid "Send follow up" -msgstr "" +msgstr "Follow-Up senden" #: app/views/request/followup_preview.rhtml:50 msgid "Send message" @@ -2225,7 +2502,7 @@ msgstr "Öffentlich senden" #: app/views/user/show.rhtml:53 msgid "Set your profile photo" -msgstr "" +msgstr "Profilbild wählen" #: app/models/public_body.rb:39 msgid "Short name is already taken" @@ -2235,7 +2512,7 @@ msgstr "Nutzername bereits vergeben " msgid "Show most relevant results first" msgstr "Relevanteste Suchergebnisse zuerst anzeigen " -#: app/views/request/list.rhtml:2 app/views/public_body/list.rhtml:3 +#: app/views/public_body/list.rhtml:3 app/views/request/list.rhtml:2 msgid "Show only..." msgstr "" @@ -2247,11 +2524,11 @@ msgstr "Anmelden" msgid "Sign in or make a new account" msgstr "Anmelden oder neues Benutzerkonto erstellen" -#: app/views/layouts/default.rhtml:122 +#: app/views/layouts/default.rhtml:103 msgid "Sign in or sign up" msgstr "Amelden oder einloggen " -#: app/views/layouts/default.rhtml:119 +#: app/views/layouts/default.rhtml:100 msgid "Sign out" msgstr "Ausloggen" @@ -2263,8 +2540,12 @@ msgstr "Benutzerkonto erstellen" msgid "Similar requests" msgstr "Ähnliche Anfragen" -#: app/models/info_request_event.rb:302 +#: app/models/info_request_event.rb:307 msgid "Some information sent" +msgstr "Information teilweise gesendet" + +#: app/views/general/search.rhtml:145 +msgid "Some of the information requested has been received" msgstr "" #: app/views/request_game/play.rhtml:31 @@ -2274,11 +2555,16 @@ msgid "" "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 "" +"Nicht alle Anfragensteller haben uns über den Erfolg Ihrer Anfragen " +"informiert. Wir sind auf <strong>Ihre</strong> Hilfe angewiesen. Wählen Sie " +"eine dieser Anfragen, lesen Sie sie und teilen Sie uns mit, ob die " +"gewünschte Information zur Verfügung gestellt wurde. Alle Nutzer wären Ihnen" +" ausgesprochen dankbar. " #: app/views/user_mailer/changeemail_already_used.rhtml:1 msgid "" "Someone, perhaps you, just tried to change their email address on\n" -"WhatDoTheyKnow.com from " +"{{site_name}} from {{old_email}} to {{new_email}}." msgstr "" #: app/views/general/exception_caught.rhtml:1 @@ -2287,16 +2573,16 @@ msgstr "Diese Seite wurde leider nicht gefunden" #: app/views/request/new.rhtml:53 msgid "Special note for this authority!" -msgstr "" +msgstr "Spezielle Nachricht and diese Behörde!" #: app/views/request/_other_describe_state.rhtml:21 msgid "Still awaiting an <strong>internal review</strong>" -msgstr "" +msgstr "<strong>internal review</strong> weiterhin ausstehend" -#: app/views/request/preview.rhtml:18 #: app/views/request/followup_preview.rhtml:23 +#: app/views/request/preview.rhtml:18 msgid "Subject:" -msgstr "" +msgstr "Thema:" #: app/views/user/signchangepassword_send_confirm.rhtml:26 msgid "Submit" @@ -2308,13 +2594,13 @@ msgstr "Status senden" #: app/models/track_thing.rb:158 app/models/track_thing.rb:159 msgid "Successful Freedom of Information requests" -msgstr "" +msgstr "Erfolgreiche Informationsfreiheitsanfrage" #: app/views/request/list.rhtml:5 msgid "Successful responses" msgstr "Erfolgreiche Anfragen" -#: app/models/info_request.rb:790 +#: app/models/info_request.rb:797 msgid "Successful." msgstr "Erfolgreich." @@ -2323,10 +2609,12 @@ msgid "" "Suggest how the requester can find the <strong>rest of the " "information</strong>." msgstr "" +"Schlagen Sie vor, wie der Anfragensteller <strong>den Rest der " +"Information</strong> finden kann." #: app/views/request/new.rhtml:93 msgid "Summary:" -msgstr "Zusammenfassung" +msgstr "Zusammenfassung:" #: app/views/general/search.rhtml:140 msgid "Table of statuses" @@ -2334,9 +2622,9 @@ msgstr "Statusliste" #: app/views/request/preview.rhtml:45 msgid "Tags:" -msgstr "Links" +msgstr "Links:" -#: app/controllers/request_game_controller.rb:50 +#: app/controllers/request_game_controller.rb:52 msgid "Thank you for helping us keep the site tidy!" msgstr "" @@ -2344,33 +2632,38 @@ msgstr "" msgid "Thank you for making an annotation!" msgstr "Vielen Dank für Ihre Anmerkung" -#: app/controllers/request_controller.rb:729 +#: app/controllers/request_controller.rb:736 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 "" +"Vielen Dank für Ihre IFG-Anfrage! Ihre Antwort wird unten angezeigt und ein " +"Link zu Ihrer Antwort wurde gesendet an" -#: app/controllers/request_controller.rb:373 +#: app/controllers/request_controller.rb:378 msgid "" "Thank you for updating the status of the request '<a " -"href=\"%s\">{{info_request_title}}</a>'. There are some more requests below " -"for you to classify." +"href=\"{{url}}\">{{info_request_title}}</a>'. There are some more requests " +"below for you to classify." msgstr "" -#: app/controllers/request_controller.rb:376 +#: app/controllers/request_controller.rb:381 msgid "Thank you for updating this request!" -msgstr "" +msgstr "Vielen Dank für die Aktualisierung dieser Anfrage!" -#: app/controllers/user_controller.rb:397 -#: app/controllers/user_controller.rb:413 +#: app/controllers/user_controller.rb:398 +#: app/controllers/user_controller.rb:414 msgid "Thank you for updating your profile photo" -msgstr "" +msgstr "Vielen Dank für die Aktualisierung Ihres Profilbildes" #: app/views/request_game/play.rhtml:42 msgid "" "Thanks for helping - your work will make it easier for everyone to find successful\n" "responses, and maybe even let us make league tables..." msgstr "" +"Vielen Dank für die Hilfe - Ihre Arbeit wird es für jeden leichter machen " +"erfolgreiche Antworten zu finden und es uns eventuell sogar ermöglichen " +"Ranglisten zu erstellen..." #: app/views/user/show.rhtml:20 msgid "" @@ -2386,30 +2679,35 @@ msgid "" " requests." msgstr "" -#: app/controllers/user_controller.rb:188 +#: app/controllers/user_controller.rb:189 msgid "" "That doesn't look like a valid email address. Please check you have typed it" " correctly." msgstr "" +"Dies sieht nicht nach einer gültigen Emailadresse aus. Bitte überprüfen Sie " +"Ihre Eingabe. " #: app/views/request/_describe_state.rhtml:47 #: app/views/request/_other_describe_state.rhtml:43 msgid "The <strong>review has finished</strong> and overall:" -msgstr "" +msgstr "Die <strong>Prüfung wurde abgeschlossen</strong> und insgesamt:" #: app/views/request/new.rhtml:62 msgid "The Freedom of Information Act <strong>does not apply</strong> to" -msgstr "" +msgstr "Das Informationsfreiheitsgesetz <strong>trifft nicht zu</strong> auf" -#: app/views/user_mailer/changeemail_already_used.rhtml:7 +#: app/views/user_mailer/changeemail_already_used.rhtml:8 msgid "The accounts have been left as they previously were." -msgstr "" +msgstr "Die Nutzerkonten wurden in Ihrem ursprünglichen Zustand belassen." #: app/views/request/_other_describe_state.rhtml:48 msgid "" "The authority do <strong>not have</strong> the information <small>(maybe " "they say who does)" msgstr "" +"Die Informationen <strong>liegen der Behörde nicht vor</strong> the " +"information <small>(vielleicht können sie Ihnen mitteilen von wem Sie die " +"Informationen erhalten können)" #: app/views/request/show_response.rhtml:28 msgid "" @@ -2423,12 +2721,16 @@ 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 "" +"Die Behörde gibt an, dass sie für eine gültige IFG-Anfrage eine " +"<strong>Postanschrift</strong>, nicht nur eine Emailadresse, benötigt." -#: app/views/request/show.rhtml:102 +#: app/views/request/show.rhtml:109 msgid "" "The authority would like to / has <strong>responded by post</strong> to this" " request." msgstr "" +"Dhe Behörde würde gerne / hat <strong>postalisch</strong> auf diese Anfrage " +"reagiert." #: app/views/request_mailer/stopped_responses.rhtml:1 msgid "" @@ -2436,6 +2738,9 @@ msgid "" "{{user}} to reply to an {{law_used_short}}\n" "request has not been delivered." msgstr "" +"Ihre im Namen von {{public_body}} an\n" +"{{user}} gesendete Anfrage, um auf {{law_used_short}}\n" +"zu reagieren, wurde nicht übermittelt." #: app/views/request/show_response.rhtml:22 msgid "" @@ -2448,160 +2753,221 @@ msgstr "" msgid "The page either doesn't exist, or is broken. Things you can try now:" msgstr "Diese Seite existiert nicht oder ist beschädigt. Versuchen Sie:" +#: app/views/general/search.rhtml:143 +msgid "The public authority does not have the information requested" +msgstr "" + +#: app/views/general/search.rhtml:147 +msgid "The public authority would like part of the request explained" +msgstr "" + +#: app/views/general/search.rhtml:148 +msgid "The public authority would like to / has responded by post" +msgstr "" + #: app/views/request/_other_describe_state.rhtml:60 msgid "The request has been <strong>refused</strong>" msgstr "Die Anfrage wurde <strong>abgelehnt</strong>" -#: app/controllers/request_controller.rb:347 +#: app/controllers/request_controller.rb:352 msgid "" "The request has been updated since you originally loaded this page. Please " "check for any new incoming messages below, and try again." msgstr "" -#: app/views/request/show.rhtml:97 +#: app/views/request/show.rhtml:104 msgid "The request is <strong>waiting for clarification</strong>." -msgstr "" +msgstr "<strong>Klärung</strong> der Anfrage wird erwartet." -#: app/views/request/show.rhtml:90 +#: app/views/request/show.rhtml:97 msgid "The request was <strong>partially successful</strong>." msgstr "Ihre Anfrage war <strong>teilweise erfolgreich</strong>." -#: app/views/request/show.rhtml:86 +#: app/views/request/show.rhtml:93 msgid "The request was <strong>refused</strong> by" msgstr "Die Anfrage wurde <strong>abgelehnt</strong> durch" -#: app/views/request/show.rhtml:88 +#: app/views/request/show.rhtml:95 msgid "The request was <strong>successful</strong>." msgstr "Die Anfrage war <strong>erfolgreich</strong>." +#: app/views/general/search.rhtml:144 +msgid "The request was refused by the public authority" +msgstr "" + #: app/views/request/hidden.rhtml:9 msgid "" "The request you have tried to view has been removed. There are\n" "various reasons why we might have done this, sorry we can't be more specific here. Please <a\n" " href=\"%s\">contact us</a> if you have any questions." msgstr "" +"Die von Ihnen ausgewählte Anfrage wurde verweigert. Dies kann unterschiedliche Ursachen haben, welche an dieser Stelle leider nicht näher erläutert werden können. Bitte<a\n" +" href=\"%s\">kontaktieren Sie uns</a> für weitere Fragen. " + +#: app/views/general/search.rhtml:152 +msgid "The requester has abandoned this request for some reason" +msgstr "" -#: app/views/request/_followup.rhtml:35 +#: app/views/request/_followup.rhtml:32 msgid "" "The response to your request has been <strong>delayed</strong>. You can say that, \n" " by law, the authority should normally have responded\n" " <strong>promptly</strong> and" msgstr "" +"Die Beantwortung auf Ihre Anfrage ist verspätet. Nach gesetzlicher " +"Vorschrift sollte die Behörde unverzüglich geantwortet haben und" -#: app/views/request/_followup.rhtml:47 +#: app/views/request/_followup.rhtml:44 msgid "" "The response to your request is <strong>long overdue</strong>. You can say that, by \n" " law, under all circumstances, the authority should have responded\n" " by now" msgstr "" +"The response to your request is <strong>long overdue</strong>. Nach " +"gesetzlicher Vorschrift sollte {{public_body_link}} Ihnen inzwischen unter " +"allen Umständen geantwortet haben. " #: app/views/public_body/show.rhtml:100 msgid "" "The search index is currently offline, so we can't show the Freedom of " "Information requests that have been made to this authority." msgstr "" +"Da die Suchanzeige momentan offline ist, können wir die an diese Behörde " +"gestellten Informationsfreiheitsanfragen gerade leider nicht anzeigen. " #: app/views/user/show.rhtml:141 msgid "" "The search index is currently offline, so we can't show the Freedom of " "Information requests this person has made." msgstr "" +"Da die Suchanzeige momentan offline ist, können wir durch diese Person " +"gestellten Informationsfreiheitsanfragen gerade leider nicht anzeigen. " -#: app/controllers/track_controller.rb:142 +#: app/controllers/track_controller.rb:144 msgid "Then you can cancel the alert." msgstr "" -#: app/controllers/track_controller.rb:172 +#: app/controllers/track_controller.rb:174 msgid "Then you can cancel the alerts." msgstr "" -#: app/controllers/user_controller.rb:248 +#: app/controllers/user_controller.rb:249 msgid "Then you can change your email address used on {{site_name}}" msgstr "" -#: app/controllers/user_controller.rb:202 +#: app/controllers/user_controller.rb:203 msgid "Then you can change your password on {{site_name}}" msgstr "" -#: app/controllers/request_controller.rb:333 +#: app/controllers/request_controller.rb:338 msgid "Then you can classify the FOI response you have got from " msgstr "" -#: app/controllers/request_game_controller.rb:39 +#: app/controllers/request_game_controller.rb:41 msgid "Then you can play the request categorisation game." msgstr "" -#: app/controllers/user_controller.rb:329 +#: app/controllers/user_controller.rb:330 msgid "Then you can send a message to " msgstr "" -#: app/controllers/user_controller.rb:513 +#: app/controllers/user_controller.rb:514 msgid "Then you can sign in to {{site_name}}" msgstr "" -#: app/controllers/request_controller.rb:59 +#: app/controllers/request_controller.rb:61 msgid "Then you can update the status of your request to " msgstr "" -#: app/controllers/request_controller.rb:695 +#: app/controllers/request_controller.rb:702 msgid "Then you can upload an FOI response. " -msgstr "" +msgstr "Dann können Sie eine IFG-Antwort hochladen. " -#: app/controllers/request_controller.rb:538 +#: app/controllers/request_controller.rb:545 msgid "Then you can write follow up message to " msgstr "" -#: app/controllers/request_controller.rb:539 +#: app/controllers/request_controller.rb:546 msgid "Then you can write your reply to " msgstr "" +#: app/models/track_thing.rb:197 +msgid "" +"Then you will be emailed whenever '{{user_name}}' requests something or gets" +" a response." +msgstr "" + +#: app/models/track_thing.rb:213 +msgid "" +"Then you will be emailed whenever a new request or response matches " +"'{{query}}'." +msgstr "" + #: app/models/track_thing.rb:162 msgid "Then you will be emailed whenever an FOI request succeeds." msgstr "" +"Sie werden bei jeder erfolgreichen IFG-Anfrage per Email benachrichtigt. " -#: app/controllers/request_controller.rb:294 -msgid "Then your FOI request to {{public_body_name}} will be sent." +#: app/models/track_thing.rb:146 +msgid "Then you will be emailed whenever anyone makes a new FOI request." +msgstr "" + +#: app/models/track_thing.rb:181 +msgid "" +"Then you will be emailed whenever someone requests something or gets a " +"response from '{{public_body_name}}'." msgstr "" +#: app/controllers/request_controller.rb:299 +msgid "Then your FOI request to {{public_body_name}} will be sent." +msgstr "Dann wird Ihre OFG-Anfrage an {{public_body_name}} gesendet. " + #: app/controllers/comment_controller.rb:56 msgid "Then your annotation to {{info_request_title}} will be posted." -msgstr "" +msgstr "Dann wird Ihr Kommentar zu {{info_request_title}} gesendet." #: app/views/request_mailer/comment_on_alert_plural.rhtml:1 msgid "" "There are {{count}} new annotations on your {{info_request}} request. Follow" " this link to see what they wrote." msgstr "" +"Es gibt {{count}} neue Anmerkungen zu Ihrer {{info_request}} Anfrage. Folgen" +" Sie dem Link, um diese anzusehen. " #: app/views/user/show.rhtml:4 msgid "" "There is <strong>more than one person</strong> who uses this site and has this name. \n" " One of them is shown below, you may mean a different one:" msgstr "" +"Es gibt <strong>mehrere Nutzer</strong> mit diesem Namen. Einer wird unten " +"angezeigt, Sie könnten jedoch einen andere Person meinen:" -#: app/views/request/show.rhtml:106 +#: app/views/request/show.rhtml:113 msgid "" "There was a <strong>delivery error</strong> or similar, which needs fixing " -"by the WhatDoTheyKnow team." +"by the {{site_name}} team." msgstr "" -#: app/controllers/public_body_controller.rb:76 +#: app/controllers/public_body_controller.rb:77 msgid "There was an error with the words you entered, please try again." msgstr "" #: app/views/request/_describe_state.rhtml:38 msgid "They are going to reply <strong>by post</strong>" -msgstr "" +msgstr "Ihnen wird <strong>postalisch</strong> geantwortet werden" #: app/views/request/_describe_state.rhtml:52 msgid "" "They do <strong>not have</strong> the information <small>(maybe they say who" " does)</small>" msgstr "" +"Die Informationen <strong>liegen nicht vor</strong> <small>(vielleicht " +"können sie Ihnen mitteilen von wem Sie die Informationen erhalten " +"können)</small>" #: app/views/user/show.rhtml:83 msgid "They have been given the following explanation:" -msgstr "" +msgstr "Die folgende Erklärung wurde abgegeben:" #: app/views/request_mailer/overdue_alert.rhtml:3 msgid "" @@ -2621,7 +2987,7 @@ msgstr "" #: app/views/request/_after_actions.rhtml:3 msgid "Things to do with this request" -msgstr "" +msgstr "Weitere Möglichkeiten für diese Anfrage" #: app/views/public_body/show.rhtml:59 msgid "This authority no longer exists, so you cannot make a request to it." @@ -2646,12 +3012,15 @@ msgid "" "This is an HTML version of an attachment to the Freedom of Information " "request" msgstr "" +"Dies ist eine HTML Version eines Anhanges der Informationsfreiheitsanfrage" #: app/views/request_mailer/stopped_responses.rhtml:5 msgid "" "This is because {{title}} is an old request that has been\n" "marked to no longer receive responses." msgstr "" +"Die Ursache ist der veraltete Status dieser Anfrage {{title}}, \n" +"welche keine weiteren Antworten erhalten kann." #: app/views/track/_tracking_links.rhtml:9 msgid "" @@ -2669,7 +3038,7 @@ msgstr "" #: app/views/user/show.rhtml:122 msgid "This person has" -msgstr "" +msgstr "Diese Person hat" #: app/views/user/show.rhtml:152 msgid "This person's" @@ -2679,20 +3048,28 @@ msgstr "" msgid "This request <strong>requires administrator attention</strong>" msgstr "" -#: app/views/request/show.rhtml:48 +#: app/views/request/show.rhtml:55 msgid "This request has an <strong>unknown status</strong>." -msgstr "" +msgstr "Diese Anfrage hat einen <strong>unbekannten Status</strong>." -#: app/views/request/show.rhtml:110 +#: app/views/request/show.rhtml:117 msgid "" "This request has been <strong>withdrawn</strong> by the person who made it. \n" " \t There may be an explanation in the correspondence below." msgstr "" +"Diese Anfrage wurde von dem/der Anfrageninhaber/in <strong>zurückgezogen</strong>. \n" +" <span class=\"whitespace other\" title=\"Tab\">»</span> Sie können evt. eine Begründung im unten angefügten Kommunikationsverlauf finden." -#: app/views/request/show.rhtml:108 +#: app/models/info_request.rb:395 +msgid "" +"This request has been set by an administrator to \"allow new responses from " +"nobody\"" +msgstr "" + +#: app/views/request/show.rhtml:115 msgid "" "This request has had an unusual response, and <strong>requires " -"attention</strong> from the WhatDoTheyKnow team." +"attention</strong> from the {{site_name}} team." msgstr "" #: app/views/request/show.rhtml:5 @@ -2724,34 +3101,46 @@ msgstr "" #: app/views/request/details.rhtml:6 msgid "" "This table shows the technical details of the internal events that happened\n" -"to this request on WhatDoTheyKnow. This could be used to generate information about\n" +"to this request on {{site_name}}. This could be used to generate information about\n" "the speed with which authorities respond to requests, the number of requests\n" "which require a postal response and much more." msgstr "" #: app/views/user/show.rhtml:79 -msgid "This user has been banned from WhatDoTheyKnow.com " -msgstr "Dieser Nutzer wurde von AskTheEU.org verweigert." +msgid "This user has been banned from {{site_name}} " +msgstr "" -#: app/views/user_mailer/changeemail_already_used.rhtml:4 +#: app/views/user_mailer/changeemail_already_used.rhtml:5 msgid "" "This was not possible because there is already an account using \n" -"the email address " +"the email address {{email}}." +msgstr "" + +#: app/models/track_thing.rb:145 +msgid "To be emailed about any new requests" msgstr "" -"Dieser Vorgang kann nicht ausgeführt werden, da bereits ein Benutzerkonto " -"mit dieser Emailadresse besteht. " #: app/models/track_thing.rb:161 msgid "To be emailed about any successful requests" +msgstr "Um per Email über erfolgreiche Anfragen informiert zu werden" + +#: app/models/track_thing.rb:196 +msgid "To be emailed about requests by '{{user_name}}'" msgstr "" -#: app/controllers/track_controller.rb:171 -msgid "To cancel these alerts" +#: app/models/track_thing.rb:180 +msgid "" +"To be emailed about requests made using {{site_name}} to the public " +"authority '{{public_body_name}}'" msgstr "" -#: app/controllers/track_controller.rb:141 +#: app/controllers/track_controller.rb:173 +msgid "To cancel these alerts" +msgstr "Um diese Benachrichtigungen zu löschen" + +#: app/controllers/track_controller.rb:143 msgid "To cancel this alert" -msgstr "" +msgstr "Um diese Benachrichtigung zu löschen" #: app/views/user/no_cookies.rhtml:5 msgid "" @@ -2761,20 +3150,24 @@ msgstr "" "Um fortzufahren müssen Sie sich anmelden oder ein Benutzerkonto erstellen. " "Leider sind bei diesem Versuch technische Störungen aufgetreten. " -#: app/controllers/user_controller.rb:247 +#: app/controllers/user_controller.rb:248 msgid "To change your email address used on {{site_name}}" msgstr "" -#: app/controllers/request_controller.rb:332 +#: app/controllers/request_controller.rb:337 msgid "To classify the response to this FOI request" msgstr "" #: app/views/request/show_response.rhtml:39 msgid "To do that please send a private email to " -msgstr "" +msgstr "Senden Sie uns hierfür bitte eine private Email" #: app/views/request_mailer/not_clarified_alert.rhtml:2 msgid "To do this, first click on the link below." +msgstr "Klicken Sie hierfür bitte auf den unten angezeigten Link." + +#: app/models/track_thing.rb:212 +msgid "To follow requests and responses matching '{{query}}'" msgstr "" #: app/views/request_mailer/old_unclassified_updated.rhtml:1 @@ -2786,36 +3179,38 @@ msgstr "" #: app/views/request_mailer/new_response_reminder_alert.rhtml:1 msgid "To let us know, follow this link and then select the appropriate box." msgstr "" +"Um uns zu informieren, folgen Sie bitte dem Link und wählen Sie das " +"zutreffende Feld aus. " -#: app/controllers/request_game_controller.rb:38 +#: app/controllers/request_game_controller.rb:40 msgid "To play the request categorisation game" msgstr "" #: app/controllers/comment_controller.rb:55 msgid "To post your annotation" -msgstr "" +msgstr "Um Ihre Anmerkung zu senden" -#: app/controllers/request_controller.rb:536 +#: app/controllers/request_controller.rb:543 msgid "To reply to " msgstr "" -#: app/controllers/request_controller.rb:535 +#: app/controllers/request_controller.rb:542 msgid "To send a follow up message to " msgstr "" -#: app/controllers/user_controller.rb:328 +#: app/controllers/user_controller.rb:329 msgid "To send a message to " msgstr "" -#: app/controllers/request_controller.rb:293 +#: app/controllers/request_controller.rb:298 msgid "To send your FOI request" -msgstr "" +msgstr "Um Ihre IFG-Anfrage zu senden" -#: app/controllers/request_controller.rb:58 +#: app/controllers/request_controller.rb:60 msgid "To update the status of this FOI request" -msgstr "" +msgstr "Um den Status dieser IFG-Anfrage zu aktualisieren" -#: app/controllers/request_controller.rb:694 +#: app/controllers/request_controller.rb:701 msgid "" "To upload a response, you must be logged in using an email address from " msgstr "" @@ -2829,32 +3224,45 @@ msgstr "" #: app/views/request_mailer/new_response.rhtml:5 msgid "To view the response, click on the link below." msgstr "" +"Um die Antwort zu lesen, klicken Sie bitte auf den unten angezeigten Link. " #: app/views/request/_request_listing_short_via_event.rhtml:9 msgid "To {{public_body_link_absolute}}" msgstr "An {{public_body_link_absolute}}" -#: app/views/request/preview.rhtml:17 #: app/views/request/followup_preview.rhtml:22 app/views/request/new.rhtml:88 +#: app/views/request/preview.rhtml:17 msgid "To:" msgstr "An:" #: app/models/track_thing.rb:174 msgid "Track requests to {{public_body_name}} by email" +msgstr "An {{public_body_name}} gestellte Anfragen via Email verfolgen" + +#: app/models/track_thing.rb:206 +msgid "Track things matching '{{query}}' by email" msgstr "" #: app/views/public_body/show.rhtml:3 msgid "Track this authority" -msgstr "" +msgstr "Diese Behörde beobachten" #: app/views/user/show.rhtml:29 msgid "Track this person" msgstr "Dieser Person folgen " +#: app/models/track_thing.rb:190 +msgid "Track this person by email" +msgstr "" + #: app/views/request/_sidebar.rhtml:2 msgid "Track this request" msgstr "Diese Anfrage verfolgen" +#: app/models/track_thing.rb:123 +msgid "Track this request by email" +msgstr "" + #: locale/model_attributes.rb:33 msgid "TrackThing|Track medium" msgstr "" @@ -2872,30 +3280,32 @@ 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 "" +"Geben Sie <strong><code>01/01/2008..14/01/2008</code></strong> ein, um " +"ausschliesslich Vorgänge aus diesem Zeitraum anzuzeigen." #: app/models/public_body.rb:37 msgid "URL name can't be blank" msgstr "URL muss angegeben werden" #: app/models/user_mailer.rb:45 -msgid "Unable to change email address on WhatDoTheyKnow.com" +msgid "Unable to change email address on {{site_name}}" msgstr "" #: app/views/request/followup_bad.rhtml:4 msgid "Unable to send a reply to {{username}}" -msgstr "" +msgstr "Antwort an {{username}} kann nicht gesendet werden" #: app/views/request/followup_bad.rhtml:2 msgid "Unable to send follow up message to {{username}}" -msgstr "" +msgstr "Follow-Up Nachricht an {{username}} kann nicht gesendet werden" #: app/views/request/list.rhtml:29 msgid "Unexpected search result type" -msgstr "" +msgstr "Unerwartetes Suchergebnis" #: app/views/request/similar.rhtml:18 msgid "Unexpected search result type " -msgstr "" +msgstr "Unerwartetes Suchergebnis" #: app/views/user/wrong_user_unknown_email.rhtml:3 msgid "" @@ -2903,31 +3313,35 @@ msgid "" "email address for that authority, so we can't validate this.\n" "Please <a href=\"%s\">contact us</a> to sort it out." msgstr "" +"Leider ist uns die IFG-Emailadresse dieser Behörde nicht bekannt, somit können wir dies nicht bestätigen.\n" +"Bitte <a href=\"%s\">kontaktieren Sie uns</a> zur Klärung der Angelegenheit." #: app/views/request/new_bad_contact.rhtml:5 msgid "" "Unfortunately, we do not have a working {{info_request_law_used_full}}\n" "address for" msgstr "" +"Wir haben leider keine funktionierende Email-Adresse für " +"{{info_request_law_used_full}}" #: app/views/general/exception_caught.rhtml:17 msgid "Unknown" msgstr "Unbekannt" -#: app/models/info_request_event.rb:312 +#: app/models/info_request_event.rb:317 msgid "Unusual response" -msgstr "" +msgstr "Ungewöhnliche Antwort" -#: app/models/info_request.rb:800 +#: app/models/info_request.rb:807 msgid "Unusual response." -msgstr "" +msgstr "Ungewöhnliche Antwort." #: app/views/request/_after_actions.rhtml:13 #: app/views/request/_after_actions.rhtml:33 msgid "Update the status of this request" msgstr "Status der Anfrage aktualisieren" -#: app/controllers/request_controller.rb:60 +#: app/controllers/request_controller.rb:62 msgid "Update the status of your request to " msgstr "" @@ -2942,68 +3356,70 @@ msgid "" "Use quotes when you want to find an exact phrase, e.g. " "<strong><code>\"Liverpool City Council\"</code></strong>" msgstr "" +"Verwenden Sie Anführungszeichen, e.g. <strong><code>\"Europäischer " +"Bürgerbeauftragter\"</code></strong>" -#: locale/model_attributes.rb:68 +#: locale/model_attributes.rb:67 msgid "UserInfoRequestSentAlert|Alert type" msgstr "" -#: locale/model_attributes.rb:79 +#: locale/model_attributes.rb:78 msgid "User|About me" msgstr "BenutzerIÜber mich" -#: locale/model_attributes.rb:77 +#: locale/model_attributes.rb:76 msgid "User|Admin level" msgstr "" -#: locale/model_attributes.rb:78 +#: locale/model_attributes.rb:77 msgid "User|Ban text" msgstr "" -#: locale/model_attributes.rb:70 +#: locale/model_attributes.rb:69 msgid "User|Email" msgstr "BenutzerIEmail" -#: locale/model_attributes.rb:74 +#: locale/model_attributes.rb:73 msgid "User|Email confirmed" msgstr "UserIEmail bestätigt" -#: locale/model_attributes.rb:72 +#: locale/model_attributes.rb:71 msgid "User|Hashed password" msgstr "" -#: locale/model_attributes.rb:76 +#: locale/model_attributes.rb:75 msgid "User|Last daily track email" msgstr "" -#: locale/model_attributes.rb:71 +#: locale/model_attributes.rb:70 msgid "User|Name" msgstr "BenutzerIName" -#: locale/model_attributes.rb:73 +#: locale/model_attributes.rb:72 msgid "User|Salt" msgstr "" -#: locale/model_attributes.rb:75 +#: locale/model_attributes.rb:74 msgid "User|Url name" -msgstr "" +msgstr "Benutzer|URL Name" #: app/views/public_body/show.rhtml:21 msgid "View FOI email address" -msgstr "" +msgstr "IFG-emailadressen ansehen" #: app/views/public_body/view_email_captcha.rhtml:1 msgid "View FOI email address for '{{public_body_name}}'" -msgstr "" +msgstr "IFG-Emailadresse für {{public_body}} ansehen" #: app/views/public_body/view_email_captcha.rhtml:3 msgid "View FOI email address for {{public_body_name}}" -msgstr "" +msgstr "IFG-Emailadresse für {{public_body}} ansehen" #: app/views/contact_mailer/user_message.rhtml:10 -msgid "View Freedom of Information requests made by" +msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "" -#: app/views/layouts/default.rhtml:108 +#: app/views/layouts/default.rhtml:89 msgid "View authorities" msgstr "Behörden ansehen" @@ -3011,35 +3427,49 @@ msgstr "Behörden ansehen" msgid "View email" msgstr "Email ansehen" -#: app/views/layouts/default.rhtml:107 +#: app/views/layouts/default.rhtml:88 msgid "View requests" msgstr "Anfragen ansehen" -#: app/models/info_request.rb:792 +#: app/models/info_request.rb:799 msgid "Waiting clarification." -msgstr "" +msgstr "Klärung wird erwartet. " -#: app/views/request/show.rhtml:104 +#: app/views/request/show.rhtml:111 msgid "" "Waiting for an <strong>internal review</strong> by {{public_body_link}} of " "their handling of this request." msgstr "" +#: app/views/general/search.rhtml:149 +msgid "" +"Waiting for the public authority to complete an internal review of their " +"handling of the request" +msgstr "" + +#: app/views/general/search.rhtml:142 +msgid "Waiting for the public authority to reply" +msgstr "" + #: app/views/public_body/view_email.rhtml:17 msgid "We do not have a working request email address for this authority." msgstr "" +"Für diese Behörde ist keine funktionierende Emailadresse zur " +"Anfragenstellung verfügbar. " #: app/views/request/followup_bad.rhtml:24 msgid "" "We do not have a working {{law_used_full}} address for {{public_body_name}}." msgstr "" +"Wir haben keine funktionierende {{law_used_full}} Adresse für " +"{{public_body_name}}." #: app/views/request/_describe_state.rhtml:107 msgid "" "We don't know whether the most recent response to this request contains\n" " information or not\n" " –\n" -"\tif you are {{user_link}} please <a href=\"%s\">sign in</a> and let everyone know." +"\tif you are {{user_link}} please <a href=\"{{url}}\">sign in</a> and let everyone know." msgstr "" #: app/views/user_mailer/confirm_login.rhtml:8 @@ -3048,17 +3478,19 @@ msgid "" "or the law tell us to." msgstr "" -#: app/views/user_mailer/changeemail_confirm.rhtml:9 +#: app/views/user_mailer/changeemail_confirm.rhtml:10 msgid "" "We will not reveal your email addresses to anybody unless you\n" "or the law tell us to." msgstr "" +"Ohne Ihre Zustimmung oder gesetzliche Vorschrift werden wir Ihre Email-" +"Adresse zu keinem Zeitpunkt veröffentlichen." -#: app/views/request/show.rhtml:54 +#: app/views/request/show.rhtml:61 msgid "We're waiting for" msgstr "" -#: app/views/request/show.rhtml:50 +#: app/views/request/show.rhtml:57 msgid "We're waiting for someone to read" msgstr "" @@ -3086,19 +3518,13 @@ msgstr "" "Wir haben Ihnen eine Email gesendet. Klicken Sie den darin angezeigten Link," " um Ihr Passwort zu ändern. " -#: app/views/request/_followup.rhtml:61 +#: app/views/request/_followup.rhtml:58 msgid "What are you doing?" -msgstr "" +msgstr "Was machen Sie?" #: app/views/request/_describe_state.rhtml:4 msgid "What best describes the status of this request now?" -msgstr "" - -#: app/views/public_body/view_email.rhtml:7 -msgid "" -"WhatDoTheyKnow sends new requests to <strong>{{request_email}}</strong> for " -"this authority." -msgstr "" +msgstr "Was ist die beste Beschreibung für diese Anfrage?" #: app/views/request_mailer/new_response.rhtml:9 msgid "" @@ -3111,6 +3537,8 @@ msgid "" "When you receive the paper response, please help\n" " others find out what it says:" msgstr "" +"Wenn Sie die gedruckte Antwort erhalten, machen Sie den Inhalt bitte für " +"andere Nutzer zugänglich" #: app/views/request/new_please_describe.rhtml:16 msgid "" @@ -3120,30 +3548,30 @@ msgstr "" #: app/views/request/show_response.rhtml:13 msgid "Which of these is happening?" -msgstr "" +msgstr "Welcher dieser Aspekte ist zutreffend?" -#: app/models/info_request_event.rb:308 +#: app/models/info_request_event.rb:313 msgid "Withdrawn by requester" -msgstr "" +msgstr "Von Antragsteller zurückgezogen" -#: app/models/info_request.rb:802 +#: app/models/info_request.rb:809 msgid "Withdrawn by the requester." -msgstr "" +msgstr "Vom Antragsteller zurückgezogen" -#: app/controllers/request_controller.rb:542 +#: app/controllers/request_controller.rb:549 msgid "Write a reply to " msgstr "Antwort senden" -#: app/controllers/request_controller.rb:541 +#: app/controllers/request_controller.rb:548 msgid "Write your FOI follow up message to " -msgstr "" +msgstr "Senden Sie Ihre Follow-Up Nachricht an " #: app/views/request/new.rhtml:46 msgid "Write your request in <strong>simple, precise language</strong>." msgstr "" "Formulieren Sie Ihre Anfrage in <strong>schlicht und präzise </strong>." -#: app/models/info_request_event.rb:296 +#: app/models/info_request_event.rb:301 msgid "Wrong Response" msgstr "Falsche Antwort" @@ -3151,49 +3579,72 @@ msgstr "Falsche Antwort" msgid "You" msgstr "" -#: app/controllers/track_controller.rb:96 +#: app/controllers/track_controller.rb:98 msgid "You are already being emailed updates about " +msgstr "Sie erhielten bereits Aktualisierungen zu" + +#: app/models/track_thing.rb:175 +msgid "You are already tracking requests to {{public_body_name}} by email" +msgstr "" + +#: app/models/track_thing.rb:207 +msgid "You are already tracking things matching '{{query}}' by email" +msgstr "" + +#: app/models/track_thing.rb:191 +msgid "You are already tracking this person by email" +msgstr "" + +#: app/models/track_thing.rb:124 +msgid "You are already tracking this request by email" msgstr "" #: app/models/track_thing.rb:156 msgid "You are being emailed about any new successful responses" +msgstr "Sie werden per Email über neue erfolgreiche Antworten informiert " + +#: app/models/track_thing.rb:140 +msgid "You are being emailed when there are new requests" msgstr "" -#: app/views/request/show.rhtml:81 +#: app/views/request/show.rhtml:88 msgid "You can <strong>complain</strong> by" -msgstr "" +msgstr "Sie können sich <strong>beschweren</strong>, indem sie" -#: app/views/request/details.rhtml:57 +#: app/views/request/details.rhtml:58 msgid "" "You can get this page in computer-readable format as part of the main JSON\n" -"page for the request. See the <a href=\"%s\">API documentation</a>." +"page for the request. See the <a href=\"{{api_path}}\">API documentation</a>." msgstr "" #: app/views/public_body/show.rhtml:40 msgid "" "You can only request information about the environment from this authority." msgstr "" +"Umweltanfragen können ausschliesslich über diese Behörde gestellt werden. " #: app/views/user/show.rhtml:122 msgid "You have" -msgstr "" +msgstr "Sie haben" #: app/views/request_mailer/new_response.rhtml:1 msgid "You have a new response to the {{law_used_full}} request " msgstr "" "Sie haben eine neue Antwort auf die Anfrage {{law_used_full}} erhalten " -#: app/controllers/user_controller.rb:491 +#: app/controllers/user_controller.rb:492 msgid "You have now changed the text about you on your profile." -msgstr "" +msgstr "Sie haben den Text zu Ihrer Person in Ihrem Profil nun geändert. " -#: app/controllers/user_controller.rb:309 +#: app/controllers/user_controller.rb:310 msgid "You have now changed your email address used on {{site_name}}" msgstr "" +"Sie haben die aud der Seite {{site_name}} verwendete Email-Adresse nun " +"geändert" #: app/views/user_mailer/already_registered.rhtml:3 msgid "" -"You just tried to sign up to WhatDoTheyKnow.com, when you\n" +"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" @@ -3211,6 +3662,9 @@ 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 "" +"Vielleicht möchten Sie <strong>Dateien anhängen</strong>. Falls Sie eine " +"Datei anhängen möchten, welche für die Emailübertragung zu groß sind, " +"verwenden Sie das untenstehende Formular. " #: app/views/request/followup_bad.rhtml:24 msgid "" @@ -3218,6 +3672,9 @@ msgid "" " 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 "" +"Es ist mögliche eine auf deren Internetseite zu finden oder sie telefonisch " +"zu erfragen. Sollten Sie sie herausfinden, <a href=\"%s\">senden sie sie uns" +" bitte zu</a>." #: app/views/request/new_bad_contact.rhtml:6 msgid "" @@ -3225,23 +3682,27 @@ msgid "" "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 "" +"Es ist mögliche eine auf deren Internetseite zu finden oder sie telefonisch " +"zu erfragen. Sollten Sie sie herausfinden, <a href=\"%s\">senden sie sie uns" +" bitte zu</a>." -#: app/controllers/user_controller.rb:469 +#: app/controllers/user_controller.rb:470 msgid "You need to be logged in to change the text about you on your profile." msgstr "Sie müssen angemeldet sein, um Ihren Profiltext zu ändern. " -#: app/controllers/user_controller.rb:370 +#: app/controllers/user_controller.rb:371 msgid "You need to be logged in to change your profile photo." msgstr "Sie müssen angemeldet sein, um Ihren Profilbild zu ändern. " -#: app/controllers/user_controller.rb:432 +#: app/controllers/user_controller.rb:433 msgid "You need to be logged in to clear your profile photo." msgstr "Sie müssen angemeldet sein, um Ihren Profilbild zu löschen." -#: app/controllers/request_controller.rb:552 +#: app/controllers/request_controller.rb:559 msgid "" "You previously submitted that exact follow up message for this request." msgstr "" +"Sie haben kürzlich dieselbe Follow-up Nachricht für diese Anfrage gesendet. " #: app/views/request/upload_response.rhtml:13 msgid "" @@ -3263,15 +3724,15 @@ msgid "" "email alerts." msgstr "" -#: app/controllers/track_controller.rb:152 +#: app/controllers/track_controller.rb:154 msgid "You will no longer be emailed updates about " -msgstr "" +msgstr "Sie erhalten keinen weiteren Aktualisierungen über" -#: app/controllers/track_controller.rb:181 +#: app/controllers/track_controller.rb:183 msgid "You will no longer be emailed updates for those alerts" -msgstr "" +msgstr "Sie werden keine weiteren Aktualisierungen zu diesen Alerts erhalten" -#: app/controllers/track_controller.rb:109 +#: app/controllers/track_controller.rb:111 msgid "You will now be emailed updates about " msgstr "" @@ -3281,9 +3742,9 @@ msgid "" "with the clarification." msgstr "" -#: app/controllers/user_controller.rb:441 +#: app/controllers/user_controller.rb:442 msgid "You've now cleared your profile photo" -msgstr "" +msgstr "Sie haben Ihr Profilbild nun gelöscht" #: app/views/user/show.rhtml:152 msgid "Your " @@ -3304,9 +3765,8 @@ msgid "" "message, which will then go directly to the person who wrote the message." msgstr "" -#: app/views/user/_signin.rhtml:11 +#: app/views/user/_signin.rhtml:11 app/views/user/_signup.rhtml:9 #: app/views/user/signchangepassword_send_confirm.rhtml:13 -#: app/views/user/_signup.rhtml:9 msgid "Your e-mail:" msgstr "Ihre Email:" @@ -3314,28 +3774,30 @@ msgstr "Ihre Email:" msgid "Your email subscriptions" msgstr "" -#: app/controllers/request_controller.rb:549 +#: app/controllers/request_controller.rb:556 msgid "" "Your follow up has not been sent because this request has been stopped to " "prevent spam. Please <a href=\"%s\">contact us</a> if you really want to " "send a follow up message." msgstr "" -#: app/controllers/request_controller.rb:577 +#: app/controllers/request_controller.rb:584 msgid "Your follow up message has been sent on its way." -msgstr "" +msgstr "Ihre Follow-up Nachricht wurde gesendet." -#: app/controllers/request_controller.rb:575 +#: app/controllers/request_controller.rb:582 msgid "Your internal review request has been sent on its way." -msgstr "" +msgstr "Ihre Anfrage zur internen Überprüfung wurde gesendet. " -#: app/controllers/help_controller.rb:61 +#: app/controllers/help_controller.rb:63 msgid "" "Your message has been sent. Thank you for getting in touch! We'll get back " "to you soon." msgstr "" +"Ihre Nachricht wurde gesendet. Vielen Dank für die Kontaktaufnahme! Wir " +"werden uns in Kürze mit Ihnen in Verbindung senden. " -#: app/controllers/user_controller.rb:348 +#: app/controllers/user_controller.rb:349 msgid "Your message to {{recipient_user_name}} has been sent!" msgstr "Ihre Nachricht an {{recipient_user_name}} wurde versendet!" @@ -3367,7 +3829,7 @@ msgstr "Ihr Name:" msgid "Your original message is attached." msgstr "Ihre ursprüngliche Nachricht befindet sich im Anhang. " -#: app/controllers/user_controller.rb:230 +#: app/controllers/user_controller.rb:231 msgid "Your password has been changed." msgstr "Ihr Passwort wurde geändert." @@ -3378,7 +3840,7 @@ msgstr "Ihr Passwort:" #: app/views/user/set_draft_profile_photo.rhtml:18 msgid "" "Your photo will be shown in public <strong>on the Internet</strong>, \n" -" wherever you do something on WhatDoTheyKnow." +" wherever you do something on {{site_name}}." msgstr "" #: app/views/request_mailer/new_response_reminder_alert.rhtml:5 @@ -3386,6 +3848,9 @@ msgid "" "Your request was called {{info_request}}. Letting everyone know whether you " "got the information will help us keep tabs on" msgstr "" +"Ihre Anfrage hat den folgenden Titel: {{info_request}}. Bitte informieren " +"Sie uns, ob Sie die gewünschte Information erhalten. Dies hilft uns die " +"Seite aktuell zu halten." #: app/views/request/new.rhtml:109 msgid "Your request:" @@ -3396,20 +3861,26 @@ msgid "" "Your response will <strong>appear on the Internet</strong>, <a " "href=\"%s\">read why</a> and answers to other questions." msgstr "" +"Ihre Antwort, sowie Antworten auf andere Anfragen wierden <strong>im " +"Internet erscheinen</strong>, <a href=\"%s\">Lesen Sie warum</a>" #: app/views/comment/new.rhtml:62 msgid "" -"Your thoughts on what the WhatDoTheyKnow <strong>administrators</strong> " +"Your thoughts on what the {{site_name}} <strong>administrators</strong> " "should do about the request." msgstr "" +#: app/models/track_mailer.rb:25 +msgid "Your {{site_name}} email alert" +msgstr "" + #: app/models/outgoing_message.rb:69 msgid "Yours faithfully," msgstr "Mit freundlichem Gruß, " #: app/models/outgoing_message.rb:67 msgid "Yours sincerely," -msgstr "" +msgstr "Mit freundlichem Gruß, " #: app/views/request/new.rhtml:97 msgid "" @@ -3425,25 +3896,25 @@ msgstr "Administration" #: app/views/public_body/show.rhtml:29 msgid "also called {{public_body_short_name}}" -msgstr "" +msgstr "auch genannt: {{public_body_short_name}}" #: app/views/user/wrong_user.rhtml:5 msgid "and sign in as " msgstr "und melden Sie sich an als" -#: app/views/request/show.rhtml:52 +#: app/views/request/show.rhtml:59 msgid "" "and update the status accordingly. Perhaps <strong>you</strong> might like " "to help out by doing that?" msgstr "" -#: app/views/request/show.rhtml:57 +#: app/views/request/show.rhtml:64 msgid "and update the status." msgstr "und aktualisieren Sie den Status. " #: app/views/request/_describe_state.rhtml:101 msgid "and we'll suggest <strong>what to do next</strong>" -msgstr "" +msgstr "und wir werden <strong>nächstmögliche Schritte</strong> vorschlagen" #: app/views/user/show.rhtml:153 msgid "annotation" @@ -3453,21 +3924,29 @@ msgstr "Anmerkung" msgid "annotations" msgstr "Anmerkungen" +#: app/models/track_thing.rb:138 +msgid "any <a href=\"/list\">new requests</a>" +msgstr "" + +#: app/models/track_thing.rb:154 +msgid "any <a href=\"/list/successful\">successful requests</a>" +msgstr "" + #: app/views/request_mailer/very_overdue_alert.rhtml:1 msgid "are long overdue." msgstr "sind lange überfällig. " -#: app/controllers/public_body_controller.rb:109 +#: app/controllers/public_body_controller.rb:111 msgid "beginning with" msgstr "" -#: app/views/request/show.rhtml:75 +#: app/views/request/show.rhtml:82 msgid "by" msgstr "von" -#: app/views/request/_followup.rhtml:41 +#: app/views/request/_followup.rhtml:38 msgid "by <strong>{{date}}</strong>" -msgstr "" +msgstr "bis zum <strong>{{date}}</strong>" #: app/views/request/_request_listing_via_event.rhtml:34 msgid "by {{public_body_name}} to {{info_request_user}} on {{date}}." @@ -3475,13 +3954,13 @@ msgstr "von {{public_body_name}} an {{info_request_user}} am {{date}}." #: app/views/request/_request_listing_short_via_event.rhtml:10 msgid "by {{user_link_absolute}}" -msgstr "" +msgstr "durch {{user_link_absolute}}" -#: locale/model_attributes.rb:42 +#: locale/model_attributes.rb:35 msgid "censor rule" msgstr "" -#: locale/model_attributes.rb:26 +#: locale/model_attributes.rb:20 msgid "comment" msgstr "Kommentar" @@ -3491,7 +3970,7 @@ msgid "" " Or you could phone them." msgstr "" -#: app/models/info_request_event.rb:333 +#: app/models/info_request_event.rb:338 msgid "display_status only works for incoming and outgoing messages right now" msgstr "" @@ -3505,7 +3984,7 @@ msgstr "z.B." #: app/views/user/show.rhtml:96 msgid "edit text about you" -msgstr "" +msgstr "Bearbeiten Sie den Infotext zu Ihrer Person" #: app/views/user/show.rhtml:171 msgid "email subscription" @@ -3515,11 +3994,11 @@ msgstr "Anleitung mailen" msgid "even during holidays" msgstr "" -#: locale/model_attributes.rb:14 +#: locale/model_attributes.rb:17 msgid "exim log" msgstr "" -#: locale/model_attributes.rb:60 +#: locale/model_attributes.rb:59 msgid "exim log done" msgstr "" @@ -3531,39 +4010,39 @@ msgstr "" msgid "have delayed." msgstr "" -#: locale/model_attributes.rb:57 +#: locale/model_attributes.rb:56 msgid "holiday" msgstr "" -#: app/views/request/_followup.rhtml:39 app/views/request/show.rhtml:63 -#: app/views/request/show.rhtml:73 +#: app/views/request/_followup.rhtml:36 app/views/request/show.rhtml:70 +#: app/views/request/show.rhtml:80 msgid "in term time" msgstr "" #: app/views/public_body/list.rhtml:42 msgid "in total" -msgstr "" +msgstr "vollständig" -#: locale/model_attributes.rb:63 +#: locale/model_attributes.rb:62 msgid "incoming message" msgstr "Eingehende Nachricht" -#: locale/model_attributes.rb:80 +#: locale/model_attributes.rb:79 msgid "info request" msgstr "Informationsanfrage" -#: locale/model_attributes.rb:35 +#: locale/model_attributes.rb:40 msgid "info request event" -msgstr "" +msgstr "Verlauf Informationsanfrage" #: app/views/user/set_profile_about_me.rhtml:3 #: app/views/user/signchangeemail.rhtml:3 msgid "internal error" msgstr "interner Fehler" -#: app/views/request/show.rhtml:93 +#: app/views/request/show.rhtml:100 msgid "is <strong>waiting for your clarification</strong>." -msgstr "" +msgstr "<strong>Ihre Erläuterung wird erwartet</strong>." #: app/views/user/show.rhtml:71 msgid "just to see how it works" @@ -3571,14 +4050,14 @@ msgstr "" #: app/views/comment/_single_comment.rhtml:10 msgid "left an annotation" -msgstr "" +msgstr "Anmerkung hinterlassen" #: app/views/user/_user_listing_single.rhtml:19 #: app/views/user/_user_listing_single.rhtml:20 msgid "made." msgstr "" -#: app/views/request/show.rhtml:67 +#: app/views/request/show.rhtml:74 msgid "no later than" msgstr "nicht später als" @@ -3590,7 +4069,7 @@ msgid "" " an email which will go to the right place, please <a href=\"%s\">send it to us</a>." msgstr "" -#: app/views/request/show.rhtml:65 +#: app/views/request/show.rhtml:72 msgid "normally" msgstr "normalerweise" @@ -3598,9 +4077,9 @@ msgstr "normalerweise" msgid "only" msgstr "nur" -#: locale/model_attributes.rb:20 +#: locale/model_attributes.rb:25 msgid "outgoing message" -msgstr "" +msgstr "Gesendete Nachricht" #: app/views/user/sign.rhtml:11 msgid "please sign in as " @@ -3610,17 +4089,17 @@ msgstr "Bitte melden Sie sich an als" msgid "please sign in or make a new account." msgstr "Bitte melden Sie sich an oder erstellen Sie ein neues Benutzerkonto." -#: locale/model_attributes.rb:50 +#: locale/model_attributes.rb:49 msgid "post redirect" msgstr "" -#: locale/model_attributes.rb:17 +#: locale/model_attributes.rb:14 msgid "profile photo" msgstr "Profilbild" #: locale/model_attributes.rb:2 msgid "public body" -msgstr "" +msgstr "Behörde" #: locale/model_attributes.rb:47 msgid "raw email" @@ -3630,9 +4109,9 @@ msgstr "" msgid "request." msgstr "Anfrage." -#: app/views/request/show.rhtml:82 +#: app/views/request/show.rhtml:89 msgid "requesting an internal review" -msgstr "" +msgstr "Interne Prüfung beantragen " #: app/views/request_mailer/requires_admin.rhtml:3 msgid "" @@ -3640,15 +4119,16 @@ msgid "" "email to let them know what you are going to do about it." msgstr "" -#: app/views/request/show.rhtml:95 +#: app/views/request/show.rhtml:102 msgid "send a follow up message" msgstr "Nachfrage versenden" #: app/views/request/_request_listing_via_event.rhtml:31 msgid "sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "" +"gesendet an {{public_body_name}} durch {{info_request_user}} am {{date}}." -#: app/views/request/show.rhtml:99 +#: app/views/request/show.rhtml:106 msgid "sign in" msgstr "Anmelden" @@ -3660,34 +4140,27 @@ msgstr "Abmelden" msgid "that you made to" msgstr "" -#: app/views/user_mailer/already_registered.rhtml:11 -#: app/views/user_mailer/confirm_login.rhtml:11 -#: app/views/user_mailer/changeemail_already_used.rhtml:9 -#: app/views/user_mailer/changeemail_confirm.rhtml:12 -#: app/views/request_mailer/stopped_responses.rhtml:16 -#: app/views/request_mailer/not_clarified_alert.rhtml:9 #: app/views/request_mailer/comment_on_alert.rhtml:6 +#: app/views/request_mailer/comment_on_alert_plural.rhtml:5 +#: app/views/request_mailer/new_response.rhtml:15 +#: app/views/request_mailer/new_response_reminder_alert.rhtml:8 +#: app/views/request_mailer/not_clarified_alert.rhtml:9 #: app/views/request_mailer/old_unclassified_updated.rhtml:8 -#: app/views/request_mailer/very_overdue_alert.rhtml:11 #: app/views/request_mailer/overdue_alert.rhtml:9 -#: app/views/request_mailer/new_response_reminder_alert.rhtml:8 -#: app/views/request_mailer/new_response.rhtml:15 -#: app/views/request_mailer/comment_on_alert_plural.rhtml:5 -msgid "the WhatDoTheyKnow team" -msgstr "das Ask The EU team" +#: app/views/request_mailer/stopped_responses.rhtml:16 +#: app/views/request_mailer/very_overdue_alert.rhtml:11 +#: app/views/track_mailer/event_digest.rhtml:66 +#: app/views/user_mailer/already_registered.rhtml:11 +#: app/views/user_mailer/changeemail_already_used.rhtml:10 +#: app/views/user_mailer/changeemail_confirm.rhtml:13 +#: app/views/user_mailer/confirm_login.rhtml:11 +msgid "the {{site_name}} team" +msgstr "" #: app/views/user/show.rhtml:140 msgid "this person" msgstr "diese Person" -#: app/views/user_mailer/changeemail_already_used.rhtml:2 -msgid "to" -msgstr "" - -#: app/views/user_mailer/changeemail_confirm.rhtml:5 -msgid "to " -msgstr "" - #: app/views/user/show.rhtml:113 msgid "" "to change password, \n" @@ -3698,15 +4171,15 @@ msgstr "" msgid "to check that the info isn't already published." msgstr "" -#: app/views/request/show.rhtml:55 +#: app/views/request/show.rhtml:62 msgid "to read" msgstr "" -#: app/views/request/show.rhtml:99 +#: app/views/request/show.rhtml:106 msgid "to send a follow up message." msgstr "" -#: app/views/request/show.rhtml:39 +#: app/views/request/show.rhtml:45 msgid "to {{public_body}}" msgstr "an {{public_body}}" @@ -3726,27 +4199,27 @@ msgstr "" msgid "unknown reason " msgstr "unbekannte Ursache" -#: app/models/info_request.rb:807 app/models/info_request_event.rb:328 +#: app/models/info_request.rb:814 app/models/info_request_event.rb:333 msgid "unknown status " msgstr "unbekannter Status" #: app/views/user/show.rhtml:208 msgid "unsubscribe" -msgstr "" +msgstr "abmelden" #: app/views/user/show.rhtml:180 app/views/user/show.rhtml:194 msgid "unsubscribe all" -msgstr "" +msgstr "alle abbestellen" -#: app/views/request/show.rhtml:46 +#: app/views/request/show.rhtml:53 msgid "useful information." msgstr "nützliche Information" -#: locale/model_attributes.rb:69 +#: locale/model_attributes.rb:68 msgid "user" msgstr "Benutzer" -#: locale/model_attributes.rb:67 +#: locale/model_attributes.rb:66 msgid "user info request sent alert" msgstr "" @@ -3763,7 +4236,7 @@ msgstr "" #: app/views/request/_after_actions.rhtml:20 msgid "{{info_request_user_name}} only:" -msgstr "" +msgstr "{{info_request_user_name}} ausschließlich:" #: app/views/general/frontpage.rhtml:51 msgid "{{length_of_time}} ago" @@ -3771,6 +4244,16 @@ msgstr "vor {{length_of_time}} " #: app/views/request/_after_actions.rhtml:43 msgid "{{public_body_name}} only:" +msgstr "{{public_body_name}} ausschließlich:" + +#: app/views/public_body/view_email.rhtml:7 +msgid "" +"{{site_name}} sends new requests to <strong>{{request_email}}</strong> for " +"this authority." +msgstr "" + +#: app/models/user.rb:122 +msgid "{{user_name}} (Banned)" msgstr "" #: app/views/request_mailer/comment_on_alert.rhtml:1 @@ -3778,8 +4261,21 @@ msgid "" "{{user_name}} has annotated your {{law_used_short}} \n" "request. Follow this link to see what they wrote." msgstr "" +"{{user_name}} hat Ihres {{law_used_short}} \n" +"Anfrage kommentiert. Folgen Sie diesem Link, um die Anmerkung zu sehen." + +#: app/views/contact_mailer/user_message.rhtml:2 +msgid "{{user_name}} has used {{site_name}} to send you the message below." +msgstr "" + +#: app/views/request/show.rhtml:36 +msgid "" +"{{user}} (<a href=\"{{user_admin_url}}\">admin</a>) made this " +"{{law_used_full}} request (<a href=\"{{request_admin_url}}\">admin</a>) to " +"{{public_body_link}} (<a href=\"{{public_body_admin_url}}\">admin</a>)" +msgstr "" -#: app/views/request/show.rhtml:35 +#: app/views/request/show.rhtml:44 msgid "{{user}} made this {{law_used_full}} request" msgstr "{{user}} hat diese {{law_used_full}} Anfrage gestellt" diff --git a/locale/en/app.po b/locale/en/app.po index 9dfc97550..c8693fbd0 100644 --- a/locale/en/app.po +++ b/locale/en/app.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: version 0.0.1\n" -"POT-Creation-Date: 2011-06-01 09:03-0000\n" +"POT-Creation-Date: 2011-08-11 12:30+0200\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" @@ -17,13 +17,21 @@ msgstr "" "Language: \n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" +#: app/models/incoming_message.rb:866 +msgid "" +"\n" +"\n" +"[ {{site_name}} note: The above text was badly encoded, and has had strange " +"characters removed. ]" +msgstr "" + #: app/views/user/set_profile_about_me.rhtml:14 msgid "" -" This will appear on your WhatDoTheyKnow profile, to make it\n" +" This will appear on your {{site_name}} profile, to make it\n" " easier for others to get involved with what you're doing." msgstr "" -#: app/views/comment/_comment_form.rhtml:17 +#: app/views/comment/_comment_form.rhtml:16 msgid "" " (<strong>no ranty</strong> politics, read our <a href=\"%s\">moderation " "policy</a>)" @@ -111,6 +119,14 @@ msgstr "" msgid " What are you investigating using Freedom of Information? " msgstr "" +#: app/controllers/comment_controller.rb:75 +msgid " You are already being emailed updates about the request." +msgstr "" + +#: app/controllers/comment_controller.rb:73 +msgid " You will also be emailed updates about the request." +msgstr "" + #: app/views/request/upload_response.rhtml:5 msgid " made by " msgstr "" @@ -119,26 +135,28 @@ msgstr "" msgid " made no Freedom of Information requests using this site." msgstr "" -#: app/views/track_mailer/event_digest.rhtml:28 -msgid " sent a request to" -msgstr "" - #: app/views/user/contact.rhtml:36 msgid " when you send this message." msgstr "" -#: app/views/public_body/show.rhtml:82 -msgid "%d Freedom of Information request" -msgid_plural "%d Freedom of Information requests" +#: app/views/public_body/show.rhtml:80 +msgid "%d Freedom of Information request made using this site" +msgid_plural "%d Freedom of Information requests made using this site" msgstr[0] "" msgstr[1] "" -#: app/views/general/frontpage.rhtml:35 +#: app/views/general/frontpage.rhtml:36 msgid "%d request" msgid_plural "%d requests" msgstr[0] "" msgstr[1] "" +#: app/views/public_body/_body_listing_single.rhtml:21 +msgid "%d request made." +msgid_plural "%d requests made." +msgstr[0] "" +msgstr[1] "" + #: app/views/request/new.rhtml:102 msgid "'Crime statistics by ward level for Wales'" msgstr "" @@ -147,6 +165,17 @@ msgstr "" msgid "'Pollution levels over time for the River Tyne'" msgstr "" +#: app/controllers/user_controller.rb:355 +msgid "" +",\n" +"\n" +"\n" +"\n" +"Yours,\n" +"\n" +"{{user_name}}" +msgstr "" + #: app/views/request/_after_actions.rhtml:9 msgid "<a href=\"%s\">Add an annotation</a> (to help the requester or others)" msgstr "" @@ -165,25 +194,163 @@ msgstr "" msgid "<a href=\"%s\">Browse all</a> or <a href=\"%s\">ask us to add one</a>." msgstr "" -#: app/views/public_body/show.rhtml:51 -msgid "" -"<a href=\"%s\">Make a new Freedom of Information request</a> to " -"{{public_body_name}}" +#: app/views/general/exception_caught.rhtml:13 +msgid "<a href=\"%s\">Contact us</a> to tell us about the problem</li>" msgstr "" #: app/views/public_body/list.rhtml:43 msgid "<a href=\"%s\">can't find the one you want?</a>" msgstr "" -#: app/views/request/show.rhtml:76 app/views/request/show.rhtml:80 -#: app/views/request/_followup.rhtml:42 app/views/request/_followup.rhtml:49 +#: app/views/request/_followup.rhtml:39 app/views/request/_followup.rhtml:46 +#: app/views/request/show.rhtml:83 app/views/request/show.rhtml:87 msgid "<a href=\"%s\">details</a>" msgstr "" -#: app/views/request/_followup.rhtml:78 +#: app/views/request/_followup.rhtml:74 msgid "<a href=\"%s\">what's that?</a>" msgstr "" +#: app/views/public_body/show.rhtml:50 +msgid "" +"<a href=\"{{url}}\">Make a new Freedom of Information request</a> to " +"{{public_body_name}}" +msgstr "" + +#: app/controllers/request_game_controller.rb:23 +msgid "" +"<p>All done! Thank you very much for your help.</p><p>There are <a href=" +"\"{{helpus_url}}\">more things you can do</a> to help {{site_name}}.</p>" +msgstr "" + +#: app/controllers/request_controller.rb:399 +msgid "" +"<p>Thank you! Here are some ideas on what to do next:</p>\n" +" <ul>\n" +" <li>To send your request to another authority, first copy the " +"text of your request below, then <a href=\"{{find_authority_url}}\">find the " +"other authority</a>.</li>\n" +" <li>If you would like to contest the authority's claim that they " +"do not hold the information, here is \n" +" <a href=\"{{complain_url}}\">how to complain</a>.\n" +" </li>\n" +" <li>We have <a href=\"{{other_means_url}}\">suggestions</a>\n" +" on other means to answer your question.\n" +" </li>\n" +" </ul>" +msgstr "" + +#: app/controllers/request_controller.rb:393 +msgid "" +"<p>Thank you! Hope you don't have to wait much longer.</p> <p>By law, you " +"should have got a response promptly, and normally before the end of <strong>" +"{{date_response_required_by}}</strong>.</p>" +msgstr "" + +#: app/controllers/request_controller.rb:389 +msgid "" +"<p>Thank you! Hopefully your wait isn't too long.</p> <p>By law, you should " +"get a response promptly, and normally before the end of <strong>\n" +"{{date_response_required_by}}</strong>.</p>" +msgstr "" + +#: app/controllers/request_controller.rb:428 +msgid "" +"<p>Thank you! Hopefully your wait isn't too long.</p><p>You should get a " +"response within 20 days, or be told if it will take longer (<a href=" +"\"{{review_url}}\">details</a>).</p>" +msgstr "" + +#: app/controllers/request_controller.rb:431 +msgid "" +"<p>Thank you! We'll look into what happened and try and fix it up.</p><p>If " +"the error was a delivery failure, and you can find an up to date FOI email " +"address for the authority, please tell us using the form below.</p>" +msgstr "" + +#: app/controllers/request_controller.rb:396 +msgid "" +"<p>Thank you! Your request is long overdue, by more than 40 working days. " +"Most requests should be answered within 20 working days. You might like to " +"complain about this, see below.</p>" +msgstr "" + +#: app/controllers/user_controller.rb:495 +msgid "" +"<p>Thanks for changing the text about you on your profile.</p>\n" +" <p><strong>Next...</strong> You can upload a profile photograph " +"too.</p>" +msgstr "" + +#: app/controllers/user_controller.rb:417 +msgid "" +"<p>Thanks for updating your profile photo.</p>\n" +" <p><strong>Next...</strong> You can put some text about you " +"and your research on your profile.</p>" +msgstr "" + +#: app/controllers/request_controller.rb:284 +msgid "" +"<p>We recommend that you edit your request and remove the email address.\n" +" If you leave it, the email address will be sent to the " +"authority, but will not be displayed on the site.</p>" +msgstr "" + +#: app/controllers/request_controller.rb:417 +msgid "" +"<p>We're glad you got all the information that you wanted. If you write " +"about or make use of the information, please come back and add an annotation " +"below saying what you did.</p><p>If you found {{site_name}} useful, <a href=" +"\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p>" +msgstr "" + +#: app/controllers/request_controller.rb:420 +msgid "" +"<p>We're glad you got some of the information that you wanted. If you found " +"{{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to " +"the charity which runs it.</p><p>If you want to try and get the rest of the " +"information, here's what to do now.</p>" +msgstr "" + +#: app/controllers/request_controller.rb:282 +msgid "" +"<p>You do not need to include your email in the request in order to get a " +"reply (<a href=\"%s\">details</a>).</p>" +msgstr "" + +#: app/controllers/request_controller.rb:280 +msgid "" +"<p>You do not need to include your email in the request in order to get a " +"reply, as we will ask for it on the next screen (<a href=\"%s\">details</a>)." +"</p>" +msgstr "" + +#: app/controllers/request_controller.rb:288 +msgid "" +"<p>Your request contains a <strong>postcode</strong>. Unless it directly " +"relates to the subject of your request, please remove any address as it will " +"<strong>appear publicly on the Internet</strong>.</p>" +msgstr "" + +#: app/controllers/request_controller.rb:311 +msgid "" +"<p>Your {{law_used_full}} request has been <strong>sent on its way</strong>!" +"</p>\n" +" <p><strong>We will email you</strong> when there is a response, " +"or after 20 working days if the authority still hasn't\n" +" replied by then.</p>\n" +" <p>If you write about this request (for example in a forum or a " +"blog) please link to this page, and add an \n" +" annotation below telling people about your writing.</p>" +msgstr "" + +#: app/controllers/application_controller.rb:279 +msgid "" +"<p>{{site_name}} is currently in maintenance. You can only view existing " +"requests. You cannot make new ones, add followups or annotations, or " +"otherwise change the database.</p> <p>{{read_only}}</p>" +msgstr "" + #: app/views/user/confirm.rhtml:11 msgid "" "<small>If you use web-based email or have \"junk mail\" filters, also check " @@ -193,50 +360,50 @@ msgid "" "</p>" msgstr "" -#: app/views/request/new.rhtml:135 +#: app/views/request/new.rhtml:131 msgid "" "<strong> Can I request information about myself?</strong>\n" "\t\t\t<a href=\"%s\">No! (Click here for details)</a>" msgstr "" -#: app/views/general/search.rhtml:118 +#: app/views/general/search.rhtml:130 msgid "" "<strong><code>commented_by:tony_bowden</code></strong> to search annotations " "made by Tony Bowden, typing the name as in the URL." msgstr "" -#: app/views/general/search.rhtml:120 +#: app/views/general/search.rhtml:132 msgid "" "<strong><code>filetype:pdf</code></strong> to find all responses with PDF " "attachments. Or try these: <code>{{list_of_file_extensions}}</code>" msgstr "" -#: app/views/general/search.rhtml:119 +#: app/views/general/search.rhtml:131 msgid "" "<strong><code>request:</code></strong> to restrict to a specific request, " "typing the title as in the URL." msgstr "" -#: app/views/general/search.rhtml:117 +#: app/views/general/search.rhtml:129 msgid "" "<strong><code>requested_by:julian_todd</code></strong> to search requests " "made by Julian Todd, typing the name as in the URL." msgstr "" -#: app/views/general/search.rhtml:116 +#: app/views/general/search.rhtml:128 msgid "" "<strong><code>requested_from:home_office</code></strong> to search requests " "from the Home Office, typing the name as in the URL." msgstr "" -#: app/views/general/search.rhtml:114 +#: app/views/general/search.rhtml:126 msgid "" "<strong><code>status:</code></strong> to select based on the status or " -"historical status of the request, see the <a href=\"%s\">table of statuses</" -"a> below." +"historical status of the request, see the <a href=\"{{statuses_url}}\">table " +"of statuses</a> below." msgstr "" -#: app/views/general/search.rhtml:122 +#: 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" @@ -246,13 +413,23 @@ msgid "" "want results them all present." msgstr "" -#: app/views/general/search.rhtml:115 +#: app/views/general/search.rhtml:127 msgid "" "<strong><code>variety:</code></strong> to select type of thing to search " -"for, see the <a href=\"%s\">table of varieties</a> below." +"for, see the <a href=\"{{varieties_url}}\">table of varieties</a> below." msgstr "" -#: app/views/request/_followup.rhtml:83 +#: app/views/comment/new.rhtml:56 +msgid "" +"<strong>Advice</strong> on how to get a response that will satisfy the " +"requester. </li>" +msgstr "" + +#: app/views/request/_other_describe_state.rhtml:56 +msgid "<strong>All the information</strong> has been sent" +msgstr "" + +#: app/views/request/_followup.rhtml:79 msgid "<strong>Anything else</strong>, such as clarifying, prompting, thanking" msgstr "" @@ -260,14 +437,24 @@ 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 WhatDoTheyKnow. How, \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=\"%s\">contact us</a> with questions." +"<a href=\"{{contact_path}}\">contact us</a> with questions." +msgstr "" + +#: app/views/request/_other_describe_state.rhtml:28 +msgid "<strong>Clarification</strong> has been requested" +msgstr "" + +#: app/views/request/_other_describe_state.rhtml:14 +msgid "" +"<strong>No response</strong> has been received\n" +" <small>(maybe there's just an acknowledgement)</small>" msgstr "" #: app/views/user/signchangeemail.rhtml:30 @@ -294,7 +481,7 @@ msgstr "" msgid "" "<strong>Privacy note:</strong> Your photo will be shown in public on the " "Internet, \n" -" wherever you do something on WhatDoTheyKnow." +" wherever you do something on {{site_name}}." msgstr "" #: app/views/request/followup_preview.rhtml:37 @@ -303,7 +490,11 @@ msgid "" " to it, will be displayed publicly on this website." msgstr "" -#: app/views/general/exception_caught.rhtml:18 +#: app/views/request/_other_describe_state.rhtml:52 +msgid "<strong>Some of the information</strong> has been sent " +msgstr "" + +#: app/views/general/exception_caught.rhtml:17 msgid "<strong>Technical details:</strong>" msgstr "" @@ -317,7 +508,7 @@ msgid "" "a> or <strong>search</strong> their web site ..." msgstr "" -#: app/views/request/show.rhtml:84 +#: app/views/request/show.rhtml:91 msgid "<strong>did not have</strong> the information requested." msgstr "" @@ -330,10 +521,30 @@ msgid "" "A <strong>summary</strong> of the response if you have received it by post. " msgstr "" +#: app/views/general/search.rhtml:162 +msgid "A public authority" +msgstr "" + +#: app/views/request/_other_describe_state.rhtml:34 +msgid "A response will be sent <strong>by post</strong>" +msgstr "" + +#: app/views/general/search.rhtml:151 +msgid "A strange reponse, required attention by the {{site_name}} team" +msgstr "" + +#: app/views/general/search.rhtml:163 +msgid "A {{site_name}} user" +msgstr "" + #: app/views/user/set_profile_about_me.rhtml:20 msgid "About you:" msgstr "" +#: app/models/info_request_event.rb:293 +msgid "Acknowledgement" +msgstr "" + #: app/views/request/_sidebar.rhtml:5 msgid "Act on what you've learnt" msgstr "" @@ -348,26 +559,62 @@ msgid "" " a <strong>summary of the response</strong>." msgstr "" +#: app/views/public_body/_body_listing_single.rhtml:26 +msgid "Added on {{date}}" +msgstr "" + #: app/models/user.rb:54 msgid "Admin level is not included in list" msgstr "" -#: app/views/general/search.rhtml:31 app/views/general/search.rhtml:109 +#: app/views/request_mailer/requires_admin.rhtml:9 +msgid "Administration URL:" +msgstr "" + +#: app/views/general/search.rhtml:31 app/views/general/search.rhtml:121 msgid "Advanced search tips" msgstr "" +#: app/views/comment/new.rhtml:52 +msgid "" +"Advise on whether the <strong>refusal is legal</strong>, and how to complain " +"about it if not." +msgstr "" + #: app/views/request/new.rhtml:69 msgid "" "Air, water, soil, land, flora and fauna (including how these effect\n" " human beings)" msgstr "" +#: app/models/info_request_event.rb:309 +msgid "All information sent" +msgstr "" + +#: app/views/general/search.rhtml:146 +msgid "All of the information requested has been received" +msgstr "" + #: app/views/public_body/list.rhtml:5 msgid "Alphabet" msgstr "" -#: app/views/track_mailer/event_digest.rhtml:63 -msgid "Alter your subscription" +#: app/views/public_body/_body_listing_single.rhtml:12 +msgid "Also called {{other_name}}." +msgstr "" + +#: app/views/request_mailer/new_response.rhtml:12 +msgid "" +"Although all responses are automatically published, we depend on\n" +"you, the original requester, to evaluate them." +msgstr "" + +#: app/views/request/_other_describe_state.rhtml:70 +msgid "An <strong>error message</strong> has been received" +msgstr "" + +#: app/views/general/search.rhtml:161 +msgid "Annotation added to request" msgstr "" #: app/views/user/show.rhtml:34 @@ -380,6 +627,12 @@ msgid "" "request. For example:" msgstr "" +#: app/views/comment/new.rhtml:69 +msgid "" +"Annotations will be posted publicly here, and are \n" +" <strong>not</strong> sent to {{public_body_name}}." +msgstr "" + #: app/views/request/_after_actions.rhtml:6 msgid "Anyone:" msgstr "" @@ -401,14 +654,16 @@ msgstr "" msgid "Attachment (optional):" msgstr "" -#: app/views/request/_describe_state.rhtml:70 -msgid "" -"Authority has replied but the response <strong>does not correspond to the " -"request</strong>" +#: app/models/info_request.rb:783 +msgid "Awaiting classification." +msgstr "" + +#: app/models/info_request.rb:803 +msgid "Awaiting internal review." msgstr "" -#: app/views/request/_describe_state.rhtml:43 -msgid "Authority has requested <strong>extension of the deadline.</strong>" +#: app/models/info_request.rb:785 +msgid "Awaiting response." msgstr "" #: app/views/request/new.rhtml:43 @@ -419,17 +674,17 @@ msgstr "" #: app/views/request/new.rhtml:41 msgid "" -"Browse <a href='%s'>other requests</a> to '{{public_body_name}}' for " +"Browse <a href='{{url}}'>other requests</a> to '{{public_body_name}}' for " "examples of how to word your request." msgstr "" -#: app/views/request/show.rhtml:79 +#: app/views/request/show.rhtml:86 msgid "" "By law, under all circumstances, {{public_body_link}} should have responded " "by now" msgstr "" -#: app/views/request/show.rhtml:71 +#: app/views/request/show.rhtml:78 msgid "" "By law, {{public_body_link}} should normally have responded " "<strong>promptly</strong> and" @@ -441,43 +696,55 @@ msgid "" "it</a>." msgstr "" -#: locale/model_attributes.rb:46 +#: app/controllers/track_controller.rb:145 +msgid "Cancel a {{site_name}} alert" +msgstr "" + +#: app/controllers/track_controller.rb:175 +msgid "Cancel some {{site_name}} alerts" +msgstr "" + +#: locale/model_attributes.rb:39 msgid "CensorRule|Last edit comment" msgstr "" -#: locale/model_attributes.rb:45 +#: locale/model_attributes.rb:38 msgid "CensorRule|Last edit editor" msgstr "" -#: locale/model_attributes.rb:44 +#: locale/model_attributes.rb:37 msgid "CensorRule|Replacement" msgstr "" -#: locale/model_attributes.rb:43 +#: locale/model_attributes.rb:36 msgid "CensorRule|Text" msgstr "" -#: lib/public_body_categories_sq.rb:14 lib/public_body_categories_sr.rb:14 #: lib/public_body_categories_en.rb:14 msgid "Central government" msgstr "" +#: app/views/user/signchangeemail.rhtml:37 +msgid "Change email on {{site_name}}" +msgstr "" + #: app/views/user/signchangepassword.rhtml:27 msgid "Change password on {{site_name}}" msgstr "" -#: app/views/user/show.rhtml:104 +#: app/views/user/set_crop_profile_photo.rhtml:1 app/views/user/show.rhtml:104 msgid "Change profile photo" msgstr "" #: app/views/user/set_profile_about_me.rhtml:1 -msgid "Change the text about you on your profile at WhatDoTheyKnow.com" +msgid "Change the text about you on your profile at {{site_name}}" msgstr "" #: app/views/user/show.rhtml:107 msgid "Change your email" msgstr "" +#: app/controllers/user_controller.rb:250 #: app/views/user/signchangeemail.rhtml:1 #: app/views/user/signchangeemail.rhtml:11 msgid "Change your email address used on {{site_name}}" @@ -487,14 +754,18 @@ msgstr "" msgid "Change your password" msgstr "" -#: app/views/user/signchangepassword_send_confirm.rhtml:1 -#: app/views/user/signchangepassword_send_confirm.rhtml:9 #: app/views/user/signchangepassword.rhtml:1 #: app/views/user/signchangepassword.rhtml:11 +#: app/views/user/signchangepassword_send_confirm.rhtml:1 +#: app/views/user/signchangepassword_send_confirm.rhtml:9 msgid "Change your password on {{site_name}}" msgstr "" -#: app/views/public_body/show.rhtml:16 app/views/public_body/show.rhtml:18 +#: app/controllers/user_controller.rb:204 +msgid "Change your password {{site_name}}" +msgstr "" + +#: app/views/public_body/show.rhtml:15 app/views/public_body/show.rhtml:17 msgid "Charity registration" msgstr "" @@ -507,9 +778,21 @@ msgstr "" msgid "Check you haven't included any <strong>personal information</strong>." msgstr "" +#: app/models/info_request_event.rb:331 +msgid "Clarification" +msgstr "" + +#: app/models/info_request_event.rb:295 +msgid "Clarification required" +msgstr "" + +#: app/controllers/request_controller.rb:339 +msgid "Classify an FOI response from " +msgstr "" + #: app/views/request_mailer/very_overdue_alert.rhtml:6 msgid "" -"Click on the link below to send a message to {{public_body.name}} telling " +"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 "" @@ -520,44 +803,107 @@ msgid "" "to reply to your request." msgstr "" -#: locale/model_attributes.rb:28 +#: locale/model_attributes.rb:22 msgid "Comment|Body" msgstr "" -#: locale/model_attributes.rb:27 +#: locale/model_attributes.rb:21 msgid "Comment|Comment type" msgstr "" -#: locale/model_attributes.rb:30 +#: locale/model_attributes.rb:24 msgid "Comment|Locale" msgstr "" -#: locale/model_attributes.rb:29 +#: locale/model_attributes.rb:23 msgid "Comment|Visible" msgstr "" -#: app/views/layouts/default.rhtml:147 +#: app/models/track_thing.rb:147 +msgid "Confirm you want to be emailed about new requests" +msgstr "" + +#: app/models/track_thing.rb:214 +msgid "" +"Confirm you want to be emailed about new requests or responses matching " +"'{{query}}'" +msgstr "" + +#: app/models/track_thing.rb:198 +msgid "Confirm you want to be emailed about requests by '{{user_name}}'" +msgstr "" + +#: app/models/track_thing.rb:182 +msgid "Confirm you want to be emailed about requests to '{{public_body_name}}'" +msgstr "" + +#: app/models/track_thing.rb:163 +msgid "Confirm you want to be emailed when an FOI request succeeds" +msgstr "" + +#: app/controllers/request_controller.rb:300 +msgid "Confirm your FOI request to " +msgstr "" + +#: app/controllers/request_controller.rb:703 +#: app/controllers/user_controller.rb:515 +msgid "Confirm your account on {{site_name}}" +msgstr "" + +#: app/controllers/comment_controller.rb:57 +msgid "Confirm your annotation to {{info_request_title}}" +msgstr "" + +#: app/models/user_mailer.rb:34 +msgid "Confirm your new email address on {{site_name}}" +msgstr "" + +#: app/views/layouts/default.rhtml:127 msgid "Contact {{site_name}}" msgstr "" +#: app/models/request_mailer.rb:210 +msgid "Could not identify the request from the email address" +msgstr "" + #: app/models/profile_photo.rb:96 msgid "" "Couldn't understand the image file that you uploaded. PNG, JPEG, GIF and " "many other common image file formats are supported." msgstr "" +#: app/views/user/set_crop_profile_photo.rhtml:6 +msgid "Crop your profile photo" +msgstr "" + #: app/views/request/new.rhtml:74 msgid "" "Cultural sites and built structures (as they may be affected by the\n" " environmental factors listed above)" msgstr "" -#: app/views/request/show.rhtml:61 +#: app/views/request/show.rhtml:68 msgid "" "Currently <strong>waiting for a response</strong> from {{public_body_link}}, " "they must respond promptly and" msgstr "" +#: app/models/info_request_event.rb:299 +msgid "Deadline Extended" +msgstr "" + +#: app/models/outgoing_message.rb:57 +msgid "Dear " +msgstr "" + +#: app/models/info_request.rb:787 +msgid "Delayed." +msgstr "" + +#: app/models/info_request.rb:805 app/models/info_request_event.rb:315 +msgid "Delivery error" +msgstr "" + #: app/views/request/details.rhtml:1 app/views/request/details.rhtml:2 msgid "Details of request '" msgstr "" @@ -566,8 +912,7 @@ msgstr "" msgid "Did you mean: {{correction}}" msgstr "" -#: app/views/outgoing_mailer/followup.rhtml:6 -#: app/views/outgoing_mailer/initial_request.rhtml:4 +#: app/views/outgoing_mailer/_followup_footer.rhtml:1 msgid "" "Disclaimer: This message and any reply that you make will be published on " "the internet. Our privacy and copyright policies:" @@ -577,7 +922,7 @@ msgstr "" msgid "Download original attachment" msgstr "" -#: app/views/request/_followup.rhtml:89 +#: app/views/request/_followup.rhtml:85 msgid "" "Edit and add <strong>more details</strong> to the message above,\n" " explaining why you are dissatisfied with their response." @@ -591,15 +936,37 @@ msgstr "" msgid "Edit text about you" msgstr "" -#: app/views/comment/_comment_form.rhtml:9 +#: app/models/user.rb:135 +msgid "Either the email or password was not recognised, please try again." +msgstr "" + +#: app/models/user.rb:137 +msgid "" +"Either the email or password was not recognised, please try again. Or create " +"a new account using the form on the right." +msgstr "" + +#: app/models/contact_validator.rb:34 +msgid "Email doesn't look like a valid address" +msgstr "" + +#: app/views/comment/_comment_form.rhtml:8 msgid "Email me future updates to this request" msgstr "" +#: app/models/track_thing.rb:155 +msgid "Email me new successful responses " +msgstr "" + +#: app/models/track_thing.rb:139 +msgid "Email me when there are new requests" +msgstr "" + #: app/views/user/show.rhtml:36 msgid "Email subscriptions" msgstr "" -#: app/views/general/search.rhtml:111 +#: app/views/general/search.rhtml:123 msgid "" "Enter words that you want to find separated by spaces, e.g. <strong>climbing " "lane</strong>" @@ -611,11 +978,11 @@ msgid "" "<a href=\"%s\">contact us</a> if you need more)." msgstr "" -#: app/views/public_body/show.rhtml:98 +#: app/views/public_body/show.rhtml:96 msgid "Environmental Information Regulations requests made" msgstr "" -#: app/views/public_body/show.rhtml:70 +#: app/views/public_body/show.rhtml:69 msgid "Environmental Information Regulations requests made using this site" msgstr "" @@ -627,14 +994,14 @@ msgstr "" msgid "Event history details" msgstr "" -#: app/views/request/new.rhtml:128 +#: app/views/request/new.rhtml:124 msgid "" "Everything that you enter on this page \n" " will be <strong>displayed publicly</strong> on\n" " this website forever (<a href=\"%s\">why?</a>)." msgstr "" -#: app/views/request/new.rhtml:120 +#: app/views/request/new.rhtml:116 msgid "" "Everything that you enter on this page, including <strong>your name</" "strong>, \n" @@ -642,19 +1009,19 @@ msgid "" " this website forever (<a href=\"%s\">why?</a>)." msgstr "" -#: locale/model_attributes.rb:61 +#: locale/model_attributes.rb:60 msgid "EximLogDone|Filename" msgstr "" -#: locale/model_attributes.rb:62 +#: locale/model_attributes.rb:61 msgid "EximLogDone|Last stat" msgstr "" -#: locale/model_attributes.rb:16 +#: locale/model_attributes.rb:19 msgid "EximLog|Line" msgstr "" -#: locale/model_attributes.rb:15 +#: locale/model_attributes.rb:18 msgid "EximLog|Order" msgstr "" @@ -666,10 +1033,8 @@ msgstr "" msgid "FOI requests" msgstr "" -#: app/views/general/search.rhtml:90 -msgid "" -"FOI requests {{start_count}} to {{end_count}} of {{total_count}} for " -"{{user_search_query}}" +#: app/models/track_thing.rb:193 app/models/track_thing.rb:194 +msgid "FOI requests by '{{user_name}}'" msgstr "" #: app/models/profile_photo.rb:101 @@ -694,10 +1059,18 @@ msgid "" " (<a href=\"%s\">why?</a>)." msgstr "" -#: app/views/request_mailer/old_unclassified_updated.rhtml:8 +#: app/views/request_mailer/old_unclassified_updated.rhtml:4 msgid "Follow this link to see the request:" msgstr "" +#: app/models/info_request_event.rb:335 +msgid "Follow up" +msgstr "" + +#: app/views/general/search.rhtml:159 +msgid "Follow up message sent by requester" +msgstr "" + #: app/views/public_body/view_email.rhtml:14 msgid "Follow up messages to existing requests are sent to " msgstr "" @@ -705,12 +1078,11 @@ msgstr "" #: app/views/request/_followup.rhtml:16 msgid "" "Follow ups and new responses to this request have been stopped to prevent " -"spam. Please\n" -" <a href=\"%s\">contact us</a> if you are {{user_link}} and need to " -"send a follow up." +"spam. Please <a href=\"{{url}}\">contact us</a> if you are {{user_link}} and " +"need to send a follow up." msgstr "" -#: app/views/public_body/show.rhtml:62 +#: app/views/public_body/show.rhtml:61 msgid "" "For an unknown reason, it is not possible to make a request to this " "authority." @@ -720,7 +1092,7 @@ msgstr "" msgid "Forgotten your password?" msgstr "" -#: app/views/public_body/show.rhtml:57 +#: app/views/public_body/show.rhtml:56 msgid "" "Freedom of Information law does not apply to this authority, so you cannot " "make\n" @@ -741,7 +1113,7 @@ msgstr "" msgid "Freedom of Information request" msgstr "" -#: app/views/public_body/show.rhtml:100 +#: app/views/public_body/show.rhtml:98 msgid "Freedom of Information requests made" msgstr "" @@ -749,7 +1121,7 @@ msgstr "" msgid "Freedom of Information requests made by" msgstr "" -#: app/views/public_body/show.rhtml:74 +#: app/views/public_body/show.rhtml:72 msgid "Freedom of Information requests made using this site" msgstr "" @@ -762,15 +1134,31 @@ msgid "" "to us</a>." msgstr "" -#: app/views/layouts/default.rhtml:123 +#: app/models/outgoing_message.rb:73 +msgid "GIVE DETAILS ABOUT YOUR COMPLAINT HERE" +msgstr "" + +#: app/views/general/exception_caught.rhtml:14 +msgid "Go to our <a href=\"%s\">front page</a></li>" +msgstr "" + +#: app/models/info_request_event.rb:297 +msgid "Handled by post" +msgstr "" + +#: app/models/info_request.rb:801 +msgid "Handled by post." +msgstr "" + +#: app/views/layouts/default.rhtml:102 msgid "Hello!" msgstr "" -#: app/views/layouts/default.rhtml:120 +#: app/views/layouts/default.rhtml:99 msgid "Hello, {{username}}!" msgstr "" -#: app/views/layouts/default.rhtml:115 +#: app/views/layouts/default.rhtml:94 msgid "Help" msgstr "" @@ -780,16 +1168,24 @@ msgid "" "request, and\n" "the most recent event had its status updated to that value. " "<strong>calculated</strong> is then inferred by\n" -"WhatDoTheyKnow for intermediate events, which weren't given an explicit\n" -"description by a user. See the <a href=\"%s\">search tips</a> for " -"description of the states." +"{{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 "" -#: locale/model_attributes.rb:58 +#: app/views/request/_other_describe_state.rhtml:4 +msgid "" +"Hi! We need your help. The person who made the following request\n" +" hasn't told us whether or not it was successful. Would you mind taking\n" +" a moment to read it and help us keep the place tidy for everyone?\n" +" Thanks." +msgstr "" + +#: locale/model_attributes.rb:57 msgid "Holiday|Day" msgstr "" -#: locale/model_attributes.rb:59 +#: locale/model_attributes.rb:58 msgid "Holiday|Description" msgstr "" @@ -807,11 +1203,11 @@ msgstr "" msgid "Human health and safety" msgstr "" -#: app/views/request/_followup.rhtml:72 +#: app/views/request/_followup.rhtml:68 msgid "I am asking for <strong>new information</strong>" msgstr "" -#: app/views/request/_followup.rhtml:77 +#: app/views/request/_followup.rhtml:73 msgid "I am requesting an <strong>internal review</strong>" msgstr "" @@ -823,7 +1219,7 @@ msgstr "" msgid "I don't want to do any more tidying now!" msgstr "" -#: app/views/request/_describe_state.rhtml:92 +#: app/views/request/_describe_state.rhtml:91 msgid "I would like to <strong>withdraw this request</strong>" msgstr "" @@ -845,15 +1241,15 @@ msgstr "" msgid "I've been asked to <strong>clarify</strong> my request" msgstr "" -#: app/views/request/_describe_state.rhtml:62 +#: app/views/request/_describe_state.rhtml:60 msgid "I've received <strong>all the information" msgstr "" -#: app/views/request/_describe_state.rhtml:58 +#: app/views/request/_describe_state.rhtml:56 msgid "I've received <strong>some of the information</strong>" msgstr "" -#: app/views/request/_describe_state.rhtml:77 +#: app/views/request/_describe_state.rhtml:76 msgid "I've received an <strong>error message</strong>" msgstr "" @@ -871,7 +1267,7 @@ msgid "" "email {{contact_email}} for help." msgstr "" -#: app/views/request/_followup.rhtml:21 +#: app/views/request/_followup.rhtml:20 msgid "" "If you are dissatisfied by the response you got from\n" " the public authority, you have the right to\n" @@ -888,13 +1284,13 @@ msgid "" "the request." msgstr "" -#: app/views/request/new.rhtml:123 +#: app/views/request/new.rhtml:119 msgid "" "If you are thinking of using a pseudonym,\n" " please <a href=\"%s\">read this first</a>." msgstr "" -#: app/views/request/show.rhtml:104 +#: app/views/request/show.rhtml:105 msgid "If you are {{user_link}}, please" msgstr "" @@ -913,16 +1309,10 @@ msgid "" " a copy to upload</strong>." msgstr "" -#: app/views/outgoing_mailer/initial_request.rhtml:13 -msgid "" -"If you find WhatDoTheyKnow useful as an FOI officer, please ask your web " -"manager to suggest us on your organisation" -msgstr "" - -#: app/views/outgoing_mailer/followup.rhtml:12 +#: app/views/outgoing_mailer/_followup_footer.rhtml:4 msgid "" -"If you find WhatDoTheyKnow useful as an FOI officer, please ask your web " -"manager to suggest us on your organisation's FOI page." +"If you find this service useful as an FOI officer, please ask your web " +"manager to link to us from your organisation's FOI page." msgstr "" #: app/views/user/bad_token.rhtml:13 @@ -932,6 +1322,13 @@ msgid "" "more. Please try doing what you were doing from the beginning." msgstr "" +#: app/controllers/request_controller.rb:437 +msgid "" +"If you have not done so already, please write a message below telling the " +"authority that you have withdrawn your request. Otherwise they will not know " +"it has been withdrawn." +msgstr "" + #: app/views/user/signchangeemail_confirm.rhtml:11 #: app/views/user/signchangepassword_confirm.rhtml:10 msgid "" @@ -946,11 +1343,11 @@ msgid "" msgstr "" #: app/views/user/_signup.rhtml:6 -msgid "If you're new to WhatDoTheyKnow" +msgid "If you're new to {{site_name}}" msgstr "" #: app/views/user/_signin.rhtml:7 -msgid "If you've used WhatDoTheyKnow before" +msgid "If you've used {{site_name}} before" msgstr "" #: app/views/user/no_cookies.rhtml:12 @@ -959,80 +1356,102 @@ msgid "" "then there is probably a fault with our server." msgstr "" -#: locale/model_attributes.rb:64 +#: locale/model_attributes.rb:63 msgid "IncomingMessage|Cached attachment text clipped" msgstr "" -#: locale/model_attributes.rb:65 +#: locale/model_attributes.rb:64 msgid "IncomingMessage|Cached main body text folded" msgstr "" -#: locale/model_attributes.rb:66 +#: locale/model_attributes.rb:65 msgid "IncomingMessage|Cached main body text unfolded" msgstr "" -#: locale/model_attributes.rb:39 +#: locale/model_attributes.rb:44 msgid "InfoRequestEvent|Calculated state" msgstr "" -#: locale/model_attributes.rb:38 +#: locale/model_attributes.rb:43 msgid "InfoRequestEvent|Described state" msgstr "" -#: locale/model_attributes.rb:36 +#: locale/model_attributes.rb:41 msgid "InfoRequestEvent|Event type" msgstr "" -#: locale/model_attributes.rb:40 +#: locale/model_attributes.rb:45 msgid "InfoRequestEvent|Last described at" msgstr "" -#: locale/model_attributes.rb:37 +#: locale/model_attributes.rb:42 msgid "InfoRequestEvent|Params yaml" msgstr "" -#: locale/model_attributes.rb:41 +#: locale/model_attributes.rb:46 msgid "InfoRequestEvent|Prominence" msgstr "" -#: locale/model_attributes.rb:87 +#: locale/model_attributes.rb:86 msgid "InfoRequest|Allow new responses from" msgstr "" -#: locale/model_attributes.rb:83 +#: locale/model_attributes.rb:82 msgid "InfoRequest|Awaiting description" msgstr "" -#: locale/model_attributes.rb:82 +#: locale/model_attributes.rb:81 msgid "InfoRequest|Described state" msgstr "" -#: locale/model_attributes.rb:88 +#: locale/model_attributes.rb:87 msgid "InfoRequest|Handle rejected responses" msgstr "" -#: locale/model_attributes.rb:86 +#: locale/model_attributes.rb:85 msgid "InfoRequest|Law used" msgstr "" -#: locale/model_attributes.rb:84 +#: locale/model_attributes.rb:83 msgid "InfoRequest|Prominence" msgstr "" -#: locale/model_attributes.rb:81 +#: locale/model_attributes.rb:80 msgid "InfoRequest|Title" msgstr "" -#: locale/model_attributes.rb:85 +#: locale/model_attributes.rb:84 msgid "InfoRequest|Url title" msgstr "" +#: app/models/info_request_event.rb:303 +msgid "Information not held" +msgstr "" + +#: app/models/info_request.rb:791 +msgid "Information not held." +msgstr "" + #: app/views/request/new.rhtml:71 msgid "" "Information on emissions and discharges (e.g. noise, energy,\n" " radiation, waste materials)" msgstr "" +#: app/models/info_request_event.rb:311 +msgid "Internal review acknowledgement" +msgstr "" + +#: app/models/info_request_event.rb:328 +msgid "Internal review request" +msgstr "" + +#: app/views/outgoing_mailer/initial_request.rhtml:8 +msgid "" +"Is {{email_address}} the wrong address for {{type_of_request}} requests to " +"{{public_body_name}}? If so, please contact us using this form:" +msgstr "" + #: app/views/user/no_cookies.rhtml:8 msgid "" "It may be that your browser is not set to accept a thing called \"cookies" @@ -1042,14 +1461,14 @@ msgid "" "browser. Then press refresh to have another go." msgstr "" -#: app/views/user/show.rhtml:62 -msgid "Joined WhatDoTheyKnow" -msgstr "" - #: app/views/user/_user_listing_single.rhtml:21 msgid "Joined in" msgstr "" +#: app/views/user/show.rhtml:62 +msgid "Joined {{site_name}} in" +msgstr "" + #: app/views/request/new.rhtml:48 msgid "" "Keep it <strong>focused</strong>, you'll be more likely to get what you want " @@ -1070,6 +1489,11 @@ msgid "" "appeared and your browser and operating system type and version." msgstr "" +#: app/views/request/_correspondence.rhtml:27 +#: app/views/request/_correspondence.rhtml:57 +msgid "Link to this" +msgstr "" + #: app/views/public_body/list.rhtml:32 msgid "List of all authorities (CSV)" msgstr "" @@ -1078,7 +1502,11 @@ msgstr "" msgid "Local and regional" msgstr "" -#: app/views/public_body/show.rhtml:48 +#: app/models/info_request.rb:789 +msgid "Long overdue." +msgstr "" + +#: app/views/public_body/show.rhtml:47 msgid "Make a new Environmental Information request" msgstr "" @@ -1086,11 +1514,11 @@ msgstr "" msgid "Make an {{law_used_short}} request to '{{public_body_name}}'" msgstr "" -#: app/views/layouts/default.rhtml:17 +#: app/views/layouts/default.rhtml:15 msgid "Make and browse Freedom of Information (FOI) requests" msgstr "" -#: app/views/layouts/default.rhtml:89 +#: app/views/layouts/default.rhtml:67 msgid "Make and explore Freedom of Information requests" msgstr "" @@ -1098,7 +1526,7 @@ msgstr "" msgid "Make or explore Freedom of Information requests" msgstr "" -#: app/views/layouts/default.rhtml:108 +#: app/views/layouts/default.rhtml:87 msgid "Make request" msgstr "" @@ -1107,7 +1535,7 @@ msgid "Make your own request" msgstr "" #: app/views/contact_mailer/message.rhtml:4 -msgid "Message sent using WhatDoTheyKnow contact form, " +msgid "Message sent using {{site_name}} contact form, " msgstr "" #: app/views/request/new_bad_contact.rhtml:1 @@ -1118,19 +1546,19 @@ msgstr "" msgid "More about this authority" msgstr "" -#: app/views/general/frontpage.rhtml:39 +#: app/views/general/frontpage.rhtml:41 msgid "More authorities..." msgstr "" -#: app/views/general/frontpage.rhtml:53 +#: app/views/general/frontpage.rhtml:55 msgid "More successful requests..." msgstr "" -#: app/views/request/_describe_state.rhtml:66 +#: app/views/request/_describe_state.rhtml:64 msgid "My request has been <strong>refused</strong>" msgstr "" -#: app/views/layouts/default.rhtml:112 +#: app/views/layouts/default.rhtml:91 msgid "My requests" msgstr "" @@ -1142,10 +1570,18 @@ msgstr "" msgid "Name is already taken" msgstr "" +#: app/models/track_thing.rb:142 app/models/track_thing.rb:143 +msgid "New Freedom of Information requests" +msgstr "" + #: app/views/user/signchangeemail.rhtml:20 msgid "New e-mail:" msgstr "" +#: app/models/change_email_validator.rb:53 +msgid "New email doesn't look like a valid address" +msgstr "" + #: app/views/user/signchangepassword.rhtml:15 msgid "New password:" msgstr "" @@ -1186,27 +1622,27 @@ msgstr "" msgid "No similar requests found." msgstr "" -#: app/views/public_body/show.rhtml:75 +#: app/views/public_body/show.rhtml:73 msgid "" "Nobody has made any Freedom of Information requests to {{public_body_name}} " "using this site yet." msgstr "" -#: app/views/request/_request_listing.rhtml:2 #: app/views/public_body/_body_listing.rhtml:2 +#: app/views/request/_request_listing.rhtml:2 msgid "None found." msgstr "" -#: app/views/general/search.rhtml:7 -msgid "Nothing found for '{{search_terms}}'" -msgstr "" - #: app/views/user/signchangeemail_confirm.rhtml:3 #: app/views/user/signchangepassword_confirm.rhtml:1 #: app/views/user/signchangepassword_confirm.rhtml:3 msgid "Now check your email!" msgstr "" +#: app/views/comment/preview.rhtml:5 +msgid "Now preview your annotation" +msgstr "" + #: app/views/request/followup_preview.rhtml:10 msgid "Now preview your follow up" msgstr "" @@ -1229,39 +1665,82 @@ msgid "" "{{site_name}}" msgstr "" +#: app/controllers/request_controller.rb:414 +msgid "" +"Oh no! Sorry to hear that your request was refused. Here is what to do now." +msgstr "" + #: app/views/user/signchangeemail.rhtml:15 msgid "Old e-mail:" msgstr "" +#: app/models/change_email_validator.rb:44 +msgid "" +"Old email address isn't the same as the address of the account you are " +"logged in with" +msgstr "" + +#: app/models/change_email_validator.rb:39 +msgid "Old email doesn't look like a valid address" +msgstr "" + #: app/views/user/show.rhtml:32 msgid "On this page" msgstr "" -#: app/views/public_body/show.rhtml:93 +#: app/views/general/search.rhtml:71 +msgid "One public authority matching ‘{{user_search_query}}’" +msgstr "" + +#: app/views/public_body/show.rhtml:91 msgid "Only requests made using {{site_name}} are shown." msgstr "" -#: locale/model_attributes.rb:21 +#: app/models/info_request.rb:405 +msgid "" +"Only the authority can reply to this request, and I don't recognise the " +"address this reply was sent from" +msgstr "" + +#: app/models/info_request.rb:401 +msgid "" +"Only the authority can reply to this request, but there is no \"From\" " +"address to check against" +msgstr "" + +#: app/views/general/search.rhtml:158 +msgid "Original request sent" +msgstr "" + +#: locale/model_attributes.rb:26 msgid "OutgoingMessage|Body" msgstr "" -#: locale/model_attributes.rb:24 +#: locale/model_attributes.rb:29 msgid "OutgoingMessage|Last sent at" msgstr "" -#: locale/model_attributes.rb:23 +#: locale/model_attributes.rb:28 msgid "OutgoingMessage|Message type" msgstr "" -#: locale/model_attributes.rb:22 +#: locale/model_attributes.rb:27 msgid "OutgoingMessage|Status" msgstr "" -#: locale/model_attributes.rb:25 +#: locale/model_attributes.rb:30 msgid "OutgoingMessage|What doing" msgstr "" -#: app/views/user/_signup.rhtml:30 app/views/user/_signin.rhtml:16 +#: app/models/info_request.rb:795 +msgid "Partially successful." +msgstr "" + +#: app/models/change_email_validator.rb:47 +msgid "Password is not correct" +msgstr "" + +#: app/views/user/_signin.rhtml:16 app/views/user/_signup.rhtml:30 msgid "Password:" msgstr "" @@ -1269,12 +1748,6 @@ msgstr "" msgid "Password: (again)" msgstr "" -#: app/views/general/search.rhtml:80 -msgid "" -"People {{start_count}} to {{end_count}} of {{total_count}} for " -"{{user_search_query}}" -msgstr "" - #: app/views/user/set_draft_profile_photo.rhtml:13 msgid "Photo of you:" msgstr "" @@ -1283,11 +1756,15 @@ msgstr "" msgid "Plans and administrative measures that affect these matters" msgstr "" +#: app/controllers/request_game_controller.rb:42 +msgid "Play the request categorisation game" +msgstr "" + #: app/views/request_game/play.rhtml:1 app/views/request_game/play.rhtml:30 msgid "Play the request categorisation game!" msgstr "" -#: app/views/request/show.rhtml:100 +#: app/views/request/show.rhtml:101 msgid "Please" msgstr "" @@ -1295,7 +1772,7 @@ msgstr "" msgid "Please <a href=\"%s\">get in touch</a> with us so we can fix it." msgstr "" -#: app/views/request/show.rhtml:45 +#: app/views/request/show.rhtml:52 msgid "" "Please <strong>answer the question above</strong> so we know whether the " msgstr "" @@ -1306,11 +1783,11 @@ msgid "" " know if there was information in the recent responses to them." msgstr "" -#: app/views/request/_followup.rhtml:28 +#: app/views/request/_followup.rhtml:27 msgid "" -"Please <strong>only</strong> write messages directly relating to your \n" -"\t\t\t\trequest {{request_link}}. If you would like to ask for information\n" -"\t\t\t\tthat was not in your original request, then <a href=\"%s\">file a " +"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 "" @@ -1332,22 +1809,23 @@ msgstr "" msgid "Please choose what sort of reply you are making." msgstr "" -#: app/views/track_mailer/event_digest.rhtml:66 -msgid "Please click on the link below to cancel or alter these emails." +#: app/controllers/request_controller.rb:346 +msgid "" +"Please choose whether or not you got some of the information that you wanted." msgstr "" #: app/views/user_mailer/changeemail_confirm.rhtml:3 msgid "" "Please click on the link below to confirm that you want to \n" -"change the email address that you use for WhatDoTheyKnow\n" -"from " +"change the email address that you use for {{site_name}}\n" +"from {{old_email}} to {{new_email}}" msgstr "" #: app/views/user_mailer/confirm_login.rhtml:3 msgid "Please click on the link below to confirm your email address." msgstr "" -#: app/models/info_request.rb:106 +#: app/models/info_request.rb:126 msgid "" "Please describe more what the request is about in the subject. There is no " "need to say it is an FOI request, we add that on anyway." @@ -1371,7 +1849,7 @@ msgstr "" msgid "Please enter a subject" msgstr "" -#: app/models/info_request.rb:35 +#: app/models/info_request.rb:34 msgid "Please enter a summary of your request" msgstr "" @@ -1391,7 +1869,7 @@ msgstr "" msgid "Please enter your annotation" msgstr "" -#: app/models/user.rb:34 app/models/contact_validator.rb:29 +#: app/models/contact_validator.rb:29 app/models/user.rb:34 msgid "Please enter your email address" msgstr "" @@ -1403,7 +1881,7 @@ msgstr "" msgid "Please enter your letter requesting information" msgstr "" -#: app/models/user.rb:36 app/models/contact_validator.rb:28 +#: app/models/contact_validator.rb:28 app/models/user.rb:36 msgid "Please enter your name" msgstr "" @@ -1411,15 +1889,15 @@ msgstr "" msgid "Please enter your name, not your email address, in the name field." msgstr "" -#: app/models/change_email_validator.rb:29 +#: app/models/change_email_validator.rb:30 msgid "Please enter your new email address" msgstr "" -#: app/models/change_email_validator.rb:28 +#: app/models/change_email_validator.rb:29 msgid "Please enter your old email address" msgstr "" -#: app/models/change_email_validator.rb:30 +#: app/models/change_email_validator.rb:31 msgid "Please enter your password" msgstr "" @@ -1431,7 +1909,7 @@ msgstr "" msgid "Please keep it shorter than 500 characters" msgstr "" -#: app/models/info_request.rb:103 +#: app/models/info_request.rb:123 msgid "" "Please keep the summary short, like in the subject of an email. You can use " "a phrase, rather than a full sentence." @@ -1462,16 +1940,24 @@ msgstr "" msgid "Please sign in as " msgstr "" -#: app/views/outgoing_mailer/followup.rhtml:9 -#: app/views/outgoing_mailer/initial_request.rhtml:7 +#: app/controllers/request_controller.rb:730 +msgid "Please type a message and/or choose a file containing your response." +msgstr "" + +#: app/controllers/request_controller.rb:434 +msgid "Please use the form below to tell us more." +msgstr "" + +#: app/views/outgoing_mailer/followup.rhtml:6 +#: app/views/outgoing_mailer/initial_request.rhtml:5 msgid "Please use this email address for all replies to this request:" msgstr "" -#: app/models/info_request.rb:36 +#: app/models/info_request.rb:35 msgid "Please write a summary with some text in it" msgstr "" -#: app/models/info_request.rb:100 +#: app/models/info_request.rb:120 msgid "" "Please write the summary using a mixture of capital and lower case letters. " "This makes it easier for others to read." @@ -1483,6 +1969,12 @@ msgid "" "letters. This makes it easier for others to read." msgstr "" +#: app/controllers/request_controller.rb:423 +msgid "" +"Please write your follow up message containing the necessary clarifications " +"below." +msgstr "" + #: app/models/outgoing_message.rb:159 msgid "" "Please write your message using a mixture of capital and lower case letters. " @@ -1495,51 +1987,63 @@ msgid "" "be useful." msgstr "" -#: locale/model_attributes.rb:56 +#: app/views/comment/preview.rhtml:21 +msgid "Post annotation" +msgstr "" + +#: locale/model_attributes.rb:55 msgid "PostRedirect|Circumstance" msgstr "" -#: locale/model_attributes.rb:54 +#: locale/model_attributes.rb:53 msgid "PostRedirect|Email token" msgstr "" -#: locale/model_attributes.rb:53 +#: locale/model_attributes.rb:52 msgid "PostRedirect|Post params yaml" msgstr "" -#: locale/model_attributes.rb:55 +#: locale/model_attributes.rb:54 msgid "PostRedirect|Reason params yaml" msgstr "" -#: locale/model_attributes.rb:51 +#: locale/model_attributes.rb:50 msgid "PostRedirect|Token" msgstr "" -#: locale/model_attributes.rb:52 +#: locale/model_attributes.rb:51 msgid "PostRedirect|Uri" msgstr "" +#: app/views/general/_credits.rhtml:1 +msgid "Powered by <a href=\"http://www.alaveteli.org/\">Alaveteli</a>." +msgstr "" + #: app/views/request/followup_preview.rhtml:1 msgid "Preview follow up to '" msgstr "" -#: app/views/comment/_comment_form.rhtml:16 +#: app/views/comment/preview.rhtml:1 +msgid "Preview new annotation on '{{info_request_title}}'" +msgstr "" + +#: app/views/comment/_comment_form.rhtml:15 msgid "Preview your annotation" msgstr "" -#: app/views/request/_followup.rhtml:100 +#: app/views/request/_followup.rhtml:96 msgid "Preview your message" msgstr "" -#: app/views/request/new.rhtml:143 +#: app/views/request/new.rhtml:139 msgid "Preview your public request" msgstr "" -#: locale/model_attributes.rb:18 +#: locale/model_attributes.rb:15 msgid "ProfilePhoto|Data" msgstr "" -#: locale/model_attributes.rb:19 +#: locale/model_attributes.rb:16 msgid "ProfilePhoto|Draft" msgstr "" @@ -1547,7 +2051,7 @@ msgstr "" msgid "Public authorities - {{description}}" msgstr "" -#: app/views/general/search.rhtml:70 +#: app/views/general/search.rhtml:73 msgid "" "Public authorities {{start_count}} to {{end_count}} of {{total_count}} for " "{{user_search_query}}" @@ -1601,12 +2105,12 @@ msgstr "" msgid "Publication scheme" msgstr "" -#: locale/model_attributes.rb:49 +#: locale/model_attributes.rb:48 msgid "RawEmail|Data binary" msgstr "" -#: locale/model_attributes.rb:48 -msgid "RawEmail|Data text" +#: app/views/comment/preview.rhtml:20 +msgid "Re-edit this annotation" msgstr "" #: app/views/request/followup_preview.rhtml:49 @@ -1617,13 +2121,13 @@ msgstr "" msgid "Re-edit this request" msgstr "" -#: app/views/general/search.rhtml:125 +#: app/views/general/search.rhtml:137 msgid "" -"Read about <a href=\"%s\">advanced search operators</a>, such as proximity " -"and wildcards." +"Read about <a href=\"{{advanced_search_url}}\">advanced search operators</" +"a>, such as proximity and wildcards." msgstr "" -#: app/views/layouts/default.rhtml:114 +#: app/views/layouts/default.rhtml:93 msgid "Read blog" msgstr "" @@ -1631,11 +2135,15 @@ msgstr "" msgid "Read this before writing your {{info_request_law_used_full}} request" msgstr "" +#: app/views/general/search.rhtml:150 +msgid "Received an error message, such as delivery failure." +msgstr "" + #: app/views/general/search.rhtml:42 msgid "Recently described results first" msgstr "" -#: app/controllers/request_controller.rb:122 +#: app/controllers/request_controller.rb:139 msgid "Recently sent Freedom of Information requests" msgstr "" @@ -1643,18 +2151,26 @@ msgstr "" msgid "Recently sent requests" msgstr "" -#: app/controllers/request_controller.rb:127 +#: app/controllers/request_controller.rb:144 msgid "Recently successful responses" msgstr "" +#: app/models/info_request_event.rb:305 +msgid "Refused" +msgstr "" + +#: app/models/info_request.rb:793 +msgid "Refused." +msgstr "" + #: app/views/user/_signin.rhtml:26 msgid "" "Remember me</label> (keeps you signed in longer;\n" " do not use on a public computer) " msgstr "" -#: app/views/request/_after_actions.rhtml:27 -msgid "Reply to " +#: app/views/request/_correspondence.rhtml:28 +msgid "Reply to this message" msgstr "" #: app/views/comment/_single_comment.rhtml:24 @@ -1693,6 +2209,10 @@ msgstr "" msgid "Requested on {{date}}" msgstr "" +#: app/models/track_thing.rb:209 app/models/track_thing.rb:210 +msgid "Requests or responses matching '{{query}}'" +msgstr "" + #: app/views/request/upload_response.rhtml:11 msgid "Respond by email" msgstr "" @@ -1709,11 +2229,15 @@ msgstr "" msgid "Respond using the web" msgstr "" -#: app/views/request/show.rhtml:70 +#: app/views/general/search.rhtml:160 +msgid "Response from a public authority" +msgstr "" + +#: app/views/request/show.rhtml:77 msgid "Response to this request is <strong>delayed</strong>." msgstr "" -#: app/views/request/show.rhtml:78 +#: app/views/request/show.rhtml:85 msgid "Response to this request is <strong>long overdue</strong>." msgstr "" @@ -1733,9 +2257,9 @@ msgstr "" msgid "Save" msgstr "" -#: app/views/general/search.rhtml:29 app/views/general/frontpage.rhtml:16 -#: app/views/general/exception_caught.rhtml:10 app/views/request/new.rhtml:31 -#: app/views/layouts/default.rhtml:102 +#: app/views/general/exception_caught.rhtml:10 +#: app/views/general/frontpage.rhtml:16 app/views/general/search.rhtml:29 +#: app/views/layouts/default.rhtml:80 app/views/request/new.rhtml:31 msgid "Search" msgstr "" @@ -1747,6 +2271,10 @@ msgstr "" msgid "Search the site to find what you were looking for." msgstr "" +#: app/controllers/user_controller.rb:331 +msgid "Send a message to " +msgstr "" + #: app/views/request/_followup.rhtml:7 msgid "Send a public follow up message to" msgstr "" @@ -1755,8 +2283,8 @@ msgstr "" msgid "Send a public reply to" msgstr "" -#: app/views/request/_after_actions.rhtml:24 -msgid "Send follow up to " +#: app/views/request/_correspondence.rhtml:58 +msgid "Send follow up" msgstr "" #: app/views/request/followup_preview.rhtml:50 @@ -1783,11 +2311,11 @@ msgstr "" msgid "Show most relevant results first" msgstr "" -#: app/views/request/list.rhtml:2 app/views/public_body/list.rhtml:3 +#: app/views/public_body/list.rhtml:3 app/views/request/list.rhtml:2 msgid "Show only..." msgstr "" -#: app/views/user/show.rhtml:113 app/views/user/_signin.rhtml:31 +#: app/views/user/_signin.rhtml:31 app/views/user/show.rhtml:113 msgid "Sign in" msgstr "" @@ -1795,11 +2323,11 @@ msgstr "" msgid "Sign in or make a new account" msgstr "" -#: app/views/layouts/default.rhtml:124 +#: app/views/layouts/default.rhtml:103 msgid "Sign in or sign up" msgstr "" -#: app/views/layouts/default.rhtml:121 +#: app/views/layouts/default.rhtml:100 msgid "Sign out" msgstr "" @@ -1811,6 +2339,14 @@ msgstr "" msgid "Similar requests" msgstr "" +#: app/models/info_request_event.rb:307 +msgid "Some information sent" +msgstr "" + +#: app/views/general/search.rhtml:145 +msgid "Some of the information requested has been received" +msgstr "" + #: app/views/request_game/play.rhtml:31 msgid "" "Some people who've made requests haven't let us know whether they were\n" @@ -1823,7 +2359,7 @@ msgstr "" #: app/views/user_mailer/changeemail_already_used.rhtml:1 msgid "" "Someone, perhaps you, just tried to change their email address on\n" -"WhatDoTheyKnow.com from " +"{{site_name}} from {{old_email}} to {{new_email}}." msgstr "" #: app/views/general/exception_caught.rhtml:1 @@ -1834,6 +2370,10 @@ msgstr "" msgid "Special note for this authority!" msgstr "" +#: app/views/request/_other_describe_state.rhtml:21 +msgid "Still awaiting an <strong>internal review</strong>" +msgstr "" + #: app/views/request/followup_preview.rhtml:23 #: app/views/request/preview.rhtml:18 msgid "Subject:" @@ -1843,14 +2383,22 @@ msgstr "" msgid "Submit" msgstr "" -#: app/views/request/_describe_state.rhtml:102 +#: app/views/request/_describe_state.rhtml:101 msgid "Submit status" msgstr "" +#: app/models/track_thing.rb:158 app/models/track_thing.rb:159 +msgid "Successful Freedom of Information requests" +msgstr "" + #: app/views/request/list.rhtml:5 msgid "Successful responses" msgstr "" +#: app/models/info_request.rb:797 +msgid "Successful." +msgstr "" + #: app/views/comment/new.rhtml:38 msgid "" "Suggest how the requester can find the <strong>rest of the information</" @@ -1861,7 +2409,7 @@ msgstr "" msgid "Summary:" msgstr "" -#: app/views/general/search.rhtml:128 +#: app/views/general/search.rhtml:140 msgid "Table of statuses" msgstr "" @@ -1869,6 +2417,36 @@ msgstr "" msgid "Tags:" msgstr "" +#: app/controllers/request_game_controller.rb:52 +msgid "Thank you for helping us keep the site tidy!" +msgstr "" + +#: app/controllers/comment_controller.rb:62 +msgid "Thank you for making an annotation!" +msgstr "" + +#: app/controllers/request_controller.rb:736 +msgid "" +"Thank you for responding to this FOI request! Your response has been " +"published below, and a link to your response has been emailed to " +msgstr "" + +#: app/controllers/request_controller.rb:378 +msgid "" +"Thank you for updating the status of the request '<a href=\"{{url}}\">" +"{{info_request_title}}</a>'. There are some more requests below for you to " +"classify." +msgstr "" + +#: app/controllers/request_controller.rb:381 +msgid "Thank you for updating this request!" +msgstr "" + +#: app/controllers/user_controller.rb:398 +#: app/controllers/user_controller.rb:414 +msgid "Thank you for updating your profile photo" +msgstr "" + #: app/views/request_game/play.rhtml:42 msgid "" "Thanks for helping - your work will make it easier for everyone to find " @@ -1892,7 +2470,14 @@ msgid "" " requests." msgstr "" -#: app/views/request/_describe_state.rhtml:49 +#: app/controllers/user_controller.rb:189 +msgid "" +"That doesn't look like a valid email address. Please check you have typed it " +"correctly." +msgstr "" + +#: app/views/request/_describe_state.rhtml:47 +#: app/views/request/_other_describe_state.rhtml:43 msgid "The <strong>review has finished</strong> and overall:" msgstr "" @@ -1900,10 +2485,16 @@ msgstr "" msgid "The Freedom of Information Act <strong>does not apply</strong> to" msgstr "" -#: app/views/user_mailer/changeemail_already_used.rhtml:7 +#: app/views/user_mailer/changeemail_already_used.rhtml:8 msgid "The accounts have been left as they previously were." msgstr "" +#: app/views/request/_other_describe_state.rhtml:48 +msgid "" +"The authority do <strong>not have</strong> the information <small>(maybe " +"they say who does)" +msgstr "" + #: app/views/request/show_response.rhtml:28 msgid "" "The authority only has a <strong>paper copy</strong> of the information." @@ -1916,7 +2507,7 @@ msgid "" "request" msgstr "" -#: app/views/request/show.rhtml:108 +#: app/views/request/show.rhtml:109 msgid "" "The authority would like to / has <strong>responded by post</strong> to this " "request." @@ -1942,22 +2533,48 @@ msgstr "" msgid "The page either doesn't exist, or is broken. Things you can try now:" msgstr "" -#: app/views/request/show.rhtml:103 +#: app/views/general/search.rhtml:143 +msgid "The public authority does not have the information requested" +msgstr "" + +#: app/views/general/search.rhtml:147 +msgid "The public authority would like part of the request explained" +msgstr "" + +#: app/views/general/search.rhtml:148 +msgid "The public authority would like to / has responded by post" +msgstr "" + +#: app/views/request/_other_describe_state.rhtml:60 +msgid "The request has been <strong>refused</strong>" +msgstr "" + +#: app/controllers/request_controller.rb:352 +msgid "" +"The request has been updated since you originally loaded this page. Please " +"check for any new incoming messages below, and try again." +msgstr "" + +#: app/views/request/show.rhtml:104 msgid "The request is <strong>waiting for clarification</strong>." msgstr "" -#: app/views/request/show.rhtml:96 +#: app/views/request/show.rhtml:97 msgid "The request was <strong>partially successful</strong>." msgstr "" -#: app/views/request/show.rhtml:86 +#: app/views/request/show.rhtml:93 msgid "The request was <strong>refused</strong> by" msgstr "" -#: app/views/request/show.rhtml:88 +#: app/views/request/show.rhtml:95 msgid "The request was <strong>successful</strong>." msgstr "" +#: app/views/general/search.rhtml:144 +msgid "The request was refused by the public authority" +msgstr "" + #: app/views/request/hidden.rhtml:9 msgid "" "The request you have tried to view has been removed. There are\n" @@ -1966,7 +2583,11 @@ msgid "" " href=\"%s\">contact us</a> if you have any questions." msgstr "" -#: app/views/request/_followup.rhtml:35 +#: app/views/general/search.rhtml:152 +msgid "The requester has abandoned this request for some reason" +msgstr "" + +#: app/views/request/_followup.rhtml:32 msgid "" "The response to your request has been <strong>delayed</strong>. You can say " "that, \n" @@ -1974,7 +2595,7 @@ msgid "" " <strong>promptly</strong> and" msgstr "" -#: app/views/request/_followup.rhtml:47 +#: app/views/request/_followup.rhtml:44 msgid "" "The response to your request is <strong>long overdue</strong>. You can say " "that, by \n" @@ -1983,7 +2604,7 @@ msgid "" " by now" msgstr "" -#: app/views/public_body/show.rhtml:102 +#: app/views/public_body/show.rhtml:100 msgid "" "The search index is currently offline, so we can't show the Freedom of " "Information requests that have been made to this authority." @@ -1995,6 +2616,88 @@ msgid "" "Information requests this person has made." msgstr "" +#: app/controllers/track_controller.rb:144 +msgid "Then you can cancel the alert." +msgstr "" + +#: app/controllers/track_controller.rb:174 +msgid "Then you can cancel the alerts." +msgstr "" + +#: app/controllers/user_controller.rb:249 +msgid "Then you can change your email address used on {{site_name}}" +msgstr "" + +#: app/controllers/user_controller.rb:203 +msgid "Then you can change your password on {{site_name}}" +msgstr "" + +#: app/controllers/request_controller.rb:338 +msgid "Then you can classify the FOI response you have got from " +msgstr "" + +#: app/controllers/request_game_controller.rb:41 +msgid "Then you can play the request categorisation game." +msgstr "" + +#: app/controllers/user_controller.rb:330 +msgid "Then you can send a message to " +msgstr "" + +#: app/controllers/user_controller.rb:514 +msgid "Then you can sign in to {{site_name}}" +msgstr "" + +#: app/controllers/request_controller.rb:61 +msgid "Then you can update the status of your request to " +msgstr "" + +#: app/controllers/request_controller.rb:702 +msgid "Then you can upload an FOI response. " +msgstr "" + +#: app/controllers/request_controller.rb:545 +msgid "Then you can write follow up message to " +msgstr "" + +#: app/controllers/request_controller.rb:546 +msgid "Then you can write your reply to " +msgstr "" + +#: app/models/track_thing.rb:197 +msgid "" +"Then you will be emailed whenever '{{user_name}}' requests something or gets " +"a response." +msgstr "" + +#: app/models/track_thing.rb:213 +msgid "" +"Then you will be emailed whenever a new request or response matches " +"'{{query}}'." +msgstr "" + +#: app/models/track_thing.rb:162 +msgid "Then you will be emailed whenever an FOI request succeeds." +msgstr "" + +#: app/models/track_thing.rb:146 +msgid "Then you will be emailed whenever anyone makes a new FOI request." +msgstr "" + +#: app/models/track_thing.rb:181 +msgid "" +"Then you will be emailed whenever someone requests something or gets a " +"response from '{{public_body_name}}'." +msgstr "" + +#: app/controllers/request_controller.rb:299 +msgid "Then your FOI request to {{public_body_name}} will be sent." +msgstr "" + +#: app/controllers/comment_controller.rb:56 +msgid "Then your annotation to {{info_request_title}} will be posted." +msgstr "" + #: app/views/request_mailer/comment_on_alert_plural.rhtml:1 msgid "" "There are {{count}} new annotations on your {{info_request}} request. Follow " @@ -2008,17 +2711,21 @@ msgid "" " One of them is shown below, you may mean a different one:" msgstr "" -#: app/views/request/show.rhtml:112 +#: app/views/request/show.rhtml:113 msgid "" "There was a <strong>delivery error</strong> or similar, which needs fixing " -"by the WhatDoTheyKnow team." +"by the {{site_name}} team." +msgstr "" + +#: app/controllers/public_body_controller.rb:77 +msgid "There was an error with the words you entered, please try again." msgstr "" #: app/views/request/_describe_state.rhtml:38 msgid "They are going to reply <strong>by post</strong>" msgstr "" -#: app/views/request/_describe_state.rhtml:54 +#: app/views/request/_describe_state.rhtml:52 msgid "" "They do <strong>not have</strong> the information <small>(maybe they say who " "does)</small>" @@ -2044,7 +2751,7 @@ msgstr "" msgid "Things to do with this request" msgstr "" -#: app/views/public_body/show.rhtml:60 +#: app/views/public_body/show.rhtml:59 msgid "This authority no longer exists, so you cannot make a request to it." msgstr "" @@ -2094,25 +2801,31 @@ msgstr "" msgid "This person's" msgstr "" -#: app/views/request/_describe_state.rhtml:85 +#: app/views/request/_describe_state.rhtml:84 msgid "This request <strong>requires administrator attention</strong>" msgstr "" -#: app/views/request/show.rhtml:48 +#: app/views/request/show.rhtml:55 msgid "This request has an <strong>unknown status</strong>." msgstr "" -#: app/views/request/show.rhtml:116 +#: app/views/request/show.rhtml:117 msgid "" "This request has been <strong>withdrawn</strong> by the person who made " "it. \n" " \t There may be an explanation in the correspondence below." msgstr "" -#: app/views/request/show.rhtml:114 +#: app/models/info_request.rb:395 +msgid "" +"This request has been set by an administrator to \"allow new responses from " +"nobody\"" +msgstr "" + +#: app/views/request/show.rhtml:115 msgid "" "This request has had an unusual response, and <strong>requires attention</" -"strong> from the WhatDoTheyKnow team." +"strong> from the {{site_name}} team." msgstr "" #: app/views/request/show.rhtml:5 @@ -2144,21 +2857,47 @@ msgstr "" #: app/views/request/details.rhtml:6 msgid "" "This table shows the technical details of the internal events that happened\n" -"to this request on WhatDoTheyKnow. This could be used to generate " -"information about\n" +"to this request on {{site_name}}. This could be used to generate information " +"about\n" "the speed with which authorities respond to requests, the number of " "requests\n" "which require a postal response and much more." msgstr "" #: app/views/user/show.rhtml:79 -msgid "This user has been banned from WhatDoTheyKnow.com " +msgid "This user has been banned from {{site_name}} " msgstr "" -#: app/views/user_mailer/changeemail_already_used.rhtml:4 +#: app/views/user_mailer/changeemail_already_used.rhtml:5 msgid "" "This was not possible because there is already an account using \n" -"the email address " +"the email address {{email}}." +msgstr "" + +#: app/models/track_thing.rb:145 +msgid "To be emailed about any new requests" +msgstr "" + +#: app/models/track_thing.rb:161 +msgid "To be emailed about any successful requests" +msgstr "" + +#: app/models/track_thing.rb:196 +msgid "To be emailed about requests by '{{user_name}}'" +msgstr "" + +#: app/models/track_thing.rb:180 +msgid "" +"To be emailed about requests made using {{site_name}} to the public " +"authority '{{public_body_name}}'" +msgstr "" + +#: app/controllers/track_controller.rb:173 +msgid "To cancel these alerts" +msgstr "" + +#: app/controllers/track_controller.rb:143 +msgid "To cancel this alert" msgstr "" #: app/views/user/no_cookies.rhtml:5 @@ -2167,6 +2906,14 @@ msgid "" "was a technical problem trying to do this." msgstr "" +#: app/controllers/user_controller.rb:248 +msgid "To change your email address used on {{site_name}}" +msgstr "" + +#: app/controllers/request_controller.rb:337 +msgid "To classify the response to this FOI request" +msgstr "" + #: app/views/request/show_response.rhtml:39 msgid "To do that please send a private email to " msgstr "" @@ -2175,24 +2922,59 @@ msgstr "" msgid "To do this, first click on the link below." msgstr "" +#: app/models/track_thing.rb:212 +msgid "To follow requests and responses matching '{{query}}'" +msgstr "" + #: app/views/request_mailer/old_unclassified_updated.rhtml:1 msgid "" "To help us keep the site tidy, someone else has updated the status of the \n" -"{{law_used_full}} request {{title}} \n" -"that you made to {{public_body}}, to \n" -"{{display_status}} If you disagree with \n" -"their categorisation, please update the status again yourself to what\n" -"you believe to be more accurate." +"{{law_used_full}} request {{title}} that you made to {{public_body}}, to " +"\"{{display_status}}\" If you disagree with their categorisation, please " +"update the status again yourself to what you believe to be more accurate." msgstr "" #: app/views/request_mailer/new_response_reminder_alert.rhtml:1 msgid "To let us know, follow this link and then select the appropriate box." msgstr "" +#: app/controllers/request_game_controller.rb:40 +msgid "To play the request categorisation game" +msgstr "" + +#: app/controllers/comment_controller.rb:55 +msgid "To post your annotation" +msgstr "" + +#: app/controllers/request_controller.rb:543 +msgid "To reply to " +msgstr "" + +#: app/controllers/request_controller.rb:542 +msgid "To send a follow up message to " +msgstr "" + +#: app/controllers/user_controller.rb:329 +msgid "To send a message to " +msgstr "" + +#: app/controllers/request_controller.rb:298 +msgid "To send your FOI request" +msgstr "" + +#: app/controllers/request_controller.rb:60 +msgid "To update the status of this FOI request" +msgstr "" + +#: app/controllers/request_controller.rb:701 +msgid "" +"To upload a response, you must be logged in using an email address from " +msgstr "" + #: app/views/public_body/view_email_captcha.rhtml:5 msgid "" "To view the email address that we use to send FOI requests to " -"{{@public_body_name}}, please enter these words." +"{{public_body_name}}, please enter these words." msgstr "" #: app/views/request_mailer/new_response.rhtml:5 @@ -2203,11 +2985,19 @@ msgstr "" msgid "To {{public_body_link_absolute}}" msgstr "" -#: app/views/request/new.rhtml:88 app/views/request/followup_preview.rhtml:22 +#: app/views/request/followup_preview.rhtml:22 app/views/request/new.rhtml:88 #: app/views/request/preview.rhtml:17 msgid "To:" msgstr "" +#: app/models/track_thing.rb:174 +msgid "Track requests to {{public_body_name}} by email" +msgstr "" + +#: app/models/track_thing.rb:206 +msgid "Track things matching '{{query}}' by email" +msgstr "" + #: app/views/public_body/show.rhtml:3 msgid "Track this authority" msgstr "" @@ -2216,10 +3006,18 @@ msgstr "" msgid "Track this person" msgstr "" +#: app/models/track_thing.rb:190 +msgid "Track this person by email" +msgstr "" + #: app/views/request/_sidebar.rhtml:2 msgid "Track this request" msgstr "" +#: app/models/track_thing.rb:123 +msgid "Track this request by email" +msgstr "" + #: locale/model_attributes.rb:33 msgid "TrackThing|Track medium" msgstr "" @@ -2232,7 +3030,7 @@ msgstr "" msgid "TrackThing|Track type" msgstr "" -#: app/views/general/search.rhtml:121 +#: app/views/general/search.rhtml:133 msgid "" "Type <strong><code>01/01/2008..14/01/2008</code></strong> to only show " "things that happened in the first two weeks of January." @@ -2242,6 +3040,10 @@ msgstr "" msgid "URL name can't be blank" msgstr "" +#: app/models/user_mailer.rb:45 +msgid "Unable to change email address on {{site_name}}" +msgstr "" + #: app/views/request/followup_bad.rhtml:4 msgid "Unable to send a reply to {{username}}" msgstr "" @@ -2271,72 +3073,84 @@ msgid "" "address for" msgstr "" -#: app/views/general/exception_caught.rhtml:18 +#: app/views/general/exception_caught.rhtml:17 msgid "Unknown" msgstr "" +#: app/models/info_request_event.rb:317 +msgid "Unusual response" +msgstr "" + +#: app/models/info_request.rb:807 +msgid "Unusual response." +msgstr "" + #: app/views/request/_after_actions.rhtml:13 #: app/views/request/_after_actions.rhtml:33 msgid "Update the status of this request" msgstr "" -#: app/views/general/search.rhtml:112 +#: app/controllers/request_controller.rb:62 +msgid "Update the status of your request to " +msgstr "" + +#: app/views/general/search.rhtml:124 msgid "" "Use OR (in capital letters) where you don't mind which word, e.g. " "<strong><code>commons OR lords</code></strong>" msgstr "" -#: app/views/general/search.rhtml:113 +#: app/views/general/search.rhtml:125 msgid "" "Use quotes when you want to find an exact phrase, e.g. <strong><code>" "\"Liverpool City Council\"</code></strong>" msgstr "" -#: locale/model_attributes.rb:68 +#: locale/model_attributes.rb:67 msgid "UserInfoRequestSentAlert|Alert type" msgstr "" -#: locale/model_attributes.rb:79 +#: locale/model_attributes.rb:78 msgid "User|About me" msgstr "" -#: locale/model_attributes.rb:77 +#: locale/model_attributes.rb:76 msgid "User|Admin level" msgstr "" -#: locale/model_attributes.rb:78 +#: locale/model_attributes.rb:77 msgid "User|Ban text" msgstr "" -#: locale/model_attributes.rb:70 +#: locale/model_attributes.rb:69 msgid "User|Email" msgstr "" -#: locale/model_attributes.rb:74 +#: locale/model_attributes.rb:73 msgid "User|Email confirmed" msgstr "" -#: locale/model_attributes.rb:72 +#: locale/model_attributes.rb:71 msgid "User|Hashed password" msgstr "" -#: locale/model_attributes.rb:76 +#: locale/model_attributes.rb:75 msgid "User|Last daily track email" msgstr "" -#: locale/model_attributes.rb:71 +#: locale/model_attributes.rb:70 msgid "User|Name" msgstr "" -#: locale/model_attributes.rb:73 +#: locale/model_attributes.rb:72 msgid "User|Salt" msgstr "" -#: locale/model_attributes.rb:75 +#: locale/model_attributes.rb:74 msgid "User|Url name" msgstr "" -#: app/views/public_body/show.rhtml:22 +#: app/views/public_body/show.rhtml:21 msgid "View FOI email address" msgstr "" @@ -2349,10 +3163,10 @@ msgid "View FOI email address for {{public_body_name}}" msgstr "" #: app/views/contact_mailer/user_message.rhtml:10 -msgid "View Freedom of Information requests made by" +msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "" -#: app/views/layouts/default.rhtml:110 +#: app/views/layouts/default.rhtml:89 msgid "View authorities" msgstr "" @@ -2360,30 +3174,45 @@ msgstr "" msgid "View email" msgstr "" -#: app/views/layouts/default.rhtml:109 +#: app/views/layouts/default.rhtml:88 msgid "View requests" msgstr "" -#: app/views/request/show.rhtml:110 +#: app/models/info_request.rb:799 +msgid "Waiting clarification." +msgstr "" + +#: app/views/request/show.rhtml:111 msgid "" "Waiting for an <strong>internal review</strong> by {{public_body_link}} of " "their handling of this request." msgstr "" -#: app/views/request/followup_bad.rhtml:24 -msgid "We do not have a working" +#: app/views/general/search.rhtml:149 +msgid "" +"Waiting for the public authority to complete an internal review of their " +"handling of the request" +msgstr "" + +#: app/views/general/search.rhtml:142 +msgid "Waiting for the public authority to reply" msgstr "" #: app/views/public_body/view_email.rhtml:17 msgid "We do not have a working request email address for this authority." msgstr "" -#: app/views/request/_describe_state.rhtml:108 +#: app/views/request/followup_bad.rhtml:24 +msgid "" +"We do not have a working {{law_used_full}} address for {{public_body_name}}." +msgstr "" + +#: app/views/request/_describe_state.rhtml:107 msgid "" "We don't know whether the most recent response to this request contains\n" " information or not\n" " –\n" -"\tif you are {{user_link}} please <a href=\"%s\">sign in</a> and let " +"\tif you are {{user_link}} please <a href=\"{{url}}\">sign in</a> and let " "everyone know." msgstr "" @@ -2393,17 +3222,17 @@ msgid "" "or the law tell us to." msgstr "" -#: app/views/user_mailer/changeemail_confirm.rhtml:9 +#: app/views/user_mailer/changeemail_confirm.rhtml:10 msgid "" "We will not reveal your email addresses to anybody unless you\n" "or the law tell us to." msgstr "" -#: app/views/request/show.rhtml:54 +#: app/views/request/show.rhtml:61 msgid "We're waiting for" msgstr "" -#: app/views/request/show.rhtml:50 +#: app/views/request/show.rhtml:57 msgid "We're waiting for someone to read" msgstr "" @@ -2427,7 +3256,7 @@ msgid "" "password." msgstr "" -#: app/views/request/_followup.rhtml:62 +#: app/views/request/_followup.rhtml:58 msgid "What are you doing?" msgstr "" @@ -2435,12 +3264,6 @@ msgstr "" msgid "What best describes the status of this request now?" msgstr "" -#: app/views/public_body/view_email.rhtml:7 -msgid "" -"WhatDoTheyKnow sends new requests to <strong>{{request_email}}</strong> for " -"this authority." -msgstr "" - #: app/views/request_mailer/new_response.rhtml:9 msgid "" "When you get there, please update the status to say if the response \n" @@ -2463,30 +3286,74 @@ msgstr "" msgid "Which of these is happening?" msgstr "" +#: app/models/info_request_event.rb:313 +msgid "Withdrawn by requester" +msgstr "" + +#: app/models/info_request.rb:809 +msgid "Withdrawn by the requester." +msgstr "" + +#: app/controllers/request_controller.rb:549 +msgid "Write a reply to " +msgstr "" + +#: app/controllers/request_controller.rb:548 +msgid "Write your FOI follow up message to " +msgstr "" + #: app/views/request/new.rhtml:46 msgid "Write your request in <strong>simple, precise language</strong>." msgstr "" -#: app/views/public_body/show.rhtml:71 -msgid "" -"XXX this section needs localising re EIR as these are specific to UK law" +#: app/models/info_request_event.rb:301 +msgid "Wrong Response" msgstr "" #: app/views/comment/_single_comment.rhtml:10 msgid "You" msgstr "" -#: app/views/request/show.rhtml:81 +#: app/controllers/track_controller.rb:98 +msgid "You are already being emailed updates about " +msgstr "" + +#: app/models/track_thing.rb:175 +msgid "You are already tracking requests to {{public_body_name}} by email" +msgstr "" + +#: app/models/track_thing.rb:207 +msgid "You are already tracking things matching '{{query}}' by email" +msgstr "" + +#: app/models/track_thing.rb:191 +msgid "You are already tracking this person by email" +msgstr "" + +#: app/models/track_thing.rb:124 +msgid "You are already tracking this request by email" +msgstr "" + +#: app/models/track_thing.rb:156 +msgid "You are being emailed about any new successful responses" +msgstr "" + +#: app/models/track_thing.rb:140 +msgid "You are being emailed when there are new requests" +msgstr "" + +#: app/views/request/show.rhtml:88 msgid "You can <strong>complain</strong> by" msgstr "" -#: app/views/request/details.rhtml:57 +#: app/views/request/details.rhtml:58 msgid "" "You can get this page in computer-readable format as part of the main JSON\n" -"page for the request. See the <a href=\"%s\">API documentation</a>." +"page for the request. See the <a href=\"{{api_path}}\">API documentation</" +"a>." msgstr "" -#: app/views/public_body/show.rhtml:41 +#: app/views/public_body/show.rhtml:40 msgid "" "You can only request information about the environment from this authority." msgstr "" @@ -2499,22 +3366,36 @@ msgstr "" msgid "You have a new response to the {{law_used_full}} request " msgstr "" +#: app/controllers/user_controller.rb:492 +msgid "You have now changed the text about you on your profile." +msgstr "" + +#: app/controllers/user_controller.rb:310 +msgid "You have now changed your email address used on {{site_name}}" +msgstr "" + #: app/views/user_mailer/already_registered.rhtml:3 msgid "" -"You just tried to sign up to WhatDoTheyKnow.com, when you\n" +"You just tried to sign up to {{site_name}}, when you\n" "already have an account. Your name and password have been\n" "left as they previously were.\n" "\n" "Please click on the link below." msgstr "" +#: app/views/comment/new.rhtml:59 +msgid "" +"You know what caused the error, and can <strong>suggest a solution</strong>, " +"such as a working email address." +msgstr "" + #: app/views/request/upload_response.rhtml:16 msgid "" "You may <strong>include attachments</strong>. If you would like to attach a\n" "file too large for email, use the form below." msgstr "" -#: app/views/request/followup_bad.rhtml:25 +#: app/views/request/followup_bad.rhtml:24 msgid "" "You may be able to find\n" " one on their website, or by phoning them up and asking. If you manage\n" @@ -2528,6 +3409,22 @@ msgid "" "to find one, then please <a href=\"%s\">send it to us</a>." msgstr "" +#: app/controllers/user_controller.rb:470 +msgid "You need to be logged in to change the text about you on your profile." +msgstr "" + +#: app/controllers/user_controller.rb:371 +msgid "You need to be logged in to change your profile photo." +msgstr "" + +#: app/controllers/user_controller.rb:433 +msgid "You need to be logged in to clear your profile photo." +msgstr "" + +#: app/controllers/request_controller.rb:559 +msgid "You previously submitted that exact follow up message for this request." +msgstr "" + #: app/views/request/upload_response.rhtml:13 msgid "" "You should have received a copy of the request by email, and you can " @@ -2552,12 +3449,28 @@ msgid "" "email alerts." msgstr "" +#: app/controllers/track_controller.rb:154 +msgid "You will no longer be emailed updates about " +msgstr "" + +#: app/controllers/track_controller.rb:183 +msgid "You will no longer be emailed updates for those alerts" +msgstr "" + +#: app/controllers/track_controller.rb:111 +msgid "You will now be emailed updates about " +msgstr "" + #: app/views/request_mailer/not_clarified_alert.rhtml:6 msgid "" "You will only get an answer to your request if you follow up\n" "with the clarification." msgstr "" +#: app/controllers/user_controller.rb:442 +msgid "You've now cleared your profile photo" +msgstr "" + #: app/views/user/show.rhtml:152 msgid "Your " msgstr "" @@ -2578,8 +3491,8 @@ msgid "" "message, which will then go directly to the person who wrote the message." msgstr "" +#: app/views/user/_signin.rhtml:11 app/views/user/_signup.rhtml:9 #: app/views/user/signchangepassword_send_confirm.rhtml:13 -#: app/views/user/_signup.rhtml:9 app/views/user/_signin.rhtml:11 msgid "Your e-mail:" msgstr "" @@ -2587,6 +3500,31 @@ msgstr "" msgid "Your email subscriptions" msgstr "" +#: app/controllers/request_controller.rb:556 +msgid "" +"Your follow up has not been sent because this request has been stopped to " +"prevent spam. Please <a href=\"%s\">contact us</a> if you really want to " +"send a follow up message." +msgstr "" + +#: app/controllers/request_controller.rb:584 +msgid "Your follow up message has been sent on its way." +msgstr "" + +#: app/controllers/request_controller.rb:582 +msgid "Your internal review request has been sent on its way." +msgstr "" + +#: app/controllers/help_controller.rb:63 +msgid "" +"Your message has been sent. Thank you for getting in touch! We'll get back " +"to you soon." +msgstr "" + +#: app/controllers/user_controller.rb:349 +msgid "Your message to {{recipient_user_name}} has been sent!" +msgstr "" + #: app/views/request/followup_preview.rhtml:15 msgid "Your message will appear in <strong>search engines</strong>" msgstr "" @@ -2611,6 +3549,10 @@ msgstr "" msgid "Your original message is attached." msgstr "" +#: app/controllers/user_controller.rb:231 +msgid "Your password has been changed." +msgstr "" + #: app/views/user/signchangeemail.rhtml:25 msgid "Your password:" msgstr "" @@ -2618,7 +3560,7 @@ msgstr "" #: app/views/user/set_draft_profile_photo.rhtml:18 msgid "" "Your photo will be shown in public <strong>on the Internet</strong>, \n" -" wherever you do something on WhatDoTheyKnow." +" wherever you do something on {{site_name}}." msgstr "" #: app/views/request_mailer/new_response_reminder_alert.rhtml:5 @@ -2637,25 +3579,35 @@ msgid "" "\">read why</a> and answers to other questions." msgstr "" -#: app/views/request/new.rhtml:97 +#: app/views/comment/new.rhtml:62 msgid "" -"a one line summary of the information you are requesting, \n" -"\t\t\te.g." +"Your thoughts on what the {{site_name}} <strong>administrators</strong> " +"should do about the request." +msgstr "" + +#: app/models/track_mailer.rb:25 +msgid "Your {{site_name}} email alert" msgstr "" -#: app/views/track_mailer/event_digest.rhtml:31 -msgid "added an annotation" +#: app/models/outgoing_message.rb:69 +msgid "Yours faithfully," msgstr "" -#: app/views/request/followup_bad.rhtml:25 -msgid "address for" +#: app/models/outgoing_message.rb:67 +msgid "Yours sincerely," +msgstr "" + +#: app/views/request/new.rhtml:97 +msgid "" +"a one line summary of the information you are requesting, \n" +"\t\t\te.g." msgstr "" -#: app/views/public_body/show.rhtml:32 +#: app/views/public_body/show.rhtml:31 msgid "admin" msgstr "" -#: app/views/public_body/show.rhtml:30 +#: app/views/public_body/show.rhtml:29 msgid "also called {{public_body_short_name}}" msgstr "" @@ -2663,17 +3615,17 @@ msgstr "" msgid "and sign in as " msgstr "" -#: app/views/request/show.rhtml:52 +#: app/views/request/show.rhtml:59 msgid "" "and update the status accordingly. Perhaps <strong>you</strong> might like " "to help out by doing that?" msgstr "" -#: app/views/request/show.rhtml:57 +#: app/views/request/show.rhtml:64 msgid "and update the status." msgstr "" -#: app/views/request/_describe_state.rhtml:102 +#: app/views/request/_describe_state.rhtml:101 msgid "and we'll suggest <strong>what to do next</strong>" msgstr "" @@ -2685,19 +3637,27 @@ msgstr "" msgid "annotations" msgstr "" +#: app/models/track_thing.rb:138 +msgid "any <a href=\"/list\">new requests</a>" +msgstr "" + +#: app/models/track_thing.rb:154 +msgid "any <a href=\"/list/successful\">successful requests</a>" +msgstr "" + #: app/views/request_mailer/very_overdue_alert.rhtml:1 msgid "are long overdue." msgstr "" -#: app/controllers/public_body_controller.rb:110 +#: app/controllers/public_body_controller.rb:111 msgid "beginning with" msgstr "" -#: app/views/request/show.rhtml:75 +#: app/views/request/show.rhtml:82 msgid "by" msgstr "" -#: app/views/request/_followup.rhtml:41 +#: app/views/request/_followup.rhtml:38 msgid "by <strong>{{date}}</strong>" msgstr "" @@ -2709,11 +3669,11 @@ msgstr "" msgid "by {{user_link_absolute}}" msgstr "" -#: locale/model_attributes.rb:42 +#: locale/model_attributes.rb:35 msgid "censor rule" msgstr "" -#: locale/model_attributes.rb:26 +#: locale/model_attributes.rb:20 msgid "comment" msgstr "" @@ -2723,6 +3683,10 @@ msgid "" " Or you could phone them." msgstr "" +#: app/models/info_request_event.rb:338 +msgid "display_status only works for incoming and outgoing messages right now" +msgstr "" + #: app/views/request_mailer/overdue_alert.rhtml:3 msgid "during term time" msgstr "" @@ -2743,11 +3707,11 @@ msgstr "" msgid "even during holidays" msgstr "" -#: locale/model_attributes.rb:14 +#: locale/model_attributes.rb:17 msgid "exim log" msgstr "" -#: locale/model_attributes.rb:60 +#: locale/model_attributes.rb:59 msgid "exim log done" msgstr "" @@ -2759,12 +3723,12 @@ msgstr "" msgid "have delayed." msgstr "" -#: locale/model_attributes.rb:57 +#: locale/model_attributes.rb:56 msgid "holiday" msgstr "" -#: app/views/request/show.rhtml:63 app/views/request/show.rhtml:73 -#: app/views/request/_followup.rhtml:39 +#: app/views/request/_followup.rhtml:36 app/views/request/show.rhtml:70 +#: app/views/request/show.rhtml:80 msgid "in term time" msgstr "" @@ -2772,24 +3736,24 @@ msgstr "" msgid "in total" msgstr "" -#: locale/model_attributes.rb:63 +#: locale/model_attributes.rb:62 msgid "incoming message" msgstr "" -#: locale/model_attributes.rb:80 +#: locale/model_attributes.rb:79 msgid "info request" msgstr "" -#: locale/model_attributes.rb:35 +#: locale/model_attributes.rb:40 msgid "info request event" msgstr "" -#: app/views/user/signchangeemail.rhtml:3 #: app/views/user/set_profile_about_me.rhtml:3 +#: app/views/user/signchangeemail.rhtml:3 msgid "internal error" msgstr "" -#: app/views/request/show.rhtml:99 +#: app/views/request/show.rhtml:100 msgid "is <strong>waiting for your clarification</strong>." msgstr "" @@ -2806,11 +3770,7 @@ msgstr "" msgid "made." msgstr "" -#: app/views/track_mailer/event_digest.rhtml:54 -msgid "need to add other types to TrackMailer.event_digest" -msgstr "" - -#: app/views/request/show.rhtml:67 +#: app/views/request/show.rhtml:74 msgid "no later than" msgstr "" @@ -2824,7 +3784,7 @@ msgid "" "to us</a>." msgstr "" -#: app/views/request/show.rhtml:65 +#: app/views/request/show.rhtml:72 msgid "normally" msgstr "" @@ -2832,7 +3792,7 @@ msgstr "" msgid "only" msgstr "" -#: locale/model_attributes.rb:20 +#: locale/model_attributes.rb:25 msgid "outgoing message" msgstr "" @@ -2844,11 +3804,11 @@ msgstr "" msgid "please sign in or make a new account." msgstr "" -#: locale/model_attributes.rb:50 +#: locale/model_attributes.rb:49 msgid "post redirect" msgstr "" -#: locale/model_attributes.rb:17 +#: locale/model_attributes.rb:14 msgid "profile photo" msgstr "" @@ -2864,7 +3824,7 @@ msgstr "" msgid "request." msgstr "" -#: app/views/request/show.rhtml:82 +#: app/views/request/show.rhtml:89 msgid "requesting an internal review" msgstr "" @@ -2874,7 +3834,7 @@ msgid "" "email to let them know what you are going to do about it." msgstr "" -#: app/views/request/show.rhtml:101 +#: app/views/request/show.rhtml:102 msgid "send a follow up message" msgstr "" @@ -2882,7 +3842,7 @@ msgstr "" msgid "sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "" -#: app/views/request/show.rhtml:105 +#: app/views/request/show.rhtml:106 msgid "sign in" msgstr "" @@ -2894,16 +3854,25 @@ msgstr "" msgid "that you made to" msgstr "" -#: app/views/user/show.rhtml:140 -msgid "this person" -msgstr "" - -#: app/views/user_mailer/changeemail_already_used.rhtml:2 -msgid "to" +#: app/views/request_mailer/comment_on_alert.rhtml:6 +#: app/views/request_mailer/comment_on_alert_plural.rhtml:5 +#: app/views/request_mailer/new_response.rhtml:15 +#: app/views/request_mailer/new_response_reminder_alert.rhtml:8 +#: app/views/request_mailer/not_clarified_alert.rhtml:9 +#: app/views/request_mailer/old_unclassified_updated.rhtml:8 +#: app/views/request_mailer/overdue_alert.rhtml:9 +#: app/views/request_mailer/stopped_responses.rhtml:16 +#: app/views/request_mailer/very_overdue_alert.rhtml:11 +#: app/views/track_mailer/event_digest.rhtml:66 +#: app/views/user_mailer/already_registered.rhtml:11 +#: app/views/user_mailer/changeemail_already_used.rhtml:10 +#: app/views/user_mailer/changeemail_confirm.rhtml:13 +#: app/views/user_mailer/confirm_login.rhtml:11 +msgid "the {{site_name}} team" msgstr "" -#: app/views/user_mailer/changeemail_confirm.rhtml:5 -msgid "to " +#: app/views/user/show.rhtml:140 +msgid "this person" msgstr "" #: app/views/user/show.rhtml:113 @@ -2916,15 +3885,15 @@ msgstr "" msgid "to check that the info isn't already published." msgstr "" -#: app/views/request/show.rhtml:55 +#: app/views/request/show.rhtml:62 msgid "to read" msgstr "" -#: app/views/request/show.rhtml:105 +#: app/views/request/show.rhtml:106 msgid "to send a follow up message." msgstr "" -#: app/views/request/show.rhtml:39 +#: app/views/request/show.rhtml:45 msgid "to {{public_body}}" msgstr "" @@ -2940,10 +3909,14 @@ msgstr "" msgid "unknown event type indexed " msgstr "" -#: app/views/request/followup_bad.rhtml:30 +#: app/views/request/followup_bad.rhtml:29 msgid "unknown reason " msgstr "" +#: app/models/info_request.rb:814 app/models/info_request_event.rb:333 +msgid "unknown status " +msgstr "" + #: app/views/user/show.rhtml:208 msgid "unsubscribe" msgstr "" @@ -2952,15 +3925,15 @@ msgstr "" msgid "unsubscribe all" msgstr "" -#: app/views/request/show.rhtml:46 +#: app/views/request/show.rhtml:53 msgid "useful information." msgstr "" -#: locale/model_attributes.rb:69 +#: locale/model_attributes.rb:68 msgid "user" msgstr "" -#: locale/model_attributes.rb:67 +#: locale/model_attributes.rb:66 msgid "user info request sent alert" msgstr "" @@ -2980,7 +3953,7 @@ msgstr "" msgid "{{info_request_user_name}} only:" msgstr "" -#: app/views/general/frontpage.rhtml:49 +#: app/views/general/frontpage.rhtml:51 msgid "{{length_of_time}} ago" msgstr "" @@ -2988,7 +3961,33 @@ msgstr "" msgid "{{public_body_name}} only:" msgstr "" -#: app/views/request/show.rhtml:35 -msgid "{{user}} made this {{law_used_full}} request" +#: app/views/public_body/view_email.rhtml:7 +msgid "" +"{{site_name}} sends new requests to <strong>{{request_email}}</strong> for " +"this authority." msgstr "" +#: app/models/user.rb:122 +msgid "{{user_name}} (Banned)" +msgstr "" + +#: app/views/request_mailer/comment_on_alert.rhtml:1 +msgid "" +"{{user_name}} has annotated your {{law_used_short}} \n" +"request. Follow this link to see what they wrote." +msgstr "" + +#: app/views/contact_mailer/user_message.rhtml:2 +msgid "{{user_name}} has used {{site_name}} to send you the message below." +msgstr "" + +#: app/views/request/show.rhtml:36 +msgid "" +"{{user}} (<a href=\"{{user_admin_url}}\">admin</a>) made this " +"{{law_used_full}} request (<a href=\"{{request_admin_url}}\">admin</a>) to " +"{{public_body_link}} (<a href=\"{{public_body_admin_url}}\">admin</a>)" +msgstr "" + +#: app/views/request/show.rhtml:44 +msgid "{{user}} made this {{law_used_full}} request" +msgstr "" diff --git a/locale/es/app.po b/locale/es/app.po index 95ad582b1..3e744973f 100644 --- a/locale/es/app.po +++ b/locale/es/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: 2011-07-12 15:18+0100\n" -"PO-Revision-Date: 2011-07-27 00:27+0000\n" -"Last-Translator: vickyanderica <victoria@access-info.org>\n" +"POT-Creation-Date: 2011-08-11 12:30+0200\n" +"PO-Revision-Date: 2011-08-12 00:21+0000\n" +"Last-Translator: dcabo <david.cabo@gmail.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,9 +19,16 @@ msgstr "" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" +#: app/models/incoming_message.rb:866 +msgid "" +"\n" +"\n" +"[ {{site_name}} note: The above text was badly encoded, and has had strange characters removed. ]" +msgstr "" + #: app/views/user/set_profile_about_me.rhtml:14 msgid "" -" This will appear on your WhatDoTheyKnow profile, to make it\n" +" This will appear on your {{site_name}} profile, to make it\n" " easier for others to get involved with what you're doing." msgstr "" @@ -30,16 +37,20 @@ msgid "" " (<strong>no ranty</strong> politics, read our <a href=\"%s\">moderation " "policy</a>)" msgstr "" +" (<strong>sin ataques políticos</strong>, lea nuestra <a " +"href=\"%s\">política de moderación</a>)" #: app/views/request/upload_response.rhtml:40 msgid "" " (<strong>patience</strong>, especially for large files, it may take a " "while!)" msgstr "" +" (<strong>paciencia</strong>, especialmente con ficheros grandes, puede " +"tardar unos minutos!)" #: app/views/user/show.rhtml:59 msgid " (you)" -msgstr "" +msgstr " (usted)" #: app/views/user/signchangepassword_send_confirm.rhtml:18 msgid "" @@ -47,30 +58,40 @@ msgid "" " We will send you an email. Follow the instructions in it to change\n" " your password." msgstr "" +" <strong>Nota::</strong>\n" +" Le enviaremos un correo. Siga sus instrucciones para cambiar\n" +" su contraseña." #: app/views/user/contact.rhtml:35 msgid " <strong>Privacy note:</strong> Your email address will be given to" msgstr "" +" <strong>Nota sobre privacidad:</strong> Su dirección de correo será dada a" #: app/views/comment/new.rhtml:33 msgid " <strong>Summarise</strong> the content of any information returned. " msgstr "" +" <strong>Resuma</strong> el contenido de cualquier información obtenida. " #: app/views/comment/new.rhtml:23 msgid " Advise on how to <strong>best clarify</strong> the request." msgstr "" +" Consejo sobre cómo <strong>aclarar lo mejor posible</strong> la petición." #: app/views/comment/new.rhtml:49 msgid "" " Ideas on what <strong>other documents to request</strong> which the " "authority may hold. " msgstr "" +" Ideas sobre <strong>qué otros documentos pedir</strong> que el organismo " +"público puede tener. " #: app/views/public_body/view_email.rhtml:30 msgid "" " If you know the address to use, then please <a href=\"%s\">send it to us</a>.\n" " You may be able to find the address on their website, or by phoning them up and asking." msgstr "" +" Si conoce la dirección a utilizar, entonces por favor <a href=\"%s\">envíenosla</a>.\n" +" Puede que la encuentre en su página web, o llamándoles por teléfono y preguntando." #: app/views/user/set_profile_about_me.rhtml:26 msgid "" @@ -78,64 +99,75 @@ msgid "" " twitter account. They will be made clickable. \n" " e.g." msgstr "" +" Incluya enlaces relevantes, como a una página informativa, su blog o\n" +" cuenta de Twitter. Se convertirán en enlaces automáticamente. \n" +" Por ejemplo:" #: app/views/comment/new.rhtml:27 msgid "" " Link to the information requested, if it is <strong>already " "available</strong> on the Internet. " msgstr "" +" Enlace a la información pedida, si <strong>ya está disponible</strong> en " +"Internet. " #: app/views/comment/new.rhtml:29 msgid "" " Offer better ways of <strong>wording the request</strong> to get the " "information. " msgstr "" +" Ofrecer mejores formas de <strong>redactar su petición</strong> para " +"conseguir la información. " #: app/views/user/sign.rhtml:26 msgid " Please sign in or make a new account." -msgstr "" +msgstr " Por favor abra una sesión o cree una nueva cuenta" #: app/views/comment/new.rhtml:34 msgid "" " Say how you've <strong>used the information</strong>, with links if " "possible." msgstr "" +" Diga cómo ha <strong>usado la información</strong>, con enlaces si es " +"posible." #: app/views/comment/new.rhtml:28 msgid "" " Suggest <strong>where else</strong> the requester might find the " "information. " msgstr "" +" Sugiera <strong>en qué otro lugar</strong> el peticionario puede encontrar " +"la información. " #: app/views/user/set_profile_about_me.rhtml:11 msgid " What are you investigating using Freedom of Information? " -msgstr "" +msgstr " ¿Qué está investigando usando Acceso a la Información? " #: app/controllers/comment_controller.rb:75 msgid " You are already being emailed updates about the request." -msgstr "" +msgstr " Ya está recibiendo actualizaciones por correo sobre la petición." #: app/controllers/comment_controller.rb:73 msgid " You will also be emailed updates about the request." -msgstr "" +msgstr " Recibirá actualizaciones por correo sobre esta petición." #: app/views/request/upload_response.rhtml:5 msgid " made by " -msgstr "" +msgstr " hecha por " #: app/views/user/show.rhtml:123 msgid " made no Freedom of Information requests using this site." -msgstr "" +msgstr " no ha hecho peticiones de Acceso a la Información en esta web." #: app/views/user/contact.rhtml:36 msgid " when you send this message." -msgstr "" +msgstr " cuando envió este mensaje." #: app/views/public_body/show.rhtml:80 -msgid "%d Freedom of Information request" -msgid_plural "%d Freedom of Information requests" -msgstr[0] "%d petición de acceso a información" -msgstr[1] "%d peticiones de acceso a información" +msgid "%d Freedom of Information request made using this site" +msgid_plural "%d Freedom of Information requests made using this site" +msgstr[0] "" +msgstr[1] "" #: app/views/general/frontpage.rhtml:36 msgid "%d request" @@ -143,6 +175,12 @@ msgid_plural "%d requests" msgstr[0] "%d petición" msgstr[1] "%d peticiones" +#: app/views/public_body/_body_listing_single.rhtml:21 +msgid "%d request made." +msgid_plural "%d requests made." +msgstr[0] "" +msgstr[1] "" + #: app/views/request/new.rhtml:102 msgid "'Crime statistics by ward level for Wales'" msgstr "" @@ -151,7 +189,7 @@ msgstr "" msgid "'Pollution levels over time for the River Tyne'" msgstr "" -#: app/controllers/user_controller.rb:354 +#: app/controllers/user_controller.rb:355 msgid "" ",\n" "\n" @@ -161,160 +199,194 @@ msgid "" "\n" "{{user_name}}" msgstr "" +",\n" +"\n" +"\n" +"\n" +"Un saludo,\n" +"\n" +"{{user_name}}" #: app/views/request/_after_actions.rhtml:9 msgid "<a href=\"%s\">Add an annotation</a> (to help the requester or others)" msgstr "" +"<a href=\"%s\">Añada un comentario</a> (para ayudar al peticionario o a " +"otros)" #: app/views/public_body/list.rhtml:29 msgid "<a href=\"%s\">Are we missing a public authority?</a>." -msgstr "" +msgstr "<a href=\"%s\">¿Nos falta algún organismo público?</a>." #: app/views/request/_sidebar.rhtml:45 msgid "" "<a href=\"%s\">Are you the owner of\n" " any commercial copyright on this page?</a>" msgstr "" +"<a href=\"%s\">¿Posee el copyright\n" +" de alguna información de esta página?</a>" #: app/views/general/search.rhtml:53 msgid "<a href=\"%s\">Browse all</a> or <a href=\"%s\">ask us to add one</a>." -msgstr "<a href=\"%s\">Ver todas</a> o <a href=\"%s\">pídenos que añadamos una</a>." +msgstr "<a href=\"%s\">Ver todas</a> o <a href=\"%s\">pídanos que añadamos una</a>." #: app/views/general/exception_caught.rhtml:13 msgid "<a href=\"%s\">Contact us</a> to tell us about the problem</li>" -msgstr "" - -#: app/views/public_body/show.rhtml:50 -msgid "" -"<a href=\"%s\">Make a new Freedom of Information request</a> to " -"{{public_body_name}}" -msgstr "" -"<a href=\"%s\">Hacer una nueva petición de información</a> a " -"{{public_body_name}}" +msgstr "<a href=\"%s\">Contáctenos</a> para informarnos sobre el problema</li>" #: app/views/public_body/list.rhtml:43 msgid "<a href=\"%s\">can't find the one you want?</a>" -msgstr "" +msgstr "<a href=\"%s\">¿No puede encontrar el que busca?</a>" -#: app/views/request/_followup.rhtml:42 app/views/request/_followup.rhtml:49 -#: app/views/request/show.rhtml:76 app/views/request/show.rhtml:80 +#: app/views/request/_followup.rhtml:39 app/views/request/_followup.rhtml:46 +#: app/views/request/show.rhtml:83 app/views/request/show.rhtml:87 msgid "<a href=\"%s\">details</a>" -msgstr "" +msgstr "<a href=\"%s\">detalles</a>" -#: app/views/request/_followup.rhtml:77 +#: app/views/request/_followup.rhtml:74 msgid "<a href=\"%s\">what's that?</a>" +msgstr "<a href=\"%s\">¿Qué es eso?</a>" + +#: app/views/public_body/show.rhtml:50 +msgid "" +"<a href=\"{{url}}\">Make a new Freedom of Information request</a> to " +"{{public_body_name}}" msgstr "" #: app/controllers/request_game_controller.rb:23 msgid "" "<p>All done! Thank you very much for your help.</p><p>There are <a " -"href=\"%s\">more things you can do</a> to help WhatDoTheyKnow.</p>" +"href=\"{{helpus_url}}\">more things you can do</a> to help " +"{{site_name}}.</p>" msgstr "" -#: app/controllers/request_controller.rb:394 +#: app/controllers/request_controller.rb:399 msgid "" "<p>Thank you! Here are some ideas on what to do next:</p>\n" " <ul>\n" -" <li>To send your request to another authority, first copy the text of your request below, then <a href=\"%s\">find the other authority</a>.</li>\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=\"%s\">how to complain</a>.\n" +" <a href=\"{{complain_url}}\">how to complain</a>.\n" " </li>\n" -" <li>We have <a href=\"%s\">suggestions</a>\n" +" <li>We have <a href=\"{{other_means_url}}\">suggestions</a>\n" " on other means to answer your question.\n" " </li>\n" -" </ul>\n" -" " +" </ul>" msgstr "" -#: app/controllers/request_controller.rb:388 +#: app/controllers/request_controller.rb:393 msgid "" "<p>Thank you! Hope you don't have to wait much longer.</p> <p>By law, you " "should have got a response promptly, and normally before the end of " "<strong>{{date_response_required_by}}</strong>.</p>" msgstr "" +"<p>¡Gracias! Esperamos que no tenga que esperar mucho más.</p> <p>Por ley, " +"debería recibir una respuesta pronto, y normalmente antes del final de " +"<strong>{{date_response_required_by}}</strong>.</p>" -#: app/controllers/request_controller.rb:384 +#: app/controllers/request_controller.rb:389 msgid "" "<p>Thank you! Hopefully your wait isn't too long.</p> <p>By law, you should get a response promptly, and normally before the end of <strong>\n" "{{date_response_required_by}}</strong>.</p>" msgstr "" +"<p>¡Gracias! Esperamos que su espera no sea demasiado larga.</p> <p>Por ley, debería recibir una respuesta pronto, y normalmente antes del fin de <strong>\n" +"{{date_response_required_by}}</strong>.</p>" -#: app/controllers/request_controller.rb:421 +#: app/controllers/request_controller.rb:428 msgid "" "<p>Thank you! Hopefully your wait isn't too long.</p><p>You should get a " "response within 20 days, or be told if it will take longer (<a " -"href=\"%s\">details</a>).</p>" +"href=\"{{review_url}}\">details</a>).</p>" msgstr "" -#: app/controllers/request_controller.rb:424 +#: app/controllers/request_controller.rb:431 msgid "" "<p>Thank you! We'll look into what happened and try and fix it up.</p><p>If " "the error was a delivery failure, and you can find an up to date FOI email " "address for the authority, please tell us using the form below.</p>" msgstr "" +"<p>¡Gracias! Investigaremos lo ocurrido y trataremos de arreglarlo.</p><p> " +"Si el error ha sido al intentar entregar el correo, y puede encontrar una " +"dirección más actualizada para este organismo, por favor indíquenoslo en el " +"siguiente formulario.</p>" -#: app/controllers/request_controller.rb:391 +#: app/controllers/request_controller.rb:396 msgid "" "<p>Thank you! Your request is long overdue, by more than 40 working days. " "Most requests should be answered within 20 working days. You might like to " "complain about this, see below.</p>" msgstr "" -#: app/controllers/user_controller.rb:494 +#: app/controllers/user_controller.rb:495 msgid "" "<p>Thanks for changing the text about you on your profile.</p>\n" " <p><strong>Next...</strong> You can upload a profile photograph too.</p>" msgstr "" +"<p>Gracias por actualizar el texto de su perfil personal.</p>\n" +" <p><strong>Ahora...</strong> puede subir también una foto a su perfil.</p>" -#: app/controllers/user_controller.rb:416 +#: app/controllers/user_controller.rb:417 msgid "" "<p>Thanks for updating your profile photo.</p>\n" " <p><strong>Next...</strong> You can put some text about you and your research on your profile.</p>" msgstr "" +"<p>Gracias por actualizar la foto de su perfil.</p>\n" +" <p><strong>Ahora...</strong> puede escribir sobre usted y su investigación en su perfil.</p>" -#: app/controllers/request_controller.rb:279 +#: app/controllers/request_controller.rb:284 msgid "" "<p>We recommend that you edit your request and remove the email address.\n" " If you leave it, the email address will be sent to the authority, but will not be displayed on the site.</p>" msgstr "" +"<p>Le aconsejamos que edite su petición y elimine su dirección de correo.\n" +" Si la deja, su dirección será enviada al organismo público, pero no será visible en esta web.</p>" -#: app/controllers/request_controller.rb:410 +#: app/controllers/request_controller.rb:417 msgid "" "<p>We're glad you got all the information that you wanted. If you write " "about or make use of the information, please come back and add an annotation" -" below saying what you did.</p><p>If you found WhatDoTheyKnow useful, <a " -"href=\"%s\">make a donation</a> to the charity which runs it.</p>" +" below saying what you did.</p><p>If you found {{site_name}} useful, <a " +"href=\"{{donation_url}}\">make a donation</a> to the charity which runs " +"it.</p>" msgstr "" -#: app/controllers/request_controller.rb:413 +#: app/controllers/request_controller.rb:420 msgid "" "<p>We're glad you got some of the information that you wanted. If you found " -"WhatDoTheyKnow useful, <a href=\"%s\">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>" +"{{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to " +"the charity which runs it.</p><p>If you want to try and get the rest of the " +"information, here's what to do now.</p>" msgstr "" -#: app/controllers/request_controller.rb:277 +#: app/controllers/request_controller.rb:282 msgid "" "<p>You do not need to include your email in the request in order to get a " "reply (<a href=\"%s\">details</a>).</p>" msgstr "" +"<p>No necesita incluir su dirección de correo en la petición para recibir " +"una respuesta (<a href=\"%s\">más detalles</a>).</p>" -#: app/controllers/request_controller.rb:275 +#: app/controllers/request_controller.rb:280 msgid "" "<p>You do not need to include your email in the request in order to get a " "reply, as we will ask for it on the next screen (<a " "href=\"%s\">details</a>).</p>" msgstr "" +"<p>No necesita incluir su dirección de correo en la petición para recibir " +"una respuesta, se la pediremos en el siguiente paso (<a href=\"%s\">más " +"detalles</a>).</p>" -#: app/controllers/request_controller.rb:283 +#: app/controllers/request_controller.rb:288 msgid "" "<p>Your request contains a <strong>postcode</strong>. Unless it directly " "relates to the subject of your request, please remove any address as it will" " <strong>appear publicly on the Internet</strong>.</p>" msgstr "" +"<p>Su petición incluye un <strong>código postal</strong>. Salvo que esté " +"directamente relacionado con su petición, por favor elimine cualquier " +"dirección, ya que <strong>estará disponible públicamente en " +"Internet</strong>.</p>" -#: app/controllers/request_controller.rb:306 +#: app/controllers/request_controller.rb:311 msgid "" "<p>Your {{law_used_full}} request has been <strong>sent on its way</strong>!</p>\n" " <p><strong>We will email you</strong> when there is a response, or after 20 working days if the authority still hasn't\n" @@ -323,18 +395,30 @@ msgid "" " annotation below telling people about your writing.</p>" msgstr "" +#: app/controllers/application_controller.rb:279 +msgid "" +"<p>{{site_name}} is currently in maintenance. You can only view existing " +"requests. You cannot make new ones, add followups or annotations, or " +"otherwise change the database.</p> <p>{{read_only}}</p>" +msgstr "" + #: app/views/user/confirm.rhtml:11 msgid "" "<small>If you use web-based email or have \"junk mail\" filters, also check your\n" "bulk/spam mail folders. Sometimes, our messages are marked that way.</small>\n" "</p>" msgstr "" +"<small>Si usa correo web o tiene filtros \"anti spam\", por favor compruebe\n" +"sus carpetas de spam. A veces, nuestros mensajes se marcan así por error.</small>\n" +"</p>" #: app/views/request/new.rhtml:131 msgid "" "<strong> Can I request information about myself?</strong>\n" "\t\t\t<a href=\"%s\">No! (Click here for details)</a>" msgstr "" +"<strong> ¿Puedo pedir información sobre mí?</strong>\n" +"\t\t\t<a href=\"%s\">¡No! (Pulse aquí para más detalles)</a>" #: app/views/general/search.rhtml:130 msgid "" @@ -381,12 +465,9 @@ msgstr "" #: app/views/general/search.rhtml:126 msgid "" "<strong><code>status:</code></strong> to select based on the status or " -"historical status of the request, see the <a href=\"%s\">table of " -"statuses</a> below." +"historical status of the request, see the <a href=\"{{statuses_url}}\">table" +" of statuses</a> below." msgstr "" -"<code><strong>status:</strong></code> para seleccionar en función del estado" -" de la solicitud, consulte la <a href=\"%s\">tabla de estados</a> a " -"continuación." #: app/views/general/search.rhtml:134 msgid "" @@ -401,46 +482,48 @@ msgstr "" #: app/views/general/search.rhtml:127 msgid "" "<strong><code>variety:</code></strong> to select type of thing to search " -"for, see the <a href=\"%s\">table of varieties</a> below." +"for, see the <a href=\"{{varieties_url}}\">table of varieties</a> below." msgstr "" -"<strong><code>variety:</code></strong> para seleccionar el tipo de " -"información a buscar, consulte la <a href=\"%s\">tabla de tipos</a> a " -"continuación." #: app/views/comment/new.rhtml:56 msgid "" "<strong>Advice</strong> on how to get a response that will satisfy the " "requester. </li>" msgstr "" +"<strong>Consejos</strong> sobre cómo conseguir una respuesta que satisfaga " +"al peticionario. </li>" #: app/views/request/_other_describe_state.rhtml:56 msgid "<strong>All the information</strong> has been sent" -msgstr "" +msgstr "<strong>Toda la información</strong> ha sido enviada" -#: app/views/request/_followup.rhtml:82 +#: app/views/request/_followup.rhtml:79 msgid "" "<strong>Anything else</strong>, such as clarifying, prompting, thanking" msgstr "" +"<strong>Otras cosas</strong>, como aclarar, preguntar, dar las gracias" #: app/views/request/details.rhtml:12 msgid "" "<strong>Caveat emptor!</strong> To use this data in an honourable way, you will need \n" -"a good internal knowledge of user behaviour on WhatDoTheyKnow. How, \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=\"%s\">contact us</a> with questions." +"<a href=\"{{contact_path}}\">contact us</a> with questions." msgstr "" #: app/views/request/_other_describe_state.rhtml:28 msgid "<strong>Clarification</strong> has been requested" -msgstr "" +msgstr "Se ha solicitado una <strong>aclaración</strong>" #: app/views/request/_other_describe_state.rhtml:14 msgid "" "<strong>No response</strong> has been received\n" " <small>(maybe there's just an acknowledgement)</small>" msgstr "" +"No se ha recibido <strong>ninguna respuesta</strong>\n" +" <small>(puede que se trate sólo de un acuse de recibo)</small>" #: app/views/user/signchangeemail.rhtml:30 msgid "" @@ -448,23 +531,30 @@ msgid "" " We will send an email to your new email address. Follow the\n" " instructions in it to confirm changing your email." msgstr "" +"<strong>Nota:</strong>\n" +" Enviaremos un correo a la nueva dirección de correo. Siga\n" +" sus instrucciones para confirmar la nueva dirección." #: app/views/user/contact.rhtml:32 msgid "" "<strong>Note:</strong> You're sending a message to yourself, presumably\n" " to try out how it works." msgstr "" +"<strong>Nota:</strong> Se está enviando un mensaje a sí mismo, suponemos\n" +" que para probar cómo funciona." #: app/views/request/preview.rhtml:31 msgid "" "<strong>Privacy note:</strong> If you want to request private information about\n" " yourself then <a href=\"%s\">click here</a>." msgstr "" +"<strong>Nota sobre privacidad:</strong> Si quiere solicitar información privada\n" +" sobre sí mismo entonces <a href=\"%s\">siga este enlace</a>." #: app/views/user/set_crop_profile_photo.rhtml:35 msgid "" "<strong>Privacy note:</strong> Your photo will be shown in public on the Internet, \n" -" wherever you do something on WhatDoTheyKnow." +" wherever you do something on {{site_name}}." msgstr "" #: app/views/request/followup_preview.rhtml:37 @@ -472,18 +562,20 @@ msgid "" "<strong>Privacy warning:</strong> Your message, and any response\n" " to it, will be displayed publicly on this website." msgstr "" +"<strong>Nota sobre privacidad:</strong> Su mensaje, y cualquier respuesta,\n" +" estarán disponibles públicamente en esta web." #: app/views/request/_other_describe_state.rhtml:52 msgid "<strong>Some of the information</strong> has been sent " -msgstr "" +msgstr "Se ha enviado <strong>parte de la información</strong> " #: app/views/general/exception_caught.rhtml:17 msgid "<strong>Technical details:</strong>" -msgstr "" +msgstr "<strong>Detalles técnicos:</strong>" #: app/views/comment/new.rhtml:35 msgid "<strong>Thank</strong> the public authority or " -msgstr "" +msgstr "<strong>Dé las gracias</strong> al organismo público o " #: app/views/request/new.rhtml:23 msgid "" @@ -491,28 +583,42 @@ msgid "" "scheme</a> or <strong>search</strong> their web site ..." msgstr "" -#: app/views/request/show.rhtml:84 +#: app/views/request/show.rhtml:91 msgid "<strong>did not have</strong> the information requested." -msgstr "" +msgstr "<strong>no tenía</strong> la información solicitada." #: app/views/request/new.rhtml:25 msgid "<strong>search</strong> the authority's web site ..." -msgstr "" +msgstr "<strong>busque</strong> en la web del organismo público ..." #: app/views/comment/new.rhtml:45 msgid "" "A <strong>summary</strong> of the response if you have received it by post. " msgstr "" +"Un <strong>resumen</strong> de la respuesta si la ha recibido por correo " +"ordinario. " + +#: app/views/general/search.rhtml:162 +msgid "A public authority" +msgstr "" #: app/views/request/_other_describe_state.rhtml:34 msgid "A response will be sent <strong>by post</strong>" +msgstr "Una respuesta será enviada <strong>por correo ordinario</strong>" + +#: app/views/general/search.rhtml:151 +msgid "A strange reponse, required attention by the {{site_name}} team" +msgstr "" + +#: app/views/general/search.rhtml:163 +msgid "A {{site_name}} user" msgstr "" #: app/views/user/set_profile_about_me.rhtml:20 msgid "About you:" -msgstr "" +msgstr "Sobre mí:" -#: app/models/info_request_event.rb:288 +#: app/models/info_request_event.rb:293 msgid "Acknowledgement" msgstr "" @@ -522,7 +628,7 @@ msgstr "" #: app/views/comment/new.rhtml:14 msgid "Add an annotation to " -msgstr "" +msgstr "Añada un comentario a " #: app/views/request/show_response.rhtml:47 msgid "" @@ -530,13 +636,17 @@ msgid "" " a <strong>summary of the response</strong>." msgstr "" +#: app/views/public_body/_body_listing_single.rhtml:26 +msgid "Added on {{date}}" +msgstr "" + #: app/models/user.rb:54 msgid "Admin level is not included in list" msgstr "Nivel de Administrador no incluido en la lista" #: app/views/request_mailer/requires_admin.rhtml:9 msgid "Administration URL:" -msgstr "" +msgstr "URL de Administración:" #: app/views/general/search.rhtml:31 app/views/general/search.rhtml:121 msgid "Advanced search tips" @@ -547,6 +657,8 @@ msgid "" "Advise on whether the <strong>refusal is legal</strong>, and how to complain" " about it if not." msgstr "" +"Consejo sobre <strong>si el rechazo es legal</strong>, y como apelar si no " +"lo es." #: app/views/request/new.rhtml:69 msgid "" @@ -554,12 +666,20 @@ msgid "" " human beings)" msgstr "" -#: app/models/info_request_event.rb:304 +#: app/models/info_request_event.rb:309 msgid "All information sent" +msgstr "Toda la información enviada" + +#: app/views/general/search.rhtml:146 +msgid "All of the information requested has been received" msgstr "" #: app/views/public_body/list.rhtml:5 msgid "Alphabet" +msgstr "Alfabeto" + +#: app/views/public_body/_body_listing_single.rhtml:12 +msgid "Also called {{other_name}}." msgstr "" #: app/views/request_mailer/new_response.rhtml:12 @@ -567,82 +687,102 @@ msgid "" "Although all responses are automatically published, we depend on\n" "you, the original requester, to evaluate them." msgstr "" +"Aunque todas las respuestas se publican automáticamente, dependemos\n" +"de usted, el creador de la petición, para evaluarlas." #: app/views/request/_other_describe_state.rhtml:70 msgid "An <strong>error message</strong> has been received" +msgstr "Se ha recibido <strong>un mensaje de error</strong>" + +#: app/views/general/search.rhtml:161 +msgid "Annotation added to request" msgstr "" #: app/views/user/show.rhtml:34 msgid "Annotations" -msgstr "" +msgstr "Comentarios" #: app/views/comment/new.rhtml:17 msgid "" "Annotations are so anyone, including you, can help the requester with their " "request. For example:" msgstr "" +"Los comentarios sirven para que cualquier, incluído usted, pueda ayudar al " +"creador de la petición. Por ejemplo:" #: app/views/comment/new.rhtml:69 msgid "" "Annotations will be posted publicly here, and are \n" " <strong>not</strong> sent to {{public_body_name}}." msgstr "" +"Los comentarios se muestran públicamente aquí, y \n" +" <strong>no</strong> se envían a {{public_body_name}}." #: app/views/request/_after_actions.rhtml:6 msgid "Anyone:" -msgstr "" +msgstr "Cualquiera:" #: app/views/request/new.rhtml:47 msgid "" "Ask for <strong>specific</strong> documents or information, this site is not" " suitable for general enquiries." msgstr "" +"Pida documentos o información <strong>específica</strong>, esta web no está " +"pensada para resolver dudas generales." #: app/views/request/show_response.rhtml:31 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 "" +"Al final de esta página, escriba una respuesta intentando convencerles de que lo escaneen\n" +" (<a href=\"%s\">más detalles</a>)." #: app/views/request/upload_response.rhtml:33 msgid "Attachment (optional):" -msgstr "" +msgstr "Adjuntos (opcional):" -#: app/models/info_request.rb:776 +#: app/models/info_request.rb:783 msgid "Awaiting classification." -msgstr "" +msgstr "Esperando clasificación." -#: app/models/info_request.rb:796 +#: app/models/info_request.rb:803 msgid "Awaiting internal review." -msgstr "" +msgstr "Esperando revisión interna." -#: app/models/info_request.rb:778 +#: app/models/info_request.rb:785 msgid "Awaiting response." -msgstr "" +msgstr "Esperando respuesta." #: app/views/request/new.rhtml:43 msgid "" "Browse <a href=\"%s\">other requests</a> for examples of how to word your " "request." msgstr "" +"Revise <a href=\"%s\">otras peticiones</a> para ver ejemplos de cómo " +"redactar su petición." #: app/views/request/new.rhtml:41 msgid "" -"Browse <a href='%s'>other requests</a> to '{{public_body_name}}' for " +"Browse <a href='{{url}}'>other requests</a> to '{{public_body_name}}' for " "examples of how to word your request." msgstr "" -#: app/views/request/show.rhtml:79 +#: app/views/request/show.rhtml:86 msgid "" "By law, under all circumstances, {{public_body_link}} should have responded " "by now" msgstr "" +"Por ley, bajo cualquier circunstancia, {{public_body_link}} ya debería haber" +" respondido" -#: app/views/request/show.rhtml:71 +#: app/views/request/show.rhtml:78 msgid "" "By law, {{public_body_link}} should normally have responded " "<strong>promptly</strong> and" msgstr "" +"Por ley, {{public_body_link}} debería haber respondido " +"<strong>pronto</strong> y" #: app/views/general/search.rhtml:17 msgid "" @@ -652,55 +792,59 @@ msgstr "" "No lo encuentra? <a href=\"%s\">Consulte la lista completa</a> o <a " "href=\"%s\">pídanos que añadamos uno nuevo</a> " -#: app/controllers/track_controller.rb:143 +#: app/controllers/track_controller.rb:145 msgid "Cancel a {{site_name}} alert" -msgstr "" +msgstr "Cancele una alerta de {{site_name}}" -#: app/controllers/track_controller.rb:173 +#: app/controllers/track_controller.rb:175 msgid "Cancel some {{site_name}} alerts" -msgstr "" +msgstr "Cancelar alertas de {{site_name}}" -#: locale/model_attributes.rb:46 +#: locale/model_attributes.rb:39 msgid "CensorRule|Last edit comment" msgstr "" -#: locale/model_attributes.rb:45 +#: locale/model_attributes.rb:38 msgid "CensorRule|Last edit editor" msgstr "" -#: locale/model_attributes.rb:44 +#: locale/model_attributes.rb:37 msgid "CensorRule|Replacement" msgstr "" -#: locale/model_attributes.rb:43 +#: locale/model_attributes.rb:36 msgid "CensorRule|Text" msgstr "" #: lib/public_body_categories_en.rb:14 msgid "Central government" +msgstr "Gobierno central" + +#: app/views/user/signchangeemail.rhtml:37 +msgid "Change email on {{site_name}}" msgstr "" #: app/views/user/signchangepassword.rhtml:27 msgid "Change password on {{site_name}}" -msgstr "" +msgstr "Cambie la contraseña en {{site_name}}" #: app/views/user/set_crop_profile_photo.rhtml:1 app/views/user/show.rhtml:104 msgid "Change profile photo" -msgstr "" +msgstr "Cambie la foto de perfil" #: app/views/user/set_profile_about_me.rhtml:1 -msgid "Change the text about you on your profile at WhatDoTheyKnow.com" +msgid "Change the text about you on your profile at {{site_name}}" msgstr "" #: app/views/user/show.rhtml:107 msgid "Change your email" -msgstr "" +msgstr "Cambie su correo" -#: app/controllers/user_controller.rb:249 +#: app/controllers/user_controller.rb:250 #: app/views/user/signchangeemail.rhtml:1 #: app/views/user/signchangeemail.rhtml:11 msgid "Change your email address used on {{site_name}}" -msgstr "" +msgstr "Cambie su dirección de correo en {{site_name}}" #: app/views/user/show.rhtml:106 msgid "Change your password" @@ -711,11 +855,11 @@ msgstr "" #: app/views/user/signchangepassword_send_confirm.rhtml:1 #: app/views/user/signchangepassword_send_confirm.rhtml:9 msgid "Change your password on {{site_name}}" -msgstr "" +msgstr "Cambie su contraseña en {{site_name}}" -#: app/controllers/user_controller.rb:203 +#: app/controllers/user_controller.rb:204 msgid "Change your password {{site_name}}" -msgstr "" +msgstr "Cambie su contraseña en {{site_name}}" #: app/views/public_body/show.rhtml:15 app/views/public_body/show.rhtml:17 msgid "Charity registration" @@ -723,87 +867,117 @@ msgstr "" #: app/views/general/exception_caught.rhtml:6 msgid "Check for mistakes if you typed or copied the address." -msgstr "" +msgstr "Busque erratas si ha copiado la dirección." -#: app/views/request/preview.rhtml:7 #: app/views/request/followup_preview.rhtml:14 +#: app/views/request/preview.rhtml:7 msgid "Check you haven't included any <strong>personal information</strong>." msgstr "" +"Compruebe que no ha incluído <strong>ninguna información personal</strong>." -#: app/models/info_request_event.rb:326 +#: app/models/info_request_event.rb:331 msgid "Clarification" -msgstr "" +msgstr "Aclaración" -#: app/models/info_request_event.rb:290 +#: app/models/info_request_event.rb:295 msgid "Clarification required" -msgstr "" +msgstr "Se necesita aclaración" -#: app/controllers/request_controller.rb:334 +#: app/controllers/request_controller.rb:339 msgid "Classify an FOI response from " -msgstr "" +msgstr "Clasifique una petición de " #: app/views/request_mailer/very_overdue_alert.rhtml:6 msgid "" "Click on the link below to send a message to {{public_body_name}} telling them to reply to your request. You might like to ask for an internal\n" "review, asking them to find out why response to the request has been so slow." msgstr "" +"Haga click en el siguiente enlace para mandar un mensaje a {{public_body_name}} solicitando que respondan a su petición. Puede pedir una revisión\n" +"interna, preguntándoles por qué se ha demorado tanto la respuesta a su petición." #: app/views/request_mailer/overdue_alert.rhtml:5 msgid "" "Click on the link below to send a message to {{public_body}} reminding them " "to reply to your request." msgstr "" +"Haga click en el siguiente enlace para enviar un mensaje a {{public_body}} " +"recordándoles que deben responder a su petición." -#: locale/model_attributes.rb:28 +#: locale/model_attributes.rb:22 msgid "Comment|Body" msgstr "" -#: locale/model_attributes.rb:27 +#: locale/model_attributes.rb:21 msgid "Comment|Comment type" msgstr "" -#: locale/model_attributes.rb:30 +#: locale/model_attributes.rb:24 msgid "Comment|Locale" msgstr "" -#: locale/model_attributes.rb:29 +#: locale/model_attributes.rb:23 msgid "Comment|Visible" msgstr "" +#: app/models/track_thing.rb:147 +msgid "Confirm you want to be emailed about new requests" +msgstr "" + +#: app/models/track_thing.rb:214 +msgid "" +"Confirm you want to be emailed about new requests or responses matching " +"'{{query}}'" +msgstr "" + +#: app/models/track_thing.rb:198 +msgid "Confirm you want to be emailed about requests by '{{user_name}}'" +msgstr "" + +#: app/models/track_thing.rb:182 +msgid "" +"Confirm you want to be emailed about requests to '{{public_body_name}}'" +msgstr "" + #: app/models/track_thing.rb:163 msgid "Confirm you want to be emailed when an FOI request succeeds" -msgstr "" +msgstr "Confirme que quiere recibir correos cuando una petición tenga éxito" -#: app/controllers/request_controller.rb:295 +#: app/controllers/request_controller.rb:300 msgid "Confirm your FOI request to " -msgstr "" +msgstr "Confirme su petición a " -#: app/controllers/request_controller.rb:696 -#: app/controllers/user_controller.rb:514 +#: app/controllers/request_controller.rb:703 +#: app/controllers/user_controller.rb:515 msgid "Confirm your account on {{site_name}}" -msgstr "" +msgstr "Confirme su cuenta en {{site_name}}" #: app/controllers/comment_controller.rb:57 msgid "Confirm your annotation to {{info_request_title}}" -msgstr "" +msgstr "Confirme su comentario a {{info_request_title}}" #: app/models/user_mailer.rb:34 -msgid "Confirm your new email address on WhatDoTheyKnow.com" +msgid "Confirm your new email address on {{site_name}}" msgstr "" -#: app/views/layouts/default.rhtml:146 +#: app/views/layouts/default.rhtml:127 msgid "Contact {{site_name}}" msgstr "Contacte con {{site_name}}" +#: app/models/request_mailer.rb:210 +msgid "Could not identify the request from the email address" +msgstr "" + #: app/models/profile_photo.rb:96 msgid "" "Couldn't understand the image file that you uploaded. PNG, JPEG, GIF and " "many other common image file formats are supported." msgstr "" +"No se pudo procesar la imagen subida. Puede utilizar PNG, JPEG, GIF u otros " +"formatos de imagen populares." #: app/views/user/set_crop_profile_photo.rhtml:6 msgid "Crop your profile photo" -msgstr "" +msgstr "Recorte su foto de perfil" #: app/views/request/new.rhtml:74 msgid "" @@ -811,31 +985,33 @@ msgid "" " environmental factors listed above)" msgstr "" -#: app/views/request/show.rhtml:61 +#: app/views/request/show.rhtml:68 msgid "" "Currently <strong>waiting for a response</strong> from {{public_body_link}}," " they must respond promptly and" msgstr "" +"Actualmente <strong>esperando la respuesta</strong> de {{public_body_link}}," +" que debe responder pronto y" -#: app/models/info_request_event.rb:294 +#: app/models/info_request_event.rb:299 msgid "Deadline Extended" -msgstr "" +msgstr "Fecha límite extendida" #: app/models/outgoing_message.rb:57 msgid "Dear " msgstr "" -#: app/models/info_request.rb:780 +#: app/models/info_request.rb:787 msgid "Delayed." -msgstr "" +msgstr "Retrasado." -#: app/models/info_request.rb:798 app/models/info_request_event.rb:310 +#: app/models/info_request.rb:805 app/models/info_request_event.rb:315 msgid "Delivery error" -msgstr "" +msgstr "Error en la entrega" #: app/views/request/details.rhtml:1 app/views/request/details.rhtml:2 msgid "Details of request '" -msgstr "" +msgstr "Detalles de la petición '" #: app/views/general/search.rhtml:50 app/views/general/search.rhtml:62 msgid "Did you mean: {{correction}}" @@ -846,16 +1022,20 @@ msgid "" "Disclaimer: This message and any reply that you make will be published on " "the internet. Our privacy and copyright policies:" msgstr "" +"Atención: Este mensaje y cualquier respuesta que usted haga serán publicadas" +" en Internet. Nuestras políticas de privacidad y copyright:" #: app/views/request/_view_html_prefix.rhtml:6 msgid "Download original attachment" -msgstr "" +msgstr "Descargar ficheros adjuntos" -#: app/views/request/_followup.rhtml:88 +#: app/views/request/_followup.rhtml:85 msgid "" "Edit and add <strong>more details</strong> to the message above,\n" " explaining why you are dissatisfied with their response." msgstr "" +"Edite y añada <strong>más detalles</strong> al mensaje anterior,\n" +" explicando por qué no esta satisfecho con su respuesta." #: app/views/admin_public_body/_locale_selector.rhtml:2 msgid "Edit language version:" @@ -863,21 +1043,23 @@ msgstr "" #: app/views/user/set_profile_about_me.rhtml:9 msgid "Edit text about you" -msgstr "" +msgstr "Edite el texto sobre usted" -#: app/models/user.rb:132 +#: app/models/user.rb:135 msgid "Either the email or password was not recognised, please try again." -msgstr "" +msgstr "El correo o la contraseña son inválidos, por favor pruebe otra vez." -#: app/models/user.rb:134 +#: app/models/user.rb:137 msgid "" "Either the email or password was not recognised, please try again. Or create" " a new account using the form on the right." msgstr "" +"El correo o la contraseña son inválidos, por favor pruebe otra vez. O cree " +"una nueva cuenta usando el formulario de la derecha." #: app/models/contact_validator.rb:34 msgid "Email doesn't look like a valid address" -msgstr "" +msgstr "La dirección de correo no parece válida" #: app/views/comment/_comment_form.rhtml:8 msgid "Email me future updates to this request" @@ -885,11 +1067,15 @@ msgstr "Quiero recibir emails con las actulizaciones de esta solicitud" #: app/models/track_thing.rb:155 msgid "Email me new successful responses " +msgstr "Recibir respuestas válidas " + +#: app/models/track_thing.rb:139 +msgid "Email me when there are new requests" msgstr "" #: app/views/user/show.rhtml:36 msgid "Email subscriptions" -msgstr "" +msgstr "Suscripciones de correo" #: app/views/general/search.rhtml:123 msgid "" @@ -907,11 +1093,11 @@ msgstr "" #: app/views/public_body/show.rhtml:96 msgid "Environmental Information Regulations requests made" -msgstr "" +msgstr "Peticiones medio-ambientales realizadas" #: app/views/public_body/show.rhtml:69 msgid "Environmental Information Regulations requests made using this site" -msgstr "" +msgstr "Peticiones medio-ambientales realizadas en esta web" #: app/views/request/details.rhtml:4 msgid "Event history" @@ -927,6 +1113,9 @@ msgid "" " will be <strong>displayed publicly</strong> on\n" " this website forever (<a href=\"%s\">why?</a>)." msgstr "" +"Todo lo que escriba en esta página \n" +" estará <strong>disponible públicamente</strong> en\n" +" está web para siempre (<a href=\"%s\">¿por qué?</a>)." #: app/views/request/new.rhtml:116 msgid "" @@ -934,29 +1123,36 @@ msgid "" " will be <strong>displayed publicly</strong> on\n" " this website forever (<a href=\"%s\">why?</a>)." msgstr "" +"Todo lo que escriba en esta página, incluyendo <strong>su nombre</strong>, \n" +" estará <strong>disponible públicamente</strong> en\n" +" está web para siempre (<a href=\"%s\">¿por qué?</a>)." -#: locale/model_attributes.rb:61 +#: locale/model_attributes.rb:60 msgid "EximLogDone|Filename" msgstr "" -#: locale/model_attributes.rb:62 +#: locale/model_attributes.rb:61 msgid "EximLogDone|Last stat" msgstr "" -#: locale/model_attributes.rb:16 +#: locale/model_attributes.rb:19 msgid "EximLog|Line" msgstr "" -#: locale/model_attributes.rb:15 +#: locale/model_attributes.rb:18 msgid "EximLog|Order" msgstr "" #: app/views/public_body/view_email.rhtml:3 msgid "FOI email address for {{public_body}}" -msgstr "" +msgstr "Dirección de correo para {{public_body}}" #: app/views/user/show.rhtml:33 msgid "FOI requests" +msgstr "Peticiones de información" + +#: app/models/track_thing.rb:193 app/models/track_thing.rb:194 +msgid "FOI requests by '{{user_name}}'" msgstr "" #: app/models/profile_photo.rb:101 @@ -973,7 +1169,7 @@ msgstr "" #: app/views/request/new.rhtml:21 msgid "First," -msgstr "" +msgstr "Primero," #: app/views/general/frontpage.rhtml:8 msgid "" @@ -984,20 +1180,25 @@ msgstr "" #: app/views/request_mailer/old_unclassified_updated.rhtml:4 msgid "Follow this link to see the request:" -msgstr "" +msgstr "Siga este enlace para ver la petición:" -#: app/models/info_request_event.rb:330 +#: app/models/info_request_event.rb:335 msgid "Follow up" +msgstr "Seguimiento" + +#: app/views/general/search.rhtml:159 +msgid "Follow up message sent by requester" msgstr "" #: app/views/public_body/view_email.rhtml:14 msgid "Follow up messages to existing requests are sent to " -msgstr "" +msgstr "Mensajes de seguimiento a peticiones existentes se envían a " #: app/views/request/_followup.rhtml:16 msgid "" -"Follow ups and new responses to this request have been stopped to prevent spam. Please\n" -" <a href=\"%s\">contact us</a> if you are {{user_link}} and need to send a follow up." +"Follow ups and new responses to this request have been stopped to prevent " +"spam. Please <a href=\"{{url}}\">contact us</a> if you are {{user_link}} and" +" need to send a follow up." msgstr "" #: app/views/public_body/show.rhtml:61 @@ -1009,7 +1210,7 @@ msgstr "" #: app/views/user/_signin.rhtml:21 msgid "Forgotten your password?" -msgstr "" +msgstr "¿Ha olvidado su contraseña?" #: app/views/public_body/show.rhtml:56 msgid "" @@ -1021,29 +1222,31 @@ msgstr "" #: app/views/request/followup_bad.rhtml:11 msgid "Freedom of Information law no longer applies to" -msgstr "" +msgstr "La ley de acceso a la información ya no es aplicable a" #: app/views/public_body/view_email.rhtml:10 msgid "" "Freedom of Information law no longer applies to this authority.Follow up " "messages to existing requests are sent to " msgstr "" +"La ley de acceso a la información ya no es aplicable a este organismo. Los " +"mensajes de seguimiento de peticiones existentes se envían a " #: app/views/user/show.rhtml:128 msgid "Freedom of Information request" -msgstr "" +msgstr "Petición de acceso a la información" #: app/views/public_body/show.rhtml:98 msgid "Freedom of Information requests made" -msgstr "peticiones de acceso a la información realizadas" +msgstr "Peticiones de acceso a información realizadas" #: app/views/user/show.rhtml:121 app/views/user/show.rhtml:140 msgid "Freedom of Information requests made by" -msgstr "" +msgstr "Peticiones de acceso a información hechas por" #: app/views/public_body/show.rhtml:72 msgid "Freedom of Information requests made using this site" -msgstr "peticiones de acceso a la información realizadas por esta web" +msgstr "Peticiones de acceso a información realizadas por esta web" #: app/views/request/followup_bad.rhtml:12 msgid "" @@ -1054,29 +1257,29 @@ msgstr "" #: app/models/outgoing_message.rb:73 msgid "GIVE DETAILS ABOUT YOUR COMPLAINT HERE" -msgstr "" +msgstr "DETALLE SU QUEJA AQUÍ" #: app/views/general/exception_caught.rhtml:14 msgid "Go to our <a href=\"%s\">front page</a></li>" -msgstr "" +msgstr "Ir a la <a href=\"%s\">página de inicio</a></li>" -#: app/models/info_request_event.rb:292 +#: app/models/info_request_event.rb:297 msgid "Handled by post" -msgstr "" +msgstr "Resuelta por correo ordinario" -#: app/models/info_request.rb:794 +#: app/models/info_request.rb:801 msgid "Handled by post." -msgstr "" +msgstr "Resuelta por correo ordinario" -#: app/views/layouts/default.rhtml:121 +#: app/views/layouts/default.rhtml:102 msgid "Hello!" msgstr "¡Hola!" -#: app/views/layouts/default.rhtml:118 +#: app/views/layouts/default.rhtml:99 msgid "Hello, {{username}}!" msgstr "¡Hola, {{username}}!" -#: app/views/layouts/default.rhtml:113 +#: app/views/layouts/default.rhtml:94 msgid "Help" msgstr "Ayuda" @@ -1084,8 +1287,8 @@ msgstr "Ayuda" 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" -"WhatDoTheyKnow for intermediate events, which weren't given an explicit\n" -"description by a user. See the <a href=\"%s\">search tips</a> for description of the states." +"{{site_name}} for intermediate events, which weren't given an explicit\n" +"description by a user. See the <a href=\"{{search_path}}\">search tips</a> for description of the states." msgstr "" #: app/views/request/_other_describe_state.rhtml:4 @@ -1096,11 +1299,11 @@ msgid "" " Thanks." msgstr "" -#: locale/model_attributes.rb:58 +#: locale/model_attributes.rb:57 msgid "Holiday|Day" msgstr "" -#: locale/model_attributes.rb:59 +#: locale/model_attributes.rb:58 msgid "Holiday|Description" msgstr "" @@ -1118,13 +1321,13 @@ msgstr "" msgid "Human health and safety" msgstr "" -#: app/views/request/_followup.rhtml:71 +#: app/views/request/_followup.rhtml:68 msgid "I am asking for <strong>new information</strong>" -msgstr "" +msgstr "Estoy pidiendo <strong>nueva información</strong>" -#: app/views/request/_followup.rhtml:76 +#: app/views/request/_followup.rhtml:73 msgid "I am requesting an <strong>internal review</strong>" -msgstr "" +msgstr "Estoy pidiendo una <strong>revisión interna</strong>" #: app/views/request_game/play.rhtml:39 msgid "I don't like these ones — give me some more!" @@ -1136,43 +1339,48 @@ msgstr "" #: app/views/request/_describe_state.rhtml:91 msgid "I would like to <strong>withdraw this request</strong>" -msgstr "" +msgstr "Me gustaría <strong>retirar esta petición</strong>" #: app/views/request/_describe_state.rhtml:11 msgid "" "I'm still <strong>waiting</strong> for my information\n" " <small>(maybe you got an acknowledgement)</small>" msgstr "" +"Todavía estoy <strong>esperando</strong> por mi información\n" +" <small>(puede que haya obtenido un acuse de recibo)</small>" #: app/views/request/_describe_state.rhtml:18 msgid "I'm still <strong>waiting</strong> for the internal review" -msgstr "" +msgstr "Todavía estoy <strong>esperando</strong> por la revisión interna" #: app/views/request/_describe_state.rhtml:32 msgid "I'm waiting for an <strong>internal review</strong> response" msgstr "" +"Estoy esperando por una respuesta de la <strong>revisión interna</strong>" #: app/views/request/_describe_state.rhtml:25 msgid "I've been asked to <strong>clarify</strong> my request" -msgstr "" +msgstr "Me han pedido que <strong>aclare</strong> mi petición" #: app/views/request/_describe_state.rhtml:60 msgid "I've received <strong>all the information" -msgstr "" +msgstr "He recibido <strong>toda la información" #: app/views/request/_describe_state.rhtml:56 msgid "I've received <strong>some of the information</strong>" -msgstr "" +msgstr "He recibido <strong>parte de la información</strong>" #: app/views/request/_describe_state.rhtml:76 msgid "I've received an <strong>error message</strong>" -msgstr "" +msgstr "He recibido un <strong>mensaje de error</strong>" #: app/views/public_body/view_email.rhtml:28 msgid "" "If the address is wrong, or you know a better address, please <a " "href=\"%s\">contact us</a>." msgstr "" +"Si la dirección es incorrecta, o conoce una más actualizada, por favor <a " +"href=\"%s\">contáctenos</a>." #: app/views/request_mailer/stopped_responses.rhtml:10 msgid "" @@ -1180,33 +1388,43 @@ msgid "" "or an email on another subject to {{user}}, then please\n" "email {{contact_email}} for help." msgstr "" +"Si no es correcto, o le gustaría enviar una respuesta a la petición\n" +"o un correo sobre otro tema a {{user}}, entonces por favor\n" +"escriba a {{contact_email}} solicitando ayuda." -#: app/views/request/_followup.rhtml:21 +#: app/views/request/_followup.rhtml:20 msgid "" "If you are dissatisfied by the response you got from\n" " the public authority, you have the right to\n" " complain (<a href=\"%s\">details</a>)." msgstr "" +"Si no está satisfecho con la respuesta que ha recibido del\n" +" organismo público, tiene derecho a\n" +" apelar (<a href=\"%s\">detalles</a>)." #: app/views/user/no_cookies.rhtml:20 msgid "If you are still having trouble, please <a href=\"%s\">contact us</a>." -msgstr "" +msgstr "Si aún tiene problemas, por favor <a href=\"%s\">contáctenos</a>." #: app/views/request/hidden.rhtml:15 msgid "" "If you are the requester, then you may <a href=\"%s\">sign in</a> to view " "the request." msgstr "" +"Si la petición es suya, puede <a href=\"%s\">abrir una sesión</a> para " +"verla." #: app/views/request/new.rhtml:119 msgid "" "If you are thinking of using a pseudonym,\n" " please <a href=\"%s\">read this first</a>." msgstr "" +"Si está pensando en utilizar un pseudónimo,\n" +" por favor <a href=\"%s\">lea esto primero</a>." -#: app/views/request/show.rhtml:98 +#: app/views/request/show.rhtml:105 msgid "If you are {{user_link}}, please" -msgstr "" +msgstr "Si es {{user_link}}, por favor" #: app/views/user/bad_token.rhtml:7 msgid "" @@ -1214,51 +1432,67 @@ msgid "" "it</strong> from the email. Then <strong>paste it into your browser</strong>, into the place\n" "you would type the address of any other webpage." msgstr "" +"Si no puede hacer click en el enlace del correo, tendrá que <strong>seleccionarlo y copiarlo\n" +"</strong> en el correo. A continuación, <strong>péguelo en su navegador</strong>, en el lugar\n" +"dónde escribe la dirección de cualquier otra página web." #: app/views/request/show_response.rhtml:49 msgid "" "If you can, scan in or photograph the response, and <strong>send us\n" " a copy to upload</strong>." msgstr "" +"Si puede, escanee o haga una foto de la respuesta, y <strong>mándenos\n" +" una copia para que la subamos</strong>." #: app/views/outgoing_mailer/_followup_footer.rhtml:4 msgid "" "If you find this service useful as an FOI officer, please ask your web " "manager to link to us from your organisation's FOI page." msgstr "" +"Si encuentra este servicio útil como responsable de Acceso a la Información," +" pida al responsable de su web que añada un enlace a nuestra web." #: app/views/user/bad_token.rhtml:13 msgid "" "If you got the email <strong>more than six months ago</strong>, then this login link won't work any\n" "more. Please try doing what you were doing from the beginning." msgstr "" +"Si recibió el correo <strong>hace más de seis meses</strong>, entonces el enlace ya no funcionará.\n" +"Por favor intente hacer lo que estaba haciendo inicialmente." -#: app/controllers/request_controller.rb:430 +#: app/controllers/request_controller.rb:437 msgid "" "If you have not done so already, please write a message below telling the " "authority that you have withdrawn your request. Otherwise they will not know" " it has been withdrawn." msgstr "" +"Si no lo ha hecho ya, por favor escriba un mensaje a continuación informando" +" al organismo público de que ha retirado su petición. De lo contrario no " +"sabrá que lo ha hecho." -#: app/views/user/signchangepassword_confirm.rhtml:10 #: app/views/user/signchangeemail_confirm.rhtml:11 +#: app/views/user/signchangepassword_confirm.rhtml:10 msgid "" "If you use web-based email or have \"junk mail\" filters, also check your\n" "bulk/spam mail folders. Sometimes, our messages are marked that way." msgstr "" +"Si usa correo web o tiene filtros \"anti spam\", por favor compruebe\n" +"sus carpetas de spam. A veces, nuestros mensajes se marcan así por error." #: app/views/user/banned.rhtml:15 msgid "" "If you would like us to lift this ban, then you may politely\n" "<a href=\"/help/contact\">contact us</a> giving reasons.\n" msgstr "" +"Si quiere eliminar el bloqueo, entonces puede <a href=\"/help/contact\">contactarnos</a>\n" +" explicándonos sus razones.\n" #: app/views/user/_signup.rhtml:6 -msgid "If you're new to WhatDoTheyKnow" +msgid "If you're new to {{site_name}}" msgstr "" #: app/views/user/_signin.rhtml:7 -msgid "If you've used WhatDoTheyKnow before" +msgid "If you've used {{site_name}} before" msgstr "" #: app/views/user/no_cookies.rhtml:12 @@ -1266,82 +1500,84 @@ 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 "" +"Si su navegador acepta cookies y está viendo este mensaje,\n" +"puede que haya un problema en nuestro servidor." -#: locale/model_attributes.rb:64 +#: locale/model_attributes.rb:63 msgid "IncomingMessage|Cached attachment text clipped" msgstr "" -#: locale/model_attributes.rb:65 +#: locale/model_attributes.rb:64 msgid "IncomingMessage|Cached main body text folded" msgstr "" -#: locale/model_attributes.rb:66 +#: locale/model_attributes.rb:65 msgid "IncomingMessage|Cached main body text unfolded" msgstr "" -#: locale/model_attributes.rb:39 +#: locale/model_attributes.rb:44 msgid "InfoRequestEvent|Calculated state" msgstr "" -#: locale/model_attributes.rb:38 +#: locale/model_attributes.rb:43 msgid "InfoRequestEvent|Described state" msgstr "" -#: locale/model_attributes.rb:36 +#: locale/model_attributes.rb:41 msgid "InfoRequestEvent|Event type" msgstr "" -#: locale/model_attributes.rb:40 +#: locale/model_attributes.rb:45 msgid "InfoRequestEvent|Last described at" msgstr "" -#: locale/model_attributes.rb:37 +#: locale/model_attributes.rb:42 msgid "InfoRequestEvent|Params yaml" msgstr "" -#: locale/model_attributes.rb:41 +#: locale/model_attributes.rb:46 msgid "InfoRequestEvent|Prominence" msgstr "" -#: locale/model_attributes.rb:87 +#: locale/model_attributes.rb:86 msgid "InfoRequest|Allow new responses from" msgstr "" -#: locale/model_attributes.rb:83 +#: locale/model_attributes.rb:82 msgid "InfoRequest|Awaiting description" msgstr "" -#: locale/model_attributes.rb:82 +#: locale/model_attributes.rb:81 msgid "InfoRequest|Described state" msgstr "" -#: locale/model_attributes.rb:88 +#: locale/model_attributes.rb:87 msgid "InfoRequest|Handle rejected responses" msgstr "" -#: locale/model_attributes.rb:86 +#: locale/model_attributes.rb:85 msgid "InfoRequest|Law used" msgstr "" -#: locale/model_attributes.rb:84 +#: locale/model_attributes.rb:83 msgid "InfoRequest|Prominence" msgstr "" -#: locale/model_attributes.rb:81 +#: locale/model_attributes.rb:80 msgid "InfoRequest|Title" msgstr "" -#: locale/model_attributes.rb:85 +#: locale/model_attributes.rb:84 msgid "InfoRequest|Url title" msgstr "" -#: app/models/info_request_event.rb:298 +#: app/models/info_request_event.rb:303 msgid "Information not held" -msgstr "" +msgstr "Información no disponible" -#: app/models/info_request.rb:784 +#: app/models/info_request.rb:791 msgid "Information not held." -msgstr "" +msgstr "Información no disponible." #: app/views/request/new.rhtml:71 msgid "" @@ -1349,17 +1585,17 @@ msgid "" " radiation, waste materials)" msgstr "" -#: app/models/info_request_event.rb:306 +#: app/models/info_request_event.rb:311 msgid "Internal review acknowledgement" -msgstr "" +msgstr "Acuse de recibo de revisión interna" -#: app/models/info_request_event.rb:323 +#: app/models/info_request_event.rb:328 msgid "Internal review request" -msgstr "" +msgstr "Petición de revisión interna" #: app/views/outgoing_mailer/initial_request.rhtml:8 msgid "" -"Is {{email_address}} the wrong address for {{type_of_request}} requests tp " +"Is {{email_address}} the wrong address for {{type_of_request}} requests to " "{{public_body_name}}? If so, please contact us using this form:" msgstr "" @@ -1369,51 +1605,59 @@ msgid "" "or cannot do so. If you can, please enable cookies, or try using a different\n" "browser. Then press refresh to have another go." msgstr "" - -#: app/views/user/show.rhtml:62 -msgid "Joined WhatDoTheyKnow in" -msgstr "" +"Puede que su navegador esté configurado para no aceptar lo que se conoce como \"cookies\",\n" +"o que no pueda hacerlo. Si sabe cómo, por favor permita las \"cookies\", o use un navegador\n" +"distinto. Entonces vuelva a visitar la página para volver a intentarlo." #: app/views/user/_user_listing_single.rhtml:21 msgid "Joined in" msgstr "" +#: app/views/user/show.rhtml:62 +msgid "Joined {{site_name}} in" +msgstr "" + #: app/views/request/new.rhtml:48 msgid "" "Keep it <strong>focused</strong>, you'll be more likely to get what you want" " (<a href=\"%s\">why?</a>)." msgstr "" +"Sea <strong>específico</strong>, tendrá más probabilidades de conseguir lo " +"que quiere (<a href=\"%s\">¿por qué?</a>)." #: app/views/contact_mailer/message.rhtml:10 msgid "Last authority viewed: " -msgstr "" +msgstr "Ultimo organismo visitado: " #: app/views/contact_mailer/message.rhtml:7 msgid "Last request viewed: " -msgstr "" +msgstr "Última petición vista: " #: app/views/user/no_cookies.rhtml:17 msgid "" "Let us know what you were doing when this message\n" "appeared and your browser and operating system type and version." msgstr "" +"Háganos saber que estaba haciendo cuando apareció\n" +"este mensaje, así como el nombre y versión de su navegador y\n" +"sistema operativo." #: app/views/request/_correspondence.rhtml:27 #: app/views/request/_correspondence.rhtml:57 msgid "Link to this" -msgstr "" +msgstr "Enlace" #: app/views/public_body/list.rhtml:32 msgid "List of all authorities (CSV)" -msgstr "" +msgstr "Lista de todos los organismos (CSV)" #: lib/public_body_categories_en.rb:23 msgid "Local and regional" -msgstr "" +msgstr "Local y regional" -#: app/models/info_request.rb:782 +#: app/models/info_request.rb:789 msgid "Long overdue." -msgstr "" +msgstr "Muy retrasada." #: app/views/public_body/show.rhtml:47 msgid "Make a new Environmental Information request" @@ -1421,13 +1665,13 @@ msgstr "" #: app/views/request/new.rhtml:1 msgid "Make an {{law_used_short}} request to '{{public_body_name}}'" -msgstr "" +msgstr "Hacer una petición {{law_used_short}} a '{{public_body_name}}'" #: app/views/layouts/default.rhtml:15 msgid "Make and browse Freedom of Information (FOI) requests" msgstr "Realiza una petición de información o mira las ya realizadas" -#: app/views/layouts/default.rhtml:86 +#: app/views/layouts/default.rhtml:67 msgid "Make and explore Freedom of Information requests" msgstr "Realiza una petición de información o mira las ya realizadas" @@ -1435,21 +1679,21 @@ msgstr "Realiza una petición de información o mira las ya realizadas" msgid "Make or explore Freedom of Information requests" msgstr "Realiza una petición de información o mira las ya realizadas" -#: app/views/layouts/default.rhtml:106 +#: app/views/layouts/default.rhtml:87 msgid "Make request" msgstr "Realizar petición" #: app/views/public_body/_body_listing_single.rhtml:23 msgid "Make your own request" -msgstr "" +msgstr "Hacer mi propia petición" #: app/views/contact_mailer/message.rhtml:4 -msgid "Message sent using WhatDoTheyKnow contact form, " +msgid "Message sent using {{site_name}} contact form, " msgstr "" #: app/views/request/new_bad_contact.rhtml:1 msgid "Missing contact details for '" -msgstr "" +msgstr "Faltan datos de contacto para '" #: app/views/public_body/show.rhtml:5 msgid "More about this authority" @@ -1465,9 +1709,9 @@ msgstr "Más peticiones realizadas con éxito..." #: app/views/request/_describe_state.rhtml:64 msgid "My request has been <strong>refused</strong>" -msgstr "" +msgstr "Mi petición ha sido <strong>rechazada</strong>" -#: app/views/layouts/default.rhtml:110 +#: app/views/layouts/default.rhtml:91 msgid "My requests" msgstr "Mis peticiones" @@ -1479,29 +1723,33 @@ msgstr "El nombre no puede estar vacío" msgid "Name is already taken" msgstr "El nombre ya está siendo utilizado" +#: app/models/track_thing.rb:142 app/models/track_thing.rb:143 +msgid "New Freedom of Information requests" +msgstr "" + #: app/views/user/signchangeemail.rhtml:20 msgid "New e-mail:" -msgstr "" +msgstr "Nueva dirección:" #: app/models/change_email_validator.rb:53 msgid "New email doesn't look like a valid address" -msgstr "" +msgstr "La nueva dirección no parece válida" #: app/views/user/signchangepassword.rhtml:15 msgid "New password:" -msgstr "" +msgstr "Nueva contraseña:" #: app/views/user/signchangepassword.rhtml:20 msgid "New password: (again)" -msgstr "" +msgstr "Nueva contraseña: (de nuevo)" #: app/views/request/show_response.rhtml:62 msgid "New response to your request" -msgstr "" +msgstr "Nueva respuesta a su petición" #: app/views/request/show_response.rhtml:68 msgid "New response to {{law_used_short}} request" -msgstr "" +msgstr "Nueva respuesta a su petición {{law_used_short}}" #: app/views/general/search.rhtml:40 msgid "Newest results first" @@ -1509,7 +1757,7 @@ msgstr "Resultados recientes primero" #: app/views/user/set_draft_profile_photo.rhtml:32 msgid "Next, crop your photo >>" -msgstr "" +msgstr "Ahora, recorte su foto >>" #: app/views/general/search.rhtml:16 msgid "Next, select the public authority you'd like to make the request from." @@ -1521,11 +1769,11 @@ msgstr "No se han encontrado organismos" #: app/views/request/list.rhtml:23 msgid "No requests of this sort yet." -msgstr "" +msgstr "No existen peticiones de este tipo todavía." #: app/views/request/similar.rhtml:7 msgid "No similar requests found." -msgstr "" +msgstr "No se han encontrado peticiones similares." #: app/views/public_body/show.rhtml:73 msgid "" @@ -1535,163 +1783,192 @@ msgstr "" "Nadie ha realizado todavía una petición de información a " "{{public_body_name}} usando esta web." -#: app/views/request/_request_listing.rhtml:2 #: app/views/public_body/_body_listing.rhtml:2 +#: app/views/request/_request_listing.rhtml:2 msgid "None found." -msgstr "" +msgstr "No se han encontrado resultados." +#: app/views/user/signchangeemail_confirm.rhtml:3 #: app/views/user/signchangepassword_confirm.rhtml:1 #: app/views/user/signchangepassword_confirm.rhtml:3 -#: app/views/user/signchangeemail_confirm.rhtml:3 msgid "Now check your email!" -msgstr "" +msgstr "¡Ahora compruebe su correo!" #: app/views/comment/preview.rhtml:5 msgid "Now preview your annotation" -msgstr "" +msgstr "Ahora revise su comentario" #: app/views/request/followup_preview.rhtml:10 msgid "Now preview your follow up" -msgstr "" +msgstr "Ahora revise su mensaje" #: app/views/request/followup_preview.rhtml:8 msgid "Now preview your message asking for an internal review" -msgstr "" +msgstr "Ahora revise su mensaje pidiendo una revisión interna" #: app/views/request/preview.rhtml:5 msgid "Now preview your request" -msgstr "" +msgstr "Ahora revise su petición" #: app/views/user/set_draft_profile_photo.rhtml:46 msgid "OR remove the existing photo" -msgstr "" +msgstr "O borre la foto actual" #: app/views/general/frontpage.rhtml:25 msgid "" "OR, <strong>search</strong> for information others have requested using " "{{site_name}}" msgstr "" -"O, <strong>busca</strong> busca en la información que otros han solicitado " -"usando {{site_name}}" +"O, <strong>busca</strong> en la información que otros han solicitado usando " +"{{site_name}}" -#: app/controllers/request_controller.rb:407 +#: app/controllers/request_controller.rb:414 msgid "" "Oh no! Sorry to hear that your request was refused. Here is what to do now." msgstr "" +"¡Oh no! Sentimos oir que su petición ha sido rechazada. Esto es lo que puede" +" hacer ahora." #: app/views/user/signchangeemail.rhtml:15 msgid "Old e-mail:" -msgstr "" +msgstr "Correo antiguo:" #: app/models/change_email_validator.rb:44 msgid "" "Old email address isn't the same as the address of the account you are " "logged in with" msgstr "" +"La dirección de correo antiguo no es con la que ha abierto su sesión actual" #: app/models/change_email_validator.rb:39 msgid "Old email doesn't look like a valid address" -msgstr "" +msgstr "La dirección de correo antigua no parece válida" #: app/views/user/show.rhtml:32 msgid "On this page" -msgstr "" +msgstr "En esta página" #: app/views/general/search.rhtml:71 msgid "One public authority matching ‘{{user_search_query}}’" msgstr "" +"Un organismo público coincide con ‘{{user_search_query}}’" #: app/views/public_body/show.rhtml:91 msgid "Only requests made using {{site_name}} are shown." msgstr "Sólo se muestran las peticiones realizadas con {{site_name}}." -#: locale/model_attributes.rb:21 -msgid "OutgoingMessage|Body" +#: app/models/info_request.rb:405 +msgid "" +"Only the authority can reply to this request, and I don't recognise the " +"address this reply was sent from" msgstr "" -#: locale/model_attributes.rb:24 -msgid "OutgoingMessage|Last sent at" +#: app/models/info_request.rb:401 +msgid "" +"Only the authority can reply to this request, but there is no \"From\" " +"address to check against" msgstr "" -#: locale/model_attributes.rb:23 -msgid "OutgoingMessage|Message type" +#: app/views/general/search.rhtml:158 +msgid "Original request sent" msgstr "" -#: locale/model_attributes.rb:22 +#: locale/model_attributes.rb:26 +msgid "OutgoingMessage|Body" +msgstr "OutgoingMessage|Body" + +#: locale/model_attributes.rb:29 +msgid "OutgoingMessage|Last sent at" +msgstr "OutgoingMessage|Last sent at" + +#: locale/model_attributes.rb:28 +msgid "OutgoingMessage|Message type" +msgstr "OutgoingMessage|Message type" + +#: locale/model_attributes.rb:27 msgid "OutgoingMessage|Status" -msgstr "" +msgstr "OutgoingMessage|Status" -#: locale/model_attributes.rb:25 +#: locale/model_attributes.rb:30 msgid "OutgoingMessage|What doing" -msgstr "" +msgstr "OutgoingMessage|What doing" -#: app/models/info_request.rb:788 +#: app/models/info_request.rb:795 msgid "Partially successful." -msgstr "" +msgstr "Éxito parcial." #: app/models/change_email_validator.rb:47 msgid "Password is not correct" -msgstr "" +msgstr "La contraseña no es correcta" #: app/views/user/_signin.rhtml:16 app/views/user/_signup.rhtml:30 msgid "Password:" -msgstr "" +msgstr "Contraseña:" #: app/views/user/_signup.rhtml:35 msgid "Password: (again)" -msgstr "" +msgstr "Contraseña: (de nuevo)" #: app/views/user/set_draft_profile_photo.rhtml:13 msgid "Photo of you:" -msgstr "" +msgstr "Foto:" #: app/views/request/new.rhtml:76 msgid "Plans and administrative measures that affect these matters" -msgstr "" +msgstr "Planes y medidas administrativas que afecten a estos temas" -#: app/controllers/request_game_controller.rb:40 +#: app/controllers/request_game_controller.rb:42 msgid "Play the request categorisation game" -msgstr "" +msgstr "Juega al juego de clasificación de peticiones!" #: app/views/request_game/play.rhtml:1 app/views/request_game/play.rhtml:30 msgid "Play the request categorisation game!" -msgstr "" +msgstr "Juega al juego de clasificación de peticiones!" -#: app/views/request/show.rhtml:94 +#: app/views/request/show.rhtml:101 msgid "Please" -msgstr "" +msgstr "Por favor" #: app/views/user/no_cookies.rhtml:15 msgid "Please <a href=\"%s\">get in touch</a> with us so we can fix it." msgstr "" +"Por favor <a href=\"%s\">contacte</a> con nosotros para que podamos " +"arreglarlo." -#: app/views/request/show.rhtml:45 +#: app/views/request/show.rhtml:52 msgid "" "Please <strong>answer the question above</strong> so we know whether the " msgstr "" +"Por favor <strong>responda la pregunta anterior</strong> para que sepamos si" +" " #: app/views/user/show.rhtml:12 msgid "" "Please <strong>go to the following requests</strong>, and let us\n" " know if there was information in the recent responses to them." msgstr "" +"Por favor <strong>vaya a la siguiente petición</strong>, y háganos\n" +" saber si había información en las últimas respuestas recibidas." -#: app/views/request/_followup.rhtml:28 +#: app/views/request/_followup.rhtml:27 msgid "" -"Please <strong>only</strong> write messages directly relating to your \n" -"\t\t\t\trequest {{request_link}}. If you would like to ask for information\n" -"\t\t\t\tthat was not in your original request, then <a href=\"%s\">file a new request</a>." +"Please <strong>only</strong> write messages directly relating to your " +"request {{request_link}}. If you would like to ask for information that was " +"not in your original request, then <a href=\"{{new_request_link}}\">file a " +"new request</a>." msgstr "" #: app/views/request/new.rhtml:60 msgid "Please ask for environmental information only" -msgstr "" +msgstr "Por favor pida información medio-ambiental solamente" #: app/views/user/bad_token.rhtml:2 msgid "" "Please check the URL (i.e. the long code of letters and numbers) is copied\n" "correctly from your email." msgstr "" +"Por favor compruebe que ha copiado correctamente la URL (esto es, la secuencia\n" +"de letras y números) del correo." #: app/models/profile_photo.rb:91 msgid "Please choose a file containing your photo." @@ -1701,29 +1978,31 @@ msgstr "Por favor elige el fichero que contiene tu foto" msgid "Please choose what sort of reply you are making." msgstr "Por favor, elija el tipo de respuesta que está creando." -#: app/controllers/request_controller.rb:341 +#: app/controllers/request_controller.rb:346 msgid "" "Please choose whether or not you got some of the information that you " "wanted." -msgstr "" +msgstr "Por favor indique si ha recibido o no la información que quería." #: app/views/user_mailer/changeemail_confirm.rhtml:3 msgid "" "Please click on the link below to confirm that you want to \n" -"change the email address that you use for WhatDoTheyKnow\n" -"from " +"change the email address that you use for {{site_name}}\n" +"from {{old_email}} to {{new_email}}" msgstr "" #: app/views/user_mailer/confirm_login.rhtml:3 msgid "Please click on the link below to confirm your email address." msgstr "" +"Por favor seleccione el siguiente enlace para confirmar su dirección de " +"correo." -#: app/models/info_request.rb:127 +#: app/models/info_request.rb:126 msgid "" "Please describe more what the request is about in the subject. There is no " "need to say it is an FOI request, we add that on anyway." msgstr "" -"Por favor, describe mejor el tema de tu petición en el asunto. Por cierto, " +"Por favor, describa mejor el tema de su petición en el asunto. Por cierto, " "no hace falta decir que es una petición FOI, ya lo añadimos nosotros." #: app/views/user/set_draft_profile_photo.rhtml:22 @@ -1731,87 +2010,89 @@ msgid "" "Please don't upload offensive pictures. We will take down images\n" " that we consider inappropriate." msgstr "" +"Por favor no suba imágenes ofensivas. Eliminaremos cualquier imagen\n" +" que consideremos inapropiada." #: app/views/user/no_cookies.rhtml:3 msgid "Please enable \"cookies\" to carry on" -msgstr "" +msgstr "Por favor active las \"cookies\" para continuar" #: app/models/user.rb:38 msgid "Please enter a password" -msgstr "Por favor, introduce una contraseña." +msgstr "Por favor, introduzca una contraseña." #: app/models/contact_validator.rb:30 msgid "Please enter a subject" -msgstr "Por favor, introduce un asunto" +msgstr "Por favor, introduzca un asunto" -#: app/models/info_request.rb:35 +#: app/models/info_request.rb:34 msgid "Please enter a summary of your request" -msgstr "Por favor, introduce un resumen de tu petición" +msgstr "Por favor, introduzca un resumen de su petición" #: app/models/user.rb:106 msgid "Please enter a valid email address" -msgstr "Por favor, introduce una dirección de correo válida" +msgstr "Por favor, introduzca una dirección de correo válida" #: app/models/contact_validator.rb:31 msgid "Please enter the message you want to send" -msgstr "Por favor, introduce el mensaje que quieres enviar" +msgstr "Por favor, introduzca el mensaje que quieres enviar" #: app/models/user.rb:49 msgid "Please enter the same password twice" -msgstr "Por favor, introduce la misma contraseña dos veces" +msgstr "Por favor, introduzca la misma contraseña dos veces" #: app/models/comment.rb:59 msgid "Please enter your annotation" -msgstr "Por favor, introduce tu comentario" +msgstr "Por favor, introduzca su comentario" #: app/models/contact_validator.rb:29 app/models/user.rb:34 msgid "Please enter your email address" -msgstr "Por favor, introduce tu dirección de correo" +msgstr "Por favor, introduzca su dirección de correo" #: app/models/outgoing_message.rb:147 msgid "Please enter your follow up message" -msgstr "Por favor, introduce tu mensaje" +msgstr "Por favor, introduzca su mensaje" #: app/models/outgoing_message.rb:150 msgid "Please enter your letter requesting information" -msgstr "Por favor, introduce tu petición de información" +msgstr "Por favor, introduzca su petición de información" #: app/models/contact_validator.rb:28 app/models/user.rb:36 msgid "Please enter your name" -msgstr "Por favor, introduce tu nombre" +msgstr "Por favor, introduzca su nombre" #: app/models/user.rb:109 msgid "Please enter your name, not your email address, in the name field." msgstr "" -"Por favor, introduce tu nombre - no tu dirección de correo - en el campo " +"Por favor, introduzca su nombre - no su dirección de correo - en el campo " "para el nombre" #: app/models/change_email_validator.rb:30 msgid "Please enter your new email address" -msgstr "Por favor, introduce tu nueva dirección de correo" +msgstr "Por favor, introduzca su nueva dirección de correo" #: app/models/change_email_validator.rb:29 msgid "Please enter your old email address" -msgstr "Por favor, introduce tu antigua dirección de correo" +msgstr "Por favor, introduzca su antigua dirección de correo" #: app/models/change_email_validator.rb:31 msgid "Please enter your password" -msgstr "Por favor, introduce tu contraseña" +msgstr "Por favor, introduzca su contraseña" #: app/models/outgoing_message.rb:145 msgid "Please give details explaining why you want a review" -msgstr "Por favor, explica por qué quieres una revisión" +msgstr "Por favor, explica por qué quiere una revisión" #: app/models/about_me_validator.rb:24 msgid "Please keep it shorter than 500 characters" -msgstr "Por favor, limita tu mensaje a 500 carácteres" +msgstr "Por favor, limite tu mensaje a 500 carácteres" -#: app/models/info_request.rb:124 +#: app/models/info_request.rb:123 msgid "" "Please keep the summary short, like in the subject of an email. You can use " "a phrase, rather than a full sentence." msgstr "" -"Por favor, mantén el resumen corto, como en el asunto de un correo " +"Por favor, mantenga el resumen corto, como en el asunto de un correo " "electrónico" #: app/views/request/new.rhtml:79 @@ -1819,48 +2100,55 @@ 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 "" +"Por favor, pida información sólo de estas categorias, <strong>no pierda su tiempo\n" +" </strong> o el del organismo público pidiendo información no relacionada." #: app/views/request/new_please_describe.rhtml:5 msgid "" "Please select each of these requests in turn, and <strong>let everyone know</strong>\n" "if they are successful yet or not." msgstr "" +"Por favor elija estas peticiones una a una, y <strong>haz que se sepa</strong>\n" +"si han tenido éxito o no." #: app/models/outgoing_message.rb:156 msgid "" "Please sign at the bottom with your name, or alter the \"%{signoff}\" " "signature" msgstr "" -"Por favor, firma con tu nombre en la parte inferior, o cambia la firma " +"Por favor, firme con su nombre en la parte inferior, o cambia la firma " "\"%{signoff}\"" #: app/views/user/sign.rhtml:8 msgid "Please sign in as " -msgstr "" +msgstr "Por favor abre una sesión como " -#: app/controllers/request_controller.rb:723 +#: app/controllers/request_controller.rb:730 msgid "Please type a message and/or choose a file containing your response." msgstr "" +"Por favor escriba un mensaje y/o escoja un fichero conteniendo su respuesta." -#: app/controllers/request_controller.rb:427 +#: app/controllers/request_controller.rb:434 msgid "Please use the form below to tell us more." -msgstr "" +msgstr "Por favor use el formulario a continuación para decirnos más." #: app/views/outgoing_mailer/followup.rhtml:6 #: app/views/outgoing_mailer/initial_request.rhtml:5 msgid "Please use this email address for all replies to this request:" msgstr "" +"Por favor use la siguiente dirección de correo para todas las respuestas a " +"esta petición:" -#: app/models/info_request.rb:36 +#: app/models/info_request.rb:35 msgid "Please write a summary with some text in it" -msgstr "Por favor, escribe un resumen que no esté vacío" +msgstr "Por favor, escriba un resumen que no esté vacío" -#: app/models/info_request.rb:121 +#: app/models/info_request.rb:120 msgid "" "Please write the summary using a mixture of capital and lower case letters. " "This makes it easier for others to read." msgstr "" -"Por favor, escribe el resumen usando letras mayúsculas y minúsculas para " +"Por favor, escriba el resumen usando letras mayúsculas y minúsculas para " "facilitar su lectura" #: app/models/comment.rb:62 @@ -1868,21 +2156,23 @@ msgid "" "Please write your annotation using a mixture of capital and lower case " "letters. This makes it easier for others to read." msgstr "" -"Por favor, escribe tu comentario usando letras mayúsculas y minúsculas para " +"Por favor, escriba su comentario usando letras mayúsculas y minúsculas para " "facilitar su lectura" -#: app/controllers/request_controller.rb:416 +#: app/controllers/request_controller.rb:423 msgid "" "Please write your follow up message containing the necessary clarifications " "below." msgstr "" +"Por favor escriba su mensaje conteniendo las aclaraciones necesarias a " +"continuación." #: app/models/outgoing_message.rb:159 msgid "" "Please write your message using a mixture of capital and lower case letters." " This makes it easier for others to read." msgstr "" -"Por favor, escribe tu mensaje usando letras mayúsculas y minúsculas para " +"Por favor, escriba su mensaje usando letras mayúsculas y minúsculas para " "facilitar su lectura" #: app/views/comment/new.rhtml:41 @@ -1890,34 +2180,36 @@ msgid "" "Point to <strong>related information</strong>, campaigns or forums which may" " be useful." msgstr "" +"Haga referencia a <strong>información relacionada</strong>, campañas o foros" +" que puedan ser útiles." #: app/views/comment/preview.rhtml:21 msgid "Post annotation" -msgstr "" +msgstr "Enviar comentario" -#: locale/model_attributes.rb:56 +#: locale/model_attributes.rb:55 msgid "PostRedirect|Circumstance" -msgstr "" +msgstr "PostRedirect|Circumstance" -#: locale/model_attributes.rb:54 +#: locale/model_attributes.rb:53 msgid "PostRedirect|Email token" -msgstr "" +msgstr "PostRedirect|Email token" -#: locale/model_attributes.rb:53 +#: locale/model_attributes.rb:52 msgid "PostRedirect|Post params yaml" -msgstr "" +msgstr "PostRedirect|Post params yaml" -#: locale/model_attributes.rb:55 +#: locale/model_attributes.rb:54 msgid "PostRedirect|Reason params yaml" -msgstr "" +msgstr "PostRedirect|Reason params yaml" -#: locale/model_attributes.rb:51 +#: locale/model_attributes.rb:50 msgid "PostRedirect|Token" -msgstr "" +msgstr "PostRedirect|Token" -#: locale/model_attributes.rb:52 +#: locale/model_attributes.rb:51 msgid "PostRedirect|Uri" -msgstr "" +msgstr "PostRedirect" #: app/views/general/_credits.rhtml:1 msgid "Powered by <a href=\"http://www.alaveteli.org/\">Alaveteli</a>." @@ -1925,35 +2217,35 @@ msgstr "" #: app/views/request/followup_preview.rhtml:1 msgid "Preview follow up to '" -msgstr "" +msgstr "Revisar mensaje a '" #: app/views/comment/preview.rhtml:1 msgid "Preview new annotation on '{{info_request_title}}'" -msgstr "" +msgstr "Revisar nuevo comentario a '{{info_request_title}}'" #: app/views/comment/_comment_form.rhtml:15 msgid "Preview your annotation" -msgstr "" +msgstr "Revise su comentario" -#: app/views/request/_followup.rhtml:99 +#: app/views/request/_followup.rhtml:96 msgid "Preview your message" -msgstr "" +msgstr "Revise su mensaje" #: app/views/request/new.rhtml:139 msgid "Preview your public request" -msgstr "" +msgstr "Revise su petición pública" -#: locale/model_attributes.rb:18 +#: locale/model_attributes.rb:15 msgid "ProfilePhoto|Data" -msgstr "" +msgstr "ProfilePhoto|Data" -#: locale/model_attributes.rb:19 +#: locale/model_attributes.rb:16 msgid "ProfilePhoto|Draft" -msgstr "" +msgstr "ProfilePhoto|Draft" #: app/views/public_body/list.rhtml:37 msgid "Public authorities - {{description}}" -msgstr "" +msgstr "Organismos públicos - {{description}}" #: app/views/general/search.rhtml:73 msgid "" @@ -1969,15 +2261,15 @@ msgstr "Primera letra" #: locale/model_attributes.rb:10 msgid "PublicBody|Home page" -msgstr "Stio web" +msgstr "Sitio web" #: locale/model_attributes.rb:8 msgid "PublicBody|Last edit comment" -msgstr "" +msgstr "PublicBody|Last edit comment" #: locale/model_attributes.rb:7 msgid "PublicBody|Last edit editor" -msgstr "" +msgstr "PublicBody|Last edit editor" #: locale/model_attributes.rb:3 msgid "PublicBody|Name" @@ -1989,11 +2281,11 @@ msgstr "Notas" #: locale/model_attributes.rb:13 msgid "PublicBody|Publication scheme" -msgstr "" +msgstr "PublicBody|Publication scheme" #: locale/model_attributes.rb:5 msgid "PublicBody|Request email" -msgstr "" +msgstr "PublicBody|Request email" #: locale/model_attributes.rb:4 msgid "PublicBody|Short name" @@ -2011,143 +2303,155 @@ msgstr "Versión" msgid "Publication scheme" msgstr "Esquema de publicación" -#: locale/model_attributes.rb:49 -msgid "RawEmail|Data binary" -msgstr "" - #: locale/model_attributes.rb:48 -msgid "RawEmail|Data text" -msgstr "" +msgid "RawEmail|Data binary" +msgstr "RawEmail|Data binary" #: app/views/comment/preview.rhtml:20 msgid "Re-edit this annotation" -msgstr "" +msgstr "Editar este comentario" #: app/views/request/followup_preview.rhtml:49 msgid "Re-edit this message" -msgstr "" +msgstr "Editar este mensaje" #: app/views/request/preview.rhtml:40 msgid "Re-edit this request" -msgstr "" +msgstr "Editar esta petición" #: app/views/general/search.rhtml:137 msgid "" -"Read about <a href=\"%s\">advanced search operators</a>, such as proximity " -"and wildcards." +"Read about <a href=\"{{advanced_search_url}}\">advanced search " +"operators</a>, such as proximity and wildcards." msgstr "" -"Más información sobre <a href=\"%s\">los operadores de búsqueda " -"avanzados</a>, como cercanía y comodines." -#: app/views/layouts/default.rhtml:112 +#: app/views/layouts/default.rhtml:93 msgid "Read blog" msgstr "Leer el blog" #: app/views/request/new.rhtml:16 msgid "Read this before writing your {{info_request_law_used_full}} request" +msgstr "Lea esto antes de escribir su petición {{info_request_law_used_full}}" + +#: app/views/general/search.rhtml:150 +msgid "Received an error message, such as delivery failure." msgstr "" #: app/views/general/search.rhtml:42 msgid "Recently described results first" msgstr "Resultados descritos recientemente primero" -#: app/controllers/request_controller.rb:134 +#: app/controllers/request_controller.rb:139 msgid "Recently sent Freedom of Information requests" -msgstr "" +msgstr "Peticiones de acceso a la información enviadas recientemente" #: app/views/request/list.rhtml:6 msgid "Recently sent requests" -msgstr "" +msgstr "Peticiones enviadas recientemente" -#: app/controllers/request_controller.rb:139 +#: app/controllers/request_controller.rb:144 msgid "Recently successful responses" -msgstr "" +msgstr "Respuestas exitosas recientes" -#: app/models/info_request_event.rb:300 +#: app/models/info_request_event.rb:305 msgid "Refused" -msgstr "" +msgstr "Rechazada" -#: app/models/info_request.rb:786 +#: app/models/info_request.rb:793 msgid "Refused." -msgstr "" +msgstr "Rechazada." #: app/views/user/_signin.rhtml:26 msgid "" "Remember me</label> (keeps you signed in longer;\n" " do not use on a public computer) " msgstr "" +"Recuérdame</label> (mantiene la sesión abierta;\n" +" no lo use en un ordenador público) " #: app/views/request/_correspondence.rhtml:28 msgid "Reply to this message" -msgstr "" +msgstr "Conteste a este mensaje" #: app/views/comment/_single_comment.rhtml:24 msgid "Report abuse" -msgstr "" +msgstr "Denuncie abuso" #: app/views/request/_after_actions.rhtml:37 msgid "Request an internal review" -msgstr "" +msgstr "Pida una revisión interna" #: app/views/request/_followup.rhtml:4 msgid "Request an internal review from" -msgstr "" +msgstr "Pida una revisión interna de" #: app/views/request/hidden.rhtml:1 msgid "Request has been removed" -msgstr "" +msgstr "La petición ha sido eliminada" #: app/views/request/_request_listing_via_event.rhtml:28 msgid "" "Request sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "" +"Petición enviada a {{public_body_name}} por {{info_request_user}} el " +"{{date}}." #: app/views/request/_request_listing_via_event.rhtml:36 msgid "" "Request to {{public_body_name}} by {{info_request_user}}. Annotated by " "{{event_comment_user}} on {{date}}." msgstr "" +"Petición a {{public_body_name}} por {{info_request_user}}. Comentada por " +"{{event_comment_user}} el {{date}}." #: app/views/request/_request_listing_single.rhtml:12 msgid "" "Requested from {{public_body_name}} by {{info_request_user}} on {{date}}" -msgstr "" +msgstr "Petición a {{public_body_name}} de {{info_request_user}} el {{date}}" #: app/views/request/_sidebar_request_listing.rhtml:13 msgid "Requested on {{date}}" +msgstr "Pedida el {{date}}" + +#: app/models/track_thing.rb:209 app/models/track_thing.rb:210 +msgid "Requests or responses matching '{{query}}'" msgstr "" #: app/views/request/upload_response.rhtml:11 msgid "Respond by email" -msgstr "" +msgstr "Contestar por correo" #: app/views/request/_after_actions.rhtml:46 msgid "Respond to request" -msgstr "" +msgstr "Contestar la petición" #: app/views/request/upload_response.rhtml:5 msgid "Respond to the FOI request" -msgstr "" +msgstr "Contestar la petición" #: app/views/request/upload_response.rhtml:21 msgid "Respond using the web" +msgstr "Contestar vía web" + +#: app/views/general/search.rhtml:160 +msgid "Response from a public authority" msgstr "" -#: app/views/request/show.rhtml:70 +#: app/views/request/show.rhtml:77 msgid "Response to this request is <strong>delayed</strong>." -msgstr "" +msgstr "La respuesta a esta petición está <strong>retrasada</strong>." -#: app/views/request/show.rhtml:78 +#: app/views/request/show.rhtml:85 msgid "Response to this request is <strong>long overdue</strong>." -msgstr "" +msgstr "La respuesta a esta petición está <strong>muy retrasada</strong>." #: app/views/request/show_response.rhtml:64 msgid "Response to your request" -msgstr "" +msgstr "Respuesta a su petición" #: app/views/request/upload_response.rhtml:28 msgid "Response:" -msgstr "" +msgstr "Respuesta:" #: app/views/general/search.rhtml:9 msgid "Results page {{page_number}}" @@ -2155,11 +2459,11 @@ msgstr "Página de resultados {{page_number}}" #: app/views/user/set_profile_about_me.rhtml:35 msgid "Save" -msgstr "" +msgstr "Guardar" -#: app/views/request/new.rhtml:31 app/views/layouts/default.rhtml:99 #: app/views/general/exception_caught.rhtml:10 #: app/views/general/frontpage.rhtml:16 app/views/general/search.rhtml:29 +#: app/views/layouts/default.rhtml:80 app/views/request/new.rhtml:31 msgid "Search" msgstr "Buscar" @@ -2169,39 +2473,39 @@ msgstr "Buscar peticiones de información, organismos públicos y usuarios" #: app/views/general/exception_caught.rhtml:7 msgid "Search the site to find what you were looking for." -msgstr "" +msgstr "Buscar en esta web para encontrar lo que busca." -#: app/controllers/user_controller.rb:330 +#: app/controllers/user_controller.rb:331 msgid "Send a message to " -msgstr "" +msgstr "Enviar un mensaje a " #: app/views/request/_followup.rhtml:7 msgid "Send a public follow up message to" -msgstr "" +msgstr "Enviar un mensaje público a" #: app/views/request/_followup.rhtml:10 msgid "Send a public reply to" -msgstr "" +msgstr "Enviar una respuesta pública a" #: app/views/request/_correspondence.rhtml:58 msgid "Send follow up" -msgstr "" +msgstr "Enviar un mensaje" #: app/views/request/followup_preview.rhtml:50 msgid "Send message" -msgstr "" +msgstr "Enviar un mensaje" #: app/views/user/show.rhtml:69 msgid "Send message to " -msgstr "" +msgstr "Enviar un mensaje a " #: app/views/request/preview.rhtml:41 msgid "Send public " -msgstr "" +msgstr "Enviar público " #: app/views/user/show.rhtml:53 msgid "Set your profile photo" -msgstr "" +msgstr "Cambiar foto de perfil" #: app/models/public_body.rb:39 msgid "Short name is already taken" @@ -2211,36 +2515,40 @@ msgstr "Nombre de usuario ya en uso" msgid "Show most relevant results first" msgstr "Muestra resultados más relevantes primero" -#: app/views/request/list.rhtml:2 app/views/public_body/list.rhtml:3 +#: app/views/public_body/list.rhtml:3 app/views/request/list.rhtml:2 msgid "Show only..." -msgstr "" +msgstr "Mostrar sólo..." #: app/views/user/_signin.rhtml:31 app/views/user/show.rhtml:113 msgid "Sign in" -msgstr "" +msgstr "Abrir sesión" #: app/views/user/sign.rhtml:20 msgid "Sign in or make a new account" -msgstr "" +msgstr "Abrir sesión o crear nueva cuenta" -#: app/views/layouts/default.rhtml:122 +#: app/views/layouts/default.rhtml:103 msgid "Sign in or sign up" msgstr "Iniciar sesión o registro" -#: app/views/layouts/default.rhtml:119 +#: app/views/layouts/default.rhtml:100 msgid "Sign out" msgstr "Cerrar sesión" #: app/views/user/_signup.rhtml:41 msgid "Sign up" -msgstr "" +msgstr "Registrarse" #: app/views/request/_sidebar.rhtml:30 msgid "Similar requests" -msgstr "" +msgstr "Peticiones similares" -#: app/models/info_request_event.rb:302 +#: app/models/info_request_event.rb:307 msgid "Some information sent" +msgstr "Enviada parte de la información" + +#: app/views/general/search.rhtml:145 +msgid "Some of the information requested has been received" msgstr "" #: app/views/request_game/play.rhtml:31 @@ -2250,49 +2558,53 @@ msgid "" "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 "" +"Algunas personas que hicieron peticiones no nos han hecho saber si tuvieron\n" +"éxito o no. Necesitamos <strong>su</strong> ayuda –\n" +"elija una de las peticiones, léala, y háganos saber si se ha obtenido o no\n" +"la información. Todos le estaremos agradecidos.." #: app/views/user_mailer/changeemail_already_used.rhtml:1 msgid "" "Someone, perhaps you, just tried to change their email address on\n" -"WhatDoTheyKnow.com from " +"{{site_name}} from {{old_email}} to {{new_email}}." msgstr "" #: app/views/general/exception_caught.rhtml:1 msgid "Sorry, we couldn't find that page" -msgstr "" +msgstr "Lo sentimos, no hemos podido encontrar esa página" #: app/views/request/new.rhtml:53 msgid "Special note for this authority!" -msgstr "" +msgstr "¡Notas especiales sobre este organismo!" #: app/views/request/_other_describe_state.rhtml:21 msgid "Still awaiting an <strong>internal review</strong>" -msgstr "" +msgstr "Todavía esperando por una <strong>revisión interna</strong>" -#: app/views/request/preview.rhtml:18 #: app/views/request/followup_preview.rhtml:23 +#: app/views/request/preview.rhtml:18 msgid "Subject:" -msgstr "" +msgstr "Tema:" #: app/views/user/signchangepassword_send_confirm.rhtml:26 msgid "Submit" -msgstr "" +msgstr "Enviar" #: app/views/request/_describe_state.rhtml:101 msgid "Submit status" -msgstr "" +msgstr "Enviar estado" #: app/models/track_thing.rb:158 app/models/track_thing.rb:159 msgid "Successful Freedom of Information requests" -msgstr "" +msgstr "Peticiones de acceso a la información con éxito" #: app/views/request/list.rhtml:5 msgid "Successful responses" -msgstr "" +msgstr "Respuestas con exito" -#: app/models/info_request.rb:790 +#: app/models/info_request.rb:797 msgid "Successful." -msgstr "" +msgstr "Exitosa." #: app/views/comment/new.rhtml:38 msgid "" @@ -2302,7 +2614,7 @@ msgstr "" #: app/views/request/new.rhtml:93 msgid "Summary:" -msgstr "" +msgstr "Resumen:" #: app/views/general/search.rhtml:140 msgid "Table of statuses" @@ -2310,43 +2622,47 @@ msgstr "Tabla de estados" #: app/views/request/preview.rhtml:45 msgid "Tags:" -msgstr "" +msgstr "Etiquetas:" -#: app/controllers/request_game_controller.rb:50 +#: app/controllers/request_game_controller.rb:52 msgid "Thank you for helping us keep the site tidy!" -msgstr "" +msgstr "¡Gracias por ayudarnos a mantener la web en orden!" #: app/controllers/comment_controller.rb:62 msgid "Thank you for making an annotation!" -msgstr "" +msgstr "¡Gracias por hacer un comentario!" -#: app/controllers/request_controller.rb:729 +#: app/controllers/request_controller.rb:736 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 "" +"¡Gracias por responder a esta petición de información! Su respuesta ha sido " +"publicada a continuación, y un enlace a su respuesta ha sido enviada a " -#: app/controllers/request_controller.rb:373 +#: app/controllers/request_controller.rb:378 msgid "" "Thank you for updating the status of the request '<a " -"href=\"%s\">{{info_request_title}}</a>'. There are some more requests below " -"for you to classify." +"href=\"{{url}}\">{{info_request_title}}</a>'. There are some more requests " +"below for you to classify." msgstr "" -#: app/controllers/request_controller.rb:376 +#: app/controllers/request_controller.rb:381 msgid "Thank you for updating this request!" -msgstr "" +msgstr "¡Gracias por actualizar esta petición!" -#: app/controllers/user_controller.rb:397 -#: app/controllers/user_controller.rb:413 +#: app/controllers/user_controller.rb:398 +#: app/controllers/user_controller.rb:414 msgid "Thank you for updating your profile photo" -msgstr "" +msgstr "Gracias por actualizar su foto de perfil" #: app/views/request_game/play.rhtml:42 msgid "" "Thanks for helping - your work will make it easier for everyone to find successful\n" "responses, and maybe even let us make league tables..." msgstr "" +"Gracias por ayudar - su trabajo hace más sencillo que otros encuentren peticiones\n" +"que han tenido éxito, e incluso nos permitirá hacer clasificaciones..." #: app/views/user/show.rhtml:20 msgid "" @@ -2354,6 +2670,9 @@ msgid "" " also, if you need it, give advice on what to do next about your\n" " requests." msgstr "" +"Muchas gracias - esto ayudará a otros a encontrar información útil.\n" +" Nosotros también, si lo necesita, ofrecemos consejos sobre qué\n" +" hacer a continuación con sus peticiones." #: app/views/request/new_please_describe.rhtml:20 msgid "" @@ -2361,48 +2680,61 @@ msgid "" " We'll also, if you need it, give you advice on what to do next about each of your\n" " requests." msgstr "" +"Muchas gracias por ayudar a mantenerlo todo <strong>limpio y organizado</strong>.\n" +" Nosotros también, si lo necesita, ofrecemos consejos sobre qué\n" +" hacer a continuación con sus peticiones." -#: app/controllers/user_controller.rb:188 +#: app/controllers/user_controller.rb:189 msgid "" "That doesn't look like a valid email address. Please check you have typed it" " correctly." msgstr "" +"No parece ser una dirección de correo válida. Por favor comprueba que la ha " +"escrito correctamente." #: app/views/request/_describe_state.rhtml:47 #: app/views/request/_other_describe_state.rhtml:43 msgid "The <strong>review has finished</strong> and overall:" -msgstr "" +msgstr "La <strong>revisión ha finalizado</strong> y en resumen:" #: app/views/request/new.rhtml:62 msgid "The Freedom of Information Act <strong>does not apply</strong> to" -msgstr "" +msgstr "La ley de acceso a la información <strong>no es aplicable</strong> a" -#: app/views/user_mailer/changeemail_already_used.rhtml:7 +#: app/views/user_mailer/changeemail_already_used.rhtml:8 msgid "The accounts have been left as they previously were." -msgstr "" +msgstr "Las cuentas se han dejado tal y como estaban anteriormente." #: app/views/request/_other_describe_state.rhtml:48 msgid "" "The authority do <strong>not have</strong> the information <small>(maybe " "they say who does)" msgstr "" +"El organismo <strong>no tiene</strong> la información <small>(tal vez dicen " +"quién la tiene)" #: app/views/request/show_response.rhtml:28 msgid "" "The authority only has a <strong>paper copy</strong> of the information." msgstr "" +"El organismo sólo tiene una <strong>copia en papel</strong> de la " +"información." #: app/views/request/show_response.rhtml:18 msgid "" "The authority say that they <strong>need a postal\n" " address</strong>, not just an email, for it to be a valid FOI request" msgstr "" +"El organismo dice que necesita <strong>una dirección\n" +" postal</strong>, no sólo un correo electrónico, para que la petición sea válida" -#: app/views/request/show.rhtml:102 +#: app/views/request/show.rhtml:109 msgid "" "The authority would like to / has <strong>responded by post</strong> to this" " request." msgstr "" +"El organismo querría / ha respondido <strong>por correo ordinario</strong> a" +" esta petición." #: app/views/request_mailer/stopped_responses.rhtml:1 msgid "" @@ -2410,6 +2742,9 @@ msgid "" "{{user}} to reply to an {{law_used_short}}\n" "request has not been delivered." msgstr "" +"El correo envíado por usted, en nombre de {{public_body}}, enviado a\n" +"{{user}} como respuesta a la petición {{law_used_short}}\n" +"no ha sido entregado." #: app/views/request/show_response.rhtml:22 msgid "" @@ -2420,32 +2755,51 @@ msgstr "" #: app/views/general/exception_caught.rhtml:3 msgid "The page either doesn't exist, or is broken. Things you can try now:" +msgstr "La página no existe, o está rota. Cosas que puede probar ahora:" + +#: app/views/general/search.rhtml:143 +msgid "The public authority does not have the information requested" +msgstr "" + +#: app/views/general/search.rhtml:147 +msgid "The public authority would like part of the request explained" +msgstr "" + +#: app/views/general/search.rhtml:148 +msgid "The public authority would like to / has responded by post" msgstr "" #: app/views/request/_other_describe_state.rhtml:60 msgid "The request has been <strong>refused</strong>" -msgstr "" +msgstr "La petición ha sido <strong>rechazada</strong>" -#: app/controllers/request_controller.rb:347 +#: app/controllers/request_controller.rb:352 msgid "" "The request has been updated since you originally loaded this page. Please " "check for any new incoming messages below, and try again." msgstr "" +"La petición ha sido actualizada desde que llegó inicialmente a esta página. " +"Por favor revise si ha llegado un nuevo mensaje a continuación, y vuelva a " +"intentarlo." -#: app/views/request/show.rhtml:97 +#: app/views/request/show.rhtml:104 msgid "The request is <strong>waiting for clarification</strong>." -msgstr "" +msgstr "La petición está <strong>esperando aclaración</strong>." -#: app/views/request/show.rhtml:90 +#: app/views/request/show.rhtml:97 msgid "The request was <strong>partially successful</strong>." -msgstr "" +msgstr "La petición fue <strong>exitosa parcialmente</strong>." -#: app/views/request/show.rhtml:86 +#: app/views/request/show.rhtml:93 msgid "The request was <strong>refused</strong> by" -msgstr "" +msgstr "La petición fue <strong>rechazada</strong> por" -#: app/views/request/show.rhtml:88 +#: app/views/request/show.rhtml:95 msgid "The request was <strong>successful</strong>." +msgstr "La petición fue <strong>exitosa</strong>." + +#: app/views/general/search.rhtml:144 +msgid "The request was refused by the public authority" msgstr "" #: app/views/request/hidden.rhtml:9 @@ -2454,146 +2808,194 @@ msgid "" "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 "" +"La petición que ha intentado ver ha sido eliminada. Hay\n" +"varios posibles motivos para esto, pero no podemos ser más específicos aquí. Por favor <a\n" +" href=\"%s\">contáctenos</a> si tiene cualquier pregunta." -#: app/views/request/_followup.rhtml:35 +#: app/views/general/search.rhtml:152 +msgid "The requester has abandoned this request for some reason" +msgstr "" + +#: app/views/request/_followup.rhtml:32 msgid "" "The response to your request has been <strong>delayed</strong>. You can say that, \n" " by law, the authority should normally have responded\n" " <strong>promptly</strong> and" msgstr "" +"La respuesta a su petición ha sido <strong>retrasada</strong>.\n" +" Por ley, el organismo debería normalmente haber respondido\n" +" <strong>rápidamente</strong> y" -#: app/views/request/_followup.rhtml:47 +#: app/views/request/_followup.rhtml:44 msgid "" "The response to your request is <strong>long overdue</strong>. You can say that, by \n" " law, under all circumstances, the authority should have responded\n" " by now" msgstr "" +"La respuesta a su petición ha sido <strong>muy retrasada</strong>.\n" +" Por ley, bajo cualquier circunstancia, el organismo ya debería\n" +" haber respondido" #: app/views/public_body/show.rhtml:100 msgid "" "The search index is currently offline, so we can't show the Freedom of " "Information requests that have been made to this authority." msgstr "" -"El índice de búsqueda no está accesible en estos momentos: no podemos " -"mostrar las peticiones de información realizadas a este organismo." +"El motor de búsqueda no está accesible en estos momentos: no podemos mostrar" +" las peticiones de información realizadas a este organismo." #: app/views/user/show.rhtml:141 msgid "" "The search index is currently offline, so we can't show the Freedom of " "Information requests this person has made." msgstr "" +"El motor de búsqueda no está accesible en estos momentos: no podemos mostrar" +" las peticiones de información que ha hecho esta persona" -#: app/controllers/track_controller.rb:142 +#: app/controllers/track_controller.rb:144 msgid "Then you can cancel the alert." -msgstr "" +msgstr "Entonces podrá cancelar su alerta." -#: app/controllers/track_controller.rb:172 +#: app/controllers/track_controller.rb:174 msgid "Then you can cancel the alerts." -msgstr "" +msgstr "Entonces podrá cancelar las alertas." -#: app/controllers/user_controller.rb:248 +#: app/controllers/user_controller.rb:249 msgid "Then you can change your email address used on {{site_name}}" -msgstr "" +msgstr "Entonces podrá cambiar el correo utilizado en {{site_name}}" -#: app/controllers/user_controller.rb:202 +#: app/controllers/user_controller.rb:203 msgid "Then you can change your password on {{site_name}}" -msgstr "" +msgstr "Entonces podrá cambiar su contraseña en {{site_name}}" -#: app/controllers/request_controller.rb:333 +#: app/controllers/request_controller.rb:338 msgid "Then you can classify the FOI response you have got from " -msgstr "" +msgstr "Entonces podrá clasificar la respuesta que ha obtenido " -#: app/controllers/request_game_controller.rb:39 +#: app/controllers/request_game_controller.rb:41 msgid "Then you can play the request categorisation game." -msgstr "" +msgstr "Entonces podrá jugar al juego de clasificar peticiones" -#: app/controllers/user_controller.rb:329 +#: app/controllers/user_controller.rb:330 msgid "Then you can send a message to " -msgstr "" +msgstr "Entonces podrá mandar un mensaje a" -#: app/controllers/user_controller.rb:513 +#: app/controllers/user_controller.rb:514 msgid "Then you can sign in to {{site_name}}" -msgstr "" +msgstr "Entonces podrá entrar a {{site_name}}" -#: app/controllers/request_controller.rb:59 +#: app/controllers/request_controller.rb:61 msgid "Then you can update the status of your request to " -msgstr "" +msgstr "Entonces podrá actualizar el estado de su petición a " -#: app/controllers/request_controller.rb:695 +#: app/controllers/request_controller.rb:702 msgid "Then you can upload an FOI response. " -msgstr "" +msgstr "Entonces podrá subir una respuesta. " -#: app/controllers/request_controller.rb:538 +#: app/controllers/request_controller.rb:545 msgid "Then you can write follow up message to " -msgstr "" +msgstr "Entonces podrá escribir un mensaje a " -#: app/controllers/request_controller.rb:539 +#: app/controllers/request_controller.rb:546 msgid "Then you can write your reply to " +msgstr "Entonces podrá escribir su respuesta a " + +#: app/models/track_thing.rb:197 +msgid "" +"Then you will be emailed whenever '{{user_name}}' requests something or gets" +" a response." +msgstr "" + +#: app/models/track_thing.rb:213 +msgid "" +"Then you will be emailed whenever a new request or response matches " +"'{{query}}'." msgstr "" #: app/models/track_thing.rb:162 msgid "Then you will be emailed whenever an FOI request succeeds." +msgstr "Entonces recibirá correos cuando una petición tenga éxito." + +#: app/models/track_thing.rb:146 +msgid "Then you will be emailed whenever anyone makes a new FOI request." msgstr "" -#: app/controllers/request_controller.rb:294 -msgid "Then your FOI request to {{public_body_name}} will be sent." +#: app/models/track_thing.rb:181 +msgid "" +"Then you will be emailed whenever someone requests something or gets a " +"response from '{{public_body_name}}'." msgstr "" +#: app/controllers/request_controller.rb:299 +msgid "Then your FOI request to {{public_body_name}} will be sent." +msgstr "Entonces su petición a {{public_body_name}} será enviada." + #: app/controllers/comment_controller.rb:56 msgid "Then your annotation to {{info_request_title}} will be posted." -msgstr "" +msgstr "Entonces se enviará su comentario a {{info_request_title}}." #: app/views/request_mailer/comment_on_alert_plural.rhtml:1 msgid "" "There are {{count}} new annotations on your {{info_request}} request. Follow" " this link to see what they wrote." msgstr "" +"Hay {{count}} comentarios en su petición {{info_request}}. Siga este enlace " +"para leer lo que dicen." #: app/views/user/show.rhtml:4 msgid "" "There is <strong>more than one person</strong> who uses this site and has this name. \n" " One of them is shown below, you may mean a different one:" msgstr "" +"Hay <strong>más de una persona</strong> que utiliza esta web y tiene este nombre. \n" +" Una de ellas se muestra a continuación, puede que se refiera a una distinta:" -#: app/views/request/show.rhtml:106 +#: app/views/request/show.rhtml:113 msgid "" "There was a <strong>delivery error</strong> or similar, which needs fixing " -"by the WhatDoTheyKnow team." +"by the {{site_name}} team." msgstr "" -#: app/controllers/public_body_controller.rb:76 +#: app/controllers/public_body_controller.rb:77 msgid "There was an error with the words you entered, please try again." msgstr "" +"Ha habido un error con las palabras introducidas, por favor pruebe otra vez." #: app/views/request/_describe_state.rhtml:38 msgid "They are going to reply <strong>by post</strong>" -msgstr "" +msgstr "Van a responder <strong>por correo ordinario</strong>" #: app/views/request/_describe_state.rhtml:52 msgid "" "They do <strong>not have</strong> the information <small>(maybe they say who" " does)</small>" msgstr "" +"<strong>No tienen</strong> la información <small>(tal vez dicen quién la " +"tiene)</small>" #: app/views/user/show.rhtml:83 msgid "They have been given the following explanation:" -msgstr "" +msgstr "Han recibido la siguiente explicación:" #: app/views/request_mailer/overdue_alert.rhtml:3 msgid "" "They have not replied to your {{law_used_short}} request {{title}} promptly," " as normally required by law" msgstr "" +"No han respondido a su petición {{law_used_short}} {{title}} rápidamente, " +"como require generalmente la ley" #: app/views/request_mailer/very_overdue_alert.rhtml:3 msgid "" "They have not replied to your {{law_used_short}} request {{title}}, \n" "as required by law" msgstr "" +"No han respondido a su petición {{law_used_short}} {{title}}, \n" +" como require la ley" #: app/views/request/_after_actions.rhtml:3 msgid "Things to do with this request" -msgstr "" +msgstr "Cosas que hacer con esta petición" #: app/views/public_body/show.rhtml:59 msgid "This authority no longer exists, so you cannot make a request to it." @@ -2605,63 +3007,84 @@ 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 "" +"Este respuesta está oculta. Revise los comentarios\n" +" para descubrir por qué. Si es su petición, <a href=\"%s\">abra una sesión</a> para ver la respuesta." #: app/views/request/new.rhtml:65 msgid "" "This covers a very wide spectrum of information about the state of\n" " the <strong>natural and built environment</strong>, such as:" msgstr "" +"Esto incluye un amplio espectro de información sobre el estado de\n" +" el <strong>entorno natural y urbanizado</strong>, como:" #: app/views/request/_view_html_prefix.rhtml:9 msgid "" "This is an HTML version of an attachment to the Freedom of Information " "request" msgstr "" +"Esta es la versión HTML de un fichero adjunto a una petición de acceso a la " +"información" #: app/views/request_mailer/stopped_responses.rhtml:5 msgid "" "This is because {{title}} is an old request that has been\n" "marked to no longer receive responses." msgstr "" +"Esto es porque {{title}} es una petición antigua\n" +"marcada para ya no recibir más respuestas." #: app/views/track/_tracking_links.rhtml:9 msgid "" "This is your own request, so you will be automatically emailed when new " "responses arrive." msgstr "" +"Esta es su petición, por lo que recibirá correos automáticamente cuando " +"lleguen nuevas respuestas." #: app/views/request/_hidden_correspondence.rhtml:17 msgid "" "This outgoing message has been hidden. See annotations to\n" "\t\t\t\t\t\tfind out why. If you are the requester, then you may <a href=\"%s\">sign in</a> to view the response." msgstr "" +"Este mensaje está oculto. Lea los comentarios\n" +"\t\t\t\t\t\tpara descubrir por qué. Si es su petición, <a href=\"%s\">abra una sesión</a> para ver la respuesta." #: app/views/user/show.rhtml:122 msgid "This person has" -msgstr "" +msgstr "Esta persona ha" #: app/views/user/show.rhtml:152 msgid "This person's" -msgstr "" +msgstr "Esta persona" #: app/views/request/_describe_state.rhtml:84 msgid "This request <strong>requires administrator attention</strong>" msgstr "" +"Esta petición <strong>requiere la intervención de un administrador</strong>" -#: app/views/request/show.rhtml:48 +#: app/views/request/show.rhtml:55 msgid "This request has an <strong>unknown status</strong>." -msgstr "" +msgstr "Esta petición tiene un <strong>estado desconocido</strong>." -#: app/views/request/show.rhtml:110 +#: app/views/request/show.rhtml:117 msgid "" "This request has been <strong>withdrawn</strong> by the person who made it. \n" " \t There may be an explanation in the correspondence below." msgstr "" +"Esta petición ha sido <strong>retirada</strong> por la persona que la realizó. \n" +" \t Puede que haya una explicación en los mensajes a continuación." + +#: app/models/info_request.rb:395 +msgid "" +"This request has been set by an administrator to \"allow new responses from " +"nobody\"" +msgstr "" -#: app/views/request/show.rhtml:108 +#: app/views/request/show.rhtml:115 msgid "" "This request has had an unusual response, and <strong>requires " -"attention</strong> from the WhatDoTheyKnow team." +"attention</strong> from the {{site_name}} team." msgstr "" #: app/views/request/show.rhtml:5 @@ -2669,52 +3092,74 @@ msgid "" "This request has prominence 'hidden'. You can only see it because you are logged\n" " in as a super user." msgstr "" +"Esta petición tiene visibilidad 'oculta'. Puede verla sólo porque esta identificado\n" +" como super-usuario." #: app/views/request/show.rhtml:11 msgid "" "This request is hidden, so that only you the requester can see it. Please\n" " <a href=\"%s\">contact us</a> if you are not sure why." msgstr "" +"Esta petición está oculta, por lo que sólo usted como creador puede verla. Por favor\n" +" <a href=\"%s\">contáctenos</a> si no está seguro de por qué." #: app/views/request/_hidden_correspondence.rhtml:10 msgid "" "This response has been hidden. See annotations to find out why.\n" " If you are the requester, then you may <a href=\"%s\">sign in</a> to view the response." msgstr "" +"Este respuesta está oculta. Revise los comentarios\n" +" para descubrir por qué. Si es su petición, <a href=\"%s\">abra una sesión</a> para ver la respuesta." #: app/views/request/new.rhtml:49 msgid "" "This site is <strong>public</strong>. Everything you type and any response " "will be published." msgstr "" +"Esta web es <strong>pública</strong>. Todo lo que escriba y cualquier " +"respuesta será publicada." #: app/views/request/details.rhtml:6 msgid "" "This table shows the technical details of the internal events that happened\n" -"to this request on WhatDoTheyKnow. This could be used to generate information about\n" +"to this request on {{site_name}}. This could be used to generate information about\n" "the speed with which authorities respond to requests, the number of requests\n" "which require a postal response and much more." msgstr "" #: app/views/user/show.rhtml:79 -msgid "This user has been banned from WhatDoTheyKnow.com " +msgid "This user has been banned from {{site_name}} " msgstr "" -#: app/views/user_mailer/changeemail_already_used.rhtml:4 +#: app/views/user_mailer/changeemail_already_used.rhtml:5 msgid "" "This was not possible because there is already an account using \n" -"the email address " +"the email address {{email}}." +msgstr "" + +#: app/models/track_thing.rb:145 +msgid "To be emailed about any new requests" msgstr "" #: app/models/track_thing.rb:161 msgid "To be emailed about any successful requests" +msgstr "Para recibir correos sobre cualquier petición exitosa" + +#: app/models/track_thing.rb:196 +msgid "To be emailed about requests by '{{user_name}}'" msgstr "" -#: app/controllers/track_controller.rb:171 -msgid "To cancel these alerts" +#: app/models/track_thing.rb:180 +msgid "" +"To be emailed about requests made using {{site_name}} to the public " +"authority '{{public_body_name}}'" msgstr "" -#: app/controllers/track_controller.rb:141 +#: app/controllers/track_controller.rb:173 +msgid "To cancel these alerts" +msgstr "Cancelar estas alertas" + +#: app/controllers/track_controller.rb:143 msgid "To cancel this alert" msgstr "Cancelar esta alerta" @@ -2723,21 +3168,27 @@ 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 "" +"Para continuar, necesita abrir una sesión o crear una cuenta. Desgraciadamente,\n" +"ha habido un problema técnico al intentar hacerlo." -#: app/controllers/user_controller.rb:247 +#: app/controllers/user_controller.rb:248 msgid "To change your email address used on {{site_name}}" msgstr "Cambiar la dirección de correo usada en {{site_name}}" -#: app/controllers/request_controller.rb:332 +#: app/controllers/request_controller.rb:337 msgid "To classify the response to this FOI request" msgstr "Reclasificar la respuesta a esta petición" #: app/views/request/show_response.rhtml:39 msgid "To do that please send a private email to " -msgstr "" +msgstr "Para hacerlo, por favor mande un correo privado a " #: app/views/request_mailer/not_clarified_alert.rhtml:2 msgid "To do this, first click on the link below." +msgstr "Para hacerlo, elija primero el siguiente enlace." + +#: app/models/track_thing.rb:212 +msgid "To follow requests and responses matching '{{query}}'" msgstr "" #: app/views/request_mailer/old_unclassified_updated.rhtml:1 @@ -2745,12 +3196,14 @@ 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 "" +"Para ayudarnos a mantener la web ordenada, alguien ha actualizado el estado de \n" +"la petición {{law_used_full}} {{title}} que hizo a {{public_body}}, a \"{{display_status}}\". Si no está de acuerdo con esta clasificación, por favor actualice el estado usted mismo a lo que considere correcto." #: app/views/request_mailer/new_response_reminder_alert.rhtml:1 msgid "To let us know, follow this link and then select the appropriate box." -msgstr "" +msgstr "Para hacérnoslo saber, siga este enlace y elija la caja apropiada." -#: app/controllers/request_game_controller.rb:38 +#: app/controllers/request_game_controller.rb:40 msgid "To play the request categorisation game" msgstr "Jugar al juego de recategorización de peticiones" @@ -2758,27 +3211,27 @@ msgstr "Jugar al juego de recategorización de peticiones" msgid "To post your annotation" msgstr "Añadir su comentario" -#: app/controllers/request_controller.rb:536 +#: app/controllers/request_controller.rb:543 msgid "To reply to " msgstr "Contestar a " -#: app/controllers/request_controller.rb:535 +#: app/controllers/request_controller.rb:542 msgid "To send a follow up message to " msgstr "Enviar una respuesta a " -#: app/controllers/user_controller.rb:328 +#: app/controllers/user_controller.rb:329 msgid "To send a message to " msgstr "Para enviar un mensaje a" -#: app/controllers/request_controller.rb:293 +#: app/controllers/request_controller.rb:298 msgid "To send your FOI request" msgstr "Para enviar su petición de información" -#: app/controllers/request_controller.rb:58 +#: app/controllers/request_controller.rb:60 msgid "To update the status of this FOI request" msgstr "Para actualizar el estado de su petición de información" -#: app/controllers/request_controller.rb:694 +#: app/controllers/request_controller.rb:701 msgid "" "To upload a response, you must be logged in using an email address from " msgstr "" @@ -2790,79 +3243,93 @@ msgid "" "To view the email address that we use to send FOI requests to " "{{public_body_name}}, please enter these words." msgstr "" +"Para ver la dirección de correo que usamos para mandar peticiones a " +"{{public_body_name}}, por favor introduzca estas palabras." #: app/views/request_mailer/new_response.rhtml:5 msgid "To view the response, click on the link below." -msgstr "" +msgstr "Para ver la respuesta, use el siguiente enlace." #: app/views/request/_request_listing_short_via_event.rhtml:9 msgid "To {{public_body_link_absolute}}" -msgstr "" +msgstr "Para {{public_body_link_absolute}}" -#: app/views/request/preview.rhtml:17 #: app/views/request/followup_preview.rhtml:22 app/views/request/new.rhtml:88 +#: app/views/request/preview.rhtml:17 msgid "To:" -msgstr "" +msgstr "Para:" #: app/models/track_thing.rb:174 msgid "Track requests to {{public_body_name}} by email" +msgstr "Seguir peticiones a {{public_body_name}} por correo" + +#: app/models/track_thing.rb:206 +msgid "Track things matching '{{query}}' by email" msgstr "" #: app/views/public_body/show.rhtml:3 msgid "Track this authority" -msgstr "" +msgstr "Seguir a este organismo" #: app/views/user/show.rhtml:29 msgid "Track this person" +msgstr "Seguir a esta persona" + +#: app/models/track_thing.rb:190 +msgid "Track this person by email" msgstr "" #: app/views/request/_sidebar.rhtml:2 msgid "Track this request" +msgstr "Seguir esta petición" + +#: app/models/track_thing.rb:123 +msgid "Track this request by email" msgstr "" #: locale/model_attributes.rb:33 msgid "TrackThing|Track medium" -msgstr "" +msgstr "TrackThing|Track medium" #: locale/model_attributes.rb:32 msgid "TrackThing|Track query" -msgstr "" +msgstr "TrackThing|Track query" #: locale/model_attributes.rb:34 msgid "TrackThing|Track type" -msgstr "" +msgstr "TrackThing|Track type" #: app/views/general/search.rhtml:133 msgid "" "Type <strong><code>01/01/2008..14/01/2008</code></strong> to only show " "things that happened in the first two weeks of January." msgstr "" -"Introduce <code><strong>01/01/2008..14/01/2008</strong></code> para mostrar " -"sólo las cosas que sucedieron en las dos primeras semanas de enero." +"Introduzca <code><strong>01/01/2008..14/01/2008</strong></code> para mostrar" +" sólo las cosas que sucedieron en las dos primeras semanas de enero." #: app/models/public_body.rb:37 msgid "URL name can't be blank" msgstr "La URL no puede estar vacía." #: app/models/user_mailer.rb:45 -msgid "Unable to change email address on WhatDoTheyKnow.com" +msgid "Unable to change email address on {{site_name}}" msgstr "" #: app/views/request/followup_bad.rhtml:4 msgid "Unable to send a reply to {{username}}" -msgstr "" +msgstr "No se pudo enviar la respuesta a {{username}}" #: app/views/request/followup_bad.rhtml:2 msgid "Unable to send follow up message to {{username}}" -msgstr "" +msgstr "No se pudo enviar la respuesta a {{username}}" #: app/views/request/list.rhtml:29 msgid "Unexpected search result type" -msgstr "" +msgstr "Se encontró un tipo de resultado inesperado" #: app/views/request/similar.rhtml:18 msgid "Unexpected search result type " -msgstr "" +msgstr "Se encontró un tipo de resultado inesperado " #: app/views/user/wrong_user_unknown_email.rhtml:3 msgid "" @@ -2870,31 +3337,34 @@ msgid "" "email address for that authority, so we can't validate this.\n" "Please <a href=\"%s\">contact us</a> to sort it out." msgstr "" +"Desgraciadamente no tenemos la dirección\n" +"de correo para este organismo, así que no podemos validarlo.\n" +"Por favor <a href=\"%s\">contáctenos</a> para arreglarlo." #: app/views/request/new_bad_contact.rhtml:5 msgid "" "Unfortunately, we do not have a working {{info_request_law_used_full}}\n" "address for" -msgstr "" +msgstr "Desgraciadamente, no tenemos una dirección de correo válida para" #: app/views/general/exception_caught.rhtml:17 msgid "Unknown" -msgstr "" +msgstr "Desconocido" -#: app/models/info_request_event.rb:312 +#: app/models/info_request_event.rb:317 msgid "Unusual response" -msgstr "" +msgstr "Respuesta no habitual" -#: app/models/info_request.rb:800 +#: app/models/info_request.rb:807 msgid "Unusual response." -msgstr "" +msgstr "Respuesta no habitual." #: app/views/request/_after_actions.rhtml:13 #: app/views/request/_after_actions.rhtml:33 msgid "Update the status of this request" -msgstr "" +msgstr "Actualizar el estado de esta petición" -#: app/controllers/request_controller.rb:60 +#: app/controllers/request_controller.rb:62 msgid "Update the status of your request to " msgstr "Actualizar el estado de la petición a " @@ -2914,49 +3384,49 @@ msgstr "" "Utilice comillas cuando quiera buscar una frase exacta, por ejemplo " "<strong><code>\"Consejo de Europa\"</code></strong>" -#: locale/model_attributes.rb:68 +#: locale/model_attributes.rb:67 msgid "UserInfoRequestSentAlert|Alert type" -msgstr "" +msgstr "UserInfoRequestSentAlert|Alert type" -#: locale/model_attributes.rb:79 +#: locale/model_attributes.rb:78 msgid "User|About me" -msgstr "Sobre mí" +msgstr "User|About me" -#: locale/model_attributes.rb:77 +#: locale/model_attributes.rb:76 msgid "User|Admin level" -msgstr "" +msgstr "User|Admin level" -#: locale/model_attributes.rb:78 +#: locale/model_attributes.rb:77 msgid "User|Ban text" -msgstr "" +msgstr "User|Ban text" -#: locale/model_attributes.rb:70 +#: locale/model_attributes.rb:69 msgid "User|Email" -msgstr "Dirección de correo" +msgstr "User|Email" -#: locale/model_attributes.rb:74 +#: locale/model_attributes.rb:73 msgid "User|Email confirmed" -msgstr "" +msgstr "User|Email confirmed" -#: locale/model_attributes.rb:72 +#: locale/model_attributes.rb:71 msgid "User|Hashed password" -msgstr "" +msgstr "User|Hashed password" -#: locale/model_attributes.rb:76 +#: locale/model_attributes.rb:75 msgid "User|Last daily track email" -msgstr "" +msgstr "User|Last daily track email" -#: locale/model_attributes.rb:71 +#: locale/model_attributes.rb:70 msgid "User|Name" -msgstr "Nombre" +msgstr "User|Name" -#: locale/model_attributes.rb:73 +#: locale/model_attributes.rb:72 msgid "User|Salt" -msgstr "" +msgstr "User|Salt" -#: locale/model_attributes.rb:75 +#: locale/model_attributes.rb:74 msgid "User|Url name" -msgstr "URL" +msgstr "User|Url name" #: app/views/public_body/show.rhtml:21 msgid "View FOI email address" @@ -2964,53 +3434,66 @@ msgstr "Ver dirección de correo" #: app/views/public_body/view_email_captcha.rhtml:1 msgid "View FOI email address for '{{public_body_name}}'" -msgstr "" +msgstr "Ver dirección de correo para '{{public_body_name}}'" #: app/views/public_body/view_email_captcha.rhtml:3 msgid "View FOI email address for {{public_body_name}}" -msgstr "" +msgstr "Ver dirección de correo para '{{public_body_name}}'" #: app/views/contact_mailer/user_message.rhtml:10 -msgid "View Freedom of Information requests made by" +msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "" -#: app/views/layouts/default.rhtml:108 +#: app/views/layouts/default.rhtml:89 msgid "View authorities" msgstr "Ver organismos públicos" #: app/views/public_body/view_email_captcha.rhtml:12 msgid "View email" -msgstr "" +msgstr "Ver correo" -#: app/views/layouts/default.rhtml:107 +#: app/views/layouts/default.rhtml:88 msgid "View requests" msgstr "Ver solicitudes" -#: app/models/info_request.rb:792 +#: app/models/info_request.rb:799 msgid "Waiting clarification." -msgstr "" +msgstr "Esperando aclaración." -#: app/views/request/show.rhtml:104 +#: app/views/request/show.rhtml:111 msgid "" "Waiting for an <strong>internal review</strong> by {{public_body_link}} of " "their handling of this request." msgstr "" +"Esperando una <strong>revisión interna</strong> por parte de " +"{{public_body_link}} de cómo han respondido a esta petición." + +#: app/views/general/search.rhtml:149 +msgid "" +"Waiting for the public authority to complete an internal review of their " +"handling of the request" +msgstr "" + +#: app/views/general/search.rhtml:142 +msgid "Waiting for the public authority to reply" +msgstr "" #: app/views/public_body/view_email.rhtml:17 msgid "We do not have a working request email address for this authority." -msgstr "" +msgstr "No tenemos una dirección de correo válida para este organismo." #: app/views/request/followup_bad.rhtml:24 msgid "" "We do not have a working {{law_used_full}} address for {{public_body_name}}." msgstr "" +"No tenemos una dirección de correo válida para este {{public_body_name}}." #: app/views/request/_describe_state.rhtml:107 msgid "" "We don't know whether the most recent response to this request contains\n" " information or not\n" " –\n" -"\tif you are {{user_link}} please <a href=\"%s\">sign in</a> and let everyone know." +"\tif you are {{user_link}} please <a href=\"{{url}}\">sign in</a> and let everyone know." msgstr "" #: app/views/user_mailer/confirm_login.rhtml:8 @@ -3018,145 +3501,176 @@ msgid "" "We will not reveal your email address to anybody unless you\n" "or the law tell us to." msgstr "" +"No revelaremos su dirección de correo a nadie salvo que usted\n" +"nos lo diga, o la ley nos obligue." -#: app/views/user_mailer/changeemail_confirm.rhtml:9 +#: app/views/user_mailer/changeemail_confirm.rhtml:10 msgid "" "We will not reveal your email addresses to anybody unless you\n" "or the law tell us to." msgstr "" +"No revelaremos su dirección de correo a nadie salvo que usted\n" +"nos lo diga, o la ley nos obligue." -#: app/views/request/show.rhtml:54 +#: app/views/request/show.rhtml:61 msgid "We're waiting for" -msgstr "" +msgstr "Estamos esperando a" -#: app/views/request/show.rhtml:50 +#: app/views/request/show.rhtml:57 msgid "We're waiting for someone to read" -msgstr "" +msgstr "Estamos esperando que alguien lea" #: app/views/user/signchangeemail_confirm.rhtml:6 msgid "" "We've sent an email to your new email address. You'll need to click the link in\n" "it before your email address will be changed." msgstr "" +"Hemos enviado un correo a su nueva dirección de correo. Necesitará seguir el enlace\n" +"incluido en él para que se actualice su dirección de correo." #: app/views/user/confirm.rhtml:6 msgid "" "We've sent you an email, and you'll need to click the link in it before you can\n" "continue." msgstr "" +"Le hemos enviado un correo, necesitará seguir el enlace incluído en él antes\n" +"de continuar." #: app/views/user/signchangepassword_confirm.rhtml:6 msgid "" "We've sent you an email, click the link in it, then you can change your " "password." msgstr "" +"Le hemos enviado un correo, siga el enlace incluído en él, y podrá cambiar " +"su contraseña." -#: app/views/request/_followup.rhtml:61 +#: app/views/request/_followup.rhtml:58 msgid "What are you doing?" -msgstr "" +msgstr "¿Qué está haciendo?" #: app/views/request/_describe_state.rhtml:4 msgid "What best describes the status of this request now?" -msgstr "" - -#: app/views/public_body/view_email.rhtml:7 -msgid "" -"WhatDoTheyKnow sends new requests to <strong>{{request_email}}</strong> for " -"this authority." -msgstr "" +msgstr "¿Cómo describiría el estado de esta petición ahora?" #: app/views/request_mailer/new_response.rhtml:9 msgid "" "When you get there, please update the status to say if the response \n" "contains any useful information." msgstr "" +"Por favor actualice el estado para indicar si la respuesta \n" +"contiene información útil." #: app/views/request/show_response.rhtml:44 msgid "" "When you receive the paper response, please help\n" " others find out what it says:" msgstr "" +"Cuando reciba la respuesta en papel, por favor ayude\n" +" a que otros sepan lo que dice:" #: app/views/request/new_please_describe.rhtml:16 msgid "" "When you're done, <strong>come back here</strong>, <a href=\"%s\">reload " "this page</a> and file your new request." msgstr "" +"Cuando esté listo, <strong>vuelva aquí</strong>, <a href=\"%s\">recargue " +"esta página</a> y cree una nueva petición." #: app/views/request/show_response.rhtml:13 msgid "Which of these is happening?" -msgstr "" +msgstr "¿Qué está pasando?" -#: app/models/info_request_event.rb:308 +#: app/models/info_request_event.rb:313 msgid "Withdrawn by requester" -msgstr "" +msgstr "Retirada por el autor" -#: app/models/info_request.rb:802 +#: app/models/info_request.rb:809 msgid "Withdrawn by the requester." -msgstr "" +msgstr "Retirada por el autor." -#: app/controllers/request_controller.rb:542 +#: app/controllers/request_controller.rb:549 msgid "Write a reply to " msgstr "Escribir una respuesta a " -#: app/controllers/request_controller.rb:541 +#: app/controllers/request_controller.rb:548 msgid "Write your FOI follow up message to " -msgstr "Escribir una respuesta a " +msgstr "Escriba su respuesta a " #: app/views/request/new.rhtml:46 msgid "Write your request in <strong>simple, precise language</strong>." msgstr "" +"Escriba su petición en un <strong>lenguaje sencillo y preciso</strong>." -#: app/models/info_request_event.rb:296 +#: app/models/info_request_event.rb:301 msgid "Wrong Response" -msgstr "" +msgstr "Respuesta incorrecta" #: app/views/comment/_single_comment.rhtml:10 msgid "You" -msgstr "" +msgstr "Usted" -#: app/controllers/track_controller.rb:96 +#: app/controllers/track_controller.rb:98 msgid "You are already being emailed updates about " msgstr "Ya está recibiendo actualizaciones por correo sobre " +#: app/models/track_thing.rb:175 +msgid "You are already tracking requests to {{public_body_name}} by email" +msgstr "" + +#: app/models/track_thing.rb:207 +msgid "You are already tracking things matching '{{query}}' by email" +msgstr "" + +#: app/models/track_thing.rb:191 +msgid "You are already tracking this person by email" +msgstr "" + +#: app/models/track_thing.rb:124 +msgid "You are already tracking this request by email" +msgstr "" + #: app/models/track_thing.rb:156 msgid "You are being emailed about any new successful responses" +msgstr "Está recibiendo correos sobre cualquier nueva respuesta exitosa" + +#: app/models/track_thing.rb:140 +msgid "You are being emailed when there are new requests" msgstr "" -#: app/views/request/show.rhtml:81 +#: app/views/request/show.rhtml:88 msgid "You can <strong>complain</strong> by" -msgstr "" +msgstr "Puede <strong>apelar</strong>" -#: app/views/request/details.rhtml:57 +#: app/views/request/details.rhtml:58 msgid "" "You can get this page in computer-readable format as part of the main JSON\n" -"page for the request. See the <a href=\"%s\">API documentation</a>." +"page for the request. See the <a href=\"{{api_path}}\">API documentation</a>." msgstr "" #: app/views/public_body/show.rhtml:40 msgid "" "You can only request information about the environment from this authority." -msgstr "Solo puedes solicitar información medioambiental a esta institución" +msgstr "Solo puede solicitar información medioambiental a esta institución" #: app/views/user/show.rhtml:122 msgid "You have" -msgstr "" +msgstr "Tiene" #: app/views/request_mailer/new_response.rhtml:1 msgid "You have a new response to the {{law_used_full}} request " -msgstr "" +msgstr "Tiene una nueva respuesta a la petición {{law_used_full}} " -#: app/controllers/user_controller.rb:491 +#: app/controllers/user_controller.rb:492 msgid "You have now changed the text about you on your profile." msgstr "Ha cambiado el texto sobre usted en su perfil." -#: app/controllers/user_controller.rb:309 +#: app/controllers/user_controller.rb:310 msgid "You have now changed your email address used on {{site_name}}" msgstr "Ha cambiado la dirección de correo que usa en {{site_name}}" #: app/views/user_mailer/already_registered.rhtml:3 msgid "" -"You just tried to sign up to WhatDoTheyKnow.com, when you\n" +"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" @@ -3191,19 +3705,19 @@ msgid "" "to find one, then please <a href=\"%s\">send it to us</a>." msgstr "" -#: app/controllers/user_controller.rb:469 +#: app/controllers/user_controller.rb:470 msgid "You need to be logged in to change the text about you on your profile." msgstr "Necesita identificarse para cambiar el texto de su perfil." -#: app/controllers/user_controller.rb:370 +#: app/controllers/user_controller.rb:371 msgid "You need to be logged in to change your profile photo." msgstr "Necesita identificarse para cambiar la foto de su perfil." -#: app/controllers/user_controller.rb:432 +#: app/controllers/user_controller.rb:433 msgid "You need to be logged in to clear your profile photo." msgstr "Necesita identificarse para borrar la foto de su perfil." -#: app/controllers/request_controller.rb:552 +#: app/controllers/request_controller.rb:559 msgid "" "You previously submitted that exact follow up message for this request." msgstr "" @@ -3228,15 +3742,15 @@ msgid "" "email alerts." msgstr "" -#: app/controllers/track_controller.rb:152 +#: app/controllers/track_controller.rb:154 msgid "You will no longer be emailed updates about " msgstr "Ya no recibirá actualizaciones por correo sobre " -#: app/controllers/track_controller.rb:181 +#: app/controllers/track_controller.rb:183 msgid "You will no longer be emailed updates for those alerts" msgstr "Ya no recibirá correos para esas alertas" -#: app/controllers/track_controller.rb:109 +#: app/controllers/track_controller.rb:111 msgid "You will now be emailed updates about " msgstr "Ahora recibirá actualizaciones por correo sobre " @@ -3245,14 +3759,16 @@ msgid "" "You will only get an answer to your request if you follow up\n" "with the clarification." msgstr "" +"Sólo recibirá una respuesta a su petición si continúa\n" +"con la aclaración." -#: app/controllers/user_controller.rb:441 +#: app/controllers/user_controller.rb:442 msgid "You've now cleared your profile photo" msgstr "Ha borrado la foto de su perfil" #: app/views/user/show.rhtml:152 msgid "Your " -msgstr "" +msgstr "Su " #: app/views/user/_signup.rhtml:22 msgid "" @@ -3269,17 +3785,16 @@ msgid "" "message, which will then go directly to the person who wrote the message." msgstr "" -#: app/views/user/_signin.rhtml:11 +#: app/views/user/_signin.rhtml:11 app/views/user/_signup.rhtml:9 #: app/views/user/signchangepassword_send_confirm.rhtml:13 -#: app/views/user/_signup.rhtml:9 msgid "Your e-mail:" -msgstr "" +msgstr "Su correo:" #: app/views/user/show.rhtml:168 msgid "Your email subscriptions" -msgstr "" +msgstr "Sus suscripciones de correo" -#: app/controllers/request_controller.rb:549 +#: app/controllers/request_controller.rb:556 msgid "" "Your follow up has not been sent because this request has been stopped to " "prevent spam. Please <a href=\"%s\">contact us</a> if you really want to " @@ -3289,15 +3804,15 @@ msgstr "" "evitar spam. Por favor <a href=\"%s\">contáctenos</a> si realmente quiere " "enviar una respuesta." -#: app/controllers/request_controller.rb:577 +#: app/controllers/request_controller.rb:584 msgid "Your follow up message has been sent on its way." -msgstr "" +msgstr "Su mensaje de seguimiento está en camino." -#: app/controllers/request_controller.rb:575 +#: app/controllers/request_controller.rb:582 msgid "Your internal review request has been sent on its way." -msgstr "" +msgstr "Su petición para una revisión interna está en camino." -#: app/controllers/help_controller.rb:61 +#: app/controllers/help_controller.rb:63 msgid "" "Your message has been sent. Thank you for getting in touch! We'll get back " "to you soon." @@ -3305,13 +3820,13 @@ msgstr "" "Su mensaje ha sido enviado. Gracias por escribir, nos pondremos en contacto " "con usted pronto." -#: app/controllers/user_controller.rb:348 +#: app/controllers/user_controller.rb:349 msgid "Your message to {{recipient_user_name}} has been sent!" msgstr "Su mensaje a {{recipient_user_name}} ha sido enviado." #: app/views/request/followup_preview.rhtml:15 msgid "Your message will appear in <strong>search engines</strong>" -msgstr "" +msgstr "Su mensaje aparecerá en <strong>los motores de búsqueda</strong>" #: app/views/comment/preview.rhtml:10 msgid "" @@ -3326,24 +3841,24 @@ msgstr "" #: app/views/user/_signup.rhtml:18 msgid "Your name:" -msgstr "" +msgstr "Su nombre:" #: app/views/request_mailer/stopped_responses.rhtml:14 msgid "Your original message is attached." -msgstr "" +msgstr "Su mensaje original está adjunto." -#: app/controllers/user_controller.rb:230 +#: app/controllers/user_controller.rb:231 msgid "Your password has been changed." msgstr "Su contraseña ha sido cambiada." #: app/views/user/signchangeemail.rhtml:25 msgid "Your password:" -msgstr "" +msgstr "Su contraseña:" #: app/views/user/set_draft_profile_photo.rhtml:18 msgid "" "Your photo will be shown in public <strong>on the Internet</strong>, \n" -" wherever you do something on WhatDoTheyKnow." +" wherever you do something on {{site_name}}." msgstr "" #: app/views/request_mailer/new_response_reminder_alert.rhtml:5 @@ -3354,7 +3869,7 @@ msgstr "" #: app/views/request/new.rhtml:109 msgid "Your request:" -msgstr "" +msgstr "Su petición:" #: app/views/request/upload_response.rhtml:8 msgid "" @@ -3364,10 +3879,14 @@ msgstr "" #: app/views/comment/new.rhtml:62 msgid "" -"Your thoughts on what the WhatDoTheyKnow <strong>administrators</strong> " +"Your thoughts on what the {{site_name}} <strong>administrators</strong> " "should do about the request." msgstr "" +#: app/models/track_mailer.rb:25 +msgid "Your {{site_name}} email alert" +msgstr "" + #: app/models/outgoing_message.rb:69 msgid "Yours faithfully," msgstr "" @@ -3384,7 +3903,7 @@ msgstr "" #: app/views/public_body/show.rhtml:31 msgid "admin" -msgstr "" +msgstr "admin" #: app/views/public_body/show.rhtml:29 msgid "also called {{public_body_short_name}}" @@ -3392,61 +3911,69 @@ msgstr "también conocido como {{public_body_short_name}}" #: app/views/user/wrong_user.rhtml:5 msgid "and sign in as " -msgstr "" +msgstr "y abra una sesión como " -#: app/views/request/show.rhtml:52 +#: app/views/request/show.rhtml:59 msgid "" "and update the status accordingly. Perhaps <strong>you</strong> might like " "to help out by doing that?" msgstr "" -#: app/views/request/show.rhtml:57 +#: app/views/request/show.rhtml:64 msgid "and update the status." -msgstr "" +msgstr "y actualizar su estado." #: app/views/request/_describe_state.rhtml:101 msgid "and we'll suggest <strong>what to do next</strong>" -msgstr "" +msgstr "y le sugeriremos <strong>qué hacer a continuación</strong>" #: app/views/user/show.rhtml:153 msgid "annotation" -msgstr "" +msgstr "comentario" #: app/views/user/show.rhtml:147 msgid "annotations" +msgstr "comentarios" + +#: app/models/track_thing.rb:138 +msgid "any <a href=\"/list\">new requests</a>" +msgstr "" + +#: app/models/track_thing.rb:154 +msgid "any <a href=\"/list/successful\">successful requests</a>" msgstr "" #: app/views/request_mailer/very_overdue_alert.rhtml:1 msgid "are long overdue." -msgstr "" +msgstr "están muy retrasados." -#: app/controllers/public_body_controller.rb:109 +#: app/controllers/public_body_controller.rb:111 msgid "beginning with" -msgstr "" +msgstr "empezando con" -#: app/views/request/show.rhtml:75 +#: app/views/request/show.rhtml:82 msgid "by" msgstr "" -#: app/views/request/_followup.rhtml:41 +#: app/views/request/_followup.rhtml:38 msgid "by <strong>{{date}}</strong>" -msgstr "" +msgstr "antes de <strong>{{date}}</strong>" #: app/views/request/_request_listing_via_event.rhtml:34 msgid "by {{public_body_name}} to {{info_request_user}} on {{date}}." -msgstr "" +msgstr "por {{public_body_name}} a {{info_request_user}} el {{date}}." #: app/views/request/_request_listing_short_via_event.rhtml:10 msgid "by {{user_link_absolute}}" -msgstr "" +msgstr "por {{user_link_absolute}}" -#: locale/model_attributes.rb:42 +#: locale/model_attributes.rb:35 msgid "censor rule" -msgstr "" +msgstr "regla de censura" -#: locale/model_attributes.rb:26 +#: locale/model_attributes.rb:20 msgid "comment" -msgstr "" +msgstr "comentario" #: app/views/request/show_response.rhtml:41 msgid "" @@ -3454,9 +3981,10 @@ msgid "" " Or you could phone them." msgstr "" -#: app/models/info_request_event.rb:333 +#: app/models/info_request_event.rb:338 msgid "display_status only works for incoming and outgoing messages right now" msgstr "" +"display_status sólo funciona para mensajes de entrada y salida ahora mismo" #: app/views/request_mailer/overdue_alert.rhtml:3 msgid "during term time" @@ -3468,82 +3996,82 @@ msgstr "por ejemplo" #: app/views/user/show.rhtml:96 msgid "edit text about you" -msgstr "" +msgstr "edite el texto sobre usted" #: app/views/user/show.rhtml:171 msgid "email subscription" -msgstr "" +msgstr "suscripción de correo" #: app/views/request_mailer/very_overdue_alert.rhtml:4 msgid "even during holidays" -msgstr "" +msgstr "incluso durante las vacaciones" -#: locale/model_attributes.rb:14 +#: locale/model_attributes.rb:17 msgid "exim log" -msgstr "" +msgstr "log exim" -#: locale/model_attributes.rb:60 +#: locale/model_attributes.rb:59 msgid "exim log done" -msgstr "" +msgstr "log exim completado" #: app/views/request_mailer/requires_admin.rhtml:2 msgid "has reported an" -msgstr "" +msgstr "ha denunciado un" #: app/views/request_mailer/overdue_alert.rhtml:1 msgid "have delayed." -msgstr "" +msgstr "han retrasado." -#: locale/model_attributes.rb:57 +#: locale/model_attributes.rb:56 msgid "holiday" -msgstr "" +msgstr "vacaciones" -#: app/views/request/_followup.rhtml:39 app/views/request/show.rhtml:63 -#: app/views/request/show.rhtml:73 +#: app/views/request/_followup.rhtml:36 app/views/request/show.rhtml:70 +#: app/views/request/show.rhtml:80 msgid "in term time" msgstr "" #: app/views/public_body/list.rhtml:42 msgid "in total" -msgstr "" +msgstr "en total" -#: locale/model_attributes.rb:63 +#: locale/model_attributes.rb:62 msgid "incoming message" -msgstr "" +msgstr "incoming message" -#: locale/model_attributes.rb:80 +#: locale/model_attributes.rb:79 msgid "info request" -msgstr "" +msgstr "info request" -#: locale/model_attributes.rb:35 +#: locale/model_attributes.rb:40 msgid "info request event" -msgstr "" +msgstr "info request event" #: app/views/user/set_profile_about_me.rhtml:3 #: app/views/user/signchangeemail.rhtml:3 msgid "internal error" -msgstr "" +msgstr "error interno" -#: app/views/request/show.rhtml:93 +#: app/views/request/show.rhtml:100 msgid "is <strong>waiting for your clarification</strong>." -msgstr "" +msgstr "está <strong>esperando su aclaración</strong>." #: app/views/user/show.rhtml:71 msgid "just to see how it works" -msgstr "" +msgstr "sólo para ver cómo funciona" #: app/views/comment/_single_comment.rhtml:10 msgid "left an annotation" -msgstr "" +msgstr "dejó un comentario" #: app/views/user/_user_listing_single.rhtml:19 #: app/views/user/_user_listing_single.rhtml:20 msgid "made." -msgstr "" +msgstr "hecho." -#: app/views/request/show.rhtml:67 +#: app/views/request/show.rhtml:74 msgid "no later than" -msgstr "" +msgstr "no más tarde de" #: app/views/request/followup_bad.rhtml:18 msgid "" @@ -3553,49 +4081,49 @@ msgid "" " an email which will go to the right place, please <a href=\"%s\">send it to us</a>." msgstr "" -#: app/views/request/show.rhtml:65 +#: app/views/request/show.rhtml:72 msgid "normally" -msgstr "" +msgstr "normalmente" #: app/views/user/show.rhtml:114 msgid "only" -msgstr "" +msgstr "sólo" -#: locale/model_attributes.rb:20 +#: locale/model_attributes.rb:25 msgid "outgoing message" -msgstr "" +msgstr "mensaje de salida" #: app/views/user/sign.rhtml:11 msgid "please sign in as " -msgstr "" +msgstr "por favor abra una sesión como " #: app/views/user/sign.rhtml:28 msgid "please sign in or make a new account." -msgstr "" +msgstr "por favor abra una sesión o cree una nueva cuenta." -#: locale/model_attributes.rb:50 +#: locale/model_attributes.rb:49 msgid "post redirect" -msgstr "" +msgstr "post redirect" -#: locale/model_attributes.rb:17 +#: locale/model_attributes.rb:14 msgid "profile photo" -msgstr "" +msgstr "foto de perfil" #: locale/model_attributes.rb:2 msgid "public body" -msgstr "" +msgstr "organismo público" #: locale/model_attributes.rb:47 msgid "raw email" -msgstr "" +msgstr "correo original" #: app/views/request_mailer/not_clarified_alert.rhtml:1 msgid "request." -msgstr "" +msgstr "petición." -#: app/views/request/show.rhtml:82 +#: app/views/request/show.rhtml:89 msgid "requesting an internal review" -msgstr "" +msgstr "pidiendo una revisión interna" #: app/views/request_mailer/requires_admin.rhtml:3 msgid "" @@ -3603,53 +4131,46 @@ msgid "" "email to let them know what you are going to do about it." msgstr "" -#: app/views/request/show.rhtml:95 +#: app/views/request/show.rhtml:102 msgid "send a follow up message" -msgstr "" +msgstr "envíe un mensaje de seguimiento" #: app/views/request/_request_listing_via_event.rhtml:31 msgid "sent to {{public_body_name}} by {{info_request_user}} on {{date}}." -msgstr "" +msgstr "enviada a {{public_body_name}} por {{info_request_user}} el {{date}}." -#: app/views/request/show.rhtml:99 +#: app/views/request/show.rhtml:106 msgid "sign in" -msgstr "" +msgstr "abrir sesión" #: app/views/user/wrong_user.rhtml:4 msgid "sign out" -msgstr "" +msgstr "cerrar sesión" #: app/views/request_mailer/new_response.rhtml:2 msgid "that you made to" -msgstr "" +msgstr "que hizo a" -#: app/views/user_mailer/already_registered.rhtml:11 -#: app/views/user_mailer/confirm_login.rhtml:11 -#: app/views/user_mailer/changeemail_already_used.rhtml:9 -#: app/views/user_mailer/changeemail_confirm.rhtml:12 -#: app/views/request_mailer/stopped_responses.rhtml:16 -#: app/views/request_mailer/not_clarified_alert.rhtml:9 #: app/views/request_mailer/comment_on_alert.rhtml:6 +#: app/views/request_mailer/comment_on_alert_plural.rhtml:5 +#: app/views/request_mailer/new_response.rhtml:15 +#: app/views/request_mailer/new_response_reminder_alert.rhtml:8 +#: app/views/request_mailer/not_clarified_alert.rhtml:9 #: app/views/request_mailer/old_unclassified_updated.rhtml:8 -#: app/views/request_mailer/very_overdue_alert.rhtml:11 #: app/views/request_mailer/overdue_alert.rhtml:9 -#: app/views/request_mailer/new_response_reminder_alert.rhtml:8 -#: app/views/request_mailer/new_response.rhtml:15 -#: app/views/request_mailer/comment_on_alert_plural.rhtml:5 -msgid "the WhatDoTheyKnow team" +#: app/views/request_mailer/stopped_responses.rhtml:16 +#: app/views/request_mailer/very_overdue_alert.rhtml:11 +#: app/views/track_mailer/event_digest.rhtml:66 +#: app/views/user_mailer/already_registered.rhtml:11 +#: app/views/user_mailer/changeemail_already_used.rhtml:10 +#: app/views/user_mailer/changeemail_confirm.rhtml:13 +#: app/views/user_mailer/confirm_login.rhtml:11 +msgid "the {{site_name}} team" msgstr "" #: app/views/user/show.rhtml:140 msgid "this person" -msgstr "" - -#: app/views/user_mailer/changeemail_already_used.rhtml:2 -msgid "to" -msgstr "" - -#: app/views/user_mailer/changeemail_confirm.rhtml:5 -msgid "to " -msgstr "" +msgstr "esta persona" #: app/views/user/show.rhtml:113 msgid "" @@ -3659,19 +4180,19 @@ msgstr "" #: app/views/request/new.rhtml:34 msgid "to check that the info isn't already published." -msgstr "" +msgstr "comprobar que la información no esta ya publicada." -#: app/views/request/show.rhtml:55 +#: app/views/request/show.rhtml:62 msgid "to read" -msgstr "" +msgstr "leer" -#: app/views/request/show.rhtml:99 +#: app/views/request/show.rhtml:106 msgid "to send a follow up message." -msgstr "" +msgstr "mandar un mensaje de seguimiento." -#: app/views/request/show.rhtml:39 +#: app/views/request/show.rhtml:45 msgid "to {{public_body}}" -msgstr "" +msgstr "a {{public_body}}" #: locale/model_attributes.rb:31 msgid "track thing" @@ -3683,39 +4204,39 @@ msgstr "" #: app/views/request/_request_listing_via_event.rhtml:38 msgid "unknown event type indexed " -msgstr "" +msgstr "indexado tipo de evento desconocido " #: app/views/request/followup_bad.rhtml:29 msgid "unknown reason " -msgstr "" +msgstr "motivo desconocido " -#: app/models/info_request.rb:807 app/models/info_request_event.rb:328 +#: app/models/info_request.rb:814 app/models/info_request_event.rb:333 msgid "unknown status " -msgstr "" +msgstr "estado desconocido " #: app/views/user/show.rhtml:208 msgid "unsubscribe" -msgstr "" +msgstr "cancelar suscripción" #: app/views/user/show.rhtml:180 app/views/user/show.rhtml:194 msgid "unsubscribe all" -msgstr "" +msgstr "cancelar todas las suscripciones" -#: app/views/request/show.rhtml:46 +#: app/views/request/show.rhtml:53 msgid "useful information." -msgstr "" +msgstr "información útil." -#: locale/model_attributes.rb:69 +#: locale/model_attributes.rb:68 msgid "user" -msgstr "" +msgstr "usuario" -#: locale/model_attributes.rb:67 +#: locale/model_attributes.rb:66 msgid "user info request sent alert" -msgstr "" +msgstr "user info request sent alert" #: app/views/user/show.rhtml:140 msgid "you" -msgstr "" +msgstr "Usted" #: app/views/request/new.rhtml:6 msgid "" @@ -3726,7 +4247,7 @@ msgstr "" #: app/views/request/_after_actions.rhtml:20 msgid "{{info_request_user_name}} only:" -msgstr "" +msgstr "Sólo {{info_request_user_name}}:" #: app/views/general/frontpage.rhtml:51 msgid "{{length_of_time}} ago" @@ -3734,6 +4255,16 @@ msgstr "hace {{length_of_time}}" #: app/views/request/_after_actions.rhtml:43 msgid "{{public_body_name}} only:" +msgstr "Sólo {{public_body_name}}:" + +#: app/views/public_body/view_email.rhtml:7 +msgid "" +"{{site_name}} sends new requests to <strong>{{request_email}}</strong> for " +"this authority." +msgstr "" + +#: app/models/user.rb:122 +msgid "{{user_name}} (Banned)" msgstr "" #: app/views/request_mailer/comment_on_alert.rhtml:1 @@ -3742,8 +4273,19 @@ msgid "" "request. Follow this link to see what they wrote." msgstr "" -#: app/views/request/show.rhtml:35 -msgid "{{user}} made this {{law_used_full}} request" +#: app/views/contact_mailer/user_message.rhtml:2 +msgid "{{user_name}} has used {{site_name}} to send you the message below." msgstr "" +#: app/views/request/show.rhtml:36 +msgid "" +"{{user}} (<a href=\"{{user_admin_url}}\">admin</a>) made this " +"{{law_used_full}} request (<a href=\"{{request_admin_url}}\">admin</a>) to " +"{{public_body_link}} (<a href=\"{{public_body_admin_url}}\">admin</a>)" +msgstr "" + +#: app/views/request/show.rhtml:44 +msgid "{{user}} made this {{law_used_full}} request" +msgstr "{{user}} hizo esta petición {{law_used_full}}" + diff --git a/locale/fr/app.po b/locale/fr/app.po index 787b9795f..63fdf31f9 100644 --- a/locale/fr/app.po +++ b/locale/fr/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: 2011-07-12 15:18+0100\n" -"PO-Revision-Date: 2011-07-28 13:14+0000\n" +"POT-Creation-Date: 2011-08-11 12:30+0200\n" +"PO-Revision-Date: 2011-08-12 00:21+0000\n" "Last-Translator: vickyanderica <victoria@access-info.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -18,9 +18,16 @@ msgstr "" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" +#: app/models/incoming_message.rb:866 +msgid "" +"\n" +"\n" +"[ {{site_name}} note: The above text was badly encoded, and has had strange characters removed. ]" +msgstr "" + #: app/views/user/set_profile_about_me.rhtml:14 msgid "" -" This will appear on your WhatDoTheyKnow profile, to make it\n" +" This will appear on your {{site_name}} profile, to make it\n" " easier for others to get involved with what you're doing." msgstr "" @@ -131,14 +138,20 @@ msgid " when you send this message." msgstr "" #: app/views/public_body/show.rhtml:80 -msgid "%d Freedom of Information request" -msgid_plural "%d Freedom of Information requests" +msgid "%d Freedom of Information request made using this site" +msgid_plural "%d Freedom of Information requests made using this site" msgstr[0] "" msgstr[1] "" #: app/views/general/frontpage.rhtml:36 msgid "%d request" msgid_plural "%d requests" +msgstr[0] "other: %d sollicitude" +msgstr[1] "" + +#: app/views/public_body/_body_listing_single.rhtml:21 +msgid "%d request made." +msgid_plural "%d requests made." msgstr[0] "" msgstr[1] "" @@ -150,7 +163,7 @@ msgstr "" msgid "'Pollution levels over time for the River Tyne'" msgstr "" -#: app/controllers/user_controller.rb:354 +#: app/controllers/user_controller.rb:355 msgid "" ",\n" "\n" @@ -178,140 +191,143 @@ msgstr "" #: app/views/general/search.rhtml:53 msgid "<a href=\"%s\">Browse all</a> or <a href=\"%s\">ask us to add one</a>." msgstr "" +"<a href=\"%s\">Voir tout</a> ou <a href=\"%s\"> demandez nous d'ajouter " +"une</a>." #: app/views/general/exception_caught.rhtml:13 msgid "<a href=\"%s\">Contact us</a> to tell us about the problem</li>" msgstr "" -#: app/views/public_body/show.rhtml:50 -msgid "" -"<a href=\"%s\">Make a new Freedom of Information request</a> to " -"{{public_body_name}}" -msgstr "" - #: app/views/public_body/list.rhtml:43 msgid "<a href=\"%s\">can't find the one you want?</a>" msgstr "" -#: app/views/request/_followup.rhtml:42 app/views/request/_followup.rhtml:49 -#: app/views/request/show.rhtml:76 app/views/request/show.rhtml:80 +#: app/views/request/_followup.rhtml:39 app/views/request/_followup.rhtml:46 +#: app/views/request/show.rhtml:83 app/views/request/show.rhtml:87 msgid "<a href=\"%s\">details</a>" msgstr "" -#: app/views/request/_followup.rhtml:77 +#: app/views/request/_followup.rhtml:74 msgid "<a href=\"%s\">what's that?</a>" msgstr "" +#: app/views/public_body/show.rhtml:50 +msgid "" +"<a href=\"{{url}}\">Make a new Freedom of Information request</a> to " +"{{public_body_name}}" +msgstr "" + #: app/controllers/request_game_controller.rb:23 msgid "" "<p>All done! Thank you very much for your help.</p><p>There are <a " -"href=\"%s\">more things you can do</a> to help WhatDoTheyKnow.</p>" +"href=\"{{helpus_url}}\">more things you can do</a> to help " +"{{site_name}}.</p>" msgstr "" -#: app/controllers/request_controller.rb:394 +#: app/controllers/request_controller.rb:399 msgid "" "<p>Thank you! Here are some ideas on what to do next:</p>\n" " <ul>\n" -" <li>To send your request to another authority, first copy the text of your request below, then <a href=\"%s\">find the other authority</a>.</li>\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=\"%s\">how to complain</a>.\n" +" <a href=\"{{complain_url}}\">how to complain</a>.\n" " </li>\n" -" <li>We have <a href=\"%s\">suggestions</a>\n" +" <li>We have <a href=\"{{other_means_url}}\">suggestions</a>\n" " on other means to answer your question.\n" " </li>\n" -" </ul>\n" -" " +" </ul>" msgstr "" -#: app/controllers/request_controller.rb:388 +#: app/controllers/request_controller.rb:393 msgid "" "<p>Thank you! Hope you don't have to wait much longer.</p> <p>By law, you " "should have got a response promptly, and normally before the end of " "<strong>{{date_response_required_by}}</strong>.</p>" msgstr "" -#: app/controllers/request_controller.rb:384 +#: app/controllers/request_controller.rb:389 msgid "" "<p>Thank you! Hopefully your wait isn't too long.</p> <p>By law, you should get a response promptly, and normally before the end of <strong>\n" "{{date_response_required_by}}</strong>.</p>" msgstr "" -#: app/controllers/request_controller.rb:421 +#: app/controllers/request_controller.rb:428 msgid "" "<p>Thank you! Hopefully your wait isn't too long.</p><p>You should get a " "response within 20 days, or be told if it will take longer (<a " -"href=\"%s\">details</a>).</p>" +"href=\"{{review_url}}\">details</a>).</p>" msgstr "" -#: app/controllers/request_controller.rb:424 +#: app/controllers/request_controller.rb:431 msgid "" "<p>Thank you! We'll look into what happened and try and fix it up.</p><p>If " "the error was a delivery failure, and you can find an up to date FOI email " "address for the authority, please tell us using the form below.</p>" msgstr "" -#: app/controllers/request_controller.rb:391 +#: app/controllers/request_controller.rb:396 msgid "" "<p>Thank you! Your request is long overdue, by more than 40 working days. " "Most requests should be answered within 20 working days. You might like to " "complain about this, see below.</p>" msgstr "" -#: app/controllers/user_controller.rb:494 +#: app/controllers/user_controller.rb:495 msgid "" "<p>Thanks for changing the text about you on your profile.</p>\n" " <p><strong>Next...</strong> You can upload a profile photograph too.</p>" msgstr "" -#: app/controllers/user_controller.rb:416 +#: app/controllers/user_controller.rb:417 msgid "" "<p>Thanks for updating your profile photo.</p>\n" " <p><strong>Next...</strong> You can put some text about you and your research on your profile.</p>" msgstr "" -#: app/controllers/request_controller.rb:279 +#: app/controllers/request_controller.rb:284 msgid "" "<p>We recommend that you edit your request and remove the email address.\n" " If you leave it, the email address will be sent to the authority, but will not be displayed on the site.</p>" msgstr "" -#: app/controllers/request_controller.rb:410 +#: app/controllers/request_controller.rb:417 msgid "" "<p>We're glad you got all the information that you wanted. If you write " "about or make use of the information, please come back and add an annotation" -" below saying what you did.</p><p>If you found WhatDoTheyKnow useful, <a " -"href=\"%s\">make a donation</a> to the charity which runs it.</p>" +" below saying what you did.</p><p>If you found {{site_name}} useful, <a " +"href=\"{{donation_url}}\">make a donation</a> to the charity which runs " +"it.</p>" msgstr "" -#: app/controllers/request_controller.rb:413 +#: app/controllers/request_controller.rb:420 msgid "" "<p>We're glad you got some of the information that you wanted. If you found " -"WhatDoTheyKnow useful, <a href=\"%s\">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>" +"{{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to " +"the charity which runs it.</p><p>If you want to try and get the rest of the " +"information, here's what to do now.</p>" msgstr "" -#: app/controllers/request_controller.rb:277 +#: app/controllers/request_controller.rb:282 msgid "" "<p>You do not need to include your email in the request in order to get a " "reply (<a href=\"%s\">details</a>).</p>" msgstr "" -#: app/controllers/request_controller.rb:275 +#: app/controllers/request_controller.rb:280 msgid "" "<p>You do not need to include your email in the request in order to get a " "reply, as we will ask for it on the next screen (<a " "href=\"%s\">details</a>).</p>" msgstr "" -#: app/controllers/request_controller.rb:283 +#: app/controllers/request_controller.rb:288 msgid "" "<p>Your request contains a <strong>postcode</strong>. Unless it directly " "relates to the subject of your request, please remove any address as it will" " <strong>appear publicly on the Internet</strong>.</p>" msgstr "" -#: app/controllers/request_controller.rb:306 +#: app/controllers/request_controller.rb:311 msgid "" "<p>Your {{law_used_full}} request has been <strong>sent on its way</strong>!</p>\n" " <p><strong>We will email you</strong> when there is a response, or after 20 working days if the authority still hasn't\n" @@ -320,6 +336,13 @@ msgid "" " annotation below telling people about your writing.</p>" msgstr "" +#: app/controllers/application_controller.rb:279 +msgid "" +"<p>{{site_name}} is currently in maintenance. You can only view existing " +"requests. You cannot make new ones, add followups or annotations, or " +"otherwise change the database.</p> <p>{{read_only}}</p>" +msgstr "" + #: app/views/user/confirm.rhtml:11 msgid "" "<small>If you use web-based email or have \"junk mail\" filters, also check your\n" @@ -338,36 +361,47 @@ msgid "" "<strong><code>commented_by:tony_bowden</code></strong> to search annotations" " made by Tony Bowden, typing the name as in the URL." msgstr "" +"<strong><code>commented_by:tony_bowden</code></strong> Pour chercher des " +"commentaires faits par Tony Bowden, écrivez le nom comme dans l'URL" #: app/views/general/search.rhtml:132 msgid "" "<strong><code>filetype:pdf</code></strong> to find all responses with PDF " "attachments. Or try these: <code>{{list_of_file_extensions}}</code>" msgstr "" +"<strong><code>filetype:pdf</code></strong> Pour trouver toutes les réponses " +"avec des documents PDF. Ou essayer ceux-ci: " +"<code>{{list_of_file_extensions}}</code>" #: app/views/general/search.rhtml:131 msgid "" "<strong><code>request:</code></strong> to restrict to a specific request, " "typing the title as in the URL." msgstr "" +"<strong><code>request:</code></strong> Pour vous limiter à une sollicitude " +"concrète, tapez le titre comme dans l'URL." #: app/views/general/search.rhtml:129 msgid "" "<strong><code>requested_by:julian_todd</code></strong> to search requests " "made by Julian Todd, typing the name as in the URL." msgstr "" +"<strong><code>requested_by:julian_todd</code></strong> Pour chercher les " +"sollicitudes faites par Julian Todd, écrivez le nom comme dans l'URL. " #: app/views/general/search.rhtml:128 msgid "" "<strong><code>requested_from:home_office</code></strong> to search requests " "from the Home Office, typing the name as in the URL." msgstr "" +"<strong><code>requested_from:home_office</code></strong> Pour chercher les " +"sollicitudes du Home Office, écrivez le nom comme dans l'URL. " #: app/views/general/search.rhtml:126 msgid "" "<strong><code>status:</code></strong> to select based on the status or " -"historical status of the request, see the <a href=\"%s\">table of " -"statuses</a> below." +"historical status of the request, see the <a href=\"{{statuses_url}}\">table" +" of statuses</a> below." msgstr "" #: app/views/general/search.rhtml:134 @@ -376,11 +410,17 @@ msgid "" " 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, ⏎ ou plusieurs étiquettes, ex. <code>tag:openlylocal " +"AND tag:financial_transaction:335633</code>. Note that by default any of the" +" tags⏎ can be present, you have to put <code>AND</code> explicitly if you " +"only want results them all present." #: app/views/general/search.rhtml:127 msgid "" "<strong><code>variety:</code></strong> to select type of thing to search " -"for, see the <a href=\"%s\">table of varieties</a> below." +"for, see the <a href=\"{{varieties_url}}\">table of varieties</a> below." msgstr "" #: app/views/comment/new.rhtml:56 @@ -393,7 +433,7 @@ msgstr "" msgid "<strong>All the information</strong> has been sent" msgstr "" -#: app/views/request/_followup.rhtml:82 +#: app/views/request/_followup.rhtml:79 msgid "" "<strong>Anything else</strong>, such as clarifying, prompting, thanking" msgstr "" @@ -401,11 +441,11 @@ msgstr "" #: app/views/request/details.rhtml:12 msgid "" "<strong>Caveat emptor!</strong> To use this data in an honourable way, you will need \n" -"a good internal knowledge of user behaviour on WhatDoTheyKnow. How, \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=\"%s\">contact us</a> with questions." +"<a href=\"{{contact_path}}\">contact us</a> with questions." msgstr "" #: app/views/request/_other_describe_state.rhtml:28 @@ -440,7 +480,7 @@ msgstr "" #: app/views/user/set_crop_profile_photo.rhtml:35 msgid "" "<strong>Privacy note:</strong> Your photo will be shown in public on the Internet, \n" -" wherever you do something on WhatDoTheyKnow." +" wherever you do something on {{site_name}}." msgstr "" #: app/views/request/followup_preview.rhtml:37 @@ -467,7 +507,7 @@ msgid "" "scheme</a> or <strong>search</strong> their web site ..." msgstr "" -#: app/views/request/show.rhtml:84 +#: app/views/request/show.rhtml:91 msgid "<strong>did not have</strong> the information requested." msgstr "" @@ -480,15 +520,27 @@ msgid "" "A <strong>summary</strong> of the response if you have received it by post. " msgstr "" +#: app/views/general/search.rhtml:162 +msgid "A public authority" +msgstr "" + #: app/views/request/_other_describe_state.rhtml:34 msgid "A response will be sent <strong>by post</strong>" msgstr "" +#: app/views/general/search.rhtml:151 +msgid "A strange reponse, required attention by the {{site_name}} team" +msgstr "" + +#: app/views/general/search.rhtml:163 +msgid "A {{site_name}} user" +msgstr "" + #: app/views/user/set_profile_about_me.rhtml:20 msgid "About you:" msgstr "" -#: app/models/info_request_event.rb:288 +#: app/models/info_request_event.rb:293 msgid "Acknowledgement" msgstr "" @@ -506,9 +558,13 @@ msgid "" " a <strong>summary of the response</strong>." msgstr "" +#: app/views/public_body/_body_listing_single.rhtml:26 +msgid "Added on {{date}}" +msgstr "" + #: app/models/user.rb:54 msgid "Admin level is not included in list" -msgstr "" +msgstr "Le niveau administratif n'est pas inclus dans cette liste" #: app/views/request_mailer/requires_admin.rhtml:9 msgid "Administration URL:" @@ -516,7 +572,7 @@ msgstr "" #: app/views/general/search.rhtml:31 app/views/general/search.rhtml:121 msgid "Advanced search tips" -msgstr "" +msgstr "Conseils pour une recherche avancée" #: app/views/comment/new.rhtml:52 msgid "" @@ -530,14 +586,22 @@ msgid "" " human beings)" msgstr "" -#: app/models/info_request_event.rb:304 +#: app/models/info_request_event.rb:309 msgid "All information sent" msgstr "" +#: app/views/general/search.rhtml:146 +msgid "All of the information requested has been received" +msgstr "" + #: app/views/public_body/list.rhtml:5 msgid "Alphabet" msgstr "" +#: app/views/public_body/_body_listing_single.rhtml:12 +msgid "Also called {{other_name}}." +msgstr "" + #: app/views/request_mailer/new_response.rhtml:12 msgid "" "Although all responses are automatically published, we depend on\n" @@ -548,6 +612,10 @@ msgstr "" msgid "An <strong>error message</strong> has been received" msgstr "" +#: app/views/general/search.rhtml:161 +msgid "Annotation added to request" +msgstr "" + #: app/views/user/show.rhtml:34 msgid "Annotations" msgstr "" @@ -584,15 +652,15 @@ msgstr "" msgid "Attachment (optional):" msgstr "" -#: app/models/info_request.rb:776 +#: app/models/info_request.rb:783 msgid "Awaiting classification." msgstr "" -#: app/models/info_request.rb:796 +#: app/models/info_request.rb:803 msgid "Awaiting internal review." msgstr "" -#: app/models/info_request.rb:778 +#: app/models/info_request.rb:785 msgid "Awaiting response." msgstr "" @@ -604,17 +672,17 @@ msgstr "" #: app/views/request/new.rhtml:41 msgid "" -"Browse <a href='%s'>other requests</a> to '{{public_body_name}}' for " +"Browse <a href='{{url}}'>other requests</a> to '{{public_body_name}}' for " "examples of how to word your request." msgstr "" -#: app/views/request/show.rhtml:79 +#: app/views/request/show.rhtml:86 msgid "" "By law, under all circumstances, {{public_body_link}} should have responded " "by now" msgstr "" -#: app/views/request/show.rhtml:71 +#: app/views/request/show.rhtml:78 msgid "" "By law, {{public_body_link}} should normally have responded " "<strong>promptly</strong> and" @@ -625,28 +693,30 @@ msgid "" "Can't find it? <a href=\"%s\">Browse all</a> or <a href=\"%s\">ask us to add" " it</a>." msgstr "" +"Vous ne l'avez pas truové? <a href=\"%s\">Voyez tous</a> ou <a " +"href=\"%s\">demandez nous de l'inclure</a>." -#: app/controllers/track_controller.rb:143 +#: app/controllers/track_controller.rb:145 msgid "Cancel a {{site_name}} alert" msgstr "" -#: app/controllers/track_controller.rb:173 +#: app/controllers/track_controller.rb:175 msgid "Cancel some {{site_name}} alerts" msgstr "" -#: locale/model_attributes.rb:46 +#: locale/model_attributes.rb:39 msgid "CensorRule|Last edit comment" msgstr "" -#: locale/model_attributes.rb:45 +#: locale/model_attributes.rb:38 msgid "CensorRule|Last edit editor" msgstr "" -#: locale/model_attributes.rb:44 +#: locale/model_attributes.rb:37 msgid "CensorRule|Replacement" msgstr "" -#: locale/model_attributes.rb:43 +#: locale/model_attributes.rb:36 msgid "CensorRule|Text" msgstr "" @@ -654,6 +724,10 @@ msgstr "" msgid "Central government" msgstr "" +#: app/views/user/signchangeemail.rhtml:37 +msgid "Change email on {{site_name}}" +msgstr "" + #: app/views/user/signchangepassword.rhtml:27 msgid "Change password on {{site_name}}" msgstr "" @@ -663,14 +737,14 @@ msgid "Change profile photo" msgstr "" #: app/views/user/set_profile_about_me.rhtml:1 -msgid "Change the text about you on your profile at WhatDoTheyKnow.com" +msgid "Change the text about you on your profile at {{site_name}}" msgstr "" #: app/views/user/show.rhtml:107 msgid "Change your email" msgstr "" -#: app/controllers/user_controller.rb:249 +#: app/controllers/user_controller.rb:250 #: app/views/user/signchangeemail.rhtml:1 #: app/views/user/signchangeemail.rhtml:11 msgid "Change your email address used on {{site_name}}" @@ -687,7 +761,7 @@ msgstr "" msgid "Change your password on {{site_name}}" msgstr "" -#: app/controllers/user_controller.rb:203 +#: app/controllers/user_controller.rb:204 msgid "Change your password {{site_name}}" msgstr "" @@ -699,20 +773,20 @@ msgstr "" msgid "Check for mistakes if you typed or copied the address." msgstr "" -#: app/views/request/preview.rhtml:7 #: app/views/request/followup_preview.rhtml:14 +#: app/views/request/preview.rhtml:7 msgid "Check you haven't included any <strong>personal information</strong>." msgstr "" -#: app/models/info_request_event.rb:326 +#: app/models/info_request_event.rb:331 msgid "Clarification" msgstr "" -#: app/models/info_request_event.rb:290 +#: app/models/info_request_event.rb:295 msgid "Clarification required" msgstr "" -#: app/controllers/request_controller.rb:334 +#: app/controllers/request_controller.rb:339 msgid "Classify an FOI response from " msgstr "" @@ -728,32 +802,51 @@ msgid "" "to reply to your request." msgstr "" -#: locale/model_attributes.rb:28 +#: locale/model_attributes.rb:22 msgid "Comment|Body" msgstr "" -#: locale/model_attributes.rb:27 +#: locale/model_attributes.rb:21 msgid "Comment|Comment type" msgstr "" -#: locale/model_attributes.rb:30 +#: locale/model_attributes.rb:24 msgid "Comment|Locale" msgstr "" -#: locale/model_attributes.rb:29 +#: locale/model_attributes.rb:23 msgid "Comment|Visible" msgstr "" +#: app/models/track_thing.rb:147 +msgid "Confirm you want to be emailed about new requests" +msgstr "" + +#: app/models/track_thing.rb:214 +msgid "" +"Confirm you want to be emailed about new requests or responses matching " +"'{{query}}'" +msgstr "" + +#: app/models/track_thing.rb:198 +msgid "Confirm you want to be emailed about requests by '{{user_name}}'" +msgstr "" + +#: app/models/track_thing.rb:182 +msgid "" +"Confirm you want to be emailed about requests to '{{public_body_name}}'" +msgstr "" + #: app/models/track_thing.rb:163 msgid "Confirm you want to be emailed when an FOI request succeeds" msgstr "" -#: app/controllers/request_controller.rb:295 +#: app/controllers/request_controller.rb:300 msgid "Confirm your FOI request to " msgstr "" -#: app/controllers/request_controller.rb:696 -#: app/controllers/user_controller.rb:514 +#: app/controllers/request_controller.rb:703 +#: app/controllers/user_controller.rb:515 msgid "Confirm your account on {{site_name}}" msgstr "" @@ -762,11 +855,15 @@ msgid "Confirm your annotation to {{info_request_title}}" msgstr "" #: app/models/user_mailer.rb:34 -msgid "Confirm your new email address on WhatDoTheyKnow.com" +msgid "Confirm your new email address on {{site_name}}" msgstr "" -#: app/views/layouts/default.rhtml:146 +#: app/views/layouts/default.rhtml:127 msgid "Contact {{site_name}}" +msgstr "Contact {{site_name}}" + +#: app/models/request_mailer.rb:210 +msgid "Could not identify the request from the email address" msgstr "" #: app/models/profile_photo.rb:96 @@ -787,13 +884,13 @@ msgid "" " environmental factors listed above)" msgstr "" -#: app/views/request/show.rhtml:61 +#: app/views/request/show.rhtml:68 msgid "" "Currently <strong>waiting for a response</strong> from {{public_body_link}}," " they must respond promptly and" msgstr "" -#: app/models/info_request_event.rb:294 +#: app/models/info_request_event.rb:299 msgid "Deadline Extended" msgstr "" @@ -801,11 +898,11 @@ msgstr "" msgid "Dear " msgstr "" -#: app/models/info_request.rb:780 +#: app/models/info_request.rb:787 msgid "Delayed." msgstr "" -#: app/models/info_request.rb:798 app/models/info_request_event.rb:310 +#: app/models/info_request.rb:805 app/models/info_request_event.rb:315 msgid "Delivery error" msgstr "" @@ -815,7 +912,7 @@ msgstr "" #: app/views/general/search.rhtml:50 app/views/general/search.rhtml:62 msgid "Did you mean: {{correction}}" -msgstr "" +msgstr "Vous vouliez dire: {{correction}}" #: app/views/outgoing_mailer/_followup_footer.rhtml:1 msgid "" @@ -827,7 +924,7 @@ msgstr "" msgid "Download original attachment" msgstr "" -#: app/views/request/_followup.rhtml:88 +#: app/views/request/_followup.rhtml:85 msgid "" "Edit and add <strong>more details</strong> to the message above,\n" " explaining why you are dissatisfied with their response." @@ -841,11 +938,11 @@ msgstr "" msgid "Edit text about you" msgstr "" -#: app/models/user.rb:132 +#: app/models/user.rb:135 msgid "Either the email or password was not recognised, please try again." msgstr "" -#: app/models/user.rb:134 +#: app/models/user.rb:137 msgid "" "Either the email or password was not recognised, please try again. Or create" " a new account using the form on the right." @@ -857,12 +954,16 @@ msgstr "" #: app/views/comment/_comment_form.rhtml:8 msgid "Email me future updates to this request" -msgstr "" +msgstr "Écrivez-moi avec les nouveautés de cette sollicitude" #: app/models/track_thing.rb:155 msgid "Email me new successful responses " msgstr "" +#: app/models/track_thing.rb:139 +msgid "Email me when there are new requests" +msgstr "" + #: app/views/user/show.rhtml:36 msgid "Email subscriptions" msgstr "" @@ -872,6 +973,8 @@ msgid "" "Enter words that you want to find separated by spaces, e.g. <strong>climbing" " lane</strong>" msgstr "" +"Écrivez les mots que vous voulez trouver séparés avec des espaces, ex. " +"<strong>climbing lane</strong>" #: app/views/request/upload_response.rhtml:23 msgid "" @@ -909,19 +1012,19 @@ msgid "" " this website forever (<a href=\"%s\">why?</a>)." msgstr "" -#: locale/model_attributes.rb:61 +#: locale/model_attributes.rb:60 msgid "EximLogDone|Filename" msgstr "" -#: locale/model_attributes.rb:62 +#: locale/model_attributes.rb:61 msgid "EximLogDone|Last stat" msgstr "" -#: locale/model_attributes.rb:16 +#: locale/model_attributes.rb:19 msgid "EximLog|Line" msgstr "" -#: locale/model_attributes.rb:15 +#: locale/model_attributes.rb:18 msgid "EximLog|Order" msgstr "" @@ -933,6 +1036,10 @@ msgstr "" msgid "FOI requests" msgstr "" +#: app/models/track_thing.rb:193 app/models/track_thing.rb:194 +msgid "FOI requests by '{{user_name}}'" +msgstr "" + #: app/models/profile_photo.rb:101 msgid "Failed to convert image to a PNG" msgstr "Je n'ais pas pu convertir l'image en PNG" @@ -955,23 +1062,31 @@ msgid "" " <br>like information from. <strong>By law, they have to respond</strong>\n" " (<a href=\"%s\">why?</a>)." msgstr "" +"Écrivez en premier lieu le <strong> nom de l'institution publique</strong> " +"de laquelle vous voulez recevoir ⏎ <br>l'information<strong> Selon la loi, " +"ils doivent vous répondre</strong>⏎ (<a href=\"%s\">pourquoi?</a>)." #: app/views/request_mailer/old_unclassified_updated.rhtml:4 msgid "Follow this link to see the request:" msgstr "" -#: app/models/info_request_event.rb:330 +#: app/models/info_request_event.rb:335 msgid "Follow up" msgstr "" +#: app/views/general/search.rhtml:159 +msgid "Follow up message sent by requester" +msgstr "" + #: app/views/public_body/view_email.rhtml:14 msgid "Follow up messages to existing requests are sent to " msgstr "" #: app/views/request/_followup.rhtml:16 msgid "" -"Follow ups and new responses to this request have been stopped to prevent spam. Please\n" -" <a href=\"%s\">contact us</a> if you are {{user_link}} and need to send a follow up." +"Follow ups and new responses to this request have been stopped to prevent " +"spam. Please <a href=\"{{url}}\">contact us</a> if you are {{user_link}} and" +" need to send a follow up." msgstr "" #: app/views/public_body/show.rhtml:61 @@ -979,6 +1094,8 @@ msgid "" "For an unknown reason, it is not possible to make a request to this " "authority." msgstr "" +"Par des raisons que nous méconnaissons, ce n'est pas possible d'envoyer des " +"sollicitudes à cette institution" #: app/views/user/_signin.rhtml:21 msgid "Forgotten your password?" @@ -989,6 +1106,8 @@ msgid "" "Freedom of Information law does not apply to this authority, so you cannot make\n" " a request to it." msgstr "" +"La loi d'accès à l'information n'est pas applicable à cette institution, " +"vous ne pouvez donc pas y envoyer⏎ une sollicitude." #: app/views/request/followup_bad.rhtml:11 msgid "Freedom of Information law no longer applies to" @@ -1006,7 +1125,7 @@ msgstr "" #: app/views/public_body/show.rhtml:98 msgid "Freedom of Information requests made" -msgstr "" +msgstr "La sollicitude d'accès à l'information a été envoyée" #: app/views/user/show.rhtml:121 app/views/user/show.rhtml:140 msgid "Freedom of Information requests made by" @@ -1015,6 +1134,7 @@ msgstr "" #: app/views/public_body/show.rhtml:72 msgid "Freedom of Information requests made using this site" msgstr "" +"La sollicitude d'accès à l'information a été envoyée en utilisant cette page" #: app/views/request/followup_bad.rhtml:12 msgid "" @@ -1031,23 +1151,23 @@ msgstr "" msgid "Go to our <a href=\"%s\">front page</a></li>" msgstr "" -#: app/models/info_request_event.rb:292 +#: app/models/info_request_event.rb:297 msgid "Handled by post" msgstr "" -#: app/models/info_request.rb:794 +#: app/models/info_request.rb:801 msgid "Handled by post." msgstr "" -#: app/views/layouts/default.rhtml:121 +#: app/views/layouts/default.rhtml:102 msgid "Hello!" msgstr "Bonjour!" -#: app/views/layouts/default.rhtml:118 +#: app/views/layouts/default.rhtml:99 msgid "Hello, {{username}}!" msgstr "Bonjour, {{username}}!" -#: app/views/layouts/default.rhtml:113 +#: app/views/layouts/default.rhtml:94 msgid "Help" msgstr "Aide" @@ -1055,8 +1175,8 @@ msgstr "Aide" 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" -"WhatDoTheyKnow for intermediate events, which weren't given an explicit\n" -"description by a user. See the <a href=\"%s\">search tips</a> for description of the states." +"{{site_name}} for intermediate events, which weren't given an explicit\n" +"description by a user. See the <a href=\"{{search_path}}\">search tips</a> for description of the states." msgstr "" #: app/views/request/_other_describe_state.rhtml:4 @@ -1067,17 +1187,17 @@ msgid "" " Thanks." msgstr "" -#: locale/model_attributes.rb:58 +#: locale/model_attributes.rb:57 msgid "Holiday|Day" msgstr "" -#: locale/model_attributes.rb:59 +#: locale/model_attributes.rb:58 msgid "Holiday|Description" msgstr "" #: app/views/public_body/show.rhtml:7 msgid "Home page of authority" -msgstr "" +msgstr "Page web de l'institution" #: app/views/request/new.rhtml:63 msgid "" @@ -1089,11 +1209,11 @@ msgstr "" msgid "Human health and safety" msgstr "" -#: app/views/request/_followup.rhtml:71 +#: app/views/request/_followup.rhtml:68 msgid "I am asking for <strong>new information</strong>" msgstr "" -#: app/views/request/_followup.rhtml:76 +#: app/views/request/_followup.rhtml:73 msgid "I am requesting an <strong>internal review</strong>" msgstr "" @@ -1152,7 +1272,7 @@ msgid "" "email {{contact_email}} for help." msgstr "" -#: app/views/request/_followup.rhtml:21 +#: app/views/request/_followup.rhtml:20 msgid "" "If you are dissatisfied by the response you got from\n" " the public authority, you have the right to\n" @@ -1175,7 +1295,7 @@ msgid "" " please <a href=\"%s\">read this first</a>." msgstr "" -#: app/views/request/show.rhtml:98 +#: app/views/request/show.rhtml:105 msgid "If you are {{user_link}}, please" msgstr "" @@ -1204,15 +1324,15 @@ msgid "" "more. Please try doing what you were doing from the beginning." msgstr "" -#: app/controllers/request_controller.rb:430 +#: app/controllers/request_controller.rb:437 msgid "" "If you have not done so already, please write a message below telling the " "authority that you have withdrawn your request. Otherwise they will not know" " it has been withdrawn." msgstr "" -#: app/views/user/signchangepassword_confirm.rhtml:10 #: app/views/user/signchangeemail_confirm.rhtml:11 +#: app/views/user/signchangepassword_confirm.rhtml:10 msgid "" "If you use web-based email or have \"junk mail\" filters, also check your\n" "bulk/spam mail folders. Sometimes, our messages are marked that way." @@ -1225,11 +1345,11 @@ msgid "" msgstr "" #: app/views/user/_signup.rhtml:6 -msgid "If you're new to WhatDoTheyKnow" +msgid "If you're new to {{site_name}}" msgstr "" #: app/views/user/_signin.rhtml:7 -msgid "If you've used WhatDoTheyKnow before" +msgid "If you've used {{site_name}} before" msgstr "" #: app/views/user/no_cookies.rhtml:12 @@ -1238,79 +1358,79 @@ msgid "" "then there is probably a fault with our server." msgstr "" -#: locale/model_attributes.rb:64 +#: locale/model_attributes.rb:63 msgid "IncomingMessage|Cached attachment text clipped" msgstr "" -#: locale/model_attributes.rb:65 +#: locale/model_attributes.rb:64 msgid "IncomingMessage|Cached main body text folded" msgstr "" -#: locale/model_attributes.rb:66 +#: locale/model_attributes.rb:65 msgid "IncomingMessage|Cached main body text unfolded" msgstr "" -#: locale/model_attributes.rb:39 +#: locale/model_attributes.rb:44 msgid "InfoRequestEvent|Calculated state" msgstr "" -#: locale/model_attributes.rb:38 +#: locale/model_attributes.rb:43 msgid "InfoRequestEvent|Described state" msgstr "" -#: locale/model_attributes.rb:36 +#: locale/model_attributes.rb:41 msgid "InfoRequestEvent|Event type" msgstr "" -#: locale/model_attributes.rb:40 +#: locale/model_attributes.rb:45 msgid "InfoRequestEvent|Last described at" msgstr "" -#: locale/model_attributes.rb:37 +#: locale/model_attributes.rb:42 msgid "InfoRequestEvent|Params yaml" msgstr "" -#: locale/model_attributes.rb:41 +#: locale/model_attributes.rb:46 msgid "InfoRequestEvent|Prominence" msgstr "" -#: locale/model_attributes.rb:87 +#: locale/model_attributes.rb:86 msgid "InfoRequest|Allow new responses from" msgstr "" -#: locale/model_attributes.rb:83 +#: locale/model_attributes.rb:82 msgid "InfoRequest|Awaiting description" msgstr "" -#: locale/model_attributes.rb:82 +#: locale/model_attributes.rb:81 msgid "InfoRequest|Described state" msgstr "" -#: locale/model_attributes.rb:88 +#: locale/model_attributes.rb:87 msgid "InfoRequest|Handle rejected responses" msgstr "" -#: locale/model_attributes.rb:86 +#: locale/model_attributes.rb:85 msgid "InfoRequest|Law used" msgstr "" -#: locale/model_attributes.rb:84 +#: locale/model_attributes.rb:83 msgid "InfoRequest|Prominence" msgstr "" -#: locale/model_attributes.rb:81 +#: locale/model_attributes.rb:80 msgid "InfoRequest|Title" msgstr "" -#: locale/model_attributes.rb:85 +#: locale/model_attributes.rb:84 msgid "InfoRequest|Url title" msgstr "" -#: app/models/info_request_event.rb:298 +#: app/models/info_request_event.rb:303 msgid "Information not held" msgstr "" -#: app/models/info_request.rb:784 +#: app/models/info_request.rb:791 msgid "Information not held." msgstr "" @@ -1320,17 +1440,17 @@ msgid "" " radiation, waste materials)" msgstr "" -#: app/models/info_request_event.rb:306 +#: app/models/info_request_event.rb:311 msgid "Internal review acknowledgement" msgstr "" -#: app/models/info_request_event.rb:323 +#: app/models/info_request_event.rb:328 msgid "Internal review request" msgstr "" #: app/views/outgoing_mailer/initial_request.rhtml:8 msgid "" -"Is {{email_address}} the wrong address for {{type_of_request}} requests tp " +"Is {{email_address}} the wrong address for {{type_of_request}} requests to " "{{public_body_name}}? If so, please contact us using this form:" msgstr "" @@ -1341,14 +1461,14 @@ msgid "" "browser. Then press refresh to have another go." msgstr "" -#: app/views/user/show.rhtml:62 -msgid "Joined WhatDoTheyKnow in" -msgstr "" - #: app/views/user/_user_listing_single.rhtml:21 msgid "Joined in" msgstr "" +#: app/views/user/show.rhtml:62 +msgid "Joined {{site_name}} in" +msgstr "" + #: app/views/request/new.rhtml:48 msgid "" "Keep it <strong>focused</strong>, you'll be more likely to get what you want" @@ -1382,7 +1502,7 @@ msgstr "" msgid "Local and regional" msgstr "" -#: app/models/info_request.rb:782 +#: app/models/info_request.rb:789 msgid "Long overdue." msgstr "" @@ -1396,26 +1516,26 @@ msgstr "" #: app/views/layouts/default.rhtml:15 msgid "Make and browse Freedom of Information (FOI) requests" -msgstr "" +msgstr "Envoyer et rechercher des sollicitudes d'accès à lìnformation" -#: app/views/layouts/default.rhtml:86 +#: app/views/layouts/default.rhtml:67 msgid "Make and explore Freedom of Information requests" -msgstr "" +msgstr "Faire et chercher des sollicitudes d'accès à l’information" #: app/views/general/frontpage.rhtml:4 msgid "Make or explore Freedom of Information requests" -msgstr "" +msgstr "Faire et chercher des sollicitudes d'accès à l’information" -#: app/views/layouts/default.rhtml:106 +#: app/views/layouts/default.rhtml:87 msgid "Make request" -msgstr "" +msgstr "Faire une sollicitude" #: app/views/public_body/_body_listing_single.rhtml:23 msgid "Make your own request" msgstr "" #: app/views/contact_mailer/message.rhtml:4 -msgid "Message sent using WhatDoTheyKnow contact form, " +msgid "Message sent using {{site_name}} contact form, " msgstr "" #: app/views/request/new_bad_contact.rhtml:1 @@ -1432,24 +1552,28 @@ msgstr "Encore plus d'administrations" #: app/views/general/frontpage.rhtml:55 msgid "More successful requests..." -msgstr "" +msgstr "Les sollicitudes les plus réussites" #: app/views/request/_describe_state.rhtml:64 msgid "My request has been <strong>refused</strong>" msgstr "" -#: app/views/layouts/default.rhtml:110 +#: app/views/layouts/default.rhtml:91 msgid "My requests" msgstr "Mes demandes" #: app/models/public_body.rb:36 msgid "Name can't be blank" -msgstr "" +msgstr "Le nom ne peut pas être effacé" #: app/models/public_body.rb:40 msgid "Name is already taken" msgstr "Le nom est déjà pris" +#: app/models/track_thing.rb:142 app/models/track_thing.rb:143 +msgid "New Freedom of Information requests" +msgstr "" + #: app/views/user/signchangeemail.rhtml:20 msgid "New e-mail:" msgstr "" @@ -1476,7 +1600,7 @@ msgstr "" #: app/views/general/search.rhtml:40 msgid "Newest results first" -msgstr "" +msgstr "Les résultats les plus nouveaux en premier lieu" #: app/views/user/set_draft_profile_photo.rhtml:32 msgid "Next, crop your photo >>" @@ -1489,7 +1613,7 @@ msgstr "" #: app/views/general/search.rhtml:48 msgid "No public authorities found" -msgstr "" +msgstr "Aucune institution trouvée" #: app/views/request/list.rhtml:23 msgid "No requests of this sort yet." @@ -1504,15 +1628,17 @@ msgid "" "Nobody has made any Freedom of Information requests to {{public_body_name}} " "using this site yet." msgstr "" +"Personne n'a jamais envoyée une sollicitude d'accès à l'information à " +"{{public_body_name}} en utilisant cette page." -#: app/views/request/_request_listing.rhtml:2 #: app/views/public_body/_body_listing.rhtml:2 +#: app/views/request/_request_listing.rhtml:2 msgid "None found." msgstr "" +#: app/views/user/signchangeemail_confirm.rhtml:3 #: app/views/user/signchangepassword_confirm.rhtml:1 #: app/views/user/signchangepassword_confirm.rhtml:3 -#: app/views/user/signchangeemail_confirm.rhtml:3 msgid "Now check your email!" msgstr "" @@ -1542,7 +1668,7 @@ msgid "" "{{site_name}}" msgstr "" -#: app/controllers/request_controller.rb:407 +#: app/controllers/request_controller.rb:414 msgid "" "Oh no! Sorry to hear that your request was refused. Here is what to do now." msgstr "" @@ -1573,27 +1699,43 @@ msgstr "" msgid "Only requests made using {{site_name}} are shown." msgstr "Seules les demandes faites en utilisant {{site_name}} sont présentés." -#: locale/model_attributes.rb:21 +#: app/models/info_request.rb:405 +msgid "" +"Only the authority can reply to this request, and I don't recognise the " +"address this reply was sent from" +msgstr "" + +#: app/models/info_request.rb:401 +msgid "" +"Only the authority can reply to this request, but there is no \"From\" " +"address to check against" +msgstr "" + +#: app/views/general/search.rhtml:158 +msgid "Original request sent" +msgstr "" + +#: locale/model_attributes.rb:26 msgid "OutgoingMessage|Body" msgstr "" -#: locale/model_attributes.rb:24 +#: locale/model_attributes.rb:29 msgid "OutgoingMessage|Last sent at" msgstr "" -#: locale/model_attributes.rb:23 +#: locale/model_attributes.rb:28 msgid "OutgoingMessage|Message type" msgstr "" -#: locale/model_attributes.rb:22 +#: locale/model_attributes.rb:27 msgid "OutgoingMessage|Status" msgstr "" -#: locale/model_attributes.rb:25 +#: locale/model_attributes.rb:30 msgid "OutgoingMessage|What doing" msgstr "" -#: app/models/info_request.rb:788 +#: app/models/info_request.rb:795 msgid "Partially successful." msgstr "" @@ -1617,7 +1759,7 @@ msgstr "" msgid "Plans and administrative measures that affect these matters" msgstr "" -#: app/controllers/request_game_controller.rb:40 +#: app/controllers/request_game_controller.rb:42 msgid "Play the request categorisation game" msgstr "" @@ -1625,7 +1767,7 @@ msgstr "" msgid "Play the request categorisation game!" msgstr "" -#: app/views/request/show.rhtml:94 +#: app/views/request/show.rhtml:101 msgid "Please" msgstr "" @@ -1633,7 +1775,7 @@ msgstr "" msgid "Please <a href=\"%s\">get in touch</a> with us so we can fix it." msgstr "" -#: app/views/request/show.rhtml:45 +#: app/views/request/show.rhtml:52 msgid "" "Please <strong>answer the question above</strong> so we know whether the " msgstr "" @@ -1644,11 +1786,12 @@ msgid "" " know if there was information in the recent responses to them." msgstr "" -#: app/views/request/_followup.rhtml:28 +#: app/views/request/_followup.rhtml:27 msgid "" -"Please <strong>only</strong> write messages directly relating to your \n" -"\t\t\t\trequest {{request_link}}. If you would like to ask for information\n" -"\t\t\t\tthat was not in your original request, then <a href=\"%s\">file a new request</a>." +"Please <strong>only</strong> write messages directly relating to your " +"request {{request_link}}. If you would like to ask for information that was " +"not in your original request, then <a href=\"{{new_request_link}}\">file a " +"new request</a>." msgstr "" #: app/views/request/new.rhtml:60 @@ -1669,7 +1812,7 @@ msgstr "Choisissez un fichier qui contient votre photo." msgid "Please choose what sort of reply you are making." msgstr "S'il vous plait choisissez le type de réponse que vous faites" -#: app/controllers/request_controller.rb:341 +#: app/controllers/request_controller.rb:346 msgid "" "Please choose whether or not you got some of the information that you " "wanted." @@ -1678,15 +1821,15 @@ msgstr "" #: app/views/user_mailer/changeemail_confirm.rhtml:3 msgid "" "Please click on the link below to confirm that you want to \n" -"change the email address that you use for WhatDoTheyKnow\n" -"from " +"change the email address that you use for {{site_name}}\n" +"from {{old_email}} to {{new_email}}" msgstr "" #: app/views/user_mailer/confirm_login.rhtml:3 msgid "Please click on the link below to confirm your email address." msgstr "" -#: app/models/info_request.rb:127 +#: app/models/info_request.rb:126 msgid "" "Please describe more what the request is about in the subject. There is no " "need to say it is an FOI request, we add that on anyway." @@ -1712,7 +1855,7 @@ msgstr "Entrez un mot de passe" msgid "Please enter a subject" msgstr "Entrez un sujet" -#: app/models/info_request.rb:35 +#: app/models/info_request.rb:34 msgid "Please enter a summary of your request" msgstr "Entrez un récapitulatif de votre demande" @@ -1730,7 +1873,7 @@ msgstr "Entrez le même mot de passe deux fois " #: app/models/comment.rb:59 msgid "Please enter your annotation" -msgstr "" +msgstr "S'il vous plait introduisez votre commentaire" #: app/models/contact_validator.rb:29 app/models/user.rb:34 msgid "Please enter your email address" @@ -1738,7 +1881,7 @@ msgstr "Entrez votre addresse email" #: app/models/outgoing_message.rb:147 msgid "Please enter your follow up message" -msgstr "" +msgstr "S'il vous plait introduisez votre message " #: app/models/outgoing_message.rb:150 msgid "Please enter your letter requesting information" @@ -1773,7 +1916,7 @@ msgstr "S'il vous plait expliquer pourquoi vous voulez une révision." msgid "Please keep it shorter than 500 characters" msgstr "S'il vous limitez vous à 500 caractères " -#: app/models/info_request.rb:124 +#: app/models/info_request.rb:123 msgid "" "Please keep the summary short, like in the subject of an email. You can use " "a phrase, rather than a full sentence." @@ -1804,11 +1947,11 @@ msgstr "" msgid "Please sign in as " msgstr "" -#: app/controllers/request_controller.rb:723 +#: app/controllers/request_controller.rb:730 msgid "Please type a message and/or choose a file containing your response." msgstr "" -#: app/controllers/request_controller.rb:427 +#: app/controllers/request_controller.rb:434 msgid "Please use the form below to tell us more." msgstr "" @@ -1817,11 +1960,11 @@ msgstr "" msgid "Please use this email address for all replies to this request:" msgstr "" -#: app/models/info_request.rb:36 +#: app/models/info_request.rb:35 msgid "Please write a summary with some text in it" msgstr "S'il vous plait écrivez un résumé avec du texte" -#: app/models/info_request.rb:121 +#: app/models/info_request.rb:120 msgid "" "Please write the summary using a mixture of capital and lower case letters. " "This makes it easier for others to read." @@ -1834,8 +1977,10 @@ msgid "" "Please write your annotation using a mixture of capital and lower case " "letters. This makes it easier for others to read." msgstr "" +"S'il vous plait écrivez votre commentaire en utilisant des lettres " +"majuscules et minuscules. Ce sera plus facile de lire." -#: app/controllers/request_controller.rb:416 +#: app/controllers/request_controller.rb:423 msgid "" "Please write your follow up message containing the necessary clarifications " "below." @@ -1859,27 +2004,27 @@ msgstr "" msgid "Post annotation" msgstr "" -#: locale/model_attributes.rb:56 +#: locale/model_attributes.rb:55 msgid "PostRedirect|Circumstance" msgstr "" -#: locale/model_attributes.rb:54 +#: locale/model_attributes.rb:53 msgid "PostRedirect|Email token" msgstr "" -#: locale/model_attributes.rb:53 +#: locale/model_attributes.rb:52 msgid "PostRedirect|Post params yaml" msgstr "" -#: locale/model_attributes.rb:55 +#: locale/model_attributes.rb:54 msgid "PostRedirect|Reason params yaml" msgstr "" -#: locale/model_attributes.rb:51 +#: locale/model_attributes.rb:50 msgid "PostRedirect|Token" msgstr "" -#: locale/model_attributes.rb:52 +#: locale/model_attributes.rb:51 msgid "PostRedirect|Uri" msgstr "" @@ -1899,7 +2044,7 @@ msgstr "" msgid "Preview your annotation" msgstr "" -#: app/views/request/_followup.rhtml:99 +#: app/views/request/_followup.rhtml:96 msgid "Preview your message" msgstr "" @@ -1907,11 +2052,11 @@ msgstr "" msgid "Preview your public request" msgstr "" -#: locale/model_attributes.rb:18 +#: locale/model_attributes.rb:15 msgid "ProfilePhoto|Data" msgstr "" -#: locale/model_attributes.rb:19 +#: locale/model_attributes.rb:16 msgid "ProfilePhoto|Draft" msgstr "" @@ -1975,12 +2120,8 @@ msgstr "" msgid "Publication scheme" msgstr "Diffusions d'Infos Publiques" -#: locale/model_attributes.rb:49 -msgid "RawEmail|Data binary" -msgstr "" - #: locale/model_attributes.rb:48 -msgid "RawEmail|Data text" +msgid "RawEmail|Data binary" msgstr "" #: app/views/comment/preview.rhtml:20 @@ -1997,11 +2138,11 @@ msgstr "" #: app/views/general/search.rhtml:137 msgid "" -"Read about <a href=\"%s\">advanced search operators</a>, such as proximity " -"and wildcards." +"Read about <a href=\"{{advanced_search_url}}\">advanced search " +"operators</a>, such as proximity and wildcards." msgstr "" -#: app/views/layouts/default.rhtml:112 +#: app/views/layouts/default.rhtml:93 msgid "Read blog" msgstr "Lire le blog" @@ -2009,11 +2150,15 @@ msgstr "Lire le blog" msgid "Read this before writing your {{info_request_law_used_full}} request" msgstr "" +#: app/views/general/search.rhtml:150 +msgid "Received an error message, such as delivery failure." +msgstr "" + #: app/views/general/search.rhtml:42 msgid "Recently described results first" msgstr "" -#: app/controllers/request_controller.rb:134 +#: app/controllers/request_controller.rb:139 msgid "Recently sent Freedom of Information requests" msgstr "" @@ -2021,15 +2166,15 @@ msgstr "" msgid "Recently sent requests" msgstr "" -#: app/controllers/request_controller.rb:139 +#: app/controllers/request_controller.rb:144 msgid "Recently successful responses" msgstr "" -#: app/models/info_request_event.rb:300 +#: app/models/info_request_event.rb:305 msgid "Refused" msgstr "" -#: app/models/info_request.rb:786 +#: app/models/info_request.rb:793 msgid "Refused." msgstr "" @@ -2079,6 +2224,10 @@ msgstr "" msgid "Requested on {{date}}" msgstr "" +#: app/models/track_thing.rb:209 app/models/track_thing.rb:210 +msgid "Requests or responses matching '{{query}}'" +msgstr "" + #: app/views/request/upload_response.rhtml:11 msgid "Respond by email" msgstr "" @@ -2095,11 +2244,15 @@ msgstr "" msgid "Respond using the web" msgstr "" -#: app/views/request/show.rhtml:70 +#: app/views/general/search.rhtml:160 +msgid "Response from a public authority" +msgstr "" + +#: app/views/request/show.rhtml:77 msgid "Response to this request is <strong>delayed</strong>." msgstr "" -#: app/views/request/show.rhtml:78 +#: app/views/request/show.rhtml:85 msgid "Response to this request is <strong>long overdue</strong>." msgstr "" @@ -2119,21 +2272,23 @@ msgstr "Page de résultats {{page_number}}" msgid "Save" msgstr "" -#: app/views/request/new.rhtml:31 app/views/layouts/default.rhtml:99 #: app/views/general/exception_caught.rhtml:10 #: app/views/general/frontpage.rhtml:16 app/views/general/search.rhtml:29 +#: app/views/layouts/default.rhtml:80 app/views/request/new.rhtml:31 msgid "Search" msgstr "Rechercher" #: app/views/general/search.rhtml:4 msgid "Search Freedom of Information requests, public authorities and users" msgstr "" +"Chercher des sollicitudes d'accès à l'information, des institutions " +"publiques et des ****" #: app/views/general/exception_caught.rhtml:7 msgid "Search the site to find what you were looking for." msgstr "" -#: app/controllers/user_controller.rb:330 +#: app/controllers/user_controller.rb:331 msgid "Send a message to " msgstr "" @@ -2167,13 +2322,13 @@ msgstr "" #: app/models/public_body.rb:39 msgid "Short name is already taken" -msgstr "" +msgstr "Ce nom est déjà pris" #: app/views/general/search.rhtml:38 msgid "Show most relevant results first" msgstr "Afficher les résultats les plus pertinents en premier" -#: app/views/request/list.rhtml:2 app/views/public_body/list.rhtml:3 +#: app/views/public_body/list.rhtml:3 app/views/request/list.rhtml:2 msgid "Show only..." msgstr "" @@ -2185,11 +2340,11 @@ msgstr "" msgid "Sign in or make a new account" msgstr "" -#: app/views/layouts/default.rhtml:122 +#: app/views/layouts/default.rhtml:103 msgid "Sign in or sign up" msgstr "Se connecter ou s'inscrire" -#: app/views/layouts/default.rhtml:119 +#: app/views/layouts/default.rhtml:100 msgid "Sign out" msgstr "Se déconnecter" @@ -2201,10 +2356,14 @@ msgstr "" msgid "Similar requests" msgstr "" -#: app/models/info_request_event.rb:302 +#: app/models/info_request_event.rb:307 msgid "Some information sent" msgstr "" +#: app/views/general/search.rhtml:145 +msgid "Some of the information requested has been received" +msgstr "" + #: app/views/request_game/play.rhtml:31 msgid "" "Some people who've made requests haven't let us know whether they were\n" @@ -2216,7 +2375,7 @@ msgstr "" #: app/views/user_mailer/changeemail_already_used.rhtml:1 msgid "" "Someone, perhaps you, just tried to change their email address on\n" -"WhatDoTheyKnow.com from " +"{{site_name}} from {{old_email}} to {{new_email}}." msgstr "" #: app/views/general/exception_caught.rhtml:1 @@ -2231,8 +2390,8 @@ msgstr "" msgid "Still awaiting an <strong>internal review</strong>" msgstr "" -#: app/views/request/preview.rhtml:18 #: app/views/request/followup_preview.rhtml:23 +#: app/views/request/preview.rhtml:18 msgid "Subject:" msgstr "" @@ -2252,7 +2411,7 @@ msgstr "" msgid "Successful responses" msgstr "" -#: app/models/info_request.rb:790 +#: app/models/info_request.rb:797 msgid "Successful." msgstr "" @@ -2268,13 +2427,13 @@ msgstr "" #: app/views/general/search.rhtml:140 msgid "Table of statuses" -msgstr "" +msgstr "Table d'états" #: app/views/request/preview.rhtml:45 msgid "Tags:" msgstr "" -#: app/controllers/request_game_controller.rb:50 +#: app/controllers/request_game_controller.rb:52 msgid "Thank you for helping us keep the site tidy!" msgstr "" @@ -2282,25 +2441,25 @@ msgstr "" msgid "Thank you for making an annotation!" msgstr "" -#: app/controllers/request_controller.rb:729 +#: app/controllers/request_controller.rb:736 msgid "" "Thank you for responding to this FOI request! Your response has been " "published below, and a link to your response has been emailed to " msgstr "" -#: app/controllers/request_controller.rb:373 +#: app/controllers/request_controller.rb:378 msgid "" "Thank you for updating the status of the request '<a " -"href=\"%s\">{{info_request_title}}</a>'. There are some more requests below " -"for you to classify." +"href=\"{{url}}\">{{info_request_title}}</a>'. There are some more requests " +"below for you to classify." msgstr "" -#: app/controllers/request_controller.rb:376 +#: app/controllers/request_controller.rb:381 msgid "Thank you for updating this request!" msgstr "" -#: app/controllers/user_controller.rb:397 -#: app/controllers/user_controller.rb:413 +#: app/controllers/user_controller.rb:398 +#: app/controllers/user_controller.rb:414 msgid "Thank you for updating your profile photo" msgstr "" @@ -2324,7 +2483,7 @@ msgid "" " requests." msgstr "" -#: app/controllers/user_controller.rb:188 +#: app/controllers/user_controller.rb:189 msgid "" "That doesn't look like a valid email address. Please check you have typed it" " correctly." @@ -2339,7 +2498,7 @@ msgstr "" msgid "The Freedom of Information Act <strong>does not apply</strong> to" msgstr "" -#: app/views/user_mailer/changeemail_already_used.rhtml:7 +#: app/views/user_mailer/changeemail_already_used.rhtml:8 msgid "The accounts have been left as they previously were." msgstr "" @@ -2360,7 +2519,7 @@ msgid "" " address</strong>, not just an email, for it to be a valid FOI request" msgstr "" -#: app/views/request/show.rhtml:102 +#: app/views/request/show.rhtml:109 msgid "" "The authority would like to / has <strong>responded by post</strong> to this" " request." @@ -2384,32 +2543,48 @@ msgstr "" msgid "The page either doesn't exist, or is broken. Things you can try now:" msgstr "" +#: app/views/general/search.rhtml:143 +msgid "The public authority does not have the information requested" +msgstr "" + +#: app/views/general/search.rhtml:147 +msgid "The public authority would like part of the request explained" +msgstr "" + +#: app/views/general/search.rhtml:148 +msgid "The public authority would like to / has responded by post" +msgstr "" + #: app/views/request/_other_describe_state.rhtml:60 msgid "The request has been <strong>refused</strong>" msgstr "" -#: app/controllers/request_controller.rb:347 +#: app/controllers/request_controller.rb:352 msgid "" "The request has been updated since you originally loaded this page. Please " "check for any new incoming messages below, and try again." msgstr "" -#: app/views/request/show.rhtml:97 +#: app/views/request/show.rhtml:104 msgid "The request is <strong>waiting for clarification</strong>." msgstr "" -#: app/views/request/show.rhtml:90 +#: app/views/request/show.rhtml:97 msgid "The request was <strong>partially successful</strong>." msgstr "" -#: app/views/request/show.rhtml:86 +#: app/views/request/show.rhtml:93 msgid "The request was <strong>refused</strong> by" msgstr "" -#: app/views/request/show.rhtml:88 +#: app/views/request/show.rhtml:95 msgid "The request was <strong>successful</strong>." msgstr "" +#: app/views/general/search.rhtml:144 +msgid "The request was refused by the public authority" +msgstr "" + #: app/views/request/hidden.rhtml:9 msgid "" "The request you have tried to view has been removed. There are\n" @@ -2417,14 +2592,18 @@ msgid "" " href=\"%s\">contact us</a> if you have any questions." msgstr "" -#: app/views/request/_followup.rhtml:35 +#: app/views/general/search.rhtml:152 +msgid "The requester has abandoned this request for some reason" +msgstr "" + +#: app/views/request/_followup.rhtml:32 msgid "" "The response to your request has been <strong>delayed</strong>. You can say that, \n" " by law, the authority should normally have responded\n" " <strong>promptly</strong> and" msgstr "" -#: app/views/request/_followup.rhtml:47 +#: app/views/request/_followup.rhtml:44 msgid "" "The response to your request is <strong>long overdue</strong>. You can say that, by \n" " law, under all circumstances, the authority should have responded\n" @@ -2443,59 +2622,81 @@ msgid "" "Information requests this person has made." msgstr "" -#: app/controllers/track_controller.rb:142 +#: app/controllers/track_controller.rb:144 msgid "Then you can cancel the alert." msgstr "" -#: app/controllers/track_controller.rb:172 +#: app/controllers/track_controller.rb:174 msgid "Then you can cancel the alerts." msgstr "" -#: app/controllers/user_controller.rb:248 +#: app/controllers/user_controller.rb:249 msgid "Then you can change your email address used on {{site_name}}" msgstr "" -#: app/controllers/user_controller.rb:202 +#: app/controllers/user_controller.rb:203 msgid "Then you can change your password on {{site_name}}" msgstr "" -#: app/controllers/request_controller.rb:333 +#: app/controllers/request_controller.rb:338 msgid "Then you can classify the FOI response you have got from " msgstr "" -#: app/controllers/request_game_controller.rb:39 +#: app/controllers/request_game_controller.rb:41 msgid "Then you can play the request categorisation game." msgstr "" -#: app/controllers/user_controller.rb:329 +#: app/controllers/user_controller.rb:330 msgid "Then you can send a message to " msgstr "" -#: app/controllers/user_controller.rb:513 +#: app/controllers/user_controller.rb:514 msgid "Then you can sign in to {{site_name}}" msgstr "" -#: app/controllers/request_controller.rb:59 +#: app/controllers/request_controller.rb:61 msgid "Then you can update the status of your request to " msgstr "" -#: app/controllers/request_controller.rb:695 +#: app/controllers/request_controller.rb:702 msgid "Then you can upload an FOI response. " msgstr "" -#: app/controllers/request_controller.rb:538 +#: app/controllers/request_controller.rb:545 msgid "Then you can write follow up message to " msgstr "" -#: app/controllers/request_controller.rb:539 +#: app/controllers/request_controller.rb:546 msgid "Then you can write your reply to " msgstr "" +#: app/models/track_thing.rb:197 +msgid "" +"Then you will be emailed whenever '{{user_name}}' requests something or gets" +" a response." +msgstr "" + +#: app/models/track_thing.rb:213 +msgid "" +"Then you will be emailed whenever a new request or response matches " +"'{{query}}'." +msgstr "" + #: app/models/track_thing.rb:162 msgid "Then you will be emailed whenever an FOI request succeeds." msgstr "" -#: app/controllers/request_controller.rb:294 +#: app/models/track_thing.rb:146 +msgid "Then you will be emailed whenever anyone makes a new FOI request." +msgstr "" + +#: app/models/track_thing.rb:181 +msgid "" +"Then you will be emailed whenever someone requests something or gets a " +"response from '{{public_body_name}}'." +msgstr "" + +#: app/controllers/request_controller.rb:299 msgid "Then your FOI request to {{public_body_name}} will be sent." msgstr "" @@ -2515,13 +2716,13 @@ msgid "" " One of them is shown below, you may mean a different one:" msgstr "" -#: app/views/request/show.rhtml:106 +#: app/views/request/show.rhtml:113 msgid "" "There was a <strong>delivery error</strong> or similar, which needs fixing " -"by the WhatDoTheyKnow team." +"by the {{site_name}} team." msgstr "" -#: app/controllers/public_body_controller.rb:76 +#: app/controllers/public_body_controller.rb:77 msgid "There was an error with the words you entered, please try again." msgstr "" @@ -2607,20 +2808,26 @@ msgstr "" msgid "This request <strong>requires administrator attention</strong>" msgstr "" -#: app/views/request/show.rhtml:48 +#: app/views/request/show.rhtml:55 msgid "This request has an <strong>unknown status</strong>." msgstr "" -#: app/views/request/show.rhtml:110 +#: app/views/request/show.rhtml:117 msgid "" "This request has been <strong>withdrawn</strong> by the person who made it. \n" " \t There may be an explanation in the correspondence below." msgstr "" -#: app/views/request/show.rhtml:108 +#: app/models/info_request.rb:395 +msgid "" +"This request has been set by an administrator to \"allow new responses from " +"nobody\"" +msgstr "" + +#: app/views/request/show.rhtml:115 msgid "" "This request has had an unusual response, and <strong>requires " -"attention</strong> from the WhatDoTheyKnow team." +"attention</strong> from the {{site_name}} team." msgstr "" #: app/views/request/show.rhtml:5 @@ -2650,30 +2857,44 @@ msgstr "" #: app/views/request/details.rhtml:6 msgid "" "This table shows the technical details of the internal events that happened\n" -"to this request on WhatDoTheyKnow. This could be used to generate information about\n" +"to this request on {{site_name}}. This could be used to generate information about\n" "the speed with which authorities respond to requests, the number of requests\n" "which require a postal response and much more." msgstr "" #: app/views/user/show.rhtml:79 -msgid "This user has been banned from WhatDoTheyKnow.com " +msgid "This user has been banned from {{site_name}} " msgstr "" -#: app/views/user_mailer/changeemail_already_used.rhtml:4 +#: app/views/user_mailer/changeemail_already_used.rhtml:5 msgid "" "This was not possible because there is already an account using \n" -"the email address " +"the email address {{email}}." +msgstr "" + +#: app/models/track_thing.rb:145 +msgid "To be emailed about any new requests" msgstr "" #: app/models/track_thing.rb:161 msgid "To be emailed about any successful requests" msgstr "" -#: app/controllers/track_controller.rb:171 +#: app/models/track_thing.rb:196 +msgid "To be emailed about requests by '{{user_name}}'" +msgstr "" + +#: app/models/track_thing.rb:180 +msgid "" +"To be emailed about requests made using {{site_name}} to the public " +"authority '{{public_body_name}}'" +msgstr "" + +#: app/controllers/track_controller.rb:173 msgid "To cancel these alerts" msgstr "" -#: app/controllers/track_controller.rb:141 +#: app/controllers/track_controller.rb:143 msgid "To cancel this alert" msgstr "" @@ -2683,11 +2904,11 @@ msgid "" "was a technical problem trying to do this." msgstr "" -#: app/controllers/user_controller.rb:247 +#: app/controllers/user_controller.rb:248 msgid "To change your email address used on {{site_name}}" msgstr "" -#: app/controllers/request_controller.rb:332 +#: app/controllers/request_controller.rb:337 msgid "To classify the response to this FOI request" msgstr "" @@ -2699,6 +2920,10 @@ msgstr "" msgid "To do this, first click on the link below." msgstr "" +#: app/models/track_thing.rb:212 +msgid "To follow requests and responses matching '{{query}}'" +msgstr "" + #: app/views/request_mailer/old_unclassified_updated.rhtml:1 msgid "" "To help us keep the site tidy, someone else has updated the status of the \n" @@ -2709,7 +2934,7 @@ msgstr "" msgid "To let us know, follow this link and then select the appropriate box." msgstr "" -#: app/controllers/request_game_controller.rb:38 +#: app/controllers/request_game_controller.rb:40 msgid "To play the request categorisation game" msgstr "" @@ -2717,27 +2942,27 @@ msgstr "" msgid "To post your annotation" msgstr "" -#: app/controllers/request_controller.rb:536 +#: app/controllers/request_controller.rb:543 msgid "To reply to " msgstr "" -#: app/controllers/request_controller.rb:535 +#: app/controllers/request_controller.rb:542 msgid "To send a follow up message to " msgstr "" -#: app/controllers/user_controller.rb:328 +#: app/controllers/user_controller.rb:329 msgid "To send a message to " msgstr "" -#: app/controllers/request_controller.rb:293 +#: app/controllers/request_controller.rb:298 msgid "To send your FOI request" msgstr "" -#: app/controllers/request_controller.rb:58 +#: app/controllers/request_controller.rb:60 msgid "To update the status of this FOI request" msgstr "" -#: app/controllers/request_controller.rb:694 +#: app/controllers/request_controller.rb:701 msgid "" "To upload a response, you must be logged in using an email address from " msgstr "" @@ -2756,8 +2981,8 @@ msgstr "" msgid "To {{public_body_link_absolute}}" msgstr "" -#: app/views/request/preview.rhtml:17 #: app/views/request/followup_preview.rhtml:22 app/views/request/new.rhtml:88 +#: app/views/request/preview.rhtml:17 msgid "To:" msgstr "" @@ -2765,6 +2990,10 @@ msgstr "" msgid "Track requests to {{public_body_name}} by email" msgstr "" +#: app/models/track_thing.rb:206 +msgid "Track things matching '{{query}}' by email" +msgstr "" + #: app/views/public_body/show.rhtml:3 msgid "Track this authority" msgstr "" @@ -2773,10 +3002,18 @@ msgstr "" msgid "Track this person" msgstr "" +#: app/models/track_thing.rb:190 +msgid "Track this person by email" +msgstr "" + #: app/views/request/_sidebar.rhtml:2 msgid "Track this request" msgstr "" +#: app/models/track_thing.rb:123 +msgid "Track this request by email" +msgstr "" + #: locale/model_attributes.rb:33 msgid "TrackThing|Track medium" msgstr "" @@ -2800,7 +3037,7 @@ msgid "URL name can't be blank" msgstr "" #: app/models/user_mailer.rb:45 -msgid "Unable to change email address on WhatDoTheyKnow.com" +msgid "Unable to change email address on {{site_name}}" msgstr "" #: app/views/request/followup_bad.rhtml:4 @@ -2836,11 +3073,11 @@ msgstr "" msgid "Unknown" msgstr "" -#: app/models/info_request_event.rb:312 +#: app/models/info_request_event.rb:317 msgid "Unusual response" msgstr "" -#: app/models/info_request.rb:800 +#: app/models/info_request.rb:807 msgid "Unusual response." msgstr "" @@ -2849,7 +3086,7 @@ msgstr "" msgid "Update the status of this request" msgstr "" -#: app/controllers/request_controller.rb:60 +#: app/controllers/request_controller.rb:62 msgid "Update the status of your request to " msgstr "" @@ -2865,47 +3102,47 @@ msgid "" "<strong><code>\"Liverpool City Council\"</code></strong>" msgstr "" -#: locale/model_attributes.rb:68 +#: locale/model_attributes.rb:67 msgid "UserInfoRequestSentAlert|Alert type" msgstr "" -#: locale/model_attributes.rb:79 +#: locale/model_attributes.rb:78 msgid "User|About me" msgstr "" -#: locale/model_attributes.rb:77 +#: locale/model_attributes.rb:76 msgid "User|Admin level" msgstr "" -#: locale/model_attributes.rb:78 +#: locale/model_attributes.rb:77 msgid "User|Ban text" msgstr "" -#: locale/model_attributes.rb:70 +#: locale/model_attributes.rb:69 msgid "User|Email" msgstr "" -#: locale/model_attributes.rb:74 +#: locale/model_attributes.rb:73 msgid "User|Email confirmed" msgstr "" -#: locale/model_attributes.rb:72 +#: locale/model_attributes.rb:71 msgid "User|Hashed password" msgstr "" -#: locale/model_attributes.rb:76 +#: locale/model_attributes.rb:75 msgid "User|Last daily track email" msgstr "" -#: locale/model_attributes.rb:71 +#: locale/model_attributes.rb:70 msgid "User|Name" msgstr "" -#: locale/model_attributes.rb:73 +#: locale/model_attributes.rb:72 msgid "User|Salt" msgstr "" -#: locale/model_attributes.rb:75 +#: locale/model_attributes.rb:74 msgid "User|Url name" msgstr "" @@ -2922,10 +3159,10 @@ msgid "View FOI email address for {{public_body_name}}" msgstr "" #: app/views/contact_mailer/user_message.rhtml:10 -msgid "View Freedom of Information requests made by" +msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "" -#: app/views/layouts/default.rhtml:108 +#: app/views/layouts/default.rhtml:89 msgid "View authorities" msgstr "" @@ -2933,20 +3170,30 @@ msgstr "" msgid "View email" msgstr "" -#: app/views/layouts/default.rhtml:107 +#: app/views/layouts/default.rhtml:88 msgid "View requests" msgstr "Voir requêtes" -#: app/models/info_request.rb:792 +#: app/models/info_request.rb:799 msgid "Waiting clarification." msgstr "" -#: app/views/request/show.rhtml:104 +#: app/views/request/show.rhtml:111 msgid "" "Waiting for an <strong>internal review</strong> by {{public_body_link}} of " "their handling of this request." msgstr "" +#: app/views/general/search.rhtml:149 +msgid "" +"Waiting for the public authority to complete an internal review of their " +"handling of the request" +msgstr "" + +#: app/views/general/search.rhtml:142 +msgid "Waiting for the public authority to reply" +msgstr "" + #: app/views/public_body/view_email.rhtml:17 msgid "We do not have a working request email address for this authority." msgstr "" @@ -2961,7 +3208,7 @@ 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=\"%s\">sign in</a> and let everyone know." +"\tif you are {{user_link}} please <a href=\"{{url}}\">sign in</a> and let everyone know." msgstr "" #: app/views/user_mailer/confirm_login.rhtml:8 @@ -2970,17 +3217,17 @@ msgid "" "or the law tell us to." msgstr "" -#: app/views/user_mailer/changeemail_confirm.rhtml:9 +#: app/views/user_mailer/changeemail_confirm.rhtml:10 msgid "" "We will not reveal your email addresses to anybody unless you\n" "or the law tell us to." msgstr "" -#: app/views/request/show.rhtml:54 +#: app/views/request/show.rhtml:61 msgid "We're waiting for" msgstr "" -#: app/views/request/show.rhtml:50 +#: app/views/request/show.rhtml:57 msgid "We're waiting for someone to read" msgstr "" @@ -3002,7 +3249,7 @@ msgid "" "password." msgstr "" -#: app/views/request/_followup.rhtml:61 +#: app/views/request/_followup.rhtml:58 msgid "What are you doing?" msgstr "" @@ -3010,12 +3257,6 @@ msgstr "" msgid "What best describes the status of this request now?" msgstr "" -#: app/views/public_body/view_email.rhtml:7 -msgid "" -"WhatDoTheyKnow sends new requests to <strong>{{request_email}}</strong> for " -"this authority." -msgstr "" - #: app/views/request_mailer/new_response.rhtml:9 msgid "" "When you get there, please update the status to say if the response \n" @@ -3038,19 +3279,19 @@ msgstr "" msgid "Which of these is happening?" msgstr "" -#: app/models/info_request_event.rb:308 +#: app/models/info_request_event.rb:313 msgid "Withdrawn by requester" msgstr "" -#: app/models/info_request.rb:802 +#: app/models/info_request.rb:809 msgid "Withdrawn by the requester." msgstr "" -#: app/controllers/request_controller.rb:542 +#: app/controllers/request_controller.rb:549 msgid "Write a reply to " msgstr "" -#: app/controllers/request_controller.rb:541 +#: app/controllers/request_controller.rb:548 msgid "Write your FOI follow up message to " msgstr "" @@ -3058,7 +3299,7 @@ msgstr "" msgid "Write your request in <strong>simple, precise language</strong>." msgstr "" -#: app/models/info_request_event.rb:296 +#: app/models/info_request_event.rb:301 msgid "Wrong Response" msgstr "" @@ -3066,22 +3307,42 @@ msgstr "" msgid "You" msgstr "" -#: app/controllers/track_controller.rb:96 +#: app/controllers/track_controller.rb:98 msgid "You are already being emailed updates about " msgstr "" +#: app/models/track_thing.rb:175 +msgid "You are already tracking requests to {{public_body_name}} by email" +msgstr "" + +#: app/models/track_thing.rb:207 +msgid "You are already tracking things matching '{{query}}' by email" +msgstr "" + +#: app/models/track_thing.rb:191 +msgid "You are already tracking this person by email" +msgstr "" + +#: app/models/track_thing.rb:124 +msgid "You are already tracking this request by email" +msgstr "" + #: app/models/track_thing.rb:156 msgid "You are being emailed about any new successful responses" msgstr "" -#: app/views/request/show.rhtml:81 +#: app/models/track_thing.rb:140 +msgid "You are being emailed when there are new requests" +msgstr "" + +#: app/views/request/show.rhtml:88 msgid "You can <strong>complain</strong> by" msgstr "" -#: app/views/request/details.rhtml:57 +#: app/views/request/details.rhtml:58 msgid "" "You can get this page in computer-readable format as part of the main JSON\n" -"page for the request. See the <a href=\"%s\">API documentation</a>." +"page for the request. See the <a href=\"{{api_path}}\">API documentation</a>." msgstr "" #: app/views/public_body/show.rhtml:40 @@ -3097,17 +3358,17 @@ msgstr "" msgid "You have a new response to the {{law_used_full}} request " msgstr "" -#: app/controllers/user_controller.rb:491 +#: app/controllers/user_controller.rb:492 msgid "You have now changed the text about you on your profile." msgstr "" -#: app/controllers/user_controller.rb:309 +#: app/controllers/user_controller.rb:310 msgid "You have now changed your email address used on {{site_name}}" msgstr "" #: app/views/user_mailer/already_registered.rhtml:3 msgid "" -"You just tried to sign up to WhatDoTheyKnow.com, when you\n" +"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" @@ -3140,19 +3401,19 @@ msgid "" "to find one, then please <a href=\"%s\">send it to us</a>." msgstr "" -#: app/controllers/user_controller.rb:469 +#: app/controllers/user_controller.rb:470 msgid "You need to be logged in to change the text about you on your profile." msgstr "" -#: app/controllers/user_controller.rb:370 +#: app/controllers/user_controller.rb:371 msgid "You need to be logged in to change your profile photo." msgstr "" -#: app/controllers/user_controller.rb:432 +#: app/controllers/user_controller.rb:433 msgid "You need to be logged in to clear your profile photo." msgstr "" -#: app/controllers/request_controller.rb:552 +#: app/controllers/request_controller.rb:559 msgid "" "You previously submitted that exact follow up message for this request." msgstr "" @@ -3177,15 +3438,15 @@ msgid "" "email alerts." msgstr "" -#: app/controllers/track_controller.rb:152 +#: app/controllers/track_controller.rb:154 msgid "You will no longer be emailed updates about " msgstr "" -#: app/controllers/track_controller.rb:181 +#: app/controllers/track_controller.rb:183 msgid "You will no longer be emailed updates for those alerts" msgstr "" -#: app/controllers/track_controller.rb:109 +#: app/controllers/track_controller.rb:111 msgid "You will now be emailed updates about " msgstr "" @@ -3195,7 +3456,7 @@ msgid "" "with the clarification." msgstr "" -#: app/controllers/user_controller.rb:441 +#: app/controllers/user_controller.rb:442 msgid "You've now cleared your profile photo" msgstr "" @@ -3218,9 +3479,8 @@ msgid "" "message, which will then go directly to the person who wrote the message." msgstr "" -#: app/views/user/_signin.rhtml:11 +#: app/views/user/_signin.rhtml:11 app/views/user/_signup.rhtml:9 #: app/views/user/signchangepassword_send_confirm.rhtml:13 -#: app/views/user/_signup.rhtml:9 msgid "Your e-mail:" msgstr "" @@ -3228,28 +3488,28 @@ msgstr "" msgid "Your email subscriptions" msgstr "" -#: app/controllers/request_controller.rb:549 +#: app/controllers/request_controller.rb:556 msgid "" "Your follow up has not been sent because this request has been stopped to " "prevent spam. Please <a href=\"%s\">contact us</a> if you really want to " "send a follow up message." msgstr "" -#: app/controllers/request_controller.rb:577 +#: app/controllers/request_controller.rb:584 msgid "Your follow up message has been sent on its way." msgstr "" -#: app/controllers/request_controller.rb:575 +#: app/controllers/request_controller.rb:582 msgid "Your internal review request has been sent on its way." msgstr "" -#: app/controllers/help_controller.rb:61 +#: app/controllers/help_controller.rb:63 msgid "" "Your message has been sent. Thank you for getting in touch! We'll get back " "to you soon." msgstr "" -#: app/controllers/user_controller.rb:348 +#: app/controllers/user_controller.rb:349 msgid "Your message to {{recipient_user_name}} has been sent!" msgstr "" @@ -3276,7 +3536,7 @@ msgstr "" msgid "Your original message is attached." msgstr "" -#: app/controllers/user_controller.rb:230 +#: app/controllers/user_controller.rb:231 msgid "Your password has been changed." msgstr "" @@ -3287,7 +3547,7 @@ msgstr "" #: app/views/user/set_draft_profile_photo.rhtml:18 msgid "" "Your photo will be shown in public <strong>on the Internet</strong>, \n" -" wherever you do something on WhatDoTheyKnow." +" wherever you do something on {{site_name}}." msgstr "" #: app/views/request_mailer/new_response_reminder_alert.rhtml:5 @@ -3308,10 +3568,14 @@ msgstr "" #: app/views/comment/new.rhtml:62 msgid "" -"Your thoughts on what the WhatDoTheyKnow <strong>administrators</strong> " +"Your thoughts on what the {{site_name}} <strong>administrators</strong> " "should do about the request." msgstr "" +#: app/models/track_mailer.rb:25 +msgid "Your {{site_name}} email alert" +msgstr "" + #: app/models/outgoing_message.rb:69 msgid "Yours faithfully," msgstr "" @@ -3338,13 +3602,13 @@ msgstr "aussi appelé {{public_body_short_name}}" msgid "and sign in as " msgstr "" -#: app/views/request/show.rhtml:52 +#: app/views/request/show.rhtml:59 msgid "" "and update the status accordingly. Perhaps <strong>you</strong> might like " "to help out by doing that?" msgstr "" -#: app/views/request/show.rhtml:57 +#: app/views/request/show.rhtml:64 msgid "and update the status." msgstr "" @@ -3360,19 +3624,27 @@ msgstr "" msgid "annotations" msgstr "" +#: app/models/track_thing.rb:138 +msgid "any <a href=\"/list\">new requests</a>" +msgstr "" + +#: app/models/track_thing.rb:154 +msgid "any <a href=\"/list/successful\">successful requests</a>" +msgstr "" + #: app/views/request_mailer/very_overdue_alert.rhtml:1 msgid "are long overdue." msgstr "" -#: app/controllers/public_body_controller.rb:109 +#: app/controllers/public_body_controller.rb:111 msgid "beginning with" msgstr "" -#: app/views/request/show.rhtml:75 +#: app/views/request/show.rhtml:82 msgid "by" msgstr "" -#: app/views/request/_followup.rhtml:41 +#: app/views/request/_followup.rhtml:38 msgid "by <strong>{{date}}</strong>" msgstr "" @@ -3384,11 +3656,11 @@ msgstr "" msgid "by {{user_link_absolute}}" msgstr "" -#: locale/model_attributes.rb:42 +#: locale/model_attributes.rb:35 msgid "censor rule" msgstr "" -#: locale/model_attributes.rb:26 +#: locale/model_attributes.rb:20 msgid "comment" msgstr "" @@ -3398,7 +3670,7 @@ msgid "" " Or you could phone them." msgstr "" -#: app/models/info_request_event.rb:333 +#: app/models/info_request_event.rb:338 msgid "display_status only works for incoming and outgoing messages right now" msgstr "" @@ -3422,11 +3694,11 @@ msgstr "" msgid "even during holidays" msgstr "" -#: locale/model_attributes.rb:14 +#: locale/model_attributes.rb:17 msgid "exim log" msgstr "" -#: locale/model_attributes.rb:60 +#: locale/model_attributes.rb:59 msgid "exim log done" msgstr "" @@ -3438,12 +3710,12 @@ msgstr "" msgid "have delayed." msgstr "" -#: locale/model_attributes.rb:57 +#: locale/model_attributes.rb:56 msgid "holiday" msgstr "" -#: app/views/request/_followup.rhtml:39 app/views/request/show.rhtml:63 -#: app/views/request/show.rhtml:73 +#: app/views/request/_followup.rhtml:36 app/views/request/show.rhtml:70 +#: app/views/request/show.rhtml:80 msgid "in term time" msgstr "" @@ -3451,15 +3723,15 @@ msgstr "" msgid "in total" msgstr "" -#: locale/model_attributes.rb:63 +#: locale/model_attributes.rb:62 msgid "incoming message" msgstr "" -#: locale/model_attributes.rb:80 +#: locale/model_attributes.rb:79 msgid "info request" msgstr "" -#: locale/model_attributes.rb:35 +#: locale/model_attributes.rb:40 msgid "info request event" msgstr "" @@ -3468,7 +3740,7 @@ msgstr "" msgid "internal error" msgstr "" -#: app/views/request/show.rhtml:93 +#: app/views/request/show.rhtml:100 msgid "is <strong>waiting for your clarification</strong>." msgstr "" @@ -3485,7 +3757,7 @@ msgstr "" msgid "made." msgstr "" -#: app/views/request/show.rhtml:67 +#: app/views/request/show.rhtml:74 msgid "no later than" msgstr "" @@ -3497,7 +3769,7 @@ msgid "" " an email which will go to the right place, please <a href=\"%s\">send it to us</a>." msgstr "" -#: app/views/request/show.rhtml:65 +#: app/views/request/show.rhtml:72 msgid "normally" msgstr "" @@ -3505,7 +3777,7 @@ msgstr "" msgid "only" msgstr "" -#: locale/model_attributes.rb:20 +#: locale/model_attributes.rb:25 msgid "outgoing message" msgstr "" @@ -3517,11 +3789,11 @@ msgstr "" msgid "please sign in or make a new account." msgstr "" -#: locale/model_attributes.rb:50 +#: locale/model_attributes.rb:49 msgid "post redirect" msgstr "" -#: locale/model_attributes.rb:17 +#: locale/model_attributes.rb:14 msgid "profile photo" msgstr "" @@ -3537,7 +3809,7 @@ msgstr "" msgid "request." msgstr "" -#: app/views/request/show.rhtml:82 +#: app/views/request/show.rhtml:89 msgid "requesting an internal review" msgstr "" @@ -3547,7 +3819,7 @@ msgid "" "email to let them know what you are going to do about it." msgstr "" -#: app/views/request/show.rhtml:95 +#: app/views/request/show.rhtml:102 msgid "send a follow up message" msgstr "" @@ -3555,7 +3827,7 @@ msgstr "" msgid "sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "" -#: app/views/request/show.rhtml:99 +#: app/views/request/show.rhtml:106 msgid "sign in" msgstr "" @@ -3567,34 +3839,27 @@ msgstr "" msgid "that you made to" msgstr "" -#: app/views/user_mailer/already_registered.rhtml:11 -#: app/views/user_mailer/confirm_login.rhtml:11 -#: app/views/user_mailer/changeemail_already_used.rhtml:9 -#: app/views/user_mailer/changeemail_confirm.rhtml:12 -#: app/views/request_mailer/stopped_responses.rhtml:16 -#: app/views/request_mailer/not_clarified_alert.rhtml:9 #: app/views/request_mailer/comment_on_alert.rhtml:6 +#: app/views/request_mailer/comment_on_alert_plural.rhtml:5 +#: app/views/request_mailer/new_response.rhtml:15 +#: app/views/request_mailer/new_response_reminder_alert.rhtml:8 +#: app/views/request_mailer/not_clarified_alert.rhtml:9 #: app/views/request_mailer/old_unclassified_updated.rhtml:8 -#: app/views/request_mailer/very_overdue_alert.rhtml:11 #: app/views/request_mailer/overdue_alert.rhtml:9 -#: app/views/request_mailer/new_response_reminder_alert.rhtml:8 -#: app/views/request_mailer/new_response.rhtml:15 -#: app/views/request_mailer/comment_on_alert_plural.rhtml:5 -msgid "the WhatDoTheyKnow team" +#: app/views/request_mailer/stopped_responses.rhtml:16 +#: app/views/request_mailer/very_overdue_alert.rhtml:11 +#: app/views/track_mailer/event_digest.rhtml:66 +#: app/views/user_mailer/already_registered.rhtml:11 +#: app/views/user_mailer/changeemail_already_used.rhtml:10 +#: app/views/user_mailer/changeemail_confirm.rhtml:13 +#: app/views/user_mailer/confirm_login.rhtml:11 +msgid "the {{site_name}} team" msgstr "" #: app/views/user/show.rhtml:140 msgid "this person" msgstr "" -#: app/views/user_mailer/changeemail_already_used.rhtml:2 -msgid "to" -msgstr "" - -#: app/views/user_mailer/changeemail_confirm.rhtml:5 -msgid "to " -msgstr "" - #: app/views/user/show.rhtml:113 msgid "" "to change password, \n" @@ -3605,15 +3870,15 @@ msgstr "" msgid "to check that the info isn't already published." msgstr "" -#: app/views/request/show.rhtml:55 +#: app/views/request/show.rhtml:62 msgid "to read" msgstr "" -#: app/views/request/show.rhtml:99 +#: app/views/request/show.rhtml:106 msgid "to send a follow up message." msgstr "" -#: app/views/request/show.rhtml:39 +#: app/views/request/show.rhtml:45 msgid "to {{public_body}}" msgstr "" @@ -3633,7 +3898,7 @@ msgstr "" msgid "unknown reason " msgstr "" -#: app/models/info_request.rb:807 app/models/info_request_event.rb:328 +#: app/models/info_request.rb:814 app/models/info_request_event.rb:333 msgid "unknown status " msgstr "" @@ -3645,15 +3910,15 @@ msgstr "" msgid "unsubscribe all" msgstr "" -#: app/views/request/show.rhtml:46 +#: app/views/request/show.rhtml:53 msgid "useful information." msgstr "" -#: locale/model_attributes.rb:69 +#: locale/model_attributes.rb:68 msgid "user" msgstr "" -#: locale/model_attributes.rb:67 +#: locale/model_attributes.rb:66 msgid "user info request sent alert" msgstr "" @@ -3680,13 +3945,34 @@ msgstr "depuis {{length_of_time}}" msgid "{{public_body_name}} only:" msgstr "" +#: app/views/public_body/view_email.rhtml:7 +msgid "" +"{{site_name}} sends new requests to <strong>{{request_email}}</strong> for " +"this authority." +msgstr "" + +#: app/models/user.rb:122 +msgid "{{user_name}} (Banned)" +msgstr "" + #: app/views/request_mailer/comment_on_alert.rhtml:1 msgid "" "{{user_name}} has annotated your {{law_used_short}} \n" "request. Follow this link to see what they wrote." msgstr "" -#: app/views/request/show.rhtml:35 +#: app/views/contact_mailer/user_message.rhtml:2 +msgid "{{user_name}} has used {{site_name}} to send you the message below." +msgstr "" + +#: app/views/request/show.rhtml:36 +msgid "" +"{{user}} (<a href=\"{{user_admin_url}}\">admin</a>) made this " +"{{law_used_full}} request (<a href=\"{{request_admin_url}}\">admin</a>) to " +"{{public_body_link}} (<a href=\"{{public_body_admin_url}}\">admin</a>)" +msgstr "" + +#: app/views/request/show.rhtml:44 msgid "{{user}} made this {{law_used_full}} request" msgstr "" diff --git a/locale/model_attributes.rb b/locale/model_attributes.rb index d84d4a0ec..c52dcb37c 100644 --- a/locale/model_attributes.rb +++ b/locale/model_attributes.rb @@ -11,27 +11,32 @@ _('PublicBody|Home page') _('PublicBody|Notes') _('PublicBody|First letter') _('PublicBody|Publication scheme') -_('exim log') -_('EximLog|Order') -_('EximLog|Line') _('profile photo') _('ProfilePhoto|Data') _('ProfilePhoto|Draft') +_('exim log') +_('EximLog|Order') +_('EximLog|Line') +_('comment') +_('Comment|Comment type') +_('Comment|Body') +_('Comment|Visible') +_('Comment|Locale') _('outgoing message') _('OutgoingMessage|Body') _('OutgoingMessage|Status') _('OutgoingMessage|Message type') _('OutgoingMessage|Last sent at') _('OutgoingMessage|What doing') -_('comment') -_('Comment|Comment type') -_('Comment|Body') -_('Comment|Visible') -_('Comment|Locale') _('track thing') _('TrackThing|Track query') _('TrackThing|Track medium') _('TrackThing|Track type') +_('censor rule') +_('CensorRule|Text') +_('CensorRule|Replacement') +_('CensorRule|Last edit editor') +_('CensorRule|Last edit comment') _('info request event') _('InfoRequestEvent|Event type') _('InfoRequestEvent|Params yaml') @@ -39,13 +44,7 @@ _('InfoRequestEvent|Described state') _('InfoRequestEvent|Calculated state') _('InfoRequestEvent|Last described at') _('InfoRequestEvent|Prominence') -_('censor rule') -_('CensorRule|Text') -_('CensorRule|Replacement') -_('CensorRule|Last edit editor') -_('CensorRule|Last edit comment') _('raw email') -_('RawEmail|Data text') _('RawEmail|Data binary') _('post redirect') _('PostRedirect|Token') diff --git a/locale/sq/app.po b/locale/sq/app.po index 2290705e1..fe7cd0174 100644 --- a/locale/sq/app.po +++ b/locale/sq/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: 2011-07-12 15:18+0100\n" -"PO-Revision-Date: 2011-07-27 00:27+0000\n" +"POT-Creation-Date: 2011-08-11 12:30+0200\n" +"PO-Revision-Date: 2011-08-12 09:51+0000\n" "Last-Translator: vbrestovci <vbrestovci@gmail.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -21,19 +21,28 @@ msgstr "" "Language: sq\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" +#: app/models/incoming_message.rb:866 +msgid "" +"\n" +"\n" +"[ {{site_name}} note: The above text was badly encoded, and has had strange characters removed. ]" +msgstr "" + #: app/views/user/set_profile_about_me.rhtml:14 msgid "" -" This will appear on your WhatDoTheyKnow profile, to make it\n" +" This will appear on your {{site_name}} profile, to make it\n" " easier for others to get involved with what you're doing." msgstr "" -"Kjo do të shfaqet në profilin tuaj në InformataZyrtare, për ta bërë më të " -"lehtë për të tjerët që të përfshihen me çfarë jeni duke bërë." +"Kjo do të shfaqet në profilin tënd në {{site_name}}, për ta bërë më të\n" +"lehtë për të tjerët që të involvohen me çfarë jeni duke bërë." #: app/views/comment/_comment_form.rhtml:16 msgid "" " (<strong>no ranty</strong> politics, read our <a href=\"%s\">moderation " "policy</a>)" msgstr "" +" (pa politikë <strong>llafazane</strong>, lexo <a href=\"%s\">politikat e " +"moderimit</a>)" #: app/views/request/upload_response.rhtml:40 msgid "" @@ -45,7 +54,7 @@ msgstr "" #: app/views/user/show.rhtml:59 msgid " (you)" -msgstr "(ti)" +msgstr " (ti)" #: app/views/user/signchangepassword_send_confirm.rhtml:18 msgid "" @@ -53,37 +62,39 @@ msgid "" " We will send you an email. Follow the instructions in it to change\n" " your password." msgstr "" -"<strong>Shënim:</strong>Do të dërgoj një email. Ndiq udhëzimet në te për të " -"ndryshuar fjalëkalimin tënd." +" <strong>Shënim:</strong>\n" +"Do të dërgoj një email. Ndiq udhëzimet në te për të ndryshuar \n" +"fjalëkalimin tënd." #: app/views/user/contact.rhtml:35 msgid " <strong>Privacy note:</strong> Your email address will be given to" -msgstr "<strong>Shënim privacie:</strong> Adresa e emailit do t'i jepet" +msgstr " <strong>Shënim privacie:</strong> Adresa e emailit do t'i jepet" #: app/views/comment/new.rhtml:33 msgid " <strong>Summarise</strong> the content of any information returned. " msgstr "" -"<strong>Përmbledh</strong> përmbajtjen e informacioneve të kthyera " +" <strong>Përmbledh</strong> përmbajtjen e informacioneve të kthyera " "(përgjegura)." #: app/views/comment/new.rhtml:23 msgid " Advise on how to <strong>best clarify</strong> the request." -msgstr "" +msgstr " Këshillo se si <strong>më së miri të sqarohet</strong> një kërkesë." #: app/views/comment/new.rhtml:49 msgid "" " Ideas on what <strong>other documents to request</strong> which the " "authority may hold. " msgstr "" +" Ide se çfarë <strong>dokumentesh tjera të kërkohen</strong> që mund t'i " +"posedojë institucioni. " #: app/views/public_body/view_email.rhtml:30 msgid "" " If you know the address to use, then please <a href=\"%s\">send it to us</a>.\n" " You may be able to find the address on their website, or by phoning them up and asking." msgstr "" -"Nëse e din adresën e emailit për ta përdorur, atëherë të lutem <a " -"href=\"%s\">na e dërgon</a> . Ti mund ta gjen adresën e emailit në ueb " -"sajtin e tyre ose duke ju telefonuar dhe pyetur." +" Nëse e din adresën e emailit për ta përdorur, atëherë të lutem <a href=\"%s\">na e dërgon</a>. \n" +"Ti mund ta gjen adresën e emailit në ueb sajtin e tyre ose duke ju telefonuar dhe pyetur." #: app/views/user/set_profile_about_me.rhtml:26 msgid "" @@ -91,33 +102,36 @@ msgid "" " twitter account. They will be made clickable. \n" " e.g." msgstr "" +" Përfshij vegzat relevante, si p.sh. te faqja e fushatës, blogu yt apo\n" +" llogaria e twitterit. Ato do të bëhen të klikueshme. \n" +" p.sh." #: app/views/comment/new.rhtml:27 msgid "" " Link to the information requested, if it is <strong>already " "available</strong> on the Internet. " msgstr "" -"Linku për informatat e kërkuara, në qoftë se ato <strong> tashmë janë " -"</strong> në dispozicion në internet." +" Vegza për informatat e kërkuara, në qoftë se ato <strong> tashmë " +"janë</strong> në dispozicion në internet. " #: app/views/comment/new.rhtml:29 msgid "" " Offer better ways of <strong>wording the request</strong> to get the " "information. " msgstr "" -"Propozo mënyra më të mira të <strong>formulim të kërkesës</strong> për të " -"marrë informacion." +" Propozo mënyra më të mira të <strong>formulim të kërkesës</strong> për të " +"marrë informacion. " #: app/views/user/sign.rhtml:26 msgid " Please sign in or make a new account." -msgstr "Të lutem kyçu ose krijo një llogari të re." +msgstr " Të lutem kyçu ose krijo një llogari të re." #: app/views/comment/new.rhtml:34 msgid "" " Say how you've <strong>used the information</strong>, with links if " "possible." msgstr "" -"Trego se si ke <strong>përdorur informacionin,</strong> me ueb linqe nëse " +" Trego se si ke <strong>përdorur informacionin,</strong> me ueb vegza nëse " "është e mundur." #: app/views/comment/new.rhtml:28 @@ -125,13 +139,13 @@ msgid "" " Suggest <strong>where else</strong> the requester might find the " "information. " msgstr "" -"Sugjero <strong>ku tjetër</strong> kërkuesi mund të gjej informacionin." +" Sugjero <strong>ku tjetër</strong> kërkuesi mund të gjej informacionin. " #: app/views/user/set_profile_about_me.rhtml:11 msgid " What are you investigating using Freedom of Information? " msgstr "" -"Çfarë jeni duke hulumtuar (hetuar) duke përdor kërkesat për çasje në " -"Informata Zyrtare?" +" Çfarë jeni duke hulumtuar (hetuar) duke përdor kërkesat për çasje në " +"Informata Zyrtare? " #: app/controllers/comment_controller.rb:75 msgid " You are already being emailed updates about the request." @@ -146,20 +160,20 @@ msgstr "" #: app/views/request/upload_response.rhtml:5 msgid " made by " -msgstr "bërë nga " +msgstr " bërë nga " #: app/views/user/show.rhtml:123 msgid " made no Freedom of Information requests using this site." msgstr "" -"nuk ka bërë kërkesa për informata zyrtare duke përdorur këtë ueb faqe." +" nuk ka bërë kërkesa për informata zyrtare duke përdorur këtë ueb faqe." #: app/views/user/contact.rhtml:36 msgid " when you send this message." -msgstr "kur e dërgoni këtë mesazh." +msgstr " kur e dërgoni këtë mesazh." #: app/views/public_body/show.rhtml:80 -msgid "%d Freedom of Information request" -msgid_plural "%d Freedom of Information requests" +msgid "%d Freedom of Information request made using this site" +msgid_plural "%d Freedom of Information requests made using this site" msgstr[0] "" msgstr[1] "" @@ -169,6 +183,12 @@ msgid_plural "%d requests" msgstr[0] "%d kërkesë" msgstr[1] "%d kërkesa" +#: app/views/public_body/_body_listing_single.rhtml:21 +msgid "%d request made." +msgid_plural "%d requests made." +msgstr[0] "" +msgstr[1] "" + #: app/views/request/new.rhtml:102 msgid "'Crime statistics by ward level for Wales'" msgstr "'Statistikat e krimit në nivel komune'" @@ -177,7 +197,7 @@ msgstr "'Statistikat e krimit në nivel komune'" msgid "'Pollution levels over time for the River Tyne'" msgstr "'Niveli i ndotjes për lumin Drin'" -#: app/controllers/user_controller.rb:354 +#: app/controllers/user_controller.rb:355 msgid "" ",\n" "\n" @@ -187,6 +207,13 @@ msgid "" "\n" "{{user_name}}" msgstr "" +",\n" +"\n" +"\n" +"\n" +"Me nderime,\n" +"\n" +"{{user_name}}" #: app/views/request/_after_actions.rhtml:9 msgid "<a href=\"%s\">Add an annotation</a> (to help the requester or others)" @@ -195,155 +222,149 @@ msgstr "" #: app/views/public_body/list.rhtml:29 msgid "<a href=\"%s\">Are we missing a public authority?</a>." -msgstr "<a href=\"%s\">A po mungon ndonjë autoritet publik?</a> ." +msgstr "<a href=\"%s\">A po mungon ndonjë autoritet publik?</a>." #: app/views/request/_sidebar.rhtml:45 msgid "" "<a href=\"%s\">Are you the owner of\n" " any commercial copyright on this page?</a>" msgstr "" -"<a href=\"%s\">Are you the owner of any commercial copyright on this " -"page?</a>" #: app/views/general/search.rhtml:53 msgid "<a href=\"%s\">Browse all</a> or <a href=\"%s\">ask us to add one</a>." msgstr "" -"<a href=\"%s\">Kërkoni të gjitha</a> ose <a href=\"%s\">të na pyetni ne që " -"të shtoni një</a> ." +"<a href=\"%s\">Shfletoni të gjitha</a> ose <a href=\"%s\">kërkoni nga ne që " +"të shtojmë një</a> ." #: app/views/general/exception_caught.rhtml:13 msgid "<a href=\"%s\">Contact us</a> to tell us about the problem</li>" msgstr "<a href=\"%s\">Na kontakto</a> për të na tregu për problemin</li>" -#: app/views/public_body/show.rhtml:50 -msgid "" -"<a href=\"%s\">Make a new Freedom of Information request</a> to " -"{{public_body_name}}" -msgstr "" -"<a href=\"%s\">Bëj një kërkesë të re për Inforamata Zyrtare</a> te " -"{{public_body_name}}" - #: app/views/public_body/list.rhtml:43 msgid "<a href=\"%s\">can't find the one you want?</a>" msgstr "<a href=\"%s\">nuk mund të gjeni ate që dëshironi?</a>" -#: app/views/request/_followup.rhtml:42 app/views/request/_followup.rhtml:49 -#: app/views/request/show.rhtml:76 app/views/request/show.rhtml:80 +#: app/views/request/_followup.rhtml:39 app/views/request/_followup.rhtml:46 +#: app/views/request/show.rhtml:83 app/views/request/show.rhtml:87 msgid "<a href=\"%s\">details</a>" msgstr "<a href=\"%s\">detajet</a>" -#: app/views/request/_followup.rhtml:77 +#: app/views/request/_followup.rhtml:74 msgid "<a href=\"%s\">what's that?</a>" msgstr "<a href=\"%s\">Çfarë është ajo?</a>" +#: app/views/public_body/show.rhtml:50 +msgid "" +"<a href=\"{{url}}\">Make a new Freedom of Information request</a> to " +"{{public_body_name}}" +msgstr "" + #: app/controllers/request_game_controller.rb:23 msgid "" "<p>All done! Thank you very much for your help.</p><p>There are <a " -"href=\"%s\">more things you can do</a> to help WhatDoTheyKnow.</p>" +"href=\"{{helpus_url}}\">more things you can do</a> to help " +"{{site_name}}.</p>" msgstr "" -#: app/controllers/request_controller.rb:394 +#: app/controllers/request_controller.rb:399 msgid "" "<p>Thank you! Here are some ideas on what to do next:</p>\n" " <ul>\n" -" <li>To send your request to another authority, first copy the text of your request below, then <a href=\"%s\">find the other authority</a>.</li>\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=\"%s\">how to complain</a>.\n" +" <a href=\"{{complain_url}}\">how to complain</a>.\n" " </li>\n" -" <li>We have <a href=\"%s\">suggestions</a>\n" +" <li>We have <a href=\"{{other_means_url}}\">suggestions</a>\n" " on other means to answer your question.\n" " </li>\n" -" </ul>\n" -" " +" </ul>" msgstr "" -#: app/controllers/request_controller.rb:388 +#: app/controllers/request_controller.rb:393 msgid "" "<p>Thank you! Hope you don't have to wait much longer.</p> <p>By law, you " "should have got a response promptly, and normally before the end of " "<strong>{{date_response_required_by}}</strong>.</p>" msgstr "" -#: app/controllers/request_controller.rb:384 +#: app/controllers/request_controller.rb:389 msgid "" "<p>Thank you! Hopefully your wait isn't too long.</p> <p>By law, you should get a response promptly, and normally before the end of <strong>\n" "{{date_response_required_by}}</strong>.</p>" msgstr "" -#: app/controllers/request_controller.rb:421 +#: app/controllers/request_controller.rb:428 msgid "" "<p>Thank you! Hopefully your wait isn't too long.</p><p>You should get a " "response within 20 days, or be told if it will take longer (<a " -"href=\"%s\">details</a>).</p>" +"href=\"{{review_url}}\">details</a>).</p>" msgstr "" -"<p> Faleminderit! Shpresojmë që pritja yte nuk do të jetë shumë e gjatë. " -"</p><p> Ti duhet të merr përgjegje brenda 7 ditë pune, ose të njoftohesh se " -"do të marrë më gjatë ( <a href=\"%s\">details</a> ). </p>" -#: app/controllers/request_controller.rb:424 +#: app/controllers/request_controller.rb:431 msgid "" "<p>Thank you! We'll look into what happened and try and fix it up.</p><p>If " "the error was a delivery failure, and you can find an up to date FOI email " "address for the authority, please tell us using the form below.</p>" msgstr "" -#: app/controllers/request_controller.rb:391 +#: app/controllers/request_controller.rb:396 msgid "" "<p>Thank you! Your request is long overdue, by more than 40 working days. " "Most requests should be answered within 20 working days. You might like to " "complain about this, see below.</p>" msgstr "" -#: app/controllers/user_controller.rb:494 +#: app/controllers/user_controller.rb:495 msgid "" "<p>Thanks for changing the text about you on your profile.</p>\n" " <p><strong>Next...</strong> You can upload a profile photograph too.</p>" msgstr "" -#: app/controllers/user_controller.rb:416 +#: app/controllers/user_controller.rb:417 msgid "" "<p>Thanks for updating your profile photo.</p>\n" " <p><strong>Next...</strong> You can put some text about you and your research on your profile.</p>" msgstr "" -#: app/controllers/request_controller.rb:279 +#: app/controllers/request_controller.rb:284 msgid "" "<p>We recommend that you edit your request and remove the email address.\n" " If you leave it, the email address will be sent to the authority, but will not be displayed on the site.</p>" msgstr "" -#: app/controllers/request_controller.rb:410 +#: app/controllers/request_controller.rb:417 msgid "" "<p>We're glad you got all the information that you wanted. If you write " "about or make use of the information, please come back and add an annotation" -" below saying what you did.</p><p>If you found WhatDoTheyKnow useful, <a " -"href=\"%s\">make a donation</a> to the charity which runs it.</p>" +" below saying what you did.</p><p>If you found {{site_name}} useful, <a " +"href=\"{{donation_url}}\">make a donation</a> to the charity which runs " +"it.</p>" msgstr "" -#: app/controllers/request_controller.rb:413 +#: app/controllers/request_controller.rb:420 msgid "" "<p>We're glad you got some of the information that you wanted. If you found " -"WhatDoTheyKnow useful, <a href=\"%s\">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>" +"{{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to " +"the charity which runs it.</p><p>If you want to try and get the rest of the " +"information, here's what to do now.</p>" msgstr "" -#: app/controllers/request_controller.rb:277 +#: app/controllers/request_controller.rb:282 msgid "" "<p>You do not need to include your email in the request in order to get a " "reply (<a href=\"%s\">details</a>).</p>" msgstr "" "<p> Ti nuk duhet të inkludosh adresën e emailit tënd në këtë kërkesë qe të " -"marrësh përgjegje ( <a href=\"%s\">detaje</a> ). </p>" +"marrësh përgjigje ( <a href=\"%s\">detaje</a> ). </p>" -#: app/controllers/request_controller.rb:275 +#: app/controllers/request_controller.rb:280 msgid "" "<p>You do not need to include your email in the request in order to get a " "reply, as we will ask for it on the next screen (<a " "href=\"%s\">details</a>).</p>" msgstr "" -#: app/controllers/request_controller.rb:283 +#: app/controllers/request_controller.rb:288 msgid "" "<p>Your request contains a <strong>postcode</strong>. Unless it directly " "relates to the subject of your request, please remove any address as it will" @@ -353,7 +374,7 @@ msgstr "" "direkt me temën e kërkesës tënde, të lutem largo çdo adresë sepse do të jetë" " <strong> publike në internet</strong>. </p>" -#: app/controllers/request_controller.rb:306 +#: app/controllers/request_controller.rb:311 msgid "" "<p>Your {{law_used_full}} request has been <strong>sent on its way</strong>!</p>\n" " <p><strong>We will email you</strong> when there is a response, or after 20 working days if the authority still hasn't\n" @@ -362,6 +383,13 @@ msgid "" " annotation below telling people about your writing.</p>" msgstr "" +#: app/controllers/application_controller.rb:279 +msgid "" +"<p>{{site_name}} is currently in maintenance. You can only view existing " +"requests. You cannot make new ones, add followups or annotations, or " +"otherwise change the database.</p> <p>{{read_only}}</p>" +msgstr "" + #: app/views/user/confirm.rhtml:11 msgid "" "<small>If you use web-based email or have \"junk mail\" filters, also check your\n" @@ -377,12 +405,16 @@ msgid "" "<strong> Can I request information about myself?</strong>\n" "\t\t\t<a href=\"%s\">No! (Click here for details)</a>" msgstr "" +"<strong> A mund të kërkoj informatë për veten time?</strong>\n" +"<span class=\"whitespace other\" title=\"Tab\">»</span><span class=\"whitespace other\" title=\"Tab\">»</span><span class=\"whitespace other\" title=\"Tab\">»</span><a href=\"%s\">Jo! (Kliko këtu për detaje)</a>" #: app/views/general/search.rhtml:130 msgid "" "<strong><code>commented_by:tony_bowden</code></strong> to search annotations" " made by Tony Bowden, typing the name as in the URL." msgstr "" +"<strong><code>komentuar_nga:filan_fisteku</code></strong> për të kërkuar " +"shenimet nga Filan Fisteku, shtypeni emrin si në URL." #: app/views/general/search.rhtml:132 msgid "" @@ -390,7 +422,7 @@ msgid "" "attachments. Or try these: <code>{{list_of_file_extensions}}</code>" msgstr "" "<strong><code>tipi_i_fajjlit:pdf</code></strong> për t'i gjetë të gjitha " -"përgjegjet me PDF të bashkangjitur. Apo provo këto: " +"përgjigjet me PDF të bashkangjitur. Apo provo këto: " "<code>{{list_of_file_extensions}}</code>" #: app/views/general/search.rhtml:131 @@ -421,12 +453,9 @@ msgstr "" #: app/views/general/search.rhtml:126 msgid "" "<strong><code>status:</code></strong> to select based on the status or " -"historical status of the request, see the <a href=\"%s\">table of " -"statuses</a> below." +"historical status of the request, see the <a href=\"{{statuses_url}}\">table" +" of statuses</a> below." msgstr "" -"<strong><code>statusi:</code></strong> për të kërkuar në bazë të statusit të" -" kërkesës apo historisë së statusit, shih <a href=\"%s\">tabelën e " -"statuseve</a> më poshtë." #: app/views/general/search.rhtml:134 msgid "" @@ -441,10 +470,8 @@ msgstr "" #: app/views/general/search.rhtml:127 msgid "" "<strong><code>variety:</code></strong> to select type of thing to search " -"for, see the <a href=\"%s\">table of varieties</a> below." +"for, see the <a href=\"{{varieties_url}}\">table of varieties</a> below." msgstr "" -"<strong><code>variantet:</code></strong> për të zgjedhur tipin e asaj që do " -"të kërkosh, shih <a href=\"%s\">tabelën e varianteve</a> më poshtë." #: app/views/comment/new.rhtml:56 msgid "" @@ -456,7 +483,7 @@ msgstr "" msgid "<strong>All the information</strong> has been sent" msgstr "<strong>Të gjitha informatat</strong> janë dërguar" -#: app/views/request/_followup.rhtml:82 +#: app/views/request/_followup.rhtml:79 msgid "" "<strong>Anything else</strong>, such as clarifying, prompting, thanking" msgstr "<strong>Diçka tjetër,</strong> p.sh. sqarim, falënderim" @@ -464,12 +491,15 @@ msgstr "<strong>Diçka tjetër,</strong> p.sh. sqarim, falënderim" #: app/views/request/details.rhtml:12 msgid "" "<strong>Caveat emptor!</strong> To use this data in an honourable way, you will need \n" -"a good internal knowledge of user behaviour on WhatDoTheyKnow. How, \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=\"%s\">contact us</a> with questions." +"<a href=\"{{contact_path}}\">contact us</a> with questions." msgstr "" +"<strong>Caveat emptor!</strong> Për të përdorur këto shenime në mënyrë të ndershme, ju duhet njohuri e brendshme e pikënisjes së përdoruesve të {{site_name}}. Si,\n" +"pse dhe nga kush kategorizohen kërkesat nuk është diçka e vetëkuptueshme pra edhe mund të ketë gabime dhe paqartësi. Gjithashtu duhet ta kuptoni ligjin për qasje në dokumente publike, si dhe mënyrën se si institucionet (autoritetet) e zbatojnë atë. Plus duhet të jeni ekspert i statistikës. Të lutem\n" +"<a href=\"{{contact_path}}\"> na kontakto </a> me pyetje." #: app/views/request/_other_describe_state.rhtml:28 msgid "<strong>Clarification</strong> has been requested" @@ -487,31 +517,40 @@ msgid "" " We will send an email to your new email address. Follow the\n" " instructions in it to confirm changing your email." 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." #: app/views/user/contact.rhtml:32 msgid "" "<strong>Note:</strong> You're sending a message to yourself, presumably\n" " to try out how it works." msgstr "" +"<strong>Shenim:</strong> Je duke dërguar email vetëvetes, me gjasë\n" +" për të provuar se si funksionon." #: app/views/request/preview.rhtml:31 msgid "" "<strong>Privacy note:</strong> If you want to request private information about\n" " yourself then <a href=\"%s\">click here</a>." msgstr "" +"<strong>Shenim privacie:</strong> Nëse do të kërkosh informatë private për\n" +" veten tënde <a href=\"%s\">kliko këtu</a>." #: app/views/user/set_crop_profile_photo.rhtml:35 msgid "" "<strong>Privacy note:</strong> Your photo will be shown in public on the Internet, \n" -" wherever you do something on WhatDoTheyKnow." +" wherever you do something on {{site_name}}." msgstr "" +"<strong>Shënim privacie:</strong> Fotografia yte do të tregohet publikisht në internet, \n" +" kudo që vepron diçka në {{site_name}}." #: app/views/request/followup_preview.rhtml:37 msgid "" "<strong>Privacy warning:</strong> Your message, and any response\n" " to it, will be displayed publicly on this website." msgstr "" -"<strong>Parajalmrim privacie:</strong> Mesazhi yt si dhe çdo përgjegje do të" +"<strong>Parajalmrim privacie:</strong> Mesazhi yt si dhe çdo përgjigje do të" " paraqitet publikisht në këtë ueb faqe " #: app/views/request/_other_describe_state.rhtml:52 @@ -532,7 +571,7 @@ msgid "" "scheme</a> or <strong>search</strong> their web site ..." msgstr "" -#: app/views/request/show.rhtml:84 +#: app/views/request/show.rhtml:91 msgid "<strong>did not have</strong> the information requested." msgstr "<strong>nuk e kanë</strong> informacionin e kërkuar." @@ -544,24 +583,36 @@ msgstr "<strong>kërko</strong> në ueb sajtin e autoritetit ..." msgid "" "A <strong>summary</strong> of the response if you have received it by post. " msgstr "" -"Një <strong>përmbledhje</strong> e përgjegjes nëse ate e keni marrë me " -"postë." +"Një <strong>përmbledhje</strong> e përgjigjes nëse ate e keni marrë me " +"postë. " + +#: app/views/general/search.rhtml:162 +msgid "A public authority" +msgstr "" #: app/views/request/_other_describe_state.rhtml:34 msgid "A response will be sent <strong>by post</strong>" -msgstr "Përgjegja do të dërgohet <strong>me postë</strong>" +msgstr "Përgjigja do të dërgohet <strong>me postë</strong>" + +#: app/views/general/search.rhtml:151 +msgid "A strange reponse, required attention by the {{site_name}} team" +msgstr "" + +#: app/views/general/search.rhtml:163 +msgid "A {{site_name}} user" +msgstr "" #: app/views/user/set_profile_about_me.rhtml:20 msgid "About you:" msgstr "Për ty:" -#: app/models/info_request_event.rb:288 +#: app/models/info_request_event.rb:293 msgid "Acknowledgement" -msgstr "" +msgstr "Konfirmim për pranim " #: app/views/request/_sidebar.rhtml:5 msgid "Act on what you've learnt" -msgstr "" +msgstr "Vepro sipas asaj që ke marrë vesh" #: app/views/comment/new.rhtml:14 msgid "Add an annotation to " @@ -572,6 +623,12 @@ msgid "" "Add an annotation to your request with choice quotes, or\n" " a <strong>summary of the response</strong>." msgstr "" +"Shto shenim në kërkesën tënde me citate të zgjedhura, apo\n" +" me <strong>përmbledhje të përgjigjes</strong>." + +#: app/views/public_body/_body_listing_single.rhtml:26 +msgid "Added on {{date}}" +msgstr "" #: app/models/user.rb:54 msgid "Admin level is not included in list" @@ -597,26 +654,38 @@ msgid "" " human beings)" msgstr "" -#: app/models/info_request_event.rb:304 +#: app/models/info_request_event.rb:309 msgid "All information sent" msgstr "Të gjitha informatat janë dërguar" +#: app/views/general/search.rhtml:146 +msgid "All of the information requested has been received" +msgstr "" + #: app/views/public_body/list.rhtml:5 msgid "Alphabet" msgstr "Sipas alfabetit" +#: app/views/public_body/_body_listing_single.rhtml:12 +msgid "Also called {{other_name}}." +msgstr "i quajtur edhe {{other_name}}." + #: app/views/request_mailer/new_response.rhtml:12 msgid "" "Although all responses are automatically published, we depend on\n" "you, the original requester, to evaluate them." msgstr "" -"Edhe pse të gjitha përgjegjet publikohen automatikisht, ne varemi nga ti, si" +"Edhe pse të gjitha përgjigjet publikohen automatikisht, ne varemi nga ti, si" " kërkues i tyre, për t'i vlerësuar ato." #: app/views/request/_other_describe_state.rhtml:70 msgid "An <strong>error message</strong> has been received" msgstr "Një <strong>mesazh gabimi</strong> është marrë" +#: app/views/general/search.rhtml:161 +msgid "Annotation added to request" +msgstr "" + #: app/views/user/show.rhtml:34 msgid "Annotations" msgstr "Shënimet" @@ -644,58 +713,62 @@ msgid "" "Ask for <strong>specific</strong> documents or information, this site is not" " suitable for general enquiries." msgstr "" +"Kërko dokumente apo informata <strong>specifike</strong>, kjo faqe nuk është" +" e përshtatshme për pyetje të përgjithshme." #: app/views/request/show_response.rhtml:31 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 "" +"Në fund të kësaj faqeje, shkruaji atyre për të kërkuar nga ata që t'i scannojnë\n" +" (<a href=\"%s\">më shumë detaje</a>)." #: app/views/request/upload_response.rhtml:33 msgid "Attachment (optional):" -msgstr "Attachment (opcionale):" +msgstr "Shtojca - attachment (opcionale):" -#: app/models/info_request.rb:776 +#: app/models/info_request.rb:783 msgid "Awaiting classification." msgstr "Në pritje të klasifikimit." -#: app/models/info_request.rb:796 +#: app/models/info_request.rb:803 msgid "Awaiting internal review." -msgstr "Në pritje për rishikimit të brendshëm." +msgstr "Në pritje për rishqyrtim intern." -#: app/models/info_request.rb:778 +#: app/models/info_request.rb:785 msgid "Awaiting response." -msgstr "Në pritje të përgjegjes." +msgstr "Në pritje të përgjigjes." #: app/views/request/new.rhtml:43 msgid "" "Browse <a href=\"%s\">other requests</a> for examples of how to word your " "request." msgstr "" -"Shfleto <a href=\"%s\">kërkesa të tjera</a> për shembuj se si të formulosh " +"Shfleto <a href=\"%s\">kërkesa të tjera</a> për shembuj se si të formulosh " "kërkesën tënde." #: app/views/request/new.rhtml:41 msgid "" -"Browse <a href='%s'>other requests</a> to '{{public_body_name}}' for " +"Browse <a href='{{url}}'>other requests</a> to '{{public_body_name}}' for " "examples of how to word your request." msgstr "" -"Shfleto <a href='%s'>kërkesa të tjera</a> për '{{public_body_name}}' për " -"shembuj se si të formulosh kërkesën tënde." -#: app/views/request/show.rhtml:79 +#: app/views/request/show.rhtml:86 msgid "" "By law, under all circumstances, {{public_body_link}} should have responded " "by now" msgstr "" "Sipas ligjit, në të gjitha rrethanat, {{public_body_link}} është duhur të " -"përgjegjet deri tani" +"përgjigjet deri tani" -#: app/views/request/show.rhtml:71 +#: app/views/request/show.rhtml:78 msgid "" "By law, {{public_body_link}} should normally have responded " "<strong>promptly</strong> and" msgstr "" +"Sipas ligjit, {{public_body_link}} do të duhej të ishte përgjegjur " +"<strong>menjëherë</strong> dhe" #: app/views/general/search.rhtml:17 msgid "" @@ -705,27 +778,27 @@ msgstr "" "Nuk u gjet? <a href=\"%s\">Shfleto të gjtiha</a> apo <a href=\"%s\">kërko që" " të shtohet</a>." -#: app/controllers/track_controller.rb:143 +#: app/controllers/track_controller.rb:145 msgid "Cancel a {{site_name}} alert" msgstr "Anulo njoftimet për {{site_name}}" -#: app/controllers/track_controller.rb:173 +#: app/controllers/track_controller.rb:175 msgid "Cancel some {{site_name}} alerts" msgstr "Anulo disa njoftime për {{site_name}}" -#: locale/model_attributes.rb:46 +#: locale/model_attributes.rb:39 msgid "CensorRule|Last edit comment" -msgstr "CensorRule | Redaktimi i fundit i koment" +msgstr "CensorRule | Editimi i fundit i koment" -#: locale/model_attributes.rb:45 +#: locale/model_attributes.rb:38 msgid "CensorRule|Last edit editor" -msgstr "CensorRule | Redaktimi i fundit të editorit" +msgstr "CensorRule | Editimi i fundit të editorit" -#: locale/model_attributes.rb:44 +#: locale/model_attributes.rb:37 msgid "CensorRule|Replacement" msgstr "CensorRule | Zëvendësimi" -#: locale/model_attributes.rb:43 +#: locale/model_attributes.rb:36 msgid "CensorRule|Text" msgstr "CensorRule | Teksti" @@ -733,6 +806,10 @@ msgstr "CensorRule | Teksti" msgid "Central government" msgstr "Qeveria" +#: app/views/user/signchangeemail.rhtml:37 +msgid "Change email on {{site_name}}" +msgstr "" + #: app/views/user/signchangepassword.rhtml:27 msgid "Change password on {{site_name}}" msgstr "Ndrysho fjalekalimin në {{site_name}}" @@ -742,14 +819,14 @@ msgid "Change profile photo" msgstr "Ndrysho fotografinë e profilit" #: app/views/user/set_profile_about_me.rhtml:1 -msgid "Change the text about you on your profile at WhatDoTheyKnow.com" -msgstr "Ndrysho tekstin për ty në profilin tënd në InformataZyrtare.org" +msgid "Change the text about you on your profile at {{site_name}}" +msgstr "Ndrysho tekstin për vetën në profilin tënd në {{site_name}}" #: app/views/user/show.rhtml:107 msgid "Change your email" msgstr "Ndrysho email adresën tënde" -#: app/controllers/user_controller.rb:249 +#: app/controllers/user_controller.rb:250 #: app/views/user/signchangeemail.rhtml:1 #: app/views/user/signchangeemail.rhtml:11 msgid "Change your email address used on {{site_name}}" @@ -766,7 +843,7 @@ msgstr "Ndrysho fjalëkalimin tënd" msgid "Change your password on {{site_name}}" msgstr "Ndrysho fjalëkalimin tënd në {{site_name}}" -#: app/controllers/user_controller.rb:203 +#: app/controllers/user_controller.rb:204 msgid "Change your password {{site_name}}" msgstr "Ndrysho fjalëkalimin tënd {{site_name}}" @@ -778,68 +855,89 @@ msgstr "Regjistrimi i organizatës" msgid "Check for mistakes if you typed or copied the address." msgstr "Kontrollo për gabime, nëse ke shtypur ose kopjuar adresën." -#: app/views/request/preview.rhtml:7 #: app/views/request/followup_preview.rhtml:14 +#: app/views/request/preview.rhtml:7 msgid "Check you haven't included any <strong>personal information</strong>." msgstr "" "Kontrollo që nuk ke përfshi asnjë <strong>informacion personal.</strong>" -#: app/models/info_request_event.rb:326 +#: app/models/info_request_event.rb:331 msgid "Clarification" msgstr "Sqarim" -#: app/models/info_request_event.rb:290 +#: app/models/info_request_event.rb:295 msgid "Clarification required" msgstr "Kërkohet sqarim" -#: app/controllers/request_controller.rb:334 +#: app/controllers/request_controller.rb:339 msgid "Classify an FOI response from " -msgstr "Klasifiko një përgjegje për kërkesë për informatë zyrtare prej " +msgstr "Klasifiko një përgjigje për kërkesë për informatë zyrtare prej " #: app/views/request_mailer/very_overdue_alert.rhtml:6 msgid "" "Click on the link below to send a message to {{public_body_name}} telling them to reply to your request. You might like to ask for an internal\n" "review, asking them to find out why response to the request has been so slow." msgstr "" -"Klikoni në linkun më poshtë për të dërguar një mesazh te " -"{{public_body_name}} duke u thënë atyre që të përgjegjen në kërkesën tënde. " -"Ti mund të dëshirosh të kërkosh rishikimin të brendshëm, duke u kërkuar " -"atyre për të gjetur se pse përgjegja ndaj kërkesës ka qenë kaq e ngadaltë." +"Kliko në vegzën më poshtë për të dërguar një mesazh te {{public_body_name}} " +"duke u thënë atyre që të përgjigjen në kërkesën tënde. Ti mund të dëshirosh " +"të kërkosh rishqyrtim intern, duke u kërkuar atyre për të gjetur se pse " +"përgjegja ndaj kërkesës ka qenë kaq e ngadaltë." #: app/views/request_mailer/overdue_alert.rhtml:5 msgid "" "Click on the link below to send a message to {{public_body}} reminding them " "to reply to your request." msgstr "" +"Kliko në vegzën e mëposhtme për t'i dërguar mesazh {{public_body}} për t'ua " +"përkujtuar që t'i përgjigjen kërkesës tënde." -#: locale/model_attributes.rb:28 +#: locale/model_attributes.rb:22 msgid "Comment|Body" msgstr "Komenti | Body" -#: locale/model_attributes.rb:27 +#: locale/model_attributes.rb:21 msgid "Comment|Comment type" msgstr "Koment|Lloji i komentit" -#: locale/model_attributes.rb:30 +#: locale/model_attributes.rb:24 msgid "Comment|Locale" msgstr "Koment | Lokale" -#: locale/model_attributes.rb:29 +#: locale/model_attributes.rb:23 msgid "Comment|Visible" msgstr "Koment | i/e dukshëm" +#: app/models/track_thing.rb:147 +msgid "Confirm you want to be emailed about new requests" +msgstr "Konfirmo që doni të merrni email për kërkesa të reja" + +#: app/models/track_thing.rb:214 +msgid "" +"Confirm you want to be emailed about new requests or responses matching " +"'{{query}}'" +msgstr "" + +#: app/models/track_thing.rb:198 +msgid "Confirm you want to be emailed about requests by '{{user_name}}'" +msgstr "" + +#: app/models/track_thing.rb:182 +msgid "" +"Confirm you want to be emailed about requests to '{{public_body_name}}'" +msgstr "" + #: app/models/track_thing.rb:163 msgid "Confirm you want to be emailed when an FOI request succeeds" msgstr "" "Konfirmo që doni të merrni email kur një kërkesë për informata zyrtare ka " "sukses" -#: app/controllers/request_controller.rb:295 +#: app/controllers/request_controller.rb:300 msgid "Confirm your FOI request to " msgstr "Konfirmo kërkesën tënde për " -#: app/controllers/request_controller.rb:696 -#: app/controllers/user_controller.rb:514 +#: app/controllers/request_controller.rb:703 +#: app/controllers/user_controller.rb:515 msgid "Confirm your account on {{site_name}}" msgstr "Konfirmo llogarinë tënde në {{site_name}}" @@ -848,12 +946,16 @@ msgid "Confirm your annotation to {{info_request_title}}" msgstr "Konfirmo shënimin tënd për {{info_request_title}}" #: app/models/user_mailer.rb:34 -msgid "Confirm your new email address on WhatDoTheyKnow.com" -msgstr "Konfirmo adresën e email-it tënd të ri në InformataZyrtare.org" +msgid "Confirm your new email address on {{site_name}}" +msgstr "Konfirmo adresën e email-it tënd të ri në {{site_name}}" -#: app/views/layouts/default.rhtml:146 +#: app/views/layouts/default.rhtml:127 msgid "Contact {{site_name}}" -msgstr "Kontakt {{site_name}}" +msgstr "Kontakto {{site_name}}" + +#: app/models/request_mailer.rb:210 +msgid "Could not identify the request from the email address" +msgstr "" #: app/models/profile_photo.rb:96 msgid "" @@ -873,13 +975,15 @@ msgid "" " environmental factors listed above)" msgstr "" -#: app/views/request/show.rhtml:61 +#: app/views/request/show.rhtml:68 msgid "" "Currently <strong>waiting for a response</strong> from {{public_body_link}}," " they must respond promptly and" msgstr "" +"Momentalisht <strong>duke pritur përgjigje</strong> nga " +"{{public_body_link}}, ata duhet të përgjigjen menjëherë dhe" -#: app/models/info_request_event.rb:294 +#: app/models/info_request_event.rb:299 msgid "Deadline Extended" msgstr "Afati është vazhduar" @@ -887,11 +991,11 @@ msgstr "Afati është vazhduar" msgid "Dear " msgstr "I/e nderuar " -#: app/models/info_request.rb:780 +#: app/models/info_request.rb:787 msgid "Delayed." msgstr "Vonuar." -#: app/models/info_request.rb:798 app/models/info_request_event.rb:310 +#: app/models/info_request.rb:805 app/models/info_request_event.rb:315 msgid "Delivery error" msgstr "Gabim gjatë dorëzimit" @@ -911,13 +1015,15 @@ msgstr "" #: app/views/request/_view_html_prefix.rhtml:6 msgid "Download original attachment" -msgstr "Shkarko attachment-in origjinal" +msgstr "Shkarko shtojcën (attachment) origjinale" -#: app/views/request/_followup.rhtml:88 +#: app/views/request/_followup.rhtml:85 msgid "" "Edit and add <strong>more details</strong> to the message above,\n" " explaining why you are dissatisfied with their response." msgstr "" +"Redakto dhe shto <strong>më shumë detaje</strong> në mesazhin e mësipërm,\n" +" duke shpjeguar se pse nuk je i kënaqur me përgjigjen e tyre." #: app/views/admin_public_body/_locale_selector.rhtml:2 msgid "Edit language version:" @@ -927,12 +1033,12 @@ msgstr "Edito versionin e gjuhës:" msgid "Edit text about you" msgstr "Edito tekstin për vetën tënde" -#: app/models/user.rb:132 +#: app/models/user.rb:135 msgid "Either the email or password was not recognised, please try again." msgstr "" "Adresa e email-it apo fjalëkalimi nuk janë njohur, të lutem provo përsëri." -#: app/models/user.rb:134 +#: app/models/user.rb:137 msgid "" "Either the email or password was not recognised, please try again. Or create" " a new account using the form on the right." @@ -950,7 +1056,11 @@ msgstr "Dërgom përditësime me email në lidhje me këtë kërkesë" #: app/models/track_thing.rb:155 msgid "Email me new successful responses " -msgstr "M'i dërgo me email përgjegjet e reja të suksesshme" +msgstr "M'i dërgo me email përgjigjet e reja të suksesshme" + +#: app/models/track_thing.rb:139 +msgid "Email me when there are new requests" +msgstr "" #: app/views/user/show.rhtml:36 msgid "Email subscriptions" @@ -969,7 +1079,7 @@ 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 "" -"Shkruaj përgjegjen tënde më poshtë. Ti mund të bashkëangjitësh një fajll " +"Shkruaj përgjigjen tënde më poshtë. Ti mund të bashkëangjitësh një fajll " "(përdor e-mail, ose <a href=\"%s\">na kontakto</a> nëse ke nevojë për më " "shumë)." @@ -997,6 +1107,9 @@ msgid "" " will be <strong>displayed publicly</strong> on\n" " this website forever (<a href=\"%s\">why?</a>)." msgstr "" +"Çdo gjë që ke shkruar në këtë faqe \n" +" do të <strong>tregohet publikisht</strong> në\n" +" këtë faqe përgjithmonë (<a href=\"%s\">pse?</a>)." #: app/views/request/new.rhtml:116 msgid "" @@ -1004,20 +1117,23 @@ msgid "" " will be <strong>displayed publicly</strong> on\n" " this website forever (<a href=\"%s\">why?</a>)." msgstr "" +"Çdo gjë që ke shkruar në këtë faqe, përfshi edhe <strong>emri yt</strong>, \n" +" do të <strong>tregohet publikisht</strong> në\n" +" këtë faqe përgjithmonë (<a href=\"%s\">pse?</a>)." -#: locale/model_attributes.rb:61 +#: locale/model_attributes.rb:60 msgid "EximLogDone|Filename" msgstr "EximLogDone|Filename" -#: locale/model_attributes.rb:62 +#: locale/model_attributes.rb:61 msgid "EximLogDone|Last stat" msgstr "EximLogDone|Statistika e fundit" -#: locale/model_attributes.rb:16 +#: locale/model_attributes.rb:19 msgid "EximLog|Line" msgstr "EximLog|Linja" -#: locale/model_attributes.rb:15 +#: locale/model_attributes.rb:18 msgid "EximLog|Order" msgstr "EximLog|Order" @@ -1029,6 +1145,10 @@ msgstr "Adresa e emailit për Informatë Zyrtare për {{public_body}}" msgid "FOI requests" msgstr "Kërkesat për Informata Zyrtare" +#: app/models/track_thing.rb:193 app/models/track_thing.rb:194 +msgid "FOI requests by '{{user_name}}'" +msgstr "" + #: app/models/profile_photo.rb:101 msgid "Failed to convert image to a PNG" msgstr "Konvertimi i imazhit në PNG dështoi" @@ -1051,24 +1171,29 @@ msgid "" msgstr "" "Së pari, shkruani <strong>emrin e autoritetit publik </strong> <br> prej të " "cilit kërkoni informata. <strong>Sipas ligjit, ata duhet të " -"përgjegjen</strong> ( <a href=\"%s\">pse?</a> )." +"përgjigjen</strong> ( <a href=\"%s\">pse?</a> )." #: app/views/request_mailer/old_unclassified_updated.rhtml:4 msgid "Follow this link to see the request:" -msgstr "Kliko këtë link për të parë kërkesën:" +msgstr "Kliko këtë vegzë për të parë kërkesën:" -#: app/models/info_request_event.rb:330 +#: app/models/info_request_event.rb:335 msgid "Follow up" msgstr "" +#: app/views/general/search.rhtml:159 +msgid "Follow up message sent by requester" +msgstr "" + #: app/views/public_body/view_email.rhtml:14 msgid "Follow up messages to existing requests are sent to " -msgstr "" +msgstr "Mesazhet vazhduese të kërkesës ekzistuese dërgohen te " #: app/views/request/_followup.rhtml:16 msgid "" -"Follow ups and new responses to this request have been stopped to prevent spam. Please\n" -" <a href=\"%s\">contact us</a> if you are {{user_link}} and need to send a follow up." +"Follow ups and new responses to this request have been stopped to prevent " +"spam. Please <a href=\"{{url}}\">contact us</a> if you are {{user_link}} and" +" need to send a follow up." msgstr "" #: app/views/public_body/show.rhtml:61 @@ -1089,7 +1214,7 @@ msgid "" " a request to it." msgstr "" "Ligji mbi lirinë e informacionit nuk ka të bëjë me këtë autoritet, kështu që" -" ju nuk mund të bëjë një kërkesë për të." +" ju nuk mund të bëni kërkesa për informata zyrtare." #: app/views/request/followup_bad.rhtml:11 msgid "Freedom of Information law no longer applies to" @@ -1123,6 +1248,9 @@ msgid "" " 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 "" +"Nga faqja e kërkesës, provo të përgjigjesh në një mesazh të caktuar, më parë se të\n" +" shkruash një përgjigje të përgjithshme. Nëse të duhet të shkruash përgjigje të përgjithshme, dhe e di\n" +" emailin ku duhet ta drejtosh, atëherë të lutem <a href=\"%s\">dërgoje te ne</a>." #: app/models/outgoing_message.rb:73 msgid "GIVE DETAILS ABOUT YOUR COMPLAINT HERE" @@ -1132,23 +1260,23 @@ msgstr "JEPI DETAJET PËR ANKESËN TËNDE KËTU" msgid "Go to our <a href=\"%s\">front page</a></li>" msgstr "Shko te <a href=\"%s\">ballina</a> </li>" -#: app/models/info_request_event.rb:292 +#: app/models/info_request_event.rb:297 msgid "Handled by post" msgstr "Do të trajtohet me postë" -#: app/models/info_request.rb:794 +#: app/models/info_request.rb:801 msgid "Handled by post." msgstr "Do të trajtohet me postë." -#: app/views/layouts/default.rhtml:121 +#: app/views/layouts/default.rhtml:102 msgid "Hello!" msgstr "Përshëndetje" -#: app/views/layouts/default.rhtml:118 +#: app/views/layouts/default.rhtml:99 msgid "Hello, {{username}}!" msgstr "Përshëndetje, {{username}}!" -#: app/views/layouts/default.rhtml:113 +#: app/views/layouts/default.rhtml:94 msgid "Help" msgstr "Ndihmë" @@ -1156,9 +1284,13 @@ msgstr "Ndihmë" 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" -"WhatDoTheyKnow for intermediate events, which weren't given an explicit\n" -"description by a user. See the <a href=\"%s\">search tips</a> for description of the states." +"{{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 "" +"Këtu <strong>përshkruar</strong> nënkupton kur një përdorues ka zgjedhë statusin e kërkesës, dhe\n" +"ngjarja e fundit ka azhuruar statusin me këtë vlerë. <strong>llogaritur</strong> në këtë rast është vënë nga\n" +"{{site_name}} për ngjarjet e ndërmjeme, të cilave nuk u është dhënë\n" +"përshkrim eksplicit nga përdoruesi. Shih <a href=\"{{search_path}}>këshillat e kërkimit</a> për përshkrimet e statuseve." #: app/views/request/_other_describe_state.rhtml:4 msgid "" @@ -1168,11 +1300,11 @@ msgid "" " Thanks." msgstr "" -#: locale/model_attributes.rb:58 +#: locale/model_attributes.rb:57 msgid "Holiday|Day" msgstr "Festa | Dita" -#: locale/model_attributes.rb:59 +#: locale/model_attributes.rb:58 msgid "Holiday|Description" msgstr "Festa | Përshkrimi" @@ -1190,13 +1322,13 @@ msgstr "" msgid "Human health and safety" msgstr "" -#: app/views/request/_followup.rhtml:71 +#: app/views/request/_followup.rhtml:68 msgid "I am asking for <strong>new information</strong>" msgstr "Unë jam duke kërkuar <strong>informacion të ri</strong>" -#: app/views/request/_followup.rhtml:76 +#: app/views/request/_followup.rhtml:73 msgid "I am requesting an <strong>internal review</strong>" -msgstr "" +msgstr "Po kërkoj <strong>rishqyrtimin intern</strong>" #: app/views/request_game/play.rhtml:39 msgid "I don't like these ones — give me some more!" @@ -1204,25 +1336,27 @@ msgstr "Nuk më pëlqejnë këto kërkesa &mdash më jep disa të tjera!" #: app/views/request_game/play.rhtml:40 msgid "I don't want to do any more tidying now!" -msgstr "" +msgstr "Nuk dua të pastroj më tutje!" #: app/views/request/_describe_state.rhtml:91 msgid "I would like to <strong>withdraw this request</strong>" -msgstr "Ddo të doja të <strong>tërheqë këtë kërkesë</strong>" +msgstr "Do të doja të <strong>tërheqë këtë kërkesë</strong>" #: app/views/request/_describe_state.rhtml:11 msgid "" "I'm still <strong>waiting</strong> for my information\n" " <small>(maybe you got an acknowledgement)</small>" msgstr "" +"Akoma po e <strong>pres</strong> informatën time \n" +" <small>(ndoshta ke marrë konfirmim)</small>" #: app/views/request/_describe_state.rhtml:18 msgid "I'm still <strong>waiting</strong> for the internal review" -msgstr "" +msgstr "Akoma po e <strong>pres</strong> rishqyrtimin intern" #: app/views/request/_describe_state.rhtml:32 msgid "I'm waiting for an <strong>internal review</strong> response" -msgstr "" +msgstr "Po pres përgjigje nga <strong>rishqyrtimi intern</strong>" #: app/views/request/_describe_state.rhtml:25 msgid "I've been asked to <strong>clarify</strong> my request" @@ -1230,7 +1364,7 @@ msgstr "Më kanë kërkuar të <strong>qartësojë</strong> kërkesën time" #: app/views/request/_describe_state.rhtml:60 msgid "I've received <strong>all the information" -msgstr "Kam marrë <strong>të gjithë informacionin</strong>" +msgstr "Kam marrë <strong>të gjitha informatat</strong>" #: app/views/request/_describe_state.rhtml:56 msgid "I've received <strong>some of the information</strong>" @@ -1254,13 +1388,19 @@ msgid "" "or an email on another subject to {{user}}, then please\n" "email {{contact_email}} for help." msgstr "" +"Nëse kjo është e pasakt, apo do t'i dërgosh përgjigje të vonuar në këtë kërkesë\n" +"apo një email me një temë tjetër te {{user}}, atëherë \n" +"dërgo email në {{contact_email}} për ndihmë." -#: app/views/request/_followup.rhtml:21 +#: app/views/request/_followup.rhtml:20 msgid "" "If you are dissatisfied by the response you got from\n" " the public authority, you have the right to\n" " complain (<a href=\"%s\">details</a>)." msgstr "" +"Nëse je i pakënaqur me përgjigjen nga\n" +" institucioni publik, ke të drejtën të\n" +" ankohesh (<a href=\"%s\">detajet</a>)." #: app/views/user/no_cookies.rhtml:20 msgid "If you are still having trouble, please <a href=\"%s\">contact us</a>." @@ -1282,7 +1422,7 @@ msgstr "" "Nëse je duke mendu me përdor pseudonim, të lutem <a href=\"%s\">lexo këtë së" " pari</a> ." -#: app/views/request/show.rhtml:98 +#: app/views/request/show.rhtml:105 msgid "If you are {{user_link}}, please" msgstr "Nëse ti je {{user_link}}, të lutem" @@ -1292,13 +1432,15 @@ msgid "" "it</strong> from the email. Then <strong>paste it into your browser</strong>, into the place\n" "you would type the address of any other webpage." msgstr "" +"Nëse ti nuk mund të klikosh mbi të në e-mail, duhet që ta <strong>përzgjedhësh dhe t'a kopjosh </strong>. Pastaj <strong>e bashkangjet (paste) \n" +"</strong>në fushën e adresës të shfletuesit tënd." #: app/views/request/show_response.rhtml:49 msgid "" "If you can, scan in or photograph the response, and <strong>send us\n" " a copy to upload</strong>." msgstr "" -"Nëse mund të skanoni ose fotografoni përgjegjen, dhe të <strong>na e dërgoni" +"Nëse mund të skanoni ose fotografoni përgjigjen, dhe të <strong>na e dërgoni" " që ne ta ngarkojme ate.</strong>" #: app/views/outgoing_mailer/_followup_footer.rhtml:4 @@ -1313,18 +1455,18 @@ msgid "" "more. Please try doing what you were doing from the beginning." msgstr "" "Nëse keni marrë këtë email <strong>më shumë se gjashtë muaj më " -"parë,</strong> atëherë ky link për kyçje nuk do të funksionojë më. Të lutem " -"provon duke bërë atë që keni vepruar nga fillimi." +"parë,</strong> atëherë kjo vegzë për kyçje nuk do të funksionojë më. Të " +"lutem provon duke bërë atë që keni vepruar nga fillimi." -#: app/controllers/request_controller.rb:430 +#: app/controllers/request_controller.rb:437 msgid "" "If you have not done so already, please write a message below telling the " "authority that you have withdrawn your request. Otherwise they will not know" " it has been withdrawn." msgstr "" -#: app/views/user/signchangepassword_confirm.rhtml:10 #: app/views/user/signchangeemail_confirm.rhtml:11 +#: app/views/user/signchangepassword_confirm.rhtml:10 msgid "" "If you use web-based email or have \"junk mail\" filters, also check your\n" "bulk/spam mail folders. Sometimes, our messages are marked that way." @@ -1338,14 +1480,16 @@ 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 "" +"Nëse do që ne ta heqim këtë leçitje, atëherë të lutem\n" +"<a href=\"/help/contact\">na kontakto</a> duke i dhënë arsyet.\n" #: app/views/user/_signup.rhtml:6 -msgid "If you're new to WhatDoTheyKnow" -msgstr "Nëse je i ri në InformataZyrtare" +msgid "If you're new to {{site_name}}" +msgstr "Nëse je i ri në {{site_name}}" #: app/views/user/_signin.rhtml:7 -msgid "If you've used WhatDoTheyKnow before" -msgstr "Nëse e ke përdorë InformataZyrtare më parë" +msgid "If you've used {{site_name}} before" +msgstr "Nëse e ke përdorë {{site_name}} më parë" #: app/views/user/no_cookies.rhtml:12 msgid "" @@ -1355,79 +1499,79 @@ msgstr "" "Nëse shfletuesi yt është vendosur për të pranuar \"cookies\" dhe ju jeni " "duke parë këtë mesazh, atëherë me sa duket ka gabim në serverin tonë." -#: locale/model_attributes.rb:64 +#: locale/model_attributes.rb:63 msgid "IncomingMessage|Cached attachment text clipped" msgstr "IncomingMessage|Cached attachment text clipped" -#: locale/model_attributes.rb:65 +#: locale/model_attributes.rb:64 msgid "IncomingMessage|Cached main body text folded" msgstr "IncomingMessage|Cached main body text folded" -#: locale/model_attributes.rb:66 +#: locale/model_attributes.rb:65 msgid "IncomingMessage|Cached main body text unfolded" msgstr "IncomingMessage|Cached main body text unfolded" -#: locale/model_attributes.rb:39 +#: locale/model_attributes.rb:44 msgid "InfoRequestEvent|Calculated state" msgstr "InfoRequestEvent|Calculated state" -#: locale/model_attributes.rb:38 +#: locale/model_attributes.rb:43 msgid "InfoRequestEvent|Described state" msgstr "InfoRequestEvent|Described state" -#: locale/model_attributes.rb:36 +#: locale/model_attributes.rb:41 msgid "InfoRequestEvent|Event type" msgstr "InfoRequestEvent|Event type" -#: locale/model_attributes.rb:40 +#: locale/model_attributes.rb:45 msgid "InfoRequestEvent|Last described at" msgstr "InfoRequestEvent|Last described at" -#: locale/model_attributes.rb:37 +#: locale/model_attributes.rb:42 msgid "InfoRequestEvent|Params yaml" msgstr "InfoRequestEvent|Params yaml" -#: locale/model_attributes.rb:41 +#: locale/model_attributes.rb:46 msgid "InfoRequestEvent|Prominence" msgstr "InfoRequestEvent|Prominence" -#: locale/model_attributes.rb:87 +#: locale/model_attributes.rb:86 msgid "InfoRequest|Allow new responses from" -msgstr "InfoRequest|Lejo përgjegje të reja prej" +msgstr "InfoRequest|Lejo përgjigje të reja prej" -#: locale/model_attributes.rb:83 +#: locale/model_attributes.rb:82 msgid "InfoRequest|Awaiting description" msgstr "InfoRequest|Awaiting description" -#: locale/model_attributes.rb:82 +#: locale/model_attributes.rb:81 msgid "InfoRequest|Described state" msgstr "InfoRequest|Described state" -#: locale/model_attributes.rb:88 +#: locale/model_attributes.rb:87 msgid "InfoRequest|Handle rejected responses" msgstr "InfoRequest|Handle rejected responses" -#: locale/model_attributes.rb:86 +#: locale/model_attributes.rb:85 msgid "InfoRequest|Law used" msgstr "Info të kërkesës | Ligji i përdorur" -#: locale/model_attributes.rb:84 +#: locale/model_attributes.rb:83 msgid "InfoRequest|Prominence" msgstr "Info të kërkesës | Rëndësi" -#: locale/model_attributes.rb:81 +#: locale/model_attributes.rb:80 msgid "InfoRequest|Title" msgstr "Info të kërkesës | Titulli" -#: locale/model_attributes.rb:85 +#: locale/model_attributes.rb:84 msgid "InfoRequest|Url title" msgstr "Info të kërkesës | Titulli Url" -#: app/models/info_request_event.rb:298 +#: app/models/info_request_event.rb:303 msgid "Information not held" msgstr "Informata nuk mbahet këtu" -#: app/models/info_request.rb:784 +#: app/models/info_request.rb:791 msgid "Information not held." msgstr "Informata nuk mbahet këtu." @@ -1437,19 +1581,22 @@ msgid "" " radiation, waste materials)" msgstr "" -#: app/models/info_request_event.rb:306 +#: app/models/info_request_event.rb:311 msgid "Internal review acknowledgement" -msgstr "" +msgstr "Pranimi i rishqyrtimit intern" -#: app/models/info_request_event.rb:323 +#: app/models/info_request_event.rb:328 msgid "Internal review request" -msgstr "Kërkesë për shqyrtim të brendshëm" +msgstr "Kërkesë për rishqyrtim intern" #: app/views/outgoing_mailer/initial_request.rhtml:8 msgid "" -"Is {{email_address}} the wrong address for {{type_of_request}} requests tp " +"Is {{email_address}} the wrong address for {{type_of_request}} requests to " "{{public_body_name}}? If so, please contact us using this form:" msgstr "" +"A ështe {{email_address}} adresë e gabuar e {{type_of_request}} kërkesave " +"për {{public_body_name}}? Nëse po, të luten na kontakto nëpermjet kësaj " +"forme:" #: app/views/user/no_cookies.rhtml:8 msgid "" @@ -1462,27 +1609,29 @@ msgstr "" " \"cookies\", ose përdor një shfletues (browser) tjeter. Pastaj shtyp " "\"refresh\" për të provuar edhe një herë." -#: app/views/user/show.rhtml:62 -msgid "Joined WhatDoTheyKnow in" -msgstr "Je anëtarësuar në InformataZyrtare" - #: app/views/user/_user_listing_single.rhtml:21 msgid "Joined in" msgstr "Bashkangjitur më" +#: app/views/user/show.rhtml:62 +msgid "Joined {{site_name}} in" +msgstr "Bashkangjitur {{site_name}} më" + #: app/views/request/new.rhtml:48 msgid "" "Keep it <strong>focused</strong>, you'll be more likely to get what you want" " (<a href=\"%s\">why?</a>)." msgstr "" +"Mbaje <strong>të fokusuar</strong>, gjasat janë më të mëdha që të marrësh " +"përgjigjen e dëshiruar (<a href=\"%s\">pse?</a>)." #: app/views/contact_mailer/message.rhtml:10 msgid "Last authority viewed: " -msgstr "Autoriteti i shikuar së fundi:" +msgstr "Autoriteti i shikuar së fundi: " #: app/views/contact_mailer/message.rhtml:7 msgid "Last request viewed: " -msgstr "Kërkesa e shikuar së fundi:" +msgstr "Kërkesa e shikuar së fundi: " #: app/views/user/no_cookies.rhtml:17 msgid "" @@ -1496,7 +1645,7 @@ msgstr "" #: app/views/request/_correspondence.rhtml:27 #: app/views/request/_correspondence.rhtml:57 msgid "Link to this" -msgstr "Linku te ky" +msgstr "Vegza e kësaj kërkese" #: app/views/public_body/list.rhtml:32 msgid "List of all authorities (CSV)" @@ -1506,13 +1655,13 @@ msgstr "Listo të gjitha autoritetet (CSV)" msgid "Local and regional" msgstr "Lokale dhe regjionale" -#: app/models/info_request.rb:782 +#: app/models/info_request.rb:789 msgid "Long overdue." msgstr "Shumë e vonuar." #: app/views/public_body/show.rhtml:47 msgid "Make a new Environmental Information request" -msgstr "" +msgstr "Bëj një kërkesë të re për informacione rreth Mjedisit" #: app/views/request/new.rhtml:1 msgid "Make an {{law_used_short}} request to '{{public_body_name}}'" @@ -1522,7 +1671,7 @@ msgstr "Bëjë një kërkesë {{law_used_short}} për '{{public_body_name}}'" msgid "Make and browse Freedom of Information (FOI) requests" msgstr "Bëj dhe shfleto kërkesa për Informata Zyrtare" -#: app/views/layouts/default.rhtml:86 +#: app/views/layouts/default.rhtml:67 msgid "Make and explore Freedom of Information requests" msgstr "Bëj dhe hulumto kërkesa për Informata Zyrtare" @@ -1530,17 +1679,17 @@ msgstr "Bëj dhe hulumto kërkesa për Informata Zyrtare" msgid "Make or explore Freedom of Information requests" msgstr "Bëj ose shfleto kërkesa për Informata Zyrtare" -#: app/views/layouts/default.rhtml:106 +#: app/views/layouts/default.rhtml:87 msgid "Make request" -msgstr "Bëjë kërkesë" +msgstr "Bëj kërkesë" #: app/views/public_body/_body_listing_single.rhtml:23 msgid "Make your own request" msgstr "Bëj kërkesën tënde" #: app/views/contact_mailer/message.rhtml:4 -msgid "Message sent using WhatDoTheyKnow contact form, " -msgstr "Mesazhi i dërguar duke përdorur kontakt formën e InformataZyrtare," +msgid "Message sent using {{site_name}} contact form, " +msgstr "Mesazhi i dërguar duke përdorur kontakt formën e {{site_name}}, " #: app/views/request/new_bad_contact.rhtml:1 msgid "Missing contact details for '" @@ -1562,7 +1711,7 @@ msgstr "Më shumë kërkesa te suksesshme" msgid "My request has been <strong>refused</strong>" msgstr "Kërkesa ime është <strong>refuzuar</strong>" -#: app/views/layouts/default.rhtml:110 +#: app/views/layouts/default.rhtml:91 msgid "My requests" msgstr "Kërkesat e mia" @@ -1574,6 +1723,10 @@ msgstr "Emri nuk mund të jetë i zbrazët" msgid "Name is already taken" msgstr "Emri është i zënë" +#: app/models/track_thing.rb:142 app/models/track_thing.rb:143 +msgid "New Freedom of Information requests" +msgstr "" + #: app/views/user/signchangeemail.rhtml:20 msgid "New e-mail:" msgstr "Email i ri:" @@ -1592,11 +1745,11 @@ msgstr "Fjalëkalim i ri: (përsërite)" #: app/views/request/show_response.rhtml:62 msgid "New response to your request" -msgstr "Përgjegje e re për kërkesën tënde" +msgstr "përgjigje e re për kërkesën tënde" #: app/views/request/show_response.rhtml:68 msgid "New response to {{law_used_short}} request" -msgstr "Përgjegje e re për {{law_used_short}} kërkesën" +msgstr "përgjigje e re për {{law_used_short}} kërkesën" #: app/views/general/search.rhtml:40 msgid "Newest results first" @@ -1631,32 +1784,32 @@ msgstr "" "Ende askush nuk ka bërë ndonjë kërkesë te {{public_body_name}} duke përdorur" " këtë faqe." -#: app/views/request/_request_listing.rhtml:2 #: app/views/public_body/_body_listing.rhtml:2 +#: app/views/request/_request_listing.rhtml:2 msgid "None found." msgstr "Asnjë nuk u gjet." +#: app/views/user/signchangeemail_confirm.rhtml:3 #: app/views/user/signchangepassword_confirm.rhtml:1 #: app/views/user/signchangepassword_confirm.rhtml:3 -#: app/views/user/signchangeemail_confirm.rhtml:3 msgid "Now check your email!" msgstr "Kontrollo emailin tënd!" #: app/views/comment/preview.rhtml:5 msgid "Now preview your annotation" -msgstr "" +msgstr "Tani shiko shënimin tënd" #: app/views/request/followup_preview.rhtml:10 msgid "Now preview your follow up" -msgstr "" +msgstr "Shiko vazhdimësinë e komunikimit" #: app/views/request/followup_preview.rhtml:8 msgid "Now preview your message asking for an internal review" -msgstr "" +msgstr "Shiko mesazhin tënd ku ke kërkuar rishqyrtim intern" #: app/views/request/preview.rhtml:5 msgid "Now preview your request" -msgstr "" +msgstr "Shiko kërkesën tënde" #: app/views/user/set_draft_profile_photo.rhtml:46 msgid "OR remove the existing photo" @@ -1670,10 +1823,10 @@ msgstr "" "OSE, <strong>kërko</strong> informata që të tjerët kanë kërkuar duke " "përdorur {{site_name}}" -#: app/controllers/request_controller.rb:407 +#: app/controllers/request_controller.rb:414 msgid "" "Oh no! Sorry to hear that your request was refused. Here is what to do now." -msgstr "" +msgstr "Na vjen keq që kërkesa yte është refuzuar. Ja se çfarë të bëhet tani." #: app/views/user/signchangeemail.rhtml:15 msgid "Old e-mail:" @@ -1698,32 +1851,49 @@ msgstr "Në këtë faqe" #: app/views/general/search.rhtml:71 msgid "One public authority matching ‘{{user_search_query}}’" msgstr "" +"Një autoritet publik përputhet me ‘{{user_search_query}}’" #: app/views/public_body/show.rhtml:91 msgid "Only requests made using {{site_name}} are shown." msgstr "Vetëm kërkesat që janë bërë me {{site_name}} janë të shfaqura." -#: locale/model_attributes.rb:21 +#: app/models/info_request.rb:405 +msgid "" +"Only the authority can reply to this request, and I don't recognise the " +"address this reply was sent from" +msgstr "" + +#: app/models/info_request.rb:401 +msgid "" +"Only the authority can reply to this request, but there is no \"From\" " +"address to check against" +msgstr "" + +#: app/views/general/search.rhtml:158 +msgid "Original request sent" +msgstr "" + +#: locale/model_attributes.rb:26 msgid "OutgoingMessage|Body" msgstr "OutgoingMessage | Body" -#: locale/model_attributes.rb:24 +#: locale/model_attributes.rb:29 msgid "OutgoingMessage|Last sent at" msgstr "OutgoingMessage | Së fundi është dërguar në" -#: locale/model_attributes.rb:23 +#: locale/model_attributes.rb:28 msgid "OutgoingMessage|Message type" msgstr "OutgoingMessage|Message type" -#: locale/model_attributes.rb:22 +#: locale/model_attributes.rb:27 msgid "OutgoingMessage|Status" msgstr "OutgoingMessage|Status" -#: locale/model_attributes.rb:25 +#: locale/model_attributes.rb:30 msgid "OutgoingMessage|What doing" msgstr "OutgoingMessage|What doing" -#: app/models/info_request.rb:788 +#: app/models/info_request.rb:795 msgid "Partially successful." msgstr "Pjesërisht e suksesshme." @@ -1747,7 +1917,7 @@ msgstr "Fotografia yte:" msgid "Plans and administrative measures that affect these matters" msgstr "Planet dhe masat administrative që ndikojnë këto çështje" -#: app/controllers/request_game_controller.rb:40 +#: app/controllers/request_game_controller.rb:42 msgid "Play the request categorisation game" msgstr "Luaj në lojën e kategorizimit të kërkesave" @@ -1755,7 +1925,7 @@ msgstr "Luaj në lojën e kategorizimit të kërkesave" msgid "Play the request categorisation game!" msgstr "Luaj lojën e kategorizimit të kërkesave!" -#: app/views/request/show.rhtml:94 +#: app/views/request/show.rhtml:101 msgid "Please" msgstr "Të lutem" @@ -1763,7 +1933,7 @@ msgstr "Të lutem" msgid "Please <a href=\"%s\">get in touch</a> with us so we can fix it." msgstr "Të lutem <a href=\"%s\">na kontakto</a> që neve ta rregullojme ate." -#: app/views/request/show.rhtml:45 +#: app/views/request/show.rhtml:52 msgid "" "Please <strong>answer the question above</strong> so we know whether the " msgstr "" @@ -1774,12 +1944,15 @@ 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 "" +"Të lutem <strong>shko te kërkesa</strong>, dhe na e bëj\n" +" medije nëse ka pasë informatë në përgjigjen e fundit drejtuar atyre." -#: app/views/request/_followup.rhtml:28 +#: app/views/request/_followup.rhtml:27 msgid "" -"Please <strong>only</strong> write messages directly relating to your \n" -"\t\t\t\trequest {{request_link}}. If you would like to ask for information\n" -"\t\t\t\tthat was not in your original request, then <a href=\"%s\">file a new request</a>." +"Please <strong>only</strong> write messages directly relating to your " +"request {{request_link}}. If you would like to ask for information that was " +"not in your original request, then <a href=\"{{new_request_link}}\">file a " +"new request</a>." msgstr "" #: app/views/request/new.rhtml:60 @@ -1800,9 +1973,9 @@ msgstr "Të lutem zgjedh një fajll që përmban foton tënde." #: app/models/outgoing_message.rb:162 msgid "Please choose what sort of reply you are making." -msgstr "Të lutem zgjedh llojin e përgjegjes." +msgstr "Të lutem zgjedh llojin e përgjigjes." -#: app/controllers/request_controller.rb:341 +#: app/controllers/request_controller.rb:346 msgid "" "Please choose whether or not you got some of the information that you " "wanted." @@ -1811,18 +1984,19 @@ msgstr "" #: app/views/user_mailer/changeemail_confirm.rhtml:3 msgid "" "Please click on the link below to confirm that you want to \n" -"change the email address that you use for WhatDoTheyKnow\n" -"from " +"change the email address that you use for {{site_name}}\n" +"from {{old_email}} to {{new_email}}" msgstr "" -"Të lutem klikoni në linkun më poshtë për të konfirmuar se dëshironi të " -"ndryshoni adresën e emailit që ju përdorni për InformataZyrtare nga" +"Të lutem klikoni në vegzën e më poshtëme për të konfirmuar se dëshironi të\n" +"ndryshoni adresën e emailit që ju përdorni për {{site_name}}\n" +"prej {{old_email}} në {{new_email}}" #: app/views/user_mailer/confirm_login.rhtml:3 msgid "Please click on the link below to confirm your email address." msgstr "" -"Të lutem kliko në linkun e mëposhtëm për të konfirmuar email adresën tënde." +"Të lutem kliko në vegzën e mëposhëtme për të konfirmuar email adresën tënde." -#: app/models/info_request.rb:127 +#: app/models/info_request.rb:126 msgid "" "Please describe more what the request is about in the subject. There is no " "need to say it is an FOI request, we add that on anyway." @@ -1851,7 +2025,7 @@ msgstr "Të lutem shkruaj fjalëkalimin" msgid "Please enter a subject" msgstr "Të lutem shkruaj lëndën" -#: app/models/info_request.rb:35 +#: app/models/info_request.rb:34 msgid "Please enter a summary of your request" msgstr "Të lutem shkruaj një përmbledhje të kërkesës tënde" @@ -1912,7 +2086,7 @@ msgstr "" msgid "Please keep it shorter than 500 characters" msgstr "Të lutem mbaje tekstin më të shkurër se 500 shenja" -#: app/models/info_request.rb:124 +#: app/models/info_request.rb:123 msgid "" "Please keep the summary short, like in the subject of an email. You can use " "a phrase, rather than a full sentence." @@ -1925,12 +2099,16 @@ 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 "" +"Të lutem kërko vetëm informata që hyjnë në këto kategori, <strong>mos e humb\n" +" kohën tënde</strong> apo kohën e institucionit duke kërkuar informata që s'kanë të bëjnë me të." #: app/views/request/new_please_describe.rhtml:5 msgid "" "Please select each of these requests in turn, and <strong>let everyone know</strong>\n" "if they are successful yet or not." msgstr "" +"Të lutem selektoi të gjitha kërkesat një pas një, dhe <strong>bëje të njohur për të gjithë</strong>\n" +"nëse kanë qenë të suksesshme deri tash apo jo." #: app/models/outgoing_message.rb:156 msgid "" @@ -1944,13 +2122,13 @@ msgstr "" msgid "Please sign in as " msgstr "Të lutem kyçu si " -#: app/controllers/request_controller.rb:723 +#: app/controllers/request_controller.rb:730 msgid "Please type a message and/or choose a file containing your response." msgstr "" -"Të lutem shkruaj një mesazh dhe/ose zgjedh një fajll që përmban përgjegjen " +"Të lutem shkruaj një mesazh dhe/ose zgjedh një fajll që përmban përgjigjen " "tënde." -#: app/controllers/request_controller.rb:427 +#: app/controllers/request_controller.rb:434 msgid "Please use the form below to tell us more." msgstr "Të lutem përdor formularin e mëposhtëm për të na treguar më shumë." @@ -1958,14 +2136,14 @@ msgstr "Të lutem përdor formularin e mëposhtëm për të na treguar më shum #: app/views/outgoing_mailer/initial_request.rhtml:5 msgid "Please use this email address for all replies to this request:" msgstr "" -"Të lutem përdor këtë adresë të emailit për të gjitha përgjegjet në këtë " +"Të lutem përdor këtë adresë të emailit për të gjitha përgjigjet në këtë " "kërkesë:" -#: app/models/info_request.rb:36 +#: app/models/info_request.rb:35 msgid "Please write a summary with some text in it" msgstr "Të lutem shkruaj përmbledhjen" -#: app/models/info_request.rb:121 +#: app/models/info_request.rb:120 msgid "" "Please write the summary using a mixture of capital and lower case letters. " "This makes it easier for others to read." @@ -1981,7 +2159,7 @@ msgstr "" "Të lutem shkruaj komentin duke përdorur kombinim të germave të mëdha dhe të " "vogla. Kjo e bën leximin për të tjerët më të lehtë." -#: app/controllers/request_controller.rb:416 +#: app/controllers/request_controller.rb:423 msgid "" "Please write your follow up message containing the necessary clarifications " "below." @@ -2000,32 +2178,34 @@ msgid "" "Point to <strong>related information</strong>, campaigns or forums which may" " be useful." msgstr "" +"Udhëzo te <strong>informatat që nderlidhen me këtë,</strong> fushata ose " +"forume të cilat mund të jenë të dobishme." #: app/views/comment/preview.rhtml:21 msgid "Post annotation" msgstr "Posto shënimin" -#: locale/model_attributes.rb:56 +#: locale/model_attributes.rb:55 msgid "PostRedirect|Circumstance" msgstr "PostRedirect|Circumstance" -#: locale/model_attributes.rb:54 +#: locale/model_attributes.rb:53 msgid "PostRedirect|Email token" msgstr "PostRedirect|Email token" -#: locale/model_attributes.rb:53 +#: locale/model_attributes.rb:52 msgid "PostRedirect|Post params yaml" msgstr "PostRedirect|Post params yaml" -#: locale/model_attributes.rb:55 +#: locale/model_attributes.rb:54 msgid "PostRedirect|Reason params yaml" msgstr "PostRedirect|Reason params yaml" -#: locale/model_attributes.rb:51 +#: locale/model_attributes.rb:50 msgid "PostRedirect|Token" msgstr "PostRedirect|Token" -#: locale/model_attributes.rb:52 +#: locale/model_attributes.rb:51 msgid "PostRedirect|Uri" msgstr "PostRedirect|Uri" @@ -2039,25 +2219,25 @@ msgstr "" #: app/views/comment/preview.rhtml:1 msgid "Preview new annotation on '{{info_request_title}}'" -msgstr "" +msgstr "Shiko shënimin e ri në '{{info_request_title}}'" #: app/views/comment/_comment_form.rhtml:15 msgid "Preview your annotation" -msgstr "" +msgstr "Shiko shënimin tënd" -#: app/views/request/_followup.rhtml:99 +#: app/views/request/_followup.rhtml:96 msgid "Preview your message" -msgstr "" +msgstr "Shiko mesazhin tënd" #: app/views/request/new.rhtml:139 msgid "Preview your public request" -msgstr "" +msgstr "Shiko kërkesën tënde publike" -#: locale/model_attributes.rb:18 +#: locale/model_attributes.rb:15 msgid "ProfilePhoto|Data" msgstr "ProfilePhoto|Data" -#: locale/model_attributes.rb:19 +#: locale/model_attributes.rb:16 msgid "ProfilePhoto|Draft" msgstr "ProfilePhoto|Draft" @@ -2083,11 +2263,11 @@ msgstr "PublicBody |Ballina" #: locale/model_attributes.rb:8 msgid "PublicBody|Last edit comment" -msgstr "PublicBody | Redaktimi i fundit i komentit" +msgstr "PublicBody | Editimi i fundit i komentit" #: locale/model_attributes.rb:7 msgid "PublicBody|Last edit editor" -msgstr "PublicBody | Redaktimi i fundit editor" +msgstr "PublicBody | Editimi i fundit editor" #: locale/model_attributes.rb:3 msgid "PublicBody|Name" @@ -2121,35 +2301,31 @@ msgstr "PublicBody |Versioni" msgid "Publication scheme" msgstr "Skema e publikimit" -#: locale/model_attributes.rb:49 +#: locale/model_attributes.rb:48 msgid "RawEmail|Data binary" msgstr "RawEmail |Të dhënat binare" -#: locale/model_attributes.rb:48 -msgid "RawEmail|Data text" -msgstr "RawEmail | Teksti i të dhënave" - #: app/views/comment/preview.rhtml:20 msgid "Re-edit this annotation" -msgstr "Ri edito këtë shënim" +msgstr "Re-edito këtë shënim" #: app/views/request/followup_preview.rhtml:49 msgid "Re-edit this message" -msgstr "Ri-edito këtë mesazh" +msgstr "Re-edito këtë mesazh" #: app/views/request/preview.rhtml:40 msgid "Re-edit this request" -msgstr "Ri-edito këtë kërkesë" +msgstr "Re-edito këtë kërkesë" #: app/views/general/search.rhtml:137 msgid "" -"Read about <a href=\"%s\">advanced search operators</a>, such as proximity " -"and wildcards." +"Read about <a href=\"{{advanced_search_url}}\">advanced search " +"operators</a>, such as proximity and wildcards." msgstr "" -"Lexo rreth <a href=\"%s\">kërkimit të avansuar të operatorëve</a> , të tilla" -" si afërsia dhe gjithëpërfshirëse." +"Lexo rreth <a href=\"{{advanced_search_url}}\">kërkimit të avansuar të " +"operatorëve</a> , të tilla si afërsia dhe gjithëpërfshirëse." -#: app/views/layouts/default.rhtml:112 +#: app/views/layouts/default.rhtml:93 msgid "Read blog" msgstr "Lexo blog-un" @@ -2158,11 +2334,15 @@ msgid "Read this before writing your {{info_request_law_used_full}} request" msgstr "" "Lexoni këtë para se të shkruani {{info_request_law_used_full}} kërkesën" +#: app/views/general/search.rhtml:150 +msgid "Received an error message, such as delivery failure." +msgstr "" + #: app/views/general/search.rhtml:42 msgid "Recently described results first" msgstr "Rezultatet e përshkruara së fundi radhiti të parat" -#: app/controllers/request_controller.rb:134 +#: app/controllers/request_controller.rb:139 msgid "Recently sent Freedom of Information requests" msgstr "Kërkesat për Informata zyrtare të dërguara së fundi" @@ -2170,15 +2350,15 @@ msgstr "Kërkesat për Informata zyrtare të dërguara së fundi" msgid "Recently sent requests" msgstr "Kërkesat e dërguara së fundi" -#: app/controllers/request_controller.rb:139 +#: app/controllers/request_controller.rb:144 msgid "Recently successful responses" -msgstr "Përgjegjet e marra së fundi" +msgstr "përgjigjet e marra së fundi" -#: app/models/info_request_event.rb:300 +#: app/models/info_request_event.rb:305 msgid "Refused" msgstr "Refuzuar" -#: app/models/info_request.rb:786 +#: app/models/info_request.rb:793 msgid "Refused." msgstr "Refuzuar." @@ -2200,11 +2380,11 @@ msgstr "Raporto abuzim" #: app/views/request/_after_actions.rhtml:37 msgid "Request an internal review" -msgstr "Kërko një rishikim intern" +msgstr "Kërko një rishqyrtim intern" #: app/views/request/_followup.rhtml:4 msgid "Request an internal review from" -msgstr "Kërko një rishikim intern prej" +msgstr "Kërko një rishqyrtim intern prej" #: app/views/request/hidden.rhtml:1 msgid "Request has been removed" @@ -2222,6 +2402,8 @@ msgid "" "Request to {{public_body_name}} by {{info_request_user}}. Annotated by " "{{event_comment_user}} on {{date}}." msgstr "" +"Kërkesë për {{public_body_name}} nga {{info_request_user}}. Shënuar nga " +"{{event_comment_user}} me {{date}}." #: app/views/request/_request_listing_single.rhtml:12 msgid "" @@ -2233,6 +2415,10 @@ msgstr "" msgid "Requested on {{date}}" msgstr "Kërkuar me {{date}}" +#: app/models/track_thing.rb:209 app/models/track_thing.rb:210 +msgid "Requests or responses matching '{{query}}'" +msgstr "" + #: app/views/request/upload_response.rhtml:11 msgid "Respond by email" msgstr "Përgjegju me email" @@ -2249,21 +2435,25 @@ msgstr "Përgjegju kërkesës për Informata Zyrtare" msgid "Respond using the web" msgstr "Përgjegju duke përdorur uebin" -#: app/views/request/show.rhtml:70 +#: app/views/general/search.rhtml:160 +msgid "Response from a public authority" +msgstr "" + +#: app/views/request/show.rhtml:77 msgid "Response to this request is <strong>delayed</strong>." msgstr "Përgjegja e kësaj kërkese është <strong>vonuar.</strong>" -#: app/views/request/show.rhtml:78 +#: app/views/request/show.rhtml:85 msgid "Response to this request is <strong>long overdue</strong>." msgstr "Përgjegja e kësaj kërkese është <strong>vonuar.</strong>" #: app/views/request/show_response.rhtml:64 msgid "Response to your request" -msgstr "Përgjegje për kërkesën tënde" +msgstr "përgjigje për kërkesën tënde" #: app/views/request/upload_response.rhtml:28 msgid "Response:" -msgstr "Përgjegja:" +msgstr "Përgjigja:" #: app/views/general/search.rhtml:9 msgid "Results page {{page_number}}" @@ -2273,9 +2463,9 @@ msgstr "Faqja e rezultateve {{page_number}}" msgid "Save" msgstr "Ruaj" -#: app/views/request/new.rhtml:31 app/views/layouts/default.rhtml:99 #: app/views/general/exception_caught.rhtml:10 #: app/views/general/frontpage.rhtml:16 app/views/general/search.rhtml:29 +#: app/views/layouts/default.rhtml:80 app/views/request/new.rhtml:31 msgid "Search" msgstr "Kërko" @@ -2288,7 +2478,7 @@ msgstr "" msgid "Search the site to find what you were looking for." msgstr "Kërko në këtë ueb sajt për të gjetur atë që ti po kërkon." -#: app/controllers/user_controller.rb:330 +#: app/controllers/user_controller.rb:331 msgid "Send a message to " msgstr "Dërgo mesazh te " @@ -2298,7 +2488,7 @@ msgstr "" #: app/views/request/_followup.rhtml:10 msgid "Send a public reply to" -msgstr "Dërgo përgjegje publike te" +msgstr "Dërgo përgjigje publike te" #: app/views/request/_correspondence.rhtml:58 msgid "Send follow up" @@ -2310,7 +2500,7 @@ msgstr "Dërgo mesazh" #: app/views/user/show.rhtml:69 msgid "Send message to " -msgstr "Dërgo mesazh te" +msgstr "Dërgo mesazh te " #: app/views/request/preview.rhtml:41 msgid "Send public " @@ -2326,9 +2516,9 @@ msgstr "Emri i shkurtë është i zënë" #: app/views/general/search.rhtml:38 msgid "Show most relevant results first" -msgstr "Shfaqi rezultatet më të rëndësishme" +msgstr "Shfaqi rezultatet më relevante" -#: app/views/request/list.rhtml:2 app/views/public_body/list.rhtml:3 +#: app/views/public_body/list.rhtml:3 app/views/request/list.rhtml:2 msgid "Show only..." msgstr "Shfaq vetëm..." @@ -2340,11 +2530,11 @@ msgstr "Kyçu" msgid "Sign in or make a new account" msgstr "Kyçu ose krijo një llogari të re" -#: app/views/layouts/default.rhtml:122 +#: app/views/layouts/default.rhtml:103 msgid "Sign in or sign up" msgstr "Kyçu ose Ç'kyçu" -#: app/views/layouts/default.rhtml:119 +#: app/views/layouts/default.rhtml:100 msgid "Sign out" msgstr "Ç'kyçu" @@ -2356,10 +2546,14 @@ msgstr "Regjistrohu" msgid "Similar requests" msgstr "Kërkesa të ngjashme" -#: app/models/info_request_event.rb:302 +#: app/models/info_request_event.rb:307 msgid "Some information sent" msgstr "Disa informata janë dërguar" +#: app/views/general/search.rhtml:145 +msgid "Some of the information requested has been received" +msgstr "" + #: app/views/request_game/play.rhtml:31 msgid "" "Some people who've made requests haven't let us know whether they were\n" @@ -2367,14 +2561,18 @@ msgid "" "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 "" +"Disa individë që kanë bërë kërkesa nuk kanë treguar se a ishin ato të " +"sukseshme apo jo. Kemi nevojë për ndihmën <strong>tënde</strong> - përzgjedh" +" një nga këto kërkesa, lexo atë, dhe njofto të tjerët se a u ofruan " +"informatat e kërkuara. Të gjithë do të jenë shumë mirënjohës për këtë." #: app/views/user_mailer/changeemail_already_used.rhtml:1 msgid "" "Someone, perhaps you, just tried to change their email address on\n" -"WhatDoTheyKnow.com from " +"{{site_name}} from {{old_email}} to {{new_email}}." msgstr "" -"Dikush, ndoshta ti, u përpoq të ndryshojë adresën e emailit në " -"InformataZyrtare.org nga" +"Dikush, ndoshta ti, u përpoq të ndryshojë adresën e emailit në\n" +"{{site_name}} prej {{old_email}} në {{new_email}}." #: app/views/general/exception_caught.rhtml:1 msgid "Sorry, we couldn't find that page" @@ -2386,10 +2584,10 @@ msgstr "Shënim të veçantë për këtë autoritet!" #: app/views/request/_other_describe_state.rhtml:21 msgid "Still awaiting an <strong>internal review</strong>" -msgstr "Ende në pritje të <strong>shqyrtimit të brendshëm</strong>" +msgstr "Ende në pritje të <strong>rishqyrtimit intern</strong>" -#: app/views/request/preview.rhtml:18 #: app/views/request/followup_preview.rhtml:23 +#: app/views/request/preview.rhtml:18 msgid "Subject:" msgstr "Lënda:" @@ -2407,9 +2605,9 @@ msgstr "Kërkesat e suksesshme për Informata Zyrtare" #: app/views/request/list.rhtml:5 msgid "Successful responses" -msgstr "Përgjegjet e suksesshme" +msgstr "përgjigjet e suksesshme" -#: app/models/info_request.rb:790 +#: app/models/info_request.rb:797 msgid "Successful." msgstr "Suksesshme." @@ -2433,7 +2631,7 @@ msgstr "Tabela e statuseve" msgid "Tags:" msgstr "Etiketat:" -#: app/controllers/request_game_controller.rb:50 +#: app/controllers/request_game_controller.rb:52 msgid "Thank you for helping us keep the site tidy!" msgstr "" @@ -2441,28 +2639,28 @@ msgstr "" msgid "Thank you for making an annotation!" msgstr "Faleminderit që keni bërë një shënim!" -#: app/controllers/request_controller.rb:729 +#: app/controllers/request_controller.rb:736 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 "" "Faleminderit që i jeni përgjegjur kësaj kërkese për informata zyrtare. " -"Përgjegja yte është publikuar më poshtë, si dhe linku për përgjegjen tënde i" +"Përgjegja yte është publikuar më poshtë, si dhe vegza për përgjigjen tënde i" " është derguar me email " -#: app/controllers/request_controller.rb:373 +#: app/controllers/request_controller.rb:378 msgid "" "Thank you for updating the status of the request '<a " -"href=\"%s\">{{info_request_title}}</a>'. There are some more requests below " -"for you to classify." +"href=\"{{url}}\">{{info_request_title}}</a>'. There are some more requests " +"below for you to classify." msgstr "" -#: app/controllers/request_controller.rb:376 +#: app/controllers/request_controller.rb:381 msgid "Thank you for updating this request!" msgstr "Faleminderit për aktualizimin e kësaj kërkese!" -#: app/controllers/user_controller.rb:397 -#: app/controllers/user_controller.rb:413 +#: app/controllers/user_controller.rb:398 +#: app/controllers/user_controller.rb:414 msgid "Thank you for updating your profile photo" msgstr "Faleminderit për aktualizimin e fotografisë e profilit tënd" @@ -2471,6 +2669,9 @@ 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 "" +"Faleminderit për ndihmë - ndihma yte do ta bëjë më të lehtë që të tjerët të " +"gjejnë kërkesat e suksesshme, e ndoshta edhe të na mundesojë krijim e " +"ranglistave..." #: app/views/user/show.rhtml:20 msgid "" @@ -2478,6 +2679,8 @@ msgid "" " also, if you need it, give advice on what to do next about your\n" " requests." msgstr "" +"Shumë faleminderit - kjo do të ndihmojë të tjerët të gjejnë gjëra të dobishme. \n" +"Ne gjithashtu mund të ndihmojmë, nëse ke nevojë, me këshilla si të veproni në vijim me kërkesat tuaja." #: app/views/request/new_please_describe.rhtml:20 msgid "" @@ -2485,23 +2688,29 @@ msgid "" " We'll also, if you need it, give you advice on what to do next about each of your\n" " requests." msgstr "" +"Shumë faleminderit për ndihmën për të mbajtur të tërat të " +"<strong>organizuara dhe në rregull</strong>. Ne gjithashtu mund të " +"ndihmojmë, nëse ke nevojë, me këshilla si të veproni në vijim me kërkesat " +"tuaja." -#: app/controllers/user_controller.rb:188 +#: app/controllers/user_controller.rb:189 msgid "" "That doesn't look like a valid email address. Please check you have typed it" " correctly." msgstr "" +"Kjo nuk duket si një email adresë e vlefshme. Të lutem kontrollo që e ke " +"shtypur të saktë." #: app/views/request/_describe_state.rhtml:47 #: app/views/request/_other_describe_state.rhtml:43 msgid "The <strong>review has finished</strong> and overall:" -msgstr "" +msgstr "<strong>Rishqyrtimi ka përfunduar</strong> dhe përfundimi është:" #: app/views/request/new.rhtml:62 msgid "The Freedom of Information Act <strong>does not apply</strong> to" msgstr "Kërkesa për <strong>Informata Zyrtare</strong> nuk aplikohet te:" -#: app/views/user_mailer/changeemail_already_used.rhtml:7 +#: app/views/user_mailer/changeemail_already_used.rhtml:8 msgid "The accounts have been left as they previously were." msgstr "Llogaritë janë lënë siq kanë qenë më përpara." @@ -2527,7 +2736,7 @@ msgstr "" " jo vetëm një adresë te emailit, që ajo të jetë një kërkesë e vlefshme për " "informatë zyrtare" -#: app/views/request/show.rhtml:102 +#: app/views/request/show.rhtml:109 msgid "" "The authority would like to / has <strong>responded by post</strong> to this" " request." @@ -2557,32 +2766,48 @@ msgstr "" "Kjo faqe ose nuk ekziston, ose është prishur. Gjërat që mund t'i provosh " "tani:" +#: app/views/general/search.rhtml:143 +msgid "The public authority does not have the information requested" +msgstr "" + +#: app/views/general/search.rhtml:147 +msgid "The public authority would like part of the request explained" +msgstr "" + +#: app/views/general/search.rhtml:148 +msgid "The public authority would like to / has responded by post" +msgstr "" + #: app/views/request/_other_describe_state.rhtml:60 msgid "The request has been <strong>refused</strong>" msgstr "Kërkesa është <strong>refuzuar</strong>" -#: app/controllers/request_controller.rb:347 +#: app/controllers/request_controller.rb:352 msgid "" "The request has been updated since you originally loaded this page. Please " "check for any new incoming messages below, and try again." msgstr "" -#: app/views/request/show.rhtml:97 +#: app/views/request/show.rhtml:104 msgid "The request is <strong>waiting for clarification</strong>." msgstr "Kërkesa është në <strong>pritje për sqarim</strong>." -#: app/views/request/show.rhtml:90 +#: app/views/request/show.rhtml:97 msgid "The request was <strong>partially successful</strong>." msgstr "Kërkesa ishte <strong>pjesërisht e suksesshme</strong>." -#: app/views/request/show.rhtml:86 +#: app/views/request/show.rhtml:93 msgid "The request was <strong>refused</strong> by" msgstr "Kërkesa u <strong>refuzua</strong> nga" -#: app/views/request/show.rhtml:88 +#: app/views/request/show.rhtml:95 msgid "The request was <strong>successful</strong>." msgstr "Kërkesa ishte e <strong>suksesshme</strong>." +#: app/views/general/search.rhtml:144 +msgid "The request was refused by the public authority" +msgstr "Kërkesa u refuzua nga autoriteti publik" + #: app/views/request/hidden.rhtml:9 msgid "" "The request you have tried to view has been removed. There are\n" @@ -2594,91 +2819,125 @@ msgstr "" "më specifik. Të lutem të <a href=\"%s\">na kontakton</a> nëse ke ndonjë " "pyetje." -#: app/views/request/_followup.rhtml:35 +#: app/views/general/search.rhtml:152 +msgid "The requester has abandoned this request for some reason" +msgstr "" + +#: app/views/request/_followup.rhtml:32 msgid "" "The response to your request has been <strong>delayed</strong>. You can say that, \n" " by law, the authority should normally have responded\n" " <strong>promptly</strong> and" msgstr "" +"Përgjegja në kërkesën tënde është e <strong>vonuar</strong>. Mund të thuhet që,\n" +"sipas ligjit, autoriteti ishte dashtë të përgjigjet në \n" +"<strong>afat</strong> të paraparë dhe " -#: app/views/request/_followup.rhtml:47 +#: app/views/request/_followup.rhtml:44 msgid "" "The response to your request is <strong>long overdue</strong>. You can say that, by \n" " law, under all circumstances, the authority should have responded\n" " by now" msgstr "" +"Përgjigja në kërkesën tënde është <strong>vonuar për së tepërmi</strong>. Mund të thuhet që,\n" +"sipas ligjit, duke i patur parasyesh të gjitha rrethanat, autoriteti ishte dashtë të përgjigjet \n" +"deri më tani" #: app/views/public_body/show.rhtml:100 msgid "" "The search index is currently offline, so we can't show the Freedom of " "Information requests that have been made to this authority." msgstr "" -"Indeksi i kërkimit aktualisht është i shkëputur, kështu që nuk mundë të " -"shfaq kërkesat e Informata zyrtare që kan të bëjnë me këtë autoritet" +"Indeksi i kërkimit aktualisht është i shkëputur, kështu që nuk mund të shfaq" +" kërkesat e Informata zyrtare që kan të bëjnë me këtë autoritet" #: app/views/user/show.rhtml:141 msgid "" "The search index is currently offline, so we can't show the Freedom of " "Information requests this person has made." msgstr "" +"Indeksi i kërkimit është jashtë funksioni, kështu që ne nuk mund t'i " +"tregojmë kërkesat për informata zyrtare që ky person ka bërë." -#: app/controllers/track_controller.rb:142 +#: app/controllers/track_controller.rb:144 msgid "Then you can cancel the alert." msgstr "Pastaj ti mund të anulon njoftimin." -#: app/controllers/track_controller.rb:172 +#: app/controllers/track_controller.rb:174 msgid "Then you can cancel the alerts." msgstr "Pastaj ti mund të anulon njoftimet." -#: app/controllers/user_controller.rb:248 +#: app/controllers/user_controller.rb:249 msgid "Then you can change your email address used on {{site_name}}" msgstr "" "Pastaj ti mund të ndryshosh adresën tënde të emailit që përdoret në " "{{site_name}}" -#: app/controllers/user_controller.rb:202 +#: app/controllers/user_controller.rb:203 msgid "Then you can change your password on {{site_name}}" msgstr "" "Pastaj ti mund të ndryshosh fjalëkalimin tënd që përdoret në {{site_name}}" -#: app/controllers/request_controller.rb:333 +#: app/controllers/request_controller.rb:338 msgid "Then you can classify the FOI response you have got from " -msgstr "Pastaj ti mund të klasifikon përgjegjet e marra nga " +msgstr "Pastaj ti mund të klasifikon përgjigjet e marra nga " -#: app/controllers/request_game_controller.rb:39 +#: app/controllers/request_game_controller.rb:41 msgid "Then you can play the request categorisation game." msgstr "Pastaj ti mund të luash lojën për kategorizim të kërkesave." -#: app/controllers/user_controller.rb:329 +#: app/controllers/user_controller.rb:330 msgid "Then you can send a message to " msgstr "Pastaj ti mund të dërgon mesazh te " -#: app/controllers/user_controller.rb:513 +#: app/controllers/user_controller.rb:514 msgid "Then you can sign in to {{site_name}}" msgstr "Pastaj ti mund të kyçesh në {{site_name}}" -#: app/controllers/request_controller.rb:59 +#: app/controllers/request_controller.rb:61 msgid "Then you can update the status of your request to " msgstr "Pastaj ti mund të aktualizosh statusin e kërkesës tënde për " -#: app/controllers/request_controller.rb:695 +#: app/controllers/request_controller.rb:702 msgid "Then you can upload an FOI response. " msgstr "" -"Pastaj ti mund të ngarkon një përgjegje ndaj kërkesës për informata zyrtare." +"Pastaj ti mund të ngarkon një përgjigje ndaj kërkesës për informata zyrtare." -#: app/controllers/request_controller.rb:538 +#: app/controllers/request_controller.rb:545 msgid "Then you can write follow up message to " msgstr "" -#: app/controllers/request_controller.rb:539 +#: app/controllers/request_controller.rb:546 msgid "Then you can write your reply to " -msgstr "Pastaj ti mund të shkruash përgjegjen tënde për " +msgstr "Pastaj ti mund të shkruash përgjigjen tënde për " + +#: app/models/track_thing.rb:197 +msgid "" +"Then you will be emailed whenever '{{user_name}}' requests something or gets" +" a response." +msgstr "" + +#: app/models/track_thing.rb:213 +msgid "" +"Then you will be emailed whenever a new request or response matches " +"'{{query}}'." +msgstr "" #: app/models/track_thing.rb:162 msgid "Then you will be emailed whenever an FOI request succeeds." msgstr "" -#: app/controllers/request_controller.rb:294 +#: app/models/track_thing.rb:146 +msgid "Then you will be emailed whenever anyone makes a new FOI request." +msgstr "" + +#: app/models/track_thing.rb:181 +msgid "" +"Then you will be emailed whenever someone requests something or gets a " +"response from '{{public_body_name}}'." +msgstr "" + +#: app/controllers/request_controller.rb:299 msgid "Then your FOI request to {{public_body_name}} will be sent." msgstr "Pastaj kërkesa yte për " @@ -2692,27 +2951,29 @@ msgid "" " this link to see what they wrote." msgstr "" "Ka {{count}} shënime të reja në kërkesën tënde {{info_request}}. Ndiqni " -"këtë link për t'i parë ato." +"këtë vegzë për t'i parë ato." #: app/views/user/show.rhtml:4 msgid "" "There is <strong>more than one person</strong> who uses this site and has this name. \n" " One of them is shown below, you may mean a different one:" msgstr "" +"Ekziston <strong>më shumë se një individ</strong> i cili e përdor këtë ueb sajt dhe ka të njejtin emërtim.\n" +"Njëri prej tyre është listuar më poshtë, ti mund të kesh menduar për tjetër kend:" -#: app/views/request/show.rhtml:106 +#: app/views/request/show.rhtml:113 msgid "" "There was a <strong>delivery error</strong> or similar, which needs fixing " -"by the WhatDoTheyKnow team." +"by the {{site_name}} team." msgstr "" -#: app/controllers/public_body_controller.rb:76 +#: app/controllers/public_body_controller.rb:77 msgid "There was an error with the words you entered, please try again." msgstr "Kishte një gabim me fjalët që keni shtypur, të lutem provo përsëri." #: app/views/request/_describe_state.rhtml:38 msgid "They are going to reply <strong>by post</strong>" -msgstr "Ata do të përgjegjen <strong>me postë</strong>" +msgstr "Ata do të përgjigjen <strong>me postë</strong>" #: app/views/request/_describe_state.rhtml:52 msgid "" @@ -2749,8 +3010,8 @@ msgstr "Gjëra për të bërë me këtë kërkesë" #: app/views/public_body/show.rhtml:59 msgid "This authority no longer exists, so you cannot make a request to it." msgstr "" -"Ky autoritet nuk ekziston më, kështu që ju nuk mund të bëjni një kërkesë për" -" të." +"Ky autoritet nuk ekziston më, kështu që ju nuk mund të bëni një kërkesë për " +"të." #: app/views/request/_hidden_correspondence.rhtml:23 msgid "" @@ -2759,7 +3020,7 @@ msgid "" msgstr "" "Ky koment është fshehur. Shih shënimet për të gjetur pse. Nëse ti je " "kërkuesi, atëherë ti mund të <a href=\"%s\">kyçesh </a> për të parë " -"përgjegjen." +"përgjigjen." #: app/views/request/new.rhtml:65 msgid "" @@ -2781,7 +3042,7 @@ msgid "" "marked to no longer receive responses." msgstr "" "Kjo është për shkak se {{title}} është një kërkesë e vjetër që ka qenë e " -"shenjuar të mos marrë më përgjegje." +"shenjuar të mos marrë më përgjigje." #: app/views/track/_tracking_links.rhtml:9 msgid "" @@ -2789,7 +3050,7 @@ msgid "" "responses arrive." msgstr "" "Kjo është kërkesa yte, kështu që ti do të merr email automatikisht kur " -"përgjegjet e reja arrijnë." +"përgjigjet e reja arrijnë." #: app/views/request/_hidden_correspondence.rhtml:17 msgid "" @@ -2809,11 +3070,11 @@ msgstr "e këtij personi" msgid "This request <strong>requires administrator attention</strong>" msgstr "Kjo kërkesë <strong>kërkon vëmendje të administratorit</strong>" -#: app/views/request/show.rhtml:48 +#: app/views/request/show.rhtml:55 msgid "This request has an <strong>unknown status</strong>." msgstr "Kjo kërkesë ka <strong>status të panjohur</strong>." -#: app/views/request/show.rhtml:110 +#: app/views/request/show.rhtml:117 msgid "" "This request has been <strong>withdrawn</strong> by the person who made it. \n" " \t There may be an explanation in the correspondence below." @@ -2821,13 +3082,19 @@ msgstr "" "Kjo kërkesë është <strong>tërhequr</strong> nga personi që e bëri atë. » " "Mund të ketë një shpjegim në korrespondencën më poshtë." -#: app/views/request/show.rhtml:108 +#: app/models/info_request.rb:395 +msgid "" +"This request has been set by an administrator to \"allow new responses from " +"nobody\"" +msgstr "" + +#: app/views/request/show.rhtml:115 msgid "" "This request has had an unusual response, and <strong>requires " -"attention</strong> from the WhatDoTheyKnow team." +"attention</strong> from the {{site_name}} team." msgstr "" -"Kjo kërkesë ka pasë një përgjegje të pazakontë dhe <strong>kërkon " -"vëmendje</strong> nga ekipi i InformataZyrtare." +"Kjo kërkesë ka pasë një përgjigje të pazakontë dhe <strong>kërkon \"\n" +"\"vëmendje</strong> nga ekipi i {{site_name}}." #: app/views/request/show.rhtml:5 msgid "" @@ -2851,9 +3118,9 @@ 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 "" -"Kjo përgjegje është fshehur. Shih shënimet për të gjetur pse. Nëse ti je " +"Kjo përgjigje është fshehur. Shih shënimet për të kuptuar pse. Nëse ti je " "kërkuesi, atëherë ti mund të <a href=\"%s\">kyçesh</a> për të parë " -"përgjegjen." +"përgjigjen." #: app/views/request/new.rhtml:49 msgid "" @@ -2866,32 +3133,46 @@ msgstr "" #: app/views/request/details.rhtml:6 msgid "" "This table shows the technical details of the internal events that happened\n" -"to this request on WhatDoTheyKnow. This could be used to generate information about\n" +"to this request on {{site_name}}. This could be used to generate information about\n" "the speed with which authorities respond to requests, the number of requests\n" "which require a postal response and much more." msgstr "" #: app/views/user/show.rhtml:79 -msgid "This user has been banned from WhatDoTheyKnow.com " -msgstr "Ky përdorues është ndaluar (përjashtuar) nga InformataZyrtare.org" +msgid "This user has been banned from {{site_name}} " +msgstr "Ky përdorues është ndaluar (përjashtuar) nga {site_name}} " -#: app/views/user_mailer/changeemail_already_used.rhtml:4 +#: app/views/user_mailer/changeemail_already_used.rhtml:5 msgid "" "This was not possible because there is already an account using \n" -"the email address " +"the email address {{email}}." +msgstr "" +"Kjo nuk ishte e mundur sepse egziston një llogari duke\n" +"përdorur këtë adresë të emailit {{email}}." + +#: app/models/track_thing.rb:145 +msgid "To be emailed about any new requests" msgstr "" -"Kjo nuk ishte e mundur sepse egziston një llogari duke \n" -"përdorur këtë adresë të emailit." #: app/models/track_thing.rb:161 msgid "To be emailed about any successful requests" msgstr "" -#: app/controllers/track_controller.rb:171 +#: app/models/track_thing.rb:196 +msgid "To be emailed about requests by '{{user_name}}'" +msgstr "" + +#: app/models/track_thing.rb:180 +msgid "" +"To be emailed about requests made using {{site_name}} to the public " +"authority '{{public_body_name}}'" +msgstr "" + +#: app/controllers/track_controller.rb:173 msgid "To cancel these alerts" msgstr "Për të anuluar njoftimet" -#: app/controllers/track_controller.rb:141 +#: app/controllers/track_controller.rb:143 msgid "To cancel this alert" msgstr "Për të anuluar këtë njoftim" @@ -2903,13 +3184,13 @@ msgstr "" "Për të vazhduar, ti duhet të kyçesh ose të hapë një llogari. Për fat të keq," " ka pasur një problem teknik duke u përpjekur për të bërë këtë." -#: app/controllers/user_controller.rb:247 +#: app/controllers/user_controller.rb:248 msgid "To change your email address used on {{site_name}}" msgstr "Për të ndryshuar email adresën tënde të përdorur në {{site_name}}" -#: app/controllers/request_controller.rb:332 +#: app/controllers/request_controller.rb:337 msgid "To classify the response to this FOI request" -msgstr "Për të klasifikuar përgjegjen e kësaj kërkese për informata zyrtare" +msgstr "Për të klasifikuar përgjigjen e kësaj kërkese për informata zyrtare" #: app/views/request/show_response.rhtml:39 msgid "To do that please send a private email to " @@ -2917,7 +3198,11 @@ msgstr "Për të bërë këtë të lutem dërgoni një email privat te" #: app/views/request_mailer/not_clarified_alert.rhtml:2 msgid "To do this, first click on the link below." -msgstr "Për ta bërë këtë, së pari kliko në linkun më poshtë." +msgstr "Për ta bërë këtë, së pari kliko në vegzën më poshtë." + +#: app/models/track_thing.rb:212 +msgid "To follow requests and responses matching '{{query}}'" +msgstr "" #: app/views/request_mailer/old_unclassified_updated.rhtml:1 msgid "" @@ -2928,9 +3213,9 @@ msgstr "" #: app/views/request_mailer/new_response_reminder_alert.rhtml:1 msgid "To let us know, follow this link and then select the appropriate box." msgstr "" -"Që të na njoftoni, ndiqni këtë link dhe pastaj zgjedhni kutinë e duhur." +"Që të na njoftoni, ndiqni këtë vegzë dhe pastaj zgjedhni kutinë e duhur." -#: app/controllers/request_game_controller.rb:38 +#: app/controllers/request_game_controller.rb:40 msgid "To play the request categorisation game" msgstr "Për të luajtur në lojën e kategorizimit të kërkesave" @@ -2938,31 +3223,31 @@ msgstr "Për të luajtur në lojën e kategorizimit të kërkesave" msgid "To post your annotation" msgstr "Për të postuar shënimin tënd" -#: app/controllers/request_controller.rb:536 +#: app/controllers/request_controller.rb:543 msgid "To reply to " msgstr "Për t'iu përgjegjur " -#: app/controllers/request_controller.rb:535 +#: app/controllers/request_controller.rb:542 msgid "To send a follow up message to " msgstr "" -#: app/controllers/user_controller.rb:328 +#: app/controllers/user_controller.rb:329 msgid "To send a message to " msgstr "Për të dërguar mesazh te " -#: app/controllers/request_controller.rb:293 +#: app/controllers/request_controller.rb:298 msgid "To send your FOI request" msgstr "Për të dërguar kërkesën tënde për informata zyrtare" -#: app/controllers/request_controller.rb:58 +#: app/controllers/request_controller.rb:60 msgid "To update the status of this FOI request" msgstr "Për të aktualizuar statusin e kësaj kërkese për informata zyrtare" -#: app/controllers/request_controller.rb:694 +#: app/controllers/request_controller.rb:701 msgid "" "To upload a response, you must be logged in using an email address from " msgstr "" -"Të ngarkoni një përgjegje, ti duhet të kyçesh duke përdorur një email adresë" +"Të ngarkoni një përgjigje, ti duhet të kyçesh duke përdorur një email adresë" " nga " #: app/views/public_body/view_email_captcha.rhtml:5 @@ -2970,17 +3255,19 @@ msgid "" "To view the email address that we use to send FOI requests to " "{{public_body_name}}, please enter these words." msgstr "" +"Për të parë adresën e emailit që ne përdorim për të dërguar kërkesa për " +"informata zyrtare te {{public_body_name}}, të lutem shkruaj këto fjalë." #: app/views/request_mailer/new_response.rhtml:5 msgid "To view the response, click on the link below." -msgstr "Për të parë përgjegjen, kliko në linkun më poshtë." +msgstr "Për të parë përgjigjen, kliko në vegzën më poshtë." #: app/views/request/_request_listing_short_via_event.rhtml:9 msgid "To {{public_body_link_absolute}}" msgstr "Për {{public_body_link_absolute}}" -#: app/views/request/preview.rhtml:17 #: app/views/request/followup_preview.rhtml:22 app/views/request/new.rhtml:88 +#: app/views/request/preview.rhtml:17 msgid "To:" msgstr "Për:" @@ -2988,6 +3275,10 @@ msgstr "Për:" msgid "Track requests to {{public_body_name}} by email" msgstr "Përcjell kërkesat e bëra për {{public_body_name}} me email" +#: app/models/track_thing.rb:206 +msgid "Track things matching '{{query}}' by email" +msgstr "" + #: app/views/public_body/show.rhtml:3 msgid "Track this authority" msgstr "Përcjell këtë autoritet" @@ -2996,10 +3287,18 @@ msgstr "Përcjell këtë autoritet" msgid "Track this person" msgstr "Përcjell aktivitetin e këtij personi" +#: app/models/track_thing.rb:190 +msgid "Track this person by email" +msgstr "Përcjell aktivitetin e këtij personi me email" + #: app/views/request/_sidebar.rhtml:2 msgid "Track this request" msgstr "Përcjell këtë kërkesë" +#: app/models/track_thing.rb:123 +msgid "Track this request by email" +msgstr "Përcjell këtë kërkesë me email" + #: locale/model_attributes.rb:33 msgid "TrackThing|Track medium" msgstr "TrackThing |Track medium" @@ -3025,12 +3324,12 @@ msgid "URL name can't be blank" msgstr "URL emri nuk mund të jetë i zbrazët" #: app/models/user_mailer.rb:45 -msgid "Unable to change email address on WhatDoTheyKnow.com" -msgstr "E pamundur për të ndryshuar email adresën në InformataZyrtare.org" +msgid "Unable to change email address on {{site_name}}" +msgstr "E pamundur për të ndryshuar email adresën në {{site_name}}" #: app/views/request/followup_bad.rhtml:4 msgid "Unable to send a reply to {{username}}" -msgstr "Nuk munda të dërgoj përgjegje te {{username}}" +msgstr "Nuk munda të dërgoj përgjigje te {{username}}" #: app/views/request/followup_bad.rhtml:2 msgid "Unable to send follow up message to {{username}}" @@ -3038,11 +3337,11 @@ msgstr "Nuk munda të dërgoj një përcjellje te {{username}}" #: app/views/request/list.rhtml:29 msgid "Unexpected search result type" -msgstr "" +msgstr "Lloji i papritur i rezultatit të kërkuar" #: app/views/request/similar.rhtml:18 msgid "Unexpected search result type " -msgstr "" +msgstr "Lloji i papritur i rezultatit të kërkuar " #: app/views/user/wrong_user_unknown_email.rhtml:3 msgid "" @@ -3066,20 +3365,20 @@ msgstr "" msgid "Unknown" msgstr "I/e panjohur" -#: app/models/info_request_event.rb:312 +#: app/models/info_request_event.rb:317 msgid "Unusual response" -msgstr "Përgjegje e pazakonshme" +msgstr "përgjigje e pazakonshme" -#: app/models/info_request.rb:800 +#: app/models/info_request.rb:807 msgid "Unusual response." -msgstr "Përgjegje e pazakonshme." +msgstr "përgjigje e pazakonshme." #: app/views/request/_after_actions.rhtml:13 #: app/views/request/_after_actions.rhtml:33 msgid "Update the status of this request" msgstr "Aktualizo statusin e kësaj kërkese" -#: app/controllers/request_controller.rb:60 +#: app/controllers/request_controller.rb:62 msgid "Update the status of your request to " msgstr "Aktualizo statusin e kërkesës tënde për " @@ -3088,7 +3387,7 @@ msgid "" "Use OR (in capital letters) where you don't mind which word, e.g. " "<strong><code>commons OR lords</code></strong>" msgstr "" -"Përdor OSE (me shkronja kapitale), ku ju nuk jeni në dijeni për cilat fjalë " +"Përdor OSE (me shkronja të mëdha), ku ju nuk jeni në dijeni për cilat fjalë " "bëhet fjalë, p.sh. <code><strong>të përbashkëta ose të " "mdhaja</strong></code>" @@ -3097,50 +3396,50 @@ msgid "" "Use quotes when you want to find an exact phrase, e.g. " "<strong><code>\"Liverpool City Council\"</code></strong>" msgstr "" -"Përdor kuotat (thonjëzat \"\") kur ti dëshiron të gjeshë një fjalë ekzakte, " +"Përdor thonjëzat (\" \") kur ti dëshiron të gjeshë një fjalë ekzakte, " "p.sh.<code><strong>\"Ministria e Arsimit\"</strong></code>" -#: locale/model_attributes.rb:68 +#: locale/model_attributes.rb:67 msgid "UserInfoRequestSentAlert|Alert type" msgstr "UserInfoRequestSentAlert|Alert type" -#: locale/model_attributes.rb:79 +#: locale/model_attributes.rb:78 msgid "User|About me" msgstr "Përdoruesi |Rreth meje" -#: locale/model_attributes.rb:77 +#: locale/model_attributes.rb:76 msgid "User|Admin level" msgstr "Përdoruesi | Niveli i Administrimit" -#: locale/model_attributes.rb:78 +#: locale/model_attributes.rb:77 msgid "User|Ban text" msgstr "Përdoruesi |Tekst i ndaluar" -#: locale/model_attributes.rb:70 +#: locale/model_attributes.rb:69 msgid "User|Email" msgstr "Përdoruesi |Email" -#: locale/model_attributes.rb:74 +#: locale/model_attributes.rb:73 msgid "User|Email confirmed" msgstr "Përdoruesi|Emaili u konfirmua" -#: locale/model_attributes.rb:72 +#: locale/model_attributes.rb:71 msgid "User|Hashed password" msgstr "User|Hashed password" -#: locale/model_attributes.rb:76 +#: locale/model_attributes.rb:75 msgid "User|Last daily track email" msgstr "User|Last daily track email" -#: locale/model_attributes.rb:71 +#: locale/model_attributes.rb:70 msgid "User|Name" msgstr "Përdoruesi|Emri" -#: locale/model_attributes.rb:73 +#: locale/model_attributes.rb:72 msgid "User|Salt" msgstr "User|Salt" -#: locale/model_attributes.rb:75 +#: locale/model_attributes.rb:74 msgid "User|Url name" msgstr "Përdoruesi | Emri Url" @@ -3158,10 +3457,10 @@ msgid "View FOI email address for {{public_body_name}}" msgstr "Shiko adresën e emailit për Informatë Zyrtare {{public_body_name}}" #: app/views/contact_mailer/user_message.rhtml:10 -msgid "View Freedom of Information requests made by" -msgstr "Shiko kërkesat për informata zyrtare të bëra nga" +msgid "View Freedom of Information requests made by {{user_name}}:" +msgstr "Shiko kërkesat për informata zyrtare të bëra nga {{user_name}}: " -#: app/views/layouts/default.rhtml:108 +#: app/views/layouts/default.rhtml:89 msgid "View authorities" msgstr "Shiko autoritetet" @@ -3169,19 +3468,31 @@ msgstr "Shiko autoritetet" msgid "View email" msgstr "Shiko adresën e emailit" -#: app/views/layouts/default.rhtml:107 +#: app/views/layouts/default.rhtml:88 msgid "View requests" msgstr "Shiko kërkesat" -#: app/models/info_request.rb:792 +#: app/models/info_request.rb:799 msgid "Waiting clarification." msgstr "Duke pritur sqarim." -#: app/views/request/show.rhtml:104 +#: app/views/request/show.rhtml:111 msgid "" "Waiting for an <strong>internal review</strong> by {{public_body_link}} of " "their handling of this request." msgstr "" +"Duke pritur për <strong>rishqyrtim intern</strong> nga {{public_body_link}} " +"për trajtimin e kësaj kërkese." + +#: app/views/general/search.rhtml:149 +msgid "" +"Waiting for the public authority to complete an internal review of their " +"handling of the request" +msgstr "" + +#: app/views/general/search.rhtml:142 +msgid "Waiting for the public authority to reply" +msgstr "" #: app/views/public_body/view_email.rhtml:17 msgid "We do not have a working request email address for this authority." @@ -3198,7 +3509,7 @@ 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=\"%s\">sign in</a> and let everyone know." +"\tif you are {{user_link}} please <a href=\"{{url}}\">sign in</a> and let everyone know." msgstr "" #: app/views/user_mailer/confirm_login.rhtml:8 @@ -3209,7 +3520,7 @@ msgstr "" "Ne nuk do ta zbulojmë adresën e emailit tënd askujt, përveç nëse ju e lejoni" " këtë." -#: app/views/user_mailer/changeemail_confirm.rhtml:9 +#: app/views/user_mailer/changeemail_confirm.rhtml:10 msgid "" "We will not reveal your email addresses to anybody unless you\n" "or the law tell us to." @@ -3217,13 +3528,13 @@ msgstr "" "Ne nuk do ta zbulojmë adresën e emailit tënd askujt, përveç nëse ju e lejoni" " këtë." -#: app/views/request/show.rhtml:54 +#: app/views/request/show.rhtml:61 msgid "We're waiting for" msgstr "Po presim për" -#: app/views/request/show.rhtml:50 +#: app/views/request/show.rhtml:57 msgid "We're waiting for someone to read" -msgstr "" +msgstr "Jemi në pritje që dikush ta lexoj" #: app/views/user/signchangeemail_confirm.rhtml:6 msgid "" @@ -3231,25 +3542,25 @@ msgid "" "it before your email address will be changed." msgstr "" "Ne të kemi dërguar një email të ri në adresën e emailit tënd. Ti duhet të " -"klikosh në linkun në te para se adresa e emailit tënd do të ndryshohet." +"klikosh në vegzën në te para se adresa e emailit tënd do të ndryshohet." #: app/views/user/confirm.rhtml:6 msgid "" "We've sent you an email, and you'll need to click the link in it before you can\n" "continue." msgstr "" -"Ne të kemi dërguar një email, ti duhet të klikosh në linkun në te para se të" -" mund të vazhdojë." +"Ne të kemi dërguar një email, ti duhet të klikosh në vegzën në te para se të" +" mund të vazhdosh." #: app/views/user/signchangepassword_confirm.rhtml:6 msgid "" "We've sent you an email, click the link in it, then you can change your " "password." msgstr "" -"Ne të kemi dërguar një email, kliko në linkun në te që të ti mund të " -"ndryshon fjalëkalimin tënd." +"Ne të kemi dërguar një email, kliko në vegzën në te që të mund të ndryshon " +"fjalëkalimin tënd." -#: app/views/request/_followup.rhtml:61 +#: app/views/request/_followup.rhtml:58 msgid "What are you doing?" msgstr "Çfarë je duke bërë?" @@ -3257,26 +3568,20 @@ msgstr "Çfarë je duke bërë?" msgid "What best describes the status of this request now?" msgstr "Çfarë përshkruan më së miri statusin e kësaj kërkese tani?" -#: app/views/public_body/view_email.rhtml:7 -msgid "" -"WhatDoTheyKnow sends new requests to <strong>{{request_email}}</strong> for " -"this authority." -msgstr "" -"InformataZyrtare.org dërgon kërkesa të reja për " -"<strong>{{request_email}}</strong> për këtë autoritet." - #: app/views/request_mailer/new_response.rhtml:9 msgid "" "When you get there, please update the status to say if the response \n" "contains any useful information." msgstr "" +"Kur të gjendesh atje, të lutem aktualizo statusin e kërkesës që të tregosh nëse pergjegja ka \n" +"informata të dobishme." #: app/views/request/show_response.rhtml:44 msgid "" "When you receive the paper response, please help\n" " others find out what it says:" msgstr "" -"Kur të marrësh përgjegjen në letër, të lutem i ndihmoni të tjerët të gjejnë " +"Kur të marrësh përgjigjen në letër, të lutem i ndihmoni të tjerët të gjejnë " "se çfarë thotë në te:" #: app/views/request/new_please_describe.rhtml:16 @@ -3291,50 +3596,71 @@ msgstr "" msgid "Which of these is happening?" msgstr "Cila nga këto po ndodh?" -#: app/models/info_request_event.rb:308 +#: app/models/info_request_event.rb:313 msgid "Withdrawn by requester" msgstr "E tërhequr nga kërkuesi" -#: app/models/info_request.rb:802 +#: app/models/info_request.rb:809 msgid "Withdrawn by the requester." msgstr "E tërhequr nga kërkuesi." -#: app/controllers/request_controller.rb:542 +#: app/controllers/request_controller.rb:549 msgid "Write a reply to " -msgstr "Shkruaj një përgjegje për " +msgstr "Shkruaj një përgjigje për " -#: app/controllers/request_controller.rb:541 +#: app/controllers/request_controller.rb:548 msgid "Write your FOI follow up message to " msgstr "" #: app/views/request/new.rhtml:46 msgid "Write your request in <strong>simple, precise language</strong>." msgstr "" +"Shkruaje kërkesën tënde me <strong>gjuhë të thjeshtë, dhe të saktë</strong>." -#: app/models/info_request_event.rb:296 +#: app/models/info_request_event.rb:301 msgid "Wrong Response" -msgstr "Përgjegje e gabuar." +msgstr "përgjigje e gabuar." #: app/views/comment/_single_comment.rhtml:10 msgid "You" msgstr "Ti" -#: app/controllers/track_controller.rb:96 +#: app/controllers/track_controller.rb:98 msgid "You are already being emailed updates about " msgstr "" +#: app/models/track_thing.rb:175 +msgid "You are already tracking requests to {{public_body_name}} by email" +msgstr "" + +#: app/models/track_thing.rb:207 +msgid "You are already tracking things matching '{{query}}' by email" +msgstr "" + +#: app/models/track_thing.rb:191 +msgid "You are already tracking this person by email" +msgstr "" + +#: app/models/track_thing.rb:124 +msgid "You are already tracking this request by email" +msgstr "" + #: app/models/track_thing.rb:156 msgid "You are being emailed about any new successful responses" -msgstr "Ti je duke pranuar me email çdo përgjegje të re të suksesshme" +msgstr "Ti je duke pranuar me email çdo përgjigje të re të suksesshme" + +#: app/models/track_thing.rb:140 +msgid "You are being emailed when there are new requests" +msgstr "" -#: app/views/request/show.rhtml:81 +#: app/views/request/show.rhtml:88 msgid "You can <strong>complain</strong> by" msgstr "Ti mund të <strong>ankohesh</strong> duke" -#: app/views/request/details.rhtml:57 +#: app/views/request/details.rhtml:58 msgid "" "You can get this page in computer-readable format as part of the main JSON\n" -"page for the request. See the <a href=\"%s\">API documentation</a>." +"page for the request. See the <a href=\"{{api_path}}\">API documentation</a>." msgstr "" #: app/views/public_body/show.rhtml:40 @@ -3350,20 +3676,20 @@ msgstr "Ti ke" #: app/views/request_mailer/new_response.rhtml:1 msgid "You have a new response to the {{law_used_full}} request " -msgstr "Ti ke një përgjegje të re për kërkesën {{law_used_full}}" +msgstr "Ti ke një përgjigje të re për kërkesën {{law_used_full}}" -#: app/controllers/user_controller.rb:491 +#: app/controllers/user_controller.rb:492 msgid "You have now changed the text about you on your profile." msgstr "" -#: app/controllers/user_controller.rb:309 +#: app/controllers/user_controller.rb:310 msgid "You have now changed your email address used on {{site_name}}" msgstr "" "Tash ke ndryshuar adresën tënde të emailit që përdoret në {{site_name}}" #: app/views/user_mailer/already_registered.rhtml:3 msgid "" -"You just tried to sign up to WhatDoTheyKnow.com, when you\n" +"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" @@ -3381,6 +3707,8 @@ 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 "" +"Ti mund të <strong>bashkangjitë shtojca (attachments).</strong>. Nëse dëshiron të bashkangjet një\n" +"fajll tepër të madh për email format, përdor formularin e mëposhtëm." #: app/views/request/followup_bad.rhtml:24 msgid "" @@ -3388,6 +3716,9 @@ msgid "" " 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 "" +"Ti ke mundësi të gjejsh atë\n" +" në ueb sajtin e tyre, ose duke iu telefonuar. Nëse keni arritur të gjeni adresën,\n" +" atëherë të lutem <a href=\"%s\">na e dërgo të njejtën</a>." #: app/views/request/new_bad_contact.rhtml:6 msgid "" @@ -3395,22 +3726,25 @@ msgid "" "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 "" +"Ti ke mundësi të gjejsh atë\n" +"në ueb sajtin e tyre, ose duke iu telefonuar. Nëse keni arritur të gjeni adresën,\n" +"atëherë të lutem <a href=\"%s\">na e dërgo të njejtën</a>." -#: app/controllers/user_controller.rb:469 +#: app/controllers/user_controller.rb:470 msgid "You need to be logged in to change the text about you on your profile." msgstr "" -#: app/controllers/user_controller.rb:370 +#: app/controllers/user_controller.rb:371 msgid "You need to be logged in to change your profile photo." msgstr "Ti duhet të jesh i kyçur që të ndryshosh fotografinë e profilit tënd." -#: app/controllers/user_controller.rb:432 +#: app/controllers/user_controller.rb:433 msgid "You need to be logged in to clear your profile photo." msgstr "" "Ti duhet të jesh i kyçur për të larguar (fshirë) fotografinë e profilit " "tënd." -#: app/controllers/request_controller.rb:552 +#: app/controllers/request_controller.rb:559 msgid "" "You previously submitted that exact follow up message for this request." msgstr "" @@ -3435,15 +3769,15 @@ msgid "" "email alerts." msgstr "" -#: app/controllers/track_controller.rb:152 +#: app/controllers/track_controller.rb:154 msgid "You will no longer be emailed updates about " msgstr "" -#: app/controllers/track_controller.rb:181 +#: app/controllers/track_controller.rb:183 msgid "You will no longer be emailed updates for those alerts" msgstr "Ti nuk të merr më aktualizime me email për këto njoftime " -#: app/controllers/track_controller.rb:109 +#: app/controllers/track_controller.rb:111 msgid "You will now be emailed updates about " msgstr "" @@ -3452,9 +3786,9 @@ msgid "" "You will only get an answer to your request if you follow up\n" "with the clarification." msgstr "" -"Ti do të merr përgjegje në kërkesën tënde vetëm në qoftë se e sqaroni ate." +"Ti do të merr përgjigje në kërkesën tënde vetëm në qoftë se e sqaroni atë." -#: app/controllers/user_controller.rb:441 +#: app/controllers/user_controller.rb:442 msgid "You've now cleared your profile photo" msgstr "Ke pastruar fotografinë e profilit tënd" @@ -3477,9 +3811,8 @@ msgid "" "message, which will then go directly to the person who wrote the message." msgstr "" -#: app/views/user/_signin.rhtml:11 +#: app/views/user/_signin.rhtml:11 app/views/user/_signup.rhtml:9 #: app/views/user/signchangepassword_send_confirm.rhtml:13 -#: app/views/user/_signup.rhtml:9 msgid "Your e-mail:" msgstr "Adresa e emailit tënd:" @@ -3487,32 +3820,32 @@ msgstr "Adresa e emailit tënd:" msgid "Your email subscriptions" msgstr "Email abonimet e tua" -#: app/controllers/request_controller.rb:549 +#: app/controllers/request_controller.rb:556 msgid "" "Your follow up has not been sent because this request has been stopped to " "prevent spam. Please <a href=\"%s\">contact us</a> if you really want to " "send a follow up message." msgstr "" -#: app/controllers/request_controller.rb:577 +#: app/controllers/request_controller.rb:584 msgid "Your follow up message has been sent on its way." msgstr "" -#: app/controllers/request_controller.rb:575 +#: app/controllers/request_controller.rb:582 msgid "Your internal review request has been sent on its way." -msgstr "Kërkesa për shqyrtim të brendshëm është dërguar." +msgstr "Kërkesa për rishqyrtim intern është dërguar." -#: app/controllers/help_controller.rb:61 +#: app/controllers/help_controller.rb:63 msgid "" "Your message has been sent. Thank you for getting in touch! We'll get back " "to you soon." msgstr "" -"Mesazhi yt u dërgua. Faleminderit që na kontaktuat! Ne do t'ju përgjegjemi " +"Mesazhi yt u dërgua. Faleminderit që na kontaktuat! Ne do t'ju përgjigjemi " "së shpejti." -#: app/controllers/user_controller.rb:348 +#: app/controllers/user_controller.rb:349 msgid "Your message to {{recipient_user_name}} has been sent!" -msgstr "Mesazhi yt për {{recipient_user_name}} është dërguar!" +msgstr "Mesazhi yt për {{recipient_user_name}} është dërguar!" #: app/views/request/followup_preview.rhtml:15 msgid "Your message will appear in <strong>search engines</strong>" @@ -3532,7 +3865,7 @@ msgid "" "Your name, request and any responses will appear in <strong>search engines</strong>\n" " (<a href=\"%s\">details</a>)." msgstr "" -"Emrin yt, kërkesa dhe çdo përgjegje do të shfaqen në <strong>kërkuesit e " +"Emrin yt, kërkesa dhe çdo përgjigje do të shfaqen në <strong>kërkuesit e " "internetit (p.sh. Google)</strong> ( <a href=\"%s\">detaje</a> )." #: app/views/user/_signup.rhtml:18 @@ -3543,7 +3876,7 @@ msgstr "Emri yt:" msgid "Your original message is attached." msgstr "Mesazhi yt origjinal është i bashkangjitur." -#: app/controllers/user_controller.rb:230 +#: app/controllers/user_controller.rb:231 msgid "Your password has been changed." msgstr "Fjalëkalimi yt është ndryshuar." @@ -3554,16 +3887,18 @@ msgstr "Fjalëkalimi yt:" #: app/views/user/set_draft_profile_photo.rhtml:18 msgid "" "Your photo will be shown in public <strong>on the Internet</strong>, \n" -" wherever you do something on WhatDoTheyKnow." +" wherever you do something on {{site_name}}." msgstr "" -"Fotografia yte do të shfaqet në publikisht <strong>në internet,</strong> " -"kurdo që të bëni diçka në InformataZyrtare." +"Fotografia yte do të shfaqet në publikisht <strong>në internet</strong>,\n" +" kurdo që të bëni diçka në {{site_name}}." #: app/views/request_mailer/new_response_reminder_alert.rhtml:5 msgid "" "Your request was called {{info_request}}. Letting everyone know whether you " "got the information will help us keep tabs on" msgstr "" +"Kërkesa yte qe emëruar {{info_request}}. Nëse i lejoni të tjerër ta dijnë a " +"i keni marrë informatat në pergjigje, do të na mundësoni ta mbikqyrim " #: app/views/request/new.rhtml:109 msgid "Your request:" @@ -3575,15 +3910,19 @@ msgid "" "href=\"%s\">read why</a> and answers to other questions." msgstr "" "Përgjegja yte do të <strong>shfaqet në internet,</strong> <a " -"href=\"%s\">lexoni pse</a> dhe përgjegjet për pyetje të tjera." +"href=\"%s\">lexoni pse</a> dhe përgjigjet për pyetje të tjera." #: app/views/comment/new.rhtml:62 msgid "" -"Your thoughts on what the WhatDoTheyKnow <strong>administrators</strong> " +"Your thoughts on what the {{site_name}} <strong>administrators</strong> " "should do about the request." msgstr "" -"Mendimet tua se çfare duhet <strong>administratorët e</strong> " -"InformataZyrtare.org bërë me kërkesën." +"Mendimet tua se çfare duhet <strong>administratorët e</strong> \n" +"{{site_name}} bërë me kërkesën." + +#: app/models/track_mailer.rb:25 +msgid "Your {{site_name}} email alert" +msgstr "" #: app/models/outgoing_message.rb:69 msgid "Yours faithfully," @@ -3613,19 +3952,19 @@ msgstr "i quajtur edhe {{public_body_short_name}}" msgid "and sign in as " msgstr "dhe kyçu si" -#: app/views/request/show.rhtml:52 +#: app/views/request/show.rhtml:59 msgid "" "and update the status accordingly. Perhaps <strong>you</strong> might like " "to help out by doing that?" msgstr "" -#: app/views/request/show.rhtml:57 +#: app/views/request/show.rhtml:64 msgid "and update the status." msgstr "dhe aktualizo statusin." #: app/views/request/_describe_state.rhtml:101 msgid "and we'll suggest <strong>what to do next</strong>" -msgstr "" +msgstr "dhe ne do të sugjerojmë <strong>çfarë të bëjë pastaj</strong>" #: app/views/user/show.rhtml:153 msgid "annotation" @@ -3635,19 +3974,27 @@ msgstr "shënim" msgid "annotations" msgstr "shënimet" +#: app/models/track_thing.rb:138 +msgid "any <a href=\"/list\">new requests</a>" +msgstr "" + +#: app/models/track_thing.rb:154 +msgid "any <a href=\"/list/successful\">successful requests</a>" +msgstr "" + #: app/views/request_mailer/very_overdue_alert.rhtml:1 msgid "are long overdue." msgstr "janë vonuar së tepërmi." -#: app/controllers/public_body_controller.rb:109 +#: app/controllers/public_body_controller.rb:111 msgid "beginning with" msgstr "duke filluar me" -#: app/views/request/show.rhtml:75 +#: app/views/request/show.rhtml:82 msgid "by" msgstr "nga" -#: app/views/request/_followup.rhtml:41 +#: app/views/request/_followup.rhtml:38 msgid "by <strong>{{date}}</strong>" msgstr "nga <strong>{{date}}</strong>" @@ -3659,11 +4006,11 @@ msgstr "nga {{public_body_name}} për {{info_request_user}} me {{date}}." msgid "by {{user_link_absolute}}" msgstr "nga {{user_link_absolute}}" -#: locale/model_attributes.rb:42 +#: locale/model_attributes.rb:35 msgid "censor rule" msgstr "censor rregulli" -#: locale/model_attributes.rb:26 +#: locale/model_attributes.rb:20 msgid "comment" msgstr "komenti" @@ -3673,7 +4020,7 @@ msgid "" " Or you could phone them." msgstr "" -#: app/models/info_request_event.rb:333 +#: app/models/info_request_event.rb:338 msgid "display_status only works for incoming and outgoing messages right now" msgstr "" "display_status tani për tani punon vetëm për mesazhet hyrëse dhe dalëse" @@ -3698,11 +4045,11 @@ msgstr "abonimet me email" msgid "even during holidays" msgstr "madje edhe gjatë pushimeve" -#: locale/model_attributes.rb:14 +#: locale/model_attributes.rb:17 msgid "exim log" msgstr "exim log" -#: locale/model_attributes.rb:60 +#: locale/model_attributes.rb:59 msgid "exim log done" msgstr "exim log done" @@ -3714,12 +4061,12 @@ msgstr "ka raportuar një" msgid "have delayed." msgstr "kanë vonuar." -#: locale/model_attributes.rb:57 +#: locale/model_attributes.rb:56 msgid "holiday" msgstr "festë" -#: app/views/request/_followup.rhtml:39 app/views/request/show.rhtml:63 -#: app/views/request/show.rhtml:73 +#: app/views/request/_followup.rhtml:36 app/views/request/show.rhtml:70 +#: app/views/request/show.rhtml:80 msgid "in term time" msgstr "" @@ -3727,15 +4074,15 @@ msgstr "" msgid "in total" msgstr "në total" -#: locale/model_attributes.rb:63 +#: locale/model_attributes.rb:62 msgid "incoming message" msgstr "mesazhi i ardhur" -#: locale/model_attributes.rb:80 +#: locale/model_attributes.rb:79 msgid "info request" msgstr "kërkesë për informatë" -#: locale/model_attributes.rb:35 +#: locale/model_attributes.rb:40 msgid "info request event" msgstr "info request event" @@ -3744,7 +4091,7 @@ msgstr "info request event" msgid "internal error" msgstr "gabim i brendshëm i sistemit" -#: app/views/request/show.rhtml:93 +#: app/views/request/show.rhtml:100 msgid "is <strong>waiting for your clarification</strong>." msgstr "është duke <strong>pritur për sqarim tuaj</strong>." @@ -3761,7 +4108,7 @@ msgstr "ka lënë një shënim" msgid "made." msgstr "bërë." -#: app/views/request/show.rhtml:67 +#: app/views/request/show.rhtml:74 msgid "no later than" msgstr "jo më vonë se" @@ -3773,7 +4120,7 @@ msgid "" " an email which will go to the right place, please <a href=\"%s\">send it to us</a>." msgstr "" -#: app/views/request/show.rhtml:65 +#: app/views/request/show.rhtml:72 msgid "normally" msgstr "normalisht" @@ -3781,7 +4128,7 @@ msgstr "normalisht" msgid "only" msgstr "vetëm" -#: locale/model_attributes.rb:20 +#: locale/model_attributes.rb:25 msgid "outgoing message" msgstr "Mesazhi dalës" @@ -3793,13 +4140,13 @@ msgstr "Të lutem kyçu si" msgid "please sign in or make a new account." msgstr "të lutem kyçu ose krijo një llogari të re." -#: locale/model_attributes.rb:50 +#: locale/model_attributes.rb:49 msgid "post redirect" msgstr "ridrejto postën në tjetër adresë" -#: locale/model_attributes.rb:17 +#: locale/model_attributes.rb:14 msgid "profile photo" -msgstr "foto e profilit" +msgstr "fotografia e profilit" #: locale/model_attributes.rb:2 msgid "public body" @@ -3807,15 +4154,15 @@ msgstr "institucioni publik" #: locale/model_attributes.rb:47 msgid "raw email" -msgstr "email para" +msgstr "raw email" #: app/views/request_mailer/not_clarified_alert.rhtml:1 msgid "request." msgstr "kërkesë." -#: app/views/request/show.rhtml:82 +#: app/views/request/show.rhtml:89 msgid "requesting an internal review" -msgstr "" +msgstr "kërko rishqyrtim intern" #: app/views/request_mailer/requires_admin.rhtml:3 msgid "" @@ -3823,7 +4170,7 @@ msgid "" "email to let them know what you are going to do about it." msgstr "" -#: app/views/request/show.rhtml:95 +#: app/views/request/show.rhtml:102 msgid "send a follow up message" msgstr "" @@ -3831,7 +4178,7 @@ msgstr "" msgid "sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "dërguar {{public_body_name}} nga {{info_request_user}} me {{date}}." -#: app/views/request/show.rhtml:99 +#: app/views/request/show.rhtml:106 msgid "sign in" msgstr "Kyçu" @@ -3843,55 +4190,48 @@ msgstr "Ç'kyçu" msgid "that you made to" msgstr "që ti ke bërë për" -#: app/views/user_mailer/already_registered.rhtml:11 -#: app/views/user_mailer/confirm_login.rhtml:11 -#: app/views/user_mailer/changeemail_already_used.rhtml:9 -#: app/views/user_mailer/changeemail_confirm.rhtml:12 -#: app/views/request_mailer/stopped_responses.rhtml:16 -#: app/views/request_mailer/not_clarified_alert.rhtml:9 #: app/views/request_mailer/comment_on_alert.rhtml:6 +#: app/views/request_mailer/comment_on_alert_plural.rhtml:5 +#: app/views/request_mailer/new_response.rhtml:15 +#: app/views/request_mailer/new_response_reminder_alert.rhtml:8 +#: app/views/request_mailer/not_clarified_alert.rhtml:9 #: app/views/request_mailer/old_unclassified_updated.rhtml:8 -#: app/views/request_mailer/very_overdue_alert.rhtml:11 #: app/views/request_mailer/overdue_alert.rhtml:9 -#: app/views/request_mailer/new_response_reminder_alert.rhtml:8 -#: app/views/request_mailer/new_response.rhtml:15 -#: app/views/request_mailer/comment_on_alert_plural.rhtml:5 -msgid "the WhatDoTheyKnow team" -msgstr "ekipi i InformataZyrtare" +#: app/views/request_mailer/stopped_responses.rhtml:16 +#: app/views/request_mailer/very_overdue_alert.rhtml:11 +#: app/views/track_mailer/event_digest.rhtml:66 +#: app/views/user_mailer/already_registered.rhtml:11 +#: app/views/user_mailer/changeemail_already_used.rhtml:10 +#: app/views/user_mailer/changeemail_confirm.rhtml:13 +#: app/views/user_mailer/confirm_login.rhtml:11 +msgid "the {{site_name}} team" +msgstr "ekipi i {{site_name}}" #: app/views/user/show.rhtml:140 msgid "this person" msgstr "ky person" -#: app/views/user_mailer/changeemail_already_used.rhtml:2 -msgid "to" -msgstr "për" - -#: app/views/user_mailer/changeemail_confirm.rhtml:5 -msgid "to " -msgstr "për " - #: app/views/user/show.rhtml:113 msgid "" "to change password, \n" " subscriptions and more" msgstr "" -"për të ndryshuar, fjalekalimin,\n" +"për të ndryshuar, fjalëkalimin,\n" "abonimet dhe më shumë" #: app/views/request/new.rhtml:34 msgid "to check that the info isn't already published." msgstr "" -#: app/views/request/show.rhtml:55 +#: app/views/request/show.rhtml:62 msgid "to read" msgstr "për të lexuar" -#: app/views/request/show.rhtml:99 +#: app/views/request/show.rhtml:106 msgid "to send a follow up message." msgstr "" -#: app/views/request/show.rhtml:39 +#: app/views/request/show.rhtml:45 msgid "to {{public_body}}" msgstr "për {{public_body}}" @@ -3905,13 +4245,13 @@ msgstr "" #: app/views/request/_request_listing_via_event.rhtml:38 msgid "unknown event type indexed " -msgstr "" +msgstr "Indeksim i llojit të panjohur të ngjarjes " #: app/views/request/followup_bad.rhtml:29 msgid "unknown reason " msgstr "arsye e panjohur" -#: app/models/info_request.rb:807 app/models/info_request_event.rb:328 +#: app/models/info_request.rb:814 app/models/info_request_event.rb:333 msgid "unknown status " msgstr "status i panjohur" @@ -3923,17 +4263,17 @@ msgstr "ndërprej abonimin" msgid "unsubscribe all" msgstr "ndërpreji të gjitha abonimet" -#: app/views/request/show.rhtml:46 +#: app/views/request/show.rhtml:53 msgid "useful information." msgstr "informata të dobishëme." -#: locale/model_attributes.rb:69 +#: locale/model_attributes.rb:68 msgid "user" msgstr "përdoruesi" -#: locale/model_attributes.rb:67 +#: locale/model_attributes.rb:66 msgid "user info request sent alert" -msgstr "" +msgstr "shfrytëzuesi info kërkesë dërguar alarm" #: app/views/user/show.rhtml:140 msgid "you" @@ -3960,15 +4300,38 @@ msgstr "{{length_of_time}} më parë" msgid "{{public_body_name}} only:" msgstr "{{public_body_name}} vetëm:" +#: app/views/public_body/view_email.rhtml:7 +msgid "" +"{{site_name}} sends new requests to <strong>{{request_email}}</strong> for " +"this authority." +msgstr "" +"{{site_name}} dërgon kërkesa të reja për <strong>{{request_email}}</strong> " +"për këtë autoritet." + +#: app/models/user.rb:122 +msgid "{{user_name}} (Banned)" +msgstr "" + #: app/views/request_mailer/comment_on_alert.rhtml:1 msgid "" "{{user_name}} has annotated your {{law_used_short}} \n" "request. Follow this link to see what they wrote." msgstr "" "{{user_name}} ka lënë shënim në kërkesën tënde {{law_used_short}}. Ndiqni " -"këtë link për të parë se çfarë ata shkruan." +"këtë vegzë për të parë se çfarë ata shkruan." + +#: app/views/contact_mailer/user_message.rhtml:2 +msgid "{{user_name}} has used {{site_name}} to send you the message below." +msgstr "" + +#: app/views/request/show.rhtml:36 +msgid "" +"{{user}} (<a href=\"{{user_admin_url}}\">admin</a>) made this " +"{{law_used_full}} request (<a href=\"{{request_admin_url}}\">admin</a>) to " +"{{public_body_link}} (<a href=\"{{public_body_admin_url}}\">admin</a>)" +msgstr "" -#: app/views/request/show.rhtml:35 +#: app/views/request/show.rhtml:44 msgid "{{user}} made this {{law_used_full}} request" msgstr "{{user}} bëri këtë {{law_used_full}} kërkesë" diff --git a/locale/sr/app.po b/locale/sr/app.po index ab011c6cf..93262c6bb 100644 --- a/locale/sr/app.po +++ b/locale/sr/app.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2011-07-12 15:18+0100\n" -"PO-Revision-Date: 2011-07-30 00:37+0000\n" +"POT-Creation-Date: 2011-08-11 12:30+0200\n" +"PO-Revision-Date: 2011-08-12 11:09+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -16,9 +16,16 @@ msgstr "" "Language: sr\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +#: app/models/incoming_message.rb:866 +msgid "" +"\n" +"\n" +"[ {{site_name}} note: The above text was badly encoded, and has had strange characters removed. ]" +msgstr "" + #: app/views/user/set_profile_about_me.rhtml:14 msgid "" -" This will appear on your WhatDoTheyKnow profile, to make it\n" +" This will appear on your {{site_name}} profile, to make it\n" " easier for others to get involved with what you're doing." msgstr "" @@ -129,8 +136,8 @@ msgid " when you send this message." msgstr "" #: app/views/public_body/show.rhtml:80 -msgid "%d Freedom of Information request" -msgid_plural "%d Freedom of Information requests" +msgid "%d Freedom of Information request made using this site" +msgid_plural "%d Freedom of Information requests made using this site" msgstr[0] "" msgstr[1] "" msgstr[2] "" @@ -142,6 +149,13 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" +#: app/views/public_body/_body_listing_single.rhtml:21 +msgid "%d request made." +msgid_plural "%d requests made." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + #: app/views/request/new.rhtml:102 msgid "'Crime statistics by ward level for Wales'" msgstr "" @@ -150,7 +164,7 @@ msgstr "" msgid "'Pollution levels over time for the River Tyne'" msgstr "" -#: app/controllers/user_controller.rb:354 +#: app/controllers/user_controller.rb:355 msgid "" ",\n" "\n" @@ -183,135 +197,136 @@ msgstr "" msgid "<a href=\"%s\">Contact us</a> to tell us about the problem</li>" msgstr "" -#: app/views/public_body/show.rhtml:50 -msgid "" -"<a href=\"%s\">Make a new Freedom of Information request</a> to " -"{{public_body_name}}" -msgstr "" - #: app/views/public_body/list.rhtml:43 msgid "<a href=\"%s\">can't find the one you want?</a>" msgstr "" -#: app/views/request/_followup.rhtml:42 app/views/request/_followup.rhtml:49 -#: app/views/request/show.rhtml:76 app/views/request/show.rhtml:80 +#: app/views/request/_followup.rhtml:39 app/views/request/_followup.rhtml:46 +#: app/views/request/show.rhtml:83 app/views/request/show.rhtml:87 msgid "<a href=\"%s\">details</a>" msgstr "" -#: app/views/request/_followup.rhtml:77 +#: app/views/request/_followup.rhtml:74 msgid "<a href=\"%s\">what's that?</a>" msgstr "" +#: app/views/public_body/show.rhtml:50 +msgid "" +"<a href=\"{{url}}\">Make a new Freedom of Information request</a> to " +"{{public_body_name}}" +msgstr "" + #: app/controllers/request_game_controller.rb:23 msgid "" "<p>All done! Thank you very much for your help.</p><p>There are <a " -"href=\"%s\">more things you can do</a> to help WhatDoTheyKnow.</p>" +"href=\"{{helpus_url}}\">more things you can do</a> to help " +"{{site_name}}.</p>" msgstr "" -#: app/controllers/request_controller.rb:394 +#: app/controllers/request_controller.rb:399 msgid "" "<p>Thank you! Here are some ideas on what to do next:</p>\n" " <ul>\n" -" <li>To send your request to another authority, first copy the text of your request below, then <a href=\"%s\">find the other authority</a>.</li>\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=\"%s\">how to complain</a>.\n" +" <a href=\"{{complain_url}}\">how to complain</a>.\n" " </li>\n" -" <li>We have <a href=\"%s\">suggestions</a>\n" +" <li>We have <a href=\"{{other_means_url}}\">suggestions</a>\n" " on other means to answer your question.\n" " </li>\n" -" </ul>\n" -" " +" </ul>" msgstr "" -#: app/controllers/request_controller.rb:388 +#: app/controllers/request_controller.rb:393 msgid "" "<p>Thank you! Hope you don't have to wait much longer.</p> <p>By law, you " "should have got a response promptly, and normally before the end of " "<strong>{{date_response_required_by}}</strong>.</p>" msgstr "" -#: app/controllers/request_controller.rb:384 +#: app/controllers/request_controller.rb:389 msgid "" "<p>Thank you! Hopefully your wait isn't too long.</p> <p>By law, you should get a response promptly, and normally before the end of <strong>\n" "{{date_response_required_by}}</strong>.</p>" msgstr "" -#: app/controllers/request_controller.rb:421 +#: app/controllers/request_controller.rb:428 msgid "" "<p>Thank you! Hopefully your wait isn't too long.</p><p>You should get a " "response within 20 days, or be told if it will take longer (<a " -"href=\"%s\">details</a>).</p>" +"href=\"{{review_url}}\">details</a>).</p>" msgstr "" -#: app/controllers/request_controller.rb:424 +#: app/controllers/request_controller.rb:431 msgid "" "<p>Thank you! We'll look into what happened and try and fix it up.</p><p>If " "the error was a delivery failure, and you can find an up to date FOI email " "address for the authority, please tell us using the form below.</p>" msgstr "" -#: app/controllers/request_controller.rb:391 +#: app/controllers/request_controller.rb:396 msgid "" "<p>Thank you! Your request is long overdue, by more than 40 working days. " "Most requests should be answered within 20 working days. You might like to " "complain about this, see below.</p>" msgstr "" -#: app/controllers/user_controller.rb:494 +#: app/controllers/user_controller.rb:495 msgid "" "<p>Thanks for changing the text about you on your profile.</p>\n" " <p><strong>Next...</strong> You can upload a profile photograph too.</p>" msgstr "" -#: app/controllers/user_controller.rb:416 +#: app/controllers/user_controller.rb:417 msgid "" "<p>Thanks for updating your profile photo.</p>\n" " <p><strong>Next...</strong> You can put some text about you and your research on your profile.</p>" msgstr "" -#: app/controllers/request_controller.rb:279 +#: app/controllers/request_controller.rb:284 msgid "" "<p>We recommend that you edit your request and remove the email address.\n" " If you leave it, the email address will be sent to the authority, but will not be displayed on the site.</p>" msgstr "" -#: app/controllers/request_controller.rb:410 +#: app/controllers/request_controller.rb:417 msgid "" "<p>We're glad you got all the information that you wanted. If you write " "about or make use of the information, please come back and add an annotation" -" below saying what you did.</p><p>If you found WhatDoTheyKnow useful, <a " -"href=\"%s\">make a donation</a> to the charity which runs it.</p>" +" below saying what you did.</p><p>If you found {{site_name}} useful, <a " +"href=\"{{donation_url}}\">make a donation</a> to the charity which runs " +"it.</p>" msgstr "" -#: app/controllers/request_controller.rb:413 +#: app/controllers/request_controller.rb:420 msgid "" "<p>We're glad you got some of the information that you wanted. If you found " -"WhatDoTheyKnow useful, <a href=\"%s\">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>" +"{{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to " +"the charity which runs it.</p><p>If you want to try and get the rest of the " +"information, here's what to do now.</p>" msgstr "" -#: app/controllers/request_controller.rb:277 +#: app/controllers/request_controller.rb:282 msgid "" "<p>You do not need to include your email in the request in order to get a " "reply (<a href=\"%s\">details</a>).</p>" msgstr "" -#: app/controllers/request_controller.rb:275 +#: app/controllers/request_controller.rb:280 msgid "" "<p>You do not need to include your email in the request in order to get a " "reply, as we will ask for it on the next screen (<a " "href=\"%s\">details</a>).</p>" msgstr "" -#: app/controllers/request_controller.rb:283 +#: app/controllers/request_controller.rb:288 msgid "" "<p>Your request contains a <strong>postcode</strong>. Unless it directly " "relates to the subject of your request, please remove any address as it will" " <strong>appear publicly on the Internet</strong>.</p>" msgstr "" -#: app/controllers/request_controller.rb:306 +#: app/controllers/request_controller.rb:311 msgid "" "<p>Your {{law_used_full}} request has been <strong>sent on its way</strong>!</p>\n" " <p><strong>We will email you</strong> when there is a response, or after 20 working days if the authority still hasn't\n" @@ -320,6 +335,13 @@ msgid "" " annotation below telling people about your writing.</p>" msgstr "" +#: app/controllers/application_controller.rb:279 +msgid "" +"<p>{{site_name}} is currently in maintenance. You can only view existing " +"requests. You cannot make new ones, add followups or annotations, or " +"otherwise change the database.</p> <p>{{read_only}}</p>" +msgstr "" + #: app/views/user/confirm.rhtml:11 msgid "" "<small>If you use web-based email or have \"junk mail\" filters, also check your\n" @@ -366,8 +388,8 @@ msgstr "" #: app/views/general/search.rhtml:126 msgid "" "<strong><code>status:</code></strong> to select based on the status or " -"historical status of the request, see the <a href=\"%s\">table of " -"statuses</a> below." +"historical status of the request, see the <a href=\"{{statuses_url}}\">table" +" of statuses</a> below." msgstr "" #: app/views/general/search.rhtml:134 @@ -380,7 +402,7 @@ msgstr "" #: app/views/general/search.rhtml:127 msgid "" "<strong><code>variety:</code></strong> to select type of thing to search " -"for, see the <a href=\"%s\">table of varieties</a> below." +"for, see the <a href=\"{{varieties_url}}\">table of varieties</a> below." msgstr "" #: app/views/comment/new.rhtml:56 @@ -393,7 +415,7 @@ msgstr "" msgid "<strong>All the information</strong> has been sent" msgstr "" -#: app/views/request/_followup.rhtml:82 +#: app/views/request/_followup.rhtml:79 msgid "" "<strong>Anything else</strong>, such as clarifying, prompting, thanking" msgstr "" @@ -401,11 +423,11 @@ msgstr "" #: app/views/request/details.rhtml:12 msgid "" "<strong>Caveat emptor!</strong> To use this data in an honourable way, you will need \n" -"a good internal knowledge of user behaviour on WhatDoTheyKnow. How, \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=\"%s\">contact us</a> with questions." +"<a href=\"{{contact_path}}\">contact us</a> with questions." msgstr "" #: app/views/request/_other_describe_state.rhtml:28 @@ -440,7 +462,7 @@ msgstr "" #: app/views/user/set_crop_profile_photo.rhtml:35 msgid "" "<strong>Privacy note:</strong> Your photo will be shown in public on the Internet, \n" -" wherever you do something on WhatDoTheyKnow." +" wherever you do something on {{site_name}}." msgstr "" #: app/views/request/followup_preview.rhtml:37 @@ -467,7 +489,7 @@ msgid "" "scheme</a> or <strong>search</strong> their web site ..." msgstr "" -#: app/views/request/show.rhtml:84 +#: app/views/request/show.rhtml:91 msgid "<strong>did not have</strong> the information requested." msgstr "" @@ -480,15 +502,27 @@ msgid "" "A <strong>summary</strong> of the response if you have received it by post. " msgstr "" +#: app/views/general/search.rhtml:162 +msgid "A public authority" +msgstr "" + #: app/views/request/_other_describe_state.rhtml:34 msgid "A response will be sent <strong>by post</strong>" msgstr "" +#: app/views/general/search.rhtml:151 +msgid "A strange reponse, required attention by the {{site_name}} team" +msgstr "" + +#: app/views/general/search.rhtml:163 +msgid "A {{site_name}} user" +msgstr "" + #: app/views/user/set_profile_about_me.rhtml:20 msgid "About you:" msgstr "" -#: app/models/info_request_event.rb:288 +#: app/models/info_request_event.rb:293 msgid "Acknowledgement" msgstr "" @@ -506,6 +540,10 @@ msgid "" " a <strong>summary of the response</strong>." msgstr "" +#: app/views/public_body/_body_listing_single.rhtml:26 +msgid "Added on {{date}}" +msgstr "" + #: app/models/user.rb:54 msgid "Admin level is not included in list" msgstr "" @@ -530,14 +568,22 @@ msgid "" " human beings)" msgstr "" -#: app/models/info_request_event.rb:304 +#: app/models/info_request_event.rb:309 msgid "All information sent" msgstr "" +#: app/views/general/search.rhtml:146 +msgid "All of the information requested has been received" +msgstr "" + #: app/views/public_body/list.rhtml:5 msgid "Alphabet" msgstr "" +#: app/views/public_body/_body_listing_single.rhtml:12 +msgid "Also called {{other_name}}." +msgstr "" + #: app/views/request_mailer/new_response.rhtml:12 msgid "" "Although all responses are automatically published, we depend on\n" @@ -548,6 +594,10 @@ msgstr "" msgid "An <strong>error message</strong> has been received" msgstr "" +#: app/views/general/search.rhtml:161 +msgid "Annotation added to request" +msgstr "" + #: app/views/user/show.rhtml:34 msgid "Annotations" msgstr "" @@ -584,15 +634,15 @@ msgstr "" msgid "Attachment (optional):" msgstr "" -#: app/models/info_request.rb:776 +#: app/models/info_request.rb:783 msgid "Awaiting classification." msgstr "" -#: app/models/info_request.rb:796 +#: app/models/info_request.rb:803 msgid "Awaiting internal review." msgstr "" -#: app/models/info_request.rb:778 +#: app/models/info_request.rb:785 msgid "Awaiting response." msgstr "" @@ -604,17 +654,17 @@ msgstr "" #: app/views/request/new.rhtml:41 msgid "" -"Browse <a href='%s'>other requests</a> to '{{public_body_name}}' for " +"Browse <a href='{{url}}'>other requests</a> to '{{public_body_name}}' for " "examples of how to word your request." msgstr "" -#: app/views/request/show.rhtml:79 +#: app/views/request/show.rhtml:86 msgid "" "By law, under all circumstances, {{public_body_link}} should have responded " "by now" msgstr "" -#: app/views/request/show.rhtml:71 +#: app/views/request/show.rhtml:78 msgid "" "By law, {{public_body_link}} should normally have responded " "<strong>promptly</strong> and" @@ -626,27 +676,27 @@ msgid "" " it</a>." msgstr "" -#: app/controllers/track_controller.rb:143 +#: app/controllers/track_controller.rb:145 msgid "Cancel a {{site_name}} alert" msgstr "" -#: app/controllers/track_controller.rb:173 +#: app/controllers/track_controller.rb:175 msgid "Cancel some {{site_name}} alerts" msgstr "" -#: locale/model_attributes.rb:46 +#: locale/model_attributes.rb:39 msgid "CensorRule|Last edit comment" msgstr "" -#: locale/model_attributes.rb:45 +#: locale/model_attributes.rb:38 msgid "CensorRule|Last edit editor" msgstr "" -#: locale/model_attributes.rb:44 +#: locale/model_attributes.rb:37 msgid "CensorRule|Replacement" msgstr "" -#: locale/model_attributes.rb:43 +#: locale/model_attributes.rb:36 msgid "CensorRule|Text" msgstr "" @@ -654,6 +704,10 @@ msgstr "" msgid "Central government" msgstr "" +#: app/views/user/signchangeemail.rhtml:37 +msgid "Change email on {{site_name}}" +msgstr "" + #: app/views/user/signchangepassword.rhtml:27 msgid "Change password on {{site_name}}" msgstr "" @@ -663,14 +717,14 @@ msgid "Change profile photo" msgstr "" #: app/views/user/set_profile_about_me.rhtml:1 -msgid "Change the text about you on your profile at WhatDoTheyKnow.com" +msgid "Change the text about you on your profile at {{site_name}}" msgstr "" #: app/views/user/show.rhtml:107 msgid "Change your email" msgstr "" -#: app/controllers/user_controller.rb:249 +#: app/controllers/user_controller.rb:250 #: app/views/user/signchangeemail.rhtml:1 #: app/views/user/signchangeemail.rhtml:11 msgid "Change your email address used on {{site_name}}" @@ -687,7 +741,7 @@ msgstr "" msgid "Change your password on {{site_name}}" msgstr "" -#: app/controllers/user_controller.rb:203 +#: app/controllers/user_controller.rb:204 msgid "Change your password {{site_name}}" msgstr "" @@ -699,20 +753,20 @@ msgstr "" msgid "Check for mistakes if you typed or copied the address." msgstr "" -#: app/views/request/preview.rhtml:7 #: app/views/request/followup_preview.rhtml:14 +#: app/views/request/preview.rhtml:7 msgid "Check you haven't included any <strong>personal information</strong>." msgstr "" -#: app/models/info_request_event.rb:326 +#: app/models/info_request_event.rb:331 msgid "Clarification" msgstr "" -#: app/models/info_request_event.rb:290 +#: app/models/info_request_event.rb:295 msgid "Clarification required" msgstr "" -#: app/controllers/request_controller.rb:334 +#: app/controllers/request_controller.rb:339 msgid "Classify an FOI response from " msgstr "" @@ -728,32 +782,51 @@ msgid "" "to reply to your request." msgstr "" -#: locale/model_attributes.rb:28 +#: locale/model_attributes.rb:22 msgid "Comment|Body" msgstr "" -#: locale/model_attributes.rb:27 +#: locale/model_attributes.rb:21 msgid "Comment|Comment type" msgstr "" -#: locale/model_attributes.rb:30 +#: locale/model_attributes.rb:24 msgid "Comment|Locale" msgstr "" -#: locale/model_attributes.rb:29 +#: locale/model_attributes.rb:23 msgid "Comment|Visible" msgstr "" +#: app/models/track_thing.rb:147 +msgid "Confirm you want to be emailed about new requests" +msgstr "" + +#: app/models/track_thing.rb:214 +msgid "" +"Confirm you want to be emailed about new requests or responses matching " +"'{{query}}'" +msgstr "" + +#: app/models/track_thing.rb:198 +msgid "Confirm you want to be emailed about requests by '{{user_name}}'" +msgstr "" + +#: app/models/track_thing.rb:182 +msgid "" +"Confirm you want to be emailed about requests to '{{public_body_name}}'" +msgstr "" + #: app/models/track_thing.rb:163 msgid "Confirm you want to be emailed when an FOI request succeeds" msgstr "" -#: app/controllers/request_controller.rb:295 +#: app/controllers/request_controller.rb:300 msgid "Confirm your FOI request to " msgstr "" -#: app/controllers/request_controller.rb:696 -#: app/controllers/user_controller.rb:514 +#: app/controllers/request_controller.rb:703 +#: app/controllers/user_controller.rb:515 msgid "Confirm your account on {{site_name}}" msgstr "" @@ -762,13 +835,17 @@ msgid "Confirm your annotation to {{info_request_title}}" msgstr "" #: app/models/user_mailer.rb:34 -msgid "Confirm your new email address on WhatDoTheyKnow.com" +msgid "Confirm your new email address on {{site_name}}" msgstr "" -#: app/views/layouts/default.rhtml:146 +#: app/views/layouts/default.rhtml:127 msgid "Contact {{site_name}}" msgstr "" +#: app/models/request_mailer.rb:210 +msgid "Could not identify the request from the email address" +msgstr "" + #: app/models/profile_photo.rb:96 msgid "" "Couldn't understand the image file that you uploaded. PNG, JPEG, GIF and " @@ -785,13 +862,13 @@ msgid "" " environmental factors listed above)" msgstr "" -#: app/views/request/show.rhtml:61 +#: app/views/request/show.rhtml:68 msgid "" "Currently <strong>waiting for a response</strong> from {{public_body_link}}," " they must respond promptly and" msgstr "" -#: app/models/info_request_event.rb:294 +#: app/models/info_request_event.rb:299 msgid "Deadline Extended" msgstr "" @@ -799,11 +876,11 @@ msgstr "" msgid "Dear " msgstr "" -#: app/models/info_request.rb:780 +#: app/models/info_request.rb:787 msgid "Delayed." msgstr "" -#: app/models/info_request.rb:798 app/models/info_request_event.rb:310 +#: app/models/info_request.rb:805 app/models/info_request_event.rb:315 msgid "Delivery error" msgstr "" @@ -825,7 +902,7 @@ msgstr "" msgid "Download original attachment" msgstr "" -#: app/views/request/_followup.rhtml:88 +#: app/views/request/_followup.rhtml:85 msgid "" "Edit and add <strong>more details</strong> to the message above,\n" " explaining why you are dissatisfied with their response." @@ -839,11 +916,11 @@ msgstr "" msgid "Edit text about you" msgstr "" -#: app/models/user.rb:132 +#: app/models/user.rb:135 msgid "Either the email or password was not recognised, please try again." msgstr "" -#: app/models/user.rb:134 +#: app/models/user.rb:137 msgid "" "Either the email or password was not recognised, please try again. Or create" " a new account using the form on the right." @@ -861,6 +938,10 @@ msgstr "" msgid "Email me new successful responses " msgstr "" +#: app/models/track_thing.rb:139 +msgid "Email me when there are new requests" +msgstr "" + #: app/views/user/show.rhtml:36 msgid "Email subscriptions" msgstr "" @@ -907,19 +988,19 @@ msgid "" " this website forever (<a href=\"%s\">why?</a>)." msgstr "" -#: locale/model_attributes.rb:61 +#: locale/model_attributes.rb:60 msgid "EximLogDone|Filename" msgstr "" -#: locale/model_attributes.rb:62 +#: locale/model_attributes.rb:61 msgid "EximLogDone|Last stat" msgstr "" -#: locale/model_attributes.rb:16 +#: locale/model_attributes.rb:19 msgid "EximLog|Line" msgstr "" -#: locale/model_attributes.rb:15 +#: locale/model_attributes.rb:18 msgid "EximLog|Order" msgstr "" @@ -931,6 +1012,10 @@ msgstr "" msgid "FOI requests" msgstr "" +#: app/models/track_thing.rb:193 app/models/track_thing.rb:194 +msgid "FOI requests by '{{user_name}}'" +msgstr "" + #: app/models/profile_photo.rb:101 msgid "Failed to convert image to a PNG" msgstr "" @@ -956,18 +1041,23 @@ msgstr "" msgid "Follow this link to see the request:" msgstr "" -#: app/models/info_request_event.rb:330 +#: app/models/info_request_event.rb:335 msgid "Follow up" msgstr "" +#: app/views/general/search.rhtml:159 +msgid "Follow up message sent by requester" +msgstr "" + #: app/views/public_body/view_email.rhtml:14 msgid "Follow up messages to existing requests are sent to " msgstr "" #: app/views/request/_followup.rhtml:16 msgid "" -"Follow ups and new responses to this request have been stopped to prevent spam. Please\n" -" <a href=\"%s\">contact us</a> if you are {{user_link}} and need to send a follow up." +"Follow ups and new responses to this request have been stopped to prevent " +"spam. Please <a href=\"{{url}}\">contact us</a> if you are {{user_link}} and" +" need to send a follow up." msgstr "" #: app/views/public_body/show.rhtml:61 @@ -1027,23 +1117,23 @@ msgstr "" msgid "Go to our <a href=\"%s\">front page</a></li>" msgstr "" -#: app/models/info_request_event.rb:292 +#: app/models/info_request_event.rb:297 msgid "Handled by post" msgstr "" -#: app/models/info_request.rb:794 +#: app/models/info_request.rb:801 msgid "Handled by post." msgstr "" -#: app/views/layouts/default.rhtml:121 +#: app/views/layouts/default.rhtml:102 msgid "Hello!" msgstr "" -#: app/views/layouts/default.rhtml:118 +#: app/views/layouts/default.rhtml:99 msgid "Hello, {{username}}!" msgstr "" -#: app/views/layouts/default.rhtml:113 +#: app/views/layouts/default.rhtml:94 msgid "Help" msgstr "" @@ -1051,8 +1141,8 @@ 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" -"WhatDoTheyKnow for intermediate events, which weren't given an explicit\n" -"description by a user. See the <a href=\"%s\">search tips</a> for description of the states." +"{{site_name}} for intermediate events, which weren't given an explicit\n" +"description by a user. See the <a href=\"{{search_path}}\">search tips</a> for description of the states." msgstr "" #: app/views/request/_other_describe_state.rhtml:4 @@ -1063,11 +1153,11 @@ msgid "" " Thanks." msgstr "" -#: locale/model_attributes.rb:58 +#: locale/model_attributes.rb:57 msgid "Holiday|Day" msgstr "" -#: locale/model_attributes.rb:59 +#: locale/model_attributes.rb:58 msgid "Holiday|Description" msgstr "" @@ -1085,11 +1175,11 @@ msgstr "" msgid "Human health and safety" msgstr "" -#: app/views/request/_followup.rhtml:71 +#: app/views/request/_followup.rhtml:68 msgid "I am asking for <strong>new information</strong>" msgstr "" -#: app/views/request/_followup.rhtml:76 +#: app/views/request/_followup.rhtml:73 msgid "I am requesting an <strong>internal review</strong>" msgstr "" @@ -1148,7 +1238,7 @@ msgid "" "email {{contact_email}} for help." msgstr "" -#: app/views/request/_followup.rhtml:21 +#: app/views/request/_followup.rhtml:20 msgid "" "If you are dissatisfied by the response you got from\n" " the public authority, you have the right to\n" @@ -1171,7 +1261,7 @@ msgid "" " please <a href=\"%s\">read this first</a>." msgstr "" -#: app/views/request/show.rhtml:98 +#: app/views/request/show.rhtml:105 msgid "If you are {{user_link}}, please" msgstr "" @@ -1200,15 +1290,15 @@ msgid "" "more. Please try doing what you were doing from the beginning." msgstr "" -#: app/controllers/request_controller.rb:430 +#: app/controllers/request_controller.rb:437 msgid "" "If you have not done so already, please write a message below telling the " "authority that you have withdrawn your request. Otherwise they will not know" " it has been withdrawn." msgstr "" -#: app/views/user/signchangepassword_confirm.rhtml:10 #: app/views/user/signchangeemail_confirm.rhtml:11 +#: app/views/user/signchangepassword_confirm.rhtml:10 msgid "" "If you use web-based email or have \"junk mail\" filters, also check your\n" "bulk/spam mail folders. Sometimes, our messages are marked that way." @@ -1221,11 +1311,11 @@ msgid "" msgstr "" #: app/views/user/_signup.rhtml:6 -msgid "If you're new to WhatDoTheyKnow" +msgid "If you're new to {{site_name}}" msgstr "" #: app/views/user/_signin.rhtml:7 -msgid "If you've used WhatDoTheyKnow before" +msgid "If you've used {{site_name}} before" msgstr "" #: app/views/user/no_cookies.rhtml:12 @@ -1234,79 +1324,79 @@ msgid "" "then there is probably a fault with our server." msgstr "" -#: locale/model_attributes.rb:64 +#: locale/model_attributes.rb:63 msgid "IncomingMessage|Cached attachment text clipped" msgstr "" -#: locale/model_attributes.rb:65 +#: locale/model_attributes.rb:64 msgid "IncomingMessage|Cached main body text folded" msgstr "" -#: locale/model_attributes.rb:66 +#: locale/model_attributes.rb:65 msgid "IncomingMessage|Cached main body text unfolded" msgstr "" -#: locale/model_attributes.rb:39 +#: locale/model_attributes.rb:44 msgid "InfoRequestEvent|Calculated state" msgstr "" -#: locale/model_attributes.rb:38 +#: locale/model_attributes.rb:43 msgid "InfoRequestEvent|Described state" msgstr "" -#: locale/model_attributes.rb:36 +#: locale/model_attributes.rb:41 msgid "InfoRequestEvent|Event type" msgstr "" -#: locale/model_attributes.rb:40 +#: locale/model_attributes.rb:45 msgid "InfoRequestEvent|Last described at" msgstr "" -#: locale/model_attributes.rb:37 +#: locale/model_attributes.rb:42 msgid "InfoRequestEvent|Params yaml" msgstr "" -#: locale/model_attributes.rb:41 +#: locale/model_attributes.rb:46 msgid "InfoRequestEvent|Prominence" msgstr "" -#: locale/model_attributes.rb:87 +#: locale/model_attributes.rb:86 msgid "InfoRequest|Allow new responses from" msgstr "" -#: locale/model_attributes.rb:83 +#: locale/model_attributes.rb:82 msgid "InfoRequest|Awaiting description" msgstr "" -#: locale/model_attributes.rb:82 +#: locale/model_attributes.rb:81 msgid "InfoRequest|Described state" msgstr "" -#: locale/model_attributes.rb:88 +#: locale/model_attributes.rb:87 msgid "InfoRequest|Handle rejected responses" msgstr "" -#: locale/model_attributes.rb:86 +#: locale/model_attributes.rb:85 msgid "InfoRequest|Law used" msgstr "" -#: locale/model_attributes.rb:84 +#: locale/model_attributes.rb:83 msgid "InfoRequest|Prominence" msgstr "" -#: locale/model_attributes.rb:81 +#: locale/model_attributes.rb:80 msgid "InfoRequest|Title" msgstr "" -#: locale/model_attributes.rb:85 +#: locale/model_attributes.rb:84 msgid "InfoRequest|Url title" msgstr "" -#: app/models/info_request_event.rb:298 +#: app/models/info_request_event.rb:303 msgid "Information not held" msgstr "" -#: app/models/info_request.rb:784 +#: app/models/info_request.rb:791 msgid "Information not held." msgstr "" @@ -1316,17 +1406,17 @@ msgid "" " radiation, waste materials)" msgstr "" -#: app/models/info_request_event.rb:306 +#: app/models/info_request_event.rb:311 msgid "Internal review acknowledgement" msgstr "" -#: app/models/info_request_event.rb:323 +#: app/models/info_request_event.rb:328 msgid "Internal review request" msgstr "" #: app/views/outgoing_mailer/initial_request.rhtml:8 msgid "" -"Is {{email_address}} the wrong address for {{type_of_request}} requests tp " +"Is {{email_address}} the wrong address for {{type_of_request}} requests to " "{{public_body_name}}? If so, please contact us using this form:" msgstr "" @@ -1337,14 +1427,14 @@ msgid "" "browser. Then press refresh to have another go." msgstr "" -#: app/views/user/show.rhtml:62 -msgid "Joined WhatDoTheyKnow in" -msgstr "" - #: app/views/user/_user_listing_single.rhtml:21 msgid "Joined in" msgstr "" +#: app/views/user/show.rhtml:62 +msgid "Joined {{site_name}} in" +msgstr "" + #: app/views/request/new.rhtml:48 msgid "" "Keep it <strong>focused</strong>, you'll be more likely to get what you want" @@ -1378,7 +1468,7 @@ msgstr "" msgid "Local and regional" msgstr "" -#: app/models/info_request.rb:782 +#: app/models/info_request.rb:789 msgid "Long overdue." msgstr "" @@ -1394,7 +1484,7 @@ msgstr "" msgid "Make and browse Freedom of Information (FOI) requests" msgstr "" -#: app/views/layouts/default.rhtml:86 +#: app/views/layouts/default.rhtml:67 msgid "Make and explore Freedom of Information requests" msgstr "" @@ -1402,7 +1492,7 @@ msgstr "" msgid "Make or explore Freedom of Information requests" msgstr "" -#: app/views/layouts/default.rhtml:106 +#: app/views/layouts/default.rhtml:87 msgid "Make request" msgstr "" @@ -1411,7 +1501,7 @@ msgid "Make your own request" msgstr "" #: app/views/contact_mailer/message.rhtml:4 -msgid "Message sent using WhatDoTheyKnow contact form, " +msgid "Message sent using {{site_name}} contact form, " msgstr "" #: app/views/request/new_bad_contact.rhtml:1 @@ -1434,7 +1524,7 @@ msgstr "" msgid "My request has been <strong>refused</strong>" msgstr "" -#: app/views/layouts/default.rhtml:110 +#: app/views/layouts/default.rhtml:91 msgid "My requests" msgstr "" @@ -1446,6 +1536,10 @@ msgstr "" msgid "Name is already taken" msgstr "" +#: app/models/track_thing.rb:142 app/models/track_thing.rb:143 +msgid "New Freedom of Information requests" +msgstr "" + #: app/views/user/signchangeemail.rhtml:20 msgid "New e-mail:" msgstr "" @@ -1500,14 +1594,14 @@ msgid "" "using this site yet." msgstr "" -#: app/views/request/_request_listing.rhtml:2 #: app/views/public_body/_body_listing.rhtml:2 +#: app/views/request/_request_listing.rhtml:2 msgid "None found." msgstr "" +#: app/views/user/signchangeemail_confirm.rhtml:3 #: app/views/user/signchangepassword_confirm.rhtml:1 #: app/views/user/signchangepassword_confirm.rhtml:3 -#: app/views/user/signchangeemail_confirm.rhtml:3 msgid "Now check your email!" msgstr "" @@ -1537,7 +1631,7 @@ msgid "" "{{site_name}}" msgstr "" -#: app/controllers/request_controller.rb:407 +#: app/controllers/request_controller.rb:414 msgid "" "Oh no! Sorry to hear that your request was refused. Here is what to do now." msgstr "" @@ -1568,27 +1662,43 @@ msgstr "" msgid "Only requests made using {{site_name}} are shown." msgstr "" -#: locale/model_attributes.rb:21 +#: app/models/info_request.rb:405 +msgid "" +"Only the authority can reply to this request, and I don't recognise the " +"address this reply was sent from" +msgstr "" + +#: app/models/info_request.rb:401 +msgid "" +"Only the authority can reply to this request, but there is no \"From\" " +"address to check against" +msgstr "" + +#: app/views/general/search.rhtml:158 +msgid "Original request sent" +msgstr "" + +#: locale/model_attributes.rb:26 msgid "OutgoingMessage|Body" msgstr "" -#: locale/model_attributes.rb:24 +#: locale/model_attributes.rb:29 msgid "OutgoingMessage|Last sent at" msgstr "" -#: locale/model_attributes.rb:23 +#: locale/model_attributes.rb:28 msgid "OutgoingMessage|Message type" msgstr "" -#: locale/model_attributes.rb:22 +#: locale/model_attributes.rb:27 msgid "OutgoingMessage|Status" msgstr "" -#: locale/model_attributes.rb:25 +#: locale/model_attributes.rb:30 msgid "OutgoingMessage|What doing" msgstr "" -#: app/models/info_request.rb:788 +#: app/models/info_request.rb:795 msgid "Partially successful." msgstr "" @@ -1612,7 +1722,7 @@ msgstr "" msgid "Plans and administrative measures that affect these matters" msgstr "" -#: app/controllers/request_game_controller.rb:40 +#: app/controllers/request_game_controller.rb:42 msgid "Play the request categorisation game" msgstr "" @@ -1620,7 +1730,7 @@ msgstr "" msgid "Play the request categorisation game!" msgstr "" -#: app/views/request/show.rhtml:94 +#: app/views/request/show.rhtml:101 msgid "Please" msgstr "" @@ -1628,7 +1738,7 @@ msgstr "" msgid "Please <a href=\"%s\">get in touch</a> with us so we can fix it." msgstr "" -#: app/views/request/show.rhtml:45 +#: app/views/request/show.rhtml:52 msgid "" "Please <strong>answer the question above</strong> so we know whether the " msgstr "" @@ -1639,11 +1749,12 @@ msgid "" " know if there was information in the recent responses to them." msgstr "" -#: app/views/request/_followup.rhtml:28 +#: app/views/request/_followup.rhtml:27 msgid "" -"Please <strong>only</strong> write messages directly relating to your \n" -"\t\t\t\trequest {{request_link}}. If you would like to ask for information\n" -"\t\t\t\tthat was not in your original request, then <a href=\"%s\">file a new request</a>." +"Please <strong>only</strong> write messages directly relating to your " +"request {{request_link}}. If you would like to ask for information that was " +"not in your original request, then <a href=\"{{new_request_link}}\">file a " +"new request</a>." msgstr "" #: app/views/request/new.rhtml:60 @@ -1664,7 +1775,7 @@ msgstr "" msgid "Please choose what sort of reply you are making." msgstr "" -#: app/controllers/request_controller.rb:341 +#: app/controllers/request_controller.rb:346 msgid "" "Please choose whether or not you got some of the information that you " "wanted." @@ -1673,15 +1784,15 @@ msgstr "" #: app/views/user_mailer/changeemail_confirm.rhtml:3 msgid "" "Please click on the link below to confirm that you want to \n" -"change the email address that you use for WhatDoTheyKnow\n" -"from " +"change the email address that you use for {{site_name}}\n" +"from {{old_email}} to {{new_email}}" msgstr "" #: app/views/user_mailer/confirm_login.rhtml:3 msgid "Please click on the link below to confirm your email address." msgstr "" -#: app/models/info_request.rb:127 +#: app/models/info_request.rb:126 msgid "" "Please describe more what the request is about in the subject. There is no " "need to say it is an FOI request, we add that on anyway." @@ -1705,7 +1816,7 @@ msgstr "" msgid "Please enter a subject" msgstr "" -#: app/models/info_request.rb:35 +#: app/models/info_request.rb:34 msgid "Please enter a summary of your request" msgstr "" @@ -1765,7 +1876,7 @@ msgstr "" msgid "Please keep it shorter than 500 characters" msgstr "" -#: app/models/info_request.rb:124 +#: app/models/info_request.rb:123 msgid "" "Please keep the summary short, like in the subject of an email. You can use " "a phrase, rather than a full sentence." @@ -1793,11 +1904,11 @@ msgstr "" msgid "Please sign in as " msgstr "" -#: app/controllers/request_controller.rb:723 +#: app/controllers/request_controller.rb:730 msgid "Please type a message and/or choose a file containing your response." msgstr "" -#: app/controllers/request_controller.rb:427 +#: app/controllers/request_controller.rb:434 msgid "Please use the form below to tell us more." msgstr "" @@ -1806,11 +1917,11 @@ msgstr "" msgid "Please use this email address for all replies to this request:" msgstr "" -#: app/models/info_request.rb:36 +#: app/models/info_request.rb:35 msgid "Please write a summary with some text in it" msgstr "" -#: app/models/info_request.rb:121 +#: app/models/info_request.rb:120 msgid "" "Please write the summary using a mixture of capital and lower case letters. " "This makes it easier for others to read." @@ -1822,7 +1933,7 @@ msgid "" "letters. This makes it easier for others to read." msgstr "" -#: app/controllers/request_controller.rb:416 +#: app/controllers/request_controller.rb:423 msgid "" "Please write your follow up message containing the necessary clarifications " "below." @@ -1844,27 +1955,27 @@ msgstr "" msgid "Post annotation" msgstr "" -#: locale/model_attributes.rb:56 +#: locale/model_attributes.rb:55 msgid "PostRedirect|Circumstance" msgstr "" -#: locale/model_attributes.rb:54 +#: locale/model_attributes.rb:53 msgid "PostRedirect|Email token" msgstr "" -#: locale/model_attributes.rb:53 +#: locale/model_attributes.rb:52 msgid "PostRedirect|Post params yaml" msgstr "" -#: locale/model_attributes.rb:55 +#: locale/model_attributes.rb:54 msgid "PostRedirect|Reason params yaml" msgstr "" -#: locale/model_attributes.rb:51 +#: locale/model_attributes.rb:50 msgid "PostRedirect|Token" msgstr "" -#: locale/model_attributes.rb:52 +#: locale/model_attributes.rb:51 msgid "PostRedirect|Uri" msgstr "" @@ -1884,7 +1995,7 @@ msgstr "" msgid "Preview your annotation" msgstr "" -#: app/views/request/_followup.rhtml:99 +#: app/views/request/_followup.rhtml:96 msgid "Preview your message" msgstr "" @@ -1892,11 +2003,11 @@ msgstr "" msgid "Preview your public request" msgstr "" -#: locale/model_attributes.rb:18 +#: locale/model_attributes.rb:15 msgid "ProfilePhoto|Data" msgstr "" -#: locale/model_attributes.rb:19 +#: locale/model_attributes.rb:16 msgid "ProfilePhoto|Draft" msgstr "" @@ -1958,12 +2069,8 @@ msgstr "" msgid "Publication scheme" msgstr "" -#: locale/model_attributes.rb:49 -msgid "RawEmail|Data binary" -msgstr "" - #: locale/model_attributes.rb:48 -msgid "RawEmail|Data text" +msgid "RawEmail|Data binary" msgstr "" #: app/views/comment/preview.rhtml:20 @@ -1980,11 +2087,11 @@ msgstr "" #: app/views/general/search.rhtml:137 msgid "" -"Read about <a href=\"%s\">advanced search operators</a>, such as proximity " -"and wildcards." +"Read about <a href=\"{{advanced_search_url}}\">advanced search " +"operators</a>, such as proximity and wildcards." msgstr "" -#: app/views/layouts/default.rhtml:112 +#: app/views/layouts/default.rhtml:93 msgid "Read blog" msgstr "" @@ -1992,11 +2099,15 @@ msgstr "" msgid "Read this before writing your {{info_request_law_used_full}} request" msgstr "" +#: app/views/general/search.rhtml:150 +msgid "Received an error message, such as delivery failure." +msgstr "" + #: app/views/general/search.rhtml:42 msgid "Recently described results first" msgstr "" -#: app/controllers/request_controller.rb:134 +#: app/controllers/request_controller.rb:139 msgid "Recently sent Freedom of Information requests" msgstr "" @@ -2004,15 +2115,15 @@ msgstr "" msgid "Recently sent requests" msgstr "" -#: app/controllers/request_controller.rb:139 +#: app/controllers/request_controller.rb:144 msgid "Recently successful responses" msgstr "" -#: app/models/info_request_event.rb:300 +#: app/models/info_request_event.rb:305 msgid "Refused" msgstr "" -#: app/models/info_request.rb:786 +#: app/models/info_request.rb:793 msgid "Refused." msgstr "" @@ -2062,6 +2173,10 @@ msgstr "" msgid "Requested on {{date}}" msgstr "" +#: app/models/track_thing.rb:209 app/models/track_thing.rb:210 +msgid "Requests or responses matching '{{query}}'" +msgstr "" + #: app/views/request/upload_response.rhtml:11 msgid "Respond by email" msgstr "" @@ -2078,11 +2193,15 @@ msgstr "" msgid "Respond using the web" msgstr "" -#: app/views/request/show.rhtml:70 +#: app/views/general/search.rhtml:160 +msgid "Response from a public authority" +msgstr "" + +#: app/views/request/show.rhtml:77 msgid "Response to this request is <strong>delayed</strong>." msgstr "" -#: app/views/request/show.rhtml:78 +#: app/views/request/show.rhtml:85 msgid "Response to this request is <strong>long overdue</strong>." msgstr "" @@ -2102,9 +2221,9 @@ msgstr "" msgid "Save" msgstr "" -#: app/views/request/new.rhtml:31 app/views/layouts/default.rhtml:99 #: app/views/general/exception_caught.rhtml:10 #: app/views/general/frontpage.rhtml:16 app/views/general/search.rhtml:29 +#: app/views/layouts/default.rhtml:80 app/views/request/new.rhtml:31 msgid "Search" msgstr "" @@ -2116,7 +2235,7 @@ msgstr "" msgid "Search the site to find what you were looking for." msgstr "" -#: app/controllers/user_controller.rb:330 +#: app/controllers/user_controller.rb:331 msgid "Send a message to " msgstr "" @@ -2156,7 +2275,7 @@ msgstr "" msgid "Show most relevant results first" msgstr "" -#: app/views/request/list.rhtml:2 app/views/public_body/list.rhtml:3 +#: app/views/public_body/list.rhtml:3 app/views/request/list.rhtml:2 msgid "Show only..." msgstr "" @@ -2168,11 +2287,11 @@ msgstr "" msgid "Sign in or make a new account" msgstr "" -#: app/views/layouts/default.rhtml:122 +#: app/views/layouts/default.rhtml:103 msgid "Sign in or sign up" msgstr "" -#: app/views/layouts/default.rhtml:119 +#: app/views/layouts/default.rhtml:100 msgid "Sign out" msgstr "" @@ -2184,10 +2303,14 @@ msgstr "" msgid "Similar requests" msgstr "" -#: app/models/info_request_event.rb:302 +#: app/models/info_request_event.rb:307 msgid "Some information sent" msgstr "" +#: app/views/general/search.rhtml:145 +msgid "Some of the information requested has been received" +msgstr "" + #: app/views/request_game/play.rhtml:31 msgid "" "Some people who've made requests haven't let us know whether they were\n" @@ -2199,7 +2322,7 @@ msgstr "" #: app/views/user_mailer/changeemail_already_used.rhtml:1 msgid "" "Someone, perhaps you, just tried to change their email address on\n" -"WhatDoTheyKnow.com from " +"{{site_name}} from {{old_email}} to {{new_email}}." msgstr "" #: app/views/general/exception_caught.rhtml:1 @@ -2214,8 +2337,8 @@ msgstr "" msgid "Still awaiting an <strong>internal review</strong>" msgstr "" -#: app/views/request/preview.rhtml:18 #: app/views/request/followup_preview.rhtml:23 +#: app/views/request/preview.rhtml:18 msgid "Subject:" msgstr "" @@ -2235,7 +2358,7 @@ msgstr "" msgid "Successful responses" msgstr "" -#: app/models/info_request.rb:790 +#: app/models/info_request.rb:797 msgid "Successful." msgstr "" @@ -2257,7 +2380,7 @@ msgstr "" msgid "Tags:" msgstr "" -#: app/controllers/request_game_controller.rb:50 +#: app/controllers/request_game_controller.rb:52 msgid "Thank you for helping us keep the site tidy!" msgstr "" @@ -2265,25 +2388,25 @@ msgstr "" msgid "Thank you for making an annotation!" msgstr "" -#: app/controllers/request_controller.rb:729 +#: app/controllers/request_controller.rb:736 msgid "" "Thank you for responding to this FOI request! Your response has been " "published below, and a link to your response has been emailed to " msgstr "" -#: app/controllers/request_controller.rb:373 +#: app/controllers/request_controller.rb:378 msgid "" "Thank you for updating the status of the request '<a " -"href=\"%s\">{{info_request_title}}</a>'. There are some more requests below " -"for you to classify." +"href=\"{{url}}\">{{info_request_title}}</a>'. There are some more requests " +"below for you to classify." msgstr "" -#: app/controllers/request_controller.rb:376 +#: app/controllers/request_controller.rb:381 msgid "Thank you for updating this request!" msgstr "" -#: app/controllers/user_controller.rb:397 -#: app/controllers/user_controller.rb:413 +#: app/controllers/user_controller.rb:398 +#: app/controllers/user_controller.rb:414 msgid "Thank you for updating your profile photo" msgstr "" @@ -2307,7 +2430,7 @@ msgid "" " requests." msgstr "" -#: app/controllers/user_controller.rb:188 +#: app/controllers/user_controller.rb:189 msgid "" "That doesn't look like a valid email address. Please check you have typed it" " correctly." @@ -2322,7 +2445,7 @@ msgstr "" msgid "The Freedom of Information Act <strong>does not apply</strong> to" msgstr "" -#: app/views/user_mailer/changeemail_already_used.rhtml:7 +#: app/views/user_mailer/changeemail_already_used.rhtml:8 msgid "The accounts have been left as they previously were." msgstr "" @@ -2343,7 +2466,7 @@ msgid "" " address</strong>, not just an email, for it to be a valid FOI request" msgstr "" -#: app/views/request/show.rhtml:102 +#: app/views/request/show.rhtml:109 msgid "" "The authority would like to / has <strong>responded by post</strong> to this" " request." @@ -2367,32 +2490,48 @@ msgstr "" msgid "The page either doesn't exist, or is broken. Things you can try now:" msgstr "" +#: app/views/general/search.rhtml:143 +msgid "The public authority does not have the information requested" +msgstr "" + +#: app/views/general/search.rhtml:147 +msgid "The public authority would like part of the request explained" +msgstr "" + +#: app/views/general/search.rhtml:148 +msgid "The public authority would like to / has responded by post" +msgstr "" + #: app/views/request/_other_describe_state.rhtml:60 msgid "The request has been <strong>refused</strong>" msgstr "" -#: app/controllers/request_controller.rb:347 +#: app/controllers/request_controller.rb:352 msgid "" "The request has been updated since you originally loaded this page. Please " "check for any new incoming messages below, and try again." msgstr "" -#: app/views/request/show.rhtml:97 +#: app/views/request/show.rhtml:104 msgid "The request is <strong>waiting for clarification</strong>." msgstr "" -#: app/views/request/show.rhtml:90 +#: app/views/request/show.rhtml:97 msgid "The request was <strong>partially successful</strong>." msgstr "" -#: app/views/request/show.rhtml:86 +#: app/views/request/show.rhtml:93 msgid "The request was <strong>refused</strong> by" msgstr "" -#: app/views/request/show.rhtml:88 +#: app/views/request/show.rhtml:95 msgid "The request was <strong>successful</strong>." msgstr "" +#: app/views/general/search.rhtml:144 +msgid "The request was refused by the public authority" +msgstr "" + #: app/views/request/hidden.rhtml:9 msgid "" "The request you have tried to view has been removed. There are\n" @@ -2400,14 +2539,18 @@ msgid "" " href=\"%s\">contact us</a> if you have any questions." msgstr "" -#: app/views/request/_followup.rhtml:35 +#: app/views/general/search.rhtml:152 +msgid "The requester has abandoned this request for some reason" +msgstr "" + +#: app/views/request/_followup.rhtml:32 msgid "" "The response to your request has been <strong>delayed</strong>. You can say that, \n" " by law, the authority should normally have responded\n" " <strong>promptly</strong> and" msgstr "" -#: app/views/request/_followup.rhtml:47 +#: app/views/request/_followup.rhtml:44 msgid "" "The response to your request is <strong>long overdue</strong>. You can say that, by \n" " law, under all circumstances, the authority should have responded\n" @@ -2426,59 +2569,81 @@ msgid "" "Information requests this person has made." msgstr "" -#: app/controllers/track_controller.rb:142 +#: app/controllers/track_controller.rb:144 msgid "Then you can cancel the alert." msgstr "" -#: app/controllers/track_controller.rb:172 +#: app/controllers/track_controller.rb:174 msgid "Then you can cancel the alerts." msgstr "" -#: app/controllers/user_controller.rb:248 +#: app/controllers/user_controller.rb:249 msgid "Then you can change your email address used on {{site_name}}" msgstr "" -#: app/controllers/user_controller.rb:202 +#: app/controllers/user_controller.rb:203 msgid "Then you can change your password on {{site_name}}" msgstr "" -#: app/controllers/request_controller.rb:333 +#: app/controllers/request_controller.rb:338 msgid "Then you can classify the FOI response you have got from " msgstr "" -#: app/controllers/request_game_controller.rb:39 +#: app/controllers/request_game_controller.rb:41 msgid "Then you can play the request categorisation game." msgstr "" -#: app/controllers/user_controller.rb:329 +#: app/controllers/user_controller.rb:330 msgid "Then you can send a message to " msgstr "" -#: app/controllers/user_controller.rb:513 +#: app/controllers/user_controller.rb:514 msgid "Then you can sign in to {{site_name}}" msgstr "" -#: app/controllers/request_controller.rb:59 +#: app/controllers/request_controller.rb:61 msgid "Then you can update the status of your request to " msgstr "" -#: app/controllers/request_controller.rb:695 +#: app/controllers/request_controller.rb:702 msgid "Then you can upload an FOI response. " msgstr "" -#: app/controllers/request_controller.rb:538 +#: app/controllers/request_controller.rb:545 msgid "Then you can write follow up message to " msgstr "" -#: app/controllers/request_controller.rb:539 +#: app/controllers/request_controller.rb:546 msgid "Then you can write your reply to " msgstr "" +#: app/models/track_thing.rb:197 +msgid "" +"Then you will be emailed whenever '{{user_name}}' requests something or gets" +" a response." +msgstr "" + +#: app/models/track_thing.rb:213 +msgid "" +"Then you will be emailed whenever a new request or response matches " +"'{{query}}'." +msgstr "" + #: app/models/track_thing.rb:162 msgid "Then you will be emailed whenever an FOI request succeeds." msgstr "" -#: app/controllers/request_controller.rb:294 +#: app/models/track_thing.rb:146 +msgid "Then you will be emailed whenever anyone makes a new FOI request." +msgstr "" + +#: app/models/track_thing.rb:181 +msgid "" +"Then you will be emailed whenever someone requests something or gets a " +"response from '{{public_body_name}}'." +msgstr "" + +#: app/controllers/request_controller.rb:299 msgid "Then your FOI request to {{public_body_name}} will be sent." msgstr "" @@ -2498,13 +2663,13 @@ msgid "" " One of them is shown below, you may mean a different one:" msgstr "" -#: app/views/request/show.rhtml:106 +#: app/views/request/show.rhtml:113 msgid "" "There was a <strong>delivery error</strong> or similar, which needs fixing " -"by the WhatDoTheyKnow team." +"by the {{site_name}} team." msgstr "" -#: app/controllers/public_body_controller.rb:76 +#: app/controllers/public_body_controller.rb:77 msgid "There was an error with the words you entered, please try again." msgstr "" @@ -2590,20 +2755,26 @@ msgstr "" msgid "This request <strong>requires administrator attention</strong>" msgstr "" -#: app/views/request/show.rhtml:48 +#: app/views/request/show.rhtml:55 msgid "This request has an <strong>unknown status</strong>." msgstr "" -#: app/views/request/show.rhtml:110 +#: app/views/request/show.rhtml:117 msgid "" "This request has been <strong>withdrawn</strong> by the person who made it. \n" " \t There may be an explanation in the correspondence below." msgstr "" -#: app/views/request/show.rhtml:108 +#: app/models/info_request.rb:395 +msgid "" +"This request has been set by an administrator to \"allow new responses from " +"nobody\"" +msgstr "" + +#: app/views/request/show.rhtml:115 msgid "" "This request has had an unusual response, and <strong>requires " -"attention</strong> from the WhatDoTheyKnow team." +"attention</strong> from the {{site_name}} team." msgstr "" #: app/views/request/show.rhtml:5 @@ -2633,30 +2804,44 @@ msgstr "" #: app/views/request/details.rhtml:6 msgid "" "This table shows the technical details of the internal events that happened\n" -"to this request on WhatDoTheyKnow. This could be used to generate information about\n" +"to this request on {{site_name}}. This could be used to generate information about\n" "the speed with which authorities respond to requests, the number of requests\n" "which require a postal response and much more." msgstr "" #: app/views/user/show.rhtml:79 -msgid "This user has been banned from WhatDoTheyKnow.com " +msgid "This user has been banned from {{site_name}} " msgstr "" -#: app/views/user_mailer/changeemail_already_used.rhtml:4 +#: app/views/user_mailer/changeemail_already_used.rhtml:5 msgid "" "This was not possible because there is already an account using \n" -"the email address " +"the email address {{email}}." +msgstr "" + +#: app/models/track_thing.rb:145 +msgid "To be emailed about any new requests" msgstr "" #: app/models/track_thing.rb:161 msgid "To be emailed about any successful requests" msgstr "" -#: app/controllers/track_controller.rb:171 +#: app/models/track_thing.rb:196 +msgid "To be emailed about requests by '{{user_name}}'" +msgstr "" + +#: app/models/track_thing.rb:180 +msgid "" +"To be emailed about requests made using {{site_name}} to the public " +"authority '{{public_body_name}}'" +msgstr "" + +#: app/controllers/track_controller.rb:173 msgid "To cancel these alerts" msgstr "" -#: app/controllers/track_controller.rb:141 +#: app/controllers/track_controller.rb:143 msgid "To cancel this alert" msgstr "" @@ -2666,11 +2851,11 @@ msgid "" "was a technical problem trying to do this." msgstr "" -#: app/controllers/user_controller.rb:247 +#: app/controllers/user_controller.rb:248 msgid "To change your email address used on {{site_name}}" msgstr "" -#: app/controllers/request_controller.rb:332 +#: app/controllers/request_controller.rb:337 msgid "To classify the response to this FOI request" msgstr "" @@ -2682,6 +2867,10 @@ msgstr "" msgid "To do this, first click on the link below." msgstr "" +#: app/models/track_thing.rb:212 +msgid "To follow requests and responses matching '{{query}}'" +msgstr "" + #: app/views/request_mailer/old_unclassified_updated.rhtml:1 msgid "" "To help us keep the site tidy, someone else has updated the status of the \n" @@ -2692,7 +2881,7 @@ msgstr "" msgid "To let us know, follow this link and then select the appropriate box." msgstr "" -#: app/controllers/request_game_controller.rb:38 +#: app/controllers/request_game_controller.rb:40 msgid "To play the request categorisation game" msgstr "" @@ -2700,27 +2889,27 @@ msgstr "" msgid "To post your annotation" msgstr "" -#: app/controllers/request_controller.rb:536 +#: app/controllers/request_controller.rb:543 msgid "To reply to " msgstr "" -#: app/controllers/request_controller.rb:535 +#: app/controllers/request_controller.rb:542 msgid "To send a follow up message to " msgstr "" -#: app/controllers/user_controller.rb:328 +#: app/controllers/user_controller.rb:329 msgid "To send a message to " msgstr "" -#: app/controllers/request_controller.rb:293 +#: app/controllers/request_controller.rb:298 msgid "To send your FOI request" msgstr "" -#: app/controllers/request_controller.rb:58 +#: app/controllers/request_controller.rb:60 msgid "To update the status of this FOI request" msgstr "" -#: app/controllers/request_controller.rb:694 +#: app/controllers/request_controller.rb:701 msgid "" "To upload a response, you must be logged in using an email address from " msgstr "" @@ -2739,8 +2928,8 @@ msgstr "" msgid "To {{public_body_link_absolute}}" msgstr "" -#: app/views/request/preview.rhtml:17 #: app/views/request/followup_preview.rhtml:22 app/views/request/new.rhtml:88 +#: app/views/request/preview.rhtml:17 msgid "To:" msgstr "" @@ -2748,6 +2937,10 @@ msgstr "" msgid "Track requests to {{public_body_name}} by email" msgstr "" +#: app/models/track_thing.rb:206 +msgid "Track things matching '{{query}}' by email" +msgstr "" + #: app/views/public_body/show.rhtml:3 msgid "Track this authority" msgstr "" @@ -2756,10 +2949,18 @@ msgstr "" msgid "Track this person" msgstr "" +#: app/models/track_thing.rb:190 +msgid "Track this person by email" +msgstr "" + #: app/views/request/_sidebar.rhtml:2 msgid "Track this request" msgstr "" +#: app/models/track_thing.rb:123 +msgid "Track this request by email" +msgstr "" + #: locale/model_attributes.rb:33 msgid "TrackThing|Track medium" msgstr "" @@ -2783,7 +2984,7 @@ msgid "URL name can't be blank" msgstr "" #: app/models/user_mailer.rb:45 -msgid "Unable to change email address on WhatDoTheyKnow.com" +msgid "Unable to change email address on {{site_name}}" msgstr "" #: app/views/request/followup_bad.rhtml:4 @@ -2819,11 +3020,11 @@ msgstr "" msgid "Unknown" msgstr "" -#: app/models/info_request_event.rb:312 +#: app/models/info_request_event.rb:317 msgid "Unusual response" msgstr "" -#: app/models/info_request.rb:800 +#: app/models/info_request.rb:807 msgid "Unusual response." msgstr "" @@ -2832,7 +3033,7 @@ msgstr "" msgid "Update the status of this request" msgstr "" -#: app/controllers/request_controller.rb:60 +#: app/controllers/request_controller.rb:62 msgid "Update the status of your request to " msgstr "" @@ -2848,47 +3049,47 @@ msgid "" "<strong><code>\"Liverpool City Council\"</code></strong>" msgstr "" -#: locale/model_attributes.rb:68 +#: locale/model_attributes.rb:67 msgid "UserInfoRequestSentAlert|Alert type" msgstr "" -#: locale/model_attributes.rb:79 +#: locale/model_attributes.rb:78 msgid "User|About me" msgstr "" -#: locale/model_attributes.rb:77 +#: locale/model_attributes.rb:76 msgid "User|Admin level" msgstr "" -#: locale/model_attributes.rb:78 +#: locale/model_attributes.rb:77 msgid "User|Ban text" msgstr "" -#: locale/model_attributes.rb:70 +#: locale/model_attributes.rb:69 msgid "User|Email" msgstr "" -#: locale/model_attributes.rb:74 +#: locale/model_attributes.rb:73 msgid "User|Email confirmed" msgstr "" -#: locale/model_attributes.rb:72 +#: locale/model_attributes.rb:71 msgid "User|Hashed password" msgstr "" -#: locale/model_attributes.rb:76 +#: locale/model_attributes.rb:75 msgid "User|Last daily track email" msgstr "" -#: locale/model_attributes.rb:71 +#: locale/model_attributes.rb:70 msgid "User|Name" msgstr "" -#: locale/model_attributes.rb:73 +#: locale/model_attributes.rb:72 msgid "User|Salt" msgstr "" -#: locale/model_attributes.rb:75 +#: locale/model_attributes.rb:74 msgid "User|Url name" msgstr "" @@ -2905,10 +3106,10 @@ msgid "View FOI email address for {{public_body_name}}" msgstr "" #: app/views/contact_mailer/user_message.rhtml:10 -msgid "View Freedom of Information requests made by" +msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "" -#: app/views/layouts/default.rhtml:108 +#: app/views/layouts/default.rhtml:89 msgid "View authorities" msgstr "" @@ -2916,20 +3117,30 @@ msgstr "" msgid "View email" msgstr "" -#: app/views/layouts/default.rhtml:107 +#: app/views/layouts/default.rhtml:88 msgid "View requests" msgstr "" -#: app/models/info_request.rb:792 +#: app/models/info_request.rb:799 msgid "Waiting clarification." msgstr "" -#: app/views/request/show.rhtml:104 +#: app/views/request/show.rhtml:111 msgid "" "Waiting for an <strong>internal review</strong> by {{public_body_link}} of " "their handling of this request." msgstr "" +#: app/views/general/search.rhtml:149 +msgid "" +"Waiting for the public authority to complete an internal review of their " +"handling of the request" +msgstr "" + +#: app/views/general/search.rhtml:142 +msgid "Waiting for the public authority to reply" +msgstr "" + #: app/views/public_body/view_email.rhtml:17 msgid "We do not have a working request email address for this authority." msgstr "" @@ -2944,7 +3155,7 @@ 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=\"%s\">sign in</a> and let everyone know." +"\tif you are {{user_link}} please <a href=\"{{url}}\">sign in</a> and let everyone know." msgstr "" #: app/views/user_mailer/confirm_login.rhtml:8 @@ -2953,17 +3164,17 @@ msgid "" "or the law tell us to." msgstr "" -#: app/views/user_mailer/changeemail_confirm.rhtml:9 +#: app/views/user_mailer/changeemail_confirm.rhtml:10 msgid "" "We will not reveal your email addresses to anybody unless you\n" "or the law tell us to." msgstr "" -#: app/views/request/show.rhtml:54 +#: app/views/request/show.rhtml:61 msgid "We're waiting for" msgstr "" -#: app/views/request/show.rhtml:50 +#: app/views/request/show.rhtml:57 msgid "We're waiting for someone to read" msgstr "" @@ -2985,7 +3196,7 @@ msgid "" "password." msgstr "" -#: app/views/request/_followup.rhtml:61 +#: app/views/request/_followup.rhtml:58 msgid "What are you doing?" msgstr "" @@ -2993,12 +3204,6 @@ msgstr "" msgid "What best describes the status of this request now?" msgstr "" -#: app/views/public_body/view_email.rhtml:7 -msgid "" -"WhatDoTheyKnow sends new requests to <strong>{{request_email}}</strong> for " -"this authority." -msgstr "" - #: app/views/request_mailer/new_response.rhtml:9 msgid "" "When you get there, please update the status to say if the response \n" @@ -3021,19 +3226,19 @@ msgstr "" msgid "Which of these is happening?" msgstr "" -#: app/models/info_request_event.rb:308 +#: app/models/info_request_event.rb:313 msgid "Withdrawn by requester" msgstr "" -#: app/models/info_request.rb:802 +#: app/models/info_request.rb:809 msgid "Withdrawn by the requester." msgstr "" -#: app/controllers/request_controller.rb:542 +#: app/controllers/request_controller.rb:549 msgid "Write a reply to " msgstr "" -#: app/controllers/request_controller.rb:541 +#: app/controllers/request_controller.rb:548 msgid "Write your FOI follow up message to " msgstr "" @@ -3041,7 +3246,7 @@ msgstr "" msgid "Write your request in <strong>simple, precise language</strong>." msgstr "" -#: app/models/info_request_event.rb:296 +#: app/models/info_request_event.rb:301 msgid "Wrong Response" msgstr "" @@ -3049,22 +3254,42 @@ msgstr "" msgid "You" msgstr "" -#: app/controllers/track_controller.rb:96 +#: app/controllers/track_controller.rb:98 msgid "You are already being emailed updates about " msgstr "" +#: app/models/track_thing.rb:175 +msgid "You are already tracking requests to {{public_body_name}} by email" +msgstr "" + +#: app/models/track_thing.rb:207 +msgid "You are already tracking things matching '{{query}}' by email" +msgstr "" + +#: app/models/track_thing.rb:191 +msgid "You are already tracking this person by email" +msgstr "" + +#: app/models/track_thing.rb:124 +msgid "You are already tracking this request by email" +msgstr "" + #: app/models/track_thing.rb:156 msgid "You are being emailed about any new successful responses" msgstr "" -#: app/views/request/show.rhtml:81 +#: app/models/track_thing.rb:140 +msgid "You are being emailed when there are new requests" +msgstr "" + +#: app/views/request/show.rhtml:88 msgid "You can <strong>complain</strong> by" msgstr "" -#: app/views/request/details.rhtml:57 +#: app/views/request/details.rhtml:58 msgid "" "You can get this page in computer-readable format as part of the main JSON\n" -"page for the request. See the <a href=\"%s\">API documentation</a>." +"page for the request. See the <a href=\"{{api_path}}\">API documentation</a>." msgstr "" #: app/views/public_body/show.rhtml:40 @@ -3080,17 +3305,17 @@ msgstr "" msgid "You have a new response to the {{law_used_full}} request " msgstr "" -#: app/controllers/user_controller.rb:491 +#: app/controllers/user_controller.rb:492 msgid "You have now changed the text about you on your profile." msgstr "" -#: app/controllers/user_controller.rb:309 +#: app/controllers/user_controller.rb:310 msgid "You have now changed your email address used on {{site_name}}" msgstr "" #: app/views/user_mailer/already_registered.rhtml:3 msgid "" -"You just tried to sign up to WhatDoTheyKnow.com, when you\n" +"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" @@ -3123,19 +3348,19 @@ msgid "" "to find one, then please <a href=\"%s\">send it to us</a>." msgstr "" -#: app/controllers/user_controller.rb:469 +#: app/controllers/user_controller.rb:470 msgid "You need to be logged in to change the text about you on your profile." msgstr "" -#: app/controllers/user_controller.rb:370 +#: app/controllers/user_controller.rb:371 msgid "You need to be logged in to change your profile photo." msgstr "" -#: app/controllers/user_controller.rb:432 +#: app/controllers/user_controller.rb:433 msgid "You need to be logged in to clear your profile photo." msgstr "" -#: app/controllers/request_controller.rb:552 +#: app/controllers/request_controller.rb:559 msgid "" "You previously submitted that exact follow up message for this request." msgstr "" @@ -3160,15 +3385,15 @@ msgid "" "email alerts." msgstr "" -#: app/controllers/track_controller.rb:152 +#: app/controllers/track_controller.rb:154 msgid "You will no longer be emailed updates about " msgstr "" -#: app/controllers/track_controller.rb:181 +#: app/controllers/track_controller.rb:183 msgid "You will no longer be emailed updates for those alerts" msgstr "" -#: app/controllers/track_controller.rb:109 +#: app/controllers/track_controller.rb:111 msgid "You will now be emailed updates about " msgstr "" @@ -3178,7 +3403,7 @@ msgid "" "with the clarification." msgstr "" -#: app/controllers/user_controller.rb:441 +#: app/controllers/user_controller.rb:442 msgid "You've now cleared your profile photo" msgstr "" @@ -3201,9 +3426,8 @@ msgid "" "message, which will then go directly to the person who wrote the message." msgstr "" -#: app/views/user/_signin.rhtml:11 +#: app/views/user/_signin.rhtml:11 app/views/user/_signup.rhtml:9 #: app/views/user/signchangepassword_send_confirm.rhtml:13 -#: app/views/user/_signup.rhtml:9 msgid "Your e-mail:" msgstr "" @@ -3211,28 +3435,28 @@ msgstr "" msgid "Your email subscriptions" msgstr "" -#: app/controllers/request_controller.rb:549 +#: app/controllers/request_controller.rb:556 msgid "" "Your follow up has not been sent because this request has been stopped to " "prevent spam. Please <a href=\"%s\">contact us</a> if you really want to " "send a follow up message." msgstr "" -#: app/controllers/request_controller.rb:577 +#: app/controllers/request_controller.rb:584 msgid "Your follow up message has been sent on its way." msgstr "" -#: app/controllers/request_controller.rb:575 +#: app/controllers/request_controller.rb:582 msgid "Your internal review request has been sent on its way." msgstr "" -#: app/controllers/help_controller.rb:61 +#: app/controllers/help_controller.rb:63 msgid "" "Your message has been sent. Thank you for getting in touch! We'll get back " "to you soon." msgstr "" -#: app/controllers/user_controller.rb:348 +#: app/controllers/user_controller.rb:349 msgid "Your message to {{recipient_user_name}} has been sent!" msgstr "" @@ -3259,7 +3483,7 @@ msgstr "" msgid "Your original message is attached." msgstr "" -#: app/controllers/user_controller.rb:230 +#: app/controllers/user_controller.rb:231 msgid "Your password has been changed." msgstr "" @@ -3270,7 +3494,7 @@ msgstr "" #: app/views/user/set_draft_profile_photo.rhtml:18 msgid "" "Your photo will be shown in public <strong>on the Internet</strong>, \n" -" wherever you do something on WhatDoTheyKnow." +" wherever you do something on {{site_name}}." msgstr "" #: app/views/request_mailer/new_response_reminder_alert.rhtml:5 @@ -3291,10 +3515,14 @@ msgstr "" #: app/views/comment/new.rhtml:62 msgid "" -"Your thoughts on what the WhatDoTheyKnow <strong>administrators</strong> " +"Your thoughts on what the {{site_name}} <strong>administrators</strong> " "should do about the request." msgstr "" +#: app/models/track_mailer.rb:25 +msgid "Your {{site_name}} email alert" +msgstr "" + #: app/models/outgoing_message.rb:69 msgid "Yours faithfully," msgstr "" @@ -3321,13 +3549,13 @@ msgstr "" msgid "and sign in as " msgstr "" -#: app/views/request/show.rhtml:52 +#: app/views/request/show.rhtml:59 msgid "" "and update the status accordingly. Perhaps <strong>you</strong> might like " "to help out by doing that?" msgstr "" -#: app/views/request/show.rhtml:57 +#: app/views/request/show.rhtml:64 msgid "and update the status." msgstr "" @@ -3343,19 +3571,27 @@ msgstr "" msgid "annotations" msgstr "" +#: app/models/track_thing.rb:138 +msgid "any <a href=\"/list\">new requests</a>" +msgstr "" + +#: app/models/track_thing.rb:154 +msgid "any <a href=\"/list/successful\">successful requests</a>" +msgstr "" + #: app/views/request_mailer/very_overdue_alert.rhtml:1 msgid "are long overdue." msgstr "" -#: app/controllers/public_body_controller.rb:109 +#: app/controllers/public_body_controller.rb:111 msgid "beginning with" msgstr "" -#: app/views/request/show.rhtml:75 +#: app/views/request/show.rhtml:82 msgid "by" msgstr "" -#: app/views/request/_followup.rhtml:41 +#: app/views/request/_followup.rhtml:38 msgid "by <strong>{{date}}</strong>" msgstr "" @@ -3367,11 +3603,11 @@ msgstr "" msgid "by {{user_link_absolute}}" msgstr "" -#: locale/model_attributes.rb:42 +#: locale/model_attributes.rb:35 msgid "censor rule" msgstr "" -#: locale/model_attributes.rb:26 +#: locale/model_attributes.rb:20 msgid "comment" msgstr "" @@ -3381,7 +3617,7 @@ msgid "" " Or you could phone them." msgstr "" -#: app/models/info_request_event.rb:333 +#: app/models/info_request_event.rb:338 msgid "display_status only works for incoming and outgoing messages right now" msgstr "" @@ -3405,11 +3641,11 @@ msgstr "" msgid "even during holidays" msgstr "" -#: locale/model_attributes.rb:14 +#: locale/model_attributes.rb:17 msgid "exim log" msgstr "" -#: locale/model_attributes.rb:60 +#: locale/model_attributes.rb:59 msgid "exim log done" msgstr "" @@ -3421,12 +3657,12 @@ msgstr "" msgid "have delayed." msgstr "" -#: locale/model_attributes.rb:57 +#: locale/model_attributes.rb:56 msgid "holiday" msgstr "" -#: app/views/request/_followup.rhtml:39 app/views/request/show.rhtml:63 -#: app/views/request/show.rhtml:73 +#: app/views/request/_followup.rhtml:36 app/views/request/show.rhtml:70 +#: app/views/request/show.rhtml:80 msgid "in term time" msgstr "" @@ -3434,15 +3670,15 @@ msgstr "" msgid "in total" msgstr "" -#: locale/model_attributes.rb:63 +#: locale/model_attributes.rb:62 msgid "incoming message" msgstr "" -#: locale/model_attributes.rb:80 +#: locale/model_attributes.rb:79 msgid "info request" msgstr "" -#: locale/model_attributes.rb:35 +#: locale/model_attributes.rb:40 msgid "info request event" msgstr "" @@ -3451,7 +3687,7 @@ msgstr "" msgid "internal error" msgstr "" -#: app/views/request/show.rhtml:93 +#: app/views/request/show.rhtml:100 msgid "is <strong>waiting for your clarification</strong>." msgstr "" @@ -3468,7 +3704,7 @@ msgstr "" msgid "made." msgstr "" -#: app/views/request/show.rhtml:67 +#: app/views/request/show.rhtml:74 msgid "no later than" msgstr "" @@ -3480,7 +3716,7 @@ msgid "" " an email which will go to the right place, please <a href=\"%s\">send it to us</a>." msgstr "" -#: app/views/request/show.rhtml:65 +#: app/views/request/show.rhtml:72 msgid "normally" msgstr "" @@ -3488,7 +3724,7 @@ msgstr "" msgid "only" msgstr "" -#: locale/model_attributes.rb:20 +#: locale/model_attributes.rb:25 msgid "outgoing message" msgstr "" @@ -3500,11 +3736,11 @@ msgstr "" msgid "please sign in or make a new account." msgstr "" -#: locale/model_attributes.rb:50 +#: locale/model_attributes.rb:49 msgid "post redirect" msgstr "" -#: locale/model_attributes.rb:17 +#: locale/model_attributes.rb:14 msgid "profile photo" msgstr "" @@ -3520,7 +3756,7 @@ msgstr "" msgid "request." msgstr "" -#: app/views/request/show.rhtml:82 +#: app/views/request/show.rhtml:89 msgid "requesting an internal review" msgstr "" @@ -3530,7 +3766,7 @@ msgid "" "email to let them know what you are going to do about it." msgstr "" -#: app/views/request/show.rhtml:95 +#: app/views/request/show.rhtml:102 msgid "send a follow up message" msgstr "" @@ -3538,7 +3774,7 @@ msgstr "" msgid "sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "" -#: app/views/request/show.rhtml:99 +#: app/views/request/show.rhtml:106 msgid "sign in" msgstr "" @@ -3550,34 +3786,27 @@ msgstr "" msgid "that you made to" msgstr "" -#: app/views/user_mailer/already_registered.rhtml:11 -#: app/views/user_mailer/confirm_login.rhtml:11 -#: app/views/user_mailer/changeemail_already_used.rhtml:9 -#: app/views/user_mailer/changeemail_confirm.rhtml:12 -#: app/views/request_mailer/stopped_responses.rhtml:16 -#: app/views/request_mailer/not_clarified_alert.rhtml:9 #: app/views/request_mailer/comment_on_alert.rhtml:6 +#: app/views/request_mailer/comment_on_alert_plural.rhtml:5 +#: app/views/request_mailer/new_response.rhtml:15 +#: app/views/request_mailer/new_response_reminder_alert.rhtml:8 +#: app/views/request_mailer/not_clarified_alert.rhtml:9 #: app/views/request_mailer/old_unclassified_updated.rhtml:8 -#: app/views/request_mailer/very_overdue_alert.rhtml:11 #: app/views/request_mailer/overdue_alert.rhtml:9 -#: app/views/request_mailer/new_response_reminder_alert.rhtml:8 -#: app/views/request_mailer/new_response.rhtml:15 -#: app/views/request_mailer/comment_on_alert_plural.rhtml:5 -msgid "the WhatDoTheyKnow team" +#: app/views/request_mailer/stopped_responses.rhtml:16 +#: app/views/request_mailer/very_overdue_alert.rhtml:11 +#: app/views/track_mailer/event_digest.rhtml:66 +#: app/views/user_mailer/already_registered.rhtml:11 +#: app/views/user_mailer/changeemail_already_used.rhtml:10 +#: app/views/user_mailer/changeemail_confirm.rhtml:13 +#: app/views/user_mailer/confirm_login.rhtml:11 +msgid "the {{site_name}} team" msgstr "" #: app/views/user/show.rhtml:140 msgid "this person" msgstr "" -#: app/views/user_mailer/changeemail_already_used.rhtml:2 -msgid "to" -msgstr "" - -#: app/views/user_mailer/changeemail_confirm.rhtml:5 -msgid "to " -msgstr "" - #: app/views/user/show.rhtml:113 msgid "" "to change password, \n" @@ -3588,15 +3817,15 @@ msgstr "" msgid "to check that the info isn't already published." msgstr "" -#: app/views/request/show.rhtml:55 +#: app/views/request/show.rhtml:62 msgid "to read" msgstr "" -#: app/views/request/show.rhtml:99 +#: app/views/request/show.rhtml:106 msgid "to send a follow up message." msgstr "" -#: app/views/request/show.rhtml:39 +#: app/views/request/show.rhtml:45 msgid "to {{public_body}}" msgstr "" @@ -3616,7 +3845,7 @@ msgstr "" msgid "unknown reason " msgstr "" -#: app/models/info_request.rb:807 app/models/info_request_event.rb:328 +#: app/models/info_request.rb:814 app/models/info_request_event.rb:333 msgid "unknown status " msgstr "" @@ -3628,15 +3857,15 @@ msgstr "" msgid "unsubscribe all" msgstr "" -#: app/views/request/show.rhtml:46 +#: app/views/request/show.rhtml:53 msgid "useful information." msgstr "" -#: locale/model_attributes.rb:69 +#: locale/model_attributes.rb:68 msgid "user" msgstr "" -#: locale/model_attributes.rb:67 +#: locale/model_attributes.rb:66 msgid "user info request sent alert" msgstr "" @@ -3663,13 +3892,34 @@ msgstr "" msgid "{{public_body_name}} only:" msgstr "" +#: app/views/public_body/view_email.rhtml:7 +msgid "" +"{{site_name}} sends new requests to <strong>{{request_email}}</strong> for " +"this authority." +msgstr "" + +#: app/models/user.rb:122 +msgid "{{user_name}} (Banned)" +msgstr "" + #: app/views/request_mailer/comment_on_alert.rhtml:1 msgid "" "{{user_name}} has annotated your {{law_used_short}} \n" "request. Follow this link to see what they wrote." msgstr "" -#: app/views/request/show.rhtml:35 +#: app/views/contact_mailer/user_message.rhtml:2 +msgid "{{user_name}} has used {{site_name}} to send you the message below." +msgstr "" + +#: app/views/request/show.rhtml:36 +msgid "" +"{{user}} (<a href=\"{{user_admin_url}}\">admin</a>) made this " +"{{law_used_full}} request (<a href=\"{{request_admin_url}}\">admin</a>) to " +"{{public_body_link}} (<a href=\"{{public_body_admin_url}}\">admin</a>)" +msgstr "" + +#: app/views/request/show.rhtml:44 msgid "{{user}} made this {{law_used_full}} request" msgstr "" diff --git a/locale/sr@latin/app.po b/locale/sr@latin/app.po index f8284c268..d362dc935 100644 --- a/locale/sr@latin/app.po +++ b/locale/sr@latin/app.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2011-07-12 15:18+0100\n" -"PO-Revision-Date: 2011-07-27 00:27+0000\n" +"POT-Creation-Date: 2011-08-11 12:30+0200\n" +"PO-Revision-Date: 2011-08-12 00:21+0000\n" "Last-Translator: vbrestovci <vbrestovci@gmail.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -17,9 +17,16 @@ msgstr "" "Language: sr@latin\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +#: app/models/incoming_message.rb:866 +msgid "" +"\n" +"\n" +"[ {{site_name}} note: The above text was badly encoded, and has had strange characters removed. ]" +msgstr "" + #: app/views/user/set_profile_about_me.rhtml:14 msgid "" -" This will appear on your WhatDoTheyKnow profile, to make it\n" +" This will appear on your {{site_name}} profile, to make it\n" " easier for others to get involved with what you're doing." msgstr "" @@ -130,8 +137,8 @@ msgid " when you send this message." msgstr "" #: app/views/public_body/show.rhtml:80 -msgid "%d Freedom of Information request" -msgid_plural "%d Freedom of Information requests" +msgid "%d Freedom of Information request made using this site" +msgid_plural "%d Freedom of Information requests made using this site" msgstr[0] "" msgstr[1] "" msgstr[2] "" @@ -143,6 +150,13 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" +#: app/views/public_body/_body_listing_single.rhtml:21 +msgid "%d request made." +msgid_plural "%d requests made." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + #: app/views/request/new.rhtml:102 msgid "'Crime statistics by ward level for Wales'" msgstr "" @@ -151,7 +165,7 @@ msgstr "" msgid "'Pollution levels over time for the River Tyne'" msgstr "" -#: app/controllers/user_controller.rb:354 +#: app/controllers/user_controller.rb:355 msgid "" ",\n" "\n" @@ -184,135 +198,136 @@ msgstr "" msgid "<a href=\"%s\">Contact us</a> to tell us about the problem</li>" msgstr "" -#: app/views/public_body/show.rhtml:50 -msgid "" -"<a href=\"%s\">Make a new Freedom of Information request</a> to " -"{{public_body_name}}" -msgstr "" - #: app/views/public_body/list.rhtml:43 msgid "<a href=\"%s\">can't find the one you want?</a>" msgstr "" -#: app/views/request/_followup.rhtml:42 app/views/request/_followup.rhtml:49 -#: app/views/request/show.rhtml:76 app/views/request/show.rhtml:80 +#: app/views/request/_followup.rhtml:39 app/views/request/_followup.rhtml:46 +#: app/views/request/show.rhtml:83 app/views/request/show.rhtml:87 msgid "<a href=\"%s\">details</a>" msgstr "" -#: app/views/request/_followup.rhtml:77 +#: app/views/request/_followup.rhtml:74 msgid "<a href=\"%s\">what's that?</a>" msgstr "" +#: app/views/public_body/show.rhtml:50 +msgid "" +"<a href=\"{{url}}\">Make a new Freedom of Information request</a> to " +"{{public_body_name}}" +msgstr "" + #: app/controllers/request_game_controller.rb:23 msgid "" "<p>All done! Thank you very much for your help.</p><p>There are <a " -"href=\"%s\">more things you can do</a> to help WhatDoTheyKnow.</p>" +"href=\"{{helpus_url}}\">more things you can do</a> to help " +"{{site_name}}.</p>" msgstr "" -#: app/controllers/request_controller.rb:394 +#: app/controllers/request_controller.rb:399 msgid "" "<p>Thank you! Here are some ideas on what to do next:</p>\n" " <ul>\n" -" <li>To send your request to another authority, first copy the text of your request below, then <a href=\"%s\">find the other authority</a>.</li>\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=\"%s\">how to complain</a>.\n" +" <a href=\"{{complain_url}}\">how to complain</a>.\n" " </li>\n" -" <li>We have <a href=\"%s\">suggestions</a>\n" +" <li>We have <a href=\"{{other_means_url}}\">suggestions</a>\n" " on other means to answer your question.\n" " </li>\n" -" </ul>\n" -" " +" </ul>" msgstr "" -#: app/controllers/request_controller.rb:388 +#: app/controllers/request_controller.rb:393 msgid "" "<p>Thank you! Hope you don't have to wait much longer.</p> <p>By law, you " "should have got a response promptly, and normally before the end of " "<strong>{{date_response_required_by}}</strong>.</p>" msgstr "" -#: app/controllers/request_controller.rb:384 +#: app/controllers/request_controller.rb:389 msgid "" "<p>Thank you! Hopefully your wait isn't too long.</p> <p>By law, you should get a response promptly, and normally before the end of <strong>\n" "{{date_response_required_by}}</strong>.</p>" msgstr "" -#: app/controllers/request_controller.rb:421 +#: app/controllers/request_controller.rb:428 msgid "" "<p>Thank you! Hopefully your wait isn't too long.</p><p>You should get a " "response within 20 days, or be told if it will take longer (<a " -"href=\"%s\">details</a>).</p>" +"href=\"{{review_url}}\">details</a>).</p>" msgstr "" -#: app/controllers/request_controller.rb:424 +#: app/controllers/request_controller.rb:431 msgid "" "<p>Thank you! We'll look into what happened and try and fix it up.</p><p>If " "the error was a delivery failure, and you can find an up to date FOI email " "address for the authority, please tell us using the form below.</p>" msgstr "" -#: app/controllers/request_controller.rb:391 +#: app/controllers/request_controller.rb:396 msgid "" "<p>Thank you! Your request is long overdue, by more than 40 working days. " "Most requests should be answered within 20 working days. You might like to " "complain about this, see below.</p>" msgstr "" -#: app/controllers/user_controller.rb:494 +#: app/controllers/user_controller.rb:495 msgid "" "<p>Thanks for changing the text about you on your profile.</p>\n" " <p><strong>Next...</strong> You can upload a profile photograph too.</p>" msgstr "" -#: app/controllers/user_controller.rb:416 +#: app/controllers/user_controller.rb:417 msgid "" "<p>Thanks for updating your profile photo.</p>\n" " <p><strong>Next...</strong> You can put some text about you and your research on your profile.</p>" msgstr "" -#: app/controllers/request_controller.rb:279 +#: app/controllers/request_controller.rb:284 msgid "" "<p>We recommend that you edit your request and remove the email address.\n" " If you leave it, the email address will be sent to the authority, but will not be displayed on the site.</p>" msgstr "" -#: app/controllers/request_controller.rb:410 +#: app/controllers/request_controller.rb:417 msgid "" "<p>We're glad you got all the information that you wanted. If you write " "about or make use of the information, please come back and add an annotation" -" below saying what you did.</p><p>If you found WhatDoTheyKnow useful, <a " -"href=\"%s\">make a donation</a> to the charity which runs it.</p>" +" below saying what you did.</p><p>If you found {{site_name}} useful, <a " +"href=\"{{donation_url}}\">make a donation</a> to the charity which runs " +"it.</p>" msgstr "" -#: app/controllers/request_controller.rb:413 +#: app/controllers/request_controller.rb:420 msgid "" "<p>We're glad you got some of the information that you wanted. If you found " -"WhatDoTheyKnow useful, <a href=\"%s\">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>" +"{{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to " +"the charity which runs it.</p><p>If you want to try and get the rest of the " +"information, here's what to do now.</p>" msgstr "" -#: app/controllers/request_controller.rb:277 +#: app/controllers/request_controller.rb:282 msgid "" "<p>You do not need to include your email in the request in order to get a " "reply (<a href=\"%s\">details</a>).</p>" msgstr "" -#: app/controllers/request_controller.rb:275 +#: app/controllers/request_controller.rb:280 msgid "" "<p>You do not need to include your email in the request in order to get a " "reply, as we will ask for it on the next screen (<a " "href=\"%s\">details</a>).</p>" msgstr "" -#: app/controllers/request_controller.rb:283 +#: app/controllers/request_controller.rb:288 msgid "" "<p>Your request contains a <strong>postcode</strong>. Unless it directly " "relates to the subject of your request, please remove any address as it will" " <strong>appear publicly on the Internet</strong>.</p>" msgstr "" -#: app/controllers/request_controller.rb:306 +#: app/controllers/request_controller.rb:311 msgid "" "<p>Your {{law_used_full}} request has been <strong>sent on its way</strong>!</p>\n" " <p><strong>We will email you</strong> when there is a response, or after 20 working days if the authority still hasn't\n" @@ -321,6 +336,13 @@ msgid "" " annotation below telling people about your writing.</p>" msgstr "" +#: app/controllers/application_controller.rb:279 +msgid "" +"<p>{{site_name}} is currently in maintenance. You can only view existing " +"requests. You cannot make new ones, add followups or annotations, or " +"otherwise change the database.</p> <p>{{read_only}}</p>" +msgstr "" + #: app/views/user/confirm.rhtml:11 msgid "" "<small>If you use web-based email or have \"junk mail\" filters, also check your\n" @@ -367,8 +389,8 @@ msgstr "" #: app/views/general/search.rhtml:126 msgid "" "<strong><code>status:</code></strong> to select based on the status or " -"historical status of the request, see the <a href=\"%s\">table of " -"statuses</a> below." +"historical status of the request, see the <a href=\"{{statuses_url}}\">table" +" of statuses</a> below." msgstr "" #: app/views/general/search.rhtml:134 @@ -381,7 +403,7 @@ msgstr "" #: app/views/general/search.rhtml:127 msgid "" "<strong><code>variety:</code></strong> to select type of thing to search " -"for, see the <a href=\"%s\">table of varieties</a> below." +"for, see the <a href=\"{{varieties_url}}\">table of varieties</a> below." msgstr "" #: app/views/comment/new.rhtml:56 @@ -394,7 +416,7 @@ msgstr "" msgid "<strong>All the information</strong> has been sent" msgstr "" -#: app/views/request/_followup.rhtml:82 +#: app/views/request/_followup.rhtml:79 msgid "" "<strong>Anything else</strong>, such as clarifying, prompting, thanking" msgstr "" @@ -402,11 +424,11 @@ msgstr "" #: app/views/request/details.rhtml:12 msgid "" "<strong>Caveat emptor!</strong> To use this data in an honourable way, you will need \n" -"a good internal knowledge of user behaviour on WhatDoTheyKnow. How, \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=\"%s\">contact us</a> with questions." +"<a href=\"{{contact_path}}\">contact us</a> with questions." msgstr "" #: app/views/request/_other_describe_state.rhtml:28 @@ -441,7 +463,7 @@ msgstr "" #: app/views/user/set_crop_profile_photo.rhtml:35 msgid "" "<strong>Privacy note:</strong> Your photo will be shown in public on the Internet, \n" -" wherever you do something on WhatDoTheyKnow." +" wherever you do something on {{site_name}}." msgstr "" #: app/views/request/followup_preview.rhtml:37 @@ -468,7 +490,7 @@ msgid "" "scheme</a> or <strong>search</strong> their web site ..." msgstr "" -#: app/views/request/show.rhtml:84 +#: app/views/request/show.rhtml:91 msgid "<strong>did not have</strong> the information requested." msgstr "" @@ -481,15 +503,27 @@ msgid "" "A <strong>summary</strong> of the response if you have received it by post. " msgstr "" +#: app/views/general/search.rhtml:162 +msgid "A public authority" +msgstr "" + #: app/views/request/_other_describe_state.rhtml:34 msgid "A response will be sent <strong>by post</strong>" msgstr "" +#: app/views/general/search.rhtml:151 +msgid "A strange reponse, required attention by the {{site_name}} team" +msgstr "" + +#: app/views/general/search.rhtml:163 +msgid "A {{site_name}} user" +msgstr "" + #: app/views/user/set_profile_about_me.rhtml:20 msgid "About you:" msgstr "" -#: app/models/info_request_event.rb:288 +#: app/models/info_request_event.rb:293 msgid "Acknowledgement" msgstr "" @@ -507,6 +541,10 @@ msgid "" " a <strong>summary of the response</strong>." msgstr "" +#: app/views/public_body/_body_listing_single.rhtml:26 +msgid "Added on {{date}}" +msgstr "" + #: app/models/user.rb:54 msgid "Admin level is not included in list" msgstr "" @@ -531,14 +569,22 @@ msgid "" " human beings)" msgstr "" -#: app/models/info_request_event.rb:304 +#: app/models/info_request_event.rb:309 msgid "All information sent" msgstr "" +#: app/views/general/search.rhtml:146 +msgid "All of the information requested has been received" +msgstr "" + #: app/views/public_body/list.rhtml:5 msgid "Alphabet" msgstr "" +#: app/views/public_body/_body_listing_single.rhtml:12 +msgid "Also called {{other_name}}." +msgstr "" + #: app/views/request_mailer/new_response.rhtml:12 msgid "" "Although all responses are automatically published, we depend on\n" @@ -549,6 +595,10 @@ msgstr "" msgid "An <strong>error message</strong> has been received" msgstr "" +#: app/views/general/search.rhtml:161 +msgid "Annotation added to request" +msgstr "" + #: app/views/user/show.rhtml:34 msgid "Annotations" msgstr "" @@ -585,15 +635,15 @@ msgstr "" msgid "Attachment (optional):" msgstr "" -#: app/models/info_request.rb:776 +#: app/models/info_request.rb:783 msgid "Awaiting classification." msgstr "" -#: app/models/info_request.rb:796 +#: app/models/info_request.rb:803 msgid "Awaiting internal review." msgstr "" -#: app/models/info_request.rb:778 +#: app/models/info_request.rb:785 msgid "Awaiting response." msgstr "" @@ -605,17 +655,17 @@ msgstr "" #: app/views/request/new.rhtml:41 msgid "" -"Browse <a href='%s'>other requests</a> to '{{public_body_name}}' for " +"Browse <a href='{{url}}'>other requests</a> to '{{public_body_name}}' for " "examples of how to word your request." msgstr "" -#: app/views/request/show.rhtml:79 +#: app/views/request/show.rhtml:86 msgid "" "By law, under all circumstances, {{public_body_link}} should have responded " "by now" msgstr "" -#: app/views/request/show.rhtml:71 +#: app/views/request/show.rhtml:78 msgid "" "By law, {{public_body_link}} should normally have responded " "<strong>promptly</strong> and" @@ -627,27 +677,27 @@ msgid "" " it</a>." msgstr "" -#: app/controllers/track_controller.rb:143 +#: app/controllers/track_controller.rb:145 msgid "Cancel a {{site_name}} alert" msgstr "" -#: app/controllers/track_controller.rb:173 +#: app/controllers/track_controller.rb:175 msgid "Cancel some {{site_name}} alerts" msgstr "" -#: locale/model_attributes.rb:46 +#: locale/model_attributes.rb:39 msgid "CensorRule|Last edit comment" msgstr "" -#: locale/model_attributes.rb:45 +#: locale/model_attributes.rb:38 msgid "CensorRule|Last edit editor" msgstr "" -#: locale/model_attributes.rb:44 +#: locale/model_attributes.rb:37 msgid "CensorRule|Replacement" msgstr "" -#: locale/model_attributes.rb:43 +#: locale/model_attributes.rb:36 msgid "CensorRule|Text" msgstr "" @@ -655,6 +705,10 @@ msgstr "" msgid "Central government" msgstr "" +#: app/views/user/signchangeemail.rhtml:37 +msgid "Change email on {{site_name}}" +msgstr "" + #: app/views/user/signchangepassword.rhtml:27 msgid "Change password on {{site_name}}" msgstr "" @@ -664,14 +718,14 @@ msgid "Change profile photo" msgstr "" #: app/views/user/set_profile_about_me.rhtml:1 -msgid "Change the text about you on your profile at WhatDoTheyKnow.com" +msgid "Change the text about you on your profile at {{site_name}}" msgstr "" #: app/views/user/show.rhtml:107 msgid "Change your email" msgstr "" -#: app/controllers/user_controller.rb:249 +#: app/controllers/user_controller.rb:250 #: app/views/user/signchangeemail.rhtml:1 #: app/views/user/signchangeemail.rhtml:11 msgid "Change your email address used on {{site_name}}" @@ -688,7 +742,7 @@ msgstr "" msgid "Change your password on {{site_name}}" msgstr "" -#: app/controllers/user_controller.rb:203 +#: app/controllers/user_controller.rb:204 msgid "Change your password {{site_name}}" msgstr "" @@ -700,20 +754,20 @@ msgstr "" msgid "Check for mistakes if you typed or copied the address." msgstr "" -#: app/views/request/preview.rhtml:7 #: app/views/request/followup_preview.rhtml:14 +#: app/views/request/preview.rhtml:7 msgid "Check you haven't included any <strong>personal information</strong>." msgstr "" -#: app/models/info_request_event.rb:326 +#: app/models/info_request_event.rb:331 msgid "Clarification" msgstr "" -#: app/models/info_request_event.rb:290 +#: app/models/info_request_event.rb:295 msgid "Clarification required" msgstr "" -#: app/controllers/request_controller.rb:334 +#: app/controllers/request_controller.rb:339 msgid "Classify an FOI response from " msgstr "" @@ -729,32 +783,51 @@ msgid "" "to reply to your request." msgstr "" -#: locale/model_attributes.rb:28 +#: locale/model_attributes.rb:22 msgid "Comment|Body" msgstr "" -#: locale/model_attributes.rb:27 +#: locale/model_attributes.rb:21 msgid "Comment|Comment type" msgstr "" -#: locale/model_attributes.rb:30 +#: locale/model_attributes.rb:24 msgid "Comment|Locale" msgstr "" -#: locale/model_attributes.rb:29 +#: locale/model_attributes.rb:23 msgid "Comment|Visible" msgstr "" +#: app/models/track_thing.rb:147 +msgid "Confirm you want to be emailed about new requests" +msgstr "" + +#: app/models/track_thing.rb:214 +msgid "" +"Confirm you want to be emailed about new requests or responses matching " +"'{{query}}'" +msgstr "" + +#: app/models/track_thing.rb:198 +msgid "Confirm you want to be emailed about requests by '{{user_name}}'" +msgstr "" + +#: app/models/track_thing.rb:182 +msgid "" +"Confirm you want to be emailed about requests to '{{public_body_name}}'" +msgstr "" + #: app/models/track_thing.rb:163 msgid "Confirm you want to be emailed when an FOI request succeeds" msgstr "" -#: app/controllers/request_controller.rb:295 +#: app/controllers/request_controller.rb:300 msgid "Confirm your FOI request to " msgstr "" -#: app/controllers/request_controller.rb:696 -#: app/controllers/user_controller.rb:514 +#: app/controllers/request_controller.rb:703 +#: app/controllers/user_controller.rb:515 msgid "Confirm your account on {{site_name}}" msgstr "" @@ -763,13 +836,17 @@ msgid "Confirm your annotation to {{info_request_title}}" msgstr "" #: app/models/user_mailer.rb:34 -msgid "Confirm your new email address on WhatDoTheyKnow.com" +msgid "Confirm your new email address on {{site_name}}" msgstr "" -#: app/views/layouts/default.rhtml:146 +#: app/views/layouts/default.rhtml:127 msgid "Contact {{site_name}}" msgstr "Kontakt {{site_name}}" +#: app/models/request_mailer.rb:210 +msgid "Could not identify the request from the email address" +msgstr "" + #: app/models/profile_photo.rb:96 msgid "" "Couldn't understand the image file that you uploaded. PNG, JPEG, GIF and " @@ -786,13 +863,13 @@ msgid "" " environmental factors listed above)" msgstr "" -#: app/views/request/show.rhtml:61 +#: app/views/request/show.rhtml:68 msgid "" "Currently <strong>waiting for a response</strong> from {{public_body_link}}," " they must respond promptly and" msgstr "" -#: app/models/info_request_event.rb:294 +#: app/models/info_request_event.rb:299 msgid "Deadline Extended" msgstr "" @@ -800,11 +877,11 @@ msgstr "" msgid "Dear " msgstr "" -#: app/models/info_request.rb:780 +#: app/models/info_request.rb:787 msgid "Delayed." msgstr "" -#: app/models/info_request.rb:798 app/models/info_request_event.rb:310 +#: app/models/info_request.rb:805 app/models/info_request_event.rb:315 msgid "Delivery error" msgstr "" @@ -826,7 +903,7 @@ msgstr "" msgid "Download original attachment" msgstr "" -#: app/views/request/_followup.rhtml:88 +#: app/views/request/_followup.rhtml:85 msgid "" "Edit and add <strong>more details</strong> to the message above,\n" " explaining why you are dissatisfied with their response." @@ -840,11 +917,11 @@ msgstr "" msgid "Edit text about you" msgstr "" -#: app/models/user.rb:132 +#: app/models/user.rb:135 msgid "Either the email or password was not recognised, please try again." msgstr "" -#: app/models/user.rb:134 +#: app/models/user.rb:137 msgid "" "Either the email or password was not recognised, please try again. Or create" " a new account using the form on the right." @@ -862,6 +939,10 @@ msgstr "" msgid "Email me new successful responses " msgstr "" +#: app/models/track_thing.rb:139 +msgid "Email me when there are new requests" +msgstr "" + #: app/views/user/show.rhtml:36 msgid "Email subscriptions" msgstr "" @@ -908,19 +989,19 @@ msgid "" " this website forever (<a href=\"%s\">why?</a>)." msgstr "" -#: locale/model_attributes.rb:61 +#: locale/model_attributes.rb:60 msgid "EximLogDone|Filename" msgstr "" -#: locale/model_attributes.rb:62 +#: locale/model_attributes.rb:61 msgid "EximLogDone|Last stat" msgstr "" -#: locale/model_attributes.rb:16 +#: locale/model_attributes.rb:19 msgid "EximLog|Line" msgstr "" -#: locale/model_attributes.rb:15 +#: locale/model_attributes.rb:18 msgid "EximLog|Order" msgstr "" @@ -932,6 +1013,10 @@ msgstr "" msgid "FOI requests" msgstr "" +#: app/models/track_thing.rb:193 app/models/track_thing.rb:194 +msgid "FOI requests by '{{user_name}}'" +msgstr "" + #: app/models/profile_photo.rb:101 msgid "Failed to convert image to a PNG" msgstr "" @@ -957,18 +1042,23 @@ msgstr "" msgid "Follow this link to see the request:" msgstr "" -#: app/models/info_request_event.rb:330 +#: app/models/info_request_event.rb:335 msgid "Follow up" msgstr "" +#: app/views/general/search.rhtml:159 +msgid "Follow up message sent by requester" +msgstr "" + #: app/views/public_body/view_email.rhtml:14 msgid "Follow up messages to existing requests are sent to " msgstr "" #: app/views/request/_followup.rhtml:16 msgid "" -"Follow ups and new responses to this request have been stopped to prevent spam. Please\n" -" <a href=\"%s\">contact us</a> if you are {{user_link}} and need to send a follow up." +"Follow ups and new responses to this request have been stopped to prevent " +"spam. Please <a href=\"{{url}}\">contact us</a> if you are {{user_link}} and" +" need to send a follow up." msgstr "" #: app/views/public_body/show.rhtml:61 @@ -1028,23 +1118,23 @@ msgstr "" msgid "Go to our <a href=\"%s\">front page</a></li>" msgstr "" -#: app/models/info_request_event.rb:292 +#: app/models/info_request_event.rb:297 msgid "Handled by post" msgstr "" -#: app/models/info_request.rb:794 +#: app/models/info_request.rb:801 msgid "Handled by post." msgstr "" -#: app/views/layouts/default.rhtml:121 +#: app/views/layouts/default.rhtml:102 msgid "Hello!" msgstr "" -#: app/views/layouts/default.rhtml:118 +#: app/views/layouts/default.rhtml:99 msgid "Hello, {{username}}!" msgstr "" -#: app/views/layouts/default.rhtml:113 +#: app/views/layouts/default.rhtml:94 msgid "Help" msgstr "Pomoć" @@ -1052,8 +1142,8 @@ msgstr "Pomoć" 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" -"WhatDoTheyKnow for intermediate events, which weren't given an explicit\n" -"description by a user. See the <a href=\"%s\">search tips</a> for description of the states." +"{{site_name}} for intermediate events, which weren't given an explicit\n" +"description by a user. See the <a href=\"{{search_path}}\">search tips</a> for description of the states." msgstr "" #: app/views/request/_other_describe_state.rhtml:4 @@ -1064,11 +1154,11 @@ msgid "" " Thanks." msgstr "" -#: locale/model_attributes.rb:58 +#: locale/model_attributes.rb:57 msgid "Holiday|Day" msgstr "" -#: locale/model_attributes.rb:59 +#: locale/model_attributes.rb:58 msgid "Holiday|Description" msgstr "" @@ -1086,11 +1176,11 @@ msgstr "" msgid "Human health and safety" msgstr "" -#: app/views/request/_followup.rhtml:71 +#: app/views/request/_followup.rhtml:68 msgid "I am asking for <strong>new information</strong>" msgstr "" -#: app/views/request/_followup.rhtml:76 +#: app/views/request/_followup.rhtml:73 msgid "I am requesting an <strong>internal review</strong>" msgstr "" @@ -1149,7 +1239,7 @@ msgid "" "email {{contact_email}} for help." msgstr "" -#: app/views/request/_followup.rhtml:21 +#: app/views/request/_followup.rhtml:20 msgid "" "If you are dissatisfied by the response you got from\n" " the public authority, you have the right to\n" @@ -1172,7 +1262,7 @@ msgid "" " please <a href=\"%s\">read this first</a>." msgstr "" -#: app/views/request/show.rhtml:98 +#: app/views/request/show.rhtml:105 msgid "If you are {{user_link}}, please" msgstr "" @@ -1201,15 +1291,15 @@ msgid "" "more. Please try doing what you were doing from the beginning." msgstr "" -#: app/controllers/request_controller.rb:430 +#: app/controllers/request_controller.rb:437 msgid "" "If you have not done so already, please write a message below telling the " "authority that you have withdrawn your request. Otherwise they will not know" " it has been withdrawn." msgstr "" -#: app/views/user/signchangepassword_confirm.rhtml:10 #: app/views/user/signchangeemail_confirm.rhtml:11 +#: app/views/user/signchangepassword_confirm.rhtml:10 msgid "" "If you use web-based email or have \"junk mail\" filters, also check your\n" "bulk/spam mail folders. Sometimes, our messages are marked that way." @@ -1222,11 +1312,11 @@ msgid "" msgstr "" #: app/views/user/_signup.rhtml:6 -msgid "If you're new to WhatDoTheyKnow" +msgid "If you're new to {{site_name}}" msgstr "" #: app/views/user/_signin.rhtml:7 -msgid "If you've used WhatDoTheyKnow before" +msgid "If you've used {{site_name}} before" msgstr "" #: app/views/user/no_cookies.rhtml:12 @@ -1235,79 +1325,79 @@ msgid "" "then there is probably a fault with our server." msgstr "" -#: locale/model_attributes.rb:64 +#: locale/model_attributes.rb:63 msgid "IncomingMessage|Cached attachment text clipped" msgstr "" -#: locale/model_attributes.rb:65 +#: locale/model_attributes.rb:64 msgid "IncomingMessage|Cached main body text folded" msgstr "" -#: locale/model_attributes.rb:66 +#: locale/model_attributes.rb:65 msgid "IncomingMessage|Cached main body text unfolded" msgstr "" -#: locale/model_attributes.rb:39 +#: locale/model_attributes.rb:44 msgid "InfoRequestEvent|Calculated state" msgstr "" -#: locale/model_attributes.rb:38 +#: locale/model_attributes.rb:43 msgid "InfoRequestEvent|Described state" msgstr "" -#: locale/model_attributes.rb:36 +#: locale/model_attributes.rb:41 msgid "InfoRequestEvent|Event type" msgstr "" -#: locale/model_attributes.rb:40 +#: locale/model_attributes.rb:45 msgid "InfoRequestEvent|Last described at" msgstr "" -#: locale/model_attributes.rb:37 +#: locale/model_attributes.rb:42 msgid "InfoRequestEvent|Params yaml" msgstr "" -#: locale/model_attributes.rb:41 +#: locale/model_attributes.rb:46 msgid "InfoRequestEvent|Prominence" msgstr "" -#: locale/model_attributes.rb:87 +#: locale/model_attributes.rb:86 msgid "InfoRequest|Allow new responses from" msgstr "" -#: locale/model_attributes.rb:83 +#: locale/model_attributes.rb:82 msgid "InfoRequest|Awaiting description" msgstr "" -#: locale/model_attributes.rb:82 +#: locale/model_attributes.rb:81 msgid "InfoRequest|Described state" msgstr "" -#: locale/model_attributes.rb:88 +#: locale/model_attributes.rb:87 msgid "InfoRequest|Handle rejected responses" msgstr "" -#: locale/model_attributes.rb:86 +#: locale/model_attributes.rb:85 msgid "InfoRequest|Law used" msgstr "" -#: locale/model_attributes.rb:84 +#: locale/model_attributes.rb:83 msgid "InfoRequest|Prominence" msgstr "" -#: locale/model_attributes.rb:81 +#: locale/model_attributes.rb:80 msgid "InfoRequest|Title" msgstr "" -#: locale/model_attributes.rb:85 +#: locale/model_attributes.rb:84 msgid "InfoRequest|Url title" msgstr "" -#: app/models/info_request_event.rb:298 +#: app/models/info_request_event.rb:303 msgid "Information not held" msgstr "" -#: app/models/info_request.rb:784 +#: app/models/info_request.rb:791 msgid "Information not held." msgstr "" @@ -1317,17 +1407,17 @@ msgid "" " radiation, waste materials)" msgstr "" -#: app/models/info_request_event.rb:306 +#: app/models/info_request_event.rb:311 msgid "Internal review acknowledgement" msgstr "" -#: app/models/info_request_event.rb:323 +#: app/models/info_request_event.rb:328 msgid "Internal review request" msgstr "" #: app/views/outgoing_mailer/initial_request.rhtml:8 msgid "" -"Is {{email_address}} the wrong address for {{type_of_request}} requests tp " +"Is {{email_address}} the wrong address for {{type_of_request}} requests to " "{{public_body_name}}? If so, please contact us using this form:" msgstr "" @@ -1338,14 +1428,14 @@ msgid "" "browser. Then press refresh to have another go." msgstr "" -#: app/views/user/show.rhtml:62 -msgid "Joined WhatDoTheyKnow in" -msgstr "" - #: app/views/user/_user_listing_single.rhtml:21 msgid "Joined in" msgstr "" +#: app/views/user/show.rhtml:62 +msgid "Joined {{site_name}} in" +msgstr "" + #: app/views/request/new.rhtml:48 msgid "" "Keep it <strong>focused</strong>, you'll be more likely to get what you want" @@ -1379,7 +1469,7 @@ msgstr "" msgid "Local and regional" msgstr "" -#: app/models/info_request.rb:782 +#: app/models/info_request.rb:789 msgid "Long overdue." msgstr "" @@ -1395,7 +1485,7 @@ msgstr "" msgid "Make and browse Freedom of Information (FOI) requests" msgstr "" -#: app/views/layouts/default.rhtml:86 +#: app/views/layouts/default.rhtml:67 msgid "Make and explore Freedom of Information requests" msgstr "" @@ -1403,7 +1493,7 @@ msgstr "" msgid "Make or explore Freedom of Information requests" msgstr "" -#: app/views/layouts/default.rhtml:106 +#: app/views/layouts/default.rhtml:87 msgid "Make request" msgstr "Napravi zahtev" @@ -1412,7 +1502,7 @@ msgid "Make your own request" msgstr "" #: app/views/contact_mailer/message.rhtml:4 -msgid "Message sent using WhatDoTheyKnow contact form, " +msgid "Message sent using {{site_name}} contact form, " msgstr "" #: app/views/request/new_bad_contact.rhtml:1 @@ -1435,7 +1525,7 @@ msgstr "" msgid "My request has been <strong>refused</strong>" msgstr "" -#: app/views/layouts/default.rhtml:110 +#: app/views/layouts/default.rhtml:91 msgid "My requests" msgstr "Moji zahtevi" @@ -1447,6 +1537,10 @@ msgstr "Ime ne može biti prazno" msgid "Name is already taken" msgstr "" +#: app/models/track_thing.rb:142 app/models/track_thing.rb:143 +msgid "New Freedom of Information requests" +msgstr "" + #: app/views/user/signchangeemail.rhtml:20 msgid "New e-mail:" msgstr "" @@ -1501,14 +1595,14 @@ msgid "" "using this site yet." msgstr "" -#: app/views/request/_request_listing.rhtml:2 #: app/views/public_body/_body_listing.rhtml:2 +#: app/views/request/_request_listing.rhtml:2 msgid "None found." msgstr "" +#: app/views/user/signchangeemail_confirm.rhtml:3 #: app/views/user/signchangepassword_confirm.rhtml:1 #: app/views/user/signchangepassword_confirm.rhtml:3 -#: app/views/user/signchangeemail_confirm.rhtml:3 msgid "Now check your email!" msgstr "" @@ -1538,7 +1632,7 @@ msgid "" "{{site_name}}" msgstr "" -#: app/controllers/request_controller.rb:407 +#: app/controllers/request_controller.rb:414 msgid "" "Oh no! Sorry to hear that your request was refused. Here is what to do now." msgstr "" @@ -1569,27 +1663,43 @@ msgstr "" msgid "Only requests made using {{site_name}} are shown." msgstr "" -#: locale/model_attributes.rb:21 +#: app/models/info_request.rb:405 +msgid "" +"Only the authority can reply to this request, and I don't recognise the " +"address this reply was sent from" +msgstr "" + +#: app/models/info_request.rb:401 +msgid "" +"Only the authority can reply to this request, but there is no \"From\" " +"address to check against" +msgstr "" + +#: app/views/general/search.rhtml:158 +msgid "Original request sent" +msgstr "" + +#: locale/model_attributes.rb:26 msgid "OutgoingMessage|Body" msgstr "" -#: locale/model_attributes.rb:24 +#: locale/model_attributes.rb:29 msgid "OutgoingMessage|Last sent at" msgstr "" -#: locale/model_attributes.rb:23 +#: locale/model_attributes.rb:28 msgid "OutgoingMessage|Message type" msgstr "" -#: locale/model_attributes.rb:22 +#: locale/model_attributes.rb:27 msgid "OutgoingMessage|Status" msgstr "" -#: locale/model_attributes.rb:25 +#: locale/model_attributes.rb:30 msgid "OutgoingMessage|What doing" msgstr "" -#: app/models/info_request.rb:788 +#: app/models/info_request.rb:795 msgid "Partially successful." msgstr "" @@ -1613,7 +1723,7 @@ msgstr "" msgid "Plans and administrative measures that affect these matters" msgstr "" -#: app/controllers/request_game_controller.rb:40 +#: app/controllers/request_game_controller.rb:42 msgid "Play the request categorisation game" msgstr "" @@ -1621,7 +1731,7 @@ msgstr "" msgid "Play the request categorisation game!" msgstr "" -#: app/views/request/show.rhtml:94 +#: app/views/request/show.rhtml:101 msgid "Please" msgstr "" @@ -1629,7 +1739,7 @@ msgstr "" msgid "Please <a href=\"%s\">get in touch</a> with us so we can fix it." msgstr "" -#: app/views/request/show.rhtml:45 +#: app/views/request/show.rhtml:52 msgid "" "Please <strong>answer the question above</strong> so we know whether the " msgstr "" @@ -1640,11 +1750,12 @@ msgid "" " know if there was information in the recent responses to them." msgstr "" -#: app/views/request/_followup.rhtml:28 +#: app/views/request/_followup.rhtml:27 msgid "" -"Please <strong>only</strong> write messages directly relating to your \n" -"\t\t\t\trequest {{request_link}}. If you would like to ask for information\n" -"\t\t\t\tthat was not in your original request, then <a href=\"%s\">file a new request</a>." +"Please <strong>only</strong> write messages directly relating to your " +"request {{request_link}}. If you would like to ask for information that was " +"not in your original request, then <a href=\"{{new_request_link}}\">file a " +"new request</a>." msgstr "" #: app/views/request/new.rhtml:60 @@ -1665,7 +1776,7 @@ msgstr "" msgid "Please choose what sort of reply you are making." msgstr "" -#: app/controllers/request_controller.rb:341 +#: app/controllers/request_controller.rb:346 msgid "" "Please choose whether or not you got some of the information that you " "wanted." @@ -1674,15 +1785,15 @@ msgstr "" #: app/views/user_mailer/changeemail_confirm.rhtml:3 msgid "" "Please click on the link below to confirm that you want to \n" -"change the email address that you use for WhatDoTheyKnow\n" -"from " +"change the email address that you use for {{site_name}}\n" +"from {{old_email}} to {{new_email}}" msgstr "" #: app/views/user_mailer/confirm_login.rhtml:3 msgid "Please click on the link below to confirm your email address." msgstr "" -#: app/models/info_request.rb:127 +#: app/models/info_request.rb:126 msgid "" "Please describe more what the request is about in the subject. There is no " "need to say it is an FOI request, we add that on anyway." @@ -1706,7 +1817,7 @@ msgstr "" msgid "Please enter a subject" msgstr "Molimo Vas da unesete naslov" -#: app/models/info_request.rb:35 +#: app/models/info_request.rb:34 msgid "Please enter a summary of your request" msgstr "Molimo Vas da unesete opis vaseg zahteva" @@ -1766,7 +1877,7 @@ msgstr "" msgid "Please keep it shorter than 500 characters" msgstr "" -#: app/models/info_request.rb:124 +#: app/models/info_request.rb:123 msgid "" "Please keep the summary short, like in the subject of an email. You can use " "a phrase, rather than a full sentence." @@ -1794,11 +1905,11 @@ msgstr "" msgid "Please sign in as " msgstr "" -#: app/controllers/request_controller.rb:723 +#: app/controllers/request_controller.rb:730 msgid "Please type a message and/or choose a file containing your response." msgstr "" -#: app/controllers/request_controller.rb:427 +#: app/controllers/request_controller.rb:434 msgid "Please use the form below to tell us more." msgstr "" @@ -1807,11 +1918,11 @@ msgstr "" msgid "Please use this email address for all replies to this request:" msgstr "" -#: app/models/info_request.rb:36 +#: app/models/info_request.rb:35 msgid "Please write a summary with some text in it" msgstr "" -#: app/models/info_request.rb:121 +#: app/models/info_request.rb:120 msgid "" "Please write the summary using a mixture of capital and lower case letters. " "This makes it easier for others to read." @@ -1823,7 +1934,7 @@ msgid "" "letters. This makes it easier for others to read." msgstr "" -#: app/controllers/request_controller.rb:416 +#: app/controllers/request_controller.rb:423 msgid "" "Please write your follow up message containing the necessary clarifications " "below." @@ -1845,27 +1956,27 @@ msgstr "" msgid "Post annotation" msgstr "" -#: locale/model_attributes.rb:56 +#: locale/model_attributes.rb:55 msgid "PostRedirect|Circumstance" msgstr "" -#: locale/model_attributes.rb:54 +#: locale/model_attributes.rb:53 msgid "PostRedirect|Email token" msgstr "" -#: locale/model_attributes.rb:53 +#: locale/model_attributes.rb:52 msgid "PostRedirect|Post params yaml" msgstr "" -#: locale/model_attributes.rb:55 +#: locale/model_attributes.rb:54 msgid "PostRedirect|Reason params yaml" msgstr "" -#: locale/model_attributes.rb:51 +#: locale/model_attributes.rb:50 msgid "PostRedirect|Token" msgstr "" -#: locale/model_attributes.rb:52 +#: locale/model_attributes.rb:51 msgid "PostRedirect|Uri" msgstr "" @@ -1885,7 +1996,7 @@ msgstr "" msgid "Preview your annotation" msgstr "" -#: app/views/request/_followup.rhtml:99 +#: app/views/request/_followup.rhtml:96 msgid "Preview your message" msgstr "" @@ -1893,11 +2004,11 @@ msgstr "" msgid "Preview your public request" msgstr "" -#: locale/model_attributes.rb:18 +#: locale/model_attributes.rb:15 msgid "ProfilePhoto|Data" msgstr "" -#: locale/model_attributes.rb:19 +#: locale/model_attributes.rb:16 msgid "ProfilePhoto|Draft" msgstr "" @@ -1959,12 +2070,8 @@ msgstr "" msgid "Publication scheme" msgstr "" -#: locale/model_attributes.rb:49 -msgid "RawEmail|Data binary" -msgstr "" - #: locale/model_attributes.rb:48 -msgid "RawEmail|Data text" +msgid "RawEmail|Data binary" msgstr "" #: app/views/comment/preview.rhtml:20 @@ -1981,11 +2088,11 @@ msgstr "" #: app/views/general/search.rhtml:137 msgid "" -"Read about <a href=\"%s\">advanced search operators</a>, such as proximity " -"and wildcards." +"Read about <a href=\"{{advanced_search_url}}\">advanced search " +"operators</a>, such as proximity and wildcards." msgstr "" -#: app/views/layouts/default.rhtml:112 +#: app/views/layouts/default.rhtml:93 msgid "Read blog" msgstr "" @@ -1993,11 +2100,15 @@ msgstr "" msgid "Read this before writing your {{info_request_law_used_full}} request" msgstr "" +#: app/views/general/search.rhtml:150 +msgid "Received an error message, such as delivery failure." +msgstr "" + #: app/views/general/search.rhtml:42 msgid "Recently described results first" msgstr "" -#: app/controllers/request_controller.rb:134 +#: app/controllers/request_controller.rb:139 msgid "Recently sent Freedom of Information requests" msgstr "" @@ -2005,15 +2116,15 @@ msgstr "" msgid "Recently sent requests" msgstr "" -#: app/controllers/request_controller.rb:139 +#: app/controllers/request_controller.rb:144 msgid "Recently successful responses" msgstr "" -#: app/models/info_request_event.rb:300 +#: app/models/info_request_event.rb:305 msgid "Refused" msgstr "" -#: app/models/info_request.rb:786 +#: app/models/info_request.rb:793 msgid "Refused." msgstr "" @@ -2063,6 +2174,10 @@ msgstr "" msgid "Requested on {{date}}" msgstr "" +#: app/models/track_thing.rb:209 app/models/track_thing.rb:210 +msgid "Requests or responses matching '{{query}}'" +msgstr "" + #: app/views/request/upload_response.rhtml:11 msgid "Respond by email" msgstr "" @@ -2079,11 +2194,15 @@ msgstr "" msgid "Respond using the web" msgstr "" -#: app/views/request/show.rhtml:70 +#: app/views/general/search.rhtml:160 +msgid "Response from a public authority" +msgstr "" + +#: app/views/request/show.rhtml:77 msgid "Response to this request is <strong>delayed</strong>." msgstr "" -#: app/views/request/show.rhtml:78 +#: app/views/request/show.rhtml:85 msgid "Response to this request is <strong>long overdue</strong>." msgstr "" @@ -2103,9 +2222,9 @@ msgstr "" msgid "Save" msgstr "" -#: app/views/request/new.rhtml:31 app/views/layouts/default.rhtml:99 #: app/views/general/exception_caught.rhtml:10 #: app/views/general/frontpage.rhtml:16 app/views/general/search.rhtml:29 +#: app/views/layouts/default.rhtml:80 app/views/request/new.rhtml:31 msgid "Search" msgstr "Pretraga" @@ -2117,7 +2236,7 @@ msgstr "" msgid "Search the site to find what you were looking for." msgstr "" -#: app/controllers/user_controller.rb:330 +#: app/controllers/user_controller.rb:331 msgid "Send a message to " msgstr "" @@ -2157,7 +2276,7 @@ msgstr "" msgid "Show most relevant results first" msgstr "" -#: app/views/request/list.rhtml:2 app/views/public_body/list.rhtml:3 +#: app/views/public_body/list.rhtml:3 app/views/request/list.rhtml:2 msgid "Show only..." msgstr "" @@ -2169,11 +2288,11 @@ msgstr "" msgid "Sign in or make a new account" msgstr "" -#: app/views/layouts/default.rhtml:122 +#: app/views/layouts/default.rhtml:103 msgid "Sign in or sign up" msgstr "" -#: app/views/layouts/default.rhtml:119 +#: app/views/layouts/default.rhtml:100 msgid "Sign out" msgstr "" @@ -2185,10 +2304,14 @@ msgstr "" msgid "Similar requests" msgstr "" -#: app/models/info_request_event.rb:302 +#: app/models/info_request_event.rb:307 msgid "Some information sent" msgstr "" +#: app/views/general/search.rhtml:145 +msgid "Some of the information requested has been received" +msgstr "" + #: app/views/request_game/play.rhtml:31 msgid "" "Some people who've made requests haven't let us know whether they were\n" @@ -2200,7 +2323,7 @@ msgstr "" #: app/views/user_mailer/changeemail_already_used.rhtml:1 msgid "" "Someone, perhaps you, just tried to change their email address on\n" -"WhatDoTheyKnow.com from " +"{{site_name}} from {{old_email}} to {{new_email}}." msgstr "" #: app/views/general/exception_caught.rhtml:1 @@ -2215,8 +2338,8 @@ msgstr "" msgid "Still awaiting an <strong>internal review</strong>" msgstr "" -#: app/views/request/preview.rhtml:18 #: app/views/request/followup_preview.rhtml:23 +#: app/views/request/preview.rhtml:18 msgid "Subject:" msgstr "" @@ -2236,7 +2359,7 @@ msgstr "" msgid "Successful responses" msgstr "" -#: app/models/info_request.rb:790 +#: app/models/info_request.rb:797 msgid "Successful." msgstr "" @@ -2258,7 +2381,7 @@ msgstr "" msgid "Tags:" msgstr "" -#: app/controllers/request_game_controller.rb:50 +#: app/controllers/request_game_controller.rb:52 msgid "Thank you for helping us keep the site tidy!" msgstr "" @@ -2266,25 +2389,25 @@ msgstr "" msgid "Thank you for making an annotation!" msgstr "" -#: app/controllers/request_controller.rb:729 +#: app/controllers/request_controller.rb:736 msgid "" "Thank you for responding to this FOI request! Your response has been " "published below, and a link to your response has been emailed to " msgstr "" -#: app/controllers/request_controller.rb:373 +#: app/controllers/request_controller.rb:378 msgid "" "Thank you for updating the status of the request '<a " -"href=\"%s\">{{info_request_title}}</a>'. There are some more requests below " -"for you to classify." +"href=\"{{url}}\">{{info_request_title}}</a>'. There are some more requests " +"below for you to classify." msgstr "" -#: app/controllers/request_controller.rb:376 +#: app/controllers/request_controller.rb:381 msgid "Thank you for updating this request!" msgstr "" -#: app/controllers/user_controller.rb:397 -#: app/controllers/user_controller.rb:413 +#: app/controllers/user_controller.rb:398 +#: app/controllers/user_controller.rb:414 msgid "Thank you for updating your profile photo" msgstr "" @@ -2308,7 +2431,7 @@ msgid "" " requests." msgstr "" -#: app/controllers/user_controller.rb:188 +#: app/controllers/user_controller.rb:189 msgid "" "That doesn't look like a valid email address. Please check you have typed it" " correctly." @@ -2323,7 +2446,7 @@ msgstr "" msgid "The Freedom of Information Act <strong>does not apply</strong> to" msgstr "" -#: app/views/user_mailer/changeemail_already_used.rhtml:7 +#: app/views/user_mailer/changeemail_already_used.rhtml:8 msgid "The accounts have been left as they previously were." msgstr "" @@ -2344,7 +2467,7 @@ msgid "" " address</strong>, not just an email, for it to be a valid FOI request" msgstr "" -#: app/views/request/show.rhtml:102 +#: app/views/request/show.rhtml:109 msgid "" "The authority would like to / has <strong>responded by post</strong> to this" " request." @@ -2368,32 +2491,48 @@ msgstr "" msgid "The page either doesn't exist, or is broken. Things you can try now:" msgstr "" +#: app/views/general/search.rhtml:143 +msgid "The public authority does not have the information requested" +msgstr "" + +#: app/views/general/search.rhtml:147 +msgid "The public authority would like part of the request explained" +msgstr "" + +#: app/views/general/search.rhtml:148 +msgid "The public authority would like to / has responded by post" +msgstr "" + #: app/views/request/_other_describe_state.rhtml:60 msgid "The request has been <strong>refused</strong>" msgstr "" -#: app/controllers/request_controller.rb:347 +#: app/controllers/request_controller.rb:352 msgid "" "The request has been updated since you originally loaded this page. Please " "check for any new incoming messages below, and try again." msgstr "" -#: app/views/request/show.rhtml:97 +#: app/views/request/show.rhtml:104 msgid "The request is <strong>waiting for clarification</strong>." msgstr "" -#: app/views/request/show.rhtml:90 +#: app/views/request/show.rhtml:97 msgid "The request was <strong>partially successful</strong>." msgstr "" -#: app/views/request/show.rhtml:86 +#: app/views/request/show.rhtml:93 msgid "The request was <strong>refused</strong> by" msgstr "" -#: app/views/request/show.rhtml:88 +#: app/views/request/show.rhtml:95 msgid "The request was <strong>successful</strong>." msgstr "" +#: app/views/general/search.rhtml:144 +msgid "The request was refused by the public authority" +msgstr "" + #: app/views/request/hidden.rhtml:9 msgid "" "The request you have tried to view has been removed. There are\n" @@ -2401,14 +2540,18 @@ msgid "" " href=\"%s\">contact us</a> if you have any questions." msgstr "" -#: app/views/request/_followup.rhtml:35 +#: app/views/general/search.rhtml:152 +msgid "The requester has abandoned this request for some reason" +msgstr "" + +#: app/views/request/_followup.rhtml:32 msgid "" "The response to your request has been <strong>delayed</strong>. You can say that, \n" " by law, the authority should normally have responded\n" " <strong>promptly</strong> and" msgstr "" -#: app/views/request/_followup.rhtml:47 +#: app/views/request/_followup.rhtml:44 msgid "" "The response to your request is <strong>long overdue</strong>. You can say that, by \n" " law, under all circumstances, the authority should have responded\n" @@ -2427,59 +2570,81 @@ msgid "" "Information requests this person has made." msgstr "" -#: app/controllers/track_controller.rb:142 +#: app/controllers/track_controller.rb:144 msgid "Then you can cancel the alert." msgstr "" -#: app/controllers/track_controller.rb:172 +#: app/controllers/track_controller.rb:174 msgid "Then you can cancel the alerts." msgstr "" -#: app/controllers/user_controller.rb:248 +#: app/controllers/user_controller.rb:249 msgid "Then you can change your email address used on {{site_name}}" msgstr "" -#: app/controllers/user_controller.rb:202 +#: app/controllers/user_controller.rb:203 msgid "Then you can change your password on {{site_name}}" msgstr "" -#: app/controllers/request_controller.rb:333 +#: app/controllers/request_controller.rb:338 msgid "Then you can classify the FOI response you have got from " msgstr "" -#: app/controllers/request_game_controller.rb:39 +#: app/controllers/request_game_controller.rb:41 msgid "Then you can play the request categorisation game." msgstr "" -#: app/controllers/user_controller.rb:329 +#: app/controllers/user_controller.rb:330 msgid "Then you can send a message to " msgstr "" -#: app/controllers/user_controller.rb:513 +#: app/controllers/user_controller.rb:514 msgid "Then you can sign in to {{site_name}}" msgstr "" -#: app/controllers/request_controller.rb:59 +#: app/controllers/request_controller.rb:61 msgid "Then you can update the status of your request to " msgstr "" -#: app/controllers/request_controller.rb:695 +#: app/controllers/request_controller.rb:702 msgid "Then you can upload an FOI response. " msgstr "" -#: app/controllers/request_controller.rb:538 +#: app/controllers/request_controller.rb:545 msgid "Then you can write follow up message to " msgstr "" -#: app/controllers/request_controller.rb:539 +#: app/controllers/request_controller.rb:546 msgid "Then you can write your reply to " msgstr "" +#: app/models/track_thing.rb:197 +msgid "" +"Then you will be emailed whenever '{{user_name}}' requests something or gets" +" a response." +msgstr "" + +#: app/models/track_thing.rb:213 +msgid "" +"Then you will be emailed whenever a new request or response matches " +"'{{query}}'." +msgstr "" + #: app/models/track_thing.rb:162 msgid "Then you will be emailed whenever an FOI request succeeds." msgstr "" -#: app/controllers/request_controller.rb:294 +#: app/models/track_thing.rb:146 +msgid "Then you will be emailed whenever anyone makes a new FOI request." +msgstr "" + +#: app/models/track_thing.rb:181 +msgid "" +"Then you will be emailed whenever someone requests something or gets a " +"response from '{{public_body_name}}'." +msgstr "" + +#: app/controllers/request_controller.rb:299 msgid "Then your FOI request to {{public_body_name}} will be sent." msgstr "" @@ -2499,13 +2664,13 @@ msgid "" " One of them is shown below, you may mean a different one:" msgstr "" -#: app/views/request/show.rhtml:106 +#: app/views/request/show.rhtml:113 msgid "" "There was a <strong>delivery error</strong> or similar, which needs fixing " -"by the WhatDoTheyKnow team." +"by the {{site_name}} team." msgstr "" -#: app/controllers/public_body_controller.rb:76 +#: app/controllers/public_body_controller.rb:77 msgid "There was an error with the words you entered, please try again." msgstr "" @@ -2591,20 +2756,26 @@ msgstr "" msgid "This request <strong>requires administrator attention</strong>" msgstr "" -#: app/views/request/show.rhtml:48 +#: app/views/request/show.rhtml:55 msgid "This request has an <strong>unknown status</strong>." msgstr "" -#: app/views/request/show.rhtml:110 +#: app/views/request/show.rhtml:117 msgid "" "This request has been <strong>withdrawn</strong> by the person who made it. \n" " \t There may be an explanation in the correspondence below." msgstr "" -#: app/views/request/show.rhtml:108 +#: app/models/info_request.rb:395 +msgid "" +"This request has been set by an administrator to \"allow new responses from " +"nobody\"" +msgstr "" + +#: app/views/request/show.rhtml:115 msgid "" "This request has had an unusual response, and <strong>requires " -"attention</strong> from the WhatDoTheyKnow team." +"attention</strong> from the {{site_name}} team." msgstr "" #: app/views/request/show.rhtml:5 @@ -2634,30 +2805,44 @@ msgstr "" #: app/views/request/details.rhtml:6 msgid "" "This table shows the technical details of the internal events that happened\n" -"to this request on WhatDoTheyKnow. This could be used to generate information about\n" +"to this request on {{site_name}}. This could be used to generate information about\n" "the speed with which authorities respond to requests, the number of requests\n" "which require a postal response and much more." msgstr "" #: app/views/user/show.rhtml:79 -msgid "This user has been banned from WhatDoTheyKnow.com " +msgid "This user has been banned from {{site_name}} " msgstr "" -#: app/views/user_mailer/changeemail_already_used.rhtml:4 +#: app/views/user_mailer/changeemail_already_used.rhtml:5 msgid "" "This was not possible because there is already an account using \n" -"the email address " +"the email address {{email}}." +msgstr "" + +#: app/models/track_thing.rb:145 +msgid "To be emailed about any new requests" msgstr "" #: app/models/track_thing.rb:161 msgid "To be emailed about any successful requests" msgstr "" -#: app/controllers/track_controller.rb:171 +#: app/models/track_thing.rb:196 +msgid "To be emailed about requests by '{{user_name}}'" +msgstr "" + +#: app/models/track_thing.rb:180 +msgid "" +"To be emailed about requests made using {{site_name}} to the public " +"authority '{{public_body_name}}'" +msgstr "" + +#: app/controllers/track_controller.rb:173 msgid "To cancel these alerts" msgstr "" -#: app/controllers/track_controller.rb:141 +#: app/controllers/track_controller.rb:143 msgid "To cancel this alert" msgstr "" @@ -2667,11 +2852,11 @@ msgid "" "was a technical problem trying to do this." msgstr "" -#: app/controllers/user_controller.rb:247 +#: app/controllers/user_controller.rb:248 msgid "To change your email address used on {{site_name}}" msgstr "" -#: app/controllers/request_controller.rb:332 +#: app/controllers/request_controller.rb:337 msgid "To classify the response to this FOI request" msgstr "" @@ -2683,6 +2868,10 @@ msgstr "" msgid "To do this, first click on the link below." msgstr "" +#: app/models/track_thing.rb:212 +msgid "To follow requests and responses matching '{{query}}'" +msgstr "" + #: app/views/request_mailer/old_unclassified_updated.rhtml:1 msgid "" "To help us keep the site tidy, someone else has updated the status of the \n" @@ -2693,7 +2882,7 @@ msgstr "" msgid "To let us know, follow this link and then select the appropriate box." msgstr "" -#: app/controllers/request_game_controller.rb:38 +#: app/controllers/request_game_controller.rb:40 msgid "To play the request categorisation game" msgstr "" @@ -2701,27 +2890,27 @@ msgstr "" msgid "To post your annotation" msgstr "" -#: app/controllers/request_controller.rb:536 +#: app/controllers/request_controller.rb:543 msgid "To reply to " msgstr "" -#: app/controllers/request_controller.rb:535 +#: app/controllers/request_controller.rb:542 msgid "To send a follow up message to " msgstr "" -#: app/controllers/user_controller.rb:328 +#: app/controllers/user_controller.rb:329 msgid "To send a message to " msgstr "" -#: app/controllers/request_controller.rb:293 +#: app/controllers/request_controller.rb:298 msgid "To send your FOI request" msgstr "" -#: app/controllers/request_controller.rb:58 +#: app/controllers/request_controller.rb:60 msgid "To update the status of this FOI request" msgstr "" -#: app/controllers/request_controller.rb:694 +#: app/controllers/request_controller.rb:701 msgid "" "To upload a response, you must be logged in using an email address from " msgstr "" @@ -2740,8 +2929,8 @@ msgstr "" msgid "To {{public_body_link_absolute}}" msgstr "" -#: app/views/request/preview.rhtml:17 #: app/views/request/followup_preview.rhtml:22 app/views/request/new.rhtml:88 +#: app/views/request/preview.rhtml:17 msgid "To:" msgstr "" @@ -2749,6 +2938,10 @@ msgstr "" msgid "Track requests to {{public_body_name}} by email" msgstr "" +#: app/models/track_thing.rb:206 +msgid "Track things matching '{{query}}' by email" +msgstr "" + #: app/views/public_body/show.rhtml:3 msgid "Track this authority" msgstr "" @@ -2757,10 +2950,18 @@ msgstr "" msgid "Track this person" msgstr "" +#: app/models/track_thing.rb:190 +msgid "Track this person by email" +msgstr "" + #: app/views/request/_sidebar.rhtml:2 msgid "Track this request" msgstr "" +#: app/models/track_thing.rb:123 +msgid "Track this request by email" +msgstr "" + #: locale/model_attributes.rb:33 msgid "TrackThing|Track medium" msgstr "" @@ -2784,7 +2985,7 @@ msgid "URL name can't be blank" msgstr "" #: app/models/user_mailer.rb:45 -msgid "Unable to change email address on WhatDoTheyKnow.com" +msgid "Unable to change email address on {{site_name}}" msgstr "" #: app/views/request/followup_bad.rhtml:4 @@ -2820,11 +3021,11 @@ msgstr "" msgid "Unknown" msgstr "" -#: app/models/info_request_event.rb:312 +#: app/models/info_request_event.rb:317 msgid "Unusual response" msgstr "" -#: app/models/info_request.rb:800 +#: app/models/info_request.rb:807 msgid "Unusual response." msgstr "" @@ -2833,7 +3034,7 @@ msgstr "" msgid "Update the status of this request" msgstr "" -#: app/controllers/request_controller.rb:60 +#: app/controllers/request_controller.rb:62 msgid "Update the status of your request to " msgstr "" @@ -2849,47 +3050,47 @@ msgid "" "<strong><code>\"Liverpool City Council\"</code></strong>" msgstr "" -#: locale/model_attributes.rb:68 +#: locale/model_attributes.rb:67 msgid "UserInfoRequestSentAlert|Alert type" msgstr "" -#: locale/model_attributes.rb:79 +#: locale/model_attributes.rb:78 msgid "User|About me" msgstr "" -#: locale/model_attributes.rb:77 +#: locale/model_attributes.rb:76 msgid "User|Admin level" msgstr "" -#: locale/model_attributes.rb:78 +#: locale/model_attributes.rb:77 msgid "User|Ban text" msgstr "" -#: locale/model_attributes.rb:70 +#: locale/model_attributes.rb:69 msgid "User|Email" msgstr "" -#: locale/model_attributes.rb:74 +#: locale/model_attributes.rb:73 msgid "User|Email confirmed" msgstr "" -#: locale/model_attributes.rb:72 +#: locale/model_attributes.rb:71 msgid "User|Hashed password" msgstr "" -#: locale/model_attributes.rb:76 +#: locale/model_attributes.rb:75 msgid "User|Last daily track email" msgstr "" -#: locale/model_attributes.rb:71 +#: locale/model_attributes.rb:70 msgid "User|Name" msgstr "" -#: locale/model_attributes.rb:73 +#: locale/model_attributes.rb:72 msgid "User|Salt" msgstr "" -#: locale/model_attributes.rb:75 +#: locale/model_attributes.rb:74 msgid "User|Url name" msgstr "" @@ -2906,10 +3107,10 @@ msgid "View FOI email address for {{public_body_name}}" msgstr "" #: app/views/contact_mailer/user_message.rhtml:10 -msgid "View Freedom of Information requests made by" +msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "" -#: app/views/layouts/default.rhtml:108 +#: app/views/layouts/default.rhtml:89 msgid "View authorities" msgstr "" @@ -2917,20 +3118,30 @@ msgstr "" msgid "View email" msgstr "" -#: app/views/layouts/default.rhtml:107 +#: app/views/layouts/default.rhtml:88 msgid "View requests" msgstr "" -#: app/models/info_request.rb:792 +#: app/models/info_request.rb:799 msgid "Waiting clarification." msgstr "" -#: app/views/request/show.rhtml:104 +#: app/views/request/show.rhtml:111 msgid "" "Waiting for an <strong>internal review</strong> by {{public_body_link}} of " "their handling of this request." msgstr "" +#: app/views/general/search.rhtml:149 +msgid "" +"Waiting for the public authority to complete an internal review of their " +"handling of the request" +msgstr "" + +#: app/views/general/search.rhtml:142 +msgid "Waiting for the public authority to reply" +msgstr "" + #: app/views/public_body/view_email.rhtml:17 msgid "We do not have a working request email address for this authority." msgstr "" @@ -2945,7 +3156,7 @@ 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=\"%s\">sign in</a> and let everyone know." +"\tif you are {{user_link}} please <a href=\"{{url}}\">sign in</a> and let everyone know." msgstr "" #: app/views/user_mailer/confirm_login.rhtml:8 @@ -2954,17 +3165,17 @@ msgid "" "or the law tell us to." msgstr "" -#: app/views/user_mailer/changeemail_confirm.rhtml:9 +#: app/views/user_mailer/changeemail_confirm.rhtml:10 msgid "" "We will not reveal your email addresses to anybody unless you\n" "or the law tell us to." msgstr "" -#: app/views/request/show.rhtml:54 +#: app/views/request/show.rhtml:61 msgid "We're waiting for" msgstr "" -#: app/views/request/show.rhtml:50 +#: app/views/request/show.rhtml:57 msgid "We're waiting for someone to read" msgstr "" @@ -2986,7 +3197,7 @@ msgid "" "password." msgstr "" -#: app/views/request/_followup.rhtml:61 +#: app/views/request/_followup.rhtml:58 msgid "What are you doing?" msgstr "" @@ -2994,12 +3205,6 @@ msgstr "" msgid "What best describes the status of this request now?" msgstr "" -#: app/views/public_body/view_email.rhtml:7 -msgid "" -"WhatDoTheyKnow sends new requests to <strong>{{request_email}}</strong> for " -"this authority." -msgstr "" - #: app/views/request_mailer/new_response.rhtml:9 msgid "" "When you get there, please update the status to say if the response \n" @@ -3022,19 +3227,19 @@ msgstr "" msgid "Which of these is happening?" msgstr "" -#: app/models/info_request_event.rb:308 +#: app/models/info_request_event.rb:313 msgid "Withdrawn by requester" msgstr "" -#: app/models/info_request.rb:802 +#: app/models/info_request.rb:809 msgid "Withdrawn by the requester." msgstr "" -#: app/controllers/request_controller.rb:542 +#: app/controllers/request_controller.rb:549 msgid "Write a reply to " msgstr "" -#: app/controllers/request_controller.rb:541 +#: app/controllers/request_controller.rb:548 msgid "Write your FOI follow up message to " msgstr "" @@ -3042,7 +3247,7 @@ msgstr "" msgid "Write your request in <strong>simple, precise language</strong>." msgstr "" -#: app/models/info_request_event.rb:296 +#: app/models/info_request_event.rb:301 msgid "Wrong Response" msgstr "" @@ -3050,22 +3255,42 @@ msgstr "" msgid "You" msgstr "" -#: app/controllers/track_controller.rb:96 +#: app/controllers/track_controller.rb:98 msgid "You are already being emailed updates about " msgstr "" +#: app/models/track_thing.rb:175 +msgid "You are already tracking requests to {{public_body_name}} by email" +msgstr "" + +#: app/models/track_thing.rb:207 +msgid "You are already tracking things matching '{{query}}' by email" +msgstr "" + +#: app/models/track_thing.rb:191 +msgid "You are already tracking this person by email" +msgstr "" + +#: app/models/track_thing.rb:124 +msgid "You are already tracking this request by email" +msgstr "" + #: app/models/track_thing.rb:156 msgid "You are being emailed about any new successful responses" msgstr "" -#: app/views/request/show.rhtml:81 +#: app/models/track_thing.rb:140 +msgid "You are being emailed when there are new requests" +msgstr "" + +#: app/views/request/show.rhtml:88 msgid "You can <strong>complain</strong> by" msgstr "" -#: app/views/request/details.rhtml:57 +#: app/views/request/details.rhtml:58 msgid "" "You can get this page in computer-readable format as part of the main JSON\n" -"page for the request. See the <a href=\"%s\">API documentation</a>." +"page for the request. See the <a href=\"{{api_path}}\">API documentation</a>." msgstr "" #: app/views/public_body/show.rhtml:40 @@ -3081,17 +3306,17 @@ msgstr "" msgid "You have a new response to the {{law_used_full}} request " msgstr "" -#: app/controllers/user_controller.rb:491 +#: app/controllers/user_controller.rb:492 msgid "You have now changed the text about you on your profile." msgstr "" -#: app/controllers/user_controller.rb:309 +#: app/controllers/user_controller.rb:310 msgid "You have now changed your email address used on {{site_name}}" msgstr "" #: app/views/user_mailer/already_registered.rhtml:3 msgid "" -"You just tried to sign up to WhatDoTheyKnow.com, when you\n" +"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" @@ -3124,19 +3349,19 @@ msgid "" "to find one, then please <a href=\"%s\">send it to us</a>." msgstr "" -#: app/controllers/user_controller.rb:469 +#: app/controllers/user_controller.rb:470 msgid "You need to be logged in to change the text about you on your profile." msgstr "" -#: app/controllers/user_controller.rb:370 +#: app/controllers/user_controller.rb:371 msgid "You need to be logged in to change your profile photo." msgstr "" -#: app/controllers/user_controller.rb:432 +#: app/controllers/user_controller.rb:433 msgid "You need to be logged in to clear your profile photo." msgstr "" -#: app/controllers/request_controller.rb:552 +#: app/controllers/request_controller.rb:559 msgid "" "You previously submitted that exact follow up message for this request." msgstr "" @@ -3161,15 +3386,15 @@ msgid "" "email alerts." msgstr "" -#: app/controllers/track_controller.rb:152 +#: app/controllers/track_controller.rb:154 msgid "You will no longer be emailed updates about " msgstr "" -#: app/controllers/track_controller.rb:181 +#: app/controllers/track_controller.rb:183 msgid "You will no longer be emailed updates for those alerts" msgstr "" -#: app/controllers/track_controller.rb:109 +#: app/controllers/track_controller.rb:111 msgid "You will now be emailed updates about " msgstr "" @@ -3179,7 +3404,7 @@ msgid "" "with the clarification." msgstr "" -#: app/controllers/user_controller.rb:441 +#: app/controllers/user_controller.rb:442 msgid "You've now cleared your profile photo" msgstr "" @@ -3202,9 +3427,8 @@ msgid "" "message, which will then go directly to the person who wrote the message." msgstr "" -#: app/views/user/_signin.rhtml:11 +#: app/views/user/_signin.rhtml:11 app/views/user/_signup.rhtml:9 #: app/views/user/signchangepassword_send_confirm.rhtml:13 -#: app/views/user/_signup.rhtml:9 msgid "Your e-mail:" msgstr "" @@ -3212,28 +3436,28 @@ msgstr "" msgid "Your email subscriptions" msgstr "" -#: app/controllers/request_controller.rb:549 +#: app/controllers/request_controller.rb:556 msgid "" "Your follow up has not been sent because this request has been stopped to " "prevent spam. Please <a href=\"%s\">contact us</a> if you really want to " "send a follow up message." msgstr "" -#: app/controllers/request_controller.rb:577 +#: app/controllers/request_controller.rb:584 msgid "Your follow up message has been sent on its way." msgstr "" -#: app/controllers/request_controller.rb:575 +#: app/controllers/request_controller.rb:582 msgid "Your internal review request has been sent on its way." msgstr "" -#: app/controllers/help_controller.rb:61 +#: app/controllers/help_controller.rb:63 msgid "" "Your message has been sent. Thank you for getting in touch! We'll get back " "to you soon." msgstr "" -#: app/controllers/user_controller.rb:348 +#: app/controllers/user_controller.rb:349 msgid "Your message to {{recipient_user_name}} has been sent!" msgstr "" @@ -3260,7 +3484,7 @@ msgstr "" msgid "Your original message is attached." msgstr "" -#: app/controllers/user_controller.rb:230 +#: app/controllers/user_controller.rb:231 msgid "Your password has been changed." msgstr "" @@ -3271,7 +3495,7 @@ msgstr "" #: app/views/user/set_draft_profile_photo.rhtml:18 msgid "" "Your photo will be shown in public <strong>on the Internet</strong>, \n" -" wherever you do something on WhatDoTheyKnow." +" wherever you do something on {{site_name}}." msgstr "" #: app/views/request_mailer/new_response_reminder_alert.rhtml:5 @@ -3292,10 +3516,14 @@ msgstr "" #: app/views/comment/new.rhtml:62 msgid "" -"Your thoughts on what the WhatDoTheyKnow <strong>administrators</strong> " +"Your thoughts on what the {{site_name}} <strong>administrators</strong> " "should do about the request." msgstr "" +#: app/models/track_mailer.rb:25 +msgid "Your {{site_name}} email alert" +msgstr "" + #: app/models/outgoing_message.rb:69 msgid "Yours faithfully," msgstr "" @@ -3322,13 +3550,13 @@ msgstr "" msgid "and sign in as " msgstr "" -#: app/views/request/show.rhtml:52 +#: app/views/request/show.rhtml:59 msgid "" "and update the status accordingly. Perhaps <strong>you</strong> might like " "to help out by doing that?" msgstr "" -#: app/views/request/show.rhtml:57 +#: app/views/request/show.rhtml:64 msgid "and update the status." msgstr "" @@ -3344,19 +3572,27 @@ msgstr "" msgid "annotations" msgstr "" +#: app/models/track_thing.rb:138 +msgid "any <a href=\"/list\">new requests</a>" +msgstr "" + +#: app/models/track_thing.rb:154 +msgid "any <a href=\"/list/successful\">successful requests</a>" +msgstr "" + #: app/views/request_mailer/very_overdue_alert.rhtml:1 msgid "are long overdue." msgstr "" -#: app/controllers/public_body_controller.rb:109 +#: app/controllers/public_body_controller.rb:111 msgid "beginning with" msgstr "" -#: app/views/request/show.rhtml:75 +#: app/views/request/show.rhtml:82 msgid "by" msgstr "" -#: app/views/request/_followup.rhtml:41 +#: app/views/request/_followup.rhtml:38 msgid "by <strong>{{date}}</strong>" msgstr "" @@ -3368,11 +3604,11 @@ msgstr "" msgid "by {{user_link_absolute}}" msgstr "" -#: locale/model_attributes.rb:42 +#: locale/model_attributes.rb:35 msgid "censor rule" msgstr "" -#: locale/model_attributes.rb:26 +#: locale/model_attributes.rb:20 msgid "comment" msgstr "" @@ -3382,7 +3618,7 @@ msgid "" " Or you could phone them." msgstr "" -#: app/models/info_request_event.rb:333 +#: app/models/info_request_event.rb:338 msgid "display_status only works for incoming and outgoing messages right now" msgstr "" @@ -3406,11 +3642,11 @@ msgstr "" msgid "even during holidays" msgstr "" -#: locale/model_attributes.rb:14 +#: locale/model_attributes.rb:17 msgid "exim log" msgstr "" -#: locale/model_attributes.rb:60 +#: locale/model_attributes.rb:59 msgid "exim log done" msgstr "" @@ -3422,12 +3658,12 @@ msgstr "" msgid "have delayed." msgstr "" -#: locale/model_attributes.rb:57 +#: locale/model_attributes.rb:56 msgid "holiday" msgstr "" -#: app/views/request/_followup.rhtml:39 app/views/request/show.rhtml:63 -#: app/views/request/show.rhtml:73 +#: app/views/request/_followup.rhtml:36 app/views/request/show.rhtml:70 +#: app/views/request/show.rhtml:80 msgid "in term time" msgstr "" @@ -3435,15 +3671,15 @@ msgstr "" msgid "in total" msgstr "" -#: locale/model_attributes.rb:63 +#: locale/model_attributes.rb:62 msgid "incoming message" msgstr "" -#: locale/model_attributes.rb:80 +#: locale/model_attributes.rb:79 msgid "info request" msgstr "" -#: locale/model_attributes.rb:35 +#: locale/model_attributes.rb:40 msgid "info request event" msgstr "" @@ -3452,7 +3688,7 @@ msgstr "" msgid "internal error" msgstr "" -#: app/views/request/show.rhtml:93 +#: app/views/request/show.rhtml:100 msgid "is <strong>waiting for your clarification</strong>." msgstr "" @@ -3469,7 +3705,7 @@ msgstr "" msgid "made." msgstr "" -#: app/views/request/show.rhtml:67 +#: app/views/request/show.rhtml:74 msgid "no later than" msgstr "" @@ -3481,7 +3717,7 @@ msgid "" " an email which will go to the right place, please <a href=\"%s\">send it to us</a>." msgstr "" -#: app/views/request/show.rhtml:65 +#: app/views/request/show.rhtml:72 msgid "normally" msgstr "" @@ -3489,7 +3725,7 @@ msgstr "" msgid "only" msgstr "" -#: locale/model_attributes.rb:20 +#: locale/model_attributes.rb:25 msgid "outgoing message" msgstr "" @@ -3501,11 +3737,11 @@ msgstr "" msgid "please sign in or make a new account." msgstr "" -#: locale/model_attributes.rb:50 +#: locale/model_attributes.rb:49 msgid "post redirect" msgstr "" -#: locale/model_attributes.rb:17 +#: locale/model_attributes.rb:14 msgid "profile photo" msgstr "" @@ -3521,7 +3757,7 @@ msgstr "" msgid "request." msgstr "" -#: app/views/request/show.rhtml:82 +#: app/views/request/show.rhtml:89 msgid "requesting an internal review" msgstr "" @@ -3531,7 +3767,7 @@ msgid "" "email to let them know what you are going to do about it." msgstr "" -#: app/views/request/show.rhtml:95 +#: app/views/request/show.rhtml:102 msgid "send a follow up message" msgstr "" @@ -3539,7 +3775,7 @@ msgstr "" msgid "sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "" -#: app/views/request/show.rhtml:99 +#: app/views/request/show.rhtml:106 msgid "sign in" msgstr "" @@ -3551,34 +3787,27 @@ msgstr "" msgid "that you made to" msgstr "" -#: app/views/user_mailer/already_registered.rhtml:11 -#: app/views/user_mailer/confirm_login.rhtml:11 -#: app/views/user_mailer/changeemail_already_used.rhtml:9 -#: app/views/user_mailer/changeemail_confirm.rhtml:12 -#: app/views/request_mailer/stopped_responses.rhtml:16 -#: app/views/request_mailer/not_clarified_alert.rhtml:9 #: app/views/request_mailer/comment_on_alert.rhtml:6 +#: app/views/request_mailer/comment_on_alert_plural.rhtml:5 +#: app/views/request_mailer/new_response.rhtml:15 +#: app/views/request_mailer/new_response_reminder_alert.rhtml:8 +#: app/views/request_mailer/not_clarified_alert.rhtml:9 #: app/views/request_mailer/old_unclassified_updated.rhtml:8 -#: app/views/request_mailer/very_overdue_alert.rhtml:11 #: app/views/request_mailer/overdue_alert.rhtml:9 -#: app/views/request_mailer/new_response_reminder_alert.rhtml:8 -#: app/views/request_mailer/new_response.rhtml:15 -#: app/views/request_mailer/comment_on_alert_plural.rhtml:5 -msgid "the WhatDoTheyKnow team" +#: app/views/request_mailer/stopped_responses.rhtml:16 +#: app/views/request_mailer/very_overdue_alert.rhtml:11 +#: app/views/track_mailer/event_digest.rhtml:66 +#: app/views/user_mailer/already_registered.rhtml:11 +#: app/views/user_mailer/changeemail_already_used.rhtml:10 +#: app/views/user_mailer/changeemail_confirm.rhtml:13 +#: app/views/user_mailer/confirm_login.rhtml:11 +msgid "the {{site_name}} team" msgstr "" #: app/views/user/show.rhtml:140 msgid "this person" msgstr "" -#: app/views/user_mailer/changeemail_already_used.rhtml:2 -msgid "to" -msgstr "" - -#: app/views/user_mailer/changeemail_confirm.rhtml:5 -msgid "to " -msgstr "" - #: app/views/user/show.rhtml:113 msgid "" "to change password, \n" @@ -3589,15 +3818,15 @@ msgstr "" msgid "to check that the info isn't already published." msgstr "" -#: app/views/request/show.rhtml:55 +#: app/views/request/show.rhtml:62 msgid "to read" msgstr "" -#: app/views/request/show.rhtml:99 +#: app/views/request/show.rhtml:106 msgid "to send a follow up message." msgstr "" -#: app/views/request/show.rhtml:39 +#: app/views/request/show.rhtml:45 msgid "to {{public_body}}" msgstr "" @@ -3617,7 +3846,7 @@ msgstr "" msgid "unknown reason " msgstr "" -#: app/models/info_request.rb:807 app/models/info_request_event.rb:328 +#: app/models/info_request.rb:814 app/models/info_request_event.rb:333 msgid "unknown status " msgstr "" @@ -3629,15 +3858,15 @@ msgstr "" msgid "unsubscribe all" msgstr "" -#: app/views/request/show.rhtml:46 +#: app/views/request/show.rhtml:53 msgid "useful information." msgstr "" -#: locale/model_attributes.rb:69 +#: locale/model_attributes.rb:68 msgid "user" msgstr "" -#: locale/model_attributes.rb:67 +#: locale/model_attributes.rb:66 msgid "user info request sent alert" msgstr "" @@ -3664,13 +3893,34 @@ msgstr "{{length_of_time}} pre" msgid "{{public_body_name}} only:" msgstr "" +#: app/views/public_body/view_email.rhtml:7 +msgid "" +"{{site_name}} sends new requests to <strong>{{request_email}}</strong> for " +"this authority." +msgstr "" + +#: app/models/user.rb:122 +msgid "{{user_name}} (Banned)" +msgstr "" + #: app/views/request_mailer/comment_on_alert.rhtml:1 msgid "" "{{user_name}} has annotated your {{law_used_short}} \n" "request. Follow this link to see what they wrote." msgstr "" -#: app/views/request/show.rhtml:35 +#: app/views/contact_mailer/user_message.rhtml:2 +msgid "{{user_name}} has used {{site_name}} to send you the message below." +msgstr "" + +#: app/views/request/show.rhtml:36 +msgid "" +"{{user}} (<a href=\"{{user_admin_url}}\">admin</a>) made this " +"{{law_used_full}} request (<a href=\"{{request_admin_url}}\">admin</a>) to " +"{{public_body_link}} (<a href=\"{{public_body_admin_url}}\">admin</a>)" +msgstr "" + +#: app/views/request/show.rhtml:44 msgid "{{user}} made this {{law_used_full}} request" msgstr "" diff --git a/script/compact-xapian-database b/script/compact-xapian-database new file mode 100755 index 000000000..5c12b5dae --- /dev/null +++ b/script/compact-xapian-database @@ -0,0 +1,16 @@ +#!/bin/bash + +RAILS_ENV=$1 +set -e +if [ -x /usr/bin/xapian-compact ]; then + XAPIAN_DB_DIR="$( cd "$( dirname "$0" )" && pwd )/../vendor/plugins/acts_as_xapian/xapiandbs" + OWNER=`stat -c %U $XAPIAN_DB_DIR/$RAILS_ENV` + su -c "xapian-compact $XAPIAN_DB_DIR/$RAILS_ENV $XAPIAN_DB_DIR/$RAILS_ENV.new" $OWNER + mv $XAPIAN_DB_DIR/$RAILS_ENV $XAPIAN_DB_DIR/$RAILS_ENV.tmp + mv $XAPIAN_DB_DIR/$RAILS_ENV.new $XAPIAN_DB_DIR/$RAILS_ENV + rm -rf $XAPIAN_DB_DIR/$RAILS_ENV.tmp + /etc/init.d/apache2 restart +else + echo "Could not find xapian-compact script; have you installed xapian-tools?" + exit 1 +fi
\ No newline at end of file diff --git a/script/load-sample-data b/script/load-sample-data new file mode 100755 index 000000000..0521ef849 --- /dev/null +++ b/script/load-sample-data @@ -0,0 +1,12 @@ +#!/bin/bash + +# This script loads spec fixtures, but also needs to do a hack around +# the fact that the fixtures aren't aware of the fact that RawEmails +# have a filesystem representation of their contents + +LOC=`dirname $0` +rake --silent spec:db:fixtures:load +"$LOC/runner" 'puts File.expand_path(File.dirname(__FILE__) + "/spec/spec_helper"); require File.expand_path(File.dirname(__FILE__) + "/spec/spec_helper"); RawEmail.all().each {|email| email.data = load_file_fixture("useless_raw_email.email")}' + + +echo "Loaded fixtures."
\ No newline at end of file diff --git a/spec/controllers/admin_general_controller_spec.rb b/spec/controllers/admin_general_controller_spec.rb index 4c3708268..820d1e7f3 100644 --- a/spec/controllers/admin_general_controller_spec.rb +++ b/spec/controllers/admin_general_controller_spec.rb @@ -5,8 +5,14 @@ describe AdminGeneralController, "when viewing front page of admin interface" do before { basic_auth_login @request } it "should render the front page" do - get :index + get :index, :suppress_redirect => 1 response.should render_template('index') end + it "should redirect to include trailing slash" do + get :index + response.should redirect_to(:controller => 'admin_general', + :action => 'index') + end + end diff --git a/spec/controllers/admin_public_body_controller_spec.rb b/spec/controllers/admin_public_body_controller_spec.rb index 6b88fe39d..357564211 100644 --- a/spec/controllers/admin_public_body_controller_spec.rb +++ b/spec/controllers/admin_public_body_controller_spec.rb @@ -110,27 +110,27 @@ describe AdminPublicBodyController, "when administering public bodies with i18n" end it "creates a new public body" do - I18n.locale = :es + I18n.default_locale = :es PublicBody.count.should == 2 post :create, { :public_body => { :name => "New Quango", :short_name => "", :tag_string => "blah", :request_email => 'newquango@localhost', :last_edit_comment => 'From test code' } } PublicBody.count.should == 3 - I18n.locale = :en + I18n.default_locale = :en end it "edits a public body" do - I18n.locale = :es + I18n.default_locale = :es get :edit, {:id => 3, :locale => :es} response.body.should include('Baguette') - I18n.locale = :en + I18n.default_locale = :en end it "saves edits to a public body" do - I18n.locale = :es + I18n.default_locale = :es pb = PublicBody.find(id=3) pb.name.should == "El Department for Humpadinking" post :update, { :id => 3, :public_body => { :name => "Renamed", :short_name => "", :tag_string => "some tags", :request_email => 'edited@localhost', :last_edit_comment => 'From test code' }} response.flash[:notice].should include('successful') - I18n.locale = :en + I18n.default_locale = :en pb = PublicBody.find(public_bodies(:humpadink_public_body).id) PublicBody.with_locale(:es) do diff --git a/spec/controllers/admin_request_controller_spec.rb b/spec/controllers/admin_request_controller_spec.rb index d82e4a49c..423c2fb49 100644 --- a/spec/controllers/admin_request_controller_spec.rb +++ b/spec/controllers/admin_request_controller_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe AdminRequestController, "when administering requests" do integrate_views - fixtures :info_requests, :outgoing_messages, :users, :info_request_events + fixtures :info_requests, :outgoing_messages, :users, :info_request_events, :public_bodies, :public_body_translations before { basic_auth_login @request } it "shows the index/list page" do @@ -39,3 +39,63 @@ describe AdminRequestController, "when administering requests" do end +describe AdminRequestController, "when administering the holding pen" do + integrate_views + fixtures :info_requests, :incoming_messages, :raw_emails, :users, :public_bodies, :public_body_translations + before(:each) do + basic_auth_login @request + load_raw_emails_data(raw_emails) + end + + it "shows a rejection reason for an incoming message from an invalid address" do + ir = info_requests(:fancy_dog_request) + ir.allow_new_responses_from = 'authority_only' + ir.handle_rejected_responses = 'holding_pen' + ir.save! + receive_incoming_mail('incoming-request-plain.email', ir.incoming_email, "frob@nowhere.com") + get :show_raw_email, :id => InfoRequest.holding_pen_request.get_last_response.raw_email.id + response.should have_text(/Only the authority can reply to this request/) + end + + it "allows redelivery even to a closed request" do + ir = info_requests(:fancy_dog_request) + ir.allow_new_responses_from = 'nobody' + ir.handle_rejected_responses = 'holding_pen' + ir.save! + InfoRequest.holding_pen_request.incoming_messages.length.should == 0 + ir.incoming_messages.length.should == 1 + receive_incoming_mail('incoming-request-plain.email', ir.incoming_email, "frob@nowhere.com") + InfoRequest.holding_pen_request.incoming_messages.length.should == 1 + new_im = InfoRequest.holding_pen_request.incoming_messages[0] + ir.incoming_messages.length.should == 1 + post :redeliver_incoming, :redeliver_incoming_message_id => new_im.id, :url_title => ir.url_title + ir = InfoRequest.find_by_url_title(ir.url_title) + ir.incoming_messages.length.should == 2 + response.should redirect_to('http://test.host/admin/request/show/101') + InfoRequest.holding_pen_request.incoming_messages.length.should == 0 + end + + it "guesses a misdirected request" do + ir = info_requests(:fancy_dog_request) + ir.handle_rejected_responses = 'holding_pen' + ir.allow_new_responses_from = 'authority_only' + ir.save! + mail_to = "request-#{ir.id}-asdfg@example.com" + receive_incoming_mail('incoming-request-plain.email', mail_to) + interesting_email = InfoRequest.holding_pen_request.get_last_response.raw_email.id + # now we add another message to the queue, which we're not interested in + receive_incoming_mail('incoming-request-plain.email', ir.incoming_email, "") + InfoRequest.holding_pen_request.incoming_messages.length.should == 2 + get :show_raw_email, :id => interesting_email + response.should have_text(/Could not identify the request/) + assigns[:info_requests][0].should == ir + end + + it "destroys an incoming message" do + im = incoming_messages(:useless_incoming_message) + raw_email = im.raw_email.filepath + post :destroy_incoming, :incoming_message_id => im.id + assert_equal File.exists?(raw_email), false + end + +end diff --git a/spec/controllers/general_controller_spec.rb b/spec/controllers/general_controller_spec.rb index 7807a5541..76e1bb5e6 100644 --- a/spec/controllers/general_controller_spec.rb +++ b/spec/controllers/general_controller_spec.rb @@ -12,11 +12,57 @@ describe GeneralController, "when searching" do :incoming_messages, :comments ] + before(:each) do + load_raw_emails_data(raw_emails) + end + it "should render the front page successfully" do get :frontpage response.should be_success end + it "should render the front page with default language" do + get :frontpage + response.should have_tag('html[lang="en"]') + end + + it "should render the front page with default language" do + old_default_locale = I18n.default_locale + I18n.default_locale = "es" + get :frontpage + response.should have_tag('html[lang="es"]') + I18n.default_locale = old_default_locale + end + + it "should render the front page with default language and ignore the browser setting" do + config = MySociety::Config.load_default() + config['USE_DEFAULT_BROWSER_LANGUAGE'] = false + accept_language = "en-GB,en-US;q=0.8,en;q=0.6" + request.env['HTTP_ACCEPT_LANGUAGE'] = accept_language + old_default_locale = I18n.default_locale + I18n.default_locale = "es" + get :frontpage + response.should have_tag('html[lang="es"]') + I18n.default_locale = old_default_locale + end + + it "should render the front page with browser-selected language when there's no default set" do + config = MySociety::Config.load_default() + config['USE_DEFAULT_BROWSER_LANGUAGE'] = true + accept_language = "es-ES,en-GB,en-US;q=0.8,en;q=0.6" + request.env['HTTP_ACCEPT_LANGUAGE'] = accept_language + get :frontpage + response.should have_tag('html[lang="es"]') + request.env['HTTP_ACCEPT_LANGUAGE'] = nil + end + + it "doesn't raise an error when there's no user matching the one in the session" do + session[:user_id] = 999 + get :frontpage + response.should be_success + end + + it "should redirect from search query URL to pretty URL" do post :search_redirect, :query => "mouse" # query hidden in POST parameters response.should redirect_to(:action => 'search', :combined => "mouse") # URL /search/:query diff --git a/spec/controllers/public_body_controller_spec.rb b/spec/controllers/public_body_controller_spec.rb index f157d4ac4..dd5fbb8bd 100644 --- a/spec/controllers/public_body_controller_spec.rb +++ b/spec/controllers/public_body_controller_spec.rb @@ -72,13 +72,13 @@ describe PublicBodyController, "when listing bodies" do end it "should list bodies in alphabetical order with different locale" do - I18n.locale = :es + I18n.default_locale = :es get :list response.should render_template('list') assigns[:public_bodies].should == [ public_bodies(:geraldine_public_body), public_bodies(:humpadink_public_body) ] assigns[:tag].should == "all" assigns[:description].should == "all" - I18n.locale = :en + I18n.default_locale = :en end it "should list a tagged thing on the appropriate list page, and others on the other page, and all still on the all page" do diff --git a/spec/controllers/request_controller_spec.rb b/spec/controllers/request_controller_spec.rb index ffb9861f7..516aa602f 100644 --- a/spec/controllers/request_controller_spec.rb +++ b/spec/controllers/request_controller_spec.rb @@ -7,8 +7,10 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') require 'json' describe RequestController, "when listing recent requests" do - + fixtures :info_requests, :outgoing_messages, :users, :info_request_events, :public_bodies, :public_body_translations, :incoming_messages, :raw_emails, :comments + before(:each) do + load_raw_emails_data(raw_emails) rebuild_xapian_index end @@ -496,7 +498,7 @@ describe RequestController, "when classifying an information request" do fixtures :info_requests, :info_request_events, :public_bodies, :public_body_translations, :users, :incoming_messages, :raw_emails, :outgoing_messages, :comments # all needed as integrating views - before do + before(:each) do @dog_request = info_requests(:fancy_dog_request) @dog_request.stub!(:is_old_unclassified?).and_return(false) InfoRequest.stub!(:find).and_return(@dog_request) @@ -831,7 +833,11 @@ end describe RequestController, "when sending a followup message" do integrate_views fixtures :info_requests, :info_request_events, :public_bodies, :public_body_translations, :users, :incoming_messages, :raw_emails, :outgoing_messages # all needed as integrating views - + + before(:each) do + load_raw_emails_data(raw_emails) + end + it "should require login" do post :show_response, :outgoing_message => { :body => "What a useless response! You suck.", :what_doing => 'normal_sort' }, :id => info_requests(:fancy_dog_request).id, :incoming_message_id => incoming_messages(:useless_incoming_message), :submitted_followup => 1 post_redirect = PostRedirect.get_last_post_redirect diff --git a/spec/controllers/track_controller_spec.rb b/spec/controllers/track_controller_spec.rb index f7002a9d4..2f3f903f9 100644 --- a/spec/controllers/track_controller_spec.rb +++ b/spec/controllers/track_controller_spec.rb @@ -37,14 +37,12 @@ describe TrackController, "when sending alerts for a track" do integrate_views fixtures :info_requests, :outgoing_messages, :incoming_messages, :raw_emails, :info_request_events, :users, :track_things, :track_things_sent_emails, :public_bodies, :public_body_translations include LinkToHelper # for main_url + before(:each) do load_raw_emails_data(raw_emails) - end - - before do rebuild_xapian_index end - + it "should send alerts" do # Don't do clever locale-insertion-unto-URL stuff ActionController::Routing::Routes.filters.clear @@ -101,9 +99,9 @@ describe TrackController, "when viewing RSS feed for a track" do integrate_views fixtures :info_requests, :outgoing_messages, :incoming_messages, :raw_emails, :info_request_events, :users, :track_things, :comments, :public_bodies, :public_body_translations - before do - rebuild_xapian_index + before(:each) do load_raw_emails_data(raw_emails) + rebuild_xapian_index end it "should get the RSS feed" do @@ -127,9 +125,9 @@ describe TrackController, "when viewing JSON version of a track feed" do integrate_views fixtures :info_requests, :outgoing_messages, :incoming_messages, :raw_emails, :info_request_events, :users, :track_things, :comments, :public_bodies, :public_body_translations - before do - rebuild_xapian_index + before(:each) do load_raw_emails_data(raw_emails) + rebuild_xapian_index end it "should get the feed" do diff --git a/spec/controllers/user_controller_spec.rb b/spec/controllers/user_controller_spec.rb index 0b5e96711..c974c8a0d 100644 --- a/spec/controllers/user_controller_spec.rb +++ b/spec/controllers/user_controller_spec.rb @@ -179,7 +179,7 @@ describe UserController, "when signing up" do deliveries = ActionMailer::Base.deliveries deliveries.size.should == 1 - deliveries[0].body.should include("have an account") + deliveries[0].body.should include("when you already have an") end # XXX need to do bob@localhost signup and check that sends different email @@ -236,7 +236,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 WhatDoTheyKnow to send you the message below") + mail.body.should include("Bob Smith has used #{MySociety::Config.get('SITE_NAME')} to send you the message below") mail.body.should include("Just a test!") #mail.to_addrs.to_s.should == users(:silly_name_user).name_and_email # XXX fix some nastiness with quoting name_and_email mail.from_addrs.to_s.should == users(:bob_smith_user).name_and_email diff --git a/spec/fixtures/files/fake-authority-type-with-field-names.csv b/spec/fixtures/files/fake-authority-type-with-field-names.csv new file mode 100644 index 000000000..93ce00a25 --- /dev/null +++ b/spec/fixtures/files/fake-authority-type-with-field-names.csv @@ -0,0 +1,4 @@ +#id,email,name,name.es +,north_west_foi@localhost,North West Fake Authority,Autoridad del Nordeste +,scottish_foi@localhost,Scottish Fake Authority,Autoridad Escocesa +,ni_foi@localhost,Fake Authority of Northern Ireland,Autoridad Irlandesa diff --git a/spec/fixtures/info_requests.yml b/spec/fixtures/info_requests.yml index bdeef4800..c1e3c1910 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 + idhash: 50929748 naughty_chicken_request: id: 103 title: How much public money is wasted on breeding naughty chickens? @@ -17,6 +18,5 @@ naughty_chicken_request: public_body_id: 2 user_id: 1 described_state: waiting_response - awaiting_description: false - - + awaiting_description: false + idhash: e8d18c84 diff --git a/spec/models/incoming_message_spec.rb b/spec/models/incoming_message_spec.rb index 42ea748fd..5fcc534ca 100644 --- a/spec/models/incoming_message_spec.rb +++ b/spec/models/incoming_message_spec.rb @@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe IncomingMessage, " when dealing with incoming mail" do fixtures :incoming_messages, :raw_emails, :info_requests - before do + before(:each) do @im = incoming_messages(:useless_incoming_message) load_raw_emails_data(raw_emails) end @@ -112,7 +112,7 @@ end describe IncomingMessage, " when censoring data" do fixtures :incoming_messages, :raw_emails, :public_bodies, :public_body_translations, :info_requests, :users - before do + before(:each) do @test_data = "There was a mouse called Stilton, he wished that he was blue." @im = incoming_messages(:useless_incoming_message) @@ -160,10 +160,12 @@ describe IncomingMessage, " when censoring data" do data.should == "His email was x\000x\000x\000@\000x\000x\000x\000.\000x\000x\000x\000, indeed" end - # As at March 9th 2010: This test fails with pdftk 1.41+dfsg-1 installed - # which is in Ubuntu Karmic. It works again for the lasest version - # 1.41+dfsg-7 in Debian unstable. And it works for Debian stable. - it "should replace everything in PDF files" do + + + def pdf_replacement_test(use_ghostscript_compression) + config = MySociety::Config.load_default() + previous = config['USE_GHOSTSCRIPT_COMPRESSION'] + config['USE_GHOSTSCRIPT_COMPRESSION'] = use_ghostscript_compression orig_pdf = load_file_fixture('tfl.pdf') pdf = orig_pdf.dup @@ -175,6 +177,15 @@ describe IncomingMessage, " when censoring data" do masked_text = IncomingMessage._get_attachment_text_internal_one_file('application/pdf', pdf) masked_text.should_not match(/foi@tfl.gov.uk/) masked_text.should match(/xxx@xxx.xxx.xx/) + config['USE_GHOSTSCRIPT_COMPRESSION'] = previous + end + + it "should replace everything in PDF files using pdftk" do + pdf_replacement_test(false) + end + + it "should replace everything in PDF files using ghostscript" do + pdf_replacement_test(true) end it "should not produce zero length output if pdftk silently fails" do @@ -204,7 +215,7 @@ end describe IncomingMessage, " when censoring whole users" do fixtures :incoming_messages, :raw_emails, :public_bodies, :public_body_translations, :info_requests, :users - before do + before(:each) do @test_data = "There was a mouse called Stilton, he wished that he was blue." @im = incoming_messages(:useless_incoming_message) diff --git a/spec/models/info_request_spec.rb b/spec/models/info_request_spec.rb index d0b0e0e32..b82052a0f 100644 --- a/spec/models/info_request_spec.rb +++ b/spec/models/info_request_spec.rb @@ -2,6 +2,40 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe InfoRequest do + describe "guessing a request from an email" do + fixtures :info_requests, :public_bodies, :incoming_messages, :raw_emails + + before(:each) do + @im = incoming_messages(:useless_incoming_message) + load_raw_emails_data(raw_emails) + end + + it 'should compute a hash' do + @info_request = InfoRequest.new(:title => "testing", + :public_body => public_bodies(:geraldine_public_body), + :user_id => 1) + @info_request.save! + @info_request.idhash.should_not == nil + end + + it 'should find a request based on an email with an intact id and a broken hash' do + ir = info_requests(:fancy_dog_request) + id = ir.id + @im.mail.to = "request-#{id}-asdfg@example.com" + guessed = InfoRequest.guess_by_incoming_email(@im) + guessed[0].idhash.should == ir.idhash + end + + it 'should find a request based on an email with a broken id and an intact hash' do + ir = info_requests(:fancy_dog_request) + idhash = ir.idhash + @im.mail.to = "request-123ab-#{idhash}@example.com" + guessed = InfoRequest.guess_by_incoming_email(@im) + guessed[0].id.should == ir.id + end + + end + describe "making up the URL title" do before do @info_request = InfoRequest.new diff --git a/spec/models/public_body_spec.rb b/spec/models/public_body_spec.rb index 5bbf03d27..ec84cbe65 100644 --- a/spec/models/public_body_spec.rb +++ b/spec/models/public_body_spec.rb @@ -240,7 +240,56 @@ describe PublicBody, " when loading CSV files" do PublicBody.count.should == original_count + 3 end -end + it "should handle a field list and fields out of order" do + original_count = PublicBody.count + + csv_contents = load_file_fixture("fake-authority-type-with-field-names.csv") + errors, notes = PublicBody.import_csv(csv_contents, 'fake', true, 'someadmin') # true means dry run + errors.should == [] + notes.size.should == 3 + notes.should == ["line 2: new authority 'North West Fake Authority' with email north_west_foi@localhost", + "line 3: new authority 'Scottish Fake Authority' with email scottish_foi@localhost", + "line 4: new authority 'Fake Authority of Northern Ireland' with email ni_foi@localhost"] + + PublicBody.count.should == original_count + end + + it "should create bodies with names in multiple locales" do + original_count = PublicBody.count + + csv_contents = load_file_fixture("fake-authority-type-with-field-names.csv") + errors, notes = PublicBody.import_csv(csv_contents, 'fake', false, 'someadmin', ['es']) + errors.should == [] + notes.size.should == 6 + notes.should == [ + "line 2: new authority 'North West Fake Authority' with email north_west_foi@localhost", + "line 2: (aka 'Autoridad del Nordeste' in locale es)", + "line 3: new authority 'Scottish Fake Authority' with email scottish_foi@localhost", + "line 3: (aka 'Autoridad Escocesa' in locale es)", + "line 4: new authority 'Fake Authority of Northern Ireland' with email ni_foi@localhost", + "line 4: (aka 'Autoridad Irlandesa' in locale es)"] + + PublicBody.count.should == original_count + 3 + + # XXX Not sure why trying to do a PublicBody.with_locale fails here. Seems related to + # the way categories are loaded every time from the PublicBody class. For now we just + # test some translation was done. + body = PublicBody.find_by_name('North West Fake Authority') + body.translated_locales.map{|l|l.to_s}.sort.should == ["en", "es"] + end + + it "should not fail if a locale is not found in the input file" do + original_count = PublicBody.count + csv_contents = load_file_fixture("fake-authority-type-with-field-names.csv") + errors, notes = PublicBody.import_csv(csv_contents, 'fake', true, 'someadmin', ['xx']) # true means dry run + errors.should == [] + notes.size.should == 3 + notes.should == ["line 2: new authority 'North West Fake Authority' with email north_west_foi@localhost", + "line 3: new authority 'Scottish Fake Authority' with email scottish_foi@localhost", + "line 4: new authority 'Fake Authority of Northern Ireland' with email ni_foi@localhost"] + PublicBody.count.should == original_count + end +end diff --git a/spec/models/request_mailer_spec.rb b/spec/models/request_mailer_spec.rb index a5f59b9bf..fbe22c220 100644 --- a/spec/models/request_mailer_spec.rb +++ b/spec/models/request_mailer_spec.rb @@ -27,7 +27,49 @@ describe RequestMailer, " when receiving incoming mail" do receive_incoming_mail('incoming-request-plain.email', 'dummy@localhost') ir.incoming_messages.size.should == 1 InfoRequest.holding_pen_request.incoming_messages.size.should == 1 + last_event = InfoRequest.holding_pen_request.incoming_messages[0].info_request.get_last_event + last_event.params[:rejected_reason].should == "Could not identify the request from the email address" + + deliveries = ActionMailer::Base.deliveries + deliveries.size.should == 1 + mail = deliveries[0] + mail.to.should == [ MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost') ] + deliveries.clear + end + it "should store mail in holding pen and send to admin when the from email is empty and only authorites can reply" do + ir = info_requests(:fancy_dog_request) + ir.allow_new_responses_from = 'authority_only' + ir.handle_rejected_responses = 'holding_pen' + ir.save! + ir.incoming_messages.size.should == 1 + InfoRequest.holding_pen_request.incoming_messages.size.should == 0 + receive_incoming_mail('incoming-request-plain.email', ir.incoming_email, "") + ir.incoming_messages.size.should == 1 + InfoRequest.holding_pen_request.incoming_messages.size.should == 1 + last_event = InfoRequest.holding_pen_request.incoming_messages[0].info_request.get_last_event + last_event.params[:rejected_reason].should =~ /there is no "From" address/ + + deliveries = ActionMailer::Base.deliveries + deliveries.size.should == 1 + mail = deliveries[0] + mail.to.should == [ MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost') ] + deliveries.clear + end + + it "should store mail in holding pen and send to admin when the from email is unknown and only authorites can reply" do + ir = info_requests(:fancy_dog_request) + ir.allow_new_responses_from = 'authority_only' + ir.handle_rejected_responses = 'holding_pen' + ir.save! + ir.incoming_messages.size.should == 1 + InfoRequest.holding_pen_request.incoming_messages.size.should == 0 + receive_incoming_mail('incoming-request-plain.email', ir.incoming_email, "frob@nowhere.com") + ir.incoming_messages.size.should == 1 + InfoRequest.holding_pen_request.incoming_messages.size.should == 1 + last_event = InfoRequest.holding_pen_request.incoming_messages[0].info_request.get_last_event + last_event.params[:rejected_reason].should =~ /Only the authority can reply/ + deliveries = ActionMailer::Base.deliveries deliveries.size.should == 1 mail = deliveries[0] @@ -108,6 +150,8 @@ describe RequestMailer, " when receiving incoming mail" do receive_incoming_mail('incoming-request-plain.email', ir.incoming_email) ir.incoming_messages.size.should == 1 InfoRequest.holding_pen_request.incoming_messages.size.should == 1 # arrives in holding pen + last_event = InfoRequest.holding_pen_request.incoming_messages[0].info_request.get_last_event + last_event.params[:rejected_reason].should =~ /allow new responses from nobody/ # should be a message to admin regarding holding pen deliveries = ActionMailer::Base.deliveries diff --git a/spec/models/xapian_spec.rb b/spec/models/xapian_spec.rb index 37e68b145..0c6fa6bb6 100644 --- a/spec/models/xapian_spec.rb +++ b/spec/models/xapian_spec.rb @@ -34,7 +34,7 @@ describe User, " when indexing users with Xapian" do end describe PublicBody, " when indexing public bodies with Xapian" do - fixtures :public_bodies, :public_body_translations, :incoming_messages, :outgoing_messages, :raw_emails, :comments + fixtures :public_bodies, :public_body_translations, :incoming_messages, :outgoing_messages, :raw_emails, :comments, :info_requests before(:each) do load_raw_emails_data(raw_emails) end @@ -74,6 +74,10 @@ end describe PublicBody, " when indexing requests by body they are to" do fixtures :public_bodies, :public_body_translations, :info_request_events, :info_requests, :raw_emails, :comments + before(:each) do + load_raw_emails_data(raw_emails) + end + it "should find requests to the body" do rebuild_xapian_index xapian_object = InfoRequest.full_search([InfoRequestEvent], "requested_from:tgq", 'created_at', true, nil, 100, 1) diff --git a/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb b/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb index 2f66b68be..43f0764ca 100644 --- a/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb +++ b/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb @@ -220,7 +220,7 @@ module ActsAsXapian raise "writable_suffix/suffix inconsistency" if @@writable_suffix && @@writable_suffix != suffix # for indexing - @@writable_db = Xapian::WritableDatabase.new(full_path, Xapian::DB_CREATE_OR_OPEN) + @@writable_db = Xapian::flint_open(full_path, Xapian::DB_CREATE_OR_OPEN) @@term_generator = Xapian::TermGenerator.new() @@term_generator.set_flags(Xapian::TermGenerator::FLAG_SPELLING, 0) @@term_generator.database = @@writable_db |