diff --git a/config/locales/activemodel.en.yml b/config/locales/activemodel.en.yml index ad43d1516..f62fd1ec6 100644 --- a/config/locales/activemodel.en.yml +++ b/config/locales/activemodel.en.yml @@ -2,17 +2,17 @@ en: activemodel: models: verification: - residence: Residence - sms: SMS + residence: "Residence" + sms: "SMS" attributes: verification: residence: - document_type: Document type - document_number: Document number(including letter) - date_of_birth: Date of birth - postal_code: Postal code + document_type: "Document type" + document_number: "Document number (including letters)" + date_of_birth: "Date of birth" + postal_code: "Postcode" sms: - phone: 'Phone' - confirmation_code: 'Confirmation code' + phone: "Telephone" + confirmation_code: "Confirmation code" email: - recipient: 'Email' \ No newline at end of file + recipient: "Email" \ No newline at end of file diff --git a/config/locales/activerecord.en.yml b/config/locales/activerecord.en.yml index 3bf203bc5..4e9cd5931 100644 --- a/config/locales/activerecord.en.yml +++ b/config/locales/activerecord.en.yml @@ -7,46 +7,68 @@ en: email: password_already_set: "This user already has a password" models: - activity: Activity - comment: Comment - debate: Debate - proposal: Proposal - tag: Topic - user: User - vote: Vote - organization: Organization + activity: + one: "activity" + other: "activities" + comment: + one: "Comment" + other: "Comments" + debate: + one: "Debate" + other: "Debates" + tag: + one: "Tag" + other: "Tags" + user: + one: "User" + other: "Users" + moderator: + one: "Moderator" + other: "Moderators" + administrator: + one: "Administrator" + other: "Administrators" + vote: + one: "Vote" + other: "Votes" + organization: + one: "Organisation" + other: "Organisations" + proposal: + one: "Citizen proposal" + other: "Citizen proposals" attributes: comment: - body: Comment - user: User + body: "Comment" + user: "User" debate: - author: Author - description: Opinion - terms_of_service: Terms of service - title: Title + author: "Author" + description: "Opinion" + terms_of_service: "Terms of service" + title: "Title" proposal: - author: Author - title: Title - question: Question - description: Description - terms_of_service: Terms of service + author: "Author" + title: "Title" + question: "Question" + description: "Description" + terms_of_service: "Terms of service" user: - email: Email - username: Username - password: Password - phone_number: Phone number - official_position: Official position - official_level: Official level + email: "Email" + username: "Username" + password: "Password" + phone_number: "Phone number" + official_position: "Official position" + official_level: "Official level" organization: - name: Organization name - responsible_name: Person in charge + name: "Name of organisation" + responsible_name: "Person responsible for the group" errors: models: debate: attributes: tag_list: - less_than_or_equal_to: tags must be less than or equal to %{count} + less_than_or_equal_to: "tags must be less than or equal to %{count}" proposal: attributes: tag_list: - less_than_or_equal_to: tags must be less than or equal to %{count} \ No newline at end of file + less_than_or_equal_to: "tags must be less than or equal to %{count}" diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml old mode 100644 new mode 100755 index a70329132..987b8123a --- a/config/locales/admin.en.yml +++ b/config/locales/admin.en.yml @@ -2,37 +2,37 @@ en: admin: settings: index: - title: Global settings + title: General settings update_setting: Update flash: - updated: 'Setting updated!' + updated: 'Value updated' dashboard: index: title: Administration menu: - settings: Global settings + settings: General settings debate_topics: Debate topics hidden_proposals: Hidden proposals hidden_debates: Hidden debates hidden_comments: Hidden comments - hidden_users: Blocked users + hidden_users: Hidden users incomplete_verifications: Incomplete verifications - organizations: Organizations + organizations: Organisations officials: Officials moderators: Moderators stats: Statistics - activity: Moderation Activity + activity: Moderator activity shared: user_search: - placeholder: 'Search user by name or email' - button: 'Search' + placeholder: "Search user by name or email'" + button: "Search" proposal_search: - placeholder: 'Search proposals by title, description or question' - button: 'Search' + placeholder: "Search proposals by title, description or question" + button: "Search" organizations: index: - title: Organizations - search_placeholder: "Name, email or phone" + title: Organisations + search_placeholder: "Name, email or phone number" search: Search verify: Verify reject: Reject @@ -45,13 +45,13 @@ en: verified: Verified rejected: Rejected hidden_count: - one: "There is %{count} organization without user or with the user banned" - other: "There is %{count} organizations without user or with the user banned" + one: "There is also one organisation with no users or with a hidden user" + other: "There are %{count} organisations with no users or with a hidden user" search: - title: "Search Organizations" + title: "Search Organisations" actions: hide: Hide - hide_author: Ban author + hide_author: Hide author restore: Restore confirm: 'Are you sure?' confirm_hide: Confirm @@ -59,12 +59,12 @@ en: index: title: 'Debate topics' add_tag: 'Add a new debate topic' - mark_as_featured: 'Propose topic to create debate' + mark_as_featured: 'Propose topic upon creating debate' name: - placeholder: 'Write a topic' + placeholder: 'Type the name of the topic' create: Create Topic update: Update Topic - destroy: Delete Topic + destroy: Destroy Topic comments: index: title: Hidden comments @@ -93,14 +93,14 @@ en: without_confirmed_hide: Pending users: index: - title: Banned users + title: Hidden users filter: Filter filters: all: All with_confirmed_hide: Confirmed without_confirmed_hide: Pending show: - title: "User activity from %{user}" + title: "Activity of user %{user}" back: Back email: "Email:" registered_at: "Registered at:" @@ -111,7 +111,7 @@ en: phone_not_given: 'Phone not given' sms_code_not_confirmed: 'Has not confirmed the sms code' officials: - level_0: Not an official + level_0: "Not official" level_1: Level 1 level_2: Level 2 level_3: Level 3 @@ -119,17 +119,20 @@ en: level_5: Level 5 index: title: Officials + search_placeholder: 'Search user by name or email' + search: Search search: - title: 'Officials: Search users' + title: 'Official positions: User search' edit_official: Edit official - make_official: Make this user an official + make_official: Make official + search: Search edit: - title: 'Officials: edit user' - destroy: "Remove 'Official' condition" + title: 'Officials: Edit user' + destroy: "Remove 'Official' status" back: Back flash: - official_updated: 'Official position saved!' - official_destroyed: 'User is not an official anymore' + official_updated: 'Details of official saved' + official_destroyed: 'Details saved: the user is no longer an official' moderators: index: title: Moderators @@ -142,17 +145,17 @@ en: add: Add activity: show: - title: Activity of Moderators - action: Action + title: Moderator activity + action: 'Action' by: Moderated by type: Type filter: Show filters: all: All - on_proposals: On Proposals - on_debates: On Debates - on_comments: On Comments - on_users: On Users + on_proposals: Proposals + on_debates: Debates + on_comments: Comments + on_users: Users actions: hide: Hidden restore: Restored @@ -175,4 +178,4 @@ en: user_level_two: Level two users unverified_users: Unverified users verified_users: Verified users - users: Total users \ No newline at end of file + users: Total users  \ No newline at end of file diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml old mode 100644 new mode 100755 index 26a10f292..bd27dd2a2 --- a/config/locales/devise.en.yml +++ b/config/locales/devise.en.yml @@ -3,58 +3,58 @@ en: devise: confirmations: - confirmed: "Your email address has been successfully confirmed." - send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes." - send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes." + confirmed: "Your account has been confirmed." + send_instructions: "In a few minutes you will receive an email containing instructions on how to reset your password." + send_paranoid_instructions: "If your email address is in our database, in a few minutes you will receive an email containing instructions on how to reset your password." failure: already_authenticated: "You are already signed in." - inactive: "Your account is not activated yet." + inactive: "Your account has not yet been activated." invalid: "Invalid %{authentication_keys} or password." - locked: "Your account is locked." - last_attempt: "You have one more attempt before your account is locked." + locked: "Your account has been locked." + last_attempt: "You have one more attempt remaining before your account is blocked." not_found_in_database: "Invalid %{authentication_keys} or password." - timeout: "Your session expired. Please sign in again to continue." - unauthenticated: "You need to sign in or sign up before continuing." - unconfirmed: "You have to confirm your email address before continuing." + timeout: "Your session has expired. Please sign in again to continue." + unauthenticated: "You must sign in or register to continue." + unconfirmed: "You must confirm your account to continue." mailer: confirmation_instructions: subject: "Confirmation instructions" reset_password_instructions: - subject: "Reset password instructions" + subject: "Instructions for resetting your password" unlock_instructions: - subject: "Unlock instructions" + subject: "Unlocking instructions" omniauth_callbacks: - failure: "Could not authenticate you from %{kind} because \"%{reason}\"." - success: "Successfully authenticated from %{kind} account." + failure: "It has not been possible to authorise you as %{kind} because \"%{reason}\"." + success: "Successfully identified as %{kind}." passwords: - no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided." - send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes." - send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes." - updated: "Your password has been changed successfully. You are now signed in." - updated_not_active: "Your password has been changed successfully." + 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." + send_instructions: "In a few minutes, you will receive an email containing instructions on resetting your password." + send_paranoid_instructions: "If your email address is in our database, in a few minutes you will receive a link to use to reset your password." + updated: "Your password has been changed successfully. Authentication successful." + updated_not_active: "Your password has been changed successfully. " registrations: - destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon." - signed_up: "Welcome! You have signed up successfully." - signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated." - signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked." - signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account." - update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address." + destroyed: "Goodbye! Your account has been cancelled. We hope to see you again soon." + signed_up: "Welcome! You have been authenticated." + signed_up_but_inactive: "Your registration was successful, but you could not be signed in because your account has not been activated." + signed_up_but_locked: "Your registration was successful, but you could not be signed in because your account is locked." + signed_up_but_unconfirmed: "You have been sent a message containing a verification link. Please click on this link to activate your account." + update_needs_confirmation: "Your account has been updated successfully; however, we need to verify your new email address. Please check your email and click on the link to complete the confirmation of your new email address." updated: "Your account has been updated successfully." sessions: - signed_in: "Signed in successfully." - signed_out: "Signed out successfully." - already_signed_out: "Signed out successfully." + signed_in: "You have been signed in successfully." + signed_out: "You have been signed out successfully." + already_signed_out: "You have been signed out successfully." unlocks: - send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes." - send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes." - unlocked: "Your account has been unlocked successfully. Please sign in to continue." + send_instructions: "In a few minutes, you will receive an email containing instructions on unlocking your account." + send_paranoid_instructions: "If you have an account, in a few minutes you will receive an email containing instructions on unlocking your account." + unlocked: "Your account has been unlocked. Please sign in to continue." errors: messages: - already_confirmed: "was already confirmed, please try signing in" - confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one" - expired: "has expired, please request a new one" - not_found: "not found" - not_locked: "was not locked" + already_confirmed: "You have already been verified; please attempt to sign in." + confirmation_period_expired: "You need to be verified within %{period}; please make a repeat request." + expired: "has expired; please make a repeat request." + not_found: "not found." + not_locked: "was not locked." not_saved: - one: "1 error prohibited this %{resource} from being saved:" - other: "%{count} errors prohibited this %{resource} from being saved:" + one: "1 error prevented this %{resource} from being saved:" + other: "%{count} errors prevented this %{resource} from being saved:" diff --git a/config/locales/devise_views.en.yml b/config/locales/devise_views.en.yml old mode 100644 new mode 100755 index 2c7ef86bb..251569ea7 --- a/config/locales/devise_views.en.yml +++ b/config/locales/devise_views.en.yml @@ -2,9 +2,9 @@ en: devise_views: confirmations: new: - title: "Resend confirmation instructions" + title: "Re-send confirmation instructions" email_label: Email - submit: "Resend confirmation" + submit: "Re-send instructions" show: title: "Confirm my account" instructions_html: "Confirming the account with email %{email}" @@ -14,28 +14,28 @@ en: submit: "Confirm" mailer: confirmation_instructions: - title: "Welcome to open government portal" + title: "Welcome to the Open Government Portal of the Madrid City Council" welcome: "Welcome" - text: "You can confirm your account email through the link below:" + text: "You can confirm your email account at the following link:" confirm_link: "Confirm my account" reset_password_instructions: hello: "Hello" - title: Change your password - text: "Someone has requested to change your password. You can do this through the link below:" + title: "Change your password" + text: "We have received a request to change your password. You can do this at the following link:" change_link: "Change my password" - ignore_text: "If you didn't request this, please ignore this email." - info_text: "Your password won't change until you access the link above and create a new one." + ignore_text: "If you did not request a password change, you can ignore this email." + info_text: "Your password will not be changed unless you access the link and edit it." unlock_instructions: hello: "Hello" title: Your account has been locked - info_text: "Your account has been locked due to an excessive number of unsuccessful sign in attempts." - instructions_text: "Click the link below to unlock your account:" + info_text: "Your account has been blocked due to an excessive number of failed sign-in attempts." + instructions_text: "Please click on this link to unlock your account:" unlock_link: "Unlock my account" menu: login_items: - logout: "Logout" - signup: "Sign up" - login: "Log in" + logout: "Sign out" + signup: "Register" + login: "Sign in" passwords: edit: title: "Change your password" @@ -43,40 +43,40 @@ en: password_confirmation_label: "Confirm new password" change_submit: "Change my password" new: - title: "Forgot your password?" + title: "Forgotten password?" email_label: "Email" - send_submit: "Send me reset password" + send_submit: "Send instructions" users: registrations: edit: edit: "Edit" email_label: "Email" - waiting_for: "Currently waiting confirmation for:" - leave_blank: "Leave blank if you don't want to change it" + waiting_for: "Awaiting confirmation of:" + leave_blank: "Leave blank if you do not wish to modify" password_label: "New password" password_confirmation_label: "Confirm new password" current_password_label: "Current password" - need_current: "We need your current password to confirm your changes" + need_current: "We need your current password to confirm the changes" update_submit: "Update" back_link: "Back" new: - title: "Sign up" + title: "Register" username_label: "Username" - username_note: "Username which will appear in your publications" + username_note: "Name that appears next to your posts" email_label: "Email" password_label: "Password" password_confirmation_label: "Confirm password" - submit: "Sign up" - organization_signup: "Do you represent an organization / group? %{signup_link}" + submit: "Register" + organization_signup: "Do you represent an organisation or collective? %{signup_link}" organization_signup_link: "Sign up here" - terms: "To sign up in this site your accept the %{terms}" - terms_link: "terms of use" + terms: "By registering you accept the %{terms}" + terms_link: "terms and conditions of use" success: - title: "Review your email inbox" - thank_you_html: "Thank you for registering. Now you must confirm your email account." - instructions_1_html: "Please review your email inbox - we have sent you a link to confirm your account." - instructions_2_html: "Once you click that link, you will be able to start participating" - back_to_index: "Understood, take me back to the home page" + title: "Modify your email" + thank_you_html: "Thank you for registering for the website. You must now confirm your email address." + instructions_1_html: "Please check your email - we have sent you a link to confirm your account." + instructions_2_html: "Once confirmed, you may begin participation." + back_to_index: "I understand; go back to main page" delete_form: title: "Erase account" info: "This action can not be undone. Please make sure this is what you want." @@ -86,41 +86,41 @@ en: organizations: registrations: new: - title: "Sign up as organization / collective" - organization_name_label: "Organization name" - responsible_name_label: "Name and surname of the person in charge" - responsible_name_note: "The responsible representative of the organization" + title: "Register as an organisation or collective" + organization_name_label: "Name of organisation" + responsible_name_label: "Full name of the person responsible for the collective" + responsible_name_note: "This would be the person representing the association/collective in whose name the proposals are presented" email_label: "Email" password_label: "Password" phone_number_label: "Phone number" password_confirmation_label: "Confirm password" - submit: "Sign up" + submit: "Register" success: - title: "Registration of organization / collective" - thank_you_html: "Thank you for registering your organization or collective in the website. Now is pending verification." - instructions_1_html: "We will contact you soon in order to verify that you represent your collective." - instructions_2_html: "Meanwhile, review your email. We have sent you a confirmation link to activate your account." - instructions_3_html: "When you confirm your account will then be able to participate as a non-verified organization." - back_to_index: "Understood, take me back to the home page" + title: "Registration of organisation / collective" + thank_you_html: "Thank you for registering your collective on the website. It is now pending verification." + 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." + back_to_index: "I understand; go back to main page" sessions: new: - title: "Log in" + title: "Sign in" email_label: "Email" password_label: "Password" remember_me: "Remember me" - submit: "Log in" + submit: "Enter" unlocks: new: - title: "Resend unlock instructions" + title: "Re-sent unlocking instructions" email_label: "Email" - submit: "Resend unlock instructions" + submit: "Re-send unlocking instructions" shared: links: - login: "Log in" + login: "Enter" signup: "Don't have an account? %{signup_link}" signup_link: "Sign up" - #organization_signup: "Sign up as an organization / collective" + #organization_signup: "Registration for organisations / collectives" signin_with_provider: "Sign in with %{provider}" - new_password: "Forgot your password?" - new_confirmation: "Didn't receive confirmation instructions?" - new_unlock: "Didn't receive unlock instructions?" + new_password: "Forgotten your password?" + new_confirmation: "Haven't received instructions to activate your account?" + new_unlock: "Haven't received unlocking instructions?" diff --git a/config/locales/kaminari.en.yml b/config/locales/kaminari.en.yml old mode 100644 new mode 100755 index e2a79c6b1..b357b1688 --- a/config/locales/kaminari.en.yml +++ b/config/locales/kaminari.en.yml @@ -3,19 +3,19 @@ en: pagination: first: "« First" last: "Last »" - previous: "‹ Prev" + previous: "‹ Previous" next: "Next ›" truncate: "…" helpers: page_entries_info: entry: - zero: "entries" - one: "entry" - other: "entries" + zero: "Entries" + one: "Entry" + other: "Entries" one_page: display_entries: - zero: "No %{entry_name} found" - one: "Displaying 1 %{entry_name}" - other: "Displaying all %{count} %{entry_name}" + zero: "%{entry_name} cannot be found" + one: "There is 1 %{entry_name}" + other: "There are %{count} %{entry_name}" more_pages: - display_entries: "Displaying %{entry_name} %{first} - %{last} of %{total} in total" + display_entries: "Displaying %{first} - %{last} of %{total} %{entry_name}" diff --git a/config/locales/mailers.en.yml b/config/locales/mailers.en.yml old mode 100644 new mode 100755 index 50330a69f..31b596b2f --- a/config/locales/mailers.en.yml +++ b/config/locales/mailers.en.yml @@ -2,19 +2,18 @@ en: mailers: comment: subject: "Someone has commented on your %{commentable}" - hi: Hello + hi: Hi title: New comment - new_comment_by_html: "There is a new comment by %{commenter} on" + new_comment_by_html: "There is a new comment from %{commenter}" reply: - subject: Someone has replied to your comment - hi: Hello - title: New reply on your comment - new_reply_by_html: "There'is a new reply by %{commenter} to your comment on" + subject: Someone has responded to your comment + hi: Hi + title: New response to your comment + new_reply_by_html: "There is a new response from %{commenter} to your comment on" email_verification: - subject: Verify your email - title: Please verify yourself - instructions_html: "We need to verify you using this email, which we got from the Census. %{verification_link}" - click_here_to_verify: "Please click here to verify yourself" + subject: Confirm your email + title: Confirm your account using the following link + instructions_html: "To complete the verification of your user account in the Open Government Portal of the Madrid City Council, you must click %{verification_link}." + click_here_to_verify: "this link" instructions_2_html: "This email will verify your account with %{document_type} %{document_number}. If these don't belong to you, please don't click on the previous link and ignore this email." - thanks: "Thanks" - + thanks: "Thank you very much." diff --git a/config/locales/moderation.en.yml b/config/locales/moderation.en.yml old mode 100644 new mode 100755 index c49b3bc4a..0988e3b8e --- a/config/locales/moderation.en.yml +++ b/config/locales/moderation.en.yml @@ -4,7 +4,7 @@ en: proposals: Proposals flagged_debates: Debates flagged_comments: Comments - users: Ban users + users: Block users dashboard: index: title: Moderation @@ -12,7 +12,7 @@ en: index: hide_comments: Hide comments block_authors: Block authors - ignore_flags: Ignore flags + ignore_flags: Mark as viewed title: Comments headers: comment: Comment @@ -21,7 +21,7 @@ en: filters: all: All pending_flag_review: Pending - with_ignored_flag: Ignored + with_ignored_flag: Marked as viewed order: Order orders: created_at: Newest @@ -31,7 +31,7 @@ en: index: hide_debates: Hide debates block_authors: Block authors - ignore_flags: Ignore flags + ignore_flags: Mark as viewed title: Debates headers: debate: Debate @@ -40,7 +40,7 @@ en: filters: all: All pending_flag_review: Pending - with_ignored_flag: Ignored + with_ignored_flag: Marked as viewed order: Order orders: created_at: Newest @@ -50,7 +50,7 @@ en: index: hide_proposals: Hide proposals block_authors: Block authors - ignore_flags: Ignore flags + ignore_flags: Mark as viewed title: Proposals headers: proposal: Proposal @@ -58,18 +58,18 @@ en: filter: Filter filters: all: All - pending_flag_review: Pending - with_ignored_flag: Ignored - order: Order + pending_flag_review: Pending review + with_ignored_flag: Mark as viewed + order: Order by orders: - created_at: Newest + created_at: Most recent flags: Most flagged confirm: Are you sure? users: - notice_hide: User banned. + notice_hide: User blocked. All of this user's debates and comments have been hidden. index: - title: User search and banning - search_placeholder: email or username + title: Block users + search_placeholder: email or name of user search: Search - hide: Ban - hidden: Banned + hide: Block + hidden: Blocked diff --git a/config/locales/pages.en.yml b/config/locales/pages.en.yml old mode 100644 new mode 100755 index ef2b271a9..6ee7c9bdd --- a/config/locales/pages.en.yml +++ b/config/locales/pages.en.yml @@ -8,17 +8,18 @@ en: conditions: "Terms of use" accessibility: "Accessibility" conditions: - "Terms of use" + "Terms and conditions of use" privacy: "Privacy Policy" general_terms: "Terms and Conditions" census_terms: - "Census Terms" + "To confirm the account, you must be 16 or older and be registered as resident in Madrid, having provided the information requested previously, which the Directorate-General of Civil Participation will verify against the files 'Municipal Census of Inhabitants', for which the Directorate-General for Statistics is responsible, and the 'Citizen Support Services', for which the Directorate-General for Quality and Citizen Services is responsible. + By accepting the verification process, you also consent to the verification of this information, as well as the contact methods featuring in said files. + The data provided will be acquired and processed by the Directorate-General for Civil Participation in the file 'Management of Participatory Activities' mentioned previously in the terms and conditions of use for the Portal." transparency: "Transparency" - opendata: - "Open Data" + opendata: "Open Data" verify: title: "Verify your account" info: "For verufy your account introduce your access data:" @@ -26,4 +27,4 @@ en: email: "Email" password: "Password" code: "Code you received in letter" - submit: "Verify my account" \ No newline at end of file + submit: "Verify my account"