Merge branch 'master' into routes_web_block

ansible/VERSION

@@ -1 +1 @@
-v0.6.50
+v0.6.51

docker/prod/docker-compose.yml

@@ -12,7 +12,7 @@ services:
     restart: always
 
   lemmy:
-    image: dessalines/lemmy:v0.6.50
+    image: dessalines/lemmy:v0.6.51
     ports:
       - "127.0.0.1:8536:8536"
     restart: always

server/src/version.rs

@@ -1 +1 @@
-pub const VERSION: &str = "v0.6.50";
+pub const VERSION: &str = "v0.6.51";

ui/src/version.ts

@@ -1 +1 @@
-export const version: string = 'v0.6.50';
+export const version: string = 'v0.6.51';

ui/translations/ja.json

@@ -24,7 +24,7 @@
     "number_of_communities": "{{count}} 個のコミュニティ",
     "community_reqs": "英小文字、アンダースコア、空白なし。",
     "create_private_message": "プライベートメッセージの作成",
-    "send_secure_message": "メッセージを安全に送信",
+    "send_secure_message": "セキュアメッセージを送信",
     "send_message": "メッセージを送信",
     "message": "メッセージ",
     "edit": "編集",
@@ -133,7 +133,7 @@
     "no_email_setup": "サーバーのメール設定が正しくありません。",
     "email": "メールアドレス",
     "matrix_user_id": "Matrix のユーザーアカウント",
-    "private_message_disclaimer": "Lemmy でのプライベートメッセージは安全ではありません。安全なメッセージを送るには <1>Riot.im</1> でアカウントを作成してください。",
+    "private_message_disclaimer": "警告：Lemmy でのプライベートメッセージは安全ではありません。安全なメッセージを送るには <1>Riot.im</1> でアカウントを作成してください。",
     "send_notifications_to_email": "通知をメール送信",
     "optional": "任意",
     "language": "言語",
@@ -201,5 +201,37 @@
     "block_leaving": "このページから離れてもよろしいですか？",
     "number_of_upvotes": "{{count}} 票の賛成",
     "number_of_downvotes": "{{count}} 票の反対",
-    "show_context": "前後を表示"
+    "show_context": "前後を表示",
+    "both": "両方",
+    "expires": "期限切れ",
+    "downvotes_disabled": "反対票を無効化",
+    "chat": "会話",
+    "sponsors_of_lemmy": "Lemmyのスポンサー",
+    "from": "から",
+    "couldnt_create_post": "投稿ができない。",
+    "couldnt_update_comment": "コメントが更新されない。",
+    "couldnt_save_comment": "コメントが保存されない。",
+    "couldnt_get_comments": "コメントが取得されない。",
+    "no_comment_edit_allowed": "コメントの編集権限がありません。",
+    "no_post_edit_allowed": "投稿の編集権限がありません。",
+    "no_community_edit_allowed": "コミュニティの編集許可がありません。",
+    "couldnt_update_community": "コミュニティが更新されない。",
+    "community_already_exists": "コミュニティは既に存在します。",
+    "community_moderator_already_exists": "コミュニティ管理人は既に存在します。",
+    "community_follower_already_exists": "コミュニティフォロワーは既に存在します。",
+    "community_user_already_banned": "コミュニティユーザーは既に禁止されています。",
+    "post_title_too_long": "投稿のタイトルが長すぎます。",
+    "couldnt_update_post": "投稿が更新されない",
+    "couldnt_get_posts": "投稿が取得できない",
+    "couldnt_save_post": "投稿が保存されない。",
+    "no_slurs": "悪口禁止。",
+    "not_an_admin": "管理者ではありません。",
+    "site_already_exists": "サイトは既に存在します。",
+    "couldnt_update_site": "サイトが更新されない。",
+    "user_already_exists": "ユーザーは既に存在します。",
+    "couldnt_update_user": "ユーザーが更新されない。",
+    "system_err_login": "システムエラーが発生しました。一度ログアウトして、再度ログインをお試しください。",
+    "couldnt_create_private_message": "プライベートメッセージが作成されない。",
+    "no_private_message_edit_allowed": "プライベートメッセージの編集許可がありません。",
+    "couldnt_update_private_message": "プライベートメッセージが更新されない。"
 }

