Merge branch 'proposal-notifications' of github.com:AyuntamientoMadrid/participacion into proposal-notifications

This commit is contained in:
rgarcia
2016-06-16 11:23:23 +02:00
17 changed files with 127 additions and 35 deletions

View File

@@ -356,7 +356,6 @@ en:
other: "%{count} comments"
zero: No comments
comments_tab: Comments
comments_title: Comments
edit_proposal_link: Edit
flag: This proposal has been flagged as inappropriate by several users.
login_to_comment: You must %{signin} or %{signup} to leave a comment.
@@ -365,6 +364,8 @@ en:
retired_warning_link_to_explanation: Read the explanation before voting for it.
retired: Proposal retired by the author
share: Share
send_notification: Send notification
no_notifications: "This proposal has any notifications."
update:
form:
submit_button: Save changes
@@ -374,7 +375,7 @@ en:
title_label: "Title"
body_label: "Message"
submit_button: "Send message"
info_about_receivers_html: "This message will be send to <strong>%{count} people</strong> and it will be visible in "
info_about_receivers_html: "This message will be send to <strong>%{count} people</strong> and it will be visible in %{proposal_page}.<br> Message 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"
@@ -539,7 +540,7 @@ en:
private_activity: This user decided to keep the activity list private
send_private_message: "Send private message"
proposals:
send_message: "Send message"
send_notification: "Send notification"
retire: "Retire"
retired: "Retired"
votes: