aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml3
-rw-r--r--Gemfile1
-rw-r--r--README.md17
-rw-r--r--app/controllers/admin_general_controller.rb2
-rw-r--r--app/controllers/admin_public_body_controller.rb3
-rw-r--r--app/controllers/application_controller.rb19
-rw-r--r--app/controllers/general_controller.rb29
-rw-r--r--app/controllers/public_body_controller.rb4
-rw-r--r--app/controllers/reports_controller.rb31
-rw-r--r--app/controllers/request_controller.rb37
-rw-r--r--app/controllers/user_controller.rb6
-rw-r--r--app/mailers/track_mailer.rb6
-rw-r--r--app/models/info_request.rb87
-rw-r--r--app/models/info_request_event.rb2
-rw-r--r--app/models/outgoing_message.rb22
-rw-r--r--app/models/user.rb7
-rw-r--r--app/views/admin_public_body/show.html.erb3
-rw-r--r--app/views/general/_stylesheet_includes.html.erb5
-rw-r--r--app/views/general/custom_css.html.erb1
-rw-r--r--app/views/layouts/default.html.erb2
-rw-r--r--app/views/layouts/no_chrome.html.erb17
-rw-r--r--app/views/public_body/_search_ahead.html.erb5
-rw-r--r--app/views/public_body/show.html.erb7
-rw-r--r--app/views/reports/new.html.erb26
-rw-r--r--app/views/request/_sidebar.html.erb2
-rw-r--r--app/views/request/new_please_describe.html.erb2
-rw-r--r--app/views/request/select_authority.html.erb21
-rw-r--r--config/.gitignore1
-rw-r--r--config/alert-tracks-debian.ugly6
-rw-r--r--config/crontab-example (renamed from config/crontab.ugly)6
-rw-r--r--config/deploy.rb1
-rw-r--r--config/general.yml-example5
-rw-r--r--config/initializers/alaveteli.rb2
-rw-r--r--config/packages1
-rw-r--r--config/packages_development9
-rw-r--r--config/purge-varnish-debian.ugly6
-rw-r--r--config/routes.rb15
-rw-r--r--doc/CHANGES.md19
-rw-r--r--doc/INSTALL-exim4.md4
-rw-r--r--doc/INSTALL.md4
-rw-r--r--doc/THEMES.md12
-rw-r--r--lib/configuration.rb1
-rw-r--r--lib/tasks/temp.rake22
-rw-r--r--lib/tasks/themes.rake12
-rw-r--r--lib/tasks/translation.rake12
-rw-r--r--locale/aln/app.po45
-rw-r--r--locale/app.pot43
-rw-r--r--locale/ar/app.po49
-rw-r--r--locale/bs/app.po48
-rw-r--r--locale/ca/app.po47
-rw-r--r--locale/cs/app.po86
-rw-r--r--locale/cy/app.po47
-rw-r--r--locale/de/app.po46
-rw-r--r--locale/en/app.po43
-rw-r--r--locale/en_IE/app.po47
-rw-r--r--locale/es/app.po50
-rw-r--r--locale/eu/app.po46
-rw-r--r--locale/fr/app.po60
-rw-r--r--locale/gl/app.po45
-rw-r--r--locale/he_IL/app.po49
-rw-r--r--locale/hr/app.po3604
-rw-r--r--locale/hr_HR/app.po53
-rw-r--r--locale/hu_HU/app.po49
-rw-r--r--locale/id/app.po47
-rw-r--r--locale/it/app.po45
-rw-r--r--locale/nb_NO/app.po47
-rw-r--r--locale/pt_BR/app.po61
-rw-r--r--locale/ro_RO/app.po47
-rw-r--r--locale/sl/app.po47
-rw-r--r--locale/sq/app.po50
-rw-r--r--locale/sr@latin/app.po47
-rw-r--r--locale/tr/app.po46
-rw-r--r--locale/uk/app.po50
-rw-r--r--public/stylesheets/ie6-custom.css1
-rw-r--r--public/stylesheets/main.css5
-rwxr-xr-xscript/make-crontab2
-rw-r--r--spec/controllers/general_controller_spec.rb3
-rw-r--r--spec/controllers/public_body_controller_spec.rb5
-rw-r--r--spec/controllers/reports_controller_spec.rb104
-rw-r--r--spec/controllers/request_controller_spec.rb313
-rw-r--r--spec/controllers/user_controller_spec.rb10
-rw-r--r--spec/integration/view_request_spec.rb7
-rw-r--r--spec/mailers/outgoing_mailer_spec.rb111
-rw-r--r--spec/mailers/track_mailer_spec.rb8
-rw-r--r--spec/models/incoming_message_spec.rb4
-rw-r--r--spec/models/info_request_spec.rb31
-rw-r--r--spec/models/outgoing_message_spec.rb19
-rw-r--r--spec/models/xapian_spec.rb129
-rw-r--r--spec/spec_helper.rb12
-rw-r--r--spec/views/reports/new.erb_spec.rb29
-rw-r--r--vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb5
91 files changed, 5390 insertions, 857 deletions
diff --git a/.travis.yml b/.travis.yml
index 4fd2a59f7..051dc0fae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,12 @@
language: ruby
branches:
only:
- - develop
- master
- rails-3-develop
rvm:
- 1.8.7
- 1.9.3
before_install:
- - gem update --system 1.8.5
- - gem update --system 1.6.2
- gem install rake --version=0.9.2.2
- git submodule update --init --recursive
- psql -c "create database foi_test template template0 encoding 'SQL_ASCII';" -U postgres
diff --git a/Gemfile b/Gemfile
index 18c2aec0d..6149891ff 100644
--- a/Gemfile
+++ b/Gemfile
@@ -41,7 +41,6 @@ gem 'dynamic_form'
gem 'exception_notification'
# Gems related to internationalisation
-# Also in vendor/plugins there is globalize2
gem 'fast_gettext'
gem 'gettext_i18n_rails'
gem 'gettext'
diff --git a/README.md b/README.md
index 9cdb766bb..8dc3125a1 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# Welcome to Alaveteli!
-[![Build Status](https://secure.travis-ci.org/mysociety/alaveteli.png)](http://travis-ci.org/mysociety/alaveteli) [![Dependency Status](https://gemnasium.com/mysociety/alaveteli.png)](https://gemnasium.com/mysociety/alaveteli) [![Coverage Status](https://coveralls.io/repos/mysociety/alaveteli/badge.png?branch=master)](https://coveralls.io/r/mysociety/alaveteli) [![Code Climate](https://codeclimate.com/github/mysociety/alaveteli.png)](https://codeclimate.com/github/mysociety/alaveteli)
+[![Build Status](https://secure.travis-ci.org/mysociety/alaveteli.png)](http://travis-ci.org/mysociety/alaveteli) [![Dependency Status](https://gemnasium.com/mysociety/alaveteli.png)](https://gemnasium.com/mysociety/alaveteli) [![Coverage Status](https://coveralls.io/repos/mysociety/alaveteli/badge.png?branch=rails-3-develop)](https://coveralls.io/r/mysociety/alaveteli) [![Code Climate](https://codeclimate.com/github/mysociety/alaveteli.png)](https://codeclimate.com/github/mysociety/alaveteli)
This is an open source project to create a standard, internationalised
platform for making Freedom of Information (FOI) requests in different
@@ -24,6 +24,21 @@ There's background information and a more documentation on
of useful information (including a blog) on
[the project website](http://alaveteli.org)
+## How to contribute
+
+If you find what looks like a bug:
+
+* Check the [GitHub issue tracker](http://github.com/mysociety/alaveteli/issues/)
+ to see if anyone else has reported issue.
+* If you don't see anything, create an issue with information on how to reproduce it.
+
+If you want to contribute an enhancement or a fix:
+
+* Fork the project on GitHub.
+* Make your changes with tests.
+* Commit the changes without making changes to any files that aren't related to your enhancement or fix.
+* Send a pull request.
+
Looking for the latest stable release? It's on the
[master branch](https://github.com/mysociety/alaveteli/tree/master).
diff --git a/app/controllers/admin_general_controller.rb b/app/controllers/admin_general_controller.rb
index b64fcac3e..ec5f95eda 100644
--- a/app/controllers/admin_general_controller.rb
+++ b/app/controllers/admin_general_controller.rb
@@ -134,7 +134,7 @@ class AdminGeneralController < AdminController
def debug
@admin_current_user = admin_current_user
- @current_commit = `git log -1 --format="%H"`
+ @current_commit = alaveteli_git_commit
@current_branch = `git branch | perl -ne 'print $1 if /^\\* (.*)/'`
@current_version = `git describe --always --tags`
repo = `git remote show origin -n | perl -ne 'print $1 if m{Fetch URL: .*github\\.com[:/](.*)\\.git}'`
diff --git a/app/controllers/admin_public_body_controller.rb b/app/controllers/admin_public_body_controller.rb
index 52b56eda2..078af12f4 100644
--- a/app/controllers/admin_public_body_controller.rb
+++ b/app/controllers/admin_public_body_controller.rb
@@ -75,6 +75,9 @@ class AdminPublicBodyController < AdminController
@locale = self.locale_from_params()
I18n.with_locale(@locale) do
@public_body = PublicBody.find(params[:id])
+ @info_requests = @public_body.info_requests.paginate :order => "created_at desc",
+ :page => params[:page],
+ :per_page => 100
render
end
end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index acf366bfb..88b107861 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -363,12 +363,15 @@ class ApplicationController < ActionController::Base
# Peform the search
@per_page = per_page
- if this_page.nil?
- @page = get_search_page_from_params
- else
- @page = this_page
- end
- result = InfoRequest.full_search(models, @query, order, ascending, collapse, @per_page, @page)
+ @page = this_page || get_search_page_from_params
+
+ result = ActsAsXapian::Search.new(models, @query,
+ :offset => (@page - 1) * @per_page,
+ :limit => @per_page,
+ :sort_by_prefix => order,
+ :sort_by_ascending => ascending,
+ :collapse_by_prefix => collapse
+ )
result.results # Touch the results to load them, otherwise accessing them from the view
# might fail later if the database has subsequently been reopened.
return result
@@ -542,6 +545,10 @@ class ApplicationController < ActionController::Base
return country
end
+ def alaveteli_git_commit
+ `git log -1 --format="%H"`.strip
+ end
+
# URL generating functions are needed by all controllers (for redirects),
# views (for links) and mailers (for use in emails), so include them into
# all of all.
diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb
index 9d0f91dda..939dd1739 100644
--- a/app/controllers/general_controller.rb
+++ b/app/controllers/general_controller.rb
@@ -153,7 +153,7 @@ class GeneralController < ApplicationController
# structured query which should show newest first, rather than a free text search
# where we want most relevant as default.
begin
- dummy_query = ::ActsAsXapian::Search.new([InfoRequestEvent], @query, :limit => 1)
+ dummy_query = ActsAsXapian::Search.new([InfoRequestEvent], @query, :limit => 1)
rescue => e
flash[:error] = "Your query was not quite right. " + CGI.escapeHTML(e.to_str)
redirect_to search_url("")
@@ -169,10 +169,8 @@ class GeneralController < ApplicationController
# Query each type separately for separate display (XXX we are calling
# perform_search multiple times and it clobbers per_page for each one,
# so set as separate var)
- requests_per_page = 25
- if params[:requests_per_page]
- requests_per_page = params[:requests_per_page].to_i
- end
+ requests_per_page = params[:requests_per_page] ? params[:requests_per_page].to_i : 25
+
@this_page_hits = @total_hits = @xapian_requests_hits = @xapian_bodies_hits = @xapian_users_hits = 0
if @requests
@xapian_requests = perform_search([InfoRequestEvent], @query, @sortby, 'request_collapse', requests_per_page)
@@ -211,22 +209,19 @@ class GeneralController < ApplicationController
@feed_autodetect = [ { :url => do_track_url(@track_thing, 'feed'), :title => @track_thing.params[:title_in_rss], :has_json => true } ]
end
- # Jump to a random request
- def random_request
- info_request = InfoRequest.random
- redirect_to request_url(info_request)
- end
-
- def custom_css
- long_cache
- @locale = self.locale_from_params()
- render(:layout => false, :content_type => 'text/css')
- end
-
# Handle requests for non-existent URLs - will be handled by ApplicationController::render_exception
def not_found
raise RouteNotFound
end
+ def version
+ respond_to do |format|
+ format.json { render :json => {
+ :alaveteli_git_commit => alaveteli_git_commit,
+ :alaveteli_version => ALAVETELI_VERSION,
+ :ruby_version => RUBY_VERSION
+ }}
+ end
+ end
end
diff --git a/app/controllers/public_body_controller.rb b/app/controllers/public_body_controller.rb
index 74ea043bb..374866eda 100644
--- a/app/controllers/public_body_controller.rb
+++ b/app/controllers/public_body_controller.rb
@@ -131,7 +131,9 @@ class PublicBodyController < ApplicationController
@public_bodies = PublicBody.where(conditions).joins(:translations).order("public_body_translations.name").paginate(
:page => params[:page], :per_page => 100
)
- render :template => "public_body/list"
+ respond_to do |format|
+ format.html { render :template => "public_body/list" }
+ end
end
end
diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb
new file mode 100644
index 000000000..a1dd53125
--- /dev/null
+++ b/app/controllers/reports_controller.rb
@@ -0,0 +1,31 @@
+class ReportsController < ApplicationController
+ def create
+ @info_request = InfoRequest.find_by_url_title!(params[:request_id])
+ @reason = params[:reason]
+ @message = params[:message]
+ if @reason.empty?
+ flash[:error] = _("Please choose a reason")
+ render "new"
+ return
+ end
+
+ if !authenticated_user
+ flash[:notice] = _("You need to be logged in to report a request for administrator attention")
+ elsif @info_request.attention_requested
+ flash[:notice] = _("This request has already been reported for administrator attention")
+ else
+ @info_request.report!(@reason, @message, @user)
+ flash[:notice] = _("This request has been reported for administrator attention")
+ end
+ redirect_to request_url(@info_request)
+ end
+
+ def new
+ @info_request = InfoRequest.find_by_url_title!(params[:request_id])
+ if authenticated?(
+ :web => _("To report this request"),
+ :email => _("Then you can report the request '{{title}}'", :title => @info_request.title),
+ :email_subject => _("Report an offensive or unsuitable request"))
+ end
+ end
+end
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb
index a455d1725..42693f867 100644
--- a/app/controllers/request_controller.rb
+++ b/app/controllers/request_controller.rb
@@ -100,7 +100,7 @@ class RequestController < ApplicationController
# ... requests that have similar imporant terms
begin
limit = 10
- @xapian_similar = ::ActsAsXapian::Similar.new([InfoRequestEvent], @info_request.info_request_events,
+ @xapian_similar = ActsAsXapian::Similar.new([InfoRequestEvent], @info_request.info_request_events,
:limit => limit, :collapse_by_prefix => 'request_collapse')
@xapian_similar_more = (@xapian_similar.matches_estimated > limit)
rescue
@@ -146,7 +146,7 @@ class RequestController < ApplicationController
if !@info_request.user_can_view?(authenticated_user)
return render_hidden
end
- @xapian_object = ::ActsAsXapian::Similar.new([InfoRequestEvent], @info_request.info_request_events,
+ @xapian_object = ActsAsXapian::Similar.new([InfoRequestEvent], @info_request.info_request_events,
:offset => (@page - 1) * @per_page, :limit => @per_page, :collapse_by_prefix => 'request_collapse')
@matches_estimated = @xapian_object.matches_estimated
@show_no_more_than = (@matches_estimated > MAX_RESULTS) ? MAX_RESULTS : @matches_estimated
@@ -461,9 +461,19 @@ class RequestController < ApplicationController
when 'rejected'
_("Oh no! Sorry to hear that your request was refused. Here is what to do now.")
when 'successful'
- _("<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/")
+ if AlaveteliConfiguration::donation_url.blank?
+ _("<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>")
+ else
+ _("<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 => AlaveteliConfiguration::donation_url)
+ end
when 'partially_successful'
- _("<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/")
+ if AlaveteliConfiguration::donation_url.blank?
+ _("<p>We're glad you got some of the information that you wanted.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>")
+ else
+ _("<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 => AlaveteliConfiguration::donation_url)
+ end
when 'waiting_clarification'
_("Please write your follow up message containing the necessary clarifications below.")
when 'gone_postal'
@@ -676,25 +686,6 @@ class RequestController < ApplicationController
end
end
- def report_request
- info_request = InfoRequest.find_by_url_title!(params[:url_title])
- return if !authenticated?(
- :web => _("To report this FOI request"),
- :email => _("Then you can report the request '{{title}}'", :title => info_request.title),
- :email_subject => _("Report an offensive or unsuitable request")
- )
-
- if !info_request.attention_requested
- info_request.set_described_state('attention_requested', @user)
- info_request.attention_requested = true # tells us if attention has ever been requested
- info_request.save!
- flash[:notice] = _("This request has been reported for administrator attention")
- else
- flash[:notice] = _("This request has already been reported for administrator attention")
- end
- redirect_to request_url(info_request)
- end
-
# special caching code so mime types are handled right
around_filter :cache_attachments, :only => [ :get_attachment, :get_attachment_as_html ]
def cache_attachments
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index e21315eb6..1bf5a5316 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -119,7 +119,11 @@ class UserController < ApplicationController
@track_things = TrackThing.find(:all, :conditions => ["tracking_user_id = ? and track_medium = ?", @display_user.id, 'email_daily'], :order => 'created_at desc')
for track_thing in @track_things
# XXX factor out of track_mailer.rb
- xapian_object = InfoRequest.full_search([InfoRequestEvent], track_thing.track_query, 'described_at', true, nil, 20, 1)
+ xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], track_thing.track_query,
+ :sort_by_prefix => 'described_at',
+ :sort_by_ascending => true,
+ :collapse_by_prefix => nil,
+ :limit => 20)
feed_results += xapian_object.results.map {|x| x[:model]}
end
end
diff --git a/app/mailers/track_mailer.rb b/app/mailers/track_mailer.rb
index 7157e12d8..8e9beded6 100644
--- a/app/mailers/track_mailer.rb
+++ b/app/mailers/track_mailer.rb
@@ -65,7 +65,11 @@ class TrackMailer < ApplicationMailer
# Query for things in this track. We use described_at for the
# ordering, so we catch anything new (before described), or
# anything whose new status has been described.
- xapian_object = InfoRequest.full_search([InfoRequestEvent], track_thing.track_query, 'described_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], track_thing.track_query,
+ :sort_by_prefix => 'described_at',
+ :sort_by_ascending => true,
+ :collapse_by_prefix => nil,
+ :limit => 100)
# Go through looking for unalerted things
alert_results = []
for result in xapian_object.results
diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index c549d6f5d..46c247fa9 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -108,6 +108,12 @@ class InfoRequest < ActiveRecord::Base
states
end
+ # Possible reasons that a request could be reported for administrator attention
+ def report_reasons
+ ["Contains defamatory material", "Not a valid request", "Request for personal information",
+ "Contains personal information", "Vexatious", "Other"]
+ end
+
def must_be_valid_state
errors.add(:described_state, "is not a valid state") if
!InfoRequest.enumerate_states.include? described_state
@@ -150,6 +156,10 @@ class InfoRequest < ActiveRecord::Base
end
end
+ def user_json_for_api
+ is_external? ? { :name => user_name || _("Anonymous user") } : user.json_for_api
+ end
+
@@custom_states_loaded = false
begin
if !Rails.env.test?
@@ -189,21 +199,6 @@ class InfoRequest < ActiveRecord::Base
self.comments.find(:all, :conditions => 'visible')
end
- # Central function to do all searches
- # (Not really the right place to put it, but everything can get it here, and it
- # does *mainly* find info requests, via their events, so hey)
- def InfoRequest.full_search(models, query, order, ascending, collapse, per_page, page)
- offset = (page - 1) * per_page
-
- return ::ActsAsXapian::Search.new(
- models, query,
- :offset => offset, :limit => per_page,
- :sort_by_prefix => order,
- :sort_by_ascending => ascending,
- :collapse_by_prefix => collapse
- )
- end
-
# If the URL name has changed, then all request: queries will break unless
# we update index for every event. Also reindex if prominence changes.
after_update :reindex_some_request_events
@@ -232,17 +227,6 @@ class InfoRequest < ActiveRecord::Base
end
end
- # For debugging
- def InfoRequest.profile_search(query)
- t = Time.now.usec
- for i in (1..10)
- t = Time.now.usec - t
- secs = t / 1000000.0
- STDOUT.write secs.to_s + " query " + i.to_s + "\n"
- results = InfoRequest.full_search([InfoRequestEvent], query, "created_at", true, nil, 25, 1).results
- end
- end
-
public
# When name is changed, also change the url name
def title=(title)
@@ -351,7 +335,10 @@ public
# copying an email, and that doesn't matter)
def InfoRequest.find_by_incoming_email(incoming_email)
id, hash = InfoRequest._extract_id_hash_from_email(incoming_email)
- return self.find_by_magic_email(id, hash)
+ if hash_from_id(id) == hash
+ # Not using find(id) because we don't exception raised if nothing found
+ find_by_id(id)
+ end
end
# Return list of info requests which *might* be right given email address
@@ -566,6 +553,15 @@ public
['requires_admin', 'error_message', 'attention_requested'].include?(described_state)
end
+ # Report this request for administrator attention
+ def report!(reason, message, user)
+ ActiveRecord::Base.transaction do
+ set_described_state('attention_requested', user, "Reason: #{reason}\n\n#{message}")
+ self.attention_requested = true # tells us if attention has ever been requested
+ save!
+ end
+ end
+
# change status, including for last event for later historical purposes
def set_described_state(new_state, set_by = nil, message = "")
old_described_state = described_state
@@ -913,24 +909,6 @@ public
return Digest::SHA1.hexdigest(id.to_s + AlaveteliConfiguration::incoming_email_secret)[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 = InfoRequest.hash_from_id(id)
- #print "expected: " + expected_hash + "\nhash: " + hash + "\n"
- if hash != expected_hash
- return nil
- else
- begin
- return self.find(id)
- rescue ActiveRecord::RecordNotFound
- # so error email is sent to admin, rather than the exception sending weird
- # error to the public body.
- return nil
- end
- end
- end
-
# Used to find when event last changed
def InfoRequest.last_event_time_clause(event_type=nil)
event_type_clause = ''
@@ -1081,25 +1059,6 @@ public
InfoRequest.update_all "allow_new_responses_from = 'nobody' where updated_at < (now() - interval '1 year') and allow_new_responses_from in ('anybody', 'authority_only') and url_title <> 'holding_pen'"
end
- # Returns a random FOI request
- def InfoRequest.random
- max_id = InfoRequest.connection.select_value('select max(id) as a from info_requests').to_i
- info_request = nil
- count = 0
- while info_request.nil?
- if count > 100
- return nil
- end
- id = rand(max_id) + 1
- begin
- count += 1
- info_request = find(id, :conditions => ["prominence = 'normal'"])
- rescue ActiveRecord::RecordNotFound
- end
- end
- return info_request
- end
-
def json_for_api(deep)
ret = {
:id => self.id,
diff --git a/app/models/info_request_event.rb b/app/models/info_request_event.rb
index 469aabc4a..0967e3940 100644
--- a/app/models/info_request_event.rb
+++ b/app/models/info_request_event.rb
@@ -420,7 +420,7 @@ class InfoRequestEvent < ActiveRecord::Base
if deep
ret[:info_request] = self.info_request.json_for_api(false)
ret[:public_body] = self.info_request.public_body.json_for_api
- ret[:user] = self.info_request.user.json_for_api
+ ret[:user] = self.info_request.user_json_for_api
end
return ret
diff --git a/app/models/outgoing_message.rb b/app/models/outgoing_message.rb
index dbe2cf1ca..aedfb9cad 100644
--- a/app/models/outgoing_message.rb
+++ b/app/models/outgoing_message.rb
@@ -23,6 +23,14 @@
# Email: hello@mysociety.org; WWW: http://www.mysociety.org/
class OutgoingMessage < ActiveRecord::Base
+ include Rails.application.routes.url_helpers
+ include LinkToHelper
+ self.default_url_options[:host] = AlaveteliConfiguration::domain
+ # https links in emails if forcing SSL
+ if AlaveteliConfiguration::force_ssl
+ self.default_url_options[:protocol] = "https"
+ end
+
strip_attributes!
belongs_to :info_request
@@ -80,15 +88,15 @@ class OutgoingMessage < ActiveRecord::Base
end
if self.what_doing == 'internal_review'
- "Please pass this on to the person who conducts Freedom of Information reviews." +
+ _("Please pass this on to the person who conducts Freedom of Information reviews.") +
"\n\n" +
- "I am writing to request an internal review of " +
- self.info_request.public_body.name +
- "'s handling of my FOI request " +
- "'" + self.info_request.title + "'." +
+ _("I am writing to request an internal review of {{public_body_name}}'s handling of my FOI request '{{info_request_title}}'.",
+ :public_body_name => self.info_request.public_body.name,
+ :info_request_title => self.info_request.title) +
"\n\n\n\n [ " + self.get_internal_review_insert_here_note + " ] \n\n\n\n" +
- "A full history of my FOI request and all correspondence is available on the Internet at this address:\n" +
- "http://" + AlaveteliConfiguration::domain + "/request/" + self.info_request.url_title
+ _("A full history of my FOI request and all correspondence is available on the Internet at this address: {{url}}",
+ :url => request_url(self.info_request)) +
+ "\n"
else
""
end
diff --git a/app/models/user.rb b/app/models/user.rb
index 306d6ad4a..9da4ad743 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -107,8 +107,11 @@ class User < ActiveRecord::Base
end
if self.public_banned?
# Use interpolation to return a string rather than a SafeBuffer so that
- # gsub can be called on it until we upgrade to Rails 3.2
- name = "#{_("{{user_name}} (Account suspended)", :user_name=> name)}"
+ # gsub can be called on it until we upgrade to Rails 3.2. The name returned
+ # is not marked as HTML safe so will be escaped automatically in views. We
+ # do this in two steps so the string still gets picked up for translation
+ name = _("{{user_name}} (Account suspended)", :user_name=> name.html_safe)
+ name = "#{name}"
end
name
end
diff --git a/app/views/admin_public_body/show.html.erb b/app/views/admin_public_body/show.html.erb
index cfb10b24e..8262287d5 100644
--- a/app/views/admin_public_body/show.html.erb
+++ b/app/views/admin_public_body/show.html.erb
@@ -83,7 +83,8 @@
<% end %>
<hr>
<h2>Requests</h2>
-<%= render :partial => 'admin_request/some_requests', :locals => { :info_requests => @public_body.info_requests } %>
+<%= render :partial => 'admin_request/some_requests', :locals => { :info_requests => @info_requests } %>
+<%= will_paginate(@info_requests, :class => "paginator") %>
<hr>
<h2>Track things</h2>
<%= render :partial => 'admin_track/some_tracks', :locals => { :track_things => @public_body.track_things, :include_destroy => true } %>
diff --git a/app/views/general/_stylesheet_includes.html.erb b/app/views/general/_stylesheet_includes.html.erb
index 5b6e12258..9dd1f357d 100644
--- a/app/views/general/_stylesheet_includes.html.erb
+++ b/app/views/general/_stylesheet_includes.html.erb
@@ -8,14 +8,9 @@
<!--[if LT IE 7]>
<style type="text/css">@import url("/stylesheets/ie6.css");</style>
<![endif]-->
- <!--[if LT IE 7]>
- <style type="text/css">@import url("/stylesheets/ie6-custom.css");</style>
- <![endif]-->
<!--[if LT IE 8]>
<style type="text/css">@import url("/stylesheets/ie7.css");</style>
<![endif]-->
- <!-- the following method for customising CSS is deprecated; see `doc/THEMES.md` for detail -->
- <%= stylesheet_link_tag 'custom', :title => "Main", :rel => "stylesheet" %>
<% if AlaveteliConfiguration::force_registration_on_new_request %>
<%= stylesheet_link_tag 'jquery.fancybox-1.3.4', :rel => "stylesheet" %>
<% end %>
diff --git a/app/views/general/custom_css.html.erb b/app/views/general/custom_css.html.erb
deleted file mode 100644
index 0def82ed0..000000000
--- a/app/views/general/custom_css.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-// this should be overridden in a local "theme" plugin
diff --git a/app/views/layouts/default.html.erb b/app/views/layouts/default.html.erb
index 32ea5e4ff..688816fa9 100644
--- a/app/views/layouts/default.html.erb
+++ b/app/views/layouts/default.html.erb
@@ -33,7 +33,7 @@
<% end %>
<% end %>
<% if @has_json %>
- <link rel="alternate" type="application/json" title="JSON version of this page" href="<%=h url_for(request.query_parameters.merge(:format => 'json')) %>">
+ <link rel="alternate" type="application/json" title="JSON version of this page" href="<%=h url_for(request.params.merge(:format => 'json')) %>">
<% end %>
<% if @no_crawl %>
diff --git a/app/views/layouts/no_chrome.html.erb b/app/views/layouts/no_chrome.html.erb
index 120ba6f28..d7918cffc 100644
--- a/app/views/layouts/no_chrome.html.erb
+++ b/app/views/layouts/no_chrome.html.erb
@@ -12,19 +12,16 @@
<script type="text/javascript" src="/javascripts/jquery.js"></script>
- <%= stylesheet_link_tag 'main', :title => "Main", :rel => "stylesheet" %>
- <%= stylesheet_link_tag 'fonts', :rel => "stylesheet" %>
- <%= stylesheet_link_tag 'theme', :rel => "stylesheet" %>
- <!--[if LT IE 7]>
- <style type="text/css">@import url("/stylesheets/ie6.css");</style>
- <![endif]-->
- <!--[if LT IE 7]>
- <style type="text/css">@import url("/stylesheets/ie6-custom.css");</style>
+ <%= stylesheet_link_tag 'main', :title => "Main", :rel => "stylesheet" %>
+ <%= stylesheet_link_tag 'fonts', :rel => "stylesheet" %>
+ <%= stylesheet_link_tag 'theme', :rel => "stylesheet" %>
+ <!--[if LT IE 7]>
+ <style type="text/css">@import url("/stylesheets/ie6.css");</style>
<![endif]-->
<%= stylesheet_link_tag 'custom', :title => "Main", :rel => "stylesheet" %>
</head>
<body>
- <div class="entirebody">
+ <div class="entirebody">
<div id="content">
<% if flash[:notice] %>
<div id="notice"><%= flash[:notice] %></div>
@@ -39,4 +36,4 @@
</div>
</div>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/app/views/public_body/_search_ahead.html.erb b/app/views/public_body/_search_ahead.html.erb
index b1af2464d..3d1dc8f93 100644
--- a/app/views/public_body/_search_ahead.html.erb
+++ b/app/views/public_body/_search_ahead.html.erb
@@ -1,4 +1,4 @@
-<div>
+
<% if !@xapian_requests.nil? %>
<% if @xapian_requests.results.size > 0 %>
<h3><%= _('Top search results:') %></h3>
@@ -10,12 +10,11 @@
<% end %>
<div id="authority_search_ahead_results">
<% for result in @xapian_requests.results %>
- <%= render :partial => 'body_listing_single', :locals => { :public_body => result[:model] } %>
+ <%= render :partial => 'public_body/body_listing_single', :locals => { :public_body => result[:model] } %>
<% end %>
</div>
<%= will_paginate WillPaginate::Collection.new(@page, @per_page, @xapian_requests.matches_estimated), :params => {:controller=>"request", :action => "select_authority"} %>
<% end %>
-</div>
diff --git a/app/views/public_body/show.html.erb b/app/views/public_body/show.html.erb
index fa6243b47..47075a1f5 100644
--- a/app/views/public_body/show.html.erb
+++ b/app/views/public_body/show.html.erb
@@ -56,12 +56,7 @@
<div id="stepwise_make_request">
<% if @public_body.is_requestable? || @public_body.not_requestable_reason == 'bad_contact' %>
- <% if @public_body.eir_only? %>
- <%= _('Make a new <strong>Environmental Information</strong> request')%>
- <% else %>
- <%= _('Make a new <strong>Freedom of Information</strong> request to {{public_body}}', :public_body => h(@public_body.name))%>
- <% end %>
- &nbsp;<%= link_to _("Start"), new_request_to_body_url(:url_name => @public_body.url_name), :class => "link_button_green" %>
+ <%= link_to _("Make a request to this authority"), new_request_to_body_path(:url_name => @public_body.url_name), :class => "link_button_green" %>
<% elsif @public_body.has_notes? %>
<%= @public_body.notes_as_html.html_safe %>
<% elsif @public_body.not_requestable_reason == 'not_apply' %>
diff --git a/app/views/reports/new.html.erb b/app/views/reports/new.html.erb
new file mode 100644
index 000000000..7d558ab4e
--- /dev/null
+++ b/app/views/reports/new.html.erb
@@ -0,0 +1,26 @@
+<h1>Report request: <%= @info_request.title %></h1>
+
+<% if @info_request.attention_requested %>
+ <p><%= _("This request has already been reported for administrator attention") %></p>
+<% else %>
+ <p>
+ Reporting a request notifies the site administrators. They will respond as soon as possible.
+ </p>
+ <p>Why specifically do you consider this request unsuitable?</p>
+
+ <%= form_tag request_report_path(:request_id => @info_request.url_title) do %>
+ <p>
+ <label class="form_label" for="reason">Reason:</label>
+ <%= select_tag :reason, options_for_select(@info_request.report_reasons, @reason), :prompt => "Choose a reason" %>
+ </p>
+ <p>
+ <label class="form_label" for="message">Please tell us more:</label>
+ <%= text_area_tag :message, @message, :rows => 10, :cols => 60 %>
+ </p>
+
+ <div class="form_button">
+ <%= submit_tag _("Report request") %>
+ </div>
+
+ <% end %>
+<% end %>
diff --git a/app/views/request/_sidebar.html.erb b/app/views/request/_sidebar.html.erb
index 4bc8826fd..aba5c2fb3 100644
--- a/app/views/request/_sidebar.html.erb
+++ b/app/views/request/_sidebar.html.erb
@@ -30,7 +30,7 @@
<% else %>
<p><%= _('Requests for personal information and vexatious requests are not considered valid for FOI purposes (<a href="/help/about">read more</a>).') %></p>
<p><%= _('If you believe this request is not suitable, you can report it for attention by the site administrators') %></p>
- <%= button_to _("Report this request"), report_path(:url_title => @info_request.url_title), :class => "link_button_green" %>
+ <%= link_to _("Report this request"), new_request_report_path(:request_id => @info_request.url_title) %>
<% end %>
<% end %>
<h2><%= _("Act on what you've learnt") %></h2>
diff --git a/app/views/request/new_please_describe.html.erb b/app/views/request/new_please_describe.html.erb
index 5a67d01f9..8da4eb555 100644
--- a/app/views/request/new_please_describe.html.erb
+++ b/app/views/request/new_please_describe.html.erb
@@ -1,4 +1,4 @@
-<% @title = "First, did your other requests succeed?" %>
+<% @title = _("First, did your other requests succeed?") %>
<h1><%=@title%></h1>
diff --git a/app/views/request/select_authority.html.erb b/app/views/request/select_authority.html.erb
index c01e2776f..75c51fc57 100644
--- a/app/views/request/select_authority.html.erb
+++ b/app/views/request/select_authority.html.erb
@@ -42,26 +42,9 @@
<%= submit_tag _('Search') %>
</div>
<% end %>
- <div id="typeahead_response">
- <% if !@xapian_requests.nil? %>
- <% if @xapian_requests.results.size > 0 %>
- <h3><%= _('Top search results:') %></h3>
- <p>
- <%= _('Select one to see more information about the authority.')%>
- </p>
- <% else %>
- <h3><%= _('No results found.') %></h3>
- <% end %>
- <div id="authority_search_ahead_results">
- <% for result in @xapian_requests.results %>
- <%= render :partial => 'public_body/body_listing_single', :locals => { :public_body => result[:model] } %>
- <% end %>
- </div>
-
- <% end %>
-
-
+ <div id="typeahead_response">
+ <%= render :partial => 'public_body/search_ahead' %>
</div>
</div>
diff --git a/config/.gitignore b/config/.gitignore
index 5ad2de008..fbe4a97d3 100644
--- a/config/.gitignore
+++ b/config/.gitignore
@@ -8,3 +8,4 @@ memcached.yml
*.deployed
deploy.yml
newrelic.yml
+crontab
diff --git a/config/alert-tracks-debian.ugly b/config/alert-tracks-debian.ugly
index 2b52ad840..29a350a0e 100644
--- a/config/alert-tracks-debian.ugly
+++ b/config/alert-tracks-debian.ugly
@@ -1,13 +1,13 @@
#!/bin/bash
#
### BEGIN INIT INFO
-# Provides: alert-tracks
+# Provides: !!(*= $daemon_name *)!!
# Required-Start: $local_fs $syslog
# 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 Alaveteli email alerts
-# Description: alert-tracks send Alaveteli email alerts as required
+# Short-Description: !!(*= $daemon_name *)!! is a daemon running the Alaveteli email alerts
+# Description: !!(*= $daemon_name *)!! sends Alaveteli email alerts as required
### END INIT INFO
#
# !!(*= $daemon_name *)!! Start the Alaveteli email alert daemon
diff --git a/config/crontab.ugly b/config/crontab-example
index d33450df4..32baff170 100644
--- a/config/crontab.ugly
+++ b/config/crontab-example
@@ -1,7 +1,7 @@
-# crontab.ugly:
-# Timed tasks for FOI site. Template file.
+# crontab-example:
+# Timed tasks for Alaveteli site. Template file.
#
-# Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
+# Copyright (c) 2013 UK Citizens Online Democracy. All rights reserved.
# Email: hello@mysociety.org. WWW: http://www.mysociety.org/
PATH=/usr/local/bin:/usr/bin:/bin
diff --git a/config/deploy.rb b/config/deploy.rb
index 5e660434a..3ce1a1969 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -50,6 +50,7 @@ namespace :deploy do
"#{release_path}/config/general.yml" => "#{shared_path}/general.yml",
"#{release_path}/config/rails_env.rb" => "#{shared_path}/rails_env.rb",
"#{release_path}/config/newrelic.yml" => "#{shared_path}/newrelic.yml",
+ "#{release_path}/config/httpd.conf" => "#{shared_path}/httpd.conf",
"#{release_path}/config/aliases" => "#{shared_path}/aliases",
"#{release_path}/public/foi-live-creation.png" => "#{shared_path}/foi-live-creation.png",
"#{release_path}/public/foi-user-use.png" => "#{shared_path}/foi-user-use.png",
diff --git a/config/general.yml-example b/config/general.yml-example
index 17e1aa552..0753af46b 100644
--- a/config/general.yml-example
+++ b/config/general.yml-example
@@ -187,3 +187,8 @@ MTA_LOG_PATH: '/var/log/exim4/exim-mainlog-*'
# Whether we are using "exim" or "postfix" for our MTA
MTA_LOG_TYPE: "exim"
+
+# URL where people can donate to the organisation running the site. If set,
+# this will be included in the message people see when their request is
+# successful.
+DONATION_URL: "http://www.mysociety.org/donate/"
diff --git a/config/initializers/alaveteli.rb b/config/initializers/alaveteli.rb
index 22ea238b7..d78bc3925 100644
--- a/config/initializers/alaveteli.rb
+++ b/config/initializers/alaveteli.rb
@@ -10,7 +10,7 @@ load "debug_helpers.rb"
load "util.rb"
# Application version
-ALAVETELI_VERSION = '0.11'
+ALAVETELI_VERSION = '0.12'
# Add new inflection rules using the following format
# (all these examples are active by default):
diff --git a/config/packages b/config/packages
index fc67cda6b..f4d0a674c 100644
--- a/config/packages
+++ b/config/packages
@@ -20,7 +20,6 @@ gnuplot-nox
php5-cli
sharutils
unzip
-wdg-html-validator
mutt
tnef (>= 1.4.5)
gettext
diff --git a/config/packages_development b/config/packages_development
new file mode 100644
index 000000000..14ca815a2
--- /dev/null
+++ b/config/packages_development
@@ -0,0 +1,9 @@
+# This is a list of packages needed on a fresh Ubuntu installation for
+# development.
+#
+# It assumes you're using RVM or a similar Ruby manager and have already
+# run `bundle install`.
+#
+# To install, paste this list after `sudo apt-get install` and run.
+
+postgresql sharutils pdftk elinks php5-cli tnef python-yaml
diff --git a/config/purge-varnish-debian.ugly b/config/purge-varnish-debian.ugly
index af32650a8..04458ea78 100644
--- a/config/purge-varnish-debian.ugly
+++ b/config/purge-varnish-debian.ugly
@@ -1,13 +1,13 @@
#!/bin/bash
#
### BEGIN INIT INFO
-# Provides: purge-varnish
+# Provides: !!(*= $daemon_name *)!!
# Required-Start: $local_fs $syslog
# Required-Stop: $local_fs $syslog
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
-# Short-Description: purge-varnish is a daemon purging the Alaveteli varnish cache
-# Description: purge-varnish purge the Alaveteli varnish cache
+# Short-Description: !!(*= $daemon_name *)!! is a daemon purging the Alaveteli varnish cache
+# Description: !!(*= $daemon_name *)!! purges the Alaveteli varnish cache
### END INIT INFO
#
# !!(*= $daemon_name *)!! Start the Alaveteli email purge-varnish daemon
diff --git a/config/routes.rb b/config/routes.rb
index 1895543d7..5af94768c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -14,7 +14,6 @@ Alaveteli::Application.routes.draw do
#### General contoller
match '/' => 'general#frontpage', :as => :frontpage
match '/blog' => 'general#blog', :as => :blog
- match '/stylesheets/custom.css' => 'general#custom_css', :as => :custom_css
match '/search' => 'general#search_redirect', :as => :search_redirect
match '/search/all' => 'general#search_redirect', :as => :search_redirect
# XXX combined is the search query, and then if sorted a "/newest" at the end.
@@ -24,8 +23,7 @@ Alaveteli::Application.routes.draw do
match '/search/*combined/all' => 'general#search', :as => :search_general, :view => 'all'
match '/search(/*combined)' => 'general#search', :as => :search_general
match '/advancedsearch' => 'general#search_redirect', :as => :advanced_search, :advanced => true
-
- match '/random' => 'general#random_request', :as => :random_request
+ match '/version.:format' => 'general#version', :as => :version
#####
##### Request controller
@@ -59,15 +57,12 @@ Alaveteli::Application.routes.draw do
match '/upload/request/:url_title' => 'request#upload_response', :as => :upload_response
match '/request/:url_title/download' => 'request#download_entire_request', :as => :download_entire_request
-
- # It would be nice to add :conditions => { :method => :post } to this next one,
- # because it ought not really to be available as a GET request since it changes
- # the server state. Unfortunately this doesn’t play well with the PostRedirect
- # mechanism, which assumes all post-login actions are available via GET, so we
- # refrain.
- match '/request/:url_title/report' => 'request#report_request', :as => :report
####
+ resources :request, :only => [] do
+ resource :report, :only => [:new, :create]
+ end
+
#### User controller
# Use /profile for things to do with the currently signed in user.
# Use /user/XXXX for things that anyone can see about that user.
diff --git a/doc/CHANGES.md b/doc/CHANGES.md
index e53dcfe0b..f0e98b1d7 100644
--- a/doc/CHANGES.md
+++ b/doc/CHANGES.md
@@ -1,3 +1,20 @@
+# Version 0.12
+## Highlighted features
+* Remove support for theme stylesheet inclusion via template (deprecated in version 0.5)
+* Addition of a simple JSON API for querying the Ruby and Alaveteli version of an Alaveteli instance - made available at /version.json (Matthew Landauer)
+* Users can now give more information when reporting a request as unsuitable (Matthew Landauer)
+* The donation url presented to users when they report their request as successful or partially successful is now option and the url itself can be configured using the config param DONATION_URL
+* Internal review request text is now translatable
+* config/crontab.ugly is now config/crontab-example
+* Search query highlighting should now work with non-ascii characters [issue #505](https://github.com/mysociety/alaveteli/issues/505) (Matthew Landauer)
+* A bug that allowed people to sign up with email addresses with spaces in them has been fixed [issue #980](https://github.com/mysociety/alaveteli/issues/980)
+
+* [List of issues on github](https://github.com/mysociety/alaveteli/issues?milestone=30&state=closed)
+
+## Upgrade notes
+* Check out this version and run `rails-post-deploy` as usual.
+* Add a DONATION_URL to your config/general.yml file if you want to use your own donation URL.
+
# Version 0.11
## Highlighted features
* Upgrade of the Rails framework to version 3.1.12 (Henare Degan, Matthew Landauer, Mark Longair, Louise Crow)
@@ -5,7 +22,7 @@
## Upgrade notes
* Manually remove vendor/rails-locales
* Themes created for 0.9 and below should be updated to work with Rails 3. See `THEMES-UPGRADE.md` for notes on upgrading your theme. You will need to manually remove your old theme directory before running `rails-post-deploy`.
-* The `config/httpd.conf` has moved to `config/httpd.conf`, as it may need customization before deploying. It also has a new line setting RackEnv to production - copy this to your config/httpd.conf file.
+* The `config/httpd.conf` has moved to `config/httpd.conf-example`, as it may need customization before deploying. It also has a new line setting RackEnv to production - copy this to your config/httpd.conf file.
* Alaveteli now uses the [mail gem](https://github.com/mikel/mail) rather than [tmail](https://github.com/mikel/tmail) to handle mail. If you're using Exim as your MTA, you'll need to use the setting `extract_addresses_remove_arguments = false` in your Exim conf (see INSTALL-exim4.md for details). This means it won't remove addresses specified with -t on command line from the mail recipient list.
# Version 0.9
diff --git a/doc/INSTALL-exim4.md b/doc/INSTALL-exim4.md
index cdc33ab12..796fb295c 100644
--- a/doc/INSTALL-exim4.md
+++ b/doc/INSTALL-exim4.md
@@ -15,7 +15,9 @@ Note that the name and location of the log files created by Exim must match
what the `load-mail-server-logs` script expects, hence the need for the extra
`log_file_path` setting. And the `check-recent-requests-sent` scripts expects
the logs to contain the `from=<...>` envelope information, so we make the
-logs more verbose with `log_selector`.
+logs more verbose with `log_selector`. The ALAVETELI_USER may need to also
+need to be added to the `trusted_users` list in your Exim config in order to
+set the return path on outgoing mail, depending on your setup.
In `/etc/exim4/conf.d/router/04_alaveteli`:
diff --git a/doc/INSTALL.md b/doc/INSTALL.md
index b6e8d2265..b356208a4 100644
--- a/doc/INSTALL.md
+++ b/doc/INSTALL.md
@@ -307,9 +307,9 @@ by setting `SKIP_ADMIN_AUTH` to `true` in `general.yml`.
# Cron jobs and init scripts
-`config/crontab.ugly` contains the cronjobs run on WhatDoTheyKnow.
+`config/crontab-example` contains the cronjobs run on WhatDoTheyKnow.
It's in a strange templating format they use in mySociety. mySociety
-render the "ugly" file to reference absolute paths, and then drop it
+render the example file to reference absolute paths, and then drop it
in `/etc/cron.d/` on the server.
The `ugly` format uses simple variable substitution. A variable looks
diff --git a/doc/THEMES.md b/doc/THEMES.md
index 8c4b927da..bae7d7665 100644
--- a/doc/THEMES.md
+++ b/doc/THEMES.md
@@ -36,15 +36,15 @@ places:
This document is about what you can do in a theme.
-By default, the sample theme ("alavetelitheme") has already been
-installed. See the setting `THEME_URLS` in `general.yml` for an
+By default, the sample theme ("alavetelitheme") has already been
+installed. See the setting `THEME_URLS` in `general.yml` for an
explanation.
You can also install the sample theme by hand, by running:
- bundle exec rails plugin install git://github.com/mysociety/alavetelitheme.git -r rails-3
+ bundle exec rails plugin install git://github.com/mysociety/alavetelitheme.git
-The sample theme contains examples for nearly everything you might
+The sample theme contains examples for nearly everything you might
want to customise. You should probably make a copy, rename it, and
use that as the basis for your own theme.
@@ -61,7 +61,7 @@ changing much in the core theme. The ideal would be if you are able
to rebrand the site by only changing the CSS. You will also need to
add custom help pages, as described below.
-# Branding the site
+# Branding the site
The core templates that comprise the layout and user interface of an
Alaveteli site live in `app/views/`. They are use Rails' ERB syntax.
@@ -158,7 +158,7 @@ unused).
`alavetelitheme/lib/config/custom-routes.rb` allows you to extend the base routes in
Alaveteli. The example in `alavetelitheme` adds an extra help page.
You can also use this to override the behaviour of specific pages if
-necessary.
+necessary.
# Adding or overriding models and controllers
diff --git a/lib/configuration.rb b/lib/configuration.rb
index 88890856b..03c4ac616 100644
--- a/lib/configuration.rb
+++ b/lib/configuration.rb
@@ -28,6 +28,7 @@ module AlaveteliConfiguration
:DEFAULT_LOCALE => '',
:DISABLE_EMERGENCY_USER => false,
:DOMAIN => 'localhost:3000',
+ :DONATION_URL => '',
:EXCEPTION_NOTIFICATIONS_FROM => '',
:EXCEPTION_NOTIFICATIONS_TO => '',
:FORCE_REGISTRATION_ON_NEW_REQUEST => false,
diff --git a/lib/tasks/temp.rake b/lib/tasks/temp.rake
index 35ae442c7..fcabb23de 100644
--- a/lib/tasks/temp.rake
+++ b/lib/tasks/temp.rake
@@ -7,6 +7,28 @@ namespace :temp do
user.save! unless dryrun
end
+ desc "Re-extract any missing cached attachments"
+ task :reextract_missing_attachments, [:commit] => :environment do |t, args|
+ dry_run = args.commit.nil? || args.commit.empty?
+ total_messages = 0
+ messages_to_reparse = 0
+ IncomingMessage.find_each :include => :foi_attachments do |im|
+ reparse = im.foi_attachments.any? { |fa| ! File.exists? fa.filepath }
+ total_messages += 1
+ messages_to_reparse += 1 if reparse
+ if total_messages % 1000 == 0
+ puts "Considered #{total_messages} received emails."
+ end
+ unless dry_run
+ im.parse_raw_email! true if reparse
+ sleep 2
+ end
+ end
+ message = dry_run ? "Would reparse" : "Reparsed"
+ message += " #{messages_to_reparse} out of #{total_messages} received emails."
+ puts message
+ end
+
desc 'Cleanup accounts with a space in the email address'
task :clean_up_emails_with_spaces => :environment do
dryrun = ENV['DRYRUN'] == '0' ? false : true
diff --git a/lib/tasks/themes.rake b/lib/tasks/themes.rake
index cbd3d123e..a8d16f108 100644
--- a/lib/tasks/themes.rake
+++ b/lib/tasks/themes.rake
@@ -9,15 +9,17 @@ namespace :themes do
File.join(plugin_dir, theme_name)
end
+ def checkout(commitish)
+ puts "Checking out #{commitish}" if verbose
+ system "git checkout #{commitish}"
+ end
+
def checkout_tag(version)
- checkout_command = "git checkout #{usage_tag(version)}"
- success = system(checkout_command)
- puts "Using tag #{usage_tag(version)}" if verbose && success
- success
+ checkout usage_tag(version)
end
def checkout_remote_branch(branch)
- system("git checkout origin/#{branch}")
+ checkout "origin/#{branch}"
end
def usage_tag(version)
diff --git a/lib/tasks/translation.rake b/lib/tasks/translation.rake
index 351faef2c..6458d9268 100644
--- a/lib/tasks/translation.rake
+++ b/lib/tasks/translation.rake
@@ -142,13 +142,11 @@ namespace :translation do
output_file)
# track mailer
- xapian_object = InfoRequest.full_search([InfoRequestEvent],
- track_thing.track_query,
- 'described_at',
- true,
- nil,
- 100,
- 1)
+ xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], track_thing.track_query,
+ :sort_by_prefix => 'described_at',
+ :sort_by_ascending => true,
+ :collapse_by_prefix => nil,
+ :limit => 100)
event_digest_email = TrackMailer.event_digest(info_request.user,
[[track_thing,
xapian_object.results,
diff --git a/locale/aln/app.po b/locale/aln/app.po
index 4a408ac88..1cc4204d6 100644
--- a/locale/aln/app.po
+++ b/locale/aln/app.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: alaveteli\n"
"Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n"
-"POT-Creation-Date: 2013-05-30 09:46+0100\n"
-"PO-Revision-Date: 2013-05-30 08:54+0000\n"
+"POT-Creation-Date: 2013-06-24 09:40-0700\n"
+"PO-Revision-Date: 2013-06-24 16:52+0000\n"
"Last-Translator: louisecrow <louise@mysociety.org>\n"
"Language-Team: Albanian Gheg (http://www.transifex.com/projects/p/alaveteli/language/aln/)\n"
"Language: aln\n"
@@ -160,12 +160,18 @@ msgstr ""
msgid "<p>We recommend that you edit your request and remove the email address.\\n If you leave it, the email address will be sent to the authority, but will not be displayed on the site.</p>"
msgstr ""
+msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p>"
+msgstr ""
+
msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p><p>If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p>"
msgstr ""
msgid "<p>We're glad you got some of the information that you wanted. If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
msgstr ""
+msgid "<p>We're glad you got some of the information that you wanted.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
+msgstr ""
+
msgid "<p>You do not need to include your email in the request in order to get a reply (<a href=\"{{url}}\">details</a>).</p>"
msgstr ""
@@ -268,6 +274,9 @@ msgstr ""
msgid "A Freedom of Information request"
msgstr ""
+msgid "A full history of my FOI request and all correspondence is available on the Internet at this address: {{url}}"
+msgstr ""
+
msgid "A new request, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, was sent to {{public_body_name}} by {{info_request_user}} on {{date}}."
msgstr ""
@@ -736,6 +745,9 @@ msgstr ""
msgid "Filter"
msgstr ""
+msgid "First, did your other requests succeed?"
+msgstr ""
+
msgid "First, type in the <strong>name of the UK public authority</strong> you'd\\n like information from. <strong>By law, they have to respond</strong>\\n (<a href=\"{{url}}\">why?</a>)."
msgstr ""
@@ -930,6 +942,9 @@ msgstr ""
msgid "I am requesting an <strong>internal review</strong>"
msgstr ""
+msgid "I am writing to request an internal review of {{public_body_name}}'s handling of my FOI request '{{info_request_title}}'."
+msgstr ""
+
msgid "I don't like these ones &mdash; give me some more!"
msgstr ""
@@ -1227,18 +1242,15 @@ msgstr ""
msgid "MailServerLog|Order"
msgstr ""
-msgid "Make a new <strong>Environmental Information</strong> request"
-msgstr ""
-
-msgid "Make a new <strong>Freedom of Information</strong> request to {{public_body}}"
-msgstr ""
-
msgid "Make a new<br/>\\n <strong>Freedom <span>of</span><br/>\\n Information<br/>\\n request</strong>"
msgstr ""
msgid "Make a request"
msgstr ""
+msgid "Make a request to this authority"
+msgstr ""
+
msgid "Make an {{law_used_short}} request to '{{public_body_name}}'"
msgstr ""
@@ -1497,6 +1509,9 @@ msgstr ""
msgid "Please choose a file containing your photo."
msgstr ""
+msgid "Please choose a reason"
+msgstr ""
+
msgid "Please choose what sort of reply you are making."
msgstr ""
@@ -1578,6 +1593,9 @@ msgstr ""
msgid "Please only request information that comes under those categories, <strong>do not waste your\\n time</strong> or the time of the public authority by requesting unrelated information."
msgstr ""
+msgid "Please pass this on to the person who conducts Freedom of Information reviews."
+msgstr ""
+
msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
msgstr ""
@@ -1791,6 +1809,9 @@ msgstr ""
msgid "Report an offensive or unsuitable request"
msgstr ""
+msgid "Report request"
+msgstr ""
+
msgid "Report this request"
msgstr ""
@@ -2009,9 +2030,6 @@ msgstr ""
msgid "Special note for this authority!"
msgstr ""
-msgid "Start"
-msgstr ""
-
msgid "Start now &raquo;"
msgstr ""
@@ -2471,7 +2489,7 @@ msgstr ""
msgid "To reply to "
msgstr ""
-msgid "To report this FOI request"
+msgid "To report this request"
msgstr ""
msgid "To send a follow up message to "
@@ -2870,6 +2888,9 @@ msgstr ""
msgid "You need to be logged in to edit your profile."
msgstr ""
+msgid "You need to be logged in to report a request for administrator attention"
+msgstr ""
+
msgid "You previously submitted that exact follow up message for this request."
msgstr ""
diff --git a/locale/app.pot b/locale/app.pot
index dea0b1243..1a0db5649 100644
--- a/locale/app.pot
+++ b/locale/app.pot
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: version 0.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-30 09:46+0100\n"
+"POT-Creation-Date: 2013-06-24 09:40-0700\n"
"PO-Revision-Date: 2011-10-09 01:10+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -157,12 +157,18 @@ msgstr ""
msgid "<p>We recommend that you edit your request and remove the email address.\\n If you leave it, the email address will be sent to the authority, but will not be displayed on the site.</p>"
msgstr ""
+msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p>"
+msgstr ""
+
msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p><p>If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p>"
msgstr ""
msgid "<p>We're glad you got some of the information that you wanted. If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
msgstr ""
+msgid "<p>We're glad you got some of the information that you wanted.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
+msgstr ""
+
msgid "<p>You do not need to include your email in the request in order to get a reply (<a href=\"{{url}}\">details</a>).</p>"
msgstr ""
@@ -265,6 +271,9 @@ msgstr ""
msgid "A Freedom of Information request"
msgstr ""
+msgid "A full history of my FOI request and all correspondence is available on the Internet at this address: {{url}}"
+msgstr ""
+
msgid "A new request, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, was sent to {{public_body_name}} by {{info_request_user}} on {{date}}."
msgstr ""
@@ -733,6 +742,9 @@ msgstr ""
msgid "Filter"
msgstr ""
+msgid "First, did your other requests succeed?"
+msgstr ""
+
msgid "First, type in the <strong>name of the UK public authority</strong> you'd\\n like information from. <strong>By law, they have to respond</strong>\\n (<a href=\"{{url}}\">why?</a>)."
msgstr ""
@@ -927,6 +939,9 @@ msgstr ""
msgid "I am requesting an <strong>internal review</strong>"
msgstr ""
+msgid "I am writing to request an internal review of {{public_body_name}}'s handling of my FOI request '{{info_request_title}}'."
+msgstr ""
+
msgid "I don't like these ones &mdash; give me some more!"
msgstr ""
@@ -1224,18 +1239,15 @@ msgstr ""
msgid "MailServerLog|Order"
msgstr ""
-msgid "Make a new <strong>Environmental Information</strong> request"
-msgstr ""
-
-msgid "Make a new <strong>Freedom of Information</strong> request to {{public_body}}"
-msgstr ""
-
msgid "Make a new<br/>\\n <strong>Freedom <span>of</span><br/>\\n Information<br/>\\n request</strong>"
msgstr ""
msgid "Make a request"
msgstr ""
+msgid "Make a request to this authority"
+msgstr ""
+
msgid "Make an {{law_used_short}} request to '{{public_body_name}}'"
msgstr ""
@@ -1494,6 +1506,9 @@ msgstr ""
msgid "Please choose a file containing your photo."
msgstr ""
+msgid "Please choose a reason"
+msgstr ""
+
msgid "Please choose what sort of reply you are making."
msgstr ""
@@ -1575,6 +1590,9 @@ msgstr ""
msgid "Please only request information that comes under those categories, <strong>do not waste your\\n time</strong> or the time of the public authority by requesting unrelated information."
msgstr ""
+msgid "Please pass this on to the person who conducts Freedom of Information reviews."
+msgstr ""
+
msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
msgstr ""
@@ -1788,6 +1806,9 @@ msgstr ""
msgid "Report an offensive or unsuitable request"
msgstr ""
+msgid "Report request"
+msgstr ""
+
msgid "Report this request"
msgstr ""
@@ -2006,9 +2027,6 @@ msgstr ""
msgid "Special note for this authority!"
msgstr ""
-msgid "Start"
-msgstr ""
-
msgid "Start now &raquo;"
msgstr ""
@@ -2468,7 +2486,7 @@ msgstr ""
msgid "To reply to "
msgstr ""
-msgid "To report this FOI request"
+msgid "To report this request"
msgstr ""
msgid "To send a follow up message to "
@@ -2867,6 +2885,9 @@ msgstr ""
msgid "You need to be logged in to edit your profile."
msgstr ""
+msgid "You need to be logged in to report a request for administrator attention"
+msgstr ""
+
msgid "You previously submitted that exact follow up message for this request."
msgstr ""
diff --git a/locale/ar/app.po b/locale/ar/app.po
index ce851db06..fb1adb0cf 100644
--- a/locale/ar/app.po
+++ b/locale/ar/app.po
@@ -4,6 +4,8 @@
#
# Translators:
# aelharaty <aelharaty@gmail.com>, 2012
+# aelharaty <aelharaty@gmail.com>, 2012
+# radproject <radhouanef@gmail.com>, 2013
# radproject <radhouanef@gmail.com>, 2013
# radproject <radhouanef@gmail.com>, 2013
# <rwiwina@live.fr>, 2013
@@ -12,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: alaveteli\n"
"Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n"
-"POT-Creation-Date: 2013-05-30 09:46+0100\n"
-"PO-Revision-Date: 2013-05-30 08:54+0000\n"
+"POT-Creation-Date: 2013-06-24 09:40-0700\n"
+"PO-Revision-Date: 2013-06-24 16:52+0000\n"
"Last-Translator: louisecrow <louise@mysociety.org>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/alaveteli/language/ar/)\n"
"Language: ar\n"
@@ -163,12 +165,18 @@ msgstr "<p>شكرا لتحيينك صورة حسابك.</p>\\n <p
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 "<نوصيك بتغيير طلبك و ازالة عنوان البريد الالكترونيaddress.\\n اذا قمت بتركه, سيقع ارسال البريد الالكتروني الى السلطة, لكن لن يتم عرضه على الموقع.</p>"
+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>"
+msgstr ""
+
msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p><p>If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p>"
msgstr "<p>نحن سعيدون لحصولك على كل المعلومات التي كنت ترغب في الحصول عليها. عندما تستفيد من المعلومة او تكتب حولها الرجاء العودة لترك ملحوظة اسفله تذكر ما فعلت/p><p>اذا وجدت {{site_name}} useful, <a href=\"{{donation_url}}\">تبرع</a>للمؤسسة الخيرية التي تديرها it.</p>"
msgid "<p>We're glad you got some of the information that you wanted. If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
msgstr "<p>سعيدون لحصولك على المعلومات التي اردت. اذا وجدتها {{site_name}} مفيدة, <a href=\"{{donation_url}}\">تبرع</a> للمؤسسة الخيرية التي تديرها it.</p><p>اذا اردت ان تجرب و تحصل على بقية المعلومات , تجد ما عليك فعله الان هنا.</p>"
+msgid "<p>We're glad you got some of the information that you wanted.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
+msgstr ""
+
msgid "<p>You do not need to include your email in the request in order to get a reply (<a href=\"{{url}}\">details</a>).</p>"
msgstr ""
@@ -271,6 +279,9 @@ msgstr "A <strong>ملخص</strong> الرد ان كنت تلقيته على ا
msgid "A Freedom of Information request"
msgstr "مطلب حق النفاذ إلى المعلومة"
+msgid "A full history of my FOI request and all correspondence is available on the Internet at this address: {{url}}"
+msgstr ""
+
msgid "A new request, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, was sent to {{public_body_name}} by {{info_request_user}} on {{date}}."
msgstr "مطلب جديد, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, تم إرساله إلى {{public_body_name}} من طرف {{info_request_user}} في {{date}}."
@@ -739,6 +750,9 @@ msgstr ""
msgid "Filter"
msgstr "فلترة"
+msgid "First, did your other requests succeed?"
+msgstr ""
+
msgid "First, type in the <strong>name of the UK public authority</strong> you'd\\n like information from. <strong>By law, they have to respond</strong>\\n (<a href=\"{{url}}\">why?</a>)."
msgstr ""
@@ -937,6 +951,9 @@ msgstr "ارغب في الحصول على <strong>معلومات جديدة</str
msgid "I am requesting an <strong>internal review</strong>"
msgstr "أنا اطلب <strong>مراجعة داخلية</strong>"
+msgid "I am writing to request an internal review of {{public_body_name}}'s handling of my FOI request '{{info_request_title}}'."
+msgstr ""
+
msgid "I don't like these ones &mdash; give me some more!"
msgstr "لا تعجبني هذه الخيارات &mdash; الرجاء مدي بالمزيد!"
@@ -1234,18 +1251,15 @@ msgstr " الدخول لبريد الخادم|الخط"
msgid "MailServerLog|Order"
msgstr "الدخول لبريد الخادم|الترتيب"
-msgid "Make a new <strong>Environmental Information</strong> request"
-msgstr "قم <strong>عن المعلومات البيئية</strong> بطلب جديد"
-
-msgid "Make a new <strong>Freedom of Information</strong> request to {{public_body}}"
-msgstr "قدم مطالب جديدة <strong>لحرية النفاذ الى المعلومة</strong> ل {{public_body}}"
-
msgid "Make a new<br/>\\n <strong>Freedom <span>of</span><br/>\\n Information<br/>\\n request</strong>"
msgstr "اضف<br/>\\n <strong>لحرية<span>of</span><br/>\\n النفاذ للمعلومة<br/>\\n طلبا جديدا</strong>"
msgid "Make a request"
msgstr "قدم مطلبا"
+msgid "Make a request to this authority"
+msgstr ""
+
msgid "Make an {{law_used_short}} request to '{{public_body_name}}'"
msgstr "قدم {{law_used_short}}مطلبا ل '{{public_body_name}}'"
@@ -1504,6 +1518,9 @@ msgstr "الرجاء التحقق ان عنوان الصفحة (i.e. شيفرة
msgid "Please choose a file containing your photo."
msgstr "يرجى اختيار ملف يحتوي على صورة لكم ."
+msgid "Please choose a reason"
+msgstr ""
+
msgid "Please choose what sort of reply you are making."
msgstr "الرجاء اختيار نوع الرد الذي تقوم به"
@@ -1585,6 +1602,9 @@ msgstr "الرجاء ابقاء الملخص قصيرا, مثل الموضوع
msgid "Please only request information that comes under those categories, <strong>do not waste your\\n time</strong> or the time of the public authority by requesting unrelated information."
msgstr "الرجاء طلب المعلومات التي تصنف ضمن هذه الفئات وحسب, <strong>لا تضيع\\n وقتك</strong> او وقت the السلطة العامة بطلب معلومات غير ذات صلة."
+msgid "Please pass this on to the person who conducts Freedom of Information reviews."
+msgstr ""
+
msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
msgstr "الرجاء اختيار كل من هذه الطلبات بدوره,و <strong>أعلم الجميع</strong>\\nان كانت الطلبات ناجحة ام ليس بعد."
@@ -1798,6 +1818,9 @@ msgstr "الإبلاغ عن سوء استخدام"
msgid "Report an offensive or unsuitable request"
msgstr "بلغ عن طلب غير ملائم أو مخل بالاداب"
+msgid "Report request"
+msgstr ""
+
msgid "Report this request"
msgstr "التقرير عن هذا المطلب"
@@ -2020,9 +2043,6 @@ msgstr "المعذرة, لم نتمكن من ايجاد الصفحة "
msgid "Special note for this authority!"
msgstr "ملاحظة خاصة بهذه السلطة."
-msgid "Start"
-msgstr "ابدأ"
-
msgid "Start now &raquo;"
msgstr "ابدأ الان &raquo;"
@@ -2494,8 +2514,8 @@ msgstr "لنشر ملاحظتك"
msgid "To reply to "
msgstr "اجب على "
-msgid "To report this FOI request"
-msgstr "لتبليغ طلب حرية النفاذ الى المعلومة "
+msgid "To report this request"
+msgstr ""
msgid "To send a follow up message to "
msgstr "لبعث رسالة متابعة الى"
@@ -2893,6 +2913,9 @@ msgstr "يجب أن تسجل دخولك لتتمكن من حذف صورة حسا
msgid "You need to be logged in to edit your profile."
msgstr "يجب أن تسجل دخولك لتتمكن من القيام بتغييرات في حسابك."
+msgid "You need to be logged in to report a request for administrator attention"
+msgstr ""
+
msgid "You previously submitted that exact follow up message for this request."
msgstr "لقد سبق لك أن قدمت نفس رسالة المتابعة لهذا الطلب."
diff --git a/locale/bs/app.po b/locale/bs/app.po
index 8e96147dc..8e0578251 100644
--- a/locale/bs/app.po
+++ b/locale/bs/app.po
@@ -5,13 +5,16 @@
# Translators:
# Krule <armin@pasalic.com.ba>, 2011
# BORIS <brkanboris@gmail.com>, 2011
+# BORIS <brkanboris@gmail.com>, 2011
+# Krule <armin@pasalic.com.ba>, 2011
+# vedad <vedadtrbonja@hotmail.com>, 2011
# vedad <vedadtrbonja@hotmail.com>, 2011
msgid ""
msgstr ""
"Project-Id-Version: alaveteli\n"
"Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n"
-"POT-Creation-Date: 2013-05-30 09:46+0100\n"
-"PO-Revision-Date: 2013-05-30 08:54+0000\n"
+"POT-Creation-Date: 2013-06-24 09:40-0700\n"
+"PO-Revision-Date: 2013-06-24 16:52+0000\n"
"Last-Translator: louisecrow <louise@mysociety.org>\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/alaveteli/language/bs/)\n"
"Language: bs\n"
@@ -180,12 +183,18 @@ msgstr ""
"<p>Preporučujemo da preuredite Vaš zahtjev i da uklonite e-mail adresu.\n"
" Ako je ostavite, e-mail adresa će biti poslana ustanovi, ali neće biti vidljiva na web stranici.</p>"
+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>"
+msgstr ""
+
msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p><p>If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p>"
msgstr "<p>Drago nam je da ste dobili sve željene informacije. Ako ih budete koristili ili pisali o njima, molimo da se vratite i dodate napomenu ispod opisujući šta ste uradili. </p><p>Ako mislite da je {{site_name}} bio koristan, <a href=\"{{donation_url}}\">donirajte</a> nevladinoj organizaciji koja ga vodi.</p>"
msgid "<p>We're glad you got some of the information that you wanted. If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
msgstr "<p>Drago nam je da ste dobili dio željenih informacija. Ako mislite da je {{site_name}} bio koristan, <a href=\"{{donation_url}}\">donirajte</a> nevladinoj organizaciji koja ga vodi.</p>"
+msgid "<p>We're glad you got some of the information that you wanted.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
+msgstr ""
+
msgid "<p>You do not need to include your email in the request in order to get a reply (<a href=\"{{url}}\">details</a>).</p>"
msgstr "<p>Nije potrebno da uključite Vašu e-mail adresu u zahtjev da biste dobili odgovor (<a href=\"{{url}}\">Više informacija</a>).</p>"
@@ -301,6 +310,9 @@ msgstr " <strong>Sažetak</strong> odgovora ako ste ga primili poštom. "
msgid "A Freedom of Information request"
msgstr ""
+msgid "A full history of my FOI request and all correspondence is available on the Internet at this address: {{url}}"
+msgstr ""
+
msgid "A new request, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, was sent to {{public_body_name}} by {{info_request_user}} on {{date}}."
msgstr ""
@@ -789,6 +801,9 @@ msgstr "Nismo uspjeli konvertovati sliku u odgovarajuću veličinu: {{cols}}x{{
msgid "Filter"
msgstr "Filtriraj"
+msgid "First, did your other requests succeed?"
+msgstr ""
+
msgid "First, type in the <strong>name of the UK public authority</strong> you'd\\n like information from. <strong>By law, they have to respond</strong>\\n (<a href=\"{{url}}\">why?</a>)."
msgstr ""
@@ -990,6 +1005,9 @@ msgstr "Molim za <strong>nove informacije</strong>"
msgid "I am requesting an <strong>internal review</strong>"
msgstr ""
+msgid "I am writing to request an internal review of {{public_body_name}}'s handling of my FOI request '{{info_request_title}}'."
+msgstr ""
+
msgid "I don't like these ones &mdash; give me some more!"
msgstr "Ne sviđaju mi se ove &mdash; dajte mi više!"
@@ -1317,12 +1335,6 @@ msgstr ""
msgid "MailServerLog|Order"
msgstr ""
-msgid "Make a new <strong>Environmental Information</strong> request"
-msgstr ""
-
-msgid "Make a new <strong>Freedom of Information</strong> request to {{public_body}}"
-msgstr "Podnesi novi <strong>Zahtjev za slobodan pristup informacijama</strong> za {{public_body}}"
-
msgid "Make a new<br/>\\n <strong>Freedom <span>of</span><br/>\\n Information<br/>\\n request</strong>"
msgstr ""
"Podnesi novi<br/>\n"
@@ -1333,6 +1345,9 @@ msgstr ""
msgid "Make a request"
msgstr "Podnesi zahtjev"
+msgid "Make a request to this authority"
+msgstr ""
+
msgid "Make an {{law_used_short}} request to '{{public_body_name}}'"
msgstr "Podnesi {{law_used_short}} zahtjev javnoj ustanovi '{{public_body_name}}'"
@@ -1595,6 +1610,9 @@ msgstr ""
msgid "Please choose a file containing your photo."
msgstr "Molimo izaberite datoteku koja sadržava Vašu sliku."
+msgid "Please choose a reason"
+msgstr ""
+
msgid "Please choose what sort of reply you are making."
msgstr "Molimo izaberite vrstu odgovora."
@@ -1681,6 +1699,9 @@ msgstr "Molimo da sažetak bude kratak, poput naslova e-maila. Radije koristite
msgid "Please only request information that comes under those categories, <strong>do not waste your\\n time</strong> or the time of the public authority by requesting unrelated information."
msgstr ""
+msgid "Please pass this on to the person who conducts Freedom of Information reviews."
+msgstr ""
+
msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
msgstr ""
"Molimo odaberite svaki od ovih zahtjeva naizmjenice, i <strong>obavijestite sviju</strong>\n"
@@ -1898,6 +1919,9 @@ msgstr "Prijavi zloupotrebu"
msgid "Report an offensive or unsuitable request"
msgstr ""
+msgid "Report request"
+msgstr ""
+
msgid "Report this request"
msgstr ""
@@ -2123,9 +2147,6 @@ msgstr "Žalimo, nismo mogli pronaći tu stranicu"
msgid "Special note for this authority!"
msgstr "Posebna napomena za ovu ustanovu!"
-msgid "Start"
-msgstr "Počni"
-
msgid "Start now &raquo;"
msgstr "Počni sada &raquo;"
@@ -2619,7 +2640,7 @@ msgstr "Da biste postavili Vašu napomenu"
msgid "To reply to "
msgstr "Da biste odgovorili "
-msgid "To report this FOI request"
+msgid "To report this request"
msgstr ""
msgid "To send a follow up message to "
@@ -3050,6 +3071,9 @@ msgstr "Morate biti prijavljeni ukoliko želite izbrisati sliku na Vašem profil
msgid "You need to be logged in to edit your profile."
msgstr ""
+msgid "You need to be logged in to report a request for administrator attention"
+msgstr ""
+
msgid "You previously submitted that exact follow up message for this request."
msgstr "Prethodno ste predali istu popratnu poruku za ovaj zahtjev."
diff --git a/locale/ca/app.po b/locale/ca/app.po
index 1e80a5a59..b3fcc4701 100644
--- a/locale/ca/app.po
+++ b/locale/ca/app.po
@@ -5,13 +5,15 @@
# Translators:
# David Cabo <david.cabo@gmail.com>, 2012
# ecapfri <ecapfri@yahoo.es>, 2012
+# ecapfri <ecapfri@yahoo.es>, 2012
+# mmtarres <mmtarres@gmail.com>, 2012
# mmtarres <mmtarres@gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: alaveteli\n"
"Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n"
-"POT-Creation-Date: 2013-05-30 09:46+0100\n"
-"PO-Revision-Date: 2013-05-30 08:54+0000\n"
+"POT-Creation-Date: 2013-06-24 09:40-0700\n"
+"PO-Revision-Date: 2013-06-24 16:52+0000\n"
"Last-Translator: louisecrow <louise@mysociety.org>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/alaveteli/language/ca/)\n"
"Language: ca\n"
@@ -183,12 +185,18 @@ msgstr ""
"<p>T'aconsellem que editis la teva sol·licitud i eliminis la teva direcció de correu.\n"
" Si la deixes, la teva direcció serà enviada a l'organisme públic, però no serà visible en aquesta web.</p>"
+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>"
+msgstr ""
+
msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p><p>If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p>"
msgstr "<p>Ens plau saber que has obtingut tota la informació que vas demanar. Si escrius sobre ella, o la utilitzes, si us plau torna i afegeix un comentari a continuació explicant el que ha fet.</p><p>Si {{site_name}} t'ha resultat útil, <a href=\"{{donation_url}}\">pot donar </a> a la ONG responsable.</p>"
msgid "<p>We're glad you got some of the information that you wanted. If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
msgstr "<p>Ens plau saber que has obtingut part de la informació que vas demanar. Si escrius sbore ella, o la utilitzes, si us plau tornar i afegeix un comentari a continuació explicant el que has fet.</p><p>Si {{site_name}} t'ha resultat útil, <a href=\"{{donation_url}}\">pots donar</a> a la ONG responsable.</p>"
+msgid "<p>We're glad you got some of the information that you wanted.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
+msgstr ""
+
msgid "<p>You do not need to include your email in the request in order to get a reply (<a href=\"{{url}}\">details</a>).</p>"
msgstr "<p>No necessites incloure la teva adreça de correu a la sol•licitud per rebre una resposta (<a href=\"{{url}}\">més detalls</a>).</p>"
@@ -314,6 +322,9 @@ msgstr "Un <strong>resum</strong> de la resposta si l'has rebut per correu ordin
msgid "A Freedom of Information request"
msgstr "Una sol·licitud d'informació"
+msgid "A full history of my FOI request and all correspondence is available on the Internet at this address: {{url}}"
+msgstr ""
+
msgid "A new request, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, was sent to {{public_body_name}} by {{info_request_user}} on {{date}}."
msgstr ""
@@ -804,6 +815,9 @@ msgstr "Error al convertir la imagen al tamaño adecuado: es {{cols}}x{{rows}},
msgid "Filter"
msgstr "Filtrar"
+msgid "First, did your other requests succeed?"
+msgstr ""
+
msgid "First, type in the <strong>name of the UK public authority</strong> you'd\\n like information from. <strong>By law, they have to respond</strong>\\n (<a href=\"{{url}}\">why?</a>)."
msgstr "Primero, escribe el <strong>nombre de la institución</strong> a la que quieres pedir información. <strong>Están obligados a responder</strong> (<a href=\"{{url}}\">¿por qué?</a>)."
@@ -1010,6 +1024,9 @@ msgstr "Estoy pidiendo <strong>nueva información</strong>"
msgid "I am requesting an <strong>internal review</strong>"
msgstr "Estoy pidiendo una <strong>revisión interna</strong>"
+msgid "I am writing to request an internal review of {{public_body_name}}'s handling of my FOI request '{{info_request_title}}'."
+msgstr ""
+
msgid "I don't like these ones &mdash; give me some more!"
msgstr "Estas no me gustan &mdash; ¡dame más!"
@@ -1338,12 +1355,6 @@ msgstr ""
msgid "MailServerLog|Order"
msgstr ""
-msgid "Make a new <strong>Environmental Information</strong> request"
-msgstr "Envíe una nueva <strong>solicitud de información medioambiental</strong>"
-
-msgid "Make a new <strong>Freedom of Information</strong> request to {{public_body}}"
-msgstr "Hacer una nueva <strong>solicitud de información</strong> a {{public_body}}"
-
msgid "Make a new<br/>\\n <strong>Freedom <span>of</span><br/>\\n Information<br/>\\n request</strong>"
msgstr ""
"Envíe una nueva<br/>\n"
@@ -1353,6 +1364,9 @@ msgstr ""
msgid "Make a request"
msgstr "Enviar solicitud"
+msgid "Make a request to this authority"
+msgstr ""
+
msgid "Make an {{law_used_short}} request to '{{public_body_name}}'"
msgstr "Hacer una solicitud {{law_used_short}} a '{{public_body_name}}'"
@@ -1615,6 +1629,9 @@ msgstr ""
msgid "Please choose a file containing your photo."
msgstr "Por favor elige el fichero que contiene tu foto"
+msgid "Please choose a reason"
+msgstr ""
+
msgid "Please choose what sort of reply you are making."
msgstr "Por favor, elija el tipo de respuesta que está creando."
@@ -1701,6 +1718,9 @@ msgstr "Por favor, mantén el resumen corto, como en el asunto de un correo elec
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, pide información sólo de estas categorias, <strong>no pierdas tu tiempo </strong> o el del organismo público pidiendo información no relacionada."
+msgid "Please pass this on to the person who conducts Freedom of Information reviews."
+msgstr ""
+
msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
msgstr ""
"Por favor elije estas solicitudes una a una, y <strong>haz que se sepa</strong>\n"
@@ -1918,6 +1938,9 @@ msgstr "Denuncie abuso"
msgid "Report an offensive or unsuitable request"
msgstr ""
+msgid "Report request"
+msgstr ""
+
msgid "Report this request"
msgstr ""
@@ -2145,9 +2168,6 @@ msgstr "Lo sentimos, no hemos podido encontrar esa página"
msgid "Special note for this authority!"
msgstr "¡Notas especiales sobre este organismo!"
-msgid "Start"
-msgstr "Comenzar"
-
msgid "Start now &raquo;"
msgstr "Comience ahora &raquo;"
@@ -2657,7 +2677,7 @@ msgstr "Añadir tu comentario"
msgid "To reply to "
msgstr "Contestar a "
-msgid "To report this FOI request"
+msgid "To report this request"
msgstr ""
msgid "To send a follow up message to "
@@ -3090,6 +3110,9 @@ msgstr "Necesitas identificarte para borrar la foto de tu perfil."
msgid "You need to be logged in to edit your profile."
msgstr ""
+msgid "You need to be logged in to report a request for administrator attention"
+msgstr ""
+
msgid "You previously submitted that exact follow up message for this request."
msgstr "Ya has enviado esa misma respuesta a esta solicitud."
diff --git a/locale/cs/app.po b/locale/cs/app.po
index 33f5737c6..c28785b8a 100644
--- a/locale/cs/app.po
+++ b/locale/cs/app.po
@@ -19,9 +19,9 @@ msgid ""
msgstr ""
"Project-Id-Version: alaveteli\n"
"Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n"
-"POT-Creation-Date: 2013-05-30 09:46+0100\n"
-"PO-Revision-Date: 2013-05-30 08:54+0000\n"
-"Last-Translator: louisecrow <louise@mysociety.org>\n"
+"POT-Creation-Date: 2013-06-24 09:40-0700\n"
+"PO-Revision-Date: 2013-06-26 17:02+0000\n"
+"Last-Translator: Hana Huntova <>\n"
"Language-Team: Czech (http://www.transifex.com/projects/p/alaveteli/language/cs/)\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
@@ -189,12 +189,18 @@ msgstr ""
"<p>Doporučujeme vám upravit dotaz a odstranit e-mailovou adresu.\n"
" Pokud ji v dotazu ponecháte, e-mailová adresa bude instituci odeslána, ale neobjeví se na stránkách Informace pro všechny.</p>"
+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>"
+msgstr "<p>Jsme rádi, že jste obdrželi požadované informace. Pokud k této odpovědi něco dodáte, nebo ji někde použijete, přidejte poznámku pro další uživatele stránek Informace pro všechny</p>"
+
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 "<p>Jsme rádi, že jste obdrželi informace, které jste potřebovali. Pokud k této odpovědi něco dodáte, nebo ji někde použijete, přidejte poznámku pro další uživatele stránek Informace pro všechny. </p><p>Pokud považujete stránky {{site_name}} užitečné, <a href=\"{{donation_url}}\">podpořte nás</a>.</p>"
msgid "<p>We're glad you got some of the information that you wanted. If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
msgstr "<p>Jsme rádi, že jste obdrželi alespoň částečnou odpověď na vznesený dotaz. Pokud považujete stránky {{site_name}} za užitečné, <a href=\"{{donation_url}}\">podpořte nás</a>.</p><p>Pokud chcete získat doplňující informace, zde je návod.</p>"
+msgid "<p>We're glad you got some of the information that you wanted.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
+msgstr "<p>Jsme rádi, že jste obdrželi alespoň částečnou odpověď na vznesený dotaz. Pokud chcete získat více informací, zde je návod. </p><p>"
+
msgid "<p>You do not need to include your email in the request in order to get a reply (<a href=\"{{url}}\">details</a>).</p>"
msgstr "<p>Nemusíte uvádět svou e-mailovou adresu. (<a href=\"{{url}}\">více</a>).</p>"
@@ -317,6 +323,9 @@ msgstr "<strong>Shrnutí</strong> odpovědi, kterou jste obdrželi poštou."
msgid "A Freedom of Information request"
msgstr "Vznesený dotaz podle zákona 106/1999 Sb. o svobodném přístupu k informacím"
+msgid "A full history of my FOI request and all correspondence is available on the Internet at this address: {{url}}"
+msgstr "Úplná historie mé žádosti a celá korespondence s ní spojená je k dispozici zde {{url}}"
+
msgid "A new request, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, was sent to {{public_body_name}} by {{info_request_user}} on {{date}}."
msgstr "Nový dotaz byl vznesen na instituci {{public_body_name}} uživatelem {{info_request_user}} dne {{date}}."
@@ -342,13 +351,13 @@ msgid "Act on what you've learnt"
msgstr "Jednejte na základě toho, co jste se dozvěděli"
msgid "Acts as xapian/acts as xapian job"
-msgstr ""
+msgstr "Acts as xapian/acts as xapian job"
msgid "ActsAsXapian::ActsAsXapianJob|Action"
-msgstr ""
+msgstr "ActsAsXapian::ActsAsXapianJob|Akce"
msgid "ActsAsXapian::ActsAsXapianJob|Model"
-msgstr ""
+msgstr "ActsAsXapian::ActsAsXapianJob|Model"
msgid "Add an annotation"
msgstr "Přidat poznámku"
@@ -482,7 +491,7 @@ msgid "By law, under all circumstances, {{public_body_link}} should have respond
msgstr "Podle zákona by instituce {{public_body_link}} měla v každém případě odpovědět."
msgid "By law, {{public_body_link}} should normally have responded <strong>promptly</strong> and"
-msgstr "Podle zákona, by měla instituce {{public_body_link}} odpovědět okamžitě a "
+msgstr "Podle zákona by měla instituce {{public_body_link}} odpovědět okamžitě a "
msgid "Calculated home page"
msgstr "Domů"
@@ -658,7 +667,7 @@ msgid "Date:"
msgstr "Datum:"
msgid "Dear {{name}},"
-msgstr ""
+msgstr "Vážený/á {{name}},"
msgid "Dear {{public_body_name}},"
msgstr ""
@@ -807,6 +816,9 @@ msgstr "Nepodařilo se konvertovat obrázek do správné velikosti: at {{cols}}x
msgid "Filter"
msgstr "Filtr"
+msgid "First, did your other requests succeed?"
+msgstr "Můžete prosím doplnit informace o Vašich ostatních žádostech? Uspěli jste?"
+
msgid "First, type in the <strong>name of the UK public authority</strong> you'd\\n like information from. <strong>By law, they have to respond</strong>\\n (<a href=\"{{url}}\">why?</a>)."
msgstr ""
"Nejdříve napište <strong>název instituce</strong>, od které chcete získat informace. <strong>Podle zákona vám musí odpovědět</strong>\n"
@@ -944,16 +956,16 @@ msgid "Handled by post."
msgstr "Vyřizováno poštou."
msgid "Has tag string/has tag string tag"
-msgstr ""
+msgstr "Má štítek/má štítek"
msgid "HasTagString::HasTagStringTag|Model"
-msgstr ""
+msgstr "MáŠtítek::MáŠtítek|Model"
msgid "HasTagString::HasTagStringTag|Name"
-msgstr ""
+msgstr "HasTagString::HasTagStringTag|Jméno"
msgid "HasTagString::HasTagStringTag|Value"
-msgstr ""
+msgstr "HasTagString::HasTagStringTag|Hodnota"
msgid "Hello! You can make Freedom of Information requests within {{country_name}} at {{link_to_website}}"
msgstr "Dobrý den, můžete vznést dotaz v zemi {{country_name}} na stránkách {{link_to_website}}"
@@ -1009,6 +1021,9 @@ msgstr "Žádám <strong>novou informaci</strong>"
msgid "I am requesting an <strong>internal review</strong>"
msgstr "Žádám <strong>o doplnění dotazu</strong>"
+msgid "I am writing to request an internal review of {{public_body_name}}'s handling of my FOI request '{{info_request_title}}'."
+msgstr "Rád bych požádal o přehodnocení přístupu {{public_body_name}} k vyřízení mé žádosti '{{info_request_title}}'."
+
msgid "I don't like these ones &mdash; give me some more!"
msgstr "To se mi nelíbí &mdash; nabídněte nějaké další!"
@@ -1324,12 +1339,6 @@ msgstr "MailServerLog|Řádek"
msgid "MailServerLog|Order"
msgstr "MailServerLog|Příkaz"
-msgid "Make a new <strong>Environmental Information</strong> request"
-msgstr "Vzneste dotaz týkající se <strong>životního prostředí</strong> "
-
-msgid "Make a new <strong>Freedom of Information</strong> request to {{public_body}}"
-msgstr "Vzneste dotaz <strong>podle zákona o svobodném přístupu k informacím</strong> na instituci {{public_body}}"
-
msgid "Make a new<br/>\\n <strong>Freedom <span>of</span><br/>\\n Information<br/>\\n request</strong>"
msgstr ""
"Vzneste nový <br/>\n"
@@ -1340,6 +1349,9 @@ msgstr ""
msgid "Make a request"
msgstr "Vzneste dotaz"
+msgid "Make a request to this authority"
+msgstr "Vzneste žádost na tuto instituci"
+
msgid "Make an {{law_used_short}} request to '{{public_body_name}}'"
msgstr "Vzneste {{law_used_short}} dotaz na '{{public_body_name}}'"
@@ -1600,6 +1612,9 @@ msgstr "Prosíme zkontrolujte, zda URL (tedy ten dlouhý kód složený z písme
msgid "Please choose a file containing your photo."
msgstr "Vyberte soubor se svým obrázkem. "
+msgid "Please choose a reason"
+msgstr "Prosím vyberte důvod"
+
msgid "Please choose what sort of reply you are making."
msgstr "Vyberte typ odpovědi. "
@@ -1684,6 +1699,9 @@ msgstr "Předmět dotazu musí být krátký, podobně jako v předmětu e-mailo
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 "Požádejte o informace, které jsou uvedeny v těchto kategoriích, <strong>neplýtvejte svým časem</strong> nebo časem lidí v institucích dotazy na nesouvisející informace."
+msgid "Please pass this on to the person who conducts Freedom of Information reviews."
+msgstr "Prosím předejte to poradenskému týmu v Otevřete, posoudí postup ve Vašem případě."
+
msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
msgstr ""
"Vyberte každý dotaz jednotlivě, a <strong>dejte ostatním vědět</strong>\n"
@@ -1901,6 +1919,9 @@ msgstr "Nahlásit zneužití"
msgid "Report an offensive or unsuitable request"
msgstr "Nahlásit nevhodný obsah dotazu"
+msgid "Report request"
+msgstr "Nahlásit tento dotaz"
+
msgid "Report this request"
msgstr "Nahlásit tento dotaz"
@@ -2128,9 +2149,6 @@ msgstr "Pardon, tuto stránku se nepodařilo najít."
msgid "Special note for this authority!"
msgstr "Speciální poznámka k této instituci!"
-msgid "Start"
-msgstr "Začít zde"
-
msgid "Start now &raquo;"
msgstr "Začněte zde &raquo;"
@@ -2319,7 +2337,7 @@ msgid "The search index is currently offline, so we can't show the Freedom of In
msgstr "Došlo ke krátkému výpadku vyhledávání, nemůžeme proto zobrazit dotazy, které tato osoba vznesla. Omlouváme se."
msgid "The {{site_name}} team."
-msgstr ""
+msgstr "Tým Informace pro všechny"
msgid "Then you can cancel the alert."
msgstr "Pak můžete upozornění zrušit."
@@ -2630,8 +2648,8 @@ msgstr "Vložit anotaci"
msgid "To reply to "
msgstr "Odpovědět "
-msgid "To report this FOI request"
-msgstr "Nahlásit tento dotaz"
+msgid "To report this request"
+msgstr "Pro nahlášení tohoto dotazu"
msgid "To send a follow up message to "
msgstr "Poslat další odpověď"
@@ -2856,10 +2874,10 @@ msgid "Was the response you got to your FOI request any good?"
msgstr "Byla odpověď na váš dotaz kompletní a v pořádku?"
msgid "We consider it is not a valid FOI request, and have therefore hidden it from other users."
-msgstr ""
+msgstr "Považujeme tuto žádost za neplatnou a proto zůstává ostatním uživatelům skryta."
msgid "We consider it to be vexatious, and have therefore hidden it from other users."
-msgstr ""
+msgstr "Považujeme tuto zprávu za nevhodnou, proto je ostatním uživatelům skryta."
msgid "We do not have a working request email address for this authority."
msgstr "Nemáme funkční e-mailovou adresu pro tuto instituci."
@@ -3061,6 +3079,9 @@ msgstr "Vymazání profilového fota je možné provést po přihlášení."
msgid "You need to be logged in to edit your profile."
msgstr "Musíte být zaregistrován/a, abyste mohl/a editovat svůj profil."
+msgid "You need to be logged in to report a request for administrator attention"
+msgstr "Upozornit adminstrátora můžete jako přihlášený uživatel"
+
msgid "You previously submitted that exact follow up message for this request."
msgstr "V minulosti jste již vložili úplně stejnou zprávu týkající se tohoto dotazu. "
@@ -3088,7 +3109,7 @@ msgstr ""
"bližším vysvětlením."
msgid "You will still be able to view it while logged in to the site. Please reply to this email if you would like to discuss this decision further."
-msgstr ""
+msgstr "Náhled Vám bude po přihlášení stále k dispozici. Prosím odpovězte na tento mail pokud k tomu máte nějaký další komentář. "
msgid "You're in. <a href=\"#\" id=\"send-request\">Continue sending your request</a>"
msgstr "Odesláno. <a href=\"#\" id=\"send-request\"> Můžete vznést další dotaz.</a>"
@@ -3164,10 +3185,10 @@ msgid "Your photo will be shown in public <strong>on the Internet</strong>,\\n
msgstr "<strong>Důležité upozornění:</strong> Vaše fotografie bude zveřejněna na stránkách Informace pro všechny pokaždé, kdy vznesete dotaz nebo přidáte komentář."
msgid "Your request '{{request}}' at {{url}} has been reviewed by moderators."
-msgstr ""
+msgstr "Vaše žádost '{{request}}' v {{url}} byla upravena adminstrátorem."
msgid "Your request on {{site_name}} hidden"
-msgstr ""
+msgstr "Vaše žádost na stránkách {{site_name}} je skryta"
msgid "Your request was called {{info_request}}. Letting everyone know whether you got the information will help us keep tabs on"
msgstr "Informace se týká vašeho dotazu {{info_request}}. Můžete všechny informovat, zda jste požadovanou informaci obdrželi a bude tak přehled o odpovědích této instituce"
@@ -3206,7 +3227,7 @@ msgid "Yours sincerely,"
msgstr "S pozdravem,"
msgid "Yours,"
-msgstr ""
+msgstr "S pozdravem,"
msgid "[FOI #{{request}} email]"
msgstr "[FOI #{{request}} e-mail] ??"
@@ -3511,10 +3532,7 @@ msgstr[1] "{{count}} dotazy byly vzneseny."
msgstr[2] "{{count}} dotazů bylo vzneseno."
msgid "{{existing_request_user}} already\\n created the same request on {{date}}. You can either view the <a href=\"{{existing_request}}\">existing request</a>,\\n or edit the details below to make a new but similar request."
-msgstr ""
-"{{existing_request_user}} již\n"
-" vznesl stejný dotaz dne {{date}}. Můžete si <a href=\"{{existing_request}}\">tento dotaz</a> přečíst,\n"
-" nebo vzneste podobný, ale podle svých potřeb upravený dotaz."
+msgstr "{{existing_request_user}} již vznesl stejný dotaz dne {{date}}. Můžete si <a href=\"{{existing_request}}\">tento dotaz</a> přečíst, nebo vzneste podobný, ale podle svých potřeb upravený dotaz."
msgid "{{info_request_user_name}} only:"
msgstr "Pouze {{info_request_user_name}}:"
diff --git a/locale/cy/app.po b/locale/cy/app.po
index 1db212feb..55ecd5061 100644
--- a/locale/cy/app.po
+++ b/locale/cy/app.po
@@ -6,13 +6,15 @@
# skenaja <alex@alexskene.com>, 2011-2012
# baragouiner <graham.craig@gmail.com>, 2013
# baragouiner <graham.craig@gmail.com>, 2013
+# baragouiner <graham.craig@gmail.com>, 2013
+# PerryX <wyeboy@gmail.com>, 2013
# PerryX <wyeboy@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: alaveteli\n"
"Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n"
-"POT-Creation-Date: 2013-05-30 09:46+0100\n"
-"PO-Revision-Date: 2013-05-30 08:54+0000\n"
+"POT-Creation-Date: 2013-06-24 09:40-0700\n"
+"PO-Revision-Date: 2013-06-24 16:52+0000\n"
"Last-Translator: louisecrow <louise@mysociety.org>\n"
"Language-Team: Welsh (http://www.transifex.com/projects/p/alaveteli/language/cy/)\n"
"Language: cy\n"
@@ -162,12 +164,18 @@ msgstr ""
msgid "<p>We recommend that you edit your request and remove the email address.\\n If you leave it, the email address will be sent to the authority, but will not be displayed on the site.</p>"
msgstr ""
+msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p>"
+msgstr ""
+
msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p><p>If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p>"
msgstr ""
msgid "<p>We're glad you got some of the information that you wanted. If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
msgstr ""
+msgid "<p>We're glad you got some of the information that you wanted.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
+msgstr ""
+
msgid "<p>You do not need to include your email in the request in order to get a reply (<a href=\"{{url}}\">details</a>).</p>"
msgstr ""
@@ -270,6 +278,9 @@ msgstr ""
msgid "A Freedom of Information request"
msgstr ""
+msgid "A full history of my FOI request and all correspondence is available on the Internet at this address: {{url}}"
+msgstr ""
+
msgid "A new request, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, was sent to {{public_body_name}} by {{info_request_user}} on {{date}}."
msgstr ""
@@ -738,6 +749,9 @@ msgstr ""
msgid "Filter"
msgstr ""
+msgid "First, did your other requests succeed?"
+msgstr ""
+
msgid "First, type in the <strong>name of the UK public authority</strong> you'd\\n like information from. <strong>By law, they have to respond</strong>\\n (<a href=\"{{url}}\">why?</a>)."
msgstr "Yn gyntaf, teipiwch <strong>enw awdurdod cyhoeddus yn y DU</strong> yr hoffech gael gwybodaeth ganddo. <strong>Yn ôl y gyfraith, mae'n rhaid iddynt ymateb</strong> (<a href=\"{{url}}\">pam?</a>)."
@@ -934,6 +948,9 @@ msgstr "Rydw i'n gofyn am <strong>gwybodaeth newydd</strong>"
msgid "I am requesting an <strong>internal review</strong>"
msgstr "Yr wyf yn gofyn am <strong>adolygiad mewnol</strong>"
+msgid "I am writing to request an internal review of {{public_body_name}}'s handling of my FOI request '{{info_request_title}}'."
+msgstr ""
+
msgid "I don't like these ones &mdash; give me some more!"
msgstr ""
@@ -1231,18 +1248,15 @@ msgstr ""
msgid "MailServerLog|Order"
msgstr ""
-msgid "Make a new <strong>Environmental Information</strong> request"
-msgstr ""
-
-msgid "Make a new <strong>Freedom of Information</strong> request to {{public_body}}"
-msgstr ""
-
msgid "Make a new<br/>\\n <strong>Freedom <span>of</span><br/>\\n Information<br/>\\n request</strong>"
msgstr ""
msgid "Make a request"
msgstr "Gwneud cais"
+msgid "Make a request to this authority"
+msgstr ""
+
msgid "Make an {{law_used_short}} request to '{{public_body_name}}'"
msgstr ""
@@ -1501,6 +1515,9 @@ msgstr ""
msgid "Please choose a file containing your photo."
msgstr ""
+msgid "Please choose a reason"
+msgstr ""
+
msgid "Please choose what sort of reply you are making."
msgstr ""
@@ -1582,6 +1599,9 @@ msgstr ""
msgid "Please only request information that comes under those categories, <strong>do not waste your\\n time</strong> or the time of the public authority by requesting unrelated information."
msgstr ""
+msgid "Please pass this on to the person who conducts Freedom of Information reviews."
+msgstr ""
+
msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
msgstr ""
@@ -1795,6 +1815,9 @@ msgstr ""
msgid "Report an offensive or unsuitable request"
msgstr ""
+msgid "Report request"
+msgstr ""
+
msgid "Report this request"
msgstr ""
@@ -2015,9 +2038,6 @@ msgstr ""
msgid "Special note for this authority!"
msgstr ""
-msgid "Start"
-msgstr ""
-
msgid "Start now &raquo;"
msgstr ""
@@ -2483,7 +2503,7 @@ msgstr ""
msgid "To reply to "
msgstr ""
-msgid "To report this FOI request"
+msgid "To report this request"
msgstr ""
msgid "To send a follow up message to "
@@ -2882,6 +2902,9 @@ msgstr ""
msgid "You need to be logged in to edit your profile."
msgstr ""
+msgid "You need to be logged in to report a request for administrator attention"
+msgstr ""
+
msgid "You previously submitted that exact follow up message for this request."
msgstr ""
diff --git a/locale/de/app.po b/locale/de/app.po
index 38b00b519..201e32692 100644
--- a/locale/de/app.po
+++ b/locale/de/app.po
@@ -6,13 +6,14 @@
# David Cabo <david.cabo@gmail.com>, 2012
# FOI Monkey <>, 2012
# KerstiRu <kersti@access-info.org>, 2011
+# KerstiRu <kersti@access-info.org>, 2011
# stefanw <stefanwehrmeyer@gmail.com>, 2011
msgid ""
msgstr ""
"Project-Id-Version: alaveteli\n"
"Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n"
-"POT-Creation-Date: 2013-05-30 09:46+0100\n"
-"PO-Revision-Date: 2013-05-30 08:54+0000\n"
+"POT-Creation-Date: 2013-06-24 09:40-0700\n"
+"PO-Revision-Date: 2013-06-24 16:52+0000\n"
"Last-Translator: louisecrow <louise@mysociety.org>\n"
"Language-Team: German (http://www.transifex.com/projects/p/alaveteli/language/de/)\n"
"Language: de\n"
@@ -177,12 +178,18 @@ 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>"
+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>"
+msgstr ""
+
msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p><p>If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p>"
msgstr "<p>Wir freuen uns, dass Sie die von Ihnen gewünschten Informationen erhalten haben. Solten Sie darüber schreiben oder die Informationen andersweitig verwenden, kommen Sie bitte zurück und fügen Sie einen Kommentar an, in welchem Sie uns mitteilen, wie Sie die Informationen verwendet haben .</p><p>Falls Sie {{site_name}} hilfreich fanden, <a href=\"{{donation_url}}\">senden Sie eine Spende</a> an die Organisation hinter dieser Seite.</p>"
msgid "<p>We're glad you got some of the information that you wanted. If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
msgstr "<p>Wir freuen uns, dass Sie die von Ihnen gewünschten Informationen erhalten haben. Falls Sie {{site_name}} hilfreich fanden, <a href=\"{{donation_url}}\">senden Sie eine Spende</a>an die Organisation hinter dieser Seite.</p><p>Falls Sie versuchen möchten den Rest der Information zu erhalten, schauen Sie hier was Sie tun können.</p>"
+msgid "<p>We're glad you got some of the information that you wanted.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
+msgstr ""
+
msgid "<p>You do not need to include your email in the request in order to get a reply (<a href=\"{{url}}\">details</a>).</p>"
msgstr "<p> Es ist nicht erfoderlich Ihre Emailadresse in der Anfrage zu nennen, um eine Antwort zu erhalten (<a href=\"{{url}}\">Details</a>).</p>"
@@ -296,6 +303,9 @@ msgstr "Eine <strong>Zusammenfassung</strong> of the response if you have receiv
msgid "A Freedom of Information request"
msgstr ""
+msgid "A full history of my FOI request and all correspondence is available on the Internet at this address: {{url}}"
+msgstr ""
+
msgid "A new request, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, was sent to {{public_body_name}} by {{info_request_user}} on {{date}}."
msgstr ""
@@ -776,6 +786,9 @@ msgstr "Konnte Bild nicht in die richtige Größe umwandeln: {{cols}} x {{rows}}
msgid "Filter"
msgstr ""
+msgid "First, did your other requests succeed?"
+msgstr ""
+
msgid "First, type in the <strong>name of the UK public authority</strong> you'd\\n like information from. <strong>By law, they have to respond</strong>\\n (<a href=\"{{url}}\">why?</a>)."
msgstr ""
@@ -970,6 +983,9 @@ msgstr "Ich beantrage <strong>neue Informationen</strong>"
msgid "I am requesting an <strong>internal review</strong>"
msgstr "Ich stelle eine Anfrage zur <strong>internen Prüfung</strong>"
+msgid "I am writing to request an internal review of {{public_body_name}}'s handling of my FOI request '{{info_request_title}}'."
+msgstr ""
+
msgid "I don't like these ones &mdash; give me some more!"
msgstr "Ich würde gerne andere Anfragen erhalten!"
@@ -1277,12 +1293,6 @@ msgstr ""
msgid "MailServerLog|Order"
msgstr ""
-msgid "Make a new <strong>Environmental Information</strong> request"
-msgstr "Stellen Sie eine neue <strong>Umwelt-Anfrage</strong>"
-
-msgid "Make a new <strong>Freedom of Information</strong> request to {{public_body}}"
-msgstr "Stellen Sie eine neue <strong>Informationsfreiheitsanfrage</strong> an {{public_body}}"
-
msgid "Make a new<br/>\\n <strong>Freedom <span>of</span><br/>\\n Information<br/>\\n request</strong>"
msgstr ""
"Stellen Sie eine neue<br/>\n"
@@ -1291,6 +1301,9 @@ msgstr ""
msgid "Make a request"
msgstr "Anfrage stellen"
+msgid "Make a request to this authority"
+msgstr ""
+
msgid "Make an {{law_used_short}} request to '{{public_body_name}}'"
msgstr "Stellen Sie einen {{law_used_short}} Antrag an '{{public_body_name}}'"
@@ -1549,6 +1562,9 @@ msgstr "Bitte überprüfen Sie, ob Sie die URL (Webadresse) korrekt aus Ihrer Em
msgid "Please choose a file containing your photo."
msgstr "Bitte wählen Sie eine Datei mit Ihrem Foto."
+msgid "Please choose a reason"
+msgstr ""
+
msgid "Please choose what sort of reply you are making."
msgstr "Bitte wählen Sie, welche Art von Antwort Sie geben."
@@ -1633,6 +1649,9 @@ msgstr "Bitte halten Sie die Zusammenfassung kurz, wie in der Betreffzeile einer
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 fragen Sie ausschliesslich auf diese Kategorien zutreffende Informationen an. <strong>Verschwenden Sie nicht Ihre⏎Zeit</strong> oder die Zeit der Behörde, indem Sie nicht zutreffende Informationen anfragen."
+msgid "Please pass this on to the person who conducts Freedom of Information reviews."
+msgstr ""
+
msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
msgstr "Bitte wählen Sie diese Anfragen der Reihe nach aus und <strong>lassen Sie jederman wissen</strong>, ob sie bereits erfolgreich waren oder noch nicht. "
@@ -1846,6 +1865,9 @@ msgstr "Missbrauch melden"
msgid "Report an offensive or unsuitable request"
msgstr ""
+msgid "Report request"
+msgstr ""
+
msgid "Report this request"
msgstr ""
@@ -2069,9 +2091,6 @@ msgstr "Diese Seite wurde leider nicht gefunden"
msgid "Special note for this authority!"
msgstr "Spezielle Nachricht and diese Behörde!"
-msgid "Start"
-msgstr "Start"
-
msgid "Start now &raquo;"
msgstr ""
@@ -2542,7 +2561,7 @@ msgstr "Um Ihre Anmerkung zu senden"
msgid "To reply to "
msgstr "Um eine Antwort zu senden an"
-msgid "To report this FOI request"
+msgid "To report this request"
msgstr ""
msgid "To send a follow up message to "
@@ -2948,6 +2967,9 @@ msgstr "Sie müssen angemeldet sein, um Ihren Profilbild zu löschen."
msgid "You need to be logged in to edit your profile."
msgstr ""
+msgid "You need to be logged in to report a request for administrator attention"
+msgstr ""
+
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. "
diff --git a/locale/en/app.po b/locale/en/app.po
index eb31d7a2e..5dcc9ce57 100644
--- a/locale/en/app.po
+++ b/locale/en/app.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: alaveteli\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-30 09:46+0100\n"
+"POT-Creation-Date: 2013-06-24 09:40-0700\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"
@@ -158,12 +158,18 @@ msgstr ""
msgid "<p>We recommend that you edit your request and remove the email address.\\n If you leave it, the email address will be sent to the authority, but will not be displayed on the site.</p>"
msgstr ""
+msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p>"
+msgstr ""
+
msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p><p>If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p>"
msgstr ""
msgid "<p>We're glad you got some of the information that you wanted. If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
msgstr ""
+msgid "<p>We're glad you got some of the information that you wanted.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
+msgstr ""
+
msgid "<p>You do not need to include your email in the request in order to get a reply (<a href=\"{{url}}\">details</a>).</p>"
msgstr ""
@@ -266,6 +272,9 @@ msgstr ""
msgid "A Freedom of Information request"
msgstr ""
+msgid "A full history of my FOI request and all correspondence is available on the Internet at this address: {{url}}"
+msgstr ""
+
msgid "A new request, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, was sent to {{public_body_name}} by {{info_request_user}} on {{date}}."
msgstr ""
@@ -734,6 +743,9 @@ msgstr ""
msgid "Filter"
msgstr ""
+msgid "First, did your other requests succeed?"
+msgstr ""
+
msgid "First, type in the <strong>name of the UK public authority</strong> you'd\\n like information from. <strong>By law, they have to respond</strong>\\n (<a href=\"{{url}}\">why?</a>)."
msgstr ""
@@ -928,6 +940,9 @@ msgstr ""
msgid "I am requesting an <strong>internal review</strong>"
msgstr ""
+msgid "I am writing to request an internal review of {{public_body_name}}'s handling of my FOI request '{{info_request_title}}'."
+msgstr ""
+
msgid "I don't like these ones &mdash; give me some more!"
msgstr ""
@@ -1225,18 +1240,15 @@ msgstr ""
msgid "MailServerLog|Order"
msgstr ""
-msgid "Make a new <strong>Environmental Information</strong> request"
-msgstr ""
-
-msgid "Make a new <strong>Freedom of Information</strong> request to {{public_body}}"
-msgstr ""
-
msgid "Make a new<br/>\\n <strong>Freedom <span>of</span><br/>\\n Information<br/>\\n request</strong>"
msgstr ""
msgid "Make a request"
msgstr ""
+msgid "Make a request to this authority"
+msgstr ""
+
msgid "Make an {{law_used_short}} request to '{{public_body_name}}'"
msgstr ""
@@ -1495,6 +1507,9 @@ msgstr ""
msgid "Please choose a file containing your photo."
msgstr ""
+msgid "Please choose a reason"
+msgstr ""
+
msgid "Please choose what sort of reply you are making."
msgstr ""
@@ -1576,6 +1591,9 @@ msgstr ""
msgid "Please only request information that comes under those categories, <strong>do not waste your\\n time</strong> or the time of the public authority by requesting unrelated information."
msgstr ""
+msgid "Please pass this on to the person who conducts Freedom of Information reviews."
+msgstr ""
+
msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
msgstr ""
@@ -1789,6 +1807,9 @@ msgstr ""
msgid "Report an offensive or unsuitable request"
msgstr ""
+msgid "Report request"
+msgstr ""
+
msgid "Report this request"
msgstr ""
@@ -2007,9 +2028,6 @@ msgstr ""
msgid "Special note for this authority!"
msgstr ""
-msgid "Start"
-msgstr ""
-
msgid "Start now &raquo;"
msgstr ""
@@ -2469,7 +2487,7 @@ msgstr ""
msgid "To reply to "
msgstr ""
-msgid "To report this FOI request"
+msgid "To report this request"
msgstr ""
msgid "To send a follow up message to "
@@ -2868,6 +2886,9 @@ msgstr ""
msgid "You need to be logged in to edit your profile."
msgstr ""
+msgid "You need to be logged in to report a request for administrator attention"
+msgstr ""
+
msgid "You previously submitted that exact follow up message for this request."
msgstr ""
diff --git a/locale/en_IE/app.po b/locale/en_IE/app.po
index 932268081..729e74ba6 100644
--- a/locale/en_IE/app.po
+++ b/locale/en_IE/app.po
@@ -3,14 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# confirmordeny <mrjohncross@googlemail.com>, 2012
+# handelaar <john@handelaar.org>, 2011
# handelaar <john@handelaar.org>, 2011
# confirmordeny <mrjohncross@googlemail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: alaveteli\n"
"Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n"
-"POT-Creation-Date: 2013-05-30 09:46+0100\n"
-"PO-Revision-Date: 2013-05-30 08:54+0000\n"
+"POT-Creation-Date: 2013-06-24 09:40-0700\n"
+"PO-Revision-Date: 2013-06-24 16:52+0000\n"
"Last-Translator: louisecrow <louise@mysociety.org>\n"
"Language-Team: English (Ireland) (http://www.transifex.com/projects/p/alaveteli/language/en_IE/)\n"
"Language: en_IE\n"
@@ -160,12 +162,18 @@ msgstr ""
msgid "<p>We recommend that you edit your request and remove the email address.\\n If you leave it, the email address will be sent to the authority, but will not be displayed on the site.</p>"
msgstr ""
+msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p>"
+msgstr ""
+
msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p><p>If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p>"
msgstr ""
msgid "<p>We're glad you got some of the information that you wanted. If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
msgstr ""
+msgid "<p>We're glad you got some of the information that you wanted.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
+msgstr ""
+
msgid "<p>You do not need to include your email in the request in order to get a reply (<a href=\"{{url}}\">details</a>).</p>"
msgstr ""
@@ -268,6 +276,9 @@ msgstr ""
msgid "A Freedom of Information request"
msgstr ""
+msgid "A full history of my FOI request and all correspondence is available on the Internet at this address: {{url}}"
+msgstr ""
+
msgid "A new request, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, was sent to {{public_body_name}} by {{info_request_user}} on {{date}}."
msgstr ""
@@ -736,6 +747,9 @@ msgstr ""
msgid "Filter"
msgstr ""
+msgid "First, did your other requests succeed?"
+msgstr ""
+
msgid "First, type in the <strong>name of the UK public authority</strong> you'd\\n like information from. <strong>By law, they have to respond</strong>\\n (<a href=\"{{url}}\">why?</a>)."
msgstr ""
@@ -930,6 +944,9 @@ msgstr ""
msgid "I am requesting an <strong>internal review</strong>"
msgstr ""
+msgid "I am writing to request an internal review of {{public_body_name}}'s handling of my FOI request '{{info_request_title}}'."
+msgstr ""
+
msgid "I don't like these ones &mdash; give me some more!"
msgstr ""
@@ -1227,18 +1244,15 @@ msgstr ""
msgid "MailServerLog|Order"
msgstr ""
-msgid "Make a new <strong>Environmental Information</strong> request"
-msgstr ""
-
-msgid "Make a new <strong>Freedom of Information</strong> request to {{public_body}}"
-msgstr ""
-
msgid "Make a new<br/>\\n <strong>Freedom <span>of</span><br/>\\n Information<br/>\\n request</strong>"
msgstr ""
msgid "Make a request"
msgstr ""
+msgid "Make a request to this authority"
+msgstr ""
+
msgid "Make an {{law_used_short}} request to '{{public_body_name}}'"
msgstr ""
@@ -1497,6 +1511,9 @@ msgstr ""
msgid "Please choose a file containing your photo."
msgstr ""
+msgid "Please choose a reason"
+msgstr ""
+
msgid "Please choose what sort of reply you are making."
msgstr ""
@@ -1578,6 +1595,9 @@ msgstr ""
msgid "Please only request information that comes under those categories, <strong>do not waste your\\n time</strong> or the time of the public authority by requesting unrelated information."
msgstr ""
+msgid "Please pass this on to the person who conducts Freedom of Information reviews."
+msgstr ""
+
msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
msgstr ""
@@ -1791,6 +1811,9 @@ msgstr ""
msgid "Report an offensive or unsuitable request"
msgstr ""
+msgid "Report request"
+msgstr ""
+
msgid "Report this request"
msgstr ""
@@ -2009,9 +2032,6 @@ msgstr ""
msgid "Special note for this authority!"
msgstr ""
-msgid "Start"
-msgstr ""
-
msgid "Start now &raquo;"
msgstr ""
@@ -2471,7 +2491,7 @@ msgstr ""
msgid "To reply to "
msgstr ""
-msgid "To report this FOI request"
+msgid "To report this request"
msgstr ""
msgid "To send a follow up message to "
@@ -2870,6 +2890,9 @@ msgstr ""
msgid "You need to be logged in to edit your profile."
msgstr ""
+msgid "You need to be logged in to report a request for administrator attention"
+msgstr ""
+
msgid "You previously submitted that exact follow up message for this request."
msgstr ""
diff --git a/locale/es/app.po b/locale/es/app.po
index 515f6a491..694822e1f 100644
--- a/locale/es/app.po
+++ b/locale/es/app.po
@@ -5,15 +5,18 @@
# Translators:
# David Cabo <david.cabo@gmail.com>, 2011-2012
# fabrizioscrollini <fabrizio.scrollini@gmail.com>, 2012
+# fabrizioscrollini <fabrizio.scrollini@gmail.com>, 2012
+# gaba <gabelula@gmail.com>, 2012
# gaba <gabelula@gmail.com>, 2012
# skenaja <alex@alexskene.com>, 2011
# vickyanderica <victoria@access-info.org>, 2011
+# vickyanderica <victoria@access-info.org>, 2011
msgid ""
msgstr ""
"Project-Id-Version: alaveteli\n"
"Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n"
-"POT-Creation-Date: 2013-05-30 09:46+0100\n"
-"PO-Revision-Date: 2013-05-30 08:54+0000\n"
+"POT-Creation-Date: 2013-06-24 09:40-0700\n"
+"PO-Revision-Date: 2013-06-24 16:52+0000\n"
"Last-Translator: louisecrow <louise@mysociety.org>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/alaveteli/language/es/)\n"
"Language: es\n"
@@ -198,12 +201,18 @@ msgstr ""
"<p>Te aconsejamos que edites tu solicitud y elimines tu dirección de correo.\n"
" Si la dejas, tu dirección será enviada al organismo público, pero no será visible en esta web.</p>"
+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>"
+msgstr ""
+
msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p><p>If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p>"
msgstr "<p>Nos alegra saber que has obtenido toda la información que solicitaste. Si escribes sobre ella, o la utilizas, por favor vuelve y añada un comentario a continuación explicando lo que has hecho.</p><p>Si {{site_name}} te ha resultado útil, <a href=\"{{donation_url}}\">puedes donar</a> a la ONG responsable.</p>"
msgid "<p>We're glad you got some of the information that you wanted. If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
msgstr "<p>Nos alegra saber que has obtenido parte de la información que solicitaste. Si escribes sobre ella, o la utilizas, por favor vuelve y añade un comentario a continuación explicando lo que has hecho.</p><p>Si {{site_name}} te ha resultado útil, <a href=\"{{donation_url}}\">puedes donar</a> a la ONG responsable.</p>"
+msgid "<p>We're glad you got some of the information that you wanted.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
+msgstr ""
+
msgid "<p>You do not need to include your email in the request in order to get a reply (<a href=\"{{url}}\">details</a>).</p>"
msgstr "<p>No necesitas incluir tu dirección de correo en la solicitud para recibir una respuesta (<a href=\"{{url}}\">más detalles</a>).</p>"
@@ -335,6 +344,9 @@ msgstr "Un <strong>resumen</strong> de la respuesta si la has recibido por corre
msgid "A Freedom of Information request"
msgstr "Una solicitud de información"
+msgid "A full history of my FOI request and all correspondence is available on the Internet at this address: {{url}}"
+msgstr ""
+
msgid "A new request, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, was sent to {{public_body_name}} by {{info_request_user}} on {{date}}."
msgstr "A new request, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, was sent to {{public_body_name}} by {{info_request_user}} on {{date}}."
@@ -825,6 +837,9 @@ msgstr "Error al convertir la imagen al tamaño adecuado: es {{cols}}x{{rows}},
msgid "Filter"
msgstr "Filtrar"
+msgid "First, did your other requests succeed?"
+msgstr ""
+
msgid "First, type in the <strong>name of the UK public authority</strong> you'd\\n like information from. <strong>By law, they have to respond</strong>\\n (<a href=\"{{url}}\">why?</a>)."
msgstr "Primero, escribe el <strong>nombre de la institución</strong> a la que quieres pedir información. <strong>Están obligados a responder</strong> (<a href=\"{{url}}\">¿por qué?</a>)."
@@ -1031,6 +1046,9 @@ msgstr "Estoy pidiendo <strong>nueva información</strong>"
msgid "I am requesting an <strong>internal review</strong>"
msgstr "Estoy pidiendo una <strong>revisión interna</strong>"
+msgid "I am writing to request an internal review of {{public_body_name}}'s handling of my FOI request '{{info_request_title}}'."
+msgstr ""
+
msgid "I don't like these ones &mdash; give me some more!"
msgstr "Estas no me gustan &mdash; ¡dame más!"
@@ -1359,12 +1377,6 @@ msgstr ""
msgid "MailServerLog|Order"
msgstr ""
-msgid "Make a new <strong>Environmental Information</strong> request"
-msgstr "Envíe una nueva <strong>solicitud de información medioambiental</strong>"
-
-msgid "Make a new <strong>Freedom of Information</strong> request to {{public_body}}"
-msgstr "Haz una nueva <strong>solicitud de información</strong> a {{public_body}}"
-
msgid "Make a new<br/>\\n <strong>Freedom <span>of</span><br/>\\n Information<br/>\\n request</strong>"
msgstr ""
"Envíe una nueva<br/>\n"
@@ -1374,6 +1386,9 @@ msgstr ""
msgid "Make a request"
msgstr "Enviar solicitud"
+msgid "Make a request to this authority"
+msgstr ""
+
msgid "Make an {{law_used_short}} request to '{{public_body_name}}'"
msgstr "Hacer una solicitud {{law_used_short}} a '{{public_body_name}}'"
@@ -1636,6 +1651,9 @@ msgstr ""
msgid "Please choose a file containing your photo."
msgstr "Por favor elige el fichero que contiene tu foto"
+msgid "Please choose a reason"
+msgstr ""
+
msgid "Please choose what sort of reply you are making."
msgstr "Por favor, elija el tipo de respuesta que está creando."
@@ -1722,6 +1740,9 @@ msgstr "Por favor, mantén el resumen corto, como en el asunto de un correo elec
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, pide información sólo de estas categorias, <strong>no pierdas tu tiempo </strong> o el del organismo público pidiendo información no relacionada."
+msgid "Please pass this on to the person who conducts Freedom of Information reviews."
+msgstr ""
+
msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
msgstr ""
"Por favor elije estas solicitudes una a una, y <strong>haz que se sepa</strong>\n"
@@ -1939,6 +1960,9 @@ msgstr "Denuncie abuso"
msgid "Report an offensive or unsuitable request"
msgstr "Denunciar un pedido ofensivo o inapropiado"
+msgid "Report request"
+msgstr ""
+
msgid "Report this request"
msgstr "Denunciar este pedido"
@@ -2166,9 +2190,6 @@ msgstr "Lo sentimos, no hemos podido encontrar esa página"
msgid "Special note for this authority!"
msgstr "¡Notas especiales sobre este organismo!"
-msgid "Start"
-msgstr "Comenzar"
-
msgid "Start now &raquo;"
msgstr "Comience ahora &raquo;"
@@ -2678,8 +2699,8 @@ msgstr "Añadir tu comentario"
msgid "To reply to "
msgstr "Contestar a "
-msgid "To report this FOI request"
-msgstr "Reportar este pedido de acceso"
+msgid "To report this request"
+msgstr ""
msgid "To send a follow up message to "
msgstr "Enviar una respuesta a "
@@ -3111,6 +3132,9 @@ msgstr "Necesitas identificarte para borrar la foto de tu perfil."
msgid "You need to be logged in to edit your profile."
msgstr "Tienes que loguearte para poder editar tu perfil."
+msgid "You need to be logged in to report a request for administrator attention"
+msgstr ""
+
msgid "You previously submitted that exact follow up message for this request."
msgstr "Ya has enviado esa misma respuesta a esta solicitud."
diff --git a/locale/eu/app.po b/locale/eu/app.po
index 7e90214d0..4fec5d9e0 100644
--- a/locale/eu/app.po
+++ b/locale/eu/app.po
@@ -5,12 +5,13 @@
# Translators:
# David Cabo <david.cabo@gmail.com>, 2012
# sroberto <ertoba@yahoo.es>, 2012
+# sroberto <ertoba@yahoo.es>, 2012
msgid ""
msgstr ""
"Project-Id-Version: alaveteli\n"
"Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n"
-"POT-Creation-Date: 2013-05-30 09:46+0100\n"
-"PO-Revision-Date: 2013-05-30 08:54+0000\n"
+"POT-Creation-Date: 2013-06-24 09:40-0700\n"
+"PO-Revision-Date: 2013-06-24 16:52+0000\n"
"Last-Translator: louisecrow <louise@mysociety.org>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/alaveteli/language/eu/)\n"
"Language: eu\n"
@@ -179,12 +180,18 @@ msgstr ""
"<p>Gure aholkua hauxe da, zure eskabidea editatu eta posta elektronikoaren helbidea kentzea.\n"
" Helbidea utziz gero, erakunde publikora bidaliko da, baina ez da ikusgarria izango webgune honetan.</p>"
+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>"
+msgstr ""
+
msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p><p>If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p>"
msgstr "<p>Pozgarria da eskatu zenuen informazioa jaso duzula jakitea. Horri buruz idazten baduzu edo erabiltzen baduzu, mesedez itzul zaitez hona eta jarraian gehitu iruzkin bat, zer egin duzun azalduz.</p><p>{{site_name}} erabilgarria izan baldin bada, dagokion GKE<a href=\"{{donation_url}}\">diruz lagundu</a> ahal duzu.</p>"
msgid "<p>We're glad you got some of the information that you wanted. If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
msgstr "<p>Pozgarria da eskatu zenuen informazioa jaso duzula jakitea. Horri buruz idazten baduzu edo erabiltzen baduzu, mesedez itzul zaitez hona eta jarraian gehitu iruzkin bat, zer egin duzun azalduz.</p><p>{{site_name}} erabilgarria izan baldin bada,dagokion GKE<a href=\"{{donation_url}}\">diruz lagundu</a> ahal duzu.</p>"
+msgid "<p>We're glad you got some of the information that you wanted.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
+msgstr ""
+
msgid "<p>You do not need to include your email in the request in order to get a reply (<a href=\"{{url}}\">details</a>).</p>"
msgstr "<p>Eskabidean ez duzu zure posta elektronikoaren helbidea sartu behar, erantzuna jasotzeko (<a href=\"{{url}}\">más detalles</a>).</p>"
@@ -295,6 +302,9 @@ msgstr "Erantzunaren <strong>laburpena</strong>, posta arruntean jaso baldin bad
msgid "A Freedom of Information request"
msgstr "Informazio eskabidea"
+msgid "A full history of my FOI request and all correspondence is available on the Internet at this address: {{url}}"
+msgstr ""
+
msgid "A new request, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, was sent to {{public_body_name}} by {{info_request_user}} on {{date}}."
msgstr ""
@@ -768,6 +778,9 @@ msgstr "Irudia behar bezalako tamainera bihurtzean huts egin da:: {{cols}}x{{row
msgid "Filter"
msgstr "Iragazi"
+msgid "First, did your other requests succeed?"
+msgstr ""
+
msgid "First, type in the <strong>name of the UK public authority</strong> you'd\\n like information from. <strong>By law, they have to respond</strong>\\n (<a href=\"{{url}}\">why?</a>)."
msgstr "Lehenbizi, idatz ezazu informazioa eskatu nahi diozun <strong>erakundearen izena</strong>. <strong>Erantzuna eman behar dute</strong> (<a href=\"{{url}}\">zergatik?</a>)."
@@ -965,6 +978,9 @@ msgstr "<strong>Informazio berria</strong> eskatzen ari naiz"
msgid "I am requesting an <strong>internal review</strong>"
msgstr "<strong>barneko berrikusketa</strong> eskatzen ari naiz"
+msgid "I am writing to request an internal review of {{public_body_name}}'s handling of my FOI request '{{info_request_title}}'."
+msgstr ""
+
msgid "I don't like these ones &mdash; give me some more!"
msgstr "Hauek ez zaizkit gustatzen &mdash; emaidazu gehiago!"
@@ -1266,12 +1282,6 @@ msgstr ""
msgid "MailServerLog|Order"
msgstr ""
-msgid "Make a new <strong>Environmental Information</strong> request"
-msgstr "Bidal ezazu <strong>Inguruneari buruzko informazio</strong> eskabide berria"
-
-msgid "Make a new <strong>Freedom of Information</strong> request to {{public_body}}"
-msgstr "Egin ezazu <strong>informazio eskabide</strong> berria {{public_body}}-ra"
-
msgid "Make a new<br/>\\n <strong>Freedom <span>of</span><br/>\\n Information<br/>\\n request</strong>"
msgstr ""
"Bidali ezazu<br/>\n"
@@ -1281,6 +1291,9 @@ msgstr ""
msgid "Make a request"
msgstr "Bidali eskabidea"
+msgid "Make a request to this authority"
+msgstr ""
+
msgid "Make an {{law_used_short}} request to '{{public_body_name}}'"
msgstr "Egin eizaiozu {{law_used_short}} eskabidea '{{public_body_name}}'-ri"
@@ -1539,6 +1552,9 @@ msgstr "Mesedez, egiazta ezazu helbide elektronikoaren URLa ondo kopiatu duzula
msgid "Please choose a file containing your photo."
msgstr "Mesedez, aukera ezazu zure argazkia daukan fitxategia"
+msgid "Please choose a reason"
+msgstr ""
+
msgid "Please choose what sort of reply you are making."
msgstr "Mesedez, aukera ezazu sortzen ari zaren erantzun mota."
@@ -1622,6 +1638,9 @@ msgstr "Mesedez, laburpenak laburra izan behar du, gutun elektroniko baten gaia
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 "Mesedez, eska ezazu kategoria hauetako informazioa soilik, <strong>ez galdu zure denbora </strong> edo erakunde publikoarena zerikusirik ez duen infomazioa eskatzen."
+msgid "Please pass this on to the person who conducts Freedom of Information reviews."
+msgstr ""
+
msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
msgstr "Mesedez, aukera itzazu eskabideak banan banan, eta <strong>jakinarazi </strong> arrakasta izan duten ala ez."
@@ -1837,6 +1856,9 @@ msgstr "Salatu gehiegikeria"
msgid "Report an offensive or unsuitable request"
msgstr ""
+msgid "Report request"
+msgstr ""
+
msgid "Report this request"
msgstr ""
@@ -2060,9 +2082,6 @@ msgstr "Barkatu, ezin izan dugu orrialde hori aurkitu"
msgid "Special note for this authority!"
msgstr "Erakunde horri buruzko ohar berezia!"
-msgid "Start"
-msgstr "Hasi"
-
msgid "Start now &raquo;"
msgstr "Has zaitez orain &raquo;"
@@ -2536,7 +2555,7 @@ msgstr "Gehitu zure iruzkina"
msgid "To reply to "
msgstr "______-ri erantzun"
-msgid "To report this FOI request"
+msgid "To report this request"
msgstr ""
msgid "To send a follow up message to "
@@ -2944,6 +2963,9 @@ msgstr "Identifikatu behar duzu zure profilaren argazkia ezabatzeko."
msgid "You need to be logged in to edit your profile."
msgstr ""
+msgid "You need to be logged in to report a request for administrator attention"
+msgstr ""
+
msgid "You previously submitted that exact follow up message for this request."
msgstr "Eskabide honi jada erantzun bera bidali diozu."
diff --git a/locale/fr/app.po b/locale/fr/app.po
index db5a128ff..a249fb7d1 100644
--- a/locale/fr/app.po
+++ b/locale/fr/app.po
@@ -9,6 +9,7 @@
# Bbear <borisjf@post.harvard.edu>, 2011
# sim51 <contact@bsimard.com>, 2013
# Bbear <borisjf@post.harvard.edu>, 2011
+# pchrzanowski <pierre.chrzanowski@gmail.com>, 2013
# radproject <radhouanef@gmail.com>, 2013
# radproject <radhouanef@gmail.com>, 2013
# rrobert <rrobertpolson@gmail.com>, 2013
@@ -25,9 +26,9 @@ msgid ""
msgstr ""
"Project-Id-Version: alaveteli\n"
"Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n"
-"POT-Creation-Date: 2013-05-30 09:46+0100\n"
-"PO-Revision-Date: 2013-05-30 09:00+0000\n"
-"Last-Translator: louisecrow <louise@mysociety.org>\n"
+"POT-Creation-Date: 2013-06-24 09:40-0700\n"
+"PO-Revision-Date: 2013-06-26 16:07+0000\n"
+"Last-Translator: pchrzanowski <pierre.chrzanowski@gmail.com>\n"
"Language-Team: French (http://www.transifex.com/projects/p/alaveteli/language/fr/)\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
@@ -42,13 +43,13 @@ msgid " (<strong>no ranty</strong> politics, read our <a href=\"{{url}}\">modera
msgstr "(<strong>aucune garantie</strong> politique, lire notre <a href=\"{{url}}\">politique de modération</a>)"
msgid " (<strong>patience</strong>, especially for large files, it may take a while!)"
-msgstr "(<strong>patience</strong>, surtout pour les fichiers volumineux, ça peut prendre un moment !)"
+msgstr "(<strong>patience</strong>, surtout pour les fichiers volumineux, celà peut prendre un moment !)"
msgid " (you)"
msgstr "(vous)"
msgid " - view and make Freedom of Information requests"
-msgstr "-Voir et faire des demandes d'accès a l'information "
+msgstr "- Voir et faire des demandes d'accès a l'information "
msgid " - wall"
msgstr "-mur"
@@ -68,7 +69,7 @@ msgid " Advise on how to <strong>best clarify</strong> the request."
msgstr "Indiquez comment rendre la demande <strong>plus claire</strong>."
msgid " Ideas on what <strong>other documents to request</strong> which the authority may hold. "
-msgstr "Idées sur <strong>d'autres documents à demander</strong> que cette administration pourrait détenir."
+msgstr "Propositions <strong>d'autres informations à demander</strong> que cette administration pourrait détenir."
msgid " If you know the address to use, then please <a href=\"{{url}}\">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 ""
@@ -82,10 +83,10 @@ msgid " Link to the information requested, if it is <strong>already available</s
msgstr "Lien vers les informations demandées, si elle sont <strong>déjà disponibles</strong> sur Internet."
msgid " Offer better ways of <strong>wording the request</strong> to get the information. "
-msgstr " Proposez d'autres <strong>formulations</strong> pour accéder à ces informations. "
+msgstr " Proposez de meilleures <strong>formulations</strong> pour accéder à ces informations. "
msgid " Say how you've <strong>used the information</strong>, with links if possible."
-msgstr " Dites-nous comment vous avez <strong>utilisé ces informations</strong>, à l'aide des liens si possible."
+msgstr " Dites-nous comment vous avez <strong>utilisé ces informations</strong>, à l'aide de liens si possible."
msgid " Suggest <strong>where else</strong> the requester might find the information. "
msgstr " Suggérez <strong>un autre endroit</strong> où l'utilisateur pourrait trouver ces informations. "
@@ -180,12 +181,18 @@ msgstr "<p>Merci pour mettre à jour votre photo de profil.</p>\\n<p><strong>En
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>Nous vous conseillons de modifier votre demande et de supprimer l'adresse e-mail.\\n Si vous la laissez, l'adresse e-mail sera envoyée à l'autorité, mais ne sera pas affichée sur le site.</p>"
+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>"
+msgstr ""
+
msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p><p>If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p>"
msgstr "<p>Nous sommes heureux que vous avez obtenu toutes les informations que vous vouliez . Si vous écrivez ou faites usage de l'information, veuillez revenir et ajouter une annotation en dessous décrivant ce que vous avez fait.</p><p>si vous avez trouvé {{site_name}} utile, <a href=\"{{donation_url}}\">Faites une donation</a> a l'organisation qui le gère.</p>"
msgid "<p>We're glad you got some of the information that you wanted. If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
msgstr "<p>Nous sommes heureux que vous avez partie de l'information que vous vouliez. si vous avez trouvé {{site_name}} utile, <a href=\"{{donation_url}}\">Faites une donation</a> a l'organisation qui le gère.</p><p>Si vous voulez essayer et obtenir le reste de l'information, voici ce qu'il faut faire maintenant.</p>"
+msgid "<p>We're glad you got some of the information that you wanted.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
+msgstr ""
+
msgid "<p>You do not need to include your email in the request in order to get a reply (<a href=\"{{url}}\">details</a>).</p>"
msgstr "<p>Vous n'avez pas besoin d'inclure votre adresse mail à votre demande pour obtenir une réponse(<a href=\"{{url}}\">details</a>).</p>"
@@ -288,6 +295,9 @@ msgstr "Un <strong>résumé</strong> si vous l'avez reçue par la poste."
msgid "A Freedom of Information request"
msgstr "Une demande d'accès à l'information"
+msgid "A full history of my FOI request and all correspondence is available on the Internet at this address: {{url}}"
+msgstr ""
+
msgid "A new request, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, was sent to {{public_body_name}} by {{info_request_user}} on {{date}}."
msgstr "Une nouvelle demande , <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, a été envoyée à {{public_body_name}} par {{info_request_user}} le {{date}}."
@@ -756,6 +766,9 @@ msgstr "Nous n'avons pas pu changer les dimensions de l'image: at {{cols}}x{{row
msgid "Filter"
msgstr "Filtre"
+msgid "First, did your other requests succeed?"
+msgstr ""
+
msgid "First, type in the <strong>name of the UK public authority</strong> you'd\\n like information from. <strong>By law, they have to respond</strong>\\n (<a href=\"{{url}}\">why?</a>)."
msgstr "Commencer par écrire le <strong>nom de l'organisme Tunisien</strong> à \\n solliciter. <strong>Légalement , Ils sont obligés de répondre </strong>\\n (<a href=\"{{url}}\">pourquoi?</a>)."
@@ -950,6 +963,9 @@ msgstr "Je vous demande de <strong>nouvelles informations</strong>."
msgid "I am requesting an <strong>internal review</strong>"
msgstr "Je demande <strong>réexamen interne</strong>."
+msgid "I am writing to request an internal review of {{public_body_name}}'s handling of my FOI request '{{info_request_title}}'."
+msgstr ""
+
msgid "I don't like these ones &mdash; give me some more!"
msgstr "Je n'aime pas ceux-ci &mdash; Donnez moi d'autres!"
@@ -1247,18 +1263,15 @@ msgstr "MailServerLog|Line"
msgid "MailServerLog|Order"
msgstr "MailServerLog|Order"
-msgid "Make a new <strong>Environmental Information</strong> request"
-msgstr "Faire une nouvelle demande <strong>d'information environnementale </strong> "
-
-msgid "Make a new <strong>Freedom of Information</strong> request to {{public_body}}"
-msgstr "Faire une nouvelle demande <strong>d'accès a l'information </strong> à {{public_body}}"
-
msgid "Make a new<br/>\\n <strong>Freedom <span>of</span><br/>\\n Information<br/>\\n request</strong>"
msgstr "Faire une<br/>\\n <strong>Nouvelle <span>demande</span><br/>\\n d'accès<br/>\\n à l'information</strong>"
msgid "Make a request"
msgstr "Faire une demande"
+msgid "Make a request to this authority"
+msgstr ""
+
msgid "Make an {{law_used_short}} request to '{{public_body_name}}'"
msgstr "Faire une {{law_used_short}} demande à '{{public_body_name}}'"
@@ -1517,6 +1530,9 @@ msgstr "Veuillez voir si l'URL ( ie: la longue suite d'adresse contenant des chi
msgid "Please choose a file containing your photo."
msgstr "Choisissez un fichier qui contient votre photo."
+msgid "Please choose a reason"
+msgstr ""
+
msgid "Please choose what sort of reply you are making."
msgstr "Merci de choisir le type de réponse que vous entrez."
@@ -1598,6 +1614,9 @@ msgstr "S'il vous plait soyez bref dans le résumé, comme dans le titre d'un em
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 "Veuillez uniquement demander les informations qui appartiennent à ces catégories <strong> ne perdez pas votre temps </strong> ou celui de l'administration publique a demander des informations sans rapport avec ces catégories ."
+msgid "Please pass this on to the person who conducts Freedom of Information reviews."
+msgstr ""
+
msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
msgstr "Veuillez choisir ces demandes une par une et <strong> laisser tout le monde savoir </strong> si elles ont abouti ou pas ."
@@ -1811,6 +1830,9 @@ msgstr "Signaler un abus"
msgid "Report an offensive or unsuitable request"
msgstr "Signaler une demande offensive ou inappropriée"
+msgid "Report request"
+msgstr ""
+
msgid "Report this request"
msgstr "Signaler cette demande"
@@ -2029,9 +2051,6 @@ msgstr "Page introuvable."
msgid "Special note for this authority!"
msgstr "Remarque spéciale pour cette autorité"
-msgid "Start"
-msgstr "Commencer "
-
msgid "Start now &raquo;"
msgstr "Commencez dès maintenant &raquo;"
@@ -2491,8 +2510,8 @@ msgstr "Pour soumettre votre annotation"
msgid "To reply to "
msgstr "Répondre à"
-msgid "To report this FOI request"
-msgstr "Pour signaler cette demande "
+msgid "To report this request"
+msgstr ""
msgid "To send a follow up message to "
msgstr "Pour envoyer un message de suivi à"
@@ -2890,6 +2909,9 @@ msgstr "Vous devez être connectés pour supprimer votre photo de profil"
msgid "You need to be logged in to edit your profile."
msgstr "Vous devez être connectés pour modifier votre profil"
+msgid "You need to be logged in to report a request for administrator attention"
+msgstr ""
+
msgid "You previously submitted that exact follow up message for this request."
msgstr "Vous avez dejà utilisé le même commentaire pour cette demande ."
diff --git a/locale/gl/app.po b/locale/gl/app.po
index 7da3fbaa7..f6a2f97ea 100644
--- a/locale/gl/app.po
+++ b/locale/gl/app.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: alaveteli\n"
"Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n"
-"POT-Creation-Date: 2013-05-30 09:46+0100\n"
-"PO-Revision-Date: 2013-05-30 08:54+0000\n"
+"POT-Creation-Date: 2013-06-24 09:40-0700\n"
+"PO-Revision-Date: 2013-06-24 16:52+0000\n"
"Last-Translator: louisecrow <louise@mysociety.org>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/alaveteli/language/gl/)\n"
"Language: gl\n"
@@ -184,12 +184,18 @@ msgstr ""
"<p>Te aconsejamos que edites tu solicitud y elimines tu dirección de correo.\n"
" Si la dejas, tu dirección será enviada al organismo público, pero no será visible en esta web.</p>"
+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>"
+msgstr ""
+
msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p><p>If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p>"
msgstr "<p>Nos alegra saber que has obtenido toda la información que solicitaste. Si escribes sobre ella, o la utilizas, por favor vuelve y añada un comentario a continuación explicando lo que has hecho.</p><p>Si {{site_name}} te ha resultado útil, <a href=\"{{donation_url}}\">puedes donar</a> a la ONG responsable.</p>"
msgid "<p>We're glad you got some of the information that you wanted. If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
msgstr "<p>Nos alegra saber que has obtenido parte de la información que solicitaste. Si escribes sobre ella, o la utilizas, por favor vuelve y añade un comentario a continuación explicando lo que has hecho.</p><p>Si {{site_name}} te ha resultado útil, <a href=\"{{donation_url}}\">puedes donar</a> a la ONG responsable.</p>"
+msgid "<p>We're glad you got some of the information that you wanted.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
+msgstr ""
+
msgid "<p>You do not need to include your email in the request in order to get a reply (<a href=\"{{url}}\">details</a>).</p>"
msgstr "<p>No necesitas incluir tu dirección de correo en la solicitud para recibir una respuesta (<a href=\"{{url}}\">más detalles</a>).</p>"
@@ -316,6 +322,9 @@ msgstr "Un <strong>resumen</strong> de la respuesta si la has recibido por corre
msgid "A Freedom of Information request"
msgstr "Una solicitud de información"
+msgid "A full history of my FOI request and all correspondence is available on the Internet at this address: {{url}}"
+msgstr ""
+
msgid "A new request, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, was sent to {{public_body_name}} by {{info_request_user}} on {{date}}."
msgstr ""
@@ -806,6 +815,9 @@ msgstr "Error al convertir la imagen al tamaño adecuado: es {{cols}}x{{rows}},
msgid "Filter"
msgstr "Filtrar"
+msgid "First, did your other requests succeed?"
+msgstr ""
+
msgid "First, type in the <strong>name of the UK public authority</strong> you'd\\n like information from. <strong>By law, they have to respond</strong>\\n (<a href=\"{{url}}\">why?</a>)."
msgstr "Primero, escribe el <strong>nombre de la institución</strong> a la que quieres pedir información. <strong>Están obligados a responder</strong> (<a href=\"{{url}}\">¿por qué?</a>)."
@@ -1012,6 +1024,9 @@ msgstr "Estoy pidiendo <strong>nueva información</strong>"
msgid "I am requesting an <strong>internal review</strong>"
msgstr "Estoy pidiendo una <strong>revisión interna</strong>"
+msgid "I am writing to request an internal review of {{public_body_name}}'s handling of my FOI request '{{info_request_title}}'."
+msgstr ""
+
msgid "I don't like these ones &mdash; give me some more!"
msgstr "Estas no me gustan &mdash; ¡dame más!"
@@ -1340,12 +1355,6 @@ msgstr ""
msgid "MailServerLog|Order"
msgstr ""
-msgid "Make a new <strong>Environmental Information</strong> request"
-msgstr "Envíe una nueva <strong>solicitud de información medioambiental</strong>"
-
-msgid "Make a new <strong>Freedom of Information</strong> request to {{public_body}}"
-msgstr "Hacer una nueva <strong>solicitud de información</strong> a {{public_body}}"
-
msgid "Make a new<br/>\\n <strong>Freedom <span>of</span><br/>\\n Information<br/>\\n request</strong>"
msgstr ""
"Envíe una nueva<br/>\n"
@@ -1355,6 +1364,9 @@ msgstr ""
msgid "Make a request"
msgstr "Enviar solicitud"
+msgid "Make a request to this authority"
+msgstr ""
+
msgid "Make an {{law_used_short}} request to '{{public_body_name}}'"
msgstr "Hacer una solicitud {{law_used_short}} a '{{public_body_name}}'"
@@ -1617,6 +1629,9 @@ msgstr ""
msgid "Please choose a file containing your photo."
msgstr "Por favor elige el fichero que contiene tu foto"
+msgid "Please choose a reason"
+msgstr ""
+
msgid "Please choose what sort of reply you are making."
msgstr "Por favor, elija el tipo de respuesta que está creando."
@@ -1703,6 +1718,9 @@ msgstr "Por favor, mantén el resumen corto, como en el asunto de un correo elec
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, pide información sólo de estas categorias, <strong>no pierdas tu tiempo </strong> o el del organismo público pidiendo información no relacionada."
+msgid "Please pass this on to the person who conducts Freedom of Information reviews."
+msgstr ""
+
msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
msgstr ""
"Por favor elije estas solicitudes una a una, y <strong>haz que se sepa</strong>\n"
@@ -1920,6 +1938,9 @@ msgstr "Denuncie abuso"
msgid "Report an offensive or unsuitable request"
msgstr ""
+msgid "Report request"
+msgstr ""
+
msgid "Report this request"
msgstr ""
@@ -2147,9 +2168,6 @@ msgstr "Lo sentimos, no hemos podido encontrar esa página"
msgid "Special note for this authority!"
msgstr "¡Notas especiales sobre este organismo!"
-msgid "Start"
-msgstr "Comenzar"
-
msgid "Start now &raquo;"
msgstr "Comience ahora &raquo;"
@@ -2659,7 +2677,7 @@ msgstr "Añadir tu comentario"
msgid "To reply to "
msgstr "Contestar a "
-msgid "To report this FOI request"
+msgid "To report this request"
msgstr ""
msgid "To send a follow up message to "
@@ -3092,6 +3110,9 @@ msgstr "Necesitas identificarte para borrar la foto de tu perfil."
msgid "You need to be logged in to edit your profile."
msgstr ""
+msgid "You need to be logged in to report a request for administrator attention"
+msgstr ""
+
msgid "You previously submitted that exact follow up message for this request."
msgstr "Ya has enviado esa misma respuesta a esta solicitud."
diff --git a/locale/he_IL/app.po b/locale/he_IL/app.po
index 98b128a89..592edfbf4 100644
--- a/locale/he_IL/app.po
+++ b/locale/he_IL/app.po
@@ -20,9 +20,9 @@ msgid ""
msgstr ""
"Project-Id-Version: alaveteli\n"
"Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n"
-"POT-Creation-Date: 2013-05-30 09:46+0100\n"
-"PO-Revision-Date: 2013-06-17 18:11+0000\n"
-"Last-Translator: rshlo <r@roishlomi.com>\n"
+"POT-Creation-Date: 2013-06-24 09:40-0700\n"
+"PO-Revision-Date: 2013-06-24 16:52+0000\n"
+"Last-Translator: louisecrow <louise@mysociety.org>\n"
"Language-Team: Hebrew (Israel) (http://www.transifex.com/projects/p/alaveteli/language/he_IL/)\n"
"Language: he_IL\n"
"MIME-Version: 1.0\n"
@@ -171,12 +171,18 @@ msgstr "<p>תודה על עדכון התמונה.</p><p><strong>ועכשיו...<
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>אנו ממליצים שתסירו את כתובת הדוא\"ל מהבקשה שלכם.\\n אם לא תסירו אותה, הכתובת תשלח לרשות, אבל לא תוצג באתר.</p>"
+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>"
+msgstr ""
+
msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p><p>If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p>"
msgstr "<p>אנו שמחים שקיבלתם את המידע שביקשתם. אם אתם כותבים על המידע או משתמשים בו, נא חזרו לדף זה והוסיפו למטה הערה על מה שעשיתם. </p><p>אם מצאתם את {{site_name}}שימושי, <a href=\"{{donation_url}}\">הרימו תרומה</a> לגוף שמפעיל אותו.</p>"
msgid "<p>We're glad you got some of the information that you wanted. If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
msgstr "<p>אנו שמחים שקיבלתם חלק מהמידע שביקשתם. אם מצאתם את {{site_name}} שימושי, <a href=\"{{donation_url}}\">הרימו תרומה</a> לגוף שמפעיל אותו.</p><p>אם אתם רוצים לנסות לקבל את שאר המידע, הנה מה שעליכם לעשות כעת.</p>"
+msgid "<p>We're glad you got some of the information that you wanted.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
+msgstr ""
+
msgid "<p>You do not need to include your email in the request in order to get a reply (<a href=\"{{url}}\">details</a>).</p>"
msgstr "<p>אין צורך לכלול את כתובת הדוא\"ל שלכם בבקשה, כדי לקבל מענה. (<a href=\"{{url}}\">details</a>).</p>"
@@ -281,6 +287,9 @@ msgstr "<strong>סיכום</strong> התגובה, אם קיבלתם אותה ב
msgid "A Freedom of Information request"
msgstr "בקשת מידע"
+msgid "A full history of my FOI request and all correspondence is available on the Internet at this address: {{url}}"
+msgstr ""
+
msgid "A new request, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, was sent to {{public_body_name}} by {{info_request_user}} on {{date}}."
msgstr "בקשה חדשה, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, נשלחה אל {{public_body_name}} על-ידי {{info_request_user}} בתאריך {{date}}."
@@ -749,6 +758,9 @@ msgstr "המרת התמונה לגודל המתאים נכשלה: ל- {{cols}}x
msgid "Filter"
msgstr "סינון"
+msgid "First, did your other requests succeed?"
+msgstr ""
+
msgid "First, type in the <strong>name of the UK public authority</strong> you'd\\n like information from. <strong>By law, they have to respond</strong>\\n (<a href=\"{{url}}\">why?</a>)."
msgstr "ראשית, הקלידו את <strong>שם הגוף הממשלתי </strong>, ממנו ברצונכם לקבל מידע.\\n <strong>לפי החלטת הממשלה, עליהם למסור תגובה</strong> (<a href=\"{{url}}\">מדוע?</a>)."
@@ -943,6 +955,9 @@ msgstr "אני מבקש <strong>מידע חדש</strong>"
msgid "I am requesting an <strong>internal review</strong>"
msgstr "אנו מבקשים <strong>בדיקה פנימית</strong>"
+msgid "I am writing to request an internal review of {{public_body_name}}'s handling of my FOI request '{{info_request_title}}'."
+msgstr ""
+
msgid "I don't like these ones &mdash; give me some more!"
msgstr "אלה לא מתאימים לנו &mdash; תנו לנו אחרים!"
@@ -1240,18 +1255,15 @@ msgstr "MailServerLog|Line"
msgid "MailServerLog|Order"
msgstr "MailServerLog|Order"
-msgid "Make a new <strong>Environmental Information</strong> request"
-msgstr "יצירת בקשת <strong>מידע סביבתי</strong> חדשה"
-
-msgid "Make a new <strong>Freedom of Information</strong> request to {{public_body}}"
-msgstr "יצירת בקשת <strong>מידע</strong> חדשה ל{{public_body}}"
-
msgid "Make a new<br/>\\n <strong>Freedom <span>of</span><br/>\\n Information<br/>\\n request</strong>"
msgstr "הגישו<br><strong>בקשה</strong><br><span>לפתיחת</span> <br><strong>מאגר מידע</strong>"
msgid "Make a request"
msgstr "בקשה חדשה"
+msgid "Make a request to this authority"
+msgstr ""
+
msgid "Make an {{law_used_short}} request to '{{public_body_name}}'"
msgstr "יצירת בקשת {{law_used_short}} ל '{{public_body_name}}'"
@@ -1510,6 +1522,9 @@ msgstr "בדקו אם כתובת האינטרנט (i.e. המופיעה כצרו
msgid "Please choose a file containing your photo."
msgstr "בחרו בקובץ התמונה שלכם"
+msgid "Please choose a reason"
+msgstr ""
+
msgid "Please choose what sort of reply you are making."
msgstr "בחרו בסוג התגובה שאתם מכינים"
@@ -1591,6 +1606,9 @@ msgstr "סכמו בקצרה, בדומה לנושא של הודעת דוא\"ל.
msgid "Please only request information that comes under those categories, <strong>do not waste your\\n time</strong> or the time of the public authority by requesting unrelated information."
msgstr "הגישו בקשות רק למידע בקטגוריות הללו. <strong>אל תבזבזו את\\n זמנכם</strong> או את זמן הרשות, בבקשות של מידע שאיננו קשור."
+msgid "Please pass this on to the person who conducts Freedom of Information reviews."
+msgstr ""
+
msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
msgstr "אנא בחר כל אחת מהבקשות הבאות, <strong>וספר לכולם</strong>\\n האם הן הצליחו כבר או עדיין לא."
@@ -1804,6 +1822,9 @@ msgstr "דיווח על שימוש לרעה"
msgid "Report an offensive or unsuitable request"
msgstr "דווחו על בקשה לא מתאימה או פוגענית"
+msgid "Report request"
+msgstr ""
+
msgid "Report this request"
msgstr "דווחו על בקשה זו"
@@ -2022,9 +2043,6 @@ msgstr "מצטערים, אנחנו לא יכולים למצוא את הדף המ
msgid "Special note for this authority!"
msgstr "הערה מיוחדת לרשות זו"
-msgid "Start"
-msgstr "התחילו"
-
msgid "Start now &raquo;"
msgstr "התחילו עכשיו &raquo;"
@@ -2484,8 +2502,8 @@ msgstr "כדי לפרסם את ההערה שלך"
msgid "To reply to "
msgstr "בתשובה אל"
-msgid "To report this FOI request"
-msgstr "לדווח על בקשת חוק חופש המידע הזו."
+msgid "To report this request"
+msgstr ""
msgid "To send a follow up message to "
msgstr "לשלוח הודעת מעקב אל"
@@ -2883,6 +2901,9 @@ msgstr "יש להתחבר כדי להסיר את תמונת הפרופיל של
msgid "You need to be logged in to edit your profile."
msgstr "דרוש חיבור למערכת על מנת לערוך את הפרופיל."
+msgid "You need to be logged in to report a request for administrator attention"
+msgstr ""
+
msgid "You previously submitted that exact follow up message for this request."
msgstr "כבר שלחתם בעבר את הודעת המעקב הזו."
diff --git a/locale/hr/app.po b/locale/hr/app.po
new file mode 100644
index 000000000..8429f0933
--- /dev/null
+++ b/locale/hr/app.po
@@ -0,0 +1,3604 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: alaveteli\n"
+"Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n"
+"POT-Creation-Date: 2013-06-24 09:40-0700\n"
+"PO-Revision-Date: 2013-06-26 15:20+0000\n"
+"Last-Translator: louisecrow <louise@mysociety.org>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/alaveteli/language/hr/)\n"
+"Language: hr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\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"
+
+msgid " This will appear on your {{site_name}} profile, to make it\\n easier for others to get involved with what you're doing."
+msgstr ""
+" Ovo će se pojaviti na vašem {{site_name}} profilu, da bi\n"
+" olakšali drugima da se uključe u to šta radite."
+
+msgid " (<strong>no ranty</strong> politics, read our <a href=\"{{url}}\">moderation policy</a>)"
+msgstr ""
+
+msgid " (<strong>patience</strong>, especially for large files, it may take a while!)"
+msgstr " (<strong>budite strpljivi</strong>, posebno za velike datoteke, moglo bi potrajati!)"
+
+msgid " (you)"
+msgstr " (Vi)"
+
+msgid " - view and make Freedom of Information requests"
+msgstr " - pregledaj i napravi Zahtjeve o slobodnom pristupu informacijama "
+
+msgid " - wall"
+msgstr ""
+
+msgid " <strong>Note:</strong>\\n We will send you an email. Follow the instructions in it to change\\n your password."
+msgstr ""
+" <strong>Note:</strong>\n"
+" Poslati ćemo vam e-mail. Pratite instrukcije u njemu da biste promijenili\n"
+" Vaš password."
+
+msgid " <strong>Privacy note:</strong> Your email address will be given to"
+msgstr " <strong>Privacy note:</strong> Vaša e-mail adresa će biti proslijeđena"
+
+msgid " <strong>Summarise</strong> the content of any information returned. "
+msgstr " <strong>Sažimati</strong> sadržaj svake vraćene informacije. "
+
+msgid " Advise on how to <strong>best clarify</strong> the request."
+msgstr " Savjetuj kako<strong>najbolje objasniti</strong> zahjev."
+
+msgid " Ideas on what <strong>other documents to request</strong> which the authority may hold. "
+msgstr " Ideje za <strong>zahtjeve drugih dokumenata</strong> koje ustanova može posjedovati. "
+
+msgid " If you know the address to use, then please <a href=\"{{url}}\">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 ""
+" Ako znate koju adresu treba koristiti, molimo Vas <a href=\"{{url}}\">pošaljite je nama</a>.\n"
+" Moguće je da možete naći adresu na njihovoj web stranici, ili putem telefona."
+
+msgid " Include relevant links, such as to a campaign page, your blog or a\\n twitter account. They will be made clickable. \\n e.g."
+msgstr ""
+" Uključite relevantne linkove, poput stranice kampanje, Vašeg bloga ili \n"
+" twitter account-a. Moći će se kliknuti na njih. \n"
+" npr."
+
+msgid " Link to the information requested, if it is <strong>already available</strong> on the Internet. "
+msgstr ""
+
+msgid " Offer better ways of <strong>wording the request</strong> to get the information. "
+msgstr ""
+
+msgid " Say how you've <strong>used the information</strong>, with links if possible."
+msgstr " Recite nam kako ste<strong>iskoristili informaciju</strong>, sa linkovima ako je moguće."
+
+msgid " Suggest <strong>where else</strong> the requester might find the information. "
+msgstr ""
+
+msgid " What are you investigating using Freedom of Information? "
+msgstr " Šta istražujete koristeći Zakon o slobodnom pristupu informacijama ? "
+
+msgid " You are already being emailed updates about the request."
+msgstr " Ažuriranja zahtjeva već su Vam poslana putem e-maila."
+
+msgid " You will also be emailed updates about the request."
+msgstr " Ažuriranja zahtjeva će Vam takođe biti poslana putem e-maila."
+
+msgid " made by "
+msgstr " načinjeno od strane "
+
+msgid " or "
+msgstr " ili "
+
+msgid " when you send this message."
+msgstr " kada pošaljete ovu poruku."
+
+msgid "\"Hello! We have an <a href=\\\"/help/alaveteli?country_name=#{CGI.escape(current_country)}\\\">important message</a> for visitors outside {{country_name}}\""
+msgstr ""
+
+msgid "'Crime statistics by ward level for Wales'"
+msgstr ""
+
+msgid "'Pollution levels over time for the River Tyne'"
+msgstr "'Nivo zagađenja kroz period vremena za rijeku Tyne'"
+
+msgid "'{{link_to_authority}}', a public authority"
+msgstr "'{{link_to_authority}}', javna ustanova"
+
+msgid "'{{link_to_request}}', a request"
+msgstr "'{{link_to_request}}', zahtjev"
+
+msgid "'{{link_to_user}}', a person"
+msgstr "'{{link_to_user}}', osoba"
+
+msgid "*unknown*"
+msgstr ""
+
+msgid ",\\n\\n\\n\\nYours,\\n\\n{{user_name}}"
+msgstr ""
+",\n"
+"\n"
+"\n"
+"\n"
+"S poštovanjem,\n"
+"\n"
+"{{user_name}}"
+
+msgid "- or -"
+msgstr "- ili -"
+
+msgid "1. Select an authority"
+msgstr "1. Odaberite ustanovu"
+
+msgid "2. Ask for Information"
+msgstr "2. Tražite informacije"
+
+msgid "3. Now check your request"
+msgstr "3. Sada provjerite Vaš zahtjev"
+
+msgid "<a href=\"{{browse_url}}\">Browse all</a> or <a href=\"{{add_url}}\">ask us to add one</a>."
+msgstr "<a href=\"{{browse_url}}\">Pretraži sve</a> ili <a href=\"{{add_url}}\"> zamolite nas da dodamo </a>."
+
+msgid "<a href=\"{{url}}\">Add an annotation</a> (to help the requester or others)"
+msgstr "<a href=\"{{url}}\">Dodaj napomenu</a> (da bi se pomoglo podnosiocu zahtjeva ili drugima)"
+
+msgid "<a href=\"{{url}}\">Sign in</a> to change password, subscriptions and more ({{user_name}} only)"
+msgstr "<a href=\"{{url}}\">Prijavite se</a> da biste promijenili password, pretplatu ili drugo ({{user_name}} only)"
+
+msgid "<p>All done! Thank you very much for your help.</p><p>There are <a href=\"{{helpus_url}}\">more things you can do</a> to help {{site_name}}.</p>"
+msgstr "<p>Završeno! Hvala Vam na pomoći.</p><p>Postoji <a href=\"{{helpus_url}}\">više stvari koje možete uradite</a> da biste pomogli {{site_name}}.</p>"
+
+msgid "<p>Thank you! Here are some ideas on what to do next:</p>\\n <ul>\\n <li>To send your request to another authority, first copy the text of your request below, then <a href=\"{{find_authority_url}}\">find the other authority</a>.</li>\\n <li>If you would like to contest the authority's claim that they do not hold the information, here is\\n <a href=\"{{complain_url}}\">how to complain</a>.\\n </li>\\n <li>We have <a href=\"{{other_means_url}}\">suggestions</a>\\n on other means to answer your question.\\n </li>\\n </ul>"
+msgstr ""
+
+msgid "<p>Thank you! Hope you don't have to wait much longer.</p> <p>By law, you should have got a response promptly, and normally before the end of <strong>{{date_response_required_by}}</strong>.</p>"
+msgstr ""
+
+msgid "<p>Thank you! Hopefully your wait isn't too long.</p> <p>By law, you should get a response promptly, and normally before the end of <strong>\\n{{date_response_required_by}}</strong>.</p>"
+msgstr ""
+
+msgid "<p>Thank you! Hopefully your wait isn't too long.</p><p>You should get a response within {{late_number_of_days}} days, or be told if it will take longer (<a href=\"{{review_url}}\">details</a>).</p>"
+msgstr "<p>Hvala! Nadamo se da nećete čekati predugo.</p><p>Trebali biste dobiti odgovor za {{late_number_of_days}} dana, ili obaviješteni da će trajati duže. (<a href=\"{{review_url}}\">Više informacija</a>)</p>"
+
+msgid "<p>Thank you! Your request is long overdue, by more than {{very_late_number_of_days}} working days. Most requests should be answered within {{late_number_of_days}} working days. You might like to complain about this, see below.</p>"
+msgstr ""
+
+msgid "<p>Thanks for changing the text about you on your profile.</p>\\n <p><strong>Next...</strong> You can upload a profile photograph too.</p>"
+msgstr ""
+
+msgid "<p>Thanks for updating your profile photo.</p>\\n <p><strong>Next...</strong> You can put some text about you and your research on your profile.</p>"
+msgstr ""
+
+msgid "<p>We recommend that you edit your request and remove the email address.\\n If you leave it, the email address will be sent to the authority, but will not be displayed on the site.</p>"
+msgstr ""
+"<p>Preporučujemo da preuredite Vaš zahtjev i da uklonite e-mail adresu.\n"
+" Ako je ostavite, e-mail adresa će biti poslana ustanovi, ali neće biti vidljiva na web stranici.</p>"
+
+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>"
+msgstr ""
+
+msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p><p>If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p>"
+msgstr "<p>Drago nam je da ste dobili sve željene informacije. Ako ih budete koristili ili pisali o njima, molimo da se vratite i dodate napomenu ispod opisujući šta ste uradili. </p><p>Ako mislite da je {{site_name}} bio koristan, <a href=\"{{donation_url}}\">donirajte</a> nevladinoj organizaciji koja ga vodi.</p>"
+
+msgid "<p>We're glad you got some of the information that you wanted. If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
+msgstr "<p>Drago nam je da ste dobili dio željenih informacija. Ako mislite da je {{site_name}} bio koristan, <a href=\"{{donation_url}}\">donirajte</a> nevladinoj organizaciji koja ga vodi.</p>"
+
+msgid "<p>We're glad you got some of the information that you wanted.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
+msgstr ""
+
+msgid "<p>You do not need to include your email in the request in order to get a reply (<a href=\"{{url}}\">details</a>).</p>"
+msgstr "<p>Nije potrebno da uključite Vašu e-mail adresu u zahtjev da biste dobili odgovor (<a href=\"{{url}}\">Više informacija</a>).</p>"
+
+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=\"{{url}}\">details</a>).</p>"
+msgstr "<p>Nije potrebno da uključite Vašu e-mail adresu u zahtjev da biste dobili odgovor, pitati ćemo vas u vezi toga u slijedećem koraku (<a href=\"{{url}}\">Više informacija</a>).</p>"
+
+msgid "<p>Your request contains a <strong>postcode</strong>. Unless it directly relates to the subject of your request, please remove any address as it will <strong>appear publicly on the Internet</strong>.</p>"
+msgstr ""
+
+msgid "<p>Your {{law_used_full}} request has been <strong>sent on its way</strong>!</p>\\n <p><strong>We will email you</strong> when there is a response, or after {{late_number_of_days}} working days if the authority still hasn't\\n replied by then.</p>\\n <p>If you write about this request (for example in a forum or a blog) please link to this page, and add an\\n annotation below telling people about your writing.</p>"
+msgstr ""
+
+msgid "<p>{{site_name}} is currently in maintenance. You can only view existing requests. You cannot make new ones, add followups or annotations, or otherwise change the database.</p> <p>{{read_only}}</p>"
+msgstr "<p>{{site_name}} je trenutno na održavanju. Možete samo pregledati postojeće zahtjeve. Ne možete odnositi nove, dodavati prateće poruke ili napomene, ili u suprotnom promijenite bazu podataka.</p> <p>{{read_only}}</p>"
+
+msgid "<small>If you use web-based email or have \"junk mail\" filters, also check your\\nbulk/spam mail folders. Sometimes, our messages are marked that way.</small>\\n</p>"
+msgstr ""
+"<small>Ako koristite neke od web mail servisa ili imate filtere za \"junk mail\", provjerite u Vašim bulk/spam folderima. Ponekad su naše poruke označene tako</small>\n"
+"</p>"
+
+msgid "<strong> Can I request information about myself?</strong>\\n\t\t\t<a href=\"{{url}}\">No! (Click here for details)</a>"
+msgstr ""
+"<strong> Da li mogu zahtijevati informacije o sebi?</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=\"{{url}}\">Ne! (Kliknite za detalje)</a>"
+
+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>komentar_od:tony_bowden</code></strong> da pretražujete komentare Tony Bowden-a, ime unesite kao u URL-u."
+
+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> da nađete sve odgovore sa PDF prilozima. Ili probajte ove: <code>{{list_of_file_extensions}}</code>"
+
+msgid "<strong><code>request:</code></strong> to restrict to a specific request, typing the title as in the URL."
+msgstr "<strong><code>zahtjev:</code></strong> da biste se ograničili na neki određeni zahtjev, ukucati naslov kao u URL-u"
+
+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>podnesen_od strane:julian_todd</code></strong> da biste pretražili zahtjeve koje je podnio Julian Todd, ukucati ime kao u URL-u."
+
+msgid "<strong><code>requested_from:home_office</code></strong> to search requests from the Home Office, typing the name as in the URL."
+msgstr ""
+
+msgid "<strong><code>status:</code></strong> to select based on the status or historical status of the request, see the <a href=\"{{statuses_url}}\">table of statuses</a> below."
+msgstr "<strong><code>status:</code></strong> da biste birali zasnovano na statusu ili historiji statusa zahtjeva, pogledajte <a href=\"{{statuses_url}}\">tabelu statusa</a> below."
+
+msgid "<strong><code>tag:charity</code></strong> to find all public authorities or requests with a given tag. You can include multiple tags, \\n and tag values, e.g. <code>tag:openlylocal AND tag:financial_transaction:335633</code>. Note that by default any of the tags\\n can be present, you have to put <code>AND</code> explicitly if you only want results them all present."
+msgstr ""
+
+msgid "<strong><code>variety:</code></strong> to select type of thing to search for, see the <a href=\"{{varieties_url}}\">table of varieties</a> below."
+msgstr ""
+
+msgid "<strong>Advice</strong> on how to get a response that will satisfy the requester. </li>"
+msgstr "<strong>Savjet</strong> o tome kako dobiti odgovor koji će zadovoljiti podnosioca zahtjeva. </li>"
+
+msgid "<strong>All the information</strong> has been sent"
+msgstr "<strong>Sve informacije</strong> su poslane"
+
+msgid "<strong>Anything else</strong>, such as clarifying, prompting, thanking"
+msgstr "<strong>Nešto drugo</strong>, poput objašnjenja, napomena, zahvalnica"
+
+msgid "<strong>Caveat emptor!</strong> To use this data in an honourable way, you will need \\na good internal knowledge of user behaviour on {{site_name}}. How, \\nwhy and by whom requests are categorised is not straightforward, and there will\\nbe user error and ambiguity. You will also need to understand FOI law, and the\\nway authorities use it. Plus you'll need to be an elite statistician. Please\\n<a href=\"{{contact_path}}\">contact us</a> with questions."
+msgstr ""
+
+msgid "<strong>Clarification</strong> has been requested"
+msgstr "<strong>Objašnjenje</strong> je zatraženo"
+
+msgid "<strong>No response</strong> has been received\\n <small>(maybe there's just an acknowledgement)</small>"
+msgstr ""
+"<strong>Nema odgovora</strong> je primljeno\n"
+" <small>(možda postoji samo potvrda)</small>"
+
+msgid "<strong>Note:</strong> Because we're testing, requests are being sent to {{email}} rather than to the actual authority."
+msgstr ""
+
+msgid "<strong>Note:</strong> You're sending a message to yourself, presumably\\n to try out how it works."
+msgstr ""
+
+msgid "<strong>Note:</strong>\\n We will send an email to your new email address. Follow the\\n instructions in it to confirm changing your email."
+msgstr ""
+"<strong>Napomena:</strong>\n"
+" Poslati ćemo e-mail na Vašu novu adresu. Pratite\n"
+" upute u njemu da bi potvrdili promjenu vašeg e-maila."
+
+msgid "<strong>Privacy note:</strong> If you want to request private information about\\n yourself then <a href=\"{{url}}\">click here</a>."
+msgstr ""
+"<strong>Napomena o privatnosti:</strong> Ako želite da zahtijevate privatne informacije o\n"
+" Vama onda <a href=\"{{url}}\">kliknite ovdje</a>."
+
+msgid "<strong>Privacy note:</strong> Your photo will be shown in public on the Internet,\\n wherever you do something on {{site_name}}."
+msgstr ""
+
+msgid "<strong>Privacy warning:</strong> Your message, and any response\\n to it, will be displayed publicly on this website."
+msgstr ""
+"<strong>Upozorenje o privatnosti:</strong> Vaša poruka i bilo koji odgovor\n"
+" na nju, će biti javno prikazan na ovoj stranici."
+
+msgid "<strong>Some of the information</strong> has been sent "
+msgstr "<strong>Dio informacija</strong> je poslan "
+
+msgid "<strong>Thank</strong> the public authority or "
+msgstr ""
+
+msgid "<strong>did not have</strong> the information requested."
+msgstr "<strong>nije sadržavao</strong> traženu informaciju."
+
+msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}."
+msgstr ""
+
+msgid "A <a href=\"{{request_url}}\">response</a> to <em>{{request_title}}</em> was sent by {{public_body_name}} to {{info_request_user}} on {{date}}. The request status is: {{request_status}}"
+msgstr ""
+
+msgid "A <strong>summary</strong> of the response if you have received it by post. "
+msgstr " <strong>Sažetak</strong> odgovora ako ste ga primili poštom. "
+
+msgid "A Freedom of Information request"
+msgstr ""
+
+msgid "A full history of my FOI request and all correspondence is available on the Internet at this address: {{url}}"
+msgstr ""
+
+msgid "A new request, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, was sent to {{public_body_name}} by {{info_request_user}} on {{date}}."
+msgstr ""
+
+msgid "A public authority"
+msgstr "Javna ustanova"
+
+msgid "A response will be sent <strong>by post</strong>"
+msgstr "Odgovor će biti poslan <strong>poštom</strong>"
+
+msgid "A strange reponse, required attention by the {{site_name}} team"
+msgstr "Neobičan odgovor, potreban pregled od strane {{site_name}} tima"
+
+msgid "A vexatious request"
+msgstr ""
+
+msgid "A {{site_name}} user"
+msgstr "Korisnik stranice {{site_name}}"
+
+msgid "About you:"
+msgstr "O Vama:"
+
+msgid "Act on what you've learnt"
+msgstr "Radite na osnovu onoga što ste naučili"
+
+msgid "Acts as xapian/acts as xapian job"
+msgstr ""
+
+msgid "ActsAsXapian::ActsAsXapianJob|Action"
+msgstr ""
+
+msgid "ActsAsXapian::ActsAsXapianJob|Model"
+msgstr ""
+
+msgid "Add an annotation"
+msgstr "Dodati napomenu"
+
+msgid "Add an annotation to your request with choice quotes, or\\n a <strong>summary of the response</strong>."
+msgstr ""
+"Dodajte napomenu Vašem zahtjevu sa izabranim navodima, ili\n"
+" <strong>sažetak odgovora</strong>."
+
+msgid "Added on {{date}}"
+msgstr "Dodato na datum {{date}}"
+
+msgid "Admin level is not included in list"
+msgstr "Nivo administratora nije uključen u listu"
+
+msgid "Administration URL:"
+msgstr "URL administracije:"
+
+msgid "Advanced search"
+msgstr "Napredna pretraga"
+
+msgid "Advanced search tips"
+msgstr "Savjeti za naprednu pretragu"
+
+msgid "Advise on whether the <strong>refusal is legal</strong>, and how to complain about it if not."
+msgstr "Savjet o tome da li je <strong>odbijanje legalno</strong>, i o tome kako se žaliti ako nije."
+
+msgid "Air, water, soil, land, flora and fauna (including how these effect\\n human beings)"
+msgstr ""
+"Zrak, voda, tlo, kopno, flora i fauna (uključujući kako ovi utiču na\n"
+" ljudska bića)"
+
+msgid "All of the information requested has been received"
+msgstr "Sve tražene informacije su primljene"
+
+msgid "All the options below can use <strong>status</strong> or <strong>latest_status</strong> before the colon. For example, <strong>status:not_held</strong> will match requests which have <em>ever</em> been marked as not held; <strong>latest_status:not_held</strong> will match only requests that are <em>currently</em> marked as not held."
+msgstr ""
+
+msgid "All the options below can use <strong>variety</strong> or <strong>latest_variety</strong> before the colon. For example, <strong>variety:sent</strong> will match requests which have <em>ever</em> been sent; <strong>latest_variety:sent</strong> will match only requests that are <em>currently</em> marked as sent."
+msgstr ""
+
+msgid "Also called {{other_name}}."
+msgstr "Drugim imenom {{other_name}}."
+
+msgid "Also send me alerts by email"
+msgstr ""
+
+msgid "Alter your subscription"
+msgstr "Promjenite Vašu pretplatu"
+
+msgid "Although all responses are automatically published, we depend on\\nyou, the original requester, to evaluate them."
+msgstr ""
+"Iako su svi odgovori automatski objavljeni, računamo na\n"
+"vas, izvornog podnosioca zahtjeva, da ih ocijenite."
+
+msgid "An <a href=\"{{request_url}}\">annotation</a> to <em>{{request_title}}</em> was made by {{event_comment_user}} on {{date}}"
+msgstr ""
+
+msgid "An <strong>error message</strong> has been received"
+msgstr "<strong>poruka o pogrešci</strong> je primljena"
+
+msgid "An Environmental Information Regulations request"
+msgstr ""
+
+msgid "An anonymous user"
+msgstr ""
+
+msgid "Annotation added to request"
+msgstr "Napomena dodata na zahtjev"
+
+msgid "Annotations"
+msgstr "Napomene"
+
+msgid "Annotations are so anyone, including you, can help the requester with their request. For example:"
+msgstr "Napomene služe da bilo ko, uključujući Vas, može pomoći podnosioca zahtjeva sa njegovim zahtjevom. Na primjer:"
+
+msgid "Annotations will be posted publicly here, and are\\n <strong>not</strong> sent to {{public_body_name}}."
+msgstr ""
+"Napomene će biti postane javno ovdje, i \n"
+" <strong>naće</strong> biti poslane za {{public_body_name}}."
+
+msgid "Anonymous user"
+msgstr ""
+
+msgid "Anyone:"
+msgstr "Bilo ko:"
+
+msgid "Applies to"
+msgstr ""
+
+msgid "Are we missing a public authority?"
+msgstr ""
+
+msgid "Are you the owner of any commercial copyright on this page?"
+msgstr ""
+
+msgid "Ask for <strong>specific</strong> documents or information, this site is not suitable for general enquiries."
+msgstr "Tražite <strong>konkretne</strong> dokumente ili informacije, ova stranica nije pogodna za opće pretrage."
+
+msgid "At the bottom of this page, write a reply to them trying to persuade them to scan it in\\n (<a href=\"{{url}}\">more details</a>)."
+msgstr ""
+"Na dnu ove stranice, napišite im odgovor pokušavajući da ih ubjedite da ga pregledaju\n"
+" (<a href=\"{{url}}\">Više informacija</a>)."
+
+msgid "Attachment (optional):"
+msgstr "Prilog (neobavezno):"
+
+msgid "Attachment:"
+msgstr "Prilog"
+
+msgid "Awaiting classification."
+msgstr "Čeka klasifikaciju."
+
+msgid "Awaiting internal review."
+msgstr "Čeka urgenciju"
+
+msgid "Awaiting response."
+msgstr "Čeka odgovor."
+
+msgid "Beginning with"
+msgstr "Počevši sa"
+
+msgid "Browse <a href='{{url}}'>other requests</a> for examples of how to word your request."
+msgstr "Pretražite <a href='{{url}}'>druge zahtjeve</a> radi primjera kako da sročite Vaš zahtjev."
+
+msgid "Browse <a href='{{url}}'>other requests</a> to '{{public_body_name}}' for examples of how to word your request."
+msgstr "Pretražite <a href='{{url}}'>druge zahtjeve</a> za '{{public_body_name}}' radi primjera kako da sročite Vaš zahtjev."
+
+msgid "Browse all authorities..."
+msgstr "Pretražite sve ustanove"
+
+msgid "By law, under all circumstances, {{public_body_link}} should have responded by now"
+msgstr "Po zakonu, pod svim uvjetima, {{public_body_link}} je trebala odgovoriti do sada"
+
+msgid "By law, {{public_body_link}} should normally have responded <strong>promptly</strong> and"
+msgstr "Po zakonu, {{public_body_link}} je trebala odgovoriti <strong>brzo</strong> i"
+
+msgid "Calculated home page"
+msgstr ""
+
+msgid "Can't find the one you want?"
+msgstr "Ne možete naći onaj koji želite?"
+
+msgid "Cancel a {{site_name}} alert"
+msgstr "Poništi {{site_name}} upozorenje"
+
+msgid "Cancel some {{site_name}} alerts"
+msgstr "Poništi neka {{site_name}} upozorenja"
+
+msgid "Cancel, return to your profile page"
+msgstr ""
+
+msgid "Censor rule"
+msgstr ""
+
+msgid "CensorRule|Last edit comment"
+msgstr ""
+
+msgid "CensorRule|Last edit editor"
+msgstr ""
+
+msgid "CensorRule|Regexp"
+msgstr ""
+
+msgid "CensorRule|Replacement"
+msgstr "Pravilo Cenzure|Zamjena"
+
+msgid "CensorRule|Text"
+msgstr "Pravilo Cenzure|Tekst"
+
+msgid "Change email on {{site_name}}"
+msgstr "Promijeniti e-mail na {{site_name}}"
+
+msgid "Change password on {{site_name}}"
+msgstr "Promijeniti password na {{site_name}}"
+
+msgid "Change profile photo"
+msgstr "Promijeniti sliku na profilu"
+
+msgid "Change the text about you on your profile at {{site_name}}"
+msgstr "Promijenite tekst o Vama na Vašem profilu na {{site_name}}"
+
+msgid "Change your email"
+msgstr "Promijeniti Vaš e-mail"
+
+msgid "Change your email address used on {{site_name}}"
+msgstr "Promijenite Vašu e-mail adresu korištenu na {{site_name}}"
+
+msgid "Change your password"
+msgstr "Promijeniti Vaš password"
+
+msgid "Change your password on {{site_name}}"
+msgstr "Promijeniti password na {{site_name}}"
+
+msgid "Change your password {{site_name}}"
+msgstr "Promjenite Vaš password {{site_name}}"
+
+msgid "Charity registration"
+msgstr "Registracija nevladine organizacije"
+
+msgid "Check for mistakes if you typed or copied the address."
+msgstr "Provjerite ima li grešaka ako ste ukucali ili kopirali adresu."
+
+msgid "Check you haven't included any <strong>personal information</strong>."
+msgstr "Provjerite da niste uključili nikakve <strong>lične podatke</strong>."
+
+msgid "Choose your profile photo"
+msgstr "Odaberite sliku na Vašem profilu"
+
+msgid "Clarification"
+msgstr "Objašnjenje"
+
+msgid "Clarify your FOI request - "
+msgstr ""
+
+msgid "Classify an FOI response from "
+msgstr "Klasificirajte odgovor na Zahtjev za slobodan pristup informacijama od"
+
+msgid "Clear photo"
+msgstr ""
+
+msgid "Click on the link below to send a message to {{public_body_name}} telling them to reply to your request. You might like to ask for an internal\\nreview, asking them to find out why response to the request has been so slow."
+msgstr ""
+"Kliknite na link ispod da biste poslali poruku za {{public_body_name}} u kojoj ih napomenite da odgovore. Možda želite tražiti internal\n"
+"review, tražeći da saznaju zašto odgovor na zahtjev kasni."
+
+msgid "Click on the link below to send a message to {{public_body}} reminding them to reply to your request."
+msgstr "Kliknite na link ispod da biste poslali poruku {{public_body}} koja će ih podsjetiti da odgovore na Vaš zahtjev."
+
+msgid "Close"
+msgstr ""
+
+msgid "Comment"
+msgstr ""
+
+msgid "Comment|Body"
+msgstr "Komentar|Tijelo"
+
+msgid "Comment|Comment type"
+msgstr "Komentar|Tip komentara"
+
+msgid "Comment|Locale"
+msgstr "Komentar|Mjesto"
+
+msgid "Comment|Visible"
+msgstr "Komentar|Vidljiv"
+
+msgid "Confirm you want to follow all successful FOI requests"
+msgstr ""
+
+msgid "Confirm you want to follow new requests"
+msgstr ""
+
+msgid "Confirm you want to follow new requests or responses matching your search"
+msgstr ""
+
+msgid "Confirm you want to follow requests by '{{user_name}}'"
+msgstr ""
+
+msgid "Confirm you want to follow requests to '{{public_body_name}}'"
+msgstr ""
+
+msgid "Confirm you want to follow the request '{{request_title}}'"
+msgstr ""
+
+msgid "Confirm your FOI request to "
+msgstr "Potvrdite Vaš Zahtjev za slobodan pristup informacijama za"
+
+msgid "Confirm your account on {{site_name}}"
+msgstr "Potvrdite Vaš račun na {{site_name}}"
+
+msgid "Confirm your annotation to {{info_request_title}}"
+msgstr "Potvrdite Vašu napomenu za {{info_request_title}}"
+
+msgid "Confirm your email address"
+msgstr "Potvrdite Vašu e-mail adresu"
+
+msgid "Confirm your new email address on {{site_name}}"
+msgstr "Potvrdite Vašu novu e-mail adresu na {{site_name}}"
+
+msgid "Considered by administrators as not an FOI request and hidden from site."
+msgstr ""
+
+msgid "Considered by administrators as vexatious and hidden from site."
+msgstr ""
+
+msgid "Contact {{recipient}}"
+msgstr ""
+
+msgid "Contact {{site_name}}"
+msgstr "Kontakt {{site_name}}"
+
+msgid "Could not identify the request from the email address"
+msgstr "Nismo mogli prepoznati zahtjev sa e-mail adrese"
+
+msgid "Couldn't understand the image file that you uploaded. PNG, JPEG, GIF and many other common image file formats are supported."
+msgstr "Pogrešan format datoteke. Molimo Vas uploadirajte: PNG, JPEG, GIF, ili neke druge podržive formate."
+
+msgid "Crop your profile photo"
+msgstr "Smanjite sliku na Vašem profilu"
+
+msgid "Cultural sites and built structures (as they may be affected by the\\n environmental factors listed above)"
+msgstr ""
+
+msgid "Currently <strong>waiting for a response</strong> from {{public_body_link}}, they must respond promptly and"
+msgstr "Trenutno <strong>čeka odgovor</strong> od {{public_body_link}}, moraju odgovoriti brzo i"
+
+msgid "Date:"
+msgstr "Datum:"
+
+msgid "Dear {{name}},"
+msgstr ""
+
+msgid "Dear {{public_body_name}},"
+msgstr "Poštovani {{public_body_name}},"
+
+msgid "Default locale"
+msgstr ""
+
+msgid "Delayed response to your FOI request - "
+msgstr "Odgođen odgovor na Vaš Zahtjev o slobodnom pristupu informacijama - "
+
+msgid "Delayed."
+msgstr "Odgođen"
+
+msgid "Delivery error"
+msgstr "Greška u isporuci"
+
+msgid "Destroy {{name}}"
+msgstr ""
+
+msgid "Details of request '"
+msgstr "Detalji zahtjeva '"
+
+msgid "Did you mean: {{correction}}"
+msgstr "Da li ste mislili: {{correction}}"
+
+msgid "Disclaimer: This message and any reply that you make will be published on the internet. Our privacy and copyright policies:"
+msgstr ""
+
+msgid "Disclosure log"
+msgstr ""
+
+msgid "Disclosure log URL"
+msgstr ""
+
+msgid "Don't want to address your message to {{person_or_body}}? You can also write to:"
+msgstr ""
+
+msgid "Done"
+msgstr "Završeno"
+
+msgid "Done &gt;&gt;"
+msgstr ""
+
+msgid "Download a zip file of all correspondence"
+msgstr "Preuzmite svu korespondenciju u zip fajlu"
+
+msgid "Download original attachment"
+msgstr "Preuzeti originalni prilog"
+
+msgid "EIR"
+msgstr ""
+
+msgid "Edit"
+msgstr ""
+
+msgid "Edit and add <strong>more details</strong> to the message above,\\n explaining why you are dissatisfied with their response."
+msgstr ""
+"Uredite i dodajte <strong>više detalja</strong> na poruku iznad,\n"
+" objašnjavajući zašto niste zadovoljni njihovim odgovorom."
+
+msgid "Edit text about you"
+msgstr "Uredite tekst o Vama"
+
+msgid "Edit this request"
+msgstr "Uredi ovaj zahtjev"
+
+msgid "Either the email or password was not recognised, please try again."
+msgstr "E-mail ili password nisu prepoznati, molimo pokušajte ponovo."
+
+msgid "Either the email or password was not recognised, please try again. Or create a new account using the form on the right."
+msgstr "E-mail ili password nisu prepoznati, molimo pokušajte ponovo. Ili kreirajte novi račun koristeći formular desno."
+
+msgid "Email doesn't look like a valid address"
+msgstr "E-mail ne izgleda kao validna adresa"
+
+msgid "Email me future updates to this request"
+msgstr "Buduća ažuriranja šaljite na moj e-mail"
+
+msgid "Enter words that you want to find separated by spaces, e.g. <strong>climbing lane</strong>"
+msgstr "Sa razmacima unesite riječi koje želite naći, npr. <strong>climbing lane</strong>"
+
+msgid "Enter your response below. You may attach one file (use email, or\\n <a href=\"{{url}}\">contact us</a> if you need more)."
+msgstr ""
+
+msgid "Environmental Information Regulations"
+msgstr ""
+
+msgid "Environmental Information Regulations requests made"
+msgstr ""
+
+msgid "Environmental Information Regulations requests made using this site"
+msgstr ""
+
+msgid "Event history"
+msgstr "Prikaz prošlih događanja"
+
+msgid "Event history details"
+msgstr "Detalji prikaza prošlih događanja"
+
+msgid "Event {{id}}"
+msgstr ""
+
+msgid "Everything that you enter on this page, including <strong>your name</strong>,\\n will be <strong>displayed publicly</strong> on\\n this website forever (<a href=\"{{url}}\">why?</a>)."
+msgstr ""
+"Sve što unesete na ovu stranicu, uključujući <strong>Vaše ime</strong>, \n"
+" će biti <strong>javno prikazano</strong> na\n"
+" ovoj web stranici zauvjek (<a href=\"{{url}}\">Više informacija</a>)."
+
+msgid "Everything that you enter on this page\\n will be <strong>displayed publicly</strong> on\\n this website forever (<a href=\"{{url}}\">why?</a>)."
+msgstr ""
+"Sve što unesete na ovu stranicu \n"
+" će biti <strong>javno prikazano</strong> na\n"
+" ovoj web stranici trajno. (<a href=\"{{url}}\">Više informacija</a>)."
+
+msgid "FOI"
+msgstr ""
+
+msgid "FOI email address for {{public_body}}"
+msgstr "ZOSPI e-mail adresa za {{public_body}}"
+
+msgid "FOI request – {{title}}"
+msgstr ""
+
+msgid "FOI requests"
+msgstr "Zahtjevi za slobodan pristup informacijama"
+
+msgid "FOI requests by '{{user_name}}'"
+msgstr "Zahtjevi za slobodan pristup informacijama od strane '{{user_name}}'"
+
+msgid "FOI requests {{start_count}} to {{end_count}} of {{total_count}}"
+msgstr ""
+
+msgid "FOI response requires admin ({{reason}}) - {{title}}"
+msgstr ""
+
+msgid "Failed to convert image to a PNG"
+msgstr "Nismo uspjeli konvertovati sliku u PNG format"
+
+msgid "Failed to convert image to the correct size: at {{cols}}x{{rows}}, need {{width}}x{{height}}"
+msgstr "Nismo uspjeli konvertovati sliku u odgovarajuću veličinu: {{cols}}x{{rows}}, potrebno {{width}}x{{height}}"
+
+msgid "Filter"
+msgstr "Filtriraj"
+
+msgid "First, did your other requests succeed?"
+msgstr ""
+
+msgid "First, type in the <strong>name of the UK public authority</strong> you'd\\n like information from. <strong>By law, they have to respond</strong>\\n (<a href=\"{{url}}\">why?</a>)."
+msgstr ""
+
+msgid "Foi attachment"
+msgstr ""
+
+msgid "FoiAttachment|Charset"
+msgstr ""
+
+msgid "FoiAttachment|Content type"
+msgstr ""
+
+msgid "FoiAttachment|Display size"
+msgstr ""
+
+msgid "FoiAttachment|Filename"
+msgstr ""
+
+msgid "FoiAttachment|Hexdigest"
+msgstr ""
+
+msgid "FoiAttachment|Url part number"
+msgstr ""
+
+msgid "FoiAttachment|Within rfc822 subject"
+msgstr ""
+
+msgid "Follow"
+msgstr ""
+
+msgid "Follow all new requests"
+msgstr ""
+
+msgid "Follow new successful responses"
+msgstr ""
+
+msgid "Follow requests to {{public_body_name}}"
+msgstr ""
+
+msgid "Follow these requests"
+msgstr "Prati ove zahtjeve"
+
+msgid "Follow things matching this search"
+msgstr ""
+
+msgid "Follow this authority"
+msgstr "Prati ovu ustanovu"
+
+msgid "Follow this link to see the request:"
+msgstr "Pratite ovaj link da biste vidjeli zahtjev:"
+
+msgid "Follow this person"
+msgstr ""
+
+msgid "Follow this request"
+msgstr "Prati ovaj zahtjev"
+
+msgid "Follow up"
+msgstr ""
+
+msgid "Follow up message sent by requester"
+msgstr "Prateća poruka poslana od strane podnosioca zahtjeva"
+
+msgid "Follow up messages to existing requests are sent to "
+msgstr ""
+
+msgid "Follow ups and new responses to this request have been stopped to prevent spam. Please <a href=\"{{url}}\">contact us</a> if you are {{user_link}} and need to send a follow up."
+msgstr ""
+
+msgid "Follow us on twitter"
+msgstr "Pratite nas na twitter-u"
+
+msgid "Followups cannot be sent for this request, as it was made externally, and published here by {{public_body_name}} on the requester's behalf."
+msgstr ""
+
+msgid "For an unknown reason, it is not possible to make a request to this authority."
+msgstr "Iz nepoznatog razloga, nije moguće podnijeti zahtjev ovoj ustanovi."
+
+msgid "Forgotten your password?"
+msgstr "Zaboravili ste Vaš password?"
+
+msgid "Found {{count}} public authority {{description}}"
+msgid_plural "Found {{count}} public authorities {{description}}"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+msgid "Freedom of Information"
+msgstr ""
+
+msgid "Freedom of Information Act"
+msgstr ""
+
+msgid "Freedom of Information law does not apply to this authority, so you cannot make\\n a request to it."
+msgstr ""
+
+msgid "Freedom of Information law no longer applies to"
+msgstr "Zakon o slobodnom pristupu informacijama više se ne primjenjuje na"
+
+msgid "Freedom of Information law no longer applies to this authority.Follow up messages to existing requests are sent to "
+msgstr ""
+
+msgid "Freedom of Information requests made"
+msgstr "Zahtjevi za slobodan pristup informacijama podneseni"
+
+msgid "Freedom of Information requests made by this person"
+msgstr "Zahtjevi za slobodan pristup informacijama podnešeni od strane ove osobe"
+
+msgid "Freedom of Information requests made by you"
+msgstr "Zahtjevi za slobodan pristup informacijama podnešeni od strane Vas."
+
+msgid "Freedom of Information requests made using this site"
+msgstr "Zahtjevi za slobodan pristup informacijama podneseni na ovoj stranici"
+
+msgid "Freedom of information requests to"
+msgstr ""
+
+msgid "From"
+msgstr ""
+
+msgid "From the request page, try replying to a particular message, rather than sending\\n a general followup. If you need to make a general followup, and know\\n an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
+msgstr ""
+
+msgid "From:"
+msgstr "Od strane:"
+
+msgid "GIVE DETAILS ABOUT YOUR COMPLAINT HERE"
+msgstr "OVDJE IZNESITE DETALJE VAŠE ŽALBE"
+
+msgid "Handled by post."
+msgstr "Riješen poštom."
+
+msgid "Has tag string/has tag string tag"
+msgstr ""
+
+msgid "HasTagString::HasTagStringTag|Model"
+msgstr ""
+
+msgid "HasTagString::HasTagStringTag|Name"
+msgstr ""
+
+msgid "HasTagString::HasTagStringTag|Value"
+msgstr ""
+
+msgid "Hello! You can make Freedom of Information requests within {{country_name}} at {{link_to_website}}"
+msgstr "Dobrodošli! Možete podnositi Zahtjeve za slobodan pristup informacijama u {{country_name}} na ovom linku: {{link_to_website}}"
+
+msgid "Hello, {{username}}!"
+msgstr "Dobrodošli, {{username}}!"
+
+msgid "Help"
+msgstr "Pomoć"
+
+msgid "Here <strong>described</strong> means when a user selected a status for the request, and\\nthe most recent event had its status updated to that value. <strong>calculated</strong> is then inferred by\\n{{site_name}} for intermediate events, which weren't given an explicit\\ndescription by a user. See the <a href=\"{{search_path}}\">search tips</a> for description of the states."
+msgstr ""
+
+msgid "Here is the message you wrote, in case you would like to copy the text and save it for later."
+msgstr ""
+
+msgid "Hi! We need your help. The person who made the following request\\n hasn't told us whether or not it was successful. Would you mind taking\\n a moment to read it and help us keep the place tidy for everyone?\\n Thanks."
+msgstr ""
+"Pozdrav, trebamo Vašu pomoć. Osoba koja je podnijela slijedeći zahtjev\n"
+" nam nije rekla da li je bio uspješan ili ne. Da li biste mogli odvojiti\n"
+" malo vremena da ga pročitate i da nam pomognete da održimo ovo mjesto urednim za sviju?\n"
+" Hvala."
+
+msgid "Hide request"
+msgstr ""
+
+msgid "Holiday"
+msgstr ""
+
+msgid "Holiday|Day"
+msgstr "Praznik|Dan"
+
+msgid "Holiday|Description"
+msgstr "Praznik|Opis"
+
+msgid "Home"
+msgstr "Naslovna"
+
+msgid "Home page"
+msgstr ""
+
+msgid "Home page of authority"
+msgstr "Početna stranica ustanove"
+
+msgid "However, you have the right to request environmental\\n information under a different law"
+msgstr ""
+"Ipak, imate pravo da tražite informacije o okolišu\n"
+" pozivajući se na drugi zakon"
+
+msgid "Human health and safety"
+msgstr ""
+
+msgid "I am asking for <strong>new information</strong>"
+msgstr "Molim za <strong>nove informacije</strong>"
+
+msgid "I am requesting an <strong>internal review</strong>"
+msgstr ""
+
+msgid "I am writing to request an internal review of {{public_body_name}}'s handling of my FOI request '{{info_request_title}}'."
+msgstr ""
+
+msgid "I don't like these ones &mdash; give me some more!"
+msgstr "Ne sviđaju mi se ove &mdash; dajte mi više!"
+
+msgid "I don't want to do any more tidying now!"
+msgstr "Ne želim da uređujem više u ovom momentu!"
+
+msgid "I like this request"
+msgstr ""
+
+msgid "I would like to <strong>withdraw this request</strong>"
+msgstr "Želio/la bih da <strong>povučem ovaj zahtjev</strong>"
+
+msgid "I'm still <strong>waiting</strong> for my information\\n <small>(maybe you got an acknowledgement)</small>"
+msgstr ""
+"Još uvjek <strong>čekam</strong> na svoje informacije\n"
+" <small>(možda ste dobili potvrdu)</small>"
+
+msgid "I'm still <strong>waiting</strong> for the internal review"
+msgstr "Još uvijek <strong>čekam</strong> na urgenciju"
+
+msgid "I'm waiting for an <strong>internal review</strong> response"
+msgstr "Čekam na <strong>urgenciju</strong>"
+
+msgid "I've been asked to <strong>clarify</strong> my request"
+msgstr "Zamoljen/a sam da <strong>objasnim</strong> moj zahtjev"
+
+msgid "I've received <strong>all the information"
+msgstr "Dobio/la sam <strong>sve informacije"
+
+msgid "I've received <strong>some of the information</strong>"
+msgstr "Dobio/la sam <strong>dio informacija</strong>"
+
+msgid "I've received an <strong>error message</strong>"
+msgstr "Dobio/la sam <strong>poruku o pogrešci</strong>"
+
+msgid "I've received an error message"
+msgstr ""
+
+msgid "Id"
+msgstr ""
+
+msgid "If the address is wrong, or you know a better address, please <a href=\"{{url}}\">contact us</a>."
+msgstr "Ako je adresa pogrešna, ili znate bolju adresu, molimo Vas <a href=\"{{url}}\">da nas kontaktirate</a>."
+
+msgid "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."
+msgstr ""
+
+msgid "If this is incorrect, or you would like to send a late response to the request\\nor an email on another subject to {{user}}, then please\\nemail {{contact_email}} for help."
+msgstr ""
+"Ako je ovo pogrešno, ili biste da pošaljete novi odgovor na zahtjev\n"
+"ili e mail o nečemu drugome {{user}}, onda molimo\n"
+"pošaljite nam e-mail {{contact_email}} za pomoć."
+
+msgid "If you are dissatisfied by the response you got from\\n the public authority, you have the right to\\n complain (<a href=\"{{url}}\">details</a>)."
+msgstr ""
+"Ako niste zadovoljni odgovorom koji ste dobili od\n"
+" javne ustanove, imate pravo na\n"
+" žalbu (<a href=\"{{url}}\">Više informacija</a>)."
+
+msgid "If you are still having trouble, please <a href=\"{{url}}\">contact us</a>."
+msgstr "Ako i dalje imate problema, molimo <a href=\"{{url}}\">kontaktirajte nas</a>."
+
+msgid "If you are the requester, then you may <a href=\"{{url}}\">sign in</a> to view the request."
+msgstr "Ako ste podnosioc zahtjeva, možete se <a href=\"{{url}}\">prijaviti</a> da biste pogledali zahtjev."
+
+msgid "If you are thinking of using a pseudonym,\\n please <a href=\"{{url}}\">read this first</a>."
+msgstr ""
+"Ako razmišljate o korištenju pseudonima,\n"
+" molimo da<a href=\"{{url}}\">pročitajte prvo ovo</a>."
+
+msgid "If you are {{user_link}}, please"
+msgstr "Ako ste {{user_link}}, molimo"
+
+msgid "If you believe this request is not suitable, you can report it for attention by the site administrators"
+msgstr ""
+
+msgid "If you can't click on it in the email, you'll have to <strong>select and copy\\nit</strong> from the email. Then <strong>paste it into your browser</strong>, into the place\\nyou would type the address of any other webpage."
+msgstr ""
+"Ako ne možete kliknuti na njega u e-mailu, morati ćete <strong>odabrati i kopirati\n"
+"ga</strong> sa e-maila. Zatim <strong>nalijepite ga u Vaš pretraživač</strong>, na mjesto\n"
+"gdje biste ukucali adresu bilo koje druge web stranice."
+
+msgid "If you can, scan in or photograph the response, and <strong>send us\\n a copy to upload</strong>."
+msgstr ""
+"Ako možete skenirajte ili uslikajte odgovor, i <strong>pošaljite nam\n"
+" kopiju za slanje</strong>."
+
+msgid "If you find this service useful as an FOI officer, please ask your web manager to link to us from your organisation's FOI page."
+msgstr ""
+
+msgid "If you got the email <strong>more than six months ago</strong>, then this login link won't work any\\nmore. Please try doing what you were doing from the beginning."
+msgstr ""
+"Ako ste dobili e-mail <strong>prije više od šest mjeseci</strong>, onda ovaj link za prijavu više neće\n"
+"raditi. Molimo pokušajte ispočetka."
+
+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 "Ako niste već, molimo napišite poruku ispod u kojoj napominjete ustanovu da ste povukli Vaš zahtjev. U protivnom neće znati da je zahtjev povučen."
+
+msgid "If you reply to this message it will go directly to {{user_name}}, who will\\nlearn your email address. Only reply if that is okay."
+msgstr ""
+
+msgid "If you use web-based email or have \"junk mail\" filters, also check your\\nbulk/spam mail folders. Sometimes, our messages are marked that way."
+msgstr ""
+"Ako koristite neke od web mail servisa ili imate filtere za \"junk mail\", provjerite u Vašim\n"
+"bulk/spam folderima. Ponekad su naše poruke označene tako."
+
+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 ""
+"Ako biste željeli da ukinemo ovu zabranu, možete nas na pristojan način\n"
+"<a href=\"/help/contact\">kontaktirati</a> uz obrazloženje.\\n"
+
+msgid "If you're new to {{site_name}}"
+msgstr "Ako ste novi na {{site_name}}"
+
+msgid "If you've used {{site_name}} before"
+msgstr "Ako ste koristili {{site_name}} prije"
+
+msgid "If your browser is set to accept cookies and you are seeing this message,\\nthen there is probably a fault with our server."
+msgstr ""
+"Ako je Vaš pretraživač namješten da prihvata cookies-e i vidite ovu poruku,\n"
+"onda vjerovatno postoji problem sa našim serverom."
+
+msgid "Incoming email address"
+msgstr ""
+
+msgid "Incoming message"
+msgstr ""
+
+msgid "IncomingMessage|Cached attachment text clipped"
+msgstr ""
+
+msgid "IncomingMessage|Cached main body text folded"
+msgstr ""
+
+msgid "IncomingMessage|Cached main body text unfolded"
+msgstr ""
+
+msgid "IncomingMessage|Last parsed"
+msgstr ""
+
+msgid "IncomingMessage|Mail from"
+msgstr ""
+
+msgid "IncomingMessage|Mail from domain"
+msgstr "Nadolazeća poruka|Pošta sa domene"
+
+msgid "IncomingMessage|Sent at"
+msgstr "Nadolazeća poruka|Poslana u"
+
+msgid "IncomingMessage|Subject"
+msgstr "Nadolazeća poruka|Tema"
+
+msgid "IncomingMessage|Valid to reply to"
+msgstr "Nadolazeća poruka|Validna za odgovor za"
+
+msgid "Individual requests"
+msgstr ""
+
+msgid "Info request"
+msgstr ""
+
+msgid "Info request event"
+msgstr ""
+
+msgid "InfoRequestEvent|Calculated state"
+msgstr ""
+
+msgid "InfoRequestEvent|Described state"
+msgstr ""
+
+msgid "InfoRequestEvent|Event type"
+msgstr ""
+
+msgid "InfoRequestEvent|Last described at"
+msgstr ""
+
+msgid "InfoRequestEvent|Params yaml"
+msgstr ""
+
+msgid "InfoRequestEvent|Prominence"
+msgstr ""
+
+msgid "InfoRequest|Allow new responses from"
+msgstr ""
+
+msgid "InfoRequest|Attention requested"
+msgstr ""
+
+msgid "InfoRequest|Awaiting description"
+msgstr ""
+
+msgid "InfoRequest|Comments allowed"
+msgstr ""
+
+msgid "InfoRequest|Described state"
+msgstr ""
+
+msgid "InfoRequest|External url"
+msgstr ""
+
+msgid "InfoRequest|External user name"
+msgstr ""
+
+msgid "InfoRequest|Handle rejected responses"
+msgstr ""
+
+msgid "InfoRequest|Idhash"
+msgstr ""
+
+msgid "InfoRequest|Law used"
+msgstr ""
+
+msgid "InfoRequest|Prominence"
+msgstr ""
+
+msgid "InfoRequest|Title"
+msgstr ""
+
+msgid "InfoRequest|Url title"
+msgstr ""
+
+msgid "Information not held."
+msgstr "Ne posjedujemo informacije."
+
+msgid "Information on emissions and discharges (e.g. noise, energy,\\n radiation, waste materials)"
+msgstr ""
+"Informacije o emisijama i otpadima (npr. buka, energija,\n"
+" radijacija, otpadni materijali)"
+
+msgid "Internal review request"
+msgstr "Zahtjev za urgenciju"
+
+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 "Da li je {{email_address}} pogrešna adresa za {{type_of_request}} zahtjeve za {{public_body_name}}?Ako da, molimo kontaktirajte nas koristeći ovaj formular:"
+
+msgid "It may be that your browser is not set to accept a thing called \"cookies\",\\nor cannot do so. If you can, please enable cookies, or try using a different\\nbrowser. Then press refresh to have another go."
+msgstr ""
+"Moguće je da Vaš pretraživač nije namješten da prihvata nešto što se zove \"cookies\",\n"
+"ili nema tu mogućnost . Ako možete, molimo pokušajte aktivirati cookies-e, ili pokušajte koristiti drugi\n"
+"pretraživač. Zatim pritisnite refresh da biste pokušali ponovo."
+
+msgid "Items matching the following conditions are currently displayed on your wall."
+msgstr ""
+
+msgid "Items sent in last month"
+msgstr ""
+
+msgid "Joined in"
+msgstr "Spojen"
+
+msgid "Joined {{site_name}} in"
+msgstr "Pridružio se na {{site_name}} u"
+
+msgid "Just one more thing"
+msgstr ""
+
+msgid "Keep it <strong>focused</strong>, you'll be more likely to get what you want (<a href=\"{{url}}\">why?</a>)."
+msgstr "Držite se <strong>suštine</strong>, lakše ćete dobiti ono što tražite(<a href=\"{{url}}\">Više informacija</a>)."
+
+msgid "Keywords"
+msgstr "Ključne riječi"
+
+msgid "Last authority viewed: "
+msgstr "Zadnja pregledana ustanova: "
+
+msgid "Last request viewed: "
+msgstr "Zadnji pregledani zahtjev: "
+
+msgid "Let us know what you were doing when this message\\nappeared and your browser and operating system type and version."
+msgstr ""
+"Obavijestite nas o tome šta ste uradili kada se ova poruka\n"
+"pojavila i o tipu i verziji Vašeg pretraživača i operativnog sistema."
+
+msgid "Link to this"
+msgstr "Spojite sa ovim"
+
+msgid "List all"
+msgstr ""
+
+msgid "List of all authorities (CSV)"
+msgstr "Popis svih ustanova (CSV)"
+
+msgid "Listing FOI requests"
+msgstr ""
+
+msgid "Listing public authorities"
+msgstr ""
+
+msgid "Listing public authorities matching '{{query}}'"
+msgstr ""
+
+msgid "Listing tracks"
+msgstr ""
+
+msgid "Listing users"
+msgstr ""
+
+msgid "Log in to download a zip file of {{info_request_title}}"
+msgstr "Prijavite se da preuzmete zipovano {{info_request_title}}"
+
+msgid "Log into the admin interface"
+msgstr ""
+
+msgid "Long overdue."
+msgstr ""
+
+msgid "Made between"
+msgstr "Napravljen između"
+
+msgid "Mail server log"
+msgstr ""
+
+msgid "Mail server log done"
+msgstr ""
+
+msgid "MailServerLogDone|Filename"
+msgstr ""
+
+msgid "MailServerLogDone|Last stat"
+msgstr ""
+
+msgid "MailServerLog|Line"
+msgstr ""
+
+msgid "MailServerLog|Order"
+msgstr ""
+
+msgid "Make a new<br/>\\n <strong>Freedom <span>of</span><br/>\\n Information<br/>\\n request</strong>"
+msgstr ""
+"Podnesi novi<br/>\n"
+" <strong>Zahtjev<span>za</span><br/>\n"
+" slobodan<br/>\n"
+" pristup informacijama</strong>"
+
+msgid "Make a request"
+msgstr "Podnesi zahtjev"
+
+msgid "Make a request to this authority"
+msgstr ""
+
+msgid "Make an {{law_used_short}} request to '{{public_body_name}}'"
+msgstr "Podnesi {{law_used_short}} zahtjev javnoj ustanovi '{{public_body_name}}'"
+
+msgid "Make and browse Freedom of Information (FOI) requests"
+msgstr "Napravi i pretraži Zahtjeve za slobodan pristup informacijama"
+
+msgid "Make your own request"
+msgstr "Načinite Vaš zahtjev"
+
+msgid "Many requests"
+msgstr ""
+
+msgid "Message"
+msgstr ""
+
+msgid "Message sent using {{site_name}} contact form, "
+msgstr "Poruka poslana koristeći {{site_name}} formular za kontakt, "
+
+msgid "Missing contact details for '"
+msgstr "Nedostaju detalji kontakta za '"
+
+msgid "More about this authority"
+msgstr "Više o ovoj ustanovi"
+
+msgid "More requests..."
+msgstr ""
+
+msgid "More similar requests"
+msgstr "Više sličnih zahtjeva"
+
+msgid "More successful requests..."
+msgstr "Više uspješnih zahtjeva..."
+
+msgid "My profile"
+msgstr "Moj profil"
+
+msgid "My request has been <strong>refused</strong>"
+msgstr "Moj zahtjev je <strong>odbijen</strong>"
+
+msgid "My requests"
+msgstr ""
+
+msgid "My wall"
+msgstr ""
+
+msgid "Name can't be blank"
+msgstr "Ime ne može ostati prazno"
+
+msgid "Name is already taken"
+msgstr "Ime se već koristi"
+
+msgid "New Freedom of Information requests"
+msgstr "Novi Zahtjevi za slobodan pristup informacijama"
+
+msgid "New censor rule"
+msgstr ""
+
+msgid "New e-mail:"
+msgstr "Novi e-mail:"
+
+msgid "New email doesn't look like a valid address"
+msgstr "Novi e-mail ne izgleda kao validna adresa"
+
+msgid "New password:"
+msgstr "Novi password:"
+
+msgid "New password: (again)"
+msgstr "Novi password: (ponovo)"
+
+msgid "New response to '{{title}}'"
+msgstr ""
+
+msgid "New response to your FOI request - "
+msgstr "Novi odgovor na Vaš Zahtjev o slobodnom pristupu informacijama - "
+
+msgid "New response to your request"
+msgstr "Novi odgovor na Vaš zahtjev"
+
+msgid "New response to {{law_used_short}} request"
+msgstr "Novi odgovor na {{law_used_short}} zahtjev"
+
+msgid "New updates for the request '{{request_title}}'"
+msgstr "Nova ažuriranja za zahtjev '{{request_title}}'"
+
+msgid "Newest results first"
+msgstr "Najnoviji rezultati "
+
+msgid "Next"
+msgstr "Slijedeći"
+
+msgid "Next, crop your photo &gt;&gt;"
+msgstr "Zatim, smanjite Vašu sliku &gt;&gt;"
+
+msgid "No requests of this sort yet."
+msgstr "Nema zahtjeva ove vrste dosada."
+
+msgid "No results found."
+msgstr "Nema rezultata pretrage"
+
+msgid "No similar requests found."
+msgstr "Nisu nađeni slični zahtjevi."
+
+msgid "No tracked things found."
+msgstr ""
+
+msgid "Nobody has made any Freedom of Information requests to {{public_body_name}} using this site yet."
+msgstr "Niko nije podnio Zahtjev za slobodan pristup informacijama {{public_body_name}} koristeći ovu stranicu."
+
+msgid "None found."
+msgstr "Ništa nije nađeno."
+
+msgid "None made."
+msgstr "Ništa podneseno."
+
+msgid "Not a valid FOI request"
+msgstr ""
+
+msgid "Note that the requester will not be notified about your annotation, because the request was published by {{public_body_name}} on their behalf."
+msgstr ""
+
+msgid "Now check your email!"
+msgstr "Sada provjerite Vaš e-mail!"
+
+msgid "Now preview your annotation"
+msgstr "Sada pregledajte Vašu napomenu"
+
+msgid "Now preview your follow up"
+msgstr ""
+
+msgid "Now preview your message asking for an internal review"
+msgstr "Sada pregledajte Vašu poruku u kojoj tražite urgenciju "
+
+msgid "OR remove the existing photo"
+msgstr "ILI odstrani postojeću sliku"
+
+msgid "Offensive? Unsuitable?"
+msgstr ""
+
+msgid "Oh no! Sorry to hear that your request was refused. Here is what to do now."
+msgstr "Žao nam je što je Vaš zahtjev odbijen. Prijedlog za Vaše slijedeće akcije."
+
+msgid "Old e-mail:"
+msgstr "Stari e-mail:"
+
+msgid "Old email address isn't the same as the address of the account you are logged in with"
+msgstr "Stara e-mail adresa nije ista kao adresa računa na koji ste prijavljeni"
+
+msgid "Old email doesn't look like a valid address"
+msgstr "Stari e-mail ne izgleda kao validna adresa"
+
+msgid "On this page"
+msgstr "Na ovoj stranici"
+
+msgid "One FOI request found"
+msgstr "Pronađen jedan Zahtjev za slobodan pristup informacijama"
+
+msgid "One person found"
+msgstr "Jedna osoba pronađena"
+
+msgid "One public authority found"
+msgstr "Jedna javna ustanova pronađena"
+
+msgid "Only put in abbreviations which are really used, otherwise leave blank. Short or long name is used in the URL – don't worry about breaking URLs through renaming, as the history is used to redirect"
+msgstr ""
+
+msgid "Only requests made using {{site_name}} are shown."
+msgstr "Samo zahtjevi koji koriste {{site_name}} su prikazani."
+
+msgid "Only the authority can reply to this request, and I don't recognise the address this reply was sent from"
+msgstr "Samo ustanova može odgovoriti na ovaj zahtjev, i ne prepoznajemo adresu sa koje je poslan ovaj odgovor"
+
+msgid "Only the authority can reply to this request, but there is no \"From\" address to check against"
+msgstr "Samo ustanova može odgovoriti na ovaj zahtjev, ali ne sadrži adresu pošiljaoca"
+
+msgid "Or search in their website for this information."
+msgstr "Ili tražite ovu informaciju na njihovoj web stranici."
+
+msgid "Original request sent"
+msgstr "Originalni zahtjev poslan"
+
+msgid "Other:"
+msgstr "Drugo:"
+
+msgid "Outgoing message"
+msgstr ""
+
+msgid "OutgoingMessage|Body"
+msgstr "Odlazeća poruka|Tijelo"
+
+msgid "OutgoingMessage|Last sent at"
+msgstr "Odlazeća poruka|Zadnja poslana u"
+
+msgid "OutgoingMessage|Message type"
+msgstr "Odlazeća poruka|Tip poruke"
+
+msgid "OutgoingMessage|Status"
+msgstr "Odlazeća poruka|Status"
+
+msgid "OutgoingMessage|What doing"
+msgstr "Odlazeća poruka|Šta radi"
+
+msgid "Partially successful."
+msgstr "Djelimično uspješan."
+
+msgid "Password is not correct"
+msgstr "Password nije ispravan"
+
+msgid "Password:"
+msgstr "Password:"
+
+msgid "Password: (again)"
+msgstr "Password: (ponovo)"
+
+msgid "Paste this link into emails, tweets, and anywhere else:"
+msgstr "Nalijepite ovaj link na e-mailove, tweets-e i na druga mjesta:"
+
+msgid "People"
+msgstr ""
+
+msgid "People {{start_count}} to {{end_count}} of {{total_count}}"
+msgstr ""
+
+msgid "Photo of you:"
+msgstr "Vaša slika:"
+
+msgid "Plans and administrative measures that affect these matters"
+msgstr "Planovi i administrativne mjere koje utiču na ove predmete"
+
+msgid "Play the request categorisation game"
+msgstr "Igrajte igru kategorizacije zahtjeva"
+
+msgid "Play the request categorisation game!"
+msgstr "Igrajte igru kategorizacije zahtjeva!"
+
+msgid "Please"
+msgstr "Molimo"
+
+msgid "Please <a href=\"{{url}}\">get in touch</a> with us so we can fix it."
+msgstr "Molimo <a href=\"{{url}}\">kontaktirajte</a> nas kako bi to mogli popraviti."
+
+msgid "Please <strong>answer the question above</strong> so we know whether the "
+msgstr "Molimo <strong>odgovorite na pitanje iznad</strong> kako bi znali da li"
+
+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 ""
+"Molimo <strong>idite na slijedeće zahtjeve</strong>, i obavijestite\n"
+" nas ako je bilo informacija u skorašnjim odgovorima."
+
+msgid "Please <strong>only</strong> write messages directly relating to your request {{request_link}}. If you would like to ask for information that was not in your original request, then <a href=\"{{new_request_link}}\">file a new request</a>."
+msgstr "Molimo <strong>samo</strong> pišite poruke samo uvezi sa Vašim zahtjevom {{request_link}}. Ako želite da tražite informacije koje nisu u Vašem originalnom zahtjevu, onda <a href=\"{{new_request_link}}\">podnesite novi zahtjev</a>."
+
+msgid "Please ask for environmental information only"
+msgstr "Molimo tražite samo informacije o okolišu"
+
+msgid "Please check the URL (i.e. the long code of letters and numbers) is copied\\ncorrectly from your email."
+msgstr ""
+"Molimo provjerite da li je URL (i.e. the long code of letters and numbers) kopiran\n"
+"ispravno sa Vašeg e-maila."
+
+msgid "Please choose a file containing your photo."
+msgstr "Molimo izaberite datoteku koja sadržava Vašu sliku."
+
+msgid "Please choose a reason"
+msgstr ""
+
+msgid "Please choose what sort of reply you are making."
+msgstr "Molimo izaberite vrstu odgovora."
+
+msgid "Please choose whether or not you got some of the information that you wanted."
+msgstr "Molimo birajte da li ste ili ne dobili dio informacija koje ste tražili."
+
+msgid "Please click on the link below to cancel or alter these emails."
+msgstr "Molimo kliknite na link ispod da biste poništili ili promijenili ove e-mailove"
+
+msgid "Please click on the link below to confirm that you want to \\nchange the email address that you use for {{site_name}}\\nfrom {{old_email}} to {{new_email}}"
+msgstr ""
+"Molimo kliknite na link ispod da potvrdite da želite \n"
+"promijeniti e-mail adresu koju koristite na {{site_name}}\n"
+"sa {{old_email}} na {{new_email}}"
+
+msgid "Please click on the link below to confirm your email address."
+msgstr "Molimo kliknite na link ispod da biste potvrdili Vašu e-mail adresu."
+
+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 "Molimo dodatno opišite o kakvom zahtjevu je riječ u predmetu. Nije potrebno reći da je Zahtjev za slobodan pristup informacijama, tu ćemo stavku dodati svakako."
+
+msgid "Please don't upload offensive pictures. We will take down images\\n that we consider inappropriate."
+msgstr ""
+"Molimo nemojte postavljati uvredljive slike. Skinuti ćemo sve slike\n"
+" koje smatramo neprikladnim."
+
+msgid "Please enable \"cookies\" to carry on"
+msgstr "Molimo aktivirajte cookies-e da biste nastavili"
+
+msgid "Please enter a password"
+msgstr "Molimo unesite password"
+
+msgid "Please enter a subject"
+msgstr "Molimo unestite naslov"
+
+msgid "Please enter a summary of your request"
+msgstr "Molimo unesite sažetak Vašeg zahtjeva"
+
+msgid "Please enter a valid email address"
+msgstr "Molimo unesite valjanu e-mail adresu"
+
+msgid "Please enter the message you want to send"
+msgstr "Molimo upišite poruku koju želite poslati"
+
+msgid "Please enter the same password twice"
+msgstr "Molimo unesite isti password dva puta"
+
+msgid "Please enter your annotation"
+msgstr "Molimo unesite komentar"
+
+msgid "Please enter your email address"
+msgstr "Molimo unesite Vašu e-mail adresu"
+
+msgid "Please enter your follow up message"
+msgstr "Molimo unesite Vašu prateću poruku"
+
+msgid "Please enter your letter requesting information"
+msgstr "Molimo unesite Vaše pismo za zahtjev informacija"
+
+msgid "Please enter your name"
+msgstr "Molimo unesite Vaše ime"
+
+msgid "Please enter your name, not your email address, in the name field."
+msgstr "Molimo unesite Vaše ime, ne Vašu e-mail adresu, u polje."
+
+msgid "Please enter your new email address"
+msgstr "Molimo unesite Vašu novu e-mail adresu"
+
+msgid "Please enter your old email address"
+msgstr "Molimo unesite Vašu staru e-mail adresu"
+
+msgid "Please enter your password"
+msgstr "Molimo unesite Vaš password"
+
+msgid "Please give details explaining why you want a review"
+msgstr "Molimo objasnite zašto želite urgenciju"
+
+msgid "Please keep it shorter than 500 characters"
+msgstr "Molimo da ne koristite više od 500 znakova"
+
+msgid "Please keep the summary short, like in the subject of an email. You can use a phrase, rather than a full sentence."
+msgstr "Molimo da sažetak bude kratak, poput naslova e-maila. Radije koristite frazu nego punu rečenicu."
+
+msgid "Please only request information that comes under those categories, <strong>do not waste your\\n time</strong> or the time of the public authority by requesting unrelated information."
+msgstr ""
+
+msgid "Please pass this on to the person who conducts Freedom of Information reviews."
+msgstr ""
+
+msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
+msgstr ""
+"Molimo odaberite svaki od ovih zahtjeva naizmjenice, i <strong>obavijestite sviju</strong>\n"
+"da li su bili uspješni ili ne."
+
+msgid "Please sign at the bottom with your name, or alter the \"{{signoff}}\" signature"
+msgstr "Molimo da se na dnu potpišete, ili izmijenite \"{{signoff}}\" potpis"
+
+msgid "Please sign in as "
+msgstr "Molimo prijavite se kao "
+
+msgid "Please sign in or make a new account."
+msgstr ""
+
+msgid "Please type a message and/or choose a file containing your response."
+msgstr "Molimo ukucajte poruku i/ili odaberite fajl koji sadrži vaš odgovor."
+
+msgid "Please use this email address for all replies to this request:"
+msgstr "Molimo koristite ovu e-mail adresu za odgovore na ovaj zahtjev:"
+
+msgid "Please write a summary with some text in it"
+msgstr "Molimo napišite sažetak sa nešto teksta"
+
+msgid "Please write the summary using a mixture of capital and lower case letters. This makes it easier for others to read."
+msgstr "Molimo napišite sažetak koristeći velika i mala slova. Tako ćete olakšati čitanje drugima."
+
+msgid "Please write your annotation using a mixture of capital and lower case letters. This makes it easier for others to read."
+msgstr "Molimo napišite komentar koristeći velika i mala slova. Tako ćete olakšati čitanje drugima."
+
+msgid "Please write your follow up message containing the necessary clarifications below."
+msgstr ""
+
+msgid "Please write your message using a mixture of capital and lower case letters. This makes it easier for others to read."
+msgstr "Molimo napišite poruku koristeći velika i mala slova. Tako ćete olakšati čitanje drugima."
+
+msgid "Point to <strong>related information</strong>, campaigns or forums which may be useful."
+msgstr "Ukažite na <strong>slične informacije</strong>, kampanje ili forume koji mogu biti korisni."
+
+msgid "Possibly related requests:"
+msgstr "Vjerovatno srodni zahtjevi:"
+
+msgid "Post annotation"
+msgstr "Postaj napomenu"
+
+msgid "Post redirect"
+msgstr ""
+
+msgid "PostRedirect|Circumstance"
+msgstr ""
+
+msgid "PostRedirect|Email token"
+msgstr ""
+
+msgid "PostRedirect|Post params yaml"
+msgstr ""
+
+msgid "PostRedirect|Reason params yaml"
+msgstr ""
+
+msgid "PostRedirect|Token"
+msgstr ""
+
+msgid "PostRedirect|Uri"
+msgstr ""
+
+msgid "Posted on {{date}} by {{author}}"
+msgstr "Poslano na datum {{date}} od strane {{author}}"
+
+msgid "Powered by <a href=\"http://www.alaveteli.org/\">Alaveteli</a>"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
+msgid "Preview follow up to '"
+msgstr ""
+
+msgid "Preview new annotation on '{{info_request_title}}'"
+msgstr "Pregledaj novu napomenu za '{{info_request_title}}'"
+
+msgid "Preview your annotation"
+msgstr "Pregledajte Vašu napomenu"
+
+msgid "Preview your message"
+msgstr "Pregledajte Vašu poruku"
+
+msgid "Preview your public request"
+msgstr "Pregledajte Vaš javni zahtjev"
+
+msgid "Profile photo"
+msgstr ""
+
+msgid "ProfilePhoto|Data"
+msgstr "Slika na profilu|Podaci"
+
+msgid "ProfilePhoto|Draft"
+msgstr "Slika na profilu|Skica"
+
+msgid "Public authorities"
+msgstr "Javne ustanove"
+
+msgid "Public authorities - {{description}}"
+msgstr "Javne ustanove - {{description}}"
+
+msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}"
+msgstr ""
+
+msgid "Public authority – {{name}}"
+msgstr ""
+
+msgid "Public body"
+msgstr ""
+
+msgid "Public notes"
+msgstr ""
+
+msgid "Public page"
+msgstr ""
+
+msgid "Public page not available"
+msgstr ""
+
+msgid "PublicBody|Api key"
+msgstr ""
+
+msgid "PublicBody|Disclosure log"
+msgstr ""
+
+msgid "PublicBody|First letter"
+msgstr "Javno tijelo|Početno slovo"
+
+msgid "PublicBody|Home page"
+msgstr "Javno tijelo|Home page"
+
+msgid "PublicBody|Info requests count"
+msgstr ""
+
+msgid "PublicBody|Last edit comment"
+msgstr "Javno tijelo|Zadnji uređeni komentar"
+
+msgid "PublicBody|Last edit editor"
+msgstr "Javno tijelo|Zadnji uređivač"
+
+msgid "PublicBody|Name"
+msgstr "Javno tijelo|Ime"
+
+msgid "PublicBody|Notes"
+msgstr "Javno tijelo|Bilješke"
+
+msgid "PublicBody|Publication scheme"
+msgstr "Javno tijelo|Nacrt publikacije"
+
+msgid "PublicBody|Request email"
+msgstr "Javno tijelo|"
+
+msgid "PublicBody|Short name"
+msgstr "Javno tijelo|Nadimak"
+
+msgid "PublicBody|Url name"
+msgstr "Javno tijelo|Url ime"
+
+msgid "PublicBody|Version"
+msgstr "Javno tijelo|Verzija"
+
+msgid "Publication scheme"
+msgstr "Nacrt publikacije"
+
+msgid "Publication scheme URL"
+msgstr ""
+
+msgid "Purge request"
+msgstr ""
+
+msgid "PurgeRequest|Model"
+msgstr ""
+
+msgid "PurgeRequest|Url"
+msgstr ""
+
+msgid "RSS feed"
+msgstr ""
+
+msgid "RSS feed of updates"
+msgstr ""
+
+msgid "Re-edit this annotation"
+msgstr "Ponovo urediti ovu napomenu"
+
+msgid "Re-edit this message"
+msgstr "Ponovo urediti ovu poruku"
+
+msgid "Read about <a href=\"{{advanced_search_url}}\">advanced search operators</a>, such as proximity and wildcards."
+msgstr ""
+
+msgid "Read blog"
+msgstr "Čitaj blog"
+
+msgid "Received an error message, such as delivery failure."
+msgstr "Dobijena poruka o pogrešci, poput neuspješnog prijema poruke."
+
+msgid "Recently described results first"
+msgstr "Nedavno opisani rezultati "
+
+msgid "Refused."
+msgstr "Odbijen."
+
+msgid "Remember me</label> (keeps you signed in longer;\\n do not use on a public computer) "
+msgstr ""
+"Zapamti nalog</label> (Omogućava da ostanete duže prijavljeni;\n"
+" Ovu opciju nemojte koristiti na javnim računarima) "
+
+msgid "Report abuse"
+msgstr "Prijavi zloupotrebu"
+
+msgid "Report an offensive or unsuitable request"
+msgstr ""
+
+msgid "Report request"
+msgstr ""
+
+msgid "Report this request"
+msgstr ""
+
+msgid "Reported for administrator attention."
+msgstr ""
+
+msgid "Request an internal review"
+msgstr "Tražite "
+
+msgid "Request an internal review from {{person_or_body}}"
+msgstr "Zatražiti urgenciju od strane {{person_or_body}}"
+
+msgid "Request email"
+msgstr ""
+
+msgid "Request has been removed"
+msgstr "Zahtjev je uklonjen"
+
+msgid "Request sent to {{public_body_name}} by {{info_request_user}} on {{date}}."
+msgstr "Zahtjev poslan {{public_body_name}} od strane {{info_request_user}} na datum {{date}}."
+
+msgid "Request to {{public_body_name}} by {{info_request_user}}. Annotated by {{event_comment_user}} on {{date}}."
+msgstr "Zahtjev za {{public_body_name}} od strane {{info_request_user}}. Prokomentarisan od strane {{event_comment_user}} na datum {{date}}."
+
+msgid "Requested from {{public_body_name}} by {{info_request_user}} on {{date}}"
+msgstr "Traženo od {{public_body_name}} od strane {{info_request_user}} na datum {{date}}"
+
+msgid "Requested on {{date}}"
+msgstr "Traženo na datum {{date}}"
+
+msgid "Requests for personal information and vexatious requests are not considered valid for FOI purposes (<a href=\"/help/about\">read more</a>)."
+msgstr ""
+
+msgid "Requests or responses matching your saved search"
+msgstr "Zahtjevi ili odgovori koji odgovaraju Vašoj spašenoj pretrazi"
+
+msgid "Respond by email"
+msgstr "Odgovoriti e-mailom"
+
+msgid "Respond to request"
+msgstr "Odgovoriti na zahtjev"
+
+msgid "Respond to the FOI request"
+msgstr "Odgovoriti na Zahtjev za slobodan pristup informacijama"
+
+msgid "Respond using the web"
+msgstr "Odgovoriti preko web-a"
+
+msgid "Response"
+msgstr "Odgovor"
+
+msgid "Response from a public authority"
+msgstr "Odgovor od javne ustanove"
+
+msgid "Response to '{{title}}'"
+msgstr ""
+
+msgid "Response to this request is <strong>delayed</strong>."
+msgstr "Odgovor na ovaj zahtjev je <strong>odgođen</strong>."
+
+msgid "Response to this request is <strong>long overdue</strong>."
+msgstr "Odgovor na ovaj zahtjev <strong>kasni</strong>."
+
+msgid "Response to your request"
+msgstr "Odgovor na Vaš zahtjev"
+
+msgid "Response:"
+msgstr "Odgovor:"
+
+msgid "Restrict to"
+msgstr "Ograničiti na"
+
+msgid "Results page {{page_number}}"
+msgstr "Rezultati na stranici {{page_number}}"
+
+msgid "Save"
+msgstr "Spasi"
+
+msgid "Search"
+msgstr "Pretraži"
+
+msgid "Search Freedom of Information requests, public authorities and users"
+msgstr "Pretraži Zahtjeve za slobodan pristup informacijama, javne ustanove i korisnici"
+
+msgid "Search contributions by this person"
+msgstr "Pretraži doprinose od strane ove osobe"
+
+msgid "Search for words in:"
+msgstr ""
+
+msgid "Search in"
+msgstr "Pretraži u"
+
+msgid "Search over<br/>\\n <strong>{{number_of_requests}} requests</strong> <span>and</span><br/>\\n <strong>{{number_of_authorities}} authorities</strong>"
+msgstr ""
+
+msgid "Search queries"
+msgstr ""
+
+msgid "Search results"
+msgstr "Rezultati pretrage"
+
+msgid "Search the site to find what you were looking for."
+msgstr "Pretražite web stranicu da pronađete što ste tražili."
+
+msgid "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
+msgid_plural "Search within the {{count}} Freedom of Information requests made to {{public_body_name}}"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+msgid "Search your contributions"
+msgstr "Pretražite Vaše doprinose"
+
+msgid "See bounce message"
+msgstr ""
+
+msgid "Select one to see more information about the authority."
+msgstr "Odaberite jedan da biste vidjeli više informacija o ustanovi."
+
+msgid "Select the authority to write to"
+msgstr "Odaberite ustanovu kojoj ćete pisati"
+
+msgid "Send a followup"
+msgstr ""
+
+msgid "Send a message to "
+msgstr "Pošalji poruku za "
+
+msgid "Send a public follow up message to {{person_or_body}}"
+msgstr ""
+
+msgid "Send a public reply to {{person_or_body}}"
+msgstr "Poslati javni odgovor za {{person_or_body}}"
+
+msgid "Send follow up to '{{title}}'"
+msgstr ""
+
+msgid "Send message"
+msgstr "Pošalji poruku"
+
+msgid "Send message to "
+msgstr "Pošalji poruku "
+
+msgid "Send request"
+msgstr "Pošalji zahtjev"
+
+msgid "Set your profile photo"
+msgstr "Podesiti sliku na Vašem profilu"
+
+msgid "Short name"
+msgstr ""
+
+msgid "Short name is already taken"
+msgstr "Nadimak se već koristi"
+
+msgid "Show most relevant results first"
+msgstr "Prikaži najreleveantnije rezultate "
+
+msgid "Show only..."
+msgstr "Prikaži samo..."
+
+msgid "Showing"
+msgstr "Prikazuje"
+
+msgid "Sign in"
+msgstr "Prijavite se"
+
+msgid "Sign in or make a new account"
+msgstr "Prijavite se ili napravite novi korisnički račun"
+
+msgid "Sign in or sign up"
+msgstr "Prijavite se ili Registrujte se"
+
+msgid "Sign out"
+msgstr "Odjavite se"
+
+msgid "Sign up"
+msgstr "Registrujte se"
+
+msgid "Similar requests"
+msgstr "Slični zahtjevi"
+
+msgid "Simple search"
+msgstr "Jednostavna pretraga"
+
+msgid "Some notes have been added to your FOI request - "
+msgstr "Bilješke su dodate na Vaš Zahtjev o slobodnom pristupu informacijama - "
+
+msgid "Some of the information requested has been received"
+msgstr "Dio traženih informacija je dobijen"
+
+msgid "Some people who've made requests haven't let us know whether they were\\nsuccessful or not. We need <strong>your</strong> help &ndash;\\nchoose one of these requests, read it, and let everyone know whether or not the\\ninformation has been provided. Everyone'll be exceedingly grateful."
+msgstr ""
+"Neki od podnosioca zahtjeva nas nisu obavijestili da li su njihovi zahtjevi bili\n"
+"uspješni ili ne. Trebamo <strong>Vašu</strong> pomoć &ndash;\n"
+"odaberite jedan od ovih zahtjeva, pročitajte ga, i sviju obavijestite da li su\n"
+"informacije dobijene ili ne. Svi će Vam biti veoma zahvalni."
+
+msgid "Somebody added a note to your FOI request - "
+msgstr "Neko je dodao komentar na Vaš Zahtjev za slobodan pristup informacijama."
+
+msgid "Someone has updated the status of your request"
+msgstr ""
+
+msgid "Someone, perhaps you, just tried to change their email address on\\n{{site_name}} from {{old_email}} to {{new_email}}."
+msgstr ""
+"Neko je, možda ste to Vi, pokušao da promijeni svoju e-mail adresu na\n"
+"{{site_name}} sa {{old_email}} na {{new_email}}."
+
+msgid "Sorry - you cannot respond to this request via {{site_name}}, because this is a copy of the request originally at {{link_to_original_request}}."
+msgstr ""
+
+msgid "Sorry, but only {{user_name}} is allowed to do that."
+msgstr "Žalimo, ali samo {{user_name}} može raditi to."
+
+msgid "Sorry, there was a problem processing this page"
+msgstr "Žalimo, postoji problem u procesuiranju stranice"
+
+msgid "Sorry, we couldn't find that page"
+msgstr "Žalimo, nismo mogli pronaći tu stranicu"
+
+msgid "Special note for this authority!"
+msgstr "Posebna napomena za ovu ustanovu!"
+
+msgid "Start now &raquo;"
+msgstr "Počni sada &raquo;"
+
+msgid "Start your own blog"
+msgstr "Započnite Vaš blog"
+
+msgid "Stay up to date"
+msgstr ""
+
+msgid "Still awaiting an <strong>internal review</strong>"
+msgstr "I dalje čeka <strong>internal review</strong>"
+
+msgid "Subject"
+msgstr ""
+
+msgid "Subject:"
+msgstr "Tema:"
+
+msgid "Submit"
+msgstr "Predaj"
+
+msgid "Submit status"
+msgstr "Pošalji status"
+
+msgid "Submit status and send message"
+msgstr ""
+
+msgid "Subscribe to blog"
+msgstr "Pretplatiti se na blog"
+
+msgid "Successful Freedom of Information requests"
+msgstr "Uspješni Zahtjevi za slobodan pristup informacijama"
+
+msgid "Successful."
+msgstr "Uspješan."
+
+msgid "Suggest how the requester can find the <strong>rest of the information</strong>."
+msgstr "Predložite kako ponosioc zahtjeva može pronaći <strong>ostatak informacije</strong>."
+
+msgid "Summary:"
+msgstr "Sažetak:"
+
+msgid "Table of statuses"
+msgstr "Pregled statusa"
+
+msgid "Table of varieties"
+msgstr "Tabela vrsta"
+
+msgid "Tags"
+msgstr ""
+
+msgid "Tags (separated by a space):"
+msgstr ""
+
+msgid "Tags:"
+msgstr "Označeni:"
+
+msgid "Technical details"
+msgstr "Tehnički detalji"
+
+msgid "Thank you for helping us keep the site tidy!"
+msgstr "Hvala što nam pomažete da održavamo ovu web stranicu urednom!"
+
+msgid "Thank you for making an annotation!"
+msgstr "Hvala što ste napravili napomenu!"
+
+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 "Hvala na Vašem odgovoru na ovaj Zahtjev za slobodan pristup informacijama! Vaš odgovor je objavljen ispod, i link na vaš odgovor je poslan putem e-maila za"
+
+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 "Hvala na ažuriranju statusa zahtjeva '<a href=\"{{url}}\">{{info_request_title}}</a>'. Postoje drugi zahtjevi ispod koje možete klasificirati."
+
+msgid "Thank you for updating this request!"
+msgstr "Hvala na ažuriranju zahtjeva!"
+
+msgid "Thank you for updating your profile photo"
+msgstr "Hvala što ste ažurirali sliku na Vašem profilu"
+
+msgid "Thank you! We'll look into what happened and try and fix it up."
+msgstr ""
+
+msgid "Thanks for helping - your work will make it easier for everyone to find successful\\nresponses, and maybe even let us make league tables..."
+msgstr ""
+"Hvala na pomoći - Vaš rad će svima olakšati pronalaženje pozitivnih\n"
+"odgovora, i možda čak dozvoliti nama da pravimo tabele zajednica..."
+
+msgid "Thanks very much - this will help others find useful stuff. We'll\\n also, if you need it, give advice on what to do next about your\\n requests."
+msgstr ""
+"Hvala - ovo će pomoći drugima da pronađu korisne stvari. Mi ćemoVas\n"
+" takođe, ako vam zatreba, savjetovati o tome šta da radite dalje sa Vašim\n"
+" zahtjevima."
+
+msgid "Thanks very much for helping keep everything <strong>neat and organised</strong>.\\n We'll also, if you need it, give you advice on what to do next about each of your\\n requests."
+msgstr ""
+"Hvala Vam što pomažete da sve bude<strong>čitko i organizovano</strong>.\n"
+" Mi ćemo Vas takođe, ako vam zatreba, posavjetovati o tome šta da dalje radite sa svakim od Vaših\n"
+" zahtjeva."
+
+msgid "That doesn't look like a valid email address. Please check you have typed it correctly."
+msgstr "E-mail adresa ne izgleda validna. Molimo provjerite da li ste je ukucali pravilno."
+
+msgid "The <strong>review has finished</strong> and overall:"
+msgstr "Pregled <strong>je završen</strong> i sveukupno:"
+
+msgid "The Freedom of Information Act <strong>does not apply</strong> to"
+msgstr "Zakon o slobodnom pristupu informacijama <strong>se ne odnosi</strong> na"
+
+msgid "The accounts have been left as they previously were."
+msgstr "Korisnički računi nisu mijenjani"
+
+msgid "The authority do <strong>not have</strong> the information <small>(maybe they say who does)"
+msgstr "Ustanova <strong>ne posjeduje</strong> informacije <small>(možda mogu reći ko posjeduje)"
+
+msgid "The authority only has a <strong>paper copy</strong> of the information."
+msgstr "Ustanova ima samo <strong>printanu kopiju</strong> informacije."
+
+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 ""
+"Iz ustanove kažu da im <strong>treba poštanska\n"
+" adresa</strong>, ne samo e-mail, da bi Zahtjev za slobodan pristup informacijama bio valjan"
+
+msgid "The authority would like to / has <strong>responded by post</strong> to this request."
+msgstr "Ustanova bi željela / je <strong>odgovorila poštom</strong> na ovaj zahtjev."
+
+msgid "The email that you, on behalf of {{public_body}}, sent to\\n{{user}} to reply to an {{law_used_short}}\\nrequest has not been delivered."
+msgstr ""
+
+msgid "The page doesn't exist. Things you can try now:"
+msgstr "Stranica ne postoji. Stvari koje možete probati sada:"
+
+msgid "The public authority does not have the information requested"
+msgstr "Javna ustanova ne posjeduje tražene informacije"
+
+msgid "The public authority would like part of the request explained"
+msgstr "Javna ustanova bi htjela objašnjenje dijela zahtjeva"
+
+msgid "The public authority would like to / has responded by post"
+msgstr "Javna ustanova bi htjela odgovoriti ili je već odgovorila poštom"
+
+msgid "The request has been <strong>refused</strong>"
+msgstr "Zahtjev je <strong>odbijen</strong>"
+
+msgid "The request has been updated since you originally loaded this page. Please check for any new incoming messages below, and try again."
+msgstr "Zahtjev je ažuriran otkako ste prvi put učitali ovu stranicu. Molimo provjerite nove dolazeće poruke ispod i pokušajte ponovo. "
+
+msgid "The request is <strong>waiting for clarification</strong>."
+msgstr "Zahtjev <strong>čeka na objašnjenje</strong>."
+
+msgid "The request was <strong>partially successful</strong>."
+msgstr "Zahtjev je <strong>djelimično uspješan</strong>."
+
+msgid "The request was <strong>refused</strong> by"
+msgstr "Zahtjev je <strong>odbijen</strong> od strane"
+
+msgid "The request was <strong>successful</strong>."
+msgstr "Zahtjev je <strong>uspješan</strong>."
+
+msgid "The request was refused by the public authority"
+msgstr "Zahtjev je odbijen od strane javne ustanove"
+
+msgid "The request you have tried to view has been removed. There are\\nvarious reasons why we might have done this, sorry we can't be more specific here. Please <a\\n href=\"{{url}}\">contact us</a> if you have any questions."
+msgstr ""
+"Zahtjev koji ste pokušali pregledati je uklonjen. Postoje\n"
+"razni razlozi radi kojih smo to mogli uraditi, žao nam je ali ne možemo biti precizniji po tom pitanju. Molimo <a\n"
+" href=\"{{url}}\">kontaktirajte nas</a> ako imate pitanja."
+
+msgid "The requester has abandoned this request for some reason"
+msgstr "Podnosioc je odustao od ovog zahtjeva iz nekog razloga"
+
+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 ""
+"Odgovor na Vaš zahtjev je <strong>odgođen</strong>. Možete reći da je, \n"
+" po zakonu, ustanova trebala odgovoriti\n"
+" <strong>brzo</strong> i"
+
+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 ""
+"Odgovor na Vaš zahtjev <strong>kasni</strong>. Možete reći da po \n"
+" zakonu, u svakom slučaju, ustanova je trebala odgovoriti\n"
+" do sada"
+
+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 "Indeks za pretragu je trenutno isključen, ne možemo prikazati Zahtjeve za slobodan pristup informacijama podnesene ovoj ustanovi."
+
+msgid "The search index is currently offline, so we can't show the Freedom of Information requests this person has made."
+msgstr "Indeks za pretragu je trenutno isključen, radi toga ne možemo prikazati Zahtjeve za slobodan pristup informacijama koje je ova osoba napravila."
+
+msgid "The {{site_name}} team."
+msgstr ""
+
+msgid "Then you can cancel the alert."
+msgstr "Tada možete poništiti upozorenje."
+
+msgid "Then you can cancel the alerts."
+msgstr "Tada možete poništiti upozorenja."
+
+msgid "Then you can change your email address used on {{site_name}}"
+msgstr "Tada možete promijeniti Vašu e-mail adresu korištenu na {{site_name}}"
+
+msgid "Then you can change your password on {{site_name}}"
+msgstr "Tada možete promijeniti Vaš password na {{site_name}}"
+
+msgid "Then you can classify the FOI response you have got from "
+msgstr "Tada možete klasificirati ZOSPI odgovor koji ste dobili od"
+
+msgid "Then you can download a zip file of {{info_request_title}}."
+msgstr "Tada možete preuzeti zipovano {{info_request_title}}."
+
+msgid "Then you can log into the administrative interface"
+msgstr ""
+
+msgid "Then you can play the request categorisation game."
+msgstr "Tada možete igrati igru kategorizacije zatjeva."
+
+msgid "Then you can report the request '{{title}}'"
+msgstr ""
+
+msgid "Then you can send a message to "
+msgstr "Tada možete poslati poruku za "
+
+msgid "Then you can sign in to {{site_name}}"
+msgstr "Tada se možete prijaviti na {{site_name}}"
+
+msgid "Then you can update the status of your request to "
+msgstr "Tada možete ažurirati status vašeg zahtjeva prema"
+
+msgid "Then you can upload an FOI response. "
+msgstr "Tada možete postaviti odgovor na Zahtjev o slobodnom pristupu informacijama."
+
+msgid "Then you can write follow up message to "
+msgstr "Tada možete napisati prateću poruku za "
+
+msgid "Then you can write your reply to "
+msgstr "Tada možete napisati Vaš odgovor za"
+
+msgid "Then you will be following all new FOI requests."
+msgstr ""
+
+msgid "Then you will be notified whenever '{{user_name}}' requests something or gets a response."
+msgstr ""
+
+msgid "Then you will be notified whenever a new request or response matches your search."
+msgstr ""
+
+msgid "Then you will be notified whenever an FOI request succeeds."
+msgstr ""
+
+msgid "Then you will be notified whenever someone requests something or gets a response from '{{public_body_name}}'."
+msgstr ""
+
+msgid "Then you will be updated whenever the request '{{request_title}}' is updated."
+msgstr ""
+
+msgid "Then you'll be allowed to send FOI requests."
+msgstr "Tada će Vam biti dozvoljeno da šaljete Zahtjeve za slobodan pristup informacijama "
+
+msgid "Then your FOI request to {{public_body_name}} will be sent."
+msgstr "Tada će Vaši Zahtjevi za slobodan pristup informacijama za {{public_body_name}} biti poslani."
+
+msgid "Then your annotation to {{info_request_title}} will be posted."
+msgstr "Tada će Vaša napomena za {{info_request_title}} biti postavljena."
+
+msgid "There are {{count}} new annotations on your {{info_request}} request. Follow this link to see what they wrote."
+msgstr "Postoje {{count}} nove napomene na Vašem {{info_request}} zahtjevu. Pratite ovaj link da pogledate šta je napisano."
+
+msgid "There is <strong>more than one person</strong> who uses this site and has this name.\\n One of them is shown below, you may mean a different one:"
+msgstr ""
+
+msgid "There is a limit on the number of requests you can make in a day, because we don’t want public authorities to be bombarded with large numbers of inappropriate requests. If you feel you have a good reason to ask for the limit to be lifted in your case, please <a href='{{help_contact_path}}'>get in touch</a>."
+msgstr ""
+
+msgid "There is {{count}} person following this request"
+msgid_plural "There are {{count}} people following this request"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+msgid "There was a <strong>delivery error</strong> or similar, which needs fixing by the {{site_name}} team."
+msgstr "Došlo je do <strong>greške u isporuci</strong> ili nečega sličnog što treba popravku od strane {{site_name}} tima."
+
+msgid "There was an error with the words you entered, please try again."
+msgstr "Postoji greška u riječima koje ste ukucali, molimo pokušajte ponovo."
+
+msgid "There were no requests matching your query."
+msgstr "Nema zahtjeva koji odgovaraju Vašoj pretrazi."
+
+msgid "There were no results matching your query."
+msgstr ""
+
+msgid "They are going to reply <strong>by post</strong>"
+msgstr "Odgovoriti će <strong>poštom</strong>"
+
+msgid "They do <strong>not have</strong> the information <small>(maybe they say who does)</small>"
+msgstr "Oni <strong>ne posjeduju</strong> informaciju <small>(možda mogu reći ko je posjeduje)</small>"
+
+msgid "They have been given the following explanation:"
+msgstr "Dato im je slijedeće objašnjenje:"
+
+msgid "They have not replied to your {{law_used_short}} request {{title}} promptly, as normally required by law"
+msgstr "Nisu odgovorili na Vaš {{law_used_short}} zahtjev {{title}} u kratkom vremenskom roku, kao što je predviđeno zakonom"
+
+msgid "They have not replied to your {{law_used_short}} request {{title}}, \\nas required by law"
+msgstr ""
+"Nisu odgovorili na Vaš {{law_used_short}} zahtjev {{title}}, \n"
+"kao što je predviđeno zakonom"
+
+msgid "Things to do with this request"
+msgstr "Stvari za uraditi sa ovim zahtjevom"
+
+msgid "Things you're following"
+msgstr ""
+
+msgid "This authority no longer exists, so you cannot make a request to it."
+msgstr "Ova ustanova više ne postoji, zato joj nije moguće podnijeti zahtjev. "
+
+msgid "This comment has been hidden. See annotations to\\n find out why. If you are the requester, then you may <a href=\"{{url}}\">sign in</a> to view the response."
+msgstr ""
+
+msgid "This covers a very wide spectrum of information about the state of\\n the <strong>natural and built environment</strong>, such as:"
+msgstr ""
+
+msgid "This external request has been hidden"
+msgstr ""
+
+msgid "This is a plain-text version of the Freedom of Information request \"{{request_title}}\". The latest, full version is available online at {{full_url}}"
+msgstr ""
+
+msgid "This is an HTML version of an attachment to the Freedom of Information request"
+msgstr "Ovo je HTML verzija priloga uz Zahtjev za slobodnom pristupu informacijama"
+
+msgid "This is because {{title}} is an old request that has been\\nmarked to no longer receive responses."
+msgstr ""
+"To je zato što je {{title}} stari zahtjev koji je\n"
+"označen da više ne prima odgovore."
+
+msgid "This is the first version."
+msgstr ""
+
+msgid "This is your own request, so you will be automatically emailed when new responses arrive."
+msgstr "Ovo je Vaš zahtjev, biti ćete automatski obaviješteni e-mailom kada novi odgovori budu stizali."
+
+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=\"{{url}}\">sign in</a> to view the response."
+msgstr ""
+
+msgid "This particular request is finished:"
+msgstr "Ovaj zahtjev je završen:"
+
+msgid "This person has made no Freedom of Information requests using this site."
+msgstr "Ova osoba nije podnijela nijedan Zahtjev za slobodan pristup informacijama koristeći ovu web stranicu."
+
+msgid "This person's annotations"
+msgstr "Napomene ove osobe"
+
+msgid "This person's {{count}} Freedom of Information request"
+msgid_plural "This person's {{count}} Freedom of Information requests"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+msgid "This person's {{count}} annotation"
+msgid_plural "This person's {{count}} annotations"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+msgid "This request <strong>requires administrator attention</strong>"
+msgstr "Ovaj zahtjev <strong>treba provjeru administratora</strong>"
+
+msgid "This request has already been reported for administrator attention"
+msgstr ""
+
+msgid "This request has an <strong>unknown status</strong>."
+msgstr "Ovaj zahtjev ima <strong>nepoznat status</strong>."
+
+msgid "This request has been <strong>hidden</strong> from the site, because an administrator considers it not to be an FOI request"
+msgstr ""
+
+msgid "This request has been <strong>hidden</strong> from the site, because an administrator considers it vexatious"
+msgstr ""
+
+msgid "This request has been <strong>reported</strong> as needing administrator attention (perhaps because it is vexatious, or a request for personal information)"
+msgstr ""
+
+msgid "This request has been <strong>withdrawn</strong> by the person who made it.\\n There may be an explanation in the correspondence below."
+msgstr ""
+"Ovaj zahtjev je <strong>povučen</strong> od strane osobe koja ga je napravila. \n"
+" <span class=\"whitespace other\" title=\"Tab\">»</span> Obijašnjenje može biti u dopisima ispod."
+
+msgid "This request has been marked for review by the site administrators, who have not hidden it at this time. If you believe it should be hidden, please <a href=\"{{url}}\">contact us</a>."
+msgstr ""
+
+msgid "This request has been reported for administrator attention"
+msgstr ""
+
+msgid "This request has been set by an administrator to \"allow new responses from nobody\""
+msgstr ""
+
+msgid "This request has had an unusual response, and <strong>requires attention</strong> from the {{site_name}} team."
+msgstr "Ovaj zahtjev je dobio neobičan odgovor, i <strong>treba pregled</strong> od strane {{site_name}} tima."
+
+msgid "This request has prominence 'hidden'. You can only see it because you are logged\\n in as a super user."
+msgstr ""
+"Ovaj zahtjev je inače skriven. Možete ga vidjeti jer ste prijavljeni \n"
+" kao super korisnik."
+
+msgid "This request is hidden, so that only you the requester can see it. Please\\n <a href=\"{{url}}\">contact us</a> if you are not sure why."
+msgstr ""
+"Ovaj zahtjev je skriven tako da ga samo Vi podnosioc možete vidjeti. Molimo\n"
+" <a href=\"{{url}}\">kontaktirajte nas</a> ako niste sigurni zašto."
+
+msgid "This request is still in progress:"
+msgstr "Ovaj zahtjev je još u toku:"
+
+msgid "This request requires administrator attention"
+msgstr ""
+
+msgid "This request was not made via {{site_name}}"
+msgstr ""
+
+msgid "This response has been hidden. See annotations to find out why.\\n If you are the requester, then you may <a href=\"{{url}}\">sign in</a> to view the response."
+msgstr ""
+
+msgid "This table shows the technical details of the internal events that happened\\nto this request on {{site_name}}. This could be used to generate information about\\nthe speed with which authorities respond to requests, the number of requests\\nwhich require a postal response and much more."
+msgstr ""
+
+msgid "This user has been banned from {{site_name}} "
+msgstr "Ovaj korisnik je isključen sa {{site_name}} "
+
+msgid "This was not possible because there is already an account using \\nthe email address {{email}}."
+msgstr "To nije bilo moguće jer već postoji račun koji koristi ovu e-mail adresu {{email}}."
+
+msgid "To cancel these alerts"
+msgstr "Da biste poništili ova upozorenja"
+
+msgid "To cancel this alert"
+msgstr "Da biste poništili ovo upozorenje"
+
+msgid "To carry on, you need to sign in or make an account. Unfortunately, there\\nwas a technical problem trying to do this."
+msgstr ""
+"Da biste nastavili,morate se prijaviti ili registrovati. Nažalost, problem\n"
+"tehničke prirode se pojavio pri pokušaju navedenog."
+
+msgid "To change your email address used on {{site_name}}"
+msgstr "Da biste promijenili Vašu e-mail adresu korištenu na {{site_name}}"
+
+msgid "To classify the response to this FOI request"
+msgstr "Da biste klasificirali odgovor na ovaj Zahtjev za slobodan pristup informacijama"
+
+msgid "To do that please send a private email to "
+msgstr "Da biste to uradili molimo pošaljite privatni e-mail "
+
+msgid "To do this, first click on the link below."
+msgstr "Da biste ovo uradili, prvo kliknite na link ispod."
+
+msgid "To download the zip file"
+msgstr "Da biste preuzeli zip fajl"
+
+msgid "To follow all successful requests"
+msgstr ""
+
+msgid "To follow new requests"
+msgstr ""
+
+msgid "To follow requests and responses matching your search"
+msgstr "Da biste pratili zahtjeve i odgovore koji se podudaraju sa Vašom pretragom"
+
+msgid "To follow requests by '{{user_name}}'"
+msgstr ""
+
+msgid "To follow requests made using {{site_name}} to the public authority '{{public_body_name}}'"
+msgstr ""
+
+msgid "To follow the request '{{request_title}}'"
+msgstr ""
+
+msgid "To help us keep the site tidy, someone else has updated the status of the \\n{{law_used_full}} request {{title}} that you made to {{public_body}}, to \"{{display_status}}\" If you disagree with their categorisation, please update the status again yourself to what you believe to be more accurate."
+msgstr ""
+
+msgid "To let everyone know, follow this link and then select the appropriate box."
+msgstr ""
+
+msgid "To log into the administrative interface"
+msgstr ""
+
+msgid "To play the request categorisation game"
+msgstr "Da biste igrali igru kategorizacije zahtjeva"
+
+msgid "To post your annotation"
+msgstr "Da biste postavili Vašu napomenu"
+
+msgid "To reply to "
+msgstr "Da biste odgovorili "
+
+msgid "To report this request"
+msgstr ""
+
+msgid "To send a follow up message to "
+msgstr "Da biste polali prateću poruku za "
+
+msgid "To send a message to "
+msgstr "Da biste poslali poruku za "
+
+msgid "To send your FOI request"
+msgstr "Da biste poslali Vaš Zahtjev za slobodan pristup informacijama."
+
+msgid "To update the status of this FOI request"
+msgstr "Da biste ažurirali status Vašeg Zahtjeva za slobodan pristup informacijama."
+
+msgid "To upload a response, you must be logged in using an email address from "
+msgstr "Da biste postavili odgovor, morate biti prijavljeni koristeći pritom e-mail adresu sa"
+
+msgid "To use the advanced search, combine phrases and labels as described in the search tips below."
+msgstr "Da biste koristili napredno pretraživanje, kombinujte fraze i oznake kao što je opisano u savjetima za pretragu ispod."
+
+msgid "To view the email address that we use to send FOI requests to {{public_body_name}}, please enter these words."
+msgstr "Da biste vidjeli e-mail adresu koju koristimo za slanje Zahtjeva za slobodan pristup informacijama prema {{public_body_name}}, molimo unesite ove riječi.."
+
+msgid "To view the response, click on the link below."
+msgstr "Da biste vidjeli odgovor, kliknite na link ispod."
+
+msgid "To {{public_body_link_absolute}}"
+msgstr "Za {{public_body_link_absolute}}"
+
+msgid "To:"
+msgstr "Za:"
+
+msgid "Today"
+msgstr "Danas"
+
+msgid "Too many requests"
+msgstr ""
+
+msgid "Top search results:"
+msgstr "Glavni rezultati pretrage"
+
+msgid "Track thing"
+msgstr ""
+
+msgid "Track this person"
+msgstr "Prati ovu osobu"
+
+msgid "Track this search"
+msgstr "Pratite ovu pretragu."
+
+msgid "TrackThing|Track medium"
+msgstr ""
+
+msgid "TrackThing|Track query"
+msgstr ""
+
+msgid "TrackThing|Track type"
+msgstr ""
+
+msgid "Turn off email alerts"
+msgstr ""
+
+msgid "Tweet this request"
+msgstr "Tweetuj ovaj zahtjev"
+
+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 "Ukucajte <strong><code>01/01/2008..14/01/2008</code></strong> da prikažete samo ono što se dešavalo u prve dvije sedmice januara."
+
+msgid "URL name can't be blank"
+msgstr "Ime URL-a ne može ostati prazno "
+
+msgid "Unable to change email address on {{site_name}}"
+msgstr "Nemoguće promijeniti e-mail adresu na {{site_name}}"
+
+msgid "Unable to send a reply to {{username}}"
+msgstr "Ne možemo poslati poruku za {{username}}"
+
+msgid "Unable to send follow up message to {{username}}"
+msgstr "Ne možemo poslati popratnu pokuku za {{username}}"
+
+msgid "Unexpected search result type"
+msgstr ""
+
+msgid "Unexpected search result type "
+msgstr ""
+
+msgid "Unfortunately we don't know the FOI\\nemail address for that authority, so we can't validate this.\\nPlease <a href=\"{{url}}\">contact us</a> to sort it out."
+msgstr ""
+"Nažalost nismo u posjedu e-mail adrese za ZOSPI\n"
+"te ustanove, tako da nismo u mogućnosti validirati ovo.\n"
+"Molimo <a href=\"{{url}}\">kontaktirajte nas</a> da to razjasnimo."
+
+msgid "Unfortunately, we do not have a working {{info_request_law_used_full}}\\naddress for"
+msgstr ""
+"Nažalost, ne posjedujemo ispravnu {{info_request_law_used_full}}\n"
+"adresu za"
+
+msgid "Unknown"
+msgstr "Nepoznat"
+
+msgid "Unsubscribe"
+msgstr ""
+
+msgid "Unusual response."
+msgstr "Neobičan odgovor."
+
+msgid "Update the status of this request"
+msgstr "Ažurirajte status ovog zahtjeva"
+
+msgid "Update the status of your request to "
+msgstr "Ažurirajte status Vašeg zahtjeva"
+
+msgid "Upload FOI response"
+msgstr ""
+
+msgid "Use OR (in capital letters) where you don't mind which word, e.g. <strong><code>commons OR lords</code></strong>"
+msgstr ""
+
+msgid "Use quotes when you want to find an exact phrase, e.g. <strong><code>\"Liverpool City Council\"</code></strong>"
+msgstr "Koristite navodnike kada želite naći tačne fraze, npr. <strong><code>\"Liverpool City Council\"</code></strong>"
+
+msgid "User"
+msgstr ""
+
+msgid "User info request sent alert"
+msgstr ""
+
+msgid "User – {{name}}"
+msgstr ""
+
+msgid "UserInfoRequestSentAlert|Alert type"
+msgstr ""
+
+msgid "User|About me"
+msgstr "Korisnik|O meni"
+
+msgid "User|Address"
+msgstr ""
+
+msgid "User|Admin level"
+msgstr "Korisnik|Administratorski nivo"
+
+msgid "User|Ban text"
+msgstr "Korisnik|tekst isključenja"
+
+msgid "User|Dob"
+msgstr ""
+
+msgid "User|Email"
+msgstr "Korisnik|E-mail"
+
+msgid "User|Email bounce message"
+msgstr ""
+
+msgid "User|Email bounced at"
+msgstr ""
+
+msgid "User|Email confirmed"
+msgstr "Korisnik | E-mail potvrđen"
+
+msgid "User|Hashed password"
+msgstr "Korisnik|Hashed password"
+
+msgid "User|Last daily track email"
+msgstr "Korisnik|Last daily track email"
+
+msgid "User|Locale"
+msgstr ""
+
+msgid "User|Name"
+msgstr "Korisnik|Ime"
+
+msgid "User|No limit"
+msgstr ""
+
+msgid "User|Receive email alerts"
+msgstr ""
+
+msgid "User|Salt"
+msgstr "Korisnik|Salt"
+
+msgid "User|Url name"
+msgstr "Korisnik|Url ime"
+
+msgid "Version {{version}}"
+msgstr ""
+
+msgid "View FOI email address"
+msgstr "Vidjeti adresu za Zahtjeve za slobodan pristup informacijama."
+
+msgid "View FOI email address for '{{public_body_name}}'"
+msgstr "Vidjeti ZOSPI e-mail za '{{public_body_name}}'"
+
+msgid "View FOI email address for {{public_body_name}}"
+msgstr "Pogledati ZOSPI e-mail adrese za {{public_body_name}}"
+
+msgid "View Freedom of Information requests made by {{user_name}}:"
+msgstr "Pegledati Zahjeve za slobodan pristup informacijama napravljene od strane {{user_name}}:"
+
+msgid "View and search requests"
+msgstr "Pregledaj i pretraži zahtjeve"
+
+msgid "View authorities"
+msgstr "Vidjeti ustanove"
+
+msgid "View email"
+msgstr "Pogledati e-mail"
+
+msgid "View requests"
+msgstr "Vidjeti zahtjeve"
+
+msgid "Waiting clarification."
+msgstr "Čekamo na objašnjenje."
+
+msgid "Waiting for an <strong>internal review</strong> by {{public_body_link}} of their handling of this request."
+msgstr ""
+
+msgid "Waiting for the public authority to complete an internal review of their handling of the request"
+msgstr ""
+
+msgid "Waiting for the public authority to reply"
+msgstr "Čekamo na odgovor javne ustanove"
+
+msgid "Was the response you got to your FOI request any good?"
+msgstr "Da li je odgovor koji ste dobili na Vaš Zahtjev o slobodnom pristupu informacijama bio od ikakve koristi?"
+
+msgid "We consider it is not a valid FOI request, and have therefore hidden it from other users."
+msgstr ""
+
+msgid "We consider it to be vexatious, and have therefore hidden it from other users."
+msgstr ""
+
+msgid "We do not have a working request email address for this authority."
+msgstr "Ne posjedujemo ispravnu e-mail adresu za zahtjeve ove ustanove."
+
+msgid "We do not have a working {{law_used_full}} address for {{public_body_name}}."
+msgstr "Nemamo ispravnu {{law_used_full}} adresu za {{public_body_name}}."
+
+msgid "We don't know whether the most recent response to this request contains\\n information or not\\n &ndash;\\n\tif you are {{user_link}} please <a href=\"{{url}}\">sign in</a> and let everyone know."
+msgstr ""
+"Ne znamo da li najnoviji odgovor na ovaj zahtjev sadrži\n"
+" informacije ili ne\n"
+" &ndash;\n"
+"<span class=\"whitespace other\" title=\"Tab\">»</span>ako ste {{user_link}} molimo <a href=\"{{url}}\">prijavite se</a> i obavijestite sviju."
+
+msgid "We will not reveal your email address to anybody unless you or\\n the law tell us to (<a href=\"{{url}}\">details</a>). "
+msgstr ""
+
+msgid "We will not reveal your email address to anybody unless you\\nor the law tell us to."
+msgstr ""
+"Nećemo prikazati Vašu e-mail adresu nikome sem ako nam Vi\n"
+"ili zakon to budete zahtijevali."
+
+msgid "We will not reveal your email addresses to anybody unless you\\nor the law tell us to."
+msgstr ""
+"Nećemo prikazati Vašu e-mail adresu nikome sem ako nam Vi\n"
+"ili zakon to budete zahtijevali."
+
+msgid "We're waiting for"
+msgstr "Čekamo na vas"
+
+msgid "We're waiting for someone to read"
+msgstr "Čekamo da neko pročita"
+
+msgid "We've sent an email to your new email address. You'll need to click the link in\\nit before your email address will be changed."
+msgstr ""
+"Poslali smo e-mail na Vašu novu e-mail adresu. Morati ćete kliknuti na link u\n"
+"njemu prije nego Vaša adresa bude izmjenjena."
+
+msgid "We've sent you an email, and you'll need to click the link in it before you can\\ncontinue."
+msgstr ""
+"Poslali smo Vam e-mail, trebate kliknuti na link u njemu prije nego što \n"
+"nastavite."
+
+msgid "We've sent you an email, click the link in it, then you can change your password."
+msgstr "Poslali smo Vam e-mail, kliknite na link u njemu, onda ćete moći promjeniti Vaš password."
+
+msgid "What are you doing?"
+msgstr "Šta radite?"
+
+msgid "What best describes the status of this request now?"
+msgstr "Šta najbolje opisuje status ovog zahtjeva sada?"
+
+msgid "What information has been released?"
+msgstr ""
+
+msgid "What information has been requested?"
+msgstr ""
+
+msgid "When you get there, please update the status to say if the response \\ncontains any useful information."
+msgstr ""
+"Kada dođete do toga, molimo ažurirajte status da nam kažete da li \n"
+"je odgovor sadržavao korisne informacije."
+
+msgid "When you receive the paper response, please help\\n others find out what it says:"
+msgstr ""
+"Kada dobijete printanu kopiju, molimo pomozite\n"
+" drugima da saznaju njen sadržaj:"
+
+msgid "When you're done, <strong>come back here</strong>, <a href=\"{{url}}\">reload this page</a> and file your new request."
+msgstr "Kada završite, <strong>vratite se ovdje</strong>, <a href=\"{{url}}\">učitajte ponovo ovu stranicu</a> i spremite Vaš novi zahtjev."
+
+msgid "Which of these is happening?"
+msgstr "Šta se od ovoga događa?"
+
+msgid "Who can I request information from?"
+msgstr "Od koga mogu tražiti informacije?"
+
+msgid "Withdrawn by the requester."
+msgstr "Povučeno od strane podnosioca zahtjeva."
+
+msgid "Wk"
+msgstr ""
+
+msgid "Would you like to see a website like this in your country?"
+msgstr "Da li biste htjeli vidjeti ovakvu web stranicu u Vašoj zemlji?"
+
+msgid "Write a reply"
+msgstr "Napisati odgovor"
+
+msgid "Write a reply to "
+msgstr "napišite odgovor za"
+
+msgid "Write your FOI follow up message to "
+msgstr "Napišite Vašu prateću poruku Zahtjeva za slobodan pristup informacijama za "
+
+msgid "Write your request in <strong>simple, precise language</strong>."
+msgstr "Pišite Vaš zahtjev <strong>jednostavnim, preciznim jezikom</strong>."
+
+msgid "You"
+msgstr "Vi"
+
+msgid "You are already following new requests"
+msgstr ""
+
+msgid "You are already following requests to {{public_body_name}}"
+msgstr ""
+
+msgid "You are already following things matching this search"
+msgstr ""
+
+msgid "You are already following this person"
+msgstr ""
+
+msgid "You are already following this request"
+msgstr ""
+
+msgid "You are already following updates about {{track_description}}"
+msgstr ""
+
+msgid "You are currently receiving notification of new activity on your wall by email."
+msgstr ""
+
+msgid "You are following all new successful responses"
+msgstr ""
+
+msgid "You are no longer following {{track_description}}."
+msgstr ""
+
+msgid "You are now <a href=\"{{wall_url_user}}\">following</a> updates about {{track_description}}"
+msgstr ""
+
+msgid "You can <strong>complain</strong> by"
+msgstr "Možete se <strong>žaliti</strong> tako što ćete"
+
+msgid "You can change the requests and users you are following on <a href=\"{{profile_url}}\">your profile page</a>."
+msgstr ""
+
+msgid "You can get this page in computer-readable format as part of the main JSON\\npage for the request. See the <a href=\"{{api_path}}\">API documentation</a>."
+msgstr ""
+
+msgid "You can only request information about the environment from this authority."
+msgstr "Možete samo zahtijevati informacije o okolišu od ove ustanove."
+
+msgid "You have a new response to the {{law_used_full}} request "
+msgstr "Imate novi odgovor na {{law_used_full}} zahtjev "
+
+msgid "You have found a bug. Please <a href=\"{{contact_url}}\">contact us</a> to tell us about the problem"
+msgstr "Pronašli ste programsku grešku. Molimo <a href=\"{{contact_url}}\">kontaktirajte nas</a> da nam ukažete na problem"
+
+msgid "You have hit the rate limit on new requests. Users are ordinarily limited to {{max_requests_per_user_per_day}} requests in any rolling 24-hour period. You will be able to make another request in {{can_make_another_request}}."
+msgstr ""
+
+msgid "You have made no Freedom of Information requests using this site."
+msgstr "Niste podnijeli nijedan Zahtjev za slobodan pristup informacijama koristeći ovu web stranicu. "
+
+msgid "You have now changed the text about you on your profile."
+msgstr "Sada ste promijenili tekst o Vama na Vašem profilu."
+
+msgid "You have now changed your email address used on {{site_name}}"
+msgstr "Sada ste promijenili Vašu e-mail adresu korištenu na {{site_name}}"
+
+msgid "You just tried to sign up to {{site_name}}, when you\\nalready have an account. Your name and password have been\\nleft as they previously were.\\n\\nPlease click on the link below."
+msgstr ""
+"Probali ste da se registrujete {{site_name}}, mada već\n"
+"imate račun. Vaše ime i password su ostali\n"
+"isti kao prije.\n"
+"\n"
+"Molimo kliknite na link ispod."
+
+msgid "You know what caused the error, and can <strong>suggest a solution</strong>, such as a working email address."
+msgstr "Znate šta je uzrok greške i možete <strong>predložiti rješenje</strong>, poput ispravne e-mail adrese."
+
+msgid "You may <strong>include attachments</strong>. If you would like to attach a\\n file too large for email, use the form below."
+msgstr ""
+
+msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"{{url}}\">send it to us</a>."
+msgstr ""
+"Moguće je da je nađete\n"
+" na njihovoj web stranici, ili putem telefonskog poziva. Ako uspijete\n"
+" da je nađete, onda molimo <a href=\"{{url}}\">da nam je pošaljete</a>."
+
+msgid "You may be able to find\\none on their website, or by phoning them up and asking. If you manage\\nto find one, then please <a href=\"{{help_url}}\">send it to us</a>."
+msgstr ""
+"Možete ga naći\n"
+"na njihovoj web-stranici, ili ih pitati putem telefona. Ako ga uspijete\n"
+"naći, tada molimo <a href=\"{{help_url}}\">pošaljite nam ga</a>."
+
+msgid "You need to be logged in to change the text about you on your profile."
+msgstr "Morate biti prijavljeni ukoliko želite mjenjati tekst o Vama na Vašem profilu."
+
+msgid "You need to be logged in to change your profile photo."
+msgstr "Morate biti prijavljeni ukoliko želite mjenjati sliku na Vašem profilu."
+
+msgid "You need to be logged in to clear your profile photo."
+msgstr "Morate biti prijavljeni ukoliko želite izbrisati sliku na Vašem profilu."
+
+msgid "You need to be logged in to edit your profile."
+msgstr ""
+
+msgid "You need to be logged in to report a request for administrator attention"
+msgstr ""
+
+msgid "You previously submitted that exact follow up message for this request."
+msgstr "Prethodno ste predali istu popratnu poruku za ovaj zahtjev."
+
+msgid "You should have received a copy of the request by email, and you can respond\\n by <strong>simply replying</strong> to that email. For your convenience, here is the address:"
+msgstr ""
+
+msgid "You want to <strong>give your postal address</strong> to the authority in private."
+msgstr "Želite da <strong>date vašu poštansku adresu</strong> isključivo ustanovi."
+
+msgid "You will be unable to make new requests, send follow ups, add annotations or\\nsend messages to other users. You may continue to view other requests, and set\\nup\\nemail alerts."
+msgstr ""
+
+msgid "You will no longer be emailed updates for those alerts"
+msgstr "Više vam nećemo slati ažuriranja za ova upozorenja"
+
+msgid "You will now be emailed updates about {{track_description}}. <a href=\"{{change_email_alerts_url}}\">Prefer not to receive emails?</a>"
+msgstr ""
+
+msgid "You will only get an answer to your request if you follow up\\nwith the clarification."
+msgstr ""
+
+msgid "You will still be able to view it while logged in to the site. Please reply to this email if you would like to discuss this decision further."
+msgstr ""
+
+msgid "You're in. <a href=\"#\" id=\"send-request\">Continue sending your request</a>"
+msgstr ""
+
+msgid "You're long overdue a response to your FOI request - "
+msgstr ""
+
+msgid "You're not following anything."
+msgstr ""
+
+msgid "You've now cleared your profile photo"
+msgstr "Sada ste izbrisali sliku na Vašem profilu"
+
+msgid "Your <strong>name will appear publicly</strong>\\n (<a href=\"{{why_url}}\">why?</a>)\\n on this website and in search engines. If you\\n are thinking of using a pseudonym, please\\n <a href=\"{{help_url}}\">read this first</a>."
+msgstr ""
+
+msgid "Your annotations"
+msgstr "Vaše napomene"
+
+msgid "Your details, including your email address, have not been given to anyone."
+msgstr ""
+
+msgid "Your e-mail:"
+msgstr "Vaš e-mail:"
+
+msgid "Your follow up has not been sent because this request has been stopped to prevent spam. Please <a href=\"{{url}}\">contact us</a> if you really want to send a follow up message."
+msgstr ""
+
+msgid "Your follow up message has been sent on its way."
+msgstr "Vaša prateća poruka je na putu."
+
+msgid "Your internal review request has been sent on its way."
+msgstr "Vaša urgencija je na putu."
+
+msgid "Your message has been sent. Thank you for getting in touch! We'll get back to you soon."
+msgstr "Vaša poruka je poslana. Hvala na javljanju! Ubrzo ćemo odgovoriti."
+
+msgid "Your message to {{recipient_user_name}} has been sent"
+msgstr ""
+
+msgid "Your message to {{recipient_user_name}} has been sent!"
+msgstr "Vaša poruka za {{recipient_user_name}} je poslana!"
+
+msgid "Your message will appear in <strong>search engines</strong>"
+msgstr "Vaša poruka će se pojaviti u <strong>pretraživačima</strong>"
+
+msgid "Your name and annotation will appear in <strong>search engines</strong>."
+msgstr "Vaše ime i napomena će se pojaviti u <strong>pretraživačima</strong>."
+
+msgid "Your name, request and any responses will appear in <strong>search engines</strong>\\n (<a href=\"{{url}}\">details</a>)."
+msgstr ""
+"Vaše ime, zahtjev i sve poruke će se pojaviti u <strong>pretraživačima</strong>\n"
+" (<a href=\"{{url}}\">Više informacija</a>)."
+
+msgid "Your name:"
+msgstr "Vaše ime:"
+
+msgid "Your original message is attached."
+msgstr "Vaša originalna poruka je pridružena."
+
+msgid "Your password has been changed."
+msgstr "Vaš password je promijenjen."
+
+msgid "Your password:"
+msgstr "Vaš password:"
+
+msgid "Your photo will be shown in public <strong>on the Internet</strong>,\\n wherever you do something on {{site_name}}."
+msgstr ""
+
+msgid "Your request '{{request}}' at {{url}} has been reviewed by moderators."
+msgstr ""
+
+msgid "Your request on {{site_name}} hidden"
+msgstr ""
+
+msgid "Your request was called {{info_request}}. Letting everyone know whether you got the information will help us keep tabs on"
+msgstr "Naziv Vašeg zahtjeva je {{info_request}}. Obavijest o tome da li ste dobili odgovor će nam pomoći da bolje pratimo."
+
+msgid "Your request:"
+msgstr "Vaš zahtjev:"
+
+msgid "Your response to an FOI request was not delivered"
+msgstr ""
+
+msgid "Your response will <strong>appear on the Internet</strong>, <a href=\"{{url}}\">read why</a> and answers to other questions."
+msgstr "Vaš odgovor će se <strong>pojaviti na Internetu</strong>, <a href=\"{{url}}\">pročitajte zašto</a> i odgovore na druga pitanja."
+
+msgid "Your thoughts on what the {{site_name}} <strong>administrators</strong> should do about the request."
+msgstr "Vaše mišljenje o tome šta administratori {{site_name}} trebaju da rade po pitanju zahtjeva."
+
+msgid "Your {{count}} Freedom of Information request"
+msgid_plural "Your {{count}} Freedom of Information requests"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+msgid "Your {{count}} annotation"
+msgid_plural "Your {{count}} annotations"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+msgid "Your {{site_name}} email alert"
+msgstr "Vaše {{site_name}} e-mail upozorenje"
+
+msgid "Yours faithfully,"
+msgstr "S poštovanjem,"
+
+msgid "Yours sincerely,"
+msgstr "S poštovanjem,"
+
+msgid "Yours,"
+msgstr ""
+
+msgid "[FOI #{{request}} email]"
+msgstr ""
+
+msgid "[{{public_body}} request email]"
+msgstr ""
+
+msgid "[{{site_name}} contact email]"
+msgstr ""
+
+msgid "\\n\\n[ {{site_name}} note: The above text was badly encoded, and has had strange characters removed. ]"
+msgstr ""
+
+msgid "a one line summary of the information you are requesting, \\n\t\t\te.g."
+msgstr ""
+"sažetak informacije koju tražite u jednoj rečenici , \n"
+"<span class=\"whitespace other\" title=\"Tab\">»</span><span class=\"whitespace other\" title=\"Tab\">»</span><span class=\"whitespace other\" title=\"Tab\">»</span>npr."
+
+msgid "admin"
+msgstr "administrator"
+
+msgid "alaveteli_foi:The software that runs {{site_name}}"
+msgstr ""
+
+msgid "all requests"
+msgstr "svi zahtjevi"
+
+msgid "also called {{public_body_short_name}}"
+msgstr "takođe poznat/a kao {{public_body_short_name}}"
+
+msgid "an anonymous user"
+msgstr ""
+
+msgid "and"
+msgstr "i"
+
+msgid "and update the status accordingly. Perhaps <strong>you</strong> might like to help out by doing that?"
+msgstr "i ažurirajte status po tome. Možda <strong>biste</strong> htjeli pomoći radeći to?"
+
+msgid "and update the status."
+msgstr "i ažurirajte status."
+
+msgid "and we'll suggest <strong>what to do next</strong>"
+msgstr "i mi ćemo predložiti <strong>šta raditi dalje</strong>"
+
+msgid "any <a href=\"/list\">new requests</a>"
+msgstr "svi <a href=\"/list\">novi zahtjevi</a>"
+
+msgid "any <a href=\"/list/successful\">successful requests</a>"
+msgstr "svi <a href=\"/list/successful\">uspješni zahtjevi</a>"
+
+msgid "anything"
+msgstr "bilo šta"
+
+msgid "are long overdue."
+msgstr "kasne"
+
+msgid "at"
+msgstr ""
+
+msgid "authorities"
+msgstr "ustanove"
+
+msgid "awaiting a response"
+msgstr ""
+
+msgid "beginning with ‘{{first_letter}}’"
+msgstr ""
+
+msgid "between two dates"
+msgstr "između dva datuma"
+
+msgid "but followupable"
+msgstr ""
+
+msgid "by"
+msgstr "od strane"
+
+msgid "by <strong>{{date}}</strong>"
+msgstr "od strane <strong>{{date}}</strong>"
+
+msgid "by {{public_body_name}} to {{info_request_user}} on {{date}}."
+msgstr "od strane {{public_body_name}} za {{info_request_user}} na datum {{date}}."
+
+msgid "by {{user_link_absolute}}"
+msgstr "od strane {{user_link_absolute}}"
+
+msgid "comments"
+msgstr "komentari"
+
+msgid "containing your postal address, and asking them to reply to this request.\\n Or you could phone them."
+msgstr ""
+"sa Vašom poštanskom adresom, tražite da odgovore na ovaj zahtjev.\n"
+" Ili ih možete kontaktirati putem telefona."
+
+msgid "details"
+msgstr "detalji"
+
+msgid "display_status only works for incoming and outgoing messages right now"
+msgstr ""
+
+msgid "during term time"
+msgstr ""
+
+msgid "edit text about you"
+msgstr "uredite tekst o Vama"
+
+msgid "even during holidays"
+msgstr "i za vrijeme praznika"
+
+msgid "everything"
+msgstr "sve"
+
+msgid "external"
+msgstr ""
+
+msgid "has reported an"
+msgstr "je prijavio/la"
+
+msgid "have delayed."
+msgstr "je odgodio/la"
+
+msgid "hide quoted sections"
+msgstr ""
+
+msgid "in term time"
+msgstr ""
+
+msgid "in the category ‘{{category_name}}’"
+msgstr ""
+
+msgid "internal error"
+msgstr "interna greška"
+
+msgid "internal reviews"
+msgstr "urgencije"
+
+msgid "is <strong>waiting for your clarification</strong>."
+msgstr "<strong>čeka na Vaše objašnjenje</strong>."
+
+msgid "just to see how it works"
+msgstr "samo da vidite kako radi"
+
+msgid "left an annotation"
+msgstr "ostavio napomenu"
+
+msgid "made."
+msgstr ""
+
+msgid "matching the tag ‘{{tag_name}}’"
+msgstr ""
+
+msgid "messages from authorities"
+msgstr "poruke od ustanova"
+
+msgid "messages from users"
+msgstr "poruke od korisnika"
+
+msgid "move..."
+msgstr ""
+
+msgid "no later than"
+msgstr "ne kasnije od"
+
+msgid "no longer exists. If you are trying to make\\n From the request page, try replying to a particular message, rather than sending\\n a general followup. If you need to make a general followup, and know\\n an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
+msgstr ""
+
+msgid "normally"
+msgstr ""
+
+msgid "not requestable due to: {{reason}}"
+msgstr ""
+
+msgid "please sign in as "
+msgstr "molimo prijavite se kao "
+
+msgid "requesting an internal review"
+msgstr "zahtjeva urgenciju"
+
+msgid "requests"
+msgstr "zahtjevi"
+
+msgid "requests which are {{list_of_statuses}}"
+msgstr "zahtjevi koji su {{list_of_statuses}}"
+
+msgid "response as needing administrator attention. Take a look, and reply to this\\nemail to let them know what you are going to do about it."
+msgstr ""
+
+msgid "send a follow up message"
+msgstr "pošaljite prateću poruku"
+
+msgid "sent to {{public_body_name}} by {{info_request_user}} on {{date}}."
+msgstr "poslano za {{public_body_name}} od strane {{info_request_user}} na datum {{date}}."
+
+msgid "set to <strong>blank</strong> (empty string) if can't find an address; these emails are <strong>public</strong> as anyone can view with a CAPTCHA"
+msgstr ""
+
+msgid "show quoted sections"
+msgstr ""
+
+msgid "sign in"
+msgstr "prijavite se"
+
+msgid "simple_date_format"
+msgstr ""
+
+msgid "successful"
+msgstr "uspješni"
+
+msgid "successful requests"
+msgstr "uspješni zahtjevi"
+
+msgid "that you made to"
+msgstr ""
+
+msgid "the main FOI contact address for {{public_body}}"
+msgstr "glavne kontakt adrese za Zahtjeve o slobodnom pristupu informacijama za {{public_body}}"
+
+#. This phrase completes the following sentences:
+#. Request an internal review from...
+#. Send a public follow up message to...
+#. Send a public reply to...
+#. Don't want to address your message to... ?
+msgid "the main FOI contact at {{public_body}}"
+msgstr "glavni kontakt za Zahtjeve o slobodnom pristupu informacijama u ustanovi {{public_body}}"
+
+msgid "the requester"
+msgstr ""
+
+msgid "the {{site_name}} team"
+msgstr "{{site_name}} tim"
+
+msgid "to read"
+msgstr "za čitati"
+
+msgid "to send a follow up message."
+msgstr "poslati prateću poruku."
+
+msgid "to {{public_body}}"
+msgstr "za {{public_body}}"
+
+msgid "unexpected prominence on request event"
+msgstr ""
+
+msgid "unknown reason "
+msgstr "nepoznat razlog "
+
+msgid "unknown status "
+msgstr "nepoznat status "
+
+msgid "unresolved requests"
+msgstr "neriješeni zahtjevi"
+
+msgid "unsubscribe"
+msgstr "prekinuti pretplatu"
+
+msgid "unsubscribe all"
+msgstr "prekinuti pretplatu na sve"
+
+msgid "unsuccessful"
+msgstr "neuspješni"
+
+msgid "unsuccessful requests"
+msgstr "neuspješni zahtjevi"
+
+msgid "useful information."
+msgstr "korisna informacija"
+
+msgid "users"
+msgstr "korisnici"
+
+msgid "what's that?"
+msgstr "šta je to?"
+
+msgid "{{count}} FOI requests found"
+msgstr "{{count}} Zahtjeva za slobodan pristup informacijama pronađeno"
+
+msgid "{{count}} Freedom of Information request to {{public_body_name}}"
+msgid_plural "{{count}} Freedom of Information requests to {{public_body_name}}"
+msgstr[0] "{{count}} Freedom of Information requests to {{public_body_name}}"
+msgstr[1] "{{count}} Freedom of Information requests to {{public_body_name}}"
+msgstr[2] "{{count}} Freedom of Information requests to {{public_body_name}}"
+
+msgid "{{count}} person is following this authority"
+msgid_plural "{{count}} people are following this authority"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+msgid "{{count}} request"
+msgid_plural "{{count}} requests"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+msgid "{{count}} request made."
+msgid_plural "{{count}} requests made."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+msgid "{{existing_request_user}} already\\n created the same request on {{date}}. You can either view the <a href=\"{{existing_request}}\">existing request</a>,\\n or edit the details below to make a new but similar request."
+msgstr ""
+
+msgid "{{info_request_user_name}} only:"
+msgstr "{{info_request_user_name}} samo:"
+
+msgid "{{law_used_full}} request - {{title}}"
+msgstr ""
+
+msgid "{{law_used_full}} request GQ - {{title}}"
+msgstr ""
+
+msgid "{{law_used}} requests at {{public_body}}"
+msgstr ""
+
+msgid "{{length_of_time}} ago"
+msgstr "prije {{length_of_time}}"
+
+msgid "{{list_of_things}} matching text '{{search_query}}'"
+msgstr ""
+
+msgid "{{number_of_comments}} comments"
+msgstr "{{number_of_comments}} komentara"
+
+msgid "{{public_body_link}} answered a request about"
+msgstr ""
+
+msgid "{{public_body_link}} was sent a request about"
+msgstr ""
+
+msgid "{{public_body_name}} only:"
+msgstr "{{public_body_name}} samo:"
+
+msgid "{{public_body}} has asked you to explain part of your {{law_used}} request."
+msgstr ""
+
+msgid "{{public_body}} sent a response to {{user_name}}"
+msgstr "{{public_body}} je poslao/la poruku za {{user_name}}"
+
+msgid "{{reason}}, please sign in or make a new account."
+msgstr ""
+
+msgid "{{search_results}} matching '{{query}}'"
+msgstr ""
+
+msgid "{{site_name}} blog and tweets"
+msgstr "{{site_name}} blogovi i tweet-ovi"
+
+msgid "{{site_name}} covers requests to {{number_of_authorities}} authorities, including:"
+msgstr ""
+
+msgid "{{site_name}} sends new requests to <strong>{{request_email}}</strong> for this authority."
+msgstr "{{site_name}} šalje nove zahtjeve <strong>{{request_email}}</strong> za ovu javnu ustanovu."
+
+msgid "{{site_name}} users have made {{number_of_requests}} requests, including:"
+msgstr "korisnici {{site_name}} su podnijeli {{number_of_requests}} zahtjeva, uključujući:"
+
+msgid "{{thing_changed}} was changed from <code>{{from_value}}</code> to <code>{{to_value}}</code>"
+msgstr ""
+
+msgid "{{title}} - a Freedom of Information request to {{public_body}}"
+msgstr ""
+
+msgid "{{user_name}} (Account suspended)"
+msgstr ""
+
+msgid "{{user_name}} - Freedom of Information requests"
+msgstr ""
+
+msgid "{{user_name}} - user profile"
+msgstr ""
+
+msgid "{{user_name}} added an annotation"
+msgstr "{{user_name}} je dodao napomenu"
+
+msgid "{{user_name}} has annotated your {{law_used_short}} \\nrequest. Follow this link to see what they wrote."
+msgstr ""
+"{{user_name}} su komentarisali Vaš {{law_used_short}} \n"
+"zahtjev. Pratite ovaj link da vidite šta su napisali."
+
+msgid "{{user_name}} has used {{site_name}} to send you the message below."
+msgstr "{{user_name}} je koristio {{site_name}} da Vam pošalje poruku ispod."
+
+msgid "{{user_name}} sent a follow up message to {{public_body}}"
+msgstr ""
+
+msgid "{{user_name}} sent a request to {{public_body}}"
+msgstr "{{user_name}} je poslao zahtjev za {{public_body}}"
+
+msgid "{{username}} left an annotation:"
+msgstr "{{username}} je ostavio napomenu:"
+
+msgid "{{user}} ({{user_admin_link}}) made this {{law_used_full}} request (<a href=\"{{request_admin_url}}\">admin</a>) to {{public_body_link}} (<a href=\"{{public_body_admin_url}}\">admin</a>)"
+msgstr "{{user}} ({{user_admin_link}}) je podnio ovaj {{law_used_full}} zahtjev (<a href=\"{{request_admin_url}}\">admin</a>) za {{public_body_link}} (<a href=\"{{public_body_admin_url}}\">admin</a>)"
+
+msgid "{{user}} made this {{law_used_full}} request"
+msgstr "{{user}} je podnio/la ovaj {{law_used_full}} zahtjev"
diff --git a/locale/hr_HR/app.po b/locale/hr_HR/app.po
index 804599b4e..3fe2b1a3a 100644
--- a/locale/hr_HR/app.po
+++ b/locale/hr_HR/app.po
@@ -3,14 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# BojanOpacak <bojan@rationalinternational.net>, 2013
+# louisecrow <louise@mysociety.org>, 2013
# louisecrow <louise@mysociety.org>, 2013
msgid ""
msgstr ""
"Project-Id-Version: alaveteli\n"
"Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n"
-"POT-Creation-Date: 2013-05-30 09:46+0100\n"
-"PO-Revision-Date: 2013-06-12 21:09+0000\n"
-"Last-Translator: louisecrow <louise@mysociety.org>\n"
+"POT-Creation-Date: 2013-06-24 09:40-0700\n"
+"PO-Revision-Date: 2013-06-26 13:19+0000\n"
+"Last-Translator: BojanOpacak <bojan@rationalinternational.net>\n"
"Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/alaveteli/language/hr_HR/)\n"
"Language: hr_HR\n"
"MIME-Version: 1.0\n"
@@ -25,7 +27,7 @@ msgid " (<strong>no ranty</strong> politics, read our <a href=\"{{url}}\">modera
msgstr ""
msgid " (<strong>patience</strong>, especially for large files, it may take a while!)"
-msgstr ""
+msgstr "(<strong>strpljenje!</strong>, za veće datoteke može potrajati)"
msgid " (you)"
msgstr ""
@@ -40,7 +42,7 @@ msgid " <strong>Note:</strong>\\n We will send you an email. Follow the instr
msgstr ""
msgid " <strong>Privacy note:</strong> Your email address will be given to"
-msgstr ""
+msgstr "<strong>Privatnost:</strong> Vaša e-mail adresa će biti poslana"
msgid " <strong>Summarise</strong> the content of any information returned. "
msgstr ""
@@ -159,12 +161,18 @@ msgstr ""
msgid "<p>We recommend that you edit your request and remove the email address.\\n If you leave it, the email address will be sent to the authority, but will not be displayed on the site.</p>"
msgstr ""
+msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p>"
+msgstr ""
+
msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p><p>If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p>"
msgstr ""
msgid "<p>We're glad you got some of the information that you wanted. If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
msgstr ""
+msgid "<p>We're glad you got some of the information that you wanted.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
+msgstr ""
+
msgid "<p>You do not need to include your email in the request in order to get a reply (<a href=\"{{url}}\">details</a>).</p>"
msgstr ""
@@ -267,6 +275,9 @@ msgstr ""
msgid "A Freedom of Information request"
msgstr ""
+msgid "A full history of my FOI request and all correspondence is available on the Internet at this address: {{url}}"
+msgstr ""
+
msgid "A new request, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, was sent to {{public_body_name}} by {{info_request_user}} on {{date}}."
msgstr ""
@@ -735,6 +746,9 @@ msgstr ""
msgid "Filter"
msgstr ""
+msgid "First, did your other requests succeed?"
+msgstr ""
+
msgid "First, type in the <strong>name of the UK public authority</strong> you'd\\n like information from. <strong>By law, they have to respond</strong>\\n (<a href=\"{{url}}\">why?</a>)."
msgstr ""
@@ -930,6 +944,9 @@ msgstr ""
msgid "I am requesting an <strong>internal review</strong>"
msgstr ""
+msgid "I am writing to request an internal review of {{public_body_name}}'s handling of my FOI request '{{info_request_title}}'."
+msgstr ""
+
msgid "I don't like these ones &mdash; give me some more!"
msgstr ""
@@ -1227,18 +1244,15 @@ msgstr ""
msgid "MailServerLog|Order"
msgstr ""
-msgid "Make a new <strong>Environmental Information</strong> request"
-msgstr ""
-
-msgid "Make a new <strong>Freedom of Information</strong> request to {{public_body}}"
-msgstr ""
-
msgid "Make a new<br/>\\n <strong>Freedom <span>of</span><br/>\\n Information<br/>\\n request</strong>"
msgstr "Napravite novi <br/>\\n <strong>Sloboda><br/> informacije<br/>\\n zahtijevati</strong>"
msgid "Make a request"
msgstr ""
+msgid "Make a request to this authority"
+msgstr ""
+
msgid "Make an {{law_used_short}} request to '{{public_body_name}}'"
msgstr ""
@@ -1497,6 +1511,9 @@ msgstr ""
msgid "Please choose a file containing your photo."
msgstr ""
+msgid "Please choose a reason"
+msgstr ""
+
msgid "Please choose what sort of reply you are making."
msgstr ""
@@ -1578,6 +1595,9 @@ msgstr ""
msgid "Please only request information that comes under those categories, <strong>do not waste your\\n time</strong> or the time of the public authority by requesting unrelated information."
msgstr ""
+msgid "Please pass this on to the person who conducts Freedom of Information reviews."
+msgstr ""
+
msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
msgstr ""
@@ -1791,6 +1811,9 @@ msgstr ""
msgid "Report an offensive or unsuitable request"
msgstr ""
+msgid "Report request"
+msgstr ""
+
msgid "Report this request"
msgstr ""
@@ -2010,9 +2033,6 @@ msgstr ""
msgid "Special note for this authority!"
msgstr ""
-msgid "Start"
-msgstr ""
-
msgid "Start now &raquo;"
msgstr ""
@@ -2475,7 +2495,7 @@ msgstr ""
msgid "To reply to "
msgstr ""
-msgid "To report this FOI request"
+msgid "To report this request"
msgstr ""
msgid "To send a follow up message to "
@@ -2874,6 +2894,9 @@ msgstr ""
msgid "You need to be logged in to edit your profile."
msgstr ""
+msgid "You need to be logged in to report a request for administrator attention"
+msgstr ""
+
msgid "You previously submitted that exact follow up message for this request."
msgstr ""
diff --git a/locale/hu_HU/app.po b/locale/hu_HU/app.po
index cba0f0446..86574e9a4 100644
--- a/locale/hu_HU/app.po
+++ b/locale/hu_HU/app.po
@@ -4,13 +4,15 @@
#
# Translators:
# alaveteli_hu <alaveteli@atlatszo.hu>, 2012
+# alaveteli_hu <alaveteli@atlatszo.hu>, 2012
+# Ebatta <orsibatta@gmail.com>, 2013
# Ebatta <orsibatta@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: alaveteli\n"
"Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n"
-"POT-Creation-Date: 2013-05-30 09:46+0100\n"
-"PO-Revision-Date: 2013-05-30 08:54+0000\n"
+"POT-Creation-Date: 2013-06-24 09:40-0700\n"
+"PO-Revision-Date: 2013-06-24 16:52+0000\n"
"Last-Translator: louisecrow <louise@mysociety.org>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/alaveteli/language/hu_HU/)\n"
"Language: hu_HU\n"
@@ -181,12 +183,18 @@ msgstr ""
"<p>Javasoljuk, hogy módosítsa igénylését és távolítsa el az e-mail címet.\n"
" Amennyiben benne hagyja, az adatgazda megkapja az e-mail címet, a weboldalon azonban nem fog szerepelni.</p> "
+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>"
+msgstr ""
+
msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p><p>If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p>"
msgstr "<p>Örülünk, hogy megkapta az összes kért információt! Kérjük, készítsen feljegyzést az adatok felhasználásáról, és tegye azt közzé egy hozzászólásban! </p><p>Amennyiben a {{site_name}} weboldalt hasznosnak találta, <a href=\"{{donation_url}}\">adományával támogassa</a> az üzemeltető közhasznú szervezetet.</p>"
msgid "<p>We're glad you got some of the information that you wanted. If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
msgstr "<p>Örülünk, hogy megkapta a kért információk egy részét. Amennyiben a {{site_name}} weboldalt hasznosnak találta, <a href=\"{{donation_url}}\">adományával támogassa</a> a weboldalt üzemeltető jótékonysági szervezetet.</p><p>Amennyiben a hiányzó információkat is meg kívánja szerezni, a következőket kell tennie.</p> "
+msgid "<p>We're glad you got some of the information that you wanted.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
+msgstr ""
+
msgid "<p>You do not need to include your email in the request in order to get a reply (<a href=\"{{url}}\">details</a>).</p>"
msgstr "<p>Az igénylésben nem kell feltüntetnie e-mail címét ahhoz, hogy választ kapjon (<a href=\"{{url}}\">részletek</a>).</p> "
@@ -310,6 +318,9 @@ msgstr "A válasz <strong>összefoglalása</strong>, amennyiben azt postán kapt
msgid "A Freedom of Information request"
msgstr "Közérdekűadat-igénylés "
+msgid "A full history of my FOI request and all correspondence is available on the Internet at this address: {{url}}"
+msgstr ""
+
msgid "A new request, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, was sent to {{public_body_name}} by {{info_request_user}} on {{date}}."
msgstr "{{info_request_user}} új adatigénylést <em><a href=\"{{request_url}}\">{{request_title}}</a></em> küldött a(z) {{public_body_name}} részére {{date}} napon."
@@ -796,6 +807,9 @@ msgstr "Nem sikerült a képet a megfelelő méretre alakítani: {{cols}}x{{rows
msgid "Filter"
msgstr "Szűrő"
+msgid "First, did your other requests succeed?"
+msgstr ""
+
msgid "First, type in the <strong>name of the UK public authority</strong> you'd\\n like information from. <strong>By law, they have to respond</strong>\\n (<a href=\"{{url}}\">why?</a>)."
msgstr ""
"Először is keresse ki a KiMitTud adatbázisából azt az <strong>adatgazdát</strong>, amelyiktől \n"
@@ -1008,6 +1022,9 @@ msgstr "<strong>Új információt</strong> kérek "
msgid "I am requesting an <strong>internal review</strong>"
msgstr "<strong>Belső felülvizsgálatot</strong> kérek "
+msgid "I am writing to request an internal review of {{public_body_name}}'s handling of my FOI request '{{info_request_title}}'."
+msgstr ""
+
msgid "I don't like these ones &mdash; give me some more!"
msgstr "Ezek nem tetszenek — többet kérek! "
@@ -1335,12 +1352,6 @@ msgstr "MailServerLog|Line"
msgid "MailServerLog|Order"
msgstr "MailServerLog|Order"
-msgid "Make a new <strong>Environmental Information</strong> request"
-msgstr "Új <strong>környezeti információ</strong> igénylés "
-
-msgid "Make a new <strong>Freedom of Information</strong> request to {{public_body}}"
-msgstr "Készítsen új <strong>közérdekűadat-igénylést</strong>, és küldje el {{public_body}} részére!"
-
msgid "Make a new<br/>\\n <strong>Freedom <span>of</span><br/>\\n Information<br/>\\n request</strong>"
msgstr ""
"Új<br/><br/>\n"
@@ -1352,6 +1363,9 @@ msgstr ""
msgid "Make a request"
msgstr "Új igénylés"
+msgid "Make a request to this authority"
+msgstr ""
+
msgid "Make an {{law_used_short}} request to '{{public_body_name}}'"
msgstr "{{law_used_short}} igénylés létrehozása a(z) '{{public_body_name}}' részére "
@@ -1614,6 +1628,9 @@ msgstr ""
msgid "Please choose a file containing your photo."
msgstr "Továbblépés előtt válassza ki a feltölteni kívánt fényképet a számítógépéről!"
+msgid "Please choose a reason"
+msgstr ""
+
msgid "Please choose what sort of reply you are making."
msgstr "Válassza ki, hogy milyen jellegű választ ad. "
@@ -1702,6 +1719,9 @@ msgstr ""
"Csak olyan információt kérjen, amely a megadott kategóriákba esik. <strong>Ne pazarolja saját\n"
" idejét</strong> vagy a nyilvánosságét azzal, hogy ide nem tartozó információkat kér. "
+msgid "Please pass this on to the person who conducts Freedom of Information reviews."
+msgstr ""
+
msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
msgstr ""
"Sorban jelölje ki az egyes igényléseket, és <strong>jelezze mindannyiunk számára,</strong>\n"
@@ -1919,6 +1939,9 @@ msgstr "Visszaélés jelentése"
msgid "Report an offensive or unsuitable request"
msgstr "Sértő vagy nem alkalmas igénylés jelentése"
+msgid "Report request"
+msgstr ""
+
msgid "Report this request"
msgstr "Igénylés jelentése"
@@ -2146,9 +2169,6 @@ msgstr "Nem található az oldal "
msgid "Special note for this authority!"
msgstr "Egyéb megállapítások az adatgazdával kapcsolatban:"
-msgid "Start"
-msgstr "Mehet &raquo;"
-
msgid "Start now &raquo;"
msgstr "Máris kezdhetjük &raquo;"
@@ -2658,8 +2678,8 @@ msgstr "Ha hozzá szeretne szólni "
msgid "To reply to "
msgstr "Ha válaszolni kíván a következőnek:"
-msgid "To report this FOI request"
-msgstr "Közérdekűadat-igénylés jelentése"
+msgid "To report this request"
+msgstr ""
msgid "To send a follow up message to "
msgstr "Ha emlékeztető üzenetet szeretne küldeni a(z) "
@@ -3091,6 +3111,9 @@ msgstr "A profilkép törléséhez először be kell jelentkeznie. "
msgid "You need to be logged in to edit your profile."
msgstr "Profiljának módosításához be kell jelentkeznie."
+msgid "You need to be logged in to report a request for administrator attention"
+msgstr ""
+
msgid "You previously submitted that exact follow up message for this request."
msgstr "Korábban már beküldte ugyanezt a nyomon követési üzenetet erre az igénylésre vonatkozóan. "
diff --git a/locale/id/app.po b/locale/id/app.po
index 2dd368b4c..f17fadcc9 100644
--- a/locale/id/app.po
+++ b/locale/id/app.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: alaveteli\n"
"Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n"
-"POT-Creation-Date: 2013-05-30 09:46+0100\n"
-"PO-Revision-Date: 2013-05-30 08:54+0000\n"
+"POT-Creation-Date: 2013-06-24 09:40-0700\n"
+"PO-Revision-Date: 2013-06-24 16:52+0000\n"
"Last-Translator: louisecrow <louise@mysociety.org>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/alaveteli/language/id/)\n"
"Language: id\n"
@@ -200,12 +200,18 @@ msgstr ""
"<p>Kami menyarankan agar Anda mengedit permintaan Anda dan menghapus alamat email.\n"
" Jika Anda meninggalkannya, alamat email tersebut akan dikirimkan kepada otoritas, tetapi tidak akan ditampilkan di situs.</p>"
+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>"
+msgstr ""
+
msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p><p>If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p>"
msgstr "<p>Kami senang Anda memperoleh semua informasi yang Anda inginkan. Jika Anda menulis atau menggunakan informasi tersebut, mohon kembali ke situs ini dan menambahkan anotasi di bawah yang menyatakan apa yang Anda lakukan.</p><p>Jika Anda merasakan {{site_name}} berguna, <a href=\"{{donation_url}}\">berikanlah donasi</a> kepada badan amal yang mengelolanya.</p>"
msgid "<p>We're glad you got some of the information that you wanted. If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
msgstr "<p>Kami senang Anda memperoleh beberapa informasi yang Anda inginkan. Jika Anda merasakannya {{site_name}} berguna, <a href=\"{{donation_url}}\">berikanlah donasi</a> kepada badan amal yang mengelolanya.</p><p>Jika Anda ingin mencoba dan mendapatkan seluruh informasi tersebut, berikut apa yang harus dilakukan sekarang.</p>"
+msgid "<p>We're glad you got some of the information that you wanted.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
+msgstr ""
+
msgid "<p>You do not need to include your email in the request in order to get a reply (<a href=\"{{url}}\">details</a>).</p>"
msgstr "<p>Anda tidak perlu menyertakan email Anda dalam permintaan ini untuk mendapatkan balasan (<a href=\"{{url}}\">rincian</a>).</p>"
@@ -336,6 +342,9 @@ msgstr "Sebuah<strong>ringkasan</strong> dari respon jika Anda telah menerimanya
msgid "A Freedom of Information request"
msgstr "Permintaan Freedom of Information"
+msgid "A full history of my FOI request and all correspondence is available on the Internet at this address: {{url}}"
+msgstr ""
+
msgid "A new request, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, was sent to {{public_body_name}} by {{info_request_user}} on {{date}}."
msgstr "Sebuah permintaan baru, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, telah dikirim kepada {{public_body_name}} oleh {{info_request_user}} pada {{date}}."
@@ -826,6 +835,9 @@ msgstr "Tidak berhasil mengubah gambar ke ukuran yang tepat: pada {{cols}}x{{row
msgid "Filter"
msgstr "Filter"
+msgid "First, did your other requests succeed?"
+msgstr ""
+
msgid "First, type in the <strong>name of the UK public authority</strong> you'd\\n like information from. <strong>By law, they have to respond</strong>\\n (<a href=\"{{url}}\">why?</a>)."
msgstr ""
"Pertama, ketik <strong>nama dari otoritas public Kerajaan Inggris </strong> Anda\n"
@@ -1036,6 +1048,9 @@ msgstr "Saya meminta <strong>informasi baru</strong>"
msgid "I am requesting an <strong>internal review</strong>"
msgstr "Saya meminta <strong>kajian internal</strong>"
+msgid "I am writing to request an internal review of {{public_body_name}}'s handling of my FOI request '{{info_request_title}}'."
+msgstr ""
+
msgid "I don't like these ones &mdash; give me some more!"
msgstr "Saya tidak suka yang ini &mdash; beri saya beberapa lagi!"
@@ -1363,12 +1378,6 @@ msgstr "MailServerLog | Line"
msgid "MailServerLog|Order"
msgstr "MailServerLog | Order"
-msgid "Make a new <strong>Environmental Information</strong> request"
-msgstr "Buat permintaan<strong>Informasi Lingkungan</strong> yang baru"
-
-msgid "Make a new <strong>Freedom of Information</strong> request to {{public_body}}"
-msgstr "Buat permintaan<strong>Freedom of Information</strong> yang baru kepada{{public_body}}"
-
msgid "Make a new<br/>\\n <strong>Freedom <span>of</span><br/>\\n Information<br/>\\n request</strong>"
msgstr ""
"Buat permintaan <br/>\n"
@@ -1379,6 +1388,9 @@ msgstr ""
msgid "Make a request"
msgstr "Buat permintaan"
+msgid "Make a request to this authority"
+msgstr ""
+
msgid "Make an {{law_used_short}} request to '{{public_body_name}}'"
msgstr "Buat {{law_used_short}} permintaan kepada '{{public_body_name}}'"
@@ -1639,6 +1651,9 @@ msgstr "Mohon periksa jika URL (yaitu kode panjang huruf dan angka) disalin"
msgid "Please choose a file containing your photo."
msgstr "Silakan pilih file yang berisi foto Anda."
+msgid "Please choose a reason"
+msgstr ""
+
msgid "Please choose what sort of reply you are making."
msgstr "Silakan pilih balasan seperti apa yang Anda buat."
@@ -1727,6 +1742,9 @@ msgstr ""
"Mohon hanya meminta informasi yang ada di dalam kategori-kategori tersebut, <strong>jangan membuang\n"
" waktu Anda</strong> atau waktu otoritas publik dengan meminta informasi yang tidak berkaitan."
+msgid "Please pass this on to the person who conducts Freedom of Information reviews."
+msgstr ""
+
msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
msgstr ""
"Silakan pilih masing-masing permintaan ini bergantian, dan <strong>biarkan semua orang tahu </strong>\n"
@@ -1944,6 +1962,9 @@ msgstr "Laporkan penyalahgunaan"
msgid "Report an offensive or unsuitable request"
msgstr "Laporkan sebuah permintaan yang tidak sopan atau tidak sesuai"
+msgid "Report request"
+msgstr ""
+
msgid "Report this request"
msgstr "Laporkan permintaan ini"
@@ -2170,9 +2191,6 @@ msgstr "Maaf, kami tidak dapat menemukan halaman tersebut"
msgid "Special note for this authority!"
msgstr "Catatan khusus untuk otoritas ini!"
-msgid "Start"
-msgstr "Mulai"
-
msgid "Start now &raquo;"
msgstr "Mulai sekarang &raquo;"
@@ -2679,8 +2697,8 @@ msgstr "Untuk memposting anotasi Anda"
msgid "To reply to "
msgstr "Untuk membalas ke "
-msgid "To report this FOI request"
-msgstr "Untuk melaporkan permintaan ini"
+msgid "To report this request"
+msgstr ""
msgid "To send a follow up message to "
msgstr "Untuk mengirimkan pesan tindak lanjut kepada"
@@ -3114,6 +3132,9 @@ msgstr "Anda harus masuk untuk menghapus foto profil Anda."
msgid "You need to be logged in to edit your profile."
msgstr "Anda perlu masuk untuk mengubah profil Anda."
+msgid "You need to be logged in to report a request for administrator attention"
+msgstr ""
+
msgid "You previously submitted that exact follow up message for this request."
msgstr "Anda sebelumnya memasukkan pesan tindak lanjut yang sama persis untuk permintaan ini."
diff --git a/locale/it/app.po b/locale/it/app.po
index 302f1c6d9..bbfbe40a0 100644
--- a/locale/it/app.po
+++ b/locale/it/app.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: alaveteli\n"
"Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n"
-"POT-Creation-Date: 2013-05-30 09:46+0100\n"
-"PO-Revision-Date: 2013-05-30 08:54+0000\n"
+"POT-Creation-Date: 2013-06-24 09:40-0700\n"
+"PO-Revision-Date: 2013-06-24 16:52+0000\n"
"Last-Translator: louisecrow <louise@mysociety.org>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/alaveteli/language/it/)\n"
"Language: it\n"
@@ -160,12 +160,18 @@ msgstr ""
msgid "<p>We recommend that you edit your request and remove the email address.\\n If you leave it, the email address will be sent to the authority, but will not be displayed on the site.</p>"
msgstr ""
+msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p>"
+msgstr ""
+
msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p><p>If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p>"
msgstr ""
msgid "<p>We're glad you got some of the information that you wanted. If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
msgstr ""
+msgid "<p>We're glad you got some of the information that you wanted.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
+msgstr ""
+
msgid "<p>You do not need to include your email in the request in order to get a reply (<a href=\"{{url}}\">details</a>).</p>"
msgstr ""
@@ -268,6 +274,9 @@ msgstr ""
msgid "A Freedom of Information request"
msgstr ""
+msgid "A full history of my FOI request and all correspondence is available on the Internet at this address: {{url}}"
+msgstr ""
+
msgid "A new request, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, was sent to {{public_body_name}} by {{info_request_user}} on {{date}}."
msgstr ""
@@ -736,6 +745,9 @@ msgstr ""
msgid "Filter"
msgstr ""
+msgid "First, did your other requests succeed?"
+msgstr ""
+
msgid "First, type in the <strong>name of the UK public authority</strong> you'd\\n like information from. <strong>By law, they have to respond</strong>\\n (<a href=\"{{url}}\">why?</a>)."
msgstr ""
@@ -930,6 +942,9 @@ msgstr ""
msgid "I am requesting an <strong>internal review</strong>"
msgstr ""
+msgid "I am writing to request an internal review of {{public_body_name}}'s handling of my FOI request '{{info_request_title}}'."
+msgstr ""
+
msgid "I don't like these ones &mdash; give me some more!"
msgstr ""
@@ -1227,18 +1242,15 @@ msgstr ""
msgid "MailServerLog|Order"
msgstr ""
-msgid "Make a new <strong>Environmental Information</strong> request"
-msgstr ""
-
-msgid "Make a new <strong>Freedom of Information</strong> request to {{public_body}}"
-msgstr ""
-
msgid "Make a new<br/>\\n <strong>Freedom <span>of</span><br/>\\n Information<br/>\\n request</strong>"
msgstr ""
msgid "Make a request"
msgstr ""
+msgid "Make a request to this authority"
+msgstr ""
+
msgid "Make an {{law_used_short}} request to '{{public_body_name}}'"
msgstr ""
@@ -1497,6 +1509,9 @@ msgstr ""
msgid "Please choose a file containing your photo."
msgstr ""
+msgid "Please choose a reason"
+msgstr ""
+
msgid "Please choose what sort of reply you are making."
msgstr ""
@@ -1578,6 +1593,9 @@ msgstr ""
msgid "Please only request information that comes under those categories, <strong>do not waste your\\n time</strong> or the time of the public authority by requesting unrelated information."
msgstr ""
+msgid "Please pass this on to the person who conducts Freedom of Information reviews."
+msgstr ""
+
msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
msgstr ""
@@ -1791,6 +1809,9 @@ msgstr ""
msgid "Report an offensive or unsuitable request"
msgstr ""
+msgid "Report request"
+msgstr ""
+
msgid "Report this request"
msgstr ""
@@ -2009,9 +2030,6 @@ msgstr ""
msgid "Special note for this authority!"
msgstr ""
-msgid "Start"
-msgstr ""
-
msgid "Start now &raquo;"
msgstr ""
@@ -2471,7 +2489,7 @@ msgstr ""
msgid "To reply to "
msgstr ""
-msgid "To report this FOI request"
+msgid "To report this request"
msgstr ""
msgid "To send a follow up message to "
@@ -2870,6 +2888,9 @@ msgstr ""
msgid "You need to be logged in to edit your profile."
msgstr ""
+msgid "You need to be logged in to report a request for administrator attention"
+msgstr ""
+
msgid "You previously submitted that exact follow up message for this request."
msgstr ""
diff --git a/locale/nb_NO/app.po b/locale/nb_NO/app.po
index 2950f0a8f..4a2433e83 100644
--- a/locale/nb_NO/app.po
+++ b/locale/nb_NO/app.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: alaveteli\n"
"Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n"
-"POT-Creation-Date: 2013-05-30 09:46+0100\n"
-"PO-Revision-Date: 2013-06-13 21:34+0000\n"
-"Last-Translator: gorm <gormer@gmail.com>\n"
+"POT-Creation-Date: 2013-06-24 09:40-0700\n"
+"PO-Revision-Date: 2013-06-24 16:52+0000\n"
+"Last-Translator: louisecrow <louise@mysociety.org>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/alaveteli/language/nb_NO/)\n"
"Language: nb_NO\n"
"MIME-Version: 1.0\n"
@@ -160,12 +160,18 @@ msgstr ""
msgid "<p>We recommend that you edit your request and remove the email address.\\n If you leave it, the email address will be sent to the authority, but will not be displayed on the site.</p>"
msgstr ""
+msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p>"
+msgstr ""
+
msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p><p>If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p>"
msgstr ""
msgid "<p>We're glad you got some of the information that you wanted. If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
msgstr ""
+msgid "<p>We're glad you got some of the information that you wanted.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
+msgstr ""
+
msgid "<p>You do not need to include your email in the request in order to get a reply (<a href=\"{{url}}\">details</a>).</p>"
msgstr ""
@@ -268,6 +274,9 @@ msgstr ""
msgid "A Freedom of Information request"
msgstr ""
+msgid "A full history of my FOI request and all correspondence is available on the Internet at this address: {{url}}"
+msgstr ""
+
msgid "A new request, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, was sent to {{public_body_name}} by {{info_request_user}} on {{date}}."
msgstr "En ny henvendelse, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, ble sendt til {{public_body_name}} av {{info_request_user}} den {{date}}."
@@ -736,6 +745,9 @@ msgstr ""
msgid "Filter"
msgstr ""
+msgid "First, did your other requests succeed?"
+msgstr ""
+
msgid "First, type in the <strong>name of the UK public authority</strong> you'd\\n like information from. <strong>By law, they have to respond</strong>\\n (<a href=\"{{url}}\">why?</a>)."
msgstr "Først, skriv inn <strong>navnet på en norsk offentlig myndighet</strong> som du\\n vil ha informasjon fra. <strong>Loven sier at de må svare deg</strong>\\n (<a href=\"{{url}}\">hvorfor?</a>)."
@@ -930,6 +942,9 @@ msgstr ""
msgid "I am requesting an <strong>internal review</strong>"
msgstr ""
+msgid "I am writing to request an internal review of {{public_body_name}}'s handling of my FOI request '{{info_request_title}}'."
+msgstr ""
+
msgid "I don't like these ones &mdash; give me some more!"
msgstr ""
@@ -1227,18 +1242,15 @@ msgstr ""
msgid "MailServerLog|Order"
msgstr ""
-msgid "Make a new <strong>Environmental Information</strong> request"
-msgstr ""
-
-msgid "Make a new <strong>Freedom of Information</strong> request to {{public_body}}"
-msgstr ""
-
msgid "Make a new<br/>\\n <strong>Freedom <span>of</span><br/>\\n Information<br/>\\n request</strong>"
msgstr "Lag en ny<br/>\\n <strong>Forespørsel <span>om</span><br/>\\n Innsyn</strong>"
msgid "Make a request"
msgstr "Lag henvendelse"
+msgid "Make a request to this authority"
+msgstr ""
+
msgid "Make an {{law_used_short}} request to '{{public_body_name}}'"
msgstr ""
@@ -1497,6 +1509,9 @@ msgstr ""
msgid "Please choose a file containing your photo."
msgstr ""
+msgid "Please choose a reason"
+msgstr ""
+
msgid "Please choose what sort of reply you are making."
msgstr ""
@@ -1578,6 +1593,9 @@ msgstr ""
msgid "Please only request information that comes under those categories, <strong>do not waste your\\n time</strong> or the time of the public authority by requesting unrelated information."
msgstr ""
+msgid "Please pass this on to the person who conducts Freedom of Information reviews."
+msgstr ""
+
msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
msgstr ""
@@ -1791,6 +1809,9 @@ msgstr "Meld misbruk"
msgid "Report an offensive or unsuitable request"
msgstr "Meld en støtende eller upassende henvendelse"
+msgid "Report request"
+msgstr ""
+
msgid "Report this request"
msgstr "Rapporter henvendelsen"
@@ -2009,9 +2030,6 @@ msgstr "Bekla,ger vi fant ikke den siden"
msgid "Special note for this authority!"
msgstr "Spesiell merknad for denne myndigheten!"
-msgid "Start"
-msgstr "Start"
-
msgid "Start now &raquo;"
msgstr "Start nå &raquo;"
@@ -2471,7 +2489,7 @@ msgstr ""
msgid "To reply to "
msgstr ""
-msgid "To report this FOI request"
+msgid "To report this request"
msgstr ""
msgid "To send a follow up message to "
@@ -2870,6 +2888,9 @@ msgstr "Du må være innlogget for å slett profil-bildet."
msgid "You need to be logged in to edit your profile."
msgstr "Du må være innlogget for å endre profil-bildet."
+msgid "You need to be logged in to report a request for administrator attention"
+msgstr ""
+
msgid "You previously submitted that exact follow up message for this request."
msgstr ""
diff --git a/locale/pt_BR/app.po b/locale/pt_BR/app.po
index 44bba74f4..d1a9a013a 100644
--- a/locale/pt_BR/app.po
+++ b/locale/pt_BR/app.po
@@ -6,29 +6,43 @@
# elaste <3laste2000@gmail.com>, 2012
# serramassuda <a.serramassuda@gmail.com>, 2012
# Bruno <bgx@bol.com.br>, 2012
+# Bruno <bgx@bol.com.br>, 2012
# brunomelnic <brunomelnic@gmail.com>, 2012-2013
# Carlos Vieira <edu.carlos.vieira@gmail.com>, 2011
# danielabsilva <danielabsilva@gmail.com>, 2011
+# danielabsilva <danielabsilva@gmail.com>, 2011
+# elaste <3laste2000@gmail.com>, 2012
# <everton137@gmail.com>, 2011
# gabinardy <gabileitao@gmail.com>, 2012
+# gabinardy <gabileitao@gmail.com>, 2012
+# jcmarkun <jcmarkun@gmail.com>, 2011
# jcmarkun <jcmarkun@gmail.com>, 2011
# Kerick <kerick.quimica@gmail.com>, 2012
+# Kerick <kerick.quimica@gmail.com>, 2012
+# leandrosalvador <leandrosalvador@gmail.com>, 2013
# leandrosalvador <leandrosalvador@gmail.com>, 2013
# leandrosalvador <leandrosalvador@gmail.com>, 2013
# lianelira <lianelira@gmail.com>, 2011
+# lianelira <lianelira@gmail.com>, 2011
# luisleao <luis.leao@gmail.com>, 2011
+# luisleao <luis.leao@gmail.com>, 2011
+# Nitai <Nitaibezerra@gmail.com>, 2012
# Nitai <Nitaibezerra@gmail.com>, 2012
# patriciacornils <patriciacornils@gmail.com>, 2011
+# patriciacornils <patriciacornils@gmail.com>, 2011
# markun <pedro@esfera.mobi>, 2011-2012
# Rafael Moretti <rafael.moretti@gmail.com>, 2012
+# Rafael Moretti <rafael.moretti@gmail.com>, 2012
+# serramassuda <a.serramassuda@gmail.com>, 2012
+# vitorbaptista <vitor@vitorbaptista.com>, 2013
# vitorbaptista <vitor@vitorbaptista.com>, 2013
# vitorbaptista <vitor@vitorbaptista.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: alaveteli\n"
"Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n"
-"POT-Creation-Date: 2013-05-30 09:46+0100\n"
-"PO-Revision-Date: 2013-05-30 08:54+0000\n"
+"POT-Creation-Date: 2013-06-24 09:40-0700\n"
+"PO-Revision-Date: 2013-06-24 16:52+0000\n"
"Last-Translator: louisecrow <louise@mysociety.org>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/alaveteli/language/pt_BR/)\n"
"Language: pt_BR\n"
@@ -191,12 +205,18 @@ msgstr ""
"<p>Recomendamos que você edite seu pedido e remova o endereço de e-mail\n"
" Se deixá-lo, o endereço de e-mail será enviado à autoridade, mas não será publicado no site.</p>"
+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>"
+msgstr ""
+
msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p><p>If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p>"
msgstr "<p>Nós estamos felizes que você tenha conseguido toda a informação que procurava. Se você for escrever sobre ou fazer uso dessa informação, por favor, volte depois e deixe um comentário contando o que você fez.</p><p>Se você achou o {{site_name}} útil, divulgue para seus contatos, exerça a cidadania!</p>"
msgid "<p>We're glad you got some of the information that you wanted. If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
msgstr "<p>Nós estamos felizes que você tenha conseguido toda a informação que procurava. Se você for escrever sobre ou fazer uso dessa informação, por favor, volte depois e deixe um comentário contando o que você fez.</p><p>Se você achou o {{site_name}} útil, divulgue para seus contatos, exerça a cidadania!</p>"
+msgid "<p>We're glad you got some of the information that you wanted.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
+msgstr ""
+
msgid "<p>You do not need to include your email in the request in order to get a reply (<a href=\"{{url}}\">details</a>).</p>"
msgstr "<p>Você não precisa incluir seu e-mail no pedido de informação para receber uma resposta (<a href=\"{{url}}\">detalhes</a>).</p>"
@@ -304,6 +324,9 @@ msgstr "Um <strong>resumo</strong> da resposta se tiver recebido por correio."
msgid "A Freedom of Information request"
msgstr "Um pedido de informação"
+msgid "A full history of my FOI request and all correspondence is available on the Internet at this address: {{url}}"
+msgstr ""
+
msgid "A new request, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, was sent to {{public_body_name}} by {{info_request_user}} on {{date}}."
msgstr "Um novo pedido, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, foi enviado para {{public_body_name}} por {{info_request_user}} em {{date}}."
@@ -772,6 +795,9 @@ msgstr "Erro ao tentar converter a imagem para o tamanho correto: no {{cols}}x{{
msgid "Filter"
msgstr "Filtro"
+msgid "First, did your other requests succeed?"
+msgstr ""
+
msgid "First, type in the <strong>name of the UK public authority</strong> you'd\\n like information from. <strong>By law, they have to respond</strong>\\n (<a href=\"{{url}}\">why?</a>)."
msgstr ""
"Primeiro, insira o <strong>nome da autoridade pública brasileira</strong> da qual você gostaria de receber informação. <strong>Por lei, eles são obrigados a responder</strong>\n"
@@ -974,6 +1000,9 @@ msgstr "Estou pedindo <strong>novas informações</strong>"
msgid "I am requesting an <strong>internal review</strong>"
msgstr "Eu estou apresentando um <strong>recurso</strong>"
+msgid "I am writing to request an internal review of {{public_body_name}}'s handling of my FOI request '{{info_request_title}}'."
+msgstr ""
+
msgid "I don't like these ones &mdash; give me some more!"
msgstr "Eu não gosto desses, deixe-me ver mais!"
@@ -1271,12 +1300,6 @@ msgstr ""
msgid "MailServerLog|Order"
msgstr ""
-msgid "Make a new <strong>Environmental Information</strong> request"
-msgstr "Faça um novo pedido de <strong>Informação Ambiental</strong>"
-
-msgid "Make a new <strong>Freedom of Information</strong> request to {{public_body}}"
-msgstr "Crie uma nova <strong>solicitação de acesso a informação</strong> para {{public_body}}"
-
msgid "Make a new<br/>\\n <strong>Freedom <span>of</span><br/>\\n Information<br/>\\n request</strong>"
msgstr ""
"Faça um novo<br/>\n"
@@ -1286,6 +1309,9 @@ msgstr ""
msgid "Make a request"
msgstr "Criar uma solicitação"
+msgid "Make a request to this authority"
+msgstr ""
+
msgid "Make an {{law_used_short}} request to '{{public_body_name}}'"
msgstr "Faça um pedido de informação pela {{law_used_short}} para '{{public_body_name}}'"
@@ -1544,6 +1570,9 @@ msgstr "Por favor, cheque se a URL (ou seja, o longo endereço da página, com l
msgid "Please choose a file containing your photo."
msgstr "Selecione um arquivo com sua foto"
+msgid "Please choose a reason"
+msgstr ""
+
msgid "Please choose what sort of reply you are making."
msgstr "Por favor, escolha que tipo de resposta você vai usar."
@@ -1625,6 +1654,9 @@ msgstr "Simplifique seu resumo, por favor. Utilize, por exemplo, uma única fras
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, solicitar somente informações referentes às categorias do site, <strong>não perca seu tempo</strong> ou o tempo da autoridade pública, solicitando informações não relacionadas."
+msgid "Please pass this on to the person who conducts Freedom of Information reviews."
+msgstr ""
+
msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
msgstr "Por favor, selecione uma solicitação por vez e <strong>deixe todo mundo saber</strong> se elas já são bem sucedidas ou não."
@@ -1838,6 +1870,9 @@ msgstr "Denunciar abuso"
msgid "Report an offensive or unsuitable request"
msgstr "Denunciar um pedido ofensivo ou impróprio"
+msgid "Report request"
+msgstr ""
+
msgid "Report this request"
msgstr "Denunciar este pedido"
@@ -2056,9 +2091,6 @@ msgstr "Desculpe, não foi possível encontrar essa página"
msgid "Special note for this authority!"
msgstr "Recado especial para esta autoridade!"
-msgid "Start"
-msgstr "Começar"
-
msgid "Start now &raquo;"
msgstr "Começar agora &raquo;"
@@ -2528,8 +2560,8 @@ msgstr "Enviar seu comentário"
msgid "To reply to "
msgstr "Responder para "
-msgid "To report this FOI request"
-msgstr "Relatar este PAI"
+msgid "To report this request"
+msgstr ""
msgid "To send a follow up message to "
msgstr "Enviar uma mensagem de acompanhamento para "
@@ -2932,6 +2964,9 @@ msgstr "Você precisa estar logado para apagar sua foto do perfil."
msgid "You need to be logged in to edit your profile."
msgstr "Você precisa estar logado para editar seu perfil."
+msgid "You need to be logged in to report a request for administrator attention"
+msgstr ""
+
msgid "You previously submitted that exact follow up message for this request."
msgstr "Você já submeteu uma resposta igual para este pedido."
diff --git a/locale/ro_RO/app.po b/locale/ro_RO/app.po
index e5c45e3d3..9ae9f4a57 100644
--- a/locale/ro_RO/app.po
+++ b/locale/ro_RO/app.po
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: alaveteli\n"
"Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n"
-"POT-Creation-Date: 2013-05-30 09:46+0100\n"
-"PO-Revision-Date: 2013-05-30 08:54+0000\n"
+"POT-Creation-Date: 2013-06-24 09:40-0700\n"
+"PO-Revision-Date: 2013-06-24 16:52+0000\n"
"Last-Translator: louisecrow <louise@mysociety.org>\n"
"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/alaveteli/language/ro_RO/)\n"
"Language: ro_RO\n"
@@ -172,12 +172,18 @@ msgstr "<p>Vă mulţumim pentru actualizarea pozei dvs. de profil.</p>\\n
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>Îți recomandăm să îți editezi solicitarea și să ștergi adresa de email.\\n Dacă o lași, adresa de email va fi trimisă către autoritate, dar nu va fi afișată pe site.</p>"
+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>"
+msgstr ""
+
msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p><p>If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p>"
msgstr "<p>Ne bucurăm tare mult că ai obţinut informaţiile pe care le doreai! Dacă vei scrie despre cum ţi-au folosit aceste informaţii, te rugăm să completezi mai jos un scurt istoric care va fi util celor ce vor face solicitări similare. </p><p> Dacă ai găsit {{site_name}} util, poţi face , <a href=\"{{donation_url}}\"> o mică donaţie</a> pentru a atenua din costurile de întreţinere pe care le avem cu serverele.</p>"
msgid "<p>We're glad you got some of the information that you wanted. If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
msgstr "<p>Ne bucurăm că aţi obţinut informaţiile pe care le doreaţi. Dacă aţi găsit acest site {{site_name}} util puteţi face , <a href=\"{{donation_url}}\"> o donaţie</a> organizaţiei care îl întreţine.</p><p> Daca vreţi să încercaţi şi să obţineti şi restul de informaţii, utitaţi aici ce mai aveţi de făcut acum .</p>"
+msgid "<p>We're glad you got some of the information that you wanted.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
+msgstr ""
+
msgid "<p>You do not need to include your email in the request in order to get a reply (<a href=\"{{url}}\">details</a>).</p>"
msgstr "<p>Nu e nevoie să incluzi emailul tău în solicitare pentru a primi răspuns (<a href=\"{{url}}\">details</a>).</p>"
@@ -280,6 +286,9 @@ msgstr "<strong>Un rezumat</strong> al răspunsului, daca l-aţi primit prin po
msgid "A Freedom of Information request"
msgstr "O cerere Libertatea de Informare"
+msgid "A full history of my FOI request and all correspondence is available on the Internet at this address: {{url}}"
+msgstr ""
+
msgid "A new request, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, was sent to {{public_body_name}} by {{info_request_user}} on {{date}}."
msgstr "O nouă cerere <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, a fost trimisă către {{public_body_name}} de către{{info_request_user}} la {{date}}."
@@ -748,6 +757,9 @@ msgstr "Eroare la conversia imaginii la mărimea corectă: la {{cols}}x{{rows}},
msgid "Filter"
msgstr "Filtrare"
+msgid "First, did your other requests succeed?"
+msgstr ""
+
msgid "First, type in the <strong>name of the UK public authority</strong> you'd\\n like information from. <strong>By law, they have to respond</strong>\\n (<a href=\"{{url}}\">why?</a>)."
msgstr "Mai întâi, introdu <strong>numele autorității publice</strong> de la care ai \\n avea nevoie de informații. <strong>Potrivit legii, trebuie să îți răspundă</strong>\\n (<a href=\"{{url}}\">de ce?</a>)."
@@ -945,6 +957,9 @@ msgstr "Solicit <strong>noi informaţii</strong>"
msgid "I am requesting an <strong>internal review</strong>"
msgstr "Soliciți <strong> o verificare internă</strong>"
+msgid "I am writing to request an internal review of {{public_body_name}}'s handling of my FOI request '{{info_request_title}}'."
+msgstr ""
+
msgid "I don't like these ones &mdash; give me some more!"
msgstr "Nu îmi plac acestea &mdash; daţi-mi mai multe!"
@@ -1242,18 +1257,15 @@ msgstr "MailServerLog|Line"
msgid "MailServerLog|Order"
msgstr "MailServerLog|Order"
-msgid "Make a new <strong>Environmental Information</strong> request"
-msgstr "Faceţi o nouă cerere de <strong> Informaţii de Mediu</strong> "
-
-msgid "Make a new <strong>Freedom of Information</strong> request to {{public_body}}"
-msgstr "Faceţi o nouă cerere de <strong> Informaţii FOI</strong> către {{public_body}}"
-
msgid "Make a new<br/>\\n <strong>Freedom <span>of</span><br/>\\n Information<br/>\\n request</strong>"
msgstr "Faceți o nouă<br/>\\n <strong>solicitare <span>de</span><br/>\\n informații<br/>\\de interes public</strong>"
msgid "Make a request"
msgstr "Faceţi o cerere"
+msgid "Make a request to this authority"
+msgstr ""
+
msgid "Make an {{law_used_short}} request to '{{public_body_name}}'"
msgstr "Faceţi o nouă cerere {{law_used_short}} către '{{public_body_name}}'"
@@ -1512,6 +1524,9 @@ msgstr "Te rugăm să verifici dacă URL-ul a fost copiat\\n corect din email-ul
msgid "Please choose a file containing your photo."
msgstr "Vă rugăm alegeţi un fisier care conţine poza dvs."
+msgid "Please choose a reason"
+msgstr ""
+
msgid "Please choose what sort of reply you are making."
msgstr "Vă rugăm alegeţi ce tip de răspuns faceţi."
@@ -1593,6 +1608,9 @@ msgstr "Vă rugăm păstraţi rezumatul cât mai scurt, ca în subiectul unui em
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 "Te rugăm să soliciți numai informațiile ce se regăsesc în una din aceste categorii, <strong>nu pierde timpul\\n tău</strong> sau pe cel al instituțiilor solicitând informații irelevante."
+msgid "Please pass this on to the person who conducts Freedom of Information reviews."
+msgstr ""
+
msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
msgstr "Te rugăm să selectezi fiecare solicitare pe rând și <strong>să spui</strong>\\ndacă au primit răspuns sau nu."
@@ -1806,6 +1824,9 @@ msgstr "Raportare abuz"
msgid "Report an offensive or unsuitable request"
msgstr "Raportaţi o cerere ofensatoare sau nepotrivită"
+msgid "Report request"
+msgstr ""
+
msgid "Report this request"
msgstr "Raportaţi această cerere"
@@ -2025,9 +2046,6 @@ msgstr "Scuze, nu am găsit pagina"
msgid "Special note for this authority!"
msgstr "O notă specială pentru această autoritate!"
-msgid "Start"
-msgstr "Start"
-
msgid "Start now &raquo;"
msgstr "Start acum &raquo;"
@@ -2490,8 +2508,8 @@ msgstr "Pentru a posta adnotarea dvs"
msgid "To reply to "
msgstr "Pentru a răspunde la"
-msgid "To report this FOI request"
-msgstr "Pentru a raporta acestă cerere FOI"
+msgid "To report this request"
+msgstr ""
msgid "To send a follow up message to "
msgstr "Pentu a trimite un mesaj de urmărire la"
@@ -2889,6 +2907,9 @@ msgstr "Trebuie să fiţi logat pentru a şterge poza dvs. de profil."
msgid "You need to be logged in to edit your profile."
msgstr "Trebuie să fiţi conectat pentru a vă edita profilul"
+msgid "You need to be logged in to report a request for administrator attention"
+msgstr ""
+
msgid "You previously submitted that exact follow up message for this request."
msgstr "Aţi trimis anterior exact acelaşi mesaj de urmărire pentru această cerere."
diff --git a/locale/sl/app.po b/locale/sl/app.po
index 8a49de3f4..e199d46cc 100644
--- a/locale/sl/app.po
+++ b/locale/sl/app.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: alaveteli\n"
"Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n"
-"POT-Creation-Date: 2013-05-30 09:46+0100\n"
-"PO-Revision-Date: 2011-03-09 17:48+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-24 09:40-0700\n"
+"PO-Revision-Date: 2013-06-24 16:52+0000\n"
+"Last-Translator: louisecrow <louise@mysociety.org>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/alaveteli/language/sl/)\n"
"Language: sl\n"
"MIME-Version: 1.0\n"
@@ -158,12 +158,18 @@ msgstr ""
msgid "<p>We recommend that you edit your request and remove the email address.\\n If you leave it, the email address will be sent to the authority, but will not be displayed on the site.</p>"
msgstr ""
+msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p>"
+msgstr ""
+
msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p><p>If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p>"
msgstr ""
msgid "<p>We're glad you got some of the information that you wanted. If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
msgstr ""
+msgid "<p>We're glad you got some of the information that you wanted.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
+msgstr ""
+
msgid "<p>You do not need to include your email in the request in order to get a reply (<a href=\"{{url}}\">details</a>).</p>"
msgstr ""
@@ -266,6 +272,9 @@ msgstr ""
msgid "A Freedom of Information request"
msgstr ""
+msgid "A full history of my FOI request and all correspondence is available on the Internet at this address: {{url}}"
+msgstr ""
+
msgid "A new request, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, was sent to {{public_body_name}} by {{info_request_user}} on {{date}}."
msgstr ""
@@ -734,6 +743,9 @@ msgstr ""
msgid "Filter"
msgstr ""
+msgid "First, did your other requests succeed?"
+msgstr ""
+
msgid "First, type in the <strong>name of the UK public authority</strong> you'd\\n like information from. <strong>By law, they have to respond</strong>\\n (<a href=\"{{url}}\">why?</a>)."
msgstr ""
@@ -930,6 +942,9 @@ msgstr ""
msgid "I am requesting an <strong>internal review</strong>"
msgstr ""
+msgid "I am writing to request an internal review of {{public_body_name}}'s handling of my FOI request '{{info_request_title}}'."
+msgstr ""
+
msgid "I don't like these ones &mdash; give me some more!"
msgstr ""
@@ -1227,18 +1242,15 @@ msgstr ""
msgid "MailServerLog|Order"
msgstr ""
-msgid "Make a new <strong>Environmental Information</strong> request"
-msgstr ""
-
-msgid "Make a new <strong>Freedom of Information</strong> request to {{public_body}}"
-msgstr ""
-
msgid "Make a new<br/>\\n <strong>Freedom <span>of</span><br/>\\n Information<br/>\\n request</strong>"
msgstr ""
msgid "Make a request"
msgstr ""
+msgid "Make a request to this authority"
+msgstr ""
+
msgid "Make an {{law_used_short}} request to '{{public_body_name}}'"
msgstr ""
@@ -1497,6 +1509,9 @@ msgstr ""
msgid "Please choose a file containing your photo."
msgstr ""
+msgid "Please choose a reason"
+msgstr ""
+
msgid "Please choose what sort of reply you are making."
msgstr ""
@@ -1578,6 +1593,9 @@ msgstr ""
msgid "Please only request information that comes under those categories, <strong>do not waste your\\n time</strong> or the time of the public authority by requesting unrelated information."
msgstr ""
+msgid "Please pass this on to the person who conducts Freedom of Information reviews."
+msgstr ""
+
msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
msgstr ""
@@ -1791,6 +1809,9 @@ msgstr ""
msgid "Report an offensive or unsuitable request"
msgstr ""
+msgid "Report request"
+msgstr ""
+
msgid "Report this request"
msgstr ""
@@ -2011,9 +2032,6 @@ msgstr ""
msgid "Special note for this authority!"
msgstr ""
-msgid "Start"
-msgstr ""
-
msgid "Start now &raquo;"
msgstr ""
@@ -2479,7 +2497,7 @@ msgstr ""
msgid "To reply to "
msgstr ""
-msgid "To report this FOI request"
+msgid "To report this request"
msgstr ""
msgid "To send a follow up message to "
@@ -2878,6 +2896,9 @@ msgstr ""
msgid "You need to be logged in to edit your profile."
msgstr ""
+msgid "You need to be logged in to report a request for administrator attention"
+msgstr ""
+
msgid "You previously submitted that exact follow up message for this request."
msgstr ""
diff --git a/locale/sq/app.po b/locale/sq/app.po
index e2a01666d..aee8a89f9 100644
--- a/locale/sq/app.po
+++ b/locale/sq/app.po
@@ -4,9 +4,12 @@
#
# Translators:
# arianit <ardob11@gmail.com>, 2012
+# arianit <ardob11@gmail.com>, 2012
+# bresta <bresta@gmail.com>, 2011
# bresta <bresta@gmail.com>, 2011
# driton <dritoni.h@gmail.com>, 2011
# Hana Huntova <>, 2012
+# Valon <vbrestovci@gmail.com>, 2011
# Valon <vbrestovci@gmail.com>, 2011-2012
# Valon <vbrestovci@gmail.com>, 2011
# Valon <vbrestovci@gmail.com>, 2011
@@ -14,8 +17,8 @@ msgid ""
msgstr ""
"Project-Id-Version: alaveteli\n"
"Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n"
-"POT-Creation-Date: 2013-05-30 09:46+0100\n"
-"PO-Revision-Date: 2013-05-30 08:54+0000\n"
+"POT-Creation-Date: 2013-06-24 09:40-0700\n"
+"PO-Revision-Date: 2013-06-24 16:52+0000\n"
"Last-Translator: louisecrow <louise@mysociety.org>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/alaveteli/language/sq/)\n"
"Language: sq\n"
@@ -186,12 +189,18 @@ msgstr "<p>Faleminderit për azhurimin e fotografisë në profilit tënd. </p><p
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 "Nuk dëshiron t'ja adresosh mesazhin tënd te {{person_or_body}}? Ti gjithashtu mund ti shkruash:"
+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>"
+msgstr ""
+
msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p><p>If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p>"
msgstr "<p>Na vjen mirë që keni marrë të gjitha informatat e kërkuara. Nëse shkruan lidhur me këtë ose i përdorë këto informata, të lutem kthehu ne këtë ueb faqe dhe shto një shënim më poshtë që të tregosh atë që bëre.</p><p> Nëse e ke gjetë {{site_name}} të dobishëm, <a href=\"{{donation_url}}\">bëj një donacion</a> për organizatat që qëndrojnë mbrapa sajë.</p>"
msgid "<p>We're glad you got some of the information that you wanted. If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
msgstr "<p>Na vjen mirë që keni marrë disa prej informatave të kërkuara. Nëse e ke gjetë {{site_name}} të dobishëm, <a href=\"{{donation_url}}\">bëj një donacion</a> për organizatat që qëndrojnë mbrapa sajë.</p><p>Nëse dëshiron të tentosh që të marrësh edhe pjesën e mbetur të informatave, këtu është se çfarë duhet të bësh.</p>"
+msgid "<p>We're glad you got some of the information that you wanted.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
+msgstr ""
+
msgid "<p>You do not need to include your email in the request in order to get a reply (<a href=\"{{url}}\">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ërgjigje (<a href=\"{{url}}\">detaje</a> ). </p>"
@@ -311,6 +320,9 @@ msgstr "Një <strong>përmbledhje</strong> e përgjigjes nëse ate e keni marrë
msgid "A Freedom of Information request"
msgstr "Žádost podle zákona o svobodném přístupu k informacím"
+msgid "A full history of my FOI request and all correspondence is available on the Internet at this address: {{url}}"
+msgstr ""
+
msgid "A new request, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, was sent to {{public_body_name}} by {{info_request_user}} on {{date}}."
msgstr ""
@@ -795,6 +807,9 @@ msgstr "Konvertimi i imazhit në madhësinë adekuate dështoi: në {{cols}}x{{r
msgid "Filter"
msgstr "Filtro"
+msgid "First, did your other requests succeed?"
+msgstr ""
+
msgid "First, type in the <strong>name of the UK public authority</strong> you'd\\n like information from. <strong>By law, they have to respond</strong>\\n (<a href=\"{{url}}\">why?</a>)."
msgstr ""
"Së pari, shkruaj <strong>emrin e autoritetit publik</strong> prej të\n"
@@ -1005,6 +1020,9 @@ msgstr "Unë jam duke kërkuar <strong>informacion të ri</strong>"
msgid "I am requesting an <strong>internal review</strong>"
msgstr "Po kërkoj <strong>rishqyrtimin intern</strong>"
+msgid "I am writing to request an internal review of {{public_body_name}}'s handling of my FOI request '{{info_request_title}}'."
+msgstr ""
+
msgid "I don't like these ones &mdash; give me some more!"
msgstr "Nuk më pëlqejnë këto kërkesa &mdash më jep disa të tjera!"
@@ -1314,12 +1332,6 @@ msgstr ""
msgid "MailServerLog|Order"
msgstr ""
-msgid "Make a new <strong>Environmental Information</strong> request"
-msgstr "Make a new <strong>Environmental Information</strong> request"
-
-msgid "Make a new <strong>Freedom of Information</strong> request to {{public_body}}"
-msgstr "Bëj një <strong>kërkesë të re për informata zyrtare</strong> për {{public_body}}"
-
msgid "Make a new<br/>\\n <strong>Freedom <span>of</span><br/>\\n Information<br/>\\n request</strong>"
msgstr ""
"Bëj një<br/>\n"
@@ -1330,6 +1342,9 @@ msgstr ""
msgid "Make a request"
msgstr "Bëj një kërkesë"
+msgid "Make a request to this authority"
+msgstr ""
+
msgid "Make an {{law_used_short}} request to '{{public_body_name}}'"
msgstr "Bëj një kërkesë për '{{public_body_name}}'"
@@ -1590,6 +1605,9 @@ msgstr "Të lutem kontrollo që URL (dmth. kodin e gjatë me shkronja e numra)
msgid "Please choose a file containing your photo."
msgstr "Të lutem zgjedh një fajll që përmban fotografinë tënde."
+msgid "Please choose a reason"
+msgstr ""
+
msgid "Please choose what sort of reply you are making."
msgstr "Të lutem zgjedh llojin e përgjigjes."
@@ -1676,6 +1694,9 @@ 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 stafit të institucionit duke kërkuar informata që s'kanë të bëjnë me të."
+msgid "Please pass this on to the person who conducts Freedom of Information reviews."
+msgstr ""
+
msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif 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"
@@ -1893,6 +1914,9 @@ msgstr "Raporto abuzim"
msgid "Report an offensive or unsuitable request"
msgstr "Raporto një kërkesë fyese ose të papërshtatshme"
+msgid "Report request"
+msgstr ""
+
msgid "Report this request"
msgstr "Raporto këtë kërkesë"
@@ -2116,9 +2140,6 @@ msgstr "Na vjen keq, nuk munda ta gjej këtë faqe"
msgid "Special note for this authority!"
msgstr "Shënim i veçantë për këtë autoritet!"
-msgid "Start"
-msgstr "Fillo"
-
msgid "Start now &raquo;"
msgstr "Fillo tash &raquo;"
@@ -2600,8 +2621,8 @@ msgstr "Për të postuar shënimin tënd"
msgid "To reply to "
msgstr "Për t'iu përgjigjur "
-msgid "To report this FOI request"
-msgstr "Për të raportuar këtë kërkesë për QDP "
+msgid "To report this request"
+msgstr ""
msgid "To send a follow up message to "
msgstr "Për të dërguar mesazh vazhdues për "
@@ -3019,6 +3040,9 @@ msgstr "Ti duhet të jesh i kyçur për të larguar (fshirë) fotografinë e pro
msgid "You need to be logged in to edit your profile."
msgstr "Duhesh të kyçesh për të redaktuar profilin tënd."
+msgid "You need to be logged in to report a request for administrator attention"
+msgstr ""
+
msgid "You previously submitted that exact follow up message for this request."
msgstr "Më parë ke dërguar të njejtin mesazh vazhdues për këtë kërkesë."
diff --git a/locale/sr@latin/app.po b/locale/sr@latin/app.po
index 8b9022d83..67b18f47a 100644
--- a/locale/sr@latin/app.po
+++ b/locale/sr@latin/app.po
@@ -4,14 +4,16 @@
#
# Translators:
# krledmno1 <krledmno1@gmail.com>, 2013
+# krledmno1 <krledmno1@gmail.com>, 2013
+# Valon <vbrestovci@gmail.com>, 2011-2012
# Valon <vbrestovci@gmail.com>, 2012
# Valon <vbrestovci@gmail.com>, 2011
msgid ""
msgstr ""
"Project-Id-Version: alaveteli\n"
"Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n"
-"POT-Creation-Date: 2013-05-30 09:46+0100\n"
-"PO-Revision-Date: 2013-05-30 08:54+0000\n"
+"POT-Creation-Date: 2013-06-24 09:40-0700\n"
+"PO-Revision-Date: 2013-06-24 16:52+0000\n"
"Last-Translator: louisecrow <louise@mysociety.org>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/alaveteli/language/sr@latin/)\n"
"Language: sr@latin\n"
@@ -178,12 +180,18 @@ msgstr ""
"<p>Preporučujemo da preuredite Vaš zahtev i da uklonite e-mail adresu.\n"
" Ako je ostavite, e-mail adresa će biti poslana ustanovi, ali neće biti vidljiva na web stranici.</p>"
+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>"
+msgstr ""
+
msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p><p>If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p>"
msgstr "<p>Drago nam je da ste dobili sve željene informacije. Ako ih budete koristili ili pisali o njima, molimo da se vratite i dodate napomenu ispod opisujući šta ste uradili. </p><p>Ako mislite da je {{site_name}} bio koristan, <a href=\"{{donation_url}}\">donirajte</a> nevladinoj organizaciji koja ga vodi.</p>"
msgid "<p>We're glad you got some of the information that you wanted. If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
msgstr "<p>Drago nam je da ste dobili dio željenih informacija. Ako mislite da je {{site_name}} bio koristan, <a href=\"{{donation_url}}\">donirajte</a> nevladinoj organizaciji koja ga vodi.</p>"
+msgid "<p>We're glad you got some of the information that you wanted.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
+msgstr ""
+
msgid "<p>You do not need to include your email in the request in order to get a reply (<a href=\"{{url}}\">details</a>).</p>"
msgstr "<p>Nije potrebno da uključite Vašu e-mail adresu u zahtev da biste dobili odgovor (<a href=\"{{url}}\">Više informacija</a>).</p>"
@@ -299,6 +307,9 @@ msgstr " <strong>Sažetak</strong> odgovora ako ste ga primili poštom. "
msgid "A Freedom of Information request"
msgstr ""
+msgid "A full history of my FOI request and all correspondence is available on the Internet at this address: {{url}}"
+msgstr ""
+
msgid "A new request, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, was sent to {{public_body_name}} by {{info_request_user}} on {{date}}."
msgstr ""
@@ -787,6 +798,9 @@ msgstr "Nismo uspeli konvertovati sliku u odgovarajuću veličinu: {{cols}}x{{r
msgid "Filter"
msgstr "Filtriraj"
+msgid "First, did your other requests succeed?"
+msgstr ""
+
msgid "First, type in the <strong>name of the UK public authority</strong> you'd\\n like information from. <strong>By law, they have to respond</strong>\\n (<a href=\"{{url}}\">why?</a>)."
msgstr ""
@@ -988,6 +1002,9 @@ msgstr "Molim za <strong>nove informacije</strong>"
msgid "I am requesting an <strong>internal review</strong>"
msgstr ""
+msgid "I am writing to request an internal review of {{public_body_name}}'s handling of my FOI request '{{info_request_title}}'."
+msgstr ""
+
msgid "I don't like these ones &mdash; give me some more!"
msgstr "Ne sviđaju mi se ove &mdash; dajte mi više!"
@@ -1315,12 +1332,6 @@ msgstr ""
msgid "MailServerLog|Order"
msgstr ""
-msgid "Make a new <strong>Environmental Information</strong> request"
-msgstr ""
-
-msgid "Make a new <strong>Freedom of Information</strong> request to {{public_body}}"
-msgstr "Podnesi novi <strong>Zahtev za slobodan pristup informacijama</strong> za {{public_body}}"
-
msgid "Make a new<br/>\\n <strong>Freedom <span>of</span><br/>\\n Information<br/>\\n request</strong>"
msgstr ""
"Podnesi novi<br/>\n"
@@ -1331,6 +1342,9 @@ msgstr ""
msgid "Make a request"
msgstr "Podnesi zahtev"
+msgid "Make a request to this authority"
+msgstr ""
+
msgid "Make an {{law_used_short}} request to '{{public_body_name}}'"
msgstr "Podnesi {{law_used_short}} zahtev javnoj ustanovi '{{public_body_name}}'"
@@ -1593,6 +1607,9 @@ msgstr ""
msgid "Please choose a file containing your photo."
msgstr "Molimo izaberite datoteku koja sadržava Vašu sliku."
+msgid "Please choose a reason"
+msgstr ""
+
msgid "Please choose what sort of reply you are making."
msgstr "Molimo izaberite vrstu odgovora."
@@ -1679,6 +1696,9 @@ msgstr "Molimo da sažetak bude kratak, poput naslova e-maila. Radije koristite
msgid "Please only request information that comes under those categories, <strong>do not waste your\\n time</strong> or the time of the public authority by requesting unrelated information."
msgstr ""
+msgid "Please pass this on to the person who conducts Freedom of Information reviews."
+msgstr ""
+
msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
msgstr ""
"Molimo odaberite svaki od ovih zahteva naizmjenice, i <strong>obavestite sve</strong>\n"
@@ -1896,6 +1916,9 @@ msgstr "Prijavi zloupotrebu"
msgid "Report an offensive or unsuitable request"
msgstr ""
+msgid "Report request"
+msgstr ""
+
msgid "Report this request"
msgstr ""
@@ -2124,9 +2147,6 @@ msgstr "Žalimo, nismo mogli pronaći tu stranicu"
msgid "Special note for this authority!"
msgstr "Posebna napomena za ovu ustanovu!"
-msgid "Start"
-msgstr "Počni"
-
msgid "Start now &raquo;"
msgstr "Počni sada &raquo;"
@@ -2620,7 +2640,7 @@ msgstr "Da biste postavili Vašu napomenu"
msgid "To reply to "
msgstr "Da biste odgovorili "
-msgid "To report this FOI request"
+msgid "To report this request"
msgstr ""
msgid "To send a follow up message to "
@@ -3051,6 +3071,9 @@ msgstr "Morate biti prijavljeni ukoliko želite izbrisati sliku na Vašem profil
msgid "You need to be logged in to edit your profile."
msgstr ""
+msgid "You need to be logged in to report a request for administrator attention"
+msgstr ""
+
msgid "You previously submitted that exact follow up message for this request."
msgstr "Prethodno ste predali istu popratnu poruku za ovaj zahtev."
diff --git a/locale/tr/app.po b/locale/tr/app.po
index 83eca28b7..364619764 100644
--- a/locale/tr/app.po
+++ b/locale/tr/app.po
@@ -4,12 +4,13 @@
#
# Translators:
# baranozgul <baran@ozgul.net>, 2012
+# baranozgul <baran@ozgul.net>, 2012
msgid ""
msgstr ""
"Project-Id-Version: alaveteli\n"
"Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n"
-"POT-Creation-Date: 2013-05-30 09:46+0100\n"
-"PO-Revision-Date: 2013-05-30 08:54+0000\n"
+"POT-Creation-Date: 2013-06-24 09:40-0700\n"
+"PO-Revision-Date: 2013-06-24 16:52+0000\n"
"Last-Translator: louisecrow <louise@mysociety.org>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/alaveteli/language/tr/)\n"
"Language: tr\n"
@@ -159,12 +160,18 @@ msgstr ""
msgid "<p>We recommend that you edit your request and remove the email address.\\n If you leave it, the email address will be sent to the authority, but will not be displayed on the site.</p>"
msgstr ""
+msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p>"
+msgstr ""
+
msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p><p>If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p>"
msgstr ""
msgid "<p>We're glad you got some of the information that you wanted. If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
msgstr ""
+msgid "<p>We're glad you got some of the information that you wanted.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
+msgstr ""
+
msgid "<p>You do not need to include your email in the request in order to get a reply (<a href=\"{{url}}\">details</a>).</p>"
msgstr ""
@@ -267,6 +274,9 @@ msgstr ""
msgid "A Freedom of Information request"
msgstr ""
+msgid "A full history of my FOI request and all correspondence is available on the Internet at this address: {{url}}"
+msgstr ""
+
msgid "A new request, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, was sent to {{public_body_name}} by {{info_request_user}} on {{date}}."
msgstr ""
@@ -735,6 +745,9 @@ msgstr ""
msgid "Filter"
msgstr ""
+msgid "First, did your other requests succeed?"
+msgstr ""
+
msgid "First, type in the <strong>name of the UK public authority</strong> you'd\\n like information from. <strong>By law, they have to respond</strong>\\n (<a href=\"{{url}}\">why?</a>)."
msgstr ""
@@ -929,6 +942,9 @@ msgstr ""
msgid "I am requesting an <strong>internal review</strong>"
msgstr ""
+msgid "I am writing to request an internal review of {{public_body_name}}'s handling of my FOI request '{{info_request_title}}'."
+msgstr ""
+
msgid "I don't like these ones &mdash; give me some more!"
msgstr ""
@@ -1226,18 +1242,15 @@ msgstr ""
msgid "MailServerLog|Order"
msgstr ""
-msgid "Make a new <strong>Environmental Information</strong> request"
-msgstr ""
-
-msgid "Make a new <strong>Freedom of Information</strong> request to {{public_body}}"
-msgstr ""
-
msgid "Make a new<br/>\\n <strong>Freedom <span>of</span><br/>\\n Information<br/>\\n request</strong>"
msgstr ""
msgid "Make a request"
msgstr ""
+msgid "Make a request to this authority"
+msgstr ""
+
msgid "Make an {{law_used_short}} request to '{{public_body_name}}'"
msgstr ""
@@ -1496,6 +1509,9 @@ msgstr ""
msgid "Please choose a file containing your photo."
msgstr ""
+msgid "Please choose a reason"
+msgstr ""
+
msgid "Please choose what sort of reply you are making."
msgstr ""
@@ -1577,6 +1593,9 @@ msgstr ""
msgid "Please only request information that comes under those categories, <strong>do not waste your\\n time</strong> or the time of the public authority by requesting unrelated information."
msgstr ""
+msgid "Please pass this on to the person who conducts Freedom of Information reviews."
+msgstr ""
+
msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
msgstr ""
@@ -1790,6 +1809,9 @@ msgstr ""
msgid "Report an offensive or unsuitable request"
msgstr ""
+msgid "Report request"
+msgstr ""
+
msgid "Report this request"
msgstr ""
@@ -2008,9 +2030,6 @@ msgstr ""
msgid "Special note for this authority!"
msgstr ""
-msgid "Start"
-msgstr ""
-
msgid "Start now &raquo;"
msgstr ""
@@ -2470,7 +2489,7 @@ msgstr ""
msgid "To reply to "
msgstr ""
-msgid "To report this FOI request"
+msgid "To report this request"
msgstr ""
msgid "To send a follow up message to "
@@ -2869,6 +2888,9 @@ msgstr ""
msgid "You need to be logged in to edit your profile."
msgstr ""
+msgid "You need to be logged in to report a request for administrator attention"
+msgstr ""
+
msgid "You previously submitted that exact follow up message for this request."
msgstr ""
diff --git a/locale/uk/app.po b/locale/uk/app.po
index 8e8c0fcfd..3af5cd5b0 100644
--- a/locale/uk/app.po
+++ b/locale/uk/app.po
@@ -4,6 +4,7 @@
#
# Translators:
# ferencbaki89 <ferencbaki89@gmail.com>, 2013
+# ferencbaki89 <ferencbaki89@gmail.com>, 2013
# hiiri <murahoid@gmail.com>, 2012
# louisecrow <louise@mysociety.org>, 2013
# louisecrow <louise@mysociety.org>, 2013
@@ -13,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: alaveteli\n"
"Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n"
-"POT-Creation-Date: 2013-05-30 09:46+0100\n"
-"PO-Revision-Date: 2013-06-24 05:50+0000\n"
-"Last-Translator: hiiri <murahoid@gmail.com>\n"
+"POT-Creation-Date: 2013-06-24 09:40-0700\n"
+"PO-Revision-Date: 2013-06-24 16:52+0000\n"
+"Last-Translator: louisecrow <louise@mysociety.org>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/alaveteli/language/uk/)\n"
"Language: uk\n"
"MIME-Version: 1.0\n"
@@ -191,12 +192,18 @@ msgstr ""
"<p>Ми радимо вам відредагувати свій запит та видалити електронну адресу.\n"
" Якщо ви її залишите, вона буде відправлена владному органу, але не буде відображена на сайті.</p>"
+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>"
+msgstr ""
+
msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p><p>If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p>"
msgstr "<p>Ми раді, що ви отримали всю потрібну інформацію. Якщо ви напишете про це або використаєте цю інформацію в будь-який спосіб, поверніться та додайте коментар про це внизу.</p><p>Якщо {{site_name}} видався вам корисним, <a href=\"{{donation_url}}\">ви можете допомогти фінансово</a> громадській організації, що займається його підтримкою.</p>"
msgid "<p>We're glad you got some of the information that you wanted. If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
msgstr "<p>Ми раді, що ви отримали дещо з потрібної вам інформації. Якщо ви напишете про це або використаєте цю інформацію в будь-який спосіб, поверніться та додайте коментар про це внизу.</p><p>Якщо {{site_name}} видався вам корисним, <a href=\"{{donation_url}}\">ви можете допомогти фінансово</a> громадській організації, що займається його підтримкою.</p><p>Якщо ви хочете спробувати отримати решту інформацію, вам слід зробити наступне.</p>"
+msgid "<p>We're glad you got some of the information that you wanted.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>"
+msgstr ""
+
msgid "<p>You do not need to include your email in the request in order to get a reply (<a href=\"{{url}}\">details</a>).</p>"
msgstr "<p>Вам не потрібно включати свою електронну адресу в запит, щоб отримати відповідь (<a href=\"{{url}}\">деталі</a>).</p>"
@@ -320,6 +327,9 @@ msgstr "Короткий виклад відповіді, якщо ви отри
msgid "A Freedom of Information request"
msgstr "Інформаційний запит"
+msgid "A full history of my FOI request and all correspondence is available on the Internet at this address: {{url}}"
+msgstr ""
+
msgid "A new request, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, was sent to {{public_body_name}} by {{info_request_user}} on {{date}}."
msgstr "Новий запит, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, було надіслано до розпорядника {{public_body_name}} користувачем {{info_request_user}} {{date}}."
@@ -806,6 +816,9 @@ msgstr ""
msgid "Filter"
msgstr "Фільтр"
+msgid "First, did your other requests succeed?"
+msgstr ""
+
msgid "First, type in the <strong>name of the UK public authority</strong> you'd\\n like information from. <strong>By law, they have to respond</strong>\\n (<a href=\"{{url}}\">why?</a>)."
msgstr ""
"Для початку, ввдеіть <strong>назву розпорядника інформації</strong>, від якого \n"
@@ -1012,6 +1025,9 @@ msgstr "Я прошу <strong>нову інформацію</strong>"
msgid "I am requesting an <strong>internal review</strong>"
msgstr "Я прошу про <strong>внутрішню перевірку</strong>"
+msgid "I am writing to request an internal review of {{public_body_name}}'s handling of my FOI request '{{info_request_title}}'."
+msgstr ""
+
msgid "I don't like these ones &mdash; give me some more!"
msgstr "Ці мені не подобаються &mdash; дайте якихось інших!"
@@ -1334,12 +1350,6 @@ msgstr ""
msgid "MailServerLog|Order"
msgstr ""
-msgid "Make a new <strong>Environmental Information</strong> request"
-msgstr "Make a new <strong>Environmental Information</strong> request"
-
-msgid "Make a new <strong>Freedom of Information</strong> request to {{public_body}}"
-msgstr "Зробіть новий запит до {{public_body}}"
-
msgid "Make a new<br/>\\n <strong>Freedom <span>of</span><br/>\\n Information<br/>\\n request</strong>"
msgstr ""
"Зробити<br/>\n"
@@ -1348,6 +1358,9 @@ msgstr ""
msgid "Make a request"
msgstr "Зробити запит"
+msgid "Make a request to this authority"
+msgstr ""
+
msgid "Make an {{law_used_short}} request to '{{public_body_name}}'"
msgstr "Зробіть новий запит до: '{{public_body_name}}'"
@@ -1606,6 +1619,9 @@ msgstr "Будь ласка, перевірте чи URL скопійоване
msgid "Please choose a file containing your photo."
msgstr "Будь ласка, оберіть файл, що містить ваше фото."
+msgid "Please choose a reason"
+msgstr ""
+
msgid "Please choose what sort of reply you are making."
msgstr "Будь ласка, оберіть тип відповіді."
@@ -1690,6 +1706,9 @@ msgstr "Ваша тема має бути короткою."
msgid "Please only request information that comes under those categories, <strong>do not waste your\\n time</strong> or the time of the public authority by requesting unrelated information."
msgstr ""
+msgid "Please pass this on to the person who conducts Freedom of Information reviews."
+msgstr ""
+
msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
msgstr "Будь ласка, оберіть кожен з цих запитів та визначте, чи були вони успішними."
@@ -1905,6 +1924,9 @@ msgstr "Повідомте про зловживання"
msgid "Report an offensive or unsuitable request"
msgstr "Повідомте про образливий або недоречний запит"
+msgid "Report request"
+msgstr ""
+
msgid "Report this request"
msgstr "Повідомити"
@@ -2124,9 +2146,6 @@ msgstr "Ми не можемо знайти цю сторінку"
msgid "Special note for this authority!"
msgstr "Примітка:"
-msgid "Start"
-msgstr "Початок"
-
msgid "Start now &raquo;"
msgstr "Почати зараз &raquo;"
@@ -2599,8 +2618,8 @@ msgstr "Щоб опублікувати свій коментар"
msgid "To reply to "
msgstr "Щоб відповісти розпоряднику інформації "
-msgid "To report this FOI request"
-msgstr "Щоб повідомити адміністратору про цей запит"
+msgid "To report this request"
+msgstr ""
msgid "To send a follow up message to "
msgstr "Щоб надіслати додаткове повідомлення до "
@@ -3013,6 +3032,9 @@ msgstr "Ви маєте бути авторизовані для цього."
msgid "You need to be logged in to edit your profile."
msgstr "Ви маєте увійти в систему, щоб мати можливість редагувати свій профіль."
+msgid "You need to be logged in to report a request for administrator attention"
+msgstr ""
+
msgid "You previously submitted that exact follow up message for this request."
msgstr "Ви вже надіслали точно таке ж додаткове повідомлення для цього запиту."
diff --git a/public/stylesheets/ie6-custom.css b/public/stylesheets/ie6-custom.css
deleted file mode 100644
index 64d632e72..000000000
--- a/public/stylesheets/ie6-custom.css
+++ /dev/null
@@ -1 +0,0 @@
-/* drop your local IE-specific CSS overrides in here */
diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
index 2823f3978..6f6d7b365 100644
--- a/public/stylesheets/main.css
+++ b/public/stylesheets/main.css
@@ -183,16 +183,11 @@ margin:18px 0 36px;
}
#stepwise_make_request {
-background-color:#BBB;
-border:1px solid #222;
-border-radius:5px;
--moz-border-radius:5px;
color:#222;
font-size:1.1em;
text-align:left;
width:412px;
margin:0 14em 40px 0;
-padding:10px 12px;
}
#stepwise_make_request_view_email {
diff --git a/script/make-crontab b/script/make-crontab
index 1b4fbabbd..d214f1485 100755
--- a/script/make-crontab
+++ b/script/make-crontab
@@ -5,7 +5,7 @@ mailto = "recipient-of-any-errors@localhost"
user = "user-to-run-as"
location = "/path/to/alaveteli"
-template = open("config/crontab.ugly").read()
+template = open("config/crontab-example").read()
template = re.sub(r"MAILTO=.*", "MAILTO=%s" % mailto, template)
template = template.replace("!!(*= $user *)!!", user)
template = re.sub(r"/data/vhost/.*/script", location + "/script", template)
diff --git a/spec/controllers/general_controller_spec.rb b/spec/controllers/general_controller_spec.rb
index 4a1c8b134..0eda73c51 100644
--- a/spec/controllers/general_controller_spec.rb
+++ b/spec/controllers/general_controller_spec.rb
@@ -21,6 +21,8 @@ describe GeneralController, 'when getting the blog feed' do
before do
AlaveteliConfiguration.stub!(:blog_feed).and_return("http://blog.example.com")
+ # Don't call out to external url during tests
+ controller.stub!(:quietly_try_to_open).and_return('')
end
it 'should add a lang param correctly to a url with no querystring' do
@@ -348,4 +350,3 @@ describe GeneralController, 'when using xapian search' do
end
end
-
diff --git a/spec/controllers/public_body_controller_spec.rb b/spec/controllers/public_body_controller_spec.rb
index 22d8418c9..e01bcb0a6 100644
--- a/spec/controllers/public_body_controller_spec.rb
+++ b/spec/controllers/public_body_controller_spec.rb
@@ -183,8 +183,11 @@ describe PublicBodyController, "when listing bodies" do
response.should render_template('list')
assigns[:public_bodies].should == [ public_bodies(:humpadink_public_body) ]
assigns[:tag].should == "eats_cheese:stilton"
+ end
-
+ it 'should return a "406 Not Acceptable" code if asked for a json version of a list' do
+ get :list, :format => 'json'
+ response.code.should == '406'
end
end
diff --git a/spec/controllers/reports_controller_spec.rb b/spec/controllers/reports_controller_spec.rb
new file mode 100644
index 000000000..fa8c72eaa
--- /dev/null
+++ b/spec/controllers/reports_controller_spec.rb
@@ -0,0 +1,104 @@
+require 'spec_helper'
+
+describe ReportsController, "when reporting a request when not logged in" do
+ it "should only allow logged-in users to report requests" do
+ post :create, :request_id => info_requests(:badger_request).url_title, :reason => "my reason"
+
+ flash[:notice].should =~ /You need to be logged in/
+ response.should redirect_to show_request_path(:url_title => info_requests(:badger_request).url_title)
+ end
+end
+
+describe ReportsController, "when reporting a request (logged in)" do
+ render_views
+
+ before do
+ @user = users(:robin_user)
+ session[:user_id] = @user.id
+ end
+
+ it "should 404 for non-existent requests" do
+ lambda {
+ post :create, :request_id => "hjksfdhjk_louytu_qqxxx"
+ }.should raise_error(ActiveRecord::RecordNotFound)
+ end
+
+ it "should mark a request as having been reported" do
+ ir = info_requests(:badger_request)
+ title = ir.url_title
+ ir.attention_requested.should == false
+
+ post :create, :request_id => title, :reason => "my reason"
+ response.should redirect_to show_request_path(:url_title => title)
+
+ ir.reload
+ ir.attention_requested.should == true
+ ir.described_state.should == "attention_requested"
+ end
+
+ it "should pass on the reason and message" do
+ info_request = mock_model(InfoRequest, :url_title => "foo", :attention_requested= => nil, :save! => nil)
+ InfoRequest.should_receive(:find_by_url_title!).with("foo").and_return(info_request)
+ info_request.should_receive(:report!).with("Not valid request", "It's just not", @user)
+ post :create, :request_id => "foo", :reason => "Not valid request", :message => "It's just not"
+ end
+
+ it "should not allow a request to be reported twice" do
+ title = info_requests(:badger_request).url_title
+
+ post :create, :request_id => title, :reason => "my reason"
+ response.should redirect_to show_request_url(:url_title => title)
+
+ post :create, :request_id => title, :reason => "my reason"
+ response.should redirect_to show_request_url(:url_title => title)
+ flash[:notice].should =~ /has already been reported/
+ end
+
+ it "should send an email from the reporter to admins" do
+ ir = info_requests(:badger_request)
+ title = ir.url_title
+ post :create, :request_id => title, :reason => "my reason"
+ deliveries = ActionMailer::Base.deliveries
+ deliveries.size.should == 1
+ mail = deliveries[0]
+ mail.subject.should =~ /attention_requested/
+ mail.from.should include(@user.email)
+ mail.body.should include(@user.name)
+ end
+
+ it "should force the user to pick a reason" do
+ info_request = mock_model(InfoRequest, :report! => nil, :url_title => "foo",
+ :report_reasons => ["Not FOIish enough"])
+ InfoRequest.should_receive(:find_by_url_title!).with("foo").and_return(info_request)
+
+ post :create, :request_id => "foo", :reason => ""
+ response.should render_template("new")
+ flash[:error].should == "Please choose a reason"
+ end
+end
+
+describe ReportsController, "#new_report_request" do
+ let(:info_request) { mock_model(InfoRequest, :url_title => "foo") }
+ before :each do
+ InfoRequest.should_receive(:find_by_url_title!).with("foo").and_return(info_request)
+ end
+
+ context "not logged in" do
+ it "should require the user to be logged in" do
+ get :new, :request_id => "foo"
+ response.should_not render_template("new")
+ end
+ end
+
+ context "logged in" do
+ before :each do
+ session[:user_id] = users(:bob_smith_user).id
+ end
+ it "should show the form" do
+ get :new, :request_id => "foo"
+ response.should render_template("new")
+ end
+ end
+end
+
+
diff --git a/spec/controllers/request_controller_spec.rb b/spec/controllers/request_controller_spec.rb
index 83e2b1767..c73576c50 100644
--- a/spec/controllers/request_controller_spec.rb
+++ b/spec/controllers/request_controller_spec.rb
@@ -93,8 +93,10 @@ describe RequestController, "when listing recent requests" do
:results => (1..25).to_a.map { |m| { :model => m } },
:matches_estimated => 1000000)
- InfoRequest.should_receive(:full_search).
- with([InfoRequestEvent]," (variety:sent OR variety:followup_sent OR variety:response OR variety:comment)", "created_at", anything, anything, anything, anything).
+ ActsAsXapian::Search.should_receive(:new).
+ with([InfoRequestEvent]," (variety:sent OR variety:followup_sent OR variety:response OR variety:comment)",
+ :sort_by_prefix => "created_at", :offset => 0, :limit => 25, :sort_by_ascending => true,
+ :collapse_by_prefix => "request_collapse").
and_return(xap_results)
get :list, :view => 'all'
assigns[:list_results].size.should == 25
@@ -134,7 +136,7 @@ describe RequestController, "when changing things that appear on the request pag
it "should purge the downstream cache when a followup is made" do
session[:user_id] = users(:bob_smith_user).id
ir = info_requests(:fancy_dog_request)
- post :show_response, :outgoing_message => { :body => "What a useless response! You suck.", :what_doing => 'normal_sort' }, :id => ir.id, :incoming_message_id => incoming_messages(:useless_incoming_message), :submitted_followup => 1
+ post :show_response, :outgoing_message => { :body => "What a useless response! You suck.", :what_doing => 'normal_sort' }, :id => ir.id, :submitted_followup => 1
PurgeRequest.all().first.model_id.should == ir.id
end
it "should purge the downstream cache when the request is categorised" do
@@ -239,6 +241,36 @@ describe RequestController, "when showing one request" do
end
end
+ context "when the request has not yet been reported" do
+ it "should allow the user to report" do
+ title = info_requests(:badger_request).url_title
+ get :show, :url_title => title
+ response.should_not contain("This request has been reported")
+ response.should contain("Offensive?")
+ end
+ end
+
+ context "when the request has been reported for admin attention" do
+ before :each do
+ info_requests(:fancy_dog_request).report!("", "", nil)
+ end
+ it "should inform the user" do
+ get :show, :url_title => 'why_do_you_have_such_a_fancy_dog'
+ response.should contain("This request has been reported")
+ response.should_not contain("Offensive?")
+ end
+
+ context "and then deemed okay and left to complete" do
+ before :each do
+ info_requests(:fancy_dog_request).set_described_state("successful")
+ end
+ it "should let the user know that the administrators have not hidden this request" do
+ get :show, :url_title => 'why_do_you_have_such_a_fancy_dog'
+ response.body.should =~ (/the site administrators.*have not hidden it/)
+ end
+ end
+ end
+
describe 'when the request is being viewed by an admin' do
describe 'if the request is awaiting description' do
@@ -1605,7 +1637,7 @@ describe RequestController, "when classifying an information request" do
end
end
- describe 'when redirecting after a successful status update by the request owner' do
+ describe 'after a successful status update by the request owner' do
before do
@request_owner = users(:bob_smith_user)
@@ -1632,87 +1664,161 @@ describe RequestController, "when classifying an information request" do
response.should redirect_to("http://test.host/#{redirect_path}")
end
- it 'should redirect to the "request url" with a message in the right tense when status is updated to "waiting response" and the response is not overdue' do
- @dog_request.stub!(:date_response_required_by).and_return(Time.now.to_date+1)
- @dog_request.stub!(:date_very_overdue_after).and_return(Time.now.to_date+40)
+ context 'when status is updated to "waiting_response"' do
- expect_redirect("waiting_response", "request/#{@dog_request.url_title}")
- flash[:notice].should match(/should get a response/)
- end
+ it 'should redirect to the "request url" with a message in the right tense when
+ the response is not overdue' do
+ @dog_request.stub!(:date_response_required_by).and_return(Time.now.to_date+1)
+ @dog_request.stub!(:date_very_overdue_after).and_return(Time.now.to_date+40)
- it 'should redirect to the "request url" with a message in the right tense when status is updated to "waiting response" and the response is overdue' do
- @dog_request.stub!(:date_response_required_by).and_return(Time.now.to_date-1)
- @dog_request.stub!(:date_very_overdue_after).and_return(Time.now.to_date+40)
- expect_redirect('waiting_response', request_url)
- flash[:notice].should match(/should have got a response/)
- end
+ expect_redirect("waiting_response", "request/#{@dog_request.url_title}")
+ flash[:notice].should match(/should get a response/)
+ end
- it 'should redirect to the "request url" with a message in the right tense when status is updated to "waiting response" and the response is overdue' do
- @dog_request.stub!(:date_response_required_by).and_return(Time.now.to_date-2)
- @dog_request.stub!(:date_very_overdue_after).and_return(Time.now.to_date-1)
- expect_redirect('waiting_response', unhappy_url)
- flash[:notice].should match(/is long overdue/)
- flash[:notice].should match(/by more than 40 working days/)
- flash[:notice].should match(/within 20 working days/)
- end
+ it 'should redirect to the "request url" with a message in the right tense when
+ the response is overdue' do
+ @dog_request.stub!(:date_response_required_by).and_return(Time.now.to_date-1)
+ @dog_request.stub!(:date_very_overdue_after).and_return(Time.now.to_date+40)
+ expect_redirect('waiting_response', request_url)
+ flash[:notice].should match(/should have got a response/)
+ end
- it 'should redirect to the "request url" when status is updated to "not held"' do
- expect_redirect('not_held', request_url)
+ it 'should redirect to the "request url" with a message in the right tense when
+ the response is overdue' do
+ @dog_request.stub!(:date_response_required_by).and_return(Time.now.to_date-2)
+ @dog_request.stub!(:date_very_overdue_after).and_return(Time.now.to_date-1)
+ expect_redirect('waiting_response', unhappy_url)
+ flash[:notice].should match(/is long overdue/)
+ flash[:notice].should match(/by more than 40 working days/)
+ flash[:notice].should match(/within 20 working days/)
+ end
end
- it 'should redirect to the "request url" when status is updated to "successful"' do
- expect_redirect('successful', request_url)
- end
+ context 'when status is updated to "not held"' do
+
+ it 'should redirect to the "request url"' do
+ expect_redirect('not_held', request_url)
+ end
- it 'should redirect to the "unhappy url" when status is updated to "rejected"' do
- expect_redirect('rejected', "help/unhappy/#{@dog_request.url_title}")
end
- it 'should redirect to the "unhappy url" when status is updated to "partially successful"' do
- expect_redirect('partially_successful', "help/unhappy/#{@dog_request.url_title}")
+ context 'when status is updated to "successful"' do
+
+ it 'should redirect to the "request url"' do
+ expect_redirect('successful', request_url)
+ end
+
+ it 'should show a message including the donation url if there is one' do
+ AlaveteliConfiguration.stub!(:donation_url).and_return('http://donations.example.com')
+ post_status('successful')
+ flash[:notice].should match('make a donation')
+ flash[:notice].should match('http://donations.example.com')
+ end
+
+ it 'should show a message without reference to donations if there is no
+ donation url' do
+ AlaveteliConfiguration.stub!(:donation_url).and_return('')
+ post_status('successful')
+ flash[:notice].should_not match('make a donation')
+ end
+
end
- it 'should redirect to the "response url" when status is updated to "waiting clarification" and there is a last response' do
- incoming_message = mock_model(IncomingMessage)
- @dog_request.stub!(:get_last_response).and_return(incoming_message)
- expect_redirect('waiting_clarification', "request/#{@dog_request.id}/response/#{incoming_message.id}")
+ context 'when status is updated to "waiting clarification"' do
+
+ it 'should redirect to the "response url" when there is a last response' do
+ incoming_message = mock_model(IncomingMessage)
+ @dog_request.stub!(:get_last_response).and_return(incoming_message)
+ expect_redirect('waiting_clarification', "request/#{@dog_request.id}/response/#{incoming_message.id}")
+ end
+
+ it 'should redirect to the "response no followup url" when there are no events
+ needing description' do
+ @dog_request.stub!(:get_last_response).and_return(nil)
+ expect_redirect('waiting_clarification', "request/#{@dog_request.id}/response")
+ end
+
end
- it 'should redirect to the "response no followup url" when status is updated to "waiting clarification" and there are no events needing description' do
- @dog_request.stub!(:get_last_response).and_return(nil)
- expect_redirect('waiting_clarification', "request/#{@dog_request.id}/response")
+ context 'when status is updated to "rejected"' do
+
+ it 'should redirect to the "unhappy url"' do
+ expect_redirect('rejected', "help/unhappy/#{@dog_request.url_title}")
+ end
+
end
- it 'should redirect to the "respond to last url" when status is updated to "gone postal"' do
- expect_redirect('gone_postal', "request/#{@dog_request.id}/response/#{@dog_request.get_last_response.id}?gone_postal=1")
+ context 'when status is updated to "partially successful"' do
+
+ it 'should redirect to the "unhappy url"' do
+ expect_redirect('partially_successful', "help/unhappy/#{@dog_request.url_title}")
+ end
+
+ it 'should show a message including the donation url if there is one' do
+ AlaveteliConfiguration.stub!(:donation_url).and_return('http://donations.example.com')
+ post_status('successful')
+ flash[:notice].should match('make a donation')
+ flash[:notice].should match('http://donations.example.com')
+ end
+
+ it 'should show a message without reference to donations if there is no
+ donation url' do
+ AlaveteliConfiguration.stub!(:donation_url).and_return('')
+ post_status('successful')
+ flash[:notice].should_not match('make a donation')
+ end
+
end
- it 'should redirect to the "request url" when status is updated to "internal review"' do
- expect_redirect('internal_review', request_url)
+ context 'when status is updated to "gone postal"' do
+
+ it 'should redirect to the "respond to last url"' do
+ expect_redirect('gone_postal', "request/#{@dog_request.id}/response/#{@dog_request.get_last_response.id}?gone_postal=1")
+ end
+
end
- it 'should redirect to the "request url" when status is updated to "requires admin"' do
- post :describe_state, :incoming_message => {
- :described_state => 'requires_admin',
- :message => "A message" },
- :id => @dog_request.id,
- :last_info_request_event_id => @dog_request.last_event_id_needing_description
- response.should redirect_to show_request_url(:url_title => @dog_request.url_title)
+ context 'when status updated to "internal review"' do
+
+ it 'should redirect to the "request url"' do
+ expect_redirect('internal_review', request_url)
+ end
+
end
- it 'should redirect to the "request url" when status is updated to "error message"' do
- post :describe_state, :incoming_message => {
- :described_state => 'error_message',
- :message => "A message" },
- :id => @dog_request.id,
- :last_info_request_event_id => @dog_request.last_event_id_needing_description
- response.should redirect_to show_request_url(:url_title => @dog_request.url_title)
+ context 'when status is updated to "requires admin"' do
+
+ it 'should redirect to the "request url"' do
+ post :describe_state, :incoming_message => {
+ :described_state => 'requires_admin',
+ :message => "A message" },
+ :id => @dog_request.id,
+ :last_info_request_event_id => @dog_request.last_event_id_needing_description
+ response.should redirect_to show_request_url(:url_title => @dog_request.url_title)
+ end
+
end
- it 'should redirect to the "respond to last url url" when status is updated to "user_withdrawn"' do
- expect_redirect('user_withdrawn', "request/#{@dog_request.id}/response/#{@dog_request.get_last_response.id}")
+ context 'when status is updated to "error message"' do
+
+ it 'should redirect to the "request url"' do
+ post :describe_state, :incoming_message => {
+ :described_state => 'error_message',
+ :message => "A message" },
+ :id => @dog_request.id,
+ :last_info_request_event_id => @dog_request.last_event_id_needing_description
+ response.should redirect_to show_request_url(:url_title => @dog_request.url_title)
+ end
+
end
+ context 'when status is updated to "user_withdrawn"' do
+
+ it 'should redirect to the "respond to last url url" ' do
+ expect_redirect('user_withdrawn', "request/#{@dog_request.id}/response/#{@dog_request.get_last_response.id}")
+ end
+
+ end
end
end
@@ -2310,6 +2416,7 @@ describe RequestController, "when showing similar requests" do
before do
get_fixtures_xapian_index
+ load_raw_emails_data
end
it "should work" do
@@ -2342,91 +2449,6 @@ describe RequestController, "when showing similar requests" do
end
-
-describe RequestController, "when reporting a request when not logged in" do
- it "should only allow logged-in users to report requests" do
- get :report_request, :url_title => info_requests(:badger_request).url_title
- post_redirect = PostRedirect.get_last_post_redirect
- response.should redirect_to(:controller => 'user', :action => 'signin', :token => post_redirect.token)
- end
-end
-
-describe RequestController, "when reporting a request (logged in)" do
- render_views
-
- before do
- @user = users(:robin_user)
- session[:user_id] = @user.id
- end
-
- it "should 404 for non-existent requests" do
- lambda {
- post :report_request, :url_title => "hjksfdhjk_louytu_qqxxx"
- }.should raise_error(ActiveRecord::RecordNotFound)
- end
-
- it "should mark a request as having been reported" do
- ir = info_requests(:badger_request)
- title = ir.url_title
- get :show, :url_title => title
- assigns[:info_request].attention_requested.should == false
-
- post :report_request, :url_title => title
- response.should redirect_to(:action => :show, :url_title => title)
-
- get :show, :url_title => title
- response.should be_success
- assigns[:info_request].attention_requested.should == true
- assigns[:info_request].described_state.should == "attention_requested"
- end
-
- it "should not allow a request to be reported twice" do
- title = info_requests(:badger_request).url_title
-
- post :report_request, :url_title => title
- response.should redirect_to(:action => :show, :url_title => title)
- get :show, :url_title => title
- response.should be_success
- response.body.should include("has been reported")
-
- post :report_request, :url_title => title
- response.should redirect_to(:action => :show, :url_title => title)
- get :show, :url_title => title
- response.should be_success
- response.body.should include("has already been reported")
- end
-
- it "should let users know a request has been reported" do
- title = info_requests(:badger_request).url_title
- get :show, :url_title => title
- response.body.should include("Offensive?")
-
- post :report_request, :url_title => title
- response.should redirect_to(:action => :show, :url_title => title)
-
- get :show, :url_title => title
- response.body.should_not include("Offensive?")
- response.body.should include("This request has been reported")
-
- info_requests(:badger_request).set_described_state("successful")
- get :show, :url_title => title
- response.body.should_not include("This request has been reported")
- response.body.should =~ (/the site administrators.*have not hidden it/)
- end
-
- it "should send an email from the reporter to admins" do
- ir = info_requests(:badger_request)
- title = ir.url_title
- post :report_request, :url_title => title
- deliveries = ActionMailer::Base.deliveries
- deliveries.size.should == 1
- mail = deliveries[0]
- mail.subject.should =~ /attention_requested/
- mail.from.should include(@user.email)
- mail.body.should include(@user.name)
- end
-end
-
describe RequestController, "when caching fragments" do
it "should not fail with long filenames" do
long_name = "blahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblah.txt"
@@ -2454,4 +2476,3 @@ describe RequestController, "when caching fragments" do
end
-
diff --git a/spec/controllers/user_controller_spec.rb b/spec/controllers/user_controller_spec.rb
index 1d8e3dcc3..b09594b9c 100644
--- a/spec/controllers/user_controller_spec.rb
+++ b/spec/controllers/user_controller_spec.rb
@@ -66,6 +66,11 @@ end
describe UserController, "when signing in" do
render_views
+ before do
+ # Don't call out to external url during tests
+ controller.stub!(:country_from_ip).and_return('gb')
+ end
+
def get_last_postredirect
post_redirects = PostRedirect.find_by_sql("select * from post_redirects order by id desc limit 1")
post_redirects.size.should == 1
@@ -226,6 +231,11 @@ end
describe UserController, "when signing up" do
render_views
+ before do
+ # Don't call out to external url during tests
+ controller.stub!(:country_from_ip).and_return('gb')
+ end
+
it "should be an error if you type the password differently each time" do
post :signup, { :user_signup => { :email => 'new@localhost', :name => 'New Person',
:password => 'sillypassword', :password_confirmation => 'sillypasswordtwo' }
diff --git a/spec/integration/view_request_spec.rb b/spec/integration/view_request_spec.rb
index 442721890..3d646cfe7 100644
--- a/spec/integration/view_request_spec.rb
+++ b/spec/integration/view_request_spec.rb
@@ -13,5 +13,12 @@ describe "When viewing requests" do
response.body.should include("dog.json?unfold=1")
end
+ it 'should not raise a routing error when making a json link for a request with an
+ "action" querystring param' do
+ @dog_request = info_requests(:fancy_dog_request)
+ get "request/#{@dog_request.url_title}?action=add"
+ response.should be_success
+ end
+
end
diff --git a/spec/mailers/outgoing_mailer_spec.rb b/spec/mailers/outgoing_mailer_spec.rb
index 0ae31801c..a11d56dd3 100644
--- a/spec/mailers/outgoing_mailer_spec.rb
+++ b/spec/mailers/outgoing_mailer_spec.rb
@@ -1,73 +1,66 @@
require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-describe OutgoingMailer, " when working out follow up addresses" do
- # This is done with fixtures as the code is a bit tangled with the way it
- # calls TMail. XXX untangle it and make these tests spread out and using
- # mocks. Put parts of the tests in spec/lib/tmail_extensions.rb
- before(:each) do
- load_raw_emails_data
+describe OutgoingMailer, " when working out follow up names and addresses" do
+
+ before do
+ @info_request = mock_model(InfoRequest,
+ :recipient_name_and_email => 'test <test@example.com>',
+ :recipient_email => 'test@example.com')
+ @info_request.stub_chain(:public_body, :name).and_return("Test Authority")
+ @incoming_message = mock_model(IncomingMessage,
+ :from_email => 'specific@example.com',
+ :safe_mail_from => 'Specific Person')
end
- it "should parse them right" do
- ir = info_requests(:fancy_dog_request)
- im = ir.incoming_messages[0]
-
- # check the basic entry in the fixture is fine
- OutgoingMailer.name_and_email_for_followup(ir, im).should == "FOI Person <foiperson@localhost>"
- OutgoingMailer.name_for_followup(ir, im).should == "FOI Person"
- OutgoingMailer.email_for_followup(ir, im).should == "foiperson@localhost"
+ def expect_address(info_request, incoming_message, expected_result)
+ mail = create_message_from(from_line)
+ name = MailHandler.get_from_name(mail)
+ email = MailHandler.get_from_address(mail)
+ address = MailHandler.address_from_name_and_email(name, email).to_s
+ [name, email, address].should == expected_result
end
- it "should work when there is only an email address" do
- ir = info_requests(:fancy_dog_request)
- im = ir.incoming_messages[0]
+ describe 'if there is no incoming message being replied to' do
- im.raw_email.data = im.raw_email.data.sub("\"FOI Person\" <foiperson@localhost>", "foiperson@localhost")
- im.parse_raw_email! true
+ it 'should return the name and email address of the public body' do
+ OutgoingMailer.name_and_email_for_followup(@info_request, nil).should == 'test <test@example.com>'
+ OutgoingMailer.name_for_followup(@info_request, nil).should == 'Test Authority'
+ OutgoingMailer.email_for_followup(@info_request, nil).should == 'test@example.com'
+ end
- # check the basic entry in the fixture is fine
- OutgoingMailer.name_and_email_for_followup(ir, im).should == "foiperson@localhost"
- OutgoingMailer.name_for_followup(ir, im).should == "Geraldine Quango"
- OutgoingMailer.email_for_followup(ir, im).should == "foiperson@localhost"
end
- it "should quote funny characters" do
- ir = info_requests(:fancy_dog_request)
- im = ir.incoming_messages[0]
+ describe 'if the incoming message being replied to is not valid to reply to' do
- im.raw_email.data = im.raw_email.data.sub("FOI Person", "FOI [ Person")
- im.parse_raw_email! true
+ before do
+ @incoming_message.stub!(:valid_to_reply_to?).and_return(false)
+ end
- # check the basic entry in the fixture is fine
- OutgoingMailer.name_and_email_for_followup(ir, im).should == "\"FOI [ Person\" <foiperson@localhost>"
- OutgoingMailer.name_for_followup(ir, im).should == "FOI [ Person"
- OutgoingMailer.email_for_followup(ir, im).should == "foiperson@localhost"
+ it 'should return the safe name and email address of the public body' do
+ OutgoingMailer.name_and_email_for_followup(@info_request, @incoming_message).should == 'test <test@example.com>'
+ OutgoingMailer.name_for_followup(@info_request, @incoming_message).should == 'Test Authority'
+ OutgoingMailer.email_for_followup(@info_request, @incoming_message).should == 'test@example.com'
+ end
end
- it "should quote quotes" do
- ir = info_requests(:fancy_dog_request)
- im = ir.incoming_messages[0]
+ describe 'if the incoming message is valid to reply to' do
- im.raw_email.data = im.raw_email.data.sub("FOI Person", "FOI \\\" Person")
- im.parse_raw_email! true
+ before do
+ @incoming_message.stub!(:valid_to_reply_to?).and_return(true)
+ end
- # check the basic entry in the fixture is fine
- OutgoingMailer.name_and_email_for_followup(ir, im).should == "\"FOI \\\" Person\" <foiperson@localhost>"
- OutgoingMailer.name_for_followup(ir, im).should == "FOI \\\" Person"
- OutgoingMailer.email_for_followup(ir, im).should == "foiperson@localhost"
- end
+ it 'should return the name and email address from the incoming message' do
+ OutgoingMailer.name_and_email_for_followup(@info_request, @incoming_message).should == 'Specific Person <specific@example.com>'
+ OutgoingMailer.name_for_followup(@info_request, @incoming_message).should == 'Specific Person'
+ OutgoingMailer.email_for_followup(@info_request, @incoming_message).should == 'specific@example.com'
+ end
- it "should quote @ signs" do
- ir = info_requests(:fancy_dog_request)
- im = ir.incoming_messages[0]
+ it 'should return the name of the public body if the incoming message does not have
+ a safe name' do
+ @incoming_message.stub!(:safe_mail_from).and_return(nil)
+ OutgoingMailer.name_for_followup(@info_request, @incoming_message).should == 'Test Authority'
+ end
- im.raw_email.data = im.raw_email.data.sub("FOI Person", "FOI @ Person")
- im.parse_raw_email! true
-
- # check the basic entry in the fixture is fine
- OutgoingMailer.name_and_email_for_followup(ir, im).should == "\"FOI @ Person\" <foiperson@localhost>"
- OutgoingMailer.name_for_followup(ir, im).should == "FOI @ Person"
- OutgoingMailer.email_for_followup(ir, im).should == "foiperson@localhost"
end
end
@@ -79,21 +72,21 @@ describe OutgoingMailer, "when working out follow up subjects" do
end
it "should prefix the title with 'Freedom of Information request -' for initial requests" do
- ir = info_requests(:fancy_dog_request)
+ ir = info_requests(:fancy_dog_request)
im = ir.incoming_messages[0]
ir.email_subject_request.should == "Freedom of Information request - Why do you have & such a fancy dog?"
end
it "should use 'Re:' and inital request subject for followups which aren't replies to particular messages" do
- ir = info_requests(:fancy_dog_request)
+ ir = info_requests(:fancy_dog_request)
om = outgoing_messages(:useless_outgoing_message)
OutgoingMailer.subject_for_followup(ir, om).should == "Re: Freedom of Information request - Why do you have & such a fancy dog?"
end
it "should prefix with Re: the subject of the message being replied to" do
- ir = info_requests(:fancy_dog_request)
+ ir = info_requests(:fancy_dog_request)
im = ir.incoming_messages[0]
om = outgoing_messages(:useless_outgoing_message)
om.incoming_message_followup = im
@@ -102,7 +95,7 @@ describe OutgoingMailer, "when working out follow up subjects" do
end
it "should not add Re: prefix if there already is such a prefix" do
- ir = info_requests(:fancy_dog_request)
+ ir = info_requests(:fancy_dog_request)
im = ir.incoming_messages[0]
om = outgoing_messages(:useless_outgoing_message)
om.incoming_message_followup = im
@@ -112,19 +105,19 @@ describe OutgoingMailer, "when working out follow up subjects" do
end
it "should not add Re: prefix if there already is a lower case re: prefix" do
- ir = info_requests(:fancy_dog_request)
+ ir = info_requests(:fancy_dog_request)
im = ir.incoming_messages[0]
om = outgoing_messages(:useless_outgoing_message)
om.incoming_message_followup = im
im.raw_email.data = im.raw_email.data.sub("Subject: Geraldine FOI Code AZXB421", "Subject: re: Geraldine FOI Code AZXB421")
im.parse_raw_email! true
-
+
OutgoingMailer.subject_for_followup(ir, om).should == "re: Geraldine FOI Code AZXB421"
end
it "should use 'Re:' and initial request subject when replying to failed delivery notifications" do
- ir = info_requests(:fancy_dog_request)
+ ir = info_requests(:fancy_dog_request)
im = ir.incoming_messages[0]
om = outgoing_messages(:useless_outgoing_message)
om.incoming_message_followup = im
diff --git a/spec/mailers/track_mailer_spec.rb b/spec/mailers/track_mailer_spec.rb
index 32012ca42..e8094b692 100644
--- a/spec/mailers/track_mailer_spec.rb
+++ b/spec/mailers/track_mailer_spec.rb
@@ -69,11 +69,15 @@ describe TrackMailer do
@xapian_search = mock('xapian search', :results => [])
@found_event = mock_model(InfoRequestEvent, :described_at => @track_thing.created_at + 1.day)
@search_result = {:model => @found_event}
- InfoRequest.stub!(:full_search).and_return(@xapian_search)
+ ActsAsXapian::Search.stub!(:new).and_return(@xapian_search)
end
it 'should ask for the events returned by the tracking query' do
- InfoRequest.should_receive(:full_search).with([InfoRequestEvent], 'test query', 'described_at', true, nil, 100, 1).and_return(@xapian_search)
+ ActsAsXapian::Search.should_receive(:new).with([InfoRequestEvent], 'test query',
+ :sort_by_prefix => 'described_at',
+ :sort_by_ascending => true,
+ :collapse_by_prefix => nil,
+ :limit => 100).and_return(@xapian_search)
TrackMailer.alert_tracks
end
diff --git a/spec/models/incoming_message_spec.rb b/spec/models/incoming_message_spec.rb
index b06991a34..3c924dcb3 100644
--- a/spec/models/incoming_message_spec.rb
+++ b/spec/models/incoming_message_spec.rb
@@ -554,6 +554,10 @@ end
describe IncomingMessage, "when extracting attachments" do
+ before do
+ load_raw_emails_data
+ end
+
it 'handles the case where reparsing changes the body of the main part
and the cached attachment has been deleted' do
# original set of attachment attributes
diff --git a/spec/models/info_request_spec.rb b/spec/models/info_request_spec.rb
index 9b87f909e..f9ca44657 100644
--- a/spec/models/info_request_spec.rb
+++ b/spec/models/info_request_spec.rb
@@ -564,6 +564,26 @@ describe InfoRequest do
end
end
+ describe 'when generating json for the api' do
+
+ before do
+ @user = mock_model(User, :json_for_api => { :id => 20,
+ :url_name => 'alaveteli_user',
+ :name => 'Alaveteli User',
+ :ban_text => '',
+ :about_me => 'Hi' })
+ end
+
+ it 'should return full user info for an internal request' do
+ @info_request = InfoRequest.new(:user => @user)
+ @info_request.user_json_for_api.should == { :id => 20,
+ :url_name => 'alaveteli_user',
+ :name => 'Alaveteli User',
+ :ban_text => '',
+ :about_me => 'Hi' }
+ end
+ end
+
describe 'when working out a subject for a followup emails' do
it "should not be confused by an nil subject in the incoming message" do
@@ -575,6 +595,15 @@ describe InfoRequest do
subject.should match(/^Re: Freedom of Information request.*fancy dog/)
end
- end
+ it "should return a hash with the user's name for an external request" do
+ @info_request = InfoRequest.new(:external_url => 'http://www.example.com',
+ :external_user_name => 'External User')
+ @info_request.user_json_for_api.should == {:name => 'External User'}
+ end
+ it 'should return "Anonymous user" for an anonymous external user' do
+ @info_request = InfoRequest.new(:external_url => 'http://www.example.com')
+ @info_request.user_json_for_api.should == {:name => 'Anonymous user'}
+ end
+ end
end
diff --git a/spec/models/outgoing_message_spec.rb b/spec/models/outgoing_message_spec.rb
index 51bb6fdf5..60164fb31 100644
--- a/spec/models/outgoing_message_spec.rb
+++ b/spec/models/outgoing_message_spec.rb
@@ -16,7 +16,7 @@ describe OutgoingMessage, " when making an outgoing message" do
it "should not index the email addresses" do
# also used for track emails
@outgoing_message.get_text_for_indexing.should_not include("foo@bar.com")
- end
+ end
it "should not display email addresses on page" do
@outgoing_message.get_body_for_html_display.should_not include("foo@bar.com")
@@ -33,6 +33,23 @@ describe OutgoingMessage, " when making an outgoing message" do
it "should work out a salutation" do
@om.get_salutation.should == "Dear Geraldine Quango,"
end
+
+ it 'should produce the expected text for an internal review request' do
+ public_body = mock_model(PublicBody, :name => 'A test public body')
+ info_request = mock_model(InfoRequest, :public_body => public_body,
+ :url_title => 'a_test_title',
+ :title => 'A test title',
+ :apply_censor_rules_to_text! => nil)
+ outgoing_message = OutgoingMessage.new({
+ :status => 'ready',
+ :message_type => 'followup',
+ :what_doing => 'internal_review',
+ :info_request => info_request
+ })
+ expected_text = "I am writing to request an internal review of A test public body's handling of my FOI request 'A test title'."
+ outgoing_message.body.should include(expected_text)
+ end
+
end
diff --git a/spec/models/xapian_spec.rb b/spec/models/xapian_spec.rb
index 8c99d550f..c40334142 100644
--- a/spec/models/xapian_spec.rb
+++ b/spec/models/xapian_spec.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
describe User, " when indexing users with Xapian" do
@@ -8,8 +9,7 @@ describe User, " when indexing users with Xapian" do
end
it "should search by name" do
- # def InfoRequest.full_search(models, query, order, ascending, collapse, per_page, page)
- xapian_object = InfoRequest.full_search([User], "Silly", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([User], "Silly", :limit => 100)
xapian_object.results.size.should == 1
xapian_object.results[0][:model].should == users(:silly_name_user)
end
@@ -17,8 +17,7 @@ describe User, " when indexing users with Xapian" do
it "should search by 'about me' text" do
user = users(:bob_smith_user)
- # def InfoRequest.full_search(models, query, order, ascending, collapse, per_page, page)
- xapian_object = InfoRequest.full_search([User], "stuff", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([User], "stuff", :limit => 100)
xapian_object.results.size.should == 1
xapian_object.results[0][:model].should == user
@@ -26,10 +25,10 @@ describe User, " when indexing users with Xapian" do
user.save!
update_xapian_index
- xapian_object = InfoRequest.full_search([User], "stuff", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([User], "stuff", :limit => 100)
xapian_object.results.size.should == 0
- xapian_object = InfoRequest.full_search([User], "aardvark", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([User], "aardvark", :limit => 100)
xapian_object.results.size.should == 1
xapian_object.results[0][:model].should == user
end
@@ -42,26 +41,26 @@ describe PublicBody, " when indexing public bodies with Xapian" do
end
it "should search index the main name field" do
- xapian_object = InfoRequest.full_search([PublicBody], "humpadinking", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([PublicBody], "humpadinking", :limit => 100)
xapian_object.results.size.should == 1
xapian_object.results[0][:model].should == public_bodies(:humpadink_public_body)
end
it "should search index the notes field" do
- xapian_object = InfoRequest.full_search([PublicBody], "albatross", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([PublicBody], "albatross", :limit => 100)
xapian_object.results.size.should == 1
xapian_object.results[0][:model].should == public_bodies(:humpadink_public_body)
end
it "should delete public bodies from the index when they are destroyed" do
- xapian_object = InfoRequest.full_search([PublicBody], "albatross", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([PublicBody], "albatross", :limit => 100)
xapian_object.results.size.should == 1
xapian_object.results[0][:model].should == public_bodies(:humpadink_public_body)
public_bodies(:forlorn_public_body).destroy
update_xapian_index
- xapian_object = InfoRequest.full_search([PublicBody], "lonely", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([PublicBody], "lonely", :limit => 100)
xapian_object.results.should == []
end
@@ -75,13 +74,13 @@ describe PublicBody, " when indexing requests by body they are to" do
end
it "should find requests to the body" do
- xapian_object = InfoRequest.full_search([InfoRequestEvent], "requested_from:tgq", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "requested_from:tgq", :limit => 100)
xapian_object.results.size.should == PublicBody.find_by_url_name("tgq").info_requests.map(&:info_request_events).flatten.size
end
it "should update index correctly when URL name of body changes" do
# initial search
- xapian_object = InfoRequest.full_search([InfoRequestEvent], "requested_from:tgq", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "requested_from:tgq", :limit => 100)
xapian_object.results.size.should == PublicBody.find_by_url_name("tgq").info_requests.map(&:info_request_events).flatten.size
models_found_before = xapian_object.results.map { |x| x[:model] }
@@ -93,9 +92,9 @@ describe PublicBody, " when indexing requests by body they are to" do
update_xapian_index
# check we get results expected
- xapian_object = InfoRequest.full_search([InfoRequestEvent], "requested_from:tgq", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "requested_from:tgq", :limit => 100)
xapian_object.results.size.should == 0
- xapian_object = InfoRequest.full_search([InfoRequestEvent], "requested_from:gq", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "requested_from:gq", :limit => 100)
xapian_object.results.size.should == PublicBody.find_by_url_name("gq").info_requests.map(&:info_request_events).flatten.size
models_found_after = xapian_object.results.map { |x| x[:model] }
@@ -113,11 +112,11 @@ describe PublicBody, " when indexing requests by body they are to" do
update_xapian_index
# check we get results expected
- xapian_object = InfoRequest.full_search([InfoRequestEvent], "requested_from:tgq", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "requested_from:tgq", :limit => 100)
xapian_object.results.size.should == 0
- xapian_object = InfoRequest.full_search([InfoRequestEvent], "requested_from:gq", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "requested_from:gq", :limit => 100)
xapian_object.results.size.should == 0
- xapian_object = InfoRequest.full_search([InfoRequestEvent], "requested_from:" + body.url_name, 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "requested_from:#{body.url_name}", :limit => 100)
xapian_object.results.size.should == public_bodies(:geraldine_public_body).info_requests.map(&:info_request_events).flatten.size
models_found_after = xapian_object.results.map { |x| x[:model] }
end
@@ -130,13 +129,14 @@ describe User, " when indexing requests by user they are from" do
end
it "should find requests from the user" do
- xapian_object = InfoRequest.full_search([InfoRequestEvent], "requested_by:bob_smith", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "requested_by:bob_smith",
+ :sort_by_prefix => 'created_at', :sort_by_ascending => true, :limit => 100)
xapian_object.results.map{|x|x[:model]}.should =~ InfoRequestEvent.all(:conditions => "info_request_id in (select id from info_requests where user_id = #{users(:bob_smith_user).id})")
end
it "should find just the sent message events from a particular user" do
- # def InfoRequest.full_search(models, query, order, ascending, collapse, per_page, page)
- xapian_object = InfoRequest.full_search([InfoRequestEvent], "requested_by:bob_smith variety:sent", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "requested_by:bob_smith variety:sent",
+ :sort_by_prefix => 'created_at', :sort_by_ascending => true, :limit => 100)
xapian_object.results.map{|x|x[:model]}.should =~ InfoRequestEvent.all(:conditions => "info_request_id in (select id from info_requests where user_id = #{users(:bob_smith_user).id}) and event_type = 'sent'")
xapian_object.results[2][:model].should == info_request_events(:useless_outgoing_message_event)
xapian_object.results[1][:model].should == info_request_events(:silly_outgoing_message_event)
@@ -150,8 +150,9 @@ describe User, " when indexing requests by user they are from" do
update_xapian_index
- # def InfoRequest.full_search(models, query, order, ascending, collapse, per_page, page)
- xapian_object = InfoRequest.full_search([InfoRequestEvent], "requested_by:bob_smith", 'created_at', true, 'request_collapse', 100, 1)
+ xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "requested_by:bob_smith",
+ :sort_by_prefix => 'created_at', :sort_by_ascending => true,
+ :collapse_by_prefix => 'request_collapse', :limit => 100)
xapian_object.results.map{|x|x[:model].info_request}.should =~ InfoRequest.all(:conditions => "user_id = #{users(:bob_smith_user).id}")
end
@@ -172,8 +173,7 @@ describe User, " when indexing requests by user they are from" do
update_xapian_index
- # def InfoRequest.full_search(models, query, order, ascending, collapse, per_page, page)
- xapian_object = InfoRequest.full_search([InfoRequestEvent], "requested_by:john_k", 'created_at', true, 'request_collapse', 100, 1)
+ xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "requested_by:john_k", :limit => 100)
xapian_object.results.size.should == 1
xapian_object.results[0][:model].should == info_request_events(:silly_outgoing_message_event)
end
@@ -181,7 +181,8 @@ describe User, " when indexing requests by user they are from" do
it "should update index correctly when URL name of user changes" do
# initial search
- xapian_object = InfoRequest.full_search([InfoRequestEvent], "requested_by:bob_smith", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "requested_by:bob_smith",
+ :sort_by_prefix => 'created_at', :sort_by_ascending => true, :limit => 100)
xapian_object.results.map{|x|x[:model]}.should =~ InfoRequestEvent.all(:conditions => "info_request_id in (select id from info_requests where user_id = #{users(:bob_smith_user).id})")
models_found_before = xapian_object.results.map { |x| x[:model] }
@@ -193,9 +194,10 @@ describe User, " when indexing requests by user they are from" do
update_xapian_index
# check we get results expected
- xapian_object = InfoRequest.full_search([InfoRequestEvent], "requested_by:bob_smith", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "requested_by:bob_smith", :limit => 100)
xapian_object.results.size.should == 0
- xapian_object = InfoRequest.full_search([InfoRequestEvent], "requested_by:robert_smith", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "requested_by:robert_smith",
+ :sort_by_prefix => 'created_at', :sort_by_ascending => true, :limit => 100)
models_found_after = xapian_object.results.map { |x| x[:model] }
models_found_before.should == models_found_after
end
@@ -208,13 +210,13 @@ describe User, " when indexing comments by user they are by" do
end
it "should find requests from the user" do
- xapian_object = InfoRequest.full_search([InfoRequestEvent], "commented_by:silly_emnameem", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "commented_by:silly_emnameem", :limit => 100)
xapian_object.results.size.should == 1
end
it "should update index correctly when URL name of user changes" do
# initial search
- xapian_object = InfoRequest.full_search([InfoRequestEvent], "commented_by:silly_emnameem", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "commented_by:silly_emnameem", :limit => 100)
xapian_object.results.size.should == 1
models_found_before = xapian_object.results.map { |x| x[:model] }
@@ -226,9 +228,9 @@ describe User, " when indexing comments by user they are by" do
update_xapian_index
# check we get results expected
- xapian_object = InfoRequest.full_search([InfoRequestEvent], "commented_by:silly_emnameem", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "commented_by:silly_emnameem", :limit => 100)
xapian_object.results.size.should == 0
- xapian_object = InfoRequest.full_search([InfoRequestEvent], "commented_by:silly_name", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "commented_by:silly_name", :limit => 100)
xapian_object.results.size.should == 1
models_found_after = xapian_object.results.map { |x| x[:model] }
@@ -243,7 +245,7 @@ describe InfoRequest, " when indexing requests by their title" do
end
it "should find events for the request" do
- xapian_object = InfoRequest.full_search([InfoRequestEvent], "request:how_much_public_money_is_wasted_o", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "request:how_much_public_money_is_wasted_o", :limit => 100)
xapian_object.results.size.should == 1
xapian_object.results[0][:model] == info_request_events(:silly_outgoing_message_event)
end
@@ -257,9 +259,9 @@ describe InfoRequest, " when indexing requests by their title" do
update_xapian_index
# check we get results expected
- xapian_object = InfoRequest.full_search([InfoRequestEvent], "request:how_much_public_money_is_wasted_o", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "request:how_much_public_money_is_wasted_o", :limit => 100)
xapian_object.results.size.should == 0
- xapian_object = InfoRequest.full_search([InfoRequestEvent], "request:really_naughty", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "request:really_naughty", :limit => 100)
xapian_object.results.size.should == 1
xapian_object.results[0][:model] == info_request_events(:silly_outgoing_message_event)
end
@@ -277,11 +279,11 @@ describe InfoRequest, " when indexing requests by tag" do
ir.save!
update_xapian_index
- xapian_object = InfoRequest.full_search([InfoRequestEvent], "tag:bunnyrabbit", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "tag:bunnyrabbit", :limit => 100)
xapian_object.results.size.should == 1
xapian_object.results[0][:model] == info_request_events(:silly_outgoing_message_event)
- xapian_object = InfoRequest.full_search([InfoRequestEvent], "tag:orangeaardvark", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "tag:orangeaardvark", :limit => 100)
xapian_object.results.size.should == 0
end
end
@@ -298,14 +300,14 @@ describe PublicBody, " when indexing authorities by tag" do
body.save!
update_xapian_index
- xapian_object = InfoRequest.full_search([PublicBody], "tag:mice", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([PublicBody], "tag:mice", :limit => 100)
xapian_object.results.size.should == 1
xapian_object.results[0][:model] == public_bodies(:geraldine_public_body)
- xapian_object = InfoRequest.full_search([PublicBody], "tag:mice:3", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([PublicBody], "tag:mice:3", :limit => 100)
xapian_object.results.size.should == 1
xapian_object.results[0][:model] == public_bodies(:geraldine_public_body)
- xapian_object = InfoRequest.full_search([PublicBody], "tag:orangeaardvark", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([PublicBody], "tag:orangeaardvark", :limit => 100)
xapian_object.results.size.should == 0
end
end
@@ -327,11 +329,11 @@ describe PublicBody, " when only indexing selected things on a rebuild" do
values = false
texts = false
rebuild_xapian_index(terms, values, texts, dropfirst)
- xapian_object = InfoRequest.full_search([PublicBody], "tag:mice", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([PublicBody], "tag:mice", :limit => 100)
xapian_object.results.size.should == 0
- xapian_object = InfoRequest.full_search([PublicBody], "frobzn", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([PublicBody], "frobzn", :limit => 100)
xapian_object.results.size.should == 0
- xapian_object = InfoRequest.full_search([PublicBody], "variety:authority", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([PublicBody], "variety:authority", :limit => 100)
xapian_object.results.map{|x|x[:model]}.should =~ PublicBody.all
# only reindex 'tag' and text
dropfirst = true
@@ -339,32 +341,57 @@ describe PublicBody, " when only indexing selected things on a rebuild" do
values = false
texts = true
rebuild_xapian_index(terms, values, texts, dropfirst)
- xapian_object = InfoRequest.full_search([PublicBody], "tag:mice", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([PublicBody], "tag:mice", :limit => 100)
xapian_object.results.size.should == 1
- xapian_object = InfoRequest.full_search([PublicBody], "frobzn", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([PublicBody], "frobzn", :limit => 100)
xapian_object.results.size.should == 1
- xapian_object = InfoRequest.full_search([PublicBody], "variety:authority", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([PublicBody], "variety:authority", :limit => 100)
xapian_object.results.size.should == 0
# only reindex 'variety' term, but keeping the existing data in-place
dropfirst = false
terms = "V"
texts = false
rebuild_xapian_index(terms, values, texts, dropfirst)
- xapian_object = InfoRequest.full_search([PublicBody], "tag:mice", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([PublicBody], "tag:mice", :limit => 100)
xapian_object.results.size.should == 1
- xapian_object = InfoRequest.full_search([PublicBody], "frobzn", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([PublicBody], "frobzn", :limit => 100)
xapian_object.results.size.should == 1
- xapian_object = InfoRequest.full_search([PublicBody], "variety:authority", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([PublicBody], "variety:authority", :limit => 100)
xapian_object.results.map{|x|x[:model]}.should =~ PublicBody.all
# only reindex 'variety' term, blowing away existing data
dropfirst = true
rebuild_xapian_index(terms, values, texts, dropfirst)
- xapian_object = InfoRequest.full_search([PublicBody], "tag:mice", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([PublicBody], "tag:mice", :limit => 100)
xapian_object.results.size.should == 0
- xapian_object = InfoRequest.full_search([PublicBody], "frobzn", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([PublicBody], "frobzn", :limit => 100)
xapian_object.results.size.should == 0
- xapian_object = InfoRequest.full_search([PublicBody], "variety:authority", 'created_at', true, nil, 100, 1)
+ xapian_object = ActsAsXapian::Search.new([PublicBody], "variety:authority", :limit => 100)
xapian_object.results.map{|x|x[:model]}.should =~ PublicBody.all
end
end
+# I would expect ActsAsXapian to have some tests under vendor/plugins/acts_as_xapian, but
+# it looks like this is not the case. Putting a test here instead.
+describe ActsAsXapian::Search, "#words_to_highlight" do
+ it "should return a list of words used in the search" do
+ s = ActsAsXapian::Search.new([PublicBody], "albatross words", :limit => 100)
+ s.words_to_highlight.should == ["albatross", "words"]
+ end
+
+ it "should remove any operators" do
+ s = ActsAsXapian::Search.new([PublicBody], "albatross words tag:mice", :limit => 100)
+ s.words_to_highlight.should == ["albatross", "words"]
+ end
+
+ # This is the current behaviour but it seems a little simplistic to me
+ it "should separate punctuation" do
+ s = ActsAsXapian::Search.new([PublicBody], "The doctor's patient", :limit => 100)
+ s.words_to_highlight.should == ["The", "doctor", "s", "patient"]
+ end
+
+ it "should handle non-ascii characters" do
+ s = ActsAsXapian::Search.new([PublicBody], "adatigénylés words tag:mice", :limit => 100)
+ s.words_to_highlight.should == ["adatigénylés", "words"]
+ end
+
+end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 57ab88da2..a3b06cea8 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,7 +1,19 @@
require 'rubygems'
require 'spork'
+
#uncomment the following line to use spork with the debugger
#require 'spork/ext/ruby-debug'
+require 'simplecov'
+require 'coveralls'
+# Generate coverage locally in html as well as in coveralls.io
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+ SimpleCov::Formatter::HTMLFormatter,
+ Coveralls::SimpleCov::Formatter
+]
+SimpleCov.start('rails') do
+ add_filter 'commonlib'
+ add_filter 'vendor/plugins'
+end
Spork.prefork do
# Loading more in this block will cause your tests to run faster. However,
diff --git a/spec/views/reports/new.erb_spec.rb b/spec/views/reports/new.erb_spec.rb
new file mode 100644
index 000000000..66b738261
--- /dev/null
+++ b/spec/views/reports/new.erb_spec.rb
@@ -0,0 +1,29 @@
+require File.expand_path(File.join('..', '..', '..', 'spec_helper'), __FILE__)
+
+describe 'reports/new.html.erb' do
+ let(:info_request) { mock_model(InfoRequest, :url_title => "foo", :report_reasons => ["Weird"]) }
+ before :each do
+ assign(:info_request, info_request)
+ end
+
+ it "should show a form" do
+ render
+ rendered.should have_selector("form")
+ end
+
+ context "request has already been reported" do
+ before :each do
+ info_request.stub!(:attention_requested).and_return(true)
+ end
+
+ it "should not show a form" do
+ render
+ rendered.should_not have_selector("form")
+ end
+
+ it "should say it's already been reported" do
+ render
+ rendered.should contain("This request has already been reported")
+ end
+ end
+end
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 1e5df8de4..f2cd1075c 100644
--- a/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb
+++ b/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
# acts_as_xapian/lib/acts_as_xapian.rb:
# Xapian full text search in Ruby on Rails.
#
@@ -472,7 +473,9 @@ module ActsAsXapian
# date ranges or similar. Use this for cheap highlighting with
# TextHelper::highlight, and excerpt.
def words_to_highlight
- query_nopunc = self.query_string.gsub(/[^a-z0-9:\.\/_]/i, " ")
+ # TODO: In Ruby 1.9 we can do matching of any unicode letter with \p{L}
+ # But we still need to support ruby 1.8 for the time being so...
+ query_nopunc = self.query_string.gsub(/[^ёЁа-яА-Яa-zA-Zà-üÀ-Ü0-9:\.\/_]/iu, " ")
query_nopunc = query_nopunc.gsub(/\s+/, " ")
words = query_nopunc.split(" ")
# Remove anything with a :, . or / in it