decidim-proposals 0.16.1 → 0.17.0

data/config/locales/de.yml

@@ -2,6 +2,7 @@ de:
   activemodel:
     attributes:
       collaborative_draft:
+        address: Adresse
         body: Karosserie
         category_id: Kategorie
         decidim_scope_id: Umfang
@@ -10,6 +11,7 @@ de:
         title: Titel
         user_group_id: Erstellen Sie einen gemeinsamen Entwurf als
       proposal:
+        address: Adresse
         answer: Antworten
         answered_at: Beantwortet bei
         automatic_hashtags: Hashtags werden automatisch hinzugefügt
@@ -26,8 +28,15 @@ de:
       proposals_copy:
         copy_proposals: Ich verstehe, dass dies alle Vorschläge von der ausgewählten Komponente in die aktuelle Komponente importiert und dass diese Aktion nicht rückgängig gemacht werden kann.
         origin_component_id: Komponente zum Kopieren der Vorschläge aus
+      proposals_import:
+        import_proposals: Vorschläge importieren
+        keep_authors: Behalten Sie die ursprünglichen Autoren
     errors:
       models:
+        participatory_text:
+          attributes:
+            document:
+              invalid_document_type: 'Ungültiger Dokumenttyp Zulässige Formate sind: %{valid_mime_types}'
         proposal:
           attributes:
             attachment:
@@ -287,8 +296,10 @@ de:
         participatory_texts:
           bulk-actions:
             are_you_sure: Sind Sie sicher, den gesamten Entwurf des partizipativen Textes zu verwerfen?
-            import_doc: Dokument importieren
             discard_all: Alle verwerfen
+            import_doc: Dokument importieren
+          discard:
+            success: Alle Mitentscheidungsentwürfe wurden verworfen.
           import:
             invalid: Das Formular ist ungültig!
             success: Herzlichen Glückwunsch, die folgenden Abschnitte wurden aus dem importierten Dokument analysiert, sie wurden in Vorschläge konvertiert. Jetzt können Sie alles überprüfen und anpassen, bevor Sie es veröffentlichen.
@@ -298,15 +309,16 @@ de:
             save_draft: Entwurf speichern
             title: VORSCHAU TEILNEHMERTEXT
           new_import:
+            accepted_mime_types:
+              md: Markdown
+              odt: Odt
             bottom_hint: "(Sie können Dokumentabschnitte in der Vorschau anzeigen und sortieren.)"
-            document_legend: 'Fügen Sie ein Dokument mit weniger als 2 MB hinzu, wobei jeder Abschnitt bis zu 3 Ebenen tief in Vorschläge zerlegt wird. Unterstützte Formate sind: Markdown'
+            document_legend: 'Fügen Sie ein Dokument hinzu, das kleiner als 2 MB ist. Jeder Abschnitt wird so lange in 3 bis 3 Ebenen tief in die Vorschläge geparst. Unterstützte Formate sind: %{valid_mime_types}'
             title: DOKUMENT HINZUFÜGEN
             upload_document: Dokument hochladen
           publish:
             invalid: Vorschläge konnten nicht veröffentlicht werden
             success: Alle Vorschläge wurden veröffentlicht
-          discard:
-            success: Alle Mitentscheidungsentwürfe wurden verworfen.
           sections:
             article: "<em>Artikel</em>"
             section: "<em>Abschnitt:</em> <strong>%{title}</strong>"
@@ -584,7 +596,7 @@ de:
           error: Es gab Fehler bei der Abstimmung des Vorschlags.
       proposals:
         compare:
-          mine_is_different: Mein Vorschlag ist anders
+          continue: Fortsetzen
           no_similars_found: Gut gemacht! Keine ähnlichen Vorschläge gefunden
           title: Ähnliche Vorschläge
         complete:
@@ -611,6 +623,7 @@ de:
           comments: Bemerkungen
         filters:
           activity: Aktivität
+          amendment_type: Art
           category: Kategorie
           category_prompt: Wählen Sie eine Kategorie
           origin: Ursprung
@@ -618,7 +631,6 @@ de:
           search: Suche
           state: Zustand
           voted: Gewählt
-          amendment_type: Art
         filters_small_view:
           close_modal: Modal schließen
           filter: Filter
