diff options
61 files changed, 2945 insertions, 2029 deletions
@@ -78,6 +78,7 @@ end group :development do gem 'capistrano', '~> 2.15.4' gem 'mailcatcher', '~> 0.5.11' + gem 'pry', '~> 0.9.6' gem 'quiet_assets', '~> 1.0.2' gem 'rdoc', '~> 3.12.2' end diff --git a/Gemfile.lock b/Gemfile.lock index 3af06fc8d..3f900d047 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -68,6 +68,7 @@ GEM net-ssh-gateway (>= 1.1.0) charlock_holmes (0.6.9.4) chunky_png (1.3.3) + coderay (1.1.0) coffee-rails (3.2.2) coffee-script (>= 2.2.0) railties (~> 3.2.0) @@ -155,6 +156,7 @@ GEM sqlite3 (~> 1.3) thin (~> 1.5.0) memcache-client (1.8.5) + method_source (0.8.2) mime-types (1.25.1) multi_json (1.10.1) net-http-local (0.1.2) @@ -173,6 +175,10 @@ GEM railties (~> 3.0) pg (0.17.1) polyglot (0.3.5) + pry (0.9.12.6) + coderay (~> 1.0) + method_source (~> 0.8) + slop (~> 3.4) quiet_assets (1.0.2) railties (>= 3.1, < 5.0) rack (1.4.5) @@ -246,6 +252,7 @@ GEM skinny (0.2.3) eventmachine (~> 1.0.0) thin (~> 1.5.0) + slop (3.6.0) spork (1.0.0rc3) spork-rails (3.2.1) rails (>= 3.0.0, < 3.3.0) @@ -325,6 +332,7 @@ DEPENDENCIES newrelic_rpm nokogiri (~> 1.5.9) pg (~> 0.17.1) + pry (~> 0.9.6) quiet_assets (~> 1.0.2) rack (~> 1.4.5) rails (= 3.2.21) diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index b063b0d77..91e509083 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -185,11 +185,9 @@ margin:18px 0 36px; } #stepwise_make_request { -color:#222; font-size:1.1em; text-align:left; -width:412px; -margin:0 14em 40px 0; +margin-bottom: 1em; } #stepwise_make_request_view_email { @@ -586,12 +584,25 @@ width:40%; width:26em; } +#request_form { +width: 63.6666%; +margin-right: 3%; +float: left; +} + #request_advice { float:right; -width:250px; +width:30.3333%; margin-top:1em; } +.advice-panel { + ul { + list-style: none outside none; + padding-left: 0 !important; + } +} + #select_authority_help { background-color: #FEF1F6; float: right; @@ -616,20 +627,18 @@ padding-top:0.5em; padding-bottom:1em; } +#request_header_subject { + .form_item_note { + margin-top: 0.5em; + } +} + #request_form label,label.form_label { -display:block; -float:left; -clear:none; -width:100px; -text-align:left; -margin:2px 0 0; -padding:0 10px 0 0; + display: block; } .form_item_note,.form_note { -width:34em; -margin-left:110px; -font-size:1em; + } .form_item_note { @@ -637,7 +646,7 @@ margin-top:-1em; } .form_button { -margin:0 0 0 9em; +margin:0; } p#sign_in_reason, p#superuser_message { @@ -653,7 +662,6 @@ p#superuser_message { clear:none; margin-bottom:1em; float:none; -margin-top:20px; width:auto; } @@ -675,8 +683,16 @@ margin-left:25%; #signup .form_item_note,#signin .form_note { font-size:0.9em; -margin-left:11.5em; -width:inherit; +margin-top: 0.5em; +} + +.sign-in-wrapper { + overflow: hidden; + padding: 1em 1.5em 1.5em; + background-color: #f4f4f4; + h2 { + margin-top: 0.2em; + } } div.controller_help dt a,div.controller_help h1 a,div#help_unhappy h1 a.hover_a { @@ -898,7 +914,6 @@ margin:0 1.2em 0 0.9em; #request_header_text,#request_search_ahead_results { font-size:0.9em; -margin-left:11em; } div.feed_link img,div.act_link img { @@ -907,34 +922,6 @@ vertical-align:middle; text-decoration:none; } -#follow_box { - - padding: 4px; -} - -#follow_box .feed_link { - text-align: center; -} - -#follow_count { - color: #93278F; - font-family: 'DeliciousBold', Arial, sans-serif; - font-weight: 700; - font-size: 60px; - line-height: 60px; - text-align: right; - float: left; - margin-top: -15px; - margin-right: 5px; -} -.follow_count { - clear:both; -} - -#follow_box h2 { - margin: 0; -} - h2,dt { font-size:1.8em; } @@ -995,21 +982,20 @@ width:245px; float:left; } +.authority__body__foi-results .request_right { +width:545px; +} + #request_header_text { -margin-left:110px; -width: 30em; border-radius:3px; -moz-border-radius:3px; -margin-top: 10px; +margin: 10px 10px 0; background-color:#D5FFD8; border-color:#1EFF38; border-style:solid; border-width:1px; padding:0.5em; - font-style: italic; - - } #request_header_text h3 { @@ -1272,13 +1258,19 @@ font-style:italic; color:#444; } -#sign_together h1 { -width:320px; -text-align:center; + +#sign_together { + #left_half { + width: 63.666%; + margin-right: 3%; + } + #right_half { + width: 33.333%; + } } -#sign_together .form_button { -margin-left:10.5em; +.pretitle { + margin-bottom: 0; } form input[type=text],form input[type=password] { @@ -1817,3 +1809,108 @@ text-decoration:none; color: #0000EE; font-size: 0.9em; } + +.back-to-results { + margin-top: 0.5em; +} + +.authority__header { + border-bottom: 1px solid #e9e9e9; + margin-bottom: 1em; +} + + +.authority__header__subtitle { + font-size: 1.2em; + color: #666; +} + +.authority__header__notes { + margin: 1em; +} + +.authority__body { + overflow: hidden; +} + +.authority__body__foi-results { + width: 63.666%; + float: left; + margin-right: 3%; +} + +.authority__body__sidebar { + width: 33.333%; + float: left; +} + +.authority__header__action-bar { + font-size: 0; + padding: 16px 0; + margin-top: 8px; + border-top: 1px solid #e9e9e9; +} + +.action-bar__make-request, +.action-bar__follow, +.action-bar__follow-button, +.action-bar__follower-count { + font-size: 16px; + display: inline-block; + margin:0 1em 0 0; + .feed_link { + padding: 0; + } +} + +.list-filter-item { + .title { + display: inline; + font-size: 1em; + font-weight: normal; + } +} + +.list-filter-item { + ul { + list-style: none outside none; + margin: 0; + padding: 0; + } + li { + display: inline-block; + &:after { + content:' | '; + display: inline-block; + color: #ccc; //Unsupported browsers will ignore the rgba declaration below + color: rgba(0,0,0,0.1); + } + &:last-child { + &:after { + content: ''; + } + } + + } +} + +.authority__body__sidebar__links { + a { + display: inline-block; + margin-bottom: 0.5em; + } +} + +#list-filter { + margin-bottom: 3em; +} + +#filter_requests_form label.title { + display: block; + width: auto; + margin-bottom: 0.3em; +} + +#notice.request-sent-message { + font-size: 1em; +} diff --git a/app/assets/stylesheets/responsive/_global_style.scss b/app/assets/stylesheets/responsive/_global_style.scss index 0ffa875ab..24cddc0d9 100644 --- a/app/assets/stylesheets/responsive/_global_style.scss +++ b/app/assets/stylesheets/responsive/_global_style.scss @@ -92,7 +92,7 @@ dt + dd { /* Links in sidebars usually only underlined on hover */ .feed_link,.act_link { - margin-bottom:10px; + a{ text-decoration:none; } @@ -116,7 +116,7 @@ dt + dd { } /* Notices to the user (usually on action completion) */ -#notice, #error { +#notice, #error, .warning { font-size:1em; border-radius:3px; margin:1em 0; @@ -136,7 +136,7 @@ dt + dd { background-color: lighten(#62b356, 23%); } -#error { +#error, .warning { background-color: lighten(#b05460, 23%); } @@ -191,15 +191,6 @@ form input[type=text],form input[type=password] { padding:0.5em; } -#preview_form ul { - margin:0; - padding:1px 32px 10px; -} - -#preview_form ul li { - margin:10px 0; -} - label small{ text-transform: none; } diff --git a/app/assets/stylesheets/responsive/_lists_layout.scss b/app/assets/stylesheets/responsive/_lists_layout.scss index 69237ae91..6a874e8fe 100644 --- a/app/assets/stylesheets/responsive/_lists_layout.scss +++ b/app/assets/stylesheets/responsive/_lists_layout.scss @@ -81,4 +81,8 @@ } } - +/* .make-request-quick-button displays in the typeahead search results in the 'make request' process */ +.make-request-quick-button { + margin-bottom: 1em; + margin-top: -0.5em; +} diff --git a/app/assets/stylesheets/responsive/_new_request_layout.scss b/app/assets/stylesheets/responsive/_new_request_layout.scss index 55c72b8e3..2ebba0813 100644 --- a/app/assets/stylesheets/responsive/_new_request_layout.scss +++ b/app/assets/stylesheets/responsive/_new_request_layout.scss @@ -3,8 +3,9 @@ /* /select_authority page */ #authority_selection { @include grid-column($columns: 12, $collapse: true); + @include respond-min( $main_menu-mobile_menu_cutoff ){ - @include grid-column($columns: 6, $collapse: true); + @include grid-column(8, $collapse: true); @include ie8{ padding-right: 0.9375em; } @@ -15,16 +16,27 @@ width: 80%; } } + .authority_search_ahead_results_container { + @include respond-min( $main_menu-mobile_menu_cutoff ){ + @include grid-row($behavior: nest); + } + } + #authority_search_ahead_results, + .cant_find_results { + @include respond-min( $main_menu-mobile_menu_cutoff ){ + @include grid-column(12); + } + } } .new_info_request{ - @include grid-row($behavior: nest); + @include grid-row(); } #select_authority_help { - @include grid-column(12); + @include grid-column(12, $collapse: true); @include respond-min( $main_menu-mobile_menu_cutoff ) { - @include grid-column(6); + @include grid-column(4); @include ie8 { padding-right: 0.9375em; } @@ -32,14 +44,41 @@ width: 26.188em; } } + + /* Hide some elements of the public body that aren't appropriate in this + context */ + #list-filter, h2.foi_results, .public-body-name-prefix { + display: none; + } + + /* Compact request list for viewing in authority preview column */ + .request_left, #header_left { + @include grid-column(12, $collapse: true); + } + + .request_right { + @include grid-column(12, $collapse: true); + } + + span.desc { + background:none; + line-height:18px; + padding: 0; + } + + .typeahead_response { + @include grid-row($behavior: nest); + } + + } /* /new/[body_name] page */ #request_header { - @include grid-row; + @include grid-row($behavior: nest); /* Restrict width of form elements on wide screens */ - #request_header_body, #request_header_subject, #typeahead_response { + #request_header_body, #request_header_subject, #typeahead_response { @include grid-column(12); @include respond-min( $main_menu-mobile_menu_cutoff ){ @include grid-column($columns:8, $last-column:true); @@ -62,12 +101,19 @@ float: right; } -/* Advice sits on right hand side */ -#request_advice { +.request_body { + @include grid-row($behavior: nest); +} +#request_body_header { + @include grid-column(12); +} + +/* Advice sits on right hand side */ +#request_advice, .preview-advice { @include grid-column(12); @include respond-min( $main_menu-mobile_menu_cutoff ){ - @include grid-column($columns:4, $push: 8); + @include grid-column($columns:4, $push:8, $last-column:true); @include ie8{ padding-left: 0.9375em; } @@ -78,10 +124,9 @@ } #request_form { - @include grid-column(12); @include respond-min( $main_menu-mobile_menu_cutoff ){ - @include grid-column($columns:8, $pull: 4); + @include grid-column($columns:8, $pull:4); @include ie8{ padding-right: 0.9375em; } @@ -92,10 +137,28 @@ } -#preview_form { - @include grid-column(12); +#outgoing_message_body { + width: 100%; +} + +/* Message preview */ +.message-preview { + @include grid-row($behavior: nest); } +.preview-pane { + @include grid-column(12); + @include respond-min( $main_menu-mobile_menu_cutoff ){ + @include grid-column($columns:8, $pull:4); + @include ie8{ + padding-right: 0.9375em; + } + @include lte-ie7 { + width: 36.813em; + } + } + } + /* Batch request page*/ @@ -164,13 +227,27 @@ div.batch_public_body_toggle { margin-left: 110px; } - /* Request sent page */ .request-sent-message { margin-top: 1em; h1 { - margin-bottom: 1em; + font-size: 1.3em; + margin-top: 0; + @include respond-min( $main_menu-mobile_menu_cutoff ){ + font-size: 2em; + margin-bottom: 1em; + } + } + + .share-link img { + display:block; + margin: 1em auto; + @include respond-min( $main_menu-mobile_menu_cutoff ){ + display: inline-block; + margin: inherit; + } } + } .request-sent-message__row { @@ -179,8 +256,10 @@ div.batch_public_body_toggle { .request-sent-message__column-1 { @include grid-column(12); + margin-bottom: 1em; @include respond-min( $main_menu-mobile_menu_cutoff ){ @include grid-column($columns:8); + margin-bottom: 0; @include ie8{ padding-right: 0.9375em; } diff --git a/app/assets/stylesheets/responsive/_new_request_style.scss b/app/assets/stylesheets/responsive/_new_request_style.scss index e07ecb55c..55abdca31 100644 --- a/app/assets/stylesheets/responsive/_new_request_style.scss +++ b/app/assets/stylesheets/responsive/_new_request_style.scss @@ -29,15 +29,23 @@ #to_public_body { font-weight: bold; font-size: 1.3em; + margin-bottom: 0.5em; +} + +.to_public_body_label { + color: #777; + font-weight: normal; +} + +#request_header { + border-bottom: 1px solid #ccc; //Unsupported browsers will ignore the rgba declaration below + border-color: rgba(0,0,0,0.1); + margin-bottom: 2em; } #request_header_text { - border-radius:3px; - background-color: lighten(#62b356, 23%); - padding:0 1em; - margin-bottom: 1.5em; - margin-top: 1.5em; overflow: hidden; + font-size: 0.875em; h3 { font-size: 1em; } @@ -45,15 +53,54 @@ } #request_advice { + margin-bottom: 1.5em; + font-size: 0.875em; + @include respond-min( $main_menu-mobile_menu_cutoff ){ + font-size: 1em; + } + .advice-panel { + margin-top: 1.5em; + } +} + +.advice-panel { + margin-bottom: 1.5em; + @include respond-min( $main_menu-mobile_menu_cutoff ){ + margin-bottom: 0; + } ul { margin:0 auto; - + list-style: none outside none; + padding: 0; li { margin:0 0 1em; } } } +#request_search_ahead_results { + background-color: #f4f4f4; + padding: 1.5em; + margin-bottom: 1.5em; + h2 { + font-size: 1em; + font-weight: normal; + } +} + + +input#reedit_button { + background-color: transparent; + color: #2688dc; + text-decoration: underline; + &:hover, + &:active, + &:focus { + color: #333333; + } + border: none; +} + /* Batch request page */ diff --git a/app/assets/stylesheets/responsive/_public_body_layout.scss b/app/assets/stylesheets/responsive/_public_body_layout.scss index 39d42e213..7a9637bc9 100644 --- a/app/assets/stylesheets/responsive/_public_body_layout.scss +++ b/app/assets/stylesheets/responsive/_public_body_layout.scss @@ -8,3 +8,66 @@ @include grid-column(12); margin-top: 0.5em; } + +.authority__header { + @include respond-min( $main_menu-mobile_menu_cutoff ){ + margin-bottom: 1em; + } + @include grid-column(12); +} + +.authority__body { + .request_left, + .request_right { + float: none; + width: auto; + } + .desc { + padding-left: 0; + } + .request_listing .bottomline { + padding-bottom: 0.5em; + } +} + +.authority__body__foi-results { + @include grid-column(12); + @include respond-min( $main_menu-mobile_menu_cutoff ){ + @include grid-column(8); + } +} + +.authority__body__sidebar { + @include grid-column(12); + @include respond-min( $main_menu-mobile_menu_cutoff ){ + @include grid-column(4); + } +} + +.authority__header__action-bar { + font-size: 0; + padding: 16px 0; + margin-top: 8px; +} + +.action-bar__make-request, +.action-bar__follow, +.action-bar__follow-button, +.action-bar__follower-count { + vertical-align: top; + font-size: 16px; + margin: 1em 0; + @include respond-min( $main_menu-mobile_menu_cutoff ){ + display: inline-block; + margin:0 1em 0 0; + } +} + + +.list-filter-item { + .title { + display: inline; + font-size: 1em; + font-weight: normal; + } +} diff --git a/app/assets/stylesheets/responsive/_public_body_style.scss b/app/assets/stylesheets/responsive/_public_body_style.scss index 4040198b3..748f6218b 100644 --- a/app/assets/stylesheets/responsive/_public_body_style.scss +++ b/app/assets/stylesheets/responsive/_public_body_style.scss @@ -1,24 +1,76 @@ /* Style for public body pages */ .back-to-results { - .message { - margin-top: 0.5em; - padding: 0.5em 0.8em; - background-color: #fff; - background-color: rgba(0,0,0,0.1); - } -} - -.public-body-name-prefix { - color:#888; - font-size: 1.3em; - position: relative; - top: 1em; -} - -#follow_count { - font-weight: bold; - font-size: 3em; - position: relative; - top: 0.25em; + .message { + margin-top: 0.5em; + padding: 0.5em 0.8em; + background-color: #fff; + background-color: rgba(0,0,0,0.1); + a { + text-decoration: none; + } + } +} + +.authority__header { + border-bottom: 1px solid #e9e9e9; +} + +.authority__header__subtitle { + font-size: 1.2em; + color: #666; +} + +.authority__header__action-bar { + border-top: 1px solid #e9e9e9; +} + +.authority__body__sidebar { + h2 { + font-size: 1.2em; + } + h3 { + font-size: 1em; + } +} + + +.list-filter-item { + ul { + list-style: none outside none; + margin: 0; + padding: 0; + } + li { + display: inline-block; + &:after { + content:' | '; + display: inline-block; + color: #ccc; //Unsupported browsers will ignore the rgba declaration below + color: rgba(0,0,0,0.1); + } + &:last-child { + &:after { + content: ''; + } + } + + } +} + +.authority__body__sidebar__links { + a { + display: inline-block; + margin-bottom: 0.5em; + } +} + +#list-filter { + margin-bottom: 3em; +} + +#filter_requests_form label.title { + display: block; + width: auto; + margin-bottom: 0.3em; } diff --git a/app/assets/stylesheets/responsive/_request_style.scss b/app/assets/stylesheets/responsive/_request_style.scss index c33688793..e6f36674a 100644 --- a/app/assets/stylesheets/responsive/_request_style.scss +++ b/app/assets/stylesheets/responsive/_request_style.scss @@ -3,7 +3,10 @@ div.correspondence { border: 1px solid #ccc; margin: 0 0 1em; - padding: 0.5em 1em 0 0.5em; + padding: 1em; + @include respond-min( $main_menu-mobile_menu_cutoff ){ + padding: 1.5em; + } h2 { text-align:right; @@ -11,6 +14,20 @@ div.correspondence { } } +.preview_subject, +.preview_to { + font-weight: bold; + strong { + font-weight: normal; + display: block; + color: #777; + } +} + +.preview_subject { + margin-bottom: 1.5em; +} + div.comment_in_request { border: 1px dotted #ccc; margin:0 0 1em 3em; @@ -30,7 +47,7 @@ div.comment_in_request { margin-bottom: 1em; } -.correspondence_text,.comment_in_request_text { +.comment_in_request_text { margin:0 1.2em 0 0.9em; } diff --git a/app/controllers/public_body_controller.rb b/app/controllers/public_body_controller.rb index 2e540d198..cc3d0b64a 100644 --- a/app/controllers/public_body_controller.rb +++ b/app/controllers/public_body_controller.rb @@ -58,6 +58,9 @@ class PublicBodyController < ApplicationController flash.keep(:search_params) @track_thing = TrackThing.create_track_for_public_body(@public_body) + if @user + @existing_track = TrackThing.find_existing(@user, @track_thing) + end @feed_autodetect = [ { :url => do_track_url(@track_thing, 'feed'), :title => @track_thing.params[:title_in_rss], :has_json => true } ] respond_to do |format| diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index 081c14d7f..e847cae1e 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.rb @@ -16,11 +16,9 @@ class RequestController < ApplicationController @@custom_states_loaded = false begin - if !Rails.env.test? - require 'customstates' - include RequestControllerCustomStates - @@custom_states_loaded = true - end + require 'customstates' + include RequestControllerCustomStates + @@custom_states_loaded = true rescue MissingSourceFile, NameError end diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 56f42891d..d66b4aa8e 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -460,6 +460,12 @@ class UserController < ApplicationController return end if !params[:submitted_draft_profile_photo].nil? + if @user.banned? + flash[:error]= _('Banned users cannot edit their profile') + redirect_to set_profile_photo_path + return + end + # check for uploaded image file_name = nil file_content = nil @@ -569,6 +575,12 @@ class UserController < ApplicationController return end + if @user.banned? + flash[:error] = _('Banned users cannot edit their profile') + redirect_to set_profile_about_me_path + return + end + @about_me = AboutMeValidator.new(params[:about_me]) if !@about_me.valid? render :action => 'set_profile_about_me' diff --git a/app/helpers/public_body_helper.rb b/app/helpers/public_body_helper.rb new file mode 100644 index 000000000..332e93284 --- /dev/null +++ b/app/helpers/public_body_helper.rb @@ -0,0 +1,61 @@ +module PublicBodyHelper + + # Public: The reasons a request can't be made to a PublicBody + # The returned reasons are ordered by priority. For example, if the body no + # longer exists there is no reason to ask for its contact details if we don't + # have an email for it. + # + # public_body - Instance of a PublicBody + # + # Returns an Array + def public_body_not_requestable_reasons(public_body) + reasons = [] + + if public_body.defunct? + reasons.push _('This authority no longer exists, so you cannot make a request to it.') + end + + if public_body.not_apply? + reasons.push _('Freedom of Information law does not apply to this authority, so you cannot make a request to it.') + end + + unless public_body.has_request_email? + # Make the authority appear requestable to encourage users to help find + # the authority's email address + msg = link_to _("Make a request to this authority"), + new_request_to_body_path(:url_name => public_body.url_name), + :class => "link_button_green" + + reasons.push(msg) + end + + reasons.compact + end + + # Use tags to describe what type of authority a PublicBody is. + # + # public_body - Instance of a PublicBody + # + # Returns a string + def type_of_authority(public_body) + types = public_body.tags.each_with_index.map do |tag, index| + if PublicBodyCategory.get().by_tag().include?(tag.name) + desc = PublicBodyCategory.get().singular_by_tag()[tag.name] + + if index.zero? + desc = desc.sub(/\S/) { |m| Unicode.upcase(m) } + end + link_to(desc, list_public_bodies_path(tag.name)) + end + end + + types.compact! + + if types.any? + types.to_sentence(:last_word_connector => ' and ').html_safe + else + _("A public authority") + end + end + +end diff --git a/app/models/info_request.rb b/app/models/info_request.rb index 814057ef4..fd42ccd9c 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -187,11 +187,9 @@ class InfoRequest < ActiveRecord::Base @@custom_states_loaded = false begin - if !Rails.env.test? - require 'customstates' - include InfoRequestCustomStates - @@custom_states_loaded = true - end + require 'customstates' + include InfoRequestCustomStates + @@custom_states_loaded = true rescue MissingSourceFile, NameError end diff --git a/app/models/public_body.rb b/app/models/public_body.rb index b8163b07d..0e90a3c16 100644 --- a/app/models/public_body.rb +++ b/app/models/public_body.rb @@ -235,39 +235,38 @@ class PublicBody < ActiveRecord::Base return self.has_tag?('defunct') end - # Can an FOI (etc.) request be made to this body, and if not why not? + # Can an FOI (etc.) request be made to this body? def is_requestable? - if self.defunct? - return false - end - if self.not_apply? - return false - end - if self.request_email.nil? - return false - end - return !self.request_email.empty? && self.request_email != 'blank' + has_request_email? && !defunct? && !not_apply? end + # Strict superset of is_requestable? def is_followupable? - if self.request_email.nil? - return false - end - return !self.request_email.empty? && self.request_email != 'blank' + has_request_email? + end + + def has_request_email? + !request_email.blank? && request_email != 'blank' end + # Also used as not_followable_reason def not_requestable_reason if self.defunct? return 'defunct' elsif self.not_apply? return 'not_apply' - elsif self.request_email.nil? or self.request_email.empty? or self.request_email == 'blank' + elsif !has_request_email? return 'bad_contact' else - raise "requestable_failure_reason called with type that has no reason" + raise "not_requestable_reason called with type that has no reason" end end + def special_not_requestable_reason? + self.defunct? || self.not_apply? + end + + class Version def last_edit_comment_for_html_display @@ -346,35 +345,6 @@ class PublicBody < ActiveRecord::Base end end - - # Use tags to describe what type of thing this is - def type_of_authority(html = false) - types = tags.each_with_index.map do |tag, index| - if PublicBodyCategory.get().by_tag().include?(tag.name) - desc = PublicBodyCategory.get().singular_by_tag()[tag.name] - - if index.zero? - desc = desc.sub(/\S/) { |m| Unicode.upcase(m) } - end - - if html - # TODO: this should call proper route helpers, but is in model sigh - desc = '<a href="/body/list/' + tag.name + '">' + desc + '</a>' - end - - desc - end - end - - types.compact! - - if types.any? - types.to_sentence(:last_word_connector => ' and ').html_safe - else - _("A public authority") - end - end - # Guess home page from the request email, or use explicit override, or nil # if not known. def calculated_home_page @@ -454,8 +424,6 @@ class PublicBody < ActiveRecord::Base def self.import_csv_from_file(csv_filename, tag, tag_behaviour, dry_run, editor, available_locales = []) errors = [] notes = [] - available_locales = [I18n.default_locale] if available_locales.empty? - begin ActiveRecord::Base.transaction do # Use the default locale when retrieving existing bodies; otherwise @@ -476,9 +444,18 @@ class PublicBody < ActiveRecord::Base end set_of_importing = Set.new() - field_names = { 'name'=>1, 'request_email'=>2 } # Default values in case no field list is given + # Default values in case no field list is given + field_names = { 'name' => 1, 'request_email' => 2 } line = 0 + import_options = {:field_names => field_names, + :available_locales => available_locales, + :tag => tag, + :tag_behaviour => tag_behaviour, + :editor => editor, + :notes => notes, + :errors => errors } + CSV.foreach(csv_filename) do |row| line = line + 1 @@ -490,7 +467,7 @@ class PublicBody < ActiveRecord::Base end fields = {} - field_names.each{|name, i| fields[name] = row[i]} + field_names.each{ |name, i| fields[name] = row[i] } yield line, fields if block_given? @@ -506,83 +483,11 @@ class PublicBody < ActiveRecord::Base next end - field_list = [] - self.csv_import_fields.each do |field_name, field_notes| - field_list.push field_name - end - - if public_body = bodies_by_name[name] # Existing public body - available_locales.each do |locale| - I18n.with_locale(locale) do - changed = ActiveSupport::OrderedHash.new - field_list.each do |field_name| - localized_field_name = (locale.to_s == I18n.default_locale.to_s) ? field_name : "#{field_name}.#{locale}" - localized_value = field_names[localized_field_name] && row[field_names[localized_field_name]] - - # Tags are a special case, as we support adding to the field, not just setting a new value - if localized_field_name == 'tag_string' - if localized_value.nil? - localized_value = tag unless tag.empty? - else - if tag_behaviour == 'add' - localized_value = "#{localized_value} #{tag}" unless tag.empty? - localized_value = "#{localized_value} #{public_body.tag_string}" - end - end - end - - if !localized_value.nil? and public_body.send(field_name) != localized_value - changed[field_name] = "#{public_body.send(field_name)}: #{localized_value}" - public_body.send("#{field_name}=", localized_value) - end - end - - unless changed.empty? - notes.push "line #{line.to_s}: updating authority '#{name}' (locale: #{locale}):\n\t#{changed.to_json}" - public_body.last_edit_editor = editor - public_body.last_edit_comment = 'Updated from spreadsheet' - public_body.save! - end - end - end - else # New public body - public_body = PublicBody.new(:name=>"", :short_name=>"", :request_email=>"") - available_locales.each do |locale| - I18n.with_locale(locale) do - changed = ActiveSupport::OrderedHash.new - field_list.each do |field_name| - localized_field_name = (locale.to_s == I18n.default_locale.to_s) ? field_name : "#{field_name}.#{locale}" - localized_value = field_names[localized_field_name] && row[field_names[localized_field_name]] - - if localized_field_name == 'tag_string' and tag_behaviour == 'add' - localized_value = "#{localized_value} #{tag}" unless tag.empty? - end - - if !localized_value.nil? and public_body.send(field_name) != localized_value - changed[field_name] = localized_value - public_body.send("#{field_name}=", localized_value) - end - end - - unless changed.empty? - notes.push "line #{line.to_s}: creating new authority '#{name}' (locale: #{locale}):\n\t#{changed.to_json}" - public_body.publication_scheme = public_body.publication_scheme || "" - public_body.last_edit_editor = editor - public_body.last_edit_comment = 'Created from spreadsheet' - - begin - public_body.save! - rescue ActiveRecord::RecordInvalid - public_body.errors.full_messages.each do |msg| - errors.push "error: line #{ line }: #{ msg } for authority '#{ name }'" - end - next - end - end - end - end - end + public_body = bodies_by_name[name] || PublicBody.new(:name => "", + :short_name => "", + :request_email => "") + public_body.import_values_from_csv_row(row, line, name, import_options) set_of_importing.add(name) end @@ -604,6 +509,77 @@ class PublicBody < ActiveRecord::Base return [errors, notes] end + def self.localized_csv_field_name(locale, field_name) + (locale.to_s == I18n.default_locale.to_s) ? field_name : "#{field_name}.#{locale}" + end + + + # import values from a csv row (that may include localized columns) + def import_values_from_csv_row(row, line, name, options) + is_new = new_record? + edit_info = if is_new + { :action => "creating new authority", + :comment => 'Created from spreadsheet' } + else + { :action => "updating authority", + :comment => 'Updated from spreadsheet' } + end + locales = options[:available_locales] + locales = [I18n.default_locale] if locales.empty? + locales.each do |locale| + I18n.with_locale(locale) do + changed = set_locale_fields_from_csv_row(is_new, locale, row, options) + unless changed.empty? + options[:notes].push "line #{ line }: #{ edit_info[:action] } '#{ name }' (locale: #{ locale }):\n\t#{ changed.to_json }" + self.last_edit_comment = edit_info[:comment] + self.publication_scheme = publication_scheme || "" + self.last_edit_editor = options[:editor] + + begin + save! + rescue ActiveRecord::RecordInvalid + errors.full_messages.each do |msg| + options[:errors].push "error: line #{ line }: #{ msg } for authority '#{ name }'" + end + next + end + end + end + end + end + + # Sets attribute values for a locale from a csv row + def set_locale_fields_from_csv_row(is_new, locale, row, options) + changed = ActiveSupport::OrderedHash.new + csv_field_names = options[:field_names] + csv_import_fields.each do |field_name, field_notes| + localized_field_name = self.class.localized_csv_field_name(locale, field_name) + column = csv_field_names[localized_field_name] + value = column && row[column] + # Tags are a special case, as we support adding to the field, not just setting a new value + if field_name == 'tag_string' + new_tags = [value, options[:tag]].select{ |new_tag| !new_tag.blank? } + if new_tags.empty? + value = nil + else + value = new_tags.join(" ") + value = "#{value} #{tag_string}"if options[:tag_behaviour] == 'add' + end + + end + + if value and read_attribute_value(field_name, locale) != value + if is_new + changed[field_name] = value + else + changed[field_name] = "#{read_attribute_value(field_name, locale)}: #{value}" + end + assign_attributes({ field_name => value }) + end + end + changed + end + # Does this user have the power of FOI officer for this body? def is_foi_officer?(user) user_domain = user.email_domain @@ -802,6 +778,19 @@ class PublicBody < ActiveRecord::Base private + # Read an attribute value (without using locale fallbacks if the attribute is translated) + def read_attribute_value(name, locale) + if self.class.translates.include?(name.to_sym) + if globalize.stash.contains?(locale, name) + globalize.stash.read(locale, name) + else + translation_for(locale).send(name) + end + else + send(name) + end + end + def request_email_if_requestable # Request_email can be blank, meaning we don't have details if self.is_requestable? diff --git a/app/models/public_body_category.rb b/app/models/public_body_category.rb index c313e5734..198e8b737 100644 --- a/app/models/public_body_category.rb +++ b/app/models/public_body_category.rb @@ -49,11 +49,6 @@ class PublicBodyCategory < ActiveRecord::Base PublicBodyCategory.find_by_sql(sql) end - # Called from the old-style public_body_categories_[locale].rb data files - def self.add(locale, data_list) - CategoryAndHeadingMigrator.add_categories_and_headings_from_list(locale, data_list) - end - # Convenience methods for creating/editing translations via forms def find_translation_by_locale(locale) translations.find_by_locale(locale) diff --git a/app/models/track_thing.rb b/app/models/track_thing.rb index 5819876ff..cd90c4a9e 100644 --- a/app/models/track_thing.rb +++ b/app/models/track_thing.rb @@ -231,8 +231,7 @@ class TrackThing < ActiveRecord::Base { # Website :verb_on_page => _("Follow requests to {{public_body_name}}", :public_body_name => public_body.name), - :verb_on_page_already => _("You are already following requests to {{public_body_name}}", - :public_body_name => public_body.name), + :verb_on_page_already => _("Following"), # Email :title_in_email => _("{{foi_law}} requests to '{{public_body_name}}'", :foi_law => public_body.law_only_short, diff --git a/app/models/user.rb b/app/models/user.rb index c953e52f2..920c0da46 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -207,7 +207,7 @@ class User < ActiveRecord::Base if not name.nil? name.strip! end - if public_banned? + if banned? # Use interpolation to return a string rather than a SafeBuffer so that # gsub can be called on it until we upgrade to Rails 3.2. The name returned # is not marked as HTML safe so will be escaped automatically in views. We @@ -294,10 +294,18 @@ class User < ActiveRecord::Base def admin_page_links? super? end + # Is it public that they are banned? + def banned? + !ban_text.empty? + end + def public_banned? - !ban_text.empty? + warn %q([DEPRECATION] User#public_banned? will be replaced with + User#banned? as of 0.22).squish + banned? end + # Various ways the user can be banned, and text to describe it if failed def can_file_requests? ban_text.empty? && !exceeded_limit? diff --git a/app/views/general/search.html.erb b/app/views/general/search.html.erb index 4f9ef5b68..c5ff8e9fd 100644 --- a/app/views/general/search.html.erb +++ b/app/views/general/search.html.erb @@ -1,7 +1,5 @@ <% @show_tips = @xapian_requests.nil? || (@total_hits == 0) %> -<% @include_request_link_in_authority_listing = true %> - <%= render :partial => 'localised_datepicker' %> <% if @query.nil? %> @@ -157,7 +155,9 @@ <div class="results_block"> <% for result in @xapian_bodies.results %> - <%= render :partial => 'public_body/body_listing_single', :locals => { :public_body => result[:model] } %> + <%= render :partial => 'public_body/body_listing_single', + :locals => { :public_body => result[:model], + :request_link => true } %> <% end %> </div> diff --git a/app/views/info_request_batch/_batch_sent.html.erb b/app/views/info_request_batch/_batch_sent.html.erb index 1bf51962f..b7d54d75c 100644 --- a/app/views/info_request_batch/_batch_sent.html.erb +++ b/app/views/info_request_batch/_batch_sent.html.erb @@ -1,18 +1,57 @@ -<div id="notice"> - <p> - <%= _("Your requests will be <strong>sent</strong> shortly!") %> - </p> +<div id="content"> + <div class="request-sent-message" id="notice"> + <h1> + <%= _("Your requests will be <strong>sent</strong> shortly!") %> + </h1> + <div class="request-sent-message__row"> + <div class="request-sent-message__column-1"> + <p class="subtitle"> + <%= _("<strong>We will email you</strong> when they have been sent. " \ + "We will also email you when there is a response to any of them, or " \ + "after {{late_number_of_days}} working days if the authorities still " \ + "haven't replied by then.", + :late_number_of_days => AlaveteliConfiguration::reply_late_after_days) %> + </p> - <p> - <%= _("<strong>We will email you</strong> when they have been sent. " \ - "We will also email you when there is a response to any of them, or " \ - "after {{late_number_of_days}} working days if the authorities still" \ - "haven't replied by then.", - :late_number_of_days => AlaveteliConfiguration::reply_late_after_days) %> - </p> + <h2><%= _("Share your batch request") %></h2> - <p> - <%= _("If you write about these requests (for example in a forum or a blog) " \ - "please link to this page.") %> - </p> + <%= link_to image_tag("next-step-twitter.png", + :alt => _("Tweet it"), + :width => "120", + :height => "37"), + "https://twitter.com/intent/tweet?" << { + :url => request.url, + :via => AlaveteliConfiguration.twitter_username, + :text => "'#{ @info_request_batch.title }'", + :related => _('alaveteli_foi:The software that runs {{site_name}}', :site_name => site_name) + }.to_query, :class => 'share-link' %> + + <%= link_to image_tag("next-step-facebook.png", + :alt => _("Share on Facebook"), + :width => "120", + :height => "37"), + "https://www.facebook.com/sharer/sharer.php?" << { + :u => request.url + }.to_query, :class => 'share-link' %> + + <h2><%= _("Keep your requests up to date") %></h2> + <p> + <%= _('If you write about these requests ' \ + '(for example in a forum or a blog) ' \ + 'please link to this page.') %> + </p> + </div> + <div class="request-sent-message__column-2"> + <div class="what-next"> + <h2><%= _("What next?") %></h2> + <ul class="what-next__list"> + <li> + <%= link_to _("Help us classify requests that haven't " \ + "been updated"), categorise_play_path %> + </li> + </ul> + </div> + </div> + </div> + </div> </div> diff --git a/app/views/public_body/_body_listing_single.html.erb b/app/views/public_body/_body_listing_single.html.erb index 91a07d09c..b343c20e1 100644 --- a/app/views/public_body/_body_listing_single.html.erb +++ b/app/views/public_body/_body_listing_single.html.erb @@ -1,6 +1,10 @@ -<% if @highlight_words.nil? - @highlight_words = [] - end %> +<% + if @highlight_words.nil? + @highlight_words = [] + end + + request_link = false unless defined?(request_link) +%> <div class="body_listing"> <span class="head"> @@ -16,23 +20,28 @@ <% end %> <br> <% end %> - </span> + </span> <span class="bottomline"> <%= n_('{{count}} request made.', '{{count}} requests made.', public_body.info_requests.size, :count => public_body.info_requests.size) %> - <% if !public_body.is_requestable? && public_body.not_requestable_reason != 'bad_contact' %> - <% if public_body.not_requestable_reason == 'defunct' %> - <%= _('Defunct.') %> - <% end %> - <% else %> - <% if !@include_request_link_in_authority_listing.nil? %> - <%= link_to _("Make your own request"), public_body_path(public_body) %>. - <% end %> - <% end %> <br> <span class="date_added"> <%= _("Added on {{date}}", :date => simple_date(public_body.created_at)) %>. </span> + <br> + <% if public_body.special_not_requestable_reason? %> + <% if public_body.not_requestable_reason == 'not_apply' %> + <%= _('FOI law does not apply to this authority.')%> + <% elsif public_body.not_requestable_reason == 'defunct' %> + <%= _('Defunct.')%> + <% end %> + <% end %> </span> + + <% if request_link && !public_body.special_not_requestable_reason? %> + <div class="make-request-quick-button"> + <%= link_to _("Make a request"), new_request_to_body_path(:url_name => public_body.url_name), :class => "link_button_green" %> + </div> + <% end %> </div> diff --git a/app/views/public_body/_search_ahead.html.erb b/app/views/public_body/_search_ahead.html.erb index b5632bccd..e1465bb15 100644 --- a/app/views/public_body/_search_ahead.html.erb +++ b/app/views/public_body/_search_ahead.html.erb @@ -1,14 +1,18 @@ <% if !@xapian_requests.nil? %> <% if @xapian_requests.results.size > 0 %> - <h3><%= _('Top search results:') %></h3> + <p><%= _('Matching authorities') %></p> <% else %> - <h3><%= _('No results found.') %></h3> + <p><%= _('No results found.') %></p> <% end %> - <div id="authority_search_ahead_results"> - <% for result in @xapian_requests.results %> - <%= render :partial => 'public_body/body_listing_single', :locals => { :public_body => result[:model] } %> - <% end %> - </div> - <%= will_paginate WillPaginate::Collection.new(@page, @per_page, @xapian_requests.matches_estimated), :params => {:controller=>"request", :action => "select_authority"} %> + <div class="authority_search_ahead_results_container"> + <div id="authority_search_ahead_results"> + <% for result in @xapian_requests.results %> + <%= render :partial => 'public_body/body_listing_single', + :locals => { :public_body => result[:model], + :request_link => true } %> + <% end %> + </div> + <%= will_paginate WillPaginate::Collection.new(@page, @per_page, @xapian_requests.matches_estimated), :params => {:controller=>"request", :action => "select_authority"} %> + </div> <% end %> diff --git a/app/views/public_body/show.html.erb b/app/views/public_body/show.html.erb index 403216c6c..016c2460d 100644 --- a/app/views/public_body/show.html.erb +++ b/app/views/public_body/show.html.erb @@ -1,79 +1,87 @@ <% @title = h(@public_body.name) + _(" - view and make Freedom of Information requests") %> -<div id="main_content"> - - <% if flash[:search_params] %> - <div class="back-to-results"> - <div class="message"> - <%= link_to select_authority_path(flash[:search_params]) do %> - <%= _('« Back to search results') %> - <% end %> - </div> - </div> - <% end %> - - <div id="header_right"> - <h2><%= _('Follow this authority')%></h2> - <% follower_count = TrackThing.count(:all, :conditions => ["public_body_id = ?", @public_body.id]) %> - <p> - <%= n_("{{count}} person is following this authority", - "{{count}} people are following this authority", - follower_count, - :count => content_tag(:span, follower_count, :id => "follow_count")) %> - </p> - - <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'sidebar' } %> - <%= render :partial => 'track/rss_feed', :locals => { :track_thing => @track_thing, :location => 'sidebar' } %> - <%= render :partial => 'more_info', :locals => { :public_body => @public_body } %> +<% if flash[:search_params] %> + <div class="back-to-results"> + <div class="message"> + <%= link_to select_authority_path(flash[:search_params]) do %> + <%= _('« Back to search results') %> + <% end %> </div> + </div> +<% end %> - <div id="header_left"> - <p class="public-body-name-prefix"><%= _("Freedom of information requests to") %></p> - <h1><%=h(@public_body.name)%></h1> - - <p class="subtitle"> - <%=@public_body.type_of_authority(true)%><% if not @public_body.short_name.empty? %>, +<div class="authority__header"> + <h1><%=h(@public_body.name)%></h1> + <p class="authority__header__subtitle"> + <%= type_of_authority(@public_body) %><% if not @public_body.short_name.empty? %>, <%= _('also called {{public_body_short_name}}', :public_body_short_name => h(@public_body.short_name))%><% end %> <% if !@user.nil? && @user.admin_page_links? %> (<%= link_to _("admin"), admin_body_path(@public_body) %>) <% end %> + </p> + + <% if @public_body.has_notes? || @public_body.eir_only? || @public_body.special_not_requestable_reason? %> + <div id="stepwise_make_request"> + <% if @public_body.has_notes? %> + <p class="authority__header__notes"> + <%= @public_body.notes_as_html.html_safe %> </p> + <% end %> - <% if @public_body.is_requestable? || @public_body.not_requestable_reason == 'bad_contact' %> - <% if @public_body.has_notes? %> - <p><%= @public_body.notes_as_html.html_safe %></p> - <% end %> - <% if @public_body.eir_only? %> - <p><%= _('You can only request information about the environment from this authority.')%></p> - <% end %> - <% else %> - <% if @public_body.not_requestable_reason == 'not_apply' %> - <p><%= _('Freedom of Information law does not apply to this authority, so you cannot make - a request to it.')%></p> - <% elsif @public_body.not_requestable_reason == 'defunct' %> - <p><%= _('This authority no longer exists, so you cannot make a request to it.')%></p> - <% else %> - <p><%= _('For an unknown reason, it is not possible to make a request to this authority.')%></p> - <% end %> + <% if @public_body.is_requestable? %> + <% if @public_body.eir_only? %> + <p class="authority__header__notes"> + <%= _('You can only request information about the environment from this authority.')%> + </p> <% end %> + <% elsif @public_body.special_not_requestable_reason? %> + <p class="authority__header__notes"> + <%= public_body_not_requestable_reasons(@public_body).first %> + </p> + <% end %> + </div> + <% end %> - <div id="stepwise_make_request"> + <% if @public_body.info_requests.size > 0 %> + <div class="authority__header__stats"> + <%= n_('{{count}} request', + '{{count}} requests', + @public_body.info_requests.size, + :count => @public_body.info_requests.size) %> + </div> + <% end %> + + <div class="authority__header__action-bar"> + <div class="action-bar__make-request"> <% if @public_body.is_requestable? || @public_body.not_requestable_reason == 'bad_contact' %> <%= link_to _("Make a request to this authority"), new_request_to_body_path(:url_name => @public_body.url_name), :class => "link_button_green" %> - <% elsif @public_body.has_notes? %> - <%= @public_body.notes_as_html.html_safe %> - <% end %> - - <% if @public_body.override_request_email %> - <p> - <%= _("<strong>Note:</strong> Because we're testing, requests are being sent to {{email}} rather than to the actual authority.", :email => @public_body.override_request_email) %> - </p> - <% end %> + <% end %> + </div> + <div class="action-bar__follow"> + <% follower_count = TrackThing.count(:all, :conditions => ["public_body_id = ?", @public_body.id]) %> + <div class="action-bar__follow-button"> + <% if @existing_track %> + <%= (link_to _("Unsubscribe"), {:controller => 'track', :action => 'update', :track_id => @existing_track.id, :track_medium => "delete", :r => request.fullpath}, :class => "link_button_green") %> + <% else %> + <div class="feed_link"> + <%= link_to _("Follow"), do_track_path(@track_thing), :class => "link_button_green" %> + </div> + <% end %> + </div> + + <div class="action-bar__follower-count"> + <%= n_("{{count}} follower", + "{{count}} followers", + follower_count, + :count => content_tag(:span, follower_count, :id => "follow_count")) %> + </div> </div> </div> +</div> - <div id="foi_results_section"> - <% if @public_body.info_requests.size == 0 %> +<div class="authority__body"> + <div class="authority__body__foi-results"> + <% if @public_body.info_requests.size == 0 %> <% if @public_body.is_requestable? or @public_body.not_requestable_reason != 'defunct' %> <% if @public_body.eir_only? %> <h2><%= _('Environmental Information Regulations requests made using this site') %></h2> @@ -84,31 +92,18 @@ <% end %> <% end %> <% else %> - <h2 class="foi_results"> - <% if @public_body.eir_only? %> - <%= pluralize(@public_body.info_requests.size, "Environmental Information Regulations request made using this site") %> - <% else %> - <% if @public_body.info_requests.size > 4 %> - <%= n_('Search within the {{count}} Freedom of Information requests to {{public_body_name}}', 'Search within the {{count}} Freedom of Information requests made to {{public_body_name}}', @public_body.info_requests.size, :count => @public_body.info_requests.size, :public_body_name => @public_body.name) %> - <% else %> - <%= n_('{{count}} Freedom of Information request to {{public_body_name}}', - '{{count}} Freedom of Information requests to {{public_body_name}}', - @public_body.info_requests.size, - :count => @public_body.info_requests.size, - :public_body_name => @public_body.name) %> - <% end %> - <% end %> + <% unless @page_desc.blank? %> + <h2 class="foi_results"> <%= @page_desc %> - </h2> + </h2> + <% end %> <a name="results"></a> <% if @public_body.info_requests.size > 4 %> - <%= render :partial => 'request/request_search_form', - :locals => { :after_form_fields => render(:partial => 'request/request_filter_form') } %> + <%= render :partial => 'request/request_filter_form' %> <% end %> <% end %> - <div style="clear:both"> </div> <% if !@xapian_requests.nil? %> <% for result in @xapian_requests.results %> @@ -135,4 +130,13 @@ <p> <%= _('The search index is currently offline, so we can\'t show the Freedom of Information requests that have been made to this authority.')%></p> <% end %> </div> + + <div class="authority__body__sidebar"> + <% if @public_body.info_requests.size > 4 %> + <%= render :partial => 'request/request_search_form' %> + <% end %> + <%= render :partial => 'more_info', :locals => { :public_body => @public_body } %> + <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'sidebar' } %> + </div> + </div> diff --git a/app/views/public_body/view_email.html.erb b/app/views/public_body/view_email.html.erb index 5f4bc95f4..399caaa61 100644 --- a/app/views/public_body/view_email.html.erb +++ b/app/views/public_body/view_email.html.erb @@ -24,7 +24,7 @@ </p> <p> - <% if @public_body.is_requestable? || @public_body.not_requestable_reason != 'bad_contact' %> + <% if @public_body.has_request_email? %> <%= raw(_('If the address is wrong, or you know a better address, please <a href="{{url}}">contact us</a>.', :url => help_contact_path.html_safe)) %> <% else %> <%= raw(_(' If you know the address to use, then please <a href="{{url}}">send it to us</a>. diff --git a/app/views/request/_request_filter_form.html.erb b/app/views/request/_request_filter_form.html.erb index 0983c8c57..19961ddfc 100644 --- a/app/views/request/_request_filter_form.html.erb +++ b/app/views/request/_request_filter_form.html.erb @@ -1,21 +1,23 @@ <div class="list-filter-item"> - <h3 class="title"><%= _("Showing") %></h3> <div class="filter-request-types"> + <ul> <% statuses = [["all", _("all requests")], ["successful", _("successful requests")], ["unsuccessful", _("unsuccessful requests")], ["awaiting", _("unresolved requests")]] %> <% statuses.each do |status, label| %> + <li> <% if params[:view] != status %> <% if params[:controller] == "public_body" %> <%= link_to label, url_for(:controller => "public_body", :action => "show", :view => status, :url_name => @public_body.url_name) + "?" + request.query_string + '#results' %> <% else %> - <%= link_to label, url_for(:controller => "request", :action => "list", :view => status) + "?" + request.query_string + '#results' %> + <%= link_to label, url_for(:controller => "request", :action => "list", :view => status) + "?" + request.query_string + '#results' %> <% end %> <% else %> <%= label %> <% end %> - <%= "|" unless statuses.last[0] == status %> + </li> <% end %> + </ul> </div> </div> diff --git a/app/views/request/_request_sent.html.erb b/app/views/request/_request_sent.html.erb index 70fa18712..3bbf49446 100644 --- a/app/views/request/_request_sent.html.erb +++ b/app/views/request/_request_sent.html.erb @@ -24,7 +24,7 @@ :via => AlaveteliConfiguration.twitter_username, :text => "'#{ @info_request.title }'", :related => _('alaveteli_foi:The software that runs {{site_name}}', :site_name => site_name) - }.to_query %> + }.to_query, :class => 'share-link' %> <%= link_to image_tag("next-step-facebook.png", :alt => _("Share on Facebook"), @@ -32,7 +32,7 @@ :height => "37"), "https://www.facebook.com/sharer/sharer.php?" << { :u => request.url - }.to_query %> + }.to_query, :class => 'share-link' %> <h2><%= _("Keep your request up to date") %></h2> <p> @@ -48,10 +48,6 @@ <h2><%= _("What next?") %></h2> <ul class="what-next__list"> <li> - <a href="#"><%= _("Change how you'd like to be notified of changes " \ - "to your request") %></a> - </li> - <li> <%= link_to _("View other requests to {{public_body}}", :public_body => @info_request.public_body.name), public_body_path(@info_request.public_body) %> </li> <li> diff --git a/app/views/request/_search_ahead.html.erb b/app/views/request/_search_ahead.html.erb index 4fbe06ebc..397973d49 100644 --- a/app/views/request/_search_ahead.html.erb +++ b/app/views/request/_search_ahead.html.erb @@ -1,9 +1,8 @@ <% unless @xapian_requests.nil? %> +<% if @xapian_requests.results.any? %> <div id="request_search_ahead_results"> - <% if @xapian_requests.results.any? %> <span class="close-button">X</span> - <h3><%= _("Possibly related requests:") %></h3> - + <h2><%= _("Possible related requests") %></h2> <% @xapian_requests.results.each do |result| %> <%= render :partial => 'request/request_listing_short_via_event', :locals => { :event => result[:model], @@ -15,6 +14,7 @@ <%= _("Search in their website for this information →") %> </a> </p> - <% end %> - </div> + + </div> + <% end %> <% end %> diff --git a/app/views/request/new.html.erb b/app/views/request/new.html.erb index 51224129e..486a89d45 100644 --- a/app/views/request/new.html.erb +++ b/app/views/request/new.html.erb @@ -19,11 +19,11 @@ // When following links in typeahead results, open new // tab/window $("#typeahead_response a").attr("target","_blank"); - + // Update the public body site search link $("#body-site-search-link").attr("href", "http://www.google.com/#q="+encodeURI($("#typeahead_search").val())+ "+site:<%= @info_request.public_body.calculated_home_page %>"); - + $('.close-button').click(function() { $(this).parent().hide() }); } }); @@ -31,178 +31,206 @@ }); </script> <% end %> + + + <% if @batch %> <% @title = _("Make an {{law_used_short}} request", :law_used_short=>h(@info_request.law_used_short)) %> <% else %> <% @title = _("Make an {{law_used_short}} request to '{{public_body_name}}'",:law_used_short=>h(@info_request.law_used_short),:public_body_name=>h(@info_request.public_body.name)) %> <% end %> - <h1><%= _('2. Ask for Information') %></h1> - - <% if @existing_request %> - <div class="errorExplanation" id="errorExplanation"><ul> - <li> - <%= _('{{existing_request_user}} already - created the same request on {{date}}. You can either view the <a href="{{existing_request}}">existing request</a>, - or edit the details below to make a new but similar request.',:existing_request_user=>user_or_you_capital_link(@existing_request.user), :date=>simple_date(@existing_request.created_at), :existing_request=>request_path(@existing_request)) %> - </li> - </ul></div> - <% end %> - <% if @existing_batch %> - <div class="errorExplanation" id="errorExplanation"><ul> - <li> - <%= _('You already created the same batch of requests on {{date}}. You can either view the <a href="{{existing_batch}}">existing batch</a>, or edit the details below to make a new but similar batch of requests.', :date=>simple_date(@existing_batch.created_at), :existing_batch=>info_request_batch_path(@existing_batch)) %> - </li> - </ul></div> - <% end %> - <%= foi_error_messages_for :info_request, :outgoing_message %> - <%= form_for(@info_request, :url => (@batch ? new_batch_path : new_request_path), :html => { :id => 'write_form' } ) do |f| %> - - <div id="request_header"> - <div id="request_header_body"> - <label class="form_label"><%= _('To:') %></label> - - <% if @batch %> - <span id="to_public_body"> - <%= _("Your selected authorities") %> - <span class="batch_public_body_toggle" data-hidetext="<%= _("(hide)") %>" data-showtext="<%= _("(show)") %>"><a class="toggle-message"></a></span> - </span> - - <div class="batch_public_body_list"> - <ul> - <% @public_bodies.each do |public_body| %> - <li><%= public_body.name %></li> - <% end %> - </ul> - </div> +<%= form_for(@info_request, :url => (@batch ? new_batch_path : new_request_path), :html => { :id => 'write_form' } ) do |f| %> + <div id="request_header"> + <div id="request_header_body"> + <h1><%= _('Make a request') %></h1> + + <% if @existing_request %> + <div class="errorExplanation" id="errorExplanation"> + <ul> + <li> + <%= _('{{existing_request_user}} already + created the same request on {{date}}. You can either view the <a href="{{existing_request}}">existing request</a>, + or edit the details below to make a new but similar request.',:existing_request_user=>user_or_you_capital_link(@existing_request.user), :date=>simple_date(@existing_request.created_at), :existing_request=>request_path(@existing_request)) %> + </li> + </ul> + </div> + <% end %> + + <% if @existing_batch %> + <div class="errorExplanation" id="errorExplanation"> + <ul> + <li> + <%= _('You already created the same batch of requests on {{date}}. You can either view the <a href="{{existing_batch}}">existing batch</a>, or edit the details below to make a new but similar batch of requests.', :date=>simple_date(@existing_batch.created_at), :existing_batch=>info_request_batch_path(@existing_batch)) %> + </li> + </ul> + </div> + <% end %> - <% else %> - <span id="to_public_body"> - <%=h(@info_request.public_body.name)%> - </span> - <% end %> + <%= foi_error_messages_for :info_request, :outgoing_message %> - <% unless @batch %> - <div class="form_item_note"> - <% if @info_request.public_body.info_requests.size > 0 %> - <%= _("Browse <a href='{{url}}'>other requests</a> to '{{public_body_name}}' for examples of how to word your request.", :public_body_name=>h(@info_request.public_body.name), :url=>public_body_path(@info_request.public_body)) %> - <% else %> - <%= _("Browse <a href='{{url}}'>other requests</a> for examples of how to word your request.", :url=>request_list_url) %> - <% end %> - </div> - - <% if @info_request.public_body.has_notes? %> - <div id="request_header_text"> - <h3><%= _('Special note for this authority!') %></h3> - <p><%= @info_request.public_body.notes_as_html.html_safe %></p> - </div> - <% end %> - - <% if @info_request.public_body.eir_only? %> - <h3><%= _('Please ask for environmental information only') %></h3> - - <p><%= _('The Freedom of Information Act <strong>does not apply</strong> to') %> <%=h(@info_request.public_body.name)%>. - <%= _('However, you have the right to request environmental - information under a different law') %> (<a href="/help/requesting#eir">explanation</a>). - <%= _('This covers a very wide spectrum of information about the state of - the <strong>natural and built environment</strong>, such as:') %> - - <ul> - <li><%= _('Air, water, soil, land, flora and fauna (including how these effect - human beings)') %></li> - <li><%= _('Information on emissions and discharges (e.g. noise, energy, - radiation, waste materials)') %></li> - <li><%= _('Human health and safety') %></li> - <li><%= _('Cultural sites and built structures (as they may be affected by the - environmental factors listed above)') %></li> - <li><%= _('Plans and administrative measures that affect these matters') %></li> - </ul> - - <p><%= _('Please only request information that comes under those categories, <strong>do not waste your - time</strong> or the time of the public authority by requesting unrelated information.') %></p> - <% end %> - <% end %> + <% if !AlaveteliConfiguration::override_all_public_body_request_emails.blank? %> + <div class="warning"> + <%= _("<strong>Note:</strong> Because we're testing, requests are being sent to {{email}} rather than to the actual authority.", :email => AlaveteliConfiguration::override_all_public_body_request_emails) %> </div> + <% end %> + + <% if @batch %> + <label class="form_label"><%= _('To:') %></label> + <span id="to_public_body"> + <%= _("Your selected authorities") %> + <span class="batch_public_body_toggle" data-hidetext="<%= _("(hide)") %>" data-showtext="<%= _("(show)") %>"><a class="toggle-message"></a></span> + </span> + + <div class="batch_public_body_list"> + <ul> + <% @public_bodies.each do |public_body| %> + <li><%= public_body.name %></li> + <% end %> + </ul> + </div> + <% else %> + <p id="to_public_body"><span class="to_public_body_label">To:</span> + <%=h(@info_request.public_body.name)%> + </p> + <% end %> - <div id="request_header_subject"> - <p> - <label class="form_label" for="typeahead_search"><%= _('Summary:') %></label> - <%= f.text_field :title, :size => 50, :id =>"typeahead_search" %> - </p> - <div class="form_item_note"> - (<%= _("a one line summary of the information you are requesting, \n\t\t\te.g.") %> - <%= render :partial => "summary_suggestion" %>) - </div> - </div> + <% unless @batch %> + <% if @info_request.public_body.has_notes? %> + <div id="request_header_text"> + <p><%= @info_request.public_body.notes_as_html.html_safe %></p> + </div> + <% end %> + <% end %> - <div id="typeahead_response"> - </div> </div> + </div> + + <% unless @batch %> + <% if @info_request.public_body.eir_only? %> + <div class="request_body"> + <div id="request_body_header"> + <h3><%= _('Please ask for environmental information only') %></h3> + + <p><%= _('The Freedom of Information Act <strong>does not apply</strong> to') %> <%=h(@info_request.public_body.name)%>. + <%= _('However, you have the right to request environmental + information under a different law') %> (<a href="/help/requesting#eir">explanation</a>). + <%= _('This covers a very wide spectrum of information about the state of + the <strong>natural and built environment</strong>, such as:') %> + </p> + <ul> + <li><%= _('Air, water, soil, land, flora and fauna (including how these effect + human beings)') %></li> + <li><%= _('Information on emissions and discharges (e.g. noise, energy, + radiation, waste materials)') %></li> + <li><%= _('Human health and safety') %></li> + <li><%= _('Cultural sites and built structures (as they may be affected by the + environmental factors listed above)') %></li> + <li><%= _('Plans and administrative measures that affect these matters') %></li> + </ul> + + <p><%= _('Please only request information that comes under those categories, <strong>do not waste your + time</strong> or the time of the public authority by requesting unrelated information.') %></p> + </div> + </div> + <% end %> + <% end %> + <div class="request_body"> <div id="request_advice"> + <% unless @batch %> + <p> + <% if @info_request.public_body.info_requests.size > 0 %> + <%= _("Browse <a href='{{url}}'>other requests</a> to '{{public_body_name}}' for examples of how to word your request.", :public_body_name=>h(@info_request.public_body.name), :url=>public_body_path(@info_request.public_body)) %> + <% else %> + <%= _("Browse <a href='{{url}}'>other requests</a> for examples of how to word your request.", :url=>request_list_url) %> + <% end %> + </p> + <% end %> + + <% if !@user %> + <p> + <%= raw(_('Everything that you enter on this page, including <strong>your name</strong>, + will be <strong>displayed publicly</strong> on + this website <a href="{{url}}">forever</a>', :url => (help_privacy_path+"#public_request").html_safe)) %>. + </p> + <p> + <%= raw(_('<a href="{{url}}">Thinking of using a pseudonym?</a>.', :url => (help_privacy_path+"#real_name").html_safe)) %> + </p> + <% else %> + <p> + <%= raw(_('Everything that you enter on this page + will be <strong>displayed publicly</strong> on + this website forever (<a href="{{url}}">why?</a>).', :url => (help_privacy_path+"#public_request").html_safe)) %> + </p> + <% end %> + + <p> + <%= raw(_("<strong> Can I request information about myself?</strong>\n" + + "\t\t\t<a href=\"{{url}}\">No!</a>", :url => (help_requesting_path+"#data_protection").html_safe)) %> + </p> + <div class="advice-panel"> <ul> - <li><%= _('Write your request in <strong>simple, precise language</strong>.') %></li> - <li><%= _('Ask for <strong>specific</strong> documents or information, this site is not suitable for general enquiries.') %></li> - <li><%= _('Keep it <strong>focused</strong>, you\'ll be more likely to get what you want (<a href="{{url}}">why?</a>).', :url => (help_requesting_path + '#focused').html_safe) %></li> + + <li><%= _('Write your request in <strong>simple, precise language</strong>.') %></li> + <li><%= _('Ask for <strong>specific</strong> documents or information, this site is not suitable for general enquiries.') %></li> + <li><%= _('<a href="{{url}}">Keep it <strong>focused</strong></a>, you\'ll be more likely to get what you want.', :url => (help_requesting_path + '#focused').html_safe) %></li> </ul> + </div> + </div> <div id="request_form"> - <%= fields_for :outgoing_message do |o| %> - <p> - <label class="form_label" for="outgoing_message_body"><%= _('Your request:') %></label> - <%= o.text_area :body, :rows => 20, :cols => 60 %> - </p> - <% end %> - - <% if !@user %> - <p class="form_note"> - - <%= raw(_('Everything that you enter on this page, including <strong>your name</strong>, - will be <strong>displayed publicly</strong> on - this website forever (<a href="{{url}}">why?</a>).', :url => (help_privacy_path+"#public_request").html_safe)) %> - <%= raw(_('If you are thinking of using a pseudonym, - please <a href="{{url}}">read this first</a>.', :url => (help_privacy_path+"#real_name").html_safe)) %> - </p> - <% else %> - <p class="form_note"> - <%= raw(_('Everything that you enter on this page - will be <strong>displayed publicly</strong> on - this website forever (<a href="{{url}}">why?</a>).', :url => (help_privacy_path+"#public_request").html_safe)) %> - </p> - <% end %> - <p class="form_note"> - <%= raw(_("<strong> Can I request information about myself?</strong>\n" + - "\t\t\t<a href=\"{{url}}\">No! (Click here for details)</a>", :url => (help_requesting_path+"#data_protection").html_safe)) %> + <div id="request_header_subject"> + <p> + <label class="form_label" for="typeahead_search"><%= _('Summary:') %></label> + <%= f.text_field :title, :size => 50, :id =>"typeahead_search" %> </p> - - <div class="form_button"> - <% if @batch %> - <% params[:public_body_ids].each do |public_body_id| %> - <%= hidden_field_tag("public_body_ids[]", public_body_id)%> - <% end %> - <% else %> - <%= f.hidden_field(:public_body_id, { :value => @info_request.public_body_id } ) %> - <% end %> - <%= hidden_field_tag(:submitted_new_request, 1 ) %> - <%= hidden_field_tag(:preview, 1 ) %> - <%= submit_tag _("Preview your public request") %> + <div class="form_item_note"> + <%= _("A one line summary of the information you are requesting, \n\t\t\te.g.") %> + <%= render :partial => "summary_suggestion" %> </div> + </div> + + <div id="typeahead_response"> + </div> + + <%= fields_for :outgoing_message do |o| %> + <p> + <label class="form_label" for="outgoing_message_body"><%= _('Your request:') %></label> + <%= o.text_area :body, :rows => 20, :cols => 60 %> + </p> + <% end %> + + <div class="form_button"> + <% if @batch %> + <% params[:public_body_ids].each do |public_body_id| %> + <%= hidden_field_tag("public_body_ids[]", public_body_id)%> + <% end %> + <% else %> + <%= f.hidden_field(:public_body_id, { :value => @info_request.public_body_id } ) %> + <% end %> + <%= hidden_field_tag(:submitted_new_request, 1 ) %> + <%= hidden_field_tag(:preview, 1 ) %> + <%= submit_tag _("Preview your public request") %> + </div> - <% if !@info_request.tag_string.empty? %> - <p class="form_note"> - <!-- <label class="form_label" for="info_request_tag_string"><%= _("Tags (separated by a space):") %></label> - <%= f.text_field :tag_string, :size => 50 %> --> + <% if !@info_request.tag_string.empty? %> + <p class="form_note"> + <!-- <label class="form_label" for="info_request_tag_string"><%= _("Tags (separated by a space):") %></label> + <%= f.text_field :tag_string, :size => 50 %> --> - <%= f.hidden_field(:tag_string) %> - <strong>Tags:</strong> <%=h @info_request.tag_string %> - </p> - <% end %> + <%= f.hidden_field(:tag_string) %> + <strong>Tags:</strong> <%=h @info_request.tag_string %> + </p> + <% end %> - </div> + </div> + </div> <% end %> + <% if @batch %> <%= javascript_include_tag 'new-request.js' %> <% end %> diff --git a/app/views/request/preview.html.erb b/app/views/request/preview.html.erb index ddd5ab30c..3a5b8ae87 100644 --- a/app/views/request/preview.html.erb +++ b/app/views/request/preview.html.erb @@ -5,58 +5,68 @@ <% end %> <%= form_for(@info_request, :url => (@batch ? new_batch_path : new_request_path), :html => { :id => 'preview_form' } ) do |f| %> - <h1><%= _('3. Now check your request') %></h1> - <ul> - <li><%= _('Check you haven\'t included any <strong>personal information</strong>.') %></li> - <li><%= raw(_('Your name, request and any responses will appear in <strong>search engines</strong> - (<a href="{{url}}">details</a>).', :url => (help_privacy_path+"#public_request").html_safe)) %> - </li> - </ul> - - <%= fields_for :outgoing_message do |o| %> - - <div class="correspondence" id="outgoing-0"> - <p class="preview_subject"> - <strong><%= _('To:') %></strong> - <% if @batch %> - <%= _("Your selected authorities")%> - <% else %> - <%=h(@info_request.public_body.name)%> - <% end %> - <br><strong><%= _('Subject:') %></strong> <%= @info_request.email_subject_request %> - </p> - - <div class="correspondence_text"> - <p><%= @outgoing_message.get_body_for_html_display %></p> - <%= o.hidden_field(:body) %> - </div> + <h1><%= _('Preview your request') %></h1> + <div class="message-preview"> + <div class="preview-advice"> + <div class="advice-panel"> + <ul> + <li><%= _('Check you haven\'t included any <strong>personal information</strong>.') %></li> + <li><%= raw(_('Your name, request and any responses will appear in <strong>search engines</strong> + (<a href="{{url}}">details</a>).', :url => (help_privacy_path+"#public_request").html_safe)) %> + </li> + <li><%= _('<a href="{{url}}">Do you want to request private information about yourself?</a>', :url => (help_requesting_path+"#data_protection").html_safe) %></li> + </ul> - <p class="event_actions"> - </p> + </div> </div> - <% end %> - - <p><%= _('<strong>Privacy note:</strong> If you want to request private information about - yourself then <a href="{{url}}">click here</a>.', :url => (help_requesting_path+"#data_protection").html_safe) %> - - <p> - <%= f.hidden_field(:title) %> - <% if @batch %> - <% params[:public_body_ids].each do |public_body_id| %> - <%= hidden_field_tag("public_body_ids[]", public_body_id)%> - <% end %> - <% else %> - <%= f.hidden_field(:public_body_id, { :value => @info_request.public_body_id } ) %> - <% end %> - <%= f.hidden_field(:tag_string) %> - <%= hidden_field_tag(:submitted_new_request, 1) %> - <%= hidden_field_tag(:preview, 0 ) %> - <%= submit_tag _("Edit this request"), :name => 'reedit', :id => 'reedit_button' %> - <%= submit_tag _("Send request"), :name => 'submit', :id => 'submit_button' %> - </p> - - <% if !@info_request.tag_string.empty? %> - <p><strong><%= _('Tags:') %></strong> <%=h @info_request.tag_string %></p> - <% end %> + <div class="preview-pane"> + <%= fields_for :outgoing_message do |o| %> + + <div class="correspondence" id="outgoing-0"> + <p class="preview_to"> + <strong><%= _('To') %></strong> + <% if @batch %> + <%= _("Your selected authorities")%> + <% else %> + <%=h(@info_request.public_body.name)%> + <% end %> + </p> + <p class="preview_subject"> + <strong><%= _('Subject') %></strong> <%= @info_request.email_subject_request %> + </p> + + <div class="correspondence_text"> + <p><%= @outgoing_message.get_body_for_html_display %></p> + <%= o.hidden_field(:body) %> + </div> + + <p class="event_actions"> + </p> + </div> + <% end %> + + + + <p> + <%= f.hidden_field(:title) %> + <% if @batch %> + <% params[:public_body_ids].each do |public_body_id| %> + <%= hidden_field_tag("public_body_ids[]", public_body_id)%> + <% end %> + <% else %> + <%= f.hidden_field(:public_body_id, { :value => @info_request.public_body_id } ) %> + <% end %> + <%= f.hidden_field(:tag_string) %> + <%= hidden_field_tag(:submitted_new_request, 1) %> + <%= hidden_field_tag(:preview, 0 ) %> + <%= submit_tag _("Edit your request"), :name => 'reedit', :id => 'reedit_button' %> + <%= submit_tag _("Send request"), :name => 'submit', :id => 'submit_button' %> + </p> + + <% if !@info_request.tag_string.empty? %> + <p><strong><%= _('Tags:') %></strong> <%=h @info_request.tag_string %></p> + <% end %> + </div> + </div> <% end %> diff --git a/app/views/request/select_authorities.html.erb b/app/views/request/select_authorities.html.erb index e16bcc191..cfbc21a28 100644 --- a/app/views/request/select_authorities.html.erb +++ b/app/views/request/select_authorities.html.erb @@ -1,5 +1,5 @@ -<% @title = _("Select the authorities to write to") %> -<h1><%= _('1. Select authorities') %></h1> +<% @title = _("Find the authorities to write to") %> +<h1><%= _('Find the authorities') %></h1> <p> <%= _("Search for the authorities you'd like information from:") %> diff --git a/app/views/request/select_authority.html.erb b/app/views/request/select_authority.html.erb index 134648264..7e27d97a8 100644 --- a/app/views/request/select_authority.html.erb +++ b/app/views/request/select_authority.html.erb @@ -10,17 +10,20 @@ }); </script> -<% @title = _("Select the authority to write to") %> +<% @title = _("Find an authority") %> -<h1 style="clear: left"><%= _('1. Select an authority') %></h1> +<h1><%= _('Find an authority') %></h1> <div id="authority_selection"> <%= form_tag select_authority_path, { :id => 'search_form', :method => 'get' } do %> <div> <p> - <%= _(%Q(First, type in the <strong>name of the UK public authority</strong> you'd - like information from. <strong>By law, they have to respond</strong> - (<a href="{{url}}">why?</a>).), :url => (help_about_path(:anchor => 'whybother_them')).html_safe) %> + <%= _(%Q(First, type in the <strong>name of the public authority</strong> you'd + like information from.)) %> + <% if AlaveteliConfiguration.authority_must_respond %> + <%= _(%Q(<strong>By law, they have to respond</strong> (<a href="{{url}}">why?</a>).), + :url => (help_about_path(:anchor => 'whybother_them')).html_safe) %> + <% end %> </p> <%= text_field_tag :query, diff --git a/app/views/user/_signin.html.erb b/app/views/user/_signin.html.erb index 7428082d3..f63c289df 100644 --- a/app/views/user/_signin.html.erb +++ b/app/views/user/_signin.html.erb @@ -22,9 +22,12 @@ </p> <p class="form_checkbox"> - <%= check_box_tag 'remember_me', "1", false, :tabindex => 90 %> - <label for="remember_me"><%= _('Remember me</label> (keeps you signed in longer; - do not use on a public computer) ')%></p> + <%= check_box_tag 'remember_me', "1", false, :tabindex => 90 %> + + <label for="remember_me"> + <%= _('Remember me (keeps you signed in longer; do not use on a public computer)') %> + </label> + </p> <div class="form_button"> <%= hidden_field_tag 'token', params[:token], {:id => 'signin_token' } %> diff --git a/app/views/user/set_draft_profile_photo.html.erb b/app/views/user/set_draft_profile_photo.html.erb index b4bdd80f3..ba44f54f4 100644 --- a/app/views/user/set_draft_profile_photo.html.erb +++ b/app/views/user/set_draft_profile_photo.html.erb @@ -11,7 +11,9 @@ <%= form_tag 'set_photo', :id => 'set_draft_profile_photo_form', :multipart => true do %> <p> <label class="form_label" for="file_1"><%= _('Photo of you:')%></label> - <%= file_field_tag :file, :size => 35, :id => 'file_1' %> + <% file_opts = { :size => 35, :id => 'file_1' } %> + <% file_opts.merge!({ :disabled => true }) if @user.banned? %> + <%= file_field_tag :file, file_opts %> </p> <ul> diff --git a/app/views/user/set_profile_about_me.html.erb b/app/views/user/set_profile_about_me.html.erb index fb7de7e97..42607ddf8 100644 --- a/app/views/user/set_profile_about_me.html.erb +++ b/app/views/user/set_profile_about_me.html.erb @@ -17,8 +17,12 @@ </div> <p> - <label class="form_label" for="set_profile_about_me"><%= _('About you:')%></label> - <%= f.text_area :about_me, :rows => 5, :cols => 55 %> + <label class="form_label" for="set_profile_about_me"> + <%= _('About you:')%> + </label> + <% about_me_opts = { :rows => 5, :cols => 55 } %> + <% about_me_opts.merge!({ :disabled => 'disabled' }) if @user.banned? %> + <%= f.text_area :about_me, about_me_opts %> </p> <div class="form_note"> diff --git a/app/views/user/show.html.erb b/app/views/user/show.html.erb index 7c8d52568..78b513d6a 100644 --- a/app/views/user/show.html.erb +++ b/app/views/user/show.html.erb @@ -78,7 +78,7 @@ <% end %> </p> - <% if @display_user.public_banned? %> + <% if @display_user.banned? %> <div id="user_public_banned"> <p> <strong> diff --git a/config/general.yml-example b/config/general.yml-example index 5be62ee21..1f126c5a5 100644 --- a/config/general.yml-example +++ b/config/general.yml-example @@ -154,6 +154,11 @@ USE_DEFAULT_BROWSER_LANGUAGE: true # --- INCLUDE_DEFAULT_LOCALE_IN_URLS: true +# Are authorities required to respond by law? +# +# AUTHORITY_MUST_RESPOND: Boolean (default: true) +AUTHORITY_MUST_RESPOND: true + # The REPLY...AFTER_DAYS settings define how many days must have passed before # an answer to a request is officially late. The SPECIAL case is for some types # of authority (for example: in the UK, schools) which are granted a bit longer diff --git a/config/initializers/alaveteli.rb b/config/initializers/alaveteli.rb index 9493d4a1e..840639228 100644 --- a/config/initializers/alaveteli.rb +++ b/config/initializers/alaveteli.rb @@ -10,7 +10,7 @@ load "debug_helpers.rb" load "util.rb" # Application version -ALAVETELI_VERSION = '0.20.0.10' +ALAVETELI_VERSION = '0.20.0.14' # Add new inflection rules using the following format # (all these examples are active by default): @@ -53,8 +53,6 @@ require 'theme' require 'xapian_queries' require 'date_quarter' require 'public_body_csv' -require 'category_and_heading_migrator' -require 'public_body_categories' require 'routing_filters' require 'alaveteli_text_masker' diff --git a/doc/CHANGES.md b/doc/CHANGES.md index 421099604..40bab6ecf 100644 --- a/doc/CHANGES.md +++ b/doc/CHANGES.md @@ -1,28 +1,60 @@ # rails-3-develop ## Highlighted Features - -* State changing admin actions are now restricted to PUT or POST methods - to protect against CSRF attacks, and now use more standard RESTful - routing. -* Global request forgery protection is now used -* The dynamic list of possibly related requests for a new request is now - limited to requests to the same authority and capped at three requests -* Some standard security headers are added by default +* Lots of improvements in the process of making a new + request (Martin Wright, Gareth Rees, Louise Crow): + * Removal of confusing AJAX results in `/select_authority`. + * Better layout of search/filtering options on the authority pages. + * Better layout of the authority pages on smaller screens. + * The dynamic list of possibly related requests for a new request + is now limited to requests to the same authority and capped at + three requests + * 'Create a new account' option now more prominent than 'Sign in' on `/sign_in` + * Better options for sharing your request on social media, and other + actions to take once the request is made. +* Some general security improvements: + * State changing admin actions are now restricted to PUT or POST methods + to protect against CSRF attacks, and now use more standard RESTful + routing (Louise Crow). + * Global request forgery protection is now used (Gareth Rees). + * Some standard security headers are added by default (Louise Crow). + * A TTL is enforced on session cookies (Louise Crow). +* Added a new `AUTHORITY_MUST_RESPOND` configuration variable. Set this to + `true` If authorities must respond by law. Set to `false` otherwise. It + defaults to `true`. At the moment this just tweaks some UI text (Gareth Rees). * New rake task for cleaning theme translations - `rake - gettext:clean_theme` -* A TTL is enforced on session cookies + gettext:clean_theme` (Gareth Rees). * There's a new admin interface for adding public holidays for the site, - to be used in calculating request due dates. -* Autocomplete has been turned off on password fields + to be used in calculating request due dates. Documentation for using + this interface is available at + http://alaveteli.org/docs/installing/next_steps/#add-some-public-holidays (Louise Crow). * Some interface phrases have been grouped together for easier - translation + translation (Gareth Rees, Louise Crow). +* Now using the bootstrap js files from the bootstrap-sass gem. +* Confusing 'web analytics' section of admin pages removed (Henare Degan) +* Banned users can no longer update their profile (Gareth Rees). +* The code that removes email addresses and mobile phone numbers from + the public view of requests an responses has been refactored, and the + text that's used to replace the email addresses and phone numbers can + now be translated (Louise Crow). +* Fixed a bug with the CSV import of authorities which have the same + name in multiple locales (Louise Crow). ## Upgrade notes * Admin route names have been standardised so if you have overridden templates that refer to admin routes, check the original templates to see if these need to be changed. +* If you override the `app/views/user/_signin.html.erb` or + `app/view/user/_signup.html.erb` templates, check the tabindex order + is still sensible - the order of the elements on the page has changed + - signup now appears on the left. +* If you override the application stylesheets rather than adding to them + using a `custom.css` or `custom.scss` file, check that your + stylesheets still order elements correctly in the + `app/views/request/select_authority.html.erb`, + `app/views/public_body/show.html.erb` and + `app/views/request/new.html.erb`. # Version 0.20 diff --git a/lib/attachment_to_html/adapters/pdf.rb b/lib/attachment_to_html/adapters/pdf.rb index b91958c52..3183d1fd0 100644 --- a/lib/attachment_to_html/adapters/pdf.rb +++ b/lib/attachment_to_html/adapters/pdf.rb @@ -73,11 +73,10 @@ module AttachmentToHTML html = AlaveteliExternalCommand.run("pdftohtml", "-nodrm", "-zoom", "1.0", "-stdout", "-enc", "UTF-8", - "-noframes", tempfile.path, :timeout => 30 + "-noframes", tempfile.path, :timeout => 30, :binary_output => false ) cleanup_tempfile(tempfile) - html end end diff --git a/lib/category_and_heading_migrator.rb b/lib/category_and_heading_migrator.rb deleted file mode 100644 index 402ea7204..000000000 --- a/lib/category_and_heading_migrator.rb +++ /dev/null @@ -1,91 +0,0 @@ -module CategoryAndHeadingMigrator - - # This module migrates data from public_body_categories_[locale].rb files - # into PublicBodyHeading and PublicBodyCategory models - - # Load all the data from public_body_categories_[locale].rb files. - def self.migrate_categories_and_headings - if PublicBodyCategory.count > 0 - puts "PublicBodyCategories exist already, not migrating." - else - @first_locale = true - I18n.available_locales.each do |locale| - begin - load "public_body_categories_#{locale}.rb" - rescue MissingSourceFile - end - @first_locale = false - end - end - end - - # Load the categories and headings for a locale - def self.add_categories_and_headings_from_list(locale, data_list) - # set the counter for headings loaded from this locale - @@locale_heading_display_order = 0 - current_heading = nil - data_list.each do |list_item| - if list_item.is_a?(Array) - # item is list of category data - add_category(list_item, current_heading, locale) - else - # item is heading name - current_heading = add_heading(list_item, locale, @first_locale) - end - end - end - - def self.add_category(category_data, heading, locale) - tag, title, description = category_data - category = PublicBodyCategory.find_by_category_tag(tag) - if category - add_category_in_locale(category, title, description, locale) - else - category = PublicBodyCategory.create(:category_tag => tag, - :title => title, - :description => description) - - # add the translation if this is not the default locale - # (occurs when a category is not defined in default locale) - unless category.translations.map { |t| t.locale }.include?(locale) - add_category_in_locale(category, title, description, locale) - end - end - heading.add_category(category) - end - - def self.add_category_in_locale(category, title, description, locale) - I18n.with_locale(locale) do - category.title = title - category.description = description - category.save - end - end - - def self.add_heading(name, locale, first_locale) - heading = nil - I18n.with_locale(locale) do - heading = PublicBodyHeading.find_by_name(name) - end - # For multi-locale installs, we assume that all public_body_[locale].rb files - # use the same headings in the same order, so we add translations to the heading - # that was in the same position in the list loaded from other public_body_[locale].rb - # files. - if heading.nil? && !@first_locale - heading = PublicBodyHeading.where(:display_order => @@locale_heading_display_order).first - end - - if heading - I18n.with_locale(locale) do - heading.name = name - heading.save - end - else - I18n.with_locale(locale) do - heading = PublicBodyHeading.create(:name => name) - end - end - @@locale_heading_display_order += 1 - heading - end -end diff --git a/lib/configuration.rb b/lib/configuration.rb index 2144f9954..90fd30d5f 100644 --- a/lib/configuration.rb +++ b/lib/configuration.rb @@ -19,6 +19,7 @@ module AlaveteliConfiguration :ADMIN_PASSWORD => '', :ADMIN_USERNAME => '', :ALLOW_BATCH_REQUESTS => false, + :AUTHORITY_MUST_RESPOND => true, :AVAILABLE_LOCALES => '', :BLACKHOLE_PREFIX => 'do-not-reply-to-this-address', :BLOG_FEED => '', diff --git a/lib/public_body_categories.rb b/lib/public_body_categories.rb deleted file mode 100644 index 3528e85b1..000000000 --- a/lib/public_body_categories.rb +++ /dev/null @@ -1,11 +0,0 @@ -# Allow the PublicBodyCategory model to be addressed using the same syntax -# as the old PublicBodyCategories class without needing to rename everything, -# make sure we're not going to break any themes -class PublicBodyCategories - - def self.method_missing(method, *args, &block) - warn 'Use of PublicBodyCategories is deprecated and will be removed in release 0.21. Please use PublicBodyCategory instead.' - PublicBodyCategory.send(method, *args, &block) - end - -end diff --git a/locale/es_NI/app.po b/locale/es_NI/app.po index 4630670c7..21b8053be 100644 --- a/locale/es_NI/app.po +++ b/locale/es_NI/app.po @@ -17,7 +17,7 @@ msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-12-02 13:14+0000\n" -"PO-Revision-Date: 2015-02-03 16:31+0000\n" +"PO-Revision-Date: 2015-02-10 15:27+0000\n" "Last-Translator: louisecrow <louise@mysociety.org>\n" "Language-Team: Spanish (Nicaragua) (http://www.transifex.com/projects/p/alaveteli/language/es_NI/)\n" "Language: es_NI\n" @@ -216,11 +216,11 @@ msgstr "<p>Tu solicitud incluye un <strong>código postal</strong>. Salvo que es msgid "<p>Your {{law_used_full}} request has been <strong>sent on its way</strong>!</p>\\n <p><strong>We will email you</strong> when there is a response, or after {{late_number_of_days}} working days if the authority still hasn't\\n replied by then.</p>\\n <p>If you write about this request (for example in a forum or a blog) please link to this page, and add an\\n annotation below telling people about your writing.</p>" msgstr "" -"<p>¡Tu solicitud {{law_used_full}} ha sido realizada y <strong>se encuentra en camino</strong></p>\n" +"<p>Tu solicitud de {{law_used_full}} ha sido realizada.</p>\n" "\n" -"<p><strong>Te enviaremos un correo electronico</strong> cuando haya respuesta, o después de {{late_number_of_days}} días hábiles si el organismo público no te ha respondido.</p>\n" +"<p><strong>Te enviaremos un correo electrónico</strong> cuando haya respuesta, o después de {{late_number_of_days}} días hábiles, si la entidad correspondiente no te ha respondido.</p>\n" "\n" -"<p>Si escribes sobre tu solicitud en alguna página web o blog, por favor enlaza a esta página, y añade un comentario explicándole a la gente porque realizas esta solicitud.</p>" +"<p>Si escribes sobre tu solicitud en alguna página web o blog, por favor enlaza a esta página, y añade un comentario a tu solicitud, si lo estimas conveniente y/o pertinente.</p>" msgid "<p>Your {{law_used_full}} requests will be <strong>sent</strong> shortly!</p>\\n <p><strong>We will email you</strong> when they have been sent.\\n We will also email you when there is a response to any of them, or after {{late_number_of_days}} working days if the authorities still haven't\\n replied by then.</p>\\n <p>If you write about these requests (for example in a forum or a blog) please link to this page.</p>" msgstr "<p>Su solicitud de información{{law_used_full}} equests will be <strong>sent</strong> shortly!</p>\\n <p><strong>We will email you</strong> when they have been sent.\\n We will also email you when there is a response to any of them, or after {{late_number_of_days}} working days if the authorities still haven't\\n replied by then.</p>\\n <p>If you write about these requests (for example in a forum or a blog) please link to this page.</p>" diff --git a/locale/es_PA/app.po b/locale/es_PA/app.po index 68d4b555d..7f1a46084 100644 --- a/locale/es_PA/app.po +++ b/locale/es_PA/app.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-12-02 13:14+0000\n" -"PO-Revision-Date: 2015-02-09 21:32+0000\n" +"PO-Revision-Date: 2015-02-12 16:20+0000\n" "Last-Translator: vdiaz <vdiaz@antai.gob.pa>\n" "Language-Team: Spanish (Panama) (http://www.transifex.com/projects/p/alaveteli/language/es_PA/)\n" "Language: es_PA\n" @@ -2290,8 +2290,8 @@ msgstr "Enviar solicitud" msgid "Sent to one authority by {{info_request_user}} on {{date}}." msgid_plural "Sent to {{authority_count}} authorities by {{info_request_user}} on {{date}}." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Enviado a una institución pública {{info_request_user}} el {{date}}" +msgstr[1] "Enviado a {{authority_count}} instituciones públicas por {{info_request_user}} el {{date}}." msgid "Set your profile photo" msgstr "Cambiar su foto de perfil" @@ -2813,9 +2813,7 @@ msgid "This request has been <strong>reported</strong> as needing administrator msgstr "Esta solicitud ha sido <strong>reportada</strong> ya que requiere la intervención del administrador del sitio, (puede que sea inapropiada o solicita información personal)" msgid "This request has been <strong>withdrawn</strong> by the person who made it.\\n There may be an explanation in the correspondence below." -msgstr "" -"Esta solicitud ha sido <strong>retirada</strong> por la persona que la realizó. \n" -" \t Puede que haya una explicación en los mensajes a continuación." +msgstr "Esta solicitud ha sido <strong>retirada</strong> por la persona que la realizó.\\n Puede que haya una explicación en los mensajes a continuación." msgid "This request has been marked for review by the site administrators, who have not hidden it at this time. If you believe it should be hidden, please <a href=\"{{url}}\">contact us</a>." msgstr "Esta solicitud será revisada por los administradores de la plataforma, todavía no ha sido ocultada. Si considera que debe ser ocultada, por favor <a href=\"{{url}}\">contáctenos</a>." @@ -2845,9 +2843,7 @@ msgid "This request was not made via {{site_name}}" msgstr "Esta solicitud no fue hecha vía {{site_name}}" msgid "This table shows the technical details of the internal events that happened\\nto this request on {{site_name}}. This could be used to generate information about\\nthe speed with which authorities respond to requests, the number of requests\\nwhich require a postal response and much more." -msgstr "" -"La siguiente tabla muestra datos técnicos sobre los eventos internos relacionados\\n con la solicitud en {{site_name}}. Estos datos pueden ser utilizados para generar\n" -"estadísticas sobre por ejemplo la velocidad de respuesta de las instituciones o el número de solicitudes\\n que requieren usar correo ordinario." +msgstr "La siguiente tabla muestra datos técnicos sobre los eventos internos relacionados\\n con la solicitud en {{site_name}}. Estos datos pueden ser utilizados para generar estadísticas sobre\\n por ejemplo la velocidad de respuesta de las instituciones." msgid "This user has been banned from {{site_name}} " msgstr "Este usuario ha sido expulsado from {{site_name}} " @@ -2856,68 +2852,64 @@ msgid "This was not possible because there is already an account using \\nthe em msgstr "No es posible porque ya existe una cuenta usando la\\n dirección de correo {{email}}." msgid "To cancel these alerts" -msgstr "Cancelar estas alertas" +msgstr "Para cancelar estas alertas" msgid "To cancel this alert" -msgstr "Cancelar esta alerta" +msgstr "Para cancelar esta alerta" msgid "To carry on, you need to sign in or make an account. Unfortunately, there\\nwas a technical problem trying to do this." -msgstr "" -"Para continuar, necesita abrir una sesión o crear una cuenta. Desgraciadamente,\n" -"ha habido un problema técnico al intentar hacerlo." +msgstr "Para continuar, necesita abrir una sesión o crear una cuenta. Lamentablemente,\\n ha ocurrido un problema técnico al intentar hacerlo." msgid "To change your email address used on {{site_name}}" -msgstr "Cambiar la dirección de correo usada en {{site_name}}" +msgstr "Cambiar la dirección de correo utilizada en {{site_name}}" msgid "To classify the response to this FOI request" msgstr "Reclasificar la respuesta a esta solicitud" msgid "To do that please send a private email to " -msgstr "Para hacerlo, por favor mande un correo privado a " +msgstr "Para hacerlo, por favor envíe un correo privado a " msgid "To do this, first click on the link below." msgstr "Para hacerlo, elija primero el siguiente enlace." msgid "To download the zip file" -msgstr "Descargar el fichero ZIP" +msgstr "Descargar el documento ZIP" msgid "To follow all successful requests" -msgstr "Sigue todos los pedidos exitosos" +msgstr "Siga todas los solicitudes exitosas" msgid "To follow new requests" msgstr "Seguir nuevas solicitudes" msgid "To follow requests and responses matching your search" -msgstr "Para seguir solicitudes y respuestas que encajen con tu búsqueda" +msgstr "Para seguir solicitudes y respuestas coincidan con su búsqueda" msgid "To follow requests by '{{user_name}}'" -msgstr "Sigue todos los pedidos por y '{{user_name}}'" +msgstr "Siga todas las solicitudes realizadas por '{{user_name}}'" msgid "To follow requests made using {{site_name}} to the public authority '{{public_body_name}}'" -msgstr "Sigue todos los pedidos hechos {{site_name}} a la autoridad publica '{{public_body_name}}'" +msgstr "Siga todas las solicitudes enviadas utilizando {{site_name}} a la institución pública '{{public_body_name}}'" msgid "To follow the request '{{request_title}}'" -msgstr "Seguir el pedido '{{request_title}}'" +msgstr "Seguir la solicitud '{{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 "" -"Para ayudarnos a mantener la web ordenada, alguien ha actualizado el estado de \n" -"la solicitud {{law_used_full}} {{title}} que hiziste a {{public_body}}, a \"{{display_status}}\". Si no está de acuerdo con esta clasificación, por favor cambia el estado tú mismo a lo que considere correcto." +msgstr "Para ayudarnos a mantener la plataforma en orden, alguien ha actualizado el estado de la solicitud {{law_used_full}} {{title}} que usted le envíó a {{public_body}}, a \"{{display_status}}\". Si no está de acuerdo con esta clasificación, por favor cambie el estado a lo que considere correcto." msgid "To let everyone know, follow this link and then select the appropriate box." -msgstr "Para que todo el mundo lo sepa, sigue este enlace y elige la opción adecuada." +msgstr "Para dar a conocer a todos, siga este enlace y elija la opción adecuada." msgid "To log into the administrative interface" msgstr " Ingresar como administrador" msgid "To make a batch request" -msgstr "" +msgstr "Para realizar una solicitud en grupo" msgid "To play the request categorisation game" -msgstr "Jugar al juego de recategorización de solicitudes" +msgstr "Jugar a recategorizar solicitudes" msgid "To post your annotation" -msgstr "Añadir tu comentario" +msgstr "Para añadir su comentario" msgid "To reply to " msgstr "Contestar a " @@ -2932,22 +2924,22 @@ msgid "To send a message to " msgstr "Para enviar un mensaje a" msgid "To send your FOI request" -msgstr "Para enviar tu solicitud de información" +msgstr "Para enviar su solicitud de acceso a la información" msgid "To update the status of this FOI request" -msgstr "Para actualizar el estado de tu solicitud de información" +msgstr "Para actualizar el estado de su solicitud de acceso información" msgid "To upload a response, you must be logged in using an email address from " -msgstr "Para cargar una respuesta, debe estar registrado con una dirección de correo electrónico de" +msgstr "Para subir una respuesta, debe estar registrado con una dirección de correo electrónico de" msgid "To use the advanced search, combine phrases and labels as described in the search tips below." -msgstr "Para usar la búsqueda avanzada, combine frases y etiquetas como se describe en las instrucciones a continuación." +msgstr "Para utilizar 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 "Para ver la dirección de correo electrónico que usamos para enviar solicitudes a {{public_body_name}}, por favor introduzca estas palabras." msgid "To view the response, click on the link below." -msgstr "Para ver la respuesta, usa el siguiente enlace." +msgstr "Para ver la respuesta, haga clic en el siguiente enlace." msgid "To {{public_body_link_absolute}}" msgstr "Para {{public_body_link_absolute}}" @@ -2959,7 +2951,7 @@ msgid "Today" msgstr "Hoy" msgid "Too many requests" -msgstr "Demasiados pedidos" +msgstr "Demasiadas solicitudes" msgid "Top search results:" msgstr "Mejores resultados:" @@ -2989,7 +2981,7 @@ msgid "Tweet this request" msgstr "Tuitear esta solicitud" 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." +msgstr "Introduzca <code><strong>01/01/2008..14/01/2008</strong></code> para mostrar sólo los eventos que sucedieron en las dos primeras semanas de enero." msgid "URL name can't be blank" msgstr "La URL no puede estar vacía." @@ -2998,7 +2990,7 @@ msgid "URL name is already taken" msgstr "El nombre de la URL ya está en uso" msgid "Unable to change email address on {{site_name}}" -msgstr "No se ha podido cambiar la dirección de correo en {{site_name}}" +msgstr "No se ha podido cambiar la dirección de correo electrónico en {{site_name}}" msgid "Unable to send a reply to {{username}}" msgstr "No se pudo enviar la respuesta a {{username}}" @@ -3013,16 +3005,13 @@ msgid "Unexpected search result type " msgstr "Se encontró un tipo de resultado inesperado " msgid "Unfortunately we don't know the FOI\\nemail address for that authority, so we can't validate this.\\nPlease <a href=\"{{url}}\">contact us</a> to sort it out." -msgstr "" -"Desgraciadamente no tenemos la dirección\n" -"de correo para este organismo, así que no podemos validarlo.\n" -"Por favor <a href=\"{{url}}\">contáctenos</a> para arreglarlo." +msgstr "Lamentablemente no tenemos la dirección\\n de correo electrónico para esta institución pública, así que no podemos validarlo. \\n Por favor <a href=\"{{url}}\">contáctenos</a> para arreglarlo." msgid "Unfortunately, we do not have a working address for {{public_body_names}}." msgstr "Lamentablemente, no tenemos una dirección que funcione para {{public_body_names}}." msgid "Unfortunately, we do not have a working {{info_request_law_used_full}}\\naddress for" -msgstr "Desgraciadamente, no tenemos una dirección de correo válida para" +msgstr "Lamentablemente, no tenemos una dirección de correo válida {{info_request_law_used_full}}\\n para" msgid "Unknown" msgstr "Desconocido" @@ -3040,7 +3029,7 @@ msgid "Update the address:" msgstr "Actualice la dirección:" msgid "Update the status of this request" -msgstr "Actualiza el estado de esta solicitud" +msgstr "Actualice el estado de esta solicitud" msgid "Update the status of your request to " msgstr "Actualizar el estado de la solicitud a " @@ -3052,7 +3041,7 @@ msgid "Use OR (in capital letters) where you don't mind which word, e.g. <stron msgstr "Escriba OR (en mayúsculas) cuando no le importe qué palabra, e.g. <strong><code>diputado OR parlamento</code></strong>" msgid "Use quotes when you want to find an exact phrase, e.g. <strong><code>\"Liverpool City Council\"</code></strong>" -msgstr "Utiliza comillas cuando quieras buscar una frase exacta, por ejemplo <strong><code>\"Consejo de Europa\"</code></strong>" +msgstr "Utilice comillas cuando quiera buscar una frase exacta, por ejemplo <strong><code>\"Consejo de Europa\"</code></strong>" msgid "User" msgstr "usuario" @@ -3067,7 +3056,7 @@ msgid "UserInfoRequestSentAlert|Alert type" msgstr "UserInfoRequestSentAlert|Alert type" msgid "Users cannot usually make batch requests to multiple authorities at once because we don’t want public authorities to be bombarded with large numbers of inappropriate requests. Please <a href=\"{{url}}\">contact us</a> if you think you have good reason to send the same request to multiple authorities at once." -msgstr "" +msgstr "Los usuarios, por lo general no pueden realizar solicitudes por grupos a varias instituciones a la vez porque no queremos que las entidades sean saturadas con un gran número de solicitudes inapropiadas. <a Href=\"{{url}}\"> contáctenos </a> si usted piensa que tiene una buena razón para enviar la misma petición a múltiples autoridades a la vez." msgid "User|About me" msgstr "User|About me" @@ -3127,22 +3116,22 @@ msgid "Vexatious" msgstr "Lenguaje inapropiado " msgid "View FOI email address" -msgstr "Ver dirección de correo" +msgstr "Ver dirección de correo electrónico" msgid "View FOI email address for '{{public_body_name}}'" -msgstr "Ver dirección de correo para '{{public_body_name}}'" +msgstr "Ver dirección de correo electrónico para '{{public_body_name}}'" msgid "View FOI email address for {{public_body_name}}" -msgstr "Ver dirección de correo para '{{public_body_name}}'" +msgstr "Ver dirección de correo electrónico 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}}:" +msgstr "Ver solicitudes de acceso a información realizadas por {{user_name}}:" msgid "View authorities" -msgstr "Ver organismos públicos" +msgstr "Ver instituciones públicas" msgid "View email" -msgstr "Ver correo" +msgstr "Ver correo electrónico" msgid "Waiting clarification." msgstr "Esperando aclaración." @@ -3151,13 +3140,13 @@ msgid "Waiting for an <strong>internal review</strong> by {{public_body_link}} o msgstr "Esperando una <strong>revisión interna</strong> por parte de {{public_body_link}} de cómo han respondido a esta solicitud." msgid "Waiting for the public authority to complete an internal review of their handling of the request" -msgstr "Esperando que el organismo termine una revisión interna de tu respuesta a la solicitud" +msgstr "Esperando que ls institución pública termine una revisión interna de su respuesta a la solicitud" msgid "Waiting for the public authority to reply" -msgstr "Esperando que el organismo responda" +msgstr "Esperando que la institución responda" msgid "Was the response you got to your FOI request any good?" -msgstr "¿Fue la respuesta a tu solicitud satisfactoria?" +msgstr "¿Fue la respuesta a su solicitud satisfactoria?" msgid "We consider it is not a valid FOI request, and have therefore hidden it from other users." msgstr "Consideramos que no es una solicitud de información válida, por lo que la hemos ocultado para otros usuarios." @@ -3166,57 +3155,43 @@ msgid "We consider it to be vexatious, and have therefore hidden it from other u msgstr "Consideramos que es ofensiva, por lo que la hemos ocultado para otros usuarios." msgid "We do not have a working request email address for this authority." -msgstr "No tenemos una dirección de correo válida para este organismo." +msgstr "No tenemos una dirección de correo válida para esta institución." msgid "We do not have a working {{law_used_full}} address for {{public_body_name}}." -msgstr "No tenemos una dirección de correo válida para este {{public_body_name}}." +msgstr "No tenemos una dirección de correo electrónico de {{law_used_full}}válida para {{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 eres {{user_link}} por favor <a href=\"{{url}}\">abre una sesión</a> y háznoslo saber." +msgstr "No sabemos si la última respuesta a esta solicitud contiene\\n información o no –\\n⇥si es usted {{user_link}} por favor <a href=\"{{url}}\">inicie sesión </a> y déjele saber a todos." 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 revelaremos su dirección de correo electrónico a nadie salvo que usted nos autorice o la ley nos obligue (<a href=\"{{url}}\">más información</a>). " msgid "We will not reveal your email address to anybody unless you\\nor the law tell us to." -msgstr "" -"No revelaremos tu dirección de correo a nadie salvo que tú\n" -"nos lo digas, o la ley nos obligue." +msgstr "No revelaremos su dirección de correo electrónico a nadie salvo que usted nos autorice,\\n o la ley nos obligue." msgid "We will not reveal your email addresses to anybody unless you\\nor the law tell us to." -msgstr "" -"No revelaremos tu dirección de correo a nadie salvo que tú\n" -"nos lo digas, o la ley nos obligue." +msgstr "No revelaremos su dirección de correo electrónico a nadie salvo que usted nos autorice o,\\n o la ley nos obligue." msgid "We're waiting for" msgstr "Estamos esperando a que " msgid "We're waiting for someone to read" -msgstr "Estamos esperando a que alguien lea" +msgstr "Estamos esperando a que sea leido" msgid "We've sent an email to your new email address. You'll need to click the link in\\nit before your email address will be changed." -msgstr "" -"Hemos enviado un correo a tu nueva dirección de correo. Necesitarás seguir el enlace\n" -"incluido en él para que se actualice tu dirección de correo." +msgstr "Hemos enviado un correo a su nueva dirección de correo. Necesitará seguir el enlace\\n incluido en él para que se actualice su dirección de correo." msgid "We've sent you an email, and you'll need to click the link in it before you can\\ncontinue." -msgstr "" -"Te hemos enviado un correo, necesitarás seguir el enlace incluído en él antes\n" -"de continuar." +msgstr "Le hemos enviado un correo electrónico, necesitará seguir el enlace incluido en él antes 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 "Le hemos enviado un correo, siga el enlace incluido en él, y podrá cambiar su contraseña." msgid "What are you doing?" msgstr "¿Qué está haciendo?" msgid "What best describes the status of this request now?" -msgstr "¿Cómo describirías el estado de esta solicitud ahora?" +msgstr "¿Cómo describiría el estado de esta solicitud ahora?" msgid "What information has been released?" msgstr "¿Qué información se ha solicitado?" @@ -3225,14 +3200,10 @@ msgid "What information has been requested?" msgstr "¿Qué información ha sido solicitada?" msgid "When you get there, please update the status to say if the response \\ncontains any useful information." -msgstr "" -"Por favor actualiza el estado para indicar si la respuesta \n" -"contiene información útil." +msgstr "Por favor actualiza el estado para indicar si la respuesta\\n contiene información útil." msgid "When you receive the paper response, please help\\n others find out what it says:" -msgstr "" -"Cuando reciba la respuesta en papel, por favor ayude\n" -" a que otros sepan lo que dice:" +msgstr "Cuando reciba la respuesta en papel, por favor ayude a que otros sepan lo que dice:" msgid "When you're done, <strong>come back here</strong>, <a href=\"{{url}}\">reload this page</a> and file your new request." msgstr "Cuando esté listo, <strong>vuelva aquí</strong>, <a href=\"{{url}}\">recargue esta página</a> y cree una nueva solicitud." @@ -3244,7 +3215,7 @@ msgid "Who can I request information from?" msgstr "¿A quién puedo solicitar información?" msgid "Why specifically do you consider this request unsuitable?" -msgstr "¿Específicamente por qué considera qué esta petición es inadecuada?" +msgstr "¿Específicamente por qué considera que esta solicitud es inadecuada?" msgid "Withdrawn by the requester." msgstr "Retirada por el autor." @@ -3253,40 +3224,40 @@ msgid "Wk" msgstr "Wk" msgid "Would you like to see a website like this in your country?" -msgstr "¿Te gustaría ver una web como esta en tu país?" +msgstr "¿Le gustaría ver una plataforma como esta en su país?" msgid "Write a reply" -msgstr "Escribe una respuesta" +msgstr "Escriba una respuesta" msgid "Write a reply to " msgstr "Escribir una respuesta a " msgid "Write your FOI follow up message to " -msgstr "Escribe tu respuesta a " +msgstr "Escribe su 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 "Escriba su solicitud en un <strong>lenguaje sencillo y claro</strong>." msgid "You" -msgstr "Tú" +msgstr "Usted" msgid "You already created the same batch of requests on {{date}}. You can either view the <a href=\"{{existing_batch}}\">existing batch</a>, or edit the details below to make a new but similar batch of requests." -msgstr "" +msgstr "Usted ya ha creado el mismo grupo de solicitudes {{date}}. Podrá ver <a href=\"{{existing_batch}}\">grupos existentes </a>, o edite los detalles de abajo para realizar una nueva solicitud en grupo con características similares." msgid "You are already following new requests" -msgstr "Tu ya estas siguiendo nuevos pedidos" +msgstr "Usted ya estas siguiendo nuevas solicitudes" msgid "You are already following requests to {{public_body_name}}" -msgstr "Tu ya estas siguiendo pedidos a {{public_body_name}}" +msgstr "Usted ya estas siguiendo solicitudes a {{public_body_name}}" msgid "You are already following things matching this search" -msgstr "Ya estás siguiendo esta búsqueda por correo" +msgstr "Ya está siguiendo esta búsqueda por correo" msgid "You are already following this person" -msgstr "Ya estás siguiendo a esta persona por correo" +msgstr "Ya está siguiendo a esta persona por correo" msgid "You are already following this request" -msgstr "Ya estás siguiendo esta solicitud por correo" +msgstr "Ya está siguiendo esta solicitud por correo" msgid "You are already subscribed to '{{link_to_authority}}', a public authority." msgstr "Usted ya está suscrito a '{{link_to_authority}}', una institución pública." @@ -3304,34 +3275,34 @@ msgid "You are already subscribed to any <a href=\"{{new_requests_url}}\">new re msgstr "Usted ya está suscrito a cualquier <a href=\"{{new_requests_url}}\"> solicitud nueva </a>." msgid "You are already subscribed to any <a href=\"{{successful_requests_url}}\">successful requests</a>." -msgstr "" +msgstr "Usted ya está suscrito a todas <a href=\"{{successful_requests_url}}\">solicitudes exitosas</a>." msgid "You are currently receiving notification of new activity on your wall by email." -msgstr "Actualmente estas recibiendo notificaciones de nueva actividad en tu muro por correo electronico." +msgstr "Actualmente esta recibiendo notificaciones de nueva actividad en su muro por correo electrónico." msgid "You are following all new successful responses" -msgstr "Estás recibiendo correos sobre cualquier nueva respuesta exitosa" +msgstr "Está siguiendo todas las nuevas respuesta exitosa" msgid "You are no longer following '{{link_to_authority}}', a public authority." msgstr "Usted ya no está siguiendo a '{{link_to_authority}}', una institución pública." msgid "You are no longer following '{{link_to_request}}', a request." -msgstr "" +msgstr "Usted ya no esta siguiendo '{{link_to_request}}', una solicitud." msgid "You are no longer following '{{link_to_user}}', a person." -msgstr "" +msgstr "Usted ya no esta siguiendo '{{link_to_request}}', una persona." msgid "You are no longer following <a href=\"{{new_requests_url}}\">new requests</a>." -msgstr "Ya no está siguiendo <a href=\"{{new_requests_url}}\">solicitudes nuevas</a>." +msgstr "Ya no está siguiendo las<a href=\"{{new_requests_url}}\">solicitudes nuevas</a>." msgid "You are no longer following <a href=\"{{search_url}}\">this search</a>." msgstr "Usted ya no está siguiendo <a href=\"{{search_url}}\"> esta búsqueda </a>." msgid "You are no longer following <a href=\"{{successful_requests_url}}\">successful requests</a>." -msgstr "" +msgstr "Usted ya no está siguiendo <a href=\"{{search_url}}\"> solicitudes exitosas </a>." msgid "You are now <a href=\"{{wall_url_user}}\">following</a> updates about '{{link_to_authority}}', a public authority." -msgstr "Usted ahora está <a href=\"{{wall_url_user}}\"> siguiendo</a> actualizaciones relacionadas con '{{link_to_authority}}', esta institución publica." +msgstr "Usted ahora está <a href=\"{{wall_url_user}}\"> siguiendo</a> actualizaciones relacionadas con '{{link_to_authority}}', esta institución pública." msgid "You are now <a href=\"{{wall_url_user}}\">following</a> updates about '{{link_to_request}}', a request." msgstr "Usted ahora está <a href=\"{{wall_url_user}}\"> siguiendo</a> actualizaciones relacionadas con '{{link_to_request}}', esta solicitud. " @@ -3346,214 +3317,187 @@ msgid "You are now <a href=\"{{wall_url_user}}\">following</a> updates about <a msgstr "Usted ahora está <a href=\"{{wall_url_user}}\"> siguiendo</a> actualizaciones relacionadas con <a href=\"{{search_url}}\">esta búsqueda</a>." msgid "You are now <a href=\"{{wall_url_user}}\">following</a> updates about <a href=\"{{successful_requests_url}}\">successful requests</a>." -msgstr "Usted ahora está <a href=\"{{wall_url_user}}\"> siguiendo </a> actualizaciones sobre <a href=\"{{successful_requests_url}}\"> solicitudes exitosas </a>." +msgstr "Usted ahora está <a href=\"{{wall_url_user}}\"> siguiendo </a> actualizaciones relacionadas con <a href=\"{{successful_requests_url}}\"> solicitudes exitosas </a>." msgid "You can <strong>complain</strong> by" -msgstr "Puede <strong>apelar</strong>" +msgstr "Puede <strong>presentar reclamo</strong>" msgid "You can change the requests and users you are following on <a href=\"{{profile_url}}\">your profile page</a>." -msgstr "Puedes cambiar los pedidos y usuarios a los que estas siguiendo en <a href=\"{{profile_url}}\">tu página de perfil</a>." +msgstr "Puede cambiar las solicitudes y usuarios a los sigue en <a href=\"{{profile_url}}\">su página de perfil</a>." msgid "You can get this page in computer-readable format as part of the main JSON\\npage for the request. See the <a href=\"{{api_path}}\">API documentation</a>." -msgstr "" -"Puedes obtener esta página en un formato procesable como parte de la página JSON\n" -"de la solicitud. Consulte <a href=\"{{api_path}}\">la documentación de nuestro API</a>." +msgstr "Puede obtener esta página en un formato compatible como parte de la página JSON de la solicitud. Consulte <a href=\"{{api_path}}\">la documentación de nuestro API</a>." msgid "You can only request information about the environment from this authority." msgstr "Solo puede solicitar información medioambiental a esta institución" msgid "You have a new response to the {{law_used_full}} request " -msgstr "Tienes una nueva respuesta a la solicitud {{law_used_full}} " +msgstr "Tiene una nueva respuesta a su solicitud {{law_used_full}}" msgid "You have found a bug. Please <a href=\"{{contact_url}}\">contact us</a> to tell us about the problem" msgstr "Ha encontrado un error. Por favor <a href=\"{{contact_url}}\">contáctenos</a> para informarnos del problema" msgid "You have hit the rate limit on new requests. Users are ordinarily limited to {{max_requests_per_user_per_day}} requests in any rolling 24-hour period. You will be able to make another request in {{can_make_another_request}}." -msgstr "Has alcanzado el límite de solicitudes en un día, que es de {{max_requests_per_user_per_day}} solicitudes en un plazo de 24 horas. Podrás enviar una nueva solicitud en {{can_make_another_request}}." +msgstr "Ha alcanzado el límite de solicitudes en un día, que es de {{max_requests_per_user_per_day}} solicitudes en un plazo de 24 horas. Podrá enviar una nueva solicitud en {{can_make_another_request}}." msgid "You have made no Freedom of Information requests using this site." -msgstr "No ha realizado solicitudes de información usando esta web." +msgstr "No ha realizado solicitudes de acceso a la información utilizando esta web." msgid "You have now changed the text about you on your profile." -msgstr "Has cambiado el texto sobre ti en tu perfil." +msgstr "Ha cambiado el texto sobre usted en su perfil." msgid "You have now changed your email address used on {{site_name}}" -msgstr "Ha cambiado la dirección de correo que usa en {{site_name}}" +msgstr "Ha cambiado su dirección de correo electrónico que utiliza en {{site_name}}" msgid "You just tried to sign up to {{site_name}}, when you\\nalready have an account. Your name and password have been\\nleft as they previously were.\\n\\nPlease click on the link below." -msgstr "" -"Has intentado registrarte en {{site_name}}, pero\n" -"ya tienes una cuenta. Tu nombre y contraseña no se han\n" -"modificado.\n" -"\n" -"Por favor usa el siguiente enlace para continuar." +msgstr "Ha intentado registrarse en {{site_name}}, pero\\n ya tiene una cuenta. Su nombre y contraseña no se han modificado.\\n\\n Por favor usa el siguiente enlace para continuar." msgid "You know what caused the error, and can <strong>suggest a solution</strong>, such as a working email address." -msgstr "Sabes lo que ha causado el error, y puedes <strong>sugerir una solución</a>, como una dirección de correo válida." +msgstr "Ya conoce lo que ha causado el error, y puede <strong>sugerir una solución</a>, tal como una dirección de correo válida." msgid "You may <strong>include attachments</strong>. If you would like to attach a\\n file too large for email, use the form below." -msgstr "Puede <strong>adjuntar ficheros</strong>. Si quiere adjuntar un fichero demasiado grande para el correo, puede utilizar el siguiente formulario." +msgstr "Puede <strong>adjuntar documentos</strong>. Si desea adjuntar un documento demasiado grande para el correo, puede utilizar el siguiente formulario." msgid "You may be able to find one on their website, or by phoning them up and asking. If you manage to find one, then please send it to us:" msgstr "Usted podría encontrar uno en el sitio web de la institución, o llamando a la misma para solicitarlo. Si logra encontrar uno, por favor re enviar a nosotros:" msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"{{url}}\">send it to us</a>." -msgstr "" -"Puede que encuentres una\n" -" en su página web, o preguntando por teléfono. Si la consigues\n" -" por favor <a href=\"{{url}}\">envíanosla</a>." +msgstr "Puede que encuentre\\n uno en su página web, o preguntando por teléfono. Si la consigue por favor <a href=\"{{url}}\">envíenoslo</a>." msgid "You may be able to find\\none on their website, or by phoning them up and asking. If you manage\\nto find one, then please <a href=\"{{help_url}}\">send it to us</a>." -msgstr "" -"Puede que encuentres una\n" -"en su página web, o llamándoles para preguntar. Si\n" -"consigues una, por favor <a href=\"{{help_url}}\">mándanosla</a>." +msgstr "Puede que encuentre\\nuna en su página web, o llamándoles para preguntar. Si consigue\\n una, por favor <a href=\"{{help_url}}\">envíenosla</a>." msgid "You need to be logged in to change the text about you on your profile." -msgstr "Necesitas identificarte para cambiar el texto de tu perfil." +msgstr "Necesita iniciar sesión para cambiar el texto de su perfil." msgid "You need to be logged in to change your profile photo." -msgstr "Necesitas identificarte para cambiar la foto de tu perfil." +msgstr "Necesita iniciar sesión para cambiar la foto de su perfil." msgid "You need to be logged in to clear your profile photo." -msgstr "Necesitas identificarte para borrar la foto de tu perfil." +msgstr "Necesita iniciar sesión para borrar la foto de su perfil." msgid "You need to be logged in to edit your profile." -msgstr "Tienes que loguearte para poder editar tu perfil." +msgstr "Necesita iniciar sesión para poder editar su perfil." msgid "You need to be logged in to report a request for administrator attention" -msgstr "Necesitas abrir una sesión para alertar a los moderadores sobre esta solicitud" +msgstr "Necesita iniciar sesión para alertar a los moderadores sobre esta solicitud" msgid "You previously submitted that exact follow up message for this request." -msgstr "Ya has enviado esa misma respuesta a esta solicitud." +msgstr "Anteriormente ha enviado la misma respuesta a esta solicitud." msgid "You should have received a copy of the request by email, and you can respond\\n by <strong>simply replying</strong> to that email. For your convenience, here is the address:" -msgstr "" -"Debería de haber recibido una copia de la petición por correo electrónico, y puede contestar\n" -"<strong>simplemente respondiendo</strong> a ese correo. Para su comodidad, esta es la dirección:" +msgstr "Debería haber recibido una copia de la solicitud por correo electrónico, y puede contestar\\n <strong>simplemente respondiendo</strong> a ese correo. Para su comodidad, esta es la dirección:" msgid "You want to <strong>give your postal address</strong> to the authority in private." -msgstr "Quieres <strong>darle tu dirección postal</strong> al organismo en privado." +msgstr "Desea <strong>darle su dirección física</strong> a la institución en privado." msgid "You will be unable to make new requests, send follow ups, add annotations or\\nsend messages to other users. You may continue to view other requests, and set\\nup\\nemail alerts." -msgstr "" -"No podrás realizar nuevas solicitudes, enviar respuestas, añadir comentarios o\n" -"contactar con otros usuarios. Podrás continuar viendo otras solicitudes y\n" -"configurando nuevas alertas de correo." +msgstr "No podrá realizar nuevas solicitudes, enviar respuestas, añadir comentarios o\\n enviar mensajes a otros usuarios. Podrá continuar viendo otras solicitudes y\\n configurar\\n nuevas alertas de correo." msgid "You will no longer be emailed updates for those alerts" msgstr "Ya no recibirá correos para esas alertas" msgid "You will now be emailed updates about '{{link_to_authority}}', a public authority." -msgstr "Ahora estará recibiendo por correo electrónico actualizaciones sobre '{{link_to_authority}}', la institución pública." +msgstr "Desde ahora recibirá por correo electrónico actualizaciones relacionadas con '{{link_to_authority}}', la institución pública." msgid "You will now be emailed updates about '{{link_to_request}}', a request." msgstr "Desde ahora se le enviará por correo electrónico las actualizaciones de '{{link_to_request}}', esta solicitud." msgid "You will now be emailed updates about '{{link_to_user}}', a person." -msgstr "Se le estarán enviando correos con actualizaciones relacionadas '{{link_to_user}}', esta persona." +msgstr "Se le enviaran correos electrónicos con actualizaciones relacionadas con '{{link_to_user}}', a esta persona." msgid "You will now be emailed updates about <a href=\"{{search_url}}\">this search</a>." -msgstr "Se le estarán enviando actualizaciones relacionadas <a href=\"{{search_url}}\">esta búsqueda</a>. " +msgstr "Se le enviaran actualizaciones relacionadas <a href=\"{{search_url}}\">esta búsqueda</a>. " msgid "You will now be emailed updates about <a href=\"{{successful_requests_url}}\">successful requests</a>." -msgstr "Desde ahora se le enviarán por correo electrónico todas las actualizaciones acerca de<a href=\"{{successful_requests_url}}\">solicitudes exitosas</a>." +msgstr "Desde ahora se le enviarán por correo electrónico todas las actualizaciones relacionadas con<a href=\"{{successful_requests_url}}\">solicitudes exitosas</a>." msgid "You will now be emailed updates about any <a href=\"{{new_requests_url}}\">new requests</a>." -msgstr "Desde ahora se le enviaran por correo electrónico todas las actualizaciones acerca de<a href=\"{{new_requests_url}}\">nuevas solicitudes </a>." +msgstr "Desde ahora se le enviaran por correo electrónico todas las actualizaciones relacionadas con<a href=\"{{new_requests_url}}\">nuevas solicitudes </a>." msgid "You will only get an answer to your request if you follow up\\nwith the clarification." -msgstr "" -"Sólo recibirás una respuesta a tu solicitud si continúas\n" -"con la aclaración." +msgstr "Sólo recibirá una respuesta a su solicitud si continúa\\n con la aclaración." msgid "You will still be able to view it while logged in to the site. Please reply to this email if you would like to discuss this decision further." -msgstr "Podrás seguir viéndola en la web al identificarte. Por favor responde a este correo si quieres comentar nuestra decisión." +msgstr "Podrá seguir viéndola mientras se encuentre en la plataforma al iniciar sesión. Por favor responda a este correo si desea comentar nuestra decisión." msgid "You're in. <a href=\"#\" id=\"send-request\">Continue sending your request</a>" -msgstr "Bienvenido. <a href=\"#\" id=\"send-request\">Ahora puede continuar mandando su solicitud</a>" +msgstr "Bienvenido a. <a href=\"#\" id=\"send-request\">Continúe enviando su solicitud</a>" 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 respuesta a su solicitud de acceso a la información está muy retrasada - " msgid "You're not following anything." -msgstr "No estás recibiendo actualizaciones por correo." +msgstr "No está recibiendo actualizaciones por correo." msgid "You've now cleared your profile photo" -msgstr "Has borrado la foto de tu perfil" +msgstr "Ha borrado la foto de su 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>." +msgstr "Su <strong>nombre aparecerá públicamente</strong>\\n (<a href=\"{{why_url}}\">¿por qué?</a>)\\n en esta plataforma y motores de búsqueda. Si está\\n pensando en utilizar un seudónimo, por favor\\n <a href=\"{{help_url}}\">lea esto primero</a>." msgid "Your annotations" -msgstr "Tus comentarios" +msgstr "Sus comentarios" msgid "Your batch request \"{{title}}\" has been sent" -msgstr "" +msgstr "Su solicitud grupal \"{{title}}\" ha sido enviada" msgid "Your details, including your email address, have not been given to anyone." -msgstr "Tus datos personales, incluyendo tu dirección de correo, no han sido compartido con nadie." +msgstr "Sus datos personales, incluyendo su dirección de correo electrónico, no han sido compartido con nadie." msgid "Your e-mail:" -msgstr "Tu correo:" +msgstr "Su correo electrónico:" msgid "Your email doesn't look like a valid address" msgstr "Su correo electrónico no parece una dirección válida" msgid "Your follow up has not been sent because this request has been stopped to prevent spam. Please <a href=\"{{url}}\">contact us</a> if you really want to send a follow up message." -msgstr "Tu respuesta no ha sido enviada porque esta solicitud ha sido bloqueada para evitar spam. Por favor <a href=\"{{url}}\">contáctanos</a> si realmente quieres enviar una respuesta." +msgstr "Su respuesta no ha sido enviada porque esta solicitud ha sido bloqueada para evitar spam. Por favor <a href=\"{{url}}\">contáctenos</a> si realmente desea enviar una respuesta." msgid "Your follow up message has been sent on its way." -msgstr "Tu mensaje está en camino." +msgstr "Su mensaje de seguimiento ha sido enviado " msgid "Your internal review request has been sent on its way." -msgstr "Tu solicitud de revisión interna está en camino." +msgstr "Su solicitud de revisión interna ha sido enviada." msgid "Your message has been sent. Thank you for getting in touch! We'll get back to you soon." -msgstr "Tu mensaje ha sido enviado. Gracias por escribir, nos pondremos en contacto contigo pronto." +msgstr "Su mensaje ha sido enviado. Gracias por escribir, nos pondremos en contacto con usted pronto." msgid "Your message to {{recipient_user_name}} has been sent" -msgstr "Tu mensaje a {{recipient_user_name}} ha sido enviado" +msgstr "Su mensaje a {{recipient_user_name}} ha sido enviado" msgid "Your message to {{recipient_user_name}} has been sent!" -msgstr "Tu mensaje a {{recipient_user_name}} ha sido enviado." +msgstr "¡Su mensaje a {{recipient_user_name}} ha sido enviado!" msgid "Your message will appear in <strong>search engines</strong>" -msgstr "Tu mensaje aparecerá en <strong>los motores de búsqueda</strong>" +msgstr "Su 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 "Su nombre y su comentario aparecerán en los <strong>motores de búsqueda</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>motores de búsqueda</strong>\n" -" (<a href=\"{{url}}\">detalles</a>)." +msgstr "Su nombre, su solicitud y cualquier respuesta aparecerán en los <strong>motores de búsqueda</strong>\\n(<a href=\"{{url}}\">detalles</a>)." msgid "Your name:" -msgstr "Tu nombre:" +msgstr "Su nombre:" msgid "Your original message is attached." -msgstr "Tu mensaje original está adjunto." +msgstr "Su mensaje original está adjunto." msgid "Your password has been changed." -msgstr "Tu contraseña ha sido cambiada." +msgstr "Su contraseña ha sido cambiada." msgid "Your password:" -msgstr "Tu contraseña:" +msgstr "Su contraseña:" msgid "Your photo will be shown in public <strong>on the Internet</strong>,\\n wherever you do something on {{site_name}}." -msgstr "Tu foto será visible públicamente <strong>en Internet</strong>, cada vez que hagas algo en {{site_name}}." +msgstr "Su foto será visible públicamente <strong>en Internet</strong>, cada vez que haga algo en {{site_name}}." msgid "Your request '{{request}}' at {{url}} has been reviewed by moderators." -msgstr "Tu solicitud '{{request}}' en {{url}} ha sido revisada por los moderadores." +msgstr "Su solicitud '{{request}}' en {{url}} ha sido revisada por los moderadores." msgid "Your request on {{site_name}} hidden" -msgstr "Tu solicitud en {{site_name}} oculta" +msgstr "Su solicitud en {{site_name}} oculta" msgid "Your request to add an authority has been sent. Thank you for getting in touch! We'll get back to you soon." msgstr "Su petición de añadir una nueva autoridad ha sido enviada. Gracias por escribirnos! Nos pondremos en contacto con usted pronto." @@ -3562,75 +3506,73 @@ msgid "Your request to add {{public_body_name}} to {{site_name}}" msgstr "Su solicitud para agregar {{public_body_name}} a {{site_name}}" msgid "Your request to update the address for {{public_body_name}} has been sent. Thank you for getting in touch! We'll get back to you soon." -msgstr "Tu pedido de actualizar la dirección de {{public_body_name}} ha sido enviada. Gracias por contactarnos y colaborar con que esta herramienta sea mejor! Vamos a intentar responderte a la brevedad." +msgstr "Su solicitud para actualizar la dirección de {{public_body_name}} ha sido enviada. Gracias por contactarnos y colaborar para que esta herramienta sea mejor! Vamos a intentar responderle lo antes posible." msgid "Your request to update {{public_body_name}} on {{site_name}}" msgstr "Su solicitud para agregar {{public_body_name}} a {{site_name}}" msgid "Your request was called {{info_request}}. Letting everyone know whether you got the information will help us keep tabs on" -msgstr "Tu solicitud se llamaba {{info_request}}. Haznos saber si has recibido la información para ayudarnos a controlar a" +msgstr "El nombre de su solicitud era {{info_request}}. Déjenos saber si has recibido la información para ayudarnos a llevar un mejor control" msgid "Your request:" -msgstr "Tu solicitud:" +msgstr "Su solicitud:" msgid "Your response to an FOI request was not delivered" -msgstr "Tú respuesta a la solicitud de información no ha sido entregada" +msgstr "Su respuesta a la solicitud de acceso a la información no ha sido entregada" msgid "Your response will <strong>appear on the Internet</strong>, <a href=\"{{url}}\">read why</a> and answers to other questions." -msgstr "Tu respuesta <strong>aparecerá en Internet</strong>, <a href=\"{{url}}\">lee por qué</a> y respuestas a otras preguntas." +msgstr "Lo que responda<strong>aparecerá en Internet</strong>, <a href=\"{{url}}\">lea por qué</a> y las respuestas a otras preguntas." msgid "Your selected authorities" msgstr "Sus instituciones públicas seleccionadas" msgid "Your thoughts on what the {{site_name}} <strong>administrators</strong> should do about the request." -msgstr "Opine sobre lo que los <strong>administradores</strong> de {{site_name}} deberían hacer con la solicitud." +msgstr "Que piensa sobre qué los <strong>administradores</strong> de {{site_name}} deberían hacer con la solicitud." 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] "Su {{count}} solicitud de acceso a la información" +msgstr[1] "Sus {{count}} solicitudes de acceso a la información" msgid "Your {{count}} annotation" msgid_plural "Your {{count}} annotations" -msgstr[0] "Tu {{count}} comentario" -msgstr[1] "Tus {{count}} comentarios" +msgstr[0] "Su {{count}} comentario" +msgstr[1] "Sus {{count}} comentarios" msgid "Your {{count}} batch requests" msgid_plural "Your {{count}} batch requests" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Su {{count}} solicitud grupal" +msgstr[1] "Sus {{count}} solicitudes grupales" msgid "Your {{site_name}} email alert" -msgstr "Tu alerta en {{site_name}}" +msgstr "Su alerta en {{site_name}}" msgid "Yours faithfully," -msgstr "Un saludo," +msgstr "Saludos cordiales," msgid "Yours sincerely," -msgstr "Un saludo," +msgstr "Atentamente," msgid "Yours," -msgstr "Un saludo," +msgstr "Saludos," msgid "[Authority URL will be inserted here]" msgstr "[La URL de la Institución Pública se insertará aqui]" msgid "[FOI #{{request}} email]" -msgstr "[Dirección de correo de la solicitud #{{request}}]" +msgstr "[Dirección de correo de la solicitud de acceso a la información #{{request}}]" msgid "[{{public_body}} request email]" -msgstr "[Dirección de correo del organismo {{public_body}}]" +msgstr "[Dirección de correo de la institución pública {{public_body}}]" msgid "[{{site_name}} contact email]" -msgstr "[Correo de contacto de {{site_name}}]" +msgstr "[Correo electrónico de contacto en {{site_name}}]" msgid "\\n\\n[ {{site_name}} note: The above text was badly encoded, and has had strange characters removed. ]" msgstr "\\n\\n[ {{site_name}} Nota: El texto anterior estaba mal codificado, y se han eliminado algunos carácteres extraños. ]" 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 "Resuma en una línea la información que desea solicitar, \\n⇥⇥⇥e.g." msgid "admin" msgstr "admin" @@ -3645,7 +3587,7 @@ msgid "all requests or comments" msgstr "todas las solicitudes o comentarios" msgid "all requests or comments matching text '{{query}}'" -msgstr "" +msgstr "todas las solicitudes y comentarios que coincidan con el texto '{{query}}'" msgid "also called {{public_body_short_name}}" msgstr "también conocido como {{public_body_short_name}}" @@ -3657,13 +3599,13 @@ msgid "and" msgstr "y" 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?" +msgstr "y actualice el estado. ¿Tal vez <strong>a usted</strong> le gustaría ayudar al hacer esto?" msgid "and update the status." msgstr "y actualice su estado." msgid "and we'll suggest <strong>what to do next</strong>" -msgstr "y te sugeriremos <strong>qué hacer a continuación</strong>" +msgstr "Y le podemos sugerir <strong>qué hacer a continuación</strong>" msgid "anything matching text '{{query}}'" msgstr "cualquier texto que coincida '{{query}}'" @@ -3675,13 +3617,13 @@ msgid "at" msgstr "en" msgid "authorities" -msgstr "organismos" +msgstr "instituciones públicas" msgid "beginning with ‘{{first_letter}}’" -msgstr "comenzando con ‘{{first_letter}}’" +msgstr "que comiencen con ‘{{first_letter}}’" msgid "but followupable" -msgstr "pero suscribible" +msgstr "pero con posibilidad de seguimiento" msgid "by" msgstr "antes de" @@ -3696,9 +3638,7 @@ msgid "comments" msgstr "comentarios" msgid "containing your postal address, and asking them to reply to this request.\\n Or you could phone them." -msgstr "" -"incluyendo tu dirección postal, y pidiéndoles que contesten a tu solicitud.\n" -" O prueba a llamarles por teléfono." +msgstr "que incluya su dirección postal, y solicitándoles que contesten a su solicitud.\\n O puede llamarles por teléfono." msgid "details" msgstr "detalles" @@ -3707,16 +3647,16 @@ msgid "display_status only works for incoming and outgoing messages right now" msgstr "display_status sólo funciona para mensajes de entrada y salida ahora mismo" msgid "during term time" -msgstr "durante el periodo escolar" +msgstr "durante el término de tiempo" msgid "e.g. Ministry of Defence" -msgstr "ejemplo: Ministerio de Gobierno" +msgstr "ejemplo: Ministerio de la Presidencia" msgid "edit text about you" -msgstr "edita el texto sobre ti" +msgstr "edite el texto sobre usted" msgid "even during holidays" -msgstr "incluso durante las vacaciones" +msgstr "incluso durante los días feriados" msgid "everything" msgstr "todo" @@ -3728,13 +3668,13 @@ msgid "has reported an" msgstr "ha denunciado un" msgid "have delayed." -msgstr "han retrasado." +msgstr "se han retrasado." msgid "hide quoted sections" msgstr "ocultar partes citadas" msgid "in term time" -msgstr "durante el periodo escolar" +msgstr "durante el término" msgid "in the category ‘{{category_name}}’" msgstr "en la categoría ‘{{category_name}}’" @@ -3758,10 +3698,10 @@ msgid "made." msgstr "hecho." msgid "matching the tag ‘{{tag_name}}’" -msgstr "con la etiqueta ‘{{tag_name}}’" +msgstr "que coincida con la etiqueta ‘{{tag_name}}’" msgid "messages from authorities" -msgstr "mensajes de organismos" +msgstr "mensajes de instituciones públicas" msgid "messages from users" msgstr "mensajes de usuarios" @@ -3773,14 +3713,10 @@ msgid "new requests" msgstr "solicitudes nuevas " msgid "no later than" -msgstr "no más tarde de" +msgstr "a mas tardar el" 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 "" -"ya no existe. \n" -"Desde la página de la solicitud, intenta responder a un mensaje en concreto, en vez de\n" -" responder a la solicitud en general. Si necesitas hacerlo y tienes una dirección de\n" -" correo válida, por favor <a href=\"{{url}}\">mándanosla</a>." +msgstr "ya no existe. Si usted lo está tratando de hacer\\n Desde la página de la solicitud, intente responder a un mensaje en particular, en vez de responder\\n a la solicitud en general. Si necesita realizar el seguimiento en general y conoce\\n una dirección de correo electrónico válida, por favor <a href=\"{{url}}\">envíenosla</a>." msgid "normally" msgstr "normalmente" @@ -3789,10 +3725,10 @@ msgid "not requestable due to: {{reason}}" msgstr "no puede recibir solicitudes por: {{reason}}" msgid "please sign in as " -msgstr "por favor abra una sesión como " +msgstr "por favor inicie sesión como " msgid "requesting an internal review" -msgstr "pidiendo una revisión interna" +msgstr "solicitando una revisión interna" msgid "requests" msgstr "solicitudes" @@ -3801,24 +3737,22 @@ msgid "requests which are successful" msgstr "solicitudes exitosas" msgid "requests which are successful matching text '{{query}}'" -msgstr "texto que coincide con las solicitudes exitosas '{{query}}'" +msgstr "texto que coincida con las solicitudes exitosas '{{query}}'" msgid "response as needing administrator attention. Take a look, and reply to this\\nemail to let them know what you are going to do about it." -msgstr "" -"respuesta necesita intervención del administrador. Revísela, y conteste a este\n" -"correo para indicarles qué va a hacer al respecto." +msgstr "respuesta necesita intervención del administrador. Revísela, y conteste a este\\n correo para indicarles qué hacer al respecto." msgid "send a follow up message" msgstr "envíe un mensaje de seguimiento" msgid "set to <strong>blank</strong> (empty string) if can't find an address; these emails are <strong>public</strong> as anyone can view with a CAPTCHA" -msgstr "<strong>déjalo en blanco</strong> si no puedes encontrar una dirección válida; estas direcciones <strong>son públicas</strong>, cualquiera puede verlas rellenando un CAPTCHA" +msgstr "déjar <strong> en blanco</strong> (empty string) si no puede encontrar una dirección válida; estas direcciones <strong>son públicas</strong>, cualquiera puede verlas rellenando un CAPTCHA" msgid "show quoted sections" msgstr "mostrar partes citadas" msgid "sign in" -msgstr "abrir sesión" +msgstr "iniciar sesión" msgid "simple_date_format" msgstr "simple_date_format" @@ -3827,10 +3761,10 @@ msgid "successful requests" msgstr "solicitudes exitosas" msgid "that you made to" -msgstr "que hiciste a" +msgstr "que hizo para" msgid "the main FOI contact address for {{public_body}}" -msgstr "la dirección de contacto de {{public_body}}" +msgstr "la principal dirección para solicitudes de acceso a la información a {{public_body}}" #. This phrase completes the following sentences: #. Request an internal review from... @@ -3838,7 +3772,7 @@ msgstr "la dirección de contacto de {{public_body}}" #. Send a public reply to... #. Don't want to address your message to... ? msgid "the main FOI contact at {{public_body}}" -msgstr "el contacto en {{public_body}}" +msgstr "el contacto principal para solicitudes de acceso a la información en {{public_body}}" msgid "the requester" msgstr "el solicitante" @@ -3850,13 +3784,13 @@ msgid "to read" msgstr "lea" msgid "to send a follow up message." -msgstr "mandar un mensaje de seguimiento." +msgstr "enviar un mensaje de seguimiento." msgid "to {{public_body}}" -msgstr "a {{public_body}}" +msgstr "para {{public_body}}" msgid "type your search term here" -msgstr "" +msgstr "escriba términos de búsqueda aquí" msgid "unknown reason " msgstr "motivo desconocido " @@ -3890,13 +3824,13 @@ msgstr "{{count}} solicitudes de información encontradas" msgid "{{count}} Freedom of Information request to {{public_body_name}}" msgid_plural "{{count}} Freedom of Information requests to {{public_body_name}}" -msgstr[0] "{{count}} solicitud de información a {{public_body_name}}" -msgstr[1] "{{count}} solicitudes de información a {{public_body_name}}" +msgstr[0] "{{count}} solicitud de acceso a la información a {{public_body_name}}" +msgstr[1] "{{count}} solicitudes de acceso a la información a {{public_body_name}}" msgid "{{count}} person is following this authority" msgid_plural "{{count}} people are following this authority" -msgstr[0] "{{count}} persona esta siguiendo este organismo" -msgstr[1] "{{count}} personas estan siguiendo este organismo" +msgstr[0] "{{count}} persona esta siguiendo a esta institución pública" +msgstr[1] "{{count}} personas estan siguiendo a esta institución pública" msgid "{{count}} request" msgid_plural "{{count}} requests" @@ -3909,10 +3843,7 @@ msgstr[0] "{{count}} solicitud enviada." msgstr[1] "{{count}} solicitudes enviadas." msgid "{{existing_request_user}} already\\n created the same request on {{date}}. You can either view the <a href=\"{{existing_request}}\">existing request</a>,\\n or edit the details below to make a new but similar request." -msgstr "" -"{{existing_request_user}} ya\n" -" envió la misma solicitud el {{date}}. Puedes ver <a href=\"{{existing_request}}\">la solicitud existente</a>,\n" -" o editar la tuya a continuación para enviar una nueva similar a la anterior." +msgstr "{{existing_request_user}} ya\\n ha creado la misma solicitud el {{date}}. Puede ver<a href=\"{{existing_request}}\">la solicitud existente</a>,\\n o editar la su creada por usted a continuación para crear una solicitud similar a la anterior." msgid "{{foi_law}} requests to '{{public_body_name}}'" msgstr "{{foi_law}} le solicita a '{{public_body_name}}'" @@ -3921,10 +3852,10 @@ msgid "{{info_request_user_name}} only:" msgstr "Sólo {{info_request_user_name}}:" msgid "{{law_used_full}} request - {{title}}" -msgstr "solicitud {{law_used_full}} - {{title}}" +msgstr "solicitud de {{law_used_full}} - {{title}}" msgid "{{law_used}} requests at {{public_body}}" -msgstr "Solicitudes de información a {{public_body}}" +msgstr "{{law_used}} a {{public_body}}" msgid "{{length_of_time}} ago" msgstr "hace {{length_of_time}}" @@ -3933,22 +3864,22 @@ msgid "{{number_of_comments}} comments" msgstr "{{number_of_comments}} comentarios" msgid "{{public_body_link}} answered a request about" -msgstr "{{public_body_link}} respondió a una solicitud sobre" +msgstr "{{public_body_link}} respondió a una solicitud relacionada con" msgid "{{public_body_link}} was sent a request about" -msgstr "{{public_body_link}} recibió una solicitud sobre" +msgstr "{{public_body_link}} recibió una solicitud relacionada con" msgid "{{public_body_name}} only:" msgstr "Sólo {{public_body_name}}:" msgid "{{public_body}} has asked you to explain part of your {{law_used}} request." -msgstr "{{public_body}} ha pedido que explicas parte de tu pedido de {{law_used}}." +msgstr "{{public_body}} desea que le explique parte de su solicitud de {{law_used}}." 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 "{{reason}}, por favor abre una sesión, o crea una nueva cuenta." +msgstr "{{reason}}, por favor iniciar sesión, o crear una nueva cuenta." msgid "{{search_results}} matching '{{query}}'" msgstr "{{search_results}} encontrados por '{{query}}'" @@ -3957,10 +3888,10 @@ msgid "{{site_name}} blog and tweets" msgstr "{{site_name}} blog y tweets" msgid "{{site_name}} covers requests to {{number_of_authorities}} authorities, including:" -msgstr "{{site_name}} incluye solicitudes a {{number_of_authorities}} organismos públicos, incluyendo:" +msgstr "{{site_name}} incluya solicitudes a {{number_of_authorities}} instituciones públicas, 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}} envía nuevas solicitudes a <strong>{{request_email}}</strong> para esta institución pública." msgid "{{site_name}} users have made {{number_of_requests}} requests, including:" msgstr "Los usuarios de {{site_name}} han hecho {{number_of_requests}} solicitudes, incluyendo:" @@ -3969,33 +3900,31 @@ msgid "{{thing_changed}} was changed from <code>{{from_value}}</code> to <code>{ msgstr "{{thing_changed}} ha pasado de <code>{{from_value}}</code> a <code>{{to_value}}</code>" msgid "{{title}} - a Freedom of Information request to {{public_body}}" -msgstr "{{title}} - una solicitud de información a {{public_body}}" +msgstr "{{title}} - una solicitud de acceso a la información a {{public_body}}" msgid "{{title}} - a batch request" -msgstr "" +msgstr "{{title}} - una solicitud grupal" msgid "{{user_name}} (Account suspended)" -msgstr "{{user_name}} (Expulsado)" +msgstr "{{user_name}} (Cuenta suspendida)" msgid "{{user_name}} - Freedom of Information requests" -msgstr "{{user_name}} - Peticiones de acceso a la información" +msgstr "{{user_name}} - Solicitudes de acceso a la información" msgid "{{user_name}} - user profile" -msgstr "{{user_name}} - perfil de usuario" +msgstr "{{user_name}} - perfil del usuario" msgid "{{user_name}} added an annotation" msgstr "{{user_name}} añadió un comentario" msgid "{{user_name}} has annotated your {{law_used_short}} \\nrequest. Follow this link to see what they wrote." -msgstr "" -"{{user_name}} ha comentado tu solicitud {{law_used_short}}. \n" -"Sigue este enlace para ver lo que ha escrito." +msgstr "{{user_name}} ha comentado es su solicitud {{law_used_short}}.\\n Siga este enlace para ver lo que ha escrito." msgid "{{user_name}} has used {{site_name}} to send you the message below." -msgstr "{{user_name}} ha usado {{site_name}} para enviarle el siguiente mensaje." +msgstr "{{user_name}} ha utilizado {{site_name}} para enviarle el siguiente mensaje." msgid "{{user_name}} sent a follow up message to {{public_body}}" -msgstr "{{user_name}} envió un mensaje a {{public_body}}" +msgstr "{{user_name}} envió un mensaje de seguimiento a {{public_body}}" msgid "{{user_name}} sent a request to {{public_body}}" msgstr "{{user_name}} envió una solicitud a {{public_body}}" @@ -4010,7 +3939,7 @@ msgid "{{username}} left an annotation:" msgstr "{{username}} dejó un comentario:" 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}}) realizo esta solicitud {{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 de {{law_used_full}}" diff --git a/locale/hr/app.po b/locale/hr/app.po index f7dfb710b..e1f10486d 100644 --- a/locale/hr/app.po +++ b/locale/hr/app.po @@ -5,6 +5,7 @@ # Translators: # Bojan Opacak <bojan@rationalinternational.net>, 2013 # Bojan Opacak <bojan@rationalinternational.net>, 2013 +# Mateja Fabijanić <mateja.fabijanic@gmail.com>, 2015 # Mihovil Nakić <mnakicvo@hotmail.com>, 2015 # Mirna Basic <mirnabasic@outlook.com>, 2015 # vanja <vanja@gong.hr>, 2013 @@ -15,7 +16,7 @@ msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-12-02 13:14+0000\n" -"PO-Revision-Date: 2015-02-09 20:09+0000\n" +"PO-Revision-Date: 2015-02-15 12:44+0000\n" "Last-Translator: Žana Počuča <zana.fakin@gmail.com>\n" "Language-Team: Croatian (http://www.transifex.com/projects/p/alaveteli/language/hr/)\n" "Language: hr\n" @@ -26,11 +27,11 @@ msgstr "" msgid " This will appear on your {{site_name}} profile, to make it\\n easier for others to get involved with what you're doing." msgstr "" -" Ovo će se pojaviti na vašem {{site_name}} profilu, da bi\n" -" olakšali drugima da se uključe u to šta radite." +" Ovo će se pojaviti na Vašem {{site_name}} profilu, da biste\n" +" olakšali drugima da se uključe u to što radite." msgid " (<strong>no ranty</strong> politics, read our <a href=\"{{url}}\">moderation policy</a>)" -msgstr "" +msgstr " (<strong>bez političkih prepucavanja</strong>, pročitajte naša<a href=\"{{url}}\">pravila moderiranja</a>)" msgid " (<strong>patience</strong>, especially for large files, it may take a while!)" msgstr " (<strong>budite strpljivi</strong>, moglo bi potrajati, posebno za velike datoteke!)" @@ -39,7 +40,7 @@ msgid " (you)" msgstr " (Vi)" msgid " - view and make Freedom of Information requests" -msgstr " - pregledaj i napravi Zahtjeve o slobodnom pristupu informacijama " +msgstr " - pregledajte i napravite Zahtjeve o slobodnom pristupu informacijama " msgid " - wall" msgstr "- zid" @@ -53,11 +54,11 @@ msgstr "<<" msgid " <strong>Note:</strong>\\n We will send you an email. Follow the instructions in it to change\\n your password." msgstr "" " <strong>Napomena:</strong>\n" -" Poslat ćemo vam e-mail. Pratite instrukcije u njemu da biste promijenili\n" -" Vaš password." +" Poslat ćemo Vam elektroničku poštu. Pratite upute u njoj da biste promijenili\n" +" Vašu lozinku." msgid " <strong>Privacy note:</strong> Your email address will be given to" -msgstr " <strong>Napomena o privatnosti:</strong> Vaša e-mail adresa će biti proslijeđena" +msgstr " <strong>Napomena o privatnosti:</strong> Vaša e-mail adresa bit će proslijeđena" msgid " <strong>Summarise</strong> the content of any information returned. " msgstr " <strong>Sažimati</strong> sadržaj svake vraćene informacije. " @@ -69,7 +70,7 @@ msgid " >> " msgstr ">>" msgid " Advise on how to <strong>best clarify</strong> the request." -msgstr " Savjetuj kako<strong>najbolje objasniti</strong> zahjev." +msgstr " Savjetuj kako<strong>najbolje objasniti</strong> zahtjev." msgid " Ideas on what <strong>other documents to request</strong> which the authority may hold. " msgstr " Ideje za <strong>zahtjeve ostalih dokumenata</strong> koje ustanova može posjedovati." @@ -77,34 +78,31 @@ msgstr " Ideje za <strong>zahtjeve ostalih dokumenata</strong> koje ustanova mo msgid " If you know the address to use, then please <a href=\"{{url}}\">send it to us</a>.\\n You may be able to find the address on their website, or by phoning them up and asking." msgstr "" " Ako znate koju adresu treba koristiti, molimo Vas <a href=\"{{url}}\">pošaljite je nama</a>.\n" -" Moguće je da možete naći adresu na njihovoj web stranici, ili putem telefona." +" Adresu možete naći na njihovoj mrežnoj stranici ili telefonskim pozivom." msgid " Include relevant links, such as to a campaign page, your blog or a\\n twitter account. They will be made clickable. \\n e.g." -msgstr "" -" Uključite relevantne linkove, poput stranice kampanje, Vašeg bloga ili \n" -" twitter account-a. Moći će se kliknuti na njih. \n" -" npr." +msgstr " Uključite relevantne linkove, poput stranice kampanje, Vašeg bloga ili Twitter korisničkog računa. Moći će se kliknuti na njih, npr." msgid " Link to the information requested, if it is <strong>already available</strong> on the Internet. " -msgstr "Link na tražene informacije, ukoliko <strong>već postoji</strong> na internetu." +msgstr "Poveznica na tražene informacije, ukoliko <strong>već postoji</strong> na internetu." msgid " Offer better ways of <strong>wording the request</strong> to get the information. " -msgstr "Ponudi bolji način za <strong>sročiti zahtjev</strong> za informacijama." +msgstr "Ponudi bolji način za <strong> sastavljanje zahtjeva </strong> za informacijama." msgid " Say how you've <strong>used the information</strong>, with links if possible." -msgstr " Recite nam kako ste<strong>iskoristili informaciju</strong>, sa linkovima ako je moguće." +msgstr " Recite nam kako ste<strong>iskoristili informaciju</strong>, s poveznicama ako je moguće." msgid " Suggest <strong>where else</strong> the requester might find the information. " msgstr "Predložite <strong>druga mjesta</strong> na kojima se informacije mogu naći." msgid " What are you investigating using Freedom of Information? " -msgstr " Šta istražujete koristeći Zakon o slobodnom pristupu informacijama ? " +msgstr " Što istražujete koristeći Zakon o slobodnom pristupu informacijama ? " msgid " You are already being emailed updates about the request." -msgstr " Ažuriranja zahtjeva već su Vam poslana putem e-maila." +msgstr " Ažuriranja zahtjeva već su Vam poslana elektroničkom poštom." msgid " You will also be emailed updates about the request." -msgstr " Ažuriranja zahtjeva će Vam takođe biti poslana putem e-maila." +msgstr " Ažuriranja zahtjeva će Vam također biti poslana elektroničkom poštom." msgid " filtered by status: '{{status}}'" msgstr "filtrirano prema statusu: '{{status}}'" @@ -116,7 +114,7 @@ msgid "'Crime statistics by ward level for Wales'" msgstr "'Statistika kriminala za Wales prema razini zaštite'" msgid "'Pollution levels over time for the River Tyne'" -msgstr "'Nivo zagađenja kroz period vremena za rijeku Tyne'" +msgstr "'Nivo zagađenja kroz vremenski period za rijeku Tyne'" msgid "'{{link_to_authority}}', a public authority" msgstr "'{{link_to_authority}}', javna ustanova" @@ -168,13 +166,13 @@ msgid "<a href=\"{{browse_url}}\">Browse all</a> or <a href=\"{{add_url}}\">ask msgstr "<a href=\"{{browse_url}}\">Pretraži sve</a> ili <a href=\"{{add_url}}\"> zamolite nas da dodamo </a>." msgid "<a href=\"{{url}}\">Add an annotation</a> (to help the requester or others)" -msgstr "<a href=\"{{url}}\">Dodaj napomenu</a> (da bi se pomoglo podnosiocu zahtjeva ili drugima)" +msgstr "<a href=\"{{url}}\">Dodaj napomenu</a> (da bi se pomoglo podnositelju zahtjeva ili drugima)" msgid "<a href=\"{{url}}\">Sign in</a> to change password, subscriptions and more ({{user_name}} only)" -msgstr "<a href=\"{{url}}\">Prijavite se</a> da biste promijenili password, pretplatu ili drugo ({{user_name}} only)" +msgstr "<a href=\"{{url}}\">Prijavite se</a> da biste promijenili lozinku, pretplatu ili drugo ({{user_name}} only)" msgid "<p>All done! Thank you very much for your help.</p><p>There are <a href=\"{{helpus_url}}\">more things you can do</a> to help {{site_name}}.</p>" -msgstr "<p>Završeno! Hvala Vam na pomoći.</p><p>Postoji <a href=\"{{helpus_url}}\">više stvari koje možete uradite</a> da biste pomogli {{site_name}}.</p>" +msgstr "<p>Završeno! Hvala Vam na pomoći.</p><p>Postoji <a href=\"{{helpus_url}}\">više stvari koje možete učiniti </a> da biste pomogli {{site_name}}.</p>" msgid "<p>Thank you! Here are some ideas on what to do next:</p>\\n <ul>\\n <li>To send your request to another authority, first copy the text of your request below, then <a href=\"{{find_authority_url}}\">find the other authority</a>.</li>\\n <li>If you would like to contest the authority's claim that they do not hold the information, here is\\n <a href=\"{{complain_url}}\">how to complain</a>.\\n </li>\\n <li>We have <a href=\"{{other_means_url}}\">suggestions</a>\\n on other means to answer your question.\\n </li>\\n </ul>" msgstr "" @@ -185,26 +183,26 @@ msgstr "" "<a href=\"{{complain_url}}\">kako se žaliti</a>.\n" "</li>\n" "<li>Imamo <a href=\"{{other_means_url}}\">prijedloge</a>\n" -"o dugim načinima za odgovor na Vaše pitanje.\n" +"o drugim načinima za odgovor na Vaše pitanje.\n" "</li>\n" "</ul>" msgid "<p>Thank you! Hope you don't have to wait much longer.</p> <p>By law, you should have got a response promptly, and normally before the end of <strong>{{date_response_required_by}}</strong>.</p>" -msgstr "<p>Hvala! Nadamo se da nećete još dugo čekati.</p> <p>Po zakonu, trebali biste ubrzo dobiti odgovor, do <strong>{{date_response_required_by}}</strong>.</p>" +msgstr "<p>Hvala! Nadamo se da nećete još dugo čekati.</p> <p>Prema zakonu, trebali biste ubrzo dobiti odgovor, do <strong>{{date_response_required_by}}</strong>.</p>" msgid "<p>Thank you! Hopefully your wait isn't too long.</p> <p>By law, you should get a response promptly, and normally before the end of <strong>\\n{{date_response_required_by}}</strong>.</p>" msgstr "<p>Hvala! Nadamo se da nećete dugo čekati.</p> <p>Prema zakonu, odgovor biste trebali dobiti brzo, a u pravilu prije <strong>\\n{{date_response_required_by}}</strong>.</p>" msgid "<p>Thank you! Hopefully your wait isn't too long.</p><p>You should get a response within {{late_number_of_days}} days, or be told if it will take longer (<a href=\"{{review_url}}\">details</a>).</p>" -msgstr "<p>Hvala! Nadamo se da nećete čekati predugo.</p><p>Trebali biste dobiti odgovor za {{late_number_of_days}} dana, ili obaviješteni da će trajati duže. (<a href=\"{{review_url}}\">Više informacija</a>)</p>" +msgstr "<p>Hvala! Nadamo se da nećete čekati predugo.</p><p>Trebali biste dobiti odgovor za {{late_number_of_days}} dana, ili biti obaviješteni da će trajati duže. (<a href=\"{{review_url}}\">Više informacija</a>)</p>" msgid "<p>Thank you! Your request is long overdue, by more than {{very_late_number_of_days}} working days. Most requests should be answered within {{late_number_of_days}} working days. You might like to complain about this, see below.</p>" -msgstr "<p>Hvala! Vaš zahtjev je odavno istekao, prije {{very_late_number_of_days}} radnih dana. Većina zahjeva mora biti odgovorena unutar {{late_number_of_days}} radnih dana. Imate pravo na žalbu. Više informacija o žalbama, pogledajte ispod.</p>" +msgstr "<p>Hvala! Vaš je zahtjev odavno istekao, prije {{very_late_number_of_days}} radnih dana. Većina zahjeva mora biti odgovorena unutar {{late_number_of_days}} radnih dana. Imate pravo na žalbu. Više informacija o žalbama, pogledajte ispod.</p>" msgid "<p>Thanks for changing the text about you on your profile.</p>\\n <p><strong>Next...</strong> You can upload a profile photograph too.</p>" msgstr "" -"<p>Hvala na promijeni teksta o vama na profilu.</p>\n" -"<p><strong>Sljedeće...</strong> Možete učitati i sliku profila.</p>" +"<p>Hvala na promjeni teksta o Vama na profilu.</p>\n" +"<p><strong> Sljedeće... </strong> Možete učitati i sliku profila.</p>" msgid "<p>Thanks for updating your profile photo.</p>\\n <p><strong>Next...</strong> You can put some text about you and your research on your profile.</p>" msgstr "" @@ -214,13 +212,13 @@ msgstr "" msgid "<p>We recommend that you edit your request and remove the email address.\\n If you leave it, the email address will be sent to the authority, but will not be displayed on the site.</p>" msgstr "" "<p>Preporučujemo da preuredite Vaš zahtjev i da uklonite e-mail adresu.\n" -" Ako je ostavite, e-mail adresa će biti poslana ustanovi, ali neće biti vidljiva na web stranici.</p>" +" Ako je ostavite, e-mail adresa bit će poslana ustanovi, ali neće biti vidljiva na mrežnoj stranici.</p>" msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p>" msgstr "<p>Drago nam je da ste dobili informacije koje ste htjeli. Ako ćete pisati o tome ili koristiti informacije, molimo vratite se i ispod napišite bilješku o onome što ste napravili.</p>" msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p><p>If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p>" -msgstr "<p>Drago nam je da ste dobili sve željene informacije. Ako ih budete koristili ili pisali o njima, molimo da se vratite i dodate napomenu ispod opisujući šta ste uradili. </p><p>Ako mislite da je {{site_name}} bio koristan, <a href=\"{{donation_url}}\">donirajte</a> nevladinoj organizaciji koja ga vodi.</p>" +msgstr "<p>Drago nam je da ste dobili sve željene informacije. Ako ćete ih koristiti ili pisati o njima, molimo da se vratite i dodate napomenu ispod opisujući što ste uradili. </p><p>Ako mislite da je {{site_name}} bio koristan, <a href=\"{{donation_url}}\">donirajte</a> nevladinoj organizaciji koja ga vodi.</p>" msgid "<p>We're glad you got some of the information that you wanted. If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>" msgstr "<p>Drago nam je da ste dobili dio željenih informacija. Ako mislite da je {{site_name}} bio koristan, <a href=\"{{donation_url}}\">donirajte</a> nevladinoj organizaciji koja ga vodi.</p>" @@ -229,73 +227,78 @@ msgid "<p>We're glad you got some of the information that you wanted.</p><p>If y msgstr "<p>Drago nam je da ste dobili dio informacije koju ste htjeli.</p><p>Evo što možete učiniti ako želite pokušati dobiti ostatak informacije.</p>" msgid "<p>You do not need to include your email in the request in order to get a reply (<a href=\"{{url}}\">details</a>).</p>" -msgstr "<p>Nije potrebno da uključite Vašu e-mail adresu u zahtjev da biste dobili odgovor (<a href=\"{{url}}\">Više informacija</a>).</p>" +msgstr "<p>Nije potrebno uključiti Vašu e-mail adresu u zahtjev da biste dobili odgovor (<a href=\"{{url}}\">Više informacija</a>).</p>" msgid "<p>You do not need to include your email in the request in order to get a reply, as we will ask for it on the next screen (<a href=\"{{url}}\">details</a>).</p>" -msgstr "<p>Nije potrebno da uključite Vašu e-mail adresu u zahtjev da biste dobili odgovor, pitati ćemo vas u vezi toga u slijedećem koraku (<a href=\"{{url}}\">Više informacija</a>).</p>" +msgstr "<p>Nije potrebno da uključite Vašu e-mail adresu u zahtjev da biste dobili odgovor, pitat ćemo vas u vezi s tim u sljedećem koraku (<a href=\"{{url}}\">Više informacija</a>).</p>" msgid "<p>Your request contains a <strong>postcode</strong>. Unless it directly relates to the subject of your request, please remove any address as it will <strong>appear publicly on the Internet</strong>.</p>" -msgstr "<p>Vaš zahtjev sadrži <strong>poštanski broj</strong>. Ako poštanski broj nije direktno vezan uz temu vašeg zahtjeva, molimo da ga izbrišete, jer će <strong>biti javno objavljen</strong>.</p>" +msgstr "<p>Vaš zahtjev sadrži <strong>poštanski broj</strong>. Ako poštanski broj nije direktno povezan s temom vašeg zahtjeva, molimo da ga izbrišete, jer će <strong>biti javno objavljen</strong>.</p>" msgid "<p>Your {{law_used_full}} request has been <strong>sent on its way</strong>!</p>\\n <p><strong>We will email you</strong> when there is a response, or after {{late_number_of_days}} working days if the authority still hasn't\\n replied by then.</p>\\n <p>If you write about this request (for example in a forum or a blog) please link to this page, and add an\\n annotation below telling people about your writing.</p>" -msgstr "<p>Vaš {{law_used_full}} zahtjev <strong>je poslan</strong>!</p>\\n <p><strong>Poslat ćemo Vam email</strong> kada dobijemo odgovor, ili nakon {{late_number_of_days}} radnih dana ako vlast još uvijek ne odgovori\\n do tada.</p>\\n <p>Ako pišete o ovom zahtjevu (primjerice na forumu ili blogu) molimo da stavite poveznicu do ove stranice, te dodajte\\n bilješku pri dnu o tome što pišete.</p>" +msgstr "<p>Vaš {{law_used_full}} zahtjev <strong>je poslan</strong>!</p>\\n <p><strong>Poslat ćemo Vam elektroničku poštu</strong> kada dobijemo odgovor, ili nakon {{late_number_of_days}} radnih dana ako vlast još uvijek ne odgovori do tada.</p>\\n <p>Ako pišete o ovom zahtjevu (primjerice na forumu ili blogu) molimo da stavite poveznicu do ove stranice, te dodajte bilješku pri dnu o tome što pišete.</p>" msgid "<p>Your {{law_used_full}} requests will be <strong>sent</strong> shortly!</p>\\n <p><strong>We will email you</strong> when they have been sent.\\n We will also email you when there is a response to any of them, or after {{late_number_of_days}} working days if the authorities still haven't\\n replied by then.</p>\\n <p>If you write about these requests (for example in a forum or a blog) please link to this page.</p>" msgstr "" "<p>Vaši zahtjevi prema {{law_used_full}} bit će <strong>poslani</strong> uskoro!</p>\n" -"<p><strong>Poslat ćrmo am e-mail</strong> kada budu poslani\n" -"Također, poslat ćemo Vam e-mail ako bude odgovora na njih ili nakon {{late_number_of_days}} radnih dana ako ustanova \n" +"<p><strong>Poslat ćemo Vam elektroničku poštu</strong> kada budu poslani.\n" +"Također, poslat ćemo Vam elektroničku poštu ako bude odgovora na njih ili nakon {{late_number_of_days}} radnih dana ako ustanova \n" "nije odgovorila do tada.</p>\n" -"<p>Ako pišete o ovim zahtjevima (npr. na forumu ili blogu), molimo Vas da stavite link do ove stranice.</p>" +"<p>Ako pišete o ovim zahtjevima (npr. na forumu ili blogu), molimo Vas da stavite poveznicu do ove stranice.</p>" msgid "<p>{{site_name}} is currently in maintenance. You can only view existing requests. You cannot make new ones, add followups or annotations, or otherwise change the database.</p> <p>{{read_only}}</p>" -msgstr "<p>{{site_name}} je trenutno na održavanju. Možete samo pregledati postojeće zahtjeve. Ne možete odnositi nove, dodavati prateće poruke ili napomene, ili u suprotnom promijenite bazu podataka.</p> <p>{{read_only}}</p>" +msgstr "<p>{{site_name}} je trenutno na održavanju. Možete samo pregledati postojeće zahtjeve. Ne možete donositi nove, dodavati prateće poruke ili napomene, ili u suprotnom promijenite bazu podataka.</p> <p>{{read_only}}</p>" msgid "<small>If you use web-based email or have \"junk mail\" filters, also check your\\nbulk/spam mail folders. Sometimes, our messages are marked that way.</small>\\n</p>" msgstr "" -"<small>Ako koristite neke od web mail servisa ili imate filtere za \"junk mail\", provjerite u Vašim bulk/spam folderima. Ponekad su naše poruke označene tako</small>\n" +"<small>Ako koristite neke od mrežnih servisa e-pošte ili imate filtere za \"junk mail\", provjerite u Vašim \"bulk/spam\" folderima. Ponekad su naše poruke označene tako</small>\n" "</p>" msgid "<strong> Can I request information about myself?</strong>\\n\t\t\t<a href=\"{{url}}\">No! (Click here for details)</a>" msgstr "" -"<strong> Da li mogu zahtijevati informacije o sebi?</strong>\n" +"<strong> Mogu li zahtijevati informacije o sebi?</strong>\n" "<span class=\"whitespace other\" title=\"Tab\">»</span><span class=\"whitespace other\" title=\"Tab\">»</span><span class=\"whitespace other\" title=\"Tab\">»</span><a href=\"{{url}}\">Ne! (Kliknite za detalje)</a>" msgid "<strong><code>commented_by:tony_bowden</code></strong> to search annotations made by Tony Bowden, typing the name as in the URL." -msgstr "<strong><code>komentar_od:tony_bowden</code></strong> da pretražujete komentare Tony Bowden-a, ime unesite kao u URL-u." +msgstr "<strong><code>komentar_od:tony_bowden</code></strong> da pretražujete komentare Tonyja Bowdena, ime unesite kao u URL-u." msgid "<strong><code>filetype:pdf</code></strong> to find all responses with PDF attachments. Or try these: <code>{{list_of_file_extensions}}</code>" msgstr "<strong><code>filetype:pdf</code></strong> da nađete sve odgovore sa PDF prilozima. Ili probajte ove: <code>{{list_of_file_extensions}}</code>" msgid "<strong><code>request:</code></strong> to restrict to a specific request, typing the title as in the URL." -msgstr "<strong><code>zahtjev:</code></strong> da biste se ograničili na neki određeni zahtjev, ukucati naslov kao u URL-u" +msgstr "<strong><code>zahtjev:</code></strong> da biste se ograničili na neki određeni zahtjev, ukucajte naslov kao u URL-u" msgid "<strong><code>requested_by:julian_todd</code></strong> to search requests made by Julian Todd, typing the name as in the URL." -msgstr "<strong><code>podnesen_od strane:julian_todd</code></strong> da biste pretražili zahtjeve koje je podnio Julian Todd, ukucati ime kao u URL-u." +msgstr "<strong><code>podnesen_od strane:julian_todd</code></strong> da biste pretražili zahtjeve koje je podnio Julian Todd, ukucajte ime kao u URL-u." msgid "<strong><code>requested_from:home_office</code></strong> to search requests from the Home Office, typing the name as in the URL." -msgstr "<strong><code>poslan zahtjev_od:kuće_ureda</code></strong> za traženjem zahtjeva od Glavnog Ureda, tipkajući ime kao u URL-u." +msgstr "<strong><code>poslan zahtjev_od:kuće_ureda</code></strong> za traženjem zahtjeva od glavnog ureda, otipkajte ime kao u URL-u." msgid "<strong><code>status:</code></strong> to select based on the status or historical status of the request, see the <a href=\"{{statuses_url}}\">table of statuses</a> below." -msgstr "<strong><code>status:</code></strong> da biste birali zasnovano na statusu ili historiji statusa zahtjeva, pogledajte <a href=\"{{statuses_url}}\">tabelu statusa</a> below." +msgstr "<strong><code>status:</code></strong> da biste birali prema statusu ili povijesti statusa zahtjeva, pogledajte <a href=\"{{statuses_url}}\">tabelu statusa</a> below." msgid "<strong><code>tag:charity</code></strong> to find all public authorities or requests with a given tag. You can include multiple tags, \\n and tag values, e.g. <code>tag:openlylocal AND tag:financial_transaction:335633</code>. Note that by default any of the tags\\n can be present, you have to put <code>AND</code> explicitly if you only want results them all present." -msgstr "<strong><code>tagiraj:humanitarni rad</code></strong> kako bi našao sve javne vlasti ili zahtjeve sa navedenim tagom. Možete staviti više tagova, \\n te tagirati vrijednosti, npr.. <code>tag:otvorenolokalno I tag:financijska_transakcija:335633</code>. Obratite pozornost da po defaultu bilo koji od tagova\\n mogu biti prisutni, trebate staviti <code>I</code> izričito ako želite da svi rezultati budu prisutni. " +msgstr "<strong><code>označite:humanitarni rad</code></strong> kako biste našli sve javne vlasti ili zahtjeve s navedenom oznakom. Možete staviti više oznaka, \\n te označiti vrijednosti, npr. <code>tag:otvorenolokalno i tag:financijska_transakcija:335633</code>. Obratite pozornost da bilo koja oznaka \\n može biti prisutna, trebate staviti <code>i</code> izričito ako želite da svi rezultati budu prisutni. " msgid "<strong><code>variety:</code></strong> to select type of thing to search for, see the <a href=\"{{varieties_url}}\">table of varieties</a> below." -msgstr "<strong><code>izbor:</code></strong> kakobi odabrali tip stvari koje tražite, pogledajte <a href=\"{{varieties_url}}\">tablicu s izborima</a> niže." +msgstr "<strong><code>izbor:</code></strong> kako biste odabrali tip stvari koje tražite, pogledajte <a href=\"{{varieties_url}}\">tablicu s izborima</a> niže." msgid "<strong>Advice</strong> on how to get a response that will satisfy the requester. </li>" -msgstr "<strong>Savjet</strong> o tome kako dobiti odgovor koji će zadovoljiti podnosioca zahtjeva. </li>" +msgstr "<strong>Savjet</strong> o tome kako dobiti odgovor koji će zadovoljiti podnositelja zahtjeva. </li>" msgid "<strong>All the information</strong> has been sent" -msgstr "<strong>Sve informacije</strong> su poslane" +msgstr "<strong>Sve su informacije</strong> poslane" msgid "<strong>Anything else</strong>, such as clarifying, prompting, thanking" msgstr "<strong>Nešto drugo</strong>, poput objašnjenja, napomena, zahvalnica" msgid "<strong>Caveat emptor!</strong> To use this data in an honourable way, you will need \\na good internal knowledge of user behaviour on {{site_name}}. How, \\nwhy and by whom requests are categorised is not straightforward, and there will\\nbe user error and ambiguity. You will also need to understand FOI law, and the\\nway authorities use it. Plus you'll need to be an elite statistician. Please\\n<a href=\"{{contact_path}}\">contact us</a> with questions." msgstr "" +"<strong>Caveat emptor!</strong> Da biste koristili ove podatke na častan način, trebat ćete\n" +"dobro interno znanje korisničkog ponašanja na {{site_name}}. Kako, \n" +"zašto i tko kategorizira zahtjeve nije jednostavno pa će biti \n" +"korisničkih pogrešaka i nejasnoća. Također, morate razumjeti Zakon o pravu na pristup informacijama i način na koji ga nadležna tijela koriste. Osim toga, morate biti vrhunski statističar. Molimo\n" +"<a href=\"{{contact_path}}\">kontaktirajte nas</a> za sva pitanja." msgid "<strong>Clarification</strong> has been requested" msgstr "<strong>Objašnjenje</strong> je zatraženo" @@ -314,21 +317,21 @@ msgstr "<strong>Napomena:</strong> Šaljete poruku samom sebi, vjerojatno\\n da msgid "<strong>Note:</strong>\\n We will send an email to your new email address. Follow the\\n instructions in it to confirm changing your email." msgstr "" "<strong>Napomena:</strong>\n" -" Poslati ćemo e-mail na Vašu novu adresu. Pratite\n" -" upute u njemu da bi potvrdili promjenu vašeg e-maila." +" Poslati ćemo elektroničku poštu na Vašu novu adresu. Pratite\n" +" upute u njoj da biste potvrdili promjenu Vašeg e-maila." msgid "<strong>Privacy note:</strong> If you want to request private information about\\n yourself then <a href=\"{{url}}\">click here</a>." msgstr "" -"<strong>Napomena o privatnosti:</strong> Ako želite da zahtijevate privatne informacije o\n" -" Vama onda <a href=\"{{url}}\">kliknite ovdje</a>." +"<strong>Napomena o privatnosti:</strong> Ako želite privatne informacije o\n" +" sebi onda <a href=\"{{url}}\">kliknite ovdje</a>." msgid "<strong>Privacy note:</strong> Your photo will be shown in public on the Internet,\\n wherever you do something on {{site_name}}." -msgstr "<strong>Napomena o privatnosti:</strong> Vaša fotografija će biti javno pokazana na Internetu,\\n gdjegod nešto napravili na {{site_name}}." +msgstr "<strong>Napomena o privatnosti:</strong> Vaša će fotografija biti javno prikazana na internetu,\\n gdje god nešto napravili na {{site_name}}." msgid "<strong>Privacy warning:</strong> Your message, and any response\\n to it, will be displayed publicly on this website." msgstr "" "<strong>Upozorenje o privatnosti:</strong> Vaša poruka i bilo koji odgovor\n" -" na nju, će biti javno prikazan na ovoj stranici." +" na nju, bit će javno prikazani na ovoj stranici." msgid "<strong>Some of the information</strong> has been sent " msgstr "<strong>Dio informacija</strong> je poslan " @@ -343,7 +346,7 @@ 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}}\">Prateći zahtjev</a> to <em>{{request_title}}</em> poslan je {{public_body_name}} od strane {{info_request_user}} dana {{date}}." +msgstr "<a href=\"{{request_url}}\">Prateći zahtjev</a> prema <em>{{request_title}}</em> poslan je {{public_body_name}} od strane {{info_request_user}} dana {{date}}." msgid "A <a href=\"{{request_url}}\">response</a> to <em>{{request_title}}</em> was sent by {{public_body_name}} to {{info_request_user}} on {{date}}. The request status is: {{request_status}}" msgstr "<a href=\"{{request_url}}\">Odgovor</a> je <em>{{request_title}}</em> poslan od strane {{public_body_name}} k {{info_request_user}} dana {{date}}. Status zahtjeva je: {{request_status}}" @@ -355,7 +358,7 @@ msgid "A Freedom of Information request" msgstr "Zahtjev za pristup informacijama" msgid "A full history of my FOI request and all correspondence is available on the Internet at this address: {{url}}" -msgstr "Potpuna povijest mojih FOI zahtjeva i sva korespondencija dostupna je na ovoj Internet adresi: {{url}}" +msgstr "Potpuna povijest mojih FOI zahtjeva i sva korespondencija dostupna je na ovoj internetskoj adresi: {{url}}" msgid "A new request, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, was sent to {{public_body_name}} by {{info_request_user}} on {{date}}." msgstr "Novi zahtjev, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, poslan je {{public_body_name}} od strane {{info_request_user}} dana {{date}}." @@ -379,16 +382,16 @@ msgid "About you:" msgstr "O Vama:" msgid "Act on what you've learnt" -msgstr "Radite na osnovu onoga što ste naučili" +msgstr "Djelujte prema onome što ste naučili" msgid "Acts as xapian/acts as xapian job" -msgstr "" +msgstr "Acts as xapian/acts as xapian job" msgid "ActsAsXapian::ActsAsXapianJob|Action" -msgstr "" +msgstr "ActsAsXapian::ActsAsXapianJob|Action" msgid "ActsAsXapian::ActsAsXapianJob|Model" -msgstr "" +msgstr "ActsAsXapian::ActsAsXapianJob|Model" msgid "Add an annotation" msgstr "Dodati napomenu" @@ -399,13 +402,13 @@ msgstr "" " <strong>sažetak odgovora</strong>." msgid "Add authority - {{public_body_name}}" -msgstr "Dodaj ustanovu - {{public_body_name}}" +msgstr "Dodajte ustanovu - {{public_body_name}}" msgid "Add the authority:" -msgstr "Dodaj ustanovu:" +msgstr "Dodajte ustanovu:" msgid "Added on {{date}}" -msgstr "Dodato na datum {{date}}" +msgstr "Dodano na datum {{date}}" msgid "Admin level is not included in list" msgstr "Nivo administratora nije uključen u listu" @@ -420,15 +423,15 @@ msgid "Advanced search tips" msgstr "Savjeti za naprednu pretragu" msgid "Advise on whether the <strong>refusal is legal</strong>, and how to complain about it if not." -msgstr "Savjet o tome da li je <strong>odbijanje legalno</strong>, i o tome kako se žaliti ako nije." +msgstr "Savjet o tome je li<strong>odbijanje legalno</strong>, i o tome kako se žaliti ako nije." msgid "Air, water, soil, land, flora and fauna (including how these effect\\n human beings)" msgstr "" -"Zrak, voda, tlo, kopno, flora i fauna (uključujući kako ovi utiču na\n" +"Zrak, voda, tlo, kopno, flora i fauna (uključujući kako utječu na\n" " ljudska bića)" msgid "All of the information requested has been received" -msgstr "Sve tražene informacije su primljene" +msgstr "Sve su tražene informacije primljene" msgid "All the options below can use <strong>status</strong> or <strong>latest_status</strong> before the colon. For example, <strong>status:not_held</strong> will match requests which have <em>ever</em> been marked as not held; <strong>latest_status:not_held</strong> will match only requests that are <em>currently</em> marked as not held." msgstr "" @@ -440,15 +443,15 @@ msgid "Also called {{other_name}}." msgstr "Drugim imenom {{other_name}}." msgid "Also send me alerts by email" -msgstr "Obavijesti mi šaljite i putem e-maila" +msgstr "Obavijesti mi šaljite i elektroničkom poštom" msgid "Alter your subscription" -msgstr "Promjenite Vašu pretplatu" +msgstr "Promijenite Vašu pretplatu" msgid "Although all responses are automatically published, we depend on\\nyou, the original requester, to evaluate them." msgstr "" "Iako su svi odgovori automatski objavljeni, računamo na\n" -"vas, izvornog podnosioca zahtjeva, da ih ocijenite." +"Vas, izvornog podnositelja zahtjeva, da ih ocijenite." msgid "An <a href=\"{{request_url}}\">annotation</a> to <em>{{request_title}}</em> was made by {{event_comment_user}} on {{date}}" msgstr "<a href=\"{{request_url}}\">Bilješku</a> na <em>{{request_title}}</em> napisao/la je {{event_comment_user}} dana {{date}}" @@ -457,30 +460,30 @@ msgid "An <strong>error message</strong> has been received" msgstr "<strong>poruka o pogrešci</strong> je primljena" msgid "An Environmental Information Regulations request" -msgstr "Zahtjev za Pravilima o Informacijama o Okolišu" +msgstr "Zahtjev za informacijom o okolišu" msgid "An anonymous user" msgstr "Anonimni korisnik" msgid "Annotation added to request" -msgstr "Napomena dodata na zahtjev" +msgstr "Napomena dodana na zahtjev" msgid "Annotations" msgstr "Napomene" msgid "Annotations are so anyone, including you, can help the requester with their request. For example:" -msgstr "Napomene služe da bilo ko, uključujući Vas, može pomoći podnosioca zahtjeva sa njegovim zahtjevom. Na primjer:" +msgstr "Napomene služe da bilo tko, uključujući Vas, može pomoći podnositelju zahtjeva s njegovim zahtjevom. Na primjer:" msgid "Annotations will be posted publicly here, and are\\n <strong>not</strong> sent to {{public_body_name}}." msgstr "" -"Napomene će biti postane javno ovdje, i \n" -" <strong>naće</strong> biti poslane za {{public_body_name}}." +"Napomene će biti objavljene javno ovdje, i \n" +" <strong>neće</strong> biti poslane {{public_body_name}}." msgid "Anonymous user" msgstr "Anonimni korisnik" msgid "Anyone:" -msgstr "Bilo ko:" +msgstr "Bilo tko:" msgid "Applies to" msgstr "Primjenjuje se na" @@ -489,7 +492,7 @@ msgid "Are we missing a public authority?" msgstr "Nedostaje li nam neka javna ustanova?" msgid "Are you the owner of any commercial copyright on this page?" -msgstr "Jeste li vlasnik bilo kakvog autorskog prava na ovoj stranici?" +msgstr "Jeste li vlasnik nekog autorskog prava na ovoj stranici?" msgid "Ask for <strong>specific</strong> documents or information, this site is not suitable for general enquiries." msgstr "Tražite <strong>konkretne</strong> dokumente ili informacije, ova stranica nije pogodna za opće pretrage." @@ -505,7 +508,7 @@ msgstr "Zatražite da ažuriramo e-mail adresu za {{public_body_name}}" msgid "At the bottom of this page, write a reply to them trying to persuade them to scan it in\\n (<a href=\"{{url}}\">more details</a>)." msgstr "" -"Na dnu ove stranice, napišite im odgovor pokušavajući da ih ubjedite da ga pregledaju\n" +"Na dnu ove stranice, napišite im odgovor pokušavajući ih uvjeriti da ga pregledaju\n" " (<a href=\"{{url}}\">Više informacija</a>)." msgid "Attachment (optional):" @@ -515,7 +518,7 @@ msgid "Attachment:" msgstr "Prilog" msgid "Authority email:" -msgstr "E-mail ustanove:" +msgstr "Elektronička pošta ustanove:" msgid "Authority:" msgstr "Ustanova:" @@ -524,7 +527,7 @@ msgid "Awaiting classification." msgstr "Čeka klasifikaciju." msgid "Awaiting internal review." -msgstr "Čeka urgenciju" +msgstr "Čeka interni pregled." msgid "Awaiting response." msgstr "Čeka odgovor." @@ -545,7 +548,7 @@ msgid "Browse all authorities..." msgstr "Pretražite sve ustanove" msgid "Browse and search requests" -msgstr "Pregledaj i pretraži zahtjeve" +msgstr "Pregledajte i pretražite zahtjeve" msgid "Browse requests" msgstr "Vidjeti zahtjeve" @@ -563,13 +566,13 @@ msgid "Can't find the one you want?" msgstr "Ne možete naći onaj koji želite?" msgid "Cancel a {{site_name}} alert" -msgstr "Poništi {{site_name}} upozorenje" +msgstr "Poništite {{site_name}} upozorenje" msgid "Cancel some {{site_name}} alerts" -msgstr "Poništi neka {{site_name}} upozorenja" +msgstr "Poništite neka {{site_name}} upozorenja" msgid "Cancel, return to your profile page" -msgstr "Odustani, vrati se na stranicu svojeg profila" +msgstr "Odustanite, vratite se na stranicu svojeg profila" msgid "Censor rule" msgstr "Pravilo cenzure" @@ -590,37 +593,37 @@ msgid "CensorRule|Text" msgstr "Pravilo Cenzure|Tekst" msgid "Change email on {{site_name}}" -msgstr "Promijeniti e-mail na {{site_name}}" +msgstr "Promijenite elektroničku poštu na {{site_name}}" msgid "Change password on {{site_name}}" -msgstr "Promijeniti password na {{site_name}}" +msgstr "Promijeniti lozinku na {{site_name}}" msgid "Change profile photo" -msgstr "Promijeniti sliku na profilu" +msgstr "Promijenite sliku na profilu" msgid "Change the text about you on your profile at {{site_name}}" msgstr "Promijenite tekst o Vama na Vašem profilu na {{site_name}}" msgid "Change your email" -msgstr "Promijeniti Vaš e-mail" +msgstr "Promijenite Vaš e-mail" msgid "Change your email address used on {{site_name}}" msgstr "Promijenite Vašu e-mail adresu korištenu na {{site_name}}" msgid "Change your password" -msgstr "Promijeniti Vaš password" +msgstr "Promijenite Vašu lozinku" msgid "Change your password on {{site_name}}" -msgstr "Promijeniti password na {{site_name}}" +msgstr "Promijenite lozinku na {{site_name}}" msgid "Check for mistakes if you typed or copied the address." -msgstr "Provjerite ima li grešaka ako ste ukucali ili kopirali adresu." +msgstr "Provjerite ima li grešaka ako ste utipkali ili kopirali adresu." msgid "Check you haven't included any <strong>personal information</strong>." -msgstr "Provjerite da niste uključili nikakve <strong>lične podatke</strong>." +msgstr "Provjerite da niste uključili nikakve <strong>osobne podatke</strong>." msgid "Choose a reason" -msgstr "Odaberi razlog" +msgstr "Odaberite razlog" msgid "Choose your profile photo" msgstr "Odaberite sliku na Vašem profilu" @@ -642,20 +645,20 @@ msgstr "Obriši sliku" msgid "Click on the link below to send a message to {{public_body_name}} telling them to reply to your request. You might like to ask for an internal\\nreview, asking them to find out why response to the request has been so slow." msgstr "" -"Kliknite na link ispod da biste poslali poruku za {{public_body_name}} u kojoj ih napomenite da odgovore. Možda želite tražiti internal\n" -"review, tražeći da saznaju zašto odgovor na zahtjev kasni." +"Kliknite na poveznicu ispod da biste poslali poruku {{public_body_name}} u kojoj im napomenite da odgovore na Vaš zahtjev. Možda želite tražiti interni\n" +"pregled, tražeći da saznaju zašto odgovor na zahtjev kasni." msgid "Click on the link below to send a message to {{public_body}} reminding them to reply to your request." -msgstr "Kliknite na link ispod da biste poslali poruku {{public_body}} koja će ih podsjetiti da odgovore na Vaš zahtjev." +msgstr "Kliknite na poveznicu ispod da biste poslali poruku {{public_body}} koja će ih podsjetiti da odgovore na Vaš zahtjev." msgid "Close" -msgstr "Zatvori" +msgstr "Zatvorite" msgid "Close the request and respond:" -msgstr "Zatvori zahtjev i odgovori:" +msgstr "Zatvorite zahtjev i odgovorite:" msgid "Comment" -msgstr "Komentiraj" +msgstr "Komentirajte" msgid "Comment|Body" msgstr "Komentar|Tijelo" @@ -703,7 +706,7 @@ msgid "Confirm your new email address on {{site_name}}" msgstr "Potvrdite Vašu novu e-mail adresu na {{site_name}}" msgid "Considered by administrators as not an FOI request and hidden from site." -msgstr "Označeno od administratora da nije zahtjev za pristup informacijama i skiveno sa stranice" +msgstr "Označeno od administratora da nije zahtjev za pristup informacijama i skriveno sa stranice" msgid "Considered by administrators as vexatious and hidden from site." msgstr "Označeno od administratora kao uznemirujuće i skriveno sa stranice" @@ -721,13 +724,13 @@ msgid "Contains personal information" msgstr "Sadrži osobne podatke" msgid "Could not identify the request from the email address" -msgstr "Nismo mogli prepoznati zahtjev sa e-mail adrese" +msgstr "Nismo mogli prepoznati zahtjev s e-mail adrese" msgid "Couldn't understand the image file that you uploaded. PNG, JPEG, GIF and many other common image file formats are supported." -msgstr "Pogrešan format datoteke. Molimo Vas uploadirajte: PNG, JPEG, GIF, ili neke druge podržive formate." +msgstr "Pogrešan format datoteke. Molimo Vas unesite: PNG, JPEG, GIF, ili neke druge podržive formate." msgid "Created by {{info_request_user}} on {{date}}." -msgstr "Izradio {{info_request_user}} dana {{date}}." +msgstr "Izradio/la {{info_request_user}} dana {{date}}." msgid "Crop your profile photo" msgstr "Smanjite sliku na Vašem profilu" @@ -736,7 +739,7 @@ msgid "Cultural sites and built structures (as they may be affected by the\\n msgstr "Kulturne znamenitosti i izgrađene strukture (jer mogu biti pogođene\\n čimbenicima okoliša koji su navedeni gore)" msgid "Currently <strong>waiting for a response</strong> from {{public_body_link}}, they must respond promptly and" -msgstr "Trenutno <strong>čeka odgovor</strong> od {{public_body_link}}, moraju odgovoriti brzo i" +msgstr "Trenutno <strong>čeka odgovor</strong> {{public_body_link}}, moraju odgovoriti brzo i" msgid "Date:" msgstr "Datum:" @@ -760,7 +763,7 @@ msgid "Defunct." msgstr "Defunkc." msgid "Delayed response to your FOI request - " -msgstr "Odgođen odgovor na Vaš Zahtjev o slobodnom pristupu informacijama - " +msgstr "Odgođen odgovor na Vaš Zahtjev za pristup informacijama - " msgid "Delayed." msgstr "Odgođen" @@ -775,7 +778,7 @@ msgid "Details of request '" msgstr "Detalji zahtjeva '" msgid "Did you mean: {{correction}}" -msgstr "Da li ste mislili: {{correction}}" +msgstr "Jeste li mislili: {{correction}}" msgid "Disclaimer: This message and any reply that you make will be published on the internet. Our privacy and copyright policies:" msgstr "Izjava o odricanju odgovornosti: Ova poruka i svaki odgovor bit će objavljen na internetu. Naša politika zaštite privatnosti i autorskih prava:" @@ -802,16 +805,16 @@ msgid "Done >>" msgstr "Napravljeno >>" msgid "Download a zip file of all correspondence" -msgstr "Preuzmite svu korespondenciju u zip fajlu" +msgstr "Preuzmite svu korespondenciju u zip datoteci" msgid "Download original attachment" -msgstr "Preuzeti originalni prilog" +msgstr "Preuzmite originalni prilog" msgid "EIR" msgstr "EIR" msgid "Edit" -msgstr "Uredi" +msgstr "Uredite" msgid "Edit and add <strong>more details</strong> to the message above,\\n explaining why you are dissatisfied with their response." msgstr "" @@ -822,16 +825,16 @@ msgid "Edit text about you" msgstr "Uredite tekst o Vama" msgid "Edit this request" -msgstr "Uredi ovaj zahtjev" +msgstr "Uredite ovaj zahtjev" msgid "Either the email or password was not recognised, please try again." -msgstr "E-mail ili password nisu prepoznati, molimo pokušajte ponovo." +msgstr "E-mail ili lozinka nisu prepoznati, molimo pokušajte ponovo." msgid "Either the email or password was not recognised, please try again. Or create a new account using the form on the right." -msgstr "E-mail ili password nisu prepoznati, molimo pokušajte ponovo. Ili kreirajte novi račun koristeći formular desno." +msgstr "E-mail ili lozinka nisu prepoznati, molimo pokušajte ponovo. Ili kreirajte novi račun koristeći formular desno." msgid "Email doesn't look like a valid address" -msgstr "E-mail ne izgleda kao validna adresa" +msgstr "E-mail ne izgleda kao ispravna adresa" msgid "Email me future updates to this request" msgstr "Buduća ažuriranja šaljite na moj e-mail" @@ -840,7 +843,7 @@ msgid "Email:" msgstr "E-mail:" msgid "Enter words that you want to find separated by spaces, e.g. <strong>climbing lane</strong>" -msgstr "Sa razmacima unesite riječi koje želite naći, npr. <strong>climbing lane</strong>" +msgstr "S razmacima unesite riječi koje želite naći, npr. <strong>climbing lane</strong>" msgid "Enter your response below. You may attach one file (use email, or\\n <a href=\"{{url}}\">contact us</a> if you need more)." msgstr "" @@ -848,13 +851,13 @@ msgstr "" "<a href=\"{{url}}\">nas kontaktirajte</a> ukoliko trebate više)." msgid "Environmental Information Regulations" -msgstr "Upute za Informacije o Okolišu" +msgstr "Zakon o zaštiti okoliša" msgid "Environmental Information Regulations requests made" -msgstr "Napravljen zahtjev za Upute za Informacije o Okolišu" +msgstr "Zahtjev za informacijom o okolišu napravljen " msgid "Environmental Information Regulations requests made using this site" -msgstr "Koristeći ovu stranicu napravljen je zahtjev za Upute za Informacije o Okolišu" +msgstr "Zahtjevi za informacijama o okolišu napravljeni korištenjem ove stranice" msgid "Event history" msgstr "Prikaz prošlih događanja" @@ -868,35 +871,35 @@ msgstr "Događaj {{id}}" msgid "Everything that you enter on this page, including <strong>your name</strong>,\\n will be <strong>displayed publicly</strong> on\\n this website forever (<a href=\"{{url}}\">why?</a>)." msgstr "" "Sve što unesete na ovu stranicu, uključujući <strong>Vaše ime</strong>, \n" -" će biti <strong>javno prikazano</strong> na\n" -" ovoj web stranici zauvijek (<a href=\"{{url}}\">Više informacija</a>)." +" bit će<strong>javno prikazano</strong> na\n" +" ovoj mrežnoj stranici zauvijek (<a href=\"{{url}}\">Više informacija</a>)." msgid "Everything that you enter on this page\\n will be <strong>displayed publicly</strong> on\\n this website forever (<a href=\"{{url}}\">why?</a>)." msgstr "" "Sve što unesete na ovu stranicu \n" -" će biti <strong>javno prikazano</strong> na\n" -" ovoj web stranici trajno. (<a href=\"{{url}}\">Više informacija</a>)." +" bit će <strong>javno prikazano</strong> na\n" +" ovoj mrežnoj stranici trajno. (<a href=\"{{url}}\">Više informacija</a>)." msgid "FOI" -msgstr "FOI" +msgstr "ZPPI" msgid "FOI email address for {{public_body}}" -msgstr "ZOSPI e-mail adresa za {{public_body}}" +msgstr "ZPPI e-mail adresa za {{public_body}}" msgid "FOI request – {{title}}" -msgstr "FOI zahtjev – {{title}}" +msgstr "Zahtjev za pristup informacijama – {{title}}" msgid "FOI requests" -msgstr "Zahtjevi za slobodan pristup informacijama" +msgstr "Zahtjevi za pristup informacijama" msgid "FOI requests by '{{user_name}}'" -msgstr "Zahtjevi za slobodan pristup informacijama od strane '{{user_name}}'" +msgstr "Zahtjevi za pristup informacijama od '{{user_name}}'" msgid "FOI requests {{start_count}} to {{end_count}} of {{total_count}}" -msgstr "FOI zahtjevi {{start_count}} do {{end_count}} od {{total_count}}" +msgstr "Zahtjevi za pristup informacijama {{start_count}} do {{end_count}} od {{total_count}}" msgid "FOI response requires admin ({{reason}}) - {{title}}" -msgstr "FOI odgovor zahtijeva administratora ({{reason}}) - {{title}}" +msgstr "Odgovor na Zahtjev treba administratora ({{reason}}) - {{title}}" msgid "Failed" msgstr "Nije uspjelo" @@ -918,15 +921,15 @@ msgstr "Prvo, jesu li Vaši ostali zahtjevi bili uspješni?" msgid "First, type in the <strong>name of the UK public authority</strong> you'd\\n like information from. <strong>By law, they have to respond</strong>\\n (<a href=\"{{url}}\">why?</a>)." msgstr "" -"Prvo, upišite<strong>ime javno ustanove</strong>od koje\n" +"Prvo, upišite<strong>ime javne ustanove</strong>od koje\n" "biste željeli informaciju.<strong>Prema zakonu, dužni su odgovoriti</strong>\n" "(<a href=\"{{url}}\">zašto?</a>)." msgid "Foi attachment" -msgstr "Foi privitak" +msgstr "Privitak Zahtjevu za pristup informacijama" msgid "FoiAttachment|Charset" -msgstr "FoiPrivitak|SkupZnakova" +msgstr "FoiPrivitak|Skup znakova" msgid "FoiAttachment|Content type" msgstr "FoiPrivitak|Vrsta Sadržaja" @@ -938,7 +941,7 @@ msgid "FoiAttachment|Filename" msgstr "FoiPrivitak|Ime podatka" msgid "FoiAttachment|Hexdigest" -msgstr "" +msgstr "FoiAttachment|Hexdigest" msgid "FoiAttachment|Url part number" msgstr "FoiPrivitakt|Url dio broja" @@ -968,10 +971,10 @@ msgid "Follow this authority" msgstr "Prati ovu ustanovu" msgid "Follow this link to see the request:" -msgstr "Pratite ovaj link da biste vidjeli zahtjev:" +msgstr "Pratite ovu poveznicu da biste vidjeli zahtjev:" msgid "Follow this link to see the requests:" -msgstr "Pratite ovaj link da biste vidjeli zahtjeve:" +msgstr "Pratite ovu poveznicu da biste vidjeli zahtjeve:" msgid "Follow this person" msgstr "Prati ovu osobu" @@ -1001,10 +1004,10 @@ msgstr "Prateća poruka poslana je {{public_body_name}} od strane {{info_request #. messages sent by the requester to the authority after #. the initial request msgid "Follow ups and new responses to this request have been stopped to prevent spam. Please <a href=\"{{url}}\">contact us</a> if you are {{user_link}} and need to send a follow up." -msgstr "Prateći i novi odgovori na ovaj zahtjev zaustavljeni su kako bi spriječili spam. Molimo, <a href=\"{{url}}\">kontaktirajte nas</a> ako ste {{user_link}} i trebate poslati prateći odgovor." +msgstr "Prateći i novi odgovori na ovaj zahtjev zaustavljeni su kako bi spriječili neželjenu poštu. Molimo, <a href=\"{{url}}\">kontaktirajte nas</a> ako ste {{user_link}} i pošaljite prateći odgovor." msgid "Follow us on twitter" -msgstr "Pratite nas na twitter-u" +msgstr "Pratite nas na Twitteru" msgid "Followups cannot be sent for this request, as it was made externally, and published here by {{public_body_name}} on the requester's behalf." msgstr "Prateći odgovori ne mogu se poslati za ovaj zahtjev, jer ga je napravio netko izvana, te ga ovdje objavio pod {{public_body_name}} u ime onoga koji je poslao zahtjev." @@ -1013,7 +1016,7 @@ msgid "For an unknown reason, it is not possible to make a request to this autho msgstr "Iz nepoznatog razloga, nije moguće podnijeti zahtjev ovoj ustanovi." msgid "Forgotten your password?" -msgstr "Zaboravili ste Vaš password?" +msgstr "Zaboravili ste Vašu lozinku?" msgid "Found {{count}} public authority {{description}}" msgid_plural "Found {{count}} public authorities {{description}}" @@ -1056,9 +1059,12 @@ msgstr "Od" msgid "From the request page, try replying to a particular message, rather than sending\\n a general followup. If you need to make a general followup, and know\\n an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>." msgstr "" +"Na stranici sa zahtjevima pokušajte odgovarati na određenu poruku, radije nego napisati\n" +"općenitu povratnu poruku. Ako morate napraviti općeniti odgovor i znate\n" +"e-mail koji će otići na pravo mjesto, molimo <a href=\"{{url}}\">pošaljite nama</a>." msgid "From:" -msgstr "Od strane:" +msgstr "Od:" msgid "GIVE DETAILS ABOUT YOUR COMPLAINT HERE" msgstr "OVDJE IZNESITE DETALJE VAŠE ŽALBE" @@ -1067,16 +1073,16 @@ msgid "Handled by post." msgstr "Riješen poštom." msgid "Has tag string/has tag string tag" -msgstr "" +msgstr "Has tag string/has tag string tag" msgid "HasTagString::HasTagStringTag|Model" -msgstr "" +msgstr "HasTagString::HasTagStringTag|Model" msgid "HasTagString::HasTagStringTag|Name" -msgstr "" +msgstr "HasTagString::HasTagStringTag|Name" msgid "HasTagString::HasTagStringTag|Value" -msgstr "" +msgstr "HasTagString::HasTagStringTag|Value" msgid "Hello! We have an <a href=\"{{url}}\">important message</a> for visitors outside {{country_name}}" msgstr "Dobrodošli! Imamo <a href=\"{{url}}\">važnu poruku</a> za posjetitelje izvan {{country_name}}" @@ -1085,7 +1091,7 @@ msgid "Hello! We have an <a href=\"{{url}}\">important message</a> for visitors msgstr "Dobrodošli! Imamo <a href=\"{{url}}\">važnu poruku</a> za posjetitelje iz ostalih država" msgid "Hello! You can make Freedom of Information requests within {{country_name}} at {{link_to_website}}" -msgstr "Dobrodošli! Možete podnositi Zahtjeve za slobodan pristup informacijama u {{country_name}} na ovom linku: {{link_to_website}}" +msgstr "Dobrodošli! Možete podnositi Zahtjeve za slobodan pristup informacijama u {{country_name}} na ovoj poveznici: {{link_to_website}}" msgid "Hello, {{username}}!" msgstr "Dobrodošli, {{username}}!" @@ -1101,12 +1107,12 @@ msgstr "" "opisali. Pogledaj <a href=\"{{search_path}}\">savjete za pretraživanje</a> za opise statusa." msgid "Here is the message you wrote, in case you would like to copy the text and save it for later." -msgstr "Ovo je poruka koju ste napisali, ukoliko je želite kopirati i pospremiti." +msgstr "Ovo je poruka koju ste napisali, ako je želite kopirati i pospremiti." msgid "Hi! We need your help. The person who made the following request\\n hasn't told us whether or not it was successful. Would you mind taking\\n a moment to read it and help us keep the place tidy for everyone?\\n Thanks." msgstr "" "Pozdrav, trebamo Vašu pomoć. Osoba koja je podnijela sljedeći zahtjev\n" -" nam nije rekla je li bio uspješan ili ne. Biste li mogli odvojiti\n" +" nije nam rekla je li bio uspješan ili ne. Biste li mogli odvojiti\n" " malo vremena da ga pročitate i da nam pomognete da održimo ovo mjesto urednim za sve?\n" " Hvala." @@ -1133,7 +1139,7 @@ msgstr "Početna stranica ustanove" msgid "However, you have the right to request environmental\\n information under a different law" msgstr "" -"Ipak, imate pravo da tražite informacije o okolišu\n" +"Ipak, imate pravo tražiti informacije o okolišu\n" " pozivajući se na drugi zakon" msgid "Human health and safety" @@ -1162,17 +1168,17 @@ msgstr "Želio/la bih <strong>povući ovaj zahtjev</strong>" msgid "I'm still <strong>waiting</strong> for my information\\n <small>(maybe you got an acknowledgement)</small>" msgstr "" -"Još uvjek <strong>čekam</strong> na svoje informacije\n" +"Još uvijek <strong>čekam</strong> svoje informacije\n" " <small>(možda ste dobili potvrdu)</small>" msgid "I'm still <strong>waiting</strong> for the internal review" -msgstr "Još uvijek <strong>čekam</strong> na interni pregled" +msgstr "Još uvijek <strong>čekam</strong> interni pregled" msgid "I'm waiting for an <strong>internal review</strong> response" -msgstr "Čekam na odgovor <strong>internog pregleda</strong>" +msgstr "Čekam odgovor <strong>internog pregleda</strong>" msgid "I've been asked to <strong>clarify</strong> my request" -msgstr "Zamoljen/a sam da <strong>objasnim</strong> moj zahtjev" +msgstr "Zamoljen/a sam da <strong>objasnim</strong> svoj zahtjev" msgid "I've received <strong>all the information" msgstr "Dobio/la sam <strong>sve informacije" @@ -1197,7 +1203,7 @@ msgstr "Ukoliko se greška pojavila pri dostavi, a možete pronaći važeću e-m msgid "If this is incorrect, or you would like to send a late response to the request\\nor an email on another subject to {{user}}, then please\\nemail {{contact_email}} for help." msgstr "" -"Ako je ovo pogrešno, ili biste da pošaljete novi odgovor na zahtjev\n" +"Ako je ovo pogrešno, ili biste poslali novi odgovor na zahtjev\n" "ili e mail o nečemu drugome {{user}}, onda molimo\n" "pošaljite nam e-mail {{contact_email}} za pomoć." @@ -1211,43 +1217,43 @@ msgid "If you are still having trouble, please <a href=\"{{url}}\">contact us</a msgstr "Ako i dalje imate problema, molimo <a href=\"{{url}}\">kontaktirajte nas</a>." msgid "If you are the requester, then you may <a href=\"{{url}}\">sign in</a> to view the message." -msgstr "Ukoiko ste predali zahtjev, možete se<a href=\"{{url}}\">prijaviti</a> da biste vidjeli poruku." +msgstr "Ako ste predali zahtjev, možete se<a href=\"{{url}}\">prijaviti</a> da biste vidjeli poruku." msgid "If you are the requester, then you may <a href=\"{{url}}\">sign in</a> to view the request." -msgstr "Ako ste podnosioc zahtjeva, možete se <a href=\"{{url}}\">prijaviti</a> da biste pogledali zahtjev." +msgstr "Ako ste podnositelj zahtjeva, možete se <a href=\"{{url}}\">prijaviti</a> da biste pogledali zahtjev." msgid "If you are thinking of using a pseudonym,\\n please <a href=\"{{url}}\">read this first</a>." msgstr "" "Ako razmišljate o korištenju pseudonima,\n" -" molimo da<a href=\"{{url}}\">pročitajte prvo ovo</a>." +" molimo da<a href=\"{{url}}\">pročitate prvo ovo</a>." msgid "If you are {{user_link}}, please" msgstr "Ako ste {{user_link}}, molimo" msgid "If you believe this request is not suitable, you can report it for attention by the site administrators" -msgstr "Ukoliko smatrate da ovaj zahtjev nije odgovarajući, možete ga prijaviti administratorima stranice. " +msgstr "Ukoliko smatrate da ovaj zahtjev nije odgovarajuć, možete ga prijaviti administratorima stranice. " msgid "If you can't click on it in the email, you'll have to <strong>select and copy\\nit</strong> from the email. Then <strong>paste it into your browser</strong>, into the place\\nyou would type the address of any other webpage." msgstr "" "Ako ne možete kliknuti na njega u e-mailu, morati ćete <strong>odabrati i kopirati\n" -"ga</strong> sa e-maila. Zatim <strong>nalijepite ga u Vaš pretraživač</strong>, na mjesto\n" -"gdje biste ukucali adresu bilo koje druge web stranice." +"ga</strong> s e-maila. Zatim <strong>nalijepite u Vaš pretraživač</strong>, na mjesto\n" +"gdje biste ukucali adresu bilo koje druge mrežne stranice." msgid "If you can, scan in or photograph the response, and <strong>send us\\n a copy to upload</strong>." msgstr "" -"Ako možete skenirajte ili uslikajte odgovor, i <strong>pošaljite nam\n" +"Ako možete, skenirajte ili uslikajte odgovor, i <strong>pošaljite nam\n" " kopiju za slanje</strong>." msgid "If you find this service useful as an FOI officer, please ask your web manager to link to us from your organisation's FOI page." -msgstr "Ukoliko Vam je, kao povjereniku za pravo na pristup informacijama, ova usluga korisna, molimo Vas da na stranicama Vaše ustanove posvećenim pravu na pristup informacijama postavite link do nas. " +msgstr "Ukoliko Vam je, kao povjereniku za pravo na pristup informacijama, ova usluga korisna, molimo Vas da na stranicama Vaše ustanove posvećenim pravu na pristup informacijama postavite poveznicu do nas. " msgid "If you got the email <strong>more than six months ago</strong>, then this login link won't work any\\nmore. Please try doing what you were doing from the beginning." msgstr "" -"Ako ste dobili e-mail <strong>prije više od šest mjeseci</strong>, onda ovaj link za prijavu više neće\n" +"Ako ste dobili e-mail <strong>prije više od šest mjeseci</strong>, onda ova poveznica za prijavu više neće\n" "raditi. Molimo pokušajte ispočetka." msgid "If you have not done so already, please write a message below telling the authority that you have withdrawn your request. Otherwise they will not know it has been withdrawn." -msgstr "Ako još niste, molimo ispod napišite poruku u kojoj napominjete ustanovi da ste povukli Vaš zahtjev. U protivnom neće znati da je zahtjev povučen." +msgstr "Ako još niste, molimo ispod napišite poruku u kojoj napominjete ustanovi da ste povukli svoj zahtjev. U protivnom se neće znati da je zahtjev povučen." msgid "If you reply to this message it will go directly to {{user_name}}, who will\\nlearn your email address. Only reply if that is okay." msgstr "" @@ -1256,8 +1262,8 @@ msgstr "" msgid "If you use web-based email or have \"junk mail\" filters, also check your\\nbulk/spam mail folders. Sometimes, our messages are marked that way." msgstr "" -"Ako koristite neke od web mail servisa ili imate filtere za \"junk mail\", provjerite u Vašim\n" -"bulk/spam folderima. Ponekad su naše poruke označene tako." +"Ako koristite neke od mrežnih servisa e-pošte ili imate filtere za \"junk mail\", provjerite u Vašim\n" +"\"bulk/spam\" folderima. Ponekad su naše poruke označene tako." msgid "If you would like us to lift this ban, then you may politely\\n<a href=\"/help/contact\">contact us</a> giving reasons.\\n" msgstr "" @@ -1272,8 +1278,8 @@ msgstr "Ako ste koristili {{site_name}} prije" msgid "If your browser is set to accept cookies and you are seeing this message,\\nthen there is probably a fault with our server." msgstr "" -"Ako je Vaš pretraživač namješten da prihvata cookies-e i vidite ovu poruku,\n" -"onda vjerovatno postoji problem sa našim serverom." +"Ako je Vaš pretraživač namješten da prihvaća kolačiće i vidite ovu poruku,\n" +"onda vjerojatno postoji problem s našim serverom." msgid "Incoming email address" msgstr "Adresa dolazne pošte" @@ -1294,7 +1300,7 @@ msgid "IncomingMessage|Last parsed" msgstr "DolaznaPoruka|Posljednje raščlanjeno " msgid "IncomingMessage|Mail from" -msgstr "DolaznaPoruka|Mail od" +msgstr "DolaznaPoruka|Pošta od" msgid "IncomingMessage|Mail from domain" msgstr "Dolazna poruka|Pošta sa domene" @@ -1312,7 +1318,7 @@ msgid "IncomingMessage|Subject" msgstr "Dolazna poruka|Tema" msgid "IncomingMessage|Valid to reply to" -msgstr "Dolazna poruka|Validna za odgovor za" +msgstr "Dolazna poruka|Važeća za odgovor za" msgid "Individual requests" msgstr "Pojedinačni zahtjevi" @@ -1321,40 +1327,40 @@ msgid "Info request" msgstr "Zahtjev za informacijom" msgid "Info request batch" -msgstr "" +msgstr "Zahtjev za skupinom informacija" msgid "Info request event" -msgstr "" +msgstr "Zahtjev za informacijama o događanju" msgid "InfoRequestBatch|Body" -msgstr "" +msgstr "ZahtjevZaSkupinomInformacija|Tijelo" msgid "InfoRequestBatch|Sent at" -msgstr "" +msgstr "ZahtjevZaSkupinomInformacija|Poslano" msgid "InfoRequestBatch|Title" -msgstr "" +msgstr "ZahtjevZaSkupinomInformacija|Naslov" msgid "InfoRequestEvent|Calculated state" -msgstr "" +msgstr "ZahtjevZaInformacijamaODogađanju|Izračunato stanje" msgid "InfoRequestEvent|Described state" -msgstr "" +msgstr "ZahtjevZaInformacijamaODogađanju|Opisano stanje" msgid "InfoRequestEvent|Event type" -msgstr "" +msgstr "ZahtjevZaInformacijamaODogađanju|Tip događanja" msgid "InfoRequestEvent|Last described at" -msgstr "" +msgstr "ZahtjevZaInformacijamaODogađanju|Posljednje opisano" msgid "InfoRequestEvent|Params yaml" -msgstr "" +msgstr "ZahtjevZaInformacijamaODogađanju|Params yaml" msgid "InfoRequest|Allow new responses from" msgstr "ZahtjevZaInformacijom|Dopusti novi odgovor od " msgid "InfoRequest|Attention requested" -msgstr "ZahtjevZaInformacijom|Zahtijevana pozornost" +msgstr "ZahtjevZaInformacijom|Zahtjevana pozornost" msgid "InfoRequest|Awaiting description" msgstr "ZahtjevZaInformacijom|Čekanje opisa" @@ -1375,13 +1381,13 @@ msgid "InfoRequest|Handle rejected responses" msgstr "ZahtjevZaInformacijom|Riješi odbijene odgovore" msgid "InfoRequest|Idhash" -msgstr "" +msgstr "ZahtjevZaInformacijom|Idhash" msgid "InfoRequest|Law used" -msgstr "" +msgstr "ZahtjevZaInformacijom|Korišteni zakon" msgid "InfoRequest|Prominence" -msgstr "" +msgstr "ZahtjevZaInformacijom|Istaknuto" msgid "InfoRequest|Title" msgstr "ZahtjevZaInformacijom|Naslov" @@ -1401,15 +1407,15 @@ msgid "Internal review request" msgstr "Zahtjev za interni pregled" msgid "Internal review request sent to {{public_body_name}} by {{info_request_user}} on {{date}}." -msgstr "Zahtjev za internim pregledom poslan {{public_body_name}} od {{info_request_user}} dana {{date}}." +msgstr "Zahtjev za interni pregled poslan {{public_body_name}} od {{info_request_user}} dana {{date}}." msgid "Is {{email_address}} the wrong address for {{type_of_request}} requests to {{public_body_name}}? If so, please contact us using this form:" msgstr "Je li {{email_address}} pogrešna adresa za {{type_of_request}} zahtjeve za {{public_body_name}}? Ako da, molimo kontaktirajte nas koristeći ovaj obrazac:" msgid "It may be that your browser is not set to accept a thing called \"cookies\",\\nor cannot do so. If you can, please enable cookies, or try using a different\\nbrowser. Then press refresh to have another go." msgstr "" -"Moguće je da Vaš pretraživač nije namješten da prihvaća tzv. \"cookies\",\n" -"ili nema tu mogućnost. Ako možete, molimo pokušajte ih aktivirati, ili pokušajte koristiti drugi\n" +"Moguće je da Vaš pretraživač nije namješten da prihvaća tzv. \"cookies\"\n" +"ili nema tu mogućnost. Ako možete, molimo pokušajte ih aktivirati ili pokušajte koristiti drugi\n" "pretraživač. Zatim pritisnite refresh da biste pokušali ponovo." msgid "Items matching the following conditions are currently displayed on your wall." @@ -1422,7 +1428,7 @@ msgid "Joined in" msgstr "Spojen" msgid "Joined {{site_name}} in" -msgstr "Pridružio se na {{site_name}} u" +msgstr "Pridružio/la se na {{site_name}} u" msgid "Just one more thing" msgstr "Još nešto" @@ -1441,11 +1447,11 @@ msgstr "Zadnji pregledani zahtjev: " msgid "Let us know what you were doing when this message\\nappeared and your browser and operating system type and version." msgstr "" -"Obavijestite nas o tome šta ste uradili kada se ova poruka\n" +"Obavijestite nas o tome što ste radili kada se ova poruka\n" "pojavila i o tipu i verziji Vašeg pretraživača i operativnog sistema." msgid "Link to this" -msgstr "Spojite sa ovim" +msgstr "Spojite s ovim" msgid "List of all authorities (CSV)" msgstr "Popis svih ustanova (CSV)" @@ -1466,7 +1472,7 @@ msgid "Listing users" msgstr "Lista korisnika" msgid "Log in to download a zip file of {{info_request_title}}" -msgstr "Prijavite se da preuzmete zipovano {{info_request_title}}" +msgstr "Prijavite se da preuzmete zip datoteku {{info_request_title}}" msgid "Log into the admin interface" msgstr "Prijavi se u administratorsko sučelje" @@ -1478,31 +1484,31 @@ msgid "Made between" msgstr "Napravljen između" msgid "Mail server log" -msgstr "Zapisnika maila servera" +msgstr "Zapisnik maila servera" msgid "Mail server log done" -msgstr "" +msgstr "Zapisnik mail servera izrađen" msgid "MailServerLogDone|Filename" -msgstr "" +msgstr "ZapisnikMailServera|Naziv" msgid "MailServerLogDone|Last stat" -msgstr "" +msgstr "ZapisnikMailServera|Posljednji status" msgid "MailServerLog|Line" -msgstr "" +msgstr "ZapisnikMailServera|Redak" msgid "MailServerLog|Order" -msgstr "" +msgstr "ZapisnikMailServera|Red" msgid "Make a batch request" -msgstr "" +msgstr "Napravi zahtjev za skupinom podataka" msgid "Make a new EIR request" msgstr "Napravi novi EIR zahtjev" msgid "Make a new FOI request" -msgstr "Napravi novi FOI zahtjev" +msgstr "Napravi novi Zahtjev za pristup informacijama" msgid "Make a new<br/>\\n <strong>Freedom <span>of</span><br/>\\n Information<br/>\\n request</strong>" msgstr "" @@ -1530,7 +1536,7 @@ msgid "Make an {{law_used_short}} request to '{{public_body_name}}'" msgstr "Podnesi {{law_used_short}} zahtjev javnoj ustanovi '{{public_body_name}}'" msgid "Make and browse Freedom of Information (FOI) requests" -msgstr "Napravi i pretraži Zahtjeve za slobodan pristup informacijama" +msgstr "Napravi i pretraži Zahtjeve za pristup informacijama (ZPPI)" msgid "Make your own request" msgstr "Načinite Vaš zahtjev" @@ -1593,16 +1599,16 @@ msgid "New email doesn't look like a valid address" msgstr "Novi e-mail ne izgleda kao valjana adresa" msgid "New password:" -msgstr "Novi password:" +msgstr "Nova lozinka:" msgid "New password: (again)" -msgstr "Novi password: (ponovo)" +msgstr "Nova lozinka: (ponovo)" msgid "New response to '{{title}}'" msgstr "Novi odgovor na '{{title}}'" msgid "New response to your FOI request - " -msgstr "Novi odgovor na Vaš Zahtjev o slobodnom pristupu informacijama - " +msgstr "Novi odgovor na Vaš Zahtjev za pristup informacijama - " msgid "New response to your request" msgstr "Novi odgovor na Vaš zahtjev" @@ -1662,10 +1668,10 @@ msgid "Now preview your annotation" msgstr "Sada pregledajte Vašu napomenu" msgid "Now preview your follow up" -msgstr "" +msgstr "Pregledajte svoj prateći odgovor" msgid "Now preview your message asking for an internal review" -msgstr "Sada pregledajte Vašu poruku u kojoj tražite urgenciju " +msgstr "Sada pregledajte Vašu poruku u kojoj tražite interni pregled" msgid "Number of requests" msgstr "Broj zahtjeva" @@ -1686,13 +1692,13 @@ msgid "Old email address isn't the same as the address of the account you are lo msgstr "Stara e-mail adresa nije ista kao adresa računa na koji ste prijavljeni" msgid "Old email doesn't look like a valid address" -msgstr "Stari e-mail ne izgleda kao validna adresa" +msgstr "Stari e-mail ne izgleda kao važeća adresa" msgid "On this page" msgstr "Na ovoj stranici" msgid "One FOI request found" -msgstr "Pronađen jedan Zahtjev za slobodan pristup informacijama" +msgstr "Pronađen jedan Zahtjev za pristup informacijama" msgid "One person found" msgstr "Jedna osoba pronađena" @@ -1716,7 +1722,7 @@ msgid "Or make a <a href=\"{{url}}\">batch request</a> to <strong>multiple autho msgstr "Ili napravite <a href=\"{{url}}\">skupni zahtjev</a> na <strong>više ustanova</strong> istovremeno." msgid "Or search in their website for this information." -msgstr "Ili tražite ovu informaciju na njihovoj web stranici." +msgstr "Ili tražite ovu informaciju na njihovoj mrežnoj stranici." msgid "Original request sent" msgstr "Originalni zahtjev poslan" @@ -1746,25 +1752,25 @@ msgid "OutgoingMessage|Prominence reason" msgstr "Odlazna poruka|Razlog isticanja" msgid "OutgoingMessage|Status" -msgstr "Odlazeća poruka|Status" +msgstr "Odlazna poruka|Status" msgid "OutgoingMessage|What doing" -msgstr "Odlazeća poruka|Šta radi" +msgstr "Odlazna poruka|Što radi" msgid "Partially successful." msgstr "Djelomično uspješno." msgid "Password is not correct" -msgstr "Password nije ispravan" +msgstr "Lozinka nije ispravna" msgid "Password:" -msgstr "Password:" +msgstr "Lozinka:" msgid "Password: (again)" -msgstr "Password: (ponovo)" +msgstr "Lozinka: (ponovo)" msgid "Paste this link into emails, tweets, and anywhere else:" -msgstr "Nalijepite ovaj link na e-mailove, tweetove i na druga mjesta:" +msgstr "Nalijepite ovu poveznicu na e-mailove, tweetove i na druga mjesta:" msgid "People" msgstr "Osobe" @@ -1800,7 +1806,7 @@ msgid "Please <a href=\"{{url}}\">get in touch</a> with us so we can fix it." msgstr "Molimo <a href=\"{{url}}\">kontaktirajte nas</a> kako bismo to mogli popraviti." msgid "Please <strong>answer the question above</strong> so we know whether the " -msgstr "Molimo <strong>odgovorite na pitanje iznad</strong> kako bi znali je li" +msgstr "Molimo <strong>odgovorite na pitanje iznad</strong> kako bismo znali je li" msgid "Please <strong>go to the following requests</strong>, and let us\\n know if there was information in the recent responses to them." msgstr "" @@ -1831,33 +1837,33 @@ msgid "Please choose whether or not you got some of the information that you wan msgstr "Molimo birajte jeste li ili niste dobili neke od informacija koje ste tražili." msgid "Please click on the link below to cancel or alter these emails." -msgstr "Molimo kliknite na link ispod da biste poništili ili promijenili ove e-mailove" +msgstr "Molimo kliknite na poveznicu ispod da biste poništili ili promijenili ove e-mailove" msgid "Please click on the link below to confirm that you want to \\nchange the email address that you use for {{site_name}}\\nfrom {{old_email}} to {{new_email}}" msgstr "" -"Molimo kliknite na link ispod da potvrdite da želite \n" +"Molimo kliknite na poveznicu ispod da potvrdite da želite \n" "promijeniti e-mail adresu koju koristite na {{site_name}}\n" "sa {{old_email}} na {{new_email}}" msgid "Please click on the link below to confirm your email address." -msgstr "Molimo kliknite na link ispod da biste potvrdili Vašu e-mail adresu." +msgstr "Molimo kliknite na poveznicu ispod da biste potvrdili Vašu e-mail adresu." msgid "Please describe more what the request is about in the subject. There is no need to say it is an FOI request, we add that on anyway." -msgstr "Molimo dodatno opišite o kakvom zahtjevu je riječ u predmetu. Nije potrebno reći da je Zahtjev za slobodan pristup informacijama, tu ćemo stavku dodati svakako." +msgstr "Molimo dodatno opišite o kakvom je zahtjevu riječ u predmetu. Nije potrebno reći da je Zahtjev za pristup informacijama, tu ćemo stavku dodati svakako." msgid "Please don't upload offensive pictures. We will take down images\\n that we consider inappropriate." msgstr "" -"Molimo nemojte postavljati uvredljive slike. Skinuti ćemo sve slike\n" +"Molimo nemojte postavljati uvredljive slike. Skinut ćemo sve slike\n" " koje smatramo neprikladnim." msgid "Please enable \"cookies\" to carry on" -msgstr "Molimo aktivirajte cookies-e da biste nastavili" +msgstr "Molimo aktivirajte \"cookies\" da biste nastavili" msgid "Please enter a password" -msgstr "Molimo unesite password" +msgstr "Molimo unesite lozinku" msgid "Please enter a subject" -msgstr "Molimo unestite naslov" +msgstr "Molimo unesite naslov" msgid "Please enter a summary of your request" msgstr "Molimo unesite sažetak Vašeg zahtjeva" @@ -1872,7 +1878,7 @@ msgid "Please enter the name of the authority" msgstr "Molimo unesite naziv ustanove" msgid "Please enter the same password twice" -msgstr "Molimo unesite isti password dva puta" +msgstr "Molimo unesite istu lozinku dva puta" msgid "Please enter your annotation" msgstr "Molimo unesite komentar" @@ -1899,7 +1905,7 @@ msgid "Please enter your old email address" msgstr "Molimo unesite Vašu staru e-mail adresu" msgid "Please enter your password" -msgstr "Molimo unesite Vaš password" +msgstr "Molimo unesite Vašu lozinku" msgid "Please give details explaining why you want a review" msgstr "Molimo objasnite zašto želite pregled" @@ -1912,7 +1918,7 @@ msgstr "Molimo da sažetak bude kratak, poput naslova e-maila. Radije koristite msgid "Please only request information that comes under those categories, <strong>do not waste your\\n time</strong> or the time of the public authority by requesting unrelated information." msgstr "" -"Molimo da zahtjevate samo informacije unutar tih kategorija, <strong>ne gubite\n" +"Molimo da zahtijevate samo informacije unutar tih kategorija, <strong>ne gubite\n" "Vaše vrijeme</strong> ili vrijeme javne ustanove tražeći nevezane informacije." msgid "Please pass this on to the person who conducts Freedom of Information reviews." @@ -1960,34 +1966,34 @@ msgid "Point to <strong>related information</strong>, campaigns or forums which msgstr "Ukažite na <strong>slične informacije</strong>, kampanje ili forume koji mogu biti korisni." msgid "Possibly related requests:" -msgstr "Vjerovatno srodni zahtjevi:" +msgstr "Vjerojatno srodni zahtjevi:" msgid "Post annotation" msgstr "Objavi napomenu" msgid "Post redirect" -msgstr "" +msgstr "Preusmjeravanje poruke" msgid "PostRedirect|Circumstance" -msgstr "" +msgstr "PostRedirect|Circumstance" msgid "PostRedirect|Email token" -msgstr "" +msgstr "PostRedirect|Email token" msgid "PostRedirect|Post params yaml" -msgstr "" +msgstr "PostRedirect|Post params yaml" msgid "PostRedirect|Reason params yaml" -msgstr "" +msgstr "PostRedirect|Reason params yaml" msgid "PostRedirect|Token" -msgstr "" +msgstr "PostRedirect|Token" msgid "PostRedirect|Uri" -msgstr "" +msgstr "PostRedirect|Uri" msgid "Posted on {{date}} by {{author}}" -msgstr "Objavio {{author}} dana {{date}} " +msgstr "Objavio/la {{author}} dana {{date}} " msgid "Powered by <a href=\"http://www.alaveteli.org/\">Alaveteli</a>" msgstr "Powered by <a href=\"http://www.alaveteli.org/\">Alaveteli</a>" @@ -1996,10 +2002,10 @@ msgid "Prefer not to receive emails?" msgstr "Ne želite primati e-mail poruke?" msgid "Prev" -msgstr "" +msgstr "Prethodna" msgid "Preview follow up to '" -msgstr "" +msgstr "Pregledaj prateći odgovor" msgid "Preview new annotation on '{{info_request_title}}'" msgstr "Pregledaj novu napomenu za '{{info_request_title}}'" @@ -2074,13 +2080,13 @@ msgid "Public body category" msgstr "Kategorija javnog tijela" msgid "Public body category link" -msgstr "Link na kategoriju javnog tijela" +msgstr "Poveznica na kategoriju javnog tijela" msgid "Public body change request" -msgstr "" +msgstr "Zahtjev za promjenom javnog tijela" msgid "Public body heading" -msgstr "" +msgstr "Naslov javnog tijela" msgid "Public notes" msgstr "Javne bilješke" @@ -2212,10 +2218,10 @@ msgid "Re-edit this message" msgstr "Ponovo urediti ovu poruku" msgid "Read about <a href=\"{{advanced_search_url}}\">advanced search operators</a>, such as proximity and wildcards." -msgstr "" +msgstr "Pročitajte o <a href=\"{{advanced_search_url}}\">naprednim operatorima za pretraživanje</a>, kao što su proximity i wildcards." msgid "Read blog" -msgstr "Čitaj blog" +msgstr "Čitajte blog" msgid "Received an error message, such as delivery failure." msgstr "Primljena poruka o pogrešci, poput neuspješnog prijema poruke." @@ -2250,10 +2256,10 @@ msgid "Reporting a request notifies the site administrators. They will respond a msgstr "Prijavom zahtjeva obavještavaju se administratori. Odgovorit će što je prije moguće. " msgid "Request an internal review" -msgstr "Zatražite interni pregled" +msgstr "Tražite interni pregled" msgid "Request an internal review from {{person_or_body}}" -msgstr "Zatražite interni pregled od {{person_or_body}}" +msgstr "Pošaljite zahtjev za interni pregled {{person_or_body}}" msgid "Request email" msgstr "E-mail za zahtjeve" @@ -2304,7 +2310,7 @@ msgid "Respond to request" msgstr "Odgovoriti na zahtjev" msgid "Respond to the FOI request '{{request}}' made by {{user}}" -msgstr "Odgovoriti na zahtjev za pravo na pristup informacijma '{{request}}' koji je uputio {{user}}" +msgstr "Odgovoriti na Zahtjev za pristup informacijma '{{request}}' koji je uputio {{user}}" msgid "Respond using the web" msgstr "Odgovoriti putem weba" @@ -2346,10 +2352,10 @@ msgid "Search" msgstr "Pretraži" msgid "Search Freedom of Information requests, public authorities and users" -msgstr "Pretraži Zahtjeve za slobodan pristup informacijama, javne ustanove i korisnici" +msgstr "Pretražite Zahtjeve za slobodan pristup informacijama, javne ustanove i korisnike" msgid "Search contributions by this person" -msgstr "Pretraži doprinose od strane ove osobe" +msgstr "Pretražite doprinose od strane ove osobe" msgid "Search for the authorities you'd like information from:" msgstr "Pretražite ustanove od kojih biste željeli informacije:" @@ -2367,25 +2373,25 @@ msgstr "" "<strong>{{number_of_authorities}} ustanova</strong>" msgid "Search queries" -msgstr "" +msgstr "Traži upite" msgid "Search results" msgstr "Rezultati pretrage" msgid "Search the site to find what you were looking for." -msgstr "Pretražite web stranicu da pronađete što ste tražili." +msgstr "Pretražite mrežnu stranicu da pronađete što ste tražili." msgid "Search within the {{count}} Freedom of Information requests to {{public_body_name}}" msgid_plural "Search within the {{count}} Freedom of Information requests made to {{public_body_name}}" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "Traži među {{count}} zahtjevom za pristup informacijama za {{public_body_name}}" +msgstr[1] "Traži među {{count}} zahtjeva za pristup informacijama za {{public_body_name}}" +msgstr[2] "Tražite među {{count}} zahtjeva za pristup informacijama za {{public_body_name}}" msgid "Search your contributions" msgstr "Pretražite Vaše doprinose" msgid "See bounce message" -msgstr "" +msgstr "Pogledajte odbijenu poruku" msgid "Select the authorities to write to" msgstr "Odaberite ustanove kojima ćete pisati" @@ -2394,28 +2400,28 @@ msgid "Select the authority to write to" msgstr "Odaberite ustanovu kojoj ćete pisati" msgid "Send a followup" -msgstr "Pošalji prateću poruku" +msgstr "Pošaljite prateću poruku" msgid "Send a message to " -msgstr "Pošalji poruku za " +msgstr "Pošaljite poruku za " msgid "Send a public follow up message to {{person_or_body}}" -msgstr "Pošaljite javnu prateću poruku za {{person_or_body}}" +msgstr "Poslati javnu prateću poruku {{person_or_body}}" msgid "Send a public reply to {{person_or_body}}" -msgstr "Poslati javni odgovor za {{person_or_body}}" +msgstr "Poslati javni odgovor {{person_or_body}}" msgid "Send follow up to '{{title}}'" -msgstr "Pošalji prateću poruku '{{title}}'" +msgstr "Pošaljite prateću poruku '{{title}}'" msgid "Send message" -msgstr "Pošalji poruku" +msgstr "Pošaljite poruku" msgid "Send message to " -msgstr "Pošalji poruku " +msgstr "Pošaljite poruku " msgid "Send request" -msgstr "Pošalji zahtjev" +msgstr "Pošaljite zahtjev" msgid "Sent to one authority by {{info_request_user}} on {{date}}." msgid_plural "Sent to {{authority_count}} authorities by {{info_request_user}} on {{date}}." @@ -2433,7 +2439,7 @@ msgid "Short name is already taken" msgstr "Nadimak se već koristi" msgid "Show most relevant results first" -msgstr "Prikaži najreleveantnije rezultate " +msgstr "Prikaži najrelevantnije rezultate " msgid "Show only..." msgstr "Prikaži samo..." @@ -2445,7 +2451,7 @@ msgid "Sign in" msgstr "Prijavite se" msgid "Sign in as the emergency user" -msgstr "" +msgstr "Registrirajte se kao korisnik u nuždi" msgid "Sign in or make a new account" msgstr "Prijavite se ili napravite novi korisnički račun" @@ -2466,7 +2472,7 @@ msgid "Simple search" msgstr "Jednostavna pretraga" msgid "Some notes have been added to your FOI request - " -msgstr "Bilješke su dodane Vašem zahtjevu za pristup informacijama - " +msgstr "Bilješke su dodane Vašem Zahtjevu za pristup informacijama - " msgid "Some of the information requested has been received" msgstr "Dio traženih informacija je dobijen" @@ -2475,14 +2481,14 @@ msgid "Some people who've made requests haven't let us know whether they were\\n msgstr "" "Neki od podnositelja zahtjeva nas nisu obavijestili jesu li njihovi zahtjevi bili\n" "uspješni ili ne. Trebamo <strong>Vašu</strong> pomoć –\n" -"odaberite jedan od ovih zahtjeva, pročitajte ga, sve obavijestite jesu li\n" +"odaberite jedan od ovih zahtjeva, pročitajte ga, obavijestite sve jesu li\n" "informacije dobijene ili ne. Svi će Vam biti veoma zahvalni." msgid "Somebody added a note to your FOI request - " -msgstr "Neko je dodao komentar na Vaš Zahtjev za slobodan pristup informacijama." +msgstr "Netko je dodao komentar na Vaš Zahtjev za pristup informacijama." msgid "Someone has updated the status of your request" -msgstr "Netko je ažurirao status vašeg zahtjeva" +msgstr "Netko je ažurirao status Vašeg zahtjeva" msgid "Someone, perhaps you, just tried to change their email address on\\n{{site_name}} from {{old_email}} to {{new_email}}." msgstr "" @@ -2508,10 +2514,10 @@ msgid "Source:" msgstr "Izvor:" msgid "Spam address" -msgstr "Adresa spama" +msgstr "Adresa neželjene pošte" msgid "SpamAddress|Email" -msgstr "" +msgstr "SpamAdresa|Email" msgid "Special note for this authority!" msgstr "Posebna napomena za ovu ustanovu!" @@ -2532,16 +2538,16 @@ msgid "Subject:" msgstr "Predmet:" msgid "Submit" -msgstr "Predaj" +msgstr "Predajte" msgid "Submit request" -msgstr "Predaj zahtjev" +msgstr "Predajte zahtjev" msgid "Submit status" -msgstr "Predaj status i pošalji poruku" +msgstr "Predajte status i pošaljite poruku" msgid "Submit status and send message" -msgstr "Predaj status i pošalji poruku" +msgstr "Predajte status i pošaljite poruku" msgid "Subscribe to blog" msgstr "Pretplatiti se na blog" @@ -2580,13 +2586,13 @@ msgid "Technical details" msgstr "Tehnički detalji" msgid "Thank you for helping us keep the site tidy!" -msgstr "Hvala što nam pomažete da održavamo ovu web stranicu urednom!" +msgstr "Hvala što nam pomažete da održavamo ovu mrežnu stranicu urednom!" msgid "Thank you for making an annotation!" msgstr "Hvala što ste napravili napomenu!" msgid "Thank you for responding to this FOI request! Your response has been published below, and a link to your response has been emailed to " -msgstr "Hvala na Vašem odgovoru na ovaj Zahtjev za slobodan pristup informacijama! Vaš odgovor je objavljen ispod, a link na vaš odgovor je poslan putem e-maila za" +msgstr "Hvala na Vašem odgovoru na ovaj Zahtjev za pristup informacijama! Vaš je odgovor objavljen ispod, a poveznica na Vaš odgovor poslana je elektroničkom poštom za" msgid "Thank you for updating the status of the request '<a href=\"{{url}}\">{{info_request_title}}</a>'. There are some more requests below for you to classify." msgstr "Hvala na ažuriranju statusa zahtjeva '<a href=\"{{url}}\">{{info_request_title}}</a>'. Ispod je još nekoliko zahtjeva koje možete klasificirati." @@ -2630,7 +2636,7 @@ msgid "The Freedom of Information Act <strong>does not apply</strong> to" msgstr "Zakon o pravu na pristup informacijama <strong>se ne odnosi</strong> na" msgid "The URL where you found the email address. This field is optional, but it would help us a lot if you can provide a link to a specific page on the authority's website that gives this address, as it will make it much easier for us to check." -msgstr "URL na kojem ste pronašli e-mail adresu. Polje nije obavezno, ali pomoglo bi nam ukoliko nam možete dati link na određenu stranicu ustanove na kojoj je ova adresa, jer tako bi nam jako olakšali provjeru. " +msgstr "URL na kojem ste pronašli e-mail adresu. Polje nije obavezno, ali pomoglo bi nam ukoliko nam možete dati poveznicu na određenu stranicu ustanove na kojoj je ova adresa, jer tako biste nam jako olakšali provjeru. " msgid "The accounts have been left as they previously were." msgstr "Korisnički računi nisu mijenjani" @@ -2689,7 +2695,7 @@ msgid "The page doesn't exist. Things you can try now:" msgstr "Stranica ne postoji. Možete probati:" msgid "The percentages are calculated with respect to the total number of requests, which includes invalid requests; this is a known problem that will be fixed in a later release." -msgstr "Postotci su izračunati uzimajući u obzir ukupni broj zahtjeva, koji uključuje i nepotpune zahtjeve, ovo je poznati problem koji će biti naknadno riješen." +msgstr "Postotci su izračunati uzimajući u obzir ukupni broj zahtjeva, koji uključuje i nepotpune zahtjeve; ovo je poznati problem koji će biti naknadno riješen." msgid "The public authority does not have the information requested" msgstr "Javna ustanova ne posjeduje tražene informacije" @@ -2724,7 +2730,7 @@ msgstr "Javna ustanova je odbila zahtjev" msgid "The request you have tried to view has been removed. There are\\nvarious reasons why we might have done this, sorry we can't be more specific here. Please <a\\n href=\"{{url}}\">contact us</a> if you have any questions." msgstr "" "Zahtjev koji ste pokušali pregledati je uklonjen. Postoje\n" -"razni razlozi radi kojih smo to mogli uraditi, žao nam je ali ne možemo biti precizniji po tom pitanju. Molimo <a\n" +"razni razlozi zbog kojih smo to mogli uraditi, žao nam je ali ne možemo biti precizniji po tom pitanju. Molimo <a\n" " href=\"{{url}}\">kontaktirajte nas</a> ako imate pitanja." msgid "The requester has abandoned this request for some reason" @@ -2746,7 +2752,7 @@ msgid "The search index is currently offline, so we can't show the Freedom of In msgstr "Indeks za pretragu je trenutno isključen, ne možemo prikazati Zahtjeve za slobodan pristup informacijama podnesene ovoj ustanovi." msgid "The search index is currently offline, so we can't show the Freedom of Information requests this person has made." -msgstr "Indeks za pretragu je trenutno isključen, radi toga ne možemo prikazati Zahtjeve za slobodan pristup informacijama koje je ova osoba napravila." +msgstr "Indeks za pretragu trenutno je isključen, zbog toga ne možemo prikazati Zahtjeve za slobodan pristup informacijama koje je ova osoba napravila." msgid "The {{site_name}} team." msgstr "{{site_name}} tim." @@ -2761,16 +2767,16 @@ msgid "Then you can change your email address used on {{site_name}}" msgstr "Tada možete promijeniti Vašu e-mail adresu korištenu na {{site_name}}" msgid "Then you can change your password on {{site_name}}" -msgstr "Tada možete promijeniti Vaš password na {{site_name}}" +msgstr "Tada možete promijeniti Vašu lozinku na {{site_name}}" msgid "Then you can classify the FOI response you have got from " -msgstr "Tada možete klasificirati ZPPI odgovor koji ste dobili od" +msgstr "Tada možete klasificirati odgovor na Zahtjev za pristup informacijama koji ste dobili od" msgid "Then you can download a zip file of {{info_request_title}}." -msgstr "Tada možete preuzeti zip file {{info_request_title}}." +msgstr "Tada možete preuzeti zip datoteku {{info_request_title}}." msgid "Then you can log into the administrative interface" -msgstr "Tada se možete prijaviti u administratorsko sučelje" +msgstr "Tada se možete prijaviti na administratorsko sučelje" msgid "Then you can make a batch request" msgstr "Tada možete uputiti skupni zahtjev" @@ -2788,7 +2794,7 @@ msgid "Then you can sign in to {{site_name}}" msgstr "Tada se možete prijaviti na {{site_name}}" msgid "Then you can update the status of your request to " -msgstr "Tada možete ažurirati status vašeg zahtjeva prema" +msgstr "Tada možete ažurirati status Vašeg zahtjeva prema" msgid "Then you can upload an FOI response. " msgstr "Tada možete postaviti odgovor na Zahtjev za pristup informacijama." @@ -2806,10 +2812,10 @@ msgid "Then you will be notified whenever '{{user_name}}' requests something or msgstr "Tada ćete biti obaviješteni svaki put kada '{{user_name}}' zahtijeva nešto ili dobije odgovor." msgid "Then you will be notified whenever a new request or response matches your search." -msgstr "Tada ćete biti obaviješteni svaki put kada novi zahtjev ili odgovor odgovara vašoj pretrazi." +msgstr "Tada ćete biti obaviješteni svaki put kada novi zahtjev ili odgovor odgovara Vašoj pretrazi." msgid "Then you will be notified whenever an FOI request succeeds." -msgstr "Tada ćete biti obaviješteni svaki put kada zahtjev za pristup informacijama uspije." +msgstr "Tada ćete biti obaviješteni svaki put kada Zahtjev za pristup informacijama uspije." msgid "Then you will be notified whenever someone requests something or gets a response from '{{public_body_name}}'." msgstr "Tada ćete biti obaviješteni svaki put kada netko zahtijeva nešto ili dobije odgovor od '{{public_body_name}}'." @@ -2827,7 +2833,7 @@ msgid "Then your annotation to {{info_request_title}} will be posted." msgstr "Tada će Vaša napomena za {{info_request_title}} biti postavljena." msgid "There are {{count}} new annotations on your {{info_request}} request. Follow this link to see what they wrote." -msgstr "Postoje {{count}} nove napomene na Vašem {{info_request}} zahtjevu. Pratite ovaj link da pogledate šta je napisano." +msgstr "Postoje {{count}} nove napomene na Vašem {{info_request}} zahtjevu. Pratite ovu poveznicu da pogledate što je napisano." msgid "There is <strong>more than one person</strong> who uses this site and has this name.\\n One of them is shown below, you may mean a different one:" msgstr "" @@ -2835,7 +2841,7 @@ msgstr "" "Jedna je prikazana ispod, možda mislite na drugu:" msgid "There is a limit on the number of requests you can make in a day, because we don’t want public authorities to be bombarded with large numbers of inappropriate requests. If you feel you have a good reason to ask for the limit to be lifted in your case, please <a href='{{help_contact_path}}'>get in touch</a>." -msgstr "Postoji ograničenje broja zahtjeva koje možete dnevno izraditi. Ne želimo da javne ustanove budu zatrpane velikim brojem neprimjerenih zahtjeva. Ukoliko mislite da, u Vašem slučaju, imate dobar razlog za zatražiti veći broj zahtjeva, molimo <a href='{{help_contact_path}}'>javite nam se</a>." +msgstr "Postoji ograničenje broja zahtjeva koje možete dnevno izraditi. Ne želimo da javne ustanove budu zatrpane velikim brojem neprimjerenih zahtjeva. Ukoliko mislite da, u Vašem slučaju, imate dobar razlog zatražiti veći broj zahtjeva, molimo <a href='{{help_contact_path}}'>javite nam se</a>." msgid "There is nothing to display yet." msgstr "Još nema ničega za prikazati." @@ -2862,16 +2868,16 @@ msgid "There were no results matching your query." msgstr "Nije bilo rezultata koji odgovaraju Vašem upitu." msgid "These graphs were partly inspired by <a href=\"http://mark.goodge.co.uk/2011/08/number-crunching-whatdotheyknow/\">some statistics that Mark Goodge produced for WhatDoTheyKnow</a>, so thanks are due to him." -msgstr "Ovi su grafovi djelomično inspirirani s <a href=\"http://mark.goodge.co.uk/2011/08/number-crunching-whatdotheyknow/\">nešto statistike koju je Mark Goodge izradio za WhatDoTheyKnow</a>, pa zahvale pripadaju njemu." +msgstr "Ovi su grafovi djelomično inspirirani <a href=\"http://mark.goodge.co.uk/2011/08/number-crunching-whatdotheyknow/\"> nešto statistike koju je Mark Goodge izradio za WhatDoTheyKnow</a>, pa zahvale pripadaju njemu." msgid "They are going to reply <strong>by post</strong>" -msgstr "Odgovoriti će <strong>poštom</strong>" +msgstr "Odgovorit će <strong>poštom</strong>" msgid "They do <strong>not have</strong> the information <small>(maybe they say who does)</small>" -msgstr "Oni <strong>ne posjeduju</strong> informaciju <small>(možda mogu reći ko je posjeduje)</small>" +msgstr "Oni <strong>ne posjeduju</strong> informaciju <small>(možda mogu reći tko je posjeduje)</small>" msgid "They have been given the following explanation:" -msgstr "Dato im je slijedeće objašnjenje:" +msgstr "Dano im je sljedeće objašnjenje:" msgid "They have not replied to your {{law_used_short}} request {{title}} promptly, as normally required by law" msgstr "Nisu odgovorili na Vaš {{law_used_short}} zahtjev {{title}} u kratkom vremenskom roku, kao što je predviđeno zakonom" @@ -2905,7 +2911,7 @@ msgid "This is a plain-text version of the Freedom of Information request \"{{re msgstr "Ovo je obična tekstualna verzija zahtjeva za pristup informacijama \"{{request_title}}\". Posljednja, potpuna verzija je dostupna na {{full_url}}" msgid "This is an HTML version of an attachment to the Freedom of Information request" -msgstr "Ovo je HTML verzija priloga uz Zahtjev za slobodnom pristupu informacijama" +msgstr "Ovo je HTML verzija priloga uz Zahtjev za slobodni pristup informacijama" msgid "This is because {{title}} is an old request that has been\\nmarked to no longer receive responses." msgstr "" @@ -2916,7 +2922,7 @@ msgid "This is the first version." msgstr "Ovo je prva verzija." msgid "This is your own request, so you will be automatically emailed when new responses arrive." -msgstr "Ovo je Vaš zahtjev, biti ćete automatski obaviješteni e-mailom kada novi odgovori budu stizali." +msgstr "Ovo je Vaš zahtjev, bit ćete automatski obaviješteni e-mailom kada novi odgovori budu stizali." msgid "This message has been hidden." msgstr "Ova je poruka skrivena." @@ -2943,22 +2949,22 @@ msgid "This particular request is finished:" msgstr "Ovaj zahtjev je završen:" msgid "This person has made no Freedom of Information requests using this site." -msgstr "Ova osoba nije podnijela nijedan Zahtjev za slobodan pristup informacijama koristeći ovu web stranicu." +msgstr "Ova osoba nije podnijela nijedan Zahtjev za slobodan pristup informacijama koristeći ovu mrežnu stranicu." msgid "This person's annotations" msgstr "Napomene ove osobe" msgid "This person's {{count}} Freedom of Information request" msgid_plural "This person's {{count}} Freedom of Information requests" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "{{count}} zahtjev za pristup informacijama ove osobe" +msgstr[1] "{{count}} zahtjeva za pristup informacijama ove osobe" +msgstr[2] "{{count}} zahtjeva za pristup informacijama ove osobe" msgid "This person's {{count}} annotation" msgid_plural "This person's {{count}} annotations" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "{{count}} bilješka ove osobe" +msgstr[1] "{{count}} bilješke ove osobe" +msgstr[2] "{{count}} bilježaka ove osobe" msgid "This request <strong>requires administrator attention</strong>" msgstr "Ovaj zahtjev <strong>treba provjeru administratora</strong>" @@ -2976,12 +2982,12 @@ msgid "This request has been <strong>hidden</strong> from the site, because an a msgstr "Ovaj je zahtjev <strong>skriven</strong> sa stranice, jer ga administrator smatra uznemirujućim" msgid "This request has been <strong>reported</strong> as needing administrator attention (perhaps because it is vexatious, or a request for personal information)" -msgstr "Ovaj je zahtjev <strong>prijavljen</strong> administratoru (možda je uznemirujuć ili se zahtijeva osobne informacije)" +msgstr "Ovaj je zahtjev <strong>prijavljen</strong> administratoru (možda je uznemirujuć ili se zahtijevaju osobne informacije)" msgid "This request has been <strong>withdrawn</strong> by the person who made it.\\n There may be an explanation in the correspondence below." msgstr "" "Ovaj zahtjev je <strong>povučen</strong> od strane osobe koja ga je napravila. \n" -" <span class=\"whitespace other\" title=\"Tab\">»</span> Obijašnjenje može biti u dopisima ispod." +" <span class=\"whitespace other\" title=\"Tab\">»</span> Objašnjenje može biti u dopisima ispod." msgid "This request has been marked for review by the site administrators, who have not hidden it at this time. If you believe it should be hidden, please <a href=\"{{url}}\">contact us</a>." msgstr "Ovaj zahtjev su administratori označili za pregled, ali trenutno ga nisu sakrili. Ukoliko mislite da bi trebao biti skriven, molimo <a href=\"{{url}}\">kontaktirajte nas</a>." @@ -2993,23 +2999,23 @@ msgid "This request has been set by an administrator to \"allow new responses fr msgstr "Administrator je postavke ovog zahtjeva namjestio da \"ne dopuštaju nikome nove odgovore\"" msgid "This request has had an unusual response, and <strong>requires attention</strong> from the {{site_name}} team." -msgstr "Ovaj zahtjev je dobio neobičan odgovor, i <strong>treba pregled</strong> od strane {{site_name}} tima." +msgstr "Ovaj je zahtjev dobio neobičan odgovor, i <strong>treba pregled</strong> od strane {{site_name}} tima." msgid "This request has prominence 'hidden'. You can only see it because you are logged\\n in as a super user." msgstr "" -"Ovaj zahtjev je inače skriven. Možete ga vidjeti jer ste prijavljeni \n" +"Ovaj je zahtjev inače skriven. Možete ga vidjeti jer ste prijavljeni \n" " kao super korisnik." msgid "This request is hidden, so that only you the requester can see it. Please\\n <a href=\"{{url}}\">contact us</a> if you are not sure why." msgstr "" -"Ovaj zahtjev je skriven tako da ga samo Vi, kao podnositelj, možete vidjeti. Molimo\n" +"Ovaj je zahtjev skriven tako da ga samo Vi, kao podnositelj, možete vidjeti. Molimo\n" "<a href=\"{{url}}\">kontaktirajte nas</a> ako niste sigurni zašto." msgid "This request is still in progress:" msgstr "Ovaj zahtjev je još u tijeku:" msgid "This request requires administrator attention" -msgstr "Ovaj zahtijev treba pažnju administratora" +msgstr "Ovaj zahtjev treba pažnju administratora" msgid "This request was not made via {{site_name}}" msgstr "Ovaj zahtjev nije predan putem {{site_name}}" @@ -3017,7 +3023,7 @@ msgstr "Ovaj zahtjev nije predan putem {{site_name}}" msgid "This table shows the technical details of the internal events that happened\\nto this request on {{site_name}}. This could be used to generate information about\\nthe speed with which authorities respond to requests, the number of requests\\nwhich require a postal response and much more." msgstr "" "Ova tablica prikazuje tehničke detalje internih događaja vezanih \n" -"uz ovaj zahtjev na {{site_name}}. To se može iskoristiti za dobijanje informacija \n" +"uz ovaj zahtjev na {{site_name}}. To se može iskoristiti za dobivanje informacija \n" "o brzini kojom ustanove odgovaraju na zahtjeve, o broju zahtjeva\n" "koji trebaju odgovor poštom i mnogo drugih stvari." @@ -3035,8 +3041,8 @@ msgstr "Da biste poništili ovo upozorenje" msgid "To carry on, you need to sign in or make an account. Unfortunately, there\\nwas a technical problem trying to do this." msgstr "" -"Da biste nastavili,morate se prijaviti ili registrovati. Nažalost, problem\n" -"tehničke prirode se pojavio pri pokušaju navedenog." +"Da biste nastavili,morate se prijaviti ili registrirati. Nažalost, problem\n" +"tehničke prirode pojavio se pri pokušaju navedenog." msgid "To change your email address used on {{site_name}}" msgstr "Da biste promijenili Vašu e-mail adresu korištenu na {{site_name}}" @@ -3045,13 +3051,13 @@ msgid "To classify the response to this FOI request" msgstr "Da biste klasificirali odgovor na ovaj Zahtjev za slobodan pristup informacijama" msgid "To do that please send a private email to " -msgstr "Da biste to uradili molimo pošaljite privatni e-mail " +msgstr "Da biste to učinili, molimo pošaljite privatni e-mail " msgid "To do this, first click on the link below." -msgstr "Da biste ovo uradili, prvo kliknite na link ispod." +msgstr "Da biste ovo učinili, prvo kliknite na poveznicu ispod." msgid "To download the zip file" -msgstr "Da biste preuzeli zip file" +msgstr "Da biste preuzeli zip datoteku" msgid "To follow all successful requests" msgstr "Da biste pratili sve uspješne zahtjeve" @@ -3060,7 +3066,7 @@ msgid "To follow new requests" msgstr "Da biste pratili nove zahtjeve" msgid "To follow requests and responses matching your search" -msgstr "Da biste pratili zahtjeve i odgovore koji se podudaraju sa Vašom pretragom" +msgstr "Da biste pratili zahtjeve i odgovore koji se podudaraju s Vašom pretragom" msgid "To follow requests by '{{user_name}}'" msgstr "Da biste pratili zahtjeve korisnika '{{user_name}}'" @@ -3075,10 +3081,10 @@ msgid "To help us keep the site tidy, someone else has updated the status of the msgstr "Kako bi nam pomogao očuvati stranicu urednom, netko je ažurirao status zahtjeva {{title}} prema {{law_used_full}}, kojeg ste uputili {{public_body}}, u \"{{display_status}}\" Ako se ne slažete s njihovom kategorizacijom, molimo osobno ažurirajte status na način koji mislite da je točniji." msgid "To let everyone know, follow this link and then select the appropriate box." -msgstr "Kako biste sve obavijestili, pratite ovaj link i označite odgovarajuće polje." +msgstr "Kako biste sve obavijestili, pratite ovu poveznicu i označite odgovarajuće polje." msgid "To log into the administrative interface" -msgstr "Za prijavu u administratorsko sučelje" +msgstr "Za prijavu na administratorsko sučelje" msgid "To make a batch request" msgstr "Da biste napravili skupni zahtjev" @@ -3096,28 +3102,28 @@ msgid "To report this request" msgstr "Da biste prijavili ovaj zahtjev" msgid "To send a follow up message to " -msgstr "Da biste polali prateću poruku za " +msgstr "Da biste poslali prateću poruku za " msgid "To send a message to " -msgstr "Da biste poslali poruku za " +msgstr "Da biste poslali poruku " msgid "To send your FOI request" -msgstr "Da biste poslali Vaš Zahtjev za slobodan pristup informacijama." +msgstr "Da biste poslali Vaš Zahtjev za pristup informacijama." msgid "To update the status of this FOI request" -msgstr "Da biste ažurirali status Vašeg Zahtjeva za slobodan pristup informacijama." +msgstr "Da biste ažurirali status Vašeg Zahtjeva za pristup informacijama." msgid "To upload a response, you must be logged in using an email address from " msgstr "Da biste postavili odgovor, morate biti prijavljeni koristeći pritom e-mail adresu sa" msgid "To use the advanced search, combine phrases and labels as described in the search tips below." -msgstr "Da biste koristili napredno pretraživanje, kombinujte fraze i oznake kao što je opisano u savjetima za pretragu ispod." +msgstr "Da biste koristili napredno pretraživanje, kombinirajte fraze i oznake kao što je opisano u savjetima za pretragu ispod." msgid "To view the email address that we use to send FOI requests to {{public_body_name}}, please enter these words." -msgstr "Da biste vidjeli e-mail adresu koju koristimo za slanje Zahtjeva za slobodan pristup informacijama prema {{public_body_name}}, molimo unesite ove riječi.." +msgstr "Da biste vidjeli e-mail adresu koju koristimo za slanje Zahtjeva za pristup informacijama prema {{public_body_name}}, molimo unesite ove riječi.." msgid "To view the response, click on the link below." -msgstr "Da biste vidjeli odgovor, kliknite na link ispod." +msgstr "Da biste vidjeli odgovor, kliknite na poveznicu ispod." msgid "To {{public_body_link_absolute}}" msgstr "Za {{public_body_link_absolute}}" @@ -3135,31 +3141,31 @@ msgid "Top search results:" msgstr "Glavni rezultati pretrage" msgid "Track thing" -msgstr "" +msgstr "Pratite stvar" msgid "Track this person" -msgstr "Prati ovu osobu" +msgstr "Pratite ovu osobu" msgid "Track this search" msgstr "Pratite ovu pretragu." msgid "TrackThing|Track medium" -msgstr "" +msgstr "PratiStvar|Prati medij" msgid "TrackThing|Track query" -msgstr "" +msgstr "PratiStvar|Prati upit" msgid "TrackThing|Track type" -msgstr "" +msgstr "PratiStvar|Prati tip" msgid "Turn off email alerts" msgstr "Isključi obavijesti putem e-maila" msgid "Tweet this request" -msgstr "Tweetuj ovaj zahtjev" +msgstr "Tweetaj ovaj zahtjev" msgid "Type <strong><code>01/01/2008..14/01/2008</code></strong> to only show things that happened in the first two weeks of January." -msgstr "Ukucajte <strong><code>01/01/2008..14/01/2008</code></strong> da prikažete samo ono što se dešavalo u prve dvije sedmice januara." +msgstr "Ukucajte <strong><code>01/01/2008..14/01/2008</code></strong> da prikažete samo ono što se događalo prva dva tjedna siječnja." msgid "URL name can't be blank" msgstr "Ime URL-a ne može ostati prazno " @@ -3174,7 +3180,7 @@ msgid "Unable to send a reply to {{username}}" msgstr "Ne možemo poslati poruku za {{username}}" msgid "Unable to send follow up message to {{username}}" -msgstr "Ne možemo poslati popratnu pokuku za {{username}}" +msgstr "Ne možemo poslati popratnu poruku za {{username}}" msgid "Unclassified or hidden requests are not counted." msgstr "Neklasificirani i skriveni zahtjevi se ne broje." @@ -3184,8 +3190,8 @@ msgstr "Neočekivani tip rezultata pretraživanja" msgid "Unfortunately we don't know the FOI\\nemail address for that authority, so we can't validate this.\\nPlease <a href=\"{{url}}\">contact us</a> to sort it out." msgstr "" -"Nažalost nismo u posjedu e-mail adrese za ZOSPI\n" -"te ustanove, tako da nismo u mogućnosti validirati ovo.\n" +"Nažalost nismo u posjedu e-mail adrese za Zahtjeve za pristup informacijama\n" +"te ustanove, tako da nismo u mogućnosti odobriti ovo.\n" "Molimo <a href=\"{{url}}\">kontaktirajte nas</a> da to razjasnimo." msgid "Unfortunately, we do not have a working address for {{public_body_names}}." @@ -3200,16 +3206,16 @@ msgid "Unknown" msgstr "Nepoznat" msgid "Unsubscribe" -msgstr "Odjavi pretplatu" +msgstr "Odjavite pretplatu" msgid "Unusual response." msgstr "Neobičan odgovor." msgid "Update email address - {{public_body_name}}" -msgstr "Ažuriraj e-mail adresu - {{public_body_name}}" +msgstr "Ažurirajte adresu e-pošte - {{public_body_name}}" msgid "Update the address:" -msgstr "Ažuriraj adresu:" +msgstr "Ažurirajte adresu:" msgid "Update the status of this request" msgstr "Ažurirajte status ovog zahtjeva" @@ -3218,28 +3224,28 @@ msgid "Update the status of your request to " msgstr "Ažurirajte status Vašeg zahtjeva" msgid "Upload FOI response" -msgstr "Učitaj odgovor nazahtjev za pristup informacijama" +msgstr "Učitajte odgovor na Zahtjev za pristup informacijama" msgid "Use OR (in capital letters) where you don't mind which word, e.g. <strong><code>commons OR lords</code></strong>" -msgstr "" +msgstr "Koristite OR (velikim tiskanim slovima) kada vam nije bitno koja riječ, npr. <strong><code>commons OR lords</code></strong>" msgid "Use quotes when you want to find an exact phrase, e.g. <strong><code>\"Liverpool City Council\"</code></strong>" -msgstr "Koristite navodnike kada želite naći tačne fraze, npr. <strong><code>\"Liverpool City Council\"</code></strong>" +msgstr "Koristite navodnike kada želite naći točne fraze, npr. <strong><code>\"Liverpool City Council\"</code></strong>" msgid "User" msgstr "Korisnik" msgid "User info request sent alert" -msgstr "" +msgstr "Obavijest o korisnikovom zahtjevu za informacijama poslana" msgid "User – {{name}}" msgstr "Korisnik – {{name}}" msgid "UserInfoRequestSentAlert|Alert type" -msgstr "" +msgstr "UserInfoRequestSentAlert|Alert type" msgid "Users cannot usually make batch requests to multiple authorities at once because we don’t want public authorities to be bombarded with large numbers of inappropriate requests. Please <a href=\"{{url}}\">contact us</a> if you think you have good reason to send the same request to multiple authorities at once." -msgstr "Korisnici obično ne mogu raditi skupne zahtjeve prema više nadležnih tijela odjednom jer ne želimo da javna tijela budu zatrpana velikim brojem neprimjerenih zahtjeva. Molimo <a href=\"{{url}}\">kontaktirajte nas</a> ako mislite da imate dobar razlog za slanje istovjetnog zahtjeva na više nadležnih tijea odjednom." +msgstr "Korisnici obično ne mogu raditi skupne zahtjeve prema više nadležnih tijela odjednom jer ne želimo da javna tijela budu zatrpana velikim brojem neprimjerenih zahtjeva. Molimo <a href=\"{{url}}\">kontaktirajte nas</a> ako mislite da imate dobar razlog za slanje istovjetnog zahtjeva na više nadležnih tijela odjednom." msgid "User|About me" msgstr "Korisnik|O meni" @@ -3257,10 +3263,10 @@ msgid "User|Email" msgstr "Korisnik|E-mail" msgid "User|Email bounce message" -msgstr "" +msgstr "Korisnik|Email preusmjerena poruka" msgid "User|Email bounced at" -msgstr "" +msgstr "Korisnik|Email preusmjeren" msgid "User|Email confirmed" msgstr "Korisnik | E-mail potvrđen" @@ -3275,7 +3281,7 @@ msgid "User|Last daily track email" msgstr "Korisnik|Last daily track email" msgid "User|Locale" -msgstr "" +msgstr "Korisnik|Mjesni" msgid "User|Name" msgstr "Korisnik|Ime" @@ -3299,16 +3305,16 @@ msgid "Vexatious" msgstr "Uznemirujuće" msgid "View FOI email address" -msgstr "Vidjeti adresu za Zahtjeve za slobodan pristup informacijama." +msgstr "Vidjeti adresu za Zahtjeve za pristup informacijama." msgid "View FOI email address for '{{public_body_name}}'" -msgstr "Vidjeti ZOSPI e-mail za '{{public_body_name}}'" +msgstr "Vidjeti e-mail za Zahtjeve za pristup informacijama prema '{{public_body_name}}'" msgid "View FOI email address for {{public_body_name}}" -msgstr "Pogledati ZOSPI e-mail adrese za {{public_body_name}}" +msgstr "Vidjeti e-mail adrese za Zahtjeve za pristup informacijama prema {{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}}:" +msgstr "Pregledati Zahtjeve za slobodan pristup informacijama napravljene od strane {{user_name}}:" msgid "View authorities" msgstr "Vidjeti ustanove" @@ -3317,7 +3323,7 @@ msgid "View email" msgstr "Pogledati e-mail" msgid "Waiting clarification." -msgstr "Čekamo na objašnjenje." +msgstr "Čekamo objašnjenje." msgid "Waiting for an <strong>internal review</strong> by {{public_body_link}} of their handling of this request." msgstr "Čeka se <strong>interni pregled</strong> {{public_body_link}} njihovog rješavanja ovog zahtjeva." @@ -3326,13 +3332,13 @@ msgid "Waiting for the public authority to complete an internal review of their msgstr "Čeka se da nadležno tijelo dovrši interni pregled rješavanja zahtjeva." msgid "Waiting for the public authority to reply" -msgstr "Čekamo na odgovor javne ustanove" +msgstr "Čekamo odgovor javne ustanove" msgid "Was the response you got to your FOI request any good?" -msgstr "Da li je odgovor koji ste dobili na Vaš Zahtjev o slobodnom pristupu informacijama bio od ikakve koristi?" +msgstr "Je li odgovor koji ste dobili na Vaš Zahtjev za pristup informacijama bio od ikakve koristi?" msgid "We consider it is not a valid FOI request, and have therefore hidden it from other users." -msgstr "Smatramo da ovo nije valjan zathjev za pristup informacijama, stoga smo ga sakrili od ostalih korisnika." +msgstr "Smatramo da ovo nije valjan Zahtjev za pristup informacijama, stoga smo ga sakrili od ostalih korisnika." msgid "We consider it to be vexatious, and have therefore hidden it from other users." msgstr "Smatramo da je ovo uznemirujuće, stoga smo sakrili od ostalih korisnika." @@ -3345,50 +3351,50 @@ msgstr "Nemamo ispravnu {{law_used_full}} adresu za {{public_body_name}}." msgid "We don't know whether the most recent response to this request contains\\n information or not\\n –\\n\tif you are {{user_link}} please <a href=\"{{url}}\">sign in</a> and let everyone know." msgstr "" -"Ne znamo da li najnoviji odgovor na ovaj zahtjev sadrži\n" +"Ne znamo sadrži li najnoviji odgovor na ovaj zahtjev\n" " informacije ili ne\n" " –\n" -"<span class=\"whitespace other\" title=\"Tab\">»</span>ako ste {{user_link}} molimo <a href=\"{{url}}\">prijavite se</a> i obavijestite sviju." +"<span class=\"whitespace other\" title=\"Tab\">»</span>ako ste {{user_link}} molimo <a href=\"{{url}}\">prijavite se</a> i obavijestite sve." 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 "" -"Nećemo otkriti Vašu e-mail adresu nikome, osim ako na Vi\n" +"Nećemo otkriti Vašu e-mail adresu nikome, osim ako Vi\n" "ili zakon tako ne kaže (<a href=\"{{url}}\">detalji</a>). " msgid "We will not reveal your email address to anybody unless you\\nor the law tell us to." msgstr "" -"Nećemo prikazati Vašu e-mail adresu nikome sem ako nam Vi\n" -"ili zakon to budete zahtijevali." +"Nećemo prikazati Vašu e-mail adresu nikome osim ako Vi\n" +"ili zakon budete to zahtijevali." msgid "We will not reveal your email addresses to anybody unless you\\nor the law tell us to." msgstr "" -"Nećemo prikazati Vašu e-mail adresu nikome sem ako nam Vi\n" +"Nećemo prikazati Vašu e-mail adresu nikome osim ako Vi\n" "ili zakon to budete zahtijevali." msgid "We're waiting for" -msgstr "Čekamo na vas" +msgstr "Čekamo " msgid "We're waiting for someone to read" msgstr "Čekamo da neko pročita" msgid "We've sent an email to your new email address. You'll need to click the link in\\nit before your email address will be changed." msgstr "" -"Poslali smo e-mail na Vašu novu e-mail adresu. Morati ćete kliknuti na link u\n" -"njemu prije nego Vaša adresa bude izmjenjena." +"Poslali smo e-mail na Vašu novu e-mail adresu. Morati ćete kliknuti na poveznicu u\n" +"njemu prije nego Vaša adresa bude izmijenjena." msgid "We've sent you an email, and you'll need to click the link in it before you can\\ncontinue." msgstr "" -"Poslali smo Vam e-mail, trebate kliknuti na link u njemu prije nego što \n" +"Poslali smo Vam e-mail, trebate kliknuti na poveznicu u njemu prije nego što \n" "nastavite." msgid "We've sent you an email, click the link in it, then you can change your password." -msgstr "Poslali smo Vam e-mail, kliknite na link u njemu, onda ćete moći promjeniti Vaš password." +msgstr "Poslali smo Vam e-mail, kliknite na poveznicu u njemu, onda ćete moći promjeniti Vašu lozinku." msgid "What are you doing?" -msgstr "Šta radite?" +msgstr "Što radite?" msgid "What best describes the status of this request now?" -msgstr "Šta najbolje opisuje status ovog zahtjeva sada?" +msgstr "Što najbolje opisuje status ovog zahtjeva sada?" msgid "What information has been released?" msgstr "Koje su informacije objavljene?" @@ -3398,8 +3404,8 @@ msgstr "Koje su informacije zatražene?" msgid "When you get there, please update the status to say if the response \\ncontains any useful information." msgstr "" -"Kada dođete do toga, molimo ažurirajte status da nam kažete da li \n" -"je odgovor sadržavao korisne informacije." +"Kada dođete do toga, molimo ažurirajte status da nam kažete je li\n" +"odgovor sadržavao korisne informacije." msgid "When you receive the paper response, please help\\n others find out what it says:" msgstr "" @@ -3410,7 +3416,7 @@ msgid "When you're done, <strong>come back here</strong>, <a href=\"{{url}}\">re msgstr "Kada završite, <strong>vratite se ovdje</strong>, <a href=\"{{url}}\">učitajte ponovo ovu stranicu</a> i spremite Vaš novi zahtjev." msgid "Which of these is happening?" -msgstr "Šta se od ovoga događa?" +msgstr "Što se od ovoga događa?" msgid "Who can I request information from?" msgstr "Od koga mogu tražiti informacije?" @@ -3419,13 +3425,13 @@ msgid "Why specifically do you consider this request unsuitable?" msgstr "Zašto ovaj zahtjev smatrate neodgovarajućim?" msgid "Withdrawn by the requester." -msgstr "Povučeno od strane podnosioca zahtjeva." +msgstr "Povučeno od strane podnositelja zahtjeva." msgid "Wk" -msgstr "" +msgstr "Wk" msgid "Would you like to see a website like this in your country?" -msgstr "Da li biste htjeli vidjeti ovakvu web stranicu u Vašoj zemlji?" +msgstr "Biste li htjeli vidjeti ovakvu mrežnu stranicu u Vašoj zemlji?" msgid "Write a reply" msgstr "Napisati odgovor" @@ -3479,7 +3485,7 @@ msgid "You are already subscribed to any <a href=\"{{successful_requests_url}}\" msgstr "Već ste pretplaćeni na sve <a href=\"{{successful_requests_url}}\">uspješne zahtjeve</a>." msgid "You are currently receiving notification of new activity on your wall by email." -msgstr "Trenutno putem e-maila dobijate obavijesti o novim aktivnostima na vašem zidu." +msgstr "Trenutno e-poštom dobivate obavijesti o novim aktivnostima na vašem zidu." msgid "You are following all new successful responses" msgstr "Pratite sve nove uspješne odgovore" @@ -3528,6 +3534,8 @@ msgstr "Možete promijeniti zahtjeve i korisnike koje pratite na <a href=\"{{pro msgid "You can get this page in computer-readable format as part of the main JSON\\npage for the request. See the <a href=\"{{api_path}}\">API documentation</a>." msgstr "" +"Možete ovu stranicu dobiti u strojno čitljivom obliku kao dio glavne JSON\n" +"stranice za zahtjeve. Pogledajte <a href=\"{{api_path}}\">API documentaciju</a>." msgid "You can only request information about the environment from this authority." msgstr "Možete samo zahtijevati informacije o okolišu od ove ustanove." @@ -3536,13 +3544,13 @@ msgid "You have a new response to the {{law_used_full}} request " msgstr "Imate novi odgovor na {{law_used_full}} zahtjev " msgid "You have found a bug. Please <a href=\"{{contact_url}}\">contact us</a> to tell us about the problem" -msgstr "Pronašli ste programsku grešku. Molimo <a href=\"{{contact_url}}\">kontaktirajte nas</a> da nam ukažete na problem" +msgstr "Pronašli ste programsku pogrešku. Molimo <a href=\"{{contact_url}}\">kontaktirajte nas</a> da nam ukažete na problem" msgid "You have hit the rate limit on new requests. Users are ordinarily limited to {{max_requests_per_user_per_day}} requests in any rolling 24-hour period. You will be able to make another request in {{can_make_another_request}}." -msgstr "Dosegli ste limit novih zahtjeva. Korisnici su ograničeni na {{max_requests_per_user_per_day}} zahtjeva u periodu od 24 sata. Novi zatjev će biti moguć za {{can_make_another_request}}." +msgstr "Dosegli ste limit novih zahtjeva. Korisnici su ograničeni na {{max_requests_per_user_per_day}} zahtjeva u periodu od 24 sata. Novi zatjev bit će moguć za {{can_make_another_request}}." msgid "You have made no Freedom of Information requests using this site." -msgstr "Niste podnijeli nijedan Zahtjev za slobodan pristup informacijama koristeći ovu web stranicu. " +msgstr "Niste podnijeli nijedan Zahtjev za slobodan pristup informacijama koristeći ovu mrežnu stranicu. " msgid "You have now changed the text about you on your profile." msgstr "Sada ste promijenili tekst o Vama na Vašem profilu." @@ -3552,14 +3560,14 @@ msgstr "Sada ste promijenili Vašu e-mail adresu korištenu na {{site_name}}" msgid "You just tried to sign up to {{site_name}}, when you\\nalready have an account. Your name and password have been\\nleft as they previously were.\\n\\nPlease click on the link below." msgstr "" -"Probali ste da se registrujete {{site_name}}, mada već\n" -"imate račun. Vaše ime i password su ostali\n" +"Probali ste se registrirati {{site_name}}, mada već\n" +"imate račun. Vaše ime i lozinka ostali su\n" "isti kao prije.\n" "\n" -"Molimo kliknite na link ispod." +"Molimo kliknite na poveznicu ispod." msgid "You know what caused the error, and can <strong>suggest a solution</strong>, such as a working email address." -msgstr "Znate šta je uzrok greške i možete <strong>predložiti rješenje</strong>, poput ispravne e-mail adrese." +msgstr "Znate što je uzrok pogrešci i možete <strong>predložiti rješenje</strong>, poput ispravne e-mail adrese." msgid "You may <strong>include attachments</strong>. If you would like to attach a\\n file too large for email, use the form below." msgstr "" @@ -3567,18 +3575,18 @@ msgstr "" "prevelik za e-mail, koristite obrazac ispod." msgid "You may be able to find one on their website, or by phoning them up and asking. If you manage to find one, then please send it to us:" -msgstr "Možda ćete pronaći na njihovoj web stranici, ili ih možete nazvati i pitati. Ukoliko uspijete pronaći, molimo pošaljite nam:" +msgstr "Možda ćete pronaći na njihovoj mrežnoj stranici, ili ih možete nazvati i pitati. Ukoliko uspijete pronaći, molimo pošaljite nam:" msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"{{url}}\">send it to us</a>." msgstr "" "Moguće je da je nađete\n" -" na njihovoj web stranici, ili putem telefonskog poziva. Ako uspijete\n" -" da je nađete, onda molimo <a href=\"{{url}}\">da nam je pošaljete</a>." +" na njihovoj mrežnoj stranici, ili telefonskim pozivom. Ako je uspijete\n" +" naći, onda molimo <a href=\"{{url}}\">da nam je pošaljete</a>." msgid "You may be able to find\\none on their website, or by phoning them up and asking. If you manage\\nto find one, then please <a href=\"{{help_url}}\">send it to us</a>." msgstr "" "Možete ga naći\n" -"na njihovoj web-stranici, ili ih pitati putem telefona. Ako ga uspijete\n" +"na njihovoj mrežnoj stranici, ili ih pitati telefonom. Ako ga uspijete\n" "naći, tada molimo <a href=\"{{help_url}}\">pošaljite nam ga</a>." msgid "You need to be logged in to change the text about you on your profile." @@ -3600,50 +3608,50 @@ msgid "You previously submitted that exact follow up message for this request." msgstr "Prethodno ste predali istu popratnu poruku za ovaj zahtjev." msgid "You should have received a copy of the request by email, and you can respond\\n by <strong>simply replying</strong> to that email. For your convenience, here is the address:" -msgstr "Trebali biste primiti kopiju zahtjeva e-mailom. Možete odgovoriti <strong>odgovaranjem</strong> na taj e-mail. to that email. Kako bi Vam bilo laše, ovdje je adresa:" +msgstr "Trebali biste primiti kopiju zahtjeva e-mailom. Možete odgovoriti <strong>odgovaranjem</strong> na taj e-mail. Kako bi Vam bilo lakše, ovdje je adresa:" msgid "You want to <strong>give your postal address</strong> to the authority in private." -msgstr "Želite da <strong>date vašu poštansku adresu</strong> isključivo ustanovi." +msgstr "Želite <strong> dati svoju poštansku adresu</strong> isključivo ustanovi." msgid "You will be unable to make new requests, send follow ups, add annotations or\\nsend messages to other users. You may continue to view other requests, and set\\nup\\nemail alerts." msgstr "" "Nećete biti u mogućnosti izrađivati nove zahtjeve, slati prateće poruke, dodavati bilješke\n" "niti slati poruke drugim korisnicima. Bit ćete u mogućnosti vidjeti druge zahtjeve i \n" "postavljati\n" -"obavijesti putem e-maila." +"obavijesti e-poštom." msgid "You will no longer be emailed updates for those alerts" -msgstr "Više vam nećemo slati ažuriranja za ova upozorenja" +msgstr "Više Vam nećemo slati ažuriranja za ova upozorenja" msgid "You will now be emailed updates about '{{link_to_authority}}', a public authority." -msgstr "Od sada ćete e-mailom dobijati obavijesti o '{{link_to_authority}}', javnoj ustanovi." +msgstr "Od sada ćete e-poštom dobivati obavijesti o '{{link_to_authority}}', javnoj ustanovi." msgid "You will now be emailed updates about '{{link_to_request}}', a request." -msgstr "Od sada ćete e-mailom dobijati obavijesti o '{{link_to_request}}', zahtjevut." +msgstr "Od sada ćete e-poštom dobivati obavijesti o '{{link_to_request}}', zahtjevu." msgid "You will now be emailed updates about '{{link_to_user}}', a person." -msgstr "Od sada ćete e-mailom dobijati obavijesti o '{{link_to_user}}', osobi." +msgstr "Od sada ćete e-poštom dobivati obavijesti o '{{link_to_user}}', osobi." msgid "You will now be emailed updates about <a href=\"{{search_url}}\">this search</a>." -msgstr "Od sada ćete e-mailom dobijati obavijesti o <a href=\"{{search_url}}\">ovom pretraživanju</a>." +msgstr "Od sada ćete e-poštom dobivati obavijesti o <a href=\"{{search_url}}\">ovom pretraživanju</a>." msgid "You will now be emailed updates about <a href=\"{{successful_requests_url}}\">successful requests</a>." -msgstr "Od sada ćete e-mailom dobijati obavijesti o <a href=\"{{successful_requests_url}}\">uspješnim zahtjevima</a>." +msgstr "Od sada ćete e-poštom dobivati obavijesti o <a href=\"{{successful_requests_url}}\">uspješnim zahtjevima</a>." msgid "You will now be emailed updates about any <a href=\"{{new_requests_url}}\">new requests</a>." -msgstr "Od sada ćete e-mailom dobijati obavijesti o svim <a href=\"{{new_requests_url}}\">novim zahtjevima</a>." +msgstr "Od sada ćete e-poštom dobivati obavijesti o svim <a href=\"{{new_requests_url}}\">novim zahtjevima</a>." msgid "You will only get an answer to your request if you follow up\\nwith the clarification." msgstr "Odgovor na Vaš zahtjev dobit ćete samo ako ga popratite pojašnjenjem." msgid "You will still be able to view it while logged in to the site. Please reply to this email if you would like to discuss this decision further." -msgstr "Još uvijek će Vam biti vidljivo kad ste prijavljeni na stranici. Molimo, odgovorite na ovaj e-mail ukoliko ovu odluku želite dodatno raspraviti." +msgstr "Još uvijek će Vam biti vidljivo kad ste prijavljeni na stranici. Molimo, odgovorite na ovu e-poštu ako ovu odluku želite dodatno raspraviti." msgid "You're in. <a href=\"#\" id=\"send-request\">Continue sending your request</a>" -msgstr "" +msgstr "Prijavljeni ste. <a href=\"#\" id=\"send-request\">Nastavite sa slanjem Vašeg zahtjeva</a>" msgid "You're long overdue a response to your FOI request - " -msgstr "" +msgstr "Prilično kasnite odgovoriti na vaš FOI zahtjev" msgid "You're not following anything." msgstr "Ne pratite ništa." @@ -3653,7 +3661,7 @@ msgstr "Sada ste izbrisali sliku na Vašem profilu" msgid "Your <strong>name will appear publicly</strong>\\n (<a href=\"{{why_url}}\">why?</a>)\\n on this website and in search engines. If you\\n are thinking of using a pseudonym, please\\n <a href=\"{{help_url}}\">read this first</a>." msgstr "" -"Vaše<strong>ime će biti javno vidljivo</strong>\n" +"Vaše<strong>ime bit će javno vidljivo</strong>\n" "(<a href=\"{{why_url}}\">zašto?</a>)\n" "na ovoj stranici i pretraživačima. Ako razmišljate o korištenju pseudonima, molimo\n" "<a href=\"{{help_url}}\">prvo ovo pročitajte</a>." @@ -3665,22 +3673,22 @@ msgid "Your batch request \"{{title}}\" has been sent" msgstr "Vaš skupni zahtjev \"{{title}}\" je poslan" msgid "Your details, including your email address, have not been given to anyone." -msgstr "Vaši detalji, uključujući vašu e-mail adresu, neće biti nikome dostupni." +msgstr "Vaši detalji, uključujući Vašu adresu e-pošte, neće biti nikome dostupni." msgid "Your e-mail:" -msgstr "Vaš e-mail:" +msgstr "Vaša e-pošta:" msgid "Your email doesn't look like a valid address" -msgstr "Vaš e-mail ne izgleda kao valjana adresa. " +msgstr "Vaša adresa e-pošte ne izgleda valjanom. " msgid "Your follow up has not been sent because this request has been stopped to prevent spam. Please <a href=\"{{url}}\">contact us</a> if you really want to send a follow up message." -msgstr "" +msgstr "Vaša popratna poruka nije poslana jer je ovaj zahtjev zaustavljen kako bi se spriječila neželjena pošta. Molimo <a href=\"{{url}}\">kontaktirajte nas</a> ako stvarno želite poslati popratnu poruku." msgid "Your follow up message has been sent on its way." msgstr "Vaša prateća poruka je na putu." msgid "Your internal review request has been sent on its way." -msgstr "Vaša urgencija je na putu." +msgstr "Vaš interni pregled je na putu." msgid "Your message has been sent. Thank you for getting in touch! We'll get back to you soon." msgstr "Vaša poruka je poslana. Hvala na javljanju! Ubrzo ćemo odgovoriti." @@ -3709,16 +3717,18 @@ msgid "Your original message is attached." msgstr "Vaša originalna poruka je pridružena." msgid "Your password has been changed." -msgstr "Vaš password je promijenjen." +msgstr "Vaša je lozinka promijenjena." msgid "Your password:" -msgstr "Vaš password:" +msgstr "Vaša lozinka:" msgid "Your photo will be shown in public <strong>on the Internet</strong>,\\n wherever you do something on {{site_name}}." msgstr "" +"Vaša će slika biti prikazana javno <strong> na internetu</strong>,\n" +" svugdje gdje učinite nešto na {{site_name}}." msgid "Your request '{{request}}' at {{url}} has been reviewed by moderators." -msgstr "Vaš zahtjev '{{request}}' na {{url}} su pregledali moderatori." +msgstr "Vaš zahtjev '{{request}}' na {{url}} pregledali su moderatori." msgid "Your request on {{site_name}} hidden" msgstr "Vaš zahtjev na {{site_name}} je skriven" @@ -3730,46 +3740,46 @@ msgid "Your request to add {{public_body_name}} to {{site_name}}" msgstr "Vaš zahtjev da dodamo javnu ustanovu {{public_body_name}} na {{site_name}}" msgid "Your request to update the address for {{public_body_name}} has been sent. Thank you for getting in touch! We'll get back to you soon." -msgstr "" +msgstr "Vaš zahtjev za ažuriranjem adrese za {{public_body_name}} je poslan. Hvala što ste nas kontaktirali! Javit ćemo se uskoro." msgid "Your request to update {{public_body_name}} on {{site_name}}" -msgstr "" +msgstr "Vaš zahtjev za ažuriranjem {{public_body_name}} na {{site_name}}" msgid "Your request was called {{info_request}}. Letting everyone know whether you got the information will help us keep tabs on" -msgstr "Naziv Vašeg zahtjeva je {{info_request}}. Obavijest o tome da li ste dobili odgovor će nam pomoći da bolje pratimo." +msgstr "Naziv Vašeg zahtjeva je {{info_request}}. Obavijest o tome jeste li dobili odgovor pomoći će nam da bolje pratimo." msgid "Your request:" msgstr "Vaš zahtjev:" msgid "Your response to an FOI request was not delivered" -msgstr "" +msgstr "Vaš odgovor na Zahtjev za pristup informacijama nije dostavljen" msgid "Your response will <strong>appear on the Internet</strong>, <a href=\"{{url}}\">read why</a> and answers to other questions." -msgstr "Vaš odgovor će se <strong>pojaviti na Internetu</strong>, <a href=\"{{url}}\">pročitajte zašto</a> i odgovore na druga pitanja." +msgstr "Vaš odgovor će se <strong>pojaviti na internetu</strong>, <a href=\"{{url}}\">pročitajte zašto</a> i odgovore na druga pitanja." msgid "Your selected authorities" msgstr "Ustanove koje ste odabrali" msgid "Your thoughts on what the {{site_name}} <strong>administrators</strong> should do about the request." -msgstr "Vaše mišljenje o tome šta administratori {{site_name}} trebaju da rade po pitanju zahtjeva." +msgstr "Vaše mišljenje o tome što administratori {{site_name}} trebaju raditi po pitanju zahtjeva." msgid "Your {{count}} Freedom of Information request" msgid_plural "Your {{count}} Freedom of Information requests" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "Vaš {{count}} zahtjev za pristup informacijama" +msgstr[1] "Vaša {{count}} zahtjeva za pristup informacijama" +msgstr[2] "Vaših {{count}} zahtjeva za pristup informacijama" msgid "Your {{count}} annotation" msgid_plural "Your {{count}} annotations" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "Vaša {{count}} bilješka" +msgstr[1] "Vaše {{count}} bilješke" +msgstr[2] "Vaših {{count}} bilješki" msgid "Your {{count}} batch requests" msgid_plural "Your {{count}} batch requests" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "Vaš {{count}} skupni zahtjev" +msgstr[1] "Vaša {{count}} skupna zahtjeva" +msgstr[2] "Vaših {{count}} skupnih zahtjeva" msgid "Your {{site_name}} email alert" msgstr "Vaše {{site_name}} e-mail upozorenje" @@ -3787,7 +3797,7 @@ msgid "[Authority URL will be inserted here]" msgstr "[URL ustanove bit će ovdje umetnut]" msgid "[FOI #{{request}} email]" -msgstr "" +msgstr "[ZPPI #{{request}} email]" msgid "[{{public_body}} request email]" msgstr "[{{public_body}} e-mail za zahtjeve]" @@ -3797,6 +3807,8 @@ msgstr "[{{site_name}} kontakt e-mail]" msgid "\\n\\n[ {{site_name}} note: The above text was badly encoded, and has had strange characters removed. ]" msgstr "" +"\n" +"\\n\\n[ {{site_name}} napomena: Tekst gore loše je kodiran, te su uklonjeni neobični znakovi. ]" msgid "a one line summary of the information you are requesting, \\n\t\t\te.g." msgstr "" @@ -3807,7 +3819,7 @@ msgid "admin" msgstr "administrator" msgid "alaveteli_foi:The software that runs {{site_name}}" -msgstr "" +msgstr "alaveteli_foi: Softver koji pokreće {{site_name}}" msgid "all requests" msgstr "svi zahtjevi" @@ -3819,10 +3831,10 @@ msgid "all requests or comments matching text '{{query}}'" msgstr "svi zahtjevi ili komentari koji odgovaraju tekstu '{{query}}'" msgid "also called {{public_body_short_name}}" -msgstr "takođe poznat/a kao {{public_body_short_name}}" +msgstr "također poznat/a kao {{public_body_short_name}}" msgid "an anonymous user" -msgstr "anonimni korisnik" +msgstr "anonimni/a korisnik/ca" msgid "and" msgstr "i" @@ -3834,7 +3846,7 @@ msgid "and update the status." msgstr "i ažurirajte status." msgid "and we'll suggest <strong>what to do next</strong>" -msgstr "i mi ćemo predložiti <strong>šta raditi dalje</strong>" +msgstr "i mi ćemo predložiti <strong>što raditi dalje</strong>" msgid "anything matching text '{{query}}'" msgstr "sve što odgovara tekstu '{{query}}'" @@ -3843,7 +3855,7 @@ msgid "are long overdue." msgstr "kasne" msgid "at" -msgstr "" +msgstr "na" msgid "authorities" msgstr "ustanove" @@ -3852,7 +3864,7 @@ msgid "beginning with ‘{{first_letter}}’" msgstr "početno slovo je ‘{{first_letter}}’" msgid "but followupable" -msgstr "" +msgstr "ali mogu se pratiti" msgid "by" msgstr "od strane" @@ -3868,8 +3880,8 @@ msgstr "komentari" msgid "containing your postal address, and asking them to reply to this request.\\n Or you could phone them." msgstr "" -"sa Vašom poštanskom adresom, tražite da odgovore na ovaj zahtjev.\n" -" Ili ih možete kontaktirati putem telefona." +"s Vašom poštanskom adresom, tražite da odgovore na ovaj zahtjev.\n" +" Ili ih možete kontaktirati telefonom." msgid "details" msgstr "detalji" @@ -3878,7 +3890,7 @@ msgid "display_status only works for incoming and outgoing messages right now" msgstr "display_status trenutno radi samo za dolazne i odlazne poruke" msgid "during term time" -msgstr "" +msgstr "unutar roka" msgid "e.g. Ministry of Defence" msgstr "npr. Ministarstvo obrane" @@ -3914,16 +3926,16 @@ msgid "internal error" msgstr "interna greška" msgid "internal reviews" -msgstr "urgencije" +msgstr "interni pregledi" msgid "is <strong>waiting for your clarification</strong>." -msgstr "<strong>čeka na Vaše objašnjenje</strong>." +msgstr "<strong>čeka Vaše objašnjenje</strong>." msgid "just to see how it works" msgstr "samo da vidite kako radi" msgid "left an annotation" -msgstr "ostavio napomenu" +msgstr "ostavio/la napomenu" msgid "made." msgstr "napravljen." @@ -3950,7 +3962,7 @@ msgid "no longer exists. If you are trying to make\\n From the request page, msgstr "" msgid "normally" -msgstr "" +msgstr "uobičajeno" msgid "not requestable due to: {{reason}}" msgstr "zahtjev nije moguć zbog: {{reason}}" @@ -3959,7 +3971,7 @@ msgid "please sign in as " msgstr "molimo prijavite se kao " msgid "requesting an internal review" -msgstr "zahtjeva urgenciju" +msgstr "zahtijeva interni pregled" msgid "requests" msgstr "zahtjevi" @@ -3968,16 +3980,18 @@ msgid "requests which are successful" msgstr "uspješni zahtjevi" msgid "requests which are successful matching text '{{query}}'" -msgstr "zahtjevi koji u sebi sadrže text '{{query}}'" +msgstr "zahtjevi koji u sebi sadrže tekst '{{query}}'" msgid "response as needing administrator attention. Take a look, and reply to this\\nemail to let them know what you are going to do about it." msgstr "" +"odgovor treba pažnju administratora. Pogledajte i odgovorite na ovu\n" +"e-poštu da biste im dali do znanja što ćete napraviti u svezi s tim." msgid "send a follow up message" msgstr "pošaljite prateću poruku" msgid "set to <strong>blank</strong> (empty string) if can't find an address; these emails are <strong>public</strong> as anyone can view with a CAPTCHA" -msgstr "" +msgstr "namješteno na <strong>prazno</strong> (prazni string) ako se ne može naći adresa; ove su adrese e-pošte <strong>javne</strong> jer ih svatko može vidjeti uz CAPTCHA" msgid "show quoted sections" msgstr "prikaži citirane dijelove" @@ -3992,10 +4006,10 @@ msgid "successful requests" msgstr "uspješni zahtjevi" msgid "that you made to" -msgstr "" +msgstr "koji ste napravili za" msgid "the main FOI contact address for {{public_body}}" -msgstr "glavne kontakt adrese za Zahtjeve o slobodnom pristupu informacijama za {{public_body}}" +msgstr "adresa službenika za informiranje u {{public_body}}" #. This phrase completes the following sentences: #. Request an internal review from... @@ -4003,7 +4017,7 @@ msgstr "glavne kontakt adrese za Zahtjeve o slobodnom pristupu informacijama za #. Send a public reply to... #. Don't want to address your message to... ? msgid "the main FOI contact at {{public_body}}" -msgstr "glavni kontakt za Zahtjeve o slobodnom pristupu informacijama u ustanovi {{public_body}}" +msgstr "službeniku za informiranje u {{public_body}}" msgid "the requester" msgstr "osoba koja je podnijela zahtjev" @@ -4012,7 +4026,7 @@ msgid "the {{site_name}} team" msgstr "{{site_name}} tim" msgid "to read" -msgstr "za čitati" +msgstr "čitati" msgid "to send a follow up message." msgstr "poslati prateću poruku." @@ -4048,10 +4062,10 @@ msgid "users" msgstr "korisnici" msgid "what's that?" -msgstr "šta je to?" +msgstr "što je to?" msgid "{{count}} FOI requests found" -msgstr "{{count}} Zahtjeva za slobodan pristup informacijama pronađeno" +msgstr "{{count}} Zahtjeva za pristup informacijama pronađeno" msgid "{{count}} Freedom of Information request to {{public_body_name}}" msgid_plural "{{count}} Freedom of Information requests to {{public_body_name}}" @@ -4079,6 +4093,9 @@ msgstr[2] "{{count}} zahtjeva izrađeno." msgid "{{existing_request_user}} already\\n created the same request on {{date}}. You can either view the <a href=\"{{existing_request}}\">existing request</a>,\\n or edit the details below to make a new but similar request." msgstr "" +"{{existing_request_user}} već je\n" +" izradio jednak zahtjev dana {{date}}. Možete vidjeti <a href=\"{{existing_request}}\">postojeći zahtjev</a>\n" +" ili urediti detalje ispod kako biste napravili novi, ali sličan zahtjev." msgid "{{foi_law}} requests to '{{public_body_name}}'" msgstr "{{foi_law}} zahtjeva prema '{{public_body_name}}'" @@ -4102,7 +4119,7 @@ msgid "{{public_body_link}} answered a request about" msgstr "{{public_body_link}} odgovorilo na zahtjev o" msgid "{{public_body_link}} was sent a request about" -msgstr "U {{public_body_link}} je poslan zahtjev vezan uz" +msgstr "U {{public_body_link}} poslan je zahtjev povezan s" msgid "{{public_body_name}} only:" msgstr "{{public_body_name}} samo:" @@ -4120,7 +4137,7 @@ msgid "{{search_results}} matching '{{query}}'" msgstr "{{search_results}} odgovara '{{query}}'" msgid "{{site_name}} blog and tweets" -msgstr "{{site_name}} blogovi i tweet-ovi" +msgstr "{{site_name}} blogovi i tweetovi" msgid "{{site_name}} covers requests to {{number_of_authorities}} authorities, including:" msgstr "{{site_name}} obuhvaća zahtjeve prema {{number_of_authorities}} ustanova, uključujući:" @@ -4141,7 +4158,7 @@ msgid "{{title}} - a batch request" msgstr "{{title}} - skupni zahtjev" msgid "{{user_name}} (Account suspended)" -msgstr "" +msgstr "{{user_name}} (Korisnički račun je suspendiran)" msgid "{{user_name}} - Freedom of Information requests" msgstr "{{user_name}} - zahtjevi za pristup informacijama" @@ -4154,14 +4171,14 @@ msgstr "{{user_name}} je dodao napomenu" msgid "{{user_name}} has annotated your {{law_used_short}} \\nrequest. Follow this link to see what they wrote." msgstr "" -"{{user_name}} su komentarisali Vaš {{law_used_short}} \n" -"zahtjev. Pratite ovaj link da vidite šta su napisali." +"{{user_name}} komentirali su Vaš {{law_used_short}} \n" +"zahtjev. Pratite ovu poveznicu kako biste vidjeli što su napisali." msgid "{{user_name}} has used {{site_name}} to send you the message below." msgstr "{{user_name}} je koristio {{site_name}} da Vam pošalje poruku ispod." msgid "{{user_name}} sent a follow up message to {{public_body}}" -msgstr "" +msgstr "{{user_name}} pošalji prateću poruku {{public_body}}" msgid "{{user_name}} sent a request to {{public_body}}" msgstr "{{user_name}} je poslao zahtjev za {{public_body}}" @@ -4170,13 +4187,13 @@ msgid "{{user_name}} would like a new authority added to {{site_name}}" msgstr "{{user_name}} bi htio/la dodati novu ustanovu na {{site_name}}" msgid "{{user_name}} would like the email address for {{public_body_name}} to be updated" -msgstr "{{user_name}} bi želio/la ažurirati e-mail adresu za {{public_body_name}} " +msgstr "{{user_name}} bi želio/la ažurirati adresu e-pošte za {{public_body_name}} " msgid "{{username}} left an annotation:" msgstr "{{username}} je ostavio napomenu:" msgid "{{user}} ({{user_admin_link}}) made this {{law_used_full}} request (<a href=\"{{request_admin_url}}\">admin</a>) to {{public_body_link}} (<a href=\"{{public_body_admin_url}}\">admin</a>)" -msgstr "{{user}} ({{user_admin_link}}) je podnio ovaj {{law_used_full}} zahtjev (<a href=\"{{request_admin_url}}\">admin</a>) za {{public_body_link}} (<a href=\"{{public_body_admin_url}}\">admin</a>)" +msgstr "{{user}} ({{user_admin_link}}) je podnio/la ovaj {{law_used_full}} zahtjev (<a href=\"{{request_admin_url}}\">admin</a>) za {{public_body_link}} (<a href=\"{{public_body_admin_url}}\">admin</a>)" msgid "{{user}} made this {{law_used_full}} request" msgstr "{{user}} je podnio/la ovaj {{law_used_full}} zahtjev" diff --git a/locale/is_IS/app.po b/locale/is_IS/app.po index 5061d47f6..e0d4eefd3 100644 --- a/locale/is_IS/app.po +++ b/locale/is_IS/app.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-12-02 13:14+0000\n" -"PO-Revision-Date: 2015-02-08 00:28+0000\n" +"PO-Revision-Date: 2015-02-15 17:57+0000\n" "Last-Translator: Páll Hilmarsson <pallih@kaninka.net>\n" "Language-Team: Icelandic (Iceland) (http://www.transifex.com/projects/p/alaveteli/language/is_IS/)\n" "Language: is_IS\n" @@ -47,7 +47,7 @@ msgid " <strong>Note:</strong>\\n We will send you an email. Follow the instr msgstr "<strong>Athugið:</strong>\\n Við munum senda þér tölvupóst. Fylgdu leiðbeiningunum í póstinum til að breyta lykilorðinu." msgid " <strong>Privacy note:</strong> Your email address will be given to" -msgstr "<strong>Persónuvernd.</strong> Netfangið þitt verður gefið" +msgstr "<strong>Persónuvernd:</strong> Netfangið þitt verður gefið" msgid " <strong>Summarise</strong> the content of any information returned. " msgstr "<strong>Lýstu</strong> gögnunum sem voru afhent." @@ -131,10 +131,10 @@ msgid "- or -" msgstr "- eða -" msgid "1. Select an authority" -msgstr "1. Veljið stofnun" +msgstr "1. Veldu stjórnvald" msgid "1. Select authorities" -msgstr "1. Veljið stofnanir" +msgstr "1. Veljið stjórnvöld" msgid "2. Ask for Information" msgstr "2. Biðjið um upplýsingar" @@ -143,7 +143,7 @@ msgid "3. Now check your request" msgstr "3. Farðu yfir beiðnina" msgid "<a href=\"{{browse_url}}\">Browse all</a> or <a href=\"{{add_url}}\">ask us to add one</a>." -msgstr "<a href=\"{{browse_url}}\">Skoða allar</a> eða <a href=\"{{add_url}}\">biðja um nýjar upplýsingar</a>." +msgstr "<a href=\"{{browse_url}}\">Skoða allar beiðnir</a> eða <a href=\"{{add_url}}\">útbúa nýja upplýsingabeiðni</a>." msgid "<a href=\"{{url}}\">Add an annotation</a> (to help the requester or others)" msgstr "<a href=\"{{url}}\">Bæta við athugasemd</a> (til að hjálpa þeim sem bjó til beiðnina eða öðrum)" @@ -191,16 +191,16 @@ msgid "<p>We're glad you got some of the information that you wanted.</p><p>If y msgstr "" msgid "<p>You do not need to include your email in the request in order to get a reply (<a href=\"{{url}}\">details</a>).</p>" -msgstr "" +msgstr "<p>Þú þarf ekki að hafa netfangið þitt í beiðninni til að fá svar (<a href=\"{{url}}\">nánar</a>).</p>" msgid "<p>You do not need to include your email in the request in order to get a reply, as we will ask for it on the next screen (<a href=\"{{url}}\">details</a>).</p>" -msgstr "" +msgstr "<p>Þú þarf ekki að hafa netfangið þitt í beiðninni til að fá svar þar sem við biðjum um það í næsta skrefi (<a href=\"{{url}}\">nánar</a>).</p>" msgid "<p>Your request contains a <strong>postcode</strong>. Unless it directly relates to the subject of your request, please remove any address as it will <strong>appear publicly on the Internet</strong>.</p>" -msgstr "" +msgstr "<p>Beiðnin þín inniheldur <strong>póstnúmer</strong>. Vinsamlegast fjarlægðu öll heimilisföng, nema það sé nauðsynlegt fyrir beiðnina þína þar sem beiðnin verður <strong>opinber á internetinu</strong>.</p>" msgid "<p>Your {{law_used_full}} request has been <strong>sent on its way</strong>!</p>\\n <p><strong>We will email you</strong> when there is a response, or after {{late_number_of_days}} working days if the authority still hasn't\\n replied by then.</p>\\n <p>If you write about this request (for example in a forum or a blog) please link to this page, and add an\\n annotation below telling people about your writing.</p>" -msgstr "" +msgstr "<p> {{law_used_full} beiðnin þín hefur verið <strong>send af stað</strong>!</p>\\\\n<p><strong>Við sendum þér tölvupóst</strong> þegar svar hefur borist, eða eftir {{late_number_of_days}} virka daga ef stjórnvaldið hefur ekki\\\\n svarað þá.</p>\\\\n<p>Ef þú skrifar um þessa beiðni (t.d. á spjallborði eða bloggsíðu), tengdu þá á þessa síðu og bættu við\\\\n athugasemd fyrir neðan til að segja öðrum frá því sem þú skrifar</p>" msgid "<p>Your {{law_used_full}} requests will be <strong>sent</strong> shortly!</p>\\n <p><strong>We will email you</strong> when they have been sent.\\n We will also email you when there is a response to any of them, or after {{late_number_of_days}} working days if the authorities still haven't\\n replied by then.</p>\\n <p>If you write about these requests (for example in a forum or a blog) please link to this page.</p>" msgstr "" @@ -212,7 +212,7 @@ msgid "<small>If you use web-based email or have \"junk mail\" filters, also che msgstr "" msgid "<strong> Can I request information about myself?</strong>\\n\t\t\t<a href=\"{{url}}\">No! (Click here for details)</a>" -msgstr "" +msgstr "<strong> Get ég beðið um upplýsingar um sjálfa(n) mig?</strong>\\n⇥⇥⇥<a href=\"{{url}}\">Nei! (Smelltu hér fyrir útskýringu)</a>" msgid "<strong><code>commented_by:tony_bowden</code></strong> to search annotations made by Tony Bowden, typing the name as in the URL." msgstr "" @@ -242,7 +242,7 @@ msgid "<strong>Advice</strong> on how to get a response that will satisfy the re msgstr "" msgid "<strong>All the information</strong> has been sent" -msgstr "" +msgstr "<strong>Allar upplýsingarnar</strong> hafa verið sendar" msgid "<strong>Anything else</strong>, such as clarifying, prompting, thanking" msgstr "" @@ -251,7 +251,7 @@ msgid "<strong>Caveat emptor!</strong> To use this data in an honourable way, yo msgstr "" msgid "<strong>Clarification</strong> has been requested" -msgstr "" +msgstr "<strong>Útskýringar</strong> hefur verið óskað" msgid "<strong>No response</strong> has been received\\n <small>(maybe there's just an acknowledgement)</small>" msgstr "" @@ -260,28 +260,28 @@ msgid "<strong>Note:</strong> Because we're testing, requests are being sent to msgstr "" msgid "<strong>Note:</strong> You're sending a message to yourself, presumably\\n to try out how it works." -msgstr "" +msgstr "<strong>Athugaðu:</strong> Þú ert að senda skilaboð til þín, sennilega\\n til að prófa hvernig það virkar." msgid "<strong>Note:</strong>\\n We will send an email to your new email address. Follow the\\n instructions in it to confirm changing your email." -msgstr "" +msgstr "<strong>Athugaðu:</strong>\\n Við sendum þér tölvupóst á nýja netfangið. Fylgdu leiðbeiningunum í honum til að staðfesta breytingu á netfangi." msgid "<strong>Privacy note:</strong> If you want to request private information about\\n yourself then <a href=\"{{url}}\">click here</a>." -msgstr "" +msgstr "<strong>Persónuvernd:</strong> Ef þú vilt biðja um upplýsingar um sjálfa(n) þig\\n smelltu þá <a href=\"{{url}}\">hérna</a>." msgid "<strong>Privacy note:</strong> Your photo will be shown in public on the Internet,\\n wherever you do something on {{site_name}}." -msgstr "" +msgstr "<strong>Persónuvernd:</strong> Myndin þín verður opinber á internetinu,\\ hvar sem þú setur eitthvað inn á {{site_name}}." msgid "<strong>Privacy warning:</strong> Your message, and any response\\n to it, will be displayed publicly on this website." msgstr "" msgid "<strong>Some of the information</strong> has been sent " -msgstr "" +msgstr "<strong>Sum gögnin</strong> hafa verið send" msgid "<strong>Thank</strong> the public authority or " -msgstr "" +msgstr "<strong>Þakkaðu</strong> stjórnvaldinu" msgid "<strong>did not have</strong> the information requested." -msgstr "" +msgstr "<strong>hafði ekki</strong> umbeðin gögn." msgid "?" msgstr "?" @@ -296,7 +296,7 @@ msgid "A <strong>summary</strong> of the response if you have received it by pos msgstr "" msgid "A Freedom of Information request" -msgstr "" +msgstr "Upplýsingabeiðni" msgid "A full history of my FOI request and all correspondence is available on the Internet at this address: {{url}}" msgstr "" @@ -305,10 +305,10 @@ msgid "A new request, <em><a href=\"{{request_url}}\">{{request_title}}</a></em> msgstr "" msgid "A public authority" -msgstr "" +msgstr "Opinbert stjórnvald" msgid "A response will be sent <strong>by post</strong>" -msgstr "" +msgstr "Svar verður sent með <strong>sniglapósti</strong>" msgid "A strange reponse, required attention by the {{site_name}} team" msgstr "" @@ -344,22 +344,22 @@ msgid "Add authority - {{public_body_name}}" msgstr "" msgid "Add the authority:" -msgstr "" +msgstr "Bæta við stjórnvaldinu:" msgid "Added on {{date}}" -msgstr "" +msgstr "Bætt við þann {{date}}" msgid "Admin level is not included in list" msgstr "" msgid "Administration URL:" -msgstr "" +msgstr "Slóð á umsýslukerfi:" msgid "Advanced search" msgstr "Ítarleg leit" msgid "Advanced search tips" -msgstr "" +msgstr "Ítarlegar leitarleiðbeiningar" msgid "Advise on whether the <strong>refusal is legal</strong>, and how to complain about it if not." msgstr "" @@ -380,28 +380,28 @@ msgid "Also called {{other_name}}." msgstr "Einnig nefnt {{other_name}}." msgid "Also send me alerts by email" -msgstr "" +msgstr "Einnig senda mér tilkynningar með tölvupósti" msgid "Alter your subscription" msgstr "Breyttu áskriftinni þinni" msgid "Although all responses are automatically published, we depend on\\nyou, the original requester, to evaluate them." -msgstr "" +msgstr "Þó að öll svör séu sjálfkrafa birt hér þá stólum við á\\nþig, þann sem upphaflega setti fram beiðnina, að leggja mat á hana." msgid "An <a href=\"{{request_url}}\">annotation</a> to <em>{{request_title}}</em> was made by {{event_comment_user}} on {{date}}" msgstr "" msgid "An <strong>error message</strong> has been received" -msgstr "" +msgstr "<strong>Villuboð</strong> voru móttekin" msgid "An Environmental Information Regulations request" msgstr "" msgid "An anonymous user" -msgstr "" +msgstr "Nafnlaus notandi" msgid "Annotation added to request" -msgstr "" +msgstr "Athugasemd við beiðnina skráð" msgid "Annotations" msgstr "Athugasemdir" @@ -422,7 +422,7 @@ msgid "Applies to" msgstr "Á við" msgid "Are we missing a public authority?" -msgstr "" +msgstr "Vantar stjórnvald?" msgid "Are you the owner of any commercial copyright on this page?" msgstr "" @@ -431,13 +431,13 @@ msgid "Ask for <strong>specific</strong> documents or information, this site is msgstr "" msgid "Ask us to add an authority" -msgstr "Beiðni um að bæta við stofnun" +msgstr "Beiðni um að bæta við stjórnvaldi" msgid "Ask us to update FOI email" -msgstr "Beiðni um að uppfæra FOI netfang" +msgstr "Beiðni um að uppfæra netfang stjórnvalds" msgid "Ask us to update the email address for {{public_body_name}}" -msgstr "" +msgstr "Biddu okkur um að uppfæra netfang fyrir {{public_body_name}}" msgid "At the bottom of this page, write a reply to them trying to persuade them to scan it in\\n (<a href=\"{{url}}\">more details</a>)." msgstr "" @@ -470,7 +470,7 @@ msgid "Beginning with" msgstr "Byrjar á" msgid "Browse <a href='{{url}}'>other requests</a> for examples of how to word your request." -msgstr "" +msgstr "Skoðaðu <a href='{{url}}'>aðrar beiðnir</a> til að sjá dæmi um hvernig hægt er að orða beiðnina þína." msgid "Browse <a href='{{url}}'>other requests</a> to '{{public_body_name}}' for examples of how to word your request." msgstr "" @@ -479,13 +479,13 @@ msgid "Browse all authorities..." msgstr "Skoða allar stofnanir..." msgid "Browse and search requests" -msgstr "Skoða allar leitarfyrirspurnir" +msgstr "Skoða allar upplýsingabeiðnir" msgid "Browse requests" -msgstr "Skoða beiðnir" +msgstr "Skoða upplýsingabeiðnir" msgid "By law, under all circumstances, {{public_body_link}} should have responded by now" -msgstr "" +msgstr "Samkvæmt lögum ætti {{public_body_link}} að hafa svarað" msgid "By law, {{public_body_link}} should normally have responded <strong>promptly</strong> and" msgstr "" @@ -494,7 +494,7 @@ msgid "Calculated home page" msgstr "" msgid "Can't find the one you want?" -msgstr "" +msgstr "Finnurðu ekki það sem þú leitar að?" msgid "Cancel a {{site_name}} alert" msgstr "Hætta við {{site_name}} viðvörun" @@ -524,16 +524,16 @@ msgid "CensorRule|Text" msgstr "" msgid "Change email on {{site_name}}" -msgstr "" +msgstr "Breyta netfangi á {{site_name}}" msgid "Change password on {{site_name}}" -msgstr "" +msgstr "Breyta lykilorði á {{site_name}}" msgid "Change profile photo" -msgstr "" +msgstr "Skipta um mynd" msgid "Change the text about you on your profile at {{site_name}}" -msgstr "" +msgstr "Breyta texta um þig á {{site_name}}" msgid "Change your email" msgstr "Breyta um netfang" @@ -551,7 +551,7 @@ msgid "Check for mistakes if you typed or copied the address." msgstr "" msgid "Check you haven't included any <strong>personal information</strong>." -msgstr "" +msgstr "Athugaðu hvort þú hefur nokkuð sett inn <strong>persónulegar upplýsingar</strong>." msgid "Choose a reason" msgstr "Veljið ástæðu" @@ -569,7 +569,7 @@ msgid "Clarify your FOI request - " msgstr "Útskýrðu beiðnina -" msgid "Classify an FOI response from " -msgstr "" +msgstr "Flokkaðu upplýsingabeiðni frá" msgid "Clear photo" msgstr "Hreinsa mynd" @@ -578,13 +578,13 @@ msgid "Click on the link below to send a message to {{public_body_name}} telling msgstr "" msgid "Click on the link below to send a message to {{public_body}} reminding them to reply to your request." -msgstr "" +msgstr "Smelltu á hlekkinn að neðan til að senda skilaboð til {{public_body}} og minna þau á að svara beiðninni þinni." msgid "Close" msgstr "Loka" msgid "Close the request and respond:" -msgstr "" +msgstr "Loka beiðninni og svara:" msgid "Comment" msgstr "Athugasemd" @@ -626,7 +626,7 @@ msgid "Confirm your account on {{site_name}}" msgstr "Staðfestu reikning þinn hjá {{site_name}}" msgid "Confirm your annotation to {{info_request_title}}" -msgstr "" +msgstr "Staðfestu athugasemd þína við {{info_request_title}}" msgid "Confirm your email address" msgstr "Staðfestu netfangið þitt" @@ -677,13 +677,13 @@ msgid "Dear [Authority name]," msgstr "Ágæta [nafn á stjórnvaldi]," msgid "Dear {{name}}," -msgstr "" +msgstr "Kæri/kæra {{name}}," msgid "Dear {{public_body_name}}," msgstr "Ágæta {{public_body_name}}," msgid "Dear {{user_name}}," -msgstr "" +msgstr "Kæri/kæra {{user_name}}," msgid "Default locale" msgstr "" @@ -710,7 +710,7 @@ msgid "Did you mean: {{correction}}" msgstr "Áttirðu við: {{correction}}" msgid "Disclaimer: This message and any reply that you make will be published on the internet. Our privacy and copyright policies:" -msgstr "" +msgstr "Athugaðu: Þetta skeyti og öll svör sem þú sendir verða birt opinberlega á internetinu. Hér er upplýsingastefna okkar:" msgid "Disclosure log" msgstr "" @@ -728,10 +728,10 @@ msgid "Don't want to address your message to {{person_or_body}}? You can also w msgstr "" msgid "Done" -msgstr "" +msgstr "Lokið" msgid "Done >>" -msgstr "" +msgstr "Lokið >>" msgid "Download a zip file of all correspondence" msgstr "Sæktu zip skrá með öllum samskiptum" @@ -764,7 +764,7 @@ msgid "Email doesn't look like a valid address" msgstr "Netfangið lítur ekki út fyrir að vera gilt" msgid "Email me future updates to this request" -msgstr "" +msgstr "Senda mér tölvupóst með uppfærslum á þessari beiðni" msgid "Email:" msgstr "Netfang:" @@ -794,10 +794,10 @@ msgid "Event {{id}}" msgstr "" msgid "Everything that you enter on this page, including <strong>your name</strong>,\\n will be <strong>displayed publicly</strong> on\\n this website forever (<a href=\"{{url}}\">why?</a>)." -msgstr "" +msgstr "Allt sem þú setur á þetta vefsvæði, þar á meðal <strong>nafnið þitt</strong>,\\n verður <strong>birt opinberlega</strong> á\\n þessum vef að eilífu (<a href=\"{{url}}\">af hverju?</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 "" +msgstr "Allt sem þú setur á þetta vefsvæði\\n verður <strong>birt opinberlega</strong> á\\n þessum vef að eilífu (<a href=\"{{url}}\">af hverju?</a>)." msgid "FOI" msgstr "" @@ -809,10 +809,10 @@ msgid "FOI request – {{title}}" msgstr "" msgid "FOI requests" -msgstr "" +msgstr "Upplýsingabeiðnir" msgid "FOI requests by '{{user_name}}'" -msgstr "" +msgstr "Upplýsingabeiðnir eftir '{{user_name}}'" msgid "FOI requests {{start_count}} to {{end_count}} of {{total_count}}" msgstr "" @@ -839,7 +839,7 @@ msgid "First, did your other requests succeed?" msgstr "" msgid "First, type in the <strong>name of the UK public authority</strong> you'd\\n like information from. <strong>By law, they have to respond</strong>\\n (<a href=\"{{url}}\">why?</a>)." -msgstr "" +msgstr "Byrjaðu á að skrifa in <strong>nafn stjórnvaldsins</strong> sem þú \\n vilt fá upplýsingar frá. <strong>Samkvæmt lögum þá er þeim skylt að svara</strong>\\n (<a href=\"{{url}}\">af hverju?</a>)." msgid "Foi attachment" msgstr "" @@ -866,25 +866,25 @@ msgid "FoiAttachment|Within rfc822 subject" msgstr "" msgid "Follow" -msgstr "" +msgstr "Fylgjast með" msgid "Follow all new requests" -msgstr "" +msgstr "Fylgjast með öllum nýjum beiðnum" msgid "Follow new successful responses" msgstr "" msgid "Follow requests to {{public_body_name}}" -msgstr "" +msgstr "Fylgjast með beiðnum til {{public_body_name}}" msgid "Follow these requests" -msgstr "" +msgstr "Fylgjast með þessum beiðnum" msgid "Follow things matching this search" -msgstr "" +msgstr "Fylgjast með þessari leit" msgid "Follow this authority" -msgstr "" +msgstr "Fylgjast með þessu stjórnvaldi" msgid "Follow this link to see the request:" msgstr "" @@ -893,10 +893,10 @@ msgid "Follow this link to see the requests:" msgstr "" msgid "Follow this person" -msgstr "" +msgstr "Fylgjast með þessum notanda" msgid "Follow this request" -msgstr "" +msgstr "Fylgjast með þessari beiðni" #. "Follow up" in this context means a further #. message sent by the requester to the authority after @@ -932,15 +932,15 @@ msgid "For an unknown reason, it is not possible to make a request to this autho msgstr "" msgid "Forgotten your password?" -msgstr "" +msgstr "Gleymdirðu lykilorðinu þínu?" msgid "Found {{count}} public authority {{description}}" msgid_plural "Found {{count}} public authorities {{description}}" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Fann {{count}} opinbert stjórnvald {{description}}" +msgstr[1] "Fann {{count}} opinber stjórnvöld {{description}}" msgid "Freedom of Information" -msgstr "" +msgstr "Upplýsingabeiðni" msgid "Freedom of Information Act" msgstr "" @@ -964,10 +964,10 @@ msgid "Freedom of Information requests made by you" msgstr "" msgid "Freedom of Information requests made using this site" -msgstr "" +msgstr "Upplýsingabeiðnir sendar í gegnum þennan vef" msgid "Freedom of information requests to" -msgstr "" +msgstr "Upplýsingabeiðni til" msgid "From" msgstr "Frá" @@ -979,7 +979,7 @@ msgid "From:" msgstr "Frá:" msgid "GIVE DETAILS ABOUT YOUR COMPLAINT HERE" -msgstr "" +msgstr "ÚTSKÝRING Á KVÖRTUN ÞINNI HÉR" msgid "Handled by post." msgstr "" @@ -1006,7 +1006,7 @@ msgid "Hello! You can make Freedom of Information requests within {{country_name msgstr "" msgid "Hello, {{username}}!" -msgstr "" +msgstr "Halló, {{username}}!" msgid "Help" msgstr "Hjálp" @@ -1015,7 +1015,7 @@ msgid "Here <strong>described</strong> means when a user selected a status for t msgstr "" msgid "Here is the message you wrote, in case you would like to copy the text and save it for later." -msgstr "" +msgstr "Hér eru skilaboðin sem þú skrifaðir, ef ske kynni að þú vildir afrita þau og geyma." msgid "Hi! We need your help. The person who made the following request\\n hasn't told us whether or not it was successful. Would you mind taking\\n a moment to read it and help us keep the place tidy for everyone?\\n Thanks." msgstr "" @@ -1024,7 +1024,7 @@ msgid "Hide request" msgstr "Fela beiðni" msgid "Holiday" -msgstr "" +msgstr "Frídagur" msgid "Holiday|Day" msgstr "" @@ -1033,7 +1033,7 @@ msgid "Holiday|Description" msgstr "" msgid "Home" -msgstr "" +msgstr "Heim" msgid "Home page" msgstr "" @@ -1057,7 +1057,7 @@ msgid "I am writing to request an internal review of {{public_body_name}}'s hand msgstr "" msgid "I don't like these ones — give me some more!" -msgstr "" +msgstr "Nenni ekki þessum — láttu mig hafa fleir!" msgid "I don't want to do any more tidying now!" msgstr "Nenni ekki að hreinsa meira til núna!" @@ -1069,7 +1069,7 @@ msgid "I would like to <strong>withdraw this request</strong>" msgstr "Ég vil <strong>draga þessa beiðni til baka</strong>" msgid "I'm still <strong>waiting</strong> for my information\\n <small>(maybe you got an acknowledgement)</small>" -msgstr "" +msgstr "Ég er enn að <strong>bíða</strong> eftir gögnum\\n <small>(kannski fékkstu staðfestingu á móttöku beiðnarinnar)</small>" msgid "I'm still <strong>waiting</strong> for the internal review" msgstr "" @@ -1078,19 +1078,19 @@ msgid "I'm waiting for an <strong>internal review</strong> response" msgstr "" msgid "I've been asked to <strong>clarify</strong> my request" -msgstr "" +msgstr "Ég hef verið beðin(n) um að <strong>útskýra</strong> beiðnina" msgid "I've received <strong>all the information" -msgstr "" +msgstr "Ég hef fengið <strong>öll gögnin" msgid "I've received <strong>some of the information</strong>" -msgstr "" +msgstr "Ég hef fengið <strong>hluta af gögnunum</strong>" msgid "I've received an <strong>error message</strong>" msgstr "" msgid "I've received an error message" -msgstr "" +msgstr "Ég fékk villuboð" msgid "Id" msgstr "" @@ -1120,7 +1120,7 @@ msgid "If you are thinking of using a pseudonym,\\n please <a hre msgstr "" msgid "If you are {{user_link}}, please" -msgstr "" +msgstr "Ef þú ert {{user_link}}, vinsamlegast" msgid "If you believe this request is not suitable, you can report it for attention by the site administrators" msgstr "" @@ -1132,7 +1132,7 @@ msgid "If you can, scan in or photograph the response, and <strong>send us\\n msgstr "" msgid "If you find this service useful as an FOI officer, please ask your web manager to link to us from your organisation's FOI page." -msgstr "" +msgstr "Ef þér finnst þessi þjónusta vera til gagns í starfi þínu, vinsamlegast biddu vefstjórann þinn um að tengja á vefinn okkar." msgid "If you got the email <strong>more than six months ago</strong>, then this login link won't work any\\nmore. Please try doing what you were doing from the beginning." msgstr "" @@ -1309,7 +1309,7 @@ msgid "Keep it <strong>focused</strong>, you'll be more likely to get what you w msgstr "" msgid "Keywords" -msgstr "Lykilorð" +msgstr "Leitarorð" msgid "Last authority viewed: " msgstr "" @@ -1342,7 +1342,7 @@ msgid "Listing users" msgstr "" msgid "Log in to download a zip file of {{info_request_title}}" -msgstr "" +msgstr "Skráðu þig inn til að sækja zip skrá með {{info_request_title}}" msgid "Log into the admin interface" msgstr "" @@ -1351,7 +1351,7 @@ msgid "Long overdue." msgstr "" msgid "Made between" -msgstr "" +msgstr "Sent milli" msgid "Mail server log" msgstr "" @@ -1387,13 +1387,13 @@ msgid "Make a request" msgstr "Útbúa upplýsingabeiðni" msgid "Make a request »" -msgstr "" +msgstr "Senda upplýsingabeiðni »" msgid "Make a request to these authorities" -msgstr "" +msgstr "Senda upplýsingabeiðnir á þessi stjórnvöld" msgid "Make a request to this authority" -msgstr "" +msgstr "Senda upplýsingabeiðni á þetta stjórnvald" msgid "Make an {{law_used_short}} request" msgstr "" @@ -1405,7 +1405,7 @@ msgid "Make and browse Freedom of Information (FOI) requests" msgstr "" msgid "Make your own request" -msgstr "" +msgstr "Búðu til þína eigin upplýsingabeiðni" msgid "Many requests" msgstr "" @@ -1423,7 +1423,7 @@ msgid "Missing contact details for '" msgstr "" msgid "More about this authority" -msgstr "" +msgstr "Meira um þetta stjórnvald" msgid "More requests..." msgstr "Fleiri beiðnir..." @@ -1438,7 +1438,7 @@ msgid "My profile" msgstr "Um mig" msgid "My request has been <strong>refused</strong>" -msgstr "" +msgstr "Beiðninni var <strong>hafnað</strong>" msgid "My requests" msgstr "Mínar beiðnir" @@ -1459,19 +1459,19 @@ msgid "New censor rule" msgstr "" msgid "New e-mail:" -msgstr "" +msgstr "Nýtt netfang:" msgid "New email doesn't look like a valid address" -msgstr "" +msgstr "Nýja netfangið lítur ekki út fyrir að vera gilt netang" msgid "New password:" -msgstr "" +msgstr "Nýtt lykilorð:" msgid "New password: (again)" -msgstr "" +msgstr "Nýtt lykilorð (aftur):" msgid "New response to '{{title}}'" -msgstr "" +msgstr "Nýtt svar við '{{title}}'" msgid "New response to your FOI request - " msgstr "" @@ -1507,10 +1507,10 @@ msgid "No tracked things found." msgstr "" msgid "Nobody has made any Freedom of Information requests to {{public_body_name}} using this site yet." -msgstr "" +msgstr "Enginn hefur enn sent upplýsingabeiðni til '{{public_body_name}}' í gegnum þennan vef." msgid "None found." -msgstr "" +msgstr "Ekkert fannst." msgid "None made." msgstr "" @@ -1570,7 +1570,7 @@ msgid "One person found" msgstr "" msgid "One public authority found" -msgstr "" +msgstr "Fann eitt opinbert stjórnvald" msgid "Only put in abbreviations which are really used, otherwise leave blank. Short or long name is used in the URL – don't worry about breaking URLs through renaming, as the history is used to redirect" msgstr "" @@ -1588,7 +1588,7 @@ msgid "Or make a <a href=\"{{url}}\">batch request</a> to <strong>multiple autho msgstr "" msgid "Or search in their website for this information." -msgstr "" +msgstr "Eða leitaðu á vef þeirra að þessum upplýsingum." msgid "Original request sent" msgstr "" @@ -1597,7 +1597,7 @@ msgid "Other" msgstr "" msgid "Other:" -msgstr "" +msgstr "Annað:" msgid "Outgoing message" msgstr "" @@ -1723,7 +1723,7 @@ msgid "Please enter a subject" msgstr "" msgid "Please enter a summary of your request" -msgstr "" +msgstr "Vinsamlegast settu inn útdrátt" msgid "Please enter a valid email address" msgstr "" @@ -1747,13 +1747,13 @@ msgid "Please enter your follow up message" msgstr "" msgid "Please enter your letter requesting information" -msgstr "" +msgstr "Vinsamlegast settu inn upplýsingabeiðnina" msgid "Please enter your name" -msgstr "" +msgstr "Vinsamlegast settu inn nafnið þitt" msgid "Please enter your name, not your email address, in the name field." -msgstr "" +msgstr "Vinsamlegast settu inn nafnfið þitt, ekki netfang, í nafna reitinn." msgid "Please enter your new email address" msgstr "" @@ -1789,16 +1789,16 @@ msgid "Please sign in as " msgstr "" msgid "Please sign in or make a new account." -msgstr "" +msgstr "Vinsamlega skráðu þig inn eða búðu til nýjan reikning." msgid "Please tell us more:" -msgstr "" +msgstr "Vinsamlegast segðu okkur meira:" msgid "Please type a message and/or choose a file containing your response." msgstr "" msgid "Please use this email address for all replies to this request:" -msgstr "" +msgstr "Vinsamlegast notaðu þetta netfang fyrir öll svör við þessari beiðni:" msgid "Please write a summary with some text in it" msgstr "" @@ -1819,7 +1819,7 @@ msgid "Point to <strong>related information</strong>, campaigns or forums which msgstr "" msgid "Possibly related requests:" -msgstr "" +msgstr "Mögulega svipaðar beiðnir:" msgid "Post annotation" msgstr "" @@ -1870,13 +1870,13 @@ msgid "Preview new {{law_used_short}} request to '{{public_body_name}}" msgstr "" msgid "Preview your annotation" -msgstr "" +msgstr "Forskoðaðu athugasemdina þína" msgid "Preview your message" msgstr "" msgid "Preview your public request" -msgstr "" +msgstr "Farðu yfir beiðnina þína" msgid "Profile photo" msgstr "" @@ -1888,28 +1888,28 @@ msgid "ProfilePhoto|Draft" msgstr "" msgid "Public Bodies" -msgstr "" +msgstr "Stjórnvöld" msgid "Public Body" -msgstr "" +msgstr "Stjórnvald" msgid "Public Body Statistics" -msgstr "" +msgstr "Tölfræði stjórnvalds" msgid "Public authorities" -msgstr "" +msgstr "Opinber stjórnvöld" msgid "Public authorities - {{description}}" -msgstr "" +msgstr "Opinber stjórnvöld - {{description}}" msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}" -msgstr "" +msgstr "Opinber stjórnvöld {{start_count}} til {{end_count}} af {{total_count}}" msgid "Public authority statistics" -msgstr "" +msgstr "Tölfræði stjórnvalds" msgid "Public authority – {{name}}" -msgstr "" +msgstr "Stjórnvald - {{name}}" msgid "Public bodies that most frequently replied with \"Not Held\"" msgstr "" @@ -2059,10 +2059,10 @@ msgid "PurgeRequest|Url" msgstr "" msgid "RSS feed" -msgstr "" +msgstr "RSS straumur" msgid "RSS feed of updates" -msgstr "" +msgstr "RSS straumur með uppfærslum" msgid "Re-edit this annotation" msgstr "" @@ -2155,16 +2155,16 @@ msgid "Requests will be sent to the following bodies:" msgstr "" msgid "Respond by email" -msgstr "" +msgstr "Svara með tölvupósti" msgid "Respond to request" -msgstr "" +msgstr "Svara beiðni" msgid "Respond to the FOI request '{{request}}' made by {{user}}" -msgstr "" +msgstr "Svara upplýsingabeiðninni '{{request}}' send af {{user}}" msgid "Respond using the web" -msgstr "" +msgstr "Svara á vefnum" msgid "Response" msgstr "" @@ -2173,7 +2173,7 @@ msgid "Response by {{public_body_name}} to {{info_request_user}} on {{date}}." msgstr "" msgid "Response from a public authority" -msgstr "" +msgstr "Svar frá stjórnvaldi" msgid "Response to '{{title}}'" msgstr "" @@ -2188,7 +2188,7 @@ msgid "Response to your request" msgstr "" msgid "Response:" -msgstr "" +msgstr "Svar:" msgid "Restrict to" msgstr "" @@ -2197,10 +2197,10 @@ msgid "Results page {{page_number}}" msgstr "" msgid "Save" -msgstr "" +msgstr "Vista" msgid "Search" -msgstr "" +msgstr "Leita" msgid "Search Freedom of Information requests, public authorities and users" msgstr "" @@ -2215,16 +2215,16 @@ msgid "Search for words in:" msgstr "" msgid "Search in" -msgstr "" +msgstr "Leita í" msgid "Search over<br/>\\n <strong>{{number_of_requests}} requests</strong> <span>and</span><br/>\\n <strong>{{number_of_authorities}} authorities</strong>" -msgstr "" +msgstr "Leitaðu í <br/>\\n<strong>{{number_of_requests}} upplýsingabeiðnum</strong> <span>og</span><br/>\\n <strong>{{number_of_authorities}} stjórnvöldum</strong>" msgid "Search queries" msgstr "" msgid "Search results" -msgstr "" +msgstr "Leitarniðurstöður" msgid "Search the site to find what you were looking for." msgstr "" @@ -2250,7 +2250,7 @@ msgid "Send a followup" msgstr "" msgid "Send a message to " -msgstr "" +msgstr "Senda skilaboð til" msgid "Send a public follow up message to {{person_or_body}}" msgstr "" @@ -2262,78 +2262,78 @@ msgid "Send follow up to '{{title}}'" msgstr "" msgid "Send message" -msgstr "" +msgstr "Senda skilaboð" msgid "Send message to " -msgstr "" +msgstr "Senda skilaboð til" msgid "Send request" -msgstr "" +msgstr "Senda beiðni" msgid "Sent to one authority by {{info_request_user}} on {{date}}." msgid_plural "Sent to {{authority_count}} authorities by {{info_request_user}} on {{date}}." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Sent til eins stjórnvalds af {{info_request_user}} þann {{date}}" +msgstr[1] "Sent til {{authority_count}} stjórnvalda af {{info_request_user}} þann {{date}}." msgid "Set your profile photo" msgstr "Veldu mynd af þér" msgid "Short name" -msgstr "" +msgstr "Stutt nafn" msgid "Short name is already taken" -msgstr "" +msgstr "Stutt nafn er þegar í notkun" msgid "Show most relevant results first" msgstr "" msgid "Show only..." -msgstr "" +msgstr "Sýna aðeins..." msgid "Showing" -msgstr "" +msgstr "Sýna" msgid "Sign in" -msgstr "" +msgstr "Innskrá" msgid "Sign in as the emergency user" -msgstr "" +msgstr "Innskrá sem neyðarnotandinn" msgid "Sign in or make a new account" msgstr "Skráðu þig inn eða búðu til reikning" msgid "Sign in or sign up" -msgstr "" +msgstr "Innskrá eða nýskrá" msgid "Sign out" msgstr "Útskrá" msgid "Sign up" -msgstr "" +msgstr "Nýskrá" msgid "Similar requests" -msgstr "" +msgstr "Svipaðar beiðnir" msgid "Simple search" -msgstr "" +msgstr "Einföld leit" msgid "Some notes have been added to your FOI request - " -msgstr "" +msgstr "Athugasemdum hefur verið bætti við upplýsingabeiðnina þína -" msgid "Some of the information requested has been received" -msgstr "" +msgstr "Eitthvað af gögnunum sem þú baðst um hefur borist" msgid "Some people who've made requests haven't let us know whether they were\\nsuccessful or not. We need <strong>your</strong> help –\\nchoose one of these requests, read it, and let everyone know whether or not the\\ninformation has been provided. Everyone'll be exceedingly grateful." msgstr "" msgid "Somebody added a note to your FOI request - " -msgstr "" +msgstr "Einhver bætti við athugasemd við upplýsingabeiðnina þína -" msgid "Someone has updated the status of your request" -msgstr "" +msgstr "Einhver hefur uppfært stöðu upplýsingabeiðninnar þinnar" msgid "Someone, perhaps you, just tried to change their email address on\\n{{site_name}} from {{old_email}} to {{new_email}}." -msgstr "" +msgstr "Einhver, kannski þú, reyndi rétt í þessu að breyta netfanginu á\\n {{site_name}} úr {{old_email}} í {{new_enail}}." msgid "Sorry - you cannot respond to this request via {{site_name}}, because this is a copy of the request originally at {{link_to_original_request}}." msgstr "" @@ -2372,19 +2372,19 @@ msgid "Still awaiting an <strong>internal review</strong>" msgstr "" msgid "Subject" -msgstr "" +msgstr "Innihald" msgid "Subject:" -msgstr "" +msgstr "Innihald:" msgid "Submit" -msgstr "" +msgstr "Senda" msgid "Submit request" -msgstr "" +msgstr "Senda beiðni" msgid "Submit status" -msgstr "" +msgstr "Uppfæra stöðu" msgid "Submit status and send message" msgstr "" @@ -2405,7 +2405,7 @@ msgid "Suggest how the requester can find the <strong>rest of the information</s msgstr "" msgid "Summary:" -msgstr "" +msgstr "Útdráttur:" msgid "Table of statuses" msgstr "" @@ -2414,31 +2414,31 @@ msgid "Table of varieties" msgstr "" msgid "Tags" -msgstr "" +msgstr "Tögg" msgid "Tags (separated by a space):" -msgstr "" +msgstr "Tögg (aðskilin með bilum)" msgid "Tags:" -msgstr "" +msgstr "Tögg:" msgid "Technical details" -msgstr "" +msgstr "Tæknilegar upplýsingar" msgid "Thank you for helping us keep the site tidy!" -msgstr "" +msgstr "Takk fyrir að hjálpa okkur við að halda vefnum við!" msgid "Thank you for making an annotation!" -msgstr "" +msgstr "Takk fyrir að skrá athugasemd!" msgid "Thank you for responding to this FOI request! Your response has been published below, and a link to your response has been emailed to " -msgstr "" +msgstr "Takk fyrir að svara þessari upplýsingabeiðni! Svarið þitt hefur verið birt að neðan og tengill á svarið þitt hefur verið sendur til" msgid "Thank you for updating the status of the request '<a href=\"{{url}}\">{{info_request_title}}</a>'. There are some more requests below for you to classify." msgstr "" msgid "Thank you for updating this request!" -msgstr "" +msgstr "Takk fyrir að uppfæra þessa beiðni!" msgid "Thank you for updating your profile photo" msgstr "" @@ -2633,7 +2633,7 @@ msgid "Then you will be notified whenever '{{user_name}}' requests something or msgstr "" msgid "Then you will be notified whenever a new request or response matches your search." -msgstr "" +msgstr "Þá færðu skilaboð þegar ný beiðni eða svar passa við leitina þína." msgid "Then you will be notified whenever an FOI request succeeds." msgstr "" @@ -2663,7 +2663,7 @@ msgid "There is a limit on the number of requests you can make in a day, because msgstr "" msgid "There is nothing to display yet." -msgstr "" +msgstr "Ekkert til að sýna, enn." msgid "There is {{count}} person following this request" msgid_plural "There are {{count}} people following this request" @@ -2689,7 +2689,7 @@ msgid "These graphs were partly inspired by <a href=\"http://mark.goodge.co.uk/2 msgstr "" msgid "They are going to reply <strong>by post</strong>" -msgstr "" +msgstr "Svar verður sent í sniglapósti" msgid "They do <strong>not have</strong> the information <small>(maybe they say who does)</small>" msgstr "" @@ -2707,7 +2707,7 @@ msgid "Things to do with this request" msgstr "" msgid "Things you're following" -msgstr "" +msgstr "Hlutir sem þú ert að fylgjast með" msgid "This authority no longer exists, so you cannot make a request to it." msgstr "" @@ -2725,16 +2725,16 @@ msgid "This is a plain-text version of the Freedom of Information request \"{{re msgstr "" msgid "This is an HTML version of an attachment to the Freedom of Information request" -msgstr "" +msgstr "Þetta er HTML útgáfa af viðhengi við upplýsingabeiðni" msgid "This is because {{title}} is an old request that has been\\nmarked to no longer receive responses." msgstr "" msgid "This is the first version." -msgstr "" +msgstr "Þetta er fyrsta útgáfa." msgid "This is your own request, so you will be automatically emailed when new responses arrive." -msgstr "" +msgstr "Þetta er þín eigin beiðni þannig að þú færð sjálfkrafa tölvupóst þegar svör berast." msgid "This message has been hidden." msgstr "" @@ -2758,10 +2758,10 @@ msgid "This page of public body statistics is currently experimental, so there a msgstr "" msgid "This particular request is finished:" -msgstr "" +msgstr "Þessari upplýsingabeiðni er lokið:" msgid "This person has made no Freedom of Information requests using this site." -msgstr "" +msgstr "Þessi notandi hefur ekki sent neina upplýsingabeiðni í gegnum þennan vef." msgid "This person's annotations" msgstr "" @@ -2816,7 +2816,7 @@ msgid "This request is hidden, so that only you the requester can see it. Please msgstr "" msgid "This request is still in progress:" -msgstr "" +msgstr "Þessi upplýsingabeiðni er enn í vinnslu:" msgid "This request requires administrator attention" msgstr "" @@ -2861,7 +2861,7 @@ msgid "To follow all successful requests" msgstr "" msgid "To follow new requests" -msgstr "" +msgstr "Til að fylgjast með nýjum beiðnum" msgid "To follow requests and responses matching your search" msgstr "" @@ -2918,25 +2918,25 @@ msgid "To use the advanced search, combine phrases and labels as described in th msgstr "" msgid "To view the email address that we use to send FOI requests to {{public_body_name}}, please enter these words." -msgstr "" +msgstr "Til að sjá netfangið sem við notum til að senda upplýsingabeiðnir til {{public_body_name}}, vinsamlegast sláðu inn þessi orð." msgid "To view the response, click on the link below." -msgstr "" +msgstr "Til að sjá svarið, smelltu á hlekkinn hér að neðan." msgid "To {{public_body_link_absolute}}" msgstr "" msgid "To:" -msgstr "" +msgstr "Til:" msgid "Today" -msgstr "" +msgstr "Í dag" msgid "Too many requests" msgstr "" msgid "Top search results:" -msgstr "" +msgstr "Bestu leitarniðurstöður:" msgid "Track thing" msgstr "" @@ -3098,13 +3098,13 @@ msgid "Vexatious" msgstr "" msgid "View FOI email address" -msgstr "" +msgstr "Sjá netfang" msgid "View FOI email address for '{{public_body_name}}'" -msgstr "" +msgstr "Sjá netfang hjá '{{public_body_name}}'" msgid "View FOI email address for {{public_body_name}}" -msgstr "" +msgstr "Sjá netfang hjá {{public_body_name}}" msgid "View Freedom of Information requests made by {{user_name}}:" msgstr "" @@ -3173,7 +3173,7 @@ msgid "What are you doing?" msgstr "" msgid "What best describes the status of this request now?" -msgstr "" +msgstr "Hvað lýsir best stöðu þessarar beiðni núna?" msgid "What information has been released?" msgstr "" @@ -3227,7 +3227,7 @@ msgid "You already created the same batch of requests on {{date}}. You can eit msgstr "" msgid "You are already following new requests" -msgstr "" +msgstr "Þú ert þegar að fylgjast með nýjum beiðnum" msgid "You are already following requests to {{public_body_name}}" msgstr "" @@ -3260,7 +3260,7 @@ msgid "You are already subscribed to any <a href=\"{{successful_requests_url}}\" msgstr "" msgid "You are currently receiving notification of new activity on your wall by email." -msgstr "" +msgstr "Þú færð skilaboð um breytingar á veggnum þínum með tölvupósti." msgid "You are following all new successful responses" msgstr "" @@ -3323,7 +3323,7 @@ msgid "You have hit the rate limit on new requests. Users are ordinarily limited msgstr "" msgid "You have made no Freedom of Information requests using this site." -msgstr "" +msgstr "Þú hefur ekki sent neina upplýsingabeiðni í gegnum þennan vef." msgid "You have now changed the text about you on your profile." msgstr "" @@ -3458,7 +3458,7 @@ msgid "Your name and annotation will appear in <strong>search engines</strong>." msgstr "" msgid "Your name, request and any responses will appear in <strong>search engines</strong>\\n (<a href=\"{{url}}\">details</a>)." -msgstr "" +msgstr "Nafnið þitt, beiðnin og öll svör munu birtast í <strong>leitarvélum</a>\\n (<a href=\"{{url}}\">nánar</a>)." msgid "Your name:" msgstr "" @@ -3497,7 +3497,7 @@ msgid "Your request was called {{info_request}}. Letting everyone know whether y msgstr "" msgid "Your request:" -msgstr "" +msgstr "Beiðnin þín:" msgid "Your response to an FOI request was not delivered" msgstr "" @@ -3530,7 +3530,7 @@ msgid "Your {{site_name}} email alert" msgstr "" msgid "Yours faithfully," -msgstr "" +msgstr "Bestu kveðjur," msgid "Yours sincerely," msgstr "" @@ -3554,7 +3554,7 @@ msgid "\\n\\n[ {{site_name}} note: The above text was badly encoded, and has had msgstr "" msgid "a one line summary of the information you are requesting, \\n\t\t\te.g." -msgstr "" +msgstr "einnar línu útdráttur um gögnin sem þú ert að biðja um, \\nt.d." msgid "admin" msgstr "" @@ -3563,7 +3563,7 @@ msgid "alaveteli_foi:The software that runs {{site_name}}" msgstr "" msgid "all requests" -msgstr "" +msgstr "Allar beiðnir" msgid "all requests or comments" msgstr "" @@ -3578,7 +3578,7 @@ msgid "an anonymous user" msgstr "" msgid "and" -msgstr "" +msgstr "og" msgid "and update the status accordingly. Perhaps <strong>you</strong> might like to help out by doing that?" msgstr "" @@ -3587,7 +3587,7 @@ msgid "and update the status." msgstr "" msgid "and we'll suggest <strong>what to do next</strong>" -msgstr "" +msgstr "og við munum leggja til <strong>næstu skref</strong>" msgid "anything matching text '{{query}}'" msgstr "" @@ -3596,7 +3596,7 @@ msgid "are long overdue." msgstr "" msgid "at" -msgstr "" +msgstr "hjá" msgid "authorities" msgstr "" @@ -3632,7 +3632,7 @@ msgid "during term time" msgstr "" msgid "e.g. Ministry of Defence" -msgstr "" +msgstr "t.d. Menntamálaráðuneyti" msgid "edit text about you" msgstr "" @@ -3692,7 +3692,7 @@ msgid "move..." msgstr "" msgid "new requests" -msgstr "" +msgstr "nýjar beiðnir" msgid "no later than" msgstr "" @@ -3769,7 +3769,7 @@ msgid "to send a follow up message." msgstr "" msgid "to {{public_body}}" -msgstr "" +msgstr "til {{public_body}}" msgid "type your search term here" msgstr "" @@ -3806,13 +3806,13 @@ msgstr "" msgid "{{count}} Freedom of Information request to {{public_body_name}}" msgid_plural "{{count}} Freedom of Information requests to {{public_body_name}}" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "{{count}} upplýsingabeiðni til {{public_body_name}}" +msgstr[1] "{{count}} upplýsingabeiðnir til {{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}} notandi er að fylgjast með þessu stjórnvaldi" +msgstr[1] "{{count}} notendur eru að fylgjast með þessu stjórnvaldi" msgid "{{count}} request" msgid_plural "{{count}} requests" @@ -3821,8 +3821,8 @@ msgstr[1] "" msgid "{{count}} request made." msgid_plural "{{count}} requests made." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "{{count}} beiðni send." +msgstr[1] "{{count}} beiðnir sendar." msgid "{{existing_request_user}} already\\n created the same request on {{date}}. You can either view the <a href=\"{{existing_request}}\">existing request</a>,\\n or edit the details below to make a new but similar request." msgstr "" @@ -3834,10 +3834,10 @@ msgid "{{info_request_user_name}} only:" msgstr "" msgid "{{law_used_full}} request - {{title}}" -msgstr "" +msgstr "{{law_used_full}} beiðni - {{title}}" msgid "{{law_used}} requests at {{public_body}}" -msgstr "" +msgstr "{{law_used}} beiðni hjá {{public_body}}" msgid "{{length_of_time}} ago" msgstr "" @@ -3858,10 +3858,10 @@ msgid "{{public_body}} has asked you to explain part of your {{law_used}} reques msgstr "" msgid "{{public_body}} sent a response to {{user_name}}" -msgstr "" +msgstr "{{public_body}} sendi svar til {{user_name}}" msgid "{{reason}}, please sign in or make a new account." -msgstr "" +msgstr "{{reason}}, vinsamlegast skráðu þig inn eða búðu til nýjan reikning." msgid "{{search_results}} matching '{{query}}'" msgstr "" @@ -3912,7 +3912,7 @@ msgid "{{user_name}} sent a request to {{public_body}}" msgstr "{{user_name}} sendi upplýsingabeiðni til {{public_body}}" msgid "{{user_name}} would like a new authority added to {{site_name}}" -msgstr "" +msgstr "{{user_name}} vill fá stjórnvaldi bætt við {{site_name}}" msgid "{{user_name}} would like the email address for {{public_body_name}} to be updated" msgstr "" @@ -3924,4 +3924,4 @@ msgid "{{user}} ({{user_admin_link}}) made this {{law_used_full}} request (<a hr msgstr "" msgid "{{user}} made this {{law_used_full}} request" -msgstr "" +msgstr "{{user}} sendi þessa {{law_used_full}} beiðni" diff --git a/locale/it/app.po b/locale/it/app.po index 4191bab4e..050ac27e1 100644 --- a/locale/it/app.po +++ b/locale/it/app.po @@ -4,7 +4,8 @@ # # Translators: # Antonella <anapolitano@gmail.com>, 2014-2015 -# louisecrow <louise@mysociety.org>, 2014 +# guido romeo <guido.romeo@gmail.com>, 2015 +# louisecrow <louise@mysociety.org>, 2014-2015 # Marco Giustini <info@marcogiustini.info>, 2013 # Marco Giustini <info@marcogiustini.info>, 2013 msgid "" @@ -12,7 +13,7 @@ msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-12-02 13:14+0000\n" -"PO-Revision-Date: 2015-02-08 14:26+0000\n" +"PO-Revision-Date: 2015-02-16 16:22+0000\n" "Last-Translator: Antonella <anapolitano@gmail.com>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/alaveteli/language/it/)\n" "Language: it\n" @@ -25,10 +26,10 @@ msgid " This will appear on your {{site_name}} profile, to make it\\n msgstr "Questo comparirà nel tuo profilo su {{site_name}}, per informare gli interessati su quello che stai facendo" msgid " (<strong>no ranty</strong> politics, read our <a href=\"{{url}}\">moderation policy</a>)" -msgstr "(<strong>niente invettive politiche</strong>, leggi il nostro <a href=\"{{url}}\">regolamento sui commenti</a>)" +msgstr "(<strong>niente lamentele su politica e politici</strong>, leggi il nostro <a href=\"{{url}}\">regolamento sui commenti</a>)" msgid " (<strong>patience</strong>, especially for large files, it may take a while!)" -msgstr " (<strong>Abbi pazienza</strong>, ci vuole un po', specie per caricare i file più pesanti!)" +msgstr " (<strong>Aspetta</strong>, ci vuole un po', specie per caricare i file più pesanti!)" msgid " (you)" msgstr " (tu)" @@ -46,10 +47,10 @@ msgid " << " 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 Ti invieremo una email. Segui le istruzioni contenute nella email per cambiare\\n la tua password." +msgstr " <strong>Nota:</strong>Ti invieremo una email. Segui le istruzioni per cambiare la tua password." msgid " <strong>Privacy note:</strong> Your email address will be given to" -msgstr " <strong>Nota Privacy:</strong> Il tuo indirizzo di email sarà fornito a" +msgstr " <strong>Nota sulla privacy:</strong> Il tuo indirizzo di email sarà fornito a" msgid " <strong>Summarise</strong> the content of any information returned. " msgstr " <strong>Riassumi</strong> il contenuto di ogni informazione che ricevi in risposta." @@ -67,7 +68,7 @@ msgid " Ideas on what <strong>other documents to request</strong> which the auth msgstr "Suggerimenti su <strong>quali altri documenti </strong> richiedere di cui l'amministrazione può essere in possesso." msgid " If you know the address to use, then please <a href=\"{{url}}\">send it to us</a>.\\n You may be able to find the address on their website, or by phoning them up and asking." -msgstr "Se sai quale indirizzo usare, per favore <a href=\"{{url}}\">invialo a noi</a>.\\n Puoi trovare l'indirizzo sul loro sito o chiederlo per telefono." +msgstr "Se sai quale indirizzo usare, per favore <a href=\"{{url}}\">inviacelo</a>.\\n Puoi trovare l'indirizzo sul loro sito o chiederlo per telefono." msgid " Include relevant links, such as to a campaign page, your blog or a\\n twitter account. They will be made clickable. \\n e.g." msgstr "Includi link rilevanti, per esempio alla pagina di una campagna, al tuo blog o al tuo account Twitter. I link diventeranno attivi." @@ -76,19 +77,19 @@ msgid " Link to the information requested, if it is <strong>already available</s msgstr " Link all'informazione richiesta, se è <strong>già disponibile</strong> su Internet. " msgid " Offer better ways of <strong>wording the request</strong> to get the information. " -msgstr " Offri modalità migliori per l'<strong>argomentazione della richiesta</strong> per ricevere l'informazione. " +msgstr "Spiega <strong>più chiaramente la tua richiesta</strong>, ti aiuterà a ricevere l'informazione. " msgid " Say how you've <strong>used the information</strong>, with links if possible." -msgstr " Dicci <strong>come hai usato l'informazione</strong> ottenuta, inserendo dei links se possibile." +msgstr "Raccontaci <strong>come hai usato l'informazione ottenuta</strong>, segnalando i relativi link, se possibile." msgid " Suggest <strong>where else</strong> the requester might find the information. " -msgstr " Suggerisci anche <strong>dove</strong> il richiedente può trovare l'informazione richiesta. " +msgstr "Dai suggerimenti su <strong>dove</strong> il richiedente può trovare l'informazione richiesta. " msgid " What are you investigating using Freedom of Information? " -msgstr "Per quale motivo stai usando le richieste di accesso? Su cosa stai facendo ricerca?" +msgstr "Per quale motivo stai utilizzando le richieste di accesso? Su cosa stai facendo ricerca?" msgid " You are already being emailed updates about the request." -msgstr " Il tuo nominativo è già stato inserito nelle notifiche via email relative alla richiesta." +msgstr "Sei già iscritto alle notifiche relative alla richiesta, le riceverai via email." msgid " You will also be emailed updates about the request." msgstr " Sarai anche aggiornato via email sullo stato della tua richiesta." @@ -106,19 +107,19 @@ msgid "'Pollution levels over time for the River Tyne'" msgstr "'Livelli di inquinamento sopra la media nel fiume Tyne'" msgid "'{{link_to_authority}}', a public authority" -msgstr "'{{link_to_authority}}', una autorità pubblica" +msgstr "l'amministrazione '{{link_to_authority}}'" msgid "'{{link_to_request}}', a request" -msgstr "'{{link_to_request}}', una richiesta" +msgstr "la richiesta '{{link_to_request}}'" msgid "'{{link_to_user}}', a person" -msgstr "'{{link_to_user}}', una persona" +msgstr "l'utente '{{link_to_user}}'" msgid "(hide)" msgstr "(nascondi)" msgid "(or <a href=\"{{url}}\">sign in</a>)" -msgstr "(o <a href=\"{{url}}\">entra</a>)" +msgstr "(o <a href=\"{{url}}\">accedi</a>)" msgid "(show)" msgstr "(mostra)" @@ -133,7 +134,7 @@ msgid "- or -" msgstr "- o -" msgid "1. Select an authority" -msgstr "1. Seleziona una autorità" +msgstr "1. Seleziona un'amministrazione" msgid "1. Select authorities" msgstr "1. Seleziona le amministrazioni" @@ -142,7 +143,7 @@ msgid "2. Ask for Information" msgstr "2. Chiedi una informazione" msgid "3. Now check your request" -msgstr "3. Ora verifica l'informazione richiesta" +msgstr "3. Ora controlla la tua richiesta" msgid "<a href=\"{{browse_url}}\">Browse all</a> or <a href=\"{{add_url}}\">ask us to add one</a>." msgstr "<a href=\"{{browse_url}}\">Guarda tutte</a> o <a href=\"{{add_url}}\">chiedici di aggiungerne una</a>." @@ -151,10 +152,10 @@ msgid "<a href=\"{{url}}\">Add an annotation</a> (to help the requester or other msgstr "<a href=\"{{url}}\">Aggiungi un'annotazione</a> (per aiutare il richiedente o altri)" msgid "<a href=\"{{url}}\">Sign in</a> to change password, subscriptions and more ({{user_name}} only)" -msgstr "<a href=\"{{url}}\">Accedi</a> per cambiare password, iscriverti agli aggiornamenti e molto altro ({{user_name}} solo)" +msgstr "<a href=\"{{url}}\">Accedi</a> per cambiare password, iscriverti agli aggiornamenti e molto altro (solo per {{user_name}})" msgid "<p>All done! Thank you very much for your help.</p><p>There are <a href=\"{{helpus_url}}\">more things you can do</a> to help {{site_name}}.</p>" -msgstr "<p>Tutto fatto! Grazie molte per il tuo aiuto.</p><p>Ci sono ancora <a href=\"{{helpus_url}}\">molte cose che puoi fare</a> per aiutare {{site_name}}.</p>" +msgstr "<p>Tutto fatto! Grazie mille per il tuo aiuto.</p><p>Ci sono ancora <a href=\"{{helpus_url}}\">molte cose che puoi fare</a> per aiutare {{site_name}}.</p>" msgid "<p>Thank you! Here are some ideas on what to do next:</p>\\n <ul>\\n <li>To send your request to another authority, first copy the text of your request below, then <a href=\"{{find_authority_url}}\">find the other authority</a>.</li>\\n <li>If you would like to contest the authority's claim that they do not hold the information, here is\\n <a href=\"{{complain_url}}\">how to complain</a>.\\n </li>\\n <li>We have <a href=\"{{other_means_url}}\">suggestions</a>\\n on other means to answer your question.\\n </li>\\n </ul>" msgstr "" @@ -171,25 +172,25 @@ msgid "<p>Thank you! Hopefully your wait isn't too long.</p><p>You should get a msgstr "<p>Grazie! Speriamo che la tua attesa non sia lunga.</p><p>Dovresti ricevere una risposta entro {{late_number_of_days}} giorni, oppure sarai ricontattato se i tempi di risposta aumenteranno (<a href=\"{{review_url}}\">dettagli</a>).</p>" msgid "<p>Thank you! Your request is long overdue, by more than {{very_late_number_of_days}} working days. Most requests should be answered within {{late_number_of_days}} working days. You might like to complain about this, see below.</p>" -msgstr "<p>Grazie! La tua richiesta è da tempo in attesa di risposta, da più di {{very_late_number_of_days}} giorni lavorativi. Alla maggior parte delle richieste viene data risposta entro {{late_number_of_days}} giorni lavorativi. Se vuoi protestare per la mancata risposta, guarda qui sotto.</p>" +msgstr "<p>Grazie! La tua richiesta è da tempo in attesa di risposta, precisamente da più di {{very_late_number_of_days}} giorni lavorativi. Le richieste dovrebbero ricevere risposta entro {{late_number_of_days}} giorni lavorativi. Se vuoi segnalare la mancata risposta, guarda qui sotto.</p>" msgid "<p>Thanks for changing the text about you on your profile.</p>\\n <p><strong>Next...</strong> You can upload a profile photograph too.</p>" msgstr "<p>Grazie per aver modificato il testo della biografia sul tuo profilo.</p>\\n <p><strong>Continua...</strong> Puoi anche caricare una foto sul tuo profilo.</p>" msgid "<p>Thanks for updating your profile photo.</p>\\n <p><strong>Next...</strong> You can put some text about you and your research on your profile.</p>" -msgstr "<p>Grazie per aver modificato la foto sul tuo profilo.</p>\\n <p><strong>Continua...</strong> Puoi anche modificare il testo della biografia sul tuo profilo.</p>" +msgstr "<p>Grazie per aver modificato la foto sul tuo profilo.</p> <p><strong>Continua...</strong> Puoi anche modificare il testo della biografia sul tuo profilo.</p>" msgid "<p>We recommend that you edit your request and remove the email address.\\n If you leave it, the email address will be sent to the authority, but will not be displayed on the site.</p>" msgstr "<p>Ti consigliamo di modificare la tua richiesta e cancellare l'indirizzo email. Se lo lasci, verrà inviato automaticamente all'amministrazione, ma non verrà mostrato sul sito.</p>" msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p>" -msgstr "<p>Siamo contenti che tu abbia ricevuto tutte le informazioni che desideravi. Se ne scrivi o le utilizzi, per favore torna sul sito e aggiungi un'annotazione segnalando che lo hai fatto." +msgstr "<p>Siamo contenti che tu abbia ricevuto tutte le informazioni che desideravi. Se ne scrivi o le utilizzi, per favore torna sul sito e aggiungi un'annotazione segnalando cosa hai fatto." msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p><p>If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p>" msgstr "<p>Siamo contenti che tu abbia ricevuto tutte le informazioni richieste. Se farai uso di queste informazioni, anche scrivendo un articolo, ti chiediamo di tornare sul sito ed aggiungere una annotazione qui sotto per raccontare cosa hai fatto.</p><p>Se {{site_name}} ti è stato utile, puoi fare <a href=\"{{donation_url}}\">una donazione</a> a favore dell'organizzazione che la gestisce.</p>" msgid "<p>We're glad you got some of the information that you wanted. If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>" -msgstr "<p>Siamo felici che tu abbia ricevuto parte delle informazioni richieste. </p><p>Se {{site_name}} ti è stato utile, puoi fare <a href=\"{{donation_url}}\">una donazione</a> a favore dell'entità che la gestisce. </p><p>Se vuoi provare ad ottenere il resto delle informazioni richieste, ecco cosa devi fare ora.</p>" +msgstr "<p>Siamo contenti che tu abbia ricevuto parte delle informazioni richieste. </p><p>Se {{site_name}} ti è stato utile, puoi fare <a href=\"{{donation_url}}\">una donazione</a> a favore dell'organizzazione che la gestisce. </p><p>Se vuoi provare ad ottenere il resto delle informazioni richieste, ecco cosa devi fare ora.</p>" msgid "<p>We're glad you got some of the information that you wanted.</p><p>If you want to try and get the rest of the information, here's what to do now.</p>" msgstr "<p>Siamo contenti che tu abbia ricevuto parte delle informazioni che desideravi.</p><p<Se vuoi provare a richiedere le informazioni mancanti, ecco cosa fare.</p>" @@ -209,40 +210,40 @@ msgstr "" "<p>Se scrivi qualcosa su questa richiesta (ad esempio su un forum o su un blog), per favore inserisci un link a questa pagina e inserisci un'annotazione qui sotto segnalando ciò che hai scritto e dove." msgid "<p>Your {{law_used_full}} requests will be <strong>sent</strong> shortly!</p>\\n <p><strong>We will email you</strong> when they have been sent.\\n We will also email you when there is a response to any of them, or after {{late_number_of_days}} working days if the authorities still haven't\\n replied by then.</p>\\n <p>If you write about these requests (for example in a forum or a blog) please link to this page.</p>" -msgstr "<p>Le tue richieste {{law_used_full}} verranno <strong>spedite</strong> a breve!</p>\\n <p><strong>Ti invieremo una email</strong> quando saranno state inviate. Ti invieremo una email anche quando ci sarà qualche risposta o dopo {{late_number_of_days}} giorni, se le amministrazioni non avessero ancora risposto.</p><p>Se scrivi qualcosa su queste richieste (ad esempio su un forum o su un blog), per favore inserisci un link a questa pagina.</p>" +msgstr "<p>Le tue richieste di {{law_used_full}} verranno <strong>spedite</strong> a breve!</p>\\n <p><strong>Ti invieremo una email</strong> quando saranno state inviate. Ti scriveremo anche quando ci sarà qualche risposta o dopo {{late_number_of_days}} giorni, se le amministrazioni non avessero ancora risposto.</p><p>Se scrivi qualcosa su queste richieste (ad esempio su un forum o su un blog), per favore inserisci un link a questa pagina.</p>" msgid "<p>{{site_name}} is currently in maintenance. You can only view existing requests. You cannot make new ones, add followups or annotations, or otherwise change the database.</p> <p>{{read_only}}</p>" -msgstr "<p>{{site_name}} è attualmente in manutenzione. Possono essere viste solo le richieste esistenti ma non possono esserne inserite di nuove, nè aggiunti followups o annotazioni, che vadano a modificare il database.</p> <p>{{read_only}}</p>" +msgstr "<p>{{site_name}} è attualmente in manutenzione. Possono essere viste solo le richieste esistenti ma non possono esserne inserite di nuove, nè aggiunti altri messaggi o annotazioni che vadano a modificare il database.</p> <p>{{read_only}}</p>" msgid "<small>If you use web-based email or have \"junk mail\" filters, also check your\\nbulk/spam mail folders. Sometimes, our messages are marked that way.</small>\\n</p>" msgstr "<small>Se usi caselle di posta online o hai filtri per la posta, controlla anche la casella \"spam\". A volte i nostri messaggi possono finire lì per errore.</small>\\n</p>" msgid "<strong> Can I request information about myself?</strong>\\n\t\t\t<a href=\"{{url}}\">No! (Click here for details)</a>" -msgstr "<strong> Posso richiedere informazioni su di me?</strong>\\n\t\t\t<a href=\"{{url}}\">No! (Clicca qui per i dettagli)</a>" +msgstr "<strong> Posso richiedere informazioni su di me?</strong>\\n⇥⇥⇥<a href=\"{{url}}\">Sì, puoi (qui i dettagli)</a>, ma tieni presente che richieste e risposte saranno pubblicate su questo sito" msgid "<strong><code>commented_by:tony_bowden</code></strong> to search annotations made by Tony Bowden, typing the name as in the URL." -msgstr "<strong><code>commented_by:tony_bowden</code></strong> per cercare le annotazioni fatte da Tony Bowden, digitare il nome come nell'URL." +msgstr "<strong><code>commented_by:mario_rossi</code></strong> per cercare le annotazioni fatte da Mario Rossi, digitare il nome come nell'URL." msgid "<strong><code>filetype:pdf</code></strong> to find all responses with PDF attachments. Or try these: <code>{{list_of_file_extensions}}</code>" -msgstr "<strong><code>filetype:pdf</code></strong> per trovare tutte le risposte con allegati PDF. Oppure prova queste: <code>{{list_of_file_extensions}}</code>" +msgstr "<strong><code>filetype:pdf</code></strong> per trovare tutte le risposte con allegati PDF. Oppure prova qui: <code>{{list_of_file_extensions}}</code>" msgid "<strong><code>request:</code></strong> to restrict to a specific request, typing the title as in the URL." -msgstr "<strong><code>richiesta:</code></strong> per restringere la ricerca ad una specifica richiesta, digitare il titolo come nell'URL." +msgstr "<strong><code>request:</code></strong> per restringere la ricerca ad una specifica richiesta, digitare il titolo come nell'URL." msgid "<strong><code>requested_by:julian_todd</code></strong> to search requests made by Julian Todd, typing the name as in the URL." -msgstr "<strong><code>requested_by:julian_todd</code></strong> per cercare le richieste fatte da Julian Todd, digitare il nome come nell'URL." +msgstr "<strong><code>requested_by:paola_bianchi</code></strong> per cercare le richieste fatte da Paola Bianchi, digitare il nome come nell'URL." msgid "<strong><code>requested_from:home_office</code></strong> to search requests from the Home Office, typing the name as in the URL." msgstr "<strong><code>requested_from:home_office</code></strong> per cercare le richieste dall'Home Office, digitare il nome come nell'URL." msgid "<strong><code>status:</code></strong> to select based on the status or historical status of the request, see the <a href=\"{{statuses_url}}\">table of statuses</a> below." -msgstr "<strong><code>status:</code></strong> per fare ricerche basate sullo status o sullo status storico della richiesta, guardare la <a href=\"{{statuses_url}}\">tabella degli status</a> qui sotto." +msgstr "<strong><code>status:</code></strong> per fare ricerche basate sullo stato attuale o passato della richiesta, guardare la <a href=\"{{statuses_url}}\">tabella degli stati</a> qui sotto." msgid "<strong><code>tag:charity</code></strong> to find all public authorities or requests with a given tag. You can include multiple tags, \\n and tag values, e.g. <code>tag:openlylocal AND tag:financial_transaction:335633</code>. Note that by default any of the tags\\n can be present, you have to put <code>AND</code> explicitly if you only want results them all present." -msgstr "" +msgstr "Usa ad esempio <strong><code>tag:ambiente</code></strong> per trovare tutte le amministrazioni o richieste che contengono quella parola. Puoi usare più parole contemporaneamente <code>tag:ambiente AND tag:appalto:335633</code>. Ricorda che per avere risultati che soddisfino entrambi i criteri devi utilizzare la parola <code>AND</code>." msgid "<strong><code>variety:</code></strong> to select type of thing to search for, see the <a href=\"{{varieties_url}}\">table of varieties</a> below." -msgstr "<strong><code>varietà:</code></strong> per fare una ricerca basata sul tipo di cosa da cercare, guardare la <a href=\"{{varieties_url}}\">tabella delle varietà</a> qui sotto." +msgstr "<strong><code>variety:</code></strong> per fare una ricerca basata sul tipo di elemento da cercare, guardare la <a href=\"{{varieties_url}}\">tabella delle variabili</a> qui sotto." msgid "<strong>Advice</strong> on how to get a response that will satisfy the requester. </li>" msgstr "<strong>Consigli</strong> su come ottenere una risposta soddisfacente per il richiedente. </li>" @@ -284,10 +285,10 @@ msgid "<strong>Some of the information</strong> has been sent " msgstr "<strong>Alcune delle informazioni</strong> sono state inviate " msgid "<strong>Thank</strong> the public authority or " -msgstr "<strong>Ringrazia</strong> la pubblica autorità o " +msgstr "<strong>Ringrazia</strong> l'amministrazione o " msgid "<strong>did not have</strong> the information requested." -msgstr "<strong>non otterrai</strong> l'informazione richiesta." +msgstr "<strong>non aveva</strong> l'informazione richiesta." msgid "?" msgstr "?" @@ -311,7 +312,7 @@ msgid "A new request, <em><a href=\"{{request_url}}\">{{request_title}}</a></em> msgstr "Una nuova richiesta, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, è stata spedita a {{public_body_name}} da {{info_request_user}} il {{date}}." msgid "A public authority" -msgstr "Una pubblica autorità" +msgstr "Un'amministrazione" msgid "A response will be sent <strong>by post</strong>" msgstr "Una risposta verrà inviata <strong>per posta</strong>" @@ -368,7 +369,7 @@ msgid "Advanced search tips" msgstr "Suggerimenti per la ricerca avanzata" msgid "Advise on whether the <strong>refusal is legal</strong>, and how to complain about it if not." -msgstr "Consigli sul <strong>rifiuto legale</strong> di fornire informazioni, e come comportarsi se non si tratta di rifiuto legale." +msgstr "Consigli sullo stato legale del <strong>rifiuto</strong> di fornire informazioni, e come comportarsi se il rifiuto non è a norma di legge." msgid "Air, water, soil, land, flora and fauna (including how these effect\\n human beings)" msgstr "Aria, acqua, terra, flora e fauna (e l'impatto che hanno sugli esseri umani)" @@ -430,7 +431,7 @@ msgid "Applies to" msgstr "Si applica a " msgid "Are we missing a public authority?" -msgstr "Non abbiamo inserito una autorità pubblica?" +msgstr "Non abbiamo inserito un'amministrazione?" msgid "Are you the owner of any commercial copyright on this page?" msgstr "Possiedi i diritti commerciali di questa pagina?" @@ -481,10 +482,10 @@ msgid "Browse <a href='{{url}}'>other requests</a> for examples of how to word y msgstr "Guarda le <a href='{{url}}'>altre richieste</a> come esempi su come argomentare la tua richiesta." msgid "Browse <a href='{{url}}'>other requests</a> to '{{public_body_name}}' for examples of how to word your request." -msgstr "Guarda le <a href='{{url}}'>altre richieste</a> all'autorità pubblica '{{public_body_name}}' per esempi su come argomentare la tua richiesta." +msgstr "Guarda le <a href='{{url}}'>altre richieste</a> all'amministrazione '{{public_body_name}}' per esempi su come argomentare la tua richiesta." msgid "Browse all authorities..." -msgstr "Guarda tutte le autorità disponibili..." +msgstr "Guarda tutte le amministrazioni..." msgid "Browse and search requests" msgstr "Guarda e cerca richieste" @@ -493,10 +494,10 @@ msgid "Browse requests" msgstr "Guarda richieste" msgid "By law, under all circumstances, {{public_body_link}} should have responded by now" -msgstr "Di regola, in ogni caso, l'autorità pubblica {{public_body_link}} dovrebbe aver risposto ora" +msgstr "Secondo la legge, in qualunque circostanza, l'amministrazione {{public_body_link}} dovrebbe aver risposto a questo punto" msgid "By law, {{public_body_link}} should normally have responded <strong>promptly</strong> and" -msgstr "Di regola, l'autorità pubblica {{public_body_link}} dovrebbe aver risposto <strong>immediatamente</strong> e" +msgstr "Di regola, l'amministrazione {{public_body_link}} dovrebbe aver risposto <strong>immediatamente</strong> e" msgid "Calculated home page" msgstr "Calculated home page" @@ -586,7 +587,7 @@ msgid "Click on the link below to send a message to {{public_body_name}} telling msgstr "Clicca sul link qui sotto per mandare un messaggio a {{public_body_name}} e dire loro di rispondere alla tua richiesta. Puoi anche chiedere perché la risposta alla richiesta è stata lenta. " msgid "Click on the link below to send a message to {{public_body}} reminding them to reply to your request." -msgstr "Clicca sul link qui sotto per inviare un messaggio all'autorità pubblica {{public_body}} e ricordargli di rispondere alla tua richiesta." +msgstr "Clicca sul link qui sotto per inviare un messaggio all'amministrazione {{public_body}} e ricorda loro di rispondere alla tua richiesta." msgid "Close" msgstr "Chiudi" @@ -676,7 +677,7 @@ msgid "Cultural sites and built structures (as they may be affected by the\\n msgstr "Siti di valore culturale e costruzioni (poiché possono essere state danneggiate dai fattori ambientali sopraelencati)" msgid "Currently <strong>waiting for a response</strong> from {{public_body_link}}, they must respond promptly and" -msgstr "Attualmente stiamo <strong>attendendo una risposta</strong> da {{public_body_link}}, essi dovranno rispondere velocemente e" +msgstr "Al momento stiamo <strong>aspettando una risposta</strong> da {{public_body_link}}, l'amministrazione dovrà rispondere rapidamente e" msgid "Date:" msgstr "Data:" @@ -793,16 +794,16 @@ msgid "Environmental Information Regulations requests made using this site" msgstr "Fatte richieste su Environmental Information Regulations usando questo sito" msgid "Event history" -msgstr "Storia dell'evento" +msgstr "Processo della richiesta" msgid "Event history details" -msgstr "Dettagli della storia dell'evento" +msgstr "Dettagli sul processo della richiesta" msgid "Event {{id}}" msgstr "Evento {{id}}" 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 "Tutte le cose che scrivi in questa pagina, incluso <strong>il tuo nome</strong>,\\n saranno <strong>rese pubbliche</strong> on\\n su questo sito per sempre (<a href=\"{{url}}\">perchè?</a>)." +msgstr "Tutto ciò che scrivi in questa pagina, incluso <strong>il tuo nome</strong> saranno <strong>pubblicate</strong> su questo sito e saranno visibili (<a href=\"{{url}}\">perché?</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 "Tutte le cose che scrivi in questa pagina,\\n saranno <strong>rese pubbliche</strong> on\\n su questo sito per sempre (<a href=\"{{url}}\">perchè?</a>)." @@ -811,7 +812,7 @@ msgid "FOI" msgstr "FOI" msgid "FOI email address for {{public_body}}" -msgstr "Indirizzo email dell'autorità pubblica {{public_body}}" +msgstr "Indirizzo email per l'accesso dell'amministrazione {{public_body}}" msgid "FOI request – {{title}}" msgstr "Richiesta di accesso - {{title}}" @@ -847,7 +848,7 @@ msgid "First, did your other requests succeed?" msgstr "Innanzitutto, le tue altre richieste hanno ricevuto risposta?" msgid "First, type in the <strong>name of the UK public authority</strong> you'd\\n like information from. <strong>By law, they have to respond</strong>\\n (<a href=\"{{url}}\">why?</a>)." -msgstr "Per prima cosa, digita il <strong>nome di una autorità pubblica italiana</strong> a cui vuoi \\n chiedere informazioni. <strong>Per legge, ti devono rispondere</strong>\\n (<a href=\"{{url}}\">perchè?</a>)." +msgstr "Per prima cosa, digita il <strong>nome di un'amministrazione italiana</strong> a cui vuoi \\n chiedere informazioni. <strong>Per legge ti devono rispondere</strong>\\n (<a href=\"{{url}}\">perchè?</a>)." msgid "Foi attachment" msgstr "Allegato" @@ -892,7 +893,7 @@ msgid "Follow things matching this search" msgstr "Segui tutto quello che corrisponde a questa ricerca" msgid "Follow this authority" -msgstr "Segui questa autorità" +msgstr "Segui questa amministrazione" msgid "Follow this link to see the request:" msgstr "Vai a questo link per vedere la richiesta:" @@ -937,18 +938,18 @@ msgid "Followups cannot be sent for this request, as it was made externally, and msgstr "Non possono essere spediti messaggi supplementari per questa richiesta, dato che è stata effettuata esternamente e pubblicata qui da {{public_body_name}} dietro richiesta del mittente." msgid "For an unknown reason, it is not possible to make a request to this authority." -msgstr "Per una ragione sconosciuta, non è possibile inviare una richiesta a questa autorità." +msgstr "Per una ragione sconosciuta, non è possibile inviare una richiesta a questa amministrazione." msgid "Forgotten your password?" msgstr "Persa la password?" msgid "Found {{count}} public authority {{description}}" msgid_plural "Found {{count}} public authorities {{description}}" -msgstr[0] "Trovata {{count}} autorità pubblica {{description}}" -msgstr[1] "Trovate {{count}} autorità pubbliche {{description}}" +msgstr[0] "Trovata {{count}} amministrazione {{description}}" +msgstr[1] "Trovate {{count}} amministrazioni {{description}}" msgid "Freedom of Information" -msgstr "Freedom of Information" +msgstr "accesso" msgid "Freedom of Information Act" msgstr "Freedom of Information Act" @@ -960,7 +961,7 @@ msgid "Freedom of Information law no longer applies to" msgstr "La legge sulla Freedom of Information non si applica più a" msgid "Freedom of Information law no longer applies to this authority.Follow up messages to existing requests are sent to " -msgstr "La legge sulla Freedom of Information non si applica più a questa autorità. I messaggi di risposta a richieste esistenti vengono inviati a " +msgstr "La legge sull'accesso non si applica più a questa amministrazione. I messaggi di risposta a richieste esistenti vengono inviati a " msgid "Freedom of Information requests made" msgstr "Le richieste fatte" @@ -1017,12 +1018,13 @@ msgid "Hello, {{username}}!" msgstr "Ciao, {{username}}!" msgid "Help" -msgstr "Aiuto" +msgstr "Per informazioni" msgid "Here <strong>described</strong> means when a user selected a status for the request, and\\nthe most recent event had its status updated to that value. <strong>calculated</strong> is then inferred by\\n{{site_name}} for intermediate events, which weren't given an explicit\\ndescription by a user. See the <a href=\"{{search_path}}\">search tips</a> for description of the states." msgstr "" -"<strong>\"descritto\"</strong> indica lo stato che un utente ha attribuito alla richiesta e l'elemento più recente a cui tale stato è attribuito.\n" -"<strong>\"calcolato\"</strong> viene quindi ricavato da {{site_name}} per elementi intermedi senza descrizione. Guarda i <a href=\"{{search_path}}\">suggerimenti di ricerca</a> per una descrizione approfondita." +"In questa tabella <strong>\"descritto\"</strong> indica lo stato che un utente ha attribuito alla richiesta.\n" +"Invece <strong>\"calcolato\"</strong> viene ricavato da {{site_name}}. \n" +"Guarda i <a href=\"{{search_path}}\">suggerimenti di ricerca</a> per una descrizione approfondita." msgid "Here is the message you wrote, in case you would like to copy the text and save it for later." msgstr "Questo è il messaggio che hai scritto. Copialo e salvalo se ti serve il testo in seguito." @@ -1049,7 +1051,7 @@ msgid "Home page" msgstr "Home page" msgid "Home page of authority" -msgstr "Home page dell'autorità" +msgstr "Home page dell'amministrazione" msgid "However, you have the right to request environmental\\n information under a different law" msgstr "Grazie a un'altra legge, comunque, hai il diritto di richiedere informazioni su questioni legate all'ambiente" @@ -1067,10 +1069,10 @@ msgid "I am writing to request an internal review of {{public_body_name}}'s hand msgstr "Faccio richiesta di una revisione interna delle modalità con cui {{public_body_name}} ha gestito la mia richiesta di accesso '{{info_request_title}}'." msgid "I don't like these ones — give me some more!" -msgstr "Non mi piacciono queste — dammene altre!" +msgstr "Queste non mi piacciono queste — mostramene altre" msgid "I don't want to do any more tidying now!" -msgstr "Non voglio fare nessun ordinamento ora!" +msgstr "In questo momento non voglio dare una mano." msgid "I like this request" msgstr "Mi piace questa richiesta" @@ -1103,7 +1105,7 @@ msgid "I've received an error message" msgstr "Visualizzo un messaggio di errore" msgid "Id" -msgstr "Id" +msgstr "N." msgid "If the address is wrong, or you know a better address, please <a href=\"{{url}}\">contact us</a>." msgstr "Se l'indirizzo è sbagliato o se conosci quello esatto, <a href=\"{{url}}\">contattaci</a>, per favore." @@ -1199,13 +1201,13 @@ msgid "IncomingMessage|Prominence reason" msgstr "IncomingMessage|Prominence reason" msgid "IncomingMessage|Sent at" -msgstr "IncomingMessage|Sent at" +msgstr "IncomingMessage|Spedito a" msgid "IncomingMessage|Subject" msgstr "Messaggio In Arrivo|Oggetto" msgid "IncomingMessage|Valid to reply to" -msgstr "IncomingMessage|Valid to reply to" +msgstr "IncomingMessage|Risposta valida" msgid "Individual requests" msgstr "Richiesta individuale" @@ -1223,46 +1225,46 @@ msgid "InfoRequestBatch|Body" msgstr "InfoRequestBatch|Body" msgid "InfoRequestBatch|Sent at" -msgstr "InfoRequestBatch|Sent at" +msgstr "InfoRequestBatch|Spedita" msgid "InfoRequestBatch|Title" msgstr "InfoRequestBatch|Title" msgid "InfoRequestEvent|Calculated state" -msgstr "InfoRequestEvent|Calculated state" +msgstr "InfoRequestEvent|Calcolato" msgid "InfoRequestEvent|Described state" -msgstr "InfoRequestEvent|Described state" +msgstr "InfoRequestEvent|Descritto" msgid "InfoRequestEvent|Event type" msgstr "InfoRequestEvent|Event type" msgid "InfoRequestEvent|Last described at" -msgstr "InfoRequestEvent|Last described at" +msgstr "InfoRequestEvent|Ultimo calcolo al" msgid "InfoRequestEvent|Params yaml" msgstr "InfoRequestEvent|Params yaml" msgid "InfoRequest|Allow new responses from" -msgstr "InfoRequest|Allow new responses from" +msgstr "InfoRequest|Nuove risposte da" msgid "InfoRequest|Attention requested" -msgstr "InfoRequest|Attention requested" +msgstr "InfoRequest|Richiesta analisi" msgid "InfoRequest|Awaiting description" -msgstr "InfoRequest|Awaiting description" +msgstr "InfoRequest|In attesa di descrizione" msgid "InfoRequest|Comments allowed" -msgstr "InfoRequest|Comments allowed" +msgstr "InfoRequest|Commenti consentiti" msgid "InfoRequest|Described state" msgstr "InfoRequest|Described state" msgid "InfoRequest|External url" -msgstr "InfoRequest|External url" +msgstr "InfoRequest|Link esterno" msgid "InfoRequest|External user name" -msgstr "InfoRequest|External user name" +msgstr "InfoRequest|Nome utente esterno" msgid "InfoRequest|Handle rejected responses" msgstr "InfoRequest|Handle rejected responses" @@ -1271,7 +1273,7 @@ msgid "InfoRequest|Idhash" msgstr "InfoRequest|Idhash" msgid "InfoRequest|Law used" -msgstr "InfoRequest|Law used" +msgstr "InfoRequest|Legge utilizzata" msgid "InfoRequest|Prominence" msgstr "InfoRequest|Prominence" @@ -1316,7 +1318,7 @@ msgid "Just one more thing" msgstr "Ancora una cosa" msgid "Keep it <strong>focused</strong>, you'll be more likely to get what you want (<a href=\"{{url}}\">why?</a>)." -msgstr "Devi essere <strong>focalizzato</strong> su un argomento, solo così otterai la risposta voluta (<a href=\"{{url}}\">perchè?</a>)." +msgstr "Se <strong>circoscrivi</strong> la richiesta a un solo argomento/documento, sarà più facile ottenere la risposta voluta (<a href=\"{{url}}\">perché?</a>)." msgid "Keywords" msgstr "Parole chiave" @@ -1334,7 +1336,7 @@ msgid "Link to this" msgstr "Inserisci un collegamento a questo" msgid "List of all authorities (CSV)" -msgstr "Lista di tutte le autorità (CSV)" +msgstr "Lista di tutte le amministrazioni (CSV)" msgid "Listing FOI requests" msgstr "Elenco delle richieste di accesso" @@ -1352,7 +1354,7 @@ msgid "Listing users" msgstr "Elenco degli utenti" msgid "Log in to download a zip file of {{info_request_title}}" -msgstr "Accedi per scaricare un file zip di {{info_request_title}}" +msgstr "Accedi per scaricare un file compresso di {{info_request_title}}" msgid "Log into the admin interface" msgstr "Accedi all'interfaccia per amministratore" @@ -1403,7 +1405,7 @@ msgid "Make a request to these authorities" msgstr "Invia una richiesta a queste amministrazioni" msgid "Make a request to this authority" -msgstr "Fai una richiesta a questa autorità" +msgstr "Fai una richiesta a questa amministrazione" msgid "Make an {{law_used_short}} request" msgstr "Invia una richiesta secondo la legge {{law_used_short}} " @@ -1481,7 +1483,7 @@ msgid "New password: (again)" msgstr "Nuova password: (di nuovo)" msgid "New response to '{{title}}'" -msgstr "Nuova risposta per '{{title}}'" +msgstr "Nuova risposta a '{{title}}'" msgid "New response to your FOI request - " msgstr "Nuova risposta alla tua richiesta di accesso -" @@ -1502,7 +1504,7 @@ msgid "Next" msgstr "Prossimo" msgid "Next, crop your photo >>" -msgstr "Ora, taglia la foto" +msgstr "Ora taglia la foto" msgid "No requests of this sort yet." msgstr "Non ci sono richieste." @@ -1535,7 +1537,7 @@ msgid "Note that the requester will not be notified about your annotation, becau msgstr "Tieni presente che il richiedente non riceverà una notifica sulla tua annotazione perché la richiesta è stata pubblicata da {{public_body_name}}." msgid "Notes:" -msgstr "Note:" +msgstr "Altre informazioni:" msgid "Now check your email!" msgstr "Ora guarda la tua email!" @@ -1553,7 +1555,7 @@ msgid "Number of requests" msgstr "Numero di richieste" msgid "OR remove the existing photo" -msgstr "O rimuovi la foto esistente" +msgstr "OR rimuovi la foto esistente" msgid "Offensive? Unsuitable?" msgstr "Offensivo? Non adatto?" @@ -1712,7 +1714,7 @@ msgid "Please click on the link below to cancel or alter these emails." msgstr "Clicca sul link qui sotto per cancellare o modificare queste email" msgid "Please click on the link below to confirm that you want to \\nchange the email address that you use for {{site_name}}\\nfrom {{old_email}} to {{new_email}}" -msgstr "Clicca sul link qui sotto per confermare che vuoi cambiare l'indirizzo email che usi per {{site_name}} da {{old_email}} a {{new_email}}" +msgstr "Clicca sul link qui sotto per confermare che vuoi cambiare l'indirizzo email che usi su {{site_name}} da {{old_email}} a {{new_email}}" msgid "Please click on the link below to confirm your email address." msgstr "Clicca sul link qui sotto per confermare il tuo indirizzo email." @@ -1814,16 +1816,16 @@ msgid "Please write a summary with some text in it" msgstr "Scrivi un riassunto contenente testo" msgid "Please write the summary using a mixture of capital and lower case letters. This makes it easier for others to read." -msgstr "" +msgstr "Per favore non scrivere l'oggetto del messaggio interamente in maiuscolo o in minuscolo. Utilizza le maiuscole dove appropriato e lo renderai più leggibile." msgid "Please write your annotation using a mixture of capital and lower case letters. This makes it easier for others to read." -msgstr "" +msgstr "Per favore non scrivere l'annotazione interamente in maiuscolo o in minuscolo. Utilizza le maiuscole dove appropriato e lo renderai più leggibile." msgid "Please write your follow up message containing the necessary clarifications below." msgstr "Scrivi un messaggio contenente le spiegazioni sulla tua richiesta." msgid "Please write your message using a mixture of capital and lower case letters. This makes it easier for others to read." -msgstr "" +msgstr "Per favore non scrivere il tuo messaggio interamente in maiuscolo o in minuscolo. Utilizza le maiuscole dove appropriato e lo renderai più leggibile." msgid "Point to <strong>related information</strong>, campaigns or forums which may be useful." msgstr "Indica <strong>informazioni</strong>, campagne e forum che potrebbero essere utili." @@ -1907,7 +1909,7 @@ msgid "Public Body Statistics" msgstr "Statistiche relative alle amministrazioni" msgid "Public authorities" -msgstr "Guarda e cerca autorità pubbliche" +msgstr "Guarda e cerca amministrazioni" msgid "Public authorities - {{description}}" msgstr "Amministrazioni - {{description}}" @@ -1952,13 +1954,13 @@ msgid "Public body heading" msgstr "Public body heading" msgid "Public notes" -msgstr "Public notes" +msgstr "Note pubbliche" msgid "Public page" -msgstr "Public page" +msgstr "Pagina pubblica" msgid "Public page not available" -msgstr "Public page not available" +msgstr "Pagina pubblica non disponibile" msgid "PublicBodyCategoryLink|Category display order" msgstr "PublicBodyCategoryLink|Category display order" @@ -2072,31 +2074,31 @@ msgid "RSS feed" msgstr "RSS feed" msgid "RSS feed of updates" -msgstr "RSS feed of updates" +msgstr "RSS feed di aggiornamenti" msgid "Re-edit this annotation" -msgstr "Re-edit this annotation" +msgstr "Modifica ancora questa annotazione" msgid "Re-edit this message" -msgstr "Re-edit this message" +msgstr "Modifica ancora questo messaggio" msgid "Read about <a href=\"{{advanced_search_url}}\">advanced search operators</a>, such as proximity and wildcards." -msgstr "Read about <a href=\"{{advanced_search_url}}\">advanced search operators</a>, such as proximity and wildcards." +msgstr "Leggi informazioni su <a href=\"{{advanced_search_url}}\">operatori di ricerca avanzati</a> in inglese" msgid "Read blog" -msgstr "Leggi blog" +msgstr "Blog" msgid "Received an error message, such as delivery failure." -msgstr "Received an error message, such as delivery failure." +msgstr "Ricevuto messaggio di errore di spedizione." msgid "Recently described results first" -msgstr "Recently described results first" +msgstr "Mostra prima risultati più recenti" msgid "Refused." msgstr "Rifiutato." msgid "Remember me</label> (keeps you signed in longer;\\n do not use on a public computer) " -msgstr "Ricorda</label> (mantiene l'accesso più a lungo;\\n non usare su computer pubblico) " +msgstr "Ricordami</label> (mantiene l'accesso più a lungo;\\n non usare su computer pubblico) " msgid "Report abuse" msgstr "Segnala violazione" @@ -2117,16 +2119,16 @@ msgid "Reporting a request notifies the site administrators. They will respond a msgstr "La segnalazione di una richiesta è stata inviata agli amministratori del sito. Riceverai risposta al più presto." msgid "Request an internal review" -msgstr "Request an internal review" +msgstr "Richiedi una revisione interna" msgid "Request an internal review from {{person_or_body}}" msgstr "Richiedi una revisione interna da {{person_or_body}}" msgid "Request email" -msgstr "Request email" +msgstr "Email per la richiesta" msgid "Request for personal information" -msgstr "Request for personal information" +msgstr "Richiesta di informazioni personali" msgid "Request has been removed" msgstr "La richiesta è stata rimossa" @@ -2159,7 +2161,7 @@ msgid "Requests similar to '{{request_title}}'" msgstr "Richieste simili a '{{request_title}}'" msgid "Requests similar to '{{request_title}}' (page {{page}})" -msgstr "Richieste simili a '{{request_title}}' (page {{page}})" +msgstr "Richieste simili a '{{request_title}}' (pagina {{page}})" msgid "Requests will be sent to the following bodies:" msgstr "Le richieste verranno spedite ai seguenti uffici:" @@ -2204,7 +2206,7 @@ msgid "Restrict to" msgstr "Restringi a " msgid "Results page {{page_number}}" -msgstr "Results page {{page_number}}" +msgstr "Pagina di risultati {{page_number}}" msgid "Save" msgstr "Salva" @@ -2228,7 +2230,7 @@ msgid "Search in" msgstr "Cerca tra" msgid "Search over<br/>\\n <strong>{{number_of_requests}} requests</strong> <span>and</span><br/>\\n <strong>{{number_of_authorities}} authorities</strong>" -msgstr "Cerca tra<br/>\\n <strong>{{number_of_requests}} richieste</strong> <span>e</span><br/>\\n <strong>{{number_of_authorities}} autorità pubbliche</strong>" +msgstr "Cerca tra<br/>\\n <strong>{{number_of_requests}} richieste</strong> <span>e</span><br/>\\n <strong>{{number_of_authorities}} amministrazioni</strong>" msgid "Search queries" msgstr "Search queries" @@ -2254,7 +2256,7 @@ msgid "Select the authorities to write to" msgstr "Fai una ricerca tra le amministrazioni a cui scrivere" msgid "Select the authority to write to" -msgstr "Seleziona una autorità pubblica a cui scrivere" +msgstr "Seleziona un'amministrazione a cui scrivere" msgid "Send a followup" msgstr "Invia ulteriore messaggio" @@ -2266,7 +2268,7 @@ msgid "Send a public follow up message to {{person_or_body}}" msgstr "Invia ulteriore messaggio pubblico a {{person_or_body}}" msgid "Send a public reply to {{person_or_body}}" -msgstr "Invia risposta pubblica a {{person_or_body}}" +msgstr "Invia una risposta pubblica a {{person_or_body}}" msgid "Send follow up to '{{title}}'" msgstr "Invia ulteriore messaggio a '{{title}}'" @@ -2397,13 +2399,13 @@ msgid "Submit status" msgstr "Pubblica lo stato della richiesta" msgid "Submit status and send message" -msgstr "Submit status and send message" +msgstr "Pubblica lo stato della richiesta e spedisci il messaggio" msgid "Subscribe to blog" msgstr "Seguici sul blog" msgid "Success" -msgstr "Success" +msgstr "Soddisfacente" msgid "Successful Freedom of Information requests" msgstr "Richieste di accesso con risposta soddisfacente" @@ -2418,10 +2420,10 @@ msgid "Summary:" msgstr "Titolo:" msgid "Table of statuses" -msgstr "Elenco dei possibili risultati della richiesta" +msgstr "Elenco dei possibili risultati" msgid "Table of varieties" -msgstr "Table of varieties" +msgstr "Elenco delle variabili" msgid "Tags" msgstr "Tag" @@ -2526,10 +2528,10 @@ msgid "The last outgoing message was created over a day ago" msgstr "The last outgoing message was created over a day ago" msgid "The last user was created in the last day" -msgstr "The last user was created in the last day" +msgstr "L'ultimo profilo utente è stato creato nelle ultime 24 ore" msgid "The last user was created over a day ago" -msgstr "The last user was created over a day ago" +msgstr "L'ultimo profilo utente è stato creato più di un giorno fa" msgid "The page doesn't exist. Things you can try now:" msgstr "La pagina non esiste. Ecco cosa puoi fare:" @@ -2794,19 +2796,19 @@ msgid "This request <strong>requires administrator attention</strong>" msgstr "La richiesta necessita del <strong>controllo dell'amministratore</strong>" msgid "This request has already been reported for administrator attention" -msgstr "La richiesta è stata portata all'attenzione dell'amministratore del sito" +msgstr "La richiesta è stata segnalata all'amministratore del sito" msgid "This request has an <strong>unknown status</strong>." -msgstr "La stato della richiesta <strong>assente</strong>." +msgstr "La stato della richiesta è <strong>sconosciuto</strong>." msgid "This request has been <strong>hidden</strong> from the site, because an administrator considers it not to be an FOI request" -msgstr "La richiesta è stata <strong>nascosta</strong> perché l'amministratore del sito non la considerano una richiesta di accesso" +msgstr "La richiesta è stata <strong>nascosta</strong> perché l'amministratore del sito non la considera valida ai sensi di legge" msgid "This request has been <strong>hidden</strong> from the site, because an administrator considers it vexatious" msgstr "La richiesta è stata <strong>nascosta</strong> perché un amministratore l'ha considerata inadatta" msgid "This request has been <strong>reported</strong> as needing administrator attention (perhaps because it is vexatious, or a request for personal information)" -msgstr "" +msgstr "Questa richiesta è stato <strong>segnalata</strong> all'amministratore del sito (tra i possibili motivi: potrebbe essere non appropriata o chiedere informazioni personali altrui)." msgid "This request has been <strong>withdrawn</strong> by the person who made it.\\n There may be an explanation in the correspondence below." msgstr "La richiesta è stata <strong>ritirata dalla persona</strong> che l'aveva presentata. Nei documenti qui sotto potrebbe esserci la motivazione." @@ -2818,13 +2820,13 @@ msgid "This request has been reported for administrator attention" msgstr "Questa richiesta è stata segnalata agli amministratori del sito" msgid "This request has been set by an administrator to \"allow new responses from nobody\"" -msgstr "" +msgstr "Questa richiesta è stata impostata dall'amministratore del sito come \"non riceve messaggi di risposta da nessuno\"" msgid "This request has had an unusual response, and <strong>requires attention</strong> from the {{site_name}} team." msgstr "Questa richiesta ha ricevuto una risposta insolita e <strong>richiede un controllo</strong> da parte dello staff di {{site_name}}." msgid "This request has prominence 'hidden'. You can only see it because you are logged\\n in as a super user." -msgstr "" +msgstr "Questa richiesta è catalogata come \"nascosta\". La stai visualizzando solo perché sei uno degli amministratori del sito." msgid "This request is hidden, so that only you the requester can see it. Please\\n <a href=\"{{url}}\">contact us</a> if you are not sure why." msgstr "La richiesta è nascosta, solo tu che l'hai scritta puoi vederla. Se hai dubbi a riguardo <a href=\"{{url}}\">contattaci</a>." @@ -2839,7 +2841,7 @@ msgid "This request was not made via {{site_name}}" msgstr "Questa richiesta non è stata fatta tramite {{site_name}}" msgid "This table shows the technical details of the internal events that happened\\nto this request on {{site_name}}. This could be used to generate information about\\nthe speed with which authorities respond to requests, the number of requests\\nwhich require a postal response and much more." -msgstr "Questa tabella mostra dettagli tecnici relativi alla risposta alla richiesta{{site_name}}. Può essere usato per ricavare informazioni sulla rapidità di risposta delle amministrazioni, il numero di richieste che richiedono risposta per posta ecc." +msgstr "Questa tabella mostra dettagli tecnici relativi alla risposta alla richiesta spedita attraverso {{site_name}}. Può essere usata per ricavare informazioni sulla rapidità di risposta delle amministrazioni, il numero di richieste che richiedono risposta per posta ecc." msgid "This user has been banned from {{site_name}} " msgstr "L'utente è stato bannato da {{site_name}}" @@ -2878,7 +2880,7 @@ msgid "To follow new requests" msgstr "Per seguire le nuove richieste" msgid "To follow requests and responses matching your search" -msgstr "Per seguire le richieste e i risultati della tua ricerca" +msgstr "Per seguire le richieste e risposte che corrispondono alla tua ricerca" msgid "To follow requests by '{{user_name}}'" msgstr "Per seguire le richieste di '{{user_name}}'" @@ -2890,7 +2892,7 @@ msgid "To follow the request '{{request_title}}'" msgstr "Per seguire la richiesta '{{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 "Qualcuno ha aggiornato lo stato della richiesta {{title}} che hai fatto a {{public_body}} usando {{law_used_full}} in \"{{display_status}}\" Se non sei d'accordo con la categoria, aggiorna nuovamente lo stato della richiesta." +msgstr "Qualcuno ha aggiornato lo stato della richiesta {{title}} che hai fatto a {{public_body}} usando la legge sull'{{law_used_full}} in \"{{display_status}}\" Se non sei d'accordo con la categoria, aggiorna nuovamente lo stato della richiesta." msgid "To let everyone know, follow this link and then select the appropriate box." msgstr "Per dirlo ad altri clicca su questo link e seleziona la casella giusta." @@ -2950,16 +2952,16 @@ msgid "Too many requests" msgstr "Troppe richieste" msgid "Top search results:" -msgstr "Top search results:" +msgstr "Risultati:" msgid "Track thing" -msgstr "Track thing" +msgstr "Segui" msgid "Track this person" -msgstr "Track this person" +msgstr "Segui questo utente" msgid "Track this search" -msgstr "Track this search" +msgstr "Segui questa ricerca" msgid "TrackThing|Track medium" msgstr "TrackThing|Track medium" @@ -2971,7 +2973,7 @@ msgid "TrackThing|Track type" msgstr "TrackThing|Track type" msgid "Turn off email alerts" -msgstr "Elimina notifiche email" +msgstr "Interrompi notifiche email" msgid "Tweet this request" msgstr "Twitta questa richiesta" @@ -3001,7 +3003,7 @@ msgid "Unexpected search result type " msgstr "Unexpected search result type" msgid "Unfortunately we don't know the FOI\\nemail address for that authority, so we can't validate this.\\nPlease <a href=\"{{url}}\">contact us</a> to sort it out." -msgstr "Non abbiamo un indirizzo email dell'amministrazione per le richieste di accesso, quindi non possiamo convalidare la tua richiesta. <a href=\"{{url}}\">Contattaci</a> per risolvere il problema." +msgstr "Non abbiamo un indirizzo email per le richieste di accesso a quella amministrazione, quindi non possiamo convalidare la tua richiesta. <a href=\"{{url}}\">Contattaci</a> per risolvere il problema." msgid "Unfortunately, we do not have a working address for {{public_body_names}}." msgstr "Non abbiamo un indirizzo valido per {{public_body_names}}." @@ -3121,10 +3123,10 @@ msgid "View FOI email address for {{public_body_name}}" msgstr "Visualizza l'indirizzo per le richieste di accesso a {{public_body_name}}" msgid "View Freedom of Information requests made by {{user_name}}:" -msgstr "Vedi le richieste di accesso fatte da {{user_name}}:" +msgstr "Visualizza le richieste di accesso fatte da {{user_name}}:" msgid "View authorities" -msgstr "Guarda autorità" +msgstr "Lista amministrazioni" msgid "View email" msgstr "Visualizza l'email" @@ -3154,7 +3156,7 @@ msgid "We do not have a working request email address for this authority." msgstr "Non abbiamo un indirizzo di posta elettronica valido per questa amministrazione." msgid "We do not have a working {{law_used_full}} address for {{public_body_name}}." -msgstr "Non abbiamo un indirizzo valido per {{public_body_name}} per {{law_used_full}}." +msgstr "Non abbiamo un indirizzo valido per {{public_body_name}} per le richieste di {{law_used_full}}." 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 "Non sappiamo se la risposta più recente a questa richiesta contiene le informazioni richieste o meno ⇥ se sei {{user_link}} <a href=\"{{url}}\">accedi</a> e segnalalo." @@ -3274,7 +3276,7 @@ msgid "You are already subscribed to any <a href=\"{{successful_requests_url}}\" msgstr "Sei già iscritto a tutte le richieste con <a href=\"{{successful_requests_url}}\">risposta soddisfacente</a>." msgid "You are currently receiving notification of new activity on your wall by email." -msgstr "Attualmente stai ricevendo via email notifiche di nuove attività nella bacheca." +msgstr "In questo momento stai ricevendo via email notifiche di nuove attività nella bacheca." msgid "You are following all new successful responses" msgstr "Stai seguendo tutte le risposte soddisfacenti" @@ -3322,7 +3324,7 @@ msgid "You can change the requests and users you are following on <a href=\"{{pr msgstr "Puoi modificare le richieste e gli utenti che stai seguendo nella pagina del <a href=\"{{profile_url}}\">tuo profilo</a>." msgid "You can get this page in computer-readable format as part of the main JSON\\npage for the request. See the <a href=\"{{api_path}}\">API documentation</a>." -msgstr "You can get this page in computer-readable format as part of the main JSON\\npage for the request. See the <a href=\"{{api_path}}\">API documentation</a>." +msgstr "Per approfondimenti tecnici guarda la <a href=\"{{api_path}}\">documentazione API</a> in inglese." msgid "You can only request information about the environment from this authority." msgstr "Per quanto riguarda questa amministrazione puoi fare solo richieste relative all'ambiente." @@ -3520,15 +3522,15 @@ msgid "Your response will <strong>appear on the Internet</strong>, <a href=\"{{u msgstr "La tua risposta <strong>comparirà in Rete</strong>, <a href=\"{{url}}\">leggi perché</a> e rispondi alle altre domande." msgid "Your selected authorities" -msgstr "Le amministrazioni selezionate" +msgstr "Le amministrazioni da te selezionate" msgid "Your thoughts on what the {{site_name}} <strong>administrators</strong> should do about the request." msgstr "Le tue osservazioni su quello che <strong>gli amministratori</strong> di {{site_name}} dovrebbero fare riguardo a questa richiesta." msgid "Your {{count}} Freedom of Information request" msgid_plural "Your {{count}} Freedom of Information requests" -msgstr[0] " - vedi e crea richieste FOI" -msgstr[1] " - vedi e crea richieste FOI" +msgstr[0] "La tua richiesta di accesso" +msgstr[1] "Le tue {{count}} richieste di accesso" msgid "Your {{count}} annotation" msgid_plural "Your {{count}} annotations" @@ -3562,7 +3564,7 @@ msgid "[{{public_body}} request email]" msgstr "[{{public_body}} email per la richiesta]" msgid "[{{site_name}} contact email]" -msgstr "[{{site_name}} email]" +msgstr "[contatti di {{site_name}}]" msgid "\\n\\n[ {{site_name}} note: The above text was badly encoded, and has had strange characters removed. ]" msgstr "\\n\\n\\n[ {{site_name}} nota: Il testo qui sopra ha problemi di codice, alcuni caratteri non riconosciuti sono stati rimossi. ]" @@ -3712,10 +3714,10 @@ msgid "no later than" msgstr "non oltre il " 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 "" +msgstr "non esiste più. Prova a rispondere al messaggio dalla pagina della richiesta invece di spedire un ulteriore messaggio generico. Se invece vuoi spedire il messaggio e conosci l'email corretta a cui spedirlo, <a href=\"{{url}}\">segnalalo anche a noi</a>.\"" msgid "normally" -msgstr "solitamente" +msgstr "di solito" msgid "not requestable due to: {{reason}}" msgstr "non si può richiedere per {{reason}}" @@ -3733,7 +3735,7 @@ msgid "requests which are successful" msgstr "richieste che hanno ricevuto risposta soddisfacente" msgid "requests which are successful matching text '{{query}}'" -msgstr "richieste che hanno ricevuto risposta soddisfacente che rispondono a {{query}}'" +msgstr "richieste con risposta soddisfacente che rispondono a {{query}}'" msgid "response as needing administrator attention. Take a look, and reply to this\\nemail to let them know what you are going to do about it." msgstr "risposta che necessita dell'attenzione dell'amministratore. Dai un'occhiata e rispondi a questa email per far sapere loro cosa farai a riguardo." @@ -3754,7 +3756,7 @@ msgid "simple_date_format" msgstr "simple_date_format" msgid "successful requests" -msgstr "richieste con successo" +msgstr "richieste che hanno ricevuto risposta soddisfacente" msgid "that you made to" msgstr "che hai fatto a " @@ -3792,19 +3794,19 @@ msgid "unknown reason " msgstr "motivo sconosciuto" msgid "unknown status " -msgstr "status sconosciuto" +msgstr "stato sconosciuto" msgid "unresolved requests" -msgstr "richieste senza soluzione" +msgstr "richieste in sospeso" msgid "unsubscribe" -msgstr "Disiscriviti" +msgstr "disiscriviti" msgid "unsubscribe all" -msgstr "Disiscriviti da tutto" +msgstr "disiscriviti da tutto" msgid "unsuccessful requests" -msgstr "richieste senza successo" +msgstr "richieste senza risposta" msgid "useful information." msgstr "informazioni utili." @@ -3825,8 +3827,8 @@ msgstr[1] "{{count}} richieste di informazioni a {{public_body_name}}" msgid "{{count}} person is following this authority" msgid_plural "{{count}} people are following this authority" -msgstr[0] "{{count}} persona sta seguendo questa amministrazione" -msgstr[1] "{{count}} persone stanno seguendo questa amministrazione" +msgstr[0] "{{count}} persona sta seguendo gli aggiornamenti di questa amministrazione" +msgstr[1] "{{count}} persone stanno seguendo gli aggiornamenti di questa amministrazione" msgid "{{count}} request" msgid_plural "{{count}} requests" @@ -3845,13 +3847,13 @@ msgid "{{foi_law}} requests to '{{public_body_name}}'" msgstr "Richieste secondo la {{foi_law}} a '{{public_body_name}}'" msgid "{{info_request_user_name}} only:" -msgstr "Solo {{info_request_user_name}} :" +msgstr "Solo per {{info_request_user_name}} :" msgid "{{law_used_full}} request - {{title}}" -msgstr "{{law_used_full}} richiesta - {{title}}" +msgstr "richiesta di {{law_used_full}} - {{title}}" msgid "{{law_used}} requests at {{public_body}}" -msgstr "Richieste di accesso secondo {{law_used}} a {{public_body}}" +msgstr "Richieste di {{law_used}} a {{public_body}}" msgid "{{length_of_time}} ago" msgstr "{{length_of_time}} fa" @@ -3866,10 +3868,10 @@ msgid "{{public_body_link}} was sent a request about" msgstr "{{public_body_link}} ha ricevuto una richiesta riguardo" msgid "{{public_body_name}} only:" -msgstr "Solo {{public_body_name}}:" +msgstr "Solo per {{public_body_name}}:" msgid "{{public_body}} has asked you to explain part of your {{law_used}} request." -msgstr "{{public_body}} ti richiede di spiegare la tua richiesta secondo la {{law_used}}." +msgstr "{{public_body}} ti richiede di spiegare la tua richiesta ai sensi della legge sull' {{law_used}}." msgid "{{public_body}} sent a response to {{user_name}}" msgstr "{{public_body}} ha spedito una risposta a {{user_name}}" @@ -3881,7 +3883,7 @@ msgid "{{search_results}} matching '{{query}}'" msgstr "'{{query}}' ha prodotto {{search_results}} " msgid "{{site_name}} blog and tweets" -msgstr "Blog" +msgstr "blog e tweet di {{site_name}} " msgid "{{site_name}} covers requests to {{number_of_authorities}} authorities, including:" msgstr "{{site_name}} comprende richieste a {{number_of_authorities}} amministrazioni, tra cui:" @@ -3915,7 +3917,7 @@ msgstr "{{user_name}} ha aggiunto un'annotazione" msgid "{{user_name}} has annotated your {{law_used_short}} \\nrequest. Follow this link to see what they wrote." msgstr "" -"{{user_name}} ha aggiunto un'annotazione alla tua {{law_used_short}} richiesta. \n" +"{{user_name}} ha aggiunto un'annotazione alla tua richiesta di {{law_used_short}}. \n" "Clicca sul link per vedere cosa ha scritto." msgid "{{user_name}} has used {{site_name}} to send you the message below." @@ -3937,7 +3939,7 @@ msgid "{{username}} left an annotation:" msgstr "{{username}} ha aggiunto una nota:" 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}}) ha fatto questa {{law_used_full}} richiesta (<a href=\"{{request_admin_url}}\">admin</a>) all' {{public_body_link}} (<a href=\"{{public_body_admin_url}}\">amministratore</a>) del sito" +msgstr "{{user}} ({{user_admin_link}}) ha fatto questa richiesta di {{law_used_full}} (<a href=\"{{request_admin_url}}\">admin</a>) all' {{public_body_link}} (<a href=\"{{public_body_admin_url}}\">amministratore</a>) del sito" msgid "{{user}} made this {{law_used_full}} request" msgstr "{{user}} ha fatto questa {{law_used_full}} richiesta" diff --git a/locale/nb/app.po b/locale/nb/app.po index 86efe5635..7d77e0fea 100644 --- a/locale/nb/app.po +++ b/locale/nb/app.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: alaveteli\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-12-02 13:14+0000\n" -"PO-Revision-Date: 2015-02-01 07:17+0000\n" +"PO-Revision-Date: 2015-02-11 20:49+0000\n" "Last-Translator: pere <pere-transifex@hungry.com>\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/alaveteli/language/nb/)\n" "Language: nb\n" diff --git a/spec/controllers/user_controller_spec.rb b/spec/controllers/user_controller_spec.rb index 413d395c5..443856cf3 100644 --- a/spec/controllers/user_controller_spec.rb +++ b/spec/controllers/user_controller_spec.rb @@ -1,6 +1,63 @@ # coding: utf-8 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') +describe UserController do + + describe :set_profile_photo do + + context 'user is banned' do + + before(:each) do + @user = FactoryGirl.create(:user, :ban_text => 'Causing trouble') + session[:user_id] = @user.id + @uploadedfile = fixture_file_upload("/files/parrot.png") + + post :set_profile_photo, :id => @user.id, + :file => @uploadedfile, + :submitted_draft_profile_photo => 1, + :automatically_crop => 1 + end + + it 'redirects to the profile page' do + expect(response).to redirect_to(set_profile_photo_path) + end + + it 'renders an error message' do + msg = 'Banned users cannot edit their profile' + expect(flash[:error]).to eq(msg) + end + + end + + end + + describe :set_profile_about_me do + + context 'user is banned' do + + before(:each) do + @user = FactoryGirl.create(:user, :ban_text => 'Causing trouble') + session[:user_id] = @user.id + + post :set_profile_about_me, :submitted_about_me => '1', + :about_me => 'Bad stuff' + end + + it 'redirects to the profile page' do + expect(response).to redirect_to(set_profile_about_me_path) + end + + it 'renders an error message' do + msg = 'Banned users cannot edit their profile' + expect(flash[:error]).to eq(msg) + end + + end + + end + +end + # TODO: Use route_for or params_from to check /c/ links better # http://rspec.rubyforge.org/rspec-rails/1.1.12/classes/Spec/Rails/Example/ControllerExampleGroup.html describe UserController, "when redirecting a show request to a canonical url" do diff --git a/spec/fixtures/files/fake-authority-add-tags.rb b/spec/fixtures/files/fake-authority-add-tags.csv index a5612d87f..a5612d87f 100644 --- a/spec/fixtures/files/fake-authority-add-tags.rb +++ b/spec/fixtures/files/fake-authority-add-tags.csv diff --git a/spec/fixtures/files/multiple-locales-same-name.csv b/spec/fixtures/files/multiple-locales-same-name.csv new file mode 100644 index 000000000..43505f6a6 --- /dev/null +++ b/spec/fixtures/files/multiple-locales-same-name.csv @@ -0,0 +1,2 @@ +"#id","request_email","name","name.es","tag_string","home_page" +23842,"test@test.es","Test","Test",37,"http://www.test.es/" diff --git a/spec/helpers/public_body_helper_spec.rb b/spec/helpers/public_body_helper_spec.rb new file mode 100644 index 000000000..0bf55abb4 --- /dev/null +++ b/spec/helpers/public_body_helper_spec.rb @@ -0,0 +1,141 @@ +# encoding: UTF-8 +require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') + +describe PublicBodyHelper do + include PublicBodyHelper + + describe :public_body_not_requestable_reasons do + + before do + @body = FactoryGirl.build(:public_body) + end + + it 'returns an empty array if there are no reasons' do + expect(public_body_not_requestable_reasons(@body)).to eq([]) + end + + it 'includes a reason if the law does not apply to the authority' do + @body.tag_string = 'not_apply' + msg = 'Freedom of Information law does not apply to this authority, so you cannot make a request to it.' + expect(public_body_not_requestable_reasons(@body)).to include(msg) + end + + it 'includes a reason if the body no longer exists' do + @body.tag_string = 'defunct' + msg = 'This authority no longer exists, so you cannot make a request to it.' + expect(public_body_not_requestable_reasons(@body)).to include(msg) + end + + it 'links to the request page if the body has no contact email' do + @body.request_email = '' + msg = %Q(<a href="/new/#{ @body.url_name }" + class="link_button_green">Make + a request to this authority</a>).squish + + expect(public_body_not_requestable_reasons(@body)).to include(msg) + end + + it 'returns the reasons in order of importance' do + @body.tag_string = 'defunct not_apply' + @body.request_email = '' + + reasons = public_body_not_requestable_reasons(@body) + + expect(reasons[0]).to match(/no longer exists/) + expect(reasons[1]).to match(/does not apply/) + expect(reasons[2]).to match(/Make a request/) + end + + end + + + describe :type_of_authority do + + it 'falls back to "A public authority"' do + public_body = FactoryGirl.build(:public_body) + expect(type_of_authority(public_body)).to eq('A public authority') + end + + it 'handles Unicode' do + category = FactoryGirl.create(:public_body_category, :category_tag => 'spec', + :description => 'ünicode category') + heading = FactoryGirl.create(:public_body_heading) + heading.add_category(category) + public_body = FactoryGirl.create(:public_body, :tag_string => 'spec') + + + expect(type_of_authority(public_body)).to eq('<a href="/body/list/spec">Ünicode category</a>') + end + + it 'constructs the correct string if there are tags which are not categories' do + heading = FactoryGirl.create(:public_body_heading) + 3.times do |i| + category = FactoryGirl.create(:public_body_category, :category_tag => "spec_#{i}", + :description => "spec category #{i}") + heading.add_category(category) + end + public_body = FactoryGirl.create(:public_body, :tag_string => 'spec_0 spec_2 unknown') + expected = '<a href="/body/list/spec_0">Spec category 0</a> and <a href="/body/list/spec_2">spec category 2</a>' + expect(type_of_authority(public_body)).to eq(expected) + end + + + context 'when associated with one category' do + + it 'returns the description wrapped in an anchor tag' do + category = FactoryGirl.create(:public_body_category, :category_tag => 'spec', + :description => 'spec category') + heading = FactoryGirl.create(:public_body_heading) + heading.add_category(category) + public_body = FactoryGirl.create(:public_body, :tag_string => 'spec') + + anchor = %Q(<a href="/body/list/spec">Spec category</a>) + expect(type_of_authority(public_body)).to eq(anchor) + end + end + + context 'when associated with several categories' do + + it 'joins the category descriptions and capitalizes the first letter' do + heading = FactoryGirl.create(:public_body_heading) + 3.times do |i| + category = FactoryGirl.create(:public_body_category, :category_tag => "spec_#{i}", + :description => "spec category #{i}") + heading.add_category(category) + end + public_body = FactoryGirl.create(:public_body, :tag_string => 'spec_0 spec_1 spec_2') + + description = [ + %Q(<a href="/body/list/spec_0">Spec category 0</a>), + ', ', + %Q(<a href="/body/list/spec_1">spec category 1</a>), + ' and ', + %Q(<a href="/body/list/spec_2">spec category 2</a>) + ].join('') + + expect(type_of_authority(public_body)).to eq(description) + end + + end + + context 'when in a non-default locale' do + + it 'creates the anchor href in the correct locale' do + # Activate the routing filter, normally turned off for helper tests + RoutingFilter.active = true + category = FactoryGirl.create(:public_body_category, :category_tag => 'spec', + :description => 'spec category') + heading = FactoryGirl.create(:public_body_heading) + heading.add_category(category) + public_body = FactoryGirl.create(:public_body, :tag_string => 'spec') + + anchor = %Q(<a href="/es/body/list/spec">Spec category</a>) + I18n.with_locale(:es) { expect(type_of_authority(public_body) +).to eq(anchor) } + end + + end + + end + +end diff --git a/spec/lib/attachment_to_html/adapters/pdf_spec.rb b/spec/lib/attachment_to_html/adapters/pdf_spec.rb index da79b2de0..f1ae4695c 100644 --- a/spec/lib/attachment_to_html/adapters/pdf_spec.rb +++ b/spec/lib/attachment_to_html/adapters/pdf_spec.rb @@ -15,7 +15,7 @@ describe AttachmentToHTML::Adapters::PDF do adapter = AttachmentToHTML::Adapters::PDF.new(attachment, :tmpdir => '/tmp') adapter.tmpdir.should == '/tmp' end - + end describe :title do @@ -23,7 +23,14 @@ describe AttachmentToHTML::Adapters::PDF do it 'uses the attachment filename for the title' do adapter.title.should == attachment.display_filename end - + + it 'returns the title encoded as UTF-8' do + if RUBY_VERSION.to_f >= 1.9 + adapter.title.encoding.should == Encoding.find('UTF-8') + end + end + + end describe :body do @@ -38,6 +45,12 @@ describe AttachmentToHTML::Adapters::PDF do adapter.body end + it 'returns the body encoded as UTF-8' do + if RUBY_VERSION.to_f >= 1.9 + adapter.body.encoding.should == Encoding.find('UTF-8') + end + end + end diff --git a/spec/models/about_me_validator_spec.rb b/spec/models/about_me_validator_spec.rb new file mode 100644 index 000000000..5610cead8 --- /dev/null +++ b/spec/models/about_me_validator_spec.rb @@ -0,0 +1,53 @@ +require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') + +describe AboutMeValidator do + + describe :new do + + it 'sets each supported attribute on the instance' do + params = { :about_me => 'My description' } + validator = AboutMeValidator.new(params) + expect(validator.about_me).to eq('My description') + end + + end + + describe :valid? do + + it 'is valid if about_me is =< 500' do + params = { :about_me => 'a'*500 } + validator = AboutMeValidator.new(params) + expect(validator).to be_valid + end + + it 'is valid if about_me is blank' do + params = { :about_me => '' } + validator = AboutMeValidator.new(params) + expect(validator).to be_valid + end + + it 'is valid if about_me is nil' do + params = { :about_me => nil } + validator = AboutMeValidator.new(params) + expect(validator).to be_valid + end + + it 'is invalid if about_me is > 500' do + params = { :about_me => 'a'*501 } + validator = AboutMeValidator.new(params) + expect(validator).to have(1).error_on(:about_me) + end + + end + + describe :about_me do + + it 'has an attribute accessor' do + params = { :about_me => 'My description' } + validator = AboutMeValidator.new(params) + expect(validator.about_me).to eq('My description') + end + + end + +end diff --git a/spec/models/public_body_category_spec.rb b/spec/models/public_body_category_spec.rb index 96fe5686b..c16c9b8a1 100644 --- a/spec/models/public_body_category_spec.rb +++ b/spec/models/public_body_category_spec.rb @@ -9,35 +9,6 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe PublicBodyCategory do - describe 'when loading the data' do - it 'should use the display_order field to preserve the original data order' do - PublicBodyCategory.add(:en, [ - "Local and regional", - [ "local_council", "Local councils", "a local council" ], - "Miscellaneous", - [ "other", "Miscellaneous", "miscellaneous" ], - [ "aardvark", "Aardvark", "daft test"],]) - - headings = PublicBodyHeading.all - cat_group1 = headings[0].public_body_categories - cat_group1.count.should eq 1 - cat_group1[0].title.should eq "Local councils" - - cat_group2 = headings[1].public_body_categories - cat_group2.count.should eq 2 - cat_group2[0].title.should eq "Miscellaneous" - cat_group2[0].public_body_category_links.where( - :public_body_heading_id => headings[1].id). - first. - category_display_order.should eq 0 - - cat_group2[1].title.should eq "Aardvark" - cat_group2[1].public_body_category_links.where( - :public_body_heading_id => headings[1].id). - first. - category_display_order.should eq 1 - end - end context 'when validating' do diff --git a/spec/models/public_body_heading_spec.rb b/spec/models/public_body_heading_spec.rb index 9372e0a07..620f7da9c 100644 --- a/spec/models/public_body_heading_spec.rb +++ b/spec/models/public_body_heading_spec.rb @@ -10,26 +10,6 @@ require 'spec_helper' describe PublicBodyHeading do - context 'when loading the data' do - - before do - PublicBodyCategory.add(:en, [ - "Local and regional", - [ "local_council", "Local councils", "a local council" ], - "Miscellaneous", - [ "other", "Miscellaneous", "miscellaneous" ],]) - end - - it 'should use the display_order field to preserve the original data order' do - headings = PublicBodyHeading.all - headings[0].name.should eq 'Local and regional' - headings[0].display_order.should eq 0 - headings[1].name.should eq 'Miscellaneous' - headings[1].display_order.should eq 1 - end - - end - context 'when validating' do it 'should require a name' do diff --git a/spec/models/public_body_spec.rb b/spec/models/public_body_spec.rb index a9e801bfd..d91021315 100644 --- a/spec/models/public_body_spec.rb +++ b/spec/models/public_body_spec.rb @@ -30,112 +30,6 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe PublicBody do - describe :type_of_authority do - - it 'falls back to "A public authority"' do - public_body = FactoryGirl.build(:public_body) - expect(public_body.type_of_authority).to eq('A public authority') - end - - it 'handles Unicode' do - category = FactoryGirl.create(:public_body_category, :category_tag => 'spec', - :description => 'ünicode category') - heading = FactoryGirl.create(:public_body_heading) - heading.add_category(category) - public_body = FactoryGirl.create(:public_body, :tag_string => 'spec') - - - expect(public_body.type_of_authority).to eq('Ünicode category') - end - - it 'constructs the correct string if there are tags which are not categories' do - heading = FactoryGirl.create(:public_body_heading) - 3.times do |i| - category = FactoryGirl.create(:public_body_category, :category_tag => "spec_#{i}", - :description => "spec category #{i}") - heading.add_category(category) - end - public_body = FactoryGirl.create(:public_body, :tag_string => 'spec_0 spec_2 unknown') - - expect(public_body.type_of_authority).to eq('Spec category 0 and spec category 2') - end - - context 'when associated with one category' do - - it 'returns the capitalised category description' do - category = FactoryGirl.create(:public_body_category, :category_tag => 'spec', - :description => 'spec category') - heading = FactoryGirl.create(:public_body_heading) - heading.add_category(category) - public_body = FactoryGirl.create(:public_body, :tag_string => 'spec') - - expect(public_body.type_of_authority).to eq('Spec category') - end - - end - - context 'when associated with several categories' do - - it 'joins the category descriptions and capitalizes the first letter' do - heading = FactoryGirl.create(:public_body_heading) - 3.times do |i| - category = FactoryGirl.create(:public_body_category, :category_tag => "spec_#{i}", - :description => "spec category #{i}") - heading.add_category(category) - end - public_body = FactoryGirl.create(:public_body, :tag_string => 'spec_0 spec_1 spec_2') - - description = 'Spec category 0, spec category 1 and spec category 2' - expect(public_body.type_of_authority).to eq(description) - end - - end - - context 'when the html parameter is true' do - - context 'when associated with one category' do - - it 'returns the description wrapped in an anchor tag' do - category = FactoryGirl.create(:public_body_category, :category_tag => 'spec', - :description => 'spec category') - heading = FactoryGirl.create(:public_body_heading) - heading.add_category(category) - public_body = FactoryGirl.create(:public_body, :tag_string => 'spec') - - anchor = %Q(<a href="/body/list/spec">Spec category</a>) - expect(public_body.type_of_authority(true)).to eq(anchor) - end - - end - - context 'when associated with several categories' do - - it 'joins the category descriptions and capitalizes the first letter' do - heading = FactoryGirl.create(:public_body_heading) - 3.times do |i| - category = FactoryGirl.create(:public_body_category, :category_tag => "spec_#{i}", - :description => "spec category #{i}") - heading.add_category(category) - end - public_body = FactoryGirl.create(:public_body, :tag_string => 'spec_0 spec_1 spec_2') - - description = [ - %Q(<a href="/body/list/spec_0">Spec category 0</a>), - ', ', - %Q(<a href="/body/list/spec_1">spec category 1</a>), - ' and ', - %Q(<a href="/body/list/spec_2">spec category 2</a>) - ].join('') - - expect(public_body.type_of_authority(true)).to eq(description) - end - - end - - end - - end - describe :translations_attributes= do context 'translation_attrs is a Hash' do @@ -654,7 +548,7 @@ describe PublicBody, " when loading CSV files" do PublicBody.find_by_name('Fake Authority of Northern Ireland').tag_array_for_search.should == ['aTag', 'fake'] # Import again to check the 'add' tag functionality works - new_tags_file = load_file_fixture('fake-authority-add-tags.rb') + new_tags_file = load_file_fixture('fake-authority-add-tags.csv') errors, notes = PublicBody.import_csv(new_tags_file, '', 'add', false, 'someadmin') # false means real run # Check tags were added successfully @@ -673,15 +567,284 @@ describe PublicBody, " when loading CSV files" do PublicBody.find_by_name('Fake Authority of Northern Ireland').tag_array_for_search.should == ['aTag', 'fake'] # Import again to check the 'replace' tag functionality works - new_tags_file = load_file_fixture('fake-authority-add-tags.rb') + new_tags_file = load_file_fixture('fake-authority-add-tags.csv') errors, notes = PublicBody.import_csv(new_tags_file, 'fake', 'replace', false, 'someadmin') # false means real run # Check tags were added successfully - PublicBody.find_by_name('North West Fake Authority').tag_array_for_search.should == ['aTag'] - PublicBody.find_by_name('Scottish Fake Authority').tag_array_for_search.should == ['aTag'] + PublicBody.find_by_name('North West Fake Authority').tag_array_for_search.should == ['aTag', 'fake'] + PublicBody.find_by_name('Scottish Fake Authority').tag_array_for_search.should == ['aTag', 'fake'] PublicBody.find_by_name('Fake Authority of Northern Ireland').tag_array_for_search.should == ['aTag', 'fake'] end + + context 'when the import tag is set' do + + context 'with a new body' do + + it 'appends the import tag when no tag_string is specified' do + csv = <<-CSV.strip_heredoc + #id,request_email,name,tag_string,home_page + ,q@localhost,Quango,,http://example.org + CSV + + # csv, tag, tag_behaviour, dry_run, editor + PublicBody.import_csv(csv, 'imported', 'add', false, 'someadmin') + + expected = %W(imported) + expect(PublicBody.find_by_name('Quango').tag_array_for_search).to eq(expected) + end + + it 'appends the import tag when a tag_string is specified' do + csv = <<-CSV.strip_heredoc + #id,request_email,name,tag_string,home_page + ,q@localhost,Quango,first_tag second_tag,http://example.org + CSV + + # csv, tag, tag_behaviour, dry_run, editor + PublicBody.import_csv(csv, 'imported', 'add', false, 'someadmin') + + expected = %W(first_tag imported second_tag) + expect(PublicBody.find_by_name('Quango').tag_array_for_search).to eq(expected) + end + + it 'replaces with the import tag when no tag_string is specified' do + csv = <<-CSV.strip_heredoc + #id,request_email,name,tag_string,home_page + ,q@localhost,Quango,,http://example.org + CSV + + # csv, tag, tag_behaviour, dry_run, editor + PublicBody.import_csv(csv, 'imported', 'replace', false, 'someadmin') + + expected = %W(imported) + expect(PublicBody.find_by_name('Quango').tag_array_for_search).to eq(expected) + end + + it 'replaces with the import tag and tag_string when a tag_string is specified' do + csv = <<-CSV.strip_heredoc + #id,request_email,name,tag_string,home_page + ,q@localhost,Quango,first_tag second_tag,http://example.org + CSV + + # csv, tag, tag_behaviour, dry_run, editor + PublicBody.import_csv(csv, 'imported', 'replace', false, 'someadmin') + + expected = %W(first_tag imported second_tag) + expect(PublicBody.find_by_name('Quango').tag_array_for_search).to eq(expected) + end + + end + + context 'an existing body without tags' do + + before do + @body = FactoryGirl.create(:public_body, :name => 'Existing Body') + end + + it 'will not import if there is an existing body without the tag' do + csv = <<-CSV.strip_heredoc + #id,request_email,name,tag_string,home_page + #{ @body.id },#{ @body.request_email },"#{ @body.name }",,#{ @body.home_page } + CSV + + # csv, tag, tag_behaviour, dry_run, editor + errors, notes = PublicBody.import_csv(csv, 'imported', 'add', false, 'someadmin') + + expected = %W(imported) + errors.should include("error: line 2: Name Name is already taken for authority 'Existing Body'") + end + + end + + context 'an existing body with tags' do + + before do + @body = FactoryGirl.create(:public_body, :tag_string => 'imported first_tag second_tag') + end + + it 'created with tags, different tags in csv, add import tag' do + csv = <<-CSV.strip_heredoc + #id,request_email,name,tag_string,home_page + #{ @body.id },#{ @body.request_email },"#{ @body.name }","first_tag new_tag",#{ @body.home_page } + CSV + + # csv, tag, tag_behaviour, dry_run, editor + PublicBody.import_csv(csv, 'imported', 'add', false, 'someadmin') + expected = %W(first_tag imported new_tag second_tag) + expect(PublicBody.find(@body.id).tag_array_for_search).to eq(expected) + end + + it 'created with tags, different tags in csv, replace import tag' do + csv = <<-CSV.strip_heredoc + #id,request_email,name,tag_string,home_page + #{ @body.id },#{ @body.request_email },"#{ @body.name }","first_tag new_tag",#{ @body.home_page } + CSV + + # csv, tag, tag_behaviour, dry_run, editor + PublicBody.import_csv(csv, 'imported', 'replace', false, 'someadmin') + + expected = %W(first_tag imported new_tag) + expect(PublicBody.find(@body.id).tag_array_for_search).to eq(expected) + end + + end + + end + + context 'when the import tag is not set' do + + context 'with a new body' do + + it 'it is empty if no tag_string is set' do + csv = <<-CSV.strip_heredoc + #id,request_email,name,tag_string,home_page + ,q@localhost,Quango,,http://example.org + CSV + + # csv, tag, tag_behaviour, dry_run, editor + PublicBody.import_csv(csv, '', 'add', false, 'someadmin') + + expected = [] + expect(PublicBody.find_by_name('Quango').tag_array_for_search).to eq(expected) + end + + it 'uses the specified tag_string' do + csv = <<-CSV.strip_heredoc + #id,request_email,name,tag_string,home_page + ,q@localhost,Quango,first_tag,http://example.org + CSV + + # csv, tag, tag_behaviour, dry_run, editor + PublicBody.import_csv(csv, '', 'add', false, 'someadmin') + + expected = %W(first_tag) + expect(PublicBody.find_by_name('Quango').tag_array_for_search).to eq(expected) + end + + it 'replaces with empty if no tag_string is set' do + csv = <<-CSV.strip_heredoc + #id,request_email,name,tag_string,home_page + ,q@localhost,Quango,,http://example.org + CSV + + # csv, tag, tag_behaviour, dry_run, editor + PublicBody.import_csv(csv, '', 'replace', false, 'someadmin') + + expected = [] + expect(PublicBody.find_by_name('Quango').tag_array_for_search).to eq(expected) + end + + it 'replaces with the specified tag_string' do + csv = <<-CSV.strip_heredoc + #id,request_email,name,tag_string,home_page + ,q@localhost,Quango,first_tag,http://example.org + CSV + + # csv, tag, tag_behaviour, dry_run, editor + PublicBody.import_csv(csv, '', 'replace', false, 'someadmin') + + expected = %W(first_tag) + expect(PublicBody.find_by_name('Quango').tag_array_for_search).to eq(expected) + end + + end + + context 'with an existing body without tags' do + + before do + @body = FactoryGirl.create(:public_body) + end + + it 'appends when no tag_string is specified' do + csv = <<-CSV.strip_heredoc + #id,request_email,name,tag_string,home_page + #{ @body.id },#{ @body.request_email },"#{ @body.name }",,#{ @body.home_page } + CSV + + # csv, tag, tag_behaviour, dry_run, editor + PublicBody.import_csv(csv, '', 'add', false, 'someadmin') + + expected = [] + expect(PublicBody.find(@body.id).tag_array_for_search).to eq(expected) + end + + it 'appends when a tag_string is specified' do + csv = <<-CSV.strip_heredoc + #id,request_email,name,tag_string,home_page + #{ @body.id },#{ @body.request_email },"#{ @body.name }",new_tag,#{ @body.home_page } + CSV + + # csv, tag, tag_behaviour, dry_run, editor + PublicBody.import_csv(csv, '', 'add', false, 'someadmin') + + expected = %W(new_tag) + expect(PublicBody.find(@body.id).tag_array_for_search).to eq(expected) + end + + it 'replaces when no tag_string is specified' do + csv = <<-CSV.strip_heredoc + #id,request_email,name,tag_string,home_page + #{ @body.id },#{ @body.request_email },"#{ @body.name }",,#{ @body.home_page } + CSV + + # csv, tag, tag_behaviour, dry_run, editor + PublicBody.import_csv(csv, '', 'replace', false, 'someadmin') + + expected = [] + expect(PublicBody.find(@body.id).tag_array_for_search).to eq(expected) + end + + it 'replaces when a tag_string is specified' do + csv = <<-CSV.strip_heredoc + #id,request_email,name,tag_string,home_page + #{ @body.id },#{ @body.request_email },"#{ @body.name }",new_tag,#{ @body.home_page } + CSV + + # csv, tag, tag_behaviour, dry_run, editor + PublicBody.import_csv(csv, '', 'replace', false, 'someadmin') + + expected = %W(new_tag) + expect(PublicBody.find(@body.id).tag_array_for_search).to eq(expected) + end + + end + + describe 'with an existing body with tags' do + + before do + @body = FactoryGirl.create(:public_body, :tag_string => 'first_tag second_tag') + end + + it 'created with tags, different tags in csv, add tags' do + csv = <<-CSV.strip_heredoc + #id,request_email,name,tag_string,home_page + #{ @body.id },#{ @body.request_email },"#{ @body.name }","first_tag new_tag",#{ @body.home_page } + CSV + + # csv, tag, tag_behaviour, dry_run, editor + PublicBody.import_csv(csv, '', 'add', false, 'someadmin') + + expected = %W(first_tag new_tag second_tag) + expect(PublicBody.find(@body.id).tag_array_for_search).to eq(expected) + end + + it 'created with tags, different tags in csv, replace' do + csv = <<-CSV.strip_heredoc + #id,request_email,name,tag_string,home_page + #{ @body.id },#{ @body.request_email },"#{ @body.name }","first_tag new_tag",#{ @body.home_page } + CSV + + # csv, tag, tag_behaviour, dry_run, editor + PublicBody.import_csv(csv, '', 'replace', false, 'someadmin') + + expected = %W(first_tag new_tag) + expect(PublicBody.find(@body.id).tag_array_for_search).to eq(expected) + end + + end + + end + it "should create bodies with names in multiple locales" do original_count = PublicBody.count @@ -806,6 +969,22 @@ CSV PublicBody.csv_import_fields = old_csv_import_fields end + it "should import translations for fields whose values are the same as the default locale's" do + original_count = PublicBody.count + + csv_contents = load_file_fixture("multiple-locales-same-name.csv") + + errors, notes = PublicBody.import_csv(csv_contents, '', 'replace', true, 'someadmin', ['en', 'es']) # true means dry run + errors.should == [] + notes.size.should == 3 + notes[0..1].should == [ + "line 2: creating new authority 'Test' (locale: en):\n\t{\"name\":\"Test\",\"request_email\":\"test@test.es\",\"home_page\":\"http://www.test.es/\",\"tag_string\":\"37\"}", + "line 2: creating new authority 'Test' (locale: es):\n\t{\"name\":\"Test\"}", + ] + notes[2].should =~ /Notes: Some bodies are in database, but not in CSV file:\n( .+\n)*You may want to delete them manually.\n/ + + PublicBody.count.should == original_count + end end describe PublicBody do @@ -868,6 +1047,53 @@ describe PublicBody do end + describe :has_request_email? do + + before do + @body = PublicBody.new(:request_email => 'test@example.com') + end + + it 'should return false if request_email is nil' do + @body.request_email = nil + @body.has_request_email?.should == false + end + + it 'should return false if the request email is "blank"' do + @body.request_email = 'blank' + @body.has_request_email?.should == false + end + + it 'should return false if the request email is an empty string' do + @body.request_email = '' + @body.has_request_email?.should == false + end + + it 'should return true if the request email is an email address' do + @body.has_request_email?.should == true + end + end + + describe :special_not_requestable_reason do + + before do + @body = PublicBody.new + end + + it 'should return true if the body is defunct' do + @body.stub!(:defunct?).and_return(true) + @body.special_not_requestable_reason?.should == true + end + + it 'should return true if FOI does not apply' do + @body.stub!(:not_apply?).and_return(true) + @body.special_not_requestable_reason?.should == true + end + + it 'should return false if the body is not defunct and FOI applies' do + @body.special_not_requestable_reason?.should == false + end + end + end describe PublicBody, " when override all public body request emails set" do @@ -960,3 +1186,81 @@ describe PublicBody, 'when asked for popular bodies' do end end + +describe PublicBody do + + describe :is_requestable? do + + before do + @body = PublicBody.new(:request_email => 'test@example.com') + end + + it 'should return false if the body is defunct' do + @body.stub!(:defunct?).and_return true + @body.is_requestable?.should == false + end + + it 'should return false if FOI does not apply' do + @body.stub!(:not_apply?).and_return true + @body.is_requestable?.should == false + end + + it 'should return false there is no request_email' do + @body.stub!(:has_request_email?).and_return false + @body.is_requestable?.should == false + end + + it 'should return true if the request email is an email address' do + @body.is_requestable?.should == true + end + + end + + describe :is_followupable? do + + before do + @body = PublicBody.new(:request_email => 'test@example.com') + end + + it 'should return false there is no request_email' do + @body.stub!(:has_request_email?).and_return false + @body.is_followupable?.should == false + end + + it 'should return true if the request email is an email address' do + @body.is_followupable?.should == true + end + + end + + describe :not_requestable_reason do + + before do + @body = PublicBody.new(:request_email => 'test@example.com') + end + + it 'should return "defunct" if the body is defunct' do + @body.stub!(:defunct?).and_return true + @body.not_requestable_reason.should == 'defunct' + end + + it 'should return "not_apply" if FOI does not apply' do + @body.stub!(:not_apply?).and_return true + @body.not_requestable_reason.should == 'not_apply' + end + + + it 'should return "bad_contact" there is no request_email' do + @body.stub!(:has_request_email?).and_return false + @body.not_requestable_reason.should == 'bad_contact' + end + + it 'should raise an error if the body is not defunct, FOI applies and has an email address' do + expected_error = "not_requestable_reason called with type that has no reason" + lambda{ @body.not_requestable_reason }.should raise_error(expected_error) + end + + end + +end + diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 7dcd3ab8a..2245a024f 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -369,3 +369,21 @@ describe User, "when calculating if a user has exceeded the request limit" do end + +describe User do + + describe :banned? do + + it 'is banned if the user has ban_text' do + user = FactoryGirl.build(:user, :ban_text => 'banned') + expect(user).to be_banned + end + + it 'is not banned if the user has no ban_text' do + user = FactoryGirl.build(:user, :ban_text => '') + expect(user).to_not be_banned + end + + end + +end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 74a4891c2..93bcfa1ba 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -18,6 +18,7 @@ SimpleCov.start('rails') do add_filter 'lib/has_tag_string' add_filter 'lib/acts_as_xapian' add_filter 'lib/themes' + add_filter '.bundle' end Spork.prefork do diff --git a/spec/views/public_body/show.html.erb_spec.rb b/spec/views/public_body/show.html.erb_spec.rb index 0559fc8ef..6ebc39caa 100644 --- a/spec/views/public_body/show.html.erb_spec.rb +++ b/spec/views/public_body/show.html.erb_spec.rb @@ -2,12 +2,12 @@ require File.expand_path(File.join('..', '..', '..', 'spec_helper'), __FILE__) describe "public_body/show" do before do - @pb = mock_model(PublicBody, - :name => 'Test Quango', + @pb = mock_model(PublicBody, + :name => 'Test Quango', :short_name => 'tq', - :url_name => 'testquango', + :url_name => 'testquango', :notes => '', - :type_of_authority => 'A public body', + :tags => [], :eir_only? => nil, :info_requests => [1, 2, 3, 4], # out of sync with Xapian :publication_scheme => '', @@ -15,6 +15,7 @@ describe "public_body/show" do :calculated_home_page => '') @pb.stub!(:override_request_email).and_return(nil) @pb.stub!(:is_requestable?).and_return(true) + @pb.stub!(:special_not_requestable_reason?).and_return(false) @pb.stub!(:has_notes?).and_return(false) @pb.stub!(:has_tag?).and_return(false) @xap = mock(ActsAsXapian::Search, :matches_estimated => 2) @@ -43,7 +44,7 @@ describe "public_body/show" do it "should tell total number of requests" do render - response.should match "4 Freedom of Information requests" + response.should match "4 requests" end it "should cope with no results" do @@ -58,44 +59,12 @@ describe "public_body/show" do response.should match "The search index is currently offline" end - it "should link to Charity Commission site if we have numbers to do so" do - @pb.stub!(:has_tag?).and_return(true) - @pb.stub!(:get_tag_values).and_return(['98765', '12345']) - - render - response.should have_selector("div#header_right") do - have_selector "a", :href => /charity-commission.gov.uk.*RegisteredCharityNumber=98765$/ - end - response.should have_selector("div#header_right") do - have_selector "a", :href => /www.charity-commission.gov.uk.*RegisteredCharityNumber=12345$/ - end - end - - it "should link to Scottish Charity Regulator site if we have an SC number" do - @pb.stub!(:has_tag?).and_return(true) - @pb.stub!(:get_tag_values).and_return(['SC1234']) - - render - response.should have_selector("div#header_right") do - have_selector "a", :href => /www.oscr.org.uk.*id=SC1234$/ - end - end - - - it "should not link to Charity Commission site if we don't have number" do - render - response.should have_selector("div#header_right") do - have_selector "a", :href => /charity-commission.gov.uk/ - end - end - - end -def mock_event - return mock_model(InfoRequestEvent, - :info_request => mock_model(InfoRequest, - :title => 'Title', +def mock_event + return mock_model(InfoRequestEvent, + :info_request => mock_model(InfoRequest, + :title => 'Title', :url_title => 'title', :display_status => 'waiting_response', :calculate_status => 'waiting_response', |