diff options
86 files changed, 1957 insertions, 1431 deletions
@@ -1,10 +1,3 @@ -# Work around bug in Debian Squeeze - see https://github.com/mysociety/alaveteli/pull/297#issuecomment-4101012 -if File.exist? "/etc/debian_version" and File.open("/etc/debian_version").read.strip =~ /^(squeeze.*|6\.0\.[45])$/ - if File.exist? "/lib/libuuid.so.1" - require 'dl' - DL::dlopen('/lib/libuuid.so.1') - end -end source 'https://rubygems.org' gem 'rails', '3.2.19' diff --git a/Gemfile.lock b/Gemfile.lock index 688f2f2c7..682bacf8c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -154,7 +154,7 @@ GEM net-ssh (2.6.7) net-ssh-gateway (1.2.0) net-ssh (>= 2.6.5) - newrelic_rpm (3.8.0.218) + newrelic_rpm (3.9.1.236) nokogiri (1.5.9) paper_trail (2.7.2) activerecord (~> 3.0) diff --git a/Vagrantfile b/Vagrantfile index 183df5893..0fcf73de0 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -60,12 +60,27 @@ ALAVETELI_FQDN = ENV['ALAVETELI_VAGRANT_FQDN'] || "alaveteli.10.10.10.30.xip.io" ALAVETELI_MEMORY = ENV['ALAVETELI_VAGRANT_MEMORY'] || 1536 ALAVETELI_THEMES_DIR = ENV['ALAVETELI_THEMES_DIR'] || '../alaveteli-themes' +ALAVETELI_OS = ENV['ALAVETELI_VAGRANT_OS'] || 'precise64' + +SUPPORTED_OPERATING_SYSTEMS = { + 'precise64' => 'https://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-amd64-vagrant-disk1.box', + 'squeeze64' => 'http://puppet-vagrant-boxes.puppetlabs.com/debian-607-x64-vbox4210-nocm.box', + 'wheezy64' => 'http://puppet-vagrant-boxes.puppetlabs.com/debian-73-x64-virtualbox-nocm.box' +} + +def box + ALAVETELI_OS +end + +def box_url + SUPPORTED_OPERATING_SYSTEMS[ALAVETELI_OS] +end VAGRANTFILE_API_VERSION = "2" Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - config.vm.box = "precise64" - config.vm.box_url = "http://files.vagrantup.com/precise64.box" + config.vm.box = box + config.vm.box_url = box_url config.vm.network :private_network, :ip => "10.10.10.30" config.vm.synced_folder ".", "/home/vagrant/alaveteli", :owner => "vagrant", :group => "vagrant" @@ -86,7 +101,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| end # Fetch and run the install script: - config.vm.provision :shell, :inline => "wget -O install-site.sh https://raw.githubusercontent.com/mysociety/commonlib/master/bin/install-site.sh" + config.vm.provision :shell, :inline => "apt-get -y install curl" + config.vm.provision :shell, :inline => "curl -O https://raw.githubusercontent.com/mysociety/commonlib/master/bin/install-site.sh" config.vm.provision :shell, :inline => "chmod a+rx install-site.sh" config.vm.provision :shell, :inline => "./install-site.sh " \ "--dev " \ diff --git a/app/assets/stylesheets/responsive/_attachments_layout.scss b/app/assets/stylesheets/responsive/_attachments_layout.scss index b41210a5f..070c288b8 100644 --- a/app/assets/stylesheets/responsive/_attachments_layout.scss +++ b/app/assets/stylesheets/responsive/_attachments_layout.scss @@ -62,7 +62,13 @@ } #wrapper_google_embed iframe { - min-height: 800px; + min-height: 400px; + @include respond-min($main_menu-mobile_menu_cutoff ){ + min-height: 800px; + @include lte-ie7{ + height:800px !important; + } + } } diff --git a/app/controllers/admin_request_controller.rb b/app/controllers/admin_request_controller.rb index 5c45a6e6e..21120e4ad 100644 --- a/app/controllers/admin_request_controller.rb +++ b/app/controllers/admin_request_controller.rb @@ -100,7 +100,8 @@ class AdminRequestController < AdminController @info_request.fully_destroy # expire cached files expire_for_request(@info_request) - flash[:notice] = "Request #{url_title} has been completely destroyed. Email of user who made request: " + user.email + email = user.try(:email) ? user.email : 'This request is external so has no associated user' + flash[:notice] = "Request #{ url_title } has been completely destroyed. Email of user who made request: #{ email }" redirect_to admin_request_list_url end diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb index 837364b19..6f83d89d6 100644 --- a/app/controllers/api_controller.rb +++ b/app/controllers/api_controller.rb @@ -191,19 +191,17 @@ class ApiController < ApplicationController raise PermissionDenied.new("#{@public_body.id} != #{params[:id]}") if @public_body.id != params[:id].to_i since_date_str = params[:since_date] - if since_date_str.nil? - @events = InfoRequestEvent.find_by_sql([ - %(select info_request_events.* - from info_requests - join info_request_events on info_requests.id = info_request_events.info_request_id - where info_requests.public_body_id = ? - and info_request_events.event_type in ( - 'sent', 'followup_sent', 'resent', 'followup_resent' - ) - order by info_request_events.created_at desc - ), @public_body.id - ]) - else + since_event_id = params[:since_event_id] + + event_type_clause = "event_type in ('sent', 'followup_sent', 'resent', 'followup_resent')" + + @events = InfoRequestEvent.where(event_type_clause) \ + .joins(:info_request) \ + .where("public_body_id = ?", @public_body.id) \ + .includes([{:info_request => :user}, :outgoing_message]) \ + .order('info_request_events.created_at DESC') + + if since_date_str begin since_date = Date.strptime(since_date_str, "%Y-%m-%d") rescue ArgumentError @@ -212,30 +210,29 @@ class ApiController < ApplicationController :status => 500 return end - @events = InfoRequestEvent.find_by_sql([ - %(select info_request_events.* - from info_requests - join info_request_events on info_requests.id = info_request_events.info_request_id - where info_requests.public_body_id = ? - and info_request_events.event_type in ( - 'sent', 'followup_sent', 'resent', 'followup_resent' - ) - and info_request_events.created_at >= ? - order by info_request_events.created_at desc - ), @public_body.id, since_date - ]) + @events = @events.where("info_request_events.created_at >= ?", since_date) + end + + # We take a "since" parameter that allows the client + # to restrict to events more recent than a certain other event + if since_event_id + begin + event = InfoRequestEvent.find(since_event_id) + rescue ActiveRecord::RecordNotFound + render :json => {"errors" => [ + "Event ID #{since_event_id} not found" ] }, + :status => 500 + return + end + @events = @events.where("info_request_events.created_at > ?", event.created_at) end + + if feed_type == "atom" render :template => "api/request_events", :formats => ['atom'], :layout => false elsif feed_type == "json" - # For the JSON feed, we take a "since" parameter that allows the client - # to restrict to events more recent than a certain other event - if params[:since_event_id] - @since_event_id = params[:since_event_id].to_i - end @event_data = [] @events.each do |event| - break if event.id == @since_event_id request = event.info_request this_event = { diff --git a/app/controllers/public_body_change_requests_controller.rb b/app/controllers/public_body_change_requests_controller.rb index 4a6c5f5cb..773308546 100644 --- a/app/controllers/public_body_change_requests_controller.rb +++ b/app/controllers/public_body_change_requests_controller.rb @@ -1,5 +1,7 @@ class PublicBodyChangeRequestsController < ApplicationController + before_filter :catch_spam, :only => [:create] + def create @change_request = PublicBodyChangeRequest.from_params(params[:public_body_change_request], @user) if @change_request.save @@ -23,6 +25,16 @@ class PublicBodyChangeRequestsController < ApplicationController else @title = _('Ask us to add an authority') end + end + + private + def catch_spam + if params[:public_body_change_request].key?(:comment) + unless params[:public_body_change_request][:comment].empty? + redirect_to frontpage_url + end + end end + end diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index 6281959fb..3fa0ef0ce 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.rb @@ -181,7 +181,7 @@ class RequestController < ApplicationController end @filters = params.merge(:latest_status => @view) - @title = _("View and search requests") + @title = _('Browse and search requests') @title = @title + " (page " + @page.to_s + ")" if (@page > 1) @track_thing = TrackThing.create_track_for_search_query(InfoRequestEvent.make_query_from_params(@filters)) diff --git a/app/views/admin_general/index.html.erb b/app/views/admin_general/index.html.erb index 2202663be..f29258162 100644 --- a/app/views/admin_general/index.html.erb +++ b/app/views/admin_general/index.html.erb @@ -39,7 +39,7 @@ <% if message.get_body_for_quoting.strip.size == 0 %> <%= link_to "(no body)", admin_request_show_raw_email_path(message.raw_email_id) %> <% else %> - <%= link_to excerpt(message.get_body_for_quoting, "", 60), admin_request_show_raw_email_path(message.raw_email_id) %> + <%= link_to excerpt(message.get_body_for_quoting, "", :radius => 60), admin_request_show_raw_email_path(message.raw_email_id) %> <% end %> </td> <td class="span2"> diff --git a/app/views/general/_responsive_topnav.html.erb b/app/views/general/_responsive_topnav.html.erb index e726c17f4..0ece0da9a 100644 --- a/app/views/general/_responsive_topnav.html.erb +++ b/app/views/general/_responsive_topnav.html.erb @@ -6,7 +6,7 @@ </li> <li class="<%= 'selected' if params[:controller] == 'request' and !['new', 'select_authority'].include?(params[:action]) %>"> - <%= link_to _("View requests"), request_list_successful_path %> + <%= link_to _("Browse requests"), request_list_successful_path %> </li> <li class="<%= 'selected' if params[:controller] == 'public_body' %>"> diff --git a/app/views/general/_topnav.html.erb b/app/views/general/_topnav.html.erb index d37bd97d1..04ca07fa9 100644 --- a/app/views/general/_topnav.html.erb +++ b/app/views/general/_topnav.html.erb @@ -2,7 +2,9 @@ <ul id="navigation"> <li class="<%= 'selected' if params[:controller] == 'general' and params[:action] != 'blog' and params[:action] != 'search' %>"><%= link_to _("Home"), frontpage_path %></li> <li class="<%= 'selected' if params[:controller] == 'request' and ['new', 'select_authority'].include?(params[:action]) %>"><%= link_to _("Make a request"), select_authority_path, :id => 'make-request-link' %></li> - <li class="<%= 'selected' if params[:controller] == 'request' and !['new', 'select_authority'].include?(params[:action]) %>"><%= link_to _("View requests"), request_list_successful_path %></li> + <li class="<%= 'selected' if params[:controller] == 'request' and !['new', 'select_authority'].include?(params[:action]) %>"> + <%= link_to _("Browse requests"), request_list_successful_path %> + </li> <li class="<%= 'selected' if params[:controller] == 'public_body' %>"><%= link_to _("View authorities"), list_public_bodies_default_path %></li> <% unless AlaveteliConfiguration::blog_feed.empty? %> <li class="<%= 'selected' if params[:controller] == 'general' and params[:action] == 'blog' %>"><%= link_to _("Read blog"), blog_path %></li> diff --git a/app/views/public_body_change_requests/new.html.erb b/app/views/public_body_change_requests/new.html.erb index 7079cd868..b52d583be 100644 --- a/app/views/public_body_change_requests/new.html.erb +++ b/app/views/public_body_change_requests/new.html.erb @@ -54,6 +54,11 @@ <%= f.text_area :notes, :rows => 10, :cols => 60 %> </p> + <p style="display:none;"> + <%= label_tag 'public_body_change_request[comment]', _('Do not fill in this field') %> + <%= text_field_tag 'public_body_change_request[comment]' %> + </p> + <div class="form_button"> <%= submit_tag _("Submit request") %> </div> diff --git a/app/views/request/_sidebar_request_listing.html.erb b/app/views/request/_sidebar_request_listing.html.erb index ec5a5813d..64fe39341 100644 --- a/app/views/request/_sidebar_request_listing.html.erb +++ b/app/views/request/_sidebar_request_listing.html.erb @@ -4,7 +4,7 @@ <%= request_link(info_request) %> </span> <span class="desc"> - <%=h excerpt(info_request.initial_request_text, "", 100) %> + <%=h excerpt(info_request.initial_request_text, "", :radius => 100) %> </span> <span class="bottomline"> <strong> diff --git a/app/views/request/_view_html_stylesheet.html.erb b/app/views/request/_view_html_stylesheet.html.erb index f3d8799da..09f295346 100644 --- a/app/views/request/_view_html_stylesheet.html.erb +++ b/app/views/request/_view_html_stylesheet.html.erb @@ -1,17 +1,16 @@ <% if AlaveteliConfiguration::responsive_styling || params[:responsive] %> <!--[if LTE IE 7]> - <link href="/assets/responsive/application-lte-ie7.css" media="all" rel="stylesheet" title="Main" type="text/css" /> + <link href="/assets/responsive/application-lte-ie7.css" media="all" rel="stylesheet" title="Main" type="text/css" charset="UTF-8" /> <![endif]--> <!--[if IE 8]> - <link href="/assets/responsive/application-ie8.css" media="all" rel="stylesheet" title="Main" type="text/css" /> + <link href="/assets/responsive/application-ie8.css" media="all" rel="stylesheet" title="Main" type="text/css" charset="UTF-8" /> <![endif]--> <!--[if GT IE 8]><!--> - <link href="/assets/responsive/application.css" media="all" rel="stylesheet" title="Main" type="text/css" /> + <link href="/assets/responsive/application.css" media="all" rel="stylesheet" title="Main" type="text/css" charset="UTF-8" /> <!--<![endif]--> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> <% else %> - <link type="text/css" title="Main" rel="stylesheet" media="screen" href="/assets/application.css"> - + <link type="text/css" title="Main" rel="stylesheet" media="screen" href="/assets/application.css" charset="UTF-8" /> <% end %> diff --git a/commonlib b/commonlib -Subproject 25fbbc5d4c486297e5fbdb85989bdacb1e86756 +Subproject 4d0fd6d01bb34d3d592a2bb4adaa5927a50d892 diff --git a/config/alert-tracks-debian.ugly b/config/alert-tracks-debian.ugly index c7d82d8c8..f1ca68b03 100755 --- a/config/alert-tracks-debian.ugly +++ b/config/alert-tracks-debian.ugly @@ -13,10 +13,12 @@ # !!(*= $daemon_name *)!! Start the Alaveteli email alert daemon NAME=!!(*= $daemon_name *)!! -DAEMON=!!(*= $vhost_dir *)!!/alaveteli/script/runner +DAEMON=!!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/script/runner DAEMON_ARGS="--daemon TrackMailer.alert_tracks_loop" -PIDFILE=!!(*= $vhost_dir *)!!/alert-tracks.pid -LOGFILE=!!(*= $vhost_dir *)!!/alaveteli/log/alert-tracks.log +PIDDIR=!!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/tmp/pids +PIDFILE=$PIDDIR/!!(*= $daemon_name *)!!.pid +LOGDIR=!!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/log +LOGFILE=$LOGDIR/!!(*= $daemon_name *)!!.log DUSER=!!(*= $user *)!! # Set RAILS_ENV - not needed if using config/rails_env.rb # RAILS_ENV=your_rails_env @@ -27,10 +29,14 @@ trap "" 1 export PIDFILE LOGFILE quietly_start_daemon() { + mkdir -p {$LOGDIR,$PIDDIR} + chown $DUSER:$DUSER {$LOGDIR,$PIDDIR} /sbin/start-stop-daemon --quiet --start --pidfile "$PIDFILE" --chuid "$DUSER" --startas "$DAEMON" -- $DAEMON_ARGS } start_daemon() { + mkdir -p {$LOGDIR,$PIDDIR} + chown $DUSER:$DUSER {$LOGDIR,$PIDDIR} /sbin/start-stop-daemon --start --pidfile "$PIDFILE" --chuid "$DUSER" --startas "$DAEMON" -- $DAEMON_ARGS } @@ -81,4 +87,3 @@ else echo " failed" exit 1 fi - diff --git a/config/crontab-example b/config/crontab-example index 79ba70beb..44e328e4e 100644 --- a/config/crontab-example +++ b/config/crontab-example @@ -10,8 +10,8 @@ MAILTO=!!(*= $mailto *)!! # Every 5 minutes */5 * * * * !!(*= $user *)!! !!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/commonlib/bin/run-with-lockfile.sh -n !!(*= $vhost_dir *)!!/change-xapian-database.lock "!!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/script/update-xapian-index verbose=true" >> !!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/log/update-xapian-index.log || echo "stalled?" # Every 10 minutes -5,15,25,35,45,55 * * * * !!(*= $user *)!! /etc/init.d/foi-alert-tracks check -5,15,25,35,45,55 * * * * !!(*= $user *)!! /etc/init.d/foi-purge-varnish check +5,15,25,35,45,55 * * * * !!(*= $user *)!! /etc/init.d/!!(*= $site *)!!-alert-tracks check +5,15,25,35,45,55 * * * * !!(*= $user *)!! /etc/init.d/!!(*= $site *)!!-purge-varnish check 0,10,20,30,40,50 * * * * !!(*= $user *)!! !!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/commonlib/bin/run-with-lockfile.sh -n !!(*= $vhost_dir *)!!/send-batch-requests.lock !!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/script/send-batch-requests || echo "stalled?" # Once an hour diff --git a/config/deploy.rb b/config/deploy.rb index 9cc847dba..c1954d058 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -33,14 +33,12 @@ namespace :xapian do end namespace :deploy do - desc "Restarting mod_rails with restart.txt" - task :restart, :roles => :app, :except => { :no_release => true } do - run "touch #{current_path}/tmp/restart.txt" - end - [:start, :stop].each do |t| - desc "#{t} task is a no-op with mod_rails" - task t, :roles => :app do ; end + [:start, :stop, :restart].each do |t| + desc "#{t.to_s.capitalize} Alaveteli service defined in /etc/init.d/alaveteli" + task t, :roles => :app, :except => { :no_release => true } do + run "/etc/init.d/alaveteli #{t}" + end end desc 'Link configuration after a code update' @@ -57,6 +55,7 @@ namespace :deploy do "#{release_path}/files" => "#{shared_path}/files", "#{release_path}/cache" => "#{shared_path}/cache", "#{release_path}/log" => "#{shared_path}/log", + "#{release_path}/tmp/pids" => "#{shared_path}/tmp/pids", "#{release_path}/lib/acts_as_xapian/xapiandbs" => "#{shared_path}/xapiandbs", } @@ -68,6 +67,7 @@ namespace :deploy do run "mkdir -p #{shared_path}/files" run "mkdir -p #{shared_path}/cache" run "mkdir -p #{shared_path}/log" + run "mkdir -p #{shared_path}/tmp/pids" run "mkdir -p #{shared_path}/xapiandbs" end end diff --git a/config/general.yml-example b/config/general.yml-example index a6f68c52e..0f32f6192 100644 --- a/config/general.yml-example +++ b/config/general.yml-example @@ -246,6 +246,7 @@ SHARED_DIRECTORIES: - cache/ - lib/acts_as_xapian/xapiandbs/ - log/ + - tmp/pids - vendor/bundle - public/assets diff --git a/config/httpd-force-ssl.conf.example b/config/httpd-force-ssl.conf.example new file mode 100644 index 000000000..0e89afe62 --- /dev/null +++ b/config/httpd-force-ssl.conf.example @@ -0,0 +1,5 @@ +# Rewrite all proxied HTTP requests to HTTPS. +# Only include if FORCE_SSL: true is set in general.yml +# Expected to be found at /etc/apache2/vhost.d/alaveteli +RewriteCond %{HTTP:X-Forwarded-Proto} !https +RewriteRule /(.*) https://www.example.com/$1 [L,R=permanent] diff --git a/config/httpd-ssl.conf.example b/config/httpd-ssl.conf.example new file mode 100644 index 000000000..8f099b8a6 --- /dev/null +++ b/config/httpd-ssl.conf.example @@ -0,0 +1,24 @@ +# VirtualHost for HTTPS requests +<VirtualHost *:443> + ServerName www.example.com + + ErrorLog /var/log/apache2/alaveteli_error.log + CustomLog /var/log/apache2/alaveteli_access.log combined + + ProxyRequests Off + ProxyPreserveHost On + ProxyPass / http://localhost:80/ + ProxyPassReverse / http://localhost:80/ + RequestHeader set X-Forwarded-Proto 'https' + + SSLEngine on + SSLProtocol all -SSLv2 + SSLCipherSuite ALL:!ADH:!EXPORT:!SSLv2:RC4+RSA:+HIGH:+MEDIUM + + SSLCertificateFile /etc/ssl/certs/www.example.com.cert + SSLCertificateKeyFile /etc/ssl/private/www.example.com.key + # SSLCertificateChainFile /etc/ssl/sub.class2.server.ca.pem + # SSLCACertificateFile /etc/ssl/ca.pem + + SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown +</VirtualHost> diff --git a/config/httpd.conf-example b/config/httpd.conf-example index 8d549d363..2f6ca9c75 100644 --- a/config/httpd.conf-example +++ b/config/httpd.conf-example @@ -1,81 +1,145 @@ -# Apache configuration for FOI site. -# -# For development ignore this, you can just run ./scripts/server as for any -# Ruby on Rails application. -# -# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. -# Email: hello@mysociety.org; WWW: http://www.mysociety.org - -# This is needed for the PHP spell checker -<Location /fcgi> - Options +ExecCGI - SetHandler fastcgi-script -</Location> - -RewriteEngine On -#RewriteLog /var/log/apache2/rewrite.log -#RewriteLogLevel 9 - -# TODO: do we need this now we use Passenger? -# Pass through the HTTP basic authentication to mongrel. See also -# admin_http_auth_user in app/controllers/application.rb -# Note: Apache 2 only. Doesn't work in Apache 1.3, you'll need to live without -# it. -RewriteCond %{LA-U:REMOTE_USER} (.+) -RewriteRule . - [E=RU:%1] -RequestHeader add X-Forwarded-User %{RU}e - -# Old /files URL to new subdomain (as can't use Alias with passenger, -# so we do it on its own domain). This is for custom admin upload -# files for archiving. -RewriteRule /files/(.+) http://files.whatdotheyknow.com/$1 - -# Serve attachments directly from the cache, if possible. -# -# The file names are URL-encoded on disk, and sharded by the first -# three digits of the request id, which is why this is as complicated -# as it is. The RewriteMap directive makes the URL-escaping function -# available to use in the other directives. -# -# The condition means that the rule will fire only if the cached -# file exists. -RewriteMap escape int:escape -RewriteCond %{DOCUMENT_ROOT}/views_cache/request/$2/$1/${escape:$3} -f -RewriteRule ^/request/((\d{1,3})\d*)/(response/\d+/attach/(html/)?\d+/.+) /views_cache/request/$2/$1/${escape:$3} [L] - - -<IfModule mod_passenger.c> - # Set this to something like 100 if you have memory leak issues - PassengerMaxRequests 500 - PassengerResolveSymlinksInDocumentRoot on - # Recommend setting this to 3 or less on servers with 512MB RAM - PassengerMaxPoolSize 6 - # The RackEnv variable applies to Rails 3 applications, while - # the RailsEnv variable applies to applications for earlier - # versions of Rails. There doesn't seem to be any harm in - # setting both, however. - RailsEnv production - RackEnv production -</IfModule> - -# Gzip font resources -<IfModule mod_deflate.c> - <IfModule mod_mime.c> - Addtype font/opentype .otf - Addtype font/opentype .woff - Addtype font/eot .eot - Addtype font/truetype .ttf +# Redirect other domains to canonical domain +<VirtualHost *:80> + ServerName example.com + ServerAlias example.org + ServerAlias www.example.org + RedirectPermanent / http://www.example.com/ +</VirtualHost> + +# Canonical domain vHost +<VirtualHost *:80> + ServerName www.example.com + ServerAdmin webmaster@example.com + DocumentRoot /var/www/alaveteli/public + + # TODO: Remove this and use PassengerUser when supported + # This is the user that runs the rails application processes + SuExecUserGroup alaveteli alaveteli + RewriteEngine On + + ErrorLog /var/log/apache2/alaveteli_error.log + CustomLog /var/log/apache2/alaveteli_access.log combined + + # App server configuration + <IfModule mod_passenger.c> + PassengerAppRoot /var/www/alaveteli + PassengerResolveSymlinksInDocumentRoot on + + # See http://blog.phusion.nl/2013/03/12/tuning-phusion-passengers-concurrency-settings/ + # and http://blog.scoutapp.com/articles/2009/12/08/production-rails-tuning-with-passenger-passengermaxprocesses + # for more information on tuning Passenger + + # Set this to something like 100 if you have memory leak issues + PassengerMaxRequests 2000 + # Passenger's default MaxPoolSize is 6. At the time of writing + # normal instances of Alaveteli seem to take 150-200MB per + # process, so we've set this conservatively at 3. Read the guides + # above to tune this for your system + PassengerMaxPoolSize 3 + + # The RAILS_ENV that the app is running in. This can be any of + # the environments listed in APP_ROOT/config/environments. + RailsEnv production + RackEnv production </IfModule> - AddOutputFilterByType DEFLATE font/opentype font/truetype font/eot - AddOutputFilterByType DEFLATE image/svg+xml -</IFModule> - -# Set the Sendfile header and switch sendfile on - Apache will -# now handle send_file calls from Alaveteli -<Location /> - <IfModule mod_xsendfile.c> - RequestHeader Set X-Sendfile-Type X-Sendfile - XSendFile On - XSendFileAllowAbove On + + # This is your Rails app's public directory + <Directory "/var/www/alaveteli/public"> + Options +ExecCGI -MultiViews + AllowOverride All + </Directory> + + # Maintenance Page + # Make a file down.html in the DocumentRoot to bring down the whole + # site and display itself. + RewriteEngine on + ErrorDocument 503 /down.html + Redirect 503 /down + + # If down.html exists, and that's what's been asked for, + # just hand it over + RewriteCond %{DOCUMENT_ROOT}/down.html -s + RewriteRule /down.html /down.html [L] + + RewriteCond %{DOCUMENT_ROOT}/down.html -s + RewriteRule /(.+).cgi /down [PT] + RewriteCond %{DOCUMENT_ROOT}/down.html -s + RewriteRule /(.+).php /down [PT] + # Mainly for Rails/Django type sites - anything without a . can go down + # TODO: could we just check that it is an HTML content-type? + RewriteCond %{DOCUMENT_ROOT}/down.html -s + RewriteRule /([^.]*)$ /down [PT] + # END Maintenance Page + + # Set the Sendfile header and switch sendfile on - Apache will + # now handle send_file calls from Alaveteli + <Location /> + <IfModule mod_xsendfile.c> + RequestHeader Set X-Sendfile-Type X-Sendfile + XSendFile On + XSendFilePath /var/www/alaveteli/public + </IfModule> + </Location> + + # Commonlib is typically found in alaveteli/commonlib + Alias /jslib/ "/var/www/alaveteli/commonlib/jslib" + <Directory "/var/www/alaveteli/commonlib/jslib"> + Options +ExecCGI + AddHandler fastcgi-script .cgi + </Directory> + + # Serve attachments directly from the cache, if possible. + # + # The file names are URL-encoded on disk, and sharded by the first + # three digits of the request id, which is why this is as complicated + # as it is. The RewriteMap directive makes the URL-escaping function + # available to use in the other directives. + # + # The condition means that the rule will fire only if the cached + # file exists. + RewriteMap escape int:escape + RewriteCond %{DOCUMENT_ROOT}/views_cache/request/$2/$1/${escape:$3} -f + RewriteRule ^/request/((\d{1,3})\d*)/(response/\d+/attach/(html/)?\d+/.+) /views_cache/request/$2/$1/${escape:$3} [L] + RewriteCond %{DOCUMENT_ROOT}/views_cache/cy/request/$2/$1/${escape:$3} -f + RewriteRule ^/cy/request/((\d{1,3})\d*)/(response/\d+/attach/(html/)?\d+/.+) /views_cache/cy/request/$2/$1/${escape:$3} [L] + + # Compress assets + <Location /> + <IfModule mod_deflate.c> + AddOutputFilterByType DEFLATE text/css application/javascript text/plain + </IfModule> + </Location> + + # Cache assets + ExpiresActive On + <LocationMatch "^/(assets).*\.(ico|gif|jpe?g|png|js|css|svg|ttf|otf|eot|woff)$"> + ExpiresDefault "access plus 1 day" + </LocationMatch> + + # Compress font resources + <IfModule mod_deflate.c> + <IfModule mod_mime.c> + Addtype font/opentype .otf + Addtype font/opentype .woff + Addtype font/eot .eot + Addtype font/truetype .ttf + </IfModule> + AddOutputFilterByType DEFLATE font/opentype font/truetype font/eot + AddOutputFilterByType DEFLATE image/svg+xml </IfModule> -</Location> + + # Include optional configuration + Include vhost.d/alaveteli/*.conf + +</VirtualHost> + +# Large / static files for WhatDoTheyKnow. Used for manual sysadmin uploads. +# Is on its own files.example.com subdomain (instead of old /files URL) +# as mod_alias doesn't work with Passenger. +# <VirtualHost *:80> +# ServerName files.example.com +# DocumentRoot /var/www/alaveteli/files +# <Directory "/var/www/alaveteli/files"> +# Options +Indexes +# </Directory> +# </VirtualHost> diff --git a/config/nginx-ssl.conf.example b/config/nginx-ssl.conf.example new file mode 100644 index 000000000..af2e9e4ab --- /dev/null +++ b/config/nginx-ssl.conf.example @@ -0,0 +1,44 @@ +upstream alaveteli { + server 127.0.0.1:3000; +} + +# Redirect any http:// request to https://www.example.com +server { + listen 80; + server_name www.example.com; + rewrite ^(.*) https://www.example.com$request_uri permanent; +} + +server { + listen 443; + server_name www.example.com; + root /var/www/alaveteli/alaveteli/public; + + server_tokens off; + + try_files $uri/index.html $uri @alaveteli; + + access_log /var/log/nginx/alaveteli_ssl_access.log; + error_log /var/log/nginx/alaveteli_ssl_error.log error; + + location /download { + internal; + alias /var/www/alaveteli/alaveteli/cache/zips/production/download; + } + + ssl on; + ssl_certificate /etc/ssl/certs/www.example.com.cert; + ssl_certificate_key /etc/ssl/private/www.example.com.key; + ssl_ciphers ECDHE-RSA-AES256-SHA384:AES256-SHA256:RC4:HIGH:!MD5:!aNULL:!EDH:!AESGCM; + + location @alaveteli { + proxy_set_header Host $http_host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto https; + proxy_set_header X-Sendfile-Type X-Accel-Redirect; + proxy_set_header X-Accel-Mapping /var/www/alaveteli/alaveteli/cache/zips/production/download=/download; + proxy_redirect off; + proxy_pass http://alaveteli; + } +} diff --git a/config/nginx.conf.example b/config/nginx.conf.example index 56e720abb..7b8af2bd9 100644 --- a/config/nginx.conf.example +++ b/config/nginx.conf.example @@ -1,29 +1,43 @@ upstream alaveteli { - server 127.0.0.1:3300; + server 127.0.0.1:3000; } +# Example to redirect other domains to the canonical URL. Also redirects the +# unqualified domain to the FQDN www.example.com, which is recommended. +# +# server { +# server_name example.com example.org www.example.org; +# rewrite ^(.*) http://www.example.com$1 permanent; +# } + server { listen 80; + # Set the server name to your domain name if you have multiple nginx servers + # running on your machine + # server_name www.example.com; root /var/www/alaveteli/alaveteli/public; - location / { - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header Host $http_host; - proxy_set_header X-Forwarded-Proto http; - proxy_redirect off; - try_files $uri @ruby; - } + server_tokens off; + + access_log /var/log/nginx/alaveteli_access.log; + error_log /var/log/nginx/alaveteli_error.log error; + + try_files $uri/index.html $uri @alaveteli; + location /download { internal; - alias /var/www/alaveteli/alaveteli/cache/zips/development/download; + alias /var/www/alaveteli/alaveteli/cache/zips/production/download; } - location @ruby { - proxy_pass http://alaveteli; + location @alaveteli { proxy_set_header Host $http_host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto http; proxy_set_header X-Sendfile-Type X-Accel-Redirect; - proxy_set_header X-Accel-Mapping /var/www/alaveteli/alaveteli/cache/zips/development/download=/download; + proxy_set_header X-Accel-Mapping /var/www/alaveteli/alaveteli/cache/zips/production/download=/download; + proxy_redirect off; + proxy_pass http://alaveteli; } } diff --git a/config/packages b/config/packages index fda09cbc1..a6eeb8079 100644 --- a/config/packages +++ b/config/packages @@ -1,42 +1,44 @@ # please note that this package list currently forms part of the # mysociety deployment infrastructure -- please discuss on the # alavateli mailing list if you want to change it -ruby1.8 -ruby -rdoc | rdoc1.8 -irb | irb1.8 -wv -poppler-utils -pdftk (>> 1.41+dfsg-1) | pdftk (<< 1.41+dfsg-1) # that version has a non-functionining uncompress option -ghostscript +build-essential +bundler catdoc -links elinks -unrtf -xlhtml -xapian-tools -gnuplot-nox -php5-cli -sharutils -unzip -mutt -tnef (>= 1.4.5) gettext -python-yaml -wkhtmltopdf-static +ghostscript +gnuplot-nox +irb | irb1.8 +libapache2-mod-passenger +libicu-dev libmagic-dev libmagickwand-dev libpq-dev +libsqlite3-dev libxml2-dev libxslt-dev -uuid-dev +links +lockfile-progs +memcached +mutt +pdftk (>> 1.41+dfsg-1) | pdftk (<< 1.41+dfsg-1) # that version has a non-functionining uncompress option +php5-cli +poppler-utils +python-yaml +rake (>= 0.9.2.2) +rdoc | rdoc1.8 +ruby +ruby1.8 ruby1.8-dev rubygems (>= 1.8.15) -rake (>= 0.9.2.2) -build-essential -bundler +sharutils sqlite3 -libsqlite3-dev -libicu-dev -memcached +tnef (>= 1.4.5) ttf-bitstream-vera +unrtf +unzip +uuid-dev +wkhtmltopdf-static +wv +xapian-tools +xlhtml diff --git a/config/packages.debian-squeeze b/config/packages.debian-squeeze index d82d66324..c34abefde 100644 --- a/config/packages.debian-squeeze +++ b/config/packages.debian-squeeze @@ -1,40 +1,42 @@ -ruby1.8 -ruby -libruby1.8 -rdoc1.8 -irb1.8 -wv -poppler-utils -pdftk -ghostscript +build-essential +bundler catdoc -links elinks -unrtf -xlhtml -xapian-tools -gnuplot-nox -php5-cli -sharutils -unzip -mutt -tnef gettext -python-yaml -wkhtmltopdf-static +ghostscript +gnuplot-nox +irb1.8 +libicu-dev libmagic-dev libmagickwand-dev libpq-dev +libruby1.8 +libsqlite3-dev libxml2-dev libxslt-dev -uuid-dev +links +lockfile-progs +mutt +pdftk +php5-cli +poppler-utils +postgresql +postgresql-client +python-yaml +rake +rdoc1.8 +ruby +ruby1.8 ruby1.8-dev rubygems/squeeze-backports -rake -build-essential +sharutils sqlite3 -libsqlite3-dev -libicu-dev -postgresql -postgresql-client +tnef ttf-bitstream-vera +unrtf +unzip +uuid-dev +wkhtmltopdf-static +wv +xapian-tools +xlhtml diff --git a/config/packages.debian-wheezy b/config/packages.debian-wheezy index 509cde56e..4129aa930 100644 --- a/config/packages.debian-wheezy +++ b/config/packages.debian-wheezy @@ -1,36 +1,37 @@ -ruby1.9.3 -wv -poppler-utils -pdftk -ghostscript +build-essential +bundler catdoc -links elinks -unrtf -xlhtml -xapian-tools -gnuplot-nox -php5-cli -sharutils -unzip -mutt -tnef gettext -python-yaml -wkhtmltopdf-static +ghostscript +gnuplot-nox +libicu-dev libmagic-dev libmagickwand-dev libpq-dev +libsqlite3-dev libxml2-dev libxslt-dev -uuid-dev +links +lockfile-progs +mutt +pdftk +php5-cli +poppler-utils +postgresql +postgresql-client +python-yaml +rake ruby-dev +ruby1.9.3 rubygems -rake -build-essential -bundler +sharutils sqlite3 -libsqlite3-dev -libicu-dev -postgresql -postgresql-client +tnef +unrtf +unzip +uuid-dev +wkhtmltopdf-static +wv +xapian-tools +xlhtml diff --git a/config/packages.ubuntu-precise b/config/packages.ubuntu-precise index 68911359a..d97579bc1 100644 --- a/config/packages.ubuntu-precise +++ b/config/packages.ubuntu-precise @@ -1,36 +1,37 @@ -ruby1.9.1 -wv -poppler-utils -pdftk -ghostscript +build-essential catdoc -links elinks -unrtf -xlhtml -xapian-tools -gnuplot-nox -sharutils -unzip -mutt -tnef gettext -python-yaml -wkhtmltopdf-static +ghostscript +gnuplot-nox +libicu-dev libmagic-dev libmagickwand-dev libpq-dev +libsqlite3-dev libxml2-dev libxslt1-dev -uuid-dev -ruby1.9.1-dev -rubygems +links +lockfile-progs +mutt +pdftk +poppler-utils +postgresql +postgresql-client +python-yaml rake -build-essential ruby-bundler +ruby1.9.1 +ruby1.9.1-dev +rubygems +sharutils sqlite3 -libsqlite3-dev -libicu-dev -postgresql -postgresql-client +tnef ttf-bitstream-vera +unrtf +unzip +uuid-dev +wkhtmltopdf-static +wv +xapian-tools +xlhtml diff --git a/config/purge-varnish-debian.ugly b/config/purge-varnish-debian.ugly index ebd4d9e5c..dc3f74ff6 100644..100755 --- a/config/purge-varnish-debian.ugly +++ b/config/purge-varnish-debian.ugly @@ -13,10 +13,12 @@ # !!(*= $daemon_name *)!! Start the Alaveteli email purge-varnish daemon NAME=!!(*= $daemon_name *)!! -DAEMON=!!(*= $vhost_dir *)!!/alaveteli/script/runner +DAEMON=!!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/script/runner DAEMON_ARGS="--daemon PurgeRequest.purge_all_loop" -PIDFILE=!!(*= $vhost_dir *)!!/purge-varnish.pid -LOGFILE=!!(*= $vhost_dir *)!!/alaveteli/log/purge-varnish.log +PIDDIR=!!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/tmp/pids +PIDFILE=$PIDDIR/!!(*= $daemon_name *)!!.pid +LOGDIR=!!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/log +LOGFILE=$LOGDIR/!!(*= $daemon_name *)!!.log DUSER=!!(*= $user *)!! # Set RAILS_ENV - not needed if using config/rails_env.rb # RAILS_ENV=your_rails_env @@ -29,10 +31,14 @@ trap "" 1 export PIDFILE LOGFILE quietly_start_daemon() { + mkdir -p {$LOGDIR,$PIDDIR} + chown $DUSER:$DUSER {$LOGDIR,$PIDDIR} /sbin/start-stop-daemon --quiet --start --pidfile "$PIDFILE" --chuid "$DUSER" --startas "$DAEMON" -- $DAEMON_ARGS } start_daemon() { + mkdir -p {$LOGDIR,$PIDDIR} + chown $DUSER:$DUSER {$LOGDIR,$PIDDIR} /sbin/start-stop-daemon --start --pidfile "$PIDFILE" --chuid "$DUSER" --startas "$DAEMON" -- $DAEMON_ARGS } diff --git a/config/sysvinit-passenger.ugly b/config/sysvinit-passenger.ugly new file mode 100755 index 000000000..0940a4d63 --- /dev/null +++ b/config/sysvinit-passenger.ugly @@ -0,0 +1,59 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: application-passenger-!!(*= $site *)!! +# Required-Start: $local_fs $network +# Required-Stop: $local_fs $network +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Starts the Passenger app server for the "!!(*= $site *)!!" site +# Description: The Passenger app server for the "!!(*= $site *)!!" site +### END INIT INFO + +# This example sysvinit script is based on the helpful example here: +# http://richard.wallman.org.uk/2010/02/howto-deploy-a-catalyst-application-using-fastcgi-and-nginx/ + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +NAME=!!(*= $site *)!! +SITE_HOME=!!(*= $vhost_dir *)!!/!!(*= $vcspath *)!! +DESC="Alaveteli app server" +USER=!!(*= $user *)!! + +set -e + +start_daemon() { + echo -n "Starting $DESC: " + rm -f "$SITE_HOME/public/down.html" + echo "$NAME." +} + +stop_daemon() { + echo -n "Stopping $DESC: " + cp "$SITE_HOME/public/down.default.html" "$SITE_HOME/public/down.html" + echo "$NAME." +} + +restart_daemon() { + echo -n "Restarting $DESC: " + rm -f "$SITE_HOME/public/down.html" + touch "$SITE_HOME/tmp/restart.txt" + echo "$NAME." +} + +case "$1" in + start) + start_daemon + ;; + stop) + stop_daemon + ;; + reload|restart|force-reload) + restart_daemon + ;; + *) + N=/etc/init.d/$NAME + echo "Usage: $N {start|stop|reload|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/config/sysvinit-thin.ugly b/config/sysvinit-thin.ugly new file mode 100755 index 000000000..cc604d994 --- /dev/null +++ b/config/sysvinit-thin.ugly @@ -0,0 +1,68 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: application-thin-!!(*= $site *)!! +# Required-Start: $local_fs $network +# Required-Stop: $local_fs $network +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Starts the Thin app server for the "!!(*= $site *)!!" site +# Description: The Thin app server for the "!!(*= $site *)!!" site +### END INIT INFO + +# This example sysvinit script is based on the helpful example here: +# http://richard.wallman.org.uk/2010/02/howto-deploy-a-catalyst-application-using-fastcgi-and-nginx/ + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +NAME=!!(*= $site *)!! +SITE_HOME=!!(*= $vhost_dir *)!!/!!(*= $vcspath *)!! +DESC="Alaveteli app server" +USER=!!(*= $user *)!! + +set -e + +# Check that the Daemon can be run +su -l -c "cd $SITE_HOME && bundle exec thin --version &> /dev/null || exit 0" $USER + +start_daemon() { + echo -n "Starting $DESC: " + cd "$SITE_HOME" && bundle exec thin \ + --environment=production \ + --user="$USER" \ + --group="$USER" \ + --address=127.0.0.1 \ + --daemonize \ + --quiet \ + start || true + echo "$NAME." +} + +stop_daemon() { + echo -n "Stopping $DESC: " + cd "$SITE_HOME" && bundle exec thin --quiet stop || true + echo "$NAME." +} + +restart_daemon() { + echo -n "Restarting $DESC: " + cd "$SITE_HOME" && bundle exec thin --onebyone --quiet restart || true + echo "$NAME." +} + +case "$1" in + start) + start_daemon + ;; + stop) + stop_daemon + ;; + reload|restart|force-reload) + restart_daemon + ;; + *) + N=/etc/init.d/$NAME + echo "Usage: $N {start|stop|reload|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/config/sysvinit.example b/config/sysvinit.example deleted file mode 100755 index 443e7c3fb..000000000 --- a/config/sysvinit.example +++ /dev/null @@ -1,53 +0,0 @@ -#! /bin/sh -### BEGIN INIT INFO -# Provides: application-thin-alaveteli -# Required-Start: $local_fs $network -# Required-Stop: $local_fs $network -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Starts the Thin web server for the "Alaveteli" site -# Description: The Thin web server for the "Alaveteli" site -### END INIT INFO - -# This example sysvinit script is based on the helpful example here: -# http://richard.wallman.org.uk/2010/02/howto-deploy-a-catalyst-application-using-fastcgi-and-nginx/ - -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -SITE_HOME=/var/www/alaveteli -NAME=alaveteli -DESC="Alaveteli app server" -USER=fms - -echo $DAEMON -test -f $DAEMON || exit 0 - -set -e - -start_daemon() { - su -l -c "cd $SITE_HOME/alaveteli && bundle exec thin -d -p 3300 -e development start" $USER -} - -stop_daemon() { - pkill -f thin -u $USER || true -} - -case "$1" in - start) - start_daemon - ;; - stop) - stop_daemon - ;; - reload|restart|force-reload) - stop_daemon - sleep 5 - start_daemon - ;; - *) - N=/etc/init.d/$NAME - echo "Usage: $N {start|stop|reload|restart|force-reload}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/db/migrate/20140801132719_add_index_to_info_request_events.rb b/db/migrate/20140801132719_add_index_to_info_request_events.rb new file mode 100644 index 000000000..5f0a77eac --- /dev/null +++ b/db/migrate/20140801132719_add_index_to_info_request_events.rb @@ -0,0 +1,5 @@ +class AddIndexToInfoRequestEvents < ActiveRecord::Migration + def change + add_index :info_request_events, :event_type + end +end diff --git a/doc/CHANGES.md b/doc/CHANGES.md index 0032706ef..e897c8452 100644 --- a/doc/CHANGES.md +++ b/doc/CHANGES.md @@ -4,6 +4,11 @@ ## Upgrade Notes +* The `SHARED_DIRECTORIES` setting now includes `tmp/pids`. The notes below for + updating the log directory should cover the update steps for `tmp/pids`. +* Capistrano now creates `SHARED_PATH/tmp/pids` and links `APP_ROOT/tmp/pids` + here, as the alert tracks daemon writes its pids to the generally expected + location of `APP_ROOT/tmp/pids`. * rails-post-deploy no longer handles linking `APP_ROOT/log` to a log directory outside the app. Capistrano users will find that `:symlink_configuration` now links `APP_ROOT/log` to `SHARED_PATH/log`. Users who aleady use the @@ -15,6 +20,21 @@ `script/rails-post-deploy` to link up the new location. If you don't use `SHARED_FILES` and `SHARED_DIRECTORIES`, alaveteli will now write it's application logs to `APP_ROOT/log` rather than `APP_ROOT/../logs` by default. +* `public_body_change_requests/new.html.erb` has a new field for spam prevention + so customisations of this template should be updated with: + + <p style="display:none;"> + <%= label_tag 'public_body_change_request[comment]', _('Do not fill in this field') %> + <%= text_field_tag 'public_body_change_request[comment]' %> + </p> + This is the anti-spam honeypot. +* The workaround for an old [bug](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=637239) in libc6 in squeeze has been removed. If you're running on squeeze, please make sure you're using the latest version of libc6 (2.11.3-4) to prevent the risk of segfaults. +* The capistrano `stop`, `start` and `restart` tasks now restart the app + server via the service `/etc/init.d/alaveteli`. If you're using + capistrano for deployment, make sure `/etc/init.d/alaveteli` exists + and is current, and executable by the cap user. You can create it using the template + `config/sysvinit-thin.ugly` or `config/sysvinit-passenger.ugly` as + described in http://alaveteli.org/docs/installing/manual_install/#generate-alaveteli-service # Version 0.18 diff --git a/lib/attachment_to_html/template.html.erb b/lib/attachment_to_html/template.html.erb index 38286a5f9..b898b1750 100644 --- a/lib/attachment_to_html/template.html.erb +++ b/lib/attachment_to_html/template.html.erb @@ -1,6 +1,7 @@ <!DOCTYPE html> <html> <head> + <meta charset="UTF-8"> <title><%= title %></title> <%= content_for(:head_suffix) %> </head> diff --git a/lib/tasks/config_files.rake b/lib/tasks/config_files.rake index 60814cb27..5dda64a04 100644 --- a/lib/tasks/config_files.rake +++ b/lib/tasks/config_files.rake @@ -23,26 +23,34 @@ namespace :config_files do desc 'Convert Debian .ugly init script in config to a form suitable for installing in /etc/init.d' task :convert_init_script => :environment do - example = 'rake config_files:convert_init_script DEPLOY_USER=deploy VHOST_DIR=/dir/above/alaveteli SCRIPT_FILE=config/alert-tracks-debian.ugly ' - check_for_env_vars(['DEPLOY_USER', 'VHOST_DIR', 'SCRIPT_FILE'], example) + example = 'rake config_files:convert_init_script DEPLOY_USER=deploy VHOST_DIR=/dir/above/alaveteli VCSPATH=alaveteli SITE=alaveteli SCRIPT_FILE=config/alert-tracks-debian.ugly' + check_for_env_vars(['DEPLOY_USER', + 'VHOST_DIR', + 'SCRIPT_FILE'], example) + + replacements = { + :user => ENV['DEPLOY_USER'], + :vhost_dir => ENV['VHOST_DIR'], + :vcspath => ENV.fetch('VCSPATH') { 'alaveteli' }, + :site => ENV.fetch('SITE') { 'foi' } + } - deploy_user = ENV['DEPLOY_USER'] - vhost_dir = ENV['VHOST_DIR'] - script_file = ENV['SCRIPT_FILE'] + # Use the filename for the $daemon_name ugly variable + daemon_name = File.basename(ENV['SCRIPT_FILE'], '-debian.ugly') + replacements.update(:daemon_name => "#{ replacements[:site] }-#{ daemon_name }") - replacements = { :user => deploy_user, - :vhost_dir => vhost_dir } + # Generate the template for potential further processing + converted = convert_ugly(ENV['SCRIPT_FILE'], replacements) - daemon_name = File.basename(script_file, '-debian.ugly') - replacements.update(:daemon_name => "foi-#{daemon_name}") - converted = convert_ugly(script_file, replacements) - rails_env_file = File.expand_path(File.join(Rails.root, 'config', 'rails_env.rb')) - if !File.exists?(rails_env_file) + # gsub the RAILS_ENV in to the generated template if its not set by the + # hard coded config file + unless File.exists?("#{ Rails.root }/config/rails_env.rb") converted.each do |line| line.gsub!(/^#\s*RAILS_ENV=your_rails_env/, "RAILS_ENV=#{Rails.env}") line.gsub!(/^#\s*export RAILS_ENV/, "export RAILS_ENV") end end + converted.each do |line| puts line end diff --git a/lib/tasks/stats.rake b/lib/tasks/stats.rake index f09594529..46a645b4d 100644 --- a/lib/tasks/stats.rake +++ b/lib/tasks/stats.rake @@ -119,7 +119,7 @@ DESC count ? count : 0 end - row = [body.name] + stats + row = [%Q("#{ body.name }")] + stats puts row.join(",") end end @@ -147,7 +147,7 @@ DESC count ? count : 0 end - row = [body.name] + stats + row = [%Q("#{ body.name }")] + stats puts row.join(",") end end diff --git a/locale/aln/app.po b/locale/aln/app.po index a91046d8f..e9975e50b 100644 --- a/locale/aln/app.po +++ b/locale/aln/app.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-15 12:46+0100\n" -"PO-Revision-Date: 2014-05-15 11:56+0000\n" -"Last-Translator: louisecrow <louise@mysociety.org>\n" +"POT-Creation-Date: 2014-08-21 13:43+0000\n" +"PO-Revision-Date: 2014-08-21 13:44+0000\n" +"Last-Translator: Gareth Rees <gareth@mysociety.org>\n" "Language-Team: Albanian Gheg (http://www.transifex.com/projects/p/alaveteli/language/aln/)\n" "Language: aln\n" "MIME-Version: 1.0\n" @@ -91,9 +91,6 @@ msgstr "" msgid " You will also be emailed updates about the request." msgstr "" -msgid " made by " -msgstr "" - msgid " when you send this message." msgstr "" @@ -283,6 +280,9 @@ msgstr "" msgid "<strong>did not have</strong> the information requested." msgstr "" +msgid "?" +msgstr "" + msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "" @@ -538,9 +538,6 @@ msgstr "" msgid "Change your password on {{site_name}}" msgstr "" -msgid "Change your password {{site_name}}" -msgstr "" - msgid "Charity registration" msgstr "" @@ -715,6 +712,9 @@ msgstr "" msgid "Disclosure log URL" msgstr "" +msgid "Do not fill in this field" +msgstr "" + msgid "Don't have a superuser account yet?" msgstr "" @@ -1374,6 +1374,9 @@ msgstr "" msgid "Make a request" msgstr "" +msgid "Make a request »" +msgstr "" + msgid "Make a request to these authorities" msgstr "" @@ -1875,6 +1878,9 @@ msgstr "" msgid "Public Bodies" msgstr "" +msgid "Public Body" +msgstr "" + msgid "Public Body Statistics" msgstr "" @@ -1887,6 +1893,9 @@ msgstr "" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "" +msgid "Public authority statistics" +msgstr "" + msgid "Public authority – {{name}}" msgstr "" @@ -2112,7 +2121,7 @@ msgstr "" msgid "Respond to request" msgstr "" -msgid "Respond to the FOI request" +msgid "Respond to the FOI request '{{request}}' made by {{user}}" msgstr "" msgid "Respond using the web" @@ -2317,9 +2326,6 @@ msgstr "" msgid "Special note for this authority!" msgstr "" -msgid "Start now »" -msgstr "" - msgid "Start your own blog" msgstr "" @@ -2917,6 +2923,9 @@ msgstr "" msgid "Unable to send follow up message to {{username}}" msgstr "" +msgid "Unclassified or hidden requests are not counted." +msgstr "" + msgid "Unexpected search result type " msgstr "" @@ -2977,9 +2986,6 @@ msgstr "" msgid "User|About me" msgstr "" -msgid "User|Address" -msgstr "" - msgid "User|Admin level" msgstr "" @@ -2989,9 +2995,6 @@ msgstr "" msgid "User|Can make batch requests" msgstr "" -msgid "User|Dob" -msgstr "" - msgid "User|Email" msgstr "" @@ -3046,7 +3049,7 @@ msgstr "" msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "" -msgid "View and search requests" +msgid "Browse and search requests" msgstr "" msgid "View authorities" @@ -3055,7 +3058,7 @@ msgstr "" msgid "View email" msgstr "" -msgid "View requests" +msgid "Browse Requests" msgstr "" msgid "Waiting clarification." diff --git a/locale/app.pot b/locale/app.pot index 21d301c2e..bf3c50630 100644 --- a/locale/app.pot +++ b/locale/app.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: version 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-15 12:46+0100\n" +"POT-Creation-Date: 2014-08-21 13:43+0000\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" @@ -88,9 +88,6 @@ msgstr "" msgid " You will also be emailed updates about the request." msgstr "" -msgid " made by " -msgstr "" - msgid " when you send this message." msgstr "" @@ -280,6 +277,9 @@ msgstr "" msgid "<strong>did not have</strong> the information requested." msgstr "" +msgid "?" +msgstr "" + msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "" @@ -535,9 +535,6 @@ msgstr "" msgid "Change your password on {{site_name}}" msgstr "" -msgid "Change your password {{site_name}}" -msgstr "" - msgid "Charity registration" msgstr "" @@ -712,6 +709,9 @@ msgstr "" msgid "Disclosure log URL" msgstr "" +msgid "Do not fill in this field" +msgstr "" + msgid "Don't have a superuser account yet?" msgstr "" @@ -1371,6 +1371,9 @@ msgstr "" msgid "Make a request" msgstr "" +msgid "Make a request »" +msgstr "" + msgid "Make a request to these authorities" msgstr "" @@ -1872,6 +1875,9 @@ msgstr "" msgid "Public Bodies" msgstr "" +msgid "Public Body" +msgstr "" + msgid "Public Body Statistics" msgstr "" @@ -1884,6 +1890,9 @@ msgstr "" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "" +msgid "Public authority statistics" +msgstr "" + msgid "Public authority – {{name}}" msgstr "" @@ -2109,7 +2118,7 @@ msgstr "" msgid "Respond to request" msgstr "" -msgid "Respond to the FOI request" +msgid "Respond to the FOI request '{{request}}' made by {{user}}" msgstr "" msgid "Respond using the web" @@ -2314,9 +2323,6 @@ msgstr "" msgid "Special note for this authority!" msgstr "" -msgid "Start now »" -msgstr "" - msgid "Start your own blog" msgstr "" @@ -2914,6 +2920,9 @@ msgstr "" msgid "Unable to send follow up message to {{username}}" msgstr "" +msgid "Unclassified or hidden requests are not counted." +msgstr "" + msgid "Unexpected search result type " msgstr "" @@ -2974,9 +2983,6 @@ msgstr "" msgid "User|About me" msgstr "" -msgid "User|Address" -msgstr "" - msgid "User|Admin level" msgstr "" @@ -2986,9 +2992,6 @@ msgstr "" msgid "User|Can make batch requests" msgstr "" -msgid "User|Dob" -msgstr "" - msgid "User|Email" msgstr "" @@ -3043,7 +3046,7 @@ msgstr "" msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "" -msgid "View and search requests" +msgid "Browse and search requests" msgstr "" msgid "View authorities" @@ -3052,7 +3055,7 @@ msgstr "" msgid "View email" msgstr "" -msgid "View requests" +msgid "Browse Requests" msgstr "" msgid "Waiting clarification." diff --git a/locale/ar/app.po b/locale/ar/app.po index 28fa4ecc5..c049a41b1 100644 --- a/locale/ar/app.po +++ b/locale/ar/app.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-15 12:46+0100\n" -"PO-Revision-Date: 2014-05-15 11:56+0000\n" -"Last-Translator: louisecrow <louise@mysociety.org>\n" +"POT-Creation-Date: 2014-08-21 13:43+0000\n" +"PO-Revision-Date: 2014-08-21 13:44+0000\n" +"Last-Translator: Gareth Rees <gareth@mysociety.org>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/alaveteli/language/ar/)\n" "Language: ar\n" "MIME-Version: 1.0\n" @@ -96,9 +96,6 @@ msgstr " يجري حصولكم على رسالةٍ إلكترونية تتضم msgid " You will also be emailed updates about the request." msgstr "سنمدكم أيضاً برسالةٍ إلكترونية تتضمن مستجدات متعلقة بطلبكم." -msgid " made by " -msgstr "قام به" - msgid " when you send this message." msgstr " عندما تقومون ببعث هذه الرسالة ." @@ -288,6 +285,9 @@ msgstr "<strong>شكر</strong> السلطة العامة أو " msgid "<strong>did not have</strong> the information requested." msgstr "<strong>لم تكن لدينا</strong>المعلومات المطلوبة." +msgid "?" +msgstr "" + msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "A <a href=\"{{request_url}}\">المتابعة</a> الى <em>{{request_title}}</em> وقع ارسالها {{public_body_name}} من قبل {{info_request_user}} بتاريخ {{date}}." @@ -543,9 +543,6 @@ msgstr "تغيير كلمة السر" msgid "Change your password on {{site_name}}" msgstr "تغيير كلمة السر على{{site_name}}" -msgid "Change your password {{site_name}}" -msgstr " تغيير كلمة السر {{site_name}}" - msgid "Charity registration" msgstr "تسجيل خيري" @@ -720,6 +717,9 @@ msgstr "سجل الكشف" msgid "Disclosure log URL" msgstr "" +msgid "Do not fill in this field" +msgstr "" + msgid "Don't have a superuser account yet?" msgstr "" @@ -1383,6 +1383,9 @@ msgstr "اضف<br/>\\n <strong>لحرية<span>of</span><br/>\\n النفاذ msgid "Make a request" msgstr "قدم مطلبا" +msgid "Make a request »" +msgstr "" + msgid "Make a request to these authorities" msgstr "" @@ -1884,6 +1887,9 @@ msgstr "صورة الحساب|مسودة" msgid "Public Bodies" msgstr "" +msgid "Public Body" +msgstr "" + msgid "Public Body Statistics" msgstr "" @@ -1896,6 +1902,9 @@ msgstr "سلطات عامة - {{description}}" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "السلطات العمومية {{start_count}} الى {{end_count}} من {{total_count}}" +msgid "Public authority statistics" +msgstr "" + msgid "Public authority – {{name}}" msgstr "" @@ -2121,8 +2130,8 @@ msgstr "الرد عبر البريد الإلكتروني" msgid "Respond to request" msgstr "الرد على المطلب " -msgid "Respond to the FOI request" -msgstr "رد على مطالب حرية المعلومة " +msgid "Respond to the FOI request '{{request}}' made by {{user}}" +msgstr "" msgid "Respond using the web" msgstr "الرد عن طريق الشبكة العنكبوتية " @@ -2334,9 +2343,6 @@ msgstr "" msgid "Special note for this authority!" msgstr "ملاحظة خاصة بهذه السلطة." -msgid "Start now »" -msgstr "ابدأ الان »" - msgid "Start your own blog" msgstr "اطلق مدونتك الخاصة" @@ -2946,6 +2952,9 @@ msgstr "غير قادر على ارسال رد ل {{username}}" msgid "Unable to send follow up message to {{username}}" msgstr "غير قادر على بعث رسالة متابعة ل {{username}}" +msgid "Unclassified or hidden requests are not counted." +msgstr "" + msgid "Unexpected search result type " msgstr "نوع نتيجة البحث غير متوقع " @@ -3006,9 +3015,6 @@ msgstr "" msgid "User|About me" msgstr "مستخدم|معلومات عني" -msgid "User|Address" -msgstr "" - msgid "User|Admin level" msgstr "مستخدم|مستوى المشرف" @@ -3018,9 +3024,6 @@ msgstr "مستخدم|منع النص" msgid "User|Can make batch requests" msgstr "" -msgid "User|Dob" -msgstr "" - msgid "User|Email" msgstr "المستخدم|البريد الالكتروني" @@ -3075,7 +3078,7 @@ msgstr "رؤية البريد الالكتروني لحرية النفاذ ال msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "الاطلاع على طلبات حرية النفاذ الى المعلومة المقدمة من قبل {{user_name}}:" -msgid "View and search requests" +msgid "Browse and search requests" msgstr "عرض والبحث عن الطلبات" msgid "View authorities" @@ -3084,7 +3087,7 @@ msgstr "عرض السلطات" msgid "View email" msgstr "عرض البريد الالكتروني" -msgid "View requests" +msgid "Browse Requests" msgstr "عرض الطلبات" msgid "Waiting clarification." diff --git a/locale/bg/app.po b/locale/bg/app.po index 17a1898b8..76e57f5b3 100644 --- a/locale/bg/app.po +++ b/locale/bg/app.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-15 12:46+0100\n" -"PO-Revision-Date: 2014-05-19 10:59+0000\n" -"Last-Translator: Valentin Laskov <laskov@festa.bg>\n" +"POT-Creation-Date: 2014-08-21 13:43+0000\n" +"PO-Revision-Date: 2014-08-21 13:44+0000\n" +"Last-Translator: Gareth Rees <gareth@mysociety.org>\n" "Language-Team: Bulgarian (http://www.transifex.com/projects/p/alaveteli/language/bg/)\n" "Language: bg\n" "MIME-Version: 1.0\n" @@ -94,9 +94,6 @@ msgstr " Вие вече получавате имейли с новостите msgid " You will also be emailed updates about the request." msgstr " Вие също ще получавате имейли с новостите относно заявлението." -msgid " made by " -msgstr " направен от " - msgid " when you send this message." msgstr " когато изпратите това съобщение." @@ -286,6 +283,9 @@ msgstr "Да <strong>благодарите</strong> на публичния о msgid "<strong>did not have</strong> the information requested." msgstr "<strong>не са имали</strong> исканата информация." +msgid "?" +msgstr "" + msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "<a href=\"{{request_url}}\">Пояснително съобщение</a> към <em>{{request_title}}</em> беше изпратено до {{public_body_name}} от {{info_request_user}} на {{date}}." @@ -541,9 +541,6 @@ msgstr "Промяна на паролата Ви" msgid "Change your password on {{site_name}}" msgstr "Промяна на паролата Ви в {{site_name}}" -msgid "Change your password {{site_name}}" -msgstr "Промяна на паролата Ви {{site_name}}" - msgid "Charity registration" msgstr "Регистрация на фондацията" @@ -718,6 +715,9 @@ msgstr "" msgid "Disclosure log URL" msgstr "" +msgid "Do not fill in this field" +msgstr "" + msgid "Don't have a superuser account yet?" msgstr "Все още нямате акаунт на суперпотребител?" @@ -1377,6 +1377,9 @@ msgstr "Създаване на ново<br/>\\n <strong>Заявление <sp msgid "Make a request" msgstr "Създаване на заявление" +msgid "Make a request »" +msgstr "" + msgid "Make a request to these authorities" msgstr "Направете заявление до тези органи" @@ -1878,6 +1881,9 @@ msgstr "" msgid "Public Bodies" msgstr "Публични органи" +msgid "Public Body" +msgstr "" + msgid "Public Body Statistics" msgstr "Статистика за Публичен Огран" @@ -1890,6 +1896,9 @@ msgstr "Публични органи - {{description}}" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "Публични органи от {{start_count}} до {{end_count}}, от общо{{total_count}}" +msgid "Public authority statistics" +msgstr "" + msgid "Public authority – {{name}}" msgstr "Публичен орган – {{name}}" @@ -2115,8 +2124,8 @@ msgstr "Отговорете с имейл" msgid "Respond to request" msgstr "Отговаряне на заявлението" -msgid "Respond to the FOI request" -msgstr "Отговор на заявлението за ДдИ" +msgid "Respond to the FOI request '{{request}}' made by {{user}}" +msgstr "" msgid "Respond using the web" msgstr "Отговаряне чрез уеб сайта" @@ -2320,9 +2329,6 @@ msgstr "" msgid "Special note for this authority!" msgstr "Специална забележка за този орган!" -msgid "Start now »" -msgstr "Начало »" - msgid "Start your own blog" msgstr "Започнете собствен блог" @@ -2920,6 +2926,9 @@ msgstr "Не е възможно изпращане на отговор до {{u msgid "Unable to send follow up message to {{username}}" msgstr "Не бе възможно да се изпрати пояснително съобщение до {{username}}" +msgid "Unclassified or hidden requests are not counted." +msgstr "" + msgid "Unexpected search result type " msgstr "Неочакван тип резултат на търсене " @@ -2980,9 +2989,6 @@ msgstr "Нормално потребителите не могат да пра msgid "User|About me" msgstr "" -msgid "User|Address" -msgstr "" - msgid "User|Admin level" msgstr "" @@ -2992,9 +2998,6 @@ msgstr "" msgid "User|Can make batch requests" msgstr "" -msgid "User|Dob" -msgstr "" - msgid "User|Email" msgstr "" @@ -3049,7 +3052,7 @@ msgstr "Показване ДдИ имейл адрес за {{public_body_name} msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "Преглед на Заявленията за Достъп до информация, направени от {{user_name}}:" -msgid "View and search requests" +msgid "Browse and search requests" msgstr "Преглед и търсене на заявления" msgid "View authorities" @@ -3058,7 +3061,7 @@ msgstr "Преглед на органите" msgid "View email" msgstr "Преглед на имейл" -msgid "View requests" +msgid "Browse Requests" msgstr "Преглед на заявления" msgid "Waiting clarification." diff --git a/locale/bs/app.po b/locale/bs/app.po index 710d8dc87..d802bd86b 100644 --- a/locale/bs/app.po +++ b/locale/bs/app.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-15 12:46+0100\n" -"PO-Revision-Date: 2014-05-15 11:56+0000\n" -"Last-Translator: louisecrow <louise@mysociety.org>\n" +"POT-Creation-Date: 2014-08-21 13:43+0000\n" +"PO-Revision-Date: 2014-08-21 13:44+0000\n" +"Last-Translator: Gareth Rees <gareth@mysociety.org>\n" "Language-Team: Bosnian (http://www.transifex.com/projects/p/alaveteli/language/bs/)\n" "Language: bs\n" "MIME-Version: 1.0\n" @@ -105,9 +105,6 @@ msgstr " Ažuriranja zahtjeva već su Vam poslana putem e-maila." msgid " You will also be emailed updates about the request." msgstr " Ažuriranja zahtjeva će Vam takođe biti poslana putem e-maila." -msgid " made by " -msgstr " načinjeno od strane " - msgid " when you send this message." msgstr " kada pošaljete ovu poruku." @@ -319,6 +316,9 @@ msgstr "" msgid "<strong>did not have</strong> the information requested." msgstr "<strong>nije sadržavao</strong> traženu informaciju." +msgid "?" +msgstr "" + msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "" @@ -584,9 +584,6 @@ msgstr "Promijeniti Vaš password" msgid "Change your password on {{site_name}}" msgstr "Promijeniti password na {{site_name}}" -msgid "Change your password {{site_name}}" -msgstr "Promjenite Vaš password {{site_name}}" - msgid "Charity registration" msgstr "Registracija nevladine organizacije" @@ -763,6 +760,9 @@ msgstr "" msgid "Disclosure log URL" msgstr "" +msgid "Do not fill in this field" +msgstr "" + msgid "Don't have a superuser account yet?" msgstr "" @@ -1471,6 +1471,9 @@ msgstr "" msgid "Make a request" msgstr "Podnesi zahtjev" +msgid "Make a request »" +msgstr "" + msgid "Make a request to these authorities" msgstr "" @@ -1983,6 +1986,9 @@ msgstr "Slika na profilu|Skica" msgid "Public Bodies" msgstr "" +msgid "Public Body" +msgstr "" + msgid "Public Body Statistics" msgstr "" @@ -1995,6 +2001,9 @@ msgstr "Javne ustanove - {{description}}" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "" +msgid "Public authority statistics" +msgstr "" + msgid "Public authority – {{name}}" msgstr "" @@ -2222,8 +2231,8 @@ msgstr "Odgovoriti e-mailom" msgid "Respond to request" msgstr "Odgovoriti na zahtjev" -msgid "Respond to the FOI request" -msgstr "Odgovoriti na Zahtjev za slobodan pristup informacijama" +msgid "Respond to the FOI request '{{request}}' made by {{user}}" +msgstr "" msgid "Respond using the web" msgstr "Odgovoriti preko web-a" @@ -2435,9 +2444,6 @@ msgstr "" msgid "Special note for this authority!" msgstr "Posebna napomena za ovu ustanovu!" -msgid "Start now »" -msgstr "Počni sada »" - msgid "Start your own blog" msgstr "Započnite Vaš blog" @@ -3069,6 +3075,9 @@ msgstr "Ne možemo poslati poruku za {{username}}" msgid "Unable to send follow up message to {{username}}" msgstr "Ne možemo poslati popratnu pokuku za {{username}}" +msgid "Unclassified or hidden requests are not counted." +msgstr "" + msgid "Unexpected search result type " msgstr "" @@ -3134,9 +3143,6 @@ msgstr "" msgid "User|About me" msgstr "Korisnik|O meni" -msgid "User|Address" -msgstr "" - msgid "User|Admin level" msgstr "Korisnik|Administratorski nivo" @@ -3146,9 +3152,6 @@ msgstr "Korisnik|tekst isključenja" msgid "User|Can make batch requests" msgstr "" -msgid "User|Dob" -msgstr "" - msgid "User|Email" msgstr "Korisnik|E-mail" @@ -3203,7 +3206,7 @@ msgstr "Pogledati ZOSPI e-mail adrese za {{public_body_name}}" msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "Pegledati Zahjeve za slobodan pristup informacijama napravljene od strane {{user_name}}:" -msgid "View and search requests" +msgid "Browse and search requests" msgstr "Pregledaj i pretraži zahtjeve" msgid "View authorities" @@ -3212,7 +3215,7 @@ msgstr "Vidjeti ustanove" msgid "View email" msgstr "Pogledati e-mail" -msgid "View requests" +msgid "Browse Requests" msgstr "Vidjeti zahtjeve" msgid "Waiting clarification." diff --git a/locale/ca/app.po b/locale/ca/app.po index ae7cbc6d8..e66874958 100644 --- a/locale/ca/app.po +++ b/locale/ca/app.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-15 12:46+0100\n" -"PO-Revision-Date: 2014-05-15 11:56+0000\n" -"Last-Translator: louisecrow <louise@mysociety.org>\n" +"POT-Creation-Date: 2014-08-21 13:43+0000\n" +"PO-Revision-Date: 2014-08-21 13:44+0000\n" +"Last-Translator: Gareth Rees <gareth@mysociety.org>\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/alaveteli/language/ca/)\n" "Language: ca\n" "MIME-Version: 1.0\n" @@ -48,7 +48,7 @@ msgstr "" msgid " <strong>Note:</strong>\\n We will send you an email. Follow the instructions in it to change\\n your password." msgstr "" -" <strong>Nota::</strong>\n" +" <strong>Nota:</strong>\n" " T'enviarem un correu electrònic. Segueix les instruccions per canviar la teva contrasenya." msgid " <strong>Privacy note:</strong> Your email address will be given to" @@ -101,14 +101,11 @@ msgstr " Ja està rebent actualitzacions per correu sobre la sol·licitud." msgid " You will also be emailed updates about the request." msgstr " Rebrà actualitzacions per correu sobre aquesta sol·licitud." -msgid " made by " -msgstr " feta per " - msgid " when you send this message." msgstr " quan enviares aquest missatge." msgid "'Crime statistics by ward level for Wales'" -msgstr "'Estadístiques de crims per regió a Espanya'" +msgstr "'Estadístiques de crims per comarca a Catalunya'" msgid "'Pollution levels over time for the River Tyne'" msgstr "'Nivells històrics de contaminació en el riu Ebre'" @@ -126,13 +123,13 @@ msgid "(hide)" msgstr "" msgid "(or <a href=\"{{url}}\">sign in</a>)" -msgstr "" +msgstr "(o <a href=\"{{url}}\">inicia sessió</a>)" msgid "(show)" msgstr "" msgid "*unknown*" -msgstr "" +msgstr "*desconegut*" msgid ",\\n\\n\\n\\nYours,\\n\\n{{user_name}}" msgstr "" @@ -331,6 +328,9 @@ msgstr "<strong>Dóna les gràcies</strong> a l'organisme públic o " msgid "<strong>did not have</strong> the information requested." msgstr "<strong>no tenia</strong> la informació sol·licitada." +msgid "?" +msgstr "" + msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "" @@ -426,7 +426,7 @@ msgid "All the options below can use <strong>variety</strong> or <strong>latest_ msgstr "All the options below can use <strong>variety</strong> or <strong>latest_variety</strong> before the colon. For example, <strong>variety:sent</strong> will match requests which have <em>ever</em> been sent; <strong>latest_variety:sent</strong> will match only requests that are <em>currently</em> marked as sent." msgid "Also called {{other_name}}." -msgstr "También conocido como {{other_name}}." +msgstr "També conegut com a {{other_name}}." msgid "Also send me alerts by email" msgstr "" @@ -455,33 +455,33 @@ msgid "Annotation added to request" msgstr "Comentario añadido a la solicitud" msgid "Annotations" -msgstr "Comentarios" +msgstr "Comentaris" msgid "Annotations are so anyone, including you, can help the requester with their request. For example:" -msgstr "Los comentarios sirven para que cualquiera, incluído tú, pueda ayudar al creador de la solicitud. Por ejemplo:" +msgstr "Els comentaris serveixen per tal que qualsevol, inclòs tu, pugui ajudar al creador de la sol·licitud. Per exemple:" msgid "Annotations will be posted publicly here, and are\\n <strong>not</strong> sent to {{public_body_name}}." msgstr "" -"Los comentarios se muestran públicamente aquí, y \n" -" <strong>no</strong> se envían a {{public_body_name}}." +"Els comentaris es mostren públicament aquí, i\n" +" <strong>no</strong> s'envien a {{public_body_name}}." msgid "Anonymous user" msgstr "" msgid "Anyone:" -msgstr "Cualquiera:" +msgstr "Qualsevol:" msgid "Applies to" msgstr "" msgid "Are we missing a public authority?" -msgstr "" +msgstr "Hi falta algun organisme?" msgid "Are you the owner of any commercial copyright on this page?" msgstr "Posseeix el copyright d'alguna informació d'aquesta pàgina?" msgid "Ask for <strong>specific</strong> documents or information, this site is not suitable for general enquiries." -msgstr "Pide documentos o información <strong>específica</strong>, esta web no está pensada para resolver dudas generales." +msgstr "Demana documents o informació <strong>específica</strong>, aquesta web no està pensada per resoldre dubtes generals." msgid "Ask us to add an authority" msgstr "" @@ -510,19 +510,19 @@ msgid "Authority:" msgstr "" msgid "Awaiting classification." -msgstr "Esperando clasificación." +msgstr "Esperant classificació." msgid "Awaiting internal review." msgstr "Esperando revisión interna." msgid "Awaiting response." -msgstr "Esperando respuesta." +msgstr "Esperant resposta." msgid "Batch created by {{info_request_user}} on {{date}}." msgstr "" msgid "Beginning with" -msgstr "Comenzando por" +msgstr "Començant per" msgid "Browse <a href='{{url}}'>other requests</a> for examples of how to word your request." msgstr "Consulta <a href='{{url}}'>otras solicitudes</a> para ver cómo puede redactar tu solicitud." @@ -591,13 +591,10 @@ msgid "Change your email address used on {{site_name}}" msgstr "Cambia tu dirección de correo en {{site_name}}" msgid "Change your password" -msgstr "Cambia tu contraseña" +msgstr "Canvia la teva contrassenya" msgid "Change your password on {{site_name}}" -msgstr "Cambia tu contraseña en {{site_name}}" - -msgid "Change your password {{site_name}}" -msgstr "Cambia tu contraseña en {{site_name}}" +msgstr "Canvia la teva contrassenya a {{site_name}}" msgid "Charity registration" msgstr "Registro de la ONG" @@ -606,7 +603,7 @@ msgid "Check for mistakes if you typed or copied the address." msgstr "Busque erratas si ha copiado la dirección." msgid "Check you haven't included any <strong>personal information</strong>." -msgstr "Compruebe que no ha incluído <strong>ninguna información personal</strong>." +msgstr "Comprova que no has inclòs <strong>cap informació personal</strong>." msgid "Choose a reason" msgstr "" @@ -727,22 +724,22 @@ msgstr "" " los factores medioambientales mencionados anteriormente)" msgid "Currently <strong>waiting for a response</strong> from {{public_body_link}}, they must respond promptly and" -msgstr "Actualmente <strong>esperando la respuesta</strong> de {{public_body_link}}, que debe responder pronto y" +msgstr "Actualment <strong>esperant la resposta</strong> de {{public_body_link}}, que ha de respondre aviat i" msgid "Date:" msgstr "Fecha:" msgid "Dear [Authority name]," -msgstr "" +msgstr "Benvolgut [Authority name]," msgid "Dear {{name}}," -msgstr "" +msgstr "Benvolgut {{name}}," msgid "Dear {{public_body_name}}," -msgstr "Estimado {{public_body_name}}," +msgstr "Benvolgut {{public_body_name}}," msgid "Dear {{user_name}}," -msgstr "" +msgstr "Benvolgut {{user_name}}," msgid "Default locale" msgstr "" @@ -754,10 +751,10 @@ msgid "Delayed response to your FOI request - " msgstr "Respuesta retrasada a tu solicitud de acceso a información - " msgid "Delayed." -msgstr "Retrasado." +msgstr "Endarrerit." msgid "Delivery error" -msgstr "Error en la entrega" +msgstr "Error en el lliurament" msgid "Destroy {{name}}" msgstr "" @@ -777,6 +774,9 @@ msgstr "" msgid "Disclosure log URL" msgstr "" +msgid "Do not fill in this field" +msgstr "" + msgid "Don't have a superuser account yet?" msgstr "" @@ -790,7 +790,7 @@ msgid "Done >>" msgstr "" msgid "Download a zip file of all correspondence" -msgstr "Descargar un fichero ZIP con toda la correspondencia" +msgstr "Descarregar un fitxer ZIP amb tota la correspondència" msgid "Download original attachment" msgstr "Descargar ficheros adjuntos" @@ -807,7 +807,7 @@ msgstr "" " explicando por qué no estás satisfecho con su respuesta." msgid "Edit text about you" -msgstr "Edite el texto sobre tí" +msgstr "Edita el text sobre tu" msgid "Edit this request" msgstr "Editar esta solicitud" @@ -822,7 +822,7 @@ msgid "Email doesn't look like a valid address" msgstr "La dirección de correo no parece válida" msgid "Email me future updates to this request" -msgstr "Quiero recibir emails con las actulizaciones de esta solicitud" +msgstr "Vull rebre emails amb les actualitzacions d'aquesta sol·licitud" msgid "Email:" msgstr "" @@ -853,30 +853,30 @@ msgstr "" msgid "Everything that you enter on this page, including <strong>your name</strong>,\\n will be <strong>displayed publicly</strong> on\\n this website forever (<a href=\"{{url}}\">why?</a>)." msgstr "" -"Todo lo que escribas en esta página, incluyendo <strong>tu nombre</strong>, \n" -" estará <strong>disponible públicamente</strong> en\n" -" está web para siempre (<a href=\"{{url}}\">¿por qué?</a>)." +"Tot el que escriguis en aquesta pàgina, incloent <strong>el teu nom</strong>, \n" +" estarà <strong>disponible públicament</strong> en\n" +" aquesta web per sempre (<a href=\"{{url}}\">per què?</a>)." msgid "Everything that you enter on this page\\n will be <strong>displayed publicly</strong> on\\n this website forever (<a href=\"{{url}}\">why?</a>)." msgstr "" -"Todo lo que escriba en esta página \n" -" estará <strong>disponible públicamente</strong> en\n" -" está web para siempre (<a href=\"{{url}}\">¿por qué?</a>)." +"Tot el que escriguis en aquesta pàgina, incloent <strong>el teu nom</strong>, \n" +" estarà <strong>disponible públicament</strong> en\n" +" aquesta web per sempre (<a href=\"{{url}}\">per què?</a>)." msgid "FOI" msgstr "FOI" msgid "FOI email address for {{public_body}}" -msgstr "Dirección de correo para {{public_body}}" +msgstr "Adreça de correu de {{public_body}}" msgid "FOI request – {{title}}" msgstr "" msgid "FOI requests" -msgstr "Solicitudes de información" +msgstr "Sol·licituds d'informació" msgid "FOI requests by '{{user_name}}'" -msgstr "Solicitudes de información por '{{user_name}}'" +msgstr "Sol·licituds d'informació de '{{user_name}}'" msgid "FOI requests {{start_count}} to {{end_count}} of {{total_count}}" msgstr "Solicitudes {{start_count}} a {{end_count}} de {{total_count}}" @@ -924,7 +924,7 @@ msgid "FoiAttachment|Within rfc822 subject" msgstr "FoiAttachment|Within rfc822 subject" msgid "Follow" -msgstr "" +msgstr "Segueix" msgid "Follow all new requests" msgstr "" @@ -936,13 +936,13 @@ msgid "Follow requests to {{public_body_name}}" msgstr "" msgid "Follow these requests" -msgstr "Seguir estas solicitudes" +msgstr "Segueix aquestes sol·licituds" msgid "Follow things matching this search" msgstr "" msgid "Follow this authority" -msgstr "Seguir a este organismo" +msgstr "Seguir aquest organisme" msgid "Follow this link to see the request:" msgstr "Siga este enlace para ver la solicitud:" @@ -954,7 +954,7 @@ msgid "Follow this person" msgstr "" msgid "Follow this request" -msgstr "Seguir esta solicitud" +msgstr "Segueix aquesta sol·licitud" #. "Follow up" in this context means a further #. message sent by the requester to the authority after @@ -990,15 +990,15 @@ msgid "For an unknown reason, it is not possible to make a request to this autho msgstr "No es posible hacer una solicitud a este organismo, por motivos desconocidos." msgid "Forgotten your password?" -msgstr "¿Has olvidado tu contraseña?" +msgstr "Has oblidat la teva contrassenya?" msgid "Found {{count}} public authority {{description}}" msgid_plural "Found {{count}} public authorities {{description}}" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Trobat {{count}} organismo {{description}}" +msgstr[1] "Trobats {{count}} organismes {{description}}" msgid "Freedom of Information" -msgstr "Acceso a la Información" +msgstr "accés a la informació" msgid "Freedom of Information Act" msgstr "Ley de Acceso a la Información" @@ -1025,7 +1025,7 @@ msgid "Freedom of Information requests made using this site" msgstr "Solicitudes de acceso a información realizadas por esta web" msgid "Freedom of information requests to" -msgstr "Solicitudes de información a" +msgstr "Sol·licituds d'informació a" msgid "From" msgstr "" @@ -1104,10 +1104,10 @@ msgid "Home" msgstr "Inicio" msgid "Home page" -msgstr "" +msgstr "Lloc web" msgid "Home page of authority" -msgstr "Sitio web del organismo" +msgstr "Lloc web de l'organisme" msgid "However, you have the right to request environmental\\n information under a different law" msgstr "" @@ -1168,7 +1168,7 @@ msgid "Id" msgstr "" msgid "If the address is wrong, or you know a better address, please <a href=\"{{url}}\">contact us</a>." -msgstr "Si la dirección es incorrecta, o conoce una más actualizada, por favor <a href=\"{{url}}\">contáctenos</a>." +msgstr "Si l'adreça és incorrecta, o en coneix una de més actualitzada, sisplau <a href=\"{{url}}\">contacta'ns</a>." msgid "If the error was a delivery failure, and you can find an up to date FOI email address for the authority, please tell us using the form below." msgstr "" @@ -1196,8 +1196,8 @@ msgstr "Si la solicitud es tuya, puedes <a href=\"{{url}}\">abrir una sesión</a msgid "If you are thinking of using a pseudonym,\\n please <a href=\"{{url}}\">read this first</a>." msgstr "" -"Si está pensando en utilizar un pseudónimo,\n" -" por favor <a href=\"{{url}}\">lea esto primero</a>." +"Si estàs pensant en utilitzar un pseudònim,\n" +" sisplau <a href=\"{{url}}\">llegeix això abans</a>." msgid "If you are {{user_link}}, please" msgstr "Si es {{user_link}}, por favor" @@ -1231,9 +1231,7 @@ msgid "If you reply to this message it will go directly to {{user_name}}, who wi msgstr "" msgid "If you use web-based email or have \"junk mail\" filters, also check your\\nbulk/spam mail folders. Sometimes, our messages are marked that way." -msgstr "" -"Si usas correo web o tiene filtros \"anti spam\", por favor comprueba\n" -"tus carpetas de spam. A veces, nuestros mensajes se marcan así por error." +msgstr "Si utilitzes correu web o tens filtres \"anti spam\", si us plau comprova les teves carpetes d'spam. A vegades, els nostres missatges es marquen així per error." msgid "If you would like us to lift this ban, then you may politely\\n<a href=\"/help/contact\">contact us</a> giving reasons.\\n" msgstr "" @@ -1366,7 +1364,7 @@ msgid "InfoRequest|Url title" msgstr "InfoRequest|Url title" msgid "Information not held." -msgstr "Información no disponible." +msgstr "Informació no disponible." msgid "Information on emissions and discharges (e.g. noise, energy,\\n radiation, waste materials)" msgstr "" @@ -1395,19 +1393,19 @@ msgid "Items sent in last month" msgstr "" msgid "Joined in" -msgstr "Registrado el" +msgstr "Registrat el" msgid "Joined {{site_name}} in" -msgstr "Registrado en {{site_name}} el" +msgstr "Registrat a {{site_name}} el" msgid "Just one more thing" msgstr "" msgid "Keep it <strong>focused</strong>, you'll be more likely to get what you want (<a href=\"{{url}}\">why?</a>)." -msgstr "Sea <strong>específico</strong>, tendrá más probabilidades de conseguir lo que quiere (<a href=\"{{url}}\">¿por qué?</a>)." +msgstr "Sigues <strong>específic</strong>, tindràs més probabilitats d'aconseguir el que vols (<a href=\"{{url}}\">per què?</a>)." msgid "Keywords" -msgstr "Términos" +msgstr "Paraules" msgid "Last authority viewed: " msgstr "Ultimo organismo visitado: " @@ -1425,7 +1423,7 @@ msgid "Link to this" msgstr "Enlace" msgid "List of all authorities (CSV)" -msgstr "Lista de todos los organismos (CSV)" +msgstr "Llista de tots els organismes (CSV)" msgid "Listing FOI requests" msgstr "" @@ -1449,10 +1447,10 @@ msgid "Log into the admin interface" msgstr "" msgid "Long overdue." -msgstr "Muy retrasada." +msgstr "Molt endarrerida." msgid "Made between" -msgstr "Realizadas entre" +msgstr "Realitzades entre" msgid "Mail server log" msgstr "" @@ -1479,7 +1477,7 @@ msgid "Make a new EIR request" msgstr "" msgid "Make a new FOI request" -msgstr "" +msgstr "Fes una nova sol·licitud" msgid "Make a new<br/>\\n <strong>Freedom <span>of</span><br/>\\n Information<br/>\\n request</strong>" msgstr "" @@ -1490,11 +1488,14 @@ msgstr "" msgid "Make a request" msgstr "Enviar solicitud" +msgid "Make a request »" +msgstr "" + msgid "Make a request to these authorities" msgstr "" msgid "Make a request to this authority" -msgstr "" +msgstr "Fes una sol·licitud a aquest organisme" msgid "Make an {{law_used_short}} request" msgstr "" @@ -1506,7 +1507,7 @@ msgid "Make and browse Freedom of Information (FOI) requests" msgstr "Realiza una solicitud de información o mira las ya realizadas" msgid "Make your own request" -msgstr "Hacer mi propia solicitud" +msgstr "Fer la meva pròpia sol·licitud" msgid "Many requests" msgstr "" @@ -1524,25 +1525,25 @@ msgid "Missing contact details for '" msgstr "Faltan datos de contacto para '" msgid "More about this authority" -msgstr "Más información sobre este organismo" +msgstr "Més informació d'aquest organisme" msgid "More requests..." msgstr "" msgid "More similar requests" -msgstr "Más solicitudes similares" +msgstr "Més sol·licituds similars" msgid "More successful requests..." msgstr "Más solicitudes realizadas con éxito..." msgid "My profile" -msgstr "Mi perfil" +msgstr "El meu perfil" msgid "My request has been <strong>refused</strong>" msgstr "Mi solicitud ha sido <strong>rechazada</strong>" msgid "My requests" -msgstr "Mis solicitudes." +msgstr "Les meves sol·licituds" msgid "My wall" msgstr "" @@ -1587,7 +1588,7 @@ msgid "New updates for the request '{{request_title}}'" msgstr "Actualizaciones para la solicitud '{{request_title}}'" msgid "Newest results first" -msgstr "Resultados recientes primero" +msgstr "Resultats recents primer" msgid "Next" msgstr "Siguiente" @@ -1614,7 +1615,7 @@ msgid "None found." msgstr "No se han encontrado resultados." msgid "None made." -msgstr "Ninguno/a." +msgstr "Cap." msgid "Not a valid FOI request" msgstr "" @@ -1629,10 +1630,10 @@ msgid "Notes:" msgstr "" msgid "Now check your email!" -msgstr "¡Ahora comprueba tu correo!" +msgstr "Ara comprova el teu correu!" msgid "Now preview your annotation" -msgstr "Ahora revisa tu comentario" +msgstr "Ara revisa el teu comentari" msgid "Now preview your follow up" msgstr "Ahora revisa tu mensaje" @@ -1662,7 +1663,7 @@ msgid "Old email doesn't look like a valid address" msgstr "La dirección de correo antigua no parece válida" msgid "On this page" -msgstr "En esta página" +msgstr "En aquesta pàgina" msgid "One FOI request found" msgstr "Una solicitud encontrada" @@ -1677,7 +1678,7 @@ msgid "Only put in abbreviations which are really used, otherwise leave blank. S msgstr "" msgid "Only requests made using {{site_name}} are shown." -msgstr "Sólo se muestran las solicitudes realizadas con {{site_name}}." +msgstr "Només es mostren las sol·licituds realitzades emprant {{site_name}}." msgid "Only the authority can reply to this request, and I don't recognise the address this reply was sent from" msgstr "Sólo el organismo puede responder a esta solicitud, y no reconozco la dirección desde la que se mandó esta respuesta" @@ -1725,19 +1726,19 @@ msgid "OutgoingMessage|What doing" msgstr "OutgoingMessage|What doing" msgid "Partially successful." -msgstr "Éxito parcial." +msgstr "Èxit parcial." msgid "Password is not correct" msgstr "La contraseña no es correcta" msgid "Password:" -msgstr "Contraseña:" +msgstr "Contrassenya:" msgid "Password: (again)" -msgstr "Contraseña: (de nuevo)" +msgstr "Contrassenya: (de nou)" msgid "Paste this link into emails, tweets, and anywhere else:" -msgstr "Pegue este enlace en correos, tweets, o cualquier otro sitio:" +msgstr "Enganxa aquest enllaç a correus, piulades, o qualsevol altre lloc:" msgid "People" msgstr "" @@ -1898,10 +1899,10 @@ msgid "Please sign at the bottom with your name, or alter the \"{{signoff}}\" si msgstr "Por favor, firma con tu nombre en la parte inferior, o cambia la firma \"{{signoff}}\"" msgid "Please sign in as " -msgstr "Por favor abre una sesión como " +msgstr "Sisplau inicia sessió como" msgid "Please sign in or make a new account." -msgstr "" +msgstr "Sisplau inicia sessió o dóna d'alta un nou compte." msgid "Please tell us more:" msgstr "" @@ -1934,7 +1935,7 @@ msgid "Possibly related requests:" msgstr "Posibles solicitudes relacionadas:" msgid "Post annotation" -msgstr "Enviar comentario" +msgstr "Envia comentari" msgid "Post redirect" msgstr "" @@ -1982,13 +1983,13 @@ msgid "Preview new {{law_used_short}} request to '{{public_body_name}}" msgstr "" msgid "Preview your annotation" -msgstr "Revisa tu comentario" +msgstr "Revisa el teu comentari" msgid "Preview your message" msgstr "Revisa tu mensaje" msgid "Preview your public request" -msgstr "Revisa tu solicitud pública" +msgstr "Revisa la teva sol·licitud pública" msgid "Profile photo" msgstr "" @@ -2002,21 +2003,27 @@ msgstr "ProfilePhoto|Draft" msgid "Public Bodies" msgstr "" +msgid "Public Body" +msgstr "" + msgid "Public Body Statistics" msgstr "" msgid "Public authorities" -msgstr "Organismos públicos" +msgstr "Organismes públics" msgid "Public authorities - {{description}}" -msgstr "Organismos públicos - {{description}}" +msgstr "Organismes públics - {{description}}" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" -msgstr "Organismos públicos {{start_count}} a {{end_count}} de {{total_count}}" +msgstr "Organismes públics {{start_count}} a {{end_count}} de {{total_count}}" -msgid "Public authority – {{name}}" +msgid "Public authority statistics" msgstr "" +msgid "Public authority – {{name}}" +msgstr "Organismo público - {{name}}" + msgid "Public bodies that most frequently replied with \"Not Held\"" msgstr "" @@ -2141,10 +2148,10 @@ msgid "RSS feed" msgstr "RSS" msgid "RSS feed of updates" -msgstr "Actualizaciones RSS" +msgstr "Actualitzacions RSS" msgid "Re-edit this annotation" -msgstr "Editar este comentario" +msgstr "Edita aquest comentari" msgid "Re-edit this message" msgstr "Editar este mensaje" @@ -2165,9 +2172,7 @@ msgid "Refused." msgstr "Rechazada." msgid "Remember me</label> (keeps you signed in longer;\\n do not use on a public computer) " -msgstr "" -"Recuérdame</label> (mantiene la sesión abierta;\n" -" no lo use en un ordenador público) " +msgstr "Recorda'm</label> (manté la sessió oberta;\\n no ho faci servir en un ordinador públic)" msgid "Report abuse" msgstr "Denuncie abuso" @@ -2203,7 +2208,7 @@ msgid "Request has been removed" msgstr "La solicitud ha sido eliminada" msgid "Request sent to {{public_body_name}} by {{info_request_user}} on {{date}}." -msgstr "Solicitud enviada a {{public_body_name}} por {{info_request_user}} el {{date}}." +msgstr "Sol·licitud enviada a {{public_body_name}} per {{info_request_user}} el {{date}}." msgid "Request to {{public_body_name}} by {{info_request_user}}. Annotated by {{event_comment_user}} on {{date}}." msgstr "Solicitud a {{public_body_name}} por {{info_request_user}}. Comentada por {{event_comment_user}} el {{date}}." @@ -2241,8 +2246,8 @@ msgstr "Contestar por correo" msgid "Respond to request" msgstr "Contestar la solicitud" -msgid "Respond to the FOI request" -msgstr "Contestar la solicitud" +msgid "Respond to the FOI request '{{request}}' made by {{user}}" +msgstr "" msgid "Respond using the web" msgstr "Contestar vía web" @@ -2260,10 +2265,10 @@ msgid "Response to '{{title}}'" msgstr "" msgid "Response to this request is <strong>delayed</strong>." -msgstr "La respuesta a esta solicitud está <strong>retrasada</strong>." +msgstr "La resposta a aquesta sol·licitud està <strong>endarrerida</strong>." msgid "Response to this request is <strong>long overdue</strong>." -msgstr "La respuesta a esta solicitud está <strong>muy retrasada</strong>." +msgstr "La resposta a aquesta sol·licitud està <strong>molt endarrerida</strong>." msgid "Response to your request" msgstr "Respuesta a tu solicitud" @@ -2281,13 +2286,13 @@ msgid "Save" msgstr "Guardar" msgid "Search" -msgstr "Buscar" +msgstr "Cerca" msgid "Search Freedom of Information requests, public authorities and users" msgstr "Buscar solicitudes de información, organismos públicos y usuarios" msgid "Search contributions by this person" -msgstr "Buscar aportaciones de esta persona" +msgstr "Cerca aportacions d'aquesta persona" msgid "Search for the authorities you'd like information from:" msgstr "" @@ -2308,7 +2313,7 @@ msgid "Search queries" msgstr "" msgid "Search results" -msgstr "Resultados de la búsqueda" +msgstr "Resultats de la cerca" msgid "Search the site to find what you were looking for." msgstr "Buscar en esta web para encontrar lo que busca." @@ -2334,10 +2339,10 @@ msgid "Select the authority to write to" msgstr "Elija el organismo al que escribir" msgid "Send a followup" -msgstr "Mandar una respuesta" +msgstr "Enviar una resposta" msgid "Send a message to " -msgstr "Enviar un mensaje a " +msgstr "Envia un missatge a " msgid "Send a public follow up message to {{person_or_body}}" msgstr "Responder públicamente a {{person_or_body}}" @@ -2349,10 +2354,10 @@ msgid "Send follow up to '{{title}}'" msgstr "" msgid "Send message" -msgstr "Enviar un mensaje" +msgstr "Envia el missatge" msgid "Send message to " -msgstr "Enviar un mensaje a " +msgstr "Envia un missatge a " msgid "Send request" msgstr "Enviar solicitud" @@ -2372,34 +2377,34 @@ msgid "Short name is already taken" msgstr "Nombre de usuario ya en uso" msgid "Show most relevant results first" -msgstr "Muestra resultados más relevantes primero" +msgstr "Mostra resultats més rellevants primer" msgid "Show only..." -msgstr "Mostrar sólo..." +msgstr "Mostrar només..." msgid "Showing" -msgstr "Mostrando" +msgstr "Mostrant" msgid "Sign in" -msgstr "Abrir sesión" +msgstr "Inicia sessió" msgid "Sign in as the emergency user" msgstr "" msgid "Sign in or make a new account" -msgstr "Abrir sesión o crear nueva cuenta" +msgstr "Inicia sessió o crea un nou compte" msgid "Sign in or sign up" msgstr "Inicia sessió / registra't" msgid "Sign out" -msgstr "Cerrar sesión" +msgstr "Tancar sessió" msgid "Sign up" -msgstr "Registrarse" +msgstr "Registra't" msgid "Similar requests" -msgstr "Solicitudes similares" +msgstr "Sol·licituds similars" msgid "Simple search" msgstr "Búsqueda básica" @@ -2455,9 +2460,6 @@ msgstr "" msgid "Special note for this authority!" msgstr "¡Notas especiales sobre este organismo!" -msgid "Start now »" -msgstr "Comience ahora »" - msgid "Start your own blog" msgstr "Crea tu propio blog" @@ -2498,7 +2500,7 @@ msgid "Suggest how the requester can find the <strong>rest of the information</s msgstr "Sugerir al creador de la solicitud cómo puede encontrar el <strong>resto de la información</strong>." msgid "Summary:" -msgstr "Resumen:" +msgstr "Resum:" msgid "Table of statuses" msgstr "Tabla de estados" @@ -2634,13 +2636,13 @@ msgid "The request is <strong>waiting for clarification</strong>." msgstr "La solicitud está <strong>esperando aclaración</strong>." msgid "The request was <strong>partially successful</strong>." -msgstr "La solicitud fue <strong>parcialmente exitosa</strong>." +msgstr "La sol·licitud ha tingut un resultat <strong>parcialment exitós</strong>." msgid "The request was <strong>refused</strong> by" msgstr "La solicitud fue <strong>rechazada</strong> por" msgid "The request was <strong>successful</strong>." -msgstr "La solicitud fue <strong>exitosa</strong>." +msgstr "La sol·licitud ha estat <strong>exitosa</strong>." msgid "The request was refused by the public authority" msgstr "La solicitud ha sido rechazada por el organismo" @@ -2662,9 +2664,8 @@ msgstr "" msgid "The response to your request is <strong>long overdue</strong>. You can say that, by\\n law, under all circumstances, the authority should have responded\\n by now" msgstr "" -"La respuesta a tu solicitud ha sido <strong>muy retrasada</strong>.\n" -" Por ley, bajo cualquier circunstancia, el organismo ya debería\n" -" haber respondido" +"La resposta a aquesta sol·licitud està <strong>molt endarrerida</strong>.\n" +" Per llei, sota qualsevol circumstància, el organismo ja hauria d'haver respòs" msgid "The search index is currently offline, so we can't show the Freedom of Information requests that have been made to this authority." msgstr "El motor de búsqueda no está accesible en estos momentos: no podemos mostrar las solicitudes de información realizadas a este organismo." @@ -2768,7 +2769,7 @@ msgstr[0] "Hay {{count}} persona siguiendo esta solicitud." msgstr[1] "Hay {{count}} personas siguiendo esta solicitud." msgid "There was a <strong>delivery error</strong> or similar, which needs fixing by the {{site_name}} team." -msgstr "Se ha producido un <strong>error en la entrega</strong> o similar, y necesita ser arreglado por el equipo de {{site_name}}." +msgstr "S'ha produït un <strong>error en el lliurament</strong> o quelcom similar, i necessita ser arreglat per l'equip de {{site_name}}." msgid "There was an error with the words you entered, please try again." msgstr "Ha habido un error con las palabras introducidas, por favor pruebe otra vez." @@ -2803,7 +2804,7 @@ msgstr "" " como requiere la ley" msgid "Things to do with this request" -msgstr "Cosas que hacer con esta solicitud" +msgstr "Coses per fer amb aquesta sol·licitud" msgid "Things you're following" msgstr "" @@ -2867,17 +2868,17 @@ msgid "This person has made no Freedom of Information requests using this site." msgstr "Esta persona no ha realizado solicitudes de información usando esta web." msgid "This person's annotations" -msgstr "Tus comentarios" +msgstr "Comentaris" msgid "This person's {{count}} Freedom of Information request" msgid_plural "This person's {{count}} Freedom of Information requests" -msgstr[0] "Tu {{count}} solicitud de información" -msgstr[1] "Tus {{count}} solicitudes de información" +msgstr[0] "{{count}} sol·licitud d'informació" +msgstr[1] "{{count}} sol·licituds d'informació" msgid "This person's {{count}} annotation" msgid_plural "This person's {{count}} annotations" -msgstr[0] "Tu {{count}} comentario" -msgstr[1] "Tus {{count}} comentarios" +msgstr[0] "{{count}} comentari" +msgstr[1] "{{count}} comentaris" msgid "This request <strong>requires administrator attention</strong>" msgstr "Esta solicitud <strong>requiere la intervención de un administrador</strong>" @@ -2886,7 +2887,7 @@ msgid "This request has already been reported for administrator attention" msgstr "" msgid "This request has an <strong>unknown status</strong>." -msgstr "Esta solicitud tiene un <strong>estado desconocido</strong>." +msgstr "Aquesta sol·licitud té un <strong>estat desconegut</strong>." msgid "This request has been <strong>hidden</strong> from the site, because an administrator considers it not to be an FOI request" msgstr "" @@ -2981,7 +2982,7 @@ msgid "To follow new requests" msgstr "" msgid "To follow requests and responses matching your search" -msgstr "Para seguir solicitudes y respuestas que encajen con tu búsqueda" +msgstr "Per seguir sol·licituds i respostes que encaixin amb la teva cerca" msgid "To follow requests by '{{user_name}}'" msgstr "" @@ -3010,7 +3011,7 @@ msgid "To play the request categorisation game" msgstr "Jugar al juego de recategorización de solicitudes" msgid "To post your annotation" -msgstr "Añadir tu comentario" +msgstr "Envia comentari" msgid "To reply to " msgstr "Contestar a " @@ -3037,16 +3038,16 @@ msgid "To use the advanced search, combine phrases and labels as described in th msgstr "Para usar la búsqueda avanzada, combine frases y etiquetas como se describe en las instrucciones a continuación." msgid "To view the email address that we use to send FOI requests to {{public_body_name}}, please enter these words." -msgstr "Para ver la dirección de correo que usamos para mandar solicitudes a {{public_body_name}}, por favor introduzca estas palabras." +msgstr "Per veure l'adreça de correu que utilitzem per enviar sol·licituds a {{public_body_name}}, sisplau introdueix aquestes paraules." msgid "To view the response, click on the link below." msgstr "Para ver la respuesta, use el siguiente enlace." msgid "To {{public_body_link_absolute}}" -msgstr "Para {{public_body_link_absolute}}" +msgstr "Per a {{public_body_link_absolute}}" msgid "To:" -msgstr "Para:" +msgstr "Per a:" msgid "Today" msgstr "Hoy" @@ -3061,10 +3062,10 @@ msgid "Track thing" msgstr "" msgid "Track this person" -msgstr "Seguir a esta persona" +msgstr "Segueix aquesta persona" msgid "Track this search" -msgstr "Seguir esta búsqueda" +msgstr "Segueix aquesta cerca" msgid "TrackThing|Track medium" msgstr "TrackThing|Track medium" @@ -3079,7 +3080,7 @@ msgid "Turn off email alerts" msgstr "" msgid "Tweet this request" -msgstr "Tuitear esta solicitud" +msgstr "Piular aquesta sol·licitud" msgid "Type <strong><code>01/01/2008..14/01/2008</code></strong> to only show things that happened in the first two weeks of January." msgstr "Introduce <code><strong>01/01/2008..14/01/2008</strong></code> para mostrar sólo las cosas que sucedieron en las dos primeras semanas de enero." @@ -3099,6 +3100,9 @@ msgstr "No se pudo enviar la respuesta a {{username}}" msgid "Unable to send follow up message to {{username}}" msgstr "No se pudo enviar la respuesta a {{username}}" +msgid "Unclassified or hidden requests are not counted." +msgstr "" + msgid "Unexpected search result type " msgstr "Se encontró un tipo de resultado inesperado " @@ -3115,7 +3119,7 @@ msgid "Unfortunately, we do not have a working {{info_request_law_used_full}}\\n msgstr "Desgraciadamente, no tenemos una dirección de correo válida para" msgid "Unknown" -msgstr "Desconocido" +msgstr "Desconegut" msgid "Unsubscribe" msgstr "" @@ -3130,10 +3134,10 @@ msgid "Update the address:" msgstr "" msgid "Update the status of this request" -msgstr "Actualizar el estado de esta solicitud" +msgstr "Actualitzar l'estat d'aquesta sol·licitud" msgid "Update the status of your request to " -msgstr "Actualizar el estado de la solicitud a " +msgstr "Actualitzar l'estat d'aquesta sol·licitud a " msgid "Upload FOI response" msgstr "" @@ -3162,9 +3166,6 @@ msgstr "" msgid "User|About me" msgstr "User|About me" -msgid "User|Address" -msgstr "" - msgid "User|Admin level" msgstr "User|Admin level" @@ -3174,9 +3175,6 @@ msgstr "User|Ban text" msgid "User|Can make batch requests" msgstr "" -msgid "User|Dob" -msgstr "" - msgid "User|Email" msgstr "User|Email" @@ -3220,27 +3218,27 @@ msgid "Vexatious" msgstr "" msgid "View FOI email address" -msgstr "Ver dirección de correo" +msgstr "Veure l'adreça de correu" msgid "View FOI email address for '{{public_body_name}}'" -msgstr "Ver dirección de correo para '{{public_body_name}}'" +msgstr "Veure l'adreça de correu de '{{public_body_name}}'" msgid "View FOI email address for {{public_body_name}}" -msgstr "Ver dirección de correo para '{{public_body_name}}'" +msgstr "Veure l'adreça de correu de '{{public_body_name}}'" msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "Ver solicitudes de acceso a información hechas por {{user_name}}:" -msgid "View and search requests" +msgid "Browse and search requests" msgstr "Ver y buscar solicitudes" msgid "View authorities" msgstr "Ver organismos públicos" msgid "View email" -msgstr "Ver correo" +msgstr "Veure el correu" -msgid "View requests" +msgid "Browse Requests" msgstr "Ver solicitudes" msgid "Waiting clarification." @@ -3272,15 +3270,11 @@ msgstr "No tenemos una dirección de correo válida para este {{public_body_name msgid "We don't know whether the most recent response to this request contains\\n information or not\\n –\\n\tif you are {{user_link}} please <a href=\"{{url}}\">sign in</a> and let everyone know." msgstr "" -"No sabemos si la última respuesta a esta solicitud contiene\n" -" información o no\n" -" –\n" -"\tsi es {{user_link}} por favor <a href=\"{{url}}\">abra una sesión</a> y háganoslo saber." +"No sabem si l'última resposta a aquesta sol·licitud conté informació o no –\n" +"\tsi ets {{user_link}} sisplau <a href=\"{{url}}\">inicia la sessió</a> i fes-nos-ho saber." msgid "We will not reveal your email address to anybody unless you or\\n the law tell us to (<a href=\"{{url}}\">details</a>). " -msgstr "" -"No revelaremos tu dirección de correo a nadie salvo que tú nos lo digas\n" -" o la ley nos obligue (<a href=\"{{url}}\">más información</a>). " +msgstr "No compartirem la teva adreça de correu amb ningú, excepte que ens ho diguis\\n o la llei ens hi obligui (<a href=\"{{url}}\">més informació</a>). " msgid "We will not reveal your email address to anybody unless you\\nor the law tell us to." msgstr "" @@ -3309,7 +3303,7 @@ msgstr "" "de continuar." msgid "We've sent you an email, click the link in it, then you can change your password." -msgstr "Te hemos enviado un correo, sigue el enlace incluído en él, y podrás cambiar tu contraseña." +msgstr "Te hem enviat un correu, segueix l'enllaç inclòs en ell, i podràs canviar la teva contrassenya." msgid "What are you doing?" msgstr "¿Qué está haciendo?" @@ -3364,7 +3358,7 @@ msgid "Write your FOI follow up message to " msgstr "Escribe tu respuesta a " msgid "Write your request in <strong>simple, precise language</strong>." -msgstr "Escribe tu solicitud en un <strong>lenguaje sencillo y claro</strong>." +msgstr "Escriu la teva sol·licitud en un <strong>llenguatge senzill i clar</strong>." msgid "You" msgstr "Tú" @@ -3571,7 +3565,7 @@ msgid "You're in. <a href=\"#\" id=\"send-request\">Continue sending your reques msgstr "" msgid "You're long overdue a response to your FOI request - " -msgstr "La respuesta a tu solicitud de información está muy retrasada - " +msgstr "La resposta a la teva sol·licitud està <strong>molt endarrerida</strong> - " msgid "You're not following anything." msgstr "" @@ -3581,11 +3575,11 @@ msgstr "Has borrado la foto de tu perfil" msgid "Your <strong>name will appear publicly</strong>\\n (<a href=\"{{why_url}}\">why?</a>)\\n on this website and in search engines. If you\\n are thinking of using a pseudonym, please\\n <a href=\"{{help_url}}\">read this first</a>." msgstr "" -"<strong>Tu nombre aparecerá públicamente</strong> \n" -" (<a href=\"{{why_url}}\">¿por qué?</a>)\n" -" en esta web y en motores de búsqueda. Si estás\n" -" pensando en utilizar un seudónimo, por favor \n" -" <a href=\"{{help_url}}\">lee esto primero</a>." +"<strong>El teu nom apareixerà públicament</strong> \n" +" (<a href=\"{{why_url}}\">¿per què?</a>)\n" +" en aquesta web i en motors de cerca. Si estàs\n" +" pensant en utilitzar un pseudònim, sisplau \n" +" <a href=\"{{help_url}}\">llegeix això abans</a>." msgid "Your annotations" msgstr "Tus comentarios" @@ -3597,7 +3591,7 @@ msgid "Your details, including your email address, have not been given to anyone msgstr "" msgid "Your e-mail:" -msgstr "Tu correo:" +msgstr "Correu:" msgid "Your email doesn't look like a valid address" msgstr "" @@ -3624,15 +3618,15 @@ msgid "Your message will appear in <strong>search engines</strong>" msgstr "Tu mensaje aparecerá en <strong>los motores de búsqueda</strong>" msgid "Your name and annotation will appear in <strong>search engines</strong>." -msgstr "Tu nombre y su comentario aparecerán en los <strong>motores de búsqueda</strong>." +msgstr "El teu nom i els teus comentaris apareixeran en els <strong>motors de cerca</strong>." msgid "Your name, request and any responses will appear in <strong>search engines</strong>\\n (<a href=\"{{url}}\">details</a>)." msgstr "" -"Tu nombre, tu solicitud y cualquier respuesta aparecerán en los <strong>motoros de búsqueda</strong>\n" -" (<a href=\"{{url}}\">detalles</a>)." +"El teu nom, la teva sol·liitud i qualsevol resposta apareixeran en els <strong>motors de cerca</strong>\n" +" (<a href=\"{{url}}\">detalls</a>)." msgid "Your name:" -msgstr "Tu nombre:" +msgstr "El teu nom:" msgid "Your original message is attached." msgstr "Tu mensaje original está adjunto." @@ -3668,7 +3662,7 @@ msgid "Your request was called {{info_request}}. Letting everyone know whether y msgstr "Tu solicitud se llamaba {{info_request}}. Haznos saber si has recibido la información para ayudarnos a controlar a" msgid "Your request:" -msgstr "Tu solicitud:" +msgstr "La teva sol·licitud:" msgid "Your response to an FOI request was not delivered" msgstr "" @@ -3684,13 +3678,13 @@ msgstr "Opine sobre lo que los <strong>administradores</strong> de {{site_name}} msgid "Your {{count}} Freedom of Information request" msgid_plural "Your {{count}} Freedom of Information requests" -msgstr[0] "Tu {{count}} solicitud de información" -msgstr[1] "Tus {{count}} solicitudes de información" +msgstr[0] "{{count}} sol·licitud d'informació" +msgstr[1] "{{count}} sol·licituds d'informació" msgid "Your {{count}} annotation" msgid_plural "Your {{count}} annotations" msgstr[0] "Tu {{count}} comentario" -msgstr[1] "Tus {{count}} comentarios" +msgstr[1] "Els teus {{count}} comentaris" msgid "Your {{count}} batch requests" msgid_plural "Your {{count}} batch requests" @@ -3701,13 +3695,13 @@ msgid "Your {{site_name}} email alert" msgstr "Tu alerta en {{site_name}}" msgid "Yours faithfully," -msgstr "Un saludo," +msgstr "Salutacions," msgid "Yours sincerely," -msgstr "Un saludo," +msgstr "Salutacions," msgid "Yours," -msgstr "" +msgstr "Salutacions," msgid "[Authority URL will be inserted here]" msgstr "" @@ -3725,9 +3719,7 @@ msgid "\\n\\n[ {{site_name}} note: The above text was badly encoded, and has had msgstr "\\n\\n[ {{site_name}} Nota: El text anterior estava mal codificat, i s'han eliminat alguns caràcters estranys. ]" msgid "a one line summary of the information you are requesting, \\n\t\t\te.g." -msgstr "" -"un resumen de una línea de la información que solicitas, \n" -"\t\t\tpor ejemplo" +msgstr "un resum d'una línia de la informació que sol·licites, \\n\t\t\tper exemple" msgid "admin" msgstr "admin" @@ -3736,7 +3728,7 @@ msgid "alaveteli_foi:The software that runs {{site_name}}" msgstr "" msgid "all requests" -msgstr "todas las solicitudes" +msgstr "totes les sol·licituds" msgid "all requests or comments" msgstr "" @@ -3745,13 +3737,13 @@ msgid "all requests or comments matching text '{{query}}'" msgstr "" msgid "also called {{public_body_short_name}}" -msgstr "también conocido como {{public_body_short_name}}" +msgstr "també conegut com a {{public_body_short_name}}" msgid "an anonymous user" msgstr "" msgid "and" -msgstr "y" +msgstr "i" msgid "and update the status accordingly. Perhaps <strong>you</strong> might like to help out by doing that?" msgstr "y actualice su estado. ¿Tal vez <strong>tú</strong> quieres ayudarnos a hacerlo?" @@ -3772,16 +3764,16 @@ msgid "at" msgstr "" msgid "authorities" -msgstr "organismos" +msgstr "organismes" msgid "beginning with ‘{{first_letter}}’" -msgstr "comenzando con ‘{{first_letter}}’" +msgstr "començant per ‘{{first_letter}}’" msgid "but followupable" msgstr "" msgid "by" -msgstr "por" +msgstr "per" msgid "by <strong>{{date}}</strong>" msgstr "antes de <strong>{{date}}</strong>" @@ -3813,7 +3805,7 @@ msgid "even during holidays" msgstr "incluso durante las vacaciones" msgid "everything" -msgstr "todo" +msgstr "tot" msgid "external" msgstr "" @@ -3846,7 +3838,7 @@ msgid "just to see how it works" msgstr "sólo para ver cómo funciona" msgid "left an annotation" -msgstr "dejó un comentario" +msgstr "ha deixat un comentari" msgid "made." msgstr "hecho." @@ -3867,7 +3859,7 @@ msgid "new requests" msgstr "" msgid "no later than" -msgstr "no más tarde de" +msgstr "no més tard de" msgid "no longer exists. If you are trying to make\\n From the request page, try replying to a particular message, rather than sending\\n a general followup. If you need to make a general followup, and know\\n an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>." msgstr "" @@ -3918,7 +3910,7 @@ msgid "simple_date_format" msgstr "" msgid "successful requests" -msgstr "solicitudes exitosas" +msgstr "sol·licituds exitoses" msgid "that you made to" msgstr "que hizo a" @@ -3953,10 +3945,10 @@ msgid "unknown reason " msgstr "motivo desconocido " msgid "unknown status " -msgstr "estado desconocido " +msgstr "estat desconegut" msgid "unresolved requests" -msgstr "solicitudes no resueltas" +msgstr "sol·licituds no resoltes" msgid "unsubscribe" msgstr "cancelar suscripción" @@ -3965,19 +3957,19 @@ msgid "unsubscribe all" msgstr "cancelar todas las suscripciones" msgid "unsuccessful requests" -msgstr "solicitudes fallidas" +msgstr "sol·licituds fallides" msgid "useful information." msgstr "información útil." msgid "users" -msgstr "usuarios" +msgstr "usuaris" msgid "what's that?" msgstr "Què és això?" msgid "{{count}} FOI requests found" -msgstr "{{count}} solicitudes de información encontradas" +msgstr "{{count}} sol·licituds d'informació trobades" msgid "{{count}} Freedom of Information request to {{public_body_name}}" msgid_plural "{{count}} Freedom of Information requests to {{public_body_name}}" @@ -3986,8 +3978,8 @@ msgstr[1] "{{count}} sol·licituds d'informació a {{public_body_name}}" msgid "{{count}} person is following this authority" msgid_plural "{{count}} people are following this authority" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "{{count}} persona segueix aquest organisme" +msgstr[1] "{{count}} persones segueixen aquest organisme" msgid "{{count}} request" msgid_plural "{{count}} requests" @@ -4009,7 +4001,7 @@ msgid "{{foi_law}} requests to '{{public_body_name}}'" msgstr "" msgid "{{info_request_user_name}} only:" -msgstr "Sólo {{info_request_user_name}}:" +msgstr "Només {{info_request_user_name}}:" msgid "{{law_used_full}} request - {{title}}" msgstr "solicitud {{law_used_full}} - {{title}}" @@ -4030,7 +4022,7 @@ msgid "{{public_body_link}} was sent a request about" msgstr "" msgid "{{public_body_name}} only:" -msgstr "Sólo {{public_body_name}}:" +msgstr "Només {{public_body_name}}:" msgid "{{public_body}} has asked you to explain part of your {{law_used}} request." msgstr "" @@ -4039,7 +4031,7 @@ msgid "{{public_body}} sent a response to {{user_name}}" msgstr "{{public_body}} respondió a {{user_name}}" msgid "{{reason}}, please sign in or make a new account." -msgstr "" +msgstr "{{reason}}, sisplau inicia sessió o dóna d'alta un nou compte." msgid "{{search_results}} matching '{{query}}'" msgstr "{{search_results}} encontrados por '{{query}}'" @@ -4051,7 +4043,7 @@ msgid "{{site_name}} covers requests to {{number_of_authorities}} authorities, i msgstr "{{site_name}} incluye solicitudes a {{number_of_authorities}} organismos públicos, incluyendo:" msgid "{{site_name}} sends new requests to <strong>{{request_email}}</strong> for this authority." -msgstr "{{site_name}} envía nuevas solicitudes a <strong>{{request_email}}</strong> para este organismo." +msgstr "{{site_name}} envia noves sol·licituds a <strong>{{request_email}}</strong> per aquest organisme." msgid "{{site_name}} users have made {{number_of_requests}} requests, including:" msgstr "Los usuarios de {{site_name}} han hecho {{number_of_requests}} solicitudes, incluyendo:" @@ -4098,10 +4090,10 @@ msgid "{{user_name}} would like the email address for {{public_body_name}} to be msgstr "" msgid "{{username}} left an annotation:" -msgstr "{{username}} dejó un comentario:" +msgstr "{{username}} ha deixat un comentari:" msgid "{{user}} ({{user_admin_link}}) made this {{law_used_full}} request (<a href=\"{{request_admin_url}}\">admin</a>) to {{public_body_link}} (<a href=\"{{public_body_admin_url}}\">admin</a>)" -msgstr "{{user}} ({{user_admin_link}}) hizo esta solicitud {{law_used_full}} (<a href=\"{{request_admin_url}}\">admin</a>) a {{public_body_link}} (<a href=\"{{public_body_admin_url}}\">admin</a>)" +msgstr "{{user}} ({{user_admin_link}}) va fer aquesta sol·licitud de {{law_used_full}} (<a href=\"{{request_admin_url}}\">admin</a>) a {{public_body_link}} (<a href=\"{{public_body_admin_url}}\">admin</a>)" msgid "{{user}} made this {{law_used_full}} request" -msgstr "{{user}} hizo esta solicitud {{law_used_full}}" +msgstr "{{user}} va fer aquesta sol·licitud de {{law_used_full}}" diff --git a/locale/cs/app.po b/locale/cs/app.po index ea9329754..181665862 100644 --- a/locale/cs/app.po +++ b/locale/cs/app.po @@ -19,9 +19,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-15 12:46+0100\n" -"PO-Revision-Date: 2014-06-12 13:59+0000\n" -"Last-Translator: Hana Huntova <>\n" +"POT-Creation-Date: 2014-08-21 13:43+0000\n" +"PO-Revision-Date: 2014-08-21 13:44+0000\n" +"Last-Translator: Gareth Rees <gareth@mysociety.org>\n" "Language-Team: Czech (http://www.transifex.com/projects/p/alaveteli/language/cs/)\n" "Language: cs\n" "MIME-Version: 1.0\n" @@ -105,9 +105,6 @@ msgstr "Aktualizace týkající se tohoto dotazu vám již byly zaslány e-maile msgid " You will also be emailed updates about the request." msgstr " Aktualizace týkající se tohoto dotazu vám budou také zaslány e-mailem." -msgid " made by " -msgstr "vytvořeno" - msgid " when you send this message." msgstr " když tuto zprávu pošlete." @@ -332,6 +329,9 @@ msgstr "<strong>Poděkujte</strong> instituci, nebo" msgid "<strong>did not have</strong> the information requested." msgstr "<strong>neměli</strong> požadované informace." +msgid "?" +msgstr "" + msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "<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}}." @@ -595,9 +595,6 @@ msgstr "Změňte své heslo" msgid "Change your password on {{site_name}}" msgstr "Změňte své heslo na stránkách {{site_name}}" -msgid "Change your password {{site_name}}" -msgstr "Změňte heslo na stránkách {{site_name}}" - msgid "Charity registration" msgstr "Registrace dobročinné společnosti" @@ -782,6 +779,9 @@ msgstr "Disclosure log" msgid "Disclosure log URL" msgstr "Disclosure log URL" +msgid "Do not fill in this field" +msgstr "" + msgid "Don't have a superuser account yet?" msgstr "Nemáte ještě vytvořen \"superuser\" přístup?" @@ -1478,6 +1478,9 @@ msgstr "" msgid "Make a request" msgstr "Vzneste dotaz" +msgid "Make a request »" +msgstr "" + msgid "Make a request to these authorities" msgstr "Vzneste dotaz na tyto instituce" @@ -1986,6 +1989,9 @@ msgstr "Profilové foto | Koncept" msgid "Public Bodies" msgstr "Veřejné instituce" +msgid "Public Body" +msgstr "" + msgid "Public Body Statistics" msgstr "Statistika veřejných institucí" @@ -1998,6 +2004,9 @@ msgstr "Veřejná instituce - {{description}}" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "Instituce od {{start_count}} do {{end_count}} z {{total_count}}" +msgid "Public authority statistics" +msgstr "" + msgid "Public authority – {{name}}" msgstr "Veřejná instituce – {{name}}" @@ -2225,8 +2234,8 @@ msgstr "Odpovězte e-mailem" msgid "Respond to request" msgstr "Odpovědět na dotaz" -msgid "Respond to the FOI request" -msgstr "Odpovědět na dotaz" +msgid "Respond to the FOI request '{{request}}' made by {{user}}" +msgstr "" msgid "Respond using the web" msgstr "Odpovězte na internetových stránkách" @@ -2440,9 +2449,6 @@ msgstr "SpamAdresa|Email" msgid "Special note for this authority!" msgstr "Speciální poznámka k této instituci!" -msgid "Start now »" -msgstr "Začněte zde »" - msgid "Start your own blog" msgstr "Začněte psát vlastní blg" @@ -3074,6 +3080,9 @@ msgstr "Nelze poslat odpověď uživateli {{username}}" msgid "Unable to send follow up message to {{username}}" msgstr "Nelze poslat odpověď uživateli {{username}}" +msgid "Unclassified or hidden requests are not counted." +msgstr "" + msgid "Unexpected search result type " msgstr "Neočekávané výsledky vyhledávání " @@ -3137,9 +3146,6 @@ msgstr "Uživatelé nemohou obvykle vznášet hromadné dotazy na více instituc msgid "User|About me" msgstr "User | O mně" -msgid "User|Address" -msgstr "Uživatel|Adresa" - msgid "User|Admin level" msgstr "User | Úroveň admin" @@ -3149,9 +3155,6 @@ msgstr "User | Zakázat text" msgid "User|Can make batch requests" msgstr "Uživatel|Může vznášet hromadné dotazy" -msgid "User|Dob" -msgstr "Uživatel|Dob" - msgid "User|Email" msgstr "User | E-mail" @@ -3206,7 +3209,7 @@ msgstr "Zobrazit e-mailovou adresu pro dotazy vznesené na {{public_body_name}}" msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "Prohlédněte si dotazy vznesené uživatelem {{user_name}}:" -msgid "View and search requests" +msgid "Browse and search requests" msgstr "Prohledávejte a prohlížejte dotazy" msgid "View authorities" @@ -3215,7 +3218,7 @@ msgstr "Zobrazit instituce" msgid "View email" msgstr "Zobrazit e-mail" -msgid "View requests" +msgid "Browse Requests" msgstr "Zobrazit dotazy" msgid "Waiting clarification." diff --git a/locale/cy/app.po b/locale/cy/app.po index 4bdf663de..1522afe12 100644 --- a/locale/cy/app.po +++ b/locale/cy/app.po @@ -20,9 +20,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-15 12:46+0100\n" -"PO-Revision-Date: 2014-06-03 13:06+0000\n" -"Last-Translator: louisecrow <louise@mysociety.org>\n" +"POT-Creation-Date: 2014-08-21 13:43+0000\n" +"PO-Revision-Date: 2014-08-21 13:44+0000\n" +"Last-Translator: Gareth Rees <gareth@mysociety.org>\n" "Language-Team: Welsh (http://www.transifex.com/projects/p/alaveteli/language/cy/)\n" "Language: cy\n" "MIME-Version: 1.0\n" @@ -102,9 +102,6 @@ msgstr "Rydych chi eisoes yn derbyn diweddariadau am y cais drwy ebost." msgid " You will also be emailed updates about the request." msgstr "Byddwch chi'n derbyn diweddariadau am y cais drwy ebost hefyd." -msgid " made by " -msgstr " a wnaed gan " - msgid " when you send this message." msgstr " pan fyddwch chi'n anfon y neges hon" @@ -294,6 +291,9 @@ msgstr "<strong>Diolch</strong> i'r awdurdod cyhoeddus neu" msgid "<strong>did not have</strong> the information requested." msgstr "Nid oedd gan y wybodaeth y gofynnwyd amdani." +msgid "?" +msgstr "" + msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "Mae <a href=\"{{request_url}}\">cais dilynol</a> i <em>{{request_title}}</em> wedi ei anfon i {{public_body_name}} gan {{info_request_user}} ar {{date}}." @@ -549,9 +549,6 @@ msgstr "Newid eich cyfrinair" msgid "Change your password on {{site_name}}" msgstr "Newid eich cyfrinair ar {{site_name}}" -msgid "Change your password {{site_name}}" -msgstr "Newid eich cyfrinair {{site_name}}" - msgid "Charity registration" msgstr "Elusen gofrestredig" @@ -726,6 +723,9 @@ msgstr "Log datgelu" msgid "Disclosure log URL" msgstr "URL log datgelu" +msgid "Do not fill in this field" +msgstr "" + msgid "Don't have a superuser account yet?" msgstr "" @@ -1387,6 +1387,9 @@ msgstr "Gwnewch <strong>Cais<br/>Rhyddid<br/>Gwybodaeth</strong><br/>newydd" msgid "Make a request" msgstr "Gwneud cais" +msgid "Make a request »" +msgstr "" + msgid "Make a request to these authorities" msgstr "Gwneud cais i'r awdurdodau hyn" @@ -1888,6 +1891,9 @@ msgstr "ProfilePhoto|Drafft" msgid "Public Bodies" msgstr "Cyrff Cyhoeddus" +msgid "Public Body" +msgstr "" + msgid "Public Body Statistics" msgstr "Ystadegau Cyrff Cyhoeddus" @@ -1900,6 +1906,9 @@ msgstr "Awdurdodau cyhoeddus - {{description}}" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "Awdurdodau cyhoeddus {{start_count}} i {{end_count}} o {{total_count}}" +msgid "Public authority statistics" +msgstr "" + msgid "Public authority – {{name}}" msgstr "Awdurdod cyhoeddus – {{name}}" @@ -2125,8 +2134,8 @@ msgstr "Ymateb drwy e-bost" msgid "Respond to request" msgstr "Ymateb i gais" -msgid "Respond to the FOI request" -msgstr "Ymateb i'r cais Rhyddid Gwybodaeth" +msgid "Respond to the FOI request '{{request}}' made by {{user}}" +msgstr "" msgid "Respond using the web" msgstr "Ymateb trwy ddefnyddio'r we" @@ -2334,9 +2343,6 @@ msgstr "" msgid "Special note for this authority!" msgstr "Nodyn arbennig ar gyfer yr awdurdod hwn!" -msgid "Start now »" -msgstr "Dechrau nawr »" - msgid "Start your own blog" msgstr "Dechreuwch eich blog eich hun" @@ -2657,7 +2663,7 @@ msgid "They have not replied to your {{law_used_short}} request {{title}} prompt msgstr "Nid ydynt wedi ymateb i'ch cais {{title}} {{law_used_short}} yn brydlon, fel sy'n ofynnol fel arfer yn ôl y gyfraith" msgid "They have not replied to your {{law_used_short}} request {{title}}, \\nas required by law" -msgstr "Nid ydynt wedi ateb i'ch cais {{teitl}} {{law_used_short}}, fel sy'n ofynnol yn ôl y gyfraith" +msgstr "Nid ydynt wedi ateb i'ch cais {{title}} {{law_used_short}}, fel sy'n ofynnol yn ôl y gyfraith" msgid "Things to do with this request" msgstr "Pethau i'w gwneud gyda'r cais hwn" @@ -2836,7 +2842,7 @@ msgid "To follow the request '{{request_title}}'" msgstr "I ddilyn y cais '{{request_title}}'" msgid "To help us keep the site tidy, someone else has updated the status of the \\n{{law_used_full}} request {{title}} that you made to {{public_body}}, to \"{{display_status}}\" If you disagree with their categorisation, please update the status again yourself to what you believe to be more accurate." -msgstr "I'n helpu ni i gadw'r wefan yn daclus, mae rhywun arall wedi diweddaru statws y cais {{law_used_full}} {{teitl}} a wnaethoch i {{public_body}} , i \"{{display_status}}\" Os ydych yn anghytuno â'u categoreiddio, diweddarwch y statws unwaith eto eich hun i'r hyn y credwch i fod yn fwy cywir." +msgstr "I'n helpu ni i gadw'r wefan yn daclus, mae rhywun arall wedi diweddaru statws y cais {{law_used_full}} {{title}} a wnaethoch i {{public_body}} , i \"{{display_status}}\" Os ydych yn anghytuno â'u categoreiddio, diweddarwch y statws unwaith eto eich hun i'r hyn y credwch i fod yn fwy cywir." msgid "To let everyone know, follow this link and then select the appropriate box." msgstr "I adael i bawb wybod, dilynwch y ddolen hon ac yna dewiswch y blwch priodol." @@ -2940,6 +2946,9 @@ msgstr "Yn methu anfon ateb i {{username}}" msgid "Unable to send follow up message to {{username}}" msgstr "Yn methu anfon neges ddilynol i {{username}}" +msgid "Unclassified or hidden requests are not counted." +msgstr "" + msgid "Unexpected search result type " msgstr "Canlyniad chwiliad o fath annisgwyl " @@ -3000,9 +3009,6 @@ msgstr "" msgid "User|About me" msgstr "User|Amdanaf i" -msgid "User|Address" -msgstr "" - msgid "User|Admin level" msgstr "User|Lefel weinyddu" @@ -3012,9 +3018,6 @@ msgstr "User|Gwahardd testun" msgid "User|Can make batch requests" msgstr "" -msgid "User|Dob" -msgstr "" - msgid "User|Email" msgstr "User|E-bost" @@ -3069,7 +3072,7 @@ msgstr "Gweld cyfeiriad e-bost Rhyddid Gwybodaeth ar gyfer '{{public_body_name}} msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "Gweld ceisiadau Rhyddid Gwybodaeth a wnaed gan {{user_name}}:" -msgid "View and search requests" +msgid "Browse and search requests" msgstr "Gweld a chwilio ceisiadau" msgid "View authorities" @@ -3078,7 +3081,7 @@ msgstr "Gweld yr awdurdodau" msgid "View email" msgstr "Gweld e-bost" -msgid "View requests" +msgid "Browse Requests" msgstr "Gweld ceisiadau" msgid "Waiting clarification." diff --git a/locale/de/app.po b/locale/de/app.po index 6ef110223..7c884fb92 100644 --- a/locale/de/app.po +++ b/locale/de/app.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-15 12:46+0100\n" -"PO-Revision-Date: 2014-05-28 15:17+0000\n" -"Last-Translator: louisecrow <louise@mysociety.org>\n" +"POT-Creation-Date: 2014-08-21 13:43+0000\n" +"PO-Revision-Date: 2014-08-21 13:44+0000\n" +"Last-Translator: Gareth Rees <gareth@mysociety.org>\n" "Language-Team: German (http://www.transifex.com/projects/p/alaveteli/language/de/)\n" "Language: de\n" "MIME-Version: 1.0\n" @@ -97,9 +97,6 @@ msgstr "Sie haben bereits Aktualisierungen zu dieser Anfrage per Email erhalten. msgid " You will also be emailed updates about the request." msgstr "Aktualisierungen zu dieser Anfrage werden Ihnen auch per Email übermittelt. " -msgid " made by " -msgstr "erstellt durch" - msgid " when you send this message." msgstr "wenn Sie diese Nachricht senden. " @@ -313,6 +310,9 @@ msgstr "<strong>Danken Sie</strong> der Behörde oder " msgid "<strong>did not have</strong> the information requested." msgstr "Die angefragten Informationen waren <strong>nicht vorhanden</strong>." +msgid "?" +msgstr "" + msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "" @@ -572,9 +572,6 @@ msgstr "Passwort ändern" msgid "Change your password on {{site_name}}" msgstr "Ändern Sie Ihr Passwort: {{site_name}}" -msgid "Change your password {{site_name}}" -msgstr "Passwort ändern{{site_name}}" - msgid "Charity registration" msgstr "Charity Registrierung" @@ -751,6 +748,9 @@ msgstr "" msgid "Disclosure log URL" msgstr "" +msgid "Do not fill in this field" +msgstr "" + msgid "Don't have a superuser account yet?" msgstr "" @@ -1428,6 +1428,9 @@ msgstr "" msgid "Make a request" msgstr "Anfrage stellen" +msgid "Make a request »" +msgstr "" + msgid "Make a request to these authorities" msgstr "" @@ -1932,6 +1935,9 @@ msgstr "ProfilePhoto|Draft" msgid "Public Bodies" msgstr "" +msgid "Public Body" +msgstr "" + msgid "Public Body Statistics" msgstr "" @@ -1944,6 +1950,9 @@ msgstr "Behörden - {{description}}" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "Behörde {{start_count}} bis {{end_count}} von {{total_count}}" +msgid "Public authority statistics" +msgstr "" + msgid "Public authority – {{name}}" msgstr "" @@ -2169,8 +2178,8 @@ msgstr "Email-Antwort senden" msgid "Respond to request" msgstr "Auf Anfrage reagieren" -msgid "Respond to the FOI request" -msgstr "IFG-Anfrage beantworten" +msgid "Respond to the FOI request '{{request}}' made by {{user}}" +msgstr "" msgid "Respond using the web" msgstr "Online antworten" @@ -2379,9 +2388,6 @@ msgstr "" msgid "Special note for this authority!" msgstr "Spezielle Nachricht and diese Behörde!" -msgid "Start now »" -msgstr "" - msgid "Start your own blog" msgstr "Starten Sie Ihren eigenen Blog" @@ -2990,6 +2996,9 @@ msgstr "Antwort an {{username}} kann nicht gesendet werden" msgid "Unable to send follow up message to {{username}}" msgstr "Nachfrage an {{username}} kann nicht gesendet werden" +msgid "Unclassified or hidden requests are not counted." +msgstr "" + msgid "Unexpected search result type " msgstr "Unerwartetes Suchergebnis" @@ -3052,9 +3061,6 @@ msgstr "" msgid "User|About me" msgstr "BenutzerIÜber mich" -msgid "User|Address" -msgstr "" - msgid "User|Admin level" msgstr "User|Admin level" @@ -3064,9 +3070,6 @@ msgstr "User|Ban text" msgid "User|Can make batch requests" msgstr "" -msgid "User|Dob" -msgstr "" - msgid "User|Email" msgstr "BenutzerIEmail" @@ -3121,7 +3124,7 @@ msgstr "IFG-Emailadresse für {{public_body_name}} ansehen" msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "Sehen Sie die durch {{user_name}} gestellten IFG-Anfragen an:" -msgid "View and search requests" +msgid "Browse and search requests" msgstr "Ansehen und Suchen von Anfragen" msgid "View authorities" @@ -3130,7 +3133,7 @@ msgstr "Behörden ansehen" msgid "View email" msgstr "Email ansehen" -msgid "View requests" +msgid "Browse Requests" msgstr "Anfragen ansehen" msgid "Waiting clarification." diff --git a/locale/en/app.po b/locale/en/app.po index a547138ba..1570a97b5 100644 --- a/locale/en/app.po +++ b/locale/en/app.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-15 12:46+0100\n" +"POT-Creation-Date: 2014-08-21 13:43+0000\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" @@ -89,9 +89,6 @@ msgstr "" msgid " You will also be emailed updates about the request." msgstr "" -msgid " made by " -msgstr "" - msgid " when you send this message." msgstr "" @@ -281,6 +278,9 @@ msgstr "" msgid "<strong>did not have</strong> the information requested." msgstr "" +msgid "?" +msgstr "" + msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "" @@ -536,9 +536,6 @@ msgstr "" msgid "Change your password on {{site_name}}" msgstr "" -msgid "Change your password {{site_name}}" -msgstr "" - msgid "Charity registration" msgstr "" @@ -713,6 +710,9 @@ msgstr "" msgid "Disclosure log URL" msgstr "" +msgid "Do not fill in this field" +msgstr "" + msgid "Don't have a superuser account yet?" msgstr "" @@ -1372,6 +1372,9 @@ msgstr "" msgid "Make a request" msgstr "" +msgid "Make a request »" +msgstr "" + msgid "Make a request to these authorities" msgstr "" @@ -1873,6 +1876,9 @@ msgstr "" msgid "Public Bodies" msgstr "" +msgid "Public Body" +msgstr "" + msgid "Public Body Statistics" msgstr "" @@ -1885,6 +1891,9 @@ msgstr "" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "" +msgid "Public authority statistics" +msgstr "" + msgid "Public authority – {{name}}" msgstr "" @@ -2110,7 +2119,7 @@ msgstr "" msgid "Respond to request" msgstr "" -msgid "Respond to the FOI request" +msgid "Respond to the FOI request '{{request}}' made by {{user}}" msgstr "" msgid "Respond using the web" @@ -2315,9 +2324,6 @@ msgstr "" msgid "Special note for this authority!" msgstr "" -msgid "Start now »" -msgstr "" - msgid "Start your own blog" msgstr "" @@ -2915,6 +2921,9 @@ msgstr "" msgid "Unable to send follow up message to {{username}}" msgstr "" +msgid "Unclassified or hidden requests are not counted." +msgstr "" + msgid "Unexpected search result type " msgstr "" @@ -2975,9 +2984,6 @@ msgstr "" msgid "User|About me" msgstr "" -msgid "User|Address" -msgstr "" - msgid "User|Admin level" msgstr "" @@ -2987,9 +2993,6 @@ msgstr "" msgid "User|Can make batch requests" msgstr "" -msgid "User|Dob" -msgstr "" - msgid "User|Email" msgstr "" @@ -3044,7 +3047,7 @@ msgstr "" msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "" -msgid "View and search requests" +msgid "Browse and search requests" msgstr "" msgid "View authorities" @@ -3053,7 +3056,7 @@ msgstr "" msgid "View email" msgstr "" -msgid "View requests" +msgid "Browse Requests" msgstr "" msgid "Waiting clarification." diff --git a/locale/en_IE/app.po b/locale/en_IE/app.po index dabeffd92..ad06b2750 100644 --- a/locale/en_IE/app.po +++ b/locale/en_IE/app.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-15 12:46+0100\n" -"PO-Revision-Date: 2014-05-15 11:56+0000\n" -"Last-Translator: louisecrow <louise@mysociety.org>\n" +"POT-Creation-Date: 2014-08-21 13:43+0000\n" +"PO-Revision-Date: 2014-08-21 13:44+0000\n" +"Last-Translator: Gareth Rees <gareth@mysociety.org>\n" "Language-Team: English (Ireland) (http://www.transifex.com/projects/p/alaveteli/language/en_IE/)\n" "Language: en_IE\n" "MIME-Version: 1.0\n" @@ -93,9 +93,6 @@ msgstr "" msgid " You will also be emailed updates about the request." msgstr "" -msgid " made by " -msgstr "" - msgid " when you send this message." msgstr "" @@ -285,6 +282,9 @@ msgstr "" msgid "<strong>did not have</strong> the information requested." msgstr "" +msgid "?" +msgstr "" + msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "" @@ -540,9 +540,6 @@ msgstr "" msgid "Change your password on {{site_name}}" msgstr "" -msgid "Change your password {{site_name}}" -msgstr "" - msgid "Charity registration" msgstr "" @@ -717,6 +714,9 @@ msgstr "" msgid "Disclosure log URL" msgstr "" +msgid "Do not fill in this field" +msgstr "" + msgid "Don't have a superuser account yet?" msgstr "" @@ -1376,6 +1376,9 @@ msgstr "" msgid "Make a request" msgstr "" +msgid "Make a request »" +msgstr "" + msgid "Make a request to these authorities" msgstr "" @@ -1877,6 +1880,9 @@ msgstr "" msgid "Public Bodies" msgstr "" +msgid "Public Body" +msgstr "" + msgid "Public Body Statistics" msgstr "" @@ -1889,6 +1895,9 @@ msgstr "" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "" +msgid "Public authority statistics" +msgstr "" + msgid "Public authority – {{name}}" msgstr "" @@ -2114,7 +2123,7 @@ msgstr "" msgid "Respond to request" msgstr "" -msgid "Respond to the FOI request" +msgid "Respond to the FOI request '{{request}}' made by {{user}}" msgstr "" msgid "Respond using the web" @@ -2319,9 +2328,6 @@ msgstr "" msgid "Special note for this authority!" msgstr "" -msgid "Start now »" -msgstr "" - msgid "Start your own blog" msgstr "" @@ -2919,6 +2925,9 @@ msgstr "" msgid "Unable to send follow up message to {{username}}" msgstr "" +msgid "Unclassified or hidden requests are not counted." +msgstr "" + msgid "Unexpected search result type " msgstr "" @@ -2979,9 +2988,6 @@ msgstr "" msgid "User|About me" msgstr "" -msgid "User|Address" -msgstr "" - msgid "User|Admin level" msgstr "" @@ -2991,9 +2997,6 @@ msgstr "" msgid "User|Can make batch requests" msgstr "" -msgid "User|Dob" -msgstr "" - msgid "User|Email" msgstr "" @@ -3048,7 +3051,7 @@ msgstr "" msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "" -msgid "View and search requests" +msgid "Browse and search requests" msgstr "" msgid "View authorities" @@ -3057,7 +3060,7 @@ msgstr "" msgid "View email" msgstr "" -msgid "View requests" +msgid "Browse Requests" msgstr "" msgid "Waiting clarification." diff --git a/locale/en_UG/app.po b/locale/en_UG/app.po index 18e293dc7..54b2f27b3 100644 --- a/locale/en_UG/app.po +++ b/locale/en_UG/app.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-15 12:46+0100\n" +"POT-Creation-Date: 2014-08-21 13:43+0000\n" "PO-Revision-Date: 2014-01-31 09:14+0000\n" "Last-Translator: Louise Crow <louise@mysociety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -89,9 +89,6 @@ msgstr "" msgid " You will also be emailed updates about the request." msgstr "" -msgid " made by " -msgstr "" - msgid " when you send this message." msgstr "" @@ -281,6 +278,9 @@ msgstr "<strong>Thank</strong> the public agency or " msgid "<strong>did not have</strong> the information requested." msgstr "" +msgid "?" +msgstr "" + msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "" @@ -536,9 +536,6 @@ msgstr "" msgid "Change your password on {{site_name}}" msgstr "" -msgid "Change your password {{site_name}}" -msgstr "" - msgid "Charity registration" msgstr "" @@ -713,6 +710,9 @@ msgstr "" msgid "Disclosure log URL" msgstr "" +msgid "Do not fill in this field" +msgstr "" + msgid "Don't have a superuser account yet?" msgstr "" @@ -1372,6 +1372,9 @@ msgstr "Make a new<br/>\\n <strong>Access <span>to</span><br/>\\n Information< msgid "Make a request" msgstr "" +msgid "Make a request »" +msgstr "" + msgid "Make a request to these authorities" msgstr "" @@ -1873,6 +1876,9 @@ msgstr "" msgid "Public Bodies" msgstr "" +msgid "Public Body" +msgstr "" + msgid "Public Body Statistics" msgstr "" @@ -1885,6 +1891,9 @@ msgstr "Public agencies - {{description}}" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "Public agencies {{start_count}} to {{end_count}} of {{total_count}}" +msgid "Public authority statistics" +msgstr "Public agency statistics" + msgid "Public authority – {{name}}" msgstr "Public agency – {{name}}" @@ -2110,8 +2119,8 @@ msgstr "" msgid "Respond to request" msgstr "" -msgid "Respond to the FOI request" -msgstr "Respond to the ATI request" +msgid "Respond to the FOI request '{{request}}' made by {{user}}" +msgstr "Respond to the ATI request '{{request}}' made by {{user}}" msgid "Respond using the web" msgstr "" @@ -2315,9 +2324,6 @@ msgstr "" msgid "Special note for this authority!" msgstr "Special note for this agency!" -msgid "Start now »" -msgstr "" - msgid "Start your own blog" msgstr "" @@ -2915,6 +2921,9 @@ msgstr "" msgid "Unable to send follow up message to {{username}}" msgstr "" +msgid "Unclassified or hidden requests are not counted." +msgstr "" + msgid "Unexpected search result type " msgstr "" @@ -2975,9 +2984,6 @@ msgstr "" msgid "User|About me" msgstr "" -msgid "User|Address" -msgstr "" - msgid "User|Admin level" msgstr "" @@ -2987,9 +2993,6 @@ msgstr "" msgid "User|Can make batch requests" msgstr "" -msgid "User|Dob" -msgstr "" - msgid "User|Email" msgstr "" @@ -3044,7 +3047,7 @@ msgstr "View ATI email address for {{public_body_name}}" msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "View Access to Information requests made by {{user_name}}:" -msgid "View and search requests" +msgid "Browse and search requests" msgstr "" msgid "View authorities" @@ -3053,7 +3056,7 @@ msgstr "View agencies" msgid "View email" msgstr "" -msgid "View requests" +msgid "Browse Requests" msgstr "" msgid "Waiting clarification." diff --git a/locale/es/app.po b/locale/es/app.po index a0d874caa..014ed2fd7 100644 --- a/locale/es/app.po +++ b/locale/es/app.po @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-15 12:46+0100\n" -"PO-Revision-Date: 2014-05-15 11:56+0000\n" -"Last-Translator: louisecrow <louise@mysociety.org>\n" +"POT-Creation-Date: 2014-08-21 13:43+0000\n" +"PO-Revision-Date: 2014-08-21 13:44+0000\n" +"Last-Translator: Gareth Rees <gareth@mysociety.org>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/alaveteli/language/es/)\n" "Language: es\n" "MIME-Version: 1.0\n" @@ -107,9 +107,6 @@ msgstr " Ya está recibiendo actualizaciones por correo sobre la solicitud." msgid " You will also be emailed updates about the request." msgstr " Recibirá actualizaciones por correo sobre esta solicitud." -msgid " made by " -msgstr " hecha por " - msgid " when you send this message." msgstr " cuando envió este mensaje." @@ -353,6 +350,9 @@ msgstr "<strong>Dé las gracias</strong> al organismo público o " msgid "<strong>did not have</strong> the information requested." msgstr "<strong>no tenía</strong> la información solicitada." +msgid "?" +msgstr "" + msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "Un <a href=\"{{request_url}}\">seguimiento</a> de <em>{{request_title}}</em> ha sido enviado a {{public_body_name}} por {{info_request_user}} el {{date}}." @@ -618,9 +618,6 @@ msgstr "Cambia tu contraseña" msgid "Change your password on {{site_name}}" msgstr "Cambia tu contraseña en {{site_name}}" -msgid "Change your password {{site_name}}" -msgstr "Cambia tu contraseña en {{site_name}}" - msgid "Charity registration" msgstr "Registro de la ONG" @@ -799,6 +796,9 @@ msgstr "Registro de declaraciones" msgid "Disclosure log URL" msgstr "URL del registro de declaraciones" +msgid "Do not fill in this field" +msgstr "" + msgid "Don't have a superuser account yet?" msgstr "" @@ -1512,6 +1512,9 @@ msgstr "" msgid "Make a request" msgstr "Enviar solicitud" +msgid "Make a request »" +msgstr "" + msgid "Make a request to these authorities" msgstr "" @@ -2024,6 +2027,9 @@ msgstr "ProfilePhoto|Draft" msgid "Public Bodies" msgstr "" +msgid "Public Body" +msgstr "" + msgid "Public Body Statistics" msgstr "" @@ -2036,6 +2042,9 @@ msgstr "Organismos públicos - {{description}}" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "Organismos públicos {{start_count}} a {{end_count}} de {{total_count}}" +msgid "Public authority statistics" +msgstr "" + msgid "Public authority – {{name}}" msgstr "Organismo público - {{name}}" @@ -2263,8 +2272,8 @@ msgstr "Contestar por correo" msgid "Respond to request" msgstr "Contestar la solicitud" -msgid "Respond to the FOI request" -msgstr "Contestar la solicitud" +msgid "Respond to the FOI request '{{request}}' made by {{user}}" +msgstr "" msgid "Respond using the web" msgstr "Contestar vía web" @@ -2477,9 +2486,6 @@ msgstr "" msgid "Special note for this authority!" msgstr "¡Notas especiales sobre este organismo!" -msgid "Start now »" -msgstr "Comience ahora »" - msgid "Start your own blog" msgstr "Crea tu propio blog" @@ -3121,6 +3127,9 @@ msgstr "No se pudo enviar la respuesta a {{username}}" msgid "Unable to send follow up message to {{username}}" msgstr "No se pudo enviar la respuesta a {{username}}" +msgid "Unclassified or hidden requests are not counted." +msgstr "" + msgid "Unexpected search result type " msgstr "Se encontró un tipo de resultado inesperado " @@ -3184,9 +3193,6 @@ msgstr "" msgid "User|About me" msgstr "User|About me" -msgid "User|Address" -msgstr "" - msgid "User|Admin level" msgstr "User|Admin level" @@ -3196,9 +3202,6 @@ msgstr "User|Ban text" msgid "User|Can make batch requests" msgstr "" -msgid "User|Dob" -msgstr "" - msgid "User|Email" msgstr "User|Email" @@ -3253,7 +3256,7 @@ msgstr "Ver dirección de correo para '{{public_body_name}}'" msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "Ver solicitudes de acceso a información hechas por {{user_name}}:" -msgid "View and search requests" +msgid "Browse and search requests" msgstr "Ver y buscar solicitudes" msgid "View authorities" @@ -3262,7 +3265,7 @@ msgstr "Ver organismos públicos" msgid "View email" msgstr "Ver correo" -msgid "View requests" +msgid "Browse Requests" msgstr "Ver solicitudes" msgid "Waiting clarification." diff --git a/locale/eu/app.po b/locale/eu/app.po index bb7448b98..ea8755583 100644 --- a/locale/eu/app.po +++ b/locale/eu/app.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-15 12:46+0100\n" -"PO-Revision-Date: 2014-05-15 11:56+0000\n" -"Last-Translator: louisecrow <louise@mysociety.org>\n" +"POT-Creation-Date: 2014-08-21 13:43+0000\n" +"PO-Revision-Date: 2014-08-21 13:44+0000\n" +"Last-Translator: Gareth Rees <gareth@mysociety.org>\n" "Language-Team: Basque (http://www.transifex.com/projects/p/alaveteli/language/eu/)\n" "Language: eu\n" "MIME-Version: 1.0\n" @@ -96,9 +96,6 @@ msgstr " Eskabideari buruzko gaurkotzeak jasotzen ari zara posta elektronikoan." msgid " You will also be emailed updates about the request." msgstr "Eskabide honi buruzko gaurkotzeak jasoko dituzu posta elektronikoan." -msgid " made by " -msgstr " _____-k egina. " - msgid " when you send this message." msgstr " Mezu hau bidali duzunean." @@ -311,6 +308,9 @@ msgstr "<strong>Eman eskerrak</strong> erakunde publikoari edo " msgid "<strong>did not have</strong> the information requested." msgstr "<strong>ez zeukan</strong> eskatutako informazioa." +msgid "?" +msgstr "" + msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "" @@ -568,9 +568,6 @@ msgstr "Aldatu zure pasahitza" msgid "Change your password on {{site_name}}" msgstr "Aldatu zure pasahitza {{site_name}}-an" -msgid "Change your password {{site_name}}" -msgstr "Aldatu zure pasahitza {{site_name}}-an" - msgid "Charity registration" msgstr "GKEren erregistroa" @@ -745,6 +742,9 @@ msgstr "" msgid "Disclosure log URL" msgstr "" +msgid "Do not fill in this field" +msgstr "" + msgid "Don't have a superuser account yet?" msgstr "" @@ -1417,6 +1417,9 @@ msgstr "" msgid "Make a request" msgstr "Bidali eskabidea" +msgid "Make a request »" +msgstr "" + msgid "Make a request to these authorities" msgstr "" @@ -1920,6 +1923,9 @@ msgstr "ProfilePhoto|Draft" msgid "Public Bodies" msgstr "" +msgid "Public Body" +msgstr "" + msgid "Public Body Statistics" msgstr "" @@ -1932,6 +1938,9 @@ msgstr "Erakunde publikoak - {{description}}" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "Erakunde publikoak {{start_count}}-etik {{end_count}}-era, guztira {{total_count}}" +msgid "Public authority statistics" +msgstr "" + msgid "Public authority – {{name}}" msgstr "" @@ -2159,8 +2168,8 @@ msgstr "Emailez erantzun" msgid "Respond to request" msgstr "Eskabideari erantzun" -msgid "Respond to the FOI request" -msgstr "Eskabideari erantzun" +msgid "Respond to the FOI request '{{request}}' made by {{user}}" +msgstr "" msgid "Respond using the web" msgstr "Web orrialdearen bidez erantzun" @@ -2369,9 +2378,6 @@ msgstr "" msgid "Special note for this authority!" msgstr "Erakunde horri buruzko ohar berezia!" -msgid "Start now »" -msgstr "Has zaitez orain »" - msgid "Start your own blog" msgstr "Sortu zeure bloga" @@ -2983,6 +2989,9 @@ msgstr "Ezin izan zaio {{username}}-ri erantzuna bidali." msgid "Unable to send follow up message to {{username}}" msgstr "Ezin izan zaio {{username}}-ri erantzuna bidali." +msgid "Unclassified or hidden requests are not counted." +msgstr "" + msgid "Unexpected search result type " msgstr "Ustegabeko emaitza aurkitu da " @@ -3043,9 +3052,6 @@ msgstr "" msgid "User|About me" msgstr "User|About me" -msgid "User|Address" -msgstr "" - msgid "User|Admin level" msgstr "User|Admin level" @@ -3055,9 +3061,6 @@ msgstr "User|Ban text" msgid "User|Can make batch requests" msgstr "" -msgid "User|Dob" -msgstr "" - msgid "User|Email" msgstr "User|Email" @@ -3112,7 +3115,7 @@ msgstr "Ikusi '{{public_body_name}}'-ren posta helbidea" msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "Ikusi {{user_name}}-k egin dituen informaziorako sarbidearen eskabideak:" -msgid "View and search requests" +msgid "Browse and search requests" msgstr "Ikusi eta bilatu eskabideak" msgid "View authorities" @@ -3121,7 +3124,7 @@ msgstr "Ikusi erakunde publikoak" msgid "View email" msgstr "Ikusi posta" -msgid "View requests" +msgid "Browse Requests" msgstr "Ikusi eskabideak" msgid "Waiting clarification." diff --git a/locale/fi/app.po b/locale/fi/app.po index ab7d3cd88..9652dd496 100644 --- a/locale/fi/app.po +++ b/locale/fi/app.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-15 12:46+0100\n" -"PO-Revision-Date: 2014-05-15 11:56+0000\n" -"Last-Translator: louisecrow <louise@mysociety.org>\n" +"POT-Creation-Date: 2014-08-21 13:43+0000\n" +"PO-Revision-Date: 2014-08-21 13:44+0000\n" +"Last-Translator: Gareth Rees <gareth@mysociety.org>\n" "Language-Team: Finnish (http://www.transifex.com/projects/p/alaveteli/language/fi/)\n" "Language: fi\n" "MIME-Version: 1.0\n" @@ -93,9 +93,6 @@ msgstr "" msgid " You will also be emailed updates about the request." msgstr "" -msgid " made by " -msgstr "" - msgid " when you send this message." msgstr "kun lähetät tämän viestin." @@ -285,6 +282,9 @@ msgstr "" msgid "<strong>did not have</strong> the information requested." msgstr "" +msgid "?" +msgstr "" + msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "" @@ -540,9 +540,6 @@ msgstr "" msgid "Change your password on {{site_name}}" msgstr "" -msgid "Change your password {{site_name}}" -msgstr "" - msgid "Charity registration" msgstr "" @@ -717,6 +714,9 @@ msgstr "" msgid "Disclosure log URL" msgstr "" +msgid "Do not fill in this field" +msgstr "" + msgid "Don't have a superuser account yet?" msgstr "" @@ -1376,6 +1376,9 @@ msgstr "" msgid "Make a request" msgstr "" +msgid "Make a request »" +msgstr "" + msgid "Make a request to these authorities" msgstr "" @@ -1877,6 +1880,9 @@ msgstr "" msgid "Public Bodies" msgstr "" +msgid "Public Body" +msgstr "" + msgid "Public Body Statistics" msgstr "" @@ -1889,6 +1895,9 @@ msgstr "" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "" +msgid "Public authority statistics" +msgstr "" + msgid "Public authority – {{name}}" msgstr "" @@ -2114,7 +2123,7 @@ msgstr "" msgid "Respond to request" msgstr "" -msgid "Respond to the FOI request" +msgid "Respond to the FOI request '{{request}}' made by {{user}}" msgstr "" msgid "Respond using the web" @@ -2319,9 +2328,6 @@ msgstr "" msgid "Special note for this authority!" msgstr "" -msgid "Start now »" -msgstr "" - msgid "Start your own blog" msgstr "" @@ -2919,6 +2925,9 @@ msgstr "" msgid "Unable to send follow up message to {{username}}" msgstr "" +msgid "Unclassified or hidden requests are not counted." +msgstr "" + msgid "Unexpected search result type " msgstr "" @@ -2979,9 +2988,6 @@ msgstr "" msgid "User|About me" msgstr "" -msgid "User|Address" -msgstr "" - msgid "User|Admin level" msgstr "" @@ -2991,9 +2997,6 @@ msgstr "" msgid "User|Can make batch requests" msgstr "" -msgid "User|Dob" -msgstr "" - msgid "User|Email" msgstr "" @@ -3048,7 +3051,7 @@ msgstr "" msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "" -msgid "View and search requests" +msgid "Browse and search requests" msgstr "" msgid "View authorities" @@ -3057,7 +3060,7 @@ msgstr "" msgid "View email" msgstr "" -msgid "View requests" +msgid "Browse Requests" msgstr "" msgid "Waiting clarification." diff --git a/locale/fr/app.po b/locale/fr/app.po index 6ca4056ee..3f86e8e1a 100644 --- a/locale/fr/app.po +++ b/locale/fr/app.po @@ -33,9 +33,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-15 12:46+0100\n" -"PO-Revision-Date: 2014-05-15 11:56+0000\n" -"Last-Translator: louisecrow <louise@mysociety.org>\n" +"POT-Creation-Date: 2014-08-21 13:43+0000\n" +"PO-Revision-Date: 2014-08-21 13:44+0000\n" +"Last-Translator: Gareth Rees <gareth@mysociety.org>\n" "Language-Team: French (http://www.transifex.com/projects/p/alaveteli/language/fr/)\n" "Language: fr\n" "MIME-Version: 1.0\n" @@ -119,9 +119,6 @@ msgstr "Un courriel vous a déjà été envoyé au sujet de cette demande." msgid " You will also be emailed updates about the request." msgstr "Vous recevrez également des courriels d'avancées liées à votre demande." -msgid " made by " -msgstr "réalisé par" - msgid " when you send this message." msgstr "quand vous envoyez ce message." @@ -311,6 +308,9 @@ msgstr "<strong>Remerciez</strong> l'autorité publique ou" msgid "<strong>did not have</strong> the information requested." msgstr "<strong>n'avait pas </strong> les informations demandées." +msgid "?" +msgstr "" + msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "Un <a href=\"{{request_url}}\">suivi</a> à <em>{{request_title}}</em> a été envoyé à {{public_body_name}} par {{info_request_user}} le {{date}}." @@ -566,9 +566,6 @@ msgstr "Modifier votre mot de passe" msgid "Change your password on {{site_name}}" msgstr "Modifier votre mot de passe pour le site {{site_name}}" -msgid "Change your password {{site_name}}" -msgstr "Changer votre mot de passe {{site_name}}" - msgid "Charity registration" msgstr "Organisme de bienfaisance" @@ -743,6 +740,9 @@ msgstr "Journal d'information" msgid "Disclosure log URL" msgstr "adresse du journal d'information" +msgid "Do not fill in this field" +msgstr "" + msgid "Don't have a superuser account yet?" msgstr "" @@ -1402,6 +1402,9 @@ msgstr "Faire une<br/>\\n <strong>Nouvelle <span>demande</span><br/>\\n d'acc msgid "Make a request" msgstr "Demander l'accès à une information" +msgid "Make a request »" +msgstr "" + msgid "Make a request to these authorities" msgstr "" @@ -1903,6 +1906,9 @@ msgstr "ProfilePhoto|Draft" msgid "Public Bodies" msgstr "Organismes publics" +msgid "Public Body" +msgstr "" + msgid "Public Body Statistics" msgstr "Statistiques de l'organisme public" @@ -1915,6 +1921,9 @@ msgstr "Organismes publics - {{description}}" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "Organismes publics {{start_count}} à {{end_count}} de {{total_count}}" +msgid "Public authority statistics" +msgstr "" + msgid "Public authority – {{name}}" msgstr "Organisme public – {{name}}" @@ -2140,8 +2149,8 @@ msgstr "Répondre par e-mail " msgid "Respond to request" msgstr "Répondre à la demande" -msgid "Respond to the FOI request" -msgstr "Répondre a la demande d'accès à l'information" +msgid "Respond to the FOI request '{{request}}' made by {{user}}" +msgstr "" msgid "Respond using the web" msgstr "Répondre en utilisant le web" @@ -2345,9 +2354,6 @@ msgstr "" msgid "Special note for this authority!" msgstr "Remarque spéciale pour cette autorité!" -msgid "Start now »" -msgstr "Commencez dès maintenant »" - msgid "Start your own blog" msgstr "Commencez votre blog" @@ -2945,6 +2951,9 @@ msgstr "Impossible d'envoyer une réponse à {{username}}" msgid "Unable to send follow up message to {{username}}" msgstr "Impossible d'envoyer un message de suivi à {{username}}" +msgid "Unclassified or hidden requests are not counted." +msgstr "" + msgid "Unexpected search result type " msgstr "Type de résultat de recherche inattendu" @@ -3005,9 +3014,6 @@ msgstr "" msgid "User|About me" msgstr "User|About me" -msgid "User|Address" -msgstr "" - msgid "User|Admin level" msgstr "User|Admin level" @@ -3017,9 +3023,6 @@ msgstr "User|Ban text" msgid "User|Can make batch requests" msgstr "" -msgid "User|Dob" -msgstr "" - msgid "User|Email" msgstr "User|Email" @@ -3074,7 +3077,7 @@ msgstr "Voir l'adresse mail des demandes d'accès à l'information pour {{publi msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "Voir les demandes faites par {{user_name}}:" -msgid "View and search requests" +msgid "Browse and search requests" msgstr "Visualiser et parcourir les demandes d'information" msgid "View authorities" @@ -3083,7 +3086,7 @@ msgstr "Voir les institutions publiques" msgid "View email" msgstr "Voir l'email " -msgid "View requests" +msgid "Browse Requests" msgstr "Voir les demandes" msgid "Waiting clarification." diff --git a/locale/fr_CA/app.po b/locale/fr_CA/app.po index 0f071ed8c..924cc2048 100644 --- a/locale/fr_CA/app.po +++ b/locale/fr_CA/app.po @@ -18,9 +18,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-15 12:46+0100\n" -"PO-Revision-Date: 2014-05-15 11:56+0000\n" -"Last-Translator: louisecrow <louise@mysociety.org>\n" +"POT-Creation-Date: 2014-08-21 13:43+0000\n" +"PO-Revision-Date: 2014-08-21 13:44+0000\n" +"Last-Translator: Gareth Rees <gareth@mysociety.org>\n" "Language-Team: French (Canada) (http://www.transifex.com/projects/p/alaveteli/language/fr_CA/)\n" "Language: fr_CA\n" "MIME-Version: 1.0\n" @@ -102,9 +102,6 @@ msgstr "Il est déjà prévu que vous receviez des mises à jour par courriel co msgid " You will also be emailed updates about the request." msgstr "Vous recevrez aussi des mises à jour par courriel concernant cette demande." -msgid " made by " -msgstr "faite par" - msgid " when you send this message." msgstr "quand vous envoyez ce message." @@ -294,6 +291,9 @@ msgstr "<strong>Remerciez</strong> l'organisme ou " msgid "<strong>did not have</strong> the information requested." msgstr "<strong>n'avait pas </strong> les informations demandées." +msgid "?" +msgstr "" + msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "Un <a href=\"{{request_url}}\">suivi</a> à <em>{{request_title}}</em> a été envoyé à {{public_body_name}} par {{info_request_user}} le {{date}}." @@ -549,9 +549,6 @@ msgstr "Changer votre mot de passe" msgid "Change your password on {{site_name}}" msgstr "Changer votre mot de passe sur {{site_name}}" -msgid "Change your password {{site_name}}" -msgstr "Changer votre mot de passe {{site_name}}" - msgid "Charity registration" msgstr "Organisme de bienfaisance" @@ -726,6 +723,9 @@ msgstr "Disclosure log" msgid "Disclosure log URL" msgstr "Disclosure log URL" +msgid "Do not fill in this field" +msgstr "" + msgid "Don't have a superuser account yet?" msgstr "" @@ -1385,6 +1385,9 @@ msgstr "Faire une nouvelle<br/>\\n <strong>demande <span>d'accès</span><br/>\\ msgid "Make a request" msgstr "Faire une demande" +msgid "Make a request »" +msgstr "" + msgid "Make a request to these authorities" msgstr "" @@ -1886,6 +1889,9 @@ msgstr "ProfilePhoto|Draft" msgid "Public Bodies" msgstr "Organismes publics" +msgid "Public Body" +msgstr "" + msgid "Public Body Statistics" msgstr "Statistiques de l'organisme" @@ -1898,6 +1904,9 @@ msgstr "Organismes publics - {{description}}" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "Organismes publics {{start_count}} à {{end_count}} de {{total_count}}" +msgid "Public authority statistics" +msgstr "" + msgid "Public authority – {{name}}" msgstr "Organisme public – {{name}}" @@ -2123,8 +2132,8 @@ msgstr "Répondre par courriel" msgid "Respond to request" msgstr "Répondre à la demande" -msgid "Respond to the FOI request" -msgstr "Répondre à la demande d'accès aux documents" +msgid "Respond to the FOI request '{{request}}' made by {{user}}" +msgstr "" msgid "Respond using the web" msgstr "Répondre en utilisant le web" @@ -2328,9 +2337,6 @@ msgstr "" msgid "Special note for this authority!" msgstr "Remarque spéciale pour cet organisme!" -msgid "Start now »" -msgstr "C'est ici! »" - msgid "Start your own blog" msgstr "Commencez votre blog" @@ -2928,6 +2934,9 @@ msgstr "Impossible d'envoyer une réponse à {{username}}" msgid "Unable to send follow up message to {{username}}" msgstr "Impossible d'envoyer un message de suivi à {{username}}" +msgid "Unclassified or hidden requests are not counted." +msgstr "" + msgid "Unexpected search result type " msgstr "Type de résultat de recherche inattendu" @@ -2988,9 +2997,6 @@ msgstr "" msgid "User|About me" msgstr "User|About me" -msgid "User|Address" -msgstr "" - msgid "User|Admin level" msgstr "User|Admin level" @@ -3000,9 +3006,6 @@ msgstr "User|Ban text" msgid "User|Can make batch requests" msgstr "" -msgid "User|Dob" -msgstr "" - msgid "User|Email" msgstr "User|Email" @@ -3057,7 +3060,7 @@ msgstr "Voir l'adresse courriel pour {{public_body_name}}" msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "Voir les demandes faites par {{user_name}}:" -msgid "View and search requests" +msgid "Browse and search requests" msgstr "Parcourir les demandes passées" msgid "View authorities" @@ -3066,7 +3069,7 @@ msgstr "Voir les organismes" msgid "View email" msgstr "Voir le courriel" -msgid "View requests" +msgid "Browse Requests" msgstr "Voir les demandes" msgid "Waiting clarification." diff --git a/locale/gl/app.po b/locale/gl/app.po index 35fbfad62..bc568166f 100644 --- a/locale/gl/app.po +++ b/locale/gl/app.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-15 12:46+0100\n" -"PO-Revision-Date: 2014-05-15 11:56+0000\n" -"Last-Translator: louisecrow <louise@mysociety.org>\n" +"POT-Creation-Date: 2014-08-21 13:43+0000\n" +"PO-Revision-Date: 2014-08-21 13:44+0000\n" +"Last-Translator: Gareth Rees <gareth@mysociety.org>\n" "Language-Team: Galician (http://www.transifex.com/projects/p/alaveteli/language/gl/)\n" "Language: gl\n" "MIME-Version: 1.0\n" @@ -100,9 +100,6 @@ msgstr " Ya está recibiendo actualizaciones por correo sobre la solicitud." msgid " You will also be emailed updates about the request." msgstr " Recibirá actualizaciones por correo sobre esta solicitud." -msgid " made by " -msgstr " hecha por " - msgid " when you send this message." msgstr " cuando envió este mensaje." @@ -331,6 +328,9 @@ msgstr "<strong>Dé las gracias</strong> al organismo público o " msgid "<strong>did not have</strong> the information requested." msgstr "<strong>no tenía</strong> la información solicitada." +msgid "?" +msgstr "" + msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "" @@ -596,9 +596,6 @@ msgstr "Cambia tu contraseña" msgid "Change your password on {{site_name}}" msgstr "Cambia tu contraseña en {{site_name}}" -msgid "Change your password {{site_name}}" -msgstr "Cambia tu contraseña en {{site_name}}" - msgid "Charity registration" msgstr "Registro de la ONG" @@ -777,6 +774,9 @@ msgstr "" msgid "Disclosure log URL" msgstr "" +msgid "Do not fill in this field" +msgstr "" + msgid "Don't have a superuser account yet?" msgstr "" @@ -1490,6 +1490,9 @@ msgstr "" msgid "Make a request" msgstr "Enviar solicitud" +msgid "Make a request »" +msgstr "" + msgid "Make a request to these authorities" msgstr "" @@ -2002,6 +2005,9 @@ msgstr "ProfilePhoto|Draft" msgid "Public Bodies" msgstr "" +msgid "Public Body" +msgstr "" + msgid "Public Body Statistics" msgstr "" @@ -2014,6 +2020,9 @@ msgstr "Organismos públicos - {{description}}" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "Organismos públicos {{start_count}} a {{end_count}} de {{total_count}}" +msgid "Public authority statistics" +msgstr "" + msgid "Public authority – {{name}}" msgstr "" @@ -2241,8 +2250,8 @@ msgstr "Contestar por correo" msgid "Respond to request" msgstr "Contestar la solicitud" -msgid "Respond to the FOI request" -msgstr "Contestar la solicitud" +msgid "Respond to the FOI request '{{request}}' made by {{user}}" +msgstr "" msgid "Respond using the web" msgstr "Contestar vía web" @@ -2455,9 +2464,6 @@ msgstr "" msgid "Special note for this authority!" msgstr "¡Notas especiales sobre este organismo!" -msgid "Start now »" -msgstr "Comience ahora »" - msgid "Start your own blog" msgstr "Crea tu propio blog" @@ -3099,6 +3105,9 @@ msgstr "No se pudo enviar la respuesta a {{username}}" msgid "Unable to send follow up message to {{username}}" msgstr "No se pudo enviar la respuesta a {{username}}" +msgid "Unclassified or hidden requests are not counted." +msgstr "" + msgid "Unexpected search result type " msgstr "Se encontró un tipo de resultado inesperado " @@ -3162,9 +3171,6 @@ msgstr "" msgid "User|About me" msgstr "User|About me" -msgid "User|Address" -msgstr "" - msgid "User|Admin level" msgstr "User|Admin level" @@ -3174,9 +3180,6 @@ msgstr "User|Ban text" msgid "User|Can make batch requests" msgstr "" -msgid "User|Dob" -msgstr "" - msgid "User|Email" msgstr "User|Email" @@ -3231,7 +3234,7 @@ msgstr "Ver dirección de correo para '{{public_body_name}}'" msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "Ver solicitudes de acceso a información hechas por {{user_name}}:" -msgid "View and search requests" +msgid "Browse and search requests" msgstr "Ver y buscar solicitudes" msgid "View authorities" @@ -3240,7 +3243,7 @@ msgstr "Ver organismos públicos" msgid "View email" msgstr "Ver correo" -msgid "View requests" +msgid "Browse Requests" msgstr "Ver solicitudes" msgid "Waiting clarification." diff --git a/locale/he_IL/app.po b/locale/he_IL/app.po index f5c54583c..bf550d7b6 100644 --- a/locale/he_IL/app.po +++ b/locale/he_IL/app.po @@ -20,9 +20,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-15 12:46+0100\n" -"PO-Revision-Date: 2014-05-15 11:56+0000\n" -"Last-Translator: louisecrow <louise@mysociety.org>\n" +"POT-Creation-Date: 2014-08-21 13:43+0000\n" +"PO-Revision-Date: 2014-08-21 13:44+0000\n" +"Last-Translator: Gareth Rees <gareth@mysociety.org>\n" "Language-Team: Hebrew (Israel) (http://www.transifex.com/projects/p/alaveteli/language/he_IL/)\n" "Language: he_IL\n" "MIME-Version: 1.0\n" @@ -102,9 +102,6 @@ msgstr "כתובת הדוא\"ל רשומה לקבלת עדכונים על הבק msgid " You will also be emailed updates about the request." msgstr "תקבלו גם עדכונים בדוא\"ל על הבקשה." -msgid " made by " -msgstr "נוצר על-ידי" - msgid " when you send this message." msgstr "כאשר אתם שולחים הודעה זו." @@ -296,6 +293,9 @@ msgstr "<strong>הודו</strong> לרשות הציבורית או " msgid "<strong>did not have</strong> the information requested." msgstr "<strong>אין</strong> את המידע המבוקש." +msgid "?" +msgstr "" + msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "<a href=\"{{request_url}}\">מעקב</a> ל- <em>{{request_title}}</em> נשלחה ל- {{public_body_name}} על-ידי {{info_request_user}} בתאריך {{date}}." @@ -551,9 +551,6 @@ msgstr "שינוי סיסמה" msgid "Change your password on {{site_name}}" msgstr "שנה סיסמתך ב {{site_name}}" -msgid "Change your password {{site_name}}" -msgstr "שנה סיסמתך {{site_name}}" - msgid "Charity registration" msgstr "רישום צדקה" @@ -731,6 +728,9 @@ msgstr "יומן גילוי נאות" msgid "Disclosure log URL" msgstr "כתובת יומן גילוי נאות" +msgid "Do not fill in this field" +msgstr "" + msgid "Don't have a superuser account yet?" msgstr "" @@ -1390,6 +1390,9 @@ msgstr "הגישו<br><strong>בקשה</strong><br><span>לפתיחת</span> <br msgid "Make a request" msgstr "בקשה חדשה" +msgid "Make a request »" +msgstr "" + msgid "Make a request to these authorities" msgstr "" @@ -1891,6 +1894,9 @@ msgstr "ProfilePhoto|Draft" msgid "Public Bodies" msgstr "" +msgid "Public Body" +msgstr "" + msgid "Public Body Statistics" msgstr "" @@ -1903,6 +1909,9 @@ msgstr "רשויות ציבוריות - {{description}}" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "רשויות ציבוריות {{start_count}} עד {{end_count}} מתוך {{total_count}}" +msgid "Public authority statistics" +msgstr "" + msgid "Public authority – {{name}}" msgstr "רשות ציבורית – {{name}}" @@ -2128,8 +2137,8 @@ msgstr "הגיבו בדוא\"ל" msgid "Respond to request" msgstr "להגיב לבקשה" -msgid "Respond to the FOI request" -msgstr "הגיבו לבקשה" +msgid "Respond to the FOI request '{{request}}' made by {{user}}" +msgstr "" msgid "Respond using the web" msgstr "הגיבו דרך הרשת" @@ -2333,9 +2342,6 @@ msgstr "" msgid "Special note for this authority!" msgstr "הערה מיוחדת לרשות זו" -msgid "Start now »" -msgstr "התחילו עכשיו »" - msgid "Start your own blog" msgstr "צרו את הבלוג שלכם" @@ -2933,6 +2939,9 @@ msgstr "לא ניתן לשלוח תגובה ל- {{username}}" msgid "Unable to send follow up message to {{username}}" msgstr "לא ניתן לשלוח הודעת מעקב ל- {{username}}" +msgid "Unclassified or hidden requests are not counted." +msgstr "" + msgid "Unexpected search result type " msgstr "תוצאת חיפוש לא צפויה" @@ -2993,9 +3002,6 @@ msgstr "" msgid "User|About me" msgstr "User|About me" -msgid "User|Address" -msgstr "" - msgid "User|Admin level" msgstr "User|Admin level" @@ -3005,9 +3011,6 @@ msgstr "User|Ban text" msgid "User|Can make batch requests" msgstr "" -msgid "User|Dob" -msgstr "" - msgid "User|Email" msgstr "User|Email" @@ -3062,7 +3065,7 @@ msgstr "צפו בדוא\"ל של בקשות מידע ל- '{{public_body_name}}'" msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "צפו בבקשות מידע שהוגשו על-ידי {{user_name}}:" -msgid "View and search requests" +msgid "Browse and search requests" msgstr "צפו וחפשו בקשות מידע" msgid "View authorities" @@ -3071,7 +3074,7 @@ msgstr "רשויות" msgid "View email" msgstr "צפו בדואר האלקטרוני" -msgid "View requests" +msgid "Browse Requests" msgstr "בקשות מידע" msgid "Waiting clarification." diff --git a/locale/hr/app.po b/locale/hr/app.po index 06e6f01c0..9fd826c47 100644 --- a/locale/hr/app.po +++ b/locale/hr/app.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-15 12:46+0100\n" -"PO-Revision-Date: 2014-05-15 11:56+0000\n" -"Last-Translator: louisecrow <louise@mysociety.org>\n" +"POT-Creation-Date: 2014-08-21 13:43+0000\n" +"PO-Revision-Date: 2014-08-21 13:44+0000\n" +"Last-Translator: Gareth Rees <gareth@mysociety.org>\n" "Language-Team: Croatian (http://www.transifex.com/projects/p/alaveteli/language/hr/)\n" "Language: hr\n" "MIME-Version: 1.0\n" @@ -103,9 +103,6 @@ msgstr " Ažuriranja zahtjeva već su Vam poslana putem e-maila." msgid " You will also be emailed updates about the request." msgstr " Ažuriranja zahtjeva će Vam takođe biti poslana putem e-maila." -msgid " made by " -msgstr " načinjeno od strane " - msgid " when you send this message." msgstr " kada pošaljete ovu poruku." @@ -317,6 +314,9 @@ msgstr "" msgid "<strong>did not have</strong> the information requested." msgstr "<strong>nije sadržavao</strong> traženu informaciju." +msgid "?" +msgstr "" + msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "" @@ -582,9 +582,6 @@ msgstr "Promijeniti Vaš password" msgid "Change your password on {{site_name}}" msgstr "Promijeniti password na {{site_name}}" -msgid "Change your password {{site_name}}" -msgstr "Promjenite Vaš password {{site_name}}" - msgid "Charity registration" msgstr "Registracija nevladine organizacije" @@ -761,6 +758,9 @@ msgstr "" msgid "Disclosure log URL" msgstr "" +msgid "Do not fill in this field" +msgstr "" + msgid "Don't have a superuser account yet?" msgstr "" @@ -1469,6 +1469,9 @@ msgstr "" msgid "Make a request" msgstr "Podnesi zahtjev" +msgid "Make a request »" +msgstr "" + msgid "Make a request to these authorities" msgstr "" @@ -1981,6 +1984,9 @@ msgstr "Slika na profilu|Skica" msgid "Public Bodies" msgstr "" +msgid "Public Body" +msgstr "" + msgid "Public Body Statistics" msgstr "" @@ -1993,6 +1999,9 @@ msgstr "Javne ustanove - {{description}}" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "" +msgid "Public authority statistics" +msgstr "" + msgid "Public authority – {{name}}" msgstr "" @@ -2220,8 +2229,8 @@ msgstr "Odgovoriti e-mailom" msgid "Respond to request" msgstr "Odgovoriti na zahtjev" -msgid "Respond to the FOI request" -msgstr "Odgovoriti na Zahtjev za slobodan pristup informacijama" +msgid "Respond to the FOI request '{{request}}' made by {{user}}" +msgstr "" msgid "Respond using the web" msgstr "Odgovoriti preko web-a" @@ -2433,9 +2442,6 @@ msgstr "" msgid "Special note for this authority!" msgstr "Posebna napomena za ovu ustanovu!" -msgid "Start now »" -msgstr "Počni sada »" - msgid "Start your own blog" msgstr "Započnite Vaš blog" @@ -3067,6 +3073,9 @@ msgstr "Ne možemo poslati poruku za {{username}}" msgid "Unable to send follow up message to {{username}}" msgstr "Ne možemo poslati popratnu pokuku za {{username}}" +msgid "Unclassified or hidden requests are not counted." +msgstr "" + msgid "Unexpected search result type " msgstr "" @@ -3132,9 +3141,6 @@ msgstr "" msgid "User|About me" msgstr "Korisnik|O meni" -msgid "User|Address" -msgstr "" - msgid "User|Admin level" msgstr "Korisnik|Administratorski nivo" @@ -3144,9 +3150,6 @@ msgstr "Korisnik|tekst isključenja" msgid "User|Can make batch requests" msgstr "" -msgid "User|Dob" -msgstr "" - msgid "User|Email" msgstr "Korisnik|E-mail" @@ -3201,7 +3204,7 @@ msgstr "Pogledati ZOSPI e-mail adrese za {{public_body_name}}" msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "Pegledati Zahjeve za slobodan pristup informacijama napravljene od strane {{user_name}}:" -msgid "View and search requests" +msgid "Browse and search requests" msgstr "Pregledaj i pretraži zahtjeve" msgid "View authorities" @@ -3210,7 +3213,7 @@ msgstr "Vidjeti ustanove" msgid "View email" msgstr "Pogledati e-mail" -msgid "View requests" +msgid "Browse Requests" msgstr "Vidjeti zahtjeve" msgid "Waiting clarification." diff --git a/locale/hr_HR/app.po b/locale/hr_HR/app.po index ec7200c50..64550864b 100644 --- a/locale/hr_HR/app.po +++ b/locale/hr_HR/app.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-15 12:46+0100\n" -"PO-Revision-Date: 2014-05-15 11:56+0000\n" -"Last-Translator: louisecrow <louise@mysociety.org>\n" +"POT-Creation-Date: 2014-08-21 13:43+0000\n" +"PO-Revision-Date: 2014-08-21 13:44+0000\n" +"Last-Translator: Gareth Rees <gareth@mysociety.org>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/alaveteli/language/hr_HR/)\n" "Language: hr_HR\n" "MIME-Version: 1.0\n" @@ -93,9 +93,6 @@ msgstr "" msgid " You will also be emailed updates about the request." msgstr "" -msgid " made by " -msgstr "" - msgid " when you send this message." msgstr "" @@ -285,6 +282,9 @@ msgstr "" msgid "<strong>did not have</strong> the information requested." msgstr "" +msgid "?" +msgstr "" + msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "" @@ -540,9 +540,6 @@ msgstr "" msgid "Change your password on {{site_name}}" msgstr "" -msgid "Change your password {{site_name}}" -msgstr "" - msgid "Charity registration" msgstr "" @@ -717,6 +714,9 @@ msgstr "" msgid "Disclosure log URL" msgstr "" +msgid "Do not fill in this field" +msgstr "" + msgid "Don't have a superuser account yet?" msgstr "" @@ -1377,6 +1377,9 @@ msgstr "Napravite novi <br/>\\n <strong>Sloboda><br/> informacije<br/>\\n zahtij msgid "Make a request" msgstr "" +msgid "Make a request »" +msgstr "" + msgid "Make a request to these authorities" msgstr "" @@ -1878,6 +1881,9 @@ msgstr "" msgid "Public Bodies" msgstr "" +msgid "Public Body" +msgstr "" + msgid "Public Body Statistics" msgstr "" @@ -1890,6 +1896,9 @@ msgstr "" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "" +msgid "Public authority statistics" +msgstr "" + msgid "Public authority – {{name}}" msgstr "" @@ -2115,7 +2124,7 @@ msgstr "" msgid "Respond to request" msgstr "" -msgid "Respond to the FOI request" +msgid "Respond to the FOI request '{{request}}' made by {{user}}" msgstr "" msgid "Respond using the web" @@ -2322,9 +2331,6 @@ msgstr "" msgid "Special note for this authority!" msgstr "" -msgid "Start now »" -msgstr "" - msgid "Start your own blog" msgstr "" @@ -2925,6 +2931,9 @@ msgstr "" msgid "Unable to send follow up message to {{username}}" msgstr "" +msgid "Unclassified or hidden requests are not counted." +msgstr "" + msgid "Unexpected search result type " msgstr "" @@ -2985,9 +2994,6 @@ msgstr "" msgid "User|About me" msgstr "" -msgid "User|Address" -msgstr "" - msgid "User|Admin level" msgstr "" @@ -2997,9 +3003,6 @@ msgstr "" msgid "User|Can make batch requests" msgstr "" -msgid "User|Dob" -msgstr "" - msgid "User|Email" msgstr "" @@ -3054,7 +3057,7 @@ msgstr "" msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "" -msgid "View and search requests" +msgid "Browse and search requests" msgstr "" msgid "View authorities" @@ -3063,7 +3066,7 @@ msgstr "" msgid "View email" msgstr "" -msgid "View requests" +msgid "Browse Requests" msgstr "" msgid "Waiting clarification." diff --git a/locale/hu_HU/app.po b/locale/hu_HU/app.po index 765de6706..4b06e9d89 100644 --- a/locale/hu_HU/app.po +++ b/locale/hu_HU/app.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-15 12:46+0100\n" -"PO-Revision-Date: 2014-05-15 11:56+0000\n" -"Last-Translator: louisecrow <louise@mysociety.org>\n" +"POT-Creation-Date: 2014-08-21 13:43+0000\n" +"PO-Revision-Date: 2014-08-21 13:44+0000\n" +"Last-Translator: Gareth Rees <gareth@mysociety.org>\n" "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/alaveteli/language/hu_HU/)\n" "Language: hu_HU\n" "MIME-Version: 1.0\n" @@ -99,9 +99,6 @@ msgstr " E-mailben már tájékoztattuk az igényléssel kapcsolatos fejleménye msgid " You will also be emailed updates about the request." msgstr " E-mailben is tájékoztatjuk az igényléssel kapcsolatos fejleményekről. " -msgid " made by " -msgstr "készítette: " - msgid " when you send this message." msgstr " részére, így a címzett megismerheti azt." @@ -327,6 +324,9 @@ msgstr "<strong>Köszönje meg</strong> a közintézménynek vagy" msgid "<strong>did not have</strong> the information requested." msgstr "<strong>nem kapta meg</strong> a kért információt. " +msgid "?" +msgstr "" + msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "A(z) <em>{{request_title}}</em> adatigénylésre vonatkozóan {{info_request_user}} <a href=\"{{request_url}}\">emlékeztetőt</a> küldött a(z) {{public_body_name}} részére {{date}} napon." @@ -588,9 +588,6 @@ msgstr "Jelszavam módosítása " msgid "Change your password on {{site_name}}" msgstr "{{site_name}} jelszó módosítása" -msgid "Change your password {{site_name}}" -msgstr "{{site_name}} jelszó módosítása" - msgid "Charity registration" msgstr "Jótékonysági szervezet regisztrációja " @@ -769,6 +766,9 @@ msgstr "Közzétételi napló" msgid "Disclosure log URL" msgstr "" +msgid "Do not fill in this field" +msgstr "" + msgid "Don't have a superuser account yet?" msgstr "" @@ -1489,6 +1489,9 @@ msgstr "" msgid "Make a request" msgstr "Új igénylés" +msgid "Make a request »" +msgstr "" + msgid "Make a request to these authorities" msgstr "" @@ -2003,6 +2006,9 @@ msgstr "ProfilePhoto|Draft" msgid "Public Bodies" msgstr "" +msgid "Public Body" +msgstr "" + msgid "Public Body Statistics" msgstr "" @@ -2015,6 +2021,9 @@ msgstr "Adatgazdák - {{description}} " msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "Adatgazdák: {{start_count}} - {{end_count}}, összesen: {{total_count}} " +msgid "Public authority statistics" +msgstr "" + msgid "Public authority – {{name}}" msgstr "" @@ -2242,8 +2251,8 @@ msgstr "Válasz küldése e-mailben " msgid "Respond to request" msgstr "Válasz az adatigénylésre" -msgid "Respond to the FOI request" -msgstr "Válasz a közérdekűadat-igénylésre" +msgid "Respond to the FOI request '{{request}}' made by {{user}}" +msgstr "" msgid "Respond using the web" msgstr "Válasz a weben " @@ -2456,9 +2465,6 @@ msgstr "" msgid "Special note for this authority!" msgstr "Egyéb megállapítások az adatgazdával kapcsolatban:" -msgid "Start now »" -msgstr "Máris kezdhetjük »" - msgid "Start your own blog" msgstr "Saját blog indítása " @@ -3100,6 +3106,9 @@ msgstr "Nem sikerült választ küldeni {{username}} részére " msgid "Unable to send follow up message to {{username}}" msgstr "Nem sikerült nyomon követési üzenetet küldeni {{username}} részére " +msgid "Unclassified or hidden requests are not counted." +msgstr "" + msgid "Unexpected search result type " msgstr "Váratlan keresésieredmény-típus " @@ -3165,9 +3174,6 @@ msgstr "" msgid "User|About me" msgstr "User|About me" -msgid "User|Address" -msgstr "" - msgid "User|Admin level" msgstr "User|Admin level" @@ -3177,9 +3183,6 @@ msgstr "User|Ban text" msgid "User|Can make batch requests" msgstr "" -msgid "User|Dob" -msgstr "" - msgid "User|Email" msgstr "User|Email" @@ -3234,7 +3237,7 @@ msgstr "{{public_body_name}} közérdekűadat-igényléshez használt e-mail cí msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "{{user_name}} által benyújtott közérdekűadat-igénylések megtekintése " -msgid "View and search requests" +msgid "Browse and search requests" msgstr "Böngészés az adatigénylések között" msgid "View authorities" @@ -3243,7 +3246,7 @@ msgstr "Adatgazdák " msgid "View email" msgstr "E-mail megtekintése " -msgid "View requests" +msgid "Browse Requests" msgstr "Adatigénylések" msgid "Waiting clarification." diff --git a/locale/id/app.po b/locale/id/app.po index 99600da24..8c35fc006 100644 --- a/locale/id/app.po +++ b/locale/id/app.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-15 12:46+0100\n" -"PO-Revision-Date: 2014-05-15 11:56+0000\n" -"Last-Translator: louisecrow <louise@mysociety.org>\n" +"POT-Creation-Date: 2014-08-21 13:43+0000\n" +"PO-Revision-Date: 2014-08-21 13:44+0000\n" +"Last-Translator: Gareth Rees <gareth@mysociety.org>\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/alaveteli/language/id/)\n" "Language: id\n" "MIME-Version: 1.0\n" @@ -106,9 +106,6 @@ msgstr " Update tentang permintaan tersebut sudah dikirimkan ke email Anda." msgid " You will also be emailed updates about the request." msgstr " Anda juga akan dikirimkan email berisi update tentang permintaan." -msgid " made by " -msgstr " dibuat oleh " - msgid " when you send this message." msgstr " saat Anda mengirim pesan ini." @@ -351,6 +348,9 @@ msgstr "<strong>Berterima kasih kepada</strong> otoritas publik atau " msgid "<strong>did not have</strong> the information requested." msgstr "<strong>tidak memiliki</strong> informasi yang diminta." +msgid "?" +msgstr "" + msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "Sebuah <a href=\"{{request_url}}\">tindak lanjut</a> untuk <em>{{request_title}}</em> telah terkirim kepada {{public_body_name}} oleh {{info_request_user}} pada {{date}}." @@ -616,9 +616,6 @@ msgstr "Mengubah kode sandi Anda" msgid "Change your password on {{site_name}}" msgstr "Mengubah kode sandi Anda di{{site_name}}" -msgid "Change your password {{site_name}}" -msgstr "Mengubah kode sandi Anda {{site_name}}" - msgid "Charity registration" msgstr "Pendaftaran Amal" @@ -797,6 +794,9 @@ msgstr "Pembukaan log" msgid "Disclosure log URL" msgstr "Pembukaan riwayat URL" +msgid "Do not fill in this field" +msgstr "" + msgid "Don't have a superuser account yet?" msgstr "" @@ -1514,6 +1514,9 @@ msgstr "" msgid "Make a request" msgstr "Buat permintaan" +msgid "Make a request »" +msgstr "" + msgid "Make a request to these authorities" msgstr "" @@ -2026,6 +2029,9 @@ msgstr "ProfilePhoto|Draft" msgid "Public Bodies" msgstr "" +msgid "Public Body" +msgstr "" + msgid "Public Body Statistics" msgstr "" @@ -2038,6 +2044,9 @@ msgstr "Otoritas publik - {{description}}" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "Ptoritas publik {{start_count}} ke{{end_count}} dari {{total_count}}" +msgid "Public authority statistics" +msgstr "" + msgid "Public authority – {{name}}" msgstr "Otoritas publik - {{name}}" @@ -2265,8 +2274,8 @@ msgstr "Merespon lewat email" msgid "Respond to request" msgstr "Merespon permintaan" -msgid "Respond to the FOI request" -msgstr "Merespon pemintaan FOI" +msgid "Respond to the FOI request '{{request}}' made by {{user}}" +msgstr "" msgid "Respond using the web" msgstr "Merespon lewat web" @@ -2477,9 +2486,6 @@ msgstr "" msgid "Special note for this authority!" msgstr "Catatan khusus untuk otoritas ini!" -msgid "Start now »" -msgstr "Mulai sekarang »" - msgid "Start your own blog" msgstr "Mulai blog Anda sendiri" @@ -3118,6 +3124,9 @@ msgstr "Tidak dapat mengirimkan balasan kepada {{username}}" msgid "Unable to send follow up message to {{username}}" msgstr "Tidak dapat mengirimkan pesan tindak lanjut kepada {{username}}" +msgid "Unclassified or hidden requests are not counted." +msgstr "" + msgid "Unexpected search result type " msgstr "Jenis hasil pencarian yang tidak terduga " @@ -3183,9 +3192,6 @@ msgstr "" msgid "User|About me" msgstr "User|About me" -msgid "User|Address" -msgstr "" - msgid "User|Admin level" msgstr "User|Admin level" @@ -3195,9 +3201,6 @@ msgstr "User|Ban text" msgid "User|Can make batch requests" msgstr "" -msgid "User|Dob" -msgstr "" - msgid "User|Email" msgstr "User|Email" @@ -3252,7 +3255,7 @@ msgstr "Tampilkan alamat email FOI untuk {{public_body_name}}" msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "Tampilkan permintaan Freedom of Information yang dibuat oleh {{user_name}}:" -msgid "View and search requests" +msgid "Browse and search requests" msgstr "Tampilkan dan cari permintaan" msgid "View authorities" @@ -3261,7 +3264,7 @@ msgstr "Tampilkan otoritas" msgid "View email" msgstr "Tampilkan email" -msgid "View requests" +msgid "Browse Requests" msgstr "Tampilkan permintaan" msgid "Waiting clarification." diff --git a/locale/it/app.po b/locale/it/app.po index bebfe1b75..66effc511 100644 --- a/locale/it/app.po +++ b/locale/it/app.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-15 12:46+0100\n" -"PO-Revision-Date: 2014-05-15 11:56+0000\n" -"Last-Translator: louisecrow <louise@mysociety.org>\n" +"POT-Creation-Date: 2014-08-21 13:43+0000\n" +"PO-Revision-Date: 2014-08-21 13:44+0000\n" +"Last-Translator: Gareth Rees <gareth@mysociety.org>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/alaveteli/language/it/)\n" "Language: it\n" "MIME-Version: 1.0\n" @@ -91,9 +91,6 @@ msgstr " Il tuo nominativo è già stato inserito nelle notifiche via email rela msgid " You will also be emailed updates about the request." msgstr " Sarai anche aggiornato via email sullo stato della tua richiesta." -msgid " made by " -msgstr "fatto da " - msgid " when you send this message." msgstr "quando invii questo messaggio." @@ -283,6 +280,9 @@ msgstr "<strong>Ringrazia</strong> la pubblica autorità o " msgid "<strong>did not have</strong> the information requested." msgstr "<strong>non otterrai</strong> l'informazione richiesta." +msgid "?" +msgstr "" + msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "" @@ -540,9 +540,6 @@ msgstr "Cambia la tua password" msgid "Change your password on {{site_name}}" msgstr "Cambia la tua password" -msgid "Change your password {{site_name}}" -msgstr "Cambia la tua password su {{site_name}}" - msgid "Charity registration" msgstr "Registrazione NoProfit" @@ -717,6 +714,9 @@ msgstr "" msgid "Disclosure log URL" msgstr "" +msgid "Do not fill in this field" +msgstr "" + msgid "Don't have a superuser account yet?" msgstr "" @@ -1376,6 +1376,9 @@ msgstr "" msgid "Make a request" msgstr "Inserisci richiesta" +msgid "Make a request »" +msgstr "" + msgid "Make a request to these authorities" msgstr "" @@ -1877,6 +1880,9 @@ msgstr "" msgid "Public Bodies" msgstr "" +msgid "Public Body" +msgstr "" + msgid "Public Body Statistics" msgstr "" @@ -1889,6 +1895,9 @@ msgstr "" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "" +msgid "Public authority statistics" +msgstr "" + msgid "Public authority – {{name}}" msgstr "" @@ -2114,7 +2123,7 @@ msgstr "Rispondi via email" msgid "Respond to request" msgstr "" -msgid "Respond to the FOI request" +msgid "Respond to the FOI request '{{request}}' made by {{user}}" msgstr "" msgid "Respond using the web" @@ -2319,9 +2328,6 @@ msgstr "" msgid "Special note for this authority!" msgstr "" -msgid "Start now »" -msgstr "" - msgid "Start your own blog" msgstr "" @@ -2919,6 +2925,9 @@ msgstr "" msgid "Unable to send follow up message to {{username}}" msgstr "" +msgid "Unclassified or hidden requests are not counted." +msgstr "" + msgid "Unexpected search result type " msgstr "" @@ -2979,9 +2988,6 @@ msgstr "" msgid "User|About me" msgstr "" -msgid "User|Address" -msgstr "" - msgid "User|Admin level" msgstr "" @@ -2991,9 +2997,6 @@ msgstr "" msgid "User|Can make batch requests" msgstr "" -msgid "User|Dob" -msgstr "" - msgid "User|Email" msgstr "" @@ -3048,7 +3051,7 @@ msgstr "" msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "" -msgid "View and search requests" +msgid "Browse and search requests" msgstr "Guarda e cerca richieste" msgid "View authorities" @@ -3057,7 +3060,7 @@ msgstr "Guarda autorità" msgid "View email" msgstr "" -msgid "View requests" +msgid "Browse Requests" msgstr "Guarda richieste" msgid "Waiting clarification." diff --git a/locale/mk_MK/app.po b/locale/mk_MK/app.po index c059275db..5eff5857a 100644 --- a/locale/mk_MK/app.po +++ b/locale/mk_MK/app.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-15 12:46+0100\n" -"PO-Revision-Date: 2014-05-15 11:56+0000\n" -"Last-Translator: louisecrow <louise@mysociety.org>\n" +"POT-Creation-Date: 2014-08-21 13:43+0000\n" +"PO-Revision-Date: 2014-08-21 13:44+0000\n" +"Last-Translator: Gareth Rees <gareth@mysociety.org>\n" "Language-Team: Macedonian (Macedonia) (http://www.transifex.com/projects/p/alaveteli/language/mk_MK/)\n" "Language: mk_MK\n" "MIME-Version: 1.0\n" @@ -89,9 +89,6 @@ msgstr " Веќе ви се испратени новости за барање msgid " You will also be emailed updates about the request." msgstr " Исто така ќе ви бидат испратени новости за барањето по е-пошта." -msgid " made by " -msgstr " креирано од " - msgid " when you send this message." msgstr " кога ќе ја испратите оваа порака." @@ -281,6 +278,9 @@ msgstr "<strong>Заблагодарете</strong> му се ја имател msgid "<strong>did not have</strong> the information requested." msgstr "<strong>ја немаше</strong> бараната информација." +msgid "?" +msgstr "" + msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "<a href=\"{{request_url}}\">Реакција</a> на <em>{{request_title}}</em> беше испратена на {{public_body_name}} од {{info_request_user}} на {{date}}." @@ -536,9 +536,6 @@ msgstr "Променете ја лозинката" msgid "Change your password on {{site_name}}" msgstr "Променете ја лозинката на {{site_name}}" -msgid "Change your password {{site_name}}" -msgstr "Променете ја лозинката {{site_name}}" - msgid "Charity registration" msgstr "Регистрација на добротворна органзиација" @@ -713,6 +710,9 @@ msgstr "Дневник на објави" msgid "Disclosure log URL" msgstr "URL на дневник на објави" +msgid "Do not fill in this field" +msgstr "" + msgid "Don't have a superuser account yet?" msgstr "" @@ -1372,6 +1372,9 @@ msgstr "Направи ново<br/>\\n <strong>Барање за Слобод msgid "Make a request" msgstr "Поднесете барање" +msgid "Make a request »" +msgstr "" + msgid "Make a request to these authorities" msgstr "" @@ -1873,6 +1876,9 @@ msgstr "ProfilePhoto|Draft" msgid "Public Bodies" msgstr "Јавни институции" +msgid "Public Body" +msgstr "" + msgid "Public Body Statistics" msgstr "Статистика за јавни институции" @@ -1885,6 +1891,9 @@ msgstr "Јавни надлежни органи - {{description}}" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "Јавни надлежни органи {{start_count}} до {{end_count}} од {{total_count}}" +msgid "Public authority statistics" +msgstr "" + msgid "Public authority – {{name}}" msgstr "Јавен надлежен орган – {{name}}" @@ -2110,8 +2119,8 @@ msgstr "Одговорете по е-пошта" msgid "Respond to request" msgstr "Одговорете на барање" -msgid "Respond to the FOI request" -msgstr "Одговорете на барањето за слободен пристап до информации од јавен карактер" +msgid "Respond to the FOI request '{{request}}' made by {{user}}" +msgstr "" msgid "Respond using the web" msgstr "Одговорете преку веб" @@ -2315,9 +2324,6 @@ msgstr "" msgid "Special note for this authority!" msgstr "Специјална белешка за овој имател!" -msgid "Start now »" -msgstr "Почнете сега »" - msgid "Start your own blog" msgstr "Почнете сопствен блог" @@ -2915,6 +2921,9 @@ msgstr "Не може да се испрати одговор на {{username}}" msgid "Unable to send follow up message to {{username}}" msgstr "Не може да се испрати порака за реакција до {{username}}" +msgid "Unclassified or hidden requests are not counted." +msgstr "" + msgid "Unexpected search result type " msgstr "Неочекуван тип на резултат од пребарување " @@ -2980,9 +2989,6 @@ msgstr "" msgid "User|About me" msgstr "User|За мене" -msgid "User|Address" -msgstr "" - msgid "User|Admin level" msgstr "User|Администраторско ниво" @@ -2992,9 +2998,6 @@ msgstr "User|Текст за исклучување" msgid "User|Can make batch requests" msgstr "" -msgid "User|Dob" -msgstr "" - msgid "User|Email" msgstr "User|Е-пошта" @@ -3049,7 +3052,7 @@ msgstr "Видете ја адресата за е-пошта за слобод msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "Видете ги барањата за слободен пристап до информации од јавен карактер направени од {{user_name}}:" -msgid "View and search requests" +msgid "Browse and search requests" msgstr "Видете и пребарајте барања" msgid "View authorities" @@ -3058,7 +3061,7 @@ msgstr "Видете ги имателите" msgid "View email" msgstr "Видете е-пошта" -msgid "View requests" +msgid "Browse Requests" msgstr "Видете барања" msgid "Waiting clarification." diff --git a/locale/model_attributes.rb b/locale/model_attributes.rb index 8cbe8528f..41b07e052 100644 --- a/locale/model_attributes.rb +++ b/locale/model_attributes.rb @@ -126,11 +126,9 @@ _('TrackThing|Track query') _('TrackThing|Track type') _('User') _('User|About me') -_('User|Address') _('User|Admin level') _('User|Ban text') _('User|Can make batch requests') -_('User|Dob') _('User|Email') _('User|Email bounce message') _('User|Email bounced at') diff --git a/locale/nb_NO/app.po b/locale/nb_NO/app.po index 79041f21f..f43bd8b45 100644 --- a/locale/nb_NO/app.po +++ b/locale/nb_NO/app.po @@ -17,9 +17,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-15 12:46+0100\n" -"PO-Revision-Date: 2014-06-13 21:03+0000\n" -"Last-Translator: pere <pere-transifex@hungry.com>\n" +"POT-Creation-Date: 2014-08-21 13:43+0000\n" +"PO-Revision-Date: 2014-08-21 13:44+0000\n" +"Last-Translator: Gareth Rees <gareth@mysociety.org>\n" "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/alaveteli/language/nb_NO/)\n" "Language: nb_NO\n" "MIME-Version: 1.0\n" @@ -101,9 +101,6 @@ msgstr "Du mottar allerede oppdateringer om denne forespørselen på e-post." msgid " You will also be emailed updates about the request." msgstr "Vi vil også motta oppdateringer om denne forespørselen på e-post." -msgid " made by " -msgstr " laget av " - msgid " when you send this message." msgstr " når du sender denne meldinen." @@ -296,6 +293,9 @@ msgstr "<strong>Takk</strong> myndigheten eller " msgid "<strong>did not have</strong> the information requested." msgstr "<strong>hadde ikke</strong> informasjonen du ba om." +msgid "?" +msgstr "" + msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "En <a href=\"{{request_url}}\">oppfølging</a> til <em>{{request_title}}</em> ble sendt til {{public_body_name}} fra {{info_request_user}} den {{date}}." @@ -551,9 +551,6 @@ msgstr "Bytt passordet ditt" msgid "Change your password on {{site_name}}" msgstr "Bytt passordet ditt på {{site_name}}" -msgid "Change your password {{site_name}}" -msgstr "Bytt passordet ditt hos {{site_name}}" - msgid "Charity registration" msgstr "Veledighetsregistrering" @@ -728,6 +725,9 @@ msgstr "Utleveringslogg" msgid "Disclosure log URL" msgstr "" +msgid "Do not fill in this field" +msgstr "" + msgid "Don't have a superuser account yet?" msgstr "" @@ -1387,6 +1387,9 @@ msgstr "Lag en ny<br/>\\n <strong>forespørsel <span>om</span><br/>\\n innsyn</ msgid "Make a request" msgstr "Lag henvendelse" +msgid "Make a request »" +msgstr "" + msgid "Make a request to these authorities" msgstr "" @@ -1888,6 +1891,9 @@ msgstr "" msgid "Public Bodies" msgstr "" +msgid "Public Body" +msgstr "" + msgid "Public Body Statistics" msgstr "" @@ -1900,6 +1906,9 @@ msgstr "Offentlige myndigheter - {{description}}" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "Offentlige myndigheter {{start_count}} til {{end_count}} av totalt {{total_count}}" +msgid "Public authority statistics" +msgstr "" + msgid "Public authority – {{name}}" msgstr "Offentlig myndighet – {{name}}" @@ -2125,8 +2134,8 @@ msgstr "Svar med epost" msgid "Respond to request" msgstr "Svar på henvendelsen" -msgid "Respond to the FOI request" -msgstr "Svar på en innsynsbegjæring" +msgid "Respond to the FOI request '{{request}}' made by {{user}}" +msgstr "" msgid "Respond using the web" msgstr "Svar på nett" @@ -2330,9 +2339,6 @@ msgstr "" msgid "Special note for this authority!" msgstr "Spesiell merknad for denne myndigheten!" -msgid "Start now »" -msgstr "Start nå »" - msgid "Start your own blog" msgstr "Start din egen blogg" @@ -2930,6 +2936,9 @@ msgstr "Klarte ikke sende svar til {{username}}" msgid "Unable to send follow up message to {{username}}" msgstr "Klarte ikke sende oppfølgningsmelding til {{username}}" +msgid "Unclassified or hidden requests are not counted." +msgstr "" + msgid "Unexpected search result type " msgstr "Uventet type søke resultat " @@ -2990,9 +2999,6 @@ msgstr "" msgid "User|About me" msgstr "Bruker|Om meg" -msgid "User|Address" -msgstr "" - msgid "User|Admin level" msgstr "Bruker|Admin nivå" @@ -3002,9 +3008,6 @@ msgstr "Bruker|Ban tekst" msgid "User|Can make batch requests" msgstr "" -msgid "User|Dob" -msgstr "" - msgid "User|Email" msgstr "Bruker|E-post" @@ -3059,7 +3062,7 @@ msgstr "Vis e-post adresse for innsyn mot {{public_body_name}}" msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "Vis innsynsbegjæringer som er opprettet av {{user_name}}:" -msgid "View and search requests" +msgid "Browse and search requests" msgstr "Vis og søk i henvendelser" msgid "View authorities" @@ -3068,7 +3071,7 @@ msgstr "Vis myndigheter" msgid "View email" msgstr "Les epost" -msgid "View requests" +msgid "Browse Requests" msgstr "Vis henvendelser" msgid "Waiting clarification." diff --git a/locale/nl/app.po b/locale/nl/app.po index 8957cb1e8..2df1b1d9c 100644 --- a/locale/nl/app.po +++ b/locale/nl/app.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-15 12:46+0100\n" -"PO-Revision-Date: 2014-05-15 11:56+0000\n" -"Last-Translator: louisecrow <louise@mysociety.org>\n" +"POT-Creation-Date: 2014-08-21 13:43+0000\n" +"PO-Revision-Date: 2014-08-21 13:44+0000\n" +"Last-Translator: Gareth Rees <gareth@mysociety.org>\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/alaveteli/language/nl/)\n" "Language: nl\n" "MIME-Version: 1.0\n" @@ -92,9 +92,6 @@ msgstr "U bent reeds gemaild met updates over het verzoek." msgid " You will also be emailed updates about the request." msgstr "U zult via de email op de hoogte gehouden worden over het verzoek." -msgid " made by " -msgstr "gemaakt door" - msgid " when you send this message." msgstr "wanneer u dit bericht verzend." @@ -284,6 +281,9 @@ msgstr "" msgid "<strong>did not have</strong> the information requested." msgstr "" +msgid "?" +msgstr "" + msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "" @@ -539,9 +539,6 @@ msgstr "Wijzig uw wachtwoord" msgid "Change your password on {{site_name}}" msgstr "Wijzig uw wachtwoord op {{site_name}}" -msgid "Change your password {{site_name}}" -msgstr "Wijzig uw wachtwoord {{site_name}}" - msgid "Charity registration" msgstr "goede doel registratie" @@ -716,6 +713,9 @@ msgstr "" msgid "Disclosure log URL" msgstr "" +msgid "Do not fill in this field" +msgstr "" + msgid "Don't have a superuser account yet?" msgstr "" @@ -1375,6 +1375,9 @@ msgstr "" msgid "Make a request" msgstr "" +msgid "Make a request »" +msgstr "" + msgid "Make a request to these authorities" msgstr "" @@ -1876,6 +1879,9 @@ msgstr "" msgid "Public Bodies" msgstr "" +msgid "Public Body" +msgstr "" + msgid "Public Body Statistics" msgstr "" @@ -1888,6 +1894,9 @@ msgstr "Overheidsinstanties - {{description}}" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "" +msgid "Public authority statistics" +msgstr "" + msgid "Public authority – {{name}}" msgstr "" @@ -2113,7 +2122,7 @@ msgstr "" msgid "Respond to request" msgstr "" -msgid "Respond to the FOI request" +msgid "Respond to the FOI request '{{request}}' made by {{user}}" msgstr "" msgid "Respond using the web" @@ -2318,9 +2327,6 @@ msgstr "" msgid "Special note for this authority!" msgstr "" -msgid "Start now »" -msgstr "" - msgid "Start your own blog" msgstr "" @@ -2918,6 +2924,9 @@ msgstr "" msgid "Unable to send follow up message to {{username}}" msgstr "" +msgid "Unclassified or hidden requests are not counted." +msgstr "" + msgid "Unexpected search result type " msgstr "" @@ -2978,9 +2987,6 @@ msgstr "" msgid "User|About me" msgstr "" -msgid "User|Address" -msgstr "" - msgid "User|Admin level" msgstr "" @@ -2990,9 +2996,6 @@ msgstr "" msgid "User|Can make batch requests" msgstr "" -msgid "User|Dob" -msgstr "" - msgid "User|Email" msgstr "" @@ -3047,7 +3050,7 @@ msgstr "" msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "Bekijk de Wet Openbaarheid Bestuur verzoeken van {{gebruikersnaam}}:" -msgid "View and search requests" +msgid "Browse and search requests" msgstr "" msgid "View authorities" @@ -3056,7 +3059,7 @@ msgstr "" msgid "View email" msgstr "" -msgid "View requests" +msgid "Browse Requests" msgstr "" msgid "Waiting clarification." diff --git a/locale/nn/app.po b/locale/nn/app.po index 8c75e4e81..52a763dfb 100644 --- a/locale/nn/app.po +++ b/locale/nn/app.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-15 12:46+0100\n" -"PO-Revision-Date: 2014-05-15 11:56+0000\n" -"Last-Translator: louisecrow <louise@mysociety.org>\n" +"POT-Creation-Date: 2014-08-21 13:43+0000\n" +"PO-Revision-Date: 2014-08-21 13:44+0000\n" +"Last-Translator: Gareth Rees <gareth@mysociety.org>\n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/alaveteli/language/nn/)\n" "Language: nn\n" "MIME-Version: 1.0\n" @@ -89,9 +89,6 @@ msgstr "" msgid " You will also be emailed updates about the request." msgstr "" -msgid " made by " -msgstr "" - msgid " when you send this message." msgstr "" @@ -281,6 +278,9 @@ msgstr "" msgid "<strong>did not have</strong> the information requested." msgstr "" +msgid "?" +msgstr "" + msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "" @@ -536,9 +536,6 @@ msgstr "" msgid "Change your password on {{site_name}}" msgstr "" -msgid "Change your password {{site_name}}" -msgstr "" - msgid "Charity registration" msgstr "" @@ -713,6 +710,9 @@ msgstr "" msgid "Disclosure log URL" msgstr "" +msgid "Do not fill in this field" +msgstr "" + msgid "Don't have a superuser account yet?" msgstr "" @@ -1372,6 +1372,9 @@ msgstr "" msgid "Make a request" msgstr "" +msgid "Make a request »" +msgstr "" + msgid "Make a request to these authorities" msgstr "" @@ -1873,6 +1876,9 @@ msgstr "" msgid "Public Bodies" msgstr "" +msgid "Public Body" +msgstr "" + msgid "Public Body Statistics" msgstr "" @@ -1885,6 +1891,9 @@ msgstr "" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "" +msgid "Public authority statistics" +msgstr "" + msgid "Public authority – {{name}}" msgstr "" @@ -2110,7 +2119,7 @@ msgstr "" msgid "Respond to request" msgstr "" -msgid "Respond to the FOI request" +msgid "Respond to the FOI request '{{request}}' made by {{user}}" msgstr "" msgid "Respond using the web" @@ -2315,9 +2324,6 @@ msgstr "" msgid "Special note for this authority!" msgstr "" -msgid "Start now »" -msgstr "" - msgid "Start your own blog" msgstr "" @@ -2915,6 +2921,9 @@ msgstr "" msgid "Unable to send follow up message to {{username}}" msgstr "" +msgid "Unclassified or hidden requests are not counted." +msgstr "" + msgid "Unexpected search result type " msgstr "" @@ -2975,9 +2984,6 @@ msgstr "" msgid "User|About me" msgstr "" -msgid "User|Address" -msgstr "" - msgid "User|Admin level" msgstr "" @@ -2987,9 +2993,6 @@ msgstr "" msgid "User|Can make batch requests" msgstr "" -msgid "User|Dob" -msgstr "" - msgid "User|Email" msgstr "" @@ -3044,7 +3047,7 @@ msgstr "" msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "" -msgid "View and search requests" +msgid "Browse and search requests" msgstr "" msgid "View authorities" @@ -3053,7 +3056,7 @@ msgstr "" msgid "View email" msgstr "" -msgid "View requests" +msgid "Browse Requests" msgstr "" msgid "Waiting clarification." diff --git a/locale/pl/app.po b/locale/pl/app.po index c4acd40e2..24620f926 100644 --- a/locale/pl/app.po +++ b/locale/pl/app.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-15 12:46+0100\n" -"PO-Revision-Date: 2014-05-15 11:56+0000\n" -"Last-Translator: louisecrow <louise@mysociety.org>\n" +"POT-Creation-Date: 2014-08-21 13:43+0000\n" +"PO-Revision-Date: 2014-08-21 13:44+0000\n" +"Last-Translator: Gareth Rees <gareth@mysociety.org>\n" "Language-Team: Polish (http://www.transifex.com/projects/p/alaveteli/language/pl/)\n" "Language: pl\n" "MIME-Version: 1.0\n" @@ -91,9 +91,6 @@ msgstr "" msgid " You will also be emailed updates about the request." msgstr "" -msgid " made by " -msgstr "" - msgid " when you send this message." msgstr "" @@ -283,6 +280,9 @@ msgstr "" msgid "<strong>did not have</strong> the information requested." msgstr "" +msgid "?" +msgstr "" + msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "" @@ -538,9 +538,6 @@ msgstr "" msgid "Change your password on {{site_name}}" msgstr "" -msgid "Change your password {{site_name}}" -msgstr "Zmień hasło {{site_name}}" - msgid "Charity registration" msgstr "" @@ -715,6 +712,9 @@ msgstr "" msgid "Disclosure log URL" msgstr "" +msgid "Do not fill in this field" +msgstr "" + msgid "Don't have a superuser account yet?" msgstr "" @@ -1375,6 +1375,9 @@ msgstr "" msgid "Make a request" msgstr "" +msgid "Make a request »" +msgstr "" + msgid "Make a request to these authorities" msgstr "" @@ -1876,6 +1879,9 @@ msgstr "" msgid "Public Bodies" msgstr "" +msgid "Public Body" +msgstr "" + msgid "Public Body Statistics" msgstr "" @@ -1888,6 +1894,9 @@ msgstr "" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "" +msgid "Public authority statistics" +msgstr "" + msgid "Public authority – {{name}}" msgstr "" @@ -2113,7 +2122,7 @@ msgstr "" msgid "Respond to request" msgstr "" -msgid "Respond to the FOI request" +msgid "Respond to the FOI request '{{request}}' made by {{user}}" msgstr "" msgid "Respond using the web" @@ -2320,9 +2329,6 @@ msgstr "" msgid "Special note for this authority!" msgstr "" -msgid "Start now »" -msgstr "" - msgid "Start your own blog" msgstr "" @@ -2923,6 +2929,9 @@ msgstr "" msgid "Unable to send follow up message to {{username}}" msgstr "" +msgid "Unclassified or hidden requests are not counted." +msgstr "" + msgid "Unexpected search result type " msgstr "" @@ -2983,9 +2992,6 @@ msgstr "" msgid "User|About me" msgstr "" -msgid "User|Address" -msgstr "" - msgid "User|Admin level" msgstr "" @@ -2995,9 +3001,6 @@ msgstr "" msgid "User|Can make batch requests" msgstr "" -msgid "User|Dob" -msgstr "" - msgid "User|Email" msgstr "" @@ -3052,7 +3055,7 @@ msgstr "" msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "" -msgid "View and search requests" +msgid "Browse and search requests" msgstr "" msgid "View authorities" @@ -3061,7 +3064,7 @@ msgstr "" msgid "View email" msgstr "" -msgid "View requests" +msgid "Browse Requests" msgstr "" msgid "Waiting clarification." diff --git a/locale/pt_BR/app.po b/locale/pt_BR/app.po index bd4a159d1..a119a1962 100644 --- a/locale/pt_BR/app.po +++ b/locale/pt_BR/app.po @@ -43,9 +43,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-15 12:46+0100\n" -"PO-Revision-Date: 2014-05-15 11:56+0000\n" -"Last-Translator: louisecrow <louise@mysociety.org>\n" +"POT-Creation-Date: 2014-08-21 13:43+0000\n" +"PO-Revision-Date: 2014-08-21 13:44+0000\n" +"Last-Translator: Gareth Rees <gareth@mysociety.org>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/alaveteli/language/pt_BR/)\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" @@ -125,9 +125,6 @@ msgstr " Você já está recebendo e-mails de atualização sobre o pedido." msgid " You will also be emailed updates about the request." msgstr "Você também receberá atualizações por e-mail sobre esse pedido." -msgid " made by " -msgstr "feito por" - msgid " when you send this message." msgstr "quando você enviar esta mensagem." @@ -335,6 +332,9 @@ msgstr "<strong>Agradeça</strong> o órgão público ou" msgid "<strong>did not have</strong> the information requested." msgstr "<strong>não tem</strong> as informações solicitadas." +msgid "?" +msgstr "" + msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "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}}." @@ -590,9 +590,6 @@ msgstr "Alterar a sua senha" msgid "Change your password on {{site_name}}" msgstr "Alterar a sua senha em {{site_name}}" -msgid "Change your password {{site_name}}" -msgstr "Mude sua senha do {{site_name}}" - msgid "Charity registration" msgstr "Registro de ONG" @@ -767,6 +764,9 @@ msgstr "" msgid "Disclosure log URL" msgstr "" +msgid "Do not fill in this field" +msgstr "" + msgid "Don't have a superuser account yet?" msgstr "" @@ -1437,6 +1437,9 @@ msgstr "" msgid "Make a request" msgstr "Criar uma solicitação" +msgid "Make a request »" +msgstr "" + msgid "Make a request to these authorities" msgstr "" @@ -1938,6 +1941,9 @@ msgstr "ProfilePhoto | Rascunho" msgid "Public Bodies" msgstr "" +msgid "Public Body" +msgstr "" + msgid "Public Body Statistics" msgstr "" @@ -1950,6 +1956,9 @@ msgstr "Orgãos públicos - {{description}}" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "Órgão público {{start_count}} para {{end_count}} de {{total_count}}" +msgid "Public authority statistics" +msgstr "" + msgid "Public authority – {{name}}" msgstr "" @@ -2175,8 +2184,8 @@ msgstr "Resposta por e-mail" msgid "Respond to request" msgstr "Responder a este pedido" -msgid "Respond to the FOI request" -msgstr "Responder ao pedido de acesso à informação" +msgid "Respond to the FOI request '{{request}}' made by {{user}}" +msgstr "" msgid "Respond using the web" msgstr "Responder através do site" @@ -2380,9 +2389,6 @@ msgstr "" msgid "Special note for this authority!" msgstr "Recado especial para esta autoridade!" -msgid "Start now »" -msgstr "Começar agora »" - msgid "Start your own blog" msgstr "Fazer seu próprio blog" @@ -2988,6 +2994,9 @@ msgstr "Não foi possível enviar uma mensagem para {{username}}" msgid "Unable to send follow up message to {{username}}" msgstr "Não foi possível mandar uma mensagem de acompanhamento para {{username}}" +msgid "Unclassified or hidden requests are not counted." +msgstr "" + msgid "Unexpected search result type " msgstr "Tipo inesperado de resultado da busca " @@ -3050,9 +3059,6 @@ msgstr "" msgid "User|About me" msgstr "Usuário | Sobre mim" -msgid "User|Address" -msgstr "" - msgid "User|Admin level" msgstr "Usuário | Nível de administrador" @@ -3062,9 +3068,6 @@ msgstr "Usuário | Banir texto" msgid "User|Can make batch requests" msgstr "" -msgid "User|Dob" -msgstr "" - msgid "User|Email" msgstr "Usuário | E-mail" @@ -3119,7 +3122,7 @@ msgstr "Veja o e-mail de {{public_body_name}}" msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "Ver os pedidos de acesso a informação feitos por {{user_name}}:" -msgid "View and search requests" +msgid "Browse and search requests" msgstr "Visualizar ou buscar pedidos" msgid "View authorities" @@ -3128,7 +3131,7 @@ msgstr "Ver órgãos públicos" msgid "View email" msgstr "Ver e-mail" -msgid "View requests" +msgid "Browse Requests" msgstr "Ver pedidos" msgid "Waiting clarification." diff --git a/locale/pt_PT/app.po b/locale/pt_PT/app.po index be6269a1b..b8d20ff2b 100644 --- a/locale/pt_PT/app.po +++ b/locale/pt_PT/app.po @@ -27,9 +27,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-15 12:46+0100\n" -"PO-Revision-Date: 2014-06-27 14:00+0000\n" -"Last-Translator: louisecrow <louise@mysociety.org>\n" +"POT-Creation-Date: 2014-08-21 13:43+0000\n" +"PO-Revision-Date: 2014-08-21 13:44+0000\n" +"Last-Translator: Gareth Rees <gareth@mysociety.org>\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/alaveteli/language/pt_PT/)\n" "Language: pt_PT\n" "MIME-Version: 1.0\n" @@ -109,9 +109,6 @@ msgstr " Você já está recebendo e-mails de atualização sobre o pedido." msgid " You will also be emailed updates about the request." msgstr "Você também receberá atualizações por e-mail sobre esse pedido." -msgid " made by " -msgstr "feito por" - msgid " when you send this message." msgstr "quando você enviar esta mensagem." @@ -319,6 +316,9 @@ msgstr "<strong>Agradeça</strong> o órgão público ou" msgid "<strong>did not have</strong> the information requested." msgstr "<strong>não tem</strong> as informações solicitadas." +msgid "?" +msgstr "" + msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "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}}." @@ -574,9 +574,6 @@ msgstr "Alterar a sua senha" msgid "Change your password on {{site_name}}" msgstr "Alterar a sua senha em {{site_name}}" -msgid "Change your password {{site_name}}" -msgstr "Mude sua senha do {{site_name}}" - msgid "Charity registration" msgstr "Registro de ONG" @@ -751,6 +748,9 @@ msgstr "" msgid "Disclosure log URL" msgstr "" +msgid "Do not fill in this field" +msgstr "" + msgid "Don't have a superuser account yet?" msgstr "" @@ -1421,6 +1421,9 @@ msgstr "" msgid "Make a request" msgstr "Criar uma solicitação" +msgid "Make a request »" +msgstr "" + msgid "Make a request to these authorities" msgstr "" @@ -1922,6 +1925,9 @@ msgstr "ProfilePhoto | Rascunho" msgid "Public Bodies" msgstr "" +msgid "Public Body" +msgstr "" + msgid "Public Body Statistics" msgstr "" @@ -1934,6 +1940,9 @@ msgstr "Orgãos públicos - {{description}}" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "Órgão público {{start_count}} para {{end_count}} de {{total_count}}" +msgid "Public authority statistics" +msgstr "" + msgid "Public authority – {{name}}" msgstr "" @@ -2159,8 +2168,8 @@ msgstr "Resposta por e-mail" msgid "Respond to request" msgstr "Responder a este pedido" -msgid "Respond to the FOI request" -msgstr "Responder ao pedido de acesso à informação" +msgid "Respond to the FOI request '{{request}}' made by {{user}}" +msgstr "" msgid "Respond using the web" msgstr "Responder através do site" @@ -2364,9 +2373,6 @@ msgstr "" msgid "Special note for this authority!" msgstr "Recado especial para esta autoridade!" -msgid "Start now »" -msgstr "Começar agora »" - msgid "Start your own blog" msgstr "Fazer seu próprio blog" @@ -2972,6 +2978,9 @@ msgstr "Não foi possível enviar uma mensagem para {{username}}" msgid "Unable to send follow up message to {{username}}" msgstr "Não foi possível mandar uma mensagem de acompanhamento para {{username}}" +msgid "Unclassified or hidden requests are not counted." +msgstr "" + msgid "Unexpected search result type " msgstr "Tipo inesperado de resultado da busca " @@ -3034,9 +3043,6 @@ msgstr "" msgid "User|About me" msgstr "Usuário | Sobre mim" -msgid "User|Address" -msgstr "" - msgid "User|Admin level" msgstr "Usuário | Nível de administrador" @@ -3046,9 +3052,6 @@ msgstr "Usuário | Banir texto" msgid "User|Can make batch requests" msgstr "" -msgid "User|Dob" -msgstr "" - msgid "User|Email" msgstr "Usuário | E-mail" @@ -3103,7 +3106,7 @@ msgstr "Veja o e-mail de {{public_body_name}}" msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "Ver os pedidos de acesso a informação feitos por {{user_name}}:" -msgid "View and search requests" +msgid "Browse and search requests" msgstr "Visualizar ou buscar pedidos" msgid "View authorities" @@ -3112,7 +3115,7 @@ msgstr "Ver órgãos públicos" msgid "View email" msgstr "Ver e-mail" -msgid "View requests" +msgid "Browse Requests" msgstr "Ver pedidos" msgid "Waiting clarification." diff --git a/locale/ro_RO/app.po b/locale/ro_RO/app.po index d8fa1e641..1a57f6175 100644 --- a/locale/ro_RO/app.po +++ b/locale/ro_RO/app.po @@ -21,9 +21,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-15 12:46+0100\n" -"PO-Revision-Date: 2014-05-15 11:56+0000\n" -"Last-Translator: louisecrow <louise@mysociety.org>\n" +"POT-Creation-Date: 2014-08-21 13:43+0000\n" +"PO-Revision-Date: 2014-08-21 13:44+0000\n" +"Last-Translator: Gareth Rees <gareth@mysociety.org>\n" "Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/alaveteli/language/ro_RO/)\n" "Language: ro_RO\n" "MIME-Version: 1.0\n" @@ -103,9 +103,6 @@ msgstr "Ţi s-au trimis deja prin e-mail actualizări referitoare la solicitare. msgid " You will also be emailed updates about the request." msgstr "Vei primi prin email noutăți legate de cererea ta." -msgid " made by " -msgstr "făcut de" - msgid " when you send this message." msgstr "când trimiți acest mesaj." @@ -295,6 +292,9 @@ msgstr "<strong>Mulţumiri </strong> autorităţii publice sau " msgid "<strong>did not have</strong> the information requested." msgstr "<strong>nu au avut</strong> informaţia solicitată." +msgid "?" +msgstr "" + msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "O <a href=\"{{request_url}}\">urmărire </a> către <em>{{request_title}}</em> a fost trimisă către {{public_body_name}} de către {{info_request_user}} la {{date}}." @@ -550,9 +550,6 @@ msgstr "Modificaţi parola" msgid "Change your password on {{site_name}}" msgstr "Modifică-ţi parola pe {{site_name}}" -msgid "Change your password {{site_name}}" -msgstr "Modifică parola ta pe {{site_name}}" - msgid "Charity registration" msgstr "Înregistrare ONG" @@ -727,6 +724,9 @@ msgstr "Disclosure log" msgid "Disclosure log URL" msgstr "Disclosure log URL" +msgid "Do not fill in this field" +msgstr "" + msgid "Don't have a superuser account yet?" msgstr "" @@ -1389,6 +1389,9 @@ msgstr "Faceți o nouă<br/>\\n <strong>solicitare <span>de</span><br/>\\n infor msgid "Make a request" msgstr "Faceţi o cerere" +msgid "Make a request »" +msgstr "" + msgid "Make a request to these authorities" msgstr "" @@ -1890,6 +1893,9 @@ msgstr "Poza de profil|Ciornă" msgid "Public Bodies" msgstr "" +msgid "Public Body" +msgstr "" + msgid "Public Body Statistics" msgstr "" @@ -1902,6 +1908,9 @@ msgstr "Autorităţi publice - {{description}}" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "Instituții publice de la {{start_count}} la {{end_count}} din {{total_count}}" +msgid "Public authority statistics" +msgstr "" + msgid "Public authority – {{name}}" msgstr "Autoritatea publică – {{name}}" @@ -2127,8 +2136,8 @@ msgstr "Răspuns prin email" msgid "Respond to request" msgstr "Răspuns la cerere" -msgid "Respond to the FOI request" -msgstr "Răspunde la solicitarea de acces la informații" +msgid "Respond to the FOI request '{{request}}' made by {{user}}" +msgstr "" msgid "Respond using the web" msgstr "Răspuns utilizând Internetul" @@ -2334,9 +2343,6 @@ msgstr "" msgid "Special note for this authority!" msgstr "O notă specială pentru această autoritate!" -msgid "Start now »" -msgstr "Start acum »" - msgid "Start your own blog" msgstr "Incepeţi propriul jurnal" @@ -2937,6 +2943,9 @@ msgstr "Nu se poate trimite un răspuns către {{username}}" msgid "Unable to send follow up message to {{username}}" msgstr "Nu se poate trimite un mesaj de urmărire către {{username}}" +msgid "Unclassified or hidden requests are not counted." +msgstr "" + msgid "Unexpected search result type " msgstr "Tip neaşteptat de rezultat la căutare" @@ -2997,9 +3006,6 @@ msgstr "" msgid "User|About me" msgstr "Utilizator|Despre mine" -msgid "User|Address" -msgstr "" - msgid "User|Admin level" msgstr "Utilizator|Nivel administrator" @@ -3009,9 +3015,6 @@ msgstr "Utilizator|Text interzis" msgid "User|Can make batch requests" msgstr "" -msgid "User|Dob" -msgstr "" - msgid "User|Email" msgstr "Utilizator|Email" @@ -3066,7 +3069,7 @@ msgstr "Vezi adresa de email pentru '{{public_body_name}}'" msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "Vezi cererile solicitările de acces la informații făcute de {{user_name}}:" -msgid "View and search requests" +msgid "Browse and search requests" msgstr "Vezi şi caută cereri" msgid "View authorities" @@ -3075,7 +3078,7 @@ msgstr "Vezi autorităţi" msgid "View email" msgstr "Vezi email" -msgid "View requests" +msgid "Browse Requests" msgstr "Vezi cereri" msgid "Waiting clarification." diff --git a/locale/sl/app.po b/locale/sl/app.po index fa7219fb6..d143f3248 100644 --- a/locale/sl/app.po +++ b/locale/sl/app.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-15 12:46+0100\n" -"PO-Revision-Date: 2014-05-15 11:56+0000\n" -"Last-Translator: louisecrow <louise@mysociety.org>\n" +"POT-Creation-Date: 2014-08-21 13:43+0000\n" +"PO-Revision-Date: 2014-08-21 13:44+0000\n" +"Last-Translator: Gareth Rees <gareth@mysociety.org>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/alaveteli/language/sl/)\n" "Language: sl\n" "MIME-Version: 1.0\n" @@ -91,9 +91,6 @@ msgstr "Že prejemate e-poštna obvestila o tem zahtevku." msgid " You will also be emailed updates about the request." msgstr "Prejeli boste tudi e-poštna obvestila o zahtevku." -msgid " made by " -msgstr "ustvaril" - msgid " when you send this message." msgstr "ko pošljete to sporočilo." @@ -283,6 +280,9 @@ msgstr "<strong>Zahvalite se</strong> javnemu organu ali" msgid "<strong>did not have</strong> the information requested." msgstr "<strong>ni imel</strong> zahtevanih informacij" +msgid "?" +msgstr "" + msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "<a href=\"{{request_url}}\">Odziv</a> na <em>{{request_title}}</em> je {{info_request_user}} poslal {{public_body_name}} dne {{date}}." @@ -538,9 +538,6 @@ msgstr "Spremenite vaše geslo" msgid "Change your password on {{site_name}}" msgstr "Spremenite vaše geslo na {{site_name}}" -msgid "Change your password {{site_name}}" -msgstr "Spremenite vaše geslo {{site_name}}" - msgid "Charity registration" msgstr "Prijava dobrodelne organizacije" @@ -715,6 +712,9 @@ msgstr "Dnevnik razkritij" msgid "Disclosure log URL" msgstr "URL za dnevnik razkritij" +msgid "Do not fill in this field" +msgstr "" + msgid "Don't have a superuser account yet?" msgstr "" @@ -1376,6 +1376,9 @@ msgstr "Ustvarite nov<br/>\\n <strong>Zahtevek <span>za</span><br/>\\n informaci msgid "Make a request" msgstr "Naredite zahtevek" +msgid "Make a request »" +msgstr "" + msgid "Make a request to these authorities" msgstr "" @@ -1877,6 +1880,9 @@ msgstr "ProfilnaSlika|Osnutek" msgid "Public Bodies" msgstr "" +msgid "Public Body" +msgstr "" + msgid "Public Body Statistics" msgstr "" @@ -1889,6 +1895,9 @@ msgstr "Javni organi - {{description}}" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "Javni organi od {{start_count}} do {{end_count}} od skupno {{total_count}}" +msgid "Public authority statistics" +msgstr "" + msgid "Public authority – {{name}}" msgstr "Javni organ - {{name}}" @@ -2114,8 +2123,8 @@ msgstr "Odgovorite prek e-pošte" msgid "Respond to request" msgstr "Odgovorite na zahtevek" -msgid "Respond to the FOI request" -msgstr "Odgovorite na zahtevek po IJZ" +msgid "Respond to the FOI request '{{request}}' made by {{user}}" +msgstr "" msgid "Respond using the web" msgstr "Odgovorite z uporabo spletnega vmesnika" @@ -2323,9 +2332,6 @@ msgstr "" msgid "Special note for this authority!" msgstr "Posebna opomba za ta organ!" -msgid "Start now »" -msgstr "Začnite zdaj »" - msgid "Start your own blog" msgstr "Začnite svoj blog" @@ -2929,6 +2935,9 @@ msgstr "Ni bilo možno poslati odgovora osebi {{username}}" msgid "Unable to send follow up message to {{username}}" msgstr "Ni bilo možno poslati odziva osebi {{username}}" +msgid "Unclassified or hidden requests are not counted." +msgstr "" + msgid "Unexpected search result type " msgstr "Nepričakovan tip rezultata pri iskanju" @@ -2989,9 +2998,6 @@ msgstr "" msgid "User|About me" msgstr "User|About me" -msgid "User|Address" -msgstr "" - msgid "User|Admin level" msgstr "User|Admin level" @@ -3001,9 +3007,6 @@ msgstr "User|Ban text" msgid "User|Can make batch requests" msgstr "" -msgid "User|Dob" -msgstr "" - msgid "User|Email" msgstr "User|Email" @@ -3058,7 +3061,7 @@ msgstr "Poglejte e-poštni naslov za zahtevke za IJZ za {{public_body_name}}" msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "Poglejte zahtevke za informacije javnega značaja, ki jih je naredil {{user_name}}:" -msgid "View and search requests" +msgid "Browse and search requests" msgstr "Preglejte in iščite po zahtevkih" msgid "View authorities" @@ -3067,7 +3070,7 @@ msgstr "Poglejte organe" msgid "View email" msgstr "Poglejte e-poštni naslov" -msgid "View requests" +msgid "Browse Requests" msgstr "Poglejte zahtevke" msgid "Waiting clarification." diff --git a/locale/sq/app.po b/locale/sq/app.po index f85e2aade..953bdf25c 100644 --- a/locale/sq/app.po +++ b/locale/sq/app.po @@ -17,9 +17,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-15 12:46+0100\n" -"PO-Revision-Date: 2014-05-15 11:56+0000\n" -"Last-Translator: louisecrow <louise@mysociety.org>\n" +"POT-Creation-Date: 2014-08-21 13:43+0000\n" +"PO-Revision-Date: 2014-08-21 13:44+0000\n" +"Last-Translator: Gareth Rees <gareth@mysociety.org>\n" "Language-Team: Albanian (http://www.transifex.com/projects/p/alaveteli/language/sq/)\n" "Language: sq\n" "MIME-Version: 1.0\n" @@ -109,9 +109,6 @@ msgstr " Ti tashmë je duke i pranuar me email aktualizimet në lidhje me këtë msgid " You will also be emailed updates about the request." msgstr " Ti gjithashtu do të pranon email me aktualizimet e reja në lidhje me kërkesën." -msgid " made by " -msgstr " bërë nga " - msgid " when you send this message." msgstr " kur e dërgoni këtë mesazh." @@ -329,6 +326,9 @@ msgstr "<strong>Falënderoju</strong> autoritet publik ose " msgid "<strong>did not have</strong> the information requested." msgstr "<strong>nuk e kanë</strong> informacionin e kërkuar." +msgid "?" +msgstr "" + msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "" @@ -592,9 +592,6 @@ msgstr "Ndrysho fjalëkalimin tënd" msgid "Change your password on {{site_name}}" msgstr "Ndrysho fjalëkalimin tënd në {{site_name}}" -msgid "Change your password {{site_name}}" -msgstr "Ndrysho fjalëkalimin tënd {{site_name}}" - msgid "Charity registration" msgstr "Regjistrimi i organizatës" @@ -769,6 +766,9 @@ msgstr "" msgid "Disclosure log URL" msgstr "" +msgid "Do not fill in this field" +msgstr "" + msgid "Don't have a superuser account yet?" msgstr "" @@ -1468,6 +1468,9 @@ msgstr "" msgid "Make a request" msgstr "Bëj një kërkesë" +msgid "Make a request »" +msgstr "" + msgid "Make a request to these authorities" msgstr "" @@ -1978,6 +1981,9 @@ msgstr "ProfilePhoto|Draft" msgid "Public Bodies" msgstr "" +msgid "Public Body" +msgstr "" + msgid "Public Body Statistics" msgstr "" @@ -1990,6 +1996,9 @@ msgstr "Autoritetet publike - {{description}}" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "Autoritetet publike {{start_count}} deri {{end_count}} prej {{total_count}}" +msgid "Public authority statistics" +msgstr "" + msgid "Public authority – {{name}}" msgstr "" @@ -2217,8 +2226,8 @@ msgstr "Përgjigju me email" msgid "Respond to request" msgstr "Përgjigju kërkesës" -msgid "Respond to the FOI request" -msgstr "Përgjigju kërkesës për Informata Zyrtare" +msgid "Respond to the FOI request '{{request}}' made by {{user}}" +msgstr "" msgid "Respond using the web" msgstr "Përgjigju duke përdorur ueb faqen" @@ -2427,9 +2436,6 @@ msgstr "" msgid "Special note for this authority!" msgstr "Shënim i veçantë për këtë autoritet!" -msgid "Start now »" -msgstr "Fillo tash »" - msgid "Start your own blog" msgstr "Nis blogun tënd" @@ -3047,6 +3053,9 @@ msgstr "Nuk munda të dërgoj përgjigje te {{username}}" msgid "Unable to send follow up message to {{username}}" msgstr "Nuk munda të dërgoj një përcjellje te {{username}}" +msgid "Unclassified or hidden requests are not counted." +msgstr "" + msgid "Unexpected search result type " msgstr "Lloji i papritur i rezultatit të kërkuar " @@ -3107,9 +3116,6 @@ msgstr "" msgid "User|About me" msgstr "Përdoruesi|Rreth meje" -msgid "User|Address" -msgstr "" - msgid "User|Admin level" msgstr "Përdoruesi | Niveli i Administrimit" @@ -3119,9 +3125,6 @@ msgstr "Përdoruesi|Tekst i ndaluar" msgid "User|Can make batch requests" msgstr "" -msgid "User|Dob" -msgstr "" - msgid "User|Email" msgstr "Përdoruesi |Email" @@ -3176,7 +3179,7 @@ msgstr "Shiko adresën e emailit për Informatë Zyrtare {{public_body_name}}" msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "Shiko kërkesat për informata zyrtare të bëra nga {{user_name}}: " -msgid "View and search requests" +msgid "Browse and search requests" msgstr "Shiko dhe kërko kërkesat" msgid "View authorities" @@ -3185,7 +3188,7 @@ msgstr "Shiko autoritetet" msgid "View email" msgstr "Shiko adresën e emailit" -msgid "View requests" +msgid "Browse Requests" msgstr "Shiko kërkesat" msgid "Waiting clarification." diff --git a/locale/sr@latin/app.po b/locale/sr@latin/app.po index f773248ba..7275c8283 100644 --- a/locale/sr@latin/app.po +++ b/locale/sr@latin/app.po @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-15 12:46+0100\n" -"PO-Revision-Date: 2014-05-15 11:56+0000\n" -"Last-Translator: louisecrow <louise@mysociety.org>\n" +"POT-Creation-Date: 2014-08-21 13:43+0000\n" +"PO-Revision-Date: 2014-08-21 13:44+0000\n" +"Last-Translator: Gareth Rees <gareth@mysociety.org>\n" "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/alaveteli/language/sr@latin/)\n" "Language: sr@latin\n" "MIME-Version: 1.0\n" @@ -101,9 +101,6 @@ msgstr "Već ste se prijavili da primate novosti u vezi zahteva." msgid " You will also be emailed updates about the request." msgstr "Novosti u vezi zahteva će Vam takođe biti poslate i putem e-pošte." -msgid " made by " -msgstr " načinjeno od strane " - msgid " when you send this message." msgstr " kada pošaljete ovu poruku." @@ -297,6 +294,9 @@ msgstr "<strong>Zahvalite</strong> javnoj ustanovi ili " msgid "<strong>did not have</strong> the information requested." msgstr "<strong>nije imao</strong> traženu informaciju." +msgid "?" +msgstr "" + msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "<a href=\"{{request_url}}\">Reakcija</a> na <em>{{request_title}}</em> je poslata za {{public_body_name}} od strane korisnika {{info_request_user}} na dan {{date}}." @@ -554,9 +554,6 @@ msgstr "Promenite Vašu lozinku" msgid "Change your password on {{site_name}}" msgstr "Promenite Vašu lozinku na {{site_name}}" -msgid "Change your password {{site_name}}" -msgstr "Promenite Vašu lozinku {{site_name}}" - msgid "Charity registration" msgstr "Registracija fondacije" @@ -731,6 +728,9 @@ msgstr "Dnevnik objava" msgid "Disclosure log URL" msgstr "URL za dnevnik objava" +msgid "Do not fill in this field" +msgstr "" + msgid "Don't have a superuser account yet?" msgstr "" @@ -1402,6 +1402,9 @@ msgstr "Podnesi novi<br/>\\n<strong>Zahtev<span> za</span><br/>\\nslobodan<br/>\ msgid "Make a request" msgstr "Podnesi zahtev" +msgid "Make a request »" +msgstr "" + msgid "Make a request to these authorities" msgstr "" @@ -1914,6 +1917,9 @@ msgstr "ProfilePhoto|Skica" msgid "Public Bodies" msgstr "Javne ustanove" +msgid "Public Body" +msgstr "" + msgid "Public Body Statistics" msgstr "Statistike javnih ustanova" @@ -1926,6 +1932,9 @@ msgstr "Javne ustanove - {{description}}" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "Javne ustanove {{start_count}} do {{end_count}} od ukupno {{total_count}}" +msgid "Public authority statistics" +msgstr "" + msgid "Public authority – {{name}}" msgstr "Ustanova – {{name}}" @@ -2153,8 +2162,8 @@ msgstr "Odgovoriti e-mailom" msgid "Respond to request" msgstr "Odgovoriti na zahtev" -msgid "Respond to the FOI request" -msgstr "Odgovoriti na zahtev po ZOSPIOJ" +msgid "Respond to the FOI request '{{request}}' made by {{user}}" +msgstr "" msgid "Respond using the web" msgstr "Odgovoriti preko web-a" @@ -2366,9 +2375,6 @@ msgstr "" msgid "Special note for this authority!" msgstr "Posebna napomena za ovu ustanovu!" -msgid "Start now »" -msgstr "Počni sada »" - msgid "Start your own blog" msgstr "Započnite Vaš blog" @@ -2999,6 +3005,9 @@ msgstr "Ne možemo poslati odgovor za {{username}}" msgid "Unable to send follow up message to {{username}}" msgstr "Ne možemo poslati reakciju za {{username}}" +msgid "Unclassified or hidden requests are not counted." +msgstr "" + msgid "Unexpected search result type " msgstr "Neočekivani tip rezultata pretrage" @@ -3064,9 +3073,6 @@ msgstr "" msgid "User|About me" msgstr "User|O meni" -msgid "User|Address" -msgstr "" - msgid "User|Admin level" msgstr "User|Administratorski nivo" @@ -3076,9 +3082,6 @@ msgstr "User|Tekst isključenja" msgid "User|Can make batch requests" msgstr "" -msgid "User|Dob" -msgstr "" - msgid "User|Email" msgstr "User|E-mail" @@ -3133,7 +3136,7 @@ msgstr "Pogledati ZOSPI e-mail adresu za {{public_body_name}}" msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "Videti Zahteve za slobodan pristup informacijama od javnog značaja napravljene od strane {{user_name}}:" -msgid "View and search requests" +msgid "Browse and search requests" msgstr "Pregledaj i pretraži zahteve" msgid "View authorities" @@ -3142,7 +3145,7 @@ msgstr "Pregledaj ustanove" msgid "View email" msgstr "Prikaži e-mail" -msgid "View requests" +msgid "Browse Requests" msgstr "Pregled zahteva" msgid "Waiting clarification." diff --git a/locale/sv/app.po b/locale/sv/app.po index a352e00c8..ef8213c88 100644 --- a/locale/sv/app.po +++ b/locale/sv/app.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-15 12:46+0100\n" -"PO-Revision-Date: 2014-05-15 11:56+0000\n" -"Last-Translator: louisecrow <louise@mysociety.org>\n" +"POT-Creation-Date: 2014-08-21 13:43+0000\n" +"PO-Revision-Date: 2014-08-21 13:44+0000\n" +"Last-Translator: Gareth Rees <gareth@mysociety.org>\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/alaveteli/language/sv/)\n" "Language: sv\n" "MIME-Version: 1.0\n" @@ -89,9 +89,6 @@ msgstr "" msgid " You will also be emailed updates about the request." msgstr "" -msgid " made by " -msgstr "" - msgid " when you send this message." msgstr "" @@ -281,6 +278,9 @@ msgstr "" msgid "<strong>did not have</strong> the information requested." msgstr "" +msgid "?" +msgstr "" + msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "" @@ -536,9 +536,6 @@ msgstr "" msgid "Change your password on {{site_name}}" msgstr "" -msgid "Change your password {{site_name}}" -msgstr "" - msgid "Charity registration" msgstr "" @@ -713,6 +710,9 @@ msgstr "" msgid "Disclosure log URL" msgstr "" +msgid "Do not fill in this field" +msgstr "" + msgid "Don't have a superuser account yet?" msgstr "" @@ -1372,6 +1372,9 @@ msgstr "" msgid "Make a request" msgstr "" +msgid "Make a request »" +msgstr "" + msgid "Make a request to these authorities" msgstr "" @@ -1873,6 +1876,9 @@ msgstr "" msgid "Public Bodies" msgstr "" +msgid "Public Body" +msgstr "" + msgid "Public Body Statistics" msgstr "" @@ -1885,6 +1891,9 @@ msgstr "" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "" +msgid "Public authority statistics" +msgstr "" + msgid "Public authority – {{name}}" msgstr "" @@ -2110,7 +2119,7 @@ msgstr "" msgid "Respond to request" msgstr "" -msgid "Respond to the FOI request" +msgid "Respond to the FOI request '{{request}}' made by {{user}}" msgstr "" msgid "Respond using the web" @@ -2315,9 +2324,6 @@ msgstr "" msgid "Special note for this authority!" msgstr "" -msgid "Start now »" -msgstr "" - msgid "Start your own blog" msgstr "" @@ -2915,6 +2921,9 @@ msgstr "" msgid "Unable to send follow up message to {{username}}" msgstr "" +msgid "Unclassified or hidden requests are not counted." +msgstr "" + msgid "Unexpected search result type " msgstr "" @@ -2975,9 +2984,6 @@ msgstr "" msgid "User|About me" msgstr "" -msgid "User|Address" -msgstr "" - msgid "User|Admin level" msgstr "" @@ -2987,9 +2993,6 @@ msgstr "" msgid "User|Can make batch requests" msgstr "" -msgid "User|Dob" -msgstr "" - msgid "User|Email" msgstr "" @@ -3044,7 +3047,7 @@ msgstr "" msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "" -msgid "View and search requests" +msgid "Browse and search requests" msgstr "" msgid "View authorities" @@ -3053,7 +3056,7 @@ msgstr "" msgid "View email" msgstr "" -msgid "View requests" +msgid "Browse Requests" msgstr "" msgid "Waiting clarification." diff --git a/locale/sw_KE/app.po b/locale/sw_KE/app.po index 0c7e62fb5..6088c1692 100644 --- a/locale/sw_KE/app.po +++ b/locale/sw_KE/app.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-15 12:46+0100\n" -"PO-Revision-Date: 2014-05-15 11:56+0000\n" -"Last-Translator: louisecrow <louise@mysociety.org>\n" +"POT-Creation-Date: 2014-08-21 13:43+0000\n" +"PO-Revision-Date: 2014-08-21 13:44+0000\n" +"Last-Translator: Gareth Rees <gareth@mysociety.org>\n" "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/alaveteli/language/sw_KE/)\n" "Language: sw_KE\n" "MIME-Version: 1.0\n" @@ -89,9 +89,6 @@ msgstr "" msgid " You will also be emailed updates about the request." msgstr "" -msgid " made by " -msgstr "" - msgid " when you send this message." msgstr "" @@ -281,6 +278,9 @@ msgstr "" msgid "<strong>did not have</strong> the information requested." msgstr "" +msgid "?" +msgstr "" + msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "" @@ -536,9 +536,6 @@ msgstr "" msgid "Change your password on {{site_name}}" msgstr "" -msgid "Change your password {{site_name}}" -msgstr "" - msgid "Charity registration" msgstr "" @@ -713,6 +710,9 @@ msgstr "" msgid "Disclosure log URL" msgstr "" +msgid "Do not fill in this field" +msgstr "" + msgid "Don't have a superuser account yet?" msgstr "" @@ -1372,6 +1372,9 @@ msgstr "" msgid "Make a request" msgstr "" +msgid "Make a request »" +msgstr "" + msgid "Make a request to these authorities" msgstr "" @@ -1873,6 +1876,9 @@ msgstr "" msgid "Public Bodies" msgstr "" +msgid "Public Body" +msgstr "" + msgid "Public Body Statistics" msgstr "" @@ -1885,6 +1891,9 @@ msgstr "" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "" +msgid "Public authority statistics" +msgstr "" + msgid "Public authority – {{name}}" msgstr "" @@ -2110,7 +2119,7 @@ msgstr "" msgid "Respond to request" msgstr "" -msgid "Respond to the FOI request" +msgid "Respond to the FOI request '{{request}}' made by {{user}}" msgstr "" msgid "Respond using the web" @@ -2315,9 +2324,6 @@ msgstr "" msgid "Special note for this authority!" msgstr "" -msgid "Start now »" -msgstr "" - msgid "Start your own blog" msgstr "" @@ -2915,6 +2921,9 @@ msgstr "" msgid "Unable to send follow up message to {{username}}" msgstr "" +msgid "Unclassified or hidden requests are not counted." +msgstr "" + msgid "Unexpected search result type " msgstr "" @@ -2975,9 +2984,6 @@ msgstr "" msgid "User|About me" msgstr "" -msgid "User|Address" -msgstr "" - msgid "User|Admin level" msgstr "" @@ -2987,9 +2993,6 @@ msgstr "" msgid "User|Can make batch requests" msgstr "" -msgid "User|Dob" -msgstr "" - msgid "User|Email" msgstr "" @@ -3044,7 +3047,7 @@ msgstr "" msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "" -msgid "View and search requests" +msgid "Browse and search requests" msgstr "" msgid "View authorities" @@ -3053,7 +3056,7 @@ msgstr "" msgid "View email" msgstr "" -msgid "View requests" +msgid "Browse Requests" msgstr "" msgid "Waiting clarification." diff --git a/locale/tr/app.po b/locale/tr/app.po index c7470b1d4..6e8f2ee2b 100644 --- a/locale/tr/app.po +++ b/locale/tr/app.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-15 12:46+0100\n" -"PO-Revision-Date: 2014-05-15 11:56+0000\n" -"Last-Translator: louisecrow <louise@mysociety.org>\n" +"POT-Creation-Date: 2014-08-21 13:43+0000\n" +"PO-Revision-Date: 2014-08-21 13:44+0000\n" +"Last-Translator: Gareth Rees <gareth@mysociety.org>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/alaveteli/language/tr/)\n" "Language: tr\n" "MIME-Version: 1.0\n" @@ -91,9 +91,6 @@ msgstr "" msgid " You will also be emailed updates about the request." msgstr "" -msgid " made by " -msgstr "" - msgid " when you send this message." msgstr "" @@ -283,6 +280,9 @@ msgstr "" msgid "<strong>did not have</strong> the information requested." msgstr "" +msgid "?" +msgstr "" + msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "" @@ -538,9 +538,6 @@ msgstr "" msgid "Change your password on {{site_name}}" msgstr "" -msgid "Change your password {{site_name}}" -msgstr "" - msgid "Charity registration" msgstr "" @@ -715,6 +712,9 @@ msgstr "" msgid "Disclosure log URL" msgstr "" +msgid "Do not fill in this field" +msgstr "" + msgid "Don't have a superuser account yet?" msgstr "" @@ -1374,6 +1374,9 @@ msgstr "" msgid "Make a request" msgstr "" +msgid "Make a request »" +msgstr "" + msgid "Make a request to these authorities" msgstr "" @@ -1875,6 +1878,9 @@ msgstr "" msgid "Public Bodies" msgstr "" +msgid "Public Body" +msgstr "" + msgid "Public Body Statistics" msgstr "" @@ -1887,6 +1893,9 @@ msgstr "" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "" +msgid "Public authority statistics" +msgstr "" + msgid "Public authority – {{name}}" msgstr "" @@ -2112,7 +2121,7 @@ msgstr "" msgid "Respond to request" msgstr "" -msgid "Respond to the FOI request" +msgid "Respond to the FOI request '{{request}}' made by {{user}}" msgstr "" msgid "Respond using the web" @@ -2317,9 +2326,6 @@ msgstr "" msgid "Special note for this authority!" msgstr "" -msgid "Start now »" -msgstr "" - msgid "Start your own blog" msgstr "" @@ -2917,6 +2923,9 @@ msgstr "" msgid "Unable to send follow up message to {{username}}" msgstr "" +msgid "Unclassified or hidden requests are not counted." +msgstr "" + msgid "Unexpected search result type " msgstr "" @@ -2977,9 +2986,6 @@ msgstr "" msgid "User|About me" msgstr "" -msgid "User|Address" -msgstr "" - msgid "User|Admin level" msgstr "" @@ -2989,9 +2995,6 @@ msgstr "" msgid "User|Can make batch requests" msgstr "" -msgid "User|Dob" -msgstr "" - msgid "User|Email" msgstr "" @@ -3046,7 +3049,7 @@ msgstr "" msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "" -msgid "View and search requests" +msgid "Browse and search requests" msgstr "" msgid "View authorities" @@ -3055,7 +3058,7 @@ msgstr "" msgid "View email" msgstr "" -msgid "View requests" +msgid "Browse Requests" msgstr "" msgid "Waiting clarification." diff --git a/locale/uk/app.po b/locale/uk/app.po index 31def22fc..97baba60c 100644 --- a/locale/uk/app.po +++ b/locale/uk/app.po @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-15 12:46+0100\n" -"PO-Revision-Date: 2014-05-15 11:56+0000\n" -"Last-Translator: louisecrow <louise@mysociety.org>\n" +"POT-Creation-Date: 2014-08-21 13:43+0000\n" +"PO-Revision-Date: 2014-08-21 13:44+0000\n" +"Last-Translator: Gareth Rees <gareth@mysociety.org>\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/alaveteli/language/uk/)\n" "Language: uk\n" "MIME-Version: 1.0\n" @@ -99,9 +99,6 @@ msgstr " Оновлення щодо запиту вже відправлені msgid " You will also be emailed updates about the request." msgstr " Вам також надійдуть оновлення щодо запиту." -msgid " made by " -msgstr " зроблено" - msgid " when you send this message." msgstr " коли ви відправите повідомлення." @@ -327,6 +324,9 @@ msgstr "<strong>Подякуйте</strong> розпоряднику інфор msgid "<strong>did not have</strong> the information requested." msgstr "<strong>не володіють</strong> запитаною інформацією." +msgid "?" +msgstr "" + msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "<a href=\"{{request_url}}\">Додатковий запит</a> щодо <em>{{request_title}}</em> було надіслано {{public_body_name}} користувачем {{info_request_user}}. Дата: {{date}}." @@ -586,9 +586,6 @@ msgstr "Змініть свій пароль" msgid "Change your password on {{site_name}}" msgstr "Змініть свій пароль на сайті" -msgid "Change your password {{site_name}}" -msgstr "Змініть свій пароль" - msgid "Charity registration" msgstr "Реєстрація благодійної організації" @@ -767,6 +764,9 @@ msgstr "" msgid "Disclosure log URL" msgstr "" +msgid "Do not fill in this field" +msgstr "" + msgid "Don't have a superuser account yet?" msgstr "" @@ -1475,6 +1475,9 @@ msgstr "" msgid "Make a request" msgstr "Зробити запит" +msgid "Make a request »" +msgstr "" + msgid "Make a request to these authorities" msgstr "" @@ -1979,6 +1982,9 @@ msgstr "" msgid "Public Bodies" msgstr "" +msgid "Public Body" +msgstr "" + msgid "Public Body Statistics" msgstr "" @@ -1991,6 +1997,9 @@ msgstr "Розпорядники інформації - {{description}}" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "" +msgid "Public authority statistics" +msgstr "" + msgid "Public authority – {{name}}" msgstr "Розпорядник інформації – {{name}}" @@ -2218,8 +2227,8 @@ msgstr "Відповісти електронною поштою" msgid "Respond to request" msgstr "Відповісти на запит" -msgid "Respond to the FOI request" -msgstr "Відповісти на запит" +msgid "Respond to the FOI request '{{request}}' made by {{user}}" +msgstr "" msgid "Respond using the web" msgstr "Відповісти через інтернет" @@ -2425,9 +2434,6 @@ msgstr "" msgid "Special note for this authority!" msgstr "Примітка:" -msgid "Start now »" -msgstr "Почати зараз »" - msgid "Start your own blog" msgstr "" @@ -3036,6 +3042,9 @@ msgstr "Неможливо надіслати відповідь користу msgid "Unable to send follow up message to {{username}}" msgstr "Неможливо надіслати повідомленя користувачу {{username}}" +msgid "Unclassified or hidden requests are not counted." +msgstr "" + msgid "Unexpected search result type " msgstr "Неочікуваний результат пошуку" @@ -3096,9 +3105,6 @@ msgstr "" msgid "User|About me" msgstr "Користувач|Про мене" -msgid "User|Address" -msgstr "" - msgid "User|Admin level" msgstr "" @@ -3108,9 +3114,6 @@ msgstr "" msgid "User|Can make batch requests" msgstr "" -msgid "User|Dob" -msgstr "" - msgid "User|Email" msgstr "Користувач|Мейл" @@ -3165,7 +3168,7 @@ msgstr "Електронна адреса розпорядника інформ msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "Переглянути запити, зроблені користувачем {{user_name}}:" -msgid "View and search requests" +msgid "Browse and search requests" msgstr "Переглядати та шукати запити" msgid "View authorities" @@ -3174,7 +3177,7 @@ msgstr "Показати розпорядників інформації" msgid "View email" msgstr "Показати емейли" -msgid "View requests" +msgid "Browse Requests" msgstr "Показати запити" msgid "Waiting clarification." diff --git a/locale/vi/app.po b/locale/vi/app.po index 24b2e0d46..cc6645ec9 100644 --- a/locale/vi/app.po +++ b/locale/vi/app.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-15 12:46+0100\n" -"PO-Revision-Date: 2014-05-15 11:56+0000\n" -"Last-Translator: louisecrow <louise@mysociety.org>\n" +"POT-Creation-Date: 2014-08-21 13:43+0000\n" +"PO-Revision-Date: 2014-08-21 13:44+0000\n" +"Last-Translator: Gareth Rees <gareth@mysociety.org>\n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/alaveteli/language/vi/)\n" "Language: vi\n" "MIME-Version: 1.0\n" @@ -93,9 +93,6 @@ msgstr "" msgid " You will also be emailed updates about the request." msgstr "" -msgid " made by " -msgstr "được tạo bởi" - msgid " when you send this message." msgstr "khi bạn gửi đi tin nhắn này" @@ -285,6 +282,9 @@ msgstr "" msgid "<strong>did not have</strong> the information requested." msgstr "" +msgid "?" +msgstr "" + msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "" @@ -540,9 +540,6 @@ msgstr "" msgid "Change your password on {{site_name}}" msgstr "" -msgid "Change your password {{site_name}}" -msgstr "" - msgid "Charity registration" msgstr "" @@ -717,6 +714,9 @@ msgstr "" msgid "Disclosure log URL" msgstr "" +msgid "Do not fill in this field" +msgstr "" + msgid "Don't have a superuser account yet?" msgstr "" @@ -1375,6 +1375,9 @@ msgstr "" msgid "Make a request" msgstr "" +msgid "Make a request »" +msgstr "" + msgid "Make a request to these authorities" msgstr "" @@ -1876,6 +1879,9 @@ msgstr "" msgid "Public Bodies" msgstr "" +msgid "Public Body" +msgstr "" + msgid "Public Body Statistics" msgstr "" @@ -1888,6 +1894,9 @@ msgstr "" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "" +msgid "Public authority statistics" +msgstr "" + msgid "Public authority – {{name}}" msgstr "" @@ -2113,7 +2122,7 @@ msgstr "" msgid "Respond to request" msgstr "" -msgid "Respond to the FOI request" +msgid "Respond to the FOI request '{{request}}' made by {{user}}" msgstr "" msgid "Respond using the web" @@ -2316,9 +2325,6 @@ msgstr "" msgid "Special note for this authority!" msgstr "" -msgid "Start now »" -msgstr "" - msgid "Start your own blog" msgstr "" @@ -2913,6 +2919,9 @@ msgstr "" msgid "Unable to send follow up message to {{username}}" msgstr "" +msgid "Unclassified or hidden requests are not counted." +msgstr "" + msgid "Unexpected search result type " msgstr "" @@ -2973,9 +2982,6 @@ msgstr "" msgid "User|About me" msgstr "" -msgid "User|Address" -msgstr "" - msgid "User|Admin level" msgstr "" @@ -2985,9 +2991,6 @@ msgstr "" msgid "User|Can make batch requests" msgstr "" -msgid "User|Dob" -msgstr "" - msgid "User|Email" msgstr "" @@ -3042,7 +3045,7 @@ msgstr "" msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "" -msgid "View and search requests" +msgid "Browse and search requests" msgstr "" msgid "View authorities" @@ -3051,7 +3054,7 @@ msgstr "" msgid "View email" msgstr "" -msgid "View requests" +msgid "Browse Requests" msgstr "" msgid "Waiting clarification." diff --git a/locale/zh_HK/app.po b/locale/zh_HK/app.po index 0a0991de4..51bea486d 100644 --- a/locale/zh_HK/app.po +++ b/locale/zh_HK/app.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-15 12:46+0100\n" -"PO-Revision-Date: 2014-05-15 11:56+0000\n" -"Last-Translator: louisecrow <louise@mysociety.org>\n" +"POT-Creation-Date: 2014-08-21 13:43+0000\n" +"PO-Revision-Date: 2014-08-21 13:44+0000\n" +"Last-Translator: Gareth Rees <gareth@mysociety.org>\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/alaveteli/language/zh_HK/)\n" "Language: zh_HK\n" "MIME-Version: 1.0\n" @@ -91,9 +91,6 @@ msgstr "" msgid " You will also be emailed updates about the request." msgstr "" -msgid " made by " -msgstr " 由 " - msgid " when you send this message." msgstr "當您傳送此訊息時。" @@ -283,6 +280,9 @@ msgstr "" msgid "<strong>did not have</strong> the information requested." msgstr "" +msgid "?" +msgstr "" + msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "" @@ -538,9 +538,6 @@ msgstr "" msgid "Change your password on {{site_name}}" msgstr "" -msgid "Change your password {{site_name}}" -msgstr "" - msgid "Charity registration" msgstr "" @@ -715,6 +712,9 @@ msgstr "" msgid "Disclosure log URL" msgstr "" +msgid "Do not fill in this field" +msgstr "" + msgid "Don't have a superuser account yet?" msgstr "" @@ -1373,6 +1373,9 @@ msgstr "" msgid "Make a request" msgstr "" +msgid "Make a request »" +msgstr "" + msgid "Make a request to these authorities" msgstr "" @@ -1874,6 +1877,9 @@ msgstr "" msgid "Public Bodies" msgstr "" +msgid "Public Body" +msgstr "" + msgid "Public Body Statistics" msgstr "" @@ -1886,6 +1892,9 @@ msgstr "" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" msgstr "" +msgid "Public authority statistics" +msgstr "" + msgid "Public authority – {{name}}" msgstr "" @@ -2111,7 +2120,7 @@ msgstr "" msgid "Respond to request" msgstr "" -msgid "Respond to the FOI request" +msgid "Respond to the FOI request '{{request}}' made by {{user}}" msgstr "" msgid "Respond using the web" @@ -2314,9 +2323,6 @@ msgstr "" msgid "Special note for this authority!" msgstr "" -msgid "Start now »" -msgstr "" - msgid "Start your own blog" msgstr "" @@ -2911,6 +2917,9 @@ msgstr "" msgid "Unable to send follow up message to {{username}}" msgstr "" +msgid "Unclassified or hidden requests are not counted." +msgstr "" + msgid "Unexpected search result type " msgstr "" @@ -2971,9 +2980,6 @@ msgstr "" msgid "User|About me" msgstr "" -msgid "User|Address" -msgstr "" - msgid "User|Admin level" msgstr "" @@ -2983,9 +2989,6 @@ msgstr "" msgid "User|Can make batch requests" msgstr "" -msgid "User|Dob" -msgstr "" - msgid "User|Email" msgstr "" @@ -3040,7 +3043,7 @@ msgstr "" msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "" -msgid "View and search requests" +msgid "Browse and search requests" msgstr "" msgid "View authorities" @@ -3049,7 +3052,7 @@ msgstr "" msgid "View email" msgstr "" -msgid "View requests" +msgid "Browse Requests" msgstr "" msgid "Waiting clarification." diff --git a/public/down.default.html b/public/down.default.html index 0440f91f9..d6291a74a 100644 --- a/public/down.default.html +++ b/public/down.default.html @@ -3,12 +3,12 @@ <head> <meta charset="utf-8"> <title> - WhatDoTheyKnow - make and browse Freedom of Information (FOI) requests + Alaveteli - make and browse Freedom of Information (FOI) requests </title> - <link href="/assets/main.css" media="screen" rel="stylesheet" title="Main" type="text/css"> + <link href="/assets/application.css" media="screen" rel="stylesheet" title="Main" type="text/css"> <!--[if LT IE 7]> - <style type="text/css">@import url("/stylesheets/ie6.css");</style> + <style type="text/css">@import url("/assets/ie6.css");</style> <![endif]--> </head> @@ -17,15 +17,12 @@ <div id="banner"> </div> <div id="header"> - <h1> - <a href="/">WhatDoTheyKnow?</a> - </h1> <div id="tagline"> Make and explore Freedom of Information requests </div> </div> <div id="mysoclogo"> - <a href="http://www.mysociety.org">a site by mysociety.org</a> + <a href="http://www.alaveteli.org">powered by Alaveteli</a> </div> <div id="topnav"> <ul id="navigation"></ul> @@ -35,7 +32,7 @@ <div id="content"> <div id="general_frontpage"> <div id="frontpage_search"> - <h1>Sorry. WhatDoTheyKnow is down for maintenance. Please come back in a few minutes.</h1> + <h1>Sorry. We’re down for maintenance. Please come back in a few minutes.</h1> </div> </div> </div> diff --git a/script/site-specific-install.sh b/script/site-specific-install.sh index fce230822..59b714fb7 100755 --- a/script/site-specific-install.sh +++ b/script/site-specific-install.sh @@ -32,6 +32,65 @@ misuse() { update_mysociety_apt_sources +# Debian Squeeze Fixes +if [ x"$DISTRIBUTION" = x"debian" ] && [ x"$DISTVERSION" = x"squeeze" ] +then + # Add wheezy repo to get bundler + cat > /etc/apt/sources.list.d/debian-wheezy.list <<EOF +deb http://the.earth.li/debian/ wheezy main contrib non-free +EOF + + # Get bundler from wheezy repo and de-prioritise all other + # wheezy packages + cat >> /etc/apt/preferences <<EOF + +Package: bundler +Pin: release n=wheezy +Pin-Priority: 990 + +Package: * +Pin: release n=wheezy +Pin-Priority: 50 +EOF + +apt-get -qq update +fi + +# Ubuntu Precise Fixes +if [ x"$DISTRIBUTION" = x"ubuntu" ] && [ x"$DISTVERSION" = x"precise" ] +then + cat > /etc/apt/sources.list.d/ubuntu-trusty.list <<EOF +deb http://archive.ubuntu.com/ubuntu/ trusty universe +deb-src http://archive.ubuntu.com/ubuntu/ trusty universe +EOF + + cat > /etc/apt/sources.list.d/mysociety-launchpad.list <<EOF +deb http://ppa.launchpad.net/mysociety/alaveteli/ubuntu precise main +deb-src http://ppa.launchpad.net/mysociety/alaveteli/ubuntu precise main +EOF + + # Get bundler from trusty and de-prioritise all other + # trusty packages + cat >> /etc/apt/preferences <<EOF + +Package: ruby-bundler +Pin: release n=trusty +Pin-Priority: 990 + +Package: * +Pin: release n=trusty +Pin-Priority: 50 +EOF + +# Get the key for the mysociety ubuntu alaveteli repo +apt-get install -y python-software-properties +add-apt-repository -y ppa:mysociety/alaveteli + +apt-get -qq update +fi + +apt-get -y update + if [ ! "$DEVELOPMENT_INSTALL" = true ]; then install_nginx add_website_to_nginx @@ -134,10 +193,6 @@ su -l -c "$BIN_DIRECTORY/install-as-user '$UNIX_USER' '$HOST' '$DIRECTORY'" "$UN # no longer need the PostgreSQL user to be a superuser: echo "ALTER USER \"$UNIX_USER\" WITH NOSUPERUSER;" | su -l -c 'psql' postgres -if [ ! "$DEVELOPMENT_INSTALL" = true ]; then - install_sysvinit_script -fi - # Set up root's crontab: cd "$REPOSITORY" @@ -146,14 +201,21 @@ echo -n "Creating /etc/cron.d/alaveteli... " (su -l -c "cd '$REPOSITORY' && bundle exec rake config_files:convert_crontab DEPLOY_USER='$UNIX_USER' VHOST_DIR='$DIRECTORY' VCSPATH='$SITE' SITE='$SITE' CRONTAB=config/crontab-example" "$UNIX_USER") > /etc/cron.d/alaveteli # There are some other parts to rewrite, so just do them with sed: sed -r \ - -e "/foi-purge-varnish/d" \ + -e "/$SITE-purge-varnish/d" \ -e "s,^(MAILTO=).*,\1root@$HOST," \ -i /etc/cron.d/alaveteli echo $DONE_MSG -echo -n "Creating /etc/init.d/foi-alert-tracks... " -(su -l -c "cd '$REPOSITORY' && bundle exec rake config_files:convert_init_script DEPLOY_USER='$UNIX_USER' VHOST_DIR='$DIRECTORY' SCRIPT_FILE=config/alert-tracks-debian.ugly" "$UNIX_USER") > /etc/init.d/foi-alert-tracks -chmod a+rx /etc/init.d/foi-alert-tracks +if [ ! "$DEVELOPMENT_INSTALL" = true ]; then + echo -n "Creating /etc/init.d/$SITE... " + (su -l -c "cd '$REPOSITORY' && bundle exec rake config_files:convert_init_script DEPLOY_USER='$UNIX_USER' VHOST_DIR='$DIRECTORY' VCSPATH='$SITE' SITE='$SITE' SCRIPT_FILE=config/sysvinit-thin.ugly" "$UNIX_USER") > /etc/init.d/"$SITE" + chmod a+rx /etc/init.d/"$SITE" + echo $DONE_MSG +fi + +echo -n "Creating /etc/init.d/$SITE-alert-tracks... " +(su -l -c "cd '$REPOSITORY' && bundle exec rake config_files:convert_init_script DEPLOY_USER='$UNIX_USER' VHOST_DIR='$DIRECTORY' SCRIPT_FILE=config/alert-tracks-debian.ugly" "$UNIX_USER") > /etc/init.d/$SITE-alert-tracks +chmod a+rx /etc/init.d/$SITE-alert-tracks echo $DONE_MSG if [ $DEFAULT_SERVER = true ] && [ x != x$EC2_HOSTNAME ] diff --git a/script/test-vagrant-provisioning b/script/test-vagrant-provisioning new file mode 100755 index 000000000..62862f3df --- /dev/null +++ b/script/test-vagrant-provisioning @@ -0,0 +1,19 @@ +#!/bin/bash + +OS=$1 + +vagrant destroy + +ALAVETELI_VAGRANT_OS="$OS" vagrant up && + vagrant ssh -c "cd /home/vagrant/alaveteli && bundle exec rails s --daemon" && + sleep 10 && + curl -I http://10.10.10.30:3000 + +if [[ $? -ne 0 ]] +then + echo "Failed with exit code $?" + exit 1 +else + echo "Success!" + exit 0 +fi diff --git a/spec/controllers/admin_request_controller_spec.rb b/spec/controllers/admin_request_controller_spec.rb index 63b219c88..7c5253f49 100644 --- a/spec/controllers/admin_request_controller_spec.rb +++ b/spec/controllers/admin_request_controller_spec.rb @@ -60,6 +60,12 @@ describe AdminRequestController, "when administering requests" do get :fully_destroy, { :id => info_request } end + it 'uses a different flash message to avoid trying to fetch a non existent user record' do + info_request = info_requests(:external_request) + post :fully_destroy, { :id => info_request.id } + request.flash[:notice].should include('external') + end + end end diff --git a/spec/controllers/api_controller_spec.rb b/spec/controllers/api_controller_spec.rb index 7b1d73e8a..323ef4cd4 100644 --- a/spec/controllers/api_controller_spec.rb +++ b/spec/controllers/api_controller_spec.rb @@ -514,7 +514,7 @@ describe ApiController, "when using the API" do assigns[:event_data].should == [first_event] end - it 'should honour the since_date parameter for the Atom feed' do + it 'should honour the since_date parameter' do get :body_request_events, :id => public_bodies(:humpadink_public_body).id, :k => public_bodies(:humpadink_public_body).api_key, @@ -527,6 +527,15 @@ describe ApiController, "when using the API" do assigns[:events].each do |event| event.created_at.should >= Date.new(2010, 1, 1) end + + get :body_request_events, + :id => public_bodies(:humpadink_public_body).id, + :k => public_bodies(:humpadink_public_body).api_key, + :since_date => '2010-01-01', + :feed_type => 'json' + assigns[:events].each do |event| + event.created_at.should >= Date.new(2010, 1, 1) + end end end end diff --git a/spec/controllers/public_body_change_requests_controller_spec.rb b/spec/controllers/public_body_change_requests_controller_spec.rb index 7b878b893..8fe7befeb 100644 --- a/spec/controllers/public_body_change_requests_controller_spec.rb +++ b/spec/controllers/public_body_change_requests_controller_spec.rb @@ -22,7 +22,8 @@ describe PublicBodyChangeRequestsController, "creating a change request" do :public_body_name => 'New Body', :public_body_email => 'new_body@example.com', :notes => 'Please', - :source => 'http://www.example.com'} + :source => 'http://www.example.com', + :comment => '' } end it "should send an email to the site contact address" do @@ -51,6 +52,18 @@ describe PublicBodyChangeRequestsController, "creating a change request" do response.should redirect_to frontpage_url end + it 'has rudimentary spam protection' do + spam_request_params = @change_request_params.merge({ :comment => 'I AM A SPAMBOT' }) + + post :create, { :public_body_change_request => spam_request_params } + + response.should redirect_to(frontpage_path) + + deliveries = ActionMailer::Base.deliveries + deliveries.size.should == 0 + deliveries.clear + end + end context 'when handling a request for an update to an existing authority' do @@ -64,7 +77,8 @@ describe PublicBodyChangeRequestsController, "creating a change request" do :public_body_id => @public_body.id, :public_body_email => 'new_body@example.com', :notes => 'Please', - :source => 'http://www.example.com'} + :source => 'http://www.example.com', + :comment => '' } end it 'should send an email to the site contact address' do diff --git a/spec/lib/attachment_to_html/view_spec.rb b/spec/lib/attachment_to_html/view_spec.rb index 65eff4cad..50179b0f7 100644 --- a/spec/lib/attachment_to_html/view_spec.rb +++ b/spec/lib/attachment_to_html/view_spec.rb @@ -119,6 +119,7 @@ describe AttachmentToHTML::View do <!DOCTYPE html> <html> <head> + <meta charset="UTF-8"> <title>An attachment.txt</title> </head> <body> |