@@ -738,6 +750,9 @@ de:
           version_number_out_of_total: "%{current_version} von %{total_count}"
         version:
           version_index: Version %{index}
+      withdraw:
+        errors:
+          has_supports: Dieser Vorschlag kann nicht zurückgezogen werden, da er bereits Unterstützung hat.
     resource_links:
       copied_from_component:
         proposal_proposal: Ähnliche Vorschläge

data/config/locales/en.yml

@@ -1,7 +1,9 @@
+---
 en:
   activemodel:
     attributes:
       collaborative_draft:
+        address: Address
         body: Body
         category_id: Category
         decidim_scope_id: Scope
@@ -10,6 +12,7 @@ en:
         title: Title
         user_group_id: Create collaborative draft as
       proposal:
+        address: Address
         answer: Answer
         answered_at: Answered at
         automatic_hashtags: Hashtags automatically added
@@ -26,8 +29,15 @@ en:
       proposals_copy:
         copy_proposals: I understand that this will import all proposals from the selected component to the current one and that this action can't be reversed.
         origin_component_id: Component to copy the proposals from
+      proposals_import:
+        import_proposals: Import proposals
+        keep_authors: Keep original authors
     errors:
       models:
+        participatory_text:
+          attributes:
+            document:
+              invalid_document_type: 'Invalid document type. Accepted formats are: %{valid_mime_types}'
         proposal:
           attributes:
             attachment:
@@ -58,15 +68,15 @@ en:
         one: Note
         other: Notes
       decidim/proposals/proposal_vote:
-        one: Vote
-        other: Votes
+        one: Support
+        other: Supports
   decidim:
     components:
       proposals:
         actions:
           create: Create
           endorse: Endorse
-          vote: Vote
+          vote: Support
           withdraw: Withdraw
         name: Proposals
         settings:
@@ -78,21 +88,21 @@ en:
             collaborative_drafts_enabled: Collaborative drafts enabled
             comments_enabled: Comments enabled
             geocoding_enabled: Geocoding enabled
-            minimum_votes_per_user: Minimum votes per user
+            minimum_votes_per_user: Minimum supports per user
             new_proposal_help_text: New proposal help text
             official_proposals_enabled: Official proposals enabled
             participatory_texts_enabled: Participatory texts enabled
             proposal_answering_enabled: Proposal answering enabled
             proposal_edit_before_minutes: Proposals can be edited by authors before this many minutes passes
             proposal_length: Maximum proposal body length
-            proposal_limit: Proposal limit per user
+            proposal_limit: Proposal limit per participant
             proposal_wizard_step_1_help_text: Proposal wizard "Create" step help text
             proposal_wizard_step_2_help_text: Proposal wizard "Compare" step help text
             proposal_wizard_step_3_help_text: Proposal wizard "Complete" step help text
             proposal_wizard_step_4_help_text: Proposal wizard "Publish" step help text
             resources_permissions_enabled: Actions permissions can be set for each proposal
             threshold_per_proposal: Threshold per proposal
-            vote_limit: Vote limit per user
+            vote_limit: Support limit per participant
           step:
             announcement: Announcement
             automatic_hashtags: Hashtags added to all proposals
@@ -101,10 +111,10 @@ en:
             endorsements_blocked: Endorsements blocked
             endorsements_enabled: Endorsements enabled
             proposal_answering_enabled: Proposal answering enabled
-            suggested_hashtags: Hashtags suggested to users for new proposals
-            votes_blocked: Voting blocked
-            votes_enabled: Voting enabled
-            votes_hidden: Votes hidden (if votes are enabled, checking this will hide the number of votes)
+            suggested_hashtags: Hashtags suggested to participants for new proposals
+            votes_blocked: Supports blocked
+            votes_enabled: Supports enabled
+            votes_hidden: Supports hidden (if supports are enabled, checking this will hide the number of supports)
     events:
       proposals:
         collaborative_draft_access_accepted:
@@ -186,7 +196,7 @@ en:
           notification_title: The <a href="%{resource_path}">%{resource_title}</a> proposal was published by <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
         proposal_published_for_space:
           email_intro: The proposal "%{resource_title}" has been added to "%{participatory_space_title}" that you are following.
