Merge branch 'develop' into feature/2024.9.0
# Conflicts: # packages/frontend/src/pages/instance-info.vue
This commit is contained in:
commit
148bf98f21
6 changed files with 28 additions and 23 deletions
|
|
@ -258,6 +258,7 @@ defaultValueIs: "Default: {value}"
|
|||
noCustomEmojis: "There are no emoji"
|
||||
noJobs: "There are no jobs"
|
||||
federating: "Federating"
|
||||
blockingYou: "Blocking you"
|
||||
blocked: "Blocked"
|
||||
suspended: "Suspended"
|
||||
all: "All"
|
||||
|
|
@ -1294,7 +1295,7 @@ _delivery:
|
|||
none: "Publishing"
|
||||
manuallySuspended: "Manually suspended"
|
||||
goneSuspended: "Server is suspended due to server deletion"
|
||||
autoSuspendedForNotResponding: "Server is suspended due to no responding"
|
||||
autoSuspendedForNotResponding: "Server is suspended due to not responding"
|
||||
_bubbleGame:
|
||||
howToPlay: "How to play"
|
||||
hold: "Hold"
|
||||
|
|
|
|||
4
locales/index.d.ts
vendored
4
locales/index.d.ts
vendored
|
|
@ -1050,6 +1050,10 @@ export interface Locale extends ILocale {
|
|||
* 連合中
|
||||
*/
|
||||
"federating": string;
|
||||
/**
|
||||
* Blocking you
|
||||
*/
|
||||
"blockingYou": string;
|
||||
/**
|
||||
* ブロック中
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -258,6 +258,7 @@ defaultValueIs: "デフォルト: {value}"
|
|||
noCustomEmojis: "絵文字はありません"
|
||||
noJobs: "ジョブはありません"
|
||||
federating: "連合中"
|
||||
blockingYou: "Blocking you"
|
||||
blocked: "ブロック中"
|
||||
suspended: "配信停止"
|
||||
all: "全て"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue