IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5266 from discourse/jomaxro-patch-1

Browse Source 
Change defer flag to ignore flag
This commit is contained in:
Jeff Atwood 2017-10-25 20:35:24 -07:00 committed by GitHub
commit ffd4f62543
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config/locales/client.en.yml
View File

@ -1932,8 +1932,8 @@ en:
actions: actions:
flag: 'Flag' flag: 'Flag'
defer_flags: defer_flags:
one: "Defer flag" one: "Ignore flag"
other: "Defer flags" other: "Ignore flags"
undo: undo:
off_topic: "Undo flag" off_topic: "Undo flag"
spam: "Undo flag" spam: "Undo flag"
@ -2617,11 +2617,11 @@ en:
agree_flag_restore_post_title: "Restore this post" agree_flag_restore_post_title: "Restore this post"
agree_flag: "Agree with flag" agree_flag: "Agree with flag"
agree_flag_title: "Agree with flag and keep the post unchanged" agree_flag_title: "Agree with flag and keep the post unchanged"
defer_flag: "Defer" defer_flag: "Ignore"
defer_flag_title: "Remove this flag; it requires no action at this time." defer_flag_title: "Remove this flag; it requires no action at this time."
delete: "Delete" delete: "Delete"
delete_title: "Delete the post this flag refers to." delete_title: "Delete the post this flag refers to."
delete_post_defer_flag: "Delete post and Defer flag" delete_post_defer_flag: "Delete post and Ignore flag"
delete_post_defer_flag_title: "Delete post; if the first post, delete the topic" delete_post_defer_flag_title: "Delete post; if the first post, delete the topic"
delete_post_agree_flag: "Delete post and Agree with flag" delete_post_agree_flag: "Delete post and Agree with flag"
delete_post_agree_flag_title: "Delete post; if the first post, delete the topic" delete_post_agree_flag_title: "Delete post; if the first post, delete the topic"
@ -2641,7 +2641,7 @@ en:
dispositions: dispositions:
agreed: "agreed" agreed: "agreed"
disagreed: "disagreed" disagreed: "disagreed"
deferred: "deferred" deferred: "ignored"
flagged_by: "Flagged by" flagged_by: "Flagged by"
resolved_by: "Resolved by" resolved_by: "Resolved by"