about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-01-25 12:23:47 +0100
committerGitHub <noreply@github.com>2020-01-25 12:23:47 +0100
commit340cb4a04c94f9403673d59e552be909fce25ece (patch)
tree6b5f1b95e8b8bd9dcdbad167e3f74097a6bea3c6 /config
parent0be67df4f0a64367d9e376b06bd3fd2fb9ca8195 (diff)
parent4e1efacfac29cbd4ba3ff675abaa923bb53fcbc8 (diff)
Merge pull request #1266 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config')
-rw-r--r--config/locales/en.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 18a96ccbc..432661c09 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -965,6 +965,7 @@ en:
     public_timelines: Public timelines
   reactions:
     errors:
+      limit_reached: Limit of different reactions reached
       unrecognized_emoji: is not a recognized emoji
   relationships:
     activity: Account activity