about summary refs log tree commit diff
path: root/config/locales/ja.yml
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-12-18 19:37:07 +0100
committerGitHub <noreply@github.com>2018-12-18 19:37:07 +0100
commit74ee5bdf37799fba5990a6b492e3d52c32efe8d7 (patch)
treeafdeb6b23ff4d7bd5e53c4e13cb2c3dfafb4b986 /config/locales/ja.yml
parent36d27e289177fdec5332539c94b8192022a412f2 (diff)
parent0ef2c1415a13d305d4c73c71f27a1366eee702a0 (diff)
Merge pull request #862 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales/ja.yml')
-rw-r--r--config/locales/ja.yml2
1 files changed, 0 insertions, 2 deletions
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 06c8d28d7..21e4236a8 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -530,8 +530,6 @@ ja:
   directories:
     directory: ディレクトリ
     explore_mastodon: "%{title}を探索"
-    most_popular: 人気順
-    most_recently_active: 直近の活動順
     people:
       one: "%{count} 人"
       other: "%{count} 人"