diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 2804b2724..6430342d7 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -55,7 +55,7 @@
"column.direct": "私信",
"column.directory": "Browse profiles",
"column.domain_blocks": "已屏蔽的网站",
- "column.favourites": "收藏",
+ "column.favourites": "赞藏",
"column.follow_requests": "关注请求",
"column.home": "主页",
"column.lists": "列表",
@@ -106,7 +106,7 @@
"confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
"confirmations.mute.message": "你确定要隐藏 {name} 吗?",
"confirmations.redraft.confirm": "删除并重新编辑",
- "confirmations.redraft.message": "你确定要删除这条嘟文并重新编辑它吗?所有相关的转嘟和收藏都会被清除,回复将会失去关联。",
+ "confirmations.redraft.message": "你确定要删除这条嘟文并重新编辑它吗?所有相关的转嘟和赞藏都会被清除,回复将会失去关联。",
"confirmations.reply.confirm": "回复",
"confirmations.reply.message": "回复此消息将会覆盖当前正在编辑的信息。确定继续吗?",
"confirmations.unfollow.confirm": "取消关注",
@@ -141,8 +141,8 @@
"empty_column.community": "本站时间轴暂时没有内容,快写点什么让它动起来吧!",
"empty_column.direct": "你还没有使用过私信。当你发出或者收到私信时,它会在这里显示。",
"empty_column.domain_blocks": "目前没有被隐藏的站点。",
- "empty_column.favourited_statuses": "你还没有收藏过任何嘟文。收藏过的嘟文会显示在这里。",
- "empty_column.favourites": "没有人收藏过这条嘟文。如果有人收藏了,就会显示在这里。",
+ "empty_column.favourited_statuses": "你还没有赞藏过任何嘟文。赞藏过的嘟文会显示在这里。",
+ "empty_column.favourites": "没有人赞藏过这条嘟文。如果有人赞藏了,就会显示在这里。",
"empty_column.follow_requests": "你没有收到新的关注请求。收到了之后就会显示在这里。",
"empty_column.hashtag": "这个话题标签下暂时没有内容。",
"empty_column.home": "你还没有关注任何用户。快看看{public},向其他人问个好吧。",
@@ -189,8 +189,8 @@
"introduction.federation.local.headline": "本站",
"introduction.federation.local.text": "你所关注的用户的动态会显示在主页里,你可以关注任何服务器上的任何人。",
"introduction.interactions.action": "教程结束!",
- "introduction.interactions.favourite.headline": "收藏",
- "introduction.interactions.favourite.text": "你可以保存嘟文以便以后阅读。或者通过收藏功能告诉作者你点了个赞。",
+ "introduction.interactions.favourite.headline": "赞藏",
+ "introduction.interactions.favourite.text": "你可以保存嘟文以便以后阅读。或者通过赞藏功能告诉作者你点了个赞。",
"introduction.interactions.reblog.headline": "转嘟",
"introduction.interactions.reblog.text": "通过转嘟,你可以向你的关注者分享其他人的嘟文。",
"introduction.interactions.reply.headline": "回复",
@@ -207,8 +207,8 @@
"keyboard_shortcuts.direct": "打开私信栏",
"keyboard_shortcuts.down": "在列表中让光标下移",
"keyboard_shortcuts.enter": "展开嘟文",
- "keyboard_shortcuts.favourite": "收藏嘟文",
- "keyboard_shortcuts.favourites": "打开收藏列表",
+ "keyboard_shortcuts.favourite": "赞藏嘟文",
+ "keyboard_shortcuts.favourites": "打开赞藏列表",
"keyboard_shortcuts.federated": "打开跨站时间轴",
"keyboard_shortcuts.heading": "快捷键列表",
"keyboard_shortcuts.home": "打开主页时间轴",
@@ -257,7 +257,7 @@
"navigation_bar.discover": "发现",
"navigation_bar.domain_blocks": "已屏蔽的网站",
"navigation_bar.edit_profile": "修改个人资料",
- "navigation_bar.favourites": "收藏的内容",
+ "navigation_bar.favourites": "赞藏的内容",
"navigation_bar.filters": "屏蔽关键词",
"navigation_bar.follow_requests": "关注请求",
"navigation_bar.follows_and_followers": "关注管理",
@@ -271,7 +271,7 @@
"navigation_bar.preferences": "首选项",
"navigation_bar.public_timeline": "跨站公共时间轴",
"navigation_bar.security": "安全",
- "notification.favourite": "{name} 收藏了你的嘟文",
+ "notification.favourite": "{name} 赞藏了你的嘟文",
"notification.follow": "{name} 开始关注你",
"notification.mention": "{name} 提及了你",
"notification.poll": "你参与的一个投票已经结束",
@@ -279,7 +279,7 @@
"notifications.clear": "清空通知列表",
"notifications.clear_confirmation": "你确定要永久清空通知列表吗?",
"notifications.column_settings.alert": "桌面通知",
- "notifications.column_settings.favourite": "当你的嘟文被收藏时:",
+ "notifications.column_settings.favourite": "当你的嘟文被赞藏时:",
"notifications.column_settings.filter_bar.advanced": "显示所有类别",
"notifications.column_settings.filter_bar.category": "快速过滤栏",
"notifications.column_settings.filter_bar.show": "显示",
@@ -292,7 +292,7 @@
"notifications.column_settings.sound": "播放音效",
"notifications.filter.all": "全部",
"notifications.filter.boosts": "转嘟",
- "notifications.filter.favourites": "收藏",
+ "notifications.filter.favourites": "赞藏",
"notifications.filter.follows": "关注",
"notifications.filter.mentions": "提及",
"notifications.filter.polls": "投票结果",
@@ -331,7 +331,7 @@
"report.target": "举报 {target}",
"search.placeholder": "搜索",
"search_popout.search_format": "高级搜索格式",
- "search_popout.tips.full_text": "输入关键词检索所有你发送、收藏、转嘟过或提及到你的嘟文,以及其他用户公开的用户名、昵称和话题标签。",
+ "search_popout.tips.full_text": "输入关键词检索所有你发送、赞藏、转嘟过或提及到你的嘟文,以及其他用户公开的用户名、昵称和话题标签。",
"search_popout.tips.hashtag": "话题标签",
"search_popout.tips.status": "嘟文",
"search_popout.tips.text": "输入关键词检索昵称、用户名和话题标签",
@@ -351,7 +351,7 @@
"status.detailed_status": "对话详情",
"status.direct": "发送私信给 @{name}",
"status.embed": "嵌入",
- "status.favourite": "收藏",
+ "status.favourite": "赞藏",
"status.filtered": "已过滤",
"status.load_more": "加载更多",
"status.media_hidden": "隐藏媒体内容",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 3ca9f0e2e..a09ca6bd9 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -207,7 +207,7 @@
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "在列表往下移動",
"keyboard_shortcuts.enter": "打開文章",
- "keyboard_shortcuts.favourite": "收藏",
+ "keyboard_shortcuts.favourite": "赞藏",
"keyboard_shortcuts.favourites": "to open favourites list",
"keyboard_shortcuts.federated": "to open federated timeline",
"keyboard_shortcuts.heading": "鍵盤快速鍵",
@@ -271,7 +271,7 @@
"navigation_bar.preferences": "偏好設定",
"navigation_bar.public_timeline": "跨站時間軸",
"navigation_bar.security": "安全",
- "notification.favourite": "{name} 收藏了你的文章",
+ "notification.favourite": "{name} 赞藏了你的文章",
"notification.follow": "{name} 開始關注你",
"notification.mention": "{name} 提及你",
"notification.poll": "A poll you have voted in has ended",
@@ -279,7 +279,7 @@
"notifications.clear": "清空通知紀錄",
"notifications.clear_confirmation": "你確定要清空通知紀錄嗎?",
"notifications.column_settings.alert": "顯示桌面通知",
- "notifications.column_settings.favourite": "收藏了你的文章:",
+ "notifications.column_settings.favourite": "赞藏了你的文章:",
"notifications.column_settings.filter_bar.advanced": "Display all categories",
"notifications.column_settings.filter_bar.category": "Quick filter bar",
"notifications.column_settings.filter_bar.show": "Show",
@@ -331,7 +331,7 @@
"report.target": "舉報",
"search.placeholder": "搜尋",
"search_popout.search_format": "高級搜索格式",
- "search_popout.tips.full_text": "輸入簡單的文字,搜索由你發放、收藏、轉推和提及你的文章,以及符合的用戶名稱,帳號名稱和標籤。",
+ "search_popout.tips.full_text": "輸入簡單的文字,搜索由你發放、赞藏、轉推和提及你的文章,以及符合的用戶名稱,帳號名稱和標籤。",
"search_popout.tips.hashtag": "標籤",
"search_popout.tips.status": "文章",
"search_popout.tips.text": "輸入簡單的文字,搜索符合的用戶名稱,帳號名稱和標籤",
@@ -351,7 +351,7 @@
"status.detailed_status": "Detailed conversation view",
"status.direct": "私訊 @{name}",
"status.embed": "鑲嵌",
- "status.favourite": "收藏",
+ "status.favourite": "赞藏",
"status.filtered": "Filtered",
"status.load_more": "載入更多",
"status.media_hidden": "隱藏媒體內容",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 136573381..30c6ae024 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -55,7 +55,7 @@
"column.direct": "私訊",
"column.directory": "瀏覽個人資料",
"column.domain_blocks": "隱藏的網域",
- "column.favourites": "收藏",
+ "column.favourites": "赞藏",
"column.follow_requests": "關注請求",
"column.home": "主頁",
"column.lists": "名單",
@@ -106,7 +106,7 @@
"confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
"confirmations.mute.message": "確定靜音 {name} ?",
"confirmations.redraft.confirm": "刪除並重新編輯",
- "confirmations.redraft.message": "確定刪掉這則嘟文並重新編輯嗎?將會失去這則嘟文的轉嘟及收藏,且回覆這則的嘟文將會變成獨立的嘟文。",
+ "confirmations.redraft.message": "確定刪掉這則嘟文並重新編輯嗎?將會失去這則嘟文的轉嘟及赞藏,且回覆這則的嘟文將會變成獨立的嘟文。",
"confirmations.reply.confirm": "回覆",
"confirmations.reply.message": "現在回覆將蓋掉您目前正在撰寫的訊息。是否仍要回覆?",
"confirmations.unfollow.confirm": "取消關注",
@@ -141,8 +141,8 @@
"empty_column.community": "本地時間軸是空的。快公開嘟些文搶頭香啊!",
"empty_column.direct": "您還沒有任何私訊。當您私訊別人或收到私訊時,它將於此顯示。",
"empty_column.domain_blocks": "尚未隱藏任何網域。",
- "empty_column.favourited_statuses": "你還沒收藏任何嘟文。這裡將會顯示你收藏的嘟文。",
- "empty_column.favourites": "還沒有人收藏這則嘟文。這裡將會顯示被收藏的嘟文。",
+ "empty_column.favourited_statuses": "你還沒赞藏任何嘟文。這裡將會顯示你赞藏的嘟文。",
+ "empty_column.favourites": "還沒有人赞藏這則嘟文。這裡將會顯示被赞藏的嘟文。",
"empty_column.follow_requests": "您尚未收到任何關注請求。這裡將會顯示收到的關注請求。",
"empty_column.hashtag": "這個主題標籤下什麼也沒有。",
"empty_column.home": "您的首頁時間軸是空的!前往 {public} 或使用搜尋功能來認識其他人。",
@@ -190,7 +190,7 @@
"introduction.federation.local.text": "跟您同伺服器之使用者所發的公開嘟文將會顯示在本機時間軸中。",
"introduction.interactions.action": "完成教學!",
"introduction.interactions.favourite.headline": "關注",
- "introduction.interactions.favourite.text": "您能儲存嘟文供稍候觀看,或者收藏嘟文,讓作者知道您喜歡這則嘟文。",
+ "introduction.interactions.favourite.text": "您能儲存嘟文供稍候觀看,或者赞藏嘟文,讓作者知道您喜歡這則嘟文。",
"introduction.interactions.reblog.headline": "轉嘟",
"introduction.interactions.reblog.text": "您能藉由轉嘟他人嘟文來分享給您的關注者。",
"introduction.interactions.reply.headline": "回覆",
@@ -207,8 +207,8 @@
"keyboard_shortcuts.direct": "開啟私訊欄",
"keyboard_shortcuts.down": "往下移動名單項目",
"keyboard_shortcuts.enter": "檢視嘟文",
- "keyboard_shortcuts.favourite": "收藏",
- "keyboard_shortcuts.favourites": "開啟收藏名單",
+ "keyboard_shortcuts.favourite": "赞藏",
+ "keyboard_shortcuts.favourites": "開啟赞藏名單",
"keyboard_shortcuts.federated": "開啟站點聯盟時間軸",
"keyboard_shortcuts.heading": "鍵盤快速鍵",
"keyboard_shortcuts.home": "開啟首頁時間軸",
@@ -257,7 +257,7 @@
"navigation_bar.discover": "探索",
"navigation_bar.domain_blocks": "隱藏的網域",
"navigation_bar.edit_profile": "編輯個人資料",
- "navigation_bar.favourites": "收藏",
+ "navigation_bar.favourites": "赞藏",
"navigation_bar.filters": "靜音詞彙",
"navigation_bar.follow_requests": "關注請求",
"navigation_bar.follows_and_followers": "關注及關注者",
diff --git a/app/views/about/show.html.haml b/app/views/about/show.html.haml
index 80f4cd828..4181de6b2 100644
--- a/app/views/about/show.html.haml
+++ b/app/views/about/show.html.haml
@@ -72,8 +72,8 @@
.hero-widget__counter{ style: 'width: 50%' }
%strong= number_to_human @instance_presenter.user_count, strip_insignificant_zeros: true
%span= t 'about.user_count_after', count: @instance_presenter.user_count
- .hero-widget__counter{ style: 'width: 50%' }
- %strong= number_to_human @instance_presenter.active_user_count, strip_insignificant_zeros: true
- %span
- = t 'about.active_count_after'
- %abbr{ title: t('about.active_footnote') } *
+ /.hero-widget__counter{ style: 'width: 50%' }
+ / %strong= number_to_human @instance_presenter.active_user_count, strip_insignificant_zeros: true
+ / %span
+ / = t 'about.active_count_after'
+ / %abbr{ title: t('about.active_footnote') } *
diff --git a/config/locales/doorkeeper.zh-CN.yml b/config/locales/doorkeeper.zh-CN.yml
index 015d2c0ce..6fabaaa33 100644
--- a/config/locales/doorkeeper.zh-CN.yml
+++ b/config/locales/doorkeeper.zh-CN.yml
@@ -125,7 +125,7 @@ zh-CN:
read: 读取你的帐户数据
read:accounts: 查看账户信息
read:blocks: 查看你的屏蔽列表
- read:favourites: 查看你的收藏
+ read:favourites: 查看你的赞藏
read:filters: 查看你的过滤器
read:follows: 查看你的关注
read:lists: 查看你的列表
@@ -137,7 +137,7 @@ zh-CN:
write: 修改你的账户数据
write:accounts: 修改你的个人资料
write:blocks: 屏蔽账户和域名
- write:favourites: 收藏嘟文
+ write:favourites: 赞藏嘟文
write:filters: 创建过滤器
write:follows: 关注其他人
write:lists: 创建列表
diff --git a/config/locales/doorkeeper.zh-TW.yml b/config/locales/doorkeeper.zh-TW.yml
index 0b2624aa9..5157ecda0 100644
--- a/config/locales/doorkeeper.zh-TW.yml
+++ b/config/locales/doorkeeper.zh-TW.yml
@@ -125,7 +125,7 @@ zh-TW:
read: 讀取您所有的帳號資料
read:accounts: 檢視帳戶資訊
read:blocks: 檢視您的封鎖名單
- read:favourites: 檢視您的收藏項目
+ read:favourites: 檢視您的赞藏項目
read:filters: 檢視您的過濾條件
read:follows: 檢視您關注的人
read:lists: 檢視您的名單
@@ -137,7 +137,7 @@ zh-TW:
write: 修改您帳號的所有資料
write:accounts: 修改您的個人檔案
write:blocks: 封鎖帳戶及站台
- write:favourites: 收藏嘟文
+ write:favourites: 赞藏嘟文
write:filters: 建立過濾條件
write:follows: 關注其他人
write:lists: 建立名單
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml
index 9bff15d1d..8612412f6 100644
--- a/config/locales/simple_form.zh-CN.yml
+++ b/config/locales/simple_form.zh-CN.yml
@@ -125,7 +125,7 @@ zh-CN:
text: 你为什么想要加入?
notification_emails:
digest: 发送摘要邮件
- favourite: 当有用户收藏了我的嘟文时,发送电子邮件提醒我
+ favourite: 当有用户赞藏了我的嘟文时,发送电子邮件提醒我
follow: 当有用户关注我时,发送电子邮件提醒我
follow_request: 当有用户向我发送关注请求时,发送电子邮件提醒我
mention: 当有用户在嘟文中提及我时,发送电子邮件提醒我
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index f883efa4e..f0526e0af 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -735,9 +735,9 @@ zh-CN:
other: "自从上次访问后,有 %{count} 条新通知 \U0001F418"
title: 在你不在的这段时间……
favourite:
- body: 你的嘟文被 %{name} 收藏了:
- subject: "%{name} 收藏了你的嘟文"
- title: 新的收藏
+ body: 你的嘟文被 %{name} 赞藏了:
+ subject: "%{name} 赞藏了你的嘟文"
+ title: 新的赞藏
follow:
body: "%{name} 关注了你!"
subject: "%{name} 关注了你"
@@ -808,8 +808,8 @@ zh-CN:
reason_html: "为什么需要这个步骤? %{instance}
可能不是您所注册的服务器,所以我们需要先重定向到您所在的服务器。"
remote_interaction:
favourite:
- proceed: 确认收藏
- prompt: 您想要收藏此嘟文:
+ proceed: 确认赞藏
+ prompt: 您想要赞藏此嘟文:
reblog:
proceed: 确认转嘟
prompt: 您想要转嘟此条:
@@ -981,7 +981,7 @@ zh-CN:
您的公共内容可能会被网络中的其他服务器下载。 您的公开帖子和关注者帖子会发送到关注者所在的服务器,并且直接邮件会传递到收件人的服务器,只要这些关注者或收件人位于与此不同的服务器上。
-当您授权应用程序使用您的帐户时,根据您批准的权限范围,它可能会访问您的公开个人资料信息,以下列表,您的关注者,您的列表,所有帖子和您的收藏夹。 应用程序永远不能访问您的电子邮件地址或密码。
+当您授权应用程序使用您的帐户时,根据您批准的权限范围,它可能会访问您的公开个人资料信息,以下列表,您的关注者,您的列表,所有帖子和您的赞藏夹。 应用程序永远不能访问您的电子邮件地址或密码。