diff options
47 files changed, 547 insertions, 333 deletions
@@ -8,6 +8,8 @@ # echo "rvm use 1.8.7" > .rvmrc environment_id="ruby-1.8.7-p370" +rubygems_version="1.6.2" + # Uncomment the following lines if you want to verify rvm version per project # rvmrc_rvm_version="1.14.10 (stable)" # 1.10.1 seams as a safe start # eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || { @@ -27,7 +29,6 @@ then \. "${rvm_path:-$HOME/.rvm}/hooks/after_use" || true if [[ $- == *i* ]] # check for interactive shells then echo "Using: $(tput setaf 2)$GEM_HOME$(tput sgr0)" # show the user the ruby and gemset they are using in green - else echo "Using: $GEM_HOME" # don't use colors in non-interactive shells fi else # If the environment file has not yet been created, use the RVM CLI to select. @@ -37,6 +38,10 @@ else } fi +if [[ "$(gem --version)" != "${rubygems_version}" ]] ; then + rvm rubygems ${rubygems_version} +fi + # If you use bundler, this might be useful to you: # if [[ -s Gemfile ]] && { # ! builtin command -v bundle >/dev/null || diff --git a/.travis.yml b/.travis.yml index 4c8fbef6a..70f1e3ecf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,4 +22,4 @@ notifications: irc: "irc.freenode.org#alaveteli" email: recipients: - - seb.bacon@gmail.com + - cron-whatdotheyknow@mysociety.org @@ -26,6 +26,7 @@ gem 'recaptcha', '~> 0.3.1', :require => 'recaptcha/rails' # :require avoids "already initialized constant" warnings gem 'rmagick', :require => 'RMagick' gem 'routing-filter', '~> 0.2.4' +gem 'rake', '~> 0.9.2.2' gem 'rspec', '~> 1.3.2' gem 'rspec-rails', '~> 1.3.4' gem 'ruby-msg', '~> 1.5.0' @@ -41,7 +42,6 @@ gem 'capistrano' group :test do gem 'fakeweb' gem 'rspec-rails', '~> 1.3.4' - gem 'rake' end group :develop do diff --git a/Gemfile.lock b/Gemfile.lock index 841e92112..f243ffaad 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -102,7 +102,7 @@ DEPENDENCIES pg rack (~> 1.1.0) rails (= 2.3.14) - rake + rake (~> 0.9.2.2) rdoc (~> 2.4.3) recaptcha (~> 0.3.1) rmagick diff --git a/app/controllers/admin_request_controller.rb b/app/controllers/admin_request_controller.rb index 7cf23e61e..53ff2957b 100644 --- a/app/controllers/admin_request_controller.rb +++ b/app/controllers/admin_request_controller.rb @@ -71,6 +71,7 @@ class AdminRequestController < AdminController old_allow_new_responses_from = @info_request.allow_new_responses_from old_handle_rejected_responses = @info_request.handle_rejected_responses old_tag_string = @info_request.tag_string + old_comments_allowed = @info_request.comments_allowed @info_request.title = params[:info_request][:title] @info_request.prominence = params[:info_request][:prominence] @@ -81,6 +82,7 @@ class AdminRequestController < AdminController @info_request.allow_new_responses_from = params[:info_request][:allow_new_responses_from] @info_request.handle_rejected_responses = params[:info_request][:handle_rejected_responses] @info_request.tag_string = params[:info_request][:tag_string] + @info_request.comments_allowed = params[:info_request][:comments_allowed] == "true" ? true : false if @info_request.valid? @info_request.save! @@ -92,7 +94,8 @@ class AdminRequestController < AdminController :old_awaiting_description => old_awaiting_description, :awaiting_description => @info_request.awaiting_description, :old_allow_new_responses_from => old_allow_new_responses_from, :allow_new_responses_from => @info_request.allow_new_responses_from, :old_handle_rejected_responses => old_handle_rejected_responses, :handle_rejected_responses => @info_request.handle_rejected_responses, - :old_tag_string => old_tag_string, :tag_string => @info_request.tag_string + :old_tag_string => old_tag_string, :tag_string => @info_request.tag_string, + :old_comments_allowed => old_comments_allowed, :tag_string => @info_request.comments_allowed }) # expire cached files expire_for_request(@info_request) diff --git a/app/controllers/comment_controller.rb b/app/controllers/comment_controller.rb index 1552017c2..988a8a6f8 100644 --- a/app/controllers/comment_controller.rb +++ b/app/controllers/comment_controller.rb @@ -23,6 +23,13 @@ class CommentController < ApplicationController else raise "Unknown type " + params[:type] end + + # Are comments disabled on this request? + # + # There is no “add comment” link when comments are disabled, so users should + # not usually hit this unless they are explicitly attempting to avoid the comment + # block, so we just raise an exception. + raise "Comments are not allowed on this request" if !@info_request.comments_allowed? # Banned from adding comments? if !authenticated_user.nil? && !authenticated_user.can_make_comments? diff --git a/app/models/censor_rule.rb b/app/models/censor_rule.rb index da3f49760..a74fdcb24 100644 --- a/app/models/censor_rule.rb +++ b/app/models/censor_rule.rb @@ -1,5 +1,5 @@ # == Schema Information -# Schema version: 114 +# Schema version: 20120919140404 # # Table name: censor_rules # @@ -9,11 +9,11 @@ # public_body_id :integer # text :text not null # replacement :text not null -# regexp :boolean # last_edit_editor :string(255) not null # last_edit_comment :text not null # created_at :datetime not null # updated_at :datetime not null +# regexp :boolean # # models/censor_rule.rb: diff --git a/app/models/info_request.rb b/app/models/info_request.rb index aa4f7537a..141440c6d 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -1,4 +1,5 @@ # == Schema Information +# Schema version: 20120919140404 # # Table name: info_requests # @@ -19,6 +20,7 @@ # external_user_name :string(255) # external_url :string(255) # attention_requested :boolean default(FALSE) +# comments_allowed :boolean default(TRUE), not null # require 'digest/sha1' diff --git a/app/models/public_body.rb b/app/models/public_body.rb index 77da81d4c..2cf1ce8a2 100644 --- a/app/models/public_body.rb +++ b/app/models/public_body.rb @@ -1,32 +1,27 @@ -# -*- coding: utf-8 -*- # == Schema Information +# Schema version: 20120919140404 # # Table name: public_bodies # -# id :integer not null, primary key -# name :text not null -# short_name :text not null -# request_email :text not null -# version :integer not null -# last_edit_editor :string(255) not null -# last_edit_comment :text not null -# created_at :datetime not null -# updated_at :datetime not null -# url_name :text not null -# home_page :text default(""), not null -# notes :text default(""), not null -# first_letter :string(255) not null -# publication_scheme :text default(""), not null -# api_key :string(255) not null -# -# models/public_body.rb: -# A public body, from which information can be requested. +# id :integer not null, primary key +# name :text not null +# short_name :text not null +# request_email :text not null +# version :integer not null +# last_edit_editor :string(255) not null +# last_edit_comment :text not null +# created_at :datetime not null +# updated_at :datetime not null +# url_name :text not null +# home_page :text default(""), not null +# notes :text default(""), not null +# first_letter :string(255) not null +# publication_scheme :text default(""), not null +# api_key :string(255) +# info_requests_count :integer default(0), not null # -# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. -# Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: public_body.rb,v 1.160 2009-10-02 22:56:35 francis Exp $ +# -*- coding: utf-8 -*- require 'csv' require 'securerandom' require 'set' diff --git a/app/models/request_classification.rb b/app/models/request_classification.rb index 678b6cd16..f5a1b4bee 100644 --- a/app/models/request_classification.rb +++ b/app/models/request_classification.rb @@ -1,3 +1,15 @@ +# == Schema Information +# Schema version: 20120919140404 +# +# Table name: request_classifications +# +# id :integer not null, primary key +# user_id :integer +# info_request_event_id :integer +# created_at :datetime +# updated_at :datetime +# + class RequestClassification < ActiveRecord::Base belongs_to :user @@ -13,4 +25,4 @@ class RequestClassification < ActiveRecord::Base :include => :user) end -end
\ No newline at end of file +end diff --git a/app/models/user.rb b/app/models/user.rb index 657ea2a4a..bb1b54d70 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,4 +1,5 @@ # == Schema Information +# Schema version: 20120919140404 # # Table name: users # @@ -21,13 +22,6 @@ # no_limit :boolean default(FALSE), not null # receive_email_alerts :boolean default(TRUE), not null # -# models/user.rb: -# Model of people who use the site to file requests, make comments etc. -# -# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. -# Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: user.rb,v 1.106 2009-10-01 01:43:36 francis Exp $ require 'digest/sha1' diff --git a/app/views/admin_request/edit.rhtml b/app/views/admin_request/edit.rhtml index 808028b47..8fa2a1fe2 100644 --- a/app/views/admin_request/edit.rhtml +++ b/app/views/admin_request/edit.rhtml @@ -28,6 +28,10 @@ <br/>(don't forget to change 'awaiting description' when you set described state)<br/> </p> + <p><label for="info_request_comments_allowed"><strong>Are comments allowed?</strong></label> + <%= select('info_request', "comments_allowed", [["Yes – comments allowed", true], ["No – comments disabled", false]]) %> + </p> + <p><label for="info_request_tag_string"><strong>Tags</strong> <small>(space separated, can use key:value)</small></label><br/> <%= text_field 'info_request', 'tag_string', :size => 60 %></p> diff --git a/app/views/request/_after_actions.rhtml b/app/views/request/_after_actions.rhtml index 15ca6302e..580ff0e87 100644 --- a/app/views/request/_after_actions.rhtml +++ b/app/views/request/_after_actions.rhtml @@ -5,9 +5,11 @@ <div id="anyone_actions"> <strong><%= _('Anyone:') %></strong> <ul> - <li> - <%= _('<a href="%s">Add an annotation</a> (to help the requester or others)') % [new_comment_url(:url_title => @info_request.url_title)] %> - </li> + <% if @info_request.comments_allowed? %> + <li> + <%= _('<a href="%s">Add an annotation</a> (to help the requester or others)') % [new_comment_url(:url_title => @info_request.url_title)] %> + </li> + <% end %> <% if @old_unclassified %> <li> <%= link_to _('Update the status of this request'), '#describe_state_form_1' %> diff --git a/app/views/request/_sidebar.rhtml b/app/views/request/_sidebar.rhtml index 731bfb34e..dc0d2eb31 100644 --- a/app/views/request/_sidebar.rhtml +++ b/app/views/request/_sidebar.rhtml @@ -24,7 +24,7 @@ <% end %> <% else %> <p><%= _('Requests for personal information and vexatious requests are not considered valid for FOI purposes (<a href="/help/about">read more</a>).') %></p> - <p><%= ('If you believe this request is not suitable, you can report it for attention by the site administrators') %></p> + <p><%= _('If you believe this request is not suitable, you can report it for attention by the site administrators') %></p> <%= link_to _("Report this request"), report_path, :class => "link_button_green", :method => "POST" %> <% end %> <% end %> @@ -32,11 +32,11 @@ <div class="act_link"> <% tweet_link = "https://twitter.com/share?url=#{h(request.url)}&via=#{h(MySociety::Config.get('TWITTER_USERNAME', ''))}&text='#{h(@info_request.title)}'&related=#{_('alaveteli_foi:The software that runs {{site_name}}', :site_name => h(site_name))}" %> - <%= link_to '<img src="/images/twitter-16.png" alt="twitter icon">', tweet_link %> - <%= link_to _("Tweet this request"), tweet_link %> + <%= link_to '<img src="/images/twitter-16.png" alt="twitter icon">', tweet_link %> + <%= link_to _("Tweet this request"), tweet_link %> </div> <div class="act_link"> - <%= link_to '<img src="/images/wordpress.png" alt="" class="rss">', "http://wordpress.com/"%> + <%= link_to '<img src="/images/wordpress.png" alt="" class="rss">', "http://wordpress.com/"%> <%= link_to _("Start your own blog"), "http://wordpress.com/"%> </div> diff --git a/app/views/track/_tracking_links.rhtml b/app/views/track/_tracking_links.rhtml index 39f346eff..3ba9d15e2 100644 --- a/app/views/track/_tracking_links.rhtml +++ b/app/views/track/_tracking_links.rhtml @@ -4,12 +4,12 @@ end %> -<% if own_request %> +<% if own_request %> <p><%= _('This is your own request, so you will be automatically emailed when new responses arrive.')%></p> -<% elsif existing_track %> +<% elsif existing_track %> <p><%= track_thing.params[:verb_on_page_already] %></p> <div class="feed_link feed_link_<%=location%>"> - <%= link_to "Unsubscribe", {:controller => 'track', :action => 'update', :track_id => existing_track.id, :track_medium => "delete", :r => request.request_uri}, :class => "link_button_green" %> + <%= link_to _("Unsubscribe"), {:controller => 'track', :action => 'update', :track_id => existing_track.id, :track_medium => "delete", :r => request.request_uri}, :class => "link_button_green" %> </div> <% elsif track_thing %> <div class="feed_link feed_link_<%=location%>"> @@ -19,9 +19,9 @@ <%= link_to _("Follow"), do_track_url(track_thing), :class => "link_button_green" %> <% end %> </div> - + <div class="feed_link feed_link_<%=location%>"> - <%= link_to '<img src="/images/feed-16.png" alt="">', do_track_url(track_thing, 'feed') %> + <%= link_to '<img src="/images/feed-16.png" alt="">', do_track_url(track_thing, 'feed') %> <%= link_to (location == 'sidebar' ? _('RSS feed of updates') : _('RSS feed')), do_track_url(track_thing, 'feed') %> </div> <% end %> diff --git a/config/deploy.rb b/config/deploy.rb index 888710f83..f82379df0 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -48,6 +48,9 @@ namespace :deploy do links = { "#{release_path}/config/database.yml" => "#{shared_path}/database.yml", "#{release_path}/config/general.yml" => "#{shared_path}/general.yml", + "#{release_path}/config/rails_env.rb" => "#{shared_path}/rails_env.rb", + "#{release_path}/public/foi-live-creation.png" => "#{shared_path}/foi-live-creation.png", + "#{release_path}/public/foi-user-use.png" => "#{shared_path}/foi-user-use.png", "#{release_path}/files" => "#{shared_path}/files", "#{release_path}/cache" => "#{shared_path}/cache", "#{release_path}/vendor/plugins/acts_as_xapian/xapiandbs" => "#{shared_path}/xapiandbs", diff --git a/config/environment.rb b/config/environment.rb index 6234ae5c1..250d3eed0 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -32,7 +32,7 @@ require File.join(File.dirname(__FILE__), '../lib/old_rubygems_patch') # Application version -ALAVETELI_VERSION = '0.6.5.1' +ALAVETELI_VERSION = '0.6.6' Rails::Initializer.run do |config| # Load intial mySociety config diff --git a/db/migrate/20120912170035_add_info_requests_count_to_public_bodies.rb b/db/migrate/20120912170035_add_info_requests_count_to_public_bodies.rb index d77dbaa64..d187dcfa5 100644 --- a/db/migrate/20120912170035_add_info_requests_count_to_public_bodies.rb +++ b/db/migrate/20120912170035_add_info_requests_count_to_public_bodies.rb @@ -2,11 +2,10 @@ class AddInfoRequestsCountToPublicBodies < ActiveRecord::Migration def self.up add_column :public_bodies, :info_requests_count, :integer, :null => false, :default => 0 - PublicBody.reset_column_information + PublicBody.connection.execute("UPDATE public_bodies + SET info_requests_count = (SELECT COUNT(*) FROM info_requests + WHERE public_body_id = public_bodies.id);") - PublicBody.find_each do |public_body| - public_body.update_attribute :info_requests_count, public_body.info_requests.length - end end diff --git a/db/migrate/20120919140404_add_comments_allowed_to_info_request.rb b/db/migrate/20120919140404_add_comments_allowed_to_info_request.rb new file mode 100644 index 000000000..4ae0bce18 --- /dev/null +++ b/db/migrate/20120919140404_add_comments_allowed_to_info_request.rb @@ -0,0 +1,9 @@ +class AddCommentsAllowedToInfoRequest < ActiveRecord::Migration + def self.up + add_column :info_requests, :comments_allowed, :boolean, :null => false, :default => true + end + + def self.down + remove_column :info_requests, :comments_allowed + end +end diff --git a/doc/CHANGES.md b/doc/CHANGES.md index ae9418ef4..15df1dce5 100644 --- a/doc/CHANGES.md +++ b/doc/CHANGES.md @@ -1,3 +1,15 @@ +# Version 0.6.6 +## Highlighted features +* Adds deployment via Capistrano - see DEPLOY.md for details +* Speeds up several admin pages that were slow in large installs + +* [List of issues on github](https://github.com/mysociety/alaveteli/issues?milestone=22&state=closed) + +## Upgrade notes + +* Check out this version and run `rails-post-deploy` as usual. +* Run `rake temp:populate_request_classifications` to populate the new request_classifications table which is used in generating the request categorisation game league tables and progress widget. + # Version 0.6.5 * This is a minor release, to update all documentation and example files to reflect the move of the official repository to http://github.com/mysociety/alaveteli and the alavetelitheme and adminbootstraptheme themes to http://github.com/mysociety/alavetelitheme and http://github.com/mysociety/adminbootstraptheme respectively. * Some basic versioning has been added for themes. An ALAVETELI_VERSION constant has been added in config/environment.rb. When loading themes, `rails-post-deploy` now looks for a tag on the theme repository in the form 'use-with-alaveteli-0.6.5' that matches the ALAVETELI_VERSION being deployed - if it finds such a tag, the theme will be checked out from that tag, rather than from the HEAD of the theme repository. If no such tag is found, HEAD is used, as before [issue #573](https://github.com/mysociety/alaveteli/issues/573). diff --git a/doc/INSTALL.md b/doc/INSTALL.md index 62c5071ca..da72987af 100644 --- a/doc/INSTALL.md +++ b/doc/INSTALL.md @@ -39,7 +39,7 @@ If you are running Debian, add the following repositories to deb http://ftp.debian.org/debian/ testing main non-free contrib The repositories above allow us to install the packages -`wkthmltopdf-static` and `bundler` using `apt`; so if you're running +`wkhtmltopdf-static` and `bundler` using `apt`; so if you're running Ubuntu, you won't be able to use the above repositories, and you will need to comment out those two lines in `config/packages` before following the next step (and install bundler manually). @@ -326,12 +326,17 @@ which lives in `config/alert-tracks-debian.ugly`. As with the cron jobs above, replace the variables (and/or bits near the variables) with paths to your software. `config/purge-varnish-debian.ugly` is a similar init script, which is optional and not required if you choose -not to run your site behind Varnish (see below). +not to run your site behind Varnish (see below). Either tweak the file permissions to make the script executable by your deploy user, or add the following line to your +sudoers file to allow these to be run by your deploy user (named `deploy` in +this case): + + deploy ALL = NOPASSWD: /etc/init.d/foi-alert-tracks, /etc/init.d/foi-purge-varnish The cron jobs refer to a program `run-with-lockfile`. See [this issue](https://github.com/mysociety/alaveteli/issues/112) for a discussion of where to find this program, and how you might replace -it. +it. This [one line script](https://gist.github.com/3741194) can install +this program system-wide. # Set up production web server diff --git a/locale/aln/app.po b/locale/aln/app.po index b31c3d1bf..0b07e2754 100644 --- a/locale/aln/app.po +++ b/locale/aln/app.po @@ -8,15 +8,15 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-08-24 09:20+0100\n" -"PO-Revision-Date: 2012-08-24 08:21+0000\n" +"POT-Creation-Date: 2012-09-19 09:37+0100\n" +"PO-Revision-Date: 2012-09-19 08:48+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: aln\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "" "\n" @@ -1968,6 +1968,9 @@ msgstr "" msgid "PublicBody|Home page" msgstr "" +msgid "PublicBody|Info requests count" +msgstr "" + msgid "PublicBody|Last edit comment" msgstr "" @@ -3453,6 +3456,9 @@ msgstr "" msgid "also called {{public_body_short_name}}" msgstr "" +msgid "an anonymous user" +msgstr "" + msgid "and" msgstr "" diff --git a/locale/app.pot b/locale/app.pot index 20433ad97..d927a0cb7 100644 --- a/locale/app.pot +++ b/locale/app.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: version 0.0.1\n" -"POT-Creation-Date: 2012-08-24 09:20+0100\n" +"POT-Creation-Date: 2012-09-19 09:37+0100\n" "PO-Revision-Date: 2011-10-09 01:10+0200\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1779,6 +1779,9 @@ msgstr "" msgid "PublicBody|Home page" msgstr "" +msgid "PublicBody|Info requests count" +msgstr "" + msgid "PublicBody|Last edit comment" msgstr "" @@ -3137,6 +3140,9 @@ msgstr "" msgid "also called {{public_body_short_name}}" msgstr "" +msgid "an anonymous user" +msgstr "" + msgid "and" msgstr "" diff --git a/locale/bs/app.po b/locale/bs/app.po index 2576c296f..50f53128b 100644 --- a/locale/bs/app.po +++ b/locale/bs/app.po @@ -10,15 +10,15 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-08-24 09:20+0100\n" -"PO-Revision-Date: 2012-08-24 10:33+0000\n" +"POT-Creation-Date: 2012-09-19 09:37+0100\n" +"PO-Revision-Date: 2012-09-19 08:48+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: bs\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" +"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 "" "\n" @@ -1974,6 +1974,9 @@ 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" @@ -3465,6 +3468,9 @@ 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" diff --git a/locale/ca/app.po b/locale/ca/app.po index 935ca5ae1..570e8ae50 100644 --- a/locale/ca/app.po +++ b/locale/ca/app.po @@ -10,15 +10,15 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-08-24 09:20+0100\n" -"PO-Revision-Date: 2012-08-24 10:31+0000\n" +"POT-Creation-Date: 2012-09-19 09:37+0100\n" +"PO-Revision-Date: 2012-09-19 08:48+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ca\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "" "\n" @@ -1970,6 +1970,9 @@ msgstr "Primera letra" msgid "PublicBody|Home page" msgstr "Sitio web" +msgid "PublicBody|Info requests count" +msgstr "" + msgid "PublicBody|Last edit comment" msgstr "PublicBody|Last edit comment" @@ -3455,6 +3458,9 @@ msgstr "todas las solicitudes" msgid "also called {{public_body_short_name}}" msgstr "también conocido como {{public_body_short_name}}" +msgid "an anonymous user" +msgstr "" + msgid "and" msgstr "y" diff --git a/locale/cs/app.po b/locale/cs/app.po index 53d4df4ae..a0f227b48 100644 --- a/locale/cs/app.po +++ b/locale/cs/app.po @@ -5,20 +5,21 @@ # Translators: # Hana Huntova <>, 2012. # Jana Kneschke <>, 2012. +# <jana.kneschke@gmail.com>, 2012. # <josef.pospisil@laststar.eu>, 2012. msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-08-24 09:20+0100\n" -"PO-Revision-Date: 2012-08-24 10:32+0000\n" +"POT-Creation-Date: 2012-09-19 09:37+0100\n" +"PO-Revision-Date: 2012-09-19 08:48+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: cs\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" msgid "" "\n" @@ -48,13 +49,13 @@ msgid " - view and make Freedom of Information requests" msgstr " - prohlížejte a vzneste dotaz" msgid " - wall" -msgstr "" +msgstr "- nástěnka" msgid "" " <strong>Note:</strong>\n" " We will send you an email. Follow the instructions in it to change\n" " your password." -msgstr " <strong>Upozornění:</strong>\n Pošleme vám e-mail s návodem, jak si změníte heslo." +msgstr " <strong>Upozornění:</strong>\n Pošleme vám e-mail s návodem, jak změnit heslo." msgid " <strong>Privacy note:</strong> Your email address will be given to" msgstr " <strong>Ochrana soukromí:</strong> Vaše e-mailová adresa bude předána" @@ -222,7 +223,7 @@ msgid "" " on other means to answer your question.\n" " </li>\n" " </ul>" -msgstr "" +msgstr "<p>Děkujeme vám! Dále můžete:</p> <ul> <li>vznést stejný dotaz na jinou instituci: nejdříve zkopírujte níže uvedený text dotazu a pak <a href=\"{{find_authority_url}}\">najděte požadovanou instituci</a>.</li> <li>Můžete také zpochybnit tvrzení instituce, pokud máte důvodné podezření, že tvrzení o nedostupnosti informací se nezakládá na skutečnosti: zde najdete <a href=\"{{complain_url}}\">popis, jak podat stížnost</a>. Také zde můžete</li> <li>pročíst další <a href=\"{{other_means_url}}\">tipy,</a> jak získat odpověď na svůj dotaz. </li> </ul>" msgid "" "<p>Thank you! Hope you don't have to wait much longer.</p> <p>By law, you " @@ -307,7 +308,7 @@ msgid "" " replied by then.</p>\n" " <p>If you write about this request (for example in a forum or a blog) please link to this page, and add an\n" " annotation below telling people about your writing.</p>" -msgstr "" +msgstr "Odesláno!\ndalší text viz e-mail od Hany z 29/9" msgid "" "<p>{{site_name}} is currently in maintenance. You can only view existing " @@ -324,9 +325,9 @@ msgstr "<small>Pokud používáte prohlížeč ke čtení a posílání e-mailů msgid "<span id='follow_count'>%d</span> person is following this authority" msgid_plural "" "<span id='follow_count'>%d</span> people are following this authority" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "<span id='follow_count'>%d</span> člověk sleduje tuto instituci" +msgstr[1] "'follow_count'>%d</span> lidí sledují tuto instituci" +msgstr[2] "'follow_count'>%d</span> lidí sleduje tuto instituci" msgid "" "<strong> Can I request information about myself?</strong>\n" @@ -413,7 +414,7 @@ msgstr "<strong>Poznámka:</strong>\n Pošleme vám zprávu na vaši e-mailov msgid "" "<strong>Note:</strong> You're sending a message to yourself, presumably\n" " to try out how it works." -msgstr "" +msgstr "<strong>Upozornění:</strong> Posíláte zprávu sami sobě." msgid "" "<strong>Privacy note:</strong> If you want to request private information about\n" @@ -423,7 +424,7 @@ msgstr "<strong>Ochrana soukromí:</strong> Pokud chcete vznést dotaz týkajíc msgid "" "<strong>Privacy note:</strong> Your photo will be shown in public on the Internet,\n" " wherever you do something on {{site_name}}." -msgstr "" +msgstr "<strong>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 "" "<strong>Privacy warning:</strong> Your message, and any response\n" @@ -442,13 +443,13 @@ msgstr "<strong>neměli</strong> požadované informace." msgid "" "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> " "was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." -msgstr "" +msgstr "<a href=\"{{request_url}}\">Odpověď</a> v konverzaci týkající se <em>{{request_title}}</em> byla odeslána instituci {{public_body_name}} uživatelem {{info_request_user}} dne {{date}}." 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 "" +msgstr "<a href=\"{{request_url}}\">Odpověď</a> na dotaz <em>{{request_title}}</em> byla odeslána institucí {{public_body_name}} uživateli {{info_request_user}} dne {{date}}. Dotaz je tedy ve stavu: {{request_status}}" msgid "" "A <strong>summary</strong> of the response if you have received it by post. " @@ -460,7 +461,7 @@ msgstr "Vznesený dotaz podle zákona 106/1999 Sb." 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 "" +msgstr "Nový dotaz byl vznesen na instituci {{public_body_name}} uživatelem {{info_request_user}} dne {{date}}." msgid "A public authority" msgstr "Instituce" @@ -537,7 +538,7 @@ msgid "Also called {{other_name}}." msgstr "Také se nazývá {{other_name}}." msgid "Also send me alerts by email" -msgstr "" +msgstr "Upozornění posílat také e-mailem." msgid "Alter your subscription" msgstr "Změnit své odběry" @@ -550,7 +551,7 @@ msgstr "I když jsou všechny odpovědi automaticky uveřejňovány, hodnocení msgid "" "An <a href=\"{{request_url}}\">annotation</a> to <em>{{request_title}}</em> " "was made by {{event_comment_user}} on {{date}}" -msgstr "" +msgstr "<a href=\"{{request_url}}\">Dotaz</a> <em>{{request_title}}</em> byl okomentován uživatelem {{event_comment_user}} dne {{date}}" msgid "An <strong>error message</strong> has been received" msgstr "Byla nahlášena <strong>chyba</strong>" @@ -559,7 +560,7 @@ msgid "An Environmental Information Regulations request" msgstr "Dotazy ve smyslu zákona č. 123/1998 Sb., o právu na informace o životním prostředí" msgid "An anonymous user" -msgstr "" +msgstr "Nezaregistrovaný uživatel" msgid "Annotation added to request" msgstr "Poznámka u dotazů byla přidána" @@ -578,7 +579,7 @@ msgid "" msgstr "Poznámky zde budou veřejně k dispozici\n <strong>a nebudou</strong> poslány {{public_body_name}}." msgid "Anonymous user" -msgstr "" +msgstr "Nezaregistrovaný uživatel" msgid "Anyone:" msgstr "Kdokoli:" @@ -644,7 +645,7 @@ msgid "Cancel, return to your profile page" msgstr "Zrušit, návrat zpět do stránky s profilem" msgid "Censor rule" -msgstr "" +msgstr "Pravidla cenzury" msgid "CensorRule|Last edit comment" msgstr "Cenzorova pravidla | Poslední komentář" @@ -653,7 +654,7 @@ msgid "CensorRule|Last edit editor" msgstr "Cenzorova pravidla | Poslední editor" msgid "CensorRule|Regexp" -msgstr "" +msgstr "CensorRule|Regexp ??" msgid "CensorRule|Replacement" msgstr "Cenzorova pravidla | Nahrazení" @@ -704,13 +705,13 @@ msgid "Clarification" msgstr "Vysvětlení" msgid "Clarify your FOI request - " -msgstr "" +msgstr "Upřesněte svůj dotaz" msgid "Classify an FOI response from " msgstr "Zařaďte dotaz od " msgid "Clear photo" -msgstr "" +msgstr "Smazat fotografii" msgid "" "Click on the link below to send a message to {{public_body_name}} telling them to reply to your request. You might like to ask for an internal\n" @@ -723,10 +724,10 @@ msgid "" msgstr "Pro poslání upomínky klikněte na níže uvedený odkaz {{public_body}}. " msgid "Close" -msgstr "" +msgstr "Zavřít" msgid "Comment" -msgstr "" +msgstr "Komentář" msgid "Comment|Body" msgstr "Komentář | Text" @@ -741,23 +742,23 @@ msgid "Comment|Visible" msgstr "Komentář | Viditelný" msgid "Confirm you want to follow all successful FOI requests" -msgstr "" +msgstr "Potvrďte, že chcete být informováni o všech úspěšně zodpovězených dotazech. ??" msgid "Confirm you want to follow new requests" -msgstr "" +msgstr "Potvrďte, že chcete být informováni o nově vznesených dotazech." msgid "" "Confirm you want to follow new requests or responses matching your search" -msgstr "" +msgstr "Potvrďte, že chcete být informováni o nově vznesených dotazech a odpovědích, které se týkají zvolených témat." msgid "Confirm you want to follow requests by '{{user_name}}'" -msgstr "" +msgstr "Potvrďte, že chcete být informováni o nově vznesených dotazech vznesených uživatelem '{{user_name}}'" msgid "Confirm you want to follow requests to '{{public_body_name}}'" -msgstr "" +msgstr "Potvrďte, že chcete být informováni o dotazech vznesených na instituci '{{public_body_name}}'" msgid "Confirm you want to follow the request '{{request_title}}'" -msgstr "" +msgstr "Potvrďte, že chcete sledovat vznesený dotaz '{{request_title}}'" msgid "Confirm your FOI request to " msgstr "Potvrďte svůj dotaz vznesený na" @@ -776,13 +777,13 @@ msgstr "Potvrďte novou e-mailovou adresu na {{site_name}}" msgid "" "Considered by administrators as not an FOI request and hidden from site." -msgstr "" +msgstr "Tento dotaz neodopovídá 106/1999 Sb., o svobodném přístupu k informacím a byl tudíž skryt." msgid "Considered by administrators as vexatious and hidden from site." -msgstr "" +msgstr "Tento dotaz odporoval dobrým mravům a byl proto skryt." msgid "Contact {{recipient}}" -msgstr "" +msgstr "Kontaktovat {{recipient}} ??" msgid "Contact {{site_name}}" msgstr "Kontaktujte {{site_name}}" @@ -843,7 +844,7 @@ msgid "Done" msgstr "Hotovo" msgid "Done >>" -msgstr "" +msgstr "Hotovo >>" msgid "Download a zip file of all correspondence" msgstr "Stáhnout zazipovaný soubor celé korespondence" @@ -890,7 +891,7 @@ msgstr "Slova, která chcete najít musí být oddělena mezerou, například <s msgid "" "Enter your response below. You may attach one file (use email, or\n" " <a href=\"%s\">contact us</a> if you need more)." -msgstr "" +msgstr "Níže můžete vložit svou odpověď. Pokud je to nutné, přiložte jeden dokument, (s použitím e-mailu, nebo⏎ <a href=\"%s\">nás kontaktujte</a> pokud potřebujete přiložit více dokumentů). ??" msgid "Environmental Information Regulations" msgstr "Informace o životním prostředí" @@ -920,10 +921,10 @@ msgid "" msgstr "Veškeré informace, které vložíte na tuto stránku, včetně <strong>vašeho jména</strong>, \n budou<strong>uveřejněny</strong> na tomto webu(<a href=\"%s\">proč?</a>)." msgid "Exim log" -msgstr "" +msgstr "Exim log ??" msgid "Exim log done" -msgstr "" +msgstr "Exim log done ??" msgid "EximLogDone|Filename" msgstr "EximLogDone | Jméno souboru" @@ -953,7 +954,7 @@ msgid "FOI requests {{start_count}} to {{end_count}} of {{total_count}}" msgstr "Dotazy {{start_count}} do {{end_count}} z {{total_count}}" msgid "FOI response requires admin ({{reason}}) - {{title}}" -msgstr "" +msgstr "Odpověď vyžaduje zásah administrátora - ({{reason}}) - {{title}}" msgid "Failed to convert image to a PNG" msgstr "Nepodařilo se konvertovat obrázek do PNG. " @@ -973,7 +974,7 @@ msgid "" 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 (<a href=\"%s#%s\">proč?</a>)." msgid "Foi attachment" -msgstr "" +msgstr "Příloha k dotazu" msgid "FoiAttachment|Charset" msgstr "Příloha dotazu | Znaková sada" @@ -997,22 +998,22 @@ msgid "FoiAttachment|Within rfc822 subject" msgstr "Příloha dotazu | V rámci rfc822 subjektu" msgid "Follow" -msgstr "" +msgstr "Sledovat" msgid "Follow all new requests" -msgstr "" +msgstr "Sledovat všechny nově vznesené dotazy" msgid "Follow new successful responses" -msgstr "" +msgstr "Sledovat všechny zodpovězené dotazy ??" msgid "Follow requests to {{public_body_name}}" -msgstr "" +msgstr "Sledovat dotaz vznesený na {{public_body_name}}" msgid "Follow these requests" msgstr "Sledovat tyto dotazy" msgid "Follow things matching this search" -msgstr "" +msgstr "Sledovat témata vyhovující nastaveným kritériím" msgid "Follow this authority" msgstr "Sledovat tuto instituci" @@ -1021,7 +1022,7 @@ msgid "Follow this link to see the request:" msgstr "Pro prohlížení dotazu přejděte na tento odkaz:" msgid "Follow this person" -msgstr "" +msgstr "Sledovat tohoto uživatele" msgid "Follow this request" msgstr "Sledovat tyto dotazy" @@ -1047,7 +1048,7 @@ msgstr "Sledujte Informace pro všechny na Twitteru" msgid "" "Followups cannot be sent for this request, as it was made externally, and " "published here by {{public_body_name}} on the requester's behalf." -msgstr "" +msgstr "Není možné sledovat tento dotaz, neboť nebyl vznesen pomocí stránek Informace pro všechny a byl byl zveřejněn na žádost instituce {{public_body_name}}." msgid "" "For an unknown reason, it is not possible to make a request to this " @@ -1095,7 +1096,7 @@ msgid "Freedom of information requests to" msgstr "Dotaz vznesený na" msgid "From" -msgstr "" +msgstr "Od" msgid "" "From the request page, try replying to a particular message, rather than sending\n" @@ -1143,7 +1144,7 @@ msgid "" msgstr "Haló! Potřebujeme vaši pomoc. Osoba, která vznesla tento dotaz nám nesdělila, jestli byla zodpovězena úspěšně. Můžete si ji přečíst a pomoci nám udržovat stránky přehledné? Děkujeme." msgid "Holiday" -msgstr "" +msgstr "Státní svátek" msgid "Holiday|Day" msgstr "Svátek | Den" @@ -1178,7 +1179,7 @@ msgid "I don't want to do any more tidying now!" msgstr "Teď už nechci dělat další úpravy!" msgid "I like this request" -msgstr "" +msgstr "Líbí se mi tento dotaz" msgid "I would like to <strong>withdraw this request</strong>" msgstr "Chci <strong>zrušit dotaz</strong>" @@ -1288,7 +1289,7 @@ msgid "" msgstr "Pokud váš prohlížeč akceptuje cookies a vy vidíte tuto zprávu,\npravděpodobně je nějaký problém s naším serverem." msgid "Incoming message" -msgstr "" +msgstr "Příchozí zpráva" msgid "IncomingMessage|Cached attachment text clipped" msgstr "Příchozí zpráva | Soubor z mezipaměti přiložen" @@ -1318,10 +1319,10 @@ msgid "IncomingMessage|Valid to reply to" msgstr "IncomingMessage | Platná zpráva pro" msgid "Info request" -msgstr "" +msgstr "Žádost o informaci" msgid "Info request event" -msgstr "" +msgstr "Žádost o informaci – akce ??" msgid "InfoRequestEvent|Calculated state" msgstr "InfoRequestEvent| V procesu" @@ -1345,7 +1346,7 @@ msgid "InfoRequest|Allow new responses from" msgstr "InfoRequestEvent | Povolit nové odpovědi od" msgid "InfoRequest|Attention requested" -msgstr "" +msgstr "InfoRequestEvent | Podle zákona ??" msgid "InfoRequest|Awaiting description" msgstr "InfoRequestEvent | Očekává se popis" @@ -1354,10 +1355,10 @@ msgid "InfoRequest|Described state" msgstr "InfoRequestEvent | Popsaný status" msgid "InfoRequest|External url" -msgstr "" +msgstr "InfoRequestEvent| Název URL" msgid "InfoRequest|External user name" -msgstr "" +msgstr "InfoRequest|External user name ??" msgid "InfoRequest|Handle rejected responses" msgstr "InfoRequestEvent | Řešit odmítnuté odpovědi" @@ -1402,7 +1403,7 @@ msgstr "Může to být tím, že váš prohlížeč není nastaven pro příjem msgid "" "Items matching the following conditions are currently displayed on your " "wall." -msgstr "" +msgstr "Témata týkající se následujících kritérií jsou zobrazeny na vaší nástěnce." msgid "Joined in" msgstr "Zapojen v" @@ -1439,7 +1440,7 @@ msgid "Log in to download a zip file of {{info_request_title}}" msgstr "Přihlaste se ke stažení komprimovaného souboru {{info_request_title}}" msgid "Log into the admin interface" -msgstr "" +msgstr "Přihlásit jako admin" msgid "Long overdue." msgstr "Velké zpoždění." @@ -1475,7 +1476,7 @@ msgid "Make your own request" msgstr "Vzneste vlastní dotaz" msgid "Message" -msgstr "" +msgstr "Zpráva" msgid "Message sent using {{site_name}} contact form, " msgstr "Zpráva zaslána pomocí kontaktního formuláře stránek {{site_name}}, " @@ -1502,7 +1503,7 @@ msgid "My requests" msgstr "Moje dotazy" msgid "My wall" -msgstr "" +msgstr "Moje nástěnka" msgid "Name can't be blank" msgstr "Jméno nemůže zůstat prázdné" @@ -1526,7 +1527,7 @@ msgid "New password: (again)" msgstr "Nové heslo (znovu):" msgid "New response to '{{title}}'" -msgstr "" +msgstr "Nová odpověď na '{{title}}'" msgid "New response to your FOI request - " msgstr "Nová odpověď na váš dotaz -" @@ -1572,7 +1573,7 @@ msgstr "Nic tu není" 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 "" +msgstr "Rádi bychom vás uzporonili, že tazatel nebude na váš komentář upozorněn, jelikož tento dotaz byl zveřejněn na žádost instituce {{public_body_name}}." msgid "Now check your email!" msgstr "Nyní zkontrolujte svou e-mailovou schránku!" @@ -1590,7 +1591,7 @@ msgid "OR remove the existing photo" msgstr "NEBO odstraňte existující foto" msgid "Offensive? Unsuitable?" -msgstr "" +msgstr "Nevhodný obsah?" msgid "" "Oh no! Sorry to hear that your request was refused. Here is what to do now." @@ -1642,7 +1643,7 @@ msgid "Other:" msgstr "Jiné:" msgid "Outgoing message" -msgstr "" +msgstr "Odchozí zpráva" msgid "OutgoingMessage|Body" msgstr "Odchozí zpráva | Text" @@ -1873,7 +1874,7 @@ msgid "Post annotation" msgstr "Zveřejněte anotaci" msgid "Post redirect" -msgstr "" +msgstr "Přesměrování zpráv" msgid "PostRedirect|Circumstance" msgstr "PostRedirect | Okolnosti" @@ -1918,7 +1919,7 @@ msgid "Preview your public request" msgstr "Náhled vašeho dotazu" msgid "Profile photo" -msgstr "" +msgstr "Profilová fotografie" msgid "ProfilePhoto|Data" msgstr "Profilové foto | Data" @@ -1936,37 +1937,37 @@ msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "Instituce od {{start_count}} do {{end_count}} z {{total_count}}" msgid "Public body" -msgstr "" +msgstr "Instituce" msgid "Public body/translation" -msgstr "" +msgstr "PublicBody | Verze ??" msgid "PublicBody::Translation|First letter" -msgstr "" +msgstr "PublicBody | Začáteční písmeno" msgid "PublicBody::Translation|Locale" -msgstr "" +msgstr "PublicBody | Lokální ??" msgid "PublicBody::Translation|Name" -msgstr "" +msgstr "PublicBody | Název" msgid "PublicBody::Translation|Notes" -msgstr "" +msgstr "PublicBody | Poznámka" msgid "PublicBody::Translation|Publication scheme" -msgstr "" +msgstr "PublicBody | Publikační schéma ??" msgid "PublicBody::Translation|Request email" -msgstr "" +msgstr "PublicBody::Translation|Zadejte e-mail ??" msgid "PublicBody::Translation|Short name" -msgstr "" +msgstr "PublicBody::Translation|Krátké jméno ??" msgid "PublicBody::Translation|Url name" -msgstr "" +msgstr "PublicBody::Translation|Název URL" msgid "PublicBody|Api key" -msgstr "" +msgstr "PublicBody | Název ??" msgid "PublicBody|First letter" msgstr "PublicBody | První dopis" @@ -1974,6 +1975,9 @@ msgstr "PublicBody | První dopis" msgid "PublicBody|Home page" msgstr "PublicBody | Domovská stránka" +msgid "PublicBody|Info requests count" +msgstr "" + msgid "PublicBody|Last edit comment" msgstr "PublicBody | Naposled aktualizovaný komentář" @@ -2005,13 +2009,13 @@ msgid "Publication scheme" msgstr "Systém publikování" msgid "Purge request" -msgstr "" +msgstr "Vyčistit formulář dotazu" msgid "PurgeRequest|Model" -msgstr "" +msgstr "PurgeRequest|Verze ??" msgid "PurgeRequest|Url" -msgstr "" +msgstr "PurgeRequest|URL" msgid "RSS feed" msgstr "RSS" @@ -2051,13 +2055,13 @@ msgid "Report abuse" msgstr "Nahlásit zneužití" msgid "Report an offensive or unsuitable request" -msgstr "" +msgstr "Upozornit na nevhodný obsah dotazu" msgid "Report this request" -msgstr "" +msgstr "Upozornit na tento dotaz" msgid "Reported for administrator attention." -msgstr "" +msgstr "Administrátor byl již upozorněn." msgid "Request an internal review" msgstr "Požádat o přezkoumání dotazu" @@ -2087,7 +2091,7 @@ msgstr "Dotaz byl vznesen dne {{date}}" msgid "" "Requests for personal information and vexatious requests are not considered " "valid for FOI purposes (<a href=\"/help/about\">read more</a>)." -msgstr "" +msgstr "Požadavky na informace osobního charakteru a obsah odporující dobrým mravům odporují zákonu 106/1999 Sb., o svobodném přístupu k informacím (<a href=\"/help/about\">Více si přečtěte v nápovědě</a>)." msgid "Requests or responses matching your saved search" msgstr "Dotazy nebo odpovědi odpovídající vašemu uloženému hledání" @@ -2111,7 +2115,7 @@ msgid "Response from a public authority" msgstr "Odpověď od instituce" msgid "Response to '{{title}}'" -msgstr "" +msgstr "Odpověď na '{{title}}'" msgid "Response to this request is <strong>delayed</strong>." msgstr "Odpověď na tento dotaz má <strong>zpoždění</strong>." @@ -2189,7 +2193,7 @@ msgid "Send a public reply to {{person_or_body}}" msgstr "Pošlete veřejnou odpověď {{person_or_body}}" msgid "Send follow up to '{{title}}'" -msgstr "" +msgstr "Odpovědět na '{{title}}'" msgid "Send message" msgstr "Vznést dotaz" @@ -2260,7 +2264,7 @@ msgstr "Někdo, možná vy, zkusil změnit svou e-mailovou adresu on\n{{site_nam 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 "" +msgstr "Omlouváme se, ale není možné odpovědět na tento dotaz pomocí stránek {{site_name}}, neboť se jedná o kopii originálního dotazu {{link_to_original_request}}." msgid "Sorry, but only {{user_name}} is allowed to do that." msgstr "Omlouváme se, toto může provést pouze {{user_name}}." @@ -2290,7 +2294,7 @@ msgid "Still awaiting an <strong>internal review</strong>" msgstr "Stále čekám na <strong>přezkoumání dotazu</strong>" msgid "Subject" -msgstr "" +msgstr "Předmět" msgid "Subject:" msgstr "Předmět:" @@ -2497,13 +2501,13 @@ msgid "Then you can download a zip file of {{info_request_title}}." msgstr "Poté si můžete stáhnout komprimovaný soubor {{info_request_title}}." msgid "Then you can log into the administrative interface" -msgstr "" +msgstr "Poté se můžete přihlásit do administrátorské sekce. ??" msgid "Then you can play the request categorisation game." msgstr "Poté si můžete zahrát hru na kategorizaci dotazů. " msgid "Then you can report the request '{{title}}'" -msgstr "" +msgstr "Poté můžete nahlásit nevhodný dotaz '{{title}}'. ??" msgid "Then you can send a message to " msgstr "Poté můžete poslat zprávu pro" @@ -2524,30 +2528,30 @@ msgid "Then you can write your reply to " msgstr "Poté můžete odpovědět na zprávu od" msgid "Then you will be following all new FOI requests." -msgstr "" +msgstr "Poté budete sledovat všechny nově vznesené dotazy. ??" msgid "" "Then you will be notified whenever '{{user_name}}' requests something or " "gets a response." -msgstr "" +msgstr "Od nynějška budete upozorněni na aktivity týkající se uživatele '{{user_name}}': reakce na dotaz, zodpovězení dotazu a vznesení nového dotazu." msgid "" "Then you will be notified whenever a new request or response matches your " "search." -msgstr "" +msgstr "Od nynějška budete upozorněni, jakmile bude vznesen nový dotaz, odpovídající vámi zadaným kritériím." msgid "Then you will be notified whenever an FOI request succeeds." -msgstr "" +msgstr "Od nynějška budete upozorněni na všechny úspěšně zodpovězené dotazy." msgid "" "Then you will be notified whenever someone requests something or gets a " "response from '{{public_body_name}}'." -msgstr "" +msgstr "Od nynějška budete upozorněni jakmile bude na '{{public_body_name}}' vznesen nový dotaz nebo daná instituce na již vznesený dotaz zareaguje nebo jej zodpoví." msgid "" "Then you will be updated whenever the request '{{request_title}}' is " "updated." -msgstr "" +msgstr "Budete upozorněni na zmeěu stavu u dotazu '{{request_title}}'." msgid "Then you'll be allowed to send FOI requests." msgstr "Pak můžete vznést dotaz." @@ -2572,7 +2576,7 @@ msgstr[2] "%d lidí sleduje tento dotaz" 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 "" +msgstr "Již existuje <strong>více než jedna další osoba</strong> která se zaregistrovala na těchto stránkách pod stejným jménem.⏎ Zvolte tedy prosím jiné uživatelské jméno než je:" msgid "" "There is a limit on the number of requests you can make in a day, because we" @@ -2621,7 +2625,7 @@ msgid "Things to do with this request" msgstr "Co můžete dělat s tímto dotazem," msgid "Things you're following" -msgstr "" +msgstr "Sledujete:" msgid "This authority no longer exists, so you cannot make a request to it." msgstr "Tato instituce již neexistuje, nelze na niproto vznést dotaz. " @@ -2637,7 +2641,7 @@ msgid "" msgstr "Toto zahrnuje široké spektrum informací o stavu \n <strong>přírody a památek</strong>, například:" msgid "This external request has been hidden" -msgstr "" +msgstr "This external request has been hidden ??" msgid "" "This is a plain-text version of the Freedom of Information request " @@ -2691,7 +2695,7 @@ msgid "This request <strong>requires administrator attention</strong>" msgstr "Tento dotaz <strong>vyžaduje pozornost administrátora</strong>" msgid "This request has already been reported for administrator attention" -msgstr "" +msgstr "Tento dotaz byl již nahlášen." msgid "This request has an <strong>unknown status</strong>." msgstr "Stav tohoto dotazu je <strong>neznámý</strong>." @@ -2699,18 +2703,18 @@ msgstr "Stav tohoto dotazu je <strong>neznámý</strong>." msgid "" "This request has been <strong>hidden</strong> from the site, because an " "administrator considers it not to be an FOI request" -msgstr "" +msgstr "Tento dotaz byl <strong>skryt</strong>, jelikož se na něj nevztahuje zákon 106/1999 Sb., o svobodném přístupu k informacím." msgid "" "This request has been <strong>hidden</strong> from the site, because an " "administrator considers it vexatious" -msgstr "" +msgstr "Tento dotaz byl <strong>skryt</strong>, jelikož jeho obsah odporoval dobrým mravům." msgid "" "This request has been <strong>reported</strong> as needing administrator " "attention (perhaps because it is vexatious, or a request for personal " "information)" -msgstr "" +msgstr "Tento dotaz byl <strong>nahlášen</strong> administrátorům stránek, (pravděpodobně z důvodu nevhodného obsahu)." msgid "" "This request has been <strong>withdrawn</strong> by the person who made it.\n" @@ -2721,10 +2725,10 @@ msgid "" "This request has been marked for review by the site administrators, who have" " not hidden it at this time. If you believe it should be hidden, please <a " "href=\"%s\">contact us</a>." -msgstr "" +msgstr "This request has been marked for review by the site administrators, who have not hidden it at this time. If you believe it should be hidden, please <a href=\"%s\">contact us</a>." msgid "This request has been reported for administrator attention" -msgstr "" +msgstr "Odesláno administrátorovi" msgid "" "This request has been set by an administrator to \"allow new responses from " @@ -2750,7 +2754,7 @@ msgid "This request is still in progress:" msgstr "Tento dotaz je stále aktivní:" msgid "This request was not made via {{site_name}}" -msgstr "" +msgstr "Tento dotaz nebyl vznesen pomocí stránek {{site_name}}" msgid "" "This response has been hidden. See annotations to find out why.\n" @@ -2799,24 +2803,24 @@ msgid "To download the zip file" msgstr "Ke stažení komprimovaného souboru" msgid "To follow all successful requests" -msgstr "" +msgstr "Sledovat všechny úspěšně zodpovězené dotazy" msgid "To follow new requests" -msgstr "" +msgstr "Sledovat nově vznesené dotazy." msgid "To follow requests and responses matching your search" msgstr "Pro sledování dotazů a odpovědí podle zadaného vyhledávání" msgid "To follow requests by '{{user_name}}'" -msgstr "" +msgstr "Sledovat dotazy vznesené uživatelem '{{user_name}}'" msgid "" "To follow requests made using {{site_name}} to the public authority " "'{{public_body_name}}'" -msgstr "" +msgstr "Sledovat dotazy vznesené prostřednictvím stránek {{site_name}} na instituci '{{public_body_name}}'" msgid "To follow the request '{{request_title}}'" -msgstr "" +msgstr "Sledovat dotaz '{{request_title}}'" msgid "" "To help us keep the site tidy, someone else has updated the status of the \n" @@ -2825,10 +2829,10 @@ msgstr "Abychom udržovali stránky přehledné, někdo jiný upravil dotaz {{ti msgid "" "To let everyone know, follow this link and then select the appropriate box." -msgstr "" +msgstr "To let everyone know, follow this link and then select the appropriate box. ??" msgid "To log into the administrative interface" -msgstr "" +msgstr "Přihlásit se do administrace" msgid "To play the request categorisation game" msgstr "Zahrát si hru na kategorizaci dotazů" @@ -2840,7 +2844,7 @@ msgid "To reply to " msgstr "Odpovědět " msgid "To report this FOI request" -msgstr "" +msgstr "Nahlásit tento dotaz" msgid "To send a follow up message to " msgstr "Poslat další odpověď" @@ -2881,13 +2885,13 @@ msgid "Today" msgstr "Dnes" msgid "Too many requests" -msgstr "" +msgstr "Příliš mnoho dotazů" msgid "Top search results:" msgstr "Nejrelevantnější výsledky vyhledávání" msgid "Track thing" -msgstr "" +msgstr "Sledovat" msgid "Track this person" msgstr "Sledovat tohoto uživatele" @@ -2905,7 +2909,7 @@ msgid "TrackThing|Track type" msgstr "TrackThing | Sledovat typ ??" msgid "Turn off email alerts" -msgstr "" +msgstr "Nezasílat e-mailová upozornění" msgid "Tweet this request" msgstr "Tweetujte tento dotaz" @@ -2967,10 +2971,10 @@ msgid "" msgstr "Použijte uvozovky pokud chcete vyhledat přesnou frázi, např. <strong><code>\"Statutární město Liberec\"</code></strong>" msgid "User" -msgstr "" +msgstr "Uživatel" msgid "User info request sent alert" -msgstr "" +msgstr "User info request sent alert ??" msgid "UserInfoRequestSentAlert|Alert type" msgstr "UserInfoRequestSentAlert| Typ upozornění" @@ -2979,7 +2983,7 @@ msgid "User|About me" msgstr "User | O mně" msgid "User|Address" -msgstr "" +msgstr "User | Adresa" msgid "User|Admin level" msgstr "User | Úroveň admin" @@ -2988,7 +2992,7 @@ msgid "User|Ban text" msgstr "User | Zakázat text" msgid "User|Dob" -msgstr "" +msgstr "User | Datum narození" msgid "User|Email" msgstr "User | E-mail" @@ -3018,7 +3022,7 @@ msgid "User|No limit" msgstr "User | Žádné omezení" msgid "User|Receive email alerts" -msgstr "" +msgstr "User|Zasílat e-mailová upozornění" msgid "User|Salt" msgstr "User | Salt ??" @@ -3174,38 +3178,38 @@ msgid "You" msgstr "Vy" msgid "You are already following new requests" -msgstr "" +msgstr "Nově vznesené dotazy již sledujete." msgid "You are already following requests to {{public_body_name}}" -msgstr "" +msgstr "Dotazy vznesené na instituci {{public_body_name}} již sledujete." msgid "You are already following things matching this search" -msgstr "" +msgstr "Tyto kategorie a témata již sledujete." msgid "You are already following this person" -msgstr "" +msgstr "Tohoto uživatele již sledujete." msgid "You are already following this request" -msgstr "" +msgstr "Tento dotaz již sledujete." msgid "You are already following updates about {{track_description}}" -msgstr "" +msgstr "Již sledujete {{track_description}}" msgid "" "You are currently receiving notification of new activity on your wall by " "email." -msgstr "" +msgstr "Pokud se cokoliv změní na vaší nástěnce, budete upozorněni e-mailem." msgid "You are following all new successful responses" -msgstr "" +msgstr "Budete upozorněni na všechny úspěšně zodpovězené dotazy." msgid "You are no longer following {{track_description}}" -msgstr "" +msgstr "Již dále nesledujete {{track_description}}" msgid "" "You are now <a href=\"{{wall_url_user}}\">following</a> updates about " "{{track_description}}" -msgstr "" +msgstr "Od nynějška budete upozorněni na změny týkající se <a href=\"{{wall_url_user}}\">sledovaného</a> tématu {{track_description}}" msgid "You can <strong>complain</strong> by" msgstr "Můžete si <strong>stěžovat</strong> " @@ -3213,7 +3217,7 @@ msgstr "Můžete si <strong>stěžovat</strong> " msgid "" "You can change the requests and users you are following on <a " "href=\"{{profile_url}}\">your profile page</a>." -msgstr "" +msgstr "Můžete změnit sledované dotazy a uživatele <a href=\"{{profile_url}}\">ve svém profilu</a>." msgid "" "You can get this page in computer-readable format as part of the main JSON\n" @@ -3263,7 +3267,7 @@ msgstr "Víte, co způsobilo chybu a můžete <strong>navrhnout řešení</stron 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 "" +msgstr "Můžete <strong>přiložit dokumenty</strong>. POkud je vaše příloha⏎ příliš velká pro poslání e-mailem, použíjte formulář níže." msgid "" "You may be able to find\n" @@ -3287,7 +3291,7 @@ msgid "You need to be logged in to clear your profile photo." 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 "" +msgstr "Musíte být zaregistrován/a, abyste mohl/a editovat svůj profil." msgid "" "You previously submitted that exact follow up message for this request." @@ -3296,7 +3300,7 @@ msgstr "V minulosti jste již vložili úplně stejnou zprávu týkající se to 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 "" +msgstr "Měli byste obdržet kopii dotazu e-mailem. Odpovědět můžete na tento e-mail <strong>jednoduše</strong>. Zde je adresa:" msgid "" "You want to <strong>give your postal address</strong> to the authority in " @@ -3316,7 +3320,7 @@ msgstr "E-mailová upozornění o těchto aktualizacích vám přestanou chodit msgid "" "You will now be emailed updates about {{track_description}}. <a " "href=\"{{change_email_alerts_url}}\">Prefer not to receive emails?</a>" -msgstr "" +msgstr "Od nynějška budete dostávat e-mailové upozornění týkající se změn v dotazu {{track_description}}. <a href=\"{{change_email_alerts_url}}\">Nechcete dostávat e-maily týkající se tohoto dotazu?</a>" msgid "" "You will only get an answer to your request if you follow up\n" @@ -3327,7 +3331,7 @@ msgid "You're long overdue a response to your FOI request - " msgstr "Dlouho jste nereagovali na odpověď k vašemu dotazu" msgid "You're not following anything." -msgstr "" +msgstr "Nesledujete žádný vznesený dotaz." msgid "You've now cleared your profile photo" msgstr "Vaše profilové foto bylo vymazáno. " @@ -3381,7 +3385,7 @@ msgid "" msgstr "Vaše zpráva byla odeslána. Děkujeme vám, odpovíme co nejdříve. " msgid "Your message to {{recipient_user_name}} has been sent" -msgstr "" +msgstr "Vaše zpráva pro uživatele {{recipient_user_name}} byla odeslána." msgid "Your message to {{recipient_user_name}} has been sent!" msgstr "Vaše zpráva pro {{recipient_user_name}} byla odeslána!" @@ -3413,7 +3417,7 @@ msgstr "Vaše heslo:" msgid "" "Your photo will be shown in public <strong>on the Internet</strong>,\n" " wherever you do something on {{site_name}}." -msgstr "" +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 was called {{info_request}}. Letting everyone know whether you " @@ -3443,13 +3447,13 @@ msgid "Yours sincerely," msgstr "S pozdravem," msgid "[FOI #{{request}} email]" -msgstr "" +msgstr "[FOI #{{request}} e-mail] ??" msgid "[{{public_body}} request email]" -msgstr "" +msgstr "[{{public_body}} request e-mail] ??" msgid "[{{site_name}} contact email]" -msgstr "" +msgstr "[{{site_name}} kontaktní e-mail]" msgid "" "a one line summary of the information you are requesting, \n" @@ -3465,6 +3469,9 @@ msgstr "všechny dotazy" msgid "also called {{public_body_short_name}}" msgstr "také se nazývá {{public_body_short_name}}" +msgid "an anonymous user" +msgstr "" + msgid "and" msgstr "a" @@ -3527,7 +3534,7 @@ msgid "" msgstr "obsahující vaši poštovní adresu, a žádající o odpověď na tento dotaz.\n Nebo jim můžete zavolat." msgid "details" -msgstr "" +msgstr "detaily" msgid "display_status only works for incoming and outgoing messages right now" msgstr "display_status právě teď funguje pouze pro příchozí a odchozí zprávy" @@ -3545,7 +3552,7 @@ msgid "everything" msgstr "vše" msgid "external" -msgstr "" +msgstr "externí" msgid "has reported an" msgstr "nahlásil" @@ -3554,7 +3561,7 @@ msgid "have delayed." msgstr "je zpoždění" msgid "hide quoted sections" -msgstr "" +msgstr "skrýt citované pasáže" msgid "in term time" msgstr "v dané lhůtě" @@ -3626,13 +3633,13 @@ msgid "sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "posláno {{public_body_name}} od {{info_request_user}} v {{date}}." msgid "show quoted sections" -msgstr "" +msgstr "ukázat citované pasáže" msgid "sign in" msgstr "přihlásit se" msgid "simple_date_format" -msgstr "" +msgstr "simple_date_format ??" msgid "successful" msgstr "úspěšné" @@ -3650,7 +3657,7 @@ msgid "the main FOI contact at {{public_body}}" msgstr "hlavní kontakt pro vznesení dotazu na {{public_body}}" msgid "the requester" -msgstr "" +msgstr "tazatel" msgid "the {{site_name}} team" msgstr "{{site_name}} tým" @@ -3713,7 +3720,7 @@ msgid "{{law_used_full}} request GQ - {{title}}" msgstr "{{law_used_full}} žádejte GQ - {{title}} ??" msgid "{{law_used}} requests at {{public_body}}" -msgstr "" +msgstr "{{law_used}} dotazy vznesené na instituci{{public_body}}" msgid "{{length_of_time}} ago" msgstr "před {{length_of_time}}" @@ -3729,7 +3736,7 @@ msgstr "Pouze {{public_body_name}}:" msgid "" "{{public_body}} has asked you to explain part of your {{law_used}} request." -msgstr "" +msgstr "{{public_body}} vás žádá o doplnění vzneseného dotazu {{law_used}}." msgid "{{public_body}} sent a response to {{user_name}}" msgstr "{{public_body}} zaslal odpověď pro {{user_name}}" @@ -3755,16 +3762,16 @@ msgid "" msgstr "{{site_name}} tazatelé podali {{number_of_requests}} dotazů, včetně:" msgid "{{title}} - a Freedom of Information request to {{public_body}}" -msgstr "" +msgstr "{{title}} - dotaz vznesený podle zákona 106/1999 Sb., o svobodném přístupu k informacím na instituci {{public_body}}" msgid "{{user_name}} (Account suspended)" msgstr "{{user_name}} (Účet pozastaven)" msgid "{{user_name}} - Freedom of Information requests" -msgstr "" +msgstr "{{user_name}} - dotaz podle zákona 106/1999 Sb., o svobodném přístupu k informacím" msgid "{{user_name}} - user profile" -msgstr "" +msgstr "{{user_name}} - uživatelský profil" msgid "{{user_name}} added an annotation" msgstr "{{user_name}} přidal poznámku" diff --git a/locale/cy/app.po b/locale/cy/app.po index 937453daa..f129d3685 100644 --- a/locale/cy/app.po +++ b/locale/cy/app.po @@ -3,20 +3,20 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# <alex@alexskene.com>, 2011, 2012. +# <alex@alexskene.com>, 2011-2012. msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-08-24 09:20+0100\n" -"PO-Revision-Date: 2012-08-24 08:21+0000\n" +"POT-Creation-Date: 2012-09-19 09:37+0100\n" +"PO-Revision-Date: 2012-09-19 08:48+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: cy\n" -"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3\n" +"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n" msgid "" "\n" @@ -1976,6 +1976,9 @@ msgstr "" msgid "PublicBody|Home page" msgstr "" +msgid "PublicBody|Info requests count" +msgstr "" + msgid "PublicBody|Last edit comment" msgstr "" @@ -3473,6 +3476,9 @@ msgstr "" msgid "also called {{public_body_short_name}}" msgstr "" +msgid "an anonymous user" +msgstr "" + msgid "and" msgstr "" diff --git a/locale/de/app.po b/locale/de/app.po index e887d9618..a890a48a1 100644 --- a/locale/de/app.po +++ b/locale/de/app.po @@ -11,15 +11,15 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-08-24 09:20+0100\n" -"PO-Revision-Date: 2012-08-24 10:31+0000\n" +"POT-Creation-Date: 2012-09-19 09:37+0100\n" +"PO-Revision-Date: 2012-09-19 08:48+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: de\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "" "\n" @@ -1971,6 +1971,9 @@ msgstr "PublicBody|First letter" msgid "PublicBody|Home page" msgstr "PublicBody|Home page" +msgid "PublicBody|Info requests count" +msgstr "" + msgid "PublicBody|Last edit comment" msgstr "PublicBody|Last edit comment" @@ -3456,6 +3459,9 @@ msgstr "alle Anfragen" msgid "also called {{public_body_short_name}}" msgstr "auch genannt: {{public_body_short_name}}" +msgid "an anonymous user" +msgstr "" + msgid "and" msgstr "und" diff --git a/locale/en/app.po b/locale/en/app.po index 8fab8256f..2129ccb8c 100644 --- a/locale/en/app.po +++ b/locale/en/app.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: version 0.0.1\n" -"POT-Creation-Date: 2012-08-24 09:20+0100\n" +"POT-Creation-Date: 2012-09-19 09:37+0100\n" "PO-Revision-Date: 2011-02-24 07:11-0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1778,6 +1778,9 @@ msgstr "" msgid "PublicBody|Home page" msgstr "" +msgid "PublicBody|Info requests count" +msgstr "" + msgid "PublicBody|Last edit comment" msgstr "" @@ -3136,6 +3139,9 @@ msgstr "" msgid "also called {{public_body_short_name}}" msgstr "" +msgid "an anonymous user" +msgstr "" + msgid "and" msgstr "" diff --git a/locale/en_IE/app.po b/locale/en_IE/app.po index 54fda3cdc..dfc576c0b 100644 --- a/locale/en_IE/app.po +++ b/locale/en_IE/app.po @@ -8,15 +8,15 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-08-24 09:20+0100\n" -"PO-Revision-Date: 2012-08-24 08:21+0000\n" +"POT-Creation-Date: 2012-09-19 09:37+0100\n" +"PO-Revision-Date: 2012-09-19 08:48+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: en_IE\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "" "\n" @@ -1968,6 +1968,9 @@ msgstr "" msgid "PublicBody|Home page" msgstr "" +msgid "PublicBody|Info requests count" +msgstr "" + msgid "PublicBody|Last edit comment" msgstr "" @@ -3453,6 +3456,9 @@ msgstr "" msgid "also called {{public_body_short_name}}" msgstr "" +msgid "an anonymous user" +msgstr "" + msgid "and" msgstr "" diff --git a/locale/es/app.po b/locale/es/app.po index b67c26a81..5e571502c 100644 --- a/locale/es/app.po +++ b/locale/es/app.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# David Cabo <david.cabo@gmail.com>, 2011, 2012. +# David Cabo <david.cabo@gmail.com>, 2011-2012. # <fabrizio.scrollini@gmail.com>, 2012. # <gabelula@gmail.com>, 2012. # skenaja <alex@alexskene.com>, 2011. @@ -12,15 +12,15 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-08-24 09:20+0100\n" -"PO-Revision-Date: 2012-08-24 10:34+0000\n" +"POT-Creation-Date: 2012-09-19 09:37+0100\n" +"PO-Revision-Date: 2012-09-19 08:48+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: es\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "" "\n" @@ -1871,7 +1871,7 @@ msgid "Post annotation" msgstr "Enviar comentario" msgid "Post redirect" -msgstr "" +msgstr "Redirigir post" msgid "PostRedirect|Circumstance" msgstr "PostRedirect|Circumstance" @@ -1946,19 +1946,19 @@ msgid "PublicBody::Translation|Locale" msgstr "PublicBody::Translation|Locale" msgid "PublicBody::Translation|Name" -msgstr "" +msgstr "Nombre" msgid "PublicBody::Translation|Notes" -msgstr "" +msgstr "Notas" msgid "PublicBody::Translation|Publication scheme" -msgstr "" +msgstr "Transparencia Activa" msgid "PublicBody::Translation|Request email" -msgstr "" +msgstr "Solicitar Correo" msgid "PublicBody::Translation|Short name" -msgstr "" +msgstr "Nombre Corto" msgid "PublicBody::Translation|Url name" msgstr "<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>" @@ -1972,6 +1972,9 @@ msgstr "Primera letra" msgid "PublicBody|Home page" msgstr "Sitio web" +msgid "PublicBody|Info requests count" +msgstr "" + msgid "PublicBody|Last edit comment" msgstr "PublicBody|Last edit comment" @@ -2003,13 +2006,13 @@ msgid "Publication scheme" msgstr "Esquema de publicación" msgid "Purge request" -msgstr "" +msgstr "Eliminar pedido" msgid "PurgeRequest|Model" -msgstr "" +msgstr "Modelo" msgid "PurgeRequest|Url" -msgstr "" +msgstr "URL" msgid "RSS feed" msgstr "RSS" @@ -2617,7 +2620,7 @@ msgid "Things to do with this request" msgstr "Cosas que hacer con esta solicitud" msgid "Things you're following" -msgstr "" +msgstr "Pedidos que estas siguiendo" msgid "This authority no longer exists, so you cannot make a request to it." msgstr "Este organismo ya no existe, no pueden realizarse solicitudes de información." @@ -2685,7 +2688,7 @@ msgid "This request <strong>requires administrator attention</strong>" msgstr "Esta solicitud <strong>requiere la intervención de un administrador</strong>" msgid "This request has already been reported for administrator attention" -msgstr "" +msgstr "Este pedido ha sido reportado al administrador del sitio." msgid "This request has an <strong>unknown status</strong>." msgstr "Esta solicitud tiene un <strong>estado desconocido</strong>." @@ -2693,18 +2696,18 @@ msgstr "Esta solicitud tiene un <strong>estado desconocido</strong>." msgid "" "This request has been <strong>hidden</strong> from the site, because an " "administrator considers it not to be an FOI request" -msgstr "" +msgstr "Este pedido ha sido <strong>removido</strong> del sitio, porque el administrador considera que no es un pedido de acceso a la información publica" msgid "" "This request has been <strong>hidden</strong> from the site, because an " "administrator considers it vexatious" -msgstr "" +msgstr "Este pedido ha sido <strong>removido</strong> del sitio, porque el administrador considera que es un pedido inapropiado" msgid "" "This request has been <strong>reported</strong> as needing administrator " "attention (perhaps because it is vexatious, or a request for personal " "information)" -msgstr "" +msgstr "Este pedido ha sido <strong>removido</strong> del sitio, porque el administrador considera que es un pedido inapropiado o solicita informacion personal" msgid "" "This request has been <strong>withdrawn</strong> by the person who made it.\n" @@ -2718,7 +2721,7 @@ msgid "" msgstr "" msgid "This request has been reported for administrator attention" -msgstr "" +msgstr "Este pedido ha sido reportado al administrador del sitio." msgid "" "This request has been set by an administrator to \"allow new responses from " @@ -2793,7 +2796,7 @@ msgid "To download the zip file" msgstr "Descargar el fichero ZIP" msgid "To follow all successful requests" -msgstr "" +msgstr "Sigue todos los pedidos exitosos" msgid "To follow new requests" msgstr "" @@ -2802,15 +2805,15 @@ msgid "To follow requests and responses matching your search" msgstr "Para seguir solicitudes y respuestas que encajen con tu búsqueda" msgid "To follow requests by '{{user_name}}'" -msgstr "" +msgstr "Sigue todos los pedidos por y '{{user_name}}'" msgid "" "To follow requests made using {{site_name}} to the public authority " "'{{public_body_name}}'" -msgstr "" +msgstr "Sigue todos los pedidos hechos {{site_name}} a la autoridad publica '{{public_body_name}}'" msgid "To follow the request '{{request_title}}'" -msgstr "" +msgstr "Seguir el pedido '{{request_title}}'" msgid "" "To help us keep the site tidy, someone else has updated the status of the \n" @@ -2822,7 +2825,7 @@ msgid "" msgstr "" msgid "To log into the administrative interface" -msgstr "" +msgstr " Ingresar como administrador" msgid "To play the request categorisation game" msgstr "Jugar al juego de recategorización de solicitudes" @@ -2834,7 +2837,7 @@ msgid "To reply to " msgstr "Contestar a " msgid "To report this FOI request" -msgstr "" +msgstr "Reportar este pedido de acceso" msgid "To send a follow up message to " msgstr "Enviar una respuesta a " @@ -2875,13 +2878,13 @@ msgid "Today" msgstr "Hoy" msgid "Too many requests" -msgstr "" +msgstr "Demasiados pedidos" msgid "Top search results:" msgstr "Mejores resultados:" msgid "Track thing" -msgstr "" +msgstr " Monitorear" msgid "Track this person" msgstr "Seguir a esta persona" @@ -2899,7 +2902,7 @@ msgid "TrackThing|Track type" msgstr "TrackThing|Track type" msgid "Turn off email alerts" -msgstr "" +msgstr "Descontinuar alertas por correo electronico" msgid "Tweet this request" msgstr "Tuitear esta solicitud" @@ -2961,10 +2964,10 @@ msgid "" msgstr "Utiliza comillas cuando quieras buscar una frase exacta, por ejemplo <strong><code>\"Consejo de Europa\"</code></strong>" msgid "User" -msgstr "" +msgstr "usuario" msgid "User info request sent alert" -msgstr "" +msgstr "Alerta de informacion de usuario enviada" msgid "UserInfoRequestSentAlert|Alert type" msgstr "UserInfoRequestSentAlert|Alert type" @@ -3012,7 +3015,7 @@ msgid "User|No limit" msgstr "User|No limit" msgid "User|Receive email alerts" -msgstr "" +msgstr "Usuario Recibe alertas por correo" msgid "User|Salt" msgstr "User|Salt" @@ -3168,10 +3171,10 @@ msgid "You" msgstr "Tú" msgid "You are already following new requests" -msgstr "" +msgstr "Tu ya estas siguiendo nuevos pedidos" msgid "You are already following requests to {{public_body_name}}" -msgstr "" +msgstr "Tu ya estas siguiendo pedidos a {{public_body_name}}" msgid "You are already following things matching this search" msgstr "" @@ -3457,6 +3460,9 @@ msgstr "todas las solicitudes" msgid "also called {{public_body_short_name}}" msgstr "también conocido como {{public_body_short_name}}" +msgid "an anonymous user" +msgstr "" + msgid "and" msgstr "y" diff --git a/locale/eu/app.po b/locale/eu/app.po index 8df713a6d..6bceee0df 100644 --- a/locale/eu/app.po +++ b/locale/eu/app.po @@ -9,15 +9,15 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-08-24 09:20+0100\n" -"PO-Revision-Date: 2012-08-24 10:33+0000\n" +"POT-Creation-Date: 2012-09-19 09:37+0100\n" +"PO-Revision-Date: 2012-09-19 08:48+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: eu\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "" "\n" @@ -1969,6 +1969,9 @@ msgstr "Primera letra" msgid "PublicBody|Home page" msgstr "Sitio web" +msgid "PublicBody|Info requests count" +msgstr "" + msgid "PublicBody|Last edit comment" msgstr "PublicBody|Last edit comment" @@ -3454,6 +3457,9 @@ msgstr "eskabide guztiak" msgid "also called {{public_body_short_name}}" msgstr "{{public_body_short_name}} izenez ere ezaguna." +msgid "an anonymous user" +msgstr "" + msgid "and" msgstr "eta" diff --git a/locale/fr/app.po b/locale/fr/app.po index 3ecb880ff..2234e2f4b 100644 --- a/locale/fr/app.po +++ b/locale/fr/app.po @@ -13,15 +13,15 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-08-24 09:20+0100\n" -"PO-Revision-Date: 2012-08-24 08:21+0000\n" +"POT-Creation-Date: 2012-09-19 09:37+0100\n" +"PO-Revision-Date: 2012-09-19 08:48+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: fr\n" -"Plural-Forms: nplurals=2; plural=(n > 1)\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" msgid "" "\n" @@ -1973,6 +1973,9 @@ msgstr "" msgid "PublicBody|Home page" msgstr "" +msgid "PublicBody|Info requests count" +msgstr "" + msgid "PublicBody|Last edit comment" msgstr "" @@ -3458,6 +3461,9 @@ msgstr "toutes les demandes" msgid "also called {{public_body_short_name}}" msgstr "aussi appelé {{public_body_short_name}}" +msgid "an anonymous user" +msgstr "" + msgid "and" msgstr "et" diff --git a/locale/gl/app.po b/locale/gl/app.po index b91414bc9..269505180 100644 --- a/locale/gl/app.po +++ b/locale/gl/app.po @@ -8,15 +8,15 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-08-24 09:20+0100\n" -"PO-Revision-Date: 2012-08-24 10:34+0000\n" +"POT-Creation-Date: 2012-09-19 09:37+0100\n" +"PO-Revision-Date: 2012-09-19 08:48+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: gl\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "" "\n" @@ -1968,6 +1968,9 @@ msgstr "Primera letra" msgid "PublicBody|Home page" msgstr "Sitio web" +msgid "PublicBody|Info requests count" +msgstr "" + msgid "PublicBody|Last edit comment" msgstr "PublicBody|Last edit comment" @@ -3453,6 +3456,9 @@ msgstr "todas las solicitudes" msgid "also called {{public_body_short_name}}" msgstr "también conocido como {{public_body_short_name}}" +msgid "an anonymous user" +msgstr "" + msgid "and" msgstr "y" diff --git a/locale/hu_HU/app.po b/locale/hu_HU/app.po index 396e47903..286237b84 100644 --- a/locale/hu_HU/app.po +++ b/locale/hu_HU/app.po @@ -8,15 +8,15 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-08-24 09:20+0100\n" -"PO-Revision-Date: 2012-08-24 10:32+0000\n" +"POT-Creation-Date: 2012-09-19 09:37+0100\n" +"PO-Revision-Date: 2012-09-19 08:48+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: hu_HU\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "" "\n" @@ -1968,6 +1968,9 @@ msgstr "PublicBody|First letter" msgid "PublicBody|Home page" msgstr "PublicBody|Home page" +msgid "PublicBody|Info requests count" +msgstr "" + msgid "PublicBody|Last edit comment" msgstr "PublicBody|Last edit comment" @@ -3453,6 +3456,9 @@ msgstr " minden igénylés " msgid "also called {{public_body_short_name}}" msgstr "más néven {{public_body_short_name}} " +msgid "an anonymous user" +msgstr "" + msgid "and" msgstr "és" diff --git a/locale/id/app.po b/locale/id/app.po index 4ecbdce48..dd56d7be6 100644 --- a/locale/id/app.po +++ b/locale/id/app.po @@ -10,15 +10,15 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-08-24 09:20+0100\n" -"PO-Revision-Date: 2012-08-24 10:34+0000\n" +"POT-Creation-Date: 2012-09-19 09:37+0100\n" +"PO-Revision-Date: 2012-09-19 08:48+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: id\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=1; plural=0;\n" msgid "" "\n" @@ -1966,6 +1966,9 @@ msgstr "PublicBody|First letter" msgid "PublicBody|Home page" msgstr "PublicBody|Home page" +msgid "PublicBody|Info requests count" +msgstr "" + msgid "PublicBody|Last edit comment" msgstr "PublicBody|Last edit comment" @@ -3445,6 +3448,9 @@ msgstr "semua permintaan" msgid "also called {{public_body_short_name}}" msgstr "juga disebut {{public_body_short_name}}" +msgid "an anonymous user" +msgstr "" + msgid "and" msgstr "dan" diff --git a/locale/model_attributes.rb b/locale/model_attributes.rb index bf4cd68da..9944bd11d 100644 --- a/locale/model_attributes.rb +++ b/locale/model_attributes.rb @@ -77,6 +77,7 @@ _('Public body') _('PublicBody|Api key') _('PublicBody|First letter') _('PublicBody|Home page') +_('PublicBody|Info requests count') _('PublicBody|Last edit comment') _('PublicBody|Last edit editor') _('PublicBody|Name') diff --git a/locale/nb_NO/app.po b/locale/nb_NO/app.po index 32c00610b..352e04bfe 100644 --- a/locale/nb_NO/app.po +++ b/locale/nb_NO/app.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: version 0.0.1\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-08-24 09:20+0100\n" +"POT-Creation-Date: 2012-09-19 09:37+0100\n" "PO-Revision-Date: 2011-03-09 17:48+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1779,6 +1779,9 @@ msgstr "" msgid "PublicBody|Home page" msgstr "" +msgid "PublicBody|Info requests count" +msgstr "" + msgid "PublicBody|Last edit comment" msgstr "" @@ -3137,6 +3140,9 @@ msgstr "" msgid "also called {{public_body_short_name}}" msgstr "" +msgid "an anonymous user" +msgstr "" + msgid "and" msgstr "" diff --git a/locale/pt_BR/app.po b/locale/pt_BR/app.po index db72c9c04..82b3a0447 100644 --- a/locale/pt_BR/app.po +++ b/locale/pt_BR/app.po @@ -15,21 +15,21 @@ # <luis.leao@gmail.com>, 2011. # <Nitaibezerra@gmail.com>, 2012. # <patriciacornils@gmail.com>, 2011. -# <pedro@esfera.mobi>, 2011, 2012. +# <pedro@esfera.mobi>, 2011-2012. # <rafael.moretti@gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-08-24 09:20+0100\n" -"PO-Revision-Date: 2012-08-24 10:30+0000\n" +"POT-Creation-Date: 2012-09-19 09:37+0100\n" +"PO-Revision-Date: 2012-09-19 08:48+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: pt_BR\n" -"Plural-Forms: nplurals=2; plural=(n > 1)\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" msgid "" "\n" @@ -1981,6 +1981,9 @@ msgstr "PublicBody | Primeira letra" msgid "PublicBody|Home page" msgstr "PublicBody | Home page" +msgid "PublicBody|Info requests count" +msgstr "" + msgid "PublicBody|Last edit comment" msgstr "PublicBody | Última edição" @@ -3466,6 +3469,9 @@ msgstr "todos os pedidos" msgid "also called {{public_body_short_name}}" msgstr "também conhecido como {{public_body_short_name}}" +msgid "an anonymous user" +msgstr "" + msgid "and" msgstr "e" diff --git a/locale/sq/app.po b/locale/sq/app.po index e10e3f993..c9174ccdd 100644 --- a/locale/sq/app.po +++ b/locale/sq/app.po @@ -6,22 +6,22 @@ # <bresta@gmail.com>, 2011. # driton <dritoni.h@gmail.com>, 2011. # Hana Huntova <>, 2012. -# Valon <vbrestovci@gmail.com>, 2011, 2012. +# Valon <vbrestovci@gmail.com>, 2011-2012. # <vbrestovci@gmail.com>, 2011. # vbrestovci <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: 2012-08-24 09:20+0100\n" -"PO-Revision-Date: 2012-08-24 10:30+0000\n" +"POT-Creation-Date: 2012-09-19 09:37+0100\n" +"PO-Revision-Date: 2012-09-19 08:48+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: sq\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "" "\n" @@ -1973,6 +1973,9 @@ msgstr "PublicBody |Germa e parë" msgid "PublicBody|Home page" msgstr "PublicBody |Ballina" +msgid "PublicBody|Info requests count" +msgstr "" + msgid "PublicBody|Last edit comment" msgstr "PublicBody | Editimi i fundit i komentit" @@ -3458,6 +3461,9 @@ msgstr "të gjitha kërkesat" msgid "also called {{public_body_short_name}}" msgstr "i quajtur edhe {{public_body_short_name}}" +msgid "an anonymous user" +msgstr "" + msgid "and" msgstr "dhe" diff --git a/locale/sr@latin/app.po b/locale/sr@latin/app.po index 45c436e12..88291fcbf 100644 --- a/locale/sr@latin/app.po +++ b/locale/sr@latin/app.po @@ -9,15 +9,15 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-08-24 09:20+0100\n" -"PO-Revision-Date: 2012-08-24 10:31+0000\n" +"POT-Creation-Date: 2012-09-19 09:37+0100\n" +"PO-Revision-Date: 2012-09-19 08:48+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: sr@latin\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"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 "" "\n" @@ -1973,6 +1973,9 @@ 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" @@ -3464,6 +3467,9 @@ msgstr "svi zahtevi" 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" diff --git a/locale/uk/app.po b/locale/uk/app.po index 34f9a2d1a..98490f9ef 100644 --- a/locale/uk/app.po +++ b/locale/uk/app.po @@ -9,15 +9,15 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n" -"POT-Creation-Date: 2012-08-24 09:20+0100\n" -"PO-Revision-Date: 2012-08-28 10:57+0000\n" -"Last-Translator: hiiri <murahoid@gmail.com>\n" +"POT-Creation-Date: 2012-09-19 09:37+0100\n" +"PO-Revision-Date: 2012-09-19 08:48+0000\n" +"Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: uk\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" +"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 "" "\n" @@ -1973,6 +1973,9 @@ msgstr "" msgid "PublicBody|Home page" msgstr "" +msgid "PublicBody|Info requests count" +msgstr "" + msgid "PublicBody|Last edit comment" msgstr "" @@ -3464,6 +3467,9 @@ msgstr "усі запити" msgid "also called {{public_body_short_name}}" msgstr "" +msgid "an anonymous user" +msgstr "" + msgid "and" msgstr "і" diff --git a/spec/controllers/comment_controller_spec.rb b/spec/controllers/comment_controller_spec.rb index b71bc0aea..4a7acee23 100644 --- a/spec/controllers/comment_controller_spec.rb +++ b/spec/controllers/comment_controller_spec.rb @@ -53,6 +53,17 @@ describe CommentController, "when commenting on a request" do response.should render_template('new') end + + it "should not allow comments if comments are not allowed" do + session[:user_id] = users(:silly_name_user).id + + expect { + post :new, :url_title => info_requests(:spam_1_request).url_title, + :comment => { :body => "I demand to be heard!" }, + :type => 'request', :submitted_comment => 1, :preview => 0 + }.to raise_error("Comments are not allowed on this request") + + end describe 'when commenting on an external request' do diff --git a/spec/controllers/request_controller_spec.rb b/spec/controllers/request_controller_spec.rb index 95737a250..77f43b618 100644 --- a/spec/controllers/request_controller_spec.rb +++ b/spec/controllers/request_controller_spec.rb @@ -238,6 +238,22 @@ describe RequestController, "when showing one request" do response.should have_tag('div#owner_actions') end + describe 'when the request does allow comments' do + it 'should have a comment link' do + get :show, { :url_title => 'why_do_you_have_such_a_fancy_dog' }, + { :user_id => users(:admin_user).id } + response.should have_tag('#anyone_actions', /Add an annotation/) + end + end + + describe 'when the request does not allow comments' do + it 'should not have a comment link' do + get :show, { :url_title => 'spam_1' }, + { :user_id => users(:admin_user).id } + response.should_not have_tag('#anyone_actions', /Add an annotation/) + end + end + describe 'when the request is being viewed by an admin' do describe 'if the request is awaiting description' do diff --git a/spec/fixtures/info_requests.yml b/spec/fixtures/info_requests.yml index 079a44cd0..9361ec486 100644 --- a/spec/fixtures/info_requests.yml +++ b/spec/fixtures/info_requests.yml @@ -8,6 +8,7 @@ fancy_dog_request: user_id: 1 described_state: waiting_response awaiting_description: true + comments_allowed: true idhash: 50929748 naughty_chicken_request: id: 103 @@ -19,6 +20,7 @@ naughty_chicken_request: user_id: 1 described_state: waiting_response awaiting_description: false + comments_allowed: true idhash: e8d18c84 badger_request: id: 104 @@ -30,6 +32,7 @@ badger_request: user_id: 1 described_state: waiting_response awaiting_description: false + comments_allowed: true idhash: e8d18c84 boring_request: id: 105 @@ -41,6 +44,7 @@ boring_request: user_id: 1 described_state: successful awaiting_description: false + comments_allowed: true idhash: 173fd003 another_boring_request: id: 106 @@ -52,6 +56,7 @@ another_boring_request: user_id: 1 described_state: successful awaiting_description: false + comments_allowed: true idhash: 173fd004 # A pair of identical requests (with url_title differing only in the numeric suffix) @@ -66,6 +71,7 @@ spam_1_request: user_id: 5 described_state: successful awaiting_description: false + comments_allowed: false idhash: 173fd005 spam_2_request: id: 108 @@ -77,6 +83,7 @@ spam_2_request: user_id: 5 described_state: successful awaiting_description: false + comments_allowed: true idhash: 173fd005 external_request: id: 109 @@ -87,6 +94,7 @@ external_request: public_body_id: 2 described_state: waiting_response awaiting_description: false + comments_allowed: true idhash: a1234567 anonymous_external_request: id: 110 @@ -97,4 +105,5 @@ anonymous_external_request: public_body_id: 2 described_state: waiting_response awaiting_description: false - idhash: 7654321a
\ No newline at end of file + comments_allowed: true + idhash: 7654321a diff --git a/spec/fixtures/public_body_translations.yml b/spec/fixtures/public_body_translations.yml index d705358c5..f3453e853 100644 --- a/spec/fixtures/public_body_translations.yml +++ b/spec/fixtures/public_body_translations.yml @@ -56,6 +56,7 @@ forlorn_en_public_body_translation: url_name: lonely locale: en notes: A very lonely public body that no one has corresponded with + publication_scheme: "" silly_walks_en_public_body_translation: id: 6 @@ -67,6 +68,7 @@ silly_walks_en_public_body_translation: short_name: MSW url_name: msw notes: You know the one. + publication_scheme: "" sensible_walks_en_public_body_translation: id: 7 @@ -78,3 +80,4 @@ sensible_walks_en_public_body_translation: short_name: SenseWalk url_name: sensible_walks notes: I bet you’ve never heard of it. + publication_scheme: "" diff --git a/spec/views/request/_after_actions.rhtml_spec.rb b/spec/views/request/_after_actions.rhtml_spec.rb index d04db3fc2..5b4734c52 100644 --- a/spec/views/request/_after_actions.rhtml_spec.rb +++ b/spec/views/request/_after_actions.rhtml_spec.rb @@ -1,85 +1,86 @@ require File.expand_path(File.join('..', '..', '..', 'spec_helper'), __FILE__) -describe 'when displaying actions that can be taken with regard to a request' do - - before do - @mock_body = mock_model(PublicBody, :name => 'test public body', +describe 'when displaying actions that can be taken with regard to a request' do + + before do + @mock_body = mock_model(PublicBody, :name => 'test public body', :url_name => 'test_public_body') - @mock_user = mock_model(User, :name => 'test user', + @mock_user = mock_model(User, :name => 'test user', :url_name => 'test_user') - @mock_request = mock_model(InfoRequest, :title => 'test request', - :user => @mock_user, - :user_name => @mock_user.name, + @mock_request = mock_model(InfoRequest, :title => 'test request', + :user => @mock_user, + :user_name => @mock_user.name, :is_external? => false, - :public_body => @mock_body, + :public_body => @mock_body, + :comments_allowed? => true, :url_title => 'test_request') assigns[:info_request] = @mock_request end - + def do_render render :partial => 'request/after_actions' end - + def expect_owner_div do_render response.should have_tag('div#owner_actions'){ yield } end - + def expect_anyone_div do_render response.should have_tag('div#anyone_actions'){ yield } end - + def expect_owner_link(text) expect_owner_div{ with_tag('a', :text => text) } end - + def expect_no_owner_link(text) expect_owner_div{ without_tag('a', :text => text) } end - + def expect_anyone_link(text) expect_anyone_div{ with_tag('a', :text => text) } end - + def expect_no_anyone_link(text) expect_anyone_div{ without_tag('a', :text => text) } end - - describe 'if the request is old and unclassified' do - - before do + + describe 'if the request is old and unclassified' do + + before do assigns[:old_unclassified] = true end - - it 'should not display a link for the request owner to update the status of the request' do + + it 'should not display a link for the request owner to update the status of the request' do expect_no_owner_link('Update the status of this request') end - - it 'should display a link for anyone to update the status of the request' do + + it 'should display a link for anyone to update the status of the request' do expect_anyone_link('Update the status of this request') end - + end - - describe 'if the request is not old and unclassified' do - - before do + + describe 'if the request is not old and unclassified' do + + before do assigns[:old_unclassified] = false end - - it 'should display a link for the request owner to update the status of the request' do + + it 'should display a link for the request owner to update the status of the request' do expect_owner_link('Update the status of this request') end - - it 'should not display a link for anyone to update the status of the request' do + + it 'should not display a link for anyone to update the status of the request' do expect_no_anyone_link('Update the status of this request') end - + end it 'should display a link for the request owner to request a review' do expect_owner_link('Request an internal review') end - + end |