-          email_outro: You have received this notification because you are following "%{participatory_space_title}". You can unfollow it from the previous link.
+          email_outro: You have received this notification because you are following "%{participatory_space_title}". You can stop receiving notifications following the previous link.
           email_subject: New proposal "%{resource_title}" added to %{participatory_space_title}
           notification_title: The proposal <a href="%{resource_path}">%{resource_title}</a> has been added to %{participatory_space_title}
         proposal_rejected:
@@ -201,67 +211,67 @@ en:
             email_subject: A proposal you're following has been rejected
             notification_title: The <a href="%{resource_path}">%{resource_title}</a> proposal has been rejected.
         proposal_update_category:
-          email_intro: 'An admin has updated the category of your proposal "%{resource_title}", check it out:'
+          email_intro: 'An admin has updated the category of your proposal "%{resource_title}", check it out in this page:'
           email_outro: You have received this notification because you are the author of the proposal.
           email_subject: The %{resource_title} proposal category has been updated
           notification_title: The <a href="%{resource_path}">%{resource_title}</a> proposal category has been updated by an admin.
         voting_enabled:
-          email_intro: 'You can vote proposals in %{participatory_space_title}! Start participating in this page:'
+          email_intro: 'You can support proposals in %{participatory_space_title}! Start participating in this page:'
           email_outro: You have received this notification because you are following %{participatory_space_title}. You can stop receiving notifications following the previous link.
-          email_subject: Proposals voting has started for %{participatory_space_title}
-          notification_title: You can now start <a href="%{resource_path}">voting proposals</a> in <a href="%{participatory_space_url}">%{participatory_space_title}</a>
+          email_subject: Proposal support has started for %{participatory_space_title}
+          notification_title: You can now start <a href="%{resource_path}">supporting proposals</a> in <a href="%{participatory_space_url}">%{participatory_space_title}</a>
     gamification:
       badges:
         accepted_proposals:
           conditions:
-            - Choose the participation space of your interest with submission for proposals enabled
-            - Try to make proposals that can be carried out. This way they are more likely to be accepted.
+          - Choose the participation space of your interest with submission for proposals enabled
+          - Try to make proposals that can be carried out. This way they are more likely to be accepted.
           description: This badge is granted when you actively participate with new proposals and these are accepted.
-          description_another: This user has gotten %{score} proposals accepted.
+          description_another: This participant had %{score} accepted proposals.
           description_own: You got %{score} proposals accepted.
           name: Accepted proposals
           next_level_in: Get %{score} more proposals accepted to reach the next level!
-          unearned_another: This user hasn't gotten any proposals accepted yet.
+          unearned_another: This participant has not yet had any accepted proposals.
           unearned_own: You got no proposals accepted yet.
         proposal_votes:
           conditions:
-            - Browse and spend some time reading other people's proposals
-            - Give support to the proposals you like or find interesting
+          - Browse and spend some time reading other people's proposals
+          - Give support to the proposals you like or find interesting
           description: This badge is granted when you support other people's proposals.
-          description_another: This user has given support to %{score} proposals.
+          description_another: This participant has given support to %{score} proposals.
           description_own: You have given support to %{score} proposals.
           name: Proposal supports
           next_level_in: Give support to %{score} more proposals to reach the next level!
-          unearned_another: This user hasn't given support to any proposals yet.
+          unearned_another: This participant hasn't given support to any proposals yet.
           unearned_own: You have given support to no proposals yet.
         proposals:
           conditions:
-            - Choose the participation space of your interest with submission for proposals enabled
-            - Create a new proposal
+          - Choose the participation space of your interest with submission for proposals enabled
+          - Create a new proposal
           description: This badge is granted when you actively participate with new proposals.
-          description_another: This user has created %{score} proposals.
+          description_another: This participant has created %{score} proposals.
           description_own: You have created %{score} proposals.
           name: Proposals
           next_level_in: Create %{score} more proposals to reach the next level!
-          unearned_another: This user hasn't created any proposals yet.
+          unearned_another: This participant hasn't created any proposals yet.
           unearned_own: You have created no proposals yet.
     metrics:
       accepted_proposals:
-        description: Number of proposals accepted by users
+        description: Number of proposals accepted
         object: proposals
-        title: Accepted Proposals
+        title: Accepted proposals
       endorsements:
