Merge branch 'main' into main

Signed-off-by: Shinya Kato <[email protected]>
deckblue · Nov 20, 2023 · 97eb06d · 97eb06d
2 parents a5b40e3 + 3933b54
commit 97eb06d
Show file tree

Hide file tree

Showing 4 changed files with 110 additions and 20 deletions.
diff --git a/strings/strings_be.arb b/strings/strings_be.arb
@@ -274,7 +274,13 @@
   "shortcutsThisWindow": "Акно спалучэнняў клавіш",
   "settingsAutoplayGIFs": "Аўтапрайграванне GIF",
   "searchTenor": "Пошук Tenror",
+  "settingsDisableGIFs": "Адключыць GIF",
   "sponsors": "спонсары",
   "blockingByList": "заблакіраваны па спісе",
-  "postedDateUnitYears": "{number}г"
+  "postedDateUnitYears": "{number}г",
+  "settingsSubscribedLists": "Спісы падпісак",
+  "settingsSubscribedListsSubtitle": "Усе мадаруемыя спісы, на якія вы падпісаны",
+  "unsubscribe": "Скасаваць падпіску",
+  "confirmUnmuteListContent": "Гэты спіс зараз падпісаны вамі; гэта дзеянне заблакіруе/разблакіруе усіх на ім, вы ўпэўнены, што жадаеце гэта зрабіць?",
+  "emptyMutedLists": "Вы не падпісаны ні на якія мадаруемы спіс!"
 }
diff --git a/strings/strings_en.arb b/strings/strings_en.arb
@@ -1134,5 +1134,29 @@
   "emptyMutedLists": "You aren't subscribed to any moderation lists!",
   "@emptyMutedLists": {
     "description": "Add list column dialog empty"
+  },
+  "settingsDisableSpellcheck": "Disable spellcheck",
+  "@settingsDisableSpellcheck": {
+    "description": "Settings toggle to disable spellcheck (buggy right now)"
+  },
+  "settingsDisableCloseComposer": "Disable Esc while typing",
+  "@settingsDisableCloseComposer": {
+    "description": "Settings toggle to disable the Esc shortcut while typing"
+  },
+  "settingsDisableCloseComposerSubtitle": "If you don't want the Esc button to close the window you're typing on",
+  "@settingsDisableCloseComposerSubtitle": {
+    "description": "Settings toggle subtitle to disable the Esc shortcut while typing"
+  },
+  "settingsPanelGeneral": "General",
+  "@settingsPanelGeneral": {
+    "description": "General settings panel, everything that isn't the two below"
+  },
+  "settingsPanelInterface": "UI",
+  "@settingsPanelInterface": {
+    "description": "Interface/UI settings panel, themes, colors, column and font sizes"
+  },
+  "settingsPanelToggles": "Toggles",
+  "@settingsPanelToggles": {
+    "description": "Toggles settings panel, everything that can be turned on/off in one place"
   }
 }
diff --git a/strings/strings_pt.arb b/strings/strings_pt.arb
@@ -282,5 +282,8 @@
   "settingsSubscribedListsSubtitle": "Todas as listas de moderação ativas no momento",
   "unsubscribe": "Desativar",
   "confirmUnmuteListContent": "Esta lista está ativa, esta ação irá desmutar ou desbloquear todos os usuários nela. Tem certeza que quer fazer isso?",
-  "emptyMutedLists": "Você está sem nenhuma lista de moderação ativa!"
+  "emptyMutedLists": "Você está sem nenhuma lista de moderação ativa!",
+  "settingsDisableSpellcheck": "Desabilitar corretor",
+  "settingsDisableCloseComposer": "Desabilitar Esc enquanto digita",
+  "settingsDisableCloseComposerSubtitle": "Se quiser que o Esc pare de fechar qualquer janela onde esteja digitando"
 }
