diff options
| author | Dennis Schubert <mail@dennis-schubert.de> | 2017-03-28 02:48:12 +0300 |
|---|---|---|
| committer | Dennis Schubert <mail@dennis-schubert.de> | 2017-03-28 02:48:35 +0300 |
| commit | efdfa749a7c0a493161b9e5a4d3e4879215d1433 (patch) | |
| tree | 6ac422d91e33968df0f4c25bf830ba0137af6390 /config/locales | |
| parent | 5de83b881b247e19e93de9a839357f75d123d308 (diff) | |
| parent | 7feed3545c06ac9438b0ec0b0955a5f8d43d5448 (diff) | |
Merge branch 'next-minor' into develop
closes #7398
Diffstat (limited to 'config/locales')
| -rw-r--r-- | config/locales/diaspora/en.yml | 2 | ||||
| -rw-r--r-- | config/locales/javascript/javascript.en.yml | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index 5dd703ddb..afcf15e5a 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -1106,8 +1106,6 @@ en: status_messages: new: mentioning: "Mentioning: %{person}" - create: - success: "Successfully mentioned: %{names}" too_long: "Please make your status message fewer than %{count} characters. Right now it is %{current_length} characters" stream_helper: diff --git a/config/locales/javascript/javascript.en.yml b/config/locales/javascript/javascript.en.yml index bea00ddee..3a93a9d5e 100644 --- a/config/locales/javascript/javascript.en.yml +++ b/config/locales/javascript/javascript.en.yml @@ -169,6 +169,7 @@ en: list: "list text here" quote: "quotation text here" code: "code here" + mention_success: "Successfully mentioned: <%= names %>" bookmarklet: post_something: "Post to diaspora*" |