-        description: Number of endorsements generated in proposals
+        description: Number of endorsements to proposals
         object: endorsements
         title: Endorsements
       proposals:
-        description: Number of proposals generated
+        description: Number of proposals
         object: proposals
         title: Proposals
       votes:
-        description: Number of votes generated in proposals by users
-        object: votes
-        title: Votes
+        description: Number of supports to proposals
+        object: supports
+        title: Supports
     participatory_processes:
       participatory_process_groups:
         highlighted_proposals:
@@ -290,32 +300,35 @@ en:
         participatory_texts:
           bulk-actions:
             are_you_sure: Are you sure to discard the whole participatory text draft?
-            import_doc: Import document
             discard_all: Discard all
+            import_doc: Import document
+          discard:
+            success: All participatory text drafts have been discarded.
           import:
             invalid: The form is invalid!
-            success: Congratulations, the following sections have been parsed from the imported document, they have been converted to proposals. Now you can review and adjust whatever you need before publishing.
+            success: Congratulations, the following sections have been converted to proposals. Now you can review and adjust them before publishing.
           index:
-            info_1: The following sections have been parsed from the imported document, they have been converted to proposals. Now you can review and adjust whatever you need before publishing.
+            info_1: The following sections have been converted to proposals. Now you can review and adjust them before publishing.
             publish_document: Publish document
             save_draft: Save draft
             title: PREVIEW PARTICIPATORY TEXT
           new_import:
+            accepted_mime_types:
+              md: Markdown
+              odt: Odt
             bottom_hint: "(You will be able to preview and sort document sections)"
-            document_legend: 'Add a document lesser than 2MB, each section until 3 levels deep will be parsed into Proposals. Suported formats are: Markdown'
+            document_legend: 'Add a document lesser than 2MB, each section until 3 levels deep will be parsed into Proposals. Suported formats are: %{valid_mime_types}'
             title: ADD DOCUMENT
             upload_document: Upload document
           publish:
             invalid: Could not publish proposals
             success: All proposals have been published
-          discard:
-            success: All Participatory text drafts have been discarded.
           sections:
             article: "<em>Article</em>"
             section: "<em>Section:</em> <strong>%{title}</strong>"
             sub-section: "<em>Subsection:</em> %{title}"
           update:
-             success: Participatory text updated successfully.
+            success: Participatory text successfully updated.
         proposal_answers:
           edit:
             accepted: Accepted
@@ -325,7 +338,7 @@ en:
             title: Answer for proposal %{title}
         proposal_notes:
           create:
-            error: There's been a problem creating this proposal note
+            error: There was a problem creating this proposal note
             success: Proposal note successfully created
           form:
             note: Note
@@ -369,26 +382,26 @@ en:
             success: 'Proposals successfully updated to the %{category} category: %{proposals}.'
         proposals_imports:
           create:
-            invalid: There's been a problem importing the proposals
+            invalid: There was a problem importing the proposals
             success: "%{number} proposals successfully imported"
           new:
             create: Import proposals
             no_components: There are no other proposal components in this participatory space to import the proposals from.
             select_component: Please select a component
-            select_states: Check the states of the proposals to import
+            select_states: Check the status of the proposals to import
         proposals_merges:
           create:
-            invalid: There was an error merging the selected proposals.
+            invalid: There was a problem merging the selected proposals.
             success: Successfully merged the proposals into a new one.
         proposals_splits:
           create:
-            invalid: There was an error spliting the selected proposals.
+            invalid: There was a problem spliting the selected proposals.
             success: Successfully splitted the proposals into new ones.
         shared:
           info_proposal:
             body: Body
             created_at: Creation date
-            proposal_votes_count: Votes count
+            proposal_votes_count: Supports count
             proposals: Proposals
       admin_log:
         proposal:
@@ -409,7 +422,7 @@ en:
           citizens: Citizens
           meetings: Meetings
           official: Official
-          user_groups: User groups
+          user_groups: Groups
         filter_state_values:
           accepted: Accepted
           all: All
@@ -423,7 +436,7 @@ en:
       collaborative_drafts:
         collaborative_draft:
           publish:
-            error: There's been errors when publishing the collaborative draft.
+            error: There was a problem publishing the collaborative draft.
             irreversible_action_modal:
               body: After publishing the draft as a proposal, the draft won't be editable anymore. The proposal won't accept new authors or contributions.
               cancel: Cancel