ui/translations/zh.json

@@ -1,25 +1,25 @@
 {
     "post": "帖子",
     "remove_post": "移除帖子",
-    "no_posts": "没有帖子.",
+    "no_posts": "没有帖子。",
     "create_a_post": "创建新帖子",
     "create_post": "创建帖子",
-    "number_of_posts": "{{count}} 帖子",
+    "number_of_posts": "{{count}} 个帖子",
     "posts": "帖子",
-    "related_posts": "相关的帖子",
+    "related_posts": "这些帖子可能相关",
     "comments": "评论",
-    "number_of_comments": "{{count}} 评论",
+    "number_of_comments": "{{count}} 条评论",
     "remove_comment": "移除评论",
-    "communities": "节点",
-    "create_a_community": "创建新节点",
-    "create_community": "创建节点",
-    "remove_community": "移除节点",
-    "subscribed_to_communities": "订阅新 <1>节点</1>",
-    "trending_communities": "<1>节点</1>趋势",
-    "list_of_communities": "节点列表",
-    "community_reqs": "包含小写与下划线且没有空格的字符串.",
+    "communities": "社群",
+    "create_a_community": "创建新社群",
+    "create_community": "创建社群",
+    "remove_community": "移除社群",
+    "subscribed_to_communities": "订阅新 <1>社群</1>",
+    "trending_communities": "热门<1>社群</1>",
+    "list_of_communities": "社群列表",
+    "community_reqs": "小写字母、下划线（_）且不含空格。",
     "edit": "编辑",
-    "reply": "回应",
+    "reply": "回复",
     "cancel": "取消",
     "unlock": "解锁",
     "lock": "加锁",
@@ -52,9 +52,9 @@
     "create": "创建",
     "username": "用户名",
     "email_or_username": "邮箱或用户名",
-    "number_of_users": "{{count}} 用户",
-    "number_of_subscribers": "{{count}} 订阅",
-    "number_of_points": "{{count}} 分",
+    "number_of_users": "{{count}} 名用户",
+    "number_of_subscribers": "{{count}} 名订阅者",
+    "number_of_points": "{{count}} 点数",
     "name": "名字",
     "title": "标题",
     "category": "分类",
@@ -90,7 +90,7 @@
     "login_sign_up": "登录/注册",
     "login": "登录",
     "sign_up": "注册",
-    "notifications_error": "你的浏览器不支持桌面通知，尝试 Firefox 或 Chrome",
+    "notifications_error": "你的浏览器不支持桌面通知，尝试 Firefox 或 Chrome。",
     "unread_messages": "未读消息",
     "password": "密码",
     "verify_password": "确认密码",
@@ -106,16 +106,16 @@
     "chat": "聊天",
     "no_results": "没有结果.",
     "setup": "设置",
-    "lemmy_instance_setup": "Lemmy Instance Setup",
+    "lemmy_instance_setup": "创设 Lemmy 实例",
     "setup_admin": "设置管理员",
     "your_site": "你的站点",
     "modified": "修改",
     "sponsors": "赞助者",
     "sponsors_of_lemmy": "Lemmy 的赞助者",
-    "sponsor_message": "Lemmy 是自由的<1>开源</1> 软件,  也就是说，决不会有广告、盈利行为和风险投资介入。您的捐款将被直接用于支持项目的开发。感谢以下诸位：",
+    "sponsor_message": "Lemmy 是自由的<1>开源</1>软件，这意味着它决不会有广告、盈利行为和风险投资介入。您的捐款将被直接用于支持项目的开发。感谢以下诸位：",
     "support_on_patreon": "在 Patreon 支持",
     "support_on_liberapay": "在 Liberapay支持",
-    "general_sponsors": "General Sponsors are those that pledged $10 to $39 to Lemmy.",
+    "general_sponsors": "向Lemmy捐助10至39美元者为普通赞助人。",
     "crypto": "加密货币",
     "bitcoin": "比特币",
     "ethereum": "以太币",
@@ -124,40 +124,40 @@
     "powered_by": "保留所有权利",
     "landing_0": "Lemmy is a <1>link aggregator</1> / reddit alternative, intended to work in the <2>fediverse</2>.<3></3>It's self-hostable, has live-updating comment threads, and is tiny (<4>~80kB</4>). Federation into the ActivityPub network is on the roadmap. <5></5>This is a <6>very early beta version</6>, and a lot of features are currently broken or missing. <7></7>Suggest new features or report bugs <8>here.</8><9></9>Made with <10>Rust</10>, <11>Actix</11>, <12>Inferno</12>, <13>Typescript</13>.",
     "not_logged_in": "未登录.",
-    "community_ban": "你被此节点禁止.",
-    "site_ban": "你被此站点禁止",
+    "community_ban": "你已被此社群拉黑。",
+    "site_ban": "你已被本站拉黑",
     "couldnt_create_comment": "不能创建评论.",
-    "couldnt_like_comment": "不能收藏评论.",
+    "couldnt_like_comment": "无法点赞评论。",
     "couldnt_update_comment": "不能更新评论.",
     "couldnt_save_comment": "不能保存评论.",
-    "no_comment_edit_allowed": "不允许编辑评论.",
-    "no_post_edit_allowed": "不运行编辑帖子.",
-    "no_community_edit_allowed": "不允许编辑节点.",
-    "couldnt_find_community": "不能找到节点.",
-    "couldnt_update_community": "不能更新节点.",
-    "community_already_exists": "节点已存在.",
-    "community_moderator_already_exists": "节点监管人已存在.",
-    "community_follower_already_exists": "节点追随者已存在.",
-    "community_user_already_banned": "节点用户已禁止.",
-    "couldnt_create_post": "不能创建帖子.",
-    "couldnt_like_post": "不能收藏帖子.",
-    "couldnt_find_post": "不能搜寻帖子.",
-    "couldnt_get_posts": "不能获取帖子",
-    "couldnt_update_post": "不能更新帖子",
-    "couldnt_save_post": "不能保持帖子.",
-    "no_slurs": "和谐.",
-    "not_an_admin": "不是管理员.",
-    "site_already_exists": "站点已存在.",
-    "couldnt_update_site": "不能更新站点.",
-    "couldnt_find_that_username_or_email": "用户名/邮箱不存在.",
-    "password_incorrect": "密码不正确.",
-    "passwords_dont_match": "密码不匹配.",
-    "admin_already_created": "抱歉，管理员已存在.",
-    "user_already_exists": "用户已存在.",
-    "couldnt_update_user": "不可以更新用户.",
-    "system_err_login": "系统错误. 尝试注销再登录",
-    "nsfw": "工作场所不宜",
-    "show_nsfw": "显示工作场所不宜内容",
+    "no_comment_edit_allowed": "没有编辑评论的权限。",
+    "no_post_edit_allowed": "没有编辑帖子的权限。",
+    "no_community_edit_allowed": "没有编辑节点的权限。",
+    "couldnt_find_community": "无法找到节点。",
+    "couldnt_update_community": "无法更新节点。",
+    "community_already_exists": "节点已存在。",
+    "community_moderator_already_exists": "节点监管人已存在。",
+    "community_follower_already_exists": "节点追随者已存在。",
+    "community_user_already_banned": "节点用户已禁止。",
+    "couldnt_create_post": "无法创建帖子。",
+    "couldnt_like_post": "无法点赞帖子。",
+    "couldnt_find_post": "无法找到帖子。",
+    "couldnt_get_posts": "无法获取帖子",
+    "couldnt_update_post": "无法更新帖子",
+    "couldnt_save_post": "无法保存帖子。",
+    "no_slurs": "文明语言。",
+    "not_an_admin": "不是管理员。",
+    "site_already_exists": "站点已存在。",
+    "couldnt_update_site": "无法更新站点。",
+    "couldnt_find_that_username_or_email": "用户名/邮箱不存在。",
+    "password_incorrect": "密码不正确。",
+    "passwords_dont_match": "密码不匹配。",
+    "admin_already_created": "抱歉，管理员已存在。",
+    "user_already_exists": "用户已存在。",
+    "couldnt_update_user": "无法更新用户。",
+    "system_err_login": "系统错误。请尝试注销后重新登入。",
+    "nsfw": "少儿不宜",
+    "show_nsfw": "显示少儿不宜内容",
     "theme": "主题",
     "from": "来自",
     "donate_to_lemmy": "向Lemmy捐赠",
@@ -167,5 +167,73 @@
     "are_you_sure": "你确定吗？",
     "yes": "是",
     "no": "否",
-    "logged_in": "已登陆"
+    "logged_in": "已登录。",
+    "message": "信息",
+    "create_private_message": "创建私信",
+    "send_secure_message": "发送安全信息",
+    "send_message": "发送信息",
+    "more": "更多",
+    "preview": "预览",
+    "upload_image": "上传图片",
+    "enable_nsfw": "允许少儿不宜内容",
+    "show_avatars": "显示头像",
+    "avatar": "头像",
+    "formatting_help": "格式帮助",
+    "sorting_help": "排序帮助",
+    "view_source": "显示来源",
+    "sticky": "固定",
+    "unsticky": "取消固定",
+    "archive_link": "链接归档",
+    "settings": "设定",
+    "stickied": "已固定",
+    "delete_account": "删除账号",
+    "delete_account_confirm": "警告：此操作将永久删除你的数据。输入密码进行确认。",
+    "cross_posts": "此链接也已被发布到：",
+    "cross_post": "复数发布",
+    "cross_posted_to": "已被复数发布到： ",
+    "users": "用户",
+    "banned": "已被禁止",
+    "creator": "发布者",
+    "number_of_communities": "{{count}} 个社群",
+    "old": "最旧",
+    "docs": "文档",
+    "upload_avatar": "上传头像",
+    "replies": "回复",
+    "number_online": "{{count}}名在线用户",
+    "mentions": "提到",
+    "message_sent": "已发送信息",
+    "old_password": "当前密码",
+    "forgot_password": "忘记密码",
+    "reset_password_mail_sent": "发送邮件重置密码。",
+    "password_change": "修改密码",
+    "new_password": "新密码",
+    "messages": "信息",
+    "no_email_setup": "此服务器还未正确设定邮箱。",
+    "matrix_user_id": "Matrix用户",
+    "private_message_disclaimer": "警告：Lemmy的私信功能并不安全。想要进行安全的信息传递，请在 <1>Riot.im</1>上创建账号。",
+    "send_notifications_to_email": "向邮箱发送通知",
+    "language": "语言",
+    "browser_default": "默认浏览器",
+    "downvotes_disabled": "点踩功能已禁用",
+    "enable_downvotes": "启用点踩功能",
+    "upvote": "点赞",
+    "number_of_upvotes": "{{count}} 个赞",
+    "downvote": "点踩",
+    "number_of_downvotes": "{{count}} 个踩",
+    "open_registration": "开放注册",
+    "registration_closed": "注册功能已关闭",
+    "recent_comments": "最新评论",
+    "by": "来自",
+    "transfer_community": "节点转让",
+    "transfer_site": "站点转让",
+    "post_title_too_long": "帖子标题过长。",
+    "couldnt_get_comments": "无法获取评论。",
+    "email_already_exists": "该邮箱已被占用。",
+    "couldnt_create_private_message": "无法创建私信。",
+    "no_private_message_edit_allowed": "没有编辑私信的权限。",
+    "couldnt_update_private_message": "无法更新私信。",
+    "time": "时间",
+    "action": "行动",
+    "block_leaving": "确定要离开吗？",
+    "show_context": "显示上下文"
 }