diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-05-19 22:41:10 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-05-19 22:41:10 +0200 |
commit | b481e4fac1c564b8008f6f1d0eea1727ec9faa08 (patch) | |
tree | 6917de2e59e69f5ad0dc9b1471a7c7c8659c1af8 /config/locales/eo.yml | |
parent | 625c4f36ef394215e65e19157bfaf60e7de94b5f (diff) | |
parent | 6aa5ea1b5dff54941682cb006ac2b11ab7b77988 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: config/locales/simple_form.ja.yml
Diffstat (limited to 'config/locales/eo.yml')
-rw-r--r-- | config/locales/eo.yml | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/config/locales/eo.yml b/config/locales/eo.yml index 0903e3517..892070914 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -596,20 +596,6 @@ eo: other: Aliaj aferoj publishing: Publikado web: Reto - push_notifications: - favourite: - title: "%{name} stelumis vian mesaĝon" - follow: - title: "%{name} eksekvis vin" - group: - title: "%{count} sciigoj" - mention: - action_boost: Diskonigi - action_expand: Montri pli - action_favourite: Stelumi - title: "%{name} menciis vin" - reblog: - title: "%{name} diskonigis vian mesaĝon" remote_follow: acct: Enmetu vian uzantnomo@domajno de kie vi volas sekvi missing_resource: La URL de plusendado ne estis trovita |