From 2c3043953389017111801ca421c0318066f59bd5 Mon Sep 17 00:00:00 2001 From: Crimekillz Date: Sat, 6 Apr 2024 23:55:59 +0200 Subject: [PATCH] Flamingo 3 --- .config/devenv.yml | 6 +- .config/docker_example.env | 6 +- .config/example-docker.yml | 6 +- .config/example.yml | 6 +- .config/helm_values_example.yml | 2 +- .forgejo/workflows/test-build.yaml | 16 ++-- .weblate | 2 +- .yarnrc.yml | 4 +- CONTRIBUTING.md | 6 +- Dockerfile | 16 ++-- chart/Chart.yaml | 2 +- chart/README.md | 66 +++++++------- chart/templates/NOTES.txt | 8 +- chart/templates/_helpers.tpl | 88 +++++++++---------- chart/templates/deployment.yaml | 20 ++--- chart/templates/hpa.yaml | 6 +- chart/templates/ingress.yaml | 4 +- chart/templates/job-db-migrate.yaml | 12 +-- chart/templates/pvc.yaml | 18 ++-- chart/templates/secret-config.yaml | 6 +- chart/templates/service.yaml | 6 +- chart/templates/serviceaccount.yaml | 4 +- chart/templates/tests/test-connection.yaml | 6 +- chart/values.yaml | 14 +-- dev/docker-compose.yml.example | 12 +-- docs/api-doc.md | 2 +- docs/docker.md | 8 +- .../Podman (quadlet)/iceshrimp-db.container | 14 --- .../Podman (quadlet)/trashposs-db.container | 14 +++ ...is.container => trashposs-redis.container} | 8 +- ...-web.container => trashposs-web.container} | 10 +-- .../{iceshrimp.network => trashposs.network} | 0 .../Podman (quadlet)/volume-dir-creation.sh | 6 +- docs/examples/docker-compose.yml | 22 ++--- ...rimp.apache.conf => trashposs.apache.conf} | 0 ...shrimp.nginx.conf => trashposs.nginx.conf} | 0 .../{iceshrimp.service => trashposs.service} | 6 +- docs/install.md | 30 +++---- docs/kubernetes.md | 26 +++--- docs/nix-development.md | 2 +- docs/podman-install.md | 22 ++--- docs/post-install.md | 6 +- docs/sharkey.sql | 12 +-- flake.nix | 10 +-- locales/ar-SA.yml | 10 +-- locales/bn-BD.yml | 10 +-- locales/bul-BG.yml | 8 +- locales/ca-ES.yml | 12 +-- locales/cs-CZ.yml | 8 +- locales/da-DK.yml | 4 +- locales/de-DE.yml | 12 +-- locales/el-GR.yml | 6 +- locales/en-US.yml | 12 +-- locales/es-ES.yml | 12 +-- locales/fi.yml | 18 ++-- locales/fr-FR.yml | 12 +-- locales/gl.yml | 4 +- locales/id-ID.yml | 12 +-- locales/it-IT.yml | 10 +-- locales/ja-JP.yml | 50 +++++------ locales/ja-KS.yml | 26 +++--- locales/kn-IN.yml | 2 +- locales/ko-KR.yml | 26 +++--- locales/nl-NL.yml | 12 +-- locales/no-NO.yml | 4 +- locales/pl-PL.yml | 12 +-- locales/pt-BR.yml | 4 +- locales/pt-PT.yml | 6 +- locales/ro-RO.yml | 6 +- locales/ru-RU.yml | 10 +-- locales/sk-SK.yml | 10 +-- locales/sv-SE.yml | 6 +- locales/th-TH.yml | 10 +-- locales/tr-TR.yml | 12 +-- locales/uk-UA.yml | 12 +-- locales/vi-VN.yml | 10 +-- locales/zh-CN.yml | 20 ++--- locales/zh-TW.yml | 36 ++++---- ...epo.ts => 1689965609061-trashposs-repo.ts} | 4 +- .../1697289658422-resync-with-orm.ts | 2 +- packages/backend/src/models/entities/meta.ts | 2 +- .../src/models/schema/federation-instance.ts | 4 +- packages/backend/src/models/schema/hashtag.ts | 2 +- .../server/api/endpoints/latest-version.ts | 2 +- .../api/mastodon/converters/visibility.ts | 6 +- .../src/server/api/mastodon/endpoints/auth.ts | 4 +- .../src/server/api/mastodon/helpers/user.ts | 4 +- packages/backend/src/server/web/bios.css | 2 +- packages/backend/src/server/web/boot.js | 2 +- packages/backend/src/server/web/cli.css | 2 +- packages/backend/test/mfm.ts | 18 ++-- .../src/components/MkInstanceCardMini.vue | 4 +- packages/client/src/components/MkSample.vue | 4 +- packages/client/src/components/MkUpdated.vue | 2 +- packages/client/src/init.ts | 2 +- ...bout-iceshrimp.vue => about-trashposs.vue} | 18 ++-- packages/client/src/pages/about.vue | 6 +- packages/client/src/pages/instance-info.vue | 6 +- packages/client/src/pages/note.vue | 2 +- packages/client/src/pages/oauth.vue | 4 +- .../client/src/pages/settings/general.vue | 2 +- .../src/pages/settings/import-export.vue | 4 +- .../client/src/pages/user/achievements.vue | 4 +- .../client/src/pages/welcome.entrance.a.vue | 4 +- .../client/src/pages/welcome.entrance.b.vue | 4 +- .../client/src/pages/welcome.entrance.c.vue | 4 +- packages/client/src/router.ts | 4 +- packages/client/src/scripts/helpMenu.ts | 4 +- packages/client/src/scripts/theme.ts | 4 +- packages/client/src/store.ts | 4 +- .../{d-iceshrimp.json5 => d-trashposs.json5} | 0 .../{l-iceshrimp.json5 => l-trashposs.json5} | 0 packages/client/src/ui/_common_/navbar.vue | 4 +- packages/trashposs-js/README.md | 2 +- packages/trashposs-js/package.json | 2 +- packages/trashposs-js/test-d/api.ts | 6 +- packages/trashposs-js/test-d/streaming.ts | 4 +- packages/trashposs-js/test/api.ts | 28 +++--- packages/trashposs-js/test/streaming.ts | 20 ++--- 119 files changed, 585 insertions(+), 585 deletions(-) delete mode 100644 docs/examples/Podman (quadlet)/iceshrimp-db.container create mode 100644 docs/examples/Podman (quadlet)/trashposs-db.container rename docs/examples/Podman (quadlet)/{iceshrimp-redis.container => trashposs-redis.container} (55%) rename docs/examples/Podman (quadlet)/{iceshrimp-web.container => trashposs-web.container} (50%) rename docs/examples/Podman (quadlet)/{iceshrimp.network => trashposs.network} (100%) rename docs/examples/{iceshrimp.apache.conf => trashposs.apache.conf} (100%) rename docs/examples/{iceshrimp.nginx.conf => trashposs.nginx.conf} (100%) rename docs/examples/{iceshrimp.service => trashposs.service} (69%) rename packages/backend/src/migration/{1689965609061-iceshrimp-repo.ts => 1689965609061-trashposs-repo.ts} (86%) rename packages/client/src/pages/{about-iceshrimp.vue => about-trashposs.vue} (92%) rename packages/client/src/themes/{d-iceshrimp.json5 => d-trashposs.json5} (100%) rename packages/client/src/themes/{l-iceshrimp.json5 => l-trashposs.json5} (100%) diff --git a/.config/devenv.yml b/.config/devenv.yml index 59907a3cd..9fcd9e222 100644 --- a/.config/devenv.yml +++ b/.config/devenv.yml @@ -5,10 +5,10 @@ db: host: 127.0.0.1 port: 5432 - db: iceshrimp + db: trashposs - user: iceshrimp - pass: iceshrimp + user: trashposs + pass: trashposs redis: host: localhost diff --git a/.config/docker_example.env b/.config/docker_example.env index cf105b18d..da14bc988 100644 --- a/.config/docker_example.env +++ b/.config/docker_example.env @@ -1,4 +1,4 @@ # db settings -POSTGRES_PASSWORD=example-iceshrimp-pass -POSTGRES_USER=example-iceshrimp-user -POSTGRES_DB=iceshrimp +POSTGRES_PASSWORD=example-trashposs-pass +POSTGRES_USER=example-trashposs-user +POSTGRES_DB=trashposs diff --git a/.config/example-docker.yml b/.config/example-docker.yml index 5c32accaa..6050451b5 100644 --- a/.config/example-docker.yml +++ b/.config/example-docker.yml @@ -44,11 +44,11 @@ db: port: 5432 #ssl: false # Database name - db: iceshrimp + db: trashposs # Auth - user: example-iceshrimp-user - pass: example-iceshrimp-pass + user: example-trashposs-user + pass: example-trashposs-pass # Whether disable Caching queries #disableCache: true diff --git a/.config/example.yml b/.config/example.yml index 55c51a8e9..154cfb099 100644 --- a/.config/example.yml +++ b/.config/example.yml @@ -44,11 +44,11 @@ db: port: 5432 #ssl: false # Database name - db: iceshrimp + db: trashposs # Auth - user: example-iceshrimp-user - pass: example-iceshrimp-pass + user: example-trashposs-user + pass: example-trashposs-pass # Whether disable Caching queries #disableCache: true diff --git a/.config/helm_values_example.yml b/.config/helm_values_example.yml index ee473993d..69c30f40b 100644 --- a/.config/helm_values_example.yml +++ b/.config/helm_values_example.yml @@ -8,7 +8,7 @@ resources: cpu: 1 memory: 1Gi -iceshrimp: +trashposs: domain: example.tld smtp: from_address: noreply@example.tld diff --git a/.forgejo/workflows/test-build.yaml b/.forgejo/workflows/test-build.yaml index 46eb743ae..6a078a9f7 100644 --- a/.forgejo/workflows/test-build.yaml +++ b/.forgejo/workflows/test-build.yaml @@ -4,8 +4,8 @@ jobs: test-build: runs-on: docker container: - image: iceshrimp.dev/iceshrimp/ci-env:latest - options: --volume /opt/iceshrimp-cache/yarn:/iceshrimp-caches/yarn + image: iceshrimp.dev/trashposs/ci-env:latest + options: --volume /opt/trashposs-cache/yarn:/trashposs-caches/yarn services: database: image: postgres:15 @@ -15,19 +15,19 @@ jobs: image: redis steps: - name: Clone repository - run: git clone https://iceshrimp.dev/Crimekillz/trashposs.git --branch=${{ github.ref_name }} --depth=1 /iceshrimp + run: git clone https://iceshrimp.dev/Crimekillz/trashposs.git --branch=${{ github.ref_name }} --depth=1 /trashposs - name: Install build dependencies run: | - cd /iceshrimp - cp -Tr /iceshrimp-caches/yarn .yarn + cd /trashposs + cp -Tr /trashposs-caches/yarn .yarn yarn --immutable - rm -rf /iceshrimp-caches/yarn/* && cp -Tr .yarn /iceshrimp-caches/yarn + rm -rf /trashposs-caches/yarn/* && cp -Tr .yarn /trashposs-caches/yarn - name: Build the shrimp run: | - cd /iceshrimp + cd /trashposs yarn build:debug - name: Test the shrimp run: | - cd /iceshrimp + cd /trashposs cp .config/ci.yml .config/default.yml yarn run migrate diff --git a/.weblate b/.weblate index 3ecf97a5a..60600b5a1 100644 --- a/.weblate +++ b/.weblate @@ -1,3 +1,3 @@ [weblate] url = https://hosted.weblate.org/api/ -translation = iceshrimp/locales +translation = trashposs/locales diff --git a/.yarnrc.yml b/.yarnrc.yml index 2de1cb4b0..c178e6e56 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -7,8 +7,8 @@ nodeLinker: pnp checksumBehavior: update npmScopes: - iceshrimp: - npmRegistryServer: "https://iceshrimp.dev/api/packages/iceshrimp/npm/" + trashposs: + npmRegistryServer: "https://iceshrimp.dev/api/packages/trashposs/npm/" packageExtensions: consolidate@^0.16.0: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1fb635541..1f32b1fe5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,9 +8,9 @@ If your language is not listed in Weblate, please open an issue. You can contribute without knowing how to code by helping translate here: -[![Translation status](https://translate.iceshrimp.dev/widgets/iceshrimp/-/287x66-grey.png)](https://translate.iceshrimp.dev/) +[![Translation status](https://translate.iceshrimp.dev/widgets/trashposs/-/287x66-grey.png)](https://translate.iceshrimp.dev/) -[![Translation bars](https://translate.iceshrimp.dev/widgets/iceshrimp/-/multi-auto.svg)](https://translate.iceshrimp.dev/) +[![Translation bars](https://translate.iceshrimp.dev/widgets/trashposs/-/multi-auto.svg)](https://translate.iceshrimp.dev/) ## Issues @@ -18,7 +18,7 @@ Before creating an issue, please check the following: - To avoid duplication, please search for similar issues before creating a new issue. - Do not use Issues to ask questions or troubleshooting. - Issues should only be used to feature requests, suggestions, and bug tracking. - - Please ask questions or troubleshooting in the [Matrix room](https://matrix.to/#/#iceshrimp-dev:161.rocks). + - Please ask questions or troubleshooting in the [Matrix room](https://matrix.to/#/#trashposs-dev:161.rocks). > **Warning** > Do not close issues that are about to be resolved. It should remain open until a commit that actually resolves it is merged. diff --git a/Dockerfile b/Dockerfile index 00ebc53fb..8f0db2c46 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # syntax = docker/dockerfile:1.2 ## Install dev and compilation dependencies, build files FROM alpine:3.18 as build -WORKDIR /iceshrimp +WORKDIR /trashposs # Install compilation dependencies RUN apk add --no-cache --no-progress git alpine-sdk vips-dev python3 nodejs-current npm vips @@ -10,40 +10,40 @@ RUN apk add --no-cache --no-progress git alpine-sdk vips-dev python3 nodejs-curr COPY . ./ # Prepare yarn cache -RUN --mount=type=cache,target=/iceshrimp/.yarncache cp -Tr .yarncache .yarn +RUN --mount=type=cache,target=/trashposs/.yarncache cp -Tr .yarncache .yarn # Configure corepack and install dev mode dependencies for compilation RUN corepack enable && corepack prepare --activate && yarn --immutable # Save yarn cache -RUN --mount=type=cache,target=/iceshrimp/.yarncache rm -rf .yarncache/* && cp -Tr .yarn .yarncache +RUN --mount=type=cache,target=/trashposs/.yarncache rm -rf .yarncache/* && cp -Tr .yarn .yarncache # Build the thing RUN env NODE_ENV=production yarn build # Prepare focused yarn cache -RUN --mount=type=cache,target=/iceshrimp/.yarncache_focused cp -Tr .yarncache_focused .yarn +RUN --mount=type=cache,target=/trashposs/.yarncache_focused cp -Tr .yarncache_focused .yarn # Remove dev deps RUN yarn focus-production # Save focused yarn cache -RUN --mount=type=cache,target=/iceshrimp/.yarncache_focused rm -rf .yarncache/* && cp -Tr .yarn .yarncache_focused +RUN --mount=type=cache,target=/trashposs/.yarncache_focused rm -rf .yarncache/* && cp -Tr .yarn .yarncache_focused ## Runtime container FROM alpine:3.18 -WORKDIR /iceshrimp +WORKDIR /trashposs # Install runtime dependencies RUN apk add --no-cache --no-progress tini ffmpeg vips-dev zip unzip nodejs-current libheif-dev # Copy built files -COPY --from=build /iceshrimp /iceshrimp +COPY --from=build /trashposs /trashposs # Configure corepack RUN corepack enable && corepack prepare --activate ENV NODE_ENV=production -VOLUME "/iceshrimp/files" +VOLUME "/trashposs/files" ENTRYPOINT [ "/sbin/tini", "--" ] CMD [ "yarn", "run", "migrateandstart" ] diff --git a/chart/Chart.yaml b/chart/Chart.yaml index ba688bcc8..1dda2ac0d 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -name: iceshrimp +name: trashposs description: A fun, new, open way to experience social media https://iceshrimp.dev # A chart can be either an 'application' or a 'library' chart. diff --git a/chart/README.md b/chart/README.md index def6b8510..c5e46861e 100644 --- a/chart/README.md +++ b/chart/README.md @@ -1,4 +1,4 @@ -# iceshrimp +# trashposs ![Version: 0.1.2](https://img.shields.io/badge/Version-0.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: rc](https://img.shields.io/badge/AppVersion-rc-informational?style=flat-square) @@ -21,39 +21,39 @@ A fun, new, open way to experience social media https://iceshrimp.dev | autoscaling.maxReplicas | int | `100` | | | autoscaling.minReplicas | int | `1` | | | autoscaling.targetCPUUtilizationPercentage | int | `80` | | -| iceshrimp.allowedPrivateNetworks | list | `[]` | If you want to allow iceshrimp to connect to private ips, enter the cidrs here. | -| iceshrimp.deepl.authKey | string | `""` | | -| iceshrimp.deepl.isPro | bool | `false` | | -| iceshrimp.deepl.managed | bool | `false` | | -| iceshrimp.domain | string | `"iceshrimp.local"` | | -| iceshrimp.isManagedHosting | bool | `true` | | -| iceshrimp.libreTranslate.apiKey | string | `""` | | -| iceshrimp.libreTranslate.apiUrl | string | `""` | | -| iceshrimp.libreTranslate.managed | bool | `false` | | -| iceshrimp.objectStorage.access_key | string | `""` | | -| iceshrimp.objectStorage.access_secret | string | `""` | | -| iceshrimp.objectStorage.baseUrl | string | `""` | | -| iceshrimp.objectStorage.bucket | string | `""` | | -| iceshrimp.objectStorage.endpoint | string | `""` | | -| iceshrimp.objectStorage.managed | bool | `true` | | -| iceshrimp.objectStorage.prefix | string | `"files"` | | -| iceshrimp.objectStorage.region | string | `""` | | -| iceshrimp.reservedUsernames[0] | string | `"root"` | | -| iceshrimp.reservedUsernames[1] | string | `"admin"` | | -| iceshrimp.reservedUsernames[2] | string | `"administrator"` | | -| iceshrimp.reservedUsernames[3] | string | `"me"` | | -| iceshrimp.reservedUsernames[4] | string | `"system"` | | -| iceshrimp.smtp.from_address | string | `"notifications@example.com"` | | -| iceshrimp.smtp.login | string | `""` | | -| iceshrimp.smtp.managed | bool | `true` | | -| iceshrimp.smtp.password | string | `""` | | -| iceshrimp.smtp.port | int | `587` | | -| iceshrimp.smtp.server | string | `"smtp.mailgun.org"` | | -| iceshrimp.smtp.useImplicitSslTls | bool | `false` | | +| trashposs.allowedPrivateNetworks | list | `[]` | If you want to allow trashposs to connect to private ips, enter the cidrs here. | +| trashposs.deepl.authKey | string | `""` | | +| trashposs.deepl.isPro | bool | `false` | | +| trashposs.deepl.managed | bool | `false` | | +| trashposs.domain | string | `"trashposs.local"` | | +| trashposs.isManagedHosting | bool | `true` | | +| trashposs.libreTranslate.apiKey | string | `""` | | +| trashposs.libreTranslate.apiUrl | string | `""` | | +| trashposs.libreTranslate.managed | bool | `false` | | +| trashposs.objectStorage.access_key | string | `""` | | +| trashposs.objectStorage.access_secret | string | `""` | | +| trashposs.objectStorage.baseUrl | string | `""` | | +| trashposs.objectStorage.bucket | string | `""` | | +| trashposs.objectStorage.endpoint | string | `""` | | +| trashposs.objectStorage.managed | bool | `true` | | +| trashposs.objectStorage.prefix | string | `"files"` | | +| trashposs.objectStorage.region | string | `""` | | +| trashposs.reservedUsernames[0] | string | `"root"` | | +| trashposs.reservedUsernames[1] | string | `"admin"` | | +| trashposs.reservedUsernames[2] | string | `"administrator"` | | +| trashposs.reservedUsernames[3] | string | `"me"` | | +| trashposs.reservedUsernames[4] | string | `"system"` | | +| trashposs.smtp.from_address | string | `"notifications@example.com"` | | +| trashposs.smtp.login | string | `""` | | +| trashposs.smtp.managed | bool | `true` | | +| trashposs.smtp.password | string | `""` | | +| trashposs.smtp.port | int | `587` | | +| trashposs.smtp.server | string | `"smtp.mailgun.org"` | | +| trashposs.smtp.useImplicitSslTls | bool | `false` | | | elasticsearch | object | `{"auth":{},"enabled":false,"hostname":"","port":9200,"ssl":false}` | https://github.com/bitnami/charts/tree/master/bitnami/elasticsearch#parameters | | fullnameOverride | string | `""` | | | image.pullPolicy | string | `"IfNotPresent"` | | -| image.repository | string | `"iceshrimp.dev/iceshrimp/iceshrimp"` | | +| image.repository | string | `"iceshrimp.dev/Crimekillz/trashposs"` | | | image.tag | string | `""` | | | imagePullSecrets | list | `[]` | | | ingress.annotations | object | `{}` | | @@ -67,9 +67,9 @@ A fun, new, open way to experience social media https://iceshrimp.dev | nodeSelector | object | `{}` | | | podAnnotations | object | `{}` | | | podSecurityContext | object | `{}` | | -| postgresql.auth.database | string | `"iceshrimp_production"` | | +| postgresql.auth.database | string | `"trashposs_production"` | | | postgresql.auth.password | string | `""` | | -| postgresql.auth.username | string | `"iceshrimp"` | | +| postgresql.auth.username | string | `"trashposs"` | | | postgresql.enabled | bool | `true` | disable if you want to use an existing db; in which case the values below must match those of that external postgres instance | | redis.auth.password | string | `""` | you must set a password; the password generated by the redis chart will be rotated on each upgrade: | | redis.enabled | bool | `true` | | diff --git a/chart/templates/NOTES.txt b/chart/templates/NOTES.txt index 3fc45a632..b07edc021 100644 --- a/chart/templates/NOTES.txt +++ b/chart/templates/NOTES.txt @@ -6,16 +6,16 @@ {{- end }} {{- end }} {{- else if contains "NodePort" .Values.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "iceshrimp.fullname" . }}) + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "trashposs.fullname" . }}) export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") echo http://$NODE_IP:$NODE_PORT {{- else if contains "LoadBalancer" .Values.service.type }} NOTE: It may take a few minutes for the LoadBalancer IP to be available. - You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "iceshrimp.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "iceshrimp.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "trashposs.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "trashposs.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") echo http://$SERVICE_IP:{{ .Values.service.port }} {{- else if contains "ClusterIP" .Values.service.type }} - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "iceshrimp.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") + export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "trashposs.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") echo "Visit http://127.0.0.1:8080 to use your application" kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT diff --git a/chart/templates/_helpers.tpl b/chart/templates/_helpers.tpl index 389da29e9..0221f9afa 100644 --- a/chart/templates/_helpers.tpl +++ b/chart/templates/_helpers.tpl @@ -1,7 +1,7 @@ {{/* Expand the name of the chart. */}} -{{- define "iceshrimp.name" -}} +{{- define "trashposs.name" -}} {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} {{- end }} @@ -10,7 +10,7 @@ Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). If release name contains chart name it will be used as a full name. */}} -{{- define "iceshrimp.fullname" -}} +{{- define "trashposs.fullname" -}} {{- if .Values.fullnameOverride }} {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} {{- else }} @@ -26,16 +26,16 @@ If release name contains chart name it will be used as a full name. {{/* Create chart name and version as used by the chart label. */}} -{{- define "iceshrimp.chart" -}} +{{- define "trashposs.chart" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} {{- end }} {{/* Common labels */}} -{{- define "iceshrimp.labels" -}} -helm.sh/chart: {{ include "iceshrimp.chart" . }} -{{ include "iceshrimp.selectorLabels" . }} +{{- define "trashposs.labels" -}} +helm.sh/chart: {{ include "trashposs.chart" . }} +{{ include "trashposs.selectorLabels" . }} {{- if .Chart.AppVersion }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} @@ -45,17 +45,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }} {{/* Selector labels */}} -{{- define "iceshrimp.selectorLabels" -}} -app.kubernetes.io/name: {{ include "iceshrimp.name" . }} +{{- define "trashposs.selectorLabels" -}} +app.kubernetes.io/name: {{ include "trashposs.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} {{- end }} {{/* Create the name of the service account to use */}} -{{- define "iceshrimp.serviceAccountName" -}} +{{- define "trashposs.serviceAccountName" -}} {{- if .Values.serviceAccount.create }} -{{- default (include "iceshrimp.fullname" .) .Values.serviceAccount.name }} +{{- default (include "trashposs.fullname" .) .Values.serviceAccount.name }} {{- else }} {{- default "default" .Values.serviceAccount.name }} {{- end }} @@ -65,31 +65,31 @@ Create the name of the service account to use Create a default fully qualified name for dependent services. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). */}} -{{- define "iceshrimp.elasticsearch.fullname" -}} +{{- define "trashposs.elasticsearch.fullname" -}} {{- printf "%s-%s" .Release.Name "elasticsearch" | trunc 63 | trimSuffix "-" -}} {{- end -}} -{{- define "iceshrimp.redis.fullname" -}} +{{- define "trashposs.redis.fullname" -}} {{- printf "%s-%s" .Release.Name "redis" | trunc 63 | trimSuffix "-" -}} {{- end -}} -{{- define "iceshrimp.postgresql.fullname" -}} +{{- define "trashposs.postgresql.fullname" -}} {{- printf "%s-%s" .Release.Name "postgresql" | trunc 63 | trimSuffix "-" -}} {{- end -}} {{/* config/default.yml content */}} -{{- define "iceshrimp.configDir.default.yml" -}} +{{- define "trashposs.configDir.default.yml" -}} #━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ -# iceshrimp configuration +# trashposs configuration #━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ # ┌─────┐ #───┘ URL └───────────────────────────────────────────────────── # Final accessible URL seen by a user. -url: "https://{{ .Values.iceshrimp.domain }}/" +url: "https://{{ .Values.trashposs.domain }}/" # ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE # URL SETTINGS AFTER THAT! @@ -118,7 +118,7 @@ port: 3000 db: {{- if .Values.postgresql.enabled }} - host: {{ template "iceshrimp.postgresql.fullname" . }} + host: {{ template "trashposs.postgresql.fullname" . }} port: 5432 {{- else }} host: {{ .Values.postgresql.postgresqlHostname }} @@ -146,7 +146,7 @@ db: redis: {{- if .Values.redis.enabled }} - host: {{ template "iceshrimp.redis.fullname" . }}-master + host: {{ template "trashposs.redis.fullname" . }}-master {{- else }} host: {{ required "When the redis chart is disabled .Values.redis.hostname is required" .Values.redis.hostname }} {{- end }} @@ -217,7 +217,7 @@ id: 'aid' #maxCaptionLength: 1500 # Reserved usernames that only the administrator can register with -reservedUsernames: {{ .Values.iceshrimp.reservedUsernames | toJson }} +reservedUsernames: {{ .Values.trashposs.reservedUsernames | toJson }} # Whether disable HSTS #disableHsts: true @@ -264,7 +264,7 @@ reservedUsernames: {{ .Values.iceshrimp.reservedUsernames | toJson }} # Proxy remote files (default: false) #proxyRemoteFiles: true -allowedPrivateNetworks: {{ .Values.iceshrimp.allowedPrivateNetworks | toJson }} +allowedPrivateNetworks: {{ .Values.trashposs.allowedPrivateNetworks | toJson }} # TWA #twa: @@ -284,34 +284,34 @@ allowedPrivateNetworks: {{ .Values.iceshrimp.allowedPrivateNetworks | toJson }} # If you mess this up, that's on you, you've been warned... #maxUserSignups: 100 -isManagedHosting: {{ .Values.iceshrimp.isManagedHosting }} +isManagedHosting: {{ .Values.trashposs.isManagedHosting }} deepl: - managed: {{ .Values.iceshrimp.deepl.managed }} - authKey: {{ .Values.iceshrimp.deepl.authKey | quote}} - isPro: {{ .Values.iceshrimp.deepl.isPro }} + managed: {{ .Values.trashposs.deepl.managed }} + authKey: {{ .Values.trashposs.deepl.authKey | quote}} + isPro: {{ .Values.trashposs.deepl.isPro }} libreTranslate: - managed: {{ .Values.iceshrimp.libreTranslate.managed }} - apiUrl: {{ .Values.iceshrimp.libreTranslate.apiUrl | quote }} - apiKey: {{ .Values.iceshrimp.libreTranslate.apiKey | quote }} + managed: {{ .Values.trashposs.libreTranslate.managed }} + apiUrl: {{ .Values.trashposs.libreTranslate.apiUrl | quote }} + apiKey: {{ .Values.trashposs.libreTranslate.apiKey | quote }} email: - managed: {{ .Values.iceshrimp.smtp.managed }} - address: {{ .Values.iceshrimp.smtp.from_address | quote }} - host: {{ .Values.iceshrimp.smtp.server | quote }} - port: {{ .Values.iceshrimp.smtp.port }} - user: {{ .Values.iceshrimp.smtp.login | quote }} - pass: {{ .Values.iceshrimp.smtp.password | quote }} - useImplicitSslTls: {{ .Values.iceshrimp.smtp.useImplicitSslTls }} + managed: {{ .Values.trashposs.smtp.managed }} + address: {{ .Values.trashposs.smtp.from_address | quote }} + host: {{ .Values.trashposs.smtp.server | quote }} + port: {{ .Values.trashposs.smtp.port }} + user: {{ .Values.trashposs.smtp.login | quote }} + pass: {{ .Values.trashposs.smtp.password | quote }} + useImplicitSslTls: {{ .Values.trashposs.smtp.useImplicitSslTls }} objectStorage: - managed: {{ .Values.iceshrimp.objectStorage.managed }} - baseUrl: {{ .Values.iceshrimp.objectStorage.baseUrl | quote }} - bucket: {{ .Values.iceshrimp.objectStorage.bucket | quote }} - prefix: {{ .Values.iceshrimp.objectStorage.prefix | quote }} - endpoint: {{ .Values.iceshrimp.objectStorage.endpoint | quote }} - region: {{ .Values.iceshrimp.objectStorage.region | quote }} - accessKey: {{ .Values.iceshrimp.objectStorage.access_key | quote }} - secretKey: {{ .Values.iceshrimp.objectStorage.access_secret | quote }} + managed: {{ .Values.trashposs.objectStorage.managed }} + baseUrl: {{ .Values.trashposs.objectStorage.baseUrl | quote }} + bucket: {{ .Values.trashposs.objectStorage.bucket | quote }} + prefix: {{ .Values.trashposs.objectStorage.prefix | quote }} + endpoint: {{ .Values.trashposs.objectStorage.endpoint | quote }} + region: {{ .Values.trashposs.objectStorage.region | quote }} + accessKey: {{ .Values.trashposs.objectStorage.access_key | quote }} + secretKey: {{ .Values.trashposs.objectStorage.access_secret | quote }} useSsl: true connnectOverProxy: false setPublicReadOnUpload: true @@ -327,6 +327,6 @@ objectStorage: {{- end }} -{{- define "iceshrimp.datapvc" -}} -{{- default (printf "%s-data-pvc" (include "iceshrimp.fullname" .) ) .Values.iceshrimp.localStorage.claimName }} +{{- define "trashposs.datapvc" -}} +{{- default (printf "%s-data-pvc" (include "trashposs.fullname" .) ) .Values.trashposs.localStorage.claimName }} {{- end }} diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml index 9485ae7c3..3ad5dd3ed 100644 --- a/chart/templates/deployment.yaml +++ b/chart/templates/deployment.yaml @@ -1,16 +1,16 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "iceshrimp.fullname" . }} + name: {{ include "trashposs.fullname" . }} labels: - {{- include "iceshrimp.labels" . | nindent 4 }} + {{- include "trashposs.labels" . | nindent 4 }} spec: {{- if not .Values.autoscaling.enabled }} replicas: {{ .Values.replicaCount }} {{- end }} selector: matchLabels: - {{- include "iceshrimp.selectorLabels" . | nindent 6 }} + {{- include "trashposs.selectorLabels" . | nindent 6 }} template: metadata: annotations: @@ -19,23 +19,23 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} labels: - {{- include "iceshrimp.selectorLabels" . | nindent 8 }} + {{- include "trashposs.selectorLabels" . | nindent 8 }} spec: {{- with .Values.imagePullSecrets }} imagePullSecrets: {{- toYaml . | nindent 8 }} {{- end }} - serviceAccountName: {{ include "iceshrimp.serviceAccountName" . }} + serviceAccountName: {{ include "trashposs.serviceAccountName" . }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} volumes: - name: config-volume secret: - secretName: {{ template "iceshrimp.fullname" . }}-config + secretName: {{ template "trashposs.fullname" . }}-config - name: data-volume - {{- if .Values.iceshrimp.localStorage.enabled }} + {{- if .Values.trashposs.localStorage.enabled }} persistentVolumeClaim: - claimName: {{ include "iceshrimp.datapvc" . }} + claimName: {{ include "trashposs.datapvc" . }} {{- else }} emptyDir: {{- end }} @@ -54,9 +54,9 @@ spec: value: "production" volumeMounts: - name: config-volume - mountPath: /iceshrimp/.config + mountPath: /trashposs/.config - name: data-volume - mountPath: /iceshrimp/files + mountPath: /trashposs/files ports: - name: http containerPort: 3000 diff --git a/chart/templates/hpa.yaml b/chart/templates/hpa.yaml index 6fe0f89ab..6859cdc47 100644 --- a/chart/templates/hpa.yaml +++ b/chart/templates/hpa.yaml @@ -2,14 +2,14 @@ apiVersion: autoscaling/v2beta1 kind: HorizontalPodAutoscaler metadata: - name: {{ include "iceshrimp.fullname" . }} + name: {{ include "trashposs.fullname" . }} labels: - {{- include "iceshrimp.labels" . | nindent 4 }} + {{- include "trashposs.labels" . | nindent 4 }} spec: scaleTargetRef: apiVersion: apps/v1 kind: Deployment - name: {{ include "iceshrimp.fullname" . }} + name: {{ include "trashposs.fullname" . }} minReplicas: {{ .Values.autoscaling.minReplicas }} maxReplicas: {{ .Values.autoscaling.maxReplicas }} metrics: diff --git a/chart/templates/ingress.yaml b/chart/templates/ingress.yaml index 74d87b78d..68471d83b 100644 --- a/chart/templates/ingress.yaml +++ b/chart/templates/ingress.yaml @@ -1,5 +1,5 @@ {{- if .Values.ingress.enabled -}} -{{- $fullName := include "iceshrimp.fullname" . -}} +{{- $fullName := include "trashposs.fullname" . -}} {{- $svcPort := .Values.service.port -}} {{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} @@ -17,7 +17,7 @@ kind: Ingress metadata: name: {{ $fullName }} labels: - {{- include "iceshrimp.labels" . | nindent 4 }} + {{- include "trashposs.labels" . | nindent 4 }} {{- with .Values.ingress.annotations }} annotations: {{- toYaml . | nindent 4 }} diff --git a/chart/templates/job-db-migrate.yaml b/chart/templates/job-db-migrate.yaml index ac980a2d9..907578a8e 100644 --- a/chart/templates/job-db-migrate.yaml +++ b/chart/templates/job-db-migrate.yaml @@ -1,9 +1,9 @@ apiVersion: batch/v1 kind: Job metadata: - name: {{ include "iceshrimp.fullname" . }}-db-migrate + name: {{ include "trashposs.fullname" . }}-db-migrate labels: - {{- include "iceshrimp.labels" . | nindent 4 }} + {{- include "trashposs.labels" . | nindent 4 }} annotations: "helm.sh/hook": post-install,pre-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded @@ -11,7 +11,7 @@ metadata: spec: template: metadata: - name: {{ include "iceshrimp.fullname" . }}-db-migrate + name: {{ include "trashposs.fullname" . }}-db-migrate {{- with .Values.podAnnotations }} annotations: {{- toYaml . | nindent 8 }} @@ -22,13 +22,13 @@ spec: imagePullSecrets: {{- toYaml . | nindent 8 }} {{- end }} - serviceAccountName: {{ include "iceshrimp.serviceAccountName" . }} + serviceAccountName: {{ include "trashposs.serviceAccountName" . }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} volumes: - name: config-volume secret: - secretName: {{ template "iceshrimp.fullname" . }}-config + secretName: {{ template "trashposs.fullname" . }}-config containers: - name: {{ .Chart.Name }} securityContext: @@ -44,7 +44,7 @@ spec: value: "production" volumeMounts: - name: config-volume - mountPath: /iceshrimp/.config + mountPath: /trashposs/.config {{- with .Values.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} diff --git a/chart/templates/pvc.yaml b/chart/templates/pvc.yaml index 0e44164e7..486c0d832 100644 --- a/chart/templates/pvc.yaml +++ b/chart/templates/pvc.yaml @@ -1,23 +1,23 @@ -{{- if .Values.iceshrimp.localStorage.enabled }} +{{- if .Values.trashposs.localStorage.enabled }} kind: PersistentVolumeClaim apiVersion: v1 metadata: - name: {{ include "iceshrimp.datapvc" . }} + name: {{ include "trashposs.datapvc" . }} labels: - {{- include "iceshrimp.labels" . | nindent 4 }} + {{- include "trashposs.labels" . | nindent 4 }} annotations: - {{- .Values.iceshrimp.localStorage.annotations | toYaml | nindent 4}} + {{- .Values.trashposs.localStorage.annotations | toYaml | nindent 4}} spec: accessModes: - {{- .Values.iceshrimp.localStorage.accessModes | toYaml | nindent 4 }} + {{- .Values.trashposs.localStorage.accessModes | toYaml | nindent 4 }} volumeMode: Filesystem - {{- if .Values.iceshrimp.localStorage.class }} - storageClassName: {{ .Values.iceshrimp.localStorage.class }} + {{- if .Values.trashposs.localStorage.class }} + storageClassName: {{ .Values.trashposs.localStorage.class }} {{- end }} - {{- with .Values.iceshrimp.localStorage.volumeName }} + {{- with .Values.trashposs.localStorage.volumeName }} volumeName: {{ . }} {{- end }} resources: requests: - storage: {{ .Values.iceshrimp.localStorage.size }} + storage: {{ .Values.trashposs.localStorage.size }} {{- end }} diff --git a/chart/templates/secret-config.yaml b/chart/templates/secret-config.yaml index b85942ecf..322558f36 100644 --- a/chart/templates/secret-config.yaml +++ b/chart/templates/secret-config.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: Secret metadata: - name: {{ template "iceshrimp.fullname" . }}-config + name: {{ template "trashposs.fullname" . }}-config labels: - {{- include "iceshrimp.labels" . | nindent 4 }} + {{- include "trashposs.labels" . | nindent 4 }} type: Opaque data: - default.yml: {{ include "iceshrimp.configDir.default.yml" . | b64enc }} + default.yml: {{ include "trashposs.configDir.default.yml" . | b64enc }} diff --git a/chart/templates/service.yaml b/chart/templates/service.yaml index fb7317c3a..435445536 100644 --- a/chart/templates/service.yaml +++ b/chart/templates/service.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "iceshrimp.fullname" . }} + name: {{ include "trashposs.fullname" . }} labels: - {{- include "iceshrimp.labels" . | nindent 4 }} + {{- include "trashposs.labels" . | nindent 4 }} spec: type: {{ .Values.service.type }} ports: @@ -12,4 +12,4 @@ spec: protocol: TCP name: http selector: - {{- include "iceshrimp.selectorLabels" . | nindent 4 }} + {{- include "trashposs.selectorLabels" . | nindent 4 }} diff --git a/chart/templates/serviceaccount.yaml b/chart/templates/serviceaccount.yaml index b2458a287..7f7c4860e 100644 --- a/chart/templates/serviceaccount.yaml +++ b/chart/templates/serviceaccount.yaml @@ -2,9 +2,9 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: {{ include "iceshrimp.serviceAccountName" . }} + name: {{ include "trashposs.serviceAccountName" . }} labels: - {{- include "iceshrimp.labels" . | nindent 4 }} + {{- include "trashposs.labels" . | nindent 4 }} {{- with .Values.serviceAccount.annotations }} annotations: {{- toYaml . | nindent 4 }} diff --git a/chart/templates/tests/test-connection.yaml b/chart/templates/tests/test-connection.yaml index baf0a01eb..9b5a13bfb 100644 --- a/chart/templates/tests/test-connection.yaml +++ b/chart/templates/tests/test-connection.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: Pod metadata: - name: "{{ include "iceshrimp.fullname" . }}-test-connection" + name: "{{ include "trashposs.fullname" . }}-test-connection" labels: - {{- include "iceshrimp.labels" . | nindent 4 }} + {{- include "trashposs.labels" . | nindent 4 }} annotations: "helm.sh/hook": test spec: @@ -11,5 +11,5 @@ spec: - name: wget image: busybox command: ['wget'] - args: ['{{ include "iceshrimp.fullname" . }}:{{ .Values.service.port }}'] + args: ['{{ include "trashposs.fullname" . }}:{{ .Values.service.port }}'] restartPolicy: Never diff --git a/chart/values.yaml b/chart/values.yaml index c4e2a5842..902dff12d 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -1,18 +1,18 @@ -# Default values for iceshrimp. +# Default values for trashposs. # This is a YAML-formatted file. # Declare variables to be passed into your templates. replicaCount: 1 image: - repository: iceshrimp.dev/iceshrimp/iceshrimp + repository: iceshrimp.dev/Crimekillz/trashposs pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. tag: latest -iceshrimp: +trashposs: isManagedHosting: true - domain: iceshrimp.local + domain: trashposs.local deepl: managed: false @@ -54,7 +54,7 @@ iceshrimp: helm.sh/resource-policy: keep size: 10Gi - # -- If you want to allow iceshrimp to connect to private ips, enter the cidrs here. + # -- If you want to allow trashposs to connect to private ips, enter the cidrs here. allowedPrivateNetworks: [] # - "10.0.0.0/8" @@ -73,8 +73,8 @@ postgresql: # postgresqlHostname: preexisting-postgresql # postgresqlPort: 5432 auth: - database: iceshrimp_production - username: iceshrimp + database: trashposs_production + username: trashposs # you must set a password; the password generated by the postgresql chart will # be rotated on each upgrade: # https://github.com/bitnami/charts/tree/master/bitnami/postgresql#upgrade diff --git a/dev/docker-compose.yml.example b/dev/docker-compose.yml.example index 5858cbd28..175b0ff3d 100644 --- a/dev/docker-compose.yml.example +++ b/dev/docker-compose.yml.example @@ -2,9 +2,9 @@ version: "3" services: web: - image: iceshrimp.dev/iceshrimp/iceshrimp:dev + image: iceshrimp.dev/Crimekillz/trashposs:dev build: .. - container_name: iceshrimp_web + container_name: trashposs_web restart: always depends_on: - db @@ -16,12 +16,12 @@ services: - network # - web volumes: - - ../files:/iceshrimp/files - - ../.config:/iceshrimp/.config:ro + - ../files:/trashposs/files + - ../.config:/trashposs/.config:ro redis: restart: always - container_name: iceshrimp_redis + container_name: trashposs_redis image: docker.io/redis:7.0-alpine networks: - network @@ -31,7 +31,7 @@ services: db: restart: always image: docker.io/postgres:12.2-alpine - container_name: iceshrimp_db + container_name: trashposs_db networks: - network env_file: diff --git a/docs/api-doc.md b/docs/api-doc.md index 95986e08c..a946bbded 100644 --- a/docs/api-doc.md +++ b/docs/api-doc.md @@ -1,5 +1,5 @@ # API Documentation -You can find interactive API documentation at any TrashPoss instance. https://iceshrimp.social/api-doc +You can find interactive API documentation at any TrashPoss instance. https://⚧.fm/api-doc You can also find auto-generated documentation for trashposs-js [here](../packages/trashposs-js/markdown/trashposs-js.md). diff --git a/docs/docker.md b/docs/docker.md index a328ee30b..b8a542711 100644 --- a/docs/docker.md +++ b/docs/docker.md @@ -1,7 +1,7 @@ # 🐳 Running a TrashPoss server with Docker ## Pre-built docker container -[iceshrimp/iceshrimp](iceshrimp.dev/iceshrimp/iceshrimp) +[trashposs/trashposs](iceshrimp.dev/Crimekillz/trashposs) ## `docker-compose` @@ -21,15 +21,15 @@ Rename the files: then edit them according to your environment. You can configure `docker.env` with anything you like, but you will have to pay attention to the `default.yml` file: - `url` should be set to the URL you will be hosting the web interface for the server at. -- `host`, `db`, `user`, `pass` will have to be configured in the `PostgreSQL configuration` section - `host` is the name of the postgres container (eg: *iceshrimp_db_1*), and the others should match your `docker.env`. -- `host`will need to be configured in the *Redis configuration* section - it is the name of the redis container (eg: *iceshrimp_redis_1*) +- `host`, `db`, `user`, `pass` will have to be configured in the `PostgreSQL configuration` section - `host` is the name of the postgres container (eg: *trashposs_db_1*), and the others should match your `docker.env`. +- `host`will need to be configured in the *Redis configuration* section - it is the name of the redis container (eg: *trashposs_redis_1*) - `auth` will need to be configured in the *Sonic* section - cannot be the default `SecretPassword` Everything else can be left as-is. ## Running docker-compose -The [prebuilt container for iceshrimp](https://iceshrimp.dev/iceshrimp/-/packages/container/iceshrimp/latest) is fairly large, and may take a few minutes to download and extract using docker. +The [prebuilt container for trashposs](https://iceshrimp.dev/Crimekillz/-/packages/container/trashposs/latest) is fairly large, and may take a few minutes to download and extract using docker. Copy `docker-compose.yml` and the `config/` to a directory, then run the **docker-compose** command: `docker-compose up -d`. diff --git a/docs/examples/Podman (quadlet)/iceshrimp-db.container b/docs/examples/Podman (quadlet)/iceshrimp-db.container deleted file mode 100644 index c2a7999b4..000000000 --- a/docs/examples/Podman (quadlet)/iceshrimp-db.container +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=TrashPoss PostgreSQL container -[Container] -Image=docker.io/postgres:15-alpine -ContainerName=iceshrimp_db -HostName=db -Network=iceshrimp.network -EnvironmentFile=%h/services/iceshrimp/.config/docker.env -Volume=%h/services/iceshrimp/db:/var/lib/postgresql/data:Z -[Service] -Restart=on-failure -TimeoutStartSec=900 -[Install] -WantedBy=iceshrimp-web.service diff --git a/docs/examples/Podman (quadlet)/trashposs-db.container b/docs/examples/Podman (quadlet)/trashposs-db.container new file mode 100644 index 000000000..ed19f601c --- /dev/null +++ b/docs/examples/Podman (quadlet)/trashposs-db.container @@ -0,0 +1,14 @@ +[Unit] +Description=TrashPoss PostgreSQL container +[Container] +Image=docker.io/postgres:15-alpine +ContainerName=trashposs_db +HostName=db +Network=trashposs.network +EnvironmentFile=%h/services/trashposs/.config/docker.env +Volume=%h/services/trashposs/db:/var/lib/postgresql/data:Z +[Service] +Restart=on-failure +TimeoutStartSec=900 +[Install] +WantedBy=trashposs-web.service diff --git a/docs/examples/Podman (quadlet)/iceshrimp-redis.container b/docs/examples/Podman (quadlet)/trashposs-redis.container similarity index 55% rename from docs/examples/Podman (quadlet)/iceshrimp-redis.container rename to docs/examples/Podman (quadlet)/trashposs-redis.container index 0007cdd47..b4fe71188 100644 --- a/docs/examples/Podman (quadlet)/iceshrimp-redis.container +++ b/docs/examples/Podman (quadlet)/trashposs-redis.container @@ -2,13 +2,13 @@ Description=TrashPoss Redis container [Container] Image=docker.io/redis:7.0-alpine -ContainerName=iceshrimp_redis +ContainerName=trashposs_redis HostName=redis -Network=iceshrimp.network -Volume=%h/services/iceshrimp/redis:/data:Z +Network=trashposs.network +Volume=%h/services/trashposs/redis:/data:Z [Service] Restart=on-failure TimeoutStartSec=900 [Install] -WantedBy=iceshrimp-web.service +WantedBy=trashposs-web.service diff --git a/docs/examples/Podman (quadlet)/iceshrimp-web.container b/docs/examples/Podman (quadlet)/trashposs-web.container similarity index 50% rename from docs/examples/Podman (quadlet)/iceshrimp-web.container rename to docs/examples/Podman (quadlet)/trashposs-web.container index 6200e68da..3654b2f34 100644 --- a/docs/examples/Podman (quadlet)/iceshrimp-web.container +++ b/docs/examples/Podman (quadlet)/trashposs-web.container @@ -1,14 +1,14 @@ [Unit] Description=TrashPoss container [Container] -Image=iceshrimp.dev/iceshrimp/iceshrimp:latest -ContainerName=iceshrimp_web +Image=iceshrimp.dev/crimekillz/trashposs:latest +ContainerName=trashposs_web HostName=web PublishPort=3000:3000 -Network=iceshrimp.network +Network=trashposs.network Environment=NODE_ENV=production -Volume=%h/services/iceshrimp/files:/iceshrimp/files:z -Volume=%h/services/iceshrimp/.config:/iceshrimp/.config:ro,z +Volume=%h/services/trashposs/files:/trashposs/files:z +Volume=%h/services/trashposs/.config:/trashposs/.config:ro,z [Service] Restart=on-failure TimeoutStartSec=900 diff --git a/docs/examples/Podman (quadlet)/iceshrimp.network b/docs/examples/Podman (quadlet)/trashposs.network similarity index 100% rename from docs/examples/Podman (quadlet)/iceshrimp.network rename to docs/examples/Podman (quadlet)/trashposs.network diff --git a/docs/examples/Podman (quadlet)/volume-dir-creation.sh b/docs/examples/Podman (quadlet)/volume-dir-creation.sh index b793180db..7136384fd 100755 --- a/docs/examples/Podman (quadlet)/volume-dir-creation.sh +++ b/docs/examples/Podman (quadlet)/volume-dir-creation.sh @@ -1,9 +1,9 @@ #!/bin/bash if [ -d $HOME/.config/containers/systemd ]; then - mkdir -pv $(grep -F "Volume=" $HOME/.config/containers/systemd/iceshrimp-*.container | sed "s|%h|$HOME|g" | cut -d= -f2 | cut -d: -f1); + mkdir -pv $(grep -F "Volume=" $HOME/.config/containers/systemd/trashposs-*.container | sed "s|%h|$HOME|g" | cut -d= -f2 | cut -d: -f1); - db_env=$(grep -F "EnvironmentFile=" $HOME/.config/containers/systemd/iceshrimp-db.container | sed "s|%h|$HOME|g" | cut -d= -f2) - config_dir=$(grep -F ":/iceshrimp/.config" $HOME/.config/containers/systemd/iceshrimp-web.container | sed "s|%h|$HOME|g" | cut -d= -f2 | cut -d: -f1) + db_env=$(grep -F "EnvironmentFile=" $HOME/.config/containers/systemd/trashposs-db.container | sed "s|%h|$HOME|g" | cut -d= -f2) + config_dir=$(grep -F ":/trashposs/.config" $HOME/.config/containers/systemd/trashposs-web.container | sed "s|%h|$HOME|g" | cut -d= -f2 | cut -d: -f1) if [ ! -f $config_dir/docker_example.env ]; then wget -O $db_env \ diff --git a/docs/examples/docker-compose.yml b/docs/examples/docker-compose.yml index 6e3cf7730..e90778dd0 100644 --- a/docs/examples/docker-compose.yml +++ b/docs/examples/docker-compose.yml @@ -10,7 +10,7 @@ services: # context: . # args: # DOCKER_BUILDKIT: 1 - container_name: iceshrimp_web + container_name: trashposs_web restart: unless-stopped depends_on: - db @@ -18,29 +18,29 @@ services: ports: - "3000:3000" networks: - - ishnet + - trashnet # - web environment: NODE_ENV: production volumes: - - ./files:/iceshrimp/files - - ./.config:/iceshrimp/.config:ro + - ./files:/trashposs/files + - ./.config:/trashposs/.config:ro redis: restart: unless-stopped image: docker.io/redis:7.0-alpine - container_name: iceshrimp_redis + container_name: trashposs_redis networks: - - ishnet + - trashnet volumes: - ./redis:/data db: restart: unless-stopped image: docker.io/postgres:12.2-alpine - container_name: iceshrimp_db + container_name: trashposs_db networks: - - ishnet + - trashnet env_file: - .config/docker.env volumes: @@ -53,17 +53,17 @@ services: # tor: # image: sirboops/tor # networks: - # - ishnet + # - trashnet # # privoxy: # image: sirboops/privoxy # volumes: # - ./.config/priv-config:/opt/config # networks: - # - ishnet + # - trashnet networks: - ishnet: + trashnet: # web: # external: # name: web diff --git a/docs/examples/iceshrimp.apache.conf b/docs/examples/trashposs.apache.conf similarity index 100% rename from docs/examples/iceshrimp.apache.conf rename to docs/examples/trashposs.apache.conf diff --git a/docs/examples/iceshrimp.nginx.conf b/docs/examples/trashposs.nginx.conf similarity index 100% rename from docs/examples/iceshrimp.nginx.conf rename to docs/examples/trashposs.nginx.conf diff --git a/docs/examples/iceshrimp.service b/docs/examples/trashposs.service similarity index 69% rename from docs/examples/iceshrimp.service rename to docs/examples/trashposs.service index 27972a95a..7c610e7a7 100644 --- a/docs/examples/iceshrimp.service +++ b/docs/examples/trashposs.service @@ -3,12 +3,12 @@ Description=TrashPoss daemon [Service] Type=simple -User=iceshrimp +User=trashposs ExecStart=/usr/bin/yarn start -WorkingDirectory=/home/iceshrimp/iceshrimp +WorkingDirectory=/home/trashposs/trashposs Environment="NODE_ENV=production" TimeoutSec=60 -SyslogIdentifier=iceshrimp +SyslogIdentifier=trashposs Restart=always [Install] diff --git a/docs/install.md b/docs/install.md index dc28aeeb5..687c42740 100644 --- a/docs/install.md +++ b/docs/install.md @@ -1,6 +1,6 @@ # Installing TrashPoss -This document will guide you through manual installation of TrashPoss. We also provide prebuilt [packages](/iceshrimp/packaging) for various platforms, should you prefer those over a manual install. +This document will guide you through manual installation of TrashPoss. We also provide prebuilt [packages](/trashposs/packaging) for various platforms, should you prefer those over a manual install. ## Dependencies @@ -38,8 +38,8 @@ If you don't want to run the latest development version, pick a version from [he ### Creating a new user -In case you want to run TrashPoss as a different user, run `adduser --disabled-password --disabled-login iceshrimp` -Following steps will require you to run them as the user you have made, so use `su - iceshrimp`, or `sudo -iu iceshrimp`, or whatever else method in order to temporarily log in as that user. +In case you want to run TrashPoss as a different user, run `adduser --disabled-password --disabled-login trashposs` +Following steps will require you to run them as the user you have made, so use `su - trashposs`, or `sudo -iu trashposs`, or whatever else method in order to temporarily log in as that user. ### Configuration @@ -74,10 +74,10 @@ Using `psql` prompt: sudo -u postgres psql ``` ```postgresql -create database iceshrimp with encoding = 'UTF8'; -create user iceshrimp with encrypted password '{YOUR_PASSWORD}'; -grant all privileges on database iceshrimp to iceshrimp; -alter database iceshrimp owner to iceshrimp; +create database trashposs with encoding = 'UTF8'; +create user trashposs with encrypted password '{YOUR_PASSWORD}'; +grant all privileges on database trashposs to trashposs; +alter database trashposs owner to trashposs; \q ``` @@ -98,9 +98,9 @@ For optimal database performance, it's highly recommended to configure PostgreSQ ### Nginx -- Run `sudo cp docs/examples/iceshrimp.nginx.conf /etc/nginx/sites-available/ && cd /etc/nginx/sites-available/` -- Edit `iceshrimp.nginx.conf` to reflect your server properly -- Run `sudo ln -s ./iceshrimp.nginx.conf ../sites-enabled/iceshrimp.nginx.conf` +- Run `sudo cp docs/examples/trashposs.nginx.conf /etc/nginx/sites-available/ && cd /etc/nginx/sites-available/` +- Edit `trashposs.nginx.conf` to reflect your server properly +- Run `sudo ln -s ./trashposs.nginx.conf ../sites-enabled/trashposs.nginx.conf` - Run `sudo nginx -t` to check that the config is valid, then restart the nginx service. ### Caddy @@ -122,11 +122,11 @@ If this is your first run, after TrashPoss has started successfully, you'll be a ### Running using systemd -- Run `sudo cp docs/examples/iceshrimp.service /etc/systemd/system/` -- Edit `/etc/systemd/system/iceshrimp.service` with text editor, and change `User`, `WorkingDir`, `ExecStart` if necessary. +- Run `sudo cp docs/examples/trashposs.service /etc/systemd/system/` +- Edit `/etc/systemd/system/trashposs.service` with text editor, and change `User`, `WorkingDir`, `ExecStart` if necessary. - Run `sudo systemctl daemon-reload` -- Run `sudo systemctl enable --now iceshrimp` in order to enable and start TrashPoss. -- (Optional) Check if instance is running using `sudo systemctl status iceshrimp` +- Run `sudo systemctl enable --now trashposs` in order to enable and start TrashPoss. +- (Optional) Check if instance is running using `sudo systemctl status trashposs` ### Environment variables - `ICESHRIMP_CONFIG` (default: `.config/default.yml`) to change where the the config file is located @@ -138,7 +138,7 @@ Make sure you are specifying absolute paths when setting environment variables. ### Updating TrashPoss -Before you start, if you cloned the iceshrimp repository before the Git LFS migration, please follow [these instructions](https://iceshrimp.dev/iceshrimp/iceshrimp/wiki/Git-LFS#fixing-up-a-preexisting-cloned-repo) to get your repository back in sync. +Before you start, if you cloned the trashposs repository before the Git LFS migration, please follow [these instructions](https://iceshrimp.dev/Crimekillz/trashposs/wiki/Git-LFS#fixing-up-a-preexisting-cloned-repo) to get your repository back in sync. First, stop the TrashPoss service and then run the following commands: diff --git a/docs/kubernetes.md b/docs/kubernetes.md index 2a0e2e037..16552dffd 100644 --- a/docs/kubernetes.md +++ b/docs/kubernetes.md @@ -1,7 +1,7 @@ -# Running a iceshrimp server with Kubernetes and Helm +# Running a trashposs server with Kubernetes and Helm This is a [Helm](https://helm.sh/) chart directory in the root of the project -that you can use to deploy iceshrimp to a Kubernetes cluster +that you can use to deploy trashposs to a Kubernetes cluster ## Deployment @@ -17,29 +17,29 @@ helm dependency list $dir 2> /dev/null | tail +2 | head -n -1 | awk '{ print "he cd ../ ``` -3. Create the iceshrimp helm release (also used to update existing deployment): +3. Create the trashposs helm release (also used to update existing deployment): ```shell helm upgrade \ --install \ - --namespace iceshrimp \ + --namespace trashposs \ --create-namespace \ - iceshrimp chart/ \ + trashposs chart/ \ -f .config/helm_values.yml ``` -4. Watch your iceshrimp server spin up: +4. Watch your trashposs server spin up: ```shell -kubectl -n iceshrimp get po -w +kubectl -n trashposs get po -w ``` 5. Initial the admin user and managed config: ```shell -export iceshrimp_USERNAME="my_desired_admin_handle" && \ -export iceshrimp_PASSWORD="myDesiredInitialPassword" && \ -export iceshrimp_HOST="iceshrimp.example.com" && \ -export iceshrimp_TOKEN=$(curl -X POST https://$iceshrimp_HOST/api/admin/accounts/create -H "Content-Type: application/json" -d "{ \"username\":\"$iceshrimp_USERNAME\", \"password\":\"$iceshrimp_PASSWORD\" }" | jq -r '.token') && \ -echo "Save this token: ${iceshrimp_TOKEN}" && \ -curl -X POST -H "Authorization: Bearer $iceshrimp_TOKEN" https://$iceshrimp_HOST/api/admin/accounts/hosted +export trashposs_USERNAME="my_desired_admin_handle" && \ +export trashposs_PASSWORD="myDesiredInitialPassword" && \ +export trashposs_HOST="trashposs.example.com" && \ +export trashposs_TOKEN=$(curl -X POST https://$trashposs_HOST/api/admin/accounts/create -H "Content-Type: application/json" -d "{ \"username\":\"$trashposs_USERNAME\", \"password\":\"$trashposs_PASSWORD\" }" | jq -r '.token') && \ +echo "Save this token: ${trashposs_TOKEN}" && \ +curl -X POST -H "Authorization: Bearer $trashposs_TOKEN" https://$trashposs_HOST/api/admin/accounts/hosted ``` 6. Enjoy! diff --git a/docs/nix-development.md b/docs/nix-development.md index caf0c408a..19274c26a 100644 --- a/docs/nix-development.md +++ b/docs/nix-development.md @@ -38,5 +38,5 @@ the build scripts DO actually set the permissions, it just needs to work in wsl. We don't anticipate any problems with the environment, as it is kept stable and does not require much maintainence. -Nevertheless, if you do encounter nix-specific problems and are unable to solve these problems yourself, please join the [Matrix support Channel](https://matrix.to/#/%23iceshrimp-dev:161.rocks) +Nevertheless, if you do encounter nix-specific problems and are unable to solve these problems yourself, please join the [Matrix support Channel](https://matrix.to/#/%23trashposs-dev:161.rocks) and ping @Pyrox with the specific error message you encounter. diff --git a/docs/podman-install.md b/docs/podman-install.md index 113a46cba..b2c1d3ada 100644 --- a/docs/podman-install.md +++ b/docs/podman-install.md @@ -17,7 +17,7 @@ mkdir -p $HOME/.config/containers/systemd cp "trashposs/docs/examples/Podman (quadlet)"/* $HOME/.config/containers/systemd ``` -Tweak quadlet files and change the image tag in `$HOME/.config/containers/systemd/iceshrimp-web.container` from `latest` to `dev` or `pre` if desired, and run `docs/examples/Podman\ \(quadlet\)/volume-dir-creation.sh`. +Tweak quadlet files and change the image tag in `$HOME/.config/containers/systemd/trashposs-web.container` from `latest` to `dev` or `pre` if desired, and run `docs/examples/Podman\ \(quadlet\)/volume-dir-creation.sh`. If you want to build your own images: @@ -29,7 +29,7 @@ cp "trashposs/docs/examples/Podman (quadlet)"/* $HOME/.config/containers/systemd ``` -Tweak quadlet files if needed, change content of `Image:` line in `$HOME/.config/containers/systemd/iceshrimp-web.container` to `Image: localhost/crimekillz/trashposs:latest`, and run `docs/examples/Podman\ \(quadlet\)/volume-dir-creation.sh`. +Tweak quadlet files if needed, change content of `Image:` line in `$HOME/.config/containers/systemd/trashposs-web.container` to `Image: localhost/crimekillz/trashposs:latest`, and run `docs/examples/Podman\ \(quadlet\)/volume-dir-creation.sh`. ### .config @@ -46,9 +46,9 @@ Choose a method, whether you chose to build the image yourself or not. ### Pulling the image ```sh -podman pull $(grep -F "Image=" $HOME/.config/containers/systemd/iceshrimp-web.container | cut -d= -f2) +podman pull $(grep -F "Image=" $HOME/.config/containers/systemd/trashposs-web.container | cut -d= -f2) systemctl --user daemon-reload -systemctl --user start iceshrimp-web.service +systemctl --user start trashposs-web.service ``` ### Building the image @@ -56,9 +56,9 @@ systemctl --user start iceshrimp-web.service Enter TrashPoss repo and run: ```sh -podman build . -t $(grep -F "Image=" $HOME/.config/containers/systemd/iceshrimp-web.container | cut -d= -f2) --ulimit nofile=16384:16384 +podman build . -t $(grep -F "Image=" $HOME/.config/containers/systemd/trashposs-web.container | cut -d= -f2) --ulimit nofile=16384:16384 systemctl --user daemon-reload -systemctl --user start iceshrimp-web.service +systemctl --user start trashposs-web.service ``` ## Starting TrashPoss automatically @@ -70,8 +70,8 @@ Run `sudo loginctl enable-linger [user]` and TrashPoss will start automatically ### Pulling the image ```sh -podman pull $(grep -F "Image=" $HOME/.config/containers/systemd/iceshrimp-web.container | cut -d= -f2) -systemctl --user restart iceshrimp-web.service +podman pull $(grep -F "Image=" $HOME/.config/containers/systemd/trashposs-web.container | cut -d= -f2) +systemctl --user restart trashposs-web.service ``` ### Building the image @@ -81,12 +81,12 @@ systemctl --user restart iceshrimp-web.service git stash git pull git stash pop -podman build . -t $(grep -F "Image=" $HOME/.config/containers/systemd/iceshrimp-web.container | cut -d= -f2) --ulimit nofile=16384:16384 -systemctl --user restart iceshrimp-web.service +podman build . -t $(grep -F "Image=" $HOME/.config/containers/systemd/trashposs-web.container | cut -d= -f2) --ulimit nofile=16384:16384 +systemctl --user restart trashposs-web.service ``` ## Post-install -If you are running TrashPoss on a system with more than one CPU thread, you might want to set the `clusterLimit` config option to about half of your thread count, depending on your system configuration. Please note that each worker requires around 10 PostgreSQL connections, so be sure to set `max_connections` appropriately. To do this, change `max_connections=n` line in `db/postgresql.conf`, with `n` being `(10 * no_workers) + 10`, and run `systemctl --user restart iceshrimp-db iceshrimp-web`. +If you are running TrashPoss on a system with more than one CPU thread, you might want to set the `clusterLimit` config option to about half of your thread count, depending on your system configuration. Please note that each worker requires around 10 PostgreSQL connections, so be sure to set `max_connections` appropriately. To do this, change `max_connections=n` line in `db/postgresql.conf`, with `n` being `(10 * no_workers) + 10`, and run `systemctl --user restart trashposs-db trashposs-web`. See also [post-install](post-install.md). diff --git a/docs/post-install.md b/docs/post-install.md index fbe24d02e..bee62f984 100644 --- a/docs/post-install.md +++ b/docs/post-install.md @@ -34,9 +34,9 @@ Recommended if using Docker - Go to desired user's page, click 3 dots in upper right corner > About > Moderation, turn on "Moderator" - Go back to Overview and copy their ID -- Run `psql -d iceshrimp`, replace `iceshrimp` with a name of your database if needed - - If instance is ran by a different system user: Prepend that command with `sudo -U iceshrimp`, replace `iceshrimp` with a name of that user if needed - - Docker Compose users: `docker compose exec db psql -d iceshrimp -U iceshrimp`, replace both `iceshrimp` with name of your db, and username owning that db respectively, if needed +- Run `psql -d trashposs`, replace `trashposs` with a name of your database if needed + - If instance is ran by a different system user: Prepend that command with `sudo -U trashposs`, replace `trashposs` with a name of that user if needed + - Docker Compose users: `docker compose exec db psql -d trashposs -U trashposs`, replace both `trashposs` with name of your db, and username owning that db respectively, if needed - Run `UPDATE "user" SET "isAdmin" = true WHERE id='999999';`, where `999999` is the copied ID of that user - Restart your TrashPoss server diff --git a/docs/sharkey.sql b/docs/sharkey.sql index 83ba14e9b..477462b6c 100644 --- a/docs/sharkey.sql +++ b/docs/sharkey.sql @@ -1,11 +1,11 @@ -- Sharkey 2024.3.1 to TrashPoss 2023.12.5 migration script -- by @kopper@brain.d.on-t.work -- only tested with aidx, theoretical support for aid and meid. other id schemes are NOT supported. --- servers which have migrated from firefish and iceshrimp to sharkey may encounter undefined behavior, as +-- servers which have migrated from firefish and trashposs to sharkey may encounter undefined behavior, as -- - sharkey's migration steps do not attempt to clean up unused firefish-exclusive data, meaning your database schema may have columns this script doesn't expect -- - re-generating createdAt data from cuid2 is untested (though it *may* end up working with the default length of 16 characters) -- no warranty, you're on your own if anything breaks. --- make sure to run this script from the same postgres user as iceshrimp, otherwise you'll encounter permission errors +-- make sure to run this script from the same postgres user as trashposs, otherwise you'll encounter permission errors BEGIN; -- createdAt generation functions @@ -242,7 +242,7 @@ CREATE EXTENSION IF NOT EXISTS pg_trgm; ALTER TYPE antenna_src_enum ADD VALUE 'group'; ALTER TYPE antenna_src_enum ADD VALUE 'instances'; --- DIFFERENCE: sharkey antenna_src_enum contains 'users_blacklist', not present on iceshrimp +-- DIFFERENCE: sharkey antenna_src_enum contains 'users_blacklist', not present on trashposs DROP TYPE meta_sensitivemediadetection_enum CASCADE; DROP TYPE meta_sensitivemediadetectionsensitivity_enum CASCADE; @@ -493,7 +493,7 @@ ALTER TABLE meta ALTER COLUMN "objectStorageAccessKey" TYPE character varying(51 ALTER TABLE meta ALTER COLUMN "objectStorageSecretKey" TYPE character varying(512); ALTER TABLE meta ALTER COLUMN "hcaptchaSiteKey" TYPE character varying(64); ALTER TABLE meta ALTER COLUMN "hcaptchaSecretKey" TYPE character varying(64); -ALTER TABLE meta ADD COLUMN "pinnedPages" character varying(512)[] DEFAULT '{/featured,/channels,/explore,/pages,/about-iceshrimp}'::character varying[] NOT NULL; +ALTER TABLE meta ADD COLUMN "pinnedPages" character varying(512)[] DEFAULT '{/featured,/channels,/explore,/pages,/about-trashposs}'::character varying[] NOT NULL; ALTER TABLE meta ALTER COLUMN "backgroundImageUrl" TYPE character varying(512); ALTER TABLE meta ALTER COLUMN "logoImageUrl" TYPE character varying(512); ALTER TABLE meta ADD COLUMN "pinnedClipId" character varying(32); @@ -739,7 +739,7 @@ CREATE INDEX "IDX_note_url" ON note USING btree (url); CREATE INDEX "IDX_note_userId_id" ON note USING btree ("userId", id); CREATE INDEX note_text_fts_idx ON note USING gin (text gin_trgm_ops); -DROP INDEX "IDX_NOTE_FILE_IDS" CASCADE; -- the iceshrimp index is a btree, this one is gin, so can't just rename! +DROP INDEX "IDX_NOTE_FILE_IDS" CASCADE; -- the trashposs index is a btree, this one is gin, so can't just rename! DROP INDEX "IDX_de22cd2b445eee31ae51cdbe99" CASCADE; -- ON public.user_profile USING btree (substr((birthday)::text, 6, 5)); DROP INDEX "IDX_f7b9d338207e40e768e4a5265a" CASCADE; -- ON public.instance USING btree ("caughtAt"); @@ -1021,7 +1021,7 @@ COPY migrations (id, "timestamp", name) FROM stdin; 188 1688845537045 AnnouncementPopup1688845537045 189 1689136347561 DonationLink1689136347561 190 1689739513827 FirefishRepo1689739513827 -191 1689965609061 IceshrimpRepo1689965609061 +191 1689965609061 TrashpossRepo1689965609061 192 1695747439252 DropReversi1695747439252 193 1695748502971 IndexNoteUrl1695748502971 194 1695748874491 DropAds1695748874491 diff --git a/flake.nix b/flake.nix index 84b959158..eea3cf71f 100644 --- a/flake.nix +++ b/flake.nix @@ -26,7 +26,7 @@ shells = { # The default shell, used by nix-direnv default = { - name = "iceshrimp-dev-shell"; + name = "trashposs-dev-shell"; # Add additional packages to our environment packages = [ pkgs.python3 @@ -56,12 +56,12 @@ enable = true; package = pkgs.postgresql_12; initialDatabases = [{ - name = "iceshrimp"; + name = "trashposs"; }]; initialScript = '' - CREATE USER iceshrimp WITH PASSWORD 'iceshrimp'; - ALTER USER iceshrimp WITH SUPERUSER; - GRANT ALL ON DATABASE iceshrimp TO iceshrimp; + CREATE USER trashposs WITH PASSWORD 'trashposs'; + ALTER USER trashposs WITH SUPERUSER; + GRANT ALL ON DATABASE trashposs TO trashposs; ''; listen_addresses = "127.0.0.1"; port = 5432; diff --git a/locales/ar-SA.yml b/locales/ar-SA.yml index 0c7e35df5..8b5c1069f 100644 --- a/locales/ar-SA.yml +++ b/locales/ar-SA.yml @@ -1,7 +1,7 @@ --- _lang_: "العربية" -headlineIceshrimp: "شبكة مرتبطة بالملاحظات" -introIceshrimp: "اهلا بك! ميسكي هو منصة تدوين مصغر لا مركزية ومفتوحة المصدر.\nيمكنك مشاركة \"ملاحظات\" عن ما يجري حولك، وإخبار الجميع عن نفسك 📡\nتسمح لك \"الانفعالات\" بتعبير عن شعورك حول ملاحظات الآخرين 👍\nاكتشف عالمًا جديدًا 🚀" +headlineTrashposs: "شبكة مرتبطة بالملاحظات" +introTrashposs: "اهلا بك! ميسكي هو منصة تدوين مصغر لا مركزية ومفتوحة المصدر.\nيمكنك مشاركة \"ملاحظات\" عن ما يجري حولك، وإخبار الجميع عن نفسك 📡\nتسمح لك \"الانفعالات\" بتعبير عن شعورك حول ملاحظات الآخرين 👍\nاكتشف عالمًا جديدًا 🚀" monthAndDay: "{day}/{month}" search: "البحث" notifications: "الإشعارات" @@ -371,7 +371,7 @@ exploreFediverse: "استكشف الفديفرس" popularTags: "الوسوم الرائجة" userList: "القوائم" about: "عن" -aboutIceshrimp: "عن TrashPoss" +aboutTrashposs: "عن TrashPoss" administrator: "المدير" token: "الرمز المميز" twoStepAuthentication: "الإستيثاق بعاملَيْن" @@ -754,7 +754,7 @@ hashtags: "الوسوم" troubleshooting: "استكشاف الأخطاء وإصلاحها" useBlurEffect: "استخدم تأثير الطمس في الواجهة" learnMore: "راجع المزيد" -iceshrimpUpdated: "حُدث ميسكي!" +trashpossUpdated: "حُدث ميسكي!" whatIsNew: "اعرض التغييرات" translate: "ترجم" translatedFrom: "تُرجم من {x}" @@ -854,7 +854,7 @@ _registry: keys: "المفاتيح" domain: "النّطاق" createKey: "أنشئ مفتاحًا" -_aboutIceshrimp: +_aboutTrashposs: about: "ميسكي هو برمجية مفتوحة المصدر يطورها syuilo منذ 2014." contributors: "المساهمون الرئيسيون" allContributors: "كل المساهمين" diff --git a/locales/bn-BD.yml b/locales/bn-BD.yml index 7daa0227e..1057a4ac9 100644 --- a/locales/bn-BD.yml +++ b/locales/bn-BD.yml @@ -1,7 +1,7 @@ --- _lang_: "বাংলা" -headlineIceshrimp: "নোট ব্যাবহার করে সংযুক্ত নেটওয়ার্ক" -introIceshrimp: "স্বাগতম! মিসকি একটি ওপেন সোর্স, ডিসেন্ট্রালাইজড মাইক্রোব্লগিং পরিষেবা। \n\"নোট\" তৈরির মাধ্যমে যা ঘটছে তা সবার সাথে শেয়ার করুন 📡\n\"রিঅ্যাকশন\" গুলির মাধ্যমে যেকোনো নোট সম্পর্কে আপনার অনুভূতি ব্যাক্ত করতে পারেন 👍\nএকটি নতুন দুনিয়া ঘুরে দেখুন 🚀\n" +headlineTrashposs: "নোট ব্যাবহার করে সংযুক্ত নেটওয়ার্ক" +introTrashposs: "স্বাগতম! মিসকি একটি ওপেন সোর্স, ডিসেন্ট্রালাইজড মাইক্রোব্লগিং পরিষেবা। \n\"নোট\" তৈরির মাধ্যমে যা ঘটছে তা সবার সাথে শেয়ার করুন 📡\n\"রিঅ্যাকশন\" গুলির মাধ্যমে যেকোনো নোট সম্পর্কে আপনার অনুভূতি ব্যাক্ত করতে পারেন 👍\nএকটি নতুন দুনিয়া ঘুরে দেখুন 🚀\n" monthAndDay: "{day}/{month}" search: "খুঁজুন" notifications: "বিজ্ঞপ্তি" @@ -376,7 +376,7 @@ exploreFediverse: "Fediverse ঘুরে দেখুন" popularTags: "জনপ্রিয় ট্যাগগুলি" userList: "লিস্ট" about: "আপনার সম্পর্কে" -aboutIceshrimp: "TrashPoss সম্পর্কে" +aboutTrashposs: "TrashPoss সম্পর্কে" administrator: "প্রশাসক" token: "টোকেন" twoStepAuthentication: "২-ধাপ প্রমাণীকরণ" @@ -785,7 +785,7 @@ hashtags: "হ্যাশট্যাগ" troubleshooting: "ট্রাবলশুটিং" useBlurEffect: "UI তে ব্লার ইফেক্ট ব্যাবহার করুন" learnMore: "আরও জানুন" -iceshrimpUpdated: "TrashPoss আপডেট করা হয়েছে！" +trashpossUpdated: "TrashPoss আপডেট করা হয়েছে！" whatIsNew: "পরিবর্তনগুলি দেখান" translate: "অনুবাদ" translatedFrom: "{x} হতে অনুবাদ করা" @@ -895,7 +895,7 @@ _registry: keys: "কী - সমূহ" domain: "ডোমেন" createKey: "কী বানান" -_aboutIceshrimp: +_aboutTrashposs: about: "TrashPoss, একটি ওপেন সোর্স সফ্টওয়্যার যা 2014 সাল থেকে syuilo তৈরি করছেন।" contributors: "প্রধান কন্ট্রিবিউটারগণ" allContributors: "সকল কন্ট্রিবিউটারগণ" diff --git a/locales/bul-BG.yml b/locales/bul-BG.yml index e703020d9..5f6312671 100644 --- a/locales/bul-BG.yml +++ b/locales/bul-BG.yml @@ -232,9 +232,9 @@ noteOf: Публикация от {user} unavailable: Не е свободно passwordMatched: Съвпада unmarkAsSensitive: Отмаркиране като деликатно -introIceshrimp: Добре дошли! TrashPoss е децентрализирана социална медийна платформа +introTrashposs: Добре дошли! TrashPoss е децентрализирана социална медийна платформа с отворен код, която е безплатна завинаги! 🚀 -headlineIceshrimp: Децентрализирана социална медийна платформа с отворен код, която +headlineTrashposs: Децентрализирана социална медийна платформа с отворен код, която е безплатна завинаги! 🚀 searchPlaceholder: Търсене във Федивселената pin: Закачане в профила @@ -450,7 +450,7 @@ _pages: pageSetting: Настройки на страницата editThisPage: Редактиране на тази страница updated: Страницата е редактирана успешно -aboutIceshrimp: Относно TrashPoss +aboutTrashposs: Относно TrashPoss token: Токен moderator: Модератор moderation: Модерация @@ -479,7 +479,7 @@ translate: Превеждане translatedFrom: Преведено от {x} whatIsNew: Показване на промените searchResult: Резултати от търсенето -_aboutIceshrimp: +_aboutTrashposs: translation: Преводи contributors: Основни сътрудници source: TrashPoss разработка diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml index 3cc6da65f..b7521a1fb 100644 --- a/locales/ca-ES.yml +++ b/locales/ca-ES.yml @@ -1,7 +1,7 @@ _lang_: "Català" -headlineIceshrimp: "Una xarxa social de codi obert, descentralitzada i gratuïta per +headlineTrashposs: "Una xarxa social de codi obert, descentralitzada i gratuïta per a sempre! 🚀" -introIceshrimp: "Benvinguts! TrashPoss és una plataforma social de codi obert, descentralitzada +introTrashposs: "Benvinguts! TrashPoss és una plataforma social de codi obert, descentralitzada i gratuïta per a sempre! 🚀" monthAndDay: "{day}/{month}" search: "Cerca" @@ -1227,7 +1227,7 @@ connectedTo: Aquest(s) compte(s) estan connectats silenceConfirm: Segur que vols posa en silenci aquest usuari? unsilence: Desfés posar en silenci unsilenceConfirm: Segur que vols treure el silenci a aquest usuari? -aboutIceshrimp: Sobre TrashPoss +aboutTrashposs: Sobre TrashPoss twoStepAuthentication: Autentificació de dos factors moderator: Moderador moderation: Moderació @@ -1552,7 +1552,7 @@ searchResult: Resultats de la cerca hashtags: Etiquetes troubleshooting: Resolució de problemes learnMore: Més informació -iceshrimpUpdated: TrashPoss s'ha actualitzat! +trashpossUpdated: TrashPoss s'ha actualitzat! translate: Tradueix translatedFrom: Traduït per {x} aiChanMode: Ai-chan a la interfície d'usuari clàssica @@ -1592,7 +1592,7 @@ cannotUploadBecauseNoFreeSpace: La pujada ha fallat a causa de la manca d'espai enableAutoSensitive: Marcar automàticament com sensible moveTo: Mou el compte actual al compte nou customKaTeXMacro: Macros KaTeX personalitzats -_aboutIceshrimp: +_aboutTrashposs: contributors: Col·laboradors principals allContributors: Tots els col·laboradors donate: Fes una donació a TrashPoss @@ -1606,7 +1606,7 @@ _aboutIceshrimp: patronsList: Llistats cronològicament, no per la quantitat donada. Fes una donació amb l'enllaç de dalt per veure el teu nom aquí! donateTitle: T'agrada TrashPoss? - pleaseDonateToIceshrimp: Penseu en fer una donació a TrashPoss per donar suport + pleaseDonateToTrashposs: Penseu en fer una donació a TrashPoss per donar suport al seu desenvolupament. pleaseDonateToHost: Penseu també en fer una donació a la vostre instància, {host}, per ajudar-lo a suportar els costos de funcionament. diff --git a/locales/cs-CZ.yml b/locales/cs-CZ.yml index 1431fbf23..dc4f698cf 100644 --- a/locales/cs-CZ.yml +++ b/locales/cs-CZ.yml @@ -1,6 +1,6 @@ _lang_: "Čeština" -headlineIceshrimp: "Síť propojená poznámkami" -introIceshrimp: "Vítejte! TrashPoss je otevřený a decentralizovaný microblogový servis.\n\ +headlineTrashposs: "Síť propojená poznámkami" +introTrashposs: "Vítejte! TrashPoss je otevřený a decentralizovaný microblogový servis.\n\ \"Poznámkami\" můžete sdílet co se zrovna děje se všemi ve Vašem okolí. \U0001F4E1\ \nPomocí \"reakcí\" můžete sdílet své názory a pocity na ostatní poznámky. \U0001F44D\ \nPojďte objevovat nový svět! \U0001F680" @@ -347,7 +347,7 @@ recentlyUpdatedUsers: "Nedávno aktívni uživatelé" popularTags: "Populární tagy" userList: "Seznamy" about: "Informace" -aboutIceshrimp: "O TrashPoss" +aboutTrashposs: "O TrashPoss" administrator: "Administrátor" token: "Token" twoStepAuthentication: "Dvoufaktorová autentikace" @@ -646,7 +646,7 @@ _registry: keys: "Klíče" domain: "Doména" createKey: "Vytvořit klíč" -_aboutIceshrimp: +_aboutTrashposs: allContributors: "Všichni přispěvatelé" source: "Zdrojový kód" _mfm: diff --git a/locales/da-DK.yml b/locales/da-DK.yml index ef474eb7d..3c610a311 100644 --- a/locales/da-DK.yml +++ b/locales/da-DK.yml @@ -157,9 +157,9 @@ pageLoadErrorDescription: Dette er normalt på grund af netværksproblemer eller browser's cache. Prøv at ryd cachen og så gentage efter et styk tid. serverIsDead: Serveren svarer ikke. Vær sød at vente et styk tid og prøv igen. editWidgetsExit: Færdig -headlineIceshrimp: En åben-kildekode, decentraliseret social-media platform som er frit +headlineTrashposs: En åben-kildekode, decentraliseret social-media platform som er frit forevigt! 🚀 -introIceshrimp: Velkommen! TrashPoss er en åbent-kildekode, decentraliseret social-media +introTrashposs: Velkommen! TrashPoss er en åbent-kildekode, decentraliseret social-media platform som er frit forevigt!🚀 enableEmojiReactions: Aktivere emoji reaktioner unsuspendConfirm: Er du sikker på at du vil ikke suspendere denne konto endnu længere? diff --git a/locales/de-DE.yml b/locales/de-DE.yml index 5034fe2be..d664557e1 100644 --- a/locales/de-DE.yml +++ b/locales/de-DE.yml @@ -1,7 +1,7 @@ _lang_: "Deutsch" -headlineIceshrimp: "Eine dezentralisierte Open-Source Social Media Plattform, die +headlineTrashposs: "Eine dezentralisierte Open-Source Social Media Plattform, die für immer gratis bleibt! 🚀" -introIceshrimp: "Willkommen! TrashPoss ist eine dezentralisierte Open-Source Social +introTrashposs: "Willkommen! TrashPoss ist eine dezentralisierte Open-Source Social Media Plattform, die für immer gratis bleibt!🚀" monthAndDay: "{month}/{day}" search: "Suchen" @@ -155,7 +155,7 @@ cacheRemoteFilesDescription: "Ist diese Einstellung deaktiviert, so werden Datei flagAsBot: "Dieses Nutzerkonto als Bot 🤖 kennzeichnen" flagAsBotDescription: "Aktiviere diese Option, falls dieses Nutzerkonto durch ein Programm gesteuert wird. Falls aktiviert, agiert es als Flag für andere Entwickler - zur Verhinderung von endlosen Kettenreaktionen mit anderen Bots und lässt Iceshrimps + zur Verhinderung von endlosen Kettenreaktionen mit anderen Bots und lässt Trashposss interne Systeme dieses Nutzerkonto als Bot behandeln." flagAsCat: "Bist du eine Katze? 😺" flagAsCatDescription: "Du bekommst Katzenohren und sprichst wie eine Katze!" @@ -419,7 +419,7 @@ exploreFediverse: "Das Fediverse erkunden" popularTags: "Beliebte Schlagwörter" userList: "Liste" about: "Über" -aboutIceshrimp: "Über TrashPoss" +aboutTrashposs: "Über TrashPoss" administrator: "Administrator" token: "Token" twoStepAuthentication: "Zwei-Faktor-Authentifizierung" @@ -875,7 +875,7 @@ hashtags: "Hashtags" troubleshooting: "Problembehandlung" useBlurEffect: "Weichzeichnungseffekt in der Benutzeroberfläche verwenden" learnMore: "Mehr erfahren" -iceshrimpUpdated: "TrashPoss wurde aktualisiert!" +trashpossUpdated: "TrashPoss wurde aktualisiert!" whatIsNew: "Änderungen anzeigen" translate: "Übersetzen" translatedFrom: "Aus {x} übersetzt" @@ -1090,7 +1090,7 @@ _registry: keys: "Schlüssel" domain: "Domain" createKey: "Schlüssel erstellen" -_aboutIceshrimp: +_aboutTrashposs: about: "TrashPoss ist ein Fork von Iceshrimp, der seit 2024 von Crimekillz entwickelt wird." contributors: "Hauptmitwirkende" diff --git a/locales/el-GR.yml b/locales/el-GR.yml index ce1293f61..0c7cb7185 100644 --- a/locales/el-GR.yml +++ b/locales/el-GR.yml @@ -568,9 +568,9 @@ yourAccountSuspendedTitle: Αυτός ο λογαριασμός έχει απο leaveConfirm: Υπάρχουν αλλαγές που δεν έχουν σωθεί. Θέλετε να τις απορρίψετε; height: Ύψος edit: Επεξεργασία -headlineIceshrimp: Μία ανοιχτού λογισμικού, αποκεντρωμένη πλατφόρμα κοινωνικής δικτύωσης +headlineTrashposs: Μία ανοιχτού λογισμικού, αποκεντρωμένη πλατφόρμα κοινωνικής δικτύωσης που θα είναι για πάντα ελεύθερη! 🚀 -introIceshrimp: Καλώς ήρθατε! Το TrashPoss είναι μία ανοιχτού λογισμικού, αποκεντρωμένη +introTrashposs: Καλώς ήρθατε! Το TrashPoss είναι μία ανοιχτού λογισμικού, αποκεντρωμένη πλατφόρμα κοινωνικής δικτύωσης που θα είναι για πάντα ελεύθερη! 🚀 markAsSensitive: Επισήμανση ως Ευαίσθητο Περιεχόμενο (NSFW) autoAcceptFollowed: Αυτόματη έγκριση αιτημάτων ακολούθησης από λογαριασμούς που ακολουθείτε @@ -762,7 +762,7 @@ dayOverDayChanges: Αλλαγές την τελευταία ημέρα promotion: Προμοταρισμένα promote: Προμοτάρισμα squareAvatars: Εμφάνιση τετραγωνισμένων άβαταρ -aboutIceshrimp: Σχετικά με το TrashPoss +aboutTrashposs: Σχετικά με το TrashPoss maintainerName: Προγραμματιστής/στρια uploadFromUrlRequested: Το ανέβασμα ζητήθηκε themeForLightMode: Θέμα για τη Φωτεινή Λειτουργία diff --git a/locales/en-US.yml b/locales/en-US.yml index a2aacba9a..f7fb45ef2 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -1,7 +1,7 @@ _lang_: "English" -headlineIceshrimp: "An open source, decentralized social media platform that's free +headlineTrashposs: "An open source, decentralized social media platform that's free forever! 🚀" -introIceshrimp: "Welcome! TrashPoss is an open source, decentralized social media +introTrashposs: "Welcome! TrashPoss is an open source, decentralized social media platform that's free forever! 🚀" monthAndDay: "{month}/{day}" search: "Search" @@ -445,7 +445,7 @@ exploreFediverse: "Explore the Fediverse" popularTags: "Popular tags" userList: "Lists" about: "About" -aboutIceshrimp: "About TrashPoss" +aboutTrashposs: "About TrashPoss" administrator: "Administrator" token: "Token" twoStepAuthentication: "Two-factor authentication" @@ -915,7 +915,7 @@ hashtags: "Hashtags" troubleshooting: "Troubleshooting" useBlurEffect: "Use blur effects in the UI" learnMore: "Learn more" -iceshrimpUpdated: "TrashPoss has been updated!" +trashpossUpdated: "TrashPoss has been updated!" whatIsNew: "Show changes" translate: "Translate" translatedFrom: "Translated from {x}" @@ -1444,7 +1444,7 @@ _registry: keys: "Keys" domain: "Domain" createKey: "Create key" -_aboutIceshrimp: +_aboutTrashposs: about: "TrashPoss is yet another fork of Iceshrimp, bringing you nonsense fixes, features & improvements you didn't know you wanted since 2024." contributors: "Main contributors" @@ -1457,7 +1457,7 @@ _aboutIceshrimp: changelog: "Changelog" donate: "Donate to TrashPoss" donateTitle: "Enjoying TrashPoss?" - pleaseDonateToIceshrimp: "Please consider donating to TrashPoss to support its development." + pleaseDonateToTrashposs: "Please consider donating to TrashPoss to support its development." pleaseDonateToHost: "Please also consider donating to your home server, {host}, to help support its operation costs." donateHost: "Donate to {host}" diff --git a/locales/es-ES.yml b/locales/es-ES.yml index 2c9ca1584..d5ba68683 100644 --- a/locales/es-ES.yml +++ b/locales/es-ES.yml @@ -1,7 +1,7 @@ _lang_: "Español" -headlineIceshrimp: "¡Una plataforma de código abierto para redes sociales descentralizadas, +headlineTrashposs: "¡Una plataforma de código abierto para redes sociales descentralizadas, gratis para siempre! 🚀" -introIceshrimp: "¡Bienvenido! ¡TrashPoss es una plataforma de código abierto para +introTrashposs: "¡Bienvenido! ¡TrashPoss es una plataforma de código abierto para redes sociales descentralizadas, gratis para siempre! 🚀" monthAndDay: "{day}/{month}" search: "Buscar" @@ -405,7 +405,7 @@ exploreFediverse: "Explorar el fediverso" popularTags: "Etiquetas populares" userList: "Listas" about: "Información" -aboutIceshrimp: "Sobre TrashPoss" +aboutTrashposs: "Sobre TrashPoss" administrator: "Administrador" token: "Token" twoStepAuthentication: "Autenticación de dos factores" @@ -856,7 +856,7 @@ hashtags: "Hashtags" troubleshooting: "Solución de problemas" useBlurEffect: "Utilizar efecto de desenfoque en la interfaz" learnMore: "Ver más" -iceshrimpUpdated: "¡Iceshrimp ha sido actualizado!" +trashpossUpdated: "¡Trashposs ha sido actualizado!" whatIsNew: "Mostrar cambios" translate: "Traducir" translatedFrom: "Traducido de {x}" @@ -1060,7 +1060,7 @@ _registry: keys: "Claves" domain: "Dominio" createKey: "Crear clave" -_aboutIceshrimp: +_aboutTrashposs: about: "TrashPoss es una bifurcación de Misskey, trayéndote arreglos sin-sinsentidos, funciones y mejoras que realmente quieres desde 2023." contributors: "Principales colaboradores" @@ -1076,7 +1076,7 @@ _aboutIceshrimp: roadmap: Hoja de ruta changelog: Registro de cambios donateTitle: ¿Te gusta TrashPoss? - pleaseDonateToIceshrimp: Por favor, considera donar a TrashPoss para apoyar su desarrollo. + pleaseDonateToTrashposs: Por favor, considera donar a TrashPoss para apoyar su desarrollo. pleaseDonateToHost: Considera tambien donar a tu servidor, {host}, para ayudar con los costes de operar. donateHost: Donar a {host} diff --git a/locales/fi.yml b/locales/fi.yml index d5e38b7ce..4d8e86707 100644 --- a/locales/fi.yml +++ b/locales/fi.yml @@ -55,7 +55,7 @@ attachCancel: Poista liite enterFileName: Anna tiedostonimi mute: Hiljennä unmute: Poista hiljennys -headlineIceshrimp: Avoimen lähdekoodin, hajautettu sosiaalisen median alusta, joka on +headlineTrashposs: Avoimen lähdekoodin, hajautettu sosiaalisen median alusta, joka on ikuisesti ilmainen! 🚀 monthAndDay: '{day}/{month}' deleteAndEditConfirm: Oletko varma, että haluat poistaa tämän lähetyksen ja muokata @@ -127,7 +127,7 @@ cacheRemoteFiles: Taltioi etätiedostot välimuistiin flagAsBot: Merkitse tili botiksi flagAsBotDescription: Ota tämä vaihtoehto käyttöön, jos tätä tiliä ohjaa ohjelma. Jos se on käytössä, se toimii lippuna muille kehittäjille, jotta estetään loputtomat - vuorovaikutusketjut muiden bottien kanssa ja säädetään Iceshrimpn sisäiset järjestelmät + vuorovaikutusketjut muiden bottien kanssa ja säädetään Trashpossn sisäiset järjestelmät käsittelemään tätä tiliä botina. flagAsCat: Oletko kissa? 🐱 flagAsCatDescription: Saat kissan korvat ja puhut kuin kissa! @@ -214,7 +214,7 @@ perDay: Päivässä version: Versio statistics: Tilastot clearQueueConfirmTitle: Oletko varma, että haluat tyhjentää jonon? -introIceshrimp: Tervetuloa! TrashPoss on avoimen lähdekoodin, hajautettu sosiaalisen median +introTrashposs: Tervetuloa! TrashPoss on avoimen lähdekoodin, hajautettu sosiaalisen median alusta, joka on ikuisesti ilmainen! 🚀 clearQueueConfirmText: Mitkään välittämättömät lähetykset, jotka ovat jonossa, eivät federoidu. Yleensä tätä toimintoa ei tarvita. @@ -472,7 +472,7 @@ silence: Hiljennä popularTags: Suositut tagit userList: Listat about: Tietoja -aboutIceshrimp: Tietoja Iceshrimpstä +aboutTrashposs: Tietoja Trashpossstä exploreFediverse: Tutustu fediverseen recentlyUpdatedUsers: Vastikään lisätyt käyttäjät recentlyRegisteredUsers: Uudet liittyneet jäyttäjät @@ -618,7 +618,7 @@ sort: Järjestä ascendingOrder: Nousevasti scratchpadDescription: Raaputusalusta tarjoaa ympäristön AiScript-kokeiluja varten. Voit kirjoittaa, suorittaa ja tarkistaa sen tulokset vuorovaikutuksessa siinä olevan - Iceshrimpn kanssa. + Trashpossn kanssa. script: Skripti disablePagesScript: Poista AiScript käytöstä sivuilla updateRemoteUser: Päivitä etäkäyttäjän tiedot @@ -800,14 +800,14 @@ smtpSecure: Käytä implisiittistä SSL/TLS:ää SMTP-yhteyksissä useGlobalSettingDesc: Jos se on päällä, käytetään tilisi ilmoitusasetuksia. Jos se on pois päältä, voit tehdä yksilöllisiä asetuksia. public: Julkinen -i18nInfo: Vapaaehtoiset kääntävät Iceshrimpta eri kielille. Voit auttaa osoitteessa +i18nInfo: Vapaaehtoiset kääntävät Trashpossta eri kielille. Voit auttaa osoitteessa {link}. lockedAccountInfo: Ellet aseta postauksen näkyvyydeksi "Vain seuraajille", postauksesi näkyvät kaikille, vaikka vaatisitkin seuraajilta manuaalista hyväksyntää. sendErrorReportsDescription: "Kun tämä on päällä, yksityiskohtaiset virhetiedot jaetaan\ - \ Iceshrimpn kanssa ongelman ilmetessä, mikä auttaa parantamaan Iceshrimpn laatua.\n\ + \ Trashpossn kanssa ongelman ilmetessä, mikä auttaa parantamaan Trashpossn laatua.\n\ Näihin tietoihin sisältyy esimerkiksi käyttöjärjestelmäversio, käyttämäsi selain,\ - \ toimintasi Iceshrimpssä jne." + \ toimintasi Trashpossssä jne." createdAt: Luotu youAreRunningUpToDateClient: Käytössäsi on asiakasohjelman uusin versio. needReloadToApply: Uudelleenlataus vaaditaan, jotta tämä näkyy. @@ -882,7 +882,7 @@ squareAvatars: Näytä neliön malliset kuvakkeet seperateRenoteQuote: Erilliset buustaa ja lainaa -napit sent: Lähetetty useBlurEffect: Käytä blur-efektejä käyttöliittymässä -iceshrimpUpdated: TrashPoss on päivitetty! +trashpossUpdated: TrashPoss on päivitetty! whatIsNew: Näytä muutokset translate: Käännä translatedFrom: Käännetty kielestä {x} diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml index 2d9aca2e9..780a1f516 100644 --- a/locales/fr-FR.yml +++ b/locales/fr-FR.yml @@ -1,7 +1,7 @@ _lang_: "Français" -headlineIceshrimp: "Une plateforme de réseaux sociaux décentralisé, libre pour toujours +headlineTrashposs: "Une plateforme de réseaux sociaux décentralisé, libre pour toujours ! 🚀" -introIceshrimp: "Bienvenue ! TrashPoss est un service de microblogage décentralisé, +introTrashposs: "Bienvenue ! TrashPoss est un service de microblogage décentralisé, libre et ouvert.\nPubliez des textes et médias dans le fédiverse 📡\nBoostez et/ou citez les publications les plus intéressantes 📣\nAjoutez des réactions par émojis aux publications des autres utilisateur·rice·s ❤️⭐️👍🎉🤣" @@ -412,7 +412,7 @@ exploreFediverse: "Explorer le Fediverse" popularTags: "Mots-clés populaires" userList: "Listes" about: "Informations" -aboutIceshrimp: "À propos de TrashPoss" +aboutTrashposs: "À propos de TrashPoss" administrator: "Administrateur·rice" token: "Jeton" twoStepAuthentication: "Authentification à deux facteurs" @@ -865,7 +865,7 @@ hashtags: "Hashtags" troubleshooting: "Résolution de problèmes" useBlurEffect: "Utiliser des effets de flou dans l’interface" learnMore: "Plus d’informations" -iceshrimpUpdated: "TrashPoss a été mis à jour !" +trashpossUpdated: "TrashPoss a été mis à jour !" whatIsNew: "Voir les derniers changements" translate: "Traduire" translatedFrom: "Traduit depuis {x}" @@ -992,7 +992,7 @@ _registry: keys: "Clés" domain: "Domaine" createKey: "Créer une clé" -_aboutIceshrimp: +_aboutTrashposs: about: "TrashPoss est un média social décentralisé et fédéré utilisant ActivityPub.\n\ C'est un fork de Calckey/Firefish (lui-même fork de Misskey) qui se concentre sur la stabilité, les performances et la facilité d'utilisation plutôt que sur @@ -1007,7 +1007,7 @@ _aboutIceshrimp: changelog: "Changelog" donate: "Soutenir TrashPoss" donateTitle: TrashPoss vous plaît ? - pleaseDonateToIceshrimp: Merci de considérer de faire un don pour soutenir le développement + pleaseDonateToTrashposs: Merci de considérer de faire un don pour soutenir le développement de TrashPoss. pleaseDonateToHost: Également, veuillez envisager de faire un don à votre instance d’accueil, {host}, pour contribuer à couvrir ses frais de fonctionnement. diff --git a/locales/gl.yml b/locales/gl.yml index c6f304410..0e266db8b 100644 --- a/locales/gl.yml +++ b/locales/gl.yml @@ -1,5 +1,5 @@ _lang_: Inglés -introIceshrimp: Benvida! TrashPoss é unha plataforma de medios sociais de código aberto, +introTrashposs: Benvida! TrashPoss é unha plataforma de medios sociais de código aberto, descentralizada e gratuíta para sempre!🚀 monthAndDay: '{day}/{month}' notifications: Notificacións @@ -8,7 +8,7 @@ forgotPassword: Esquecín o contrasinal gotIt: Vale! cancel: Cancelar noThankYou: Non, grazas -headlineIceshrimp: Plataforma de medios sociais de código aberto e descentralizada, +headlineTrashposs: Plataforma de medios sociais de código aberto e descentralizada, gratuíta para sempre!🚀 search: Buscar searchPlaceholder: Buscar en TrashPoss diff --git a/locales/id-ID.yml b/locales/id-ID.yml index 3f88e066a..bc38c28c4 100644 --- a/locales/id-ID.yml +++ b/locales/id-ID.yml @@ -1,6 +1,6 @@ _lang_: "Bahasa Indonesia" -headlineIceshrimp: "Jaringan terhubung melalui catatan" -introIceshrimp: "Selamat datang! TrashPoss adalah perangkat mikroblog tercatu bersifat\ +headlineTrashposs: "Jaringan terhubung melalui catatan" +introTrashposs: "Selamat datang! TrashPoss adalah perangkat mikroblog tercatu bersifat\ \ sumber terbuka.\nMulailah menuliskan catatan, bagikan peristiwa terkini, serta\ \ ceritakan segala tentangmu.\U0001F4E1\nTunjukkan juga reaksimu pada catatan pengguna\ \ lain.\U0001F44D\nMari jelajahi dunia baru\U0001F680" @@ -409,7 +409,7 @@ exploreFediverse: "Jelajahi Fediverse" popularTags: "Tag populer" userList: "Daftar" about: "Informasi" -aboutIceshrimp: "Tentang TrashPoss" +aboutTrashposs: "Tentang TrashPoss" administrator: "Admin" token: "Token" twoStepAuthentication: "Otentikasi dua faktor" @@ -861,7 +861,7 @@ hashtags: "Tagar" troubleshooting: "Penyelesaian Masalah" useBlurEffect: "Gunakan efek blur pada antarmuka" learnMore: "Pelajari lebih lanjut" -iceshrimpUpdated: "TrashPoss telah dimutakhirkan!" +trashpossUpdated: "TrashPoss telah dimutakhirkan!" whatIsNew: "Lihat perubahan pemutakhiran" translate: "Terjemahkan" translatedFrom: "Terjemahkan dari {x}" @@ -987,7 +987,7 @@ _registry: keys: "Kunci" domain: "Domain" createKey: "Buat kunci" -_aboutIceshrimp: +_aboutTrashposs: about: "TrashPoss adalah perangkat lunak sumber terbuka yang sedang dikembangkan oleh\ \ syuilo sejak 2014." contributors: "Kontributor utama" @@ -1230,7 +1230,7 @@ _tutorial: step3_3: "Isilah di dalam modal dan tekan tombol pada atas kanan untuk memcatat\ \ catatan kamu." step3_4: "Bingung tidak berpikiran untuk mengatakan sesuatu? Coba saja \"baru aja\ - \ ikutan bikin akun iceshrimp punyaku\"!" + \ ikutan bikin akun trashposs punyaku\"!" step4_1: "Selesai mencatat catatan pertamamu?" step4_2: "Horee! Sekarang catatan pertamamu sudah ditampilkan di linimasa milikmu." step5_1: "Sekarang, mari mencoba untuk membuat linimasamu lebih hidup dengan mengikuti\ diff --git a/locales/it-IT.yml b/locales/it-IT.yml index 4ffd5d40e..9135f2917 100644 --- a/locales/it-IT.yml +++ b/locales/it-IT.yml @@ -1,6 +1,6 @@ _lang_: "Italiano" -headlineIceshrimp: "Rete collegata tramite note" -introIceshrimp: "Benvenut@! TrashPoss è un servizio di microblogging decentralizzato, +headlineTrashposs: "Rete collegata tramite note" +introTrashposs: "Benvenut@! TrashPoss è un servizio di microblogging decentralizzato, libero e aperto. \nScrivi \"note\" per condividere ciò che sta succedendo adesso o per dire a tutti qualcosa di te. 📡\nGrazie alla funzione \"reazioni\" puoi anche mandare reazioni rapide alle note delle altre persone del Fediverso. 👍\nEsplora @@ -401,7 +401,7 @@ exploreFediverse: "Esplora il Fediverso" popularTags: "Tag di tendenza" userList: "Liste" about: "Informazioni" -aboutIceshrimp: "Informazioni di TrashPoss" +aboutTrashposs: "Informazioni di TrashPoss" administrator: "Amministratore" token: "Token" twoStepAuthentication: "Autenticazione a due fattori" @@ -835,7 +835,7 @@ hashtags: "Hashtag" troubleshooting: "Risoluzione problemi" useBlurEffect: "Utilizza effetto sfocatura per l'interfaccia utente" learnMore: "Più dettagli" -iceshrimpUpdated: "TrashPoss è stato aggiornato!" +trashpossUpdated: "TrashPoss è stato aggiornato!" whatIsNew: "Visualizza le informazioni sull'aggiornamento" translate: "Traduzione" translatedFrom: "Tradotto da {x}" @@ -930,7 +930,7 @@ _registry: keys: "Dati" domain: "Dominio" createKey: "Crea chiave" -_aboutIceshrimp: +_aboutTrashposs: about: "TrashPoss è un software libero e open source, sviluppato da syuilo dal 2014." contributors: "Principali sostenitori" allContributors: "Tutti i sostenitori" diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 590cdb972..5c56f6b5f 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1,6 +1,6 @@ _lang_: "日本語" -headlineIceshrimp: "ずっと無料でオープンソースの非中央集権型ソーシャルメディアプラットフォーム🚀" -introIceshrimp: "ようこそ！TrashPossは、オープンソースの非中央集権型ソーシャルメディアプラットフォームです。\nいま起こっていることを共有したり、あなたについて皆に発信しましょう📡\n\ +headlineTrashposs: "ずっと無料でオープンソースの非中央集権型ソーシャルメディアプラットフォーム🚀" +introTrashposs: "ようこそ！TrashPossは、オープンソースの非中央集権型ソーシャルメディアプラットフォームです。\nいま起こっていることを共有したり、あなたについて皆に発信しましょう📡\n\ 「リアクション」機能で、皆の投稿に素早く反応を追加できます👍\n新しい世界を探検しよう🚀" monthAndDay: "{month}月 {day}日" search: "検索" @@ -146,7 +146,7 @@ settingGuide: "おすすめ設定" cacheRemoteFiles: "リモートのファイルをキャッシュする" cacheRemoteFilesDescription: "この設定を無効にすると、リモートファイルをキャッシュせず直リンクします。サーバーのストレージを節約できますが、サムネイルが生成されないので通信量が増加します。" flagAsBot: "Botとして設定" -flagAsBotDescription: "このアカウントがBotである場合は、この設定をオンにします。オンにすると、反応の連鎖を防ぐためのフラグとして他の開発者に役立ったり、Iceshrimpのシステム上での扱いがBotに合ったものになります。" +flagAsBotDescription: "このアカウントがBotである場合は、この設定をオンにします。オンにすると、反応の連鎖を防ぐためのフラグとして他の開発者に役立ったり、Trashpossのシステム上での扱いがBotに合ったものになります。" flagAsCat: "あなたは…猫？😺" flagAsCatDescription: "このアカウントが猫であることを示す猫モードを有効にするには、このフラグをオンにします。" flagSpeakAsCat: "猫語で話す" @@ -213,7 +213,7 @@ noInstances: "サーバーがありません" editProfile: "プロフィールを編集" noteDeleteConfirm: "この投稿を削除しますか？" pinLimitExceeded: "これ以上ピン留めできません" -intro: "Iceshrimpのインストールが完了しました！管理者アカウントを作成しましょう。" +intro: "Trashpossのインストールが完了しました！管理者アカウントを作成しましょう。" done: "完了" processing: "処理中" preview: "プレビュー" @@ -396,7 +396,7 @@ exploreFediverse: "Fediverseを探索" popularTags: "人気のタグ" userList: "リスト" about: "情報" -aboutIceshrimp: "Iceshrimpについて" +aboutTrashposs: "Trashpossについて" administrator: "管理者" token: "トークン" twoStepAuthentication: "二段階認証" @@ -543,7 +543,7 @@ sort: "ソート" ascendingOrder: "昇順" descendingOrder: "降順" scratchpad: "スクラッチパッド" -scratchpadDescription: "スクラッチパッドは、AiScriptの実験環境を提供します。Iceshrimpと対話するコードの記述、実行、結果の確認ができます。" +scratchpadDescription: "スクラッチパッドは、AiScriptの実験環境を提供します。Trashpossと対話するコードの記述、実行、結果の確認ができます。" output: "出力" script: "スクリプト" disablePagesScript: "ページのスクリプトを無効にする" @@ -672,7 +672,7 @@ createNewClip: "新しいクリップを作成" unclip: "クリップ解除" confirmToUnclipAlreadyClippedNote: "この投稿はすでにクリップ「{name}」に含まれています。投稿をこのクリップから除外しますか？" public: "公開" -i18nInfo: "Iceshrimpは有志によって様々な言語に翻訳されています。{link}で翻訳に協力できます。" +i18nInfo: "Trashpossは有志によって様々な言語に翻訳されています。{link}で翻訳に協力できます。" manageAccessTokens: "アクセストークンの管理" accountInfo: "アカウント情報" notesCount: "投稿の数" @@ -723,7 +723,7 @@ onlineUsersCount: "{n}人がオンライン" nUsers: "{n}ユーザー" nNotes: "{n}投稿" sendErrorReports: "エラーリポートを送信" -sendErrorReportsDescription: "オンにすると、問題が発生したときにエラーの詳細情報がIceshrimpに共有され、ソフトウェアの品質向上に役立てられます。\n\ +sendErrorReportsDescription: "オンにすると、問題が発生したときにエラーの詳細情報がTrashpossに共有され、ソフトウェアの品質向上に役立てられます。\n\ エラー情報には、OSのバージョン、ブラウザの種類、行動履歴などが含まれます。" myTheme: "マイテーマ" backgroundColor: "背景" @@ -824,7 +824,7 @@ hashtags: "ハッシュタグ" troubleshooting: "トラブルシューティング" useBlurEffect: "UIにぼかし効果を使用" learnMore: "詳しく" -iceshrimpUpdated: "Iceshrimpが更新されました！" +trashpossUpdated: "Trashpossが更新されました！" whatIsNew: "更新情報を見る" translate: "翻訳" translatedFrom: "{x}から翻訳" @@ -943,7 +943,7 @@ customMOTDDescription: "ユーザがページをロード/リロードするた customSplashIcons: "カスタムスプラッシュスクリーンアイコン" customSplashIconsDescription: "ユーザがページをロード/リロードするたびにランダムに表示される、改行で区切られたカスタムスプラッシュスクリーンアイコンの URL。画像は静的なURLで、できればすべて192x192にリサイズしてください。" -showUpdates: "Iceshrimpの更新時にポップアップを表示する" +showUpdates: "Trashpossの更新時にポップアップを表示する" recommendedInstances: "おすすめサーバー" recommendedInstancesDescription: "おすすめタイムラインに表示するサーバーを改行区切りで入力してください。" caption: "自動キャプション" @@ -951,7 +951,7 @@ splash: "スプラッシュスクリーン" updateAvailable: "アップデートがありますよ！" swipeOnDesktop: "デスクトップでモバイルスタイルのスワイプを可能にする" logoImageUrl: "ロゴのURL" -showAdminUpdates: "新しいIceshrimpのバージョンが利用可能なときに通知する(管理者のみ)" +showAdminUpdates: "新しいTrashpossのバージョンが利用可能なときに通知する(管理者のみ)" replayTutorial: "もう一度チュートリアルを見る" migration: "アカウントの引っ越し" moveTo: "このアカウントを新しいアカウントに引っ越す" @@ -976,7 +976,7 @@ customKaTeXMacroDescription: "数式入力を楽にするためのマクロを enableCustomKaTeXMacro: "カスタムKaTeXマクロを有効にする" preventAiLearning: "AIによる学習を防止" preventAiLearningDescription: "投稿したノート、添付した画像などのコンテンツを学習の対象にしないようAIに要求します。これはnoaiフラグをHTMLレスポンスに含めることによって実現されます。" -noGraze: "ブラウザの拡張機能「Graze for Mastodon」は、Iceshrimpの動作を妨げるため、無効にしてください。" +noGraze: "ブラウザの拡張機能「Graze for Mastodon」は、Trashpossの動作を妨げるため、無効にしてください。" enableServerMachineStats: "サーバーのマシン情報を公開する" enableIdenticonGeneration: "ユーザーごとのIdenticon生成を有効にする" showPopup: "ポップアップを表示してユーザーに知らせる" @@ -1275,28 +1275,28 @@ _registry: keys: "キー" domain: "ドメイン" createKey: "キーを作成" -_aboutIceshrimp: - about: "Iceshrimpは、2022年に生まれたThatOneCalculatorによるIceshrimpのforkです。" +_aboutTrashposs: + about: "Trashpossは、2022年に生まれたThatOneCalculatorによるTrashpossのforkです。" contributors: "主なコントリビューター" allContributors: "全てのコントリビューター" source: "ソースコード" - translation: "Iceshrimpを翻訳" - donate: "Iceshrimpに寄付" + translation: "Trashpossを翻訳" + donate: "Trashpossに寄付" morePatrons: "他にも多くの方が支援してくれています。ありがとうございます！ 🥰" patrons: "支援者" patronsList: 寄付額ではなく時系列順に並んでいます。上記のリンクから寄付を行ってここにあなたのIDを載せましょう！ - pleaseDonateToIceshrimp: Iceshrimp開発への寄付をご検討ください。 + pleaseDonateToTrashposs: Trashposs開発への寄付をご検討ください。 pleaseDonateToHost: また、このサーバー {host} の運営者への寄付もご検討ください。 donateHost: '{host} に寄付する' - donateTitle: Iceshrimpを気に入りましたか？ + donateTitle: Trashpossを気に入りましたか？ _nsfw: respect: "閲覧注意のメディアは隠す" ignore: "閲覧注意のメディアを隠さない" force: "常にメディアを隠す" _mfm: cheatSheet: "MFMチートシート" - intro: "MFMは、IceshrimpやIceshrimp、Akkomaなどの様々な場所で使用できるマークアップ言語です。ここでは、MFMで使用可能な構文一覧が確認できます。" - dummy: "IceshrimpでFediverseの世界が広がります" + intro: "MFMは、TrashpossやTrashposs、Akkomaなどの様々な場所で使用できるマークアップ言語です。ここでは、MFMで使用可能な構文一覧が確認できます。" + dummy: "TrashpossでFediverseの世界が広がります" mention: "メンション" mentionDescription: "アットマーク + ユーザー名で、特定のユーザーを示せます。" hashtag: "ハッシュタグ" @@ -1518,7 +1518,7 @@ _time: hour: "時間" day: "日" _tutorial: - title: "Iceshrimpの使い方" + title: "Trashpossの使い方" step1_1: "ようこそ！" step1_2: "使い始める前に、いくつか設定を済ませましょう。すぐできますよ！" step2_1: "最初に、あなたのプロフィールを作りましょう。" @@ -1536,8 +1536,8 @@ _tutorial: step5_6: "おすすめ{icon}タイムラインでは、管理人がおすすめするサーバーの投稿を見られます。" step5_7: "グローバル{icon}タイムラインでは、接続している他のすべてのサーバーからの投稿を見られます。" step6_1: "じゃあ、ここはどんな場所なの？" - step6_2: "実は、あなたはただIceshrimpに参加しただけではありません。ここは、何千もの相互接続されたサーバーが構成する Fediverse への入口です。" - step6_3: "それぞれのサーバーでは必ずしもIceshrimpが使われているわけではなく、異なる動作をするサーバーもあります。しかし、あなたは他のサーバーのアカウントもフォローしたり、返信・ブーストができます。一見難しそうですが大丈夫！すぐ慣れます。" + step6_2: "実は、あなたはただTrashpossに参加しただけではありません。ここは、何千もの相互接続されたサーバーが構成する Fediverse への入口です。" + step6_3: "それぞれのサーバーでは必ずしもTrashpossが使われているわけではなく、異なる動作をするサーバーもあります。しかし、あなたは他のサーバーのアカウントもフォローしたり、返信・ブーストができます。一見難しそうですが大丈夫！すぐ慣れます。" step6_4: "これで完了です。お楽しみください！" _2fa: alreadyRegistered: "既に設定は完了しています。" @@ -2119,7 +2119,7 @@ apps: "アプリ" _experiments: title: 試験的な機能 postImportsCaption: - ユーザーが過去の投稿をIceshrimp・Iceshrimp・Mastodon・Akkoma・Pleromaからインポートすることを許可します。キューが溜まっているときにインポートするとサーバーに負荷がかかる可能性があります。 + ユーザーが過去の投稿をTrashposs・Trashposs・Mastodon・Akkoma・Pleromaからインポートすることを許可します。キューが溜まっているときにインポートするとサーバーに負荷がかかる可能性があります。 enablePostImports: 投稿のインポートを有効にする sendModMail: モデレーション通知を送る deleted: 削除済み @@ -2134,7 +2134,7 @@ accessibility: アクセシビリティ jumpToPrevious: 前に戻る cw: 閲覧注意 silencedWarning: スパムの可能性があるため、これらのユーザーが所属するサーバーは管理者によりサイレンスされています。 -searchPlaceholder: Iceshrimpを検索 +searchPlaceholder: Trashpossを検索 channelFederationWarn: 現時点では、チャンネルは他のサーバーへ連合しません listsDesc: リストでは指定したユーザーだけのタイムラインを作れます。リストには「タイムライン」のページからアクセスできます。 antennasDesc: "アンテナでは指定した条件に合致する投稿が表示されます。\nアンテナには「タイムライン」のページからアクセスできます。" diff --git a/locales/ja-KS.yml b/locales/ja-KS.yml index d00e8abb4..6ca149660 100644 --- a/locales/ja-KS.yml +++ b/locales/ja-KS.yml @@ -1,7 +1,7 @@ --- _lang_: "日本語 (関西弁)" -headlineIceshrimp: "ノートでつながるネットワーク" -introIceshrimp: "ようお越し！TrashPossは、オープンソースの分散型マイクロブログサービスやねん。\n「ノート」を作って、いま起こっとることを共有したり、あんたについて皆に発信しよう📡\n「リアクション」機能で、皆のノートに素早く反応を追加したりもできるで✌\nほな新しい世界を探検しよか🚀" +headlineTrashposs: "ノートでつながるネットワーク" +introTrashposs: "ようお越し！TrashPossは、オープンソースの分散型マイクロブログサービスやねん。\n「ノート」を作って、いま起こっとることを共有したり、あんたについて皆に発信しよう📡\n「リアクション」機能で、皆のノートに素早く反応を追加したりもできるで✌\nほな新しい世界を探検しよか🚀" monthAndDay: "{month}月 {day}日" search: "探す" notifications: "通知" @@ -139,7 +139,7 @@ settingGuide: "ええ感じの設定" cacheRemoteFiles: "リモートのファイルをキャッシュする" cacheRemoteFilesDescription: "この設定を切っとくと、リモートファイルをキャッシュせず直リンクするようになるで。サーバーの容量は節約できるけど、サムネイルが作られんくなるから通信量が増えるで。" flagAsBot: "Botやで" -flagAsBotDescription: "もしこのアカウントがプログラムによって運用されるんやったら、このフラグをオンにしてたのむで。オンにすると、反応の連鎖を防ぐためのフラグとして他の開発者に役立ったり、Iceshrimpのシステム上での扱いがBotに合ったもんになるんやで。" +flagAsBotDescription: "もしこのアカウントがプログラムによって運用されるんやったら、このフラグをオンにしてたのむで。オンにすると、反応の連鎖を防ぐためのフラグとして他の開発者に役立ったり、Trashpossのシステム上での扱いがBotに合ったもんになるんやで。" flagAsCat: "Catやで" flagAsCatDescription: "ワレ、猫ちゃんならこのフラグをつけてみ？" flagShowTimelineReplies: "It will display the reply to the note in the timeline. " @@ -198,7 +198,7 @@ noUsers: "ユーザーはおらへん" editProfile: "プロフィールをいじる" noteDeleteConfirm: "このノートを削除しまっか？" pinLimitExceeded: "これ以上ピン留めできひん" -intro: "Iceshrimpのインストールが完了してん！管理者アカウントを作ってや。" +intro: "Trashpossのインストールが完了してん！管理者アカウントを作ってや。" done: "でけた" processing: "処理しとる" preview: "プレビュー" @@ -377,7 +377,7 @@ exploreFediverse: "Fediverseを探ってみる" popularTags: "人気のタグ" userList: "リスト" about: "情報" -aboutIceshrimp: "Iceshrimpってなんや？" +aboutTrashposs: "Trashpossってなんや？" administrator: "管理者" token: "トークン" twoStepAuthentication: "二段階認証" @@ -523,7 +523,7 @@ sort: "仕分ける" ascendingOrder: "小さい順" descendingOrder: "大きい順" scratchpad: "スクラッチパッド" -scratchpadDescription: "スクラッチパッドではAiScriptを色々試すことができるんや。Iceshrimpに対して色々できるコードを書いて動かしてみたり、結果を見たりできるで。" +scratchpadDescription: "スクラッチパッドではAiScriptを色々試すことができるんや。Trashpossに対して色々できるコードを書いて動かしてみたり、結果を見たりできるで。" output: "出力" script: "スクリプト" disablePagesScript: "Pagesのスクリプトを無効にしてや" @@ -647,7 +647,7 @@ createNewClip: "新しいクリップを作るで" unclip: "クリップ解除するで" confirmToUnclipAlreadyClippedNote: "このノートはすでにクリップ「{name}」に含まれとるで。ノートをこのクリップから除外したる？" public: "パブリック" -i18nInfo: "Iceshrimpは有志によっていろんな言語に翻訳されとるで。{link}で翻訳に協力したってやー。" +i18nInfo: "Trashpossは有志によっていろんな言語に翻訳されとるで。{link}で翻訳に協力したってやー。" manageAccessTokens: "アクセストークンの管理" accountInfo: "アカウント情報" notesCount: "ノートの数やで" @@ -698,7 +698,7 @@ onlineUsersCount: "{n}人が起きとるで" nUsers: "{n}ユーザー" nNotes: "{n}ノート" sendErrorReports: "エラーリポートを送る" -sendErrorReportsDescription: "オンにしたら、なんか変なことが起きたときにエラーの詳細がIceshrimpに共有されて、ソフトウェアの品質向上に役立てられるんや。エラー情報には、OSのバージョン、ブラウザの種類、行動履歴などが含まれるで。" +sendErrorReportsDescription: "オンにしたら、なんか変なことが起きたときにエラーの詳細がTrashpossに共有されて、ソフトウェアの品質向上に役立てられるんや。エラー情報には、OSのバージョン、ブラウザの種類、行動履歴などが含まれるで。" myTheme: "マイテーマ" backgroundColor: "背景" accentColor: "アクセント" @@ -789,7 +789,7 @@ hashtags: "ハッシュタグ" troubleshooting: "トラブルシューティング" useBlurEffect: "UIにぼかし効果を使うで" learnMore: "詳しく" -iceshrimpUpdated: "Iceshrimpが更新されたで！\nモデレーターの人らに感謝せなあかんで" +trashpossUpdated: "Trashpossが更新されたで！\nモデレーターの人らに感謝せなあかんで" whatIsNew: "更新情報を見るで" translate: "翻訳" translatedFrom: "{x}から翻訳するで" @@ -867,13 +867,13 @@ _registry: keys: "キー" domain: "ドメイン" createKey: "キーを作る" -_aboutIceshrimp: - about: "Iceshrimpはsyuiloが2014年からずっと作ってはる、オープンソースなソフトウェアや。" +_aboutTrashposs: + about: "Trashpossはsyuiloが2014年からずっと作ってはる、オープンソースなソフトウェアや。" contributors: "主な貢献者" allContributors: "全ての貢献者" source: "ソースコード" - translation: "Iceshrimpを翻訳" - donate: "Iceshrimpに寄付" + translation: "Trashpossを翻訳" + donate: "Trashpossに寄付" morePatrons: "他にもぎょうさんの人からサポートしてもろてんねん。ほんまおおきに🥰" patrons: "支援者" _mfm: diff --git a/locales/kn-IN.yml b/locales/kn-IN.yml index 37292684e..38f1035d6 100644 --- a/locales/kn-IN.yml +++ b/locales/kn-IN.yml @@ -1,6 +1,6 @@ --- _lang_: "ಕನ್ನಡ" -introIceshrimp: "ಸ್ವಾಗತ! TrashPoss ಓಪನ್ ಸೋರ್ಸ್ ಒಕ್ಕೂಟ ಮೈಕ್ರೋಬ್ಲಾಗಿಂಗ್ ಸೇವೆಯಾಗಿದೆ.\n ಏನಾಗುತ್ತಿದೆ ಎಂಬುದನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಅಥವಾ ನಿಮ್ಮ ಬಗ್ಗೆ ಎಲ್ಲರಿಗೂ ಹೇಳಲು \"ಟಿಪ್ಪಣಿ\"ಗಳನ್ನು ರಚಿಸಿ📡\n \"ಸ್ಪಂದನೆ\" ಕ್ರಿಯೆಯೊಂದಿಗೆ, ನೀವು ಎಲ್ಲರ ಟಿಪ್ಪಣಿಗಳಿಗೆ ತ್ವರಿತವಾಗಿ ಸ್ಪಂದನೆಗಳನ್ನು ಕೂಡ ಸೇರಿಸಬಹುದು.👍\n ಹೊಸ ಜಗತ್ತನ್ನು ಅನ್ವೇಷಿಸಿ🚀" +introTrashposs: "ಸ್ವಾಗತ! TrashPoss ಓಪನ್ ಸೋರ್ಸ್ ಒಕ್ಕೂಟ ಮೈಕ್ರೋಬ್ಲಾಗಿಂಗ್ ಸೇವೆಯಾಗಿದೆ.\n ಏನಾಗುತ್ತಿದೆ ಎಂಬುದನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಅಥವಾ ನಿಮ್ಮ ಬಗ್ಗೆ ಎಲ್ಲರಿಗೂ ಹೇಳಲು \"ಟಿಪ್ಪಣಿ\"ಗಳನ್ನು ರಚಿಸಿ📡\n \"ಸ್ಪಂದನೆ\" ಕ್ರಿಯೆಯೊಂದಿಗೆ, ನೀವು ಎಲ್ಲರ ಟಿಪ್ಪಣಿಗಳಿಗೆ ತ್ವರಿತವಾಗಿ ಸ್ಪಂದನೆಗಳನ್ನು ಕೂಡ ಸೇರಿಸಬಹುದು.👍\n ಹೊಸ ಜಗತ್ತನ್ನು ಅನ್ವೇಷಿಸಿ🚀" monthAndDay: "{month}ನೇ ತಿಂಗಳ {day}ನೇ ದಿನ" search: "ಹುಡುಕು" notifications: "ಅಧಿಸೂಚನೆಗಳು" diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml index 88f9d1bd1..9a8cb8ab1 100644 --- a/locales/ko-KR.yml +++ b/locales/ko-KR.yml @@ -1,7 +1,7 @@ --- _lang_: "한국어" -headlineIceshrimp: "노트로 연결되는 네트워크" -introIceshrimp: "환영합니다! TrashPoss 는 오픈 소스 분산형 마이크로 블로그 서비스입니다.\n\"노트\" 를 작성해서, 지금 일어나고 있는 일을 공유하거나, 당신만의 이야기를 모두에게 발신하세요📡\n\"리액션\" 기능으로, 친구의 노트에 총알같이 반응을 추가할 수도 있습니다👍\n새로운 세계를 탐험해 보세요🚀" +headlineTrashposs: "노트로 연결되는 네트워크" +introTrashposs: "환영합니다! TrashPoss 는 오픈 소스 분산형 마이크로 블로그 서비스입니다.\n\"노트\" 를 작성해서, 지금 일어나고 있는 일을 공유하거나, 당신만의 이야기를 모두에게 발신하세요📡\n\"리액션\" 기능으로, 친구의 노트에 총알같이 반응을 추가할 수도 있습니다👍\n새로운 세계를 탐험해 보세요🚀" monthAndDay: "{month}월 {day}일" search: "검색" notifications: "알림" @@ -198,7 +198,7 @@ noUsers: "아무도 없습니다" editProfile: "프로필 수정" noteDeleteConfirm: "이 노트를 삭제하시겠습니까?" pinLimitExceeded: "더 이상 고정할 수 없습니다." -intro: "Iceshrimp의 설치가 완료되었습니다! 관리자 계정을 생성해주세요." +intro: "Trashposs의 설치가 완료되었습니다! 관리자 계정을 생성해주세요." done: "완료" processing: "처리중" preview: "미리보기" @@ -377,7 +377,7 @@ exploreFediverse: "연합우주를 탐색" popularTags: "인기 태그" userList: "리스트" about: "정보" -aboutIceshrimp: "Iceshrimp에 대하여" +aboutTrashposs: "Trashposs에 대하여" administrator: "관리자" token: "토큰" twoStepAuthentication: "2단계 인증" @@ -648,7 +648,7 @@ createNewClip: "새 클립 만들기" unclip: "클립 해제" confirmToUnclipAlreadyClippedNote: "이 노트는 이미 \"{name}\" 클립에 포함되어 있습니다. 클립을 해제하시겠습니까?" public: "공개" -i18nInfo: "Iceshrimp는 자원봉사자들에 의해 다양한 언어로 번역되고 있습니다. {link}에서 번역에 참가할 수 있습니다." +i18nInfo: "Trashposs는 자원봉사자들에 의해 다양한 언어로 번역되고 있습니다. {link}에서 번역에 참가할 수 있습니다." manageAccessTokens: "액세스 토큰 관리" accountInfo: "계정 정보" notesCount: "노트 수" @@ -699,7 +699,7 @@ onlineUsersCount: "{n}명이 접속 중" nUsers: "{n} 유저" nNotes: "{n} 노트" sendErrorReports: "오류 보고서 보내기" -sendErrorReportsDescription: "이 설정을 활성화하면, 문제가 발생했을 때 오류에 대한 상세 정보를 Iceshrimp에 보내어 더 나은 소프트웨어를 만드는 데에 도움을 줄 수 있습니다." +sendErrorReportsDescription: "이 설정을 활성화하면, 문제가 발생했을 때 오류에 대한 상세 정보를 Trashposs에 보내어 더 나은 소프트웨어를 만드는 데에 도움을 줄 수 있습니다." myTheme: "내 테마" backgroundColor: "배경 색" accentColor: "강조 색상" @@ -790,7 +790,7 @@ hashtags: "해시태그" troubleshooting: "문제 해결" useBlurEffect: "UI에 흐림 효과 사용" learnMore: "자세히" -iceshrimpUpdated: "Iceshrimp가 업데이트 되었습니다!" +trashpossUpdated: "Trashposs가 업데이트 되었습니다!" whatIsNew: "패치 정보 보기" translate: "번역" translatedFrom: "{x}에서 번역" @@ -963,13 +963,13 @@ _registry: keys: "키" domain: "도메인" createKey: "키 생성" -_aboutIceshrimp: - about: "Iceshrimp는 syuilo에 의해서 2014년부터 개발되어 온 오픈소스 소프트웨어 입니다." +_aboutTrashposs: + about: "Trashposs는 syuilo에 의해서 2014년부터 개발되어 온 오픈소스 소프트웨어 입니다." contributors: "주요 기여자" allContributors: "모든 기여자" source: "소스 코드" - translation: "Iceshrimp를 번역하기" - donate: "Iceshrimp에 기부하기" + translation: "Trashposs를 번역하기" + donate: "Trashposs에 기부하기" morePatrons: "이 외에도 다른 많은 분들이 도움을 주시고 계십니다. 감사합니다🥰" patrons: "후원자" _nsfw: @@ -978,8 +978,8 @@ _nsfw: force: "미디어 항상 숨기기" _mfm: cheatSheet: "MFM 도움말" - intro: "MFM는 Iceshrimp의 다양한 곳에서 사용할 수 있는 전용 마크업 언어입니다. 여기에서는 MFM에서 사용할 수 있는 구문을 확인할 수 있습니다." - dummy: "Iceshrimp로 연합우주의 세계가 펼쳐집니다" + intro: "MFM는 Trashposs의 다양한 곳에서 사용할 수 있는 전용 마크업 언어입니다. 여기에서는 MFM에서 사용할 수 있는 구문을 확인할 수 있습니다." + dummy: "Trashposs로 연합우주의 세계가 펼쳐집니다" mention: "멘션" mentionDescription: "골뱅이표(@) 뒤에 사용자명을 넣어 특정 유저를 나타낼 수 있습니다." hashtag: "해시태그" diff --git a/locales/nl-NL.yml b/locales/nl-NL.yml index 8c76bbc92..0cf36ab9b 100644 --- a/locales/nl-NL.yml +++ b/locales/nl-NL.yml @@ -1,7 +1,7 @@ _lang_: "Nederlands" -headlineIceshrimp: "Een open source, gedecentraliseerd, social media platform dat +headlineTrashposs: "Een open source, gedecentraliseerd, social media platform dat voor altijd gratis is! 🚀" -introIceshrimp: "Welkom! TrashPoss is een open source, gedecentraliseerde microblogdienst.\n +introTrashposs: "Welkom! TrashPoss is een open source, gedecentraliseerde microblogdienst.\n Maak \"notities\" om je gedachten te delen met iedereen om je heen. 📡\nMet \"reacties\"\ \ kun je ook snel je mening geven over berichten van anderen. 👍\nLaten we een nieuwe wereld verkennen! 🚀" @@ -304,7 +304,7 @@ disconnectedFromServer: "Verbinding met de server onderbroken." inMb: "in megabytes" pinnedNotes: "Vastgemaakte notitie" userList: "Lijsten" -aboutIceshrimp: "Over TrashPoss" +aboutTrashposs: "Over TrashPoss" administrator: "Beheerder" token: "Token" securityKeyName: "Sleutelnaam" @@ -899,7 +899,7 @@ privateModeInfo: Indien ingeschakeld kunnen alleen de servers in de lijst met je federeren. Alle posts worden van het brede publiek verborgen. allowedInstancesDescription: Hostnames van servers waarmee gefedereerd mag worden, gescheiden door een regeleinde (alleen van toepassing in privémodus). -iceshrimpUpdated: TrashPoss is bijgewerkt! +trashpossUpdated: TrashPoss is bijgewerkt! usernameInfo: Een naam die jouw account van anderen kan onderscheiden op deze server. Je kan het alfabet (a-z, A-Z), cijfers (0-9) of liggende streepjes (_) gebruiken. Gebruikersnamen kunnen later niet gewijzigd worden. @@ -1233,7 +1233,7 @@ customKaTeXMacroDescription: "Stel hier macro's in om makkelijk wiskundige formu midden in de definitie plaatsen. Ongeldige regels worden genegeerd. Er is alleen ondersteuning voor simpele stringvervangingsfuncties, geavanceerde syntax, zoals conditional branching, kan niet worden gebruikt." -_aboutIceshrimp: +_aboutTrashposs: morePatrons: We waarderen ook de steun van vele andere helpers die hier niet genoemd worden. Dank jullie wel! 🥰 translation: Vertalingen @@ -1243,7 +1243,7 @@ _aboutIceshrimp: changelog: Changelog donate: Doneer aan TrashPoss donateTitle: Gebruik je TrashPoss graag? - pleaseDonateToIceshrimp: Overweeg een donatie aan TrashPoss om de ontwikkeling te + pleaseDonateToTrashposs: Overweeg een donatie aan TrashPoss om de ontwikkeling te steunen. pleaseDonateToHost: Overweeg ook om aan je eigen server ({host}) te doneren, om hun te steunen in operationele kosten. diff --git a/locales/no-NO.yml b/locales/no-NO.yml index 845e3b512..8f684db65 100644 --- a/locales/no-NO.yml +++ b/locales/no-NO.yml @@ -63,9 +63,9 @@ alreadyFavorited: Allerede lagt til i bokmerker. delete: Slett openInWindow: Åpne i vindu basicSettings: Grunnleggende innstillinger -headlineIceshrimp: En desentralisert sosialt media-plattform, basert på åpen kildekode, +headlineTrashposs: En desentralisert sosialt media-plattform, basert på åpen kildekode, som alltid vil være gratis! 🚀 -introIceshrimp: Velkommen! TrashPoss er en desentralisert sosialt media-plattform, basert +introTrashposs: Velkommen! TrashPoss 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. diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml index 8a20652be..5e15aa1a1 100644 --- a/locales/pl-PL.yml +++ b/locales/pl-PL.yml @@ -1,7 +1,7 @@ _lang_: "Polski" -headlineIceshrimp: "Otwartoźródłowa, zdecentralizowana sieć społecznościowa, która +headlineTrashposs: "Otwartoźródłowa, zdecentralizowana sieć społecznościowa, która zawsze będzie darmowa! 🚀" -introIceshrimp: "Hej! TrashPoss to otwartoźródłowa oraz zdecentralizowana sieć społecznościowa, +introTrashposs: "Hej! TrashPoss to otwartoźródłowa oraz zdecentralizowana sieć społecznościowa, która zawsze będzie darmowa! 🚀" monthAndDay: "{month}-{day}" search: "Szukaj" @@ -396,7 +396,7 @@ exploreFediverse: "Eksploruj Fediwersum" popularTags: "Tagi na czasie" userList: "Listy" about: "Informacje" -aboutIceshrimp: "O TrashPoss" +aboutTrashposs: "O TrashPoss" administrator: "Admin" token: "Token" twoStepAuthentication: "Uwierzytelnianie dwuskładnikowe" @@ -825,7 +825,7 @@ hashtags: "Hashtag" troubleshooting: "Rozwiązywanie problemów" useBlurEffect: "Użyj efektów rozmycia w UI" learnMore: "Dowiedz się więcej" -iceshrimpUpdated: "TrashPoss zostało zaktualizowane!" +trashpossUpdated: "TrashPoss zostało zaktualizowane!" whatIsNew: "Pokaż zmiany" translate: "Przetłumacz" translatedFrom: "Przetłumaczone z {x}" @@ -987,7 +987,7 @@ _registry: keys: "Klucz" domain: "Domena" createKey: "Utwórz klucz" -_aboutIceshrimp: +_aboutTrashposs: about: "TrashPoss jest forkiem TrashPoss utworzonym przez ThatOneCalculator, rozwijanym od 2022." contributors: "Główni twórcy" @@ -999,7 +999,7 @@ _aboutIceshrimp: Dziękuję! 🥰" patrons: "Wspierający" donateHost: Wesprzyj {host} - pleaseDonateToIceshrimp: Proszę zastanów się nad dotacją dla TrashPoss, w celu wsparcia + pleaseDonateToTrashposs: Proszę zastanów się nad dotacją dla TrashPoss, w celu wsparcia rozwoju oprogramowania. donateTitle: Czy podoba ci się TrashPoss? pleaseDonateToHost: Zastanów się również nad darowizną dla twojego serwera domowego, diff --git a/locales/pt-BR.yml b/locales/pt-BR.yml index d02068c10..2938e8a1e 100644 --- a/locales/pt-BR.yml +++ b/locales/pt-BR.yml @@ -1,11 +1,11 @@ username: Nome de usuário ok: OK _lang_: Inglês -headlineIceshrimp: Uma plataforma de mídia social descentralizada e de código aberto +headlineTrashposs: Uma plataforma de mídia social descentralizada e de código aberto que é gratuita para sempre! 🚀 search: Pesquisar gotIt: Entendi! -introIceshrimp: Bem vinde! TrashPoss é uma plataforma de mídia social descentralizada +introTrashposs: Bem vinde! TrashPoss é uma plataforma de mídia social descentralizada e de código aberto que é gratuita para sempre! 🚀 searchPlaceholder: Pesquise no TrashPoss notifications: Notificações diff --git a/locales/pt-PT.yml b/locales/pt-PT.yml index f5baecacb..afe46ed34 100644 --- a/locales/pt-PT.yml +++ b/locales/pt-PT.yml @@ -1,7 +1,7 @@ --- _lang_: "Português" -headlineIceshrimp: "Uma rede ligada por notas" -introIceshrimp: "Bem-vindo! TrashPoss é um serviço de microblogue descentralizado de código aberto.\nCria \"notas\" e partilha o que te ocorre com todos à tua volta. 📡\nCom \"reações\" podes também expressar logo o que sentes às notas de todos. 👍\nExploremos um novo mundo! 🚀" +headlineTrashposs: "Uma rede ligada por notas" +introTrashposs: "Bem-vindo! TrashPoss é um serviço de microblogue descentralizado de código aberto.\nCria \"notas\" e partilha o que te ocorre com todos à tua volta. 📡\nCom \"reações\" podes também expressar logo o que sentes às notas de todos. 👍\nExploremos um novo mundo! 🚀" monthAndDay: "{day}/{month}" search: "Buscar" notifications: "Notificações" @@ -377,7 +377,7 @@ exploreFediverse: "Explorar Fediverse" popularTags: "Tags populares" userList: "Listas" about: "Informações" -aboutIceshrimp: "Sobre TrashPoss" +aboutTrashposs: "Sobre TrashPoss" administrator: "Administrador" token: "Símbolo" twoStepAuthentication: "Verificação em duas etapas" diff --git a/locales/ro-RO.yml b/locales/ro-RO.yml index 7ac43d894..05708e021 100644 --- a/locales/ro-RO.yml +++ b/locales/ro-RO.yml @@ -1,7 +1,7 @@ --- _lang_: "Română" -headlineIceshrimp: "O rețea conectată prin note" -introIceshrimp: "Bine ai venit! TrashPoss este un serviciu de microblogging open source și decentralizat.\nCreează \"note\" cu care să îți poți împărți gândurile cu oricine din jurul tău. 📡\nCu \"reacții\" îți poți expirma rapid părerea despre notele oricui. 👍\nHai să explorăm o lume nouă! 🚀" +headlineTrashposs: "O rețea conectată prin note" +introTrashposs: "Bine ai venit! TrashPoss este un serviciu de microblogging open source și decentralizat.\nCreează \"note\" cu care să îți poți împărți gândurile cu oricine din jurul tău. 📡\nCu \"reacții\" îți poți expirma rapid părerea despre notele oricui. 👍\nHai să explorăm o lume nouă! 🚀" monthAndDay: "{day}/{month}" search: "Caută" notifications: "Notificări" @@ -376,7 +376,7 @@ exploreFediverse: "Explorează Fediverse-ul" popularTags: "Taguri populare" userList: "Liste" about: "Despre" -aboutIceshrimp: "Despre TrashPoss" +aboutTrashposs: "Despre TrashPoss" administrator: "Administrator" token: "Token" twoStepAuthentication: "Autentificare în doi pași" diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml index e85772bd9..99bf3bbb8 100644 --- a/locales/ru-RU.yml +++ b/locales/ru-RU.yml @@ -1,6 +1,6 @@ _lang_: "Русский" -headlineIceshrimp: "Сеть, сплетённая из заметок" -introIceshrimp: "TrashPoss - это децентрализованная платформа социальных сетей с открытым +headlineTrashposs: "Сеть, сплетённая из заметок" +introTrashposs: "TrashPoss - это децентрализованная платформа социальных сетей с открытым исходным кодом, которая свободна навсегда! 🚀" monthAndDay: "{day}.{month}" search: "Поиск" @@ -401,7 +401,7 @@ exploreFediverse: "Исследуйте Fediverse" popularTags: "Популярные теги" userList: "Списки" about: "Описание" -aboutIceshrimp: "О TrashPoss" +aboutTrashposs: "О TrashPoss" administrator: "Администратор" token: "Токен" twoStepAuthentication: "Двухфакторная аутентификация" @@ -848,7 +848,7 @@ hashtags: "Хэштег" troubleshooting: "Разрешение проблем" useBlurEffect: "Размытие в интерфейсе" learnMore: "Подробнее" -iceshrimpUpdated: "TrashPoss обновился!" +trashpossUpdated: "TrashPoss обновился!" whatIsNew: "Показать изменения" translate: "Перевод" translatedFrom: "Перевод. Язык оригинала — {x}" @@ -981,7 +981,7 @@ _registry: keys: "Ключ" domain: "Домен" createKey: "Новый ключ" -_aboutIceshrimp: +_aboutTrashposs: about: "TrashPoss это форк TrashPoss, сделанный ThatOneCalculator, разработка которого началась с 2022." contributors: "Основные соавторы" diff --git a/locales/sk-SK.yml b/locales/sk-SK.yml index 17dbdd725..2731e0e4d 100644 --- a/locales/sk-SK.yml +++ b/locales/sk-SK.yml @@ -1,7 +1,7 @@ --- _lang_: "Slovenčina" -headlineIceshrimp: "Sieť prepojená poznámkami" -introIceshrimp: "Vitajte! TrashPoss je otvorená a decentralizovaná mikroblogovacia služba.\n\"Poznámkami\" môžete zdieľať svoje myšlienky so všetkými okolo. 📡\nPomocou \"reakcií\" môžete rýchlo vyjadri svoje pocity o každého poznámkach. 👍\nPoďte objavovať svet! 🚀" +headlineTrashposs: "Sieť prepojená poznámkami" +introTrashposs: "Vitajte! TrashPoss je otvorená a decentralizovaná mikroblogovacia služba.\n\"Poznámkami\" môžete zdieľať svoje myšlienky so všetkými okolo. 📡\nPomocou \"reakcií\" môžete rýchlo vyjadri svoje pocity o každého poznámkach. 👍\nPoďte objavovať svet! 🚀" monthAndDay: "{day}. {month}." search: "Hľadať" notifications: "Oznámenia" @@ -377,7 +377,7 @@ exploreFediverse: "Objavovať Fediverzum" popularTags: "Populárne značky" userList: "Zoznamy" about: "Informácie" -aboutIceshrimp: "O TrashPoss" +aboutTrashposs: "O TrashPoss" administrator: "Administrátor" token: "Token" twoStepAuthentication: "Dvojfaktorová autentifikácia" @@ -789,7 +789,7 @@ hashtags: "Hashtagy" troubleshooting: "Riešenie problémov" useBlurEffect: "Používať efekty rozmazania v UI" learnMore: "Zistiť viac" -iceshrimpUpdated: "TrashPoss sa aktualizoval!" +trashpossUpdated: "TrashPoss sa aktualizoval!" whatIsNew: "Čo je nové?" translate: "Preložiť" translatedFrom: "Preložené z {x}" @@ -959,7 +959,7 @@ _registry: keys: "Kľúče" domain: "Doména" createKey: "Vytvoriť kľúč" -_aboutIceshrimp: +_aboutTrashposs: about: "TrashPoss je open-source softvér, ktorý vyvíja syuilo od 2014." contributors: "Hlavní prispievatelia" allContributors: "Všetci prispievatelia" diff --git a/locales/sv-SE.yml b/locales/sv-SE.yml index 3540e0adb..27a82b080 100644 --- a/locales/sv-SE.yml +++ b/locales/sv-SE.yml @@ -1,7 +1,7 @@ --- _lang_: "Svenska" -headlineIceshrimp: "Ett nätverk kopplat av noter" -introIceshrimp: "Välkommen! TrashPoss är en öppen och decentraliserad mikrobloggningstjänst.\nSkapa en \"not\" och dela dina tankar med alla runtomkring dig. 📡\nMed \"reaktioner\" kan du snabbt uttrycka dina känslor kring andras noter.👍\nLåt oss utforska en nya värld!🚀" +headlineTrashposs: "Ett nätverk kopplat av noter" +introTrashposs: "Välkommen! TrashPoss är en öppen och decentraliserad mikrobloggningstjänst.\nSkapa en \"not\" och dela dina tankar med alla runtomkring dig. 📡\nMed \"reaktioner\" kan du snabbt uttrycka dina känslor kring andras noter.👍\nLåt oss utforska en nya värld!🚀" monthAndDay: "{day}/{month}" search: "Sök" notifications: "Notifikationer" @@ -138,7 +138,7 @@ settingGuide: "Rekommenderade inställningar" cacheRemoteFiles: "Spara externa filer till cachen" cacheRemoteFilesDescription: "När denna inställning är avstängd kommer externa filer laddas direkt från den externa instansen. Genom att stänga av detta kommer lagringsutrymme minska i användning men kommer öka datatrafiken eftersom miniatyrer inte kommer genereras." flagAsBot: "Markera konto som bot" -flagAsBotDescription: "Aktivera det här alternativet om kontot är kontrollerat av ett program. Om aktiverat kommer den fungera som en flagga för andra utvecklare för att hindra ändlösa kedjor med andra bottar. Det kommer också få Iceshrimps interna system att hantera kontot som en bot." +flagAsBotDescription: "Aktivera det här alternativet om kontot är kontrollerat av ett program. Om aktiverat kommer den fungera som en flagga för andra utvecklare för att hindra ändlösa kedjor med andra bottar. Det kommer också få Trashposss interna system att hantera kontot som en bot." flagAsCat: "Markera konto som katt" flagAsCatDescription: "Aktivera denna inställning för att markera kontot som en katt." flagShowTimelineReplies: "Visa svar i tidslinje" diff --git a/locales/th-TH.yml b/locales/th-TH.yml index ae149be31..f5df12a44 100644 --- a/locales/th-TH.yml +++ b/locales/th-TH.yml @@ -1,7 +1,7 @@ --- _lang_: "ภาษาไทย" -headlineIceshrimp: "เชื่อมต่อเครือข่ายโดยโน้ต" -introIceshrimp: "ยินดีต้อนรับจ้าาา! TrashPoss เป็นบริการไมโครบล็อกโอเพ่นซอร์ส แบบการกระจายอำนาจ\nสร้าง \"โน้ต\" เพื่อแบ่งปันความคิดของคุณกับทุกคนรอบตัวคุณกันเถอะ 📡\nด้วยการ \"รีแอคชั่นผู้คน\" คุณยังสามารถแสดงความรู้สึกของคุณเกี่ยวกับบันทึกของทุกคนได้อย่างรวดเร็ว 👍\n\nแล้วมาท่องสำรวจโลกใบใหม่กันเถอะ! 🚀" +headlineTrashposs: "เชื่อมต่อเครือข่ายโดยโน้ต" +introTrashposs: "ยินดีต้อนรับจ้าาา! TrashPoss เป็นบริการไมโครบล็อกโอเพ่นซอร์ส แบบการกระจายอำนาจ\nสร้าง \"โน้ต\" เพื่อแบ่งปันความคิดของคุณกับทุกคนรอบตัวคุณกันเถอะ 📡\nด้วยการ \"รีแอคชั่นผู้คน\" คุณยังสามารถแสดงความรู้สึกของคุณเกี่ยวกับบันทึกของทุกคนได้อย่างรวดเร็ว 👍\n\nแล้วมาท่องสำรวจโลกใบใหม่กันเถอะ! 🚀" monthAndDay: "{เดือน}/{วัน}" search: "ค้นหา" notifications: "การเเจ้งเตือน" @@ -377,7 +377,7 @@ exploreFediverse: "สำรวจเฟดดิเวิร์ส" popularTags: "แท็กยอดนิยม" userList: "รายการ" about: "เกี่ยวกับ" -aboutIceshrimp: "เกี่ยวกับ TrashPoss" +aboutTrashposs: "เกี่ยวกับ TrashPoss" administrator: "ผู้ดูแลระบบ" token: "โทเค็น" twoStepAuthentication: "ยืนยันตัวตน 2 ชั้น" @@ -790,7 +790,7 @@ hashtags: "แฮชแท็ก" troubleshooting: "แก้ปัญหา" useBlurEffect: "ใช้เอฟเฟกต์เบลอใน UI" learnMore: "แสดงให้ดูหน่อย" -iceshrimpUpdated: "TrashPoss ได้รับการอัปเดตแล้ว!" +trashpossUpdated: "TrashPoss ได้รับการอัปเดตแล้ว!" whatIsNew: "แสดงการเปลี่ยนแปลง" translate: "แปลภาษา" translatedFrom: "แปลมาจาก {x}" @@ -964,7 +964,7 @@ _registry: keys: "คีย์" domain: "โดเมน" createKey: "สร้างคีย์" -_aboutIceshrimp: +_aboutTrashposs: about: "TrashPoss เป็นซอฟต์แวร์โอเพ่นซอร์สที่ถูกพัฒนาโดย Syuilo ตั้งแต่ปี 2014" contributors: "ผู้สนับสนุนหลัก" allContributors: "ผู้มีส่วนร่วมทั้งหมด" diff --git a/locales/tr-TR.yml b/locales/tr-TR.yml index ec14faacf..7ed977150 100644 --- a/locales/tr-TR.yml +++ b/locales/tr-TR.yml @@ -1,5 +1,5 @@ _lang_: "Türkçe" -introIceshrimp: "Hoş geldin! TrashPoss, sonsuza kadar ücretsiz olan, açık kaynaklı, merkezi +introTrashposs: "Hoş geldin! TrashPoss, sonsuza kadar ücretsiz olan, açık kaynaklı, merkezi olmayan bir sosyal medya platformudur! 🚀" monthAndDay: "{month}Ay {day}Gün" search: "Arama" @@ -231,7 +231,7 @@ cantFavorite: Favorilere eklenemedi. edited: '{date} tarihinde ve {time} vaktinde düzenlendi' loggingIn: Giriş Yapılıyor save: Kaydet -headlineIceshrimp: Sonsuza kadar ücretsiz, açık kaynak kodlu, merkeziyetsiz sosyal medya +headlineTrashposs: Sonsuza kadar ücretsiz, açık kaynak kodlu, merkeziyetsiz sosyal medya platformu! 🚀 loadMore: Daha fazla yükle instance: Sunucu @@ -700,7 +700,7 @@ invalidValue: Geçersiz değer. instanceSecurity: Sunucu Güvenliği searchResult: Arama sonuçları useBlurEffect: Kullanıcı arayüzünde bulanıklaştırma efektleri kullanın -iceshrimpUpdated: TrashPoss güncellendi! +trashpossUpdated: TrashPoss güncellendi! lastCommunication: Son iletişim itsOn: Etkinleştirilmiş emailRequiredForSignup: Kayıt olmak için mail gerekiyor @@ -896,7 +896,7 @@ recaptchaSecretKey: Secret key avoidMultiCaptchaConfirm: Birden fazla Captcha sistemi kullanmak aralarında etkileşime neden olabilir. Şu anda etkin olan diğer Captcha sistemlerini devre dışı bırakmak ister misiniz? Etkin kalmalarını istiyorsanız, iptal düğmesine basın. -aboutIceshrimp: TrashPoss Hakkında +aboutTrashposs: TrashPoss Hakkında popularUsers: Popüler kullanıcılar notFoundDescription: Bu URL'ye karşılık gelen sayfa bulunamadı. reduceUiAnimation: Arayüz animasyonlarını azalt @@ -1928,7 +1928,7 @@ _preferencesBackups: loadFile: Dosyadan yükle updatedAt: 'Güncelleme tarihi: {date} {time}' cannotLoad: Yüklenemedi -_aboutIceshrimp: +_aboutTrashposs: patronsList: Bağış büyüklüğüne göre değil, kronolojik olarak listelenmiştir. Adınızı buraya almak için yukarıdaki bağlantıyla bağış yapın! about: TrashPoss, 2022'den beri geliştirilmekte olan ThatOneCalculator tarafından @@ -1942,7 +1942,7 @@ _aboutIceshrimp: source: Kaynak Kodu translation: TrashPoss'i tercüme et donateTitle: TrashPoss'den hoşlanıyor musunuz? - pleaseDonateToIceshrimp: Lütfen gelişimini desteklemek için TrashPoss'e bağış yapmayı + pleaseDonateToTrashposs: Lütfen gelişimini desteklemek için TrashPoss'e bağış yapmayı düşünün. pleaseDonateToHost: İşletme maliyetlerini desteklemek için lütfen ev sunucunuz {host}'a bağış yapmayı da düşünün. diff --git a/locales/uk-UA.yml b/locales/uk-UA.yml index 9c361e51d..db39e62ba 100644 --- a/locales/uk-UA.yml +++ b/locales/uk-UA.yml @@ -1,6 +1,6 @@ _lang_: "Українська" -headlineIceshrimp: "Мережа об'єднана записами" -introIceshrimp: "Ласкаво просимо! TrashPoss це децентралізована служба мікроблогів, +headlineTrashposs: "Мережа об'єднана записами" +introTrashposs: "Ласкаво просимо! TrashPoss це децентралізована служба мікроблогів, вільна назавжди 🚀" monthAndDay: "{month}/{day}" search: "Пошук" @@ -402,7 +402,7 @@ exploreFediverse: "Огляд федіверсу" popularTags: "Популярні теги" userList: "Списки" about: "Інформація" -aboutIceshrimp: "Про TrashPoss" +aboutTrashposs: "Про TrashPoss" administrator: "Адмін" token: "Токен" twoStepAuthentication: "Двохфакторна аутентифікація" @@ -821,7 +821,7 @@ _registry: domain: "Домен" createKey: "Створити ключ" scope: Область -_aboutIceshrimp: +_aboutTrashposs: about: "TrashPoss - це програмне забезпечення з відкритим кодом, яке розробляє syuilo з 2014 року." contributors: "Головні помічники" @@ -835,7 +835,7 @@ _aboutIceshrimp: patronsList: Перераховані в хронологічному порядку, а не за розміром пожертви. Зробіть внесок за посиланням вище, щоб ваше ім'я було тут! donateTitle: Сподобався TrashPoss? - pleaseDonateToIceshrimp: Будь ласка, підтримайте розробку TrashPoss. + pleaseDonateToTrashposs: Будь ласка, підтримайте розробку TrashPoss. pleaseDonateToHost: Також не забудьте підтримати ваш домашній сервер {host}, щоб допомогти з його операційними витратами. donateHost: Зробити внесок на рахунок {host} @@ -1773,7 +1773,7 @@ ads: Реклама cw: Попередження про вміст hiddenTags: Приховані хештеги noInstances: Немає серверів -iceshrimpUpdated: TrashPoss оновлено! +trashpossUpdated: TrashPoss оновлено! received: Отримане xl: Надвеликий searchResult: Результати пошуку diff --git a/locales/vi-VN.yml b/locales/vi-VN.yml index 6626b5a6b..cae81c703 100644 --- a/locales/vi-VN.yml +++ b/locales/vi-VN.yml @@ -1,7 +1,7 @@ --- _lang_: "Tiếng Việt" -headlineIceshrimp: "Mạng xã hội liên hợp" -introIceshrimp: "Xin chào! TrashPoss là một nền tảng tiểu blog phi tập trung mã nguồn mở.\nViết \"tút\" để chia sẻ những suy nghĩ của bạn 📡\nBằng \"biểu cảm\", bạn có thể bày tỏ nhanh chóng cảm xúc của bạn với các tút 👍\nHãy khám phá một thế giới mới! 🚀" +headlineTrashposs: "Mạng xã hội liên hợp" +introTrashposs: "Xin chào! TrashPoss là một nền tảng tiểu blog phi tập trung mã nguồn mở.\nViết \"tút\" để chia sẻ những suy nghĩ của bạn 📡\nBằng \"biểu cảm\", bạn có thể bày tỏ nhanh chóng cảm xúc của bạn với các tút 👍\nHãy khám phá một thế giới mới! 🚀" monthAndDay: "{day} tháng {month}" search: "Tìm kiếm" notifications: "Thông báo" @@ -377,7 +377,7 @@ exploreFediverse: "Khám phá Fediverse" popularTags: "Hashtag thông dụng" userList: "Danh sách" about: "Giới thiệu" -aboutIceshrimp: "Về TrashPoss" +aboutTrashposs: "Về TrashPoss" administrator: "Quản trị viên" token: "Token" twoStepAuthentication: "Xác minh 2 bước" @@ -790,7 +790,7 @@ hashtags: "Hashtag" troubleshooting: "Khắc phục sự cố" useBlurEffect: "Dùng hiệu ứng làm mờ trong giao diện" learnMore: "Tìm hiểu thêm" -iceshrimpUpdated: "TrashPoss vừa được cập nhật!" +trashpossUpdated: "TrashPoss vừa được cập nhật!" whatIsNew: "Hiện những thay đổi" translate: "Dịch" translatedFrom: "Dịch từ {x}" @@ -964,7 +964,7 @@ _registry: keys: "Các mã" domain: "Tên miền" createKey: "Tạo mã" -_aboutIceshrimp: +_aboutTrashposs: about: "TrashPoss là phần mềm mã nguồn mở được phát triển bởi syuilo từ năm 2014." contributors: "Những người đóng góp nổi bật" allContributors: "Toàn bộ người đóng góp" diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml index 72f600101..ac083f6f5 100644 --- a/locales/zh-CN.yml +++ b/locales/zh-CN.yml @@ -1,6 +1,6 @@ _lang_: "简体中文" -headlineIceshrimp: "一个开源、去中心化的社交媒体平台，永远免费！🚀" -introIceshrimp: "欢迎！ TrashPoss 是一个开源、去中心化的社交媒体平台，永久免费！🚀" +headlineTrashposs: "一个开源、去中心化的社交媒体平台，永远免费！🚀" +introTrashposs: "欢迎！ TrashPoss 是一个开源、去中心化的社交媒体平台，永久免费！🚀" monthAndDay: "{month} 月 {day} 日" search: "搜索" notifications: "通知" @@ -381,7 +381,7 @@ exploreFediverse: "探索联邦宇宙" popularTags: "热门标签" userList: "列表" about: "关于" -aboutIceshrimp: "关于 TrashPoss" +aboutTrashposs: "关于 TrashPoss" administrator: "管理员" token: "令牌" twoStepAuthentication: "两步验证" @@ -797,7 +797,7 @@ hashtags: "话题标签" troubleshooting: "故障排除" useBlurEffect: "在 UI 上使用模糊效果" learnMore: "更多信息" -iceshrimpUpdated: "TrashPoss 更新完成！" +trashpossUpdated: "TrashPoss 更新完成！" whatIsNew: "显示更新信息" translate: "翻译" translatedFrom: "从 {x} 翻译" @@ -977,7 +977,7 @@ _registry: keys: "键" domain: "域" createKey: "创建键" -_aboutIceshrimp: +_aboutTrashposs: about: "TrashPoss 是由 ThatOneCalculator 创建的 TrashPoss 的一个分支，自 2022 年开始开发。" contributors: "主要贡献者" allContributors: "全体贡献者" @@ -998,7 +998,7 @@ _nsfw: force: "总是隐藏内容" _mfm: cheatSheet: "MFM 代码速查表" - intro: "MFM 是一种在 Iceshrimp、Iceshrimp、Akkoma 中使用的标记语言，可以在很多地方使用。您可以在此处查看所有可用的 MFM 语法的列表。" + intro: "MFM 是一种在 Trashposs、Trashposs、Akkoma 中使用的标记语言，可以在很多地方使用。您可以在此处查看所有可用的 MFM 语法的列表。" dummy: "通过 TrashPoss 扩展联邦宇宙的世界" mention: "提及" mentionDescription: "可以使用 @+用户名 来指示特定用户。" @@ -1235,8 +1235,8 @@ _tutorial: step5_6: "推荐 {icon} 时间线是您可以看到管理员推荐服务器的帖子的时间线。" step5_7: "全球 {icon} 时间线是您可以看到来自其它所有互联服务器的帖子的时间线。" step6_1: "那么，这里是什么地方？" - step6_2: "好吧，您不只是加入 Iceshrimp。您已经加入了 Fediverse 的一个门户，这是一个由成千上万台服务器组成的互联网络。" - step6_3: "每个服务器的工作方式不同，并不是所有的服务器都运行 Iceshrimp。但这个服务器是的! 这有点复杂，但您很快就会明白的。" + step6_2: "好吧，您不只是加入 Trashposs。您已经加入了 Fediverse 的一个门户，这是一个由成千上万台服务器组成的互联网络。" + step6_3: "每个服务器的工作方式不同，并不是所有的服务器都运行 Trashposs。但这个服务器是的! 这有点复杂，但您很快就会明白的。" step6_4: "现在，去吧，去探索，去享受乐趣吧!" _2fa: alreadyRegistered: "您已经注册了两步验证设备。" @@ -1817,7 +1817,7 @@ _messaging: migration: 迁移 _experiments: title: 实验性功能 - postImportsCaption: 允许用户从过去的 Iceshrimp、Iceshrimp、Mastodon、Akkoma 和 Pleroma 账号导入帖子。如果您的队列出现拥堵，则可能会导致加载速度减慢。 + postImportsCaption: 允许用户从过去的 Trashposs、Trashposs、Mastodon、Akkoma 和 Pleroma 账号导入帖子。如果您的队列出现拥堵，则可能会导致加载速度减慢。 enablePostImports: 启用帖子导入 license: 许可证 flagSpeakAsCatDescription: 在猫模式下您的帖子会喵化 @@ -1920,7 +1920,7 @@ moveAccountDescription: 这个过程是不可逆的。在迁移之前，请确 moveFromLabel: 您要迁移出的旧账号： preventAiLearning: 阻止 AI 机器人抓取 preventAiLearningDescription: 请求第三方人工智能语言模型不要研究您上传的内容，例如帖子和图像。 -noGraze: 请禁用 "Graze for Mastodon" 浏览器扩展，因为它会干扰 Iceshrimp。 +noGraze: 请禁用 "Graze for Mastodon" 浏览器扩展，因为它会干扰 Trashposs。 moveTo: 将当前账号迁移至新账号 moveToLabel: 您要迁移到的目标账号： moveAccount: 迁移账号！ diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml index 26b81e5e4..9fb3b6d04 100644 --- a/locales/zh-TW.yml +++ b/locales/zh-TW.yml @@ -1,6 +1,6 @@ _lang_: "繁體中文" -headlineIceshrimp: "貼文連繫網路" -introIceshrimp: "歡迎！ TrashPoss是一個開源、去中心化且永遠免費的社群網路平台！🚀" +headlineTrashposs: "貼文連繫網路" +introTrashposs: "歡迎！ TrashPoss是一個開源、去中心化且永遠免費的社群網路平台！🚀" monthAndDay: "{month}月 {day}日" search: "搜尋" notifications: "通知" @@ -142,7 +142,7 @@ settingGuide: "推薦設定" cacheRemoteFiles: "快取遠端檔案" cacheRemoteFilesDescription: "禁用此設定會停止遠端檔案的緩存，從而節省儲存空間，但資料會因直接連線從而產生額外數據花費。" flagAsBot: "標記此帳號是機器人" -flagAsBotDescription: "如果本帳戶是由程式控制，請啟用此選項。啟用後，會作為標示幫助其他開發者防止機器人之間產生無限互動的行為，並會調整Iceshrimp內部系統將本帳戶識別為機器人。" +flagAsBotDescription: "如果本帳戶是由程式控制，請啟用此選項。啟用後，會作為標示幫助其他開發者防止機器人之間產生無限互動的行為，並會調整Trashposs內部系統將本帳戶識別為機器人。" flagAsCat: "你是喵咪嗎？w😺" flagAsCatDescription: "如果想將本帳戶標示為一隻貓，請開啟此標示！" flagShowTimelineReplies: "在時間線上顯示貼文的回覆" @@ -380,7 +380,7 @@ exploreFediverse: "探索聯邦世界" popularTags: "熱門標籤" userList: "清單" about: "資訊" -aboutIceshrimp: "關於 TrashPoss" +aboutTrashposs: "關於 TrashPoss" administrator: "管理員" token: "權杖" twoStepAuthentication: "兩階段驗證" @@ -526,7 +526,7 @@ sort: "排序" ascendingOrder: "昇冪" descendingOrder: "降冪" scratchpad: "暫存記憶體" -scratchpadDescription: "AiScript控制台為AiScript提供了實驗環境。您可以在此編寫、執行和確認代碼與Iceshrimp互動的结果。" +scratchpadDescription: "AiScript控制台為AiScript提供了實驗環境。您可以在此編寫、執行和確認代碼與Trashposs互動的结果。" output: "輸出" script: "腳本" disablePagesScript: "停用頁面的AiScript腳本" @@ -651,7 +651,7 @@ createNewClip: "建立新摘錄" unclip: "解除摘錄" confirmToUnclipAlreadyClippedNote: "此貼文已包含在摘錄「{name}」中。 你想將貼文從這個摘錄中排除嗎？" public: "公開" -i18nInfo: "Iceshrimp已經被志願者們翻譯成各種語言版本，如果想要幫忙的話，可以進入{link}幫助翻譯。" +i18nInfo: "Trashposs已經被志願者們翻譯成各種語言版本，如果想要幫忙的話，可以進入{link}幫助翻譯。" manageAccessTokens: "管理存取權杖" accountInfo: "帳戶資訊" notesCount: "貼文數量" @@ -794,7 +794,7 @@ hashtags: "#tag" troubleshooting: "故障排除" useBlurEffect: "在 UI 上使用模糊效果" learnMore: "更多資訊" -iceshrimpUpdated: "TrashPoss 更新完成！" +trashpossUpdated: "TrashPoss 更新完成！" whatIsNew: "顯示更新資訊" translate: "翻譯" translatedFrom: "從 {x} 翻譯" @@ -974,19 +974,19 @@ _registry: keys: "機碼" domain: "域" createKey: "新增機碼" -_aboutIceshrimp: - about: "Iceshrimp是由ThatOneCalculator自2022年起開發的Iceshrimp分支。" +_aboutTrashposs: + about: "Trashposs是由ThatOneCalculator自2022年起開發的Trashposs分支。" contributors: "主要貢獻者" allContributors: "全體貢獻人員" source: "原始碼" - translation: "翻譯Iceshrimp" - donate: "贊助Iceshrimp" + translation: "翻譯Trashposs" + donate: "贊助Trashposs" morePatrons: "還有許許多多幫助我們的其他人，非常感謝你們。 🥰" patrons: "贊助者" patronsList: 按時間順序列出，而不是按贊助規模列出。使用上面的連結贊助，在這裡獲得顯示您名字的機會！ sponsors: TrashPoss 贊助者們 donateTitle: 覺得 TrashPoss 棒嗎? - pleaseDonateToIceshrimp: 請考慮向 TrashPoss 贊助以支持其發展。 + pleaseDonateToTrashposs: 請考慮向 TrashPoss 贊助以支持其發展。 pleaseDonateToHost: 還請考慮捐贈給您在使用的伺服器 {host}，以支援龐大的運營成本。 donateHost: 贊助給 {host} _nsfw: @@ -995,8 +995,8 @@ _nsfw: force: "隱藏所有內容" _mfm: cheatSheet: "MFM代碼小抄" - intro: "MFM是Iceshrimp專用的標記語言，可以在Iceshrimp中的各個位置使用。 您可以這裏看到MFM可用語法列表。" - dummy: "Iceshrimp拓展了Fediverse的世界" + intro: "MFM是Trashposs專用的標記語言，可以在Trashposs中的各個位置使用。 您可以這裏看到MFM可用語法列表。" + dummy: "Trashposs拓展了Fediverse的世界" mention: "提及" mentionDescription: "透過 @+用戶名 來標示特定使用者。" hashtag: "#tag" @@ -1205,7 +1205,7 @@ _time: hour: "小時" day: "日" _tutorial: - title: "如何使用Iceshrimp" + title: "如何使用Trashposs" step1_1: "歡迎！" step1_2: "讓我們把你安排好。你很快就會啟動並運行！" step2_1: "首先，請完成你的個人資料。" @@ -1222,8 +1222,8 @@ _tutorial: step5_6: "推薦 {icon} 時間線是顯示你的伺服器管理員推薦的貼文。" step5_7: "全球 {icon} 時間線是顯示來自所有其他連接的伺服器的貼文。" step6_1: "那麼，這裡是什麼地方？" - step6_2: "你不只是加入Iceshrimp。你已經加入了Fediverse的一個門戶，這是一個由成千上萬台服務器組成的互聯網絡。" - step6_3: "每個服務器也有不同，而並不是所有的服務器都運行Iceshrimp。但這個服務器確實是運行Iceshrimp的! 你可能會覺得有點複雜，但你很快就會明白的。" + step6_2: "你不只是加入Trashposs。你已經加入了Fediverse的一個門戶，這是一個由成千上萬台服務器組成的互聯網絡。" + step6_3: "每個服務器也有不同，而並不是所有的服務器都運行Trashposs。但這個服務器確實是運行Trashposs的! 你可能會覺得有點複雜，但你很快就會明白的。" step6_4: "現在開始探索吧！" _2fa: alreadyRegistered: "你已註冊過一個雙重認證的裝置。" @@ -1826,7 +1826,7 @@ silenced: 已靜音 _experiments: title: 試驗功能 findOtherInstance: 找找另一個伺服器 -noGraze: 瀏覽器擴展 "Graze for Mastodon" 會與Iceshrimp發生衝突，請停用該擴展。 +noGraze: 瀏覽器擴展 "Graze for Mastodon" 會與Trashposs發生衝突，請停用該擴展。 userSaysSomethingReasonRenote: '{name} 轉傳了包含 {reason} 的貼文' pushNotificationNotSupported: 你的瀏覽器或伺服器不支援推送通知 accessibility: 輔助功能 diff --git a/packages/backend/src/migration/1689965609061-iceshrimp-repo.ts b/packages/backend/src/migration/1689965609061-trashposs-repo.ts similarity index 86% rename from packages/backend/src/migration/1689965609061-iceshrimp-repo.ts rename to packages/backend/src/migration/1689965609061-trashposs-repo.ts index c952e0050..fbb8804cc 100644 --- a/packages/backend/src/migration/1689965609061-iceshrimp-repo.ts +++ b/packages/backend/src/migration/1689965609061-trashposs-repo.ts @@ -1,6 +1,6 @@ import { MigrationInterface, QueryRunner } from "typeorm"; -export class IceshrimpRepo1689965609061 implements MigrationInterface { - name = "IceshrimpRepo1689965609061"; +export class TrashpossRepo1689965609061 implements MigrationInterface { + name = "TrashpossRepo1689965609061"; async up(queryRunner: QueryRunner): Promise { await queryRunner.query( diff --git a/packages/backend/src/migration/1697289658422-resync-with-orm.ts b/packages/backend/src/migration/1697289658422-resync-with-orm.ts index c50cd1718..5b942ca73 100644 --- a/packages/backend/src/migration/1697289658422-resync-with-orm.ts +++ b/packages/backend/src/migration/1697289658422-resync-with-orm.ts @@ -15,7 +15,7 @@ export class ResyncWithOrm1697289658422 implements MigrationInterface { await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "secureMode" SET NOT NULL`); await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "privateMode" SET NOT NULL`); await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "allowedHosts" SET NOT NULL`); - await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "pinnedPages" SET DEFAULT '{/featured,/channels,/explore,/pages,/about-iceshrimp}'`); + await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "pinnedPages" SET DEFAULT '{/featured,/channels,/explore,/pages,/about-trashposs}'`); await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "repositoryUrl" SET DEFAULT 'https://iceshrimp.dev/Crimekillz/trashposs'`); await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "feedbackUrl" SET DEFAULT 'https://iceshrimp.dev/Crimekillz/trashposs/issues/new'`); await queryRunner.query(`COMMENT ON COLUMN "renote_muting"."createdAt" IS 'The created date of the Muting.'`); diff --git a/packages/backend/src/models/entities/meta.ts b/packages/backend/src/models/entities/meta.ts index ab0cc578d..3ab2414a5 100644 --- a/packages/backend/src/models/entities/meta.ts +++ b/packages/backend/src/models/entities/meta.ts @@ -143,7 +143,7 @@ export class Meta { @Column("varchar", { length: 512, array: true, - default: "{/featured,/channels,/explore,/pages,/about-iceshrimp}", + default: "{/featured,/channels,/explore,/pages,/about-trashposs}", }) public pinnedPages: string[]; diff --git a/packages/backend/src/models/schema/federation-instance.ts b/packages/backend/src/models/schema/federation-instance.ts index fa675699e..5d4a9203b 100644 --- a/packages/backend/src/models/schema/federation-instance.ts +++ b/packages/backend/src/models/schema/federation-instance.ts @@ -19,7 +19,7 @@ export const packedFederationInstanceSchema = { type: "string", optional: false, nullable: false, - example: "iceshrimp.example.com", + example: "trashposs.example.com", }, usersCount: { type: "number", @@ -77,7 +77,7 @@ export const packedFederationInstanceSchema = { type: "string", optional: false, nullable: true, - example: "iceshrimp", + example: "trashposs", }, softwareVersion: { type: "string", diff --git a/packages/backend/src/models/schema/hashtag.ts b/packages/backend/src/models/schema/hashtag.ts index 0f8be622d..9e8e85d41 100644 --- a/packages/backend/src/models/schema/hashtag.ts +++ b/packages/backend/src/models/schema/hashtag.ts @@ -5,7 +5,7 @@ export const packedHashtagSchema = { type: "string", optional: false, nullable: false, - example: "iceshrimp", + example: "trashposs", }, mentionedUsersCount: { type: "number", diff --git a/packages/backend/src/server/api/endpoints/latest-version.ts b/packages/backend/src/server/api/endpoints/latest-version.ts index 8c44d15f2..163b63b26 100644 --- a/packages/backend/src/server/api/endpoints/latest-version.ts +++ b/packages/backend/src/server/api/endpoints/latest-version.ts @@ -17,7 +17,7 @@ export const paramDef = { export default define(meta, paramDef, async () => { let tag_name; await fetch( - `https://iceshrimp.dev/api/v1/repos/iceshrimp/iceshrimp/releases?draft=false&pre-release=${config.version.includes('-pre')}&page=1&limit=1`, + `https://iceshrimp.dev/api/v1/repos/Crimekillz/trashposs/releases?draft=false&pre-release=${config.version.includes('-pre')}&page=1&limit=1`, ) .then((response) => response.json()) .then((data) => { diff --git a/packages/backend/src/server/api/mastodon/converters/visibility.ts b/packages/backend/src/server/api/mastodon/converters/visibility.ts index 6d9c44334..8e49e3845 100644 --- a/packages/backend/src/server/api/mastodon/converters/visibility.ts +++ b/packages/backend/src/server/api/mastodon/converters/visibility.ts @@ -1,8 +1,8 @@ -export type IceshrimpVisibility = "public" | "home" | "followers" | "specified" | "hidden"; +export type TrashpossVisibility = "public" | "home" | "followers" | "specified" | "hidden"; export type MastodonVisibility = "public" | "unlisted" | "private" | "direct"; export class VisibilityConverter { - public static encode(v: IceshrimpVisibility): MastodonVisibility { + public static encode(v: TrashpossVisibility): MastodonVisibility { switch (v) { case "public": return v; @@ -17,7 +17,7 @@ export class VisibilityConverter { } } - public static decode(v: MastodonVisibility): IceshrimpVisibility { + public static decode(v: MastodonVisibility): TrashpossVisibility { switch (v) { case "public": return v; diff --git a/packages/backend/src/server/api/mastodon/endpoints/auth.ts b/packages/backend/src/server/api/mastodon/endpoints/auth.ts index 95baa10bd..bc3090bad 100644 --- a/packages/backend/src/server/api/mastodon/endpoints/auth.ts +++ b/packages/backend/src/server/api/mastodon/endpoints/auth.ts @@ -11,13 +11,13 @@ export function setupEndpointsAuth(router: Router): void { ctx.body = await AuthHelpers.verifyAppCredentials(ctx); }); - router.post("/v1/iceshrimp/apps/info", + router.post("/v1/trashposs/apps/info", MiAuth(true), async (ctx) => { ctx.body = await AuthHelpers.getAppInfo(ctx); }); - router.post("/v1/iceshrimp/auth/code", + router.post("/v1/trashposs/auth/code", MiAuth(true), async (ctx) => { ctx.body = await AuthHelpers.getAuthCode(ctx); diff --git a/packages/backend/src/server/api/mastodon/helpers/user.ts b/packages/backend/src/server/api/mastodon/helpers/user.ts index 77dd6cce8..9c80475ec 100644 --- a/packages/backend/src/server/api/mastodon/helpers/user.ts +++ b/packages/backend/src/server/api/mastodon/helpers/user.ts @@ -33,7 +33,7 @@ import { UserConverter } from "@/server/api/mastodon/converters/user.js"; import acceptFollowRequest from "@/services/following/requests/accept.js"; import { rejectFollowRequest } from "@/services/following/reject.js"; import { Brackets, IsNull } from "typeorm"; -import { IceshrimpVisibility, VisibilityConverter } from "@/server/api/mastodon/converters/visibility.js"; +import { TrashpossVisibility, VisibilityConverter } from "@/server/api/mastodon/converters/visibility.js"; import { Files } from "formidable"; import { toSingleLast } from "@/prelude/array.js"; import { MediaHelpers } from "@/server/api/mastodon/helpers/media.js"; @@ -549,7 +549,7 @@ export class UserHelpers { }; } - public static async getDefaultNoteVisibility(ctx: MastoContext): Promise { + public static async getDefaultNoteVisibility(ctx: MastoContext): Promise { const user = ctx.user as ILocalUser; return RegistryItems.findOneBy({ domain: IsNull(), diff --git a/packages/backend/src/server/web/bios.css b/packages/backend/src/server/web/bios.css index d927f26ed..6e5973cf4 100644 --- a/packages/backend/src/server/web/bios.css +++ b/packages/backend/src/server/web/bios.css @@ -45,7 +45,7 @@ main { * { font-family: BIZ UDGothic, Roboto, HelveticaNeue, Arial, sans-serif; } -#iceshrimp_app { +#trashposs_app { display: none !important; } body, diff --git a/packages/backend/src/server/web/boot.js b/packages/backend/src/server/web/boot.js index bb27f60af..14a4f8f61 100644 --- a/packages/backend/src/server/web/boot.js +++ b/packages/backend/src/server/web/boot.js @@ -185,7 +185,7 @@ font-family: Roboto,HelveticaNeue,Arial,sans-serif; } - #iceshrimp_app, + #trashposs_app, #splash { display: none !important; } diff --git a/packages/backend/src/server/web/cli.css b/packages/backend/src/server/web/cli.css index 9407b5f7b..fd9b6c9cd 100644 --- a/packages/backend/src/server/web/cli.css +++ b/packages/backend/src/server/web/cli.css @@ -26,7 +26,7 @@ img { text-align: center; } -#iceshrimp_app { +#trashposs_app { display: none !important; } diff --git a/packages/backend/test/mfm.ts b/packages/backend/test/mfm.ts index 642403875..1fe0192d3 100644 --- a/packages/backend/test/mfm.ts +++ b/packages/backend/test/mfm.ts @@ -70,18 +70,18 @@ describe("fromHtml", () => { it("link with same text", async () => { assert.deepStrictEqual( await fromHtml( - '

