diff options
author | ThibG <thib@sitedethib.com> | 2018-05-23 19:19:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-23 19:19:28 +0200 |
commit | 88ec5193cb377500c4500d31d7ba9fa441f1f5ee (patch) | |
tree | d517f10fdeffb6adaf7e349ea78593c02534c84a /config/locales/en.yml | |
parent | 7719fe0df27a59cb7292989688efaa4efc6cbccc (diff) | |
parent | e0ef89c73f6b380a2841b9dcde07725d515340a4 (diff) |
Merge pull request #510 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales/en.yml')
-rw-r--r-- | config/locales/en.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index a14b5b9d6..68d5f8358 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -283,7 +283,7 @@ en: create_and_resolve: Resolve with note create_and_unresolve: Reopen with note delete: Delete - placeholder: Describe what actions have been taken, or any other updates to this report… + placeholder: Describe what actions have been taken, or any other related updates... reopen: Reopen report report: 'Report #%{id}' report_contents: Contents @@ -559,7 +559,7 @@ en: subject: one: "1 new notification since your last visit \U0001F418" other: "%{count} new notifications since your last visit \U0001F418" - title: In your absence… + title: In your absence... favourite: body: 'Your status was favourited by %{name}:' subject: "%{name} favourited your status" |