diff --git a/CHANGELOG.md b/CHANGELOG.md index 69516ef4f..0337dafb2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Next release +## v6.3.31 2024 July 22 + +- updates translations + ## v6.3.30 2024 July 19 - Fix a bug: unable to change training reservation slot to another slot diff --git a/config/locales/app.admin.zh.yml b/config/locales/app.admin.zh.yml index 348bf300f..e01eb3ca3 100644 --- a/config/locales/app.admin.zh.yml +++ b/config/locales/app.admin.zh.yml @@ -360,7 +360,7 @@ zh-CN: select_period: "请选择重复周期" select_nb_period: "请选择重复周期数" select_end_date: "请选择最后一次发生的日期" - about_to_create: "您即将创建以下 {TYPE, select, machines{machine} training{training} space{space} other{other}} {NUMBER, plural, one{slot} other{slots}}:" + about_to_create: "您即将创建以下{TYPE, select, machines{机器} training{培训} space{空间} other{其他}}{NUMBER, plural, =1{时段} other{时段}}:" divided_in_slots: "{COUNT, plural, =1{此时间段} other{这些时间段}} 将以 {DURATION} 分钟的间隔开放供预订。" reservable: "可预订:" labels: "标签:" diff --git a/config/locales/app.public.fr.yml b/config/locales/app.public.fr.yml index 171c911e0..d1c6d00b7 100644 --- a/config/locales/app.public.fr.yml +++ b/config/locales/app.public.fr.yml @@ -244,7 +244,7 @@ fr: all_machines: "Toutes les machines" machine_card: book: "Réserver" - consult: "View" + consult: "Consulter" #details of a machine machines_show: book_this_machine: "Réserver cette machine" diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 3a260cb83..62c8ed174 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -2,10 +2,13 @@ zh-CN: #subscription plan duration duration: year: + one: '一年' other: '%{count}年' month: + one: '一个月' other: '%{count}个月' week: + one: '一周' other: '%{count}周' activerecord: attributes: @@ -103,8 +106,10 @@ zh-CN: from_payment_schedule: "第%{NUMBER}次,共%{TOTAL}次,从%{DATE}开始。还款计划%{SCHEDULE}" null_invoice: "零金额发票,由于Fab Manager软件故障导致的账单跳转" full_price_ticket: + one: "一张全价票" other: "%{count}张全价票" other_rate_ticket: + one: "一张%{NAME}票" other: "%{count}张%{NAME}票" coupon_CODE_discount_of_DISCOUNT: "优惠券{CODE}:折扣{DISCOUNT}{TYPE, select, percent_off{%} other{}}" #messageFormat interpolation total_including_all_taxes: "总额(含所有税)" diff --git a/package.json b/package.json index c15bf52d8..f72fdea01 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fab-manager", - "version": "6.3.30", + "version": "6.3.31", "description": "Fab-manager is the FabLab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks and your marker's projects.", "keywords": [ "fablab",