diff --git a/app/assets/javascripts/discourse/controllers/topic_controller.js b/app/assets/javascripts/discourse/controllers/topic_controller.js index 30e244c1ed1..12dc33c33db 100644 --- a/app/assets/javascripts/discourse/controllers/topic_controller.js +++ b/app/assets/javascripts/discourse/controllers/topic_controller.js @@ -211,7 +211,7 @@ Discourse.TopicController = Discourse.ObjectController.extend({ var _this = this; this.unsubscribe(); this.get('content')["delete"](function() { - _this.set('message', "The topic has been deleted"); + _this.set('message', Em.String.i18n('topic.deleted')); _this.set('loaded', false); }); }, diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index aef417a34b0..698cb9621c1 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -416,6 +416,7 @@ en: read_position_reset: "Your read position has been reset." jump_reply_up: jump to earlier reply jump_reply_down: jump to later reply + deleted: "The topic has been deleted" progress: title: topic progress diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml index e6c354f71dc..56cf997c368 100644 --- a/config/locales/client.zh_CN.yml +++ b/config/locales/client.zh_CN.yml @@ -274,10 +274,12 @@ zh_CN: saving_draft_tip: "保存中" saved_draft_tip: "已保存" saved_local_draft_tip: "已本地保存" + similar_topics: "你的主题与此有些类似..." + drafts_offline: "离线草稿" min_length: - at_least: "请输入至少 {{n}} 个字符" - more: "尚需 {{n}} 个字符……" + need_more_for_title: "请给标题再输入至少 {{n}} 个字符" + need_more_for_reply: "请给正文内容再输入至少 {{n}} 个字符" save_edit: "保存编辑" reply_original: "回复原始帖" @@ -362,7 +364,9 @@ zh_CN: favorite: title: '收藏' - help: '将此主题加入你的收藏列表' + help: + star: '将此主题加入你的收藏列表' + unstar: '将此主题从你的收藏列表中移除' topics: none: @@ -418,6 +422,7 @@ zh_CN: read_position_reset: "你的阅读位置已经被重置。" jump_reply_up: 跳转至更早的回复 jump_reply_down: 跳转至更晚的回复 + deleted: "此主题已被删除" progress: title: 主题进度 @@ -541,6 +546,7 @@ zh_CN: create: "抱歉，在创建你的帖子时发生了错误。请重试。" edit: "抱歉，在编辑你的帖子时发生了错误。请重试。" upload: "抱歉，在上传文件时发生了错误。请重试。" + upload_too_large: "抱歉，你上传的文件太大了（最大不能超过 {{max_size_kb}}kb），请调整文件大小后重新上传。" abandon: "你确定要丢弃你的帖子吗？" @@ -590,11 +596,14 @@ zh_CN: view: '浏览分类下的主题' delete: '删除分类' create: '创建分类' + creation_error: 创建此分类时发生了错误。 more_posts: "浏览全部 {{posts}} ……" name: "分类名称" description: "描述" topic: "分类主题" - color: "颜色" + badge_colors: "徽章颜色" + background_color: "背景色" + foreground_color: "前景色" name_placeholder: "应该简明扼要。" color_placeholder: "任何网络色彩" delete_confirm: "你确定要删除此分类吗？" @@ -691,8 +700,11 @@ zh_CN: critical_available: "有一个关键更新可用。" updates_available: "目前有可用更新。" please_upgrade: "请升级！" + installed_version: "已安装" latest_version: "最新版本" update_often: '请经常升级！' + total_users: "用户总数" + moderator_short: "版主" reports: today: "今天" @@ -703,6 +715,10 @@ zh_CN: 7_days_ago: "7 天之前" 30_days_ago: "30 天之前" + commits: + latest_changes: "最后的改动" + by: "来自" + flags: title: "投诉" old: "过去的" @@ -712,6 +728,7 @@ zh_CN: delete: "删除帖子" delete_title: "删除帖子（如果它是主题第一帖，那么将删除主题）" flagged_by: "投诉者为" + error: "出错了" customize: title: "定制" @@ -722,6 +739,8 @@ zh_CN: preview: "预览" undo_preview: "撤销预览" save: "保存" + new: "新建" + new_style: "新样式" delete: "删除" delete_confirm: "删除本定制内容？" diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml index f8fb8ceadd0..65ed1abfadf 100644 --- a/config/locales/client.zh_TW.yml +++ b/config/locales/client.zh_TW.yml @@ -274,10 +274,12 @@ zh_TW: saving_draft_tip: "保存中" saved_draft_tip: "已保存" saved_local_draft_tip: "已本地保存" + similar_topics: "你的主題與此有些類似..." + drafts_offline: "離線草稿" min_length: - at_least: "請輸入至少 {{n}} 個字符" - more: "尚需 {{n}} 個字符……" + need_more_for_title: "請給標題再輸入至少 {{n}} 個字符" + need_more_for_reply: "請給正文內容再輸入至少 {{n}} 個字符" save_edit: "保存編輯" reply_original: "回複原始帖" @@ -362,7 +364,9 @@ zh_TW: favorite: title: '收藏' - help: '將此主題加入你的收藏列表' + help: + star: '將此主題加入你的收藏列表' + unstar: '將此主題從你的收藏列表中移除' topics: none: @@ -418,6 +422,7 @@ zh_TW: read_position_reset: "你的閱讀位置已經被重置。" jump_reply_up: 跳轉至更早的回複 jump_reply_down: 跳轉至更晚的回複 + deleted: "此主題已被刪除" progress: title: 主題進度 @@ -541,6 +546,7 @@ zh_TW: create: "抱歉，在創建你的帖子時發生了錯誤。請重試。" edit: "抱歉，在編輯你的帖子時發生了錯誤。請重試。" upload: "抱歉，在上傳文件時發生了錯誤。請重試。" + upload_too_large: "抱歉，你上傳的文件太大了（最大不能超過 {{max_size_kb}}kb），請調整文件大小後重新上傳。" abandon: "你確定要丟棄你的帖子嗎？" @@ -590,11 +596,14 @@ zh_TW: view: '浏覽分類下的主題' delete: '刪除分類' create: '創建分類' + creation_error: 創建此分類時發生了錯誤。 more_posts: "浏覽全部 {{posts}} ……" name: "分類名稱" description: "描述" topic: "分類主題" - color: "顔色" + badge_colors: "徽章顔色" + background_color: "背景色" + foreground_color: "前景色" name_placeholder: "應該簡明扼要。" color_placeholder: "任何網絡色彩" delete_confirm: "你確定要刪除此分類嗎？" @@ -691,8 +700,11 @@ zh_TW: critical_available: "有一個關鍵更新可用。" updates_available: "目前有可用更新。" please_upgrade: "請升級！" + installed_version: "已安裝" latest_version: "最新版本" update_often: '請經常升級！' + total_users: "用戶總數" + moderator_short: "版主" reports: today: "今天" @@ -703,6 +715,10 @@ zh_TW: 7_days_ago: "7 天之前" 30_days_ago: "30 天之前" + commits: + latest_changes: "最後的改動" + by: "來自" + flags: title: "投訴" old: "過去的" @@ -712,6 +728,7 @@ zh_TW: delete: "刪除帖子" delete_title: "刪除帖子（如果它是主題第一帖，那麽將刪除主題）" flagged_by: "投訴者爲" + error: "出錯了" customize: title: "定制" @@ -722,6 +739,8 @@ zh_TW: preview: "預覽" undo_preview: "撤銷預覽" save: "保存" + new: "新建" + new_style: "新樣式" delete: "刪除" delete_confirm: "刪除本定制內容？" diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml index 14935b17f7b..5fcd8598a7a 100644 --- a/config/locales/server.zh_CN.yml +++ b/config/locales/server.zh_CN.yml @@ -63,18 +63,12 @@ zh_CN: name: "分类名称" post: raw: "内容" - user: - email: "电子邮箱" errors: models: topic: attributes: archetype: cant_send_pm: "抱歉，你不能向该用户发送私信。" - user: - attributes: - email: - taken: "已经被使用" user_profile: no_info_me: "
你的介绍信息中，“关于我”部分目前还是空白，介绍一下你自己，好不好？
" @@ -86,18 +80,16 @@ zh_CN: post_template: "%{replace_paragraph}\n\n使用下面的空间输入分类的详细描述信息，可包括在此分类下讨论的规则、内容导向等等。" trust_levels: - new: - title: "新用户" + visitor: + title: "访客" basic: title: "初级用户" regular: title: "常规用户" - experienced: - title: "中级用户" - advanced: - title: "高级用户" - moderator: - title: "论坛版主" + leader: + title: "领先用户" + elder: + title: "资深用户" rate_limiter: too_many_requests: "你的请求过于频繁，请等待 %{time_left} 之后再试。" @@ -270,6 +262,10 @@ zh_CN: title: "新发表帖子" xaxis: "天" yaxis: "新帖子数" + likes: + title: "新的赞" + xaxis: "天" + yaxis: "新的赞数" total_users: title: "用户总数" xaxis: "天" @@ -278,6 +274,14 @@ zh_CN: title: "投诉" xaxis: "天" yaxis: "投诉数" + users_by_trust_level: + title: "按用户等级的用户统计" + xaxis: "用户等级" + yaxis: "用户数" + emails: + title: "已发送邮件" + xaxis: "天" + yaxis: "邮件数" site_settings: default_locale: "此 论道 - Discourse 实例的缺省语言 (ISO 639-1 代码)" @@ -428,6 +432,7 @@ zh_CN: category_colors: "设置分类颜色的用'|'分隔的十六进色彩值列表" max_upload_size_kb: "允许用户上传的最大文件大小(以kb为单位) - 确保在nginx(client_max_body_size), apache或代理服务中进行限制文件大小的配置." + max_similar_results: "当用户撰写新主题时，显示多少类似主题给用户" notification_types: mentioned: "%{display_username} 在 %{link} 提及到了你" diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml index 9cbedc2d703..5e3b1c3d6e7 100644 --- a/config/locales/server.zh_TW.yml +++ b/config/locales/server.zh_TW.yml @@ -63,18 +63,12 @@ zh_TW: name: "分類名稱" post: raw: "內容" - user: - email: "電子郵箱" errors: models: topic: attributes: archetype: cant_send_pm: "抱歉，你不能向該用戶發送私信。" - user: - attributes: - email: - taken: "已經被使用" user_profile: no_info_me: "
你的介紹信息中，“關于我”部分目前還是空白，介紹一下你自己，好不好？
" @@ -86,18 +80,16 @@ zh_TW: post_template: "%{replace_paragraph}\n\n使用下面的空間輸入分類的詳細描述信息，可包括在此分類下討論的規則、內容導向等等。" trust_levels: - new: - title: "新用戶" + visitor: + title: "訪客" basic: title: "初級用戶" regular: title: "常規用戶" - experienced: - title: "中級用戶" - advanced: - title: "高級用戶" - moderator: - title: "論壇版主" + leader: + title: "領先用戶" + elder: + title: "資深用戶" rate_limiter: too_many_requests: "你的請求過于頻繁，請等待 %{time_left} 之後再試。" @@ -270,6 +262,10 @@ zh_TW: title: "新發表帖子" xaxis: "天" yaxis: "新帖子數" + likes: + title: "新的贊" + xaxis: "天" + yaxis: "新的贊數" total_users: title: "用戶總數" xaxis: "天" @@ -278,6 +274,14 @@ zh_TW: title: "投訴" xaxis: "天" yaxis: "投訴數" + users_by_trust_level: + title: "按用戶等級的用戶統計" + xaxis: "用戶等級" + yaxis: "用戶數" + emails: + title: "已發送郵件" + xaxis: "天" + yaxis: "郵件數" site_settings: default_locale: "此 論道 - Discourse 實例的缺省語言 (ISO 639-1 代碼)" @@ -426,8 +430,9 @@ zh_TW: min_title_similar_length: "開始檢查相似主題的帖子標題的最小長度" min_body_similar_length: "開始檢查相似主題的帖子內容的最小長度" - category_colors: "設置分類顏色的用'|'分隔的十六進色彩值列表" - max_upload_size_kb: "允許用戶上傳的最大文件大小(以kb為單位) - 確保在nginx(client_max_body_size), apache或代理服務中進行限制文件大小的配置." + category_colors: "設置分類顔色的用'|'分隔的十六進色彩值列表" + max_upload_size_kb: "允許用戶上傳的最大文件大小(以kb爲單位) - 確保在nginx(client_max_body_size), apache或代理服務中進行限制文件大小的配置." + max_similar_results: "當用戶撰寫新主題時，顯示多少類似主題給用戶" notification_types: mentioned: "%{display_username} 在 %{link} 提及到了你"