Merge branch 'dev' into pr_2971

This commit is contained in:
Nick O'Leary
2021-05-18 16:30:13 +01:00
74 changed files with 1036 additions and 368 deletions

View File

@@ -524,8 +524,8 @@
"title": "パレットの管理",
"palette": "パレット",
"times": {
"seconds": "秒前",
"minutes": "分前",
"seconds": "秒前",
"minutes": "分前",
"minutesV": "__count__ 分前",
"hoursV": "__count__ 時間前",
"hoursV_plural": "__count__ 時間前",