diff --git a/untranslated.json b/untranslated.json
@@ -1,6 +1,5 @@
 {
-  "fr": [
-  ],
+  "fr": [],
   "fi": [
     "settingsForceAltTextInput",
     "postDialogForceAltTextInputHint",
@@ -39,18 +38,36 @@
     "settingsSubscribedListsSubtitle",
     "unsubscribe",
     "confirmUnmuteListContent",
-    "emptyMutedLists"
+    "emptyMutedLists",
+    "settingsDisableSpellcheck",
+    "settingsDisableCloseComposer",
+    "settingsDisableCloseComposerSubtitle",
+    "settingsPanelGeneral",
+    "settingsPanelInterface",
+    "settingsPanelToggles"
   ],
   "ca": [
     "postedDateUnitYears",
     "settingsSubscribedLists",
     "settingsSubscribedListsSubtitle",
     "unsubscribe",
     "confirmUnmuteListContent",
-    "emptyMutedLists"
+    "emptyMutedLists",
+    "settingsDisableSpellcheck",
+    "settingsDisableCloseComposer",
+    "settingsDisableCloseComposerSubtitle",
+    "settingsPanelGeneral",
+    "settingsPanelInterface",
+    "settingsPanelToggles"
   ],
   "ja": [
-    "followsAccount"
+    "followsAccount",
+    "settingsDisableSpellcheck",
+    "settingsDisableCloseComposer",
+    "settingsDisableCloseComposerSubtitle",
+    "settingsPanelGeneral",
+    "settingsPanelInterface",
+    "settingsPanelToggles"
   ],
   "ru": [
     "settingsForceAltTextInput",
@@ -90,24 +107,40 @@
     "settingsSubscribedListsSubtitle",
     "unsubscribe",
     "confirmUnmuteListContent",
-    "emptyMutedLists"
+    "emptyMutedLists",
+    "settingsDisableSpellcheck",
+    "settingsDisableCloseComposer",
+    "settingsDisableCloseComposerSubtitle",
+    "settingsPanelGeneral",
+    "settingsPanelInterface",
+    "settingsPanelToggles"
+  ],
+  "pt": [
+    "settingsPanelGeneral",
+    "settingsPanelInterface",
+    "settingsPanelToggles"
   ],
-  "pt": [],
   "uk": [
     "postedDateUnitYears",
     "settingsSubscribedLists",
     "settingsSubscribedListsSubtitle",
     "unsubscribe",
     "confirmUnmuteListContent",
-    "emptyMutedLists"
+    "emptyMutedLists",
+    "settingsDisableSpellcheck",
+    "settingsDisableCloseComposer",
+    "settingsDisableCloseComposerSubtitle",
+    "settingsPanelGeneral",
+    "settingsPanelInterface",
+    "settingsPanelToggles"
   ],
   "be": [
-    "settingsDisableGIFs",
-    "settingsSubscribedLists",
-    "settingsSubscribedListsSubtitle",
-    "unsubscribe",
-    "confirmUnmuteListContent",
-    "emptyMutedLists"
+    "settingsDisableSpellcheck",
+    "settingsDisableCloseComposer",
+    "settingsDisableCloseComposerSubtitle",
+    "settingsPanelGeneral",
+    "settingsPanelInterface",
+    "settingsPanelToggles"
   ],
   "zh_TW": [
     "followsAccount",
@@ -148,15 +181,27 @@
     "settingsSubscribedListsSubtitle",
     "unsubscribe",
     "confirmUnmuteListContent",
-    "emptyMutedLists"
+    "emptyMutedLists",
+    "settingsDisableSpellcheck",
+    "settingsDisableCloseComposer",
+    "settingsDisableCloseComposerSubtitle",
+    "settingsPanelGeneral",
+    "settingsPanelInterface",
+    "settingsPanelToggles"
   ],
   "es": [
     "postedDateUnitYears",
     "settingsSubscribedLists",
     "settingsSubscribedListsSubtitle",
     "unsubscribe",
     "confirmUnmuteListContent",
-    "emptyMutedLists"
+    "emptyMutedLists",
+    "settingsDisableSpellcheck",
+    "settingsDisableCloseComposer",
+    "settingsDisableCloseComposerSubtitle",
+    "settingsPanelGeneral",
+    "settingsPanelInterface",
+    "settingsPanelToggles"
   ],
   "de": [
     "confirmDeleteColumnTitle",
@@ -201,14 +246,26 @@
     "settingsSubscribedListsSubtitle",
     "unsubscribe",
     "confirmUnmuteListContent",
-    "emptyMutedLists"
+    "emptyMutedLists",
+    "settingsDisableSpellcheck",
+    "settingsDisableCloseComposer",
+    "settingsDisableCloseComposerSubtitle",
+    "settingsPanelGeneral",
+    "settingsPanelInterface",
+    "settingsPanelToggles"
   ],
   "id": [
     "postedDateUnitYears",
     "settingsSubscribedLists",
     "settingsSubscribedListsSubtitle",
     "unsubscribe",
     "confirmUnmuteListContent",
-    "emptyMutedLists"
+    "emptyMutedLists",
+    "settingsDisableSpellcheck",
+    "settingsDisableCloseComposer",
+    "settingsDisableCloseComposerSubtitle",
+    "settingsPanelGeneral",
+    "settingsPanelInterface",
+    "settingsPanelToggles"
   ]
 }