diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 94578ceb8..e1281fb32 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -338,7 +338,7 @@ en: without_confirmed_hide: Pending title: Hidden users user: User - no_hidden_users: There is no hidden users. + no_hidden_users: There are no hidden users. show: email: 'Email:' hidden_at: 'Hidden at:' @@ -385,7 +385,7 @@ en: index: create: New process delete: Delete - title: Legislation processess + title: Legislation processes filters: open: Open next: Next @@ -987,7 +987,7 @@ en: index: title: Officials no_officials: There are no officials. - name: Nombre + name: Name official_position: Official position official_level: Level level_0: Not official @@ -1372,11 +1372,11 @@ en: title: Homepage description: The active modules appear in the homepage in the same order as here. header_title: Header - no_header: There is no header. + no_header: There are no headers. create_header: Create header cards_title: Cards create_card: Create card - no_cards: There is no cards. + no_cards: There are no cards. cards: title: Title description: Description diff --git a/config/locales/en/budgets.yml b/config/locales/en/budgets.yml index e20c9f09f..7aae18bfd 100644 --- a/config/locales/en/budgets.yml +++ b/config/locales/en/budgets.yml @@ -163,7 +163,7 @@ en: heading: "Participatory budget results" heading_selection_title: "By district" spending_proposal: Proposal title - ballot_lines_count: Times selected + ballot_lines_count: Votes hide_discarded_link: Hide discarded show_all_link: Show all price: Price diff --git a/config/locales/en/community.yml b/config/locales/en/community.yml index d7a892aa8..bcda80b6c 100644 --- a/config/locales/en/community.yml +++ b/config/locales/en/community.yml @@ -16,7 +16,7 @@ en: create_first_community_topic: first_theme_not_logged_in: No issue available, participate creating the first one. first_theme: Create the first community topic - sub_first_theme: "To create a theme you must to %{sign_in} o %{sign_up}." + sub_first_theme: "To create a theme you must %{sign_in} or %{sign_up}." sign_in: "sign in" sign_up: "sign up" tab: @@ -57,4 +57,4 @@ en: recommendation_three: Enjoy this space, the voices that fill it, it's yours too. topics: show: - login_to_comment: You must %{signin} or %{signup} to leave a comment. \ No newline at end of file + login_to_comment: You must %{signin} or %{signup} to leave a comment. diff --git a/config/locales/en/devise.yml b/config/locales/en/devise.yml index 712e47ff4..3b09ed785 100644 --- a/config/locales/en/devise.yml +++ b/config/locales/en/devise.yml @@ -29,7 +29,7 @@ en: unlock_instructions: subject: "Unlocking instructions" omniauth_callbacks: - failure: "It has not been possible to authorise you as %{kind} because \"%{reason}\"." + failure: "It has not been possible to authorize you as %{kind} because \"%{reason}\"." success: "Successfully identified as %{kind}." passwords: no_token: "You cannot access this page except through a password reset link. If you have accessed it through a password reset link, please check that the URL is complete." @@ -63,4 +63,4 @@ en: not_saved: one: "1 error prevented this %{resource} from being saved. Please check the marked fields to know how to correct them:" other: "%{count} errors prevented this %{resource} from being saved. Please check the marked fields to know how to correct them:" - equal_to_current_password: "must be different than the current password." \ No newline at end of file + equal_to_current_password: "must be different than the current password." diff --git a/config/locales/en/devise_views.yml b/config/locales/en/devise_views.yml index 30a35b66e..61c7b3369 100644 --- a/config/locales/en/devise_views.yml +++ b/config/locales/en/devise_views.yml @@ -50,10 +50,10 @@ en: title: Register as an organisation or collective success: back_to_index: I understand; go back to main page - instructions_1_html: "We will contact you soon to verify that you do in fact represent this collective." - instructions_2_html: While your email is reviewed, we have sent you a link to confirm your account. + instructions_1_html: "We will contact you soon to verify that you do in fact represent this collective." + instructions_2_html: While your email is reviewed, we have sent you a link to confirm your account. instructions_3_html: Once confirmed, you may begin to participate as an unverified collective. - thank_you_html: Thank you for registering your collective on the website. It is now pending verification. + thank_you_html: Thank you for registering your collective on the website. It is now pending verification. title: Registration of organisation / collective passwords: edit: diff --git a/config/locales/en/documents.yml b/config/locales/en/documents.yml index 12e839941..7471deb84 100644 --- a/config/locales/en/documents.yml +++ b/config/locales/en/documents.yml @@ -7,7 +7,7 @@ en: title_placeholder: Add a descriptive title for the document attachment_label: Choose document delete_button: Remove document - cancel_button: Cancelar + cancel_button: Cancel note: "You can upload up to a maximum of %{max_documents_allowed} documents of following content types: %{accepted_content_types}, up to %{max_file_size} MB per file." add_new_document: Add new document actions: @@ -21,4 +21,4 @@ en: errors: messages: in_between: must be in between %{min} and %{max} - wrong_content_type: content type %{content_type} does not match any of accepted content types %{accepted_content_types} \ No newline at end of file + wrong_content_type: content type %{content_type} does not match any of accepted content types %{accepted_content_types} diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 096fbc83e..25136eecb 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -111,12 +111,12 @@ en: relevance: relevance recommendations: recommendations recommendations: - without_results: There are not debates related to your interests + without_results: There are no debates related to your interests without_interests: Follow proposals so we can give you recommendations disable: "Debates recommendations will stop showing if you dismiss them. You can enable them again in 'My account' page" actions: success: "Recommendations for debates are now disabled for this account" - error: "An error has occured. Please go to 'Your account' page to manually disable recommendations for debates" + error: "An error has occured. Please go to 'My account' page to manually disable recommendations for debates" search_form: button: Search placeholder: Search debates... @@ -204,7 +204,7 @@ en: conditions: Terms and conditions of use consul: CONSUL application consul_url: https://github.com/consul/consul - contact_us: For technical assistance enters + contact_us: For technical assistance visit copyright: CONSUL, %{year} description: This portal uses the %{consul} which is %{open_source}. open_source: open-source software @@ -357,7 +357,7 @@ en: disable: "Proposals recommendations will stop showing if you dismiss them. You can enable them again in 'My account' page" actions: success: "Recommendations for proposals are now disabled for this account" - error: "An error has occured. Please go to 'Your account' page to manually disable recommendations for proposals" + error: "An error has occured. Please go to 'My account' page to manually disable recommendations for proposals" retired_proposals: Retired proposals retired_proposals_link: "Proposals retired by the author" retired_links: @@ -442,7 +442,7 @@ en: retired: Proposal retired by the author share: Share send_notification: Send notification - no_notifications: "This proposal has any notifications." + no_notifications: "This proposal has no notifications." embed_video_title: "Video on %{proposal}" title_external_url: "Additional documentation" title_video_url: "External video" @@ -531,7 +531,7 @@ en: title_label: "Title" body_label: "Message" submit_button: "Send message" - info_about_receivers_html: "This message will be send to %{count} people and it will be visible in %{proposal_page}.
Message are not sent immediately, users will receive periodically an email with all proposal notifications." + info_about_receivers_html: "This message will be sent to %{count} people and it will be visible in %{proposal_page}.
Messages are not sent immediately, users will receive periodically an email with all proposal notifications." proposal_page: "the proposal's page" show: back: "Go back to my activity" @@ -836,7 +836,7 @@ en: error: "Link not valid. Remember to start with %{url}." error_itself: "Link not valid. You cannot relate a content to itself." success: "You added a new related content" - is_related: "¿Is it related content?" + is_related: "Is it related content?" score_positive: "Yes" score_negative: "No" content_title: diff --git a/config/locales/en/mailers.yml b/config/locales/en/mailers.yml index daf1ef259..cbc112f8d 100644 --- a/config/locales/en/mailers.yml +++ b/config/locales/en/mailers.yml @@ -22,7 +22,7 @@ en: title: New response to your comment unfeasible_spending_proposal: hi: "Dear user," - new_html: "For all these, we invite you to elaborate a new proposal that ajusts to the conditions of this process. You can do it following this link: %{url}." + new_html: "For all these, we invite you to elaborate a new proposal that adjusts to the conditions of this process. You can do it following this link: %{url}." new_href: "new investment project" sincerely: "Sincerely" sorry: "Sorry for the inconvenience and we again thank you for your invaluable participation." @@ -32,16 +32,16 @@ en: title: "Proposal notifications in %{org_name}" share: Share proposal comment: Comment proposal - unsubscribe: "If you don't want receive proposal's notification, visit %{account} and unckeck 'Receive a summary of proposal notifications'." + unsubscribe: "If you don't want receive proposal's notification, visit %{account} and uncheck 'Receive a summary of proposal notifications'." unsubscribe_account: My account direct_message_for_receiver: subject: "You have received a new private message" reply: Reply to %{sender} - unsubscribe: "If you don't want receive direct messages, visit %{account} and unckeck 'Receive emails about direct messages'." + unsubscribe: "If you don't want receive direct messages, visit %{account} and uncheck 'Receive emails about direct messages'." unsubscribe_account: My account direct_message_for_sender: - subject: "You have send a new private message" - title_html: "You have send a new private message to %{receiver} with the content:" + subject: "You have sent a new private message" + title_html: "You have sent a new private message to %{receiver} with the content:" user_invite: ignore: "If you have not requested this invitation don't worry, you can ignore this email." text: "Thank you for applying to join %{org}! In seconds you can start to participate, just fill the form below:" @@ -60,7 +60,7 @@ en: share: "Share your project" budget_investment_unfeasible: hi: "Dear user," - new_html: "For all these, we invite you to elaborate a new investment that ajusts to the conditions of this process. You can do it following this link: %{url}." + new_html: "For all these, we invite you to elaborate a new investment that adjusts to the conditions of this process. You can do it following this link: %{url}." new_href: "new investment project" sincerely: "Sincerely" sorry: "Sorry for the inconvenience and we again thank you for your invaluable participation." diff --git a/config/locales/en/management.yml b/config/locales/en/management.yml index 86ddba64b..8d512e287 100644 --- a/config/locales/en/management.yml +++ b/config/locales/en/management.yml @@ -77,7 +77,7 @@ en: support_proposals: Support proposals vote_proposals: Vote proposals print: - proposals_info: Create yor proposal on http://url.consul + proposals_info: Create your proposal on http://url.consul proposals_title: 'Proposals:' spending_proposals_info: Participate at http://url.consul budget_investments_info: Participate at http://url.consul @@ -147,4 +147,4 @@ en: title: Send invitations create: success_html: %{count} invitations have been sent. - title: Send invitations \ No newline at end of file + title: Send invitations diff --git a/config/locales/en/officing.yml b/config/locales/en/officing.yml index 7c74962bd..3eb0e70d7 100644 --- a/config/locales/en/officing.yml +++ b/config/locales/en/officing.yml @@ -23,7 +23,7 @@ en: error_wrong_booth: "Wrong booth. Results NOT saved." new: title: "%{poll} - Add results" - not_allowed: "You are allowed to add results for this poll" + not_allowed: "You are not allowed to add results for this poll" booth: "Booth" date: "Date" select_booth: "Select booth" @@ -65,4 +65,4 @@ en: submit: Confirm vote success: "Vote introduced!" can_vote: - submit_disable_with: "Wait, confirming vote..." \ No newline at end of file + submit_disable_with: "Wait, confirming vote..." diff --git a/config/locales/en/pages.yml b/config/locales/en/pages.yml index 8b9473949..be7cad3ef 100644 --- a/config/locales/en/pages.yml +++ b/config/locales/en/pages.yml @@ -61,7 +61,7 @@ en: text: |- Use it in your local government or help us to improve it, it is free software. - This Open Government Portal use the [CONSUL app](https://github.com/consul/consul 'consul github') that is free software, with [licence AGPLv3](http://www.gnu.org/licenses/agpl-3.0.html 'AGPLv3 gnu' ), that means in simple words that anyone can use the code freely, copy it, see it in detail, modify it and redistribute it to the word with the modifications he wants (allowing others to do the same). Because we think culture is better and richer when it is released. + This Open Government Portal use the [CONSUL app](https://github.com/consul/consul 'consul github') that is free software, with [licence AGPLv3](http://www.gnu.org/licenses/agpl-3.0.html 'AGPLv3 gnu' ), that means in simple words that anyone can use the code freely, copy it, see it in detail, modify it and redistribute it to the world with the modifications they want (allowing others to do the same). Because we think culture is better and richer when it is released. If you are a programmer, you can see the code and help us to improve it at [CONSUL app](https://github.com/consul/consul 'consul github'). titles: @@ -89,7 +89,7 @@ en: When websites are designed with accessibility in mind, all users can access content in equal conditions, for example: examples: - - Proporcionando un texto alternativo a las imágenes, los usuarios invidentes o con problemas de visión pueden utilizar lectores especiales para acceder a la información.Providing alternative text to the images, blind or visually impaired users can use special readers to access the information. + - Providing alternative text to the images, blind or visually impaired users can use special readers to access the information. - When videos have subtitles, users with hearing difficulties can fully understand them. - If the contents are written in a simple and illustrated language, users with learning problems are better able to understand them. - If the user has mobility problems and it is difficult to use the mouse, the alternatives with the keyboard help in navigation. @@ -152,7 +152,7 @@ en: - shortcut_column: CTRL and + (CMD and + on MAC) description_column: Increases text size - shortcut_column: CTRL and - (CMD and - on MAC) - description_column: Descreases text size + description_column: Decreases text size compatibility: title: Compatibility with standards and visual design description_html: 'All pages of this website comply with the Accessibility Guidelines or General Principles of Accessible Design established by the Working Group WAI belonging to W3C.' @@ -169,4 +169,4 @@ en: info_code: 'Now introduce the code you received in letter:' password: Password submit: Verify my account - title: Verify your account \ No newline at end of file + title: Verify your account diff --git a/config/locales/en/settings.yml b/config/locales/en/settings.yml index 4aba41ac5..d8f6717b3 100644 --- a/config/locales/en/settings.yml +++ b/config/locales/en/settings.yml @@ -23,13 +23,13 @@ en: votes_for_proposal_success: "Number of votes necessary for approval of a Proposal" votes_for_proposal_success_description: "When a proposal reaches this number of supports it will no longer be able to receive more supports and is considered successful" months_to_archive_proposals: "Months to archive Proposals" - months_to_archive_proposals_description: After this number of months the Proposals will be archived and will no longer be able to receive supports" + months_to_archive_proposals_description: "After this number of months the Proposals will be archived and will no longer be able to receive supports" email_domain_for_officials: "Email domain for public officials" email_domain_for_officials_description: "All users registered with this domain will have their account verified at registration" per_page_code_head: "Code to be included on every page ()" - per_page_code_head_description: "This code will appear inside the label. Useful for entering custom scripts, analitycs..." + per_page_code_head_description: "This code will appear inside the label. Useful for entering custom scripts, analytics..." per_page_code_body: "Code to be included on every page ()" - per_page_code_body_description: "This code will appear inside the label. Useful for entering custom scripts, analitycs..." + per_page_code_body_description: "This code will appear inside the label. Useful for entering custom scripts, analytics..." twitter_handle: "Twitter handle" twitter_handle_description: "If filled in it will appear in the footer" twitter_hashtag: "Twitter hashtag" @@ -90,7 +90,7 @@ en: polls: "Polls" polls_description: "Citizens' polls are a participatory mechanism by which citizens with voting rights can make direct decisions" signature_sheets: "Signature sheets" - signature_sheets_description: "It allows ading from the Administration panel signatures collected on-site to Proposals and investment projects of the Participative Budgets" + signature_sheets_description: "It allows adding from the Administration panel signatures collected on-site to Proposals and investment projects of the Participative Budgets" legislation: "Legislation" legislation_description: "In participatory processes, citizens are offered the opportunity to participate in the drafting and modification of regulations that affect the city and to give their opinion on certain actions that are planned to be carried out" spending_proposals: "Spending proposals" @@ -120,4 +120,4 @@ en: public_stats: "Public stats" public_stats_description: "Display public stats in the Administration panel" help_page: "Help page" - help_page_description: "Displays a Help menu that contains a page with an info section about each enabled feature" \ No newline at end of file + help_page_description: "Displays a Help menu that contains a page with an info section about each enabled feature" diff --git a/config/locales/en/verification.yml b/config/locales/en/verification.yml index d40017653..0ba13f8dd 100644 --- a/config/locales/en/verification.yml +++ b/config/locales/en/verification.yml @@ -96,7 +96,7 @@ en: step_2: Confirmation code step_3: Final verification user_permission_debates: Participate on debates - user_permission_info: Verifing your information you'll be able to... + user_permission_info: Verifying your information you'll be able to... user_permission_proposal: Create new proposals user_permission_support_proposal: Support proposals* user_permission_votes: Participate on final voting* @@ -108,4 +108,4 @@ en: explanation: We currently hold the following details on the Register; please select a method for your confirmation code to be sent. phone_title: Phone numbers title: Available information - use_another_phone: Use other phone \ No newline at end of file + use_another_phone: Use other phone diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb index 447e47ca6..2089dadd1 100644 --- a/spec/features/debates_spec.rb +++ b/spec/features/debates_spec.rb @@ -441,7 +441,7 @@ feature 'Debates' do click_link 'recommendations' - expect(page).to have_content 'There are not debates related to your interests' + expect(page).to have_content 'There are no debates related to your interests' end scenario 'should display text when user has no related interests' do diff --git a/spec/features/emails_spec.rb b/spec/features/emails_spec.rb index 7e7b83ad0..09b6130d6 100644 --- a/spec/features/emails_spec.rb +++ b/spec/features/emails_spec.rb @@ -253,7 +253,7 @@ feature 'Emails' do email = unread_emails_for(sender.email).first - expect(email).to have_subject("You have send a new private message") + expect(email).to have_subject("You have sent a new private message") expect(email).to have_body_text(direct_message.title) expect(email).to have_body_text(direct_message.body) expect(email).to have_body_text(direct_message.receiver.name) diff --git a/spec/features/officing/results_spec.rb b/spec/features/officing/results_spec.rb index 376629314..eccffef4b 100644 --- a/spec/features/officing/results_spec.rb +++ b/spec/features/officing/results_spec.rb @@ -40,7 +40,7 @@ feature 'Officing Results', :with_frozen_time do expect(page).to have_content(@poll.name) visit new_officing_poll_result_path(not_allowed_poll_1) - expect(page).to have_content('You are allowed to add results for this poll') + expect(page).to have_content('You are not allowed to add results for this poll') end scenario 'Add results' do diff --git a/spec/features/proposal_notifications_spec.rb b/spec/features/proposal_notifications_spec.rb index 647ad88c8..c5c21d27a 100644 --- a/spec/features/proposal_notifications_spec.rb +++ b/spec/features/proposal_notifications_spec.rb @@ -113,8 +113,10 @@ feature 'Proposal Notifications' do login_as(author) visit new_proposal_notification_path(proposal_id: proposal.id) - expect(page).to have_content "This message will be send to 7 people and it will be visible in the proposal's page" - expect(page).to have_link("the proposal's page", href: proposal_path(proposal, anchor: 'comments')) + expect(page).to have_content "This message will be sent to 7 people and it will "\ + "be visible in the proposal's page" + expect(page).to have_link("the proposal's page", href: proposal_path(proposal, + anchor: 'comments')) end scenario "Message about receivers (Followers)" do @@ -126,8 +128,10 @@ feature 'Proposal Notifications' do login_as(author) visit new_proposal_notification_path(proposal_id: proposal.id) - expect(page).to have_content "This message will be send to 7 people and it will be visible in the proposal's page" - expect(page).to have_link("the proposal's page", href: proposal_path(proposal, anchor: 'comments')) + expect(page).to have_content "This message will be sent to 7 people and it will "\ + "be visible in the proposal's page" + expect(page).to have_link("the proposal's page", href: proposal_path(proposal, + anchor: 'comments')) end scenario "Message about receivers (Disctinct Followers and Voters)" do @@ -140,8 +144,10 @@ feature 'Proposal Notifications' do login_as(author) visit new_proposal_notification_path(proposal_id: proposal.id) - expect(page).to have_content "This message will be send to 14 people and it will be visible in the proposal's page" - expect(page).to have_link("the proposal's page", href: proposal_path(proposal, anchor: 'comments')) + expect(page).to have_content "This message will be sent to 14 people and it will "\ + "be visible in the proposal's page" + expect(page).to have_link("the proposal's page", href: proposal_path(proposal, + anchor: 'comments')) end scenario "Message about receivers (Same Followers and Voters)" do @@ -155,8 +161,10 @@ feature 'Proposal Notifications' do login_as(author) visit new_proposal_notification_path(proposal_id: proposal.id) - expect(page).to have_content "This message will be send to 1 people and it will be visible in the proposal's page" - expect(page).to have_link("the proposal's page", href: proposal_path(proposal, anchor: 'comments')) + expect(page).to have_content "This message will be sent to 1 people and it will "\ + "be visible in the proposal's page" + expect(page).to have_link("the proposal's page", href: proposal_path(proposal, + anchor: 'comments')) end context "Permissions" do