@@ -432,7 +445,7 @@ en:
             success: Collaborative draft published successfully as a proposal.
           view_collaborative_draft: View Collaborative Draft
           withdraw:
-            error: There's been errors closing the collaborative draft.
+            error: There was a problem closing the collaborative draft.
             irreversible_action_modal:
               body: After closing the draft, the draft won't be editable anymore. The draft won't accept new authors or contributions.
               cancel: Cancel
@@ -449,9 +462,9 @@ en:
         count:
           drafts_count:
             one: "%{count} collaborative draft"
-            other: "%{count} collaborative draft"
+            other: "%{count} collaborative drafts"
         create:
-          error: There's been a problem creating this collaborative drafts
+          error: There was a problem creating this collaborative drafts
           success: Collaborative draft successfully created.
         edit:
           attachment_legend: "(Optional) Add an attachment"
@@ -468,7 +481,7 @@ en:
           published: Published
           related_to: Related to
           search: Search
-          state: State
+          state: Status
           withdrawn: Withdrawn
         filters_small_view:
           close_modal: Close modal
@@ -487,23 +500,23 @@ en:
           recent: Recent
         requests:
           accepted_request:
-            error: Could not be accepted as a collaborator, try again later.
+            error: Could not be accepted as a collaborator, please try again later.
             success: "@%{user} has been accepted as a collaborator successfully"
           access_requested:
-            error: Your request could not be completed, try again later.
-            success: Your request to collaborate has been sent successfully
+            error: Your request could not be completed, please try again later.
+            success: Your request to collaborate has been successfully sent
           collaboration_requests:
             accept_request: Accept
             reject_request: Reject
             title: Collaboration requests
           rejected_request:
-            error: Could not be rejected as a collaborator, try again later.
-            success: "@%{user} has been rejected as a collaborator successfully"
+            error: Could not be rejected as a collaborator, please try again later.
+            success: "@%{user} has been successfully rejected as a collaborator"
         show:
           back: Back
           edit: Edit collaborative draft
           final_proposal: final proposal
-          final_proposal_help_text: This draft is finished. You can see the final finished proposal
+          final_proposal_help_text: This draft is finished. Check out the final proposal
           hidden_authors_count:
             one: and %{count} more person
             other: and %{count} more people
@@ -523,8 +536,8 @@ en:
           published: Published
           withdrawn: Withdrawn
         update:
-          error: There's been errors when saving the collaborative draft.
-          success: Collaborative draft updated successfully.
+          error: There was a problem saving the collaborative draft.
+          success: Collaborative draft successfully updated.
         wizard_aside:
           back: Back
           info: You are creating a <strong>collaborative draft</strong>.
@@ -535,10 +548,10 @@ en:
           step_3: Complete your collaborative draft
           step_of: Step %{current_step_num} of %{total_steps}
       create:
-        error: There's been errors when saving the proposal.
-        success: Proposal created successfully. Saved as a Draft.
+        error: There was a problem saving the proposal.
+        success: Proposal successfully created. Saved as a Draft.
       destroy_draft:
-        error: There's been errors deleting the proposal draft.
+        error: There was a problem deleting the collaborative draft.
         success: Proposal draft was successfully deleted.
       last_activity:
         new_proposal_at_html: "<span>New proposal at %{link}</span>"
@@ -558,7 +571,7 @@ en:
             official_proposal: Official proposal
             published_at: Published at
             scope: Scope
-            state: State
+            state: Status
             title: Title
             votes: Votes
       new:
@@ -572,7 +585,7 @@ en:
           endorse: Endorse
       proposal_endorsements:
         create:
-          error: There's been errors when endorsing the proposal.
+          error: There was a problem endorsing the proposal.
         identities:
           done: Done
           select_identity: Select identity
@@ -584,10 +597,10 @@ en:
           endorse: Endorse
       proposal_votes:
         create:
-          error: There's been errors when voting the proposal.
+          error: There was a problem supporting the proposal.
       proposals:
         compare:
-          mine_is_different: My proposal is different
+          continue: Continue
           no_similars_found: Well done! No similar proposals found
           title: Similar Proposals
         complete:
@@ -614,14 +627,14 @@ en:
           comments: Comments
         filters:
           activity: Activity
