about summary refs log tree commit diff
path: root/config/locales/eu.yml
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-12-18 16:55:15 +0100
committerThibaut Girka <thib@sitedethib.com>2018-12-18 16:55:15 +0100
commit034ffc079e40e0c723173b5998242803cc28dc50 (patch)
treefee1b208be2068cf372ab23f268a66ca51cc2dc3 /config/locales/eu.yml
parent36d27e289177fdec5332539c94b8192022a412f2 (diff)
parent5bf100f87be571e86305f3ab244183fc46f1ede2 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/admin/base_controller.rb
  Some refactoring made upstream, no real conflict.
- app/javascript/mastodon/features/compose/components/compose_form.js
  Updated using upstream's code but using maxChars instead of the
  hardcoded length of 500 characters per toot.
- app/javascript/styles/mastodon/components.scss
  Upstream redesigned the onboarding modal. Not sure why we had a
  conflict there.
Diffstat (limited to 'config/locales/eu.yml')
-rw-r--r--config/locales/eu.yml2
1 files changed, 0 insertions, 2 deletions
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 15307c76e..c96438bc3 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -531,8 +531,6 @@ eu:
     directory: Profilen direktorioa
     explanation: Deskubritu erabiltzaileak interesen arabera
     explore_mastodon: Esploratu %{title}
-    most_popular: Puri-purian
-    most_recently_active: Azkenaldian aktibo
     people:
       one: pertsona %{count}
       other: "%{count} pertsona"