about summary refs log tree commit diff
path: root/config/locales/zh-TW.yml
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-05-09 17:43:30 +0200
committerThibaut Girka <thib@sitedethib.com>2018-05-10 00:03:28 +0200
commit1c9c0167b7ea7dd03ef233a085adc0a6ef1b2527 (patch)
treeccfcb53c4ddb61d7ef3158d29403ff7cd6516e55 /config/locales/zh-TW.yml
parent143878d9dadd03347c54c9261b9bc754a1d0f5bc (diff)
parentac788ad47e32a3cf84a46ac87f84f376185cdad4 (diff)
Merge branch 'master' into glitch-soc/master
Conflicts:
	app/models/account.rb
	app/views/accounts/_header.html.haml
Diffstat (limited to 'config/locales/zh-TW.yml')
-rw-r--r--config/locales/zh-TW.yml1
1 files changed, 0 insertions, 1 deletions
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index f69d22d79..d8c0f89a9 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -80,7 +80,6 @@ zh-TW:
     reports:
       comment:
         none: 無
-      delete: 刪除
       id: ID
       mark_as_resolved: 標記為已解決
       report: '檢舉 #%{id}'