From f67ea7a60959fcb189f4aaacc519bd7b6d6fdba3 Mon Sep 17 00:00:00 2001
From: freeplay <freeplay@duck.com>
Date: Fri, 14 Jul 2023 00:14:57 -0400
Subject: [PATCH 1/9] fix: Follow Request labeling

resolves #10368
---
 locales/en-US.yml                                 | 2 +-
 packages/backend/src/models/repositories/user.ts  | 2 +-
 packages/client/src/components/MkFollowButton.vue | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 415d872305..1cead0fbf1 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -105,7 +105,7 @@ privacy: "Privacy"
 makeFollowManuallyApprove: "Follow requests require approval"
 defaultNoteVisibility: "Default visibility"
 follow: "Follow"
-followRequest: "Follow"
+followRequest: "Follow Request"
 followRequests: "Follow requests"
 unfollow: "Unfollow"
 followRequestPending: "Follow request pending"
diff --git a/packages/backend/src/models/repositories/user.ts b/packages/backend/src/models/repositories/user.ts
index 5ca36e3d31..e4aab896d0 100644
--- a/packages/backend/src/models/repositories/user.ts
+++ b/packages/backend/src/models/repositories/user.ts
@@ -453,6 +453,7 @@ export const UserRepository = db.getRepository(User).extend({
 			isAdmin: user.isAdmin || falsy,
 			isModerator: user.isModerator || falsy,
 			isBot: user.isBot || falsy,
+			isLocked: user.isLocked,
 			isCat: user.isCat || falsy,
 			speakAsCat: user.speakAsCat || falsy,
 			instance: user.host
@@ -497,7 +498,6 @@ export const UserRepository = db.getRepository(User).extend({
 							: null,
 						bannerBlurhash: user.banner?.blurhash || null,
 						bannerColor: null, // 後方互換性のため
-						isLocked: user.isLocked,
 						isSilenced: user.isSilenced || falsy,
 						isSuspended: user.isSuspended || falsy,
 						description: profile!.description,
diff --git a/packages/client/src/components/MkFollowButton.vue b/packages/client/src/components/MkFollowButton.vue
index e8dd63a357..bb0ce0b69c 100644
--- a/packages/client/src/components/MkFollowButton.vue
+++ b/packages/client/src/components/MkFollowButton.vue
@@ -46,7 +46,7 @@
 			</template>
 			<template v-else-if="!isFollowing && user.isLocked">
 				<span>{{ (state = i18n.ts.followRequest) }}</span
-				><i class="ph-plus ph-bold ph-lg"></i>
+				><i class="ph-lock-open ph-bold ph-lg"></i>
 			</template>
 			<template v-else-if="!isFollowing && !user.isLocked">
 				<span>{{ (state = i18n.ts.follow) }}</span

From a7d173882ff15b3c59ae9582556b008b8fb5c61e Mon Sep 17 00:00:00 2001
From: jolupa <jolupameister@gmail.com>
Date: Thu, 13 Jul 2023 14:29:41 +0000
Subject: [PATCH 2/9] chore: Translated using Weblate (Catalan)

Currently translated at 100.0% (1830 of 1830 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/
---
 locales/ca-ES.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml
index f855f6732a..a60f514d40 100644
--- a/locales/ca-ES.yml
+++ b/locales/ca-ES.yml
@@ -2157,3 +2157,6 @@ xl: XL
 donationLink: Enllaç a la pàgina de donacions
 neverShow: No tornis a mostrar
 remindMeLater: Potser després
+removeMember: Elimina el membre
+removeQuote: Elimina la cita
+removeRecipient: Elimina el destinatari

From 0eb943334f5aba39ff240bb5b9cb531b015c81f9 Mon Sep 17 00:00:00 2001
From: Erik Spjelkavik <erik.spjelkavik@gmail.com>
Date: Thu, 13 Jul 2023 10:44:13 +0000
Subject: [PATCH 3/9] =?UTF-8?q?chore:=20Translated=20using=20Weblate=20(No?=
 =?UTF-8?q?rwegian=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 4.3% (79 of 1830 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/nb_NO/
---
 locales/no-NO.yml | 83 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 82 insertions(+), 1 deletion(-)

diff --git a/locales/no-NO.yml b/locales/no-NO.yml
index 83e189b9cf..5f02d5f191 100644
--- a/locales/no-NO.yml
+++ b/locales/no-NO.yml
@@ -1,2 +1,83 @@
----
 _lang_: "Norsk Bokmål"
+search: Søk
+monthAndDay: '{day}/{month}'
+fetchingAsApObject: Henter fra fediverset
+ok: OK
+gotIt: Jeg forstår!
+profile: Profil
+timeline: Tidslinje
+save: Lagre
+addToList: Legg til liste
+searchPlaceholder: Søk Calckey
+username: Brukernavn
+password: Passord
+notifications: Meldinger
+forgotPassword: Glemt passord
+cancel: Avbryt
+noNotes: Ingen poster
+instance: Server
+settings: Innstillinger
+noAccountDescription: Denne brukeren har ikke fylt ut bio'en sin ennå.
+login: Logg inn
+loggingIn: Logger inn
+signup: Oppretter bruker
+uploading: Laster opp..
+enterUsername: Skriv inn brukernavn
+noNotifications: Ingen meldinger
+users: Brukere
+addUser: Legg til en bruker
+favorite: Legg til i bokmerker
+cantFavorite: Kunne ikke legges til i bokmerker.
+pin: Fest til profilen
+copyContent: Kopier innhold
+deleteAndEdit: Slett og rediger
+sendMessage: Send en melding
+copyUsername: Kopier brukernavn
+reply: Svar
+loadMore: Last mer
+showLess: Lukk
+receiveFollowRequest: Følgeforespørsel mottatt
+directNotes: Direktemelding
+importAndExport: Importer/eksporter data
+importRequested: Du har bedt om en importering. Dette vil ta litt tid.
+lists: Lister
+listsDesc: Lister lar deg lage tidslinjer med utvalgte brukere. De kan hentes frem
+  fra tidslinje-siden.
+deleted: Slettet
+editNote: Rediger notat
+followsYou: Følger deg
+createList: Lag liste
+newer: nyere
+older: eldre
+download: Last ned
+unfollowConfirm: Er du sikker på at du ikke lenger vil følge {name}?
+noLists: Du har ingen lister
+following: Følger
+files: Filer
+note: Post
+notes: Poster
+followers: Følgere
+otherSettings: Andre innstillinger
+addInstance: Legg til en server
+alreadyFavorited: Allerede lagt til i bokmerker.
+delete: Slett
+openInWindow: Åpne i vindu
+basicSettings: Grunnleggende innstillinger
+headlineMisskey: En desentralisert sosialt media-plattform, basert på åpen kildekode,
+  som alltid vil være gratis! 🚀
+introMisskey: Velkommen! Calckey er en desentralisert sosialt media-plattform, basert
+  på åpen kildekode, som alltid vil være gratis! 🚀
+exportRequested: Du har bedt om en eksportering. Dette vil ta litt tid. Den vil bli
+  lagt til på disken din når den er ferdig.
+noThankYou: Nei takk
+favorites: Bokmerker
+unfavorite: Fjern fra bokmerker
+favorited: Lagt til i bokmerker.
+copyLink: Kopier lenke
+searchUser: Søk etter en bruker
+jumpToPrevious: Gå til foregående
+showMore: Vis mer
+followRequestAccepted: Følgeforespørsel godtatt
+import: Importer
+export: Eksporter
+logout: Logger ut

From 018063625087cbe1d7290be6f1ef97392628bf72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Al=C3=A9xia?= <alexiacordeiro@tutanota.com>
Date: Thu, 13 Jul 2023 20:10:55 +0000
Subject: [PATCH 4/9] chore: Translated using Weblate (Portuguese (Brazil))

Currently translated at 5.6% (103 of 1830 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/pt_BR/
---
 locales/pt_BR.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/locales/pt_BR.yml b/locales/pt_BR.yml
index 2cc22c86ab..6a7a1d9e34 100644
--- a/locales/pt_BR.yml
+++ b/locales/pt_BR.yml
@@ -85,3 +85,10 @@ noLists: Você não possui nenhuma lista
 following: Seguindo
 followers: Seguidores
 followsYou: Segue você
+fetchingAsApObject: Buscando do Fediverse
+timeline: Linha do tempo
+favorite: Adicionar aos marcadores
+favorites: Marcadores
+unfavorite: Remover dos marcadores
+favorited: Adicionado aos marcadores.
+alreadyFavorited: Já foi adicionado aos marcadores.

From eecffea8b91920a67082e247eda6ed63de7b57c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Al=C3=A9xia=20Cordeiro=20Oliveira?=
 <alexiacordeiro@protonmail.com>
Date: Thu, 13 Jul 2023 20:12:34 +0000
Subject: [PATCH 5/9] chore: Translated using Weblate (Portuguese (Brazil))

Currently translated at 5.6% (103 of 1830 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/pt_BR/
---
 locales/pt_BR.yml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/locales/pt_BR.yml b/locales/pt_BR.yml
index 6a7a1d9e34..f991be9131 100644
--- a/locales/pt_BR.yml
+++ b/locales/pt_BR.yml
@@ -92,3 +92,21 @@ favorites: Marcadores
 unfavorite: Remover dos marcadores
 favorited: Adicionado aos marcadores.
 alreadyFavorited: Já foi adicionado aos marcadores.
+download: Download
+pageLoadError: Ocorreu um erro ao carregar a página.
+pageLoadErrorDescription: Isso normalmente é causado por erros de rede ou pelo cache
+  do navegador. Tente limpar o cache e, depois de esperar um pouquinho, tente novamente.
+serverIsDead: Esse servidos não está respondendo. Por favor espere um pouco e tente
+  novamente.
+youShouldUpgradeClient: Para visualizar essa página, favor reiniciar para atualizar
+  seu cliente.
+enterListName: Insira um nome para a lista
+privacy: Privacidade
+defaultNoteVisibility: Visibilidade padrão
+makeFollowManuallyApprove: Pedidos de seguimento precisam de aprovação
+follow: Seguir
+followRequest: Seguir
+followRequests: Pedidos de seguimento
+unfollow: Parar de seguir
+followRequestPending: Pedido de seguimento pendente
+enterEmoji: Insira um emoji

From 8b4df60ebcf9f8ebb0ce75ee896776f90f65817e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?jos=C3=A9=20m?= <correoxm@disroot.org>
Date: Fri, 14 Jul 2023 03:41:41 +0000
Subject: [PATCH 6/9] chore: Translated using Weblate (Galician)

Currently translated at 0.8% (15 of 1830 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/gl/
---
 locales/gl.yml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/locales/gl.yml b/locales/gl.yml
index 0967ef424b..891a81927f 100644
--- a/locales/gl.yml
+++ b/locales/gl.yml
@@ -1 +1,17 @@
-{}
+_lang_: Inglés
+introMisskey: Benvida! Calckey é unha plataforma de medios sociais de código aberto,
+  descentralizada e gratuíta para sempre!🚀
+monthAndDay: '{day}/{month}'
+notifications: Notificacións
+password: Contrasinal
+forgotPassword: Esquecín o contrasinal
+gotIt: Vale!
+cancel: Cancelar
+noThankYou: Non, grazas
+headlineMisskey: Plataforma de medios sociais de código aberto e descentralizada,
+  gratuíta para sempre!🚀
+search: Buscar
+searchPlaceholder: Buscar en Calckey
+username: Identificador
+fetchingAsApObject: Descargando desde o Fediverso
+ok: OK

From 4fde8ba47071d4600084c60e276aedbb749adf5e Mon Sep 17 00:00:00 2001
From: freeplay <freeplay@duck.com>
Date: Fri, 14 Jul 2023 00:25:01 -0400
Subject: [PATCH 7/9] fix: error in user card if no user desc

---
 packages/client/src/components/MkUserInfo.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkUserInfo.vue b/packages/client/src/components/MkUserInfo.vue
index 55979a2298..76ae8a9cd1 100644
--- a/packages/client/src/components/MkUserInfo.vue
+++ b/packages/client/src/components/MkUserInfo.vue
@@ -93,7 +93,7 @@ const props = defineProps<{
 }>();
 
 let isLong = $ref(
-	props.detailed &&
+	props.detailed && props.user.description && 
 		(props.user.description.split("\n").length > 9 ||
 			props.user.description.length > 400),
 );

From 79aaf392e88a075d5b5d154bec2e80666e44897b Mon Sep 17 00:00:00 2001
From: freeplay <freeplay@duck.com>
Date: Fri, 14 Jul 2023 15:31:31 -0400
Subject: [PATCH 8/9] refactor: remove tinycolor from MkFolder + a11y

---
 packages/client/src/components/MkFolder.vue | 55 +++++++--------------
 1 file changed, 19 insertions(+), 36 deletions(-)

diff --git a/packages/client/src/components/MkFolder.vue b/packages/client/src/components/MkFolder.vue
index bf08ac24ad..5acdffe4c7 100644
--- a/packages/client/src/components/MkFolder.vue
+++ b/packages/client/src/components/MkFolder.vue
@@ -1,13 +1,16 @@
 <template>
-	<div v-size="{ max: [500] }" class="ssazuxis">
+	<section class="ssazuxis">
 		<header
 			class="_button"
-			:style="{ background: bg }"
 			@click="showBody = !showBody"
 		>
 			<div class="title"><slot name="header"></slot></div>
 			<div class="divider"></div>
-			<button class="_button">
+			<button 
+				class="_button"
+				:aria-expanded="showBody"
+				:aria-controls="bodyId"
+			>
 				<template v-if="showBody"
 					><i class="ph-caret-up ph-bold ph-lg"></i
 				></template>
@@ -23,16 +26,16 @@
 			@leave="leave"
 			@after-leave="afterLeave"
 		>
-			<div v-show="showBody">
+			<div v-show="showBody" :id="bodyId">
 				<slot></slot>
 			</div>
 		</transition>
-	</div>
+	</section>
 </template>
 
 <script lang="ts">
 import { defineComponent } from "vue";
-import tinycolor from "tinycolor2";
+import { getUniqueId } from "@/os";
 
 const localStoragePrefix = "ui:folder:";
 
@@ -51,7 +54,7 @@ export default defineComponent({
 	},
 	data() {
 		return {
-			bg: null,
+			bodyId: getUniqueId(),
 			showBody:
 				this.persistKey &&
 				localStorage.getItem(localStoragePrefix + this.persistKey)
@@ -71,27 +74,6 @@ export default defineComponent({
 			}
 		},
 	},
-	mounted() {
-		function getParentBg(el: Element | null): string {
-			if (el == null || el.tagName === "BODY") return "var(--bg)";
-			const bg = el.style.background || el.style.backgroundColor;
-			if (bg) {
-				return bg;
-			} else {
-				return getParentBg(el.parentElement);
-			}
-		}
-		const rawBg = getParentBg(this.$el);
-		const bg = tinycolor(
-			rawBg.startsWith("var(")
-				? getComputedStyle(document.documentElement).getPropertyValue(
-						rawBg.slice(4, -1),
-				  )
-				: rawBg,
-		);
-		bg.setAlpha(0.85);
-		this.bg = bg.toRgbString();
-	},
 	methods: {
 		toggleContent(show: boolean) {
 			this.showBody = show;
@@ -161,6 +143,15 @@ export default defineComponent({
 			transparent
 		);
 
+		&::before {
+			content: "";
+			position: absolute;
+			inset: 0;
+			background: var(--bg);
+			opacity: 0.85;
+			z-index: -1;
+		}
+
 		> .title {
 			margin: 0;
 			padding: 12px 16px 12px 0;
@@ -185,13 +176,5 @@ export default defineComponent({
 			padding: 12px 0 12px 16px;
 		}
 	}
-
-	&.max-width_500px {
-		> header {
-			> .title {
-				padding: 8px 10px 8px 0;
-			}
-		}
-	}
 }
 </style>

From 6072ec92ab6ce2a461a4b148eff48fe1b57edbf6 Mon Sep 17 00:00:00 2001
From: naskya <naskya@noreply.codeberg.org>
Date: Fri, 14 Jul 2023 21:48:13 +0000
Subject: [PATCH 9/9] nowrap tab texts in MkNoteDetailed

---
 packages/client/src/components/MkNoteDetailed.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 7b571d8b2b..3dfac1f0cf 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -33,7 +33,12 @@
 			detailedView
 		></MkNote>
 
-		<MkTab v-model="tab" :style="'underline'" @update:modelValue="loadTab">
+		<MkTab
+			v-model="tab"
+			style="white-space: nowrap"
+			:style="'underline'"
+			@update:modelValue="loadTab"
+		>
 			<option value="replies">
 				<!-- <i class="ph-arrow-u-up-left ph-bold ph-lg"></i> -->
 				<span v-if="note.repliesCount > 0" class="count">{{