From ba7418aa6d164fecdc4d800717c2618843d64298 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Sun, 7 May 2023 18:01:36 -0700 Subject: [PATCH 1/7] Revert "fix: hidden post federation" This reverts commit 8a51c73fe705d4c86886ae6b5cc2b9a8dd7dcfb8. --- .../backend/src/remote/activitypub/renderer/note.ts | 1 - packages/backend/src/services/note/create.ts | 2 +- .../backend/src/services/note/reaction/create.ts | 6 +++++- packages/client/src/components/MkRenoteButton.vue | 12 +++--------- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/packages/backend/src/remote/activitypub/renderer/note.ts b/packages/backend/src/remote/activitypub/renderer/note.ts index 280205eaf8..2ad2fec9fb 100644 --- a/packages/backend/src/remote/activitypub/renderer/note.ts +++ b/packages/backend/src/remote/activitypub/renderer/note.ts @@ -16,7 +16,6 @@ export default async function renderNote( dive = true, isTalk = false, ): Promise> { - note.visibility = note.visibility === "hidden" ? "home" : note.visibility; const getPromisedFiles = async (ids: string[]) => { if (!ids || ids.length === 0) return []; const items = await DriveFiles.findBy({ id: In(ids) }); diff --git a/packages/backend/src/services/note/create.ts b/packages/backend/src/services/note/create.ts index 721147dd6b..f2ccdca226 100644 --- a/packages/backend/src/services/note/create.ts +++ b/packages/backend/src/services/note/create.ts @@ -606,7 +606,7 @@ export default async ( }); async function renderNoteOrRenoteActivity(data: Option, note: Note) { - if (data.localOnly || note.visibility !== "hidden") return null; + if (data.localOnly) return null; const content = data.renote && diff --git a/packages/backend/src/services/note/reaction/create.ts b/packages/backend/src/services/note/reaction/create.ts index 277393eb41..4cf1fd0941 100644 --- a/packages/backend/src/services/note/reaction/create.ts +++ b/packages/backend/src/services/note/reaction/create.ts @@ -144,7 +144,11 @@ export default async ( }); //#region deliver - if (Users.isLocalUser(user) && !note.localOnly) { + if ( + Users.isLocalUser(user) && + !note.localOnly && + note.visibility !== "hidden" + ) { const content = renderActivity(await renderLike(record, note)); const dm = new DeliverManager(user, content); if (note.userHost !== null) { diff --git a/packages/client/src/components/MkRenoteButton.vue b/packages/client/src/components/MkRenoteButton.vue index b70edda7d5..05f43a5df6 100644 --- a/packages/client/src/components/MkRenoteButton.vue +++ b/packages/client/src/components/MkRenoteButton.vue @@ -35,7 +35,7 @@ const buttonRef = ref(); const canRenote = computed( () => - ["public", "home", "hidden"].includes(props.note.visibility) || + ["public", "home"].includes(props.note.visibility) || props.note.userId === $i.id ); @@ -75,10 +75,7 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => { let buttonActions = []; - if ( - props.note.visibility === "public" || - props.note.visibility === "hidden" - ) { + if (props.note.visibility === "public") { buttonActions.push({ text: i18n.ts.renote, textStyle: "font-weight: bold", @@ -105,11 +102,8 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => { }); } - if (["public", "home", "hidden"].includes(props.note.visibility)) { - buttonActions.push({ - text: `${i18n.ts.renote} (${i18n.ts._visibility.home})`, + if (["public", "home"].includes(props.note.visibility)) { icon: "ph-house ph-bold ph-lg", - danger: false, action: () => { os.api("notes/create", { renoteId: props.note.id, From 6126b43aa9840b8d05583ff410bf0a8bfec43b90 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Sun, 7 May 2023 18:05:11 -0700 Subject: [PATCH 2/7] fix incomplete revert --- packages/client/src/components/MkRenoteButton.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/client/src/components/MkRenoteButton.vue b/packages/client/src/components/MkRenoteButton.vue index 05f43a5df6..0903210030 100644 --- a/packages/client/src/components/MkRenoteButton.vue +++ b/packages/client/src/components/MkRenoteButton.vue @@ -103,7 +103,10 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => { } if (["public", "home"].includes(props.note.visibility)) { + buttonActions.push({ + text: `${i18n.ts.renote} (${i18n.ts._visibility.home})`, icon: "ph-house ph-bold ph-lg", + danger: false, action: () => { os.api("notes/create", { renoteId: props.note.id, From 5d88fc455525ce699261babaf6e2c93178df7cca Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Sun, 7 May 2023 18:17:02 -0700 Subject: [PATCH 3/7] dev5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0ea5a0dad9..29faa28442 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "14.0.0-dev4", + "version": "14.0.0-dev5", "codename": "aqua", "repository": { "type": "git", From da61357f2d4d2f6f2ae841f2a8c3f74846cf2070 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Sun, 7 May 2023 18:41:31 -0700 Subject: [PATCH 4/7] fix: only fetch admin/meta if admin --- packages/client/src/pages/instance-info.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/pages/instance-info.vue b/packages/client/src/pages/instance-info.vue index 1ddf631425..b9163091a6 100644 --- a/packages/client/src/pages/instance-info.vue +++ b/packages/client/src/pages/instance-info.vue @@ -398,7 +398,7 @@ const usersPagination = { }; async function fetch() { - meta = (await os.api("admin/meta")) as AugmentedInstanceMetadata; + if (iAmAdmin) meta = (await os.api("admin/meta")) as AugmentedInstanceMetadata; instance = (await os.api("federation/show-instance", { host: props.host, })) as AugmentedInstance; From 9e17f1b525e1d7d2d272d69a054d3599884e635c Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Sun, 7 May 2023 18:49:56 -0700 Subject: [PATCH 5/7] refactor: remove internal apps page --- locales/ca-ES.yml | 17 ---- locales/de-DE.yml | 10 -- locales/en-US.yml | 17 ---- locales/es-ES.yml | 12 --- locales/ja-JP.yml | 17 ---- locales/pl-PL.yml | 17 ---- locales/ru-RU.yml | 17 ---- locales/zh-TW.yml | 4 - packages/client/package.json | 1 - packages/client/src/pages/apps.vue | 126 ------------------------ packages/client/src/router.ts | 5 - packages/client/src/scripts/helpMenu.ts | 2 +- pnpm-lock.yaml | 56 +---------- 13 files changed, 3 insertions(+), 298 deletions(-) delete mode 100644 packages/client/src/pages/apps.vue diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml index ea449b8228..692ff07bd5 100644 --- a/locales/ca-ES.yml +++ b/locales/ca-ES.yml @@ -2022,23 +2022,6 @@ _relayStatus: requesting: Pendent accepted: Acceptat rejected: Rebutjat -_apps: - crossPlatform: Multiplataforma - mobile: Mòbil - firstParty: Primer partit - secondClass: Segona classe - thirdClass: Tercera classe - pwa: Instal·lar PWA - kaiteki: Kaiteki - milktea: Milktea - missLi: MissLi - mona: Mona - lesskey: Lesskey - firstClass: Primera classe - free: Gratuït - paid: Pagament - theDesk: TheDesk - apps: Aplicacions deleted: Esborrat editNote: Edita la nota edited: Editat diff --git a/locales/de-DE.yml b/locales/de-DE.yml index 2b5d01655b..1bbf16cf55 100644 --- a/locales/de-DE.yml +++ b/locales/de-DE.yml @@ -1961,16 +1961,6 @@ cannotUploadBecauseExceedsFileSizeLimit: Die Datei konnte nicht hochgeladen werd da sie die maximal zulässige Größe überschreitet moveFromLabel: 'Nutzerkonto von dem Sie umziehen:' moveAccount: Nutzerkonto umziehen! -_apps: - mona: Mona - missLi: MissLi - thirdClass: Drittrangig - milktea: Milktea - theDesk: TheDesk - lesskey: Lesskey - mobile: Mobilgeräte - paid: Zahlungspflichtige - free: Kostenlose defaultReaction: Standard-Emoji-Reaktion für ausgehende und eingehende Beiträge moveTo: Umzug des Nutzerkontos zu einem neuen Nutzerkonto moveToLabel: 'Nutzerkonto zu dem sie umziehen:' diff --git a/locales/en-US.yml b/locales/en-US.yml index 7a23d2c99b..fe6f31798c 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -1997,20 +1997,3 @@ _deck: list: "List" mentions: "Mentions" direct: "Direct messages" -_apps: - apps: "Apps" - crossPlatform: "Cross platform" - mobile: "Mobile" - firstParty: "First party" - firstClass: "First class" - secondClass: "Second class" - thirdClass: "Third class" - free: "Free" - paid: "Paid" - pwa: "Install PWA" - kaiteki: "Kaiteki" - milktea: "Milktea" - missLi: "MissLi" - mona: "Mona" - theDesk: "TheDesk" - lesskey: "Lesskey" diff --git a/locales/es-ES.yml b/locales/es-ES.yml index c9811e3c0e..bcd8903547 100644 --- a/locales/es-ES.yml +++ b/locales/es-ES.yml @@ -1900,18 +1900,6 @@ moveFrom: Mueve a esta cuenta de una cuenta antigua moveFromLabel: 'La cuenta que estás moviendo de:' moveAccountDescription: '' license: Licencia -_apps: - apps: Aplicaciones - crossPlatform: Plataforma Cruzada - mobile: Teléfono móvil - secondClass: Segunda clase - lesskey: '' - firstClass: Primera clase - thirdClass: Tercera clase - theDesk: '' - pwa: Instalar PWA - free: Gratis - paid: Pagado noThankYou: No gracias userSaysSomethingReason: '{name} dijo {reason}' hiddenTags: Etiquetas Ocultas diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 0eb17e5afb..b9f2caacb0 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1837,23 +1837,6 @@ _deck: list: "リスト" mentions: "あなた宛て" direct: "ダイレクト" -_apps: - apps: "アプリ" - crossPlatform: "クロスプラットフォーム" - mobile: "モバイル" - firstParty: "ファーストパーティ" - firstClass: "対応度◎" - secondClass: "対応度○" - thirdClass: "対応度△" - free: "無料" - paid: "有料" - pwa: "PWAをインストール" - kaiteki: "Kaiteki" - milktea: "Milktea" - missLi: "MissLi" - mona: "Mona" - theDesk: "TheDesk" - lesskey: "Lesskey" noteId: 投稿のID hiddenTagsDescription: 'トレンドと「みつける」から除外したいハッシュタグを（先頭の # を除いて）改行区切りで入力してください。この設定はトレンドと「みつける」以外には影響しません。' hiddenTags: 非表示にするハッシュタグ diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml index 1c7b675c50..c8a2d13a54 100644 --- a/locales/pl-PL.yml +++ b/locales/pl-PL.yml @@ -1894,23 +1894,6 @@ indexNotice: Indeksuję. Zapewne zajmie to chwilę, nie restartuj serwera przez customKaTeXMacro: Niestandardowe makra KaTeX enableCustomKaTeXMacro: Włącz niestandardowe makra KaTeX noteId: ID wpisu -_apps: - apps: Aplikacje - crossPlatform: Wieloplatformowe - mobile: Mobilne - firstParty: Oficjalne - firstClass: Pierwszej klasy - secondClass: Drugiej klasy - thirdClass: Trzeciej klasy - free: Darmowe - paid: Płatne - pwa: Zainstaluj PWA - kaiteki: Kaiteki - milktea: Milktea - missLi: MissLi - mona: Mona - theDesk: TheDesk - lesskey: Lesskey hiddenTagsDescription: 'Wypisz tagi (bez #) hashtagów które masz zamiar ukryć z "Na czasie" i "Eksploruj". Na ukryte hashtagi można dalej wejść innymi sposobami.' proxyAccountDescription: Konto proxy jest kontem które w określonych sytuacjach zachowuje diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml index 91d96fcc51..bd30455920 100644 --- a/locales/ru-RU.yml +++ b/locales/ru-RU.yml @@ -1937,23 +1937,6 @@ _preferencesBackups: cannotLoad: Загрузка не удалась invalidFile: Неправильный формат файла enableEmojiReactions: Включить эмодзи реакции -_apps: - paid: Платные - lesskey: Lesskey - pwa: Установить PWA - free: Бесплатные - apps: Приложения - crossPlatform: Кроссплатформенные - mobile: Мобильные - firstParty: От разработчиков - firstClass: Первый класс - thirdClass: Третий класс - kaiteki: Kaiteki - milktea: Milktea - missLi: MissLi - mona: Mona - theDesk: TheDesk - secondClass: Второй класс migrationConfirm: "Вы абсолютно уверены что хотите мигрировать ваш аккаунт на {account}?\ \ Как только вы сделаете, вы не сможете отменить это и не сможете нормально использовать\ \ аккаунт снова.\nТакже, пожалуйста, убедитесь, что вы установили эту текущую учетную\ diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml index 42fec8279d..093dbd994d 100644 --- a/locales/zh-TW.yml +++ b/locales/zh-TW.yml @@ -1790,10 +1790,6 @@ moveAccountDescription: '這個過程是不可逆的。 在遷移前，請確保 moveFrom: 由舊帳戶移至此帳戶 moveFromDescription: '這將為你的舊帳戶設置一個別名(Alias)，以便你可以從該帳戶轉移到當前帳戶。 在你的舊帳戶移動之前請執行此操作。 請輸入帳戶標籤 (格式: @person@instance.com)' -_apps: - crossPlatform: 跨平台 - free: 免費 - paid: 付費 enableEmojiReactions: 啟用表情符號反應 breakFollowConfirm: 您確定要移除該關注者嗎？ socialTimeline: 社交時間軸 diff --git a/packages/client/package.json b/packages/client/package.json index 1735855037..69346651d8 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -9,7 +9,6 @@ }, "devDependencies": { "@discordapp/twemoji": "14.0.2", - "@khmyznikov/pwa-install": "^0.2.0", "@phosphor-icons/web": "^2.0.3", "@rollup/plugin-alias": "3.1.9", "@rollup/plugin-json": "4.1.0", diff --git a/packages/client/src/pages/apps.vue b/packages/client/src/pages/apps.vue deleted file mode 100644 index 0ef511027e..0000000000 --- a/packages/client/src/pages/apps.vue +++ /dev/null @@ -1,126 +0,0 @@ - - - diff --git a/packages/client/src/router.ts b/packages/client/src/router.ts index 16a056de9e..2f1d2217fd 100644 --- a/packages/client/src/router.ts +++ b/packages/client/src/router.ts @@ -195,11 +195,6 @@ export const routes = [ name: "api", component: page(() => import("./pages/settings/api.vue")), }, - { - path: "/apps", - name: "api", - component: page(() => import("./pages/settings/apps.vue")), - }, { path: "/webhook/edit/:webhookId", name: "webhook", diff --git a/packages/client/src/scripts/helpMenu.ts b/packages/client/src/scripts/helpMenu.ts index aca9d6e70c..5892471c0f 100644 --- a/packages/client/src/scripts/helpMenu.ts +++ b/packages/client/src/scripts/helpMenu.ts @@ -28,7 +28,7 @@ export function openHelpMenu_(ev: MouseEvent) { type: "link", text: i18n.ts._apps.apps, icon: "ph-device-mobile ph-bold ph-lg", - to: "/apps", + to: "https://calckey.org/apps", }, { type: "button", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 77b0e0d4cc..19bb976a99 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -656,9 +656,6 @@ importers: '@discordapp/twemoji': specifier: 14.0.2 version: 14.0.2 - '@khmyznikov/pwa-install': - specifier: ^0.2.0 - version: 0.2.0 '@phosphor-icons/web': specifier: ^2.0.3 version: 2.0.3 @@ -2116,13 +2113,6 @@ packages: '@jridgewell/resolve-uri': 3.1.0 '@jridgewell/sourcemap-codec': 1.4.14 - /@khmyznikov/pwa-install@0.2.0: - resolution: {integrity: sha512-Lz8lvCf47/DCVzXgLyCGt46HDpie2U/lga++vOgVwil3B8bSMj8fL1+a/8oBhDikHjtLKinTCMf0jZvgW2xCZQ==} - dependencies: - '@lit/localize': 0.11.4 - lit: 2.6.1 - dev: true - /@koa/cors@3.4.3: resolution: {integrity: sha512-WPXQUaAeAMVaLTEFpoq3T2O1C+FstkjJnDQqy95Ck1UdILajsRhu6mhJ8H2f4NFPRBoCNN+qywTJfq/gGki5mw==} engines: {node: '>= 8.0.0'} @@ -2156,23 +2146,6 @@ packages: resolution: {integrity: sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==} dev: true - /@lit-labs/ssr-dom-shim@1.0.0: - resolution: {integrity: sha512-ic93MBXfApIFTrup4a70M/+ddD8xdt2zxxj9sRwHQzhS9ag/syqkD8JPdTXsc1gUy2K8TTirhlCqyTEM/sifNw==} - dev: true - - /@lit/localize@0.11.4: - resolution: {integrity: sha512-RRIwIX2tAm3+DuEndoXSJrFjGrAK5cb5IXo5K6jcJ6sbgD829B8rSqHC5MaKVUmXTVLIR1bk5IZOZDf9wFereA==} - dependencies: - '@lit/reactive-element': 1.6.1 - lit: 2.6.1 - dev: true - - /@lit/reactive-element@1.6.1: - resolution: {integrity: sha512-va15kYZr7KZNNPZdxONGQzpUr+4sxVu7V/VG7a8mRfPPXUyhEYj5RzXCQmGrlP3tAh0L3HHm5AjBMFYRqlM9SA==} - dependencies: - '@lit-labs/ssr-dom-shim': 1.0.0 - dev: true - /@mapbox/node-pre-gyp@1.0.10: resolution: {integrity: sha512-4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA==} hasBin: true @@ -3622,10 +3595,6 @@ packages: resolution: {integrity: sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==} dev: true - /@types/trusted-types@2.0.2: - resolution: {integrity: sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg==} - dev: true - /@types/undertaker-registry@1.0.1: resolution: {integrity: sha512-Z4TYuEKn9+RbNVk1Ll2SS4x1JeLHecolIbM/a8gveaHsW0Hr+RQMraZACwTO2VD7JvepgA6UO1A1VrbktQrIbQ==} dev: true @@ -9810,7 +9779,7 @@ packages: /jsonfile@4.0.0: resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==} optionalDependencies: - graceful-fs: 4.2.10 + graceful-fs: 4.2.11 /jsonfile@5.0.0: resolution: {integrity: sha512-NQRZ5CRo74MhMMC3/3r5g2k4fjodJ/wh8MxjFbCViWKFjxrnudWSY5vomh+23ZaXzAS7J3fBZIR2dV6WbmfM0w==} @@ -9824,7 +9793,7 @@ packages: dependencies: universalify: 2.0.0 optionalDependencies: - graceful-fs: 4.2.10 + graceful-fs: 4.2.11 dev: true /jsonld@6.0.0: @@ -10263,27 +10232,6 @@ packages: wrap-ansi: 7.0.0 dev: true - /lit-element@3.2.2: - resolution: {integrity: sha512-6ZgxBR9KNroqKb6+htkyBwD90XGRiqKDHVrW/Eh0EZ+l+iC+u+v+w3/BA5NGi4nizAVHGYvQBHUDuSmLjPp7NQ==} - dependencies: - '@lit/reactive-element': 1.6.1 - lit-html: 2.6.1 - dev: true - - /lit-html@2.6.1: - resolution: {integrity: sha512-Z3iw+E+3KKFn9t2YKNjsXNEu/LRLI98mtH/C6lnFg7kvaqPIzPn124Yd4eT/43lyqrejpc5Wb6BHq3fdv4S8Rw==} - dependencies: - '@types/trusted-types': 2.0.2 - dev: true - - /lit@2.6.1: - resolution: {integrity: sha512-DT87LD64f8acR7uVp7kZfhLRrHkfC/N4BVzAtnw9Yg8087mbBJ//qedwdwX0kzDbxgPccWRW6mFwGbRQIxy0pw==} - dependencies: - '@lit/reactive-element': 1.6.1 - lit-element: 3.2.2 - lit-html: 2.6.1 - dev: true - /load-json-file@1.1.0: resolution: {integrity: sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A==} engines: {node: '>=0.10.0'} From b6510533b8119f81c1dd983cc66587bc5c8bec7b Mon Sep 17 00:00:00 2001 From: Michael 465537 Date: Sun, 7 May 2023 21:46:48 +0000 Subject: [PATCH 6/7] chore: Translated using Weblate (German) Currently translated at 97.3% (1703 of 1749 strings) Translation: Calckey/locales Translate-URL: https://hosted.weblate.org/projects/calckey/locales/de/ --- locales/de-DE.yml | 48 +++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/locales/de-DE.yml b/locales/de-DE.yml index 2b5d01655b..430068356b 100644 --- a/locales/de-DE.yml +++ b/locales/de-DE.yml @@ -86,9 +86,9 @@ error: "Fehler" somethingHappened: "Ein Fehler ist aufgetreten" retry: "Wiederholen" pageLoadError: "Beim Laden der Seite ist ein Fehler aufgetreten." -pageLoadErrorDescription: "Dies wird in der Regel verursacht durch einen Netzwerkfehler\ - \ oder den Browser-Cache.\nVersuchen sie den Browser-Cache zu leeren, nachdem Sie\ - \ eine Weile gewartet haben, versuchen Sie es erneut." +pageLoadErrorDescription: "Dies wird in der Regel durch Netzwerkfehler oder den Cache\ + \ des Browsers verursacht. Versuchen Sie, den Cache zu leeren, und versuchen Sie\ + \ es dann erneut, nachdem Sie eine Weile gewartet haben" serverIsDead: "Der Server antwortet nicht. Bitte warte einen Moment und versuche es\ \ dann erneut." youShouldUpgradeClient: "Bitte aktualisiere diese Seite, um eine neuere Version deines\ @@ -522,18 +522,18 @@ promote: "Werbung schalten" numberOfDays: "Anzahl der Tage" hideThisNote: "Diesen Beitrag verstecken" showFeaturedNotesInTimeline: "Beliebte Beiträge in der Timeline anzeigen" -objectStorage: "Object Storage" +objectStorage: "Objektspeicher" useObjectStorage: "Object Storage verwenden" objectStorageBaseUrl: "Basis-URL" objectStorageBaseUrlDesc: "Die als Referenz verwendete URL. Verwendest du einen CDN\ \ oder Proxy, gib dessen URL an. \nFür S3 verwende 'https://.s3.amazonaws.com'.\ \ Für GCS o.ä. verwende 'https://storage.googleapis.com/'." -objectStorageBucket: "Bucket" +objectStorageBucket: "Eimer" objectStorageBucketDesc: "Bitte gib den Namen des Buckets an, der bei deinem Anbieter\ \ verwendet wird." objectStoragePrefix: "Prefix" objectStoragePrefixDesc: "Dateien werden in Ordnern unter diesem Prefix gespeichert." -objectStorageEndpoint: "Endpoint" +objectStorageEndpoint: "Limit" objectStorageEndpointDesc: "Im Falle von S3 leerlassen, für andere Anbieter den relevanten\ \ Endpoint im Format „“ oder „:“ angeben." objectStorageRegion: "Region" @@ -710,7 +710,7 @@ switchUi: "Layout" desktop: "Desktop" clip: "Clip erstellen" createNew: "Neu erstellen" -optional: "Optional" +optional: "optional" createNewClip: "Neuen Clip erstellen" unclip: "Aus Clip entfernen" confirmToUnclipAlreadyClippedNote: "Dieser Beitrag ist bereits im \"{name}\" Clip\ @@ -946,7 +946,7 @@ recentNDays: "Die letzten {n} Tage" noEmailServerWarning: "Es ist kein Email-Server konfiguriert." thereIsUnresolvedAbuseReportWarning: "Es liegen ungelöste Meldungen vor." recommended: "Empfehlung" -check: "Check" +check: "Kontrolle" driveCapOverrideLabel: "Die Drive-Kapazität dieses Nutzers verändern" driveCapOverrideCaption: "Gib einen Wert von 0 oder weniger ein, um die Kapazität\ \ auf den Standard zurückzusetzen." @@ -1304,13 +1304,13 @@ _sfx: _ago: future: "Zukunft" justNow: "Gerade eben" - secondsAgo: "vor {n} Sekunde(n)" - minutesAgo: "vor {n} Minute(n)" - hoursAgo: "vor {n} Stunde(n)" - daysAgo: "vor {n} Tag(en)" - weeksAgo: "vor {n} Woche(n)" - monthsAgo: "vor {n} Monat(en)" - yearsAgo: "vor {n} Jahr(en)" + secondsAgo: "vor {n} s" + minutesAgo: "vor {n} min" + hoursAgo: "vor {n} h" + daysAgo: "vor {n} T" + weeksAgo: "vor {n} W" + monthsAgo: "vor {n} M" + yearsAgo: "vor {n} J" _time: second: "Sekunde(n)" minute: "Minute(n)" @@ -1323,13 +1323,13 @@ _tutorial: step2_1: "Bitte füllen Sie zuerst Ihr Profil aus." step2_2: "Wenn du ein paar Angaben zu deiner Person machst, können andere leichter\ \ erkennen, ob sie deine Beiträge sehen oder dir folgen wollen." - step3_1: "Jetzt ist es Zeit, einigen Leuten zu folgen!" + step3_1: "Jetzt ist es an der Zeit, einigen Leuten zu folgen!" step3_2: "Deine Home- und Social-Timeline basiert darauf, wem du folgst, also folge\ \ für den Anfang ein paar Accounts.\nKlicke das Plus Symbol oben links in einem\ \ Profil um es zu folgen." step4_1: "Wir bringen dich nach draußen." - step4_2: "Für deinen ersten Beitrag machen manche Leute gerne einen {introduction}\ - \ Beitrag oder ein einfaches \"Hallo Welt!\"" + step4_2: "Für Ihren ersten Beitrag machen einige Leute gerne einen {introduction}-Beitrag\ + \ oder ein einfaches \"Hallo Welt!\"" step5_1: "Timelines, Timelines überall!" step5_2: "Dein Server hat {timelines} verschiedene Timelines aktiviert." step5_3: "Die Startseite {icon} ist die Timeline, in der du die Beiträge der Nutzerkonten\ @@ -1435,7 +1435,7 @@ _widgets: trends: "Trends" clock: "Uhr" rss: "RSS-Reader" - rssTicker: "RSS-Ticker" + rssTicker: "RSS-Laufschrift (Ticker)" activity: "Aktivität" photos: "Fotos" digitalClock: "Digitaluhr" @@ -1483,7 +1483,7 @@ _poll: _visibility: public: "Öffentlich" publicDescription: "Dein Beitrag wird global für alle Nutzer sichtbar sein" - home: "Startseite" + home: "nicht aufgelistet" homeDescription: "Beitrag nur auf der Startseite anzeigen" followers: "Follower" followersDescription: "Nur für Follower sichtbar" @@ -1585,7 +1585,7 @@ _pages: hideTitleWhenPinned: "Seitentitel wenn angeheftet ausblenden" font: "Schriftart" fontSerif: "Serif" - fontSansSerif: "Sans Serif" + fontSansSerif: "sans-serif" eyeCatchingImageSet: "Vorschaubild festlegen" eyeCatchingImageRemove: "Vorschaubild entfernen" chooseBlock: "Block hinzufügen" @@ -1895,9 +1895,9 @@ _deck: swapDown: "Mit unterer Spalte tauschen" stackLeft: "Auf linke Spalte stapeln" popRight: "Nach rechts vom Stapel nehmen" - profile: "Profil" - newProfile: "Neues Profil" - deleteProfile: "Profil löschen" + profile: "Arbeitsbereich" + newProfile: "Neuer Arbeitsbereich" + deleteProfile: "Arbeitsbereich löschen" introduction: "Erstelle eine auf dich zugeschneiderte Benutzeroberfläche durch das\ \ Aneinanderreihen von Spalten!" introduction2: "Klicke auf das + rechts um wann immer du möchtest neue Spalten hinzuzufügen." From 6c5ca005ee30af707005dfaf0fa3121d210c4f98 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Sun, 7 May 2023 18:53:15 -0700 Subject: [PATCH 7/7] remove reference to apps.vue --- packages/client/src/router.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/client/src/router.ts b/packages/client/src/router.ts index 2f1d2217fd..7f03279dd6 100644 --- a/packages/client/src/router.ts +++ b/packages/client/src/router.ts @@ -295,10 +295,6 @@ export const routes = [ path: "/about-calckey", component: page(() => import("./pages/about-calckey.vue")), }, - { - path: "/apps", - component: page(() => import("./pages/apps.vue")), - }, { path: "/theme-editor", component: page(() => import("./pages/theme-editor.vue")),