Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into froth
Some checks reported errors
continuous-integration/drone/push Build was killed

This commit is contained in:
Sam Therapy 2023-01-24 16:50:39 +01:00
commit c263dff6c1
Signed by: sam
GPG key ID: 4D8B07C18F31ACBD
5 changed files with 4074 additions and 5392 deletions

Binary file not shown.

View file

@ -73,10 +73,10 @@
"eslint": "8.32.0",
"eslint-config-standard": "17.0.0",
"eslint-formatter-friendly": "7.0.0",
"eslint-plugin-import": "2.26.0",
"eslint-plugin-import": "2.27.5",
"eslint-plugin-n": "15.6.1",
"eslint-plugin-promise": "6.1.1",
"eslint-plugin-vue": "9.8.0",
"eslint-plugin-vue": "9.9.0",
"eslint-webpack-plugin": "3.2.0",
"eventsource-polyfill": "0.9.6",
"express": "4.18.2",

View file

@ -603,7 +603,7 @@
"use_websockets": "Uzi teĥnikaron «websockets» (tuja ĝisdatigo)",
"mention_link_display_full_for_remote": "plene nur je uzantoj foraj (ekz. {'@'}zozo{'@'}ekzemplo.org)",
"expert_mode": "Montri altnivelajn",
"setting_server_side": "Ĉi tiu agordo estas ligita al via profilo, kaj efektiviĝon en ĉiuj viaj salutoj kaj klientoj",
"setting_server_side": "Ĉi tiu agordo estas ligita al via profilo, kaj efektiviĝos en ĉiuj viaj salutoj kaj klientoj",
"post_look_feel": "Aspekto de afiŝoj",
"mention_links": "Menciaj ligiloj",
"email_language": "Lingvo de leteroj ricevotaj de la servilo",

View file

@ -53,7 +53,13 @@
"direct": "私讯",
"private": "仅关注者",
"unlisted": "列外"
}
},
"scroll_to_top": "滚动至顶",
"generic_error_message": "发生一个错误:{0}",
"never_show_again": "不再显示",
"undo": "撤销",
"yes": "是",
"no": "否"
},
"image_cropper": {
"crop_picture": "裁剪图片",
@ -109,7 +115,12 @@
"chats": "聊天",
"timelines": "时间线",
"bookmarks": "书签",
"home_timeline": "主页时间线"
"home_timeline": "主页时间线",
"lists": "列表",
"edit_finish": "完成编辑",
"mobile_notifications": "打开通知(有未读的)",
"mobile_notifications_close": "关闭通知",
"announcements": "公告"
},
"notifications": {
"broken_favorite": "未知的状态,正在搜索中…",
@ -890,7 +901,18 @@
"search_emoji": "搜索表情符号",
"emoji": "表情符号",
"load_all": "加载所有表情符号(共 {emojiAmount} 个)",
"load_all_hint": "最先加载的 {saneAmount} 表情符号,加载全部表情符号可能会带来性能问题。"
"load_all_hint": "最先加载的 {saneAmount} 表情符号,加载全部表情符号可能会带来性能问题。",
"unicode_groups": {
"flags": "旗帜",
"food-and-drink": "饮食",
"objects": "物件",
"people-and-body": "人和身体",
"symbols": "符号",
"travel-and-places": "旅行和地点",
"activities": "活动",
"animals-and-nature": "动物和自然"
},
"regional_indicator": "地区指示符 {letter}"
},
"about": {
"mrf": {
@ -958,5 +980,26 @@
"delete": "删除",
"message_user": "发消息给 {nickname}",
"you": "你:"
},
"announcements": {
"page_header": "公告",
"title": "公告",
"mark_as_read_action": "标为已读",
"post_form_header": "发布公告",
"post_placeholder": "在这里输入公告内容...",
"post_action": "发布",
"post_error": "错误:{error}",
"close_error": "关闭",
"delete_action": "删除",
"start_time_prompt": "起始时间: ",
"end_time_prompt": "终止时间: ",
"all_day_prompt": "这是全天的事件",
"published_time_display": "发表于 {time}",
"start_time_display": "开始于 {time}",
"end_time_display": "结束于 {time}",
"edit_action": "编辑",
"submit_edit_action": "提交",
"cancel_edit_action": "取消",
"inactive_message": "这个公告不活跃"
}
}

9411
yarn.lock

File diff suppressed because it is too large Load diff