From 18e6b733abccd23a15bff5938c2d8d75f8ac3aec Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Mon, 16 Dec 2024 20:40:23 +0000
Subject: [PATCH 1/2] add missing English translations
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

misskey still doesn't have these… I'm putting them here because these
are not Sharkey-specific strings

and yes, this *will* cause conflicts on the next merge
---
 locales/en-US.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 69e6da1a6f..d6b47a9d7a 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1457,6 +1457,8 @@ _serverSettings:
   inquiryUrl: "Inquiry URL"
   inquiryUrlDescription: "Specify a URL for the inquiry form to the server maintainer or a web page for the contact information."
   thisSettingWillAutomaticallyOffWhenModeratorsInactive: "If no moderator activity is detected for a while, this setting will be automatically turned off to prevent spam."
+  openRegistration: "Open account creation"
+  openRegistrationWarning: "Opening up registration is risky, so we recommend turning it on only if you are able to constantly monitor your server and respond immediately if any problems arise."
 _accountMigration:
   moveFrom: "Migrate another account to this one"
   moveFromSub: "Create alias to another account"
@@ -2738,3 +2740,7 @@ _selfXssPrevention:
   description1: "If you paste something here, a malicious user could hijack your account or steal your personal information."
   description2: "If you do not understand exactly what you are trying to paste, %cstop working right now and close this window."
   description3: "For more information, please refer to this. {link}"
+_followRequest:
+  receive: "Received"
+  sent: "Sent"
+acknowledgeNotesAndEnable: "Be sure you have understood the warnings before turning this on"
-- 
GitLab


From d31db31c075b05edb9de34d0e4b515a89389e73c Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Tue, 17 Dec 2024 13:21:22 +0000
Subject: [PATCH 2/2] add translations for notification settings

---
 locales/index.d.ts        | 8 ++++++++
 sharkey-locales/en-US.yml | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 08fa10061b..bcb78e4ee1 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -9637,6 +9637,14 @@ export interface Locale extends ILocale {
              * Edits
              */
             "edited": string;
+            /**
+             * Posting scheduled note failed
+             */
+            "scheduledNoteFailed": string;
+            /**
+             * Scheduled note was posted
+             */
+            "scheduledNotePosted": string;
         };
         "_actions": {
             /**
diff --git a/sharkey-locales/en-US.yml b/sharkey-locales/en-US.yml
index 54fdf444d3..db3ef9c3eb 100644
--- a/sharkey-locales/en-US.yml
+++ b/sharkey-locales/en-US.yml
@@ -284,6 +284,8 @@ _notification:
   _types:
     renote: "Boosts"
     edited: "Edits"
+    scheduledNoteFailed: "Posting scheduled note failed"
+    scheduledNotePosted: "Scheduled note was posted"
   _actions:
     renote: "Boost"
 _webhookSettings:
-- 
GitLab