a https://joiniceshrimp.org/b d

', + '

a https://jointrashposs.org/b d

', ), - "a https://joiniceshrimp.org/b d", + "a https://jointrashposs.org/b d", ); }); it("link with same text, but not encoded", async () => { assert.deepStrictEqual( await fromHtml( - '

a https://joiniceshrimp.org/ä d

', + '

a https://jointrashposs.org/ä d

', ), - "a d", + "a d", ); }); @@ -98,8 +98,8 @@ describe("fromHtml", () => { it("link without text", async () => { assert.deepStrictEqual( - await fromHtml('

a d

'), - "a https://joiniceshrimp.org/b d", + await fromHtml('

a d

'), + "a https://jointrashposs.org/b d", ); }); @@ -109,14 +109,14 @@ describe("fromHtml", () => { it("mention", async () => { assert.deepStrictEqual( - await fromHtml('

a @user d

'), - "a @user@joiniceshrimp.org d", + await fromHtml('

a @user d

'), + "a @user@jointrashposs.org d", ); }); it("hashtag", async () => { assert.deepStrictEqual( - await fromHtml('

a #a d

', [ + await fromHtml('

a #a d

', [ "#a", ]), "a #a d", diff --git a/packages/client/src/components/MkInstanceCardMini.vue b/packages/client/src/components/MkInstanceCardMini.vue index 10e975bb0..82c800eb0 100644 --- a/packages/client/src/components/MkInstanceCardMini.vue +++ b/packages/client/src/components/MkInstanceCardMini.vue @@ -24,13 +24,13 @@ diff --git a/packages/client/src/pages/about.vue b/packages/client/src/pages/about.vue index 5153b2eec..9372c8fc1 100644 --- a/packages/client/src/pages/about.vue +++ b/packages/client/src/pages/about.vue @@ -62,8 +62,8 @@ - {{ - i18n.ts.aboutIceshrimp + {{ + i18n.ts.aboutTrashposs }} @@ -102,7 +102,7 @@ > {{ - i18n.t("_aboutIceshrimp.donateHost", { + i18n.t("_aboutTrashposs.donateHost", { host: $instance.name || host, }) }} diff --git a/packages/client/src/pages/instance-info.vue b/packages/client/src/pages/instance-info.vue index 7de6a26f6..ffe56ad15 100644 --- a/packages/client/src/pages/instance-info.vue +++ b/packages/client/src/pages/instance-info.vue @@ -340,7 +340,7 @@ import { watch } from "vue"; import { Virtual } from "swiper/modules"; import { Swiper, SwiperSlide } from "swiper/vue"; -import type * as iceshrimp from "trashposs-js"; +import type * as trashposs from "trashposs-js"; import MkChart from "@/components/MkChart.vue"; import MkObjectView from "@/components/MkObjectView.vue"; import FormLink from "@/components/form/link.vue"; @@ -363,11 +363,11 @@ import "swiper/scss"; import "swiper/scss/virtual"; import { getProxiedImageUrlNullable } from "@/scripts/media-proxy"; -type AugmentedInstanceMetadata = iceshrimp.entities.DetailedInstanceMetadata & { +type AugmentedInstanceMetadata = trashposs.entities.DetailedInstanceMetadata & { blockedHosts: string[]; silencedHosts: string[]; }; -type AugmentedInstance = iceshrimp.entities.Instance & { +type AugmentedInstance = trashposs.entities.Instance & { isBlocked: boolean; isSilenced: boolean; }; diff --git a/packages/client/src/pages/note.vue b/packages/client/src/pages/note.vue index 8bdeec4bb..f79f91a72 100644 --- a/packages/client/src/pages/note.vue +++ b/packages/client/src/pages/note.vue @@ -160,7 +160,7 @@ definePageMetadata( } .fcuexfpr { - #iceshrimp_app > :not(.wallpaper) & { + #trashposs_app > :not(.wallpaper) & { background: var(--bg); } diff --git a/packages/client/src/pages/oauth.vue b/packages/client/src/pages/oauth.vue index 2ff7dfdd9..3d71e5428 100644 --- a/packages/client/src/pages/oauth.vue +++ b/packages/client/src/pages/oauth.vue @@ -116,7 +116,7 @@ let name = $ref(null); let message = $ref('Unknown error occurred'); if ($i) { - await os.apiJson("v1/iceshrimp/apps/info", { + await os.apiJson("v1/trashposs/apps/info", { client_id: props.client_id, }).then(res => { name = res.name; @@ -150,7 +150,7 @@ function getIcon(p: string) { async function accept(): Promise { state = "waiting"; - const res = await os.apiJson("v1/iceshrimp/auth/code", { + const res = await os.apiJson("v1/trashposs/auth/code", { client_id: props.client_id, redirect_uri: redirectUri, scopes: _scopes, diff --git a/packages/client/src/pages/settings/general.vue b/packages/client/src/pages/settings/general.vue index 895c2dbbd..039d6ece2 100644 --- a/packages/client/src/pages/settings/general.vue +++ b/packages/client/src/pages/settings/general.vue @@ -9,7 +9,7 @@ diff --git a/packages/client/src/pages/settings/import-export.vue b/packages/client/src/pages/settings/import-export.vue index 6ed042d87..6bcab4957 100644 --- a/packages/client/src/pages/settings/import-export.vue +++ b/packages/client/src/pages/settings/import-export.vue @@ -22,7 +22,7 @@ > - + { diff --git a/packages/client/src/pages/user/achievements.vue b/packages/client/src/pages/user/achievements.vue index 5fc93ac3b..e5cc4e8d8 100644 --- a/packages/client/src/pages/user/achievements.vue +++ b/packages/client/src/pages/user/achievements.vue @@ -6,14 +6,14 @@