diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-03-16 20:59:33 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-16 20:59:33 +0100 |
| commit | 4aa6aba6ee95ba37df7ca1d9c65f360b1b00ec04 (patch) | |
| tree | 7c90513d2576dba9d71ac069ca28ac7e4db72a28 /config/locales/zh-TW.yml | |
| parent | 6af2300454c960ef83f7b7d31e9b829e0d5a8e38 (diff) | |
| parent | 735b8be2042a29fb10077aaab526832b95a041a9 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/services/remove_status_service.rb Conflict because we still handle the direct timeline. Took upstream changes, with that one extra function call. - config/locales/ca.yml Conflict because theme names were updated. Decided to *keep* the theme names even if they are useless to avoid future conflicts. - config/locales/oc.yml Decided to *keep* the theme names even if they are useless to avoid future conflicts. - config/locales/pl.yml Decided to *keep* the theme names even if they are useless to avoid future conflicts.
Diffstat (limited to 'config/locales/zh-TW.yml')
| -rw-r--r-- | config/locales/zh-TW.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index d05514b83..fb3d4f1f5 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -300,7 +300,7 @@ zh-TW: desc_html: 在個人資料頁面上顯示管理人員標誌 title: 顯示管理人員標誌 site_description: - desc_html: "</code>在首頁顯示，及在 meta 標籤中的站點簡介。可以使用 HTML 標籤，包括 <code> 1< 2a> 3</code> 4 and <code> 5< 6em> 7</code> 8." + desc_html: "</code>在首頁顯示，及在 meta 標籤中的站點簡介。可以使用 HTML 標籤，包括 <code><a></code> 和 <code><em></code>。" title: 站點描述 site_description_extended: desc_html: 顯示在資訊頁的長版描述，可使用 HTML 標籤 |