1
0

merge: upstream changes for 2024.11 (!742)

View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/742

Closes #645 and #646

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
This commit is contained in:
dakkar
2024-12-15 17:27:12 +00:00
616 changed files with 16825 additions and 7991 deletions
+134 -4
View File
@@ -1546,10 +1546,6 @@ export interface Locale extends ILocale {
*
*/
"registration": string;
/**
*
*/
"enableRegistration": string;
/**
*
*/
@@ -2366,6 +2362,10 @@ export interface Locale extends ILocale {
*
*/
"details": string;
/**
*
*/
"renoteDetails": string;
/**
*
*/
@@ -3807,6 +3807,18 @@ export interface Locale extends ILocale {
* 1
*/
"oneMonth": string;
/**
* 3
*/
"threeMonths": string;
/**
* 1
*/
"oneYear": string;
/**
* 3
*/
"threeDays": string;
/**
*
*/
@@ -5191,6 +5203,72 @@ export interface Locale extends ILocale {
* 使
*/
"yourNameContainsProhibitedWordsDescription": string;
/**
* 稿
*/
"thisContentsAreMarkedAsSigninRequiredByAuthor": string;
/**
*
*/
"lockdown": string;
/**
*
*/
"pleaseSelectAccount": string;
/**
*
*/
"availableRoles": string;
/**
*
*/
"acknowledgeNotesAndEnable": string;
"_accountSettings": {
/**
*
*/
"requireSigninToViewContents": string;
/**
*
*/
"requireSigninToViewContentsDescription1": string;
/**
* URLプレビュー(OGP)Webページへの埋め込み
*/
"requireSigninToViewContentsDescription2": string;
/**
*
*/
"requireSigninToViewContentsDescription3": string;
/**
*
*/
"makeNotesFollowersOnlyBefore": string;
/**
*
*/
"makeNotesFollowersOnlyBeforeDescription": string;
/**
*
*/
"makeNotesHiddenBefore": string;
/**
* ()
*/
"makeNotesHiddenBeforeDescription": string;
/**
*
*/
"mayNotEffectForFederatedNotes": string;
/**
*
*/
"notesHavePassedSpecifiedPeriod": string;
/**
*
*/
"notesOlderThanSpecifiedDateAndTime": string;
};
"_abuseUserReport": {
/**
*
@@ -5733,6 +5811,14 @@ export interface Locale extends ILocale {
* Specify the URL of a web page that contains a contact form or the instance operators' contact information.
*/
"inquiryUrlDescription": string;
/**
*
*/
"openRegistration": string;
/**
*
*/
"openRegistrationWarning": string;
/**
*
*/
@@ -8458,14 +8544,26 @@ export interface Locale extends ILocale {
*
*/
"callback": string;
/**
*
*/
"accepted": string;
/**
*
*/
"denied": string;
/**
*
*/
"scopeUser": string;
/**
*
*/
"pleaseLogin": string;
/**
* URLに遷移します
*/
"byClickingYouWillBeRedirectedToThisUrl": string;
/**
* Allowed
*/
@@ -10623,6 +10721,38 @@ export interface Locale extends ILocale {
*/
"codeGeneratedDescription": string;
};
"_selfXssPrevention": {
/**
*
*/
"warning": string;
/**
*
*/
"title": string;
/**
*
*/
"description1": string;
/**
* %c今すぐ作業を中止してこのウィンドウを閉じてください
*/
"description2": string;
/**
* {link}
*/
"description3": ParameterizedString<"link">;
};
"_followRequest": {
/**
*
*/
"recieved": string;
/**
*
*/
"sent": string;
};
/**
* Approvals
*/