+          amendment_type: Type
           category: Category
           category_prompt: Select a category
           origin: Origin
           related_to: Related to
           search: Search
-          state: State
-          voted: Voted
-          amendment_type: Type
+          state: Status
+          voted: Supported
         filters_small_view:
           close_modal: Close modal
           filter: Filter
@@ -634,14 +647,14 @@ en:
           view_proposal: View proposal
         linked_proposals:
           proposal_votes:
-            one: vote
-            other: votes
+            one: support
+            other: supports
         new:
           send: Continue
           title: Create Your Proposal
         orders:
           label: 'Order proposals by:'
-          most_voted: Most voted
+          most_voted: Most supported
           random: Random
           recent: Recent
         participatory_texts:
@@ -673,40 +686,40 @@ en:
           proposal_rejected_reason: 'This proposal has been rejected because:'
           report: Report
           withdraw_btn_hint: You can withdraw your proposal if you change your mind, as long as you have not received any support. The proposal is not deleted, it will appear in the list of withdrawn proposals.
-          withdraw_confirmation: Are you sure to withdraw this proposal?
+          withdraw_confirmation: Are you sure you want to withdraw this proposal?
           withdraw_proposal: Withdraw proposal
         tags:
           changed_from: "(changed from <u>%{previous_category}</u> by an administrator)"
           filed_as: Filed as
         vote_button:
-          already_voted: Already voted
-          already_voted_hover: Unvote
-          maximum_votes_reached: Vote limit reached
-          no_votes_remaining: No votes remaining
-          vote: Vote
-          votes_blocked: Voting disabled
+          already_voted: Already supported
+          already_voted_hover: Withdraw support
+          maximum_votes_reached: Support limit reached
+          no_votes_remaining: No supports remaining
+          vote: Support
+          votes_blocked: Supports disabled
         votes_count:
           count:
-            one: VOTE
-            other: VOTES
+            one: SUPPORT
+            other: SUPPORTS
           most_popular_proposal: Most popular proposal
-          need_more_votes: Need more votes
+          need_more_votes: Need more supports
         voting_rules:
           can_accumulate_supports_beyond_threshold:
             description: Each proposal can accumulate more than %{limit} supports
           minimum_votes_per_user:
-            description: You must distribute a minimum of %{votes} votes among different proposals.
+            description: You must distribute a minimum of %{votes} supports among different proposals.
             given_enough_votes: You've given enough supports.
-            supports_remaining: You have to vote %{remaining_votes} more proposals for your votes to be taken into account.
+            supports_remaining: You have to support %{remaining_votes} more proposals for your supports to be taken into account.
           proposal_limit:
             description: You can create up to %{limit} proposals.
           threshold_per_proposal:
             description: In order to be validated proposals need to reach %{limit} supports
-          title: 'Voting is subject to the following rules:'
+          title: 'Supports are subject to the following rules:'
           vote_limit:
-            description: You can vote up to %{limit} proposals.
+            description: You can support up to %{limit} proposals.
             left: Remaining
-            votes: Votes
+            votes: Supports
         wizard_aside:
           back: Back
           info: You are creating a <strong>proposal</strong>.
@@ -718,14 +731,14 @@ en:
           step_4: Publish your proposal
           step_of: Step %{current_step_num} of %{total_steps}
       publish:
-        error: There's been errors when publishing the proposal.
-        success: Proposal published successfully.
+        error: There was a problem publishing the proposal.
+        success: Proposal successfully published.
       update:
-        error: There's been errors when saving the proposal.
-        success: Proposal updated successfully.
+        error: There was a problem saving the proposal.
+        success: Proposal successfully updated.
       update_draft:
-        error: There's been errors when saving the proposal draft.
-        success: Proposal draft updated successfully.
+        error: There was a problem saving the collaborative draft.
+        success: Proposal draft successfully updated.
       versions:
         changes_at_title: Changes at "%{title}"
         index:
@@ -741,6 +754,9 @@ en:
           version_number_out_of_total: "%{current_version} out of %{total_count}"
         version:
           version_index: Version %{index}
+      withdraw:
+        errors:
+          has_supports: This proposal can not be withdrawn because it already has supports.
     resource_links:
       copied_from_component:
         proposal_proposal: Related proposals