oof

Co-authored-by: Free <freeplay@duck.com>
Co-committed-by: Free <freeplay@duck.com>

.config/ci.yml

@@ -0,0 +1,195 @@
+#━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+# Calckey configuration
+#━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+#   ┌─────┐
+#───┘ URL └─────────────────────────────────────────────────────
+
+# Final accessible URL seen by a user.
+url: https://example.tld/
+
+# ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
+# URL SETTINGS AFTER THAT!
+
+#   ┌───────────────────────┐
+#───┘ Port and TLS settings └───────────────────────────────────
+
+#
+# Misskey requires a reverse proxy to support HTTPS connections.
+#
+#                 +----- https://example.tld/ ------------+
+#   +------+      |+-------------+      +----------------+|
+#   | User | ---> || Proxy (443) | ---> | Misskey (3000) ||
+#   +------+      |+-------------+      +----------------+|
+#                 +---------------------------------------+
+#
+#   You need to set up a reverse proxy. (e.g. nginx)
+#   An encrypted connection with HTTPS is highly recommended
+#   because tokens may be transferred in GET requests.
+
+# The port that your Misskey server should listen on.
+port: 3000
+
+#   ┌──────────────────────────┐
+#───┘ PostgreSQL configuration └────────────────────────────────
+
+db:
+  host: database
+  port: 5432
+
+  # Database name
+  db: postgres
+
+  # Auth
+  user: postgres
+  pass: test
+
+  # Whether disable Caching queries
+  #disableCache: true
+
+  # Extra Connection options
+  #extra:
+  #  ssl: true
+
+#   ┌─────────────────────┐
+#───┘ Redis configuration └─────────────────────────────────────
+
+redis:
+  host: redis
+  port: 6379
+  #family: 0  # 0=Both, 4=IPv4, 6=IPv6
+  #pass: example-pass
+  #prefix: example-prefix
+  #db: 1
+
+#   ┌─────────────────────────────┐
+#───┘ Elasticsearch configuration └─────────────────────────────
+
+#elasticsearch:
+#  host: localhost
+#  port: 9200
+#  ssl: false
+#  user: 
+#  pass: 
+
+#   ┌───────────────┐
+#───┘ ID generation └───────────────────────────────────────────
+
+# You can select the ID generation method.
+# You don't usually need to change this setting, but you can
+# change it according to your preferences.
+
+# Available methods:
+# aid ... Short, Millisecond accuracy
+# meid ... Similar to ObjectID, Millisecond accuracy
+# ulid ... Millisecond accuracy
+# objectid ... This is left for backward compatibility
+
+# ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
+# ID SETTINGS AFTER THAT!
+
+id: 'aid'
+
+#   ┌─────────────────────┐
+#───┘ Other configuration └─────────────────────────────────────
+
+# Max note length, should be < 8000.
+#maxNoteLength: 3000
+
+# Whether disable HSTS
+#disableHsts: true
+
+# Number of worker processes
+#clusterLimit: 1
+
+# Job concurrency per worker
+# deliverJobConcurrency: 128
+# inboxJobConcurrency: 16
+
+# Job rate limiter
+# deliverJobPerSec: 128
+# inboxJobPerSec: 16
+
+# Job attempts
+# deliverJobMaxAttempts: 12
+# inboxJobMaxAttempts: 8
+
+# IP address family used for outgoing request (ipv4, ipv6 or dual)
+#outgoingAddressFamily: ipv4
+
+# Syslog option
+#syslog:
+#  host: localhost
+#  port: 514
+
+# Proxy for HTTP/HTTPS
+#proxy: http://127.0.0.1:3128
+
+#proxyBypassHosts: [
+#  'example.com',
+#  '192.0.2.8'
+#]
+
+# Proxy for SMTP/SMTPS
+#proxySmtp: http://127.0.0.1:3128   # use HTTP/1.1 CONNECT
+#proxySmtp: socks4://127.0.0.1:1080 # use SOCKS4
+#proxySmtp: socks5://127.0.0.1:1080 # use SOCKS5
+
+# Media Proxy
+#mediaProxy: https://example.com/proxy
+
+# Proxy remote files (default: false)
+#proxyRemoteFiles: true
+
+#allowedPrivateNetworks: [
+#  '127.0.0.1/32'
+#]
+
+# Upload or download file size limits (bytes)
+#maxFileSize: 262144000
+
+# Managed hosting settings
+# !!!!!!!!!!
+# >>>>>> NORMAL SELF-HOSTERS, STAY AWAY! <<<<<<
+# >>>>>> YOU DON'T NEED THIS! <<<<<<
+# !!!!!!!!!!
+# Each category is optional, but if each item in each category is mandatory!
+# If you mess this up, that's on you, you've been warned...
+
+#maxUserSignups: 100
+#isManagedHosting: true
+#deepl:
+#  managed: true
+#  authKey: ''
+#  isPro: false
+#
+#email:
+#  managed: true
+#  address: 'example@email.com'
+#  host: 'email.com'
+#  port: 587
+#  user: 'example@email.com'
+#  pass: ''
+#  useImplicitSslTls: false
+#
+#objectStorage:
+#  managed: true
+#  baseUrl: ''
+#  bucket: ''
+#  prefix: ''
+#  endpoint: ''
+#  region: ''
+#  accessKey: ''
+#  secretKey: ''
+#  useSsl: true
+#  connnectOverProxy: false
+#  setPublicReadOnUpload: true
+#  s3ForcePathStyle: true
+
+# !!!!!!!!!!
+# >>>>>> AGAIN, NORMAL SELF-HOSTERS, STAY AWAY! <<<<<<
+# >>>>>> YOU DON'T NEED THIS, ABOVE SETTINGS ARE FOR MANAGED HOSTING ONLY! <<<<<<
+# !!!!!!!!!!
+
+# Seriously. Do NOT fill out the above settings if you're self-hosting.
+# They're much better off being set from the control panel. 

.config/docker_example.env

@@ -1,4 +1,4 @@
 # db settings
-POSTGRES_PASSWORD=example-misskey-pass
+POSTGRES_PASSWORD=example-calckey-pass
-POSTGRES_USER=example-misskey-user
+POSTGRES_USER=example-calckey-user
-POSTGRES_DB=misskey
+POSTGRES_DB=calckey

.config/example.yml

@@ -1,5 +1,5 @@
 #━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-# Misskey configuration
+# Calckey configuration
 #━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
 #   ┌─────┐
@@ -38,11 +38,11 @@ db:
   port: 5432
 
   # Database name
-  db: misskey
+  db: calckey
 
   # Auth
-  user: example-misskey-user
+  user: example-calckey-user
-  pass: example-misskey-pass
+  pass: example-calckey-pass
 
   # Whether disable Caching queries
   #disableCache: true
@@ -93,6 +93,9 @@ id: 'aid'
 #   ┌─────────────────────┐
 #───┘ Other configuration └─────────────────────────────────────
 
+# Max note length, should be < 8000.
+#maxNoteLength: 3000
+
 # Whether disable HSTS
 #disableHsts: true
 
@@ -138,12 +141,61 @@ id: 'aid'
 # Proxy remote files (default: false)
 #proxyRemoteFiles: true
 
-# Sign to ActivityPub GET request (default: false)
-#signToActivityPubGet: true
-
 #allowedPrivateNetworks: [
 #  '127.0.0.1/32'
 #]
 
+# TWA
+#twa:
+#  nameSpace: android_app
+#  packageName: tld.domain.twa
+#  sha256CertFingerprints: ['AB:CD:EF']
+
 # Upload or download file size limits (bytes)
 #maxFileSize: 262144000
+
+# Managed hosting settings
+# !!!!!!!!!!
+# >>>>>> NORMAL SELF-HOSTERS, STAY AWAY! <<<<<<
+# >>>>>> YOU DON'T NEED THIS! <<<<<<
+# !!!!!!!!!!
+# Each category is optional, but if each item in each category is mandatory!
+# If you mess this up, that's on you, you've been warned...
+
+#maxUserSignups: 100
+#isManagedHosting: true
+#deepl:
+#  managed: true
+#  authKey: ''
+#  isPro: false
+#
+#email:
+#  managed: true
+#  address: 'example@email.com'
+#  host: 'email.com'
+#  port: 587
+#  user: 'example@email.com'
+#  pass: ''
+#  useImplicitSslTls: false
+#
+#objectStorage:
+#  managed: true
+#  baseUrl: ''
+#  bucket: ''
+#  prefix: ''
+#  endpoint: ''
+#  region: ''
+#  accessKey: ''
+#  secretKey: ''
+#  useSsl: true
+#  connnectOverProxy: false
+#  setPublicReadOnUpload: true
+#  s3ForcePathStyle: true
+
+# !!!!!!!!!!
+# >>>>>> AGAIN, NORMAL SELF-HOSTERS, STAY AWAY! <<<<<<
+# >>>>>> YOU DON'T NEED THIS, ABOVE SETTINGS ARE FOR MANAGED HOSTING ONLY! <<<<<<
+# !!!!!!!!!!
+
+# Seriously. Do NOT fill out the above settings if you're self-hosting.
+# They're much better off being set from the control panel. 

.dockerignore

@@ -1,15 +1,48 @@
-.autogen
+# Visual Studio Code
-.github
+/.vscode
-.travis
+!/.vscode/extensions.json
-.vscode
+
-.config
+# Intelij-IDEA
+/.idea
+packages/backend/.idea/backend.iml
+packages/backend/.idea/modules.xml
+packages/backend/.idea/vcs.xml
+
+# Node.js
+node_modules
+report.*.json
+
+# Cypress
+cypress/screenshots
+cypress/videos
+
+# Coverage
+coverage
+
+# config
+/.config/*
+!/.config/example.yml
+!/.config/docker_example.env
+
+#docker dev config
+/dev/docker-compose.yml
+
+# misskey
+built
+db
+elasticsearch
+redis
+npm-debug.log
+*.pem
+run.bat
+api-docs.json
+*.log
+*.code-workspace
+.DS_Store
+files
+ormconfig.json
+packages/backend/assets/instance.css
+
+# dockerignore custom
+.git
 Dockerfile
-build/
-built/
-db/
-docker-compose.yml
-elasticsearch/
-node_modules/
-redis/
-files/
-misskey-assets/

.github/FUNDING.yml

@@ -1,3 +0,0 @@
-# These are supported funding model platforms
-
-patreon: syuilo

.github/ISSUE_TEMPLATE/01_bug-report.md

@@ -1,42 +0,0 @@
----
-name: 🐛 Bug Report
-about: Create a report to help us improve
-title: ''
-labels: ⚠️bug?
-assignees: ''
-
----
-
-<!--
-Thanks for reporting!
-First, in order to avoid duplicate Issues, please search to see if the problem you found has already been reported.
--->
-
-## 💡 Summary
-
-<!-- Tell us what the bug is -->
-
-## 🥰 Expected Behavior
-
-<!--- Tell us what should happen -->
-
-## 🤬 Actual Behavior
-
-<!--
-Tell us what happens instead of the expected behavior.
-Please include errors from the developer console and/or server log files if you have access to them.
--->
-
-## 📝 Steps to Reproduce
-
-1.
-2.
-3.
-
-## 📌 Environment
-
-<!-- Tell us where on the platform it happens -->
-
-Misskey version:
-Your OS:
-Your browser:

.github/ISSUE_TEMPLATE/02_feature-request.md

@@ -1,12 +0,0 @@
----
-name: ✨ Feature Request
-about: Suggest an idea for this project
-title: ''
-labels: ✨Feature
-assignees: ''
-
----
-
-## Summary
-
-<!-- Tell us what the suggestion is -->

.github/ISSUE_TEMPLATE/config.yml

@@ -1,7 +0,0 @@
-contact_links:
-  - name: 👪 Misskey Forum
-    url: https://forum.misskey.io/
-    about: Ask questions and share knowledge
-  - name: 💬 Misskey official Discord
-    url: https://discord.gg/Wp8gVStHW3
-    about: Chat freely about Misskey

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,17 +0,0 @@
-<!-- ℹ お読みください / README
-PRありがとうございます！ PRを作成する前に、コントリビューションガイドをご確認ください:
-Thank you for your PR! Before creating a PR, please check the contribution guide:
-https://github.com/misskey-dev/misskey/blob/develop/CONTRIBUTING.md
--->
-
-# What
-<!-- このPRで何をしたのか？ どう変わるのか？ -->
-<!-- What did you do with this PR? How will it change things? -->
-
-# Why
-<!-- なぜそうするのか？ どういう意図なのか？ 何が困っているのか？ -->
-<!-- Why do you do it? What are your intentions? What is the problem? -->
-
-# Additional info (optional)
-<!-- テスト観点など -->
-<!-- Test perspective, etc -->

.github/dependabot.yml

@@ -1,22 +0,0 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-
-version: 2
-updates:
-- package-ecosystem: npm
-  directory: "/"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 0
-- package-ecosystem: npm
-  directory: "/packages/backend"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 0
-- package-ecosystem: npm
-  directory: "/packages/client"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 0

.github/labeler.yml

@@ -1,12 +0,0 @@
-'⚙️Server':
-- packages/backend/**/*
-
-'🖥️Client':
-- packages/client/**/*
-
-'🧪Test':
-- cypress/**/*
-- packages/backend/test/**/*
-
-'‼️ wrong locales':
-- any: ['locales/*.yml', '!locales/ja-JP.yml']

.github/misskey/test.yml

@@ -1,15 +0,0 @@
-url: 'http://misskey.local'
-
-# ローカルでテストするときにポートを被らないようにするためデフォルトのものとは変える(以下同じ)
-port: 61812
-
-db:
-  host: localhost
-  port: 54312
-  db: test-misskey
-  user: postgres
-  pass: ''
-redis:
-  host: localhost
-  port: 56312
-id: aid

.github/workflows/docker-develop.yml

@@ -1,33 +0,0 @@
-name: Publish Docker image (develop)
-
-on:
-  push:
-    branches:
-      - develop
-  workflow_dispatch:
-
-jobs:
-  push_to_registry:
-    name: Push Docker image to Docker Hub
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v2
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v3
-        with:
-          images: misskey/misskey
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Build and Push to Docker Hub
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          push: true
-          tags: misskey/misskey:develop
-          labels: develop

.github/workflows/docker.yml

@@ -1,32 +0,0 @@
-name: Publish Docker image
-
-on:
-  release:
-    types: [published]
-  workflow_dispatch:
-
-jobs:
-  push_to_registry:
-    name: Push Docker image to Docker Hub
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v2
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v3
-        with:
-          images: misskey/misskey
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Build and Push to Docker Hub
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/labeler.yml

@@ -1,16 +0,0 @@
-name: "Pull Request Labeler"
-on:
-  pull_request_target:
-    branches-ignore:
-      - 'l10n_develop'
-
-jobs:
-  triage:
-    permissions:
-      contents: read
-      pull-requests: write
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/labeler@v4
-      with:
-        repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/lint.yml

@@ -1,39 +0,0 @@
-name: Lint
-
-on:
-  push:
-    branches:
-      - master
-      - develop
-  pull_request:
-
-jobs:
-  backend:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        submodules: true
-    - uses: actions/setup-node@v3
-      with:
-        node-version: 18.x
-        cache: 'yarn'
-        cache-dependency-path: |
-          packages/backend/yarn.lock
-    - run: yarn install
-    - run: yarn --cwd ./packages/backend lint
-
-  client:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        submodules: true
-    - uses: actions/setup-node@v3
-      with:
-        node-version: 18.x
-        cache: 'yarn'
-        cache-dependency-path: |
-          packages/client/yarn.lock
-    - run: yarn install
-    - run: yarn --cwd ./packages/client lint

.github/workflows/ok-to-test.yml

@@ -1,36 +0,0 @@
-# If someone with write access comments "/ok-to-test" on a pull request, emit a repository_dispatch event
-name: Ok To Test
-
-on:
-  issue_comment:
-    types: [created]
-
-jobs:
-  ok-to-test:
-    runs-on: ubuntu-latest
-    # Only run for PRs, not issue comments
-    if: ${{ github.event.issue.pull_request }}
-    steps:
-    # Generate a GitHub App installation access token from an App ID and private key
-    # To create a new GitHub App:
-    #   https://developer.github.com/apps/building-github-apps/creating-a-github-app/
-    # See app.yml for an example app manifest
-    - name: Generate token
-      id: generate_token
-      uses: tibdex/github-app-token@v1
-      with:
-        app_id: ${{ secrets.DEPLOYBOT_APP_ID }}
-        private_key: ${{ secrets.DEPLOYBOT_PRIVATE_KEY }}
-
-    - name: Slash Command Dispatch
-      uses: peter-evans/slash-command-dispatch@v1
-      env:
-        TOKEN: ${{ steps.generate_token.outputs.token }}
-      with:
-        token: ${{ env.TOKEN }} # GitHub App installation access token
-        # token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} # PAT or OAuth token will also work
-        reaction-token: ${{ secrets.GITHUB_TOKEN }}
-        issue-type: pull-request
-        commands: deploy
-        named-args: true
-        permission: write

.github/workflows/pr-preview-deploy.yml

@@ -1,95 +0,0 @@
-# Run secret-dependent integration tests only after /deploy approval
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-  repository_dispatch:
-    types: [deploy-command]
-
-name: Deploy preview environment
-
-jobs:
-  # Repo owner has commented /deploy on a (fork-based) pull request
-  deploy-preview-environment:
-    runs-on: ubuntu-latest
-    if:
-      github.event_name == 'repository_dispatch' &&
-      github.event.client_payload.slash_command.sha != '' &&
-      contains(github.event.client_payload.pull_request.head.sha, github.event.client_payload.slash_command.sha)
-    steps:
-    - uses: actions/github-script@v5
-      id: check-id
-      env:
-        number: ${{ github.event.client_payload.pull_request.number }}
-        job: ${{ github.job }}
-      with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-        result-encoding: string
-        script: |
-          const { data: pull } = await github.rest.pulls.get({
-            ...context.repo,
-            pull_number: process.env.number
-          });
-          const ref = pull.head.sha;
-
-          const { data: checks } = await github.rest.checks.listForRef({
-            ...context.repo,
-            ref
-          });
-
-          const check = checks.check_runs.filter(c => c.name === process.env.job);
-
-          return check[0].id;
-
-    - uses: actions/github-script@v5
-      env:
-        check_id: ${{ steps.check-id.outputs.result }}
-        details_url: ${{ github.server_url }}/${{ github.repository }}/runs/${{ github.run_id }}
-      with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-        script: |
-          await github.rest.checks.update({
-            ...context.repo,
-            check_run_id: process.env.check_id,
-            status: 'in_progress',
-            details_url: process.env.details_url
-          });
-
-    # Check out merge commit
-    - name: Fork based /deploy checkout
-      uses: actions/checkout@v2
-      with:
-        ref: 'refs/pull/${{ github.event.client_payload.pull_request.number }}/merge'
-
-    # <insert integration tests needing secrets>
-    - name: Context
-      uses: okteto/context@latest
-      with:
-        token: ${{ secrets.OKTETO_TOKEN }}
-
-    - name: Deploy preview environment
-      uses: ikuradon/deploy-preview@latest
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        name: pr-${{ github.event.client_payload.pull_request.number }}-syuilo
-        timeout: 15m
-
-    # Update check run called "integration-fork"
-    - uses: actions/github-script@v5
-      id: update-check-run
-      if: ${{ always() }}
-      env:
-        # Conveniently, job.status maps to https://developer.github.com/v3/checks/runs/#update-a-check-run
-        conclusion: ${{ job.status }}
-        check_id: ${{ steps.check-id.outputs.result }}
-      with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-        script: |
-          const { data: result } = await github.rest.checks.update({
-            ...context.repo,
-            check_run_id: process.env.check_id,
-            status: 'completed',
-            conclusion: process.env.conclusion
-          });
-
-          return result;

.github/workflows/pr-preview-destroy.yml

@@ -1,21 +0,0 @@
-# file: .github/workflows/preview-closed.yaml
-on:
-  pull_request:
-    types:
-      - closed
-
-name: Destroy preview environment
-
-jobs:
-  destroy-preview-environment:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Context
-        uses: okteto/context@latest
-        with:
-          token: ${{ secrets.OKTETO_TOKEN }}
-
-      - name: Destroy preview environment
-        uses: okteto/destroy-preview@latest
-        with:
-          name: pr-${{ github.event.number }}-syuilo

.github/workflows/test.yml

@@ -1,122 +0,0 @@
-name: Test
-
-on:
-  push:
-    branches:
-      - master
-      - develop
-  pull_request:
-
-jobs:
-  mocha:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [18.x]
-
-    services:
-      postgres:
-        image: postgres:13
-        ports:
-          - 54312:5432
-        env:
-          POSTGRES_DB: test-misskey
-          POSTGRES_HOST_AUTH_METHOD: trust
-      redis:
-        image: redis:6
-        ports:
-          - 56312:6379
-
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        submodules: true
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3
-      with:
-        node-version: ${{ matrix.node-version }}
-        cache: 'yarn'
-        cache-dependency-path: |
-          packages/backend/yarn.lock
-          packages/client/yarn.lock
-    - name: Install dependencies
-      run: yarn install
-    - name: Check yarn.lock
-      run: git diff --exit-code yarn.lock
-    - name: Copy Configure
-      run: cp .github/misskey/test.yml .config
-    - name: Build
-      run: yarn build
-    - name: Test
-      run: yarn mocha
-
-  e2e:
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        node-version: [18.x]
-        browser: [chrome]
-
-    services:
-      postgres:
-        image: postgres:13
-        ports:
-          - 54312:5432
-        env:
-          POSTGRES_DB: test-misskey
-          POSTGRES_HOST_AUTH_METHOD: trust
-      redis:
-        image: redis:6
-        ports:
-          - 56312:6379
-
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        submodules: true
-    # https://github.com/cypress-io/cypress-docker-images/issues/150
-    #- name: Install mplayer for FireFox
-    #  run: sudo apt install mplayer -y
-    #  if: ${{ matrix.browser == 'firefox' }}
-    #- uses: browser-actions/setup-firefox@latest
-    #  if: ${{ matrix.browser == 'firefox' }}
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3
-      with:
-        node-version: ${{ matrix.node-version }}
-        cache: 'yarn'
-        cache-dependency-path: |
-          packages/backend/yarn.lock
-          packages/client/yarn.lock
-    - name: Install dependencies
-      run: yarn install
-    - name: Check yarn.lock
-      run: git diff --exit-code yarn.lock
-    - name: Copy Configure
-      run: cp .github/misskey/test.yml .config
-    - name: Build
-      run: yarn build
-    # https://github.com/cypress-io/cypress/issues/4351#issuecomment-559489091
-    - name: ALSA Env
-      run: echo -e 'pcm.!default {\n type hw\n card 0\n}\n\nctl.!default {\n type hw\n card 0\n}' > ~/.asoundrc
-    - name: Cypress run
-      uses: cypress-io/github-action@v4
-      with:
-        install: false
-        start: npm run start:test
-        wait-on: 'http://localhost:61812'
-        headless: false
-        browser: ${{ matrix.browser }}
-    - uses: actions/upload-artifact@v2
-      if: failure()
-      with:
-        name: ${{ matrix.browser }}-cypress-screenshots
-        path: cypress/screenshots
-    - uses: actions/upload-artifact@v2
-      if: always()
-      with:
-        name: ${{ matrix.browser }}-cypress-videos
-        path: cypress/videos

.gitignore

@@ -4,6 +4,9 @@
 
 # Intelij-IDEA
 /.idea
+packages/backend/.idea/backend.iml
+packages/backend/.idea/modules.xml
+packages/backend/.idea/vcs.xml
 
 # Node.js
 node_modules
@@ -21,23 +24,26 @@ coverage
 !/.config/example.yml
 !/.config/docker_example.env
 
+#docker dev config
+/dev/docker-compose.yml
+
 # misskey
-/build
 built
-/data
+db
-/.cache-loader
+elasticsearch
-/db
+redis
-/elasticsearch
 npm-debug.log
 *.pem
 run.bat
 api-docs.json
 *.log
-/redis
 *.code-workspace
 .DS_Store
-/files
+files
 ormconfig.json
+packages/backend/assets/instance.css
+packages/backend/assets/sounds/None.mp3
+
 
 # blender backups
 *.blend1
@@ -45,3 +51,7 @@ ormconfig.json
 *.blend3
 *.blend4
 *.blend5
+
+# old yarn
+.yarn
+yarn*

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "misskey-assets"]
-	path = misskey-assets
-	url = https://github.com/misskey-dev/assets.git

.npmrc

@@ -1,2 +0,0 @@
-save-exact = true
-package-lock = false

.vim/coc-settings.json

@@ -0,0 +1,4 @@
+{
+  "eslint.packageManager": "pnpm",
+  "workspace.workspaceFolderCheckCwd": false
+}

.vscode/extensions.json

@@ -1,9 +1,11 @@
 {
-	"recommendations": [
+  "recommendations": [
-		"editorconfig.editorconfig",
+    "editorconfig.editorconfig",
-		"eg2.vscode-npm-script",
+    "eg2.vscode-npm-script",
-		"dbaeumer.vscode-eslint",
+    "rome.rome",
-		"Vue.volar",
+    "Vue.volar",
-		"Vue.vscode-typescript-vue-plugin"
+    "Vue.vscode-typescript-vue-plugin",
-	]
+    "arcanis.vscode-zipfs",
+		"Orta.vscode-twoslash-queries"
+  ]
 }

.woodpecker/commit.yml

@@ -0,0 +1,21 @@
+pipeline:
+  testCommit:
+    image: node:latest
+    commands:
+      - cp .config/ci.yml .config/default.yml
+      - corepack enable
+      - corepack prepare pnpm@latest --activate
+      - pnpm i --frozen-lockfile
+      - pnpm run build
+      - pnpm run migrate
+
+services:
+  database:
+    image: postgres:15
+    environment:
+      - POSTGRES_PASSWORD=test
+  redis:
+    image: redis
+
+branches:
+  include: [ main, develop, feature/* ]

.woodpecker/dockerHubRelease.yml

@@ -0,0 +1,15 @@
+pipeline:
+  publish-docker-latest:
+    image: plugins/kaniko
+    settings:
+      repo: thatonecalculator/calckey
+      tags: latest
+      dockerfile: Dockerfile
+      username:
+        # Secret 'docker_username' needs to be set in the CI settings
+        from_secret: docker_username
+      password:
+        # Secret 'docker_password' needs to be set in the CI settings
+        from_secret: docker_password
+
+branches: main

.woodpecker/dockerHubReleaseCandidate.yml

@@ -0,0 +1,15 @@
+pipeline:
+  publish-docker-latest:
+    image: plugins/kaniko
+    settings:
+      repo: thatonecalculator/calckey
+      tags: rc
+      dockerfile: Dockerfile
+      username:
+        # Secret 'docker_username' needs to be set in the CI settings
+        from_secret: docker_username
+      password:
+        # Secret 'docker_password' needs to be set in the CI settings
+        from_secret: docker_password
+
+branches: beta

.woodpecker/dockerHubTag.yml

@@ -0,0 +1,19 @@
+pipeline:
+  publish-docker-tag:
+    image: plugins/kaniko
+    settings:
+      repo: thatonecalculator/calckey
+      # Uses the tag from git for the container tag
+      tags: ${CI_COMMIT_TAG}
+      dockerfile: Dockerfile
+      username:
+        # Secret 'docker_username' needs to be set in the CI settings
+        from_secret: docker_username
+      password:
+        # Secret 'docker_password' needs to be set in the CI settings
+        from_secret: docker_password
+    when:
+      # Push new version when version tag is created
+      event: tag
+      tag: v*
+

.woodpecker/testDocker.yml

@@ -0,0 +1,11 @@
+pipeline:
+  docker-build:
+    image: plugins/kaniko
+    settings:
+      repo: thatonecalculator/calckey
+      tags: test
+      dockerfile: Dockerfile
+      no_push: true
+
+branches:
+  include: [ main, develop, beta ]

.yarnrc

@@ -1 +0,0 @@
-network-timeout 600000

CALCKEY.md

@@ -0,0 +1,152 @@
+# All the changes to Calckey from stock Misskey
+
+## Planned
+
+- Stucture
+  - [Sonic](https://crates.io/crates/sonic-server) support as an ElasticSearch alternative
+  - [DragonflyDB](https://dragonflydb.io/) support as a Redis alternative
+  - Optionally use [ScyllaDB](https://www.scylladb.com/open-source-nosql-database/) for storing notes
+  - Rewrite backend in Rust and [Axum](https://github.com/tokio-rs/axum)
+- Function
+  - Federate with note edits
+  - Admin customizable max note length (100-8000)
+  - User "choices" (recommended users) like Mastodon and Soapbox
+  - Join Reason system like Mastodon/Pleroma
+  - Option to publicize instance blocks
+  - Backfill remote users
+  - Build flag to remove NSFW/AI stuff
+  - Timeline filters
+  - Filter notifications by user
+  - Non-nyaify cat mode
+  - Exclude self from antenna
+- Form
+  - MFM button
+  - Personal notes for all accounts
+  - Fully revamp non-logged-in screen
+  - Classic mode make instance icon bring up new context menu
+  - [Rat mode?](https://stop.voring.me/notes/933fx97bmd)
+
+## Work in progress
+
+- Weblate project
+- Customizable max note length
+- Link verification
+- Better Messaging UI
+- Better API Documentation
+- Remote follow button
+- Admin custom CSS
+- Add back time machine (jump to date)
+- Improve accesibility
+
+## Implemented
+
+- A lot of general bugfixes
+- pnpm instead of yarn
+  - Fix Dockerfile @hanna
+  - Upgrade packages with security vunrabilities
+- Saner defaults
+- Fediverse account migration
+- Recommended instances timeline
+- OCR image captioning
+- Improve mobile UX
+  - Swipe through pages on mobile
+  - Redesigned mobile bottom nav bar
+  - Post button on TL
+- Star as default reaction
+- Like/star button
+- Rosé Pine by default (+ non-themable elements made Rosé Pine)
+- Better sidebar/navbar
+- Better intro tutorial/onboarding
+- Add back groups
+  - Integrate groups UI into chats UI
+- MOTD (customizable by admins!)
+- Custom randomized splash icons
+- Self hosted, newly designed error images
+  - Illustrated by [Henki](https://www.youtube.com/c/Henkiwashere)!
+  - Licensed under the CC-BY-SA 4.0.
+- Better timeline top bar
+- Improved note style
+  - Make more of the post clickable like every other SNS
+  - No more details tag for reply attachments
+  - Better CW button
+- Mark as read from notifications widget
+- Less cluttered notification summary
+- Better welcome screen (not logged in)
+- vue-plyr as video/audio player
+- Ability to turn off "Connection lost" message
+- Raw instance info only for moderators
+- New spinner animation
+- Spinner instead of "Loading..."
+- SearchX instead of Google
+- Always signToActivityPubGet
+- Spacing on group items
+- Quotes have solid border
+- Reply limit bug fixed
+- Make showing the update popup optional
+- Improve PWA manifest
+- Fix incoming chat scrolling globally
+- Update notifier
+- Allow admins to set logo URL via admin settings
+- Allow importing follows from Pixelfed
+- Phosphor icons instead of FontAwesome
+- Fully deprecate MkEmojiPickerWindow in favor of MkEmojiPickerDialog
+- Link hover effect
+- Replace all `$ts` with i18n
+- AVIF support
+- Page drafts
+- Patron list
+- Animations respect reduced motion
+- Undo renote button inside original note
+- Custom locales
+- Obliteration of Ai-chan
+- Switch to [Calckey.js](https://codeberg.org/calckey/calckey.js)
+- Woozy mode 🥴
+- Improve blocking instances
+- Release notes
+- New post style
+- Admins set default reaction emoji
+  - Allows custom emoji
+- Fix lint errors
+- Use Rome instead of ESLint
+- MissV: [fix Misskey Forkbomb](https://code.vtopia.live/Vtopia/MissV/commit/40b23c070bd4adbb3188c73546c6c625138fb3c1)
+- [Make showing ads optional](https://github.com/misskey-dev/misskey/pull/8996)
+- [Tapping avatar in mobile opens account modal](https://github.com/misskey-dev/misskey/pull/9056)
+- [OAuth bearer token authentication](https://github.com/misskey-dev/misskey/pull/9021)
+- [Styled Repair Tools](https://github.com/misskey-dev/misskey/pull/8956)
+- [Option to make enter send message](https://github.com/misskey-dev/misskey/pull/8954)
+- [Autocomplete in messaging](https://github.com/misskey-dev/misskey/pull/8955)
+- [Profile background as banner](https://codeberg.org/Freeplay/Misskey-Tweaks/src/branch/main/snippets/profile-background.styl)
+- [Star is generic like/favorite](https://github.com/JakeMBauer/Misskey-Extras/blob/master/patches/star-is-like.patch)
+  - 👍 also triggers generic like/favorite
+- [Add additional background for acrylic popups if backdrop-filter is unsupported](https://github.com/misskey-dev/misskey/pull/8671)
+- [Add parameters to MFM rotate](https://github.com/misskey-dev/misskey/pull/8549)
+- Many changes from [Foundkey](https://akkoma.dev/FoundKeyGang/Foundkey)
+	- 0ece67b04c3f0365057624c1068808276ccab981: refactor pages/auth.form.vue to composition API
+	- 0ece67b04c3f0365057624c1068808276ccab981: refactor pages/auth.form.vue to composition API
+	- 4bc9610d8bf5af736b5e89e4782395705de45d7d: remove unnecessary joins
+	- 9ee609d70082f7a6dc119a5d83c0e7c5e1208676: enhance privacy of notes
+	- 0fec6e10477b1c1b95d9469fbaf4e249a3722f12: remove ms dependency
+	- 46fff77accbe8bf0fd3cc88170d67b997bf2bdc3:  client uses new API for child notes depth
+	- c35372a20d22cddb75e93a0b407f2b652cd7faf0:  pack children without detail
+	- aca724e0bfff3e58b4d273f3ee744e3f3aa9c39b: enable to fetch replies recursively
+	- 2fe64c11502fd8d89c126558cd715e095c83754e: Refactor components/page/page.textarea.vue to composition API
+	- 6d3181f9835955e5b79bde5484c74bd70e7f9535: Refactor components/page/page.text.vue to composition API
+	- b630cd7eacd695bb705e6748c87f38425ec4ed45:  refactor: add NoteReactions.packMany
+	- 3fe351df6d4e21f7748c46adfa6ca165abd030c0: fix: catch errors from packing with detail
+	- 63591da33e233b2ed0ab331ae6bb3c9eff5020ae: refactor: colours in queue chart
+	- 0f6d94f1e7e1f58cfbf8d07e5f835f8de626842e: backend: improve mutes and blocks
+	- e2bf2715a6462ed377b033956d65260157f042ea: fix spelling error
+	- 09a7eabda137e77f81ab31f65d69329670693c8d: backend: fix lint "no-throw-literal"
+	- 4fbe2e065e75ed3e5b4dfdfd4be3baa03cc447c3: client: fix lint "quotes"
+	- 585e4f5c42cfafb6cdf7eb601ab435d6a4d85a96: fix textarea not updating properly
+	- 30d8bc9259cb6b72ed76d67b21dbb4cdceca8327: refactor: welcome.setup.vue to composition api
+	- 751921e24f37ed707fe44a40d88eebb1299efa35: make emoji picker case insensitive
+	- 298febeb9c9501e3e3df16982c08657d1da474e0: enhance: add re-collapsing to quoted notes
+	- b0fdedb264db87575063abed45e52ad71ce4a6af: fix lints in folder.vue
+	- 6fed87f85d132304eb84b0a59b84dce299a1822f: fix pagination.vue lints
+	- Tosti's security fixes
+	- 384e8c49b738f576ba8843296de6cebf01c1b247: server: allow to like own gallery posts
+	- 4c5aa9e53887cca5561fcec6ab0754e018f589a5: server: allow to like own pages
+	- 923c93da1228458dd65be47483c198a1a9191bcf: use await for notes.countBy
+	- ca90cedba0a0704b503c2778694230f5a7dfbace: server: reduce dead instance detection to 7 days
+	- e9ab42c10afb4e27516c2d2b5e3e06630efe9edd: Alt text in image viewer

CODE_OF_CONDUCT.md

@@ -1,46 +1,136 @@
+
 # Contributor Covenant Code of Conduct
 
 ## Our Pledge
 
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, caste, color, religion, or sexual
+identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
 
 ## Our Standards
 
-Examples of behavior that contributes to creating a positive environment include:
+Examples of behavior that contributes to a positive environment for our
+community include:
 
-* Using welcoming and inclusive language
+* Demonstrating empathy and kindness toward other people
-* Being respectful of differing viewpoints and experiences
+* Being respectful of differing opinions, viewpoints, and experiences
-* Gracefully accepting constructive criticism
+* Giving and gracefully accepting constructive feedback
-* Focusing on what is best for the community
+* Accepting responsibility and apologizing to those affected by our mistakes,
-* Showing empathy towards other community members
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall
+  community
 
-Examples of unacceptable behavior by participants include:
+Examples of unacceptable behavior include:
 
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* The use of sexualized language or imagery, and sexual attention or advances of
-* Trolling, insulting/derogatory comments, and personal or political attacks
+  any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Publishing others' private information, such as a physical or email address,
-* Other conduct which could reasonably be considered inappropriate in a professional setting
+  without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
 
-## Our Responsibilities
+## Enforcement Responsibilities
 
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
 
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
 
 ## Scope
 
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at syuilotan@yahoo.co.jp. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+@thatonecalculator on Codeberg,
+`@thatonecalculator@stop.voring.me` or `@t1c@i.calckey.cloud` on the Fediverse,
+or kainoa@t1c.dev via email.
+All complaints will be reviewed and investigated promptly and fairly.
 
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series of
+actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or permanent
+ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the
+community.
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.1, available at
+[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
+
+Community Impact Guidelines were inspired by
+[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
+
+For answers to common questions about this code of conduct, see the FAQ at
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
+[https://www.contributor-covenant.org/translations][translations].
+
+[homepage]: https://www.contributor-covenant.org
+[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
+[Mozilla CoC]: https://github.com/mozilla/diversity
+[FAQ]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations
 
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/

CONTRIBUTING.md

@@ -1,21 +1,26 @@
 # Contribution guide
-We're glad you're interested in contributing Misskey! In this document you will find the information you need to contribute to the project.
+We're glad you're interested in contributing Calckey! In this document you will find the information you need to contribute to the project.
 
-> **Note**
+## Localization (l10n)
-> This project uses Japanese as its major language, **but you do not need to translate and write the Issues/PRs in Japanese.**
+Calckey uses [Weblate](hhttps://hosted.weblate.org/engage/calckey/) for localization management.
-> Also, you might receive comments on your Issue/PR in Japanese, but you do not need to reply to them in Japanese as well.\
+
-> The accuracy of machine translation into Japanese is not high, so it will be easier for us to understand if you write it in the original language.
+If your language is not listed in Weblate, please open an issue.
-> It will also allow the reader to use the translation tool of their preference if necessary.
+
+You can contribute without knowing how to code by helping translate here:
+
+[![Translation status](https://hosted.weblate.org/widgets/calckey/-/287x66-grey.png)](https://hosted.weblate.org/engage/calckey/)
+
+[![Translation bars](https://hosted.weblate.org/widgets/calckey/-/multi-auto.svg)](https://hosted.weblate.org/engage/calckey/)
 
 ## Roadmap
-See [ROADMAP.md](./ROADMAP.md)
+See [CALCKEY.md](./CALCKEY.md)
 
 ## Issues
 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 [Misskey Forum](https://forum.misskey.io/) or [Discord](https://discord.gg/Wp8gVStHW3).
+	- Please ask questions or troubleshooting in the [Matrix room](https://matrix.to/#/#calckey:matrix.fedibird.com).
 
 > **Warning**
 > Do not close issues that are about to be resolved. It should remain open until a commit that actually resolves it is merged.
@@ -29,22 +34,22 @@ PRs that do not have a clear set of do's and don'ts tend to be bloated and diffi
 Also, when you start implementation, assign yourself to the Issue (if you cannot do it yourself, ask another member to assign you). By expressing your intention to work the Issue, you can prevent conflicts in the work.
 
 ## Well-known branches
-- **`master`** branch is tracking the latest release and used for production purposes.
+- The **`main`** branch is tracking the latest release and used for production purposes.
-- **`develop`** branch is where we work for the next release.
+- The **`develop`** branch is where we work for the next release.
-	- When you create a PR, basically target it to this branch.
+	- When you create a PR, basically target it to this branch. **But create a different branch**
-- **`l10n_develop`** branch is reserved for localization management.
+- The **`l10n_develop`** branch is reserved for localization management.
+- **`feature/*`** branches are reserved for the development of a specific feature
 
 ## Creating a PR
 Thank you for your PR! Before creating a PR, please check the following:
 - If possible, prefix the title with a keyword that identifies the type of this PR, as shown below.
-  - `fix` / `refactor` / `feat` / `enhance` / `perf` / `chore` etc
+  - `fix` / `refactor` / `feat` / `enhance` / `perf` / `chore` etc. You are also welcome to use gitmoji. This is important as we use these to A) easier read the git history and B) generate our changelog. Without propper prefixing it is possible that your PR is rejected.
   - Also, make sure that the granularity of this PR is appropriate. Please do not include more than one type of change or interest in a single PR.
-- If there is an Issue which will be resolved by this PR, please include a reference to the Issue in the text.
+- If there is an Issue which will be resolved by this PR, please include a reference to the Issue in the text. Good examples include `Closing: #21` or `Resolves: #21`
-- Please add the summary of the changes to [`CHANGELOG.md`](/CHANGELOG.md). However, this is not necessary for changes that do not affect the users, such as refactoring.
 - Check if there are any documents that need to be created or updated due to this change.
 - If you have added a feature or fixed a bug, please add a test case if possible.
 - Please make sure that tests and Lint are passed in advance.
-  - You can run it with `npm run test` and `npm run lint`. [See more info](#testing)
+  - You can run it with `pnpm run test` and `pnpm run lint`. [See more info](#testing)
 - If this PR includes UI changes, please attach a screenshot in the text.
 
 Thanks for your cooperation 🤗
@@ -66,7 +71,7 @@ Be willing to comment on the good points and not just the things you want fixed
 	- Are there any omissions or gaps?
 	- Does it check for anomalies?
 
-## Deploy
+## Deploy (SOON)
 The `/deploy` command by issue comment can be used to deploy the contents of a PR to the preview environment.
 ```
 /deploy sha=<commit hash>
@@ -88,21 +93,14 @@ An actual domain will be assigned so you can test the federation.
 	- The target branch must be `master`
 	- The tag name must be the version
 
-## Localization (l10n)
-Misskey uses [Crowdin](https://crowdin.com/project/misskey) for localization management.
-You can improve our translations with your Crowdin account.
-Your changes in Crowdin are automatically submitted as a PR (with the title "New Crowdin translations") to the repository.
-The owner [@syuilo](https://github.com/syuilo) merges the PR into the develop branch before the next release.
-
-If your language is not listed in Crowdin, please open an issue.
-
-![Crowdin](https://d322cqt584bo4o.cloudfront.net/misskey/localized.svg)
-
 ## Development
-During development, it is useful to use the `npm run dev` command.
+During development, it is useful to use the `yarn dev` command.
 This command monitors the server-side and client-side source files and automatically builds them if they are modified.
 In addition, it will also automatically start the Misskey server process.
 
+
+# THE FOLLOWING IS OUTDATED:
+
 ## Testing
 - Test codes are located in [`/test`](/test).
 
@@ -119,12 +117,12 @@ Alternatively, prepare an empty (data can be erased) DB and edit `.config/test.y
 
 Run all test.
 ```
-npm run test
+yarn test
 ```
 
 #### Run specify test
 ```
-npx cross-env TS_NODE_FILES=true TS_NODE_TRANSPILE_ONLY=true TS_NODE_PROJECT="./test/tsconfig.json" npx mocha test/foo.ts --require ts-node/register
+TS_NODE_FILES=true TS_NODE_TRANSPILE_ONLY=true TS_NODE_PROJECT="./test/tsconfig.json" yarn dlx mocha test/foo.ts --require ts-node/register
 ```
 
 ### e2e tests
@@ -257,7 +255,7 @@ MongoDBは`null`で返してきてたので、その感覚で`if (x === null)`
 ### Migration作成方法
 packages/backendで:
 ```sh
-npx typeorm migration:generate -d ormconfig.js -o <migration name>
+pnpm dlx typeorm migration:generate -d ormconfig.js -o <migration name>
 ```
 
 - 生成後、ファイルをmigration下に移してください

COPYING

@@ -1,10 +1,11 @@
 Unless otherwise stated this repository is
 Copyright © 2014-2022 syuilo and contributers
+Copyright © 2022 thatonecalculator and contributers
 
 And is distributed under The GNU Affero General Public License Version 3, you should have received a copy of the license file as LICENSE.
 
 
-Misskey includes several third-party Open-Source softwares.
+Calckey includes several third-party Open-Source softwares.
 
 Emoji keywords for Unicode 11 and below by Mu-An Chiou
 License: MIT

Dockerfile

@@ -1,32 +1,51 @@
-FROM node:16.15.1-bullseye AS builder
+## Install dev and compilation dependencies, build files
+FROM node:19-alpine as build
+WORKDIR /calckey
 
-ARG NODE_ENV=production
+# Install compilation dependencies
+RUN apk add --no-cache --no-progress git alpine-sdk python3
 
-WORKDIR /misskey
+# Copy only the dependency-related files first, to cache efficiently
+COPY package.json pnpm*.yaml ./
+COPY packages/backend/package.json packages/backend/package.json
+COPY packages/client/package.json packages/client/package.json
+COPY packages/sw/package.json packages/sw/package.json
+
+# Configure corepack and pnpm
+RUN corepack enable
+RUN corepack prepare pnpm@latest --activate
+
+# Install dev mode dependencies for compilation
+RUN pnpm i --frozen-lockfile
+
+# Copy in the rest of the files, to compile from TS to JS
+COPY . ./
+RUN pnpm run build
+
+# Trim down the dependencies to only the prod deps
+RUN pnpm i --prod --frozen-lockfile
+
+
+## Runtime container
+FROM node:19-alpine
+WORKDIR /calckey
+
+# Install runtime dependencies
+RUN apk add --no-cache --no-progress tini ffmpeg
 
 COPY . ./
 
-RUN apt-get update
+# Copy node modules
-RUN apt-get install -y build-essential
+COPY --from=build /calckey/node_modules /calckey/node_modules
-RUN git submodule update --init
+COPY --from=build /calckey/packages/backend/node_modules /calckey/packages/backend/node_modules
-RUN yarn install
+COPY --from=build /calckey/packages/sw/node_modules /calckey/packages/sw/node_modules
-RUN yarn build
+COPY --from=build /calckey/packages/client/node_modules /calckey/packages/client/node_modules
-RUN rm -rf .git
 
-FROM node:16.15.1-bullseye-slim AS runner
+# Copy the finished compiled files
+COPY --from=build /calckey/built /calckey/built
+COPY --from=build /calckey/packages/backend/built /calckey/packages/backend/built
+COPY --from=build /calckey/packages/backend/assets/instance.css /calckey/packages/backend/assets/instance.css
 
-WORKDIR /misskey
+RUN corepack enable
-
+ENTRYPOINT [ "/sbin/tini", "--" ]
-RUN apt-get update
+CMD [ "pnpm", "run", "migrateandstart" ]
-RUN apt-get install -y ffmpeg tini
-
-COPY --from=builder /misskey/node_modules ./node_modules
-COPY --from=builder /misskey/built ./built
-COPY --from=builder /misskey/packages/backend/node_modules ./packages/backend/node_modules
-COPY --from=builder /misskey/packages/backend/built ./packages/backend/built
-COPY --from=builder /misskey/packages/client/node_modules ./packages/client/node_modules
-COPY . ./
-
-ENV NODE_ENV=production
-ENTRYPOINT ["/usr/bin/tini", "--"]
-CMD ["npm", "run", "migrateandstart"]

README.md

@@ -1,57 +1,180 @@
 <div align="center">
-<a href="https://misskey-hub.net">
+<a href="https://i.calckey.cloud/">
-	<img src="./assets/title_float.svg" alt="Misskey logo" style="border-radius:50%" width="400"/>
+	<img src="./title_float.svg" alt="Calckey logo" style="border-radius:50%" width="400"/>
 </a>
-	
-**🌎 **[Misskey](https://misskey-hub.net/)** is an open source, decentralized social media platform that's free forever! 🚀**
-	
----
 
-<a href="https://misskey-hub.net/instances.html">
+**🌎 **[Calckey](https://i.calckey.cloud/)** is an open source, decentralized social media platform that's free forever! 🚀**
-		<img src="https://custom-icon-badges.herokuapp.com/badge/find_an-instance-acea31?logoColor=acea31&style=for-the-badge&logo=misskey&labelColor=363B40" alt="find an instance"/></a>
 
-<a href="https://misskey-hub.net/docs/install.html">
+[![no github badge](https://nogithub.codeberg.page/badge.svg)](https://nogithub.codeberg.page/)
-		<img src="https://custom-icon-badges.herokuapp.com/badge/create_an-instance-FBD53C?logoColor=FBD53C&style=for-the-badge&logo=server&labelColor=363B40" alt="create an instance"/></a>
+[![status badge](https://ci.codeberg.org/api/badges/calckey/calckey/status.svg)](https://ci.codeberg.org/calckey/calckey)
-
+[![liberapay badge](https://img.shields.io/liberapay/receives/ThatOneCalculator?logo=liberapay)](https://liberapay.com/ThatOneCalculator)
-<a href="./CONTRIBUTING.md">
+[![translate-badge](https://hosted.weblate.org/widgets/calckey/-/svg-badge.svg)](https://hosted.weblate.org/engage/calckey/)
-		<img src="https://custom-icon-badges.herokuapp.com/badge/become_a-contributor-A371F7?logoColor=A371F7&style=for-the-badge&logo=git-merge&labelColor=363B40" alt="become a contributor"/></a>
+[![docker badge](https://img.shields.io/docker/pulls/thatonecalculator/calckey?logo=docker)](https://hub.docker.com/r/thatonecalculator/calckey)
-
+[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](./CODE_OF_CONDUCT.md)
-<a href="https://discord.gg/Wp8gVStHW3">
+[![Codeberg badge](https://custom-icon-badges.demolab.com/badge/hosted%20on-codeberg-4793CC.svg?logo=codeberg&logoColor=white)](https://codeberg.org/calckey/calckey/)
-		<img src="https://custom-icon-badges.herokuapp.com/badge/join_the-community-5865F2?logoColor=5865F2&style=for-the-badge&logo=discord&labelColor=363B40" alt="join the community"/></a>
-
-<a href="https://www.patreon.com/syuilo">
-		<img src="https://custom-icon-badges.herokuapp.com/badge/become_a-patron-F96854?logoColor=F96854&style=for-the-badge&logo=patreon&labelColor=363B40" alt="become a patron"/></a>
-	
----
 
 </div>
 
 <div>
 
-<a href="https://xn--931a.moe/"><img src="https://github.com/misskey-dev/misskey/blob/develop/assets/ai.png?raw=true" align="right" height="320px"/></a>
+<img src="https://pool.jortage.com/voringme/misskey/e7cd2a17-8b23-4e1e-b5cf-709480c623e2.png" align="right" height="320px" alt="Calc (the Calckey mascot) smoking a fat dart"/>
 
-## ✨ Features
+# ✨ About Calckey
-- **ActivityPub support**\
+
-Not on Misskey? No problem! Not only can Misskey instances talk to each other, but you can make friends with people on other networks like Mastodon and Pixelfed!
+- Calckey is based off of Misskey, a powerful microblogging server on ActivityPub with features such as emoji reactions, a customizable web UI, rich chatting, and much more!
-- **Reactions**\
+- Calckey adds many quality of life changes and bug fixes for users and instance admins alike.
-You can add emoji reactions to any post! No longer are you bound by a like button, show everyone exactly how you feel with the tap of a button.
+- Read **[this document](./CALCKEY.md)** all for current and future differences.
-- **Drive**\
+- Notable differences:
-With Misskey's built in drive, you get cloud storage right in your social media, where you can upload any files, make folders, and find media from posts you've made!
+  - Improved UI/UX (especially on mobile)
-- **Rich Web UI**\
+  - Improved notifications
-	Misskey has a rich and easy to use Web UI!
+  - Fediverse account migration
-	It is highly customizable, from changing the layout and adding widgets to making custom themes.
+  - Improved instance security
-	Furthermore, plugins can be created using AiScript, an original programming language.
+  - Improved accessibility
-- And much more...
+  - Recommended Instances timeline
+  - OCR image captioning
+  - New and improved Groups
+  - Better intro tutorial
+  - Many more user and admin settings
+  - [So much more!](./CALCKEY.md)
 
 </div>
 
 <div style="clear: both;"></div>
 
-## Documentation
+# 🥂 Links
 
-Misskey Documentation can be found at [Misskey Hub](https://misskey-hub.net/), some of the links and graphics above also lead to specific portions of it.
+- 💸 Liberapay: <https://liberapay.com/ThatOneCalculator>
+  - Donate publicly to get your name on the Patron list!
+- 🚢 Flagship instance: <https://calckey.social>
+- 📣 Official account: <https://i.calckey.cloud/@calckey>
+- 💁 Matrix support room: <https://matrix.to/#/#calckey:matrix.fedibird.com>
+- 📜 Instance list: <https://calckey.fediverse.observer/list>
+- 📖 JoinFediverse Wiki: <https://joinfediverse.wiki/What_is_Calckey%3F>
+- 🐋 Docker Hub: <https://hub.docker.com/r/thatonecalculator/calckey>
+- ✍️ Weblate: <https://hosted.weblate.org/engage/calckey/>
+- 📦 Yunohost: <https://github.com/YunoHost-Apps/calckey_ynh>
 
-## Sponsors
+# 🌠 Getting started
-<div align="center">
+
-	<a class="rss3" title="RSS3" href="https://rss3.io/" target="_blank"><img src="https://rss3.mypinata.cloud/ipfs/QmUG6H3Z7D5P511shn7sB4CPmpjH5uZWu4m5mWX7U3Gqbu" alt="RSS3" height="60"></a>
+This guide will work for both **starting from scratch** and **migrating from Misskey**.
-</div>
+
+## 🔰 Easy installers
+
+If you have access to a server that supports one of the sources below, I recommend you use it! Note that these methods *won't* allow you to migrate from Misskey without manual intervention.
+
+[![Install on Ubuntu](https://pool.jortage.com/voringme/misskey/3b62a443-1b44-45cf-8f9e-f1c588f803ed.png)](https://codeberg.org/calckey/ubuntu-bash-install)　　[![Install on the Arch User Repository](https://pool.jortage.com/voringme/misskey/ba2a5c07-f078-43f1-8483-2e01acca9c40.png)](https://aur.archlinux.org/packages/calckey)　　[![Install Calckey with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=calckey)
+
+### 🐋 Docker
+
+[How to run Calckey with Docker](./docker-README.md).
+
+## 🧑‍💻 Dependencies
+
+- 🐢 At least [NodeJS](https://nodejs.org/en/) v18.12.1 (v19 recommended)
+  - Install with [nvm](https://github.com/nvm-sh/nvm)
+- 🐘 At least [PostgreSQL](https://www.postgresql.org/) v12
+- 🍱 At least [Redis](https://redis.io/) v6 (v7 recommend)
+
+### 😗 Optional dependencies
+
+- [FFmpeg](https://ffmpeg.org/) for video transcoding
+- [ElasticSearch](https://www.elastic.co/elasticsearch/) for full-text search
+  - OpenSearch/Sonic are not supported as of right now
+- Management (choose one of the following)
+  - 🛰️ [pm2](https://pm2.io/)
+  - 🐳 [Docker](https://docker.com)
+  - Service manager (systemd, openrc, etc)
+
+### 🏗️ Build dependencies
+
+- 🦬 C/C++ compiler & build tools
+  - `build-essential` on Debian/Ubuntu Linux
+  - `base-devel` on Arch Linux
+- 🐍 [Python 3](https://www.python.org/)
+
+## 👀 Get folder ready
+
+```sh
+git clone --depth 1 https://codeberg.org/calckey/calckey.git
+cd calckey/
+```
+
+By default, you're on the development branch. Run `git checkout beta` or `git checkout main` to switch to the Beta/Main branches.
+
+## 📩 Install dependencies
+
+```sh
+# nvm install 19 && nvm use 19
+corepack enable
+corepack prepare pnpm@latest --activate
+# To build without TensorFlow, append --no-optional
+pnpm i # --no-optional
+```
+
+## 🐘 Create database
+
+Assuming you set up PostgreSQL correctly, all you have to run is:
+
+```sh
+psql postgres -c "create database calckey with encoding = 'UTF8';"
+```
+
+## 💅 Customize
+
+- To add custom CSS for all users, edit `./custom/assets/instance.css`.
+- To add static assets (such as images for the splash screen), place them in the `./custom/assets/` directory. They'll then be available on `https://yourinstance.tld/static-assets/filename.ext`.
+- To add custom locales, place them in the `./custom/locales/` directory. If you name your custom locale the same as an existing locale, it will overwrite it. If you give it a unique name, it will be added to the list. Also make sure that the first part of the filename matches the locale you're basing it on. (Example: `en-FOO.yml`)
+- To add custom error images, place them in the `./custom/assets/badges` directory, replacing the files already there.
+- To add custom sounds, place only mp3 files in the `./custom/assets/sounds` directory.
+- To update custom assets without rebuilding, just run `pnpm run gulp`.
+
+## 🧑‍🔬 Configuring a new instance
+
+- Run `cp .config/example.yml .config/default.yml`
+- Edit `.config/default.yml`, making sure to fill out required fields.
+- Also copy and edit `.config/docker_example.env` to `.config/docker.env` if you're using Docker.
+
+## 🚚 Migrating from Misskey to Calckey
+
+> ⚠️ Because of their changes, migrating from Foundkey is not supported.
+
+```sh
+cp ../misskey/.config/default.yml ./.config/default.yml # replace `../misskey/` with misskey path, add `docker.env` if you use Docker
+cp -r ../misskey/files .
+```
+
+## 🍀 NGINX
+
+- Run `sudo cp ./calckey.nginx.conf /etc/nginx/sites-available/ && cd /etc/nginx/sites-available/`
+- Edit `calckey.nginx.conf` to reflect your instance properly
+- Run `sudo cp ./calckey.nginx.conf ../sites-enabled/`
+- Run `sudo nginx -t` to validate that the config is valid, then restart the NGINX service.
+
+</details>
+
+## 🚀 Build and launch!
+
+### 🐢 NodeJS + pm2
+
+#### `git pull` and run these steps to update Calckey in the future!
+
+```sh
+# git pull
+NODE_ENV=production pnpm install && pnpm run build && pnpm run migrate
+pm2 start "NODE_ENV=production pnpm run start" --name Calckey
+```
+
+## 😉 Tips & Tricks
+
+- When editing the config file, please don't fill out the settings at the bottom. They're designed *only* for managed hosting, not self hosting. Those settings are much better off being set in Calckey's control panel.
+- Port 3000 (used in the default config) might be already used on your server for something else. To find an open port for Calckey, run `for p in {3000..4000}; do ss -tlnH | tr -s ' ' | cut -d" " -sf4 | grep -q "${p}$" || echo "${p}"; done | head -n 1`. Replace 3000 with the minimum port and 4000 with the maximum port if you need it.
+- I'd recommend you use a S3 Bucket/CDN for Object Storage, especially if you use Docker. 
+- I'd ***strongly*** recommend against using CloudFlare, but if you do, make sure to turn code minification off.
+- For push notifications, run `npx web-push generate-vapid-keys`, then put the public and private keys into Control Panel > General > ServiceWorker.
+- For translations, make a [DeepL](https://deepl.com) account and generate an API key, then put it into Control Panel > General > DeepL Translation.
+- To add another admin account:
+  - Go to the user's page > 3 Dots > About > Moderation > turn on "Moderator"
+  - Go back to Overview > click the clipboard icon next to the ID
+  - Run `psql -d calckey` (or whatever the database name is)
+  - Run `UPDATE "user" SET "isAdmin" = true WHERE id='999999';` (replace `999999` with the copied ID)
+  - Have the new admin log out and log back in

ROADMAP.md

@@ -1,42 +0,0 @@
-# Roadmap
-The order of individual tasks is a guide only and is subject to change depending on the situation.
-Also, the later tasks are more indefinite and are subject to change as development progresses.
-
-## (1) Improve maintainability \<current phase\>
-This is the phase we are at now. We need to make a high-maintenance environment that can withstand future development.
-
-- Make the number of type errors zero (backend)
-	- Probably need to switch some libraries to others that make it difficult to reduce type errors
-		- e.g. koa to fastify https://github.com/misskey-dev/misskey/issues/7537
-- Improve CI
-	- Fix tests
-		- mocha, jest, etc. do not support the combination of `TypeScript + ESM + Path alias`, and the tests currently do not work.
-	- Fix random test failures - https://github.com/misskey-dev/misskey/issues/7985 and https://github.com/misskey-dev/misskey/issues/7986
-	- Add more tests
-		- May need to implement a mechanism that allows for DI
-			- https://github.com/misskey-dev/misskey/pull/9085
-	- Measure coverage
-		- https://github.com/misskey-dev/misskey/pull/9081
-- Improve documentation
-- Refactoring
-	- Extract the logic of each endpoint definition into a service and just call it
-
-## (2) Improve functionality
-Once Phase 1 is complete and an environment conducive to the development of a stable system is in place, the implementation of new functions can begin gradually.
-
-- Improve features for moderation
-- OAuth2 support https://github.com/misskey-dev/misskey/issues/8262
-- GraphQL support?
-
-## (3) Improve scalability
-Once the development of the feature has settled down, this may be an opportunity to make larger modifications.
-
-- Rewriting in Rust?
-
-## (4) Change the world
-It is time to promote Misskey and change the world.
-
-- Become more major than services such as Twitter and become critical infrastructure for the world
-- MiOS will be developed and integrated into various systems - What is MiOS?
-- Letting Ai-chan interfere with the real world
-- Make Misskey a member of GAFA; Misskey's office must be a reinforced concrete brutalist building with a courtyard.

SECURITY.md

@@ -1,9 +1,16 @@
 # Reporting Security Issues
 
-If you discover a security issue in Misskey, please report it by sending an
+## Minor Security Issues
-email to [syuilotan@yahoo.co.jp](mailto:syuilotan@yahoo.co.jp).
+
+If you discover a minor security issue in Calckey, please report it by sending an
+email to [kainoa@t1c.dev](mailto:kainoa@t1c.dev).
+
+## High Security Issues
+
+If you discover a security issue, which is so high risk, that too much is affected by it, please dont send it over unencrypted communication. You can share your PGP keys with us using kainoa@t1c.dev and after we established a secure communication, send it over E-Mail, or message us using matrix' encrypted private messages at @t1c:matrix.fedibird.com or @cleo:tchncs.de
+
 
 This will allow us to assess the risk, and make a fix available before we add a
-bug report to the GitHub repository.
+bug report to the Codeberg repository.
 
-Thanks for helping make Misskey safe for everyone.
+Thanks for helping make Calckey safe for everyone.

assets/title_float.svg

@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg10"
-   version="1.1"
-   viewBox="0 0 162.642 54.261"
-   height="205.08"
-   width="614.71">
-  <metadata
-     id="metadata16">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-	<style>
-		#g8 { 
-    	animation-name: floating;
-    	animation-duration: 3s;
-    	animation-iteration-count: infinite;
-   	 	animation-timing-function: ease-in-out;
-		}
- 
-		@keyframes floating {
-    	0% { transform: translate(0,  0px); }
-    	50% { transform: translate(0, -5px); }
-    	100% { transform: translate(0, 0px); }
-		}
-	</style>
-	<linearGradient id="myGradient" gradientTransform="rotate(90)">
-      <stop offset="5%"  stop-color="#A1CA03" />
-      <stop offset="95%" stop-color="#91BA03" />
-    </linearGradient>
-  <defs
-     id="defs14" />
-  <g
-     id="g8"
-     fill="url('#myGradient')"
-     word-spacing="0"
-     letter-spacing="0"
-     font-family="OTADESIGN Rounded"
-     font-weight="400">
-    <g
-       id="g4"
-       style="line-height:476.69509888px;-inkscape-font-specification:'OTADESIGN Rounded'">
-      <path
-         id="path2"
-         font-size="141.034"
-         aria-label="Mi"
-         d="m 27.595,34.59 c -1.676,0.006 -3.115,-1.004 -3.793,-2.179 -0.363,-0.513 -1.08,-0.696 -1.09,0 v 3.214 c 0,1.291 -0.47,2.408 -1.412,3.35 -0.915,0.914 -2.031,1.371 -3.35,1.371 -1.29,0 -2.407,-0.457 -3.349,-1.372 -0.914,-0.941 -1.372,-2.058 -1.372,-3.349 V 17.95 c 0,-0.995 0.283,-1.896 0.848,-2.703 0.591,-0.834 1.345,-1.413 2.26,-1.735 0.516591,-0.189385 1.062793,-0.285215 1.613,-0.283 1.453,0 2.664,0.565 3.632,1.695 l 4.832,5.608 c 0.108,0.08 0.424,0.697 1.18,0.697 0.758,0 1.115,-0.617 1.222,-0.698 l 4.791,-5.607 c 0.996,-1.13 2.22,-1.695 3.673,-1.695 0.538,0 1.076,0.094 1.614,0.283 0.914,0.322 1.654,0.9 2.22,1.735 0.591,0.807 0.887,1.708 0.887,2.703 v 17.675 c 0,1.291 -0.47,2.408 -1.412,3.35 -0.915,0.914 -2.032,1.371 -3.35,1.371 -1.291,0 -2.407,-0.457 -3.35,-1.372 -0.914,-0.941 -1.371,-2.058 -1.371,-3.349 v -3.214 c -0.08,-0.877 -0.855,-0.324 -1.13,0 -0.726,1.345 -2.118,2.173 -3.793,2.18 z M 47.806,21.38 c -1.13,0 -2.098333,-0.39 -2.905,-1.17 -0.78,-0.806667 -1.17,-1.775 -1.17,-2.905 0,-1.13 0.39,-2.085 1.17,-2.865 0.806667,-0.806667 1.775,-1.21 2.905,-1.21 1.13,0 2.098667,0.403333 2.906,1.21 0.806667,0.78 1.21,1.735 1.21,2.865 0,1.13 -0.403333,2.098333 -1.21,2.905 -0.807333,0.78 -1.776,1.17 -2.906,1.17 z m 0.04,0.808 c 1.13,0 2.085333,0.403333 2.866,1.21 0.806667,0.806667 1.21,1.775333 1.21,2.906 v 9.967 c 0,1.13 -0.403333,2.098333 -1.21,2.905 -0.78,0.78 -1.735333,1.17 -2.866,1.17 -1.129333,0 -2.097667,-0.39 -2.905,-1.17 -0.806667,-0.806667 -1.21,-1.775 -1.21,-2.905 v -9.967 c 0,-1.13 0.403333,-2.098667 1.21,-2.906 0.806667,-0.806667 1.775,-1.21 2.905,-1.21 z"
-         style="font-size:141.03399658px;-inkscape-font-specification:'OTADESIGN Rounded'" />
-    </g>
-    <path
-       id="path6"
-       d="M60.925 27.24q.968.243 2.42.525 2.42.403 3.792 1.29 2.582 1.695 2.582 5.083 0 2.743-1.815 4.478-2.098 2.017-5.85 2.017-2.742 0-6.13-.767-1.09-.242-1.776-1.089-.645-.847-.645-1.896 0-1.29.887-2.178.928-.928 2.179-.928.363 0 .685.081 1.17.242 4.478.605.444 0 .968-.04.202 0 .202-.242.04-.202-.242-.283-1.372-.242-2.542-.524-1.33-.282-1.896-.484-1.129-.323-1.895-.847-2.582-1.694-2.622-5.083 0-2.702 1.855-4.477 2.26-2.179 6.414-1.977 2.783.121 5.567.726 1.048.242 1.734 1.09.686.846.686 1.936 0 1.25-.928 2.178-.887.887-2.178.887-.323 0-.645-.08-1.17-.242-4.518-.565-.404-.04-.767 0-.323.04-.323.242.04.242.323.323zm17.555 0q.968.243 2.42.525 2.42.403 3.792 1.29 2.581 1.695 2.581 5.083 0 2.743-1.815 4.478-2.098 2.017-5.849 2.017-2.743 0-6.131-.767-1.09-.242-1.775-1.089-.646-.847-.646-1.896 0-1.29.888-2.178.927-.928 2.178-.928.363 0 .686.081 1.17.242 4.477.605.444 0 .968-.04.202 0 .202-.242.04-.202-.242-.283-1.371-.242-2.541-.524-1.331-.282-1.896-.484-1.13-.323-1.896-.847-2.582-1.694-2.622-5.083 0-2.702 1.855-4.477 2.26-2.179 6.414-1.977 2.784.121 5.567.726 1.049.242 1.735 1.09.685.846.685 1.936 0 1.25-.927 2.178-.888.887-2.179.887-.322 0-.645-.08-1.17-.242-4.518-.565-.403-.04-.767 0-.322.04-.322.242.04.242.322.323zm26.075 3.335q.12.08 2.864 2.783 1.25 1.21 1.25 2.945 0 1.613-1.17 2.864-1.17 1.21-2.904 1.21-1.654 0-2.864-1.17l-4.034-3.913q-.161-.12-.323-.12-.322 0-.322 1.21 0 1.694-1.21 2.904-1.21 1.17-2.905 1.17-1.694 0-2.904-1.17-1.17-1.21-1.17-2.905V17.586q0-1.694 1.17-2.864 1.21-1.21 2.904-1.21t2.904 1.21q1.21 1.17 1.21 2.864v6.293q0 .403.283.524.242.121.524-.08.162-.081 4.841-3.188 1.049-.645 2.259-.645 2.219 0 3.429 1.815.645 1.05.645 2.26 0 2.218-1.815 3.428l-2.541 1.614v.04l-.081.04q-.565.363-.04.888zm15.599 10.058q-4.195 0-7.18-2.945-2.945-2.985-2.945-7.18 0-4.155 2.945-7.1 2.985-2.985 7.18-2.985 4.155 0 6.979 2.784.928.927.928 2.259 0 1.33-.928 2.259l-4.68 4.639q-1.008 1.008-2.016 1.008-1.453 0-2.26-.807-.806-.807-.806-2.138 0-1.29.928-2.218l.806-.847q.162-.121.081-.243-.12-.08-.323-.04-.806.202-1.371.807-1.13 1.09-1.13 2.622 0 1.573 1.09 2.703 1.13 1.089 2.702 1.089 1.533 0 2.622-1.13.928-.927 2.26-.927 1.33 0 2.258.927.928.928.928 2.26 0 1.33-.928 2.258-2.985 2.945-7.14 2.945zm29.259-15.786v5.607q0 .564-.08 1.21v7.382q0 4.518-2.744 7.22-2.702 2.703-7.301 2.703-2.662 0-4.8-1.008-2.138-.968-2.138-3.348 0-.807.363-1.533.968-2.179 3.348-2.179.565 0 1.573.323 1.009.323 1.654.323 1.694 0 2.219-.726.201-.283.08-.444-.161-.242-.564-.161-.686.12-1.493.12-4.074 0-6.979-2.904-2.904-2.904-2.904-6.978v-5.607q0-1.695 1.17-2.864 1.21-1.21 2.904-1.21t2.905 1.21q1.21 1.17 1.21 2.864v5.607q0 .685.484 1.21.524.484 1.21.484.726 0 1.21-.484.484-.525.484-1.21v-5.607q0-1.695 1.21-2.864 1.21-1.21 2.905-1.21 1.694 0 2.864 1.21 1.21 1.17 1.21 2.864z"
-       style="line-height:136.34428406px;-inkscape-font-specification:'OTADESIGN Rounded'" />
-  </g>
-</svg>

calckey.nginx.conf

@@ -0,0 +1,72 @@
+# Replace example.tld with your domain
+
+# For WebSocket
+map $http_upgrade $connection_upgrade {
+    default upgrade;
+    ''      close;
+}
+
+proxy_cache_path /tmp/nginx_cache levels=1:2 keys_zone=cache1:16m max_size=1g inactive=720m use_temp_path=off;
+
+server {
+    listen 80;
+    listen [::]:80;
+    server_name example.tld;
+
+    # For SSL domain validation
+    root /var/www/html;
+    location /.well-known/acme-challenge/ { allow all; }
+    location /.well-known/pki-validation/ { allow all; }
+    location / { return 301 https://$server_name$request_uri; }
+}
+
+server {
+    listen 443 ssl http2;
+    listen [::]:443 ssl http2;
+    server_name example.tld;
+
+    ssl_session_timeout 1d;
+    ssl_session_cache shared:ssl_session_cache:10m;
+    ssl_session_tickets off;
+
+    # To use Let's Encrypt certificate
+    ssl_certificate     /etc/letsencrypt/live/example.tld/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/example.tld/privkey.pem;
+
+    # To use Debian/Ubuntu's self-signed certificate (For testing or before issuing a certificate)
+    #ssl_certificate     /etc/ssl/certs/ssl-cert-snakeoil.pem;
+    #ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key;
+
+    # SSL protocol settings
+    ssl_protocols TLSv1.2 TLSv1.3;
+    ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384;
+    ssl_prefer_server_ciphers off;
+    ssl_stapling on;
+    ssl_stapling_verify on;
+
+    # Change to your upload limit
+    client_max_body_size 80m;
+
+    # Proxy to Node
+    location / {
+        proxy_pass http://127.0.0.1:3000;
+        proxy_set_header Host $host;
+        proxy_http_version 1.1;
+        proxy_redirect off;
+
+        # If it's behind another reverse proxy or CDN, remove the following.
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto https;
+
+        # For WebSocket
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection $connection_upgrade;
+
+        # Cache settings
+        proxy_cache cache1;
+        proxy_cache_lock on;
+        proxy_cache_use_stale updating;
+        add_header X-Cache $upstream_cache_status;
+    }
+}

chart/files/default.yml

@@ -154,9 +154,6 @@ id: "aid"
 # Media Proxy
 #mediaProxy: https://example.com/proxy
 
-# Sign to ActivityPub GET request (default: false)
-#signToActivityPubGet: true
-
 #allowedPrivateNetworks: [
 #  '127.0.0.1/32'
 #]

cliff.toml

@@ -0,0 +1,103 @@
+# configuration file for git-cliff (0.1.0)
+
+[changelog]
+# changelog header
+header = """
+# Changelog\n
+All changes from v13.0.0 onwards, for a full list of differences read CALCKEY.md\n
+"""
+# template for the changelog body
+# https://tera.netlify.app/docs/#introduction
+body = """
+{% if version %}\
+    ## [{{ version | trim_start_matches(pat="v") }}] - {{ timestamp | date(format="%Y-%m-%d") }}
+{% else %}\
+    ## [unreleased]
+{% endif %}\
+{% for group, commits in commits | group_by(attribute="group") %}
+    ### {{ group | upper_first }}
+    {% for commit in commits %}
+        - {% if commit.breaking %}[**breaking**] {% endif %}{{ commit.message | upper_first }}\
+    {% endfor %}
+{% endfor %}\n
+"""
+# remove the leading and trailing whitespace from the template
+trim = true
+# changelog footer
+footer = """
+<!-- generated by git-cliff -->
+"""
+
+[git]
+# parse the commits based on https://www.conventionalcommits.org
+conventional_commits = false
+# filter out the commits that are not conventional
+filter_unconventional = true
+# process each line of a commit as an individual commit
+split_commits = false
+# regex for preprocessing the commit messages
+commit_preprocessors = [
+    { pattern = '\((\w+\s)?#([0-9]+)\)', replace = "([#${2}](https://github.com/orhun/git-cliff/issues/${2}))"},
+]
+# regex for parsing and grouping commits
+commit_parsers = [
+    { message = "^feat", group = "Features"},
+    { message = "^add", group = "Features"},
+    { message = "^fix", group = "Bug Fixes"},
+    { message = "^prevent", group = "Bug Fixes"},
+    { message = "^doc", group = "Documentation"},
+    { message = "^perf", group = "Performance"},
+    { message = "^🎨", group = "Refactor"},
+    { message = "^enhance", group = "Refactor"},
+    { message = "^⚡️", group = "Refactor"},
+    { message = "^🔥", group = "Features"},
+    { message = "^🐛", group = "Bug Fixes"},
+    { message = "^🚑️", group = "Bug Fixes"},
+    { message = "^block", group = "Bug Fixes"},
+    { message = "^✨", group = "Features"},
+    { message = "^📝", group = "Documentation"},
+    { message = "^🚀", group = "Features"},
+    { message = "^💄", group = "Styling"},
+    { message = "^✅", group = "Testing"},
+    { message = "^🔒️", group = "Security"},
+    { message = "^🚨", group = "Testing"},
+    { message = "^💚", group = "CI"},
+    { message = "^👷", group = "CI"},
+    { message = "^⬇️", group = "Miscellaneous Tasks"},
+    { message = "^⬆️", group = "Miscellaneous Tasks"},
+    { message = "^📌", group = "Miscellaneous Tasks"},
+    { message = "^➕", group = "Miscellaneous Tasks"},
+    { message = "^➖", group = "Miscellaneous Tasks"},
+    { message = "^♻️", group = "Refactor"},
+    { message = "^🔧", group = "CI"},
+    { message = "^🔨", group = "CI"},
+    { message = "^🌐", group = "Localization"},
+    { message = "^✏️", group = "Localization"},
+    { message = "^👽️", group = "Bug Fixes"},
+    { message = "^🍱", group = "Styling"},
+    { message = "^♿️", group = "Styling"},
+    { message = "^🩹", group = "Bug Fixes"},
+    { message = "^refactor", group = "Refactor"},
+    { message = "^style", group = "Styling"},
+    { message = "^test", group = "Testing"},
+    { message = "^chore\\(release\\): prepare for", skip = true},
+    { message = "^chore", group = "Miscellaneous Tasks"},
+    { message = "^update", group = "Miscellaneous Tasks"},
+    { body = ".*security", group = "Security"},
+]
+# protect breaking changes from being skipped due to matching a skipping commit_parser
+protect_breaking_commits = false
+# filter out the commits that are not matched by commit parsers
+filter_commits = false
+# glob pattern for matching git tags
+tag_pattern = "v[0-9]*"
+# regex for skipping tags
+skip_tags = "v0.1.0-beta.1"
+# regex for ignoring tags
+ignore_tags = ""
+# sort the tags chronologically
+date_order = false
+# sort the commits inside sections by oldest/newest order
+sort_commits = "oldest"
+# limit the number of commits included in the changelog.
+# limit_commits = 42

crowdin.yml

@@ -1,4 +0,0 @@
-files:
-  - source: /locales/ja-JP.yml
-    translation: /locales/%locale%.yml
-    update_option: update_as_unapproved

custom/assets/instance.css

@@ -0,0 +1,7 @@
+/*
+* !!! WARNING !!!
+* Editing this file may cause your instance to break for EVERYONE.
+* Please know what you're doing and test it out with regular user custom CSS.
+* With that said, GLHF!
+* This may eventuallly be replaced with a function in the admin panel.
+ */

cypress/e2e/widgets.cy.js

@@ -61,5 +61,4 @@ describe('After user signed in', () => {
 	buildWidgetTest('jobQueue');
 	buildWidgetTest('button');
 	buildWidgetTest('aiscript');
-	buildWidgetTest('aichan');
 });

cypress/plugins/index.js

@@ -15,7 +15,6 @@
 /**
  * @type {Cypress.PluginConfig}
  */
-// eslint-disable-next-line no-unused-vars
 module.exports = (on, config) => {
   // `on` is used to hook into various events Cypress emits
   // `config` is the resolved Cypress config

dev/docker-compose.yml.example

@@ -0,0 +1,57 @@
+version: "3"
+
+services:
+  web:
+    image: docker.io/thatonecalculator/calckey
+    build: ..
+    container_name: calckey_web
+    restart: always
+    depends_on:
+      - db
+      - redis
+#      - es
+    ports:
+      - "3000:3000"
+    networks:
+      - network
+#      - web
+    volumes:
+      - ../files:/calckey/files
+      - ../.config:/calckey/.config:ro
+
+  redis:
+    restart: always
+    container_name: calckey_redis
+    image: docker.io/redis:7.0-alpine
+    networks:
+      - network
+    volumes:
+      - ../redis:/data
+
+  db:
+    restart: always
+    image: docker.io/postgres:12.2-alpine
+    container_name: calckey_db
+    networks:
+      - network
+    env_file:
+      - ../.config/docker.env
+    volumes:
+      - ../db:/var/lib/postgresql/data
+
+#  es:
+#    restart: always
+#    image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.4.2
+#    environment:
+#      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+#      - "TAKE_FILE_OWNERSHIP=111"
+#    networks:
+#      - network
+#    volumes:
+#      - ./elasticsearch:/usr/share/elasticsearch/data
+
+networks:
+  network:
+#  web:
+#    external:
+#      name: web

docker-README.md

@@ -0,0 +1,47 @@
+# 🐳 Running a Calckey instance with Docker
+
+## Pre-built docker container
+[thatonecalculator/calckey](https://hub.docker.com/r/thatonecalculator/calckey)
+
+## `docker-compose`
+
+There is a `docker-compose.yml` in the root of the project that you can use to build the container from source
+
+- .config/docker.env (**db config settings**)
+- .config/default.yml (**calckey instance settings**)
+
+## Configuring
+
+Rename the files:
+
+`cp .config/default_example.yml .config/default.yml`
+
+`cp .config/example.env .config/docker.env`
+
+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 instance at.
+- `host`, `db`, `user`, `pass` will have to be configured in the `PostgreSQL configuration` section - `host` is the name of the postgres container (eg: *calckey_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: *calckey_redis_1*)
+
+Everything else can be left as-is.
+
+## Running docker-compose
+
+The [prebuilt container for calckey](https://hub.docker.com/r/thatonecalculator/calckey) 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`.
+
+NOTE: This will take some time to come fully online, even after download and extracting the container images, and it may emit some error messages before completing successfully. Specifically, the `db` container needs to initialize and so isn't available to the `web` container right away. Only once the `db` container comes online does the `web` container start building and initializing the calckey tables.
+
+Once the instance is up you can use a web browser to access the web interface at `http://serverip:3000` (where `serverip` is the IP of the server you are running the calckey instance on).
+
+## Docker for development
+
+```sh
+cd dev/
+docker-compose build
+docker-compose run --rm web pnpm run init
+docker-compose up -d
+```

docker-compose.yml

@@ -2,51 +2,57 @@ version: "3"
 
 services:
   web:
-    build: .
+    image: docker.io/thatonecalculator/calckey
-    restart: always
+    container_name: calckey_web
-    links:
+    restart: unless-stopped
+    depends_on:
       - db
       - redis
 #      - es
     ports:
       - "3000:3000"
     networks:
-      - internal_network
+      - calcnet
-      - external_network
+#     - web
+    environment:
+      NODE_ENV: production
     volumes:
-      - ./files:/misskey/files
+      - ./files:/calckey/files
-      - ./.config:/misskey/.config:ro
+      - ./.config:/calckey/.config:ro
 
   redis:
-    restart: always
+    restart: unless-stopped
-    image: redis:4.0-alpine
+    image: docker.io/redis:7.0-alpine
+    container_name: calckey_redis
     networks:
-      - internal_network
+      - calcnet
     volumes:
       - ./redis:/data
 
   db:
-    restart: always
+    restart: unless-stopped
-    image: postgres:12.2-alpine
+    image: docker.io/postgres:12.2-alpine
+    container_name: calckey_db
     networks:
-      - internal_network
+      - calcnet
     env_file:
       - .config/docker.env
     volumes:
       - ./db:/var/lib/postgresql/data
 
 #  es:
-#    restart: always
+#   restart: unless-stopped
-#    image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.4.2
+#   image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.4.2
-#    environment:
+#   environment:
 #      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
 #      - "TAKE_FILE_OWNERSHIP=111"
 #    networks:
-#      - internal_network
+#      - calcnet
 #    volumes:
 #      - ./elasticsearch:/usr/share/elasticsearch/data
 
 networks:
-  internal_network:
+  calcnet:
-    internal: true
+    #  web:
-  external_network:
+    #    external:
+    #      name: web

docs/DONATORS.md

@@ -1,25 +0,0 @@
-DONATORS
-========
-The list of people who have sent donation for Misskey.
-
-(In random order, honorific titles are omitted.)
-
-* らふぁ
-* 俺様
-* なぎうり
-* スルメ https://surume.tk/
-* 藍
-* 音船 https://otofune.me/
-* aqz https://misskey.xyz/aqz
-* kotodu "虚無創作中"
-* Maya Minatsuki
-* Knzk https://knzk.me/@Knzk
-* ねじりわさび https://knzk.me/@y
-* NCLS https://knzk.me/@imncls]
-* こじま @skoji@sandbox.skoji.jp
-
-:heart: Thanks for donating, guys!
-
----
-
-If your name is missing, please contact us!

gulpfile.js

@@ -15,12 +15,17 @@ gulp.task('copy:backend:views', () =>
 	gulp.src('./packages/backend/src/server/web/views/**/*').pipe(gulp.dest('./packages/backend/built/server/web/views'))
 );
 
+
+gulp.task('copy:backend:custom', () =>
+	gulp.src('./custom/assets/**/*').pipe(gulp.dest('./packages/backend/assets/'))
+);
+
 gulp.task('copy:client:fonts', () =>
 	gulp.src('./packages/client/node_modules/three/examples/fonts/**/*').pipe(gulp.dest('./built/_client_dist_/fonts/'))
 );
 
-gulp.task('copy:client:fontawesome', () =>
+gulp.task('copy:client:phosphor', () =>
-	gulp.src('./packages/client/node_modules/@fortawesome/fontawesome-free/**/*').pipe(gulp.dest('./built/_client_dist_/fontawesome/'))
+	gulp.src('./node_modules/phosphor-icons/src/fonts/*').pipe(gulp.dest('./built/_client_dist_/phosphor/'))
 );
 
 gulp.task('copy:client:locales', cb => {
@@ -35,6 +40,7 @@ gulp.task('copy:client:locales', cb => {
 	cb();
 });
 
+
 gulp.task('build:backend:script', () => {
 	return gulp.src(['./packages/backend/src/server/web/boot.js', './packages/backend/src/server/web/bios.js', './packages/backend/src/server/web/cli.js'])
 		.pipe(replace('LANGS', JSON.stringify(Object.keys(locales))))
@@ -53,7 +59,7 @@ gulp.task('build:backend:style', () => {
 });
 
 gulp.task('build', gulp.parallel(
-	'copy:client:locales', 'copy:backend:views', 'build:backend:script', 'build:backend:style', 'copy:client:fonts', 'copy:client:fontawesome'
+	'copy:client:locales', 'copy:backend:views', 'copy:backend:custom', 'build:backend:script', 'build:backend:style', 'copy:client:fonts', 'copy:client:phosphor'
 ));
 
 gulp.task('default', gulp.task('build'));

issue_template/bug.yaml

@@ -0,0 +1,70 @@
+name: Bug Report
+about: File a bug report
+title: "[Bug]: "
+body:
+  - type: markdown
+    attributes:
+      value: |
+                Thanks for taking the time to fill out this bug report!
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+      description: Please give us a brief description of what happened.
+      placeholder: Tell us what you see!
+      value: "A bug happened!"
+    validations:
+      required: true
+  - type: textarea
+    id: what-is-expected
+    attributes:
+      label: What did you expect to happen?
+      description: Please give us a brief description of what you expected to happen.
+      placeholder: Tell us what you wish happened!
+      value: "Instead of x, y should happen instead!"
+    validations:
+      required: true
+  - type: input
+    id: version
+    attributes:
+      label: Version
+      description: What version of calckey is your instance running? You can find this by clicking your instance's logo at the bottom left and then clicking instance information.
+      placeholder: Calckey Version 13.0.4
+    validations:
+      required: true
+  - type: input
+    id: instance
+    attributes:
+      label: Instance
+      description: What instance of calckey are you using?
+      placeholder: stop.voring.me
+    validations:
+      required: false
+  - type: dropdown
+    id: browsers
+    attributes:
+      label: What browser are you using?
+      multiple: false
+      options:
+        - Firefox
+        - Chrome
+        - Brave
+        - Librewolf
+        - Chromium
+        - Safari
+        - Microsoft Edge
+        - Other (Please Specify)
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output
+      description: Please copy and paste any relevant log output. You can find your log by inspecting the page, and going to the "console" tab. This will be automatically formatted into code, so no need for backticks.
+      render: shell
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Contribution Guidelines
+      description: By submitting this issue, you agree to follow our [Contribution Guidelines](https://codeberg.org/calckey/calckey/src/branch/develop/CONTRIBUTING.md)
+      options:
+        - label: I agree to follow this project's Contribution Guidelines
+          required: true

issue_template/feature.yaml

@@ -0,0 +1,70 @@
+name: Feature Request
+about: Request a Feature
+title: "[Feature]: "
+body:
+  - type: markdown
+    attributes:
+      value: |
+                Thanks for taking the time to fill out this feature request!
+  - type: textarea
+    id: what-feature
+    attributes:
+      label: What feature would you like implemented?
+      description: Please give us a brief description of what you'd like.
+      placeholder: Tell us what you want!
+      value: "x feature would be great!"
+    validations:
+      required: true
+  - type: textarea
+    id: why-add-feature
+    attributes:
+      label: Why should we add this feature?
+      description: Please give us a brief description of why your feature is important.
+      placeholder: Tell us why you want this feature!
+      value: "x feature is super useful because y!"
+    validations:
+      required: true
+  - type: input
+    id: version
+    attributes:
+      label: Version
+      description: What version of calckey is your instance running? You can find this by clicking your instance's logo at the bottom left and then clicking instance information.
+      placeholder: Calckey Version 13.0.4
+    validations:
+      required: true
+  - type: input
+    id: instance
+    attributes:
+      label: Instance
+      description: What instance of calckey are you using?
+      placeholder: stop.voring.me
+    validations:
+      required: false
+  - type: dropdown
+    id: browsers
+    attributes:
+      label: What browser are you using?
+      multiple: false
+      options:
+        - Firefox
+        - Chrome
+        - Brave
+        - Librewolf
+        - Chromium
+        - Safari
+        - Microsoft Edge
+        - Other (Please Specify)
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output
+      description: Please copy and paste any relevant log output. You can find your log by inspecting the page, and going to the "console" tab. This will be automatically formatted into code, so no need for backticks.
+      render: shell
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Contribution Guidelines
+      description: By submitting this issue, you agree to follow our [Contribution Guidelines](https://codeberg.org/calckey/calckey/src/branch/develop/CONTRIBUTING.md)
+      options:
+        - label: I agree to follow this project's Contribution Guidelines
+          required: true

locales/ar-SA.yml

@@ -8,7 +8,7 @@ notifications: "الإشعارات"
 username: "اسم المستخدم"
 password: "الكلمة السرية"
 forgotPassword: "نسيتَ كلمة السر"
-fetchingAsApObject: "جارٍ جلبه مِن الفديفرس…"
+fetchingAsApObject: "جارٍ جلبه مِن الفديفرس"
 ok: " حسناً"
 gotIt: "فهِمت"
 cancel: " إلغاء"
@@ -556,7 +556,6 @@ tokenRequested: "منح حق الوصول إلى الحساب"
 pluginTokenRequestedDescription: "ستتمكن الإضافة من استخدام هذه الأذونات."
 notificationType: "أنواع الإشعارات"
 edit: "التعديل"
-useStarForReactionFallback: "استخدم ★ كبديل إذا كان التفاعل مجهولًا"
 emailServer: "خادم البريد الإلكتروني"
 emailConfigInfo: "يستخدم لتأكيد عنوان بريدك الإلكتروني ولإعادة تعيين كلمة المرور إن نسيتها."
 email: "البريد الإلكتروني "
@@ -694,7 +693,7 @@ receiveAnnouncementFromInstance: "استلم إشعارات من هذا المث
 emailNotification: "إشعارات البريد الكتروني"
 inChannelSearch: "ابحث عن قناة"
 useReactionPickerForContextMenu: "افتح منتقي التفاعلات عند النقر بالزر الأيمن"
-typingUsers: "{users} يكتب(ون)..."
+typingUsers: "{users} يكتب(ون)"
 jumpToSpecifiedDate: "انتقل إلى تاريخ محدد"
 showingPastTimeline: "أنت تستعرض حاليًا خيطًا زمنيًا قديمًا"
 clear: "عودة"
@@ -1029,28 +1028,26 @@ _time:
   hour: "سا"
   day: "ي"
 _tutorial:
-  title: "كيف تستخدم Misskey"
+  title: "How to use Calckey"
-  step1_1: "مرحبًا!"
+  step1_1: "Welcome!"
-  step1_2: "تدعى هذه الصفحة 'الخيط الزمني' وهي تحوي ملاحظات الأشخاص الذي تتابعهم مرتبة حسب تاريخ نشرها."
+  step1_2: "Let's get you set up. You'll be up and running in no time!"
-  step1_3: "خيطك الزمني فارغ حاليًا بما أنك لا تتابع أي شخص ولم تنشر أي ملاحظة."
+  step2_1: "First, please fill out your profile."
-  step2_1: "لننهي إعداد ملفك الشخصي قبل كتابة ملاحظة أو متابعة أشخاص."
+  step2_2: "Providing some information about who you are will make it easier for others to tell if they want to see your notes or follow you."
-  step2_2: "أعطاء معلومات عن شخصيتك يمنح من له نفس إهتماماتك فرصة متابعتك والتفاعل مع ملاحظاتك."
+  step3_1: "Now time to follow some people!"
-  step3_1: "هل أنهيت إعداد حسابك؟"
+  step3_2: "Your home and social timelines are based off of who you follow, so try following a couple accounts to get started.\nClick the plus circle on the top right of a profile to follow them."
-  step3_2: "إذا تاليًا لتنشر ملاحظة. أنقر على أيقونة القلم في أعلى الشاشة"
+  step4_1: "Let's get you out there."
-  step3_3: "املأ النموذج وانقر الزرّ الموجود في أعلى اليمين للإرسال."
+  step4_2: "For your first post, some people like to made a {introduction} post or a simple \"Hello world!\""
-  step3_4: "ليس لديك ما تقوله؟ إذا اكتب \"بدأتُ استخدم ميسكي\"."
+  step5_1: "Timelines, timelines everywhere!"
-  step4_1: "هل نشرت ملاحظتك الأولى؟"
+  step5_2: "Your instance has {timelines} different timelines enabled."
-  step4_2: "مرحى! يمكنك الآن رؤية ملاحظتك في الخيط الزمني."
+  step5_3: "The Home {icon} timeline is where you can see posts from your followers."
-  step5_1: "والآن، لنجعل الخيط الزمني أكثر حيوية وذلك بمتابعة بعض المستخدمين."
+  step5_4: "The Local {icon} timeline is where you can see posts from everyone else on this instance."
-  step5_2: "تعرض صفحة {features} الملاحظات المتداولة في هذا المثيل ويتيح لك {Explore} العثور على المستخدمين الرائدين. اعثر على الأشخاص الذين يثيرون إهتمامك وتابعهم!"
+  step5_5: "The Recommended {icon} timeline is where you can see posts from instances the admins recommend."
-  step5_3: "لمتابعة مستخدمين ادخل ملفهم الشخصي بالنقر على صورتهم الشخصية ثم اضغط زر 'تابع'."
+  step5_6: "The Social {icon} timeline is where you can see posts from friends of your followers."
-  step5_4: "إذا كان لدى المستخدم رمز قفل بجوار اسمه ، وجب عليك انتظاره ليقبل طلب المتابعة يدويًا."
+  step5_7: "The Global {icon} timeline is where you can see posts from every other connected instance."
-  step6_1: "الآن ستتمكن من رؤية ملاحظات المستخدمين المتابَعين في الخيط الزمني."
+  step6_1: "So, what is this place?"
-  step6_2: "يمكنك التفاعل بسرعة مع الملاحظات عن طريق إضافة \"تفاعل\"."
+  step6_2: "Well, you didn't just join Calckey. You joined a portal to the Fediverse, an interconnected network of thousands of servers, called \"instances\"."
-  step6_3: "لإضافة تفاعل لملاحظة ، انقر فوق علامة \"+\" أسفل للملاحظة واختر الإيموجي المطلوب."
+  step6_3: "Each server works in different ways, and not all servers run Calckey. This one does though! It's a bit complicated, but you'll get the hang of it in no time."
-  step7_1: "مبارك ! أنهيت الدورة التعليمية الأساسية لاستخدام ميسكي."
+  step6_4: "Now go, explore, and have fun!"
-  step7_2: "إذا أردت معرفة المزيد عن ميسكي زر {help}."
-  step7_3: "حظًا سعيدًا واستمتع بوقتك مع ميسكي! 🚀"
 _2fa:
   alreadyRegistered: "سجلت سلفًا جهازًا للاستيثاق بعاملين."
   registerDevice: "سجّل جهازًا جديدًا"

locales/bn-BD.yml

@@ -8,7 +8,7 @@ notifications: "বিজ্ঞপ্তি"
 username: "ব্যবহারকারীর নাম"
 password: "পাসওয়ার্ড"
 forgotPassword: "পাসওয়ার্ড ভুলে গেছেন"
-fetchingAsApObject: "ফেডিভার্স থেকে খবর আনা হচ্ছে..."
+fetchingAsApObject: "ফেডিভার্স থেকে খবর আনা হচ্ছে"
 ok: "ঠিক"
 gotIt: "বুঝেছি"
 cancel: "বাতিল"
@@ -577,7 +577,6 @@ tokenRequested: "অ্যাকাউন্টে অ্যাক্সেস
 pluginTokenRequestedDescription: "এই প্লাগইনটি এখানে দেওয়া অনুমুতিসমূহ ব্যাবহার করবে"
 notificationType: "বিজ্ঞপ্তির ধরন"
 edit: "সম্পাদনা"
-useStarForReactionFallback: "রিঅ্যাকশনের ইমোজি না জানলে ★ ব্যবহার করুন"
 emailServer: "ইমেইল সার্ভার"
 enableEmail: "ইমেইল বিতরণ চালু করুন"
 emailConfigInfo: "আপনার ইমেল ঠিকানা নিশ্চিত করতে এবং আপনার পাসওয়ার্ড পুনরায় সেট করতে ব্যবহৃত হয়"
@@ -645,7 +644,7 @@ createNew: "নতুন"
 optional: "প্রয়োজনীয় নয়"
 createNewClip: "নতুন ক্লিপ তৈরি করুন"
 public: "সর্বজনীন"
-i18nInfo: "Misskey স্বেচ্ছাসেবকদের দ্বারা বিভিন্ন ভাষায় অনুবাদ করা হচ্ছে। আপনি {link} এ গিয়ে অনুবাদে সহযোগিতা করতে পারেন।"
+i18nInfo: "Calckey স্বেচ্ছাসেবকদের দ্বারা বিভিন্ন ভাষায় অনুবাদ করা হচ্ছে। আপনি {link} এ গিয়ে অনুবাদে সহযোগিতা করতে পারেন।"
 manageAccessTokens: "অ্যাক্সেস টোকেন পরিচালনা করুন"
 accountInfo: "অ্যাকাউন্টের তথ্য"
 notesCount: "নোটের সংখ্যা"
@@ -1110,28 +1109,26 @@ _time:
   hour: "ঘণ্টা"
   day: "দিন"
 _tutorial:
-  title: "Misskey কিভাবে ব্যাবহার করবেন"
+  title: "How to use Calckey"
-  step1_1: "স্বাগতম!"
+  step1_1: "Welcome!"
-  step1_2: "এই স্ক্রীনটিকে \"টাইমলাইন\" বলা হয় এবং কালানুক্রমিক ক্রমে আপনার এবং আপনি যাদের \"অনুসরণ করেন\" তাদের \"নোটগুলি\" দেখায়৷"
+  step1_2: "Let's get you set up. You'll be up and running in no time!"
-  step1_3: "আপনি আপনার টাইমলাইনে কিছু দেখতে পাবেন না কারণ আপনি এখনও কোনো নোট পোস্ট করেননি এবং আপনি কাউকে অনুসরণ করছেন না৷"
+  step2_1: "First, please fill out your profile."
-  step2_1: "নোট তৈরি করার আগে বা কাউকে অনুসরণ করার আগে প্রথমে আপনার প্রোফাইলটি সম্পূর্ণ করুন।"
+  step2_2: "Providing some information about who you are will make it easier for others to tell if they want to see your notes or follow you."
-  step2_2: "আপনি কে তা জানা অনেক লোকের জন্য আপনার নোটগুলি দেখা এবং অনুসরণ করাকে সহজ করে তোলে৷"
+  step3_1: "Now time to follow some people!"
-  step3_1: "আপনি কি সফলভাবে আপনার প্রোফাইল সেট আপ করেছেন?"
+  step3_2: "Your home and social timelines are based off of who you follow, so try following a couple accounts to get started.\nClick the plus circle on the top right of a profile to follow them."
-  step3_2: "এখন, কিছু নোট পোস্ট করার চেষ্টা করুন। পোস্ট ফর্ম খুলতে পেন্সিল চিহ্নযুক্ত বাটনে ক্লিক করুন।"
+  step4_1: "Let's get you out there."
-  step3_3: "বিষয়বস্তু লেখার পরে, আপনি ফর্মের উপরের ডানদিকের বাটনে ক্লিক করে পোস্ট করতে পারেন।"
+  step4_2: "For your first post, some people like to made a {introduction} post or a simple \"Hello world!\""
-  step3_4: "পোস্ট করার মত কিছু মনে পরছে না? \"আমি মিসকি সেট আপ করছি\" বললে কেমন হয়?"
+  step5_1: "Timelines, timelines everywhere!"
-  step4_1: "পোস্ট করেছেন?"
+  step5_2: "Your instance has {timelines} different timelines enabled."
-  step4_2: "সাবাশ! এখন আপনার নোট টাইমলাইনে দেখা যাবে।"
+  step5_3: "The Home {icon} timeline is where you can see posts from your followers."
-  step5_1: "এখন অন্যদেরকে অনুসরণ করে আপনার টাইমলাইনকে প্রাণবন্ত করে তুলুন।"
+  step5_4: "The Local {icon} timeline is where you can see posts from everyone else on this instance."
-  step5_2: "আপনি {featured}-এ জনপ্রিয় নোটগুলি দেখতে পারেন, যাতে আপনি যে ব্যক্তিকে পছন্দ করেন তাকে বেছে নিতে এবং অনুসরণ করতে পারেন, অথবা {explore}-এ জনপ্রিয় ব্যবহারকারীদের দেখতে পারেন৷"
+  step5_5: "The Recommended {icon} timeline is where you can see posts from instances the admins recommend."
-  step5_3: "একজন ব্যবহারকারীকে অনুসরণ করতে, ব্যবহারকারীর আইকনে ক্লিক করুন এবং ব্যবহারকারীর পৃষ্ঠাতে  \"অনুসরণ করুন\" বাটনে ক্লিক করুন।"
+  step5_6: "The Social {icon} timeline is where you can see posts from friends of your followers."
-  step5_4: "যদি ব্যবহারকারীর নামের পাশে একটি লক আইকন থাকে তাহলে আপনার অনুসরণের অনুরোধ গ্রহণ করার জন্য তারা কিছু সময় নিতে পারে।"
+  step5_7: "The Global {icon} timeline is where you can see posts from every other connected instance."
-  step6_1: "সবকিছু ঠিক থাকলে আপনি টাইমলাইনে অন্য ব্যবহারকারীদের নোট দেখতে পাবেন।"
+  step6_1: "So, what is this place?"
-  step6_2: "আপনি সহজেই আপনার প্রতিক্রিয়া জানাতে অন্য ব্যক্তির নোটে \"রিঅ্যাকশন\" যোগ করতে পারেন।"
+  step6_2: "Well, you didn't just join Calckey. You joined a portal to the Fediverse, an interconnected network of thousands of servers, called \"instances\"."
-  step6_3: "একটি রিঅ্যাকশন যোগ করতে, নোটে \"+\" চিহ্নে ক্লিক করুন এবং আপনার পছন্দের রিঅ্যাকশন নির্বাচন করুন।"
+  step6_3: "Each server works in different ways, and not all servers run Calckey. This one does though! It's a bit complicated, but you'll get the hang of it in no time."
-  step7_1: "অভিনন্দন! আপনি এখন Misskey-র প্রাথমিক টিউটোরিয়ালটি শেষ করেছেন।"
+  step6_4: "Now go, explore, and have fun!"
-  step7_2: "আপনি যদি Misskey সম্পর্কে আরও জানতে চান, তাহলে {help} এ দেখুন।"
-  step7_3: "এখন Misskey উপভোগ করুন 🚀"
 _2fa:
   alreadyRegistered: "আপনি ইতিমধ্যে একটি 2-ফ্যাক্টর অথেনটিকেশন ডিভাইস নিবন্ধন করেছেন৷"
   registerDevice: "নতুন ডিভাইস নিবন্ধন করুন"

locales/ca-ES.yml

@@ -8,7 +8,7 @@ notifications: "Notificacions"
 username: "Nom d'usuari"
 password: "Contrasenya"
 forgotPassword: "Contrasenya oblidada"
-fetchingAsApObject: "Cercant en el Fediverse..."
+fetchingAsApObject: "Cercant en el Fediverse"
 ok: "OK"
 gotIt: "Ho he entès!"
 cancel: "Cancel·lar"

locales/cs-CZ.yml

@@ -8,7 +8,7 @@ notifications: "Oznámení"
 username: "Uživatelské jméno"
 password: "Heslo"
 forgotPassword: "Zapomenuté heslo"
-fetchingAsApObject: "Načítám data z Fediversu..."
+fetchingAsApObject: "Načítám data z Fediversu"
 ok: "Potvrdit"
 gotIt: "Rozumím!"
 cancel: "Zrušit"

locales/de-DE.yml

@@ -1,14 +1,14 @@
 ---
 _lang_: "Deutsch"
-headlineMisskey: "Ein durch Notizen verbundenes Netzwerk"
+headlineMisskey: "Ein durch Posts verbundenes Netzwerk"
-introMisskey: "Willkommen! Misskey ist eine dezentralisierte Open-Source Microblogging-Platform.\nVerfasse „Notizen“ um mitzuteilen, was gerade passiert oder um Ereignisse mit anderen zu teilen. 📡\nMit „Reaktionen“ kannst du außerdem schnell deine Gefühle über Notizen anderer Benutzer zum Ausdruck bringen. 👍\nEine neue Welt wartet auf dich! 🚀"
+introMisskey: "Willkommen! Calckey ist eine dezentralisierte Open-Source Microblogging-Platform.\nVerfasse „Posts“ um mitzuteilen, was gerade passiert oder um Ereignisse mit anderen zu teilen. 📡\nMit „Reaktionen“ kannst du außerdem schnell deine Gefühle über Posts anderer Benutzer zum Ausdruck bringen. 👍\nEine neue Welt wartet auf dich! 🚀"
 monthAndDay: "{day}.{month}."
 search: "Suchen"
 notifications: "Benachrichtigungen"
 username: "Benutzername"
 password: "Passwort"
 forgotPassword: "Passwort vergessen"
-fetchingAsApObject: "Wird aus dem Fediverse angefragt …"
+fetchingAsApObject: "Wird aus dem Fediverse angefragt"
 ok: "OK"
 gotIt: "Verstanden!"
 cancel: "Abbrechen"
@@ -89,7 +89,7 @@ privacy: "Privatsphäre"
 makeFollowManuallyApprove: "Follow-Anfragen benötigen Bestätigung"
 defaultNoteVisibility: "Standardsichtbarkeit"
 follow: "Folgen"
-followRequest: "Follow-Anfrage senden"
+followRequest: "Follow anfragen"
 followRequests: "Follow-Anfragen"
 unfollow: "Nicht mehr folgen"
 followRequestPending: "Follow-Anfrage ausstehend"
@@ -112,6 +112,7 @@ reactionSettingDescription2: "Ziehe um Anzuordnen, klicke um zu löschen, drück
 rememberNoteVisibility: "Notizsichtbarkeit merken"
 attachCancel: "Anhang entfernen"
 markAsSensitive: "Als NSFW markieren"
+accountMoved: "Benutzer hat zu einem anderen Account gewechselt."
 unmarkAsSensitive: "Als nicht NSFW markieren"
 enterFileName: "Dateinamen eingeben"
 mute: "Stummschalten"
@@ -256,7 +257,7 @@ agreeTo: "Ich stimme {0} zu"
 tos: "Nutzungsbedingungen"
 start: "Anfangen"
 home: "Startseite"
-remoteUserCaution: "Diese Informationen sind möglicherweise unvollständig, da der Benutzer von einer fremden Instanz stammt."
+remoteUserCaution: "Informationen von fremden Instanzen sind möglicherweise unvollständig."
 activity: "Aktivität"
 images: "Bilder"
 birthday: "Geburtstag"
@@ -580,7 +581,6 @@ tokenRequested: "Zugriff zum Benutzerkonto gewähren"
 pluginTokenRequestedDescription: "Dieses Plugin wird die hier konfigurierten Berechtigungen verwenden können."
 notificationType: "Art der Benachrichtigung"
 edit: "Bearbeiten"
-useStarForReactionFallback: "Verwende ★ falls das Reaktions-Emoji unbekannt ist"
 emailServer: "Email-Server"
 enableEmail: "Email-Versand aktivieren"
 emailConfigInfo: "Zur Email-Bestätigung bei Registrierung oder zum Zurücksetzen des Passworts verwendet"
@@ -650,7 +650,7 @@ createNewClip: "Neuen Clip erstellen"
 unclip: "Aus Clip entfernen"
 confirmToUnclipAlreadyClippedNote: "Diese Notiz ist bereits im \"{name}\" Clip enthalten. Möchtest du sie aus diesem Clip entfernen?"
 public: "Öffentlich"
-i18nInfo: "Misskey wird durch freiwillige Helfer in viele verschiedene Sprachen übersetzt. Auf {link} kannst du mithelfen."
+i18nInfo: "Calckey wird durch freiwillige Helfer in viele verschiedene Sprachen übersetzt. Auf {link} kannst du mithelfen."
 manageAccessTokens: "Zugriffstokens verwalten"
 accountInfo: "Benutzerkonto-Informationen"
 notesCount: "Anzahl der Notizen"
@@ -1181,28 +1181,26 @@ _time:
   hour: "Stunde(n)"
   day: "Tag(en)"
 _tutorial:
-  title: "Wie du Misskey verwendest"
+  title: "Wie man Calckey benutzt"
   step1_1: "Willkommen!"
-  step1_2: "Diese Seite ist die „Chronik“. Sie zeigt dir deine geschrieben „Notizen“ sowie die aller Benutzer, denen du „folgst“, in chronologischer Reihenfolge."
+  step1_2: "Wir werden Sie einrichten. Sie werden im Handumdrehen einsatzbereit sein!"
-  step1_3: "Deine Chronik sollte momentan leer sein, da du bis jetzt noch keine Notizen geschrieben hast und auch noch keinen Benutzern folgst."
+  step2_1: "Bitte füllen Sie zuerst Ihr Profil aus."
-  step2_1: "Lass uns zuerst dein Profil vervollständigen, bevor du Notizen schreibst oder jemandem folgst."
+  step2_2: "Wenn du ein paar Angaben zu deiner Person machst, können andere leichter erkennen, ob sie deine Notizen sehen oder dir folgen wollen."
-  step2_2: "Informationen darüber, was für eine Person du bist, macht es anderen leichter zu wissen, ob sie deine Notizen sehen wollen und ob sie dir folgen möchten."
+  step3_1: "Jetzt ist es Zeit, einigen Leuten zu folgen!"
-  step3_1: "Mit dem Einrichten deines Profils fertig?"
+  step3_2: "Deine Home- und Social-Timeline basiert darauf, wem du folgst, also folge für den Anfang ein paar Accounts."
-  step3_2: "Dann lass uns als nächstes versuchen, eine Notiz zu schreiben. Dies kannst du tun, indem du auf den Knopf mit dem Stift-Icon auf dem Bildschirm drückst."
+  step4_1: "Wir bringen dich nach draußen."
-  step3_3: "Fülle das Fenster aus und drücke auf den Knopf oben rechts zum Senden."
+  step4_2: "Für deinen ersten Beitrag machen manche Leute gerne einen {introduction} Beitrag oder ein einfaches \"Hallo Welt!\""
-  step3_4: "Fällt dir nichts ein, das du schreiben möchtest? Versuch's mit \"Hallo Misskey!\""
+  step5_1: "Timelines, Timelines überall!"
-  step4_1: "Fertig mit dem Senden deiner ersten Notiz?"
+  step5_2: "Deine Instanz hat {Zeitleisten} verschiedene Zeitleisten aktiviert."
-  step4_2: "Falls deine Notiz nun in deiner Chronik auftaucht, hast du alles richtig gemacht."
+  step5_3: "Die Zeitleiste Home {icon} ist die Zeitleiste, in der du die Beiträge deiner Follower sehen kannst."
-  step5_1: "Lass uns nun deiner Chronik etwas mehr Leben einhauchen, indem du einigen anderen Benutzern folgst."
+  step5_4: "In der lokalen {Icon} Zeitleiste kannst du die Beiträge aller anderen Mitglieder dieser Instanz sehen."
-  step5_2: "{featured} zeigt dir beliebte Notizen dieser Instanz. In {explore} kannst du beliebte Benutzer finden. Schau dort, ob du Benutzer findest, die dich interessieren."
+  step5_5: "In der Zeitleiste Empfohlen {icon} kannst du Beiträge von Instanzen sehen, die von den Administratoren empfohlen werden."
-  step5_3: "Klicke zum Anzeigen des Profils eines Benutzers auf dessen Profilbild und dann auf den \"Folgen\"-Knopf, um diesem zu folgen."
+  step5_6: "In der sozialen {icon} Zeitleiste kannst du Beiträge von Freunden deiner Follower sehen."
-  step5_4: "Je nach Benutzer kann es etwas Zeit in Anspruch nehmen, bis dieser deine Follow-Anfrage bestätigt."
+  step5_7: "In der globalen {icon} Zeitleiste kannst du Beiträge von allen anderen verbundenen Instanzen sehen."
-  step6_1: "Wenn du nun auch die Notizen anderer Benutzer in deiner Chronik siehst, hast du auch diesmal alles richtig gemacht."
+  step6_1: "Also, was ist das hier?"
-  step6_2: "Du kannst ebenso „Reaktionen“ verwenden, um schnell auf Notizen anderer Benutzer zu reagieren."
+  step6_2: "Nun, du bist nicht nur Calckey beigetreten. Du bist einem Portal zum Fediversum beigetreten, einem zusammenhängenden Netzwerk von Tausenden von Servern, genannt \"Instanzen\"."
-  step6_3: "Um eine Reaktion anzufügen, klicke auf das „+“-Symbol in der Notiz und wähle ein Emoji aus, mit dem du reagieren möchtest."
+  step6_3: "Jeder Server funktioniert auf unterschiedliche Weise, und nicht auf allen Servern läuft Calckey. Dieser hier aber schon! Es ist ein bisschen kompliziert, aber du wirst den Dreh schnell raus haben."
-  step7_1: "Glückwunsch! Du hast die Einführung in die Verwendung von Misskey abgeschlossen."
+  step6_4: "Jetzt geh, erkunde und hab Spaß!"
-  step7_2: "Wenn du mehr über Misskey lernen möchtest, schau dich im {help}-Bereich um."
-  step7_3: "Und nun, viel Spaß mit Misskey! 🚀"
 _2fa:
   alreadyRegistered: "Du hast bereits ein Gerät für Zwei-Faktor-Authentifizierung registriert."
   registerDevice: "Neues Gerät registrieren"

locales/el-GR.yml

@@ -0,0 +1,408 @@
+---
+_lang_: "Ελληνικά"
+monthAndDay: "{μήνας}/{ημέρα}"
+search: "Αναζήτηση"
+notifications: "Ειδοποιήσεις"
+username: "Όνομα μέλους"
+password: "Κωδικός πρόσβασης"
+forgotPassword: "Ξέχασα τον κωδικό πρόσβασης"
+fetchingAsApObject: "Μαζεύοντας από το Fediverse..."
+ok: "Εντάξει"
+gotIt: "Τό'πιασα!"
+cancel: "Ακύρωση"
+enterUsername: "Εισάγετε το όνομα μέλους"
+renotedBy: "Κοινοποιήθηκε από {user}"
+noNotes: "Δεν υπάρχουν σημειώματα"
+noNotifications: "Δεν υπάρχουν ειδοποιήσεις"
+settings: "Ρυθμίσεις"
+basicSettings: "Βασικές ρυθμίσεις"
+otherSettings: "Άλλες ρυθμίσεις"
+openInWindow: "Άνοιγμα σε παράθυρο"
+profile: "Προφίλ"
+timeline: "Χρονολόγιο"
+noAccountDescription: "Αυτό το μέλος δεν έχει γράψει βιογραφικό ακόμη."
+login: "Σύνδεση"
+loggingIn: "Συνδέεστε"
+logout: "Αποσύνδεση"
+signup: "Δημιουργία λογαριασμού"
+uploading: "Ανέβασμα..."
+save: "Αποθήκευση"
+users: "Μέλη"
+addUser: "Προσθήκη μέλους"
+favorite: "Προσθήκη στα αγαπημένα"
+favorites: "Αγαπημένα"
+unfavorite: "Αφαίρεση από αγαπημένα"
+favorited: "Προστέθηκε στα αγαπημένα."
+alreadyFavorited: "Έχει ήδη προστεθεί στα αγαπημένα."
+cantFavorite: "Αδυναμία προσθήκης στα αγαπημένα."
+pin: "Καρφίτσωμα στο προφίλ"
+unpin: "Ξεκαρφίτσωμα από το προφίλ"
+copyContent: "Αντιγραφή περιεχομένων"
+copyLink: "Αντιγραφή συνδέσμου"
+delete: "Διαγραφή"
+deleteAndEdit: "Διαγραφή και επεξεργασία"
+deleteAndEditConfirm: "Σίγουρα θέλετε να διαγράψετε αυτό το σημείωμα και να το επεξεργαστείτε; Θα χάσετε όλες τις αντιδράσεις, κοινοποιήσεις και απαντήσεις σε αυτό."
+addToList: "Προσθήκη στη λίστα"
+sendMessage: "Αποστολή μηνύματος"
+copyUsername: "Αντιγραφή ονόματος μέλους"
+searchUser: "Αναζήτηση μέλους"
+reply: "Απάντηση"
+loadMore: "Φόρτωσε περισσότερα"
+showMore: "Δείξε περισσότερα"
+showLess: "Κλείσιμο"
+youGotNewFollower: "σε ακολούθησε"
+receiveFollowRequest: "Λάβατε αίτημα ακολούθησης"
+followRequestAccepted: "Το αίτημα ακολούθησης έγινε δεκτό"
+mention: "Επισήμανση"
+mentions: "Επισημάνσεις"
+directNotes: "Απευθείας σημειώματα"
+importAndExport: "Εισαγωγή / Εξαγωγή"
+import: "Εισαγωγή"
+export: "Εξαγωγή"
+files: "Αρχεία"
+download: "Λήψη"
+driveFileDeleteConfirm: "Θέλετε σίγουρα να διαγράψετε το αρχείο \"{name}\"; Τα σημειώματα με αυτό το συνημμένο αρχείο επίσης θα διαγραφούν."
+unfollowConfirm: "Θέλετε σίγουρα να σταματήσετε να ακολουθείτε το μέλος {name};"
+exportRequested: "Ζητήσατε μία εξαγωγή. Αυτό μπορεί να πάρει κάποιον χρόνο. Επίσης θα προστεθεί στον Δίσκο σας μόλις ολοκληρωθεί."
+importRequested: "Ζητήσατε μία εισαγωγή. Αυτό μπορεί να πάρει κάποιον χρόνο."
+lists: "Λίστες"
+noLists: "Δεν έχετε λίστες"
+note: "Σημείωμα"
+notes: "Σημειώματα"
+following: "Ακολουθεί"
+followers: "Ακολουθούν"
+followsYou: "Σε ακολουθεί"
+createList: "Δημιουργία λίστας"
+manageLists: "Διαχείριση λιστών"
+error: "Σφάλμα"
+somethingHappened: "Προέκυψε ένα σφάλμα"
+retry: "Προσπάθεια ξανά"
+pageLoadError: "Ένα σφάλμα προέκυψε φορτώνοντας τη σελίδα."
+pageLoadErrorDescription: "Αυτό κανονικά προκαλείται από σφάλματα δικτύου ή από την προσωρινή μνήμη του προγράμματος περιήγησης. Δοκιμάστε να σβήσετε την προσωρινή μνήμη (cache) και ξαναδοκιμάστε μετά από λίγο."
+serverIsDead: "Αυτός ο server δεν αποκρίνεται. Παρακαλώ περιμέντε λίγο και δοκιμάστε ξανά."
+youShouldUpgradeClient: "Για να δείτε αυτή τη σελίδα, παρακαλώ επαναφορτώστε για να ενημερωθεί το πρόγραμμα."
+enterListName: "Πληκτρολογήστε ένα όνομα για τη λίστα"
+privacy: "Ιδιωτικότητα"
+makeFollowManuallyApprove: "Τα αιτήματα ακολούθησης χρειάζονται έγκριση"
+defaultNoteVisibility: "Προεπιλεγμένη ορατότητα"
+follow: "Ακολουθήστε"
+followRequest: "Στείλτε αίτημα ακολούθησης"
+followRequests: "Αιτήματα ακολούθησης"
+unfollow: "Να μην ακολουθώ"
+followRequestPending: "Το αίτημα ακολούθησης εκκρεμεί"
+enterEmoji: "Εισάγετε ένα emoji"
+renote: "Κοινοποίηση σημειώματος"
+unrenote: "Ακύρωση κοινοποίησης"
+renoted: "Κοινοποιήθηκε."
+cantRenote: "Αυτή η δημοσίευση δεν μπορεί να κοινοποιηθεί."
+cantReRenote: "Μία κοινοποίηση δεν μπορεί να κοινοποιηθεί."
+quote: "Παράθεση"
+pinnedNote: "Καρφιτσωμένο σημείωμα"
+pinned: "Καρφίτσωμα στο προφίλ"
+you: "Εσύ"
+clickToShow: "Κάντε κλικ για εμφάνιση"
+add: "Προσθέστε"
+reaction: "Αντιδράσεις"
+reactionSetting: "Αντιδράσεις για εμφάνιση στην επιλογή αντίδρασης"
+reactionSettingDescription2: "Σύρετε για να αλλάξετε τη σειρά, κάντε κλικ για να διαγράψετε, πατήστε \"+\" για να προσθέσετε."
+rememberNoteVisibility: "Θυμήσου τις ρυθμίσεις ορατότητας σημειώματος"
+attachCancel: "Διαγραφή αρχείου"
+enterFileName: "Πληκτρολογήστε όνομα αρχείου"
+mute: "Σίγαση"
+unmute: "Άρση σίγασης"
+block: "Μπλοκάρισμα"
+unblock: "Άρση μπλοκαρίσματος"
+suspend: "Αποβολή"
+unsuspend: "Άρση αποβολής"
+blockConfirm: "Θέλετε σίγουρα να μπλοκάρετε αυτόν τον λογαριασμό;"
+unblockConfirm: "Θέλετε σίγουρα να ξεμπλοκάρετε αυτόν τον λογαριασμό;"
+suspendConfirm: "Θέλετε σίγουρα να αποβάλλετε αυτόν τον λογαριασμό;"
+unsuspendConfirm: "Θέλετε σίγουρα να άρετε την αποβολή αυτού του λογαριασμού;"
+selectList: "Επιλέξτε μία λίστα"
+selectAntenna: "Επιλέξτε μία αντένα"
+selectWidget: "Επιλέξτε ένα μαραφέτι"
+editWidgets: "Επεξεργασία μαραφετίων"
+editWidgetsExit: "Ολοκληρώθηκε"
+customEmojis: "Επιπλέον emoji"
+emojiName: "Όνομα emoji"
+addEmoji: "Προσθήκη emoji"
+settingGuide: "Συνιστώμενες ρυθμίσεις"
+flagAsBot: "Αυτός ο λογαριασμός είναι bot"
+flagAsCat: "Αυτός ο λογαριασμός είναι γάτα"
+flagShowTimelineReplies: "Εμφάνιση απαντήσεων στο χρονολόγιο"
+addAccount: "Προσθήκη λογαριασμού"
+general: "Γενικές"
+wallpaper: "Ταπετσαρία"
+setWallpaper: "Ορισμός ταπετσαρίας"
+removeWallpaper: "Διαγραφή ταπετσαρίας"
+searchWith: "Αναζήτηση: {q}"
+youHaveNoLists: "Δεν έχετε λίστες"
+followConfirm: "Θέλετε σίγουρα να ακολουθήσετε τον λογαριασμό {name};"
+host: "Φιλοξενεί"
+selectUser: "Επιλέξτε ένα μέλος"
+recipient: "Αποδέκτης-τρια"
+annotation: "Σχόλια"
+federation: "Ομοσπονδία"
+storageUsage: "Χρήση χώρου"
+version: "Έκδοση"
+metadata: "Μεταδεδομένα"
+network: "Δίκτυο"
+disk: "Δίσκος"
+instanceInfo: "Πληροφορίες του instance"
+statistics: "Στατιστικά"
+clearQueue: "Εκκαθάριση ουράς"
+clearQueueConfirmTitle: "Θέλετε να διαγράψετε την ουρά;"
+clearCachedFiles: "Εκκαθάριση προσωρινής μνήμης"
+done: "Ολοκληρώθηκε"
+attachFile: "Επισύναψη αρχείων"
+more: "Περισσότερα!"
+noSuchUser: "Το μέλος δεν βρέθηκε"
+announcements: "Ανακοινώσεις"
+imageUrl: "URL εικόνας"
+remove: "Διαγραφή"
+removed: "Η διαγραφή ολοκληρώθηκε επιτυχώς"
+saved: "Αποθηκεύτηκε"
+messaging: "Συνομιλία"
+upload: "Ανεβάστε"
+fromDrive: "Από τον Αποθηκευτικό Χώρο"
+fromUrl: "Από URL"
+uploadFromUrl: "Ανεβάστε από URL"
+explore: "Εξερευνήστε"
+messageRead: "Διαβάστηκε"
+startMessaging: "Ξεκινήστε μία συνομιλία"
+nUsersRead: "διαβάστηκε από {n}"
+tos: "Όροι χρήσης"
+start: "Ας αρχίσουμε"
+home: "Κεντρικό"
+activity: "Δραστηριότητα"
+images: "Εικόνες"
+birthday: "Γενέθλια"
+registeredDate: "Έγινε μέλος στις"
+location: "Τοποθεσία"
+theme: "Θέματα"
+light: "Ανοιχτόχρωμο"
+dark: "Σκούρο"
+drive: "Αποθηκευτικός Χώρος"
+fileName: "Όνομα αρχείου"
+selectFile: "Επιλέξτε ένα αρχείο"
+selectFiles: "Επιλέξτε αρχεία"
+selectFolder: "Επιλέξτε φάκελο"
+selectFolders: "Επιλέξτε φακέλους"
+renameFile: "Μετονομασία αρχείου"
+addFile: "Προσθήκη αρχείου"
+emptyDrive: "Ο Αποθηκευτικός Χώρος σας είναι άδειος"
+copyUrl: "Αντιγραφή URL"
+rename: "Αλλαγή ονόματος"
+avatar: "Εικονίδιο"
+banner: "Πανό"
+reload: "Ανανέωση"
+doNothing: "Αγνόηση"
+watch: "Παρακολούθηση"
+unwatch: "Τέλος παρακολούθησης"
+accept: "Αποδοχή"
+reject: "Απόρριψη"
+normal: "Κανονικό"
+instanceName: "Όνομα instance"
+thisYear: "Έτος"
+thisMonth: "Μήνας"
+today: "Σήμερα"
+dayX: "{day}"
+pages: "Σελίδες"
+connectService: "Σύνδεση"
+disconnectService: "Αποσύνδεση"
+registration: "Εγγραφή"
+pinnedPages: "Καρφιτσωμένες Σελίδες"
+pinnedNotes: "Καρφιτσωμένα σημειώματα"
+antennas: "Αντένες"
+manageAntennas: "Διαχείριση αντενών"
+name: "Όνομα"
+antennaSource: "Πηγή αντένας"
+antennaKeywords: "Λέξεις-κλειδιά για παρακολούθηση"
+antennaExcludeKeywords: "Λέξεις-κλειδιά για αποκλεισμό"
+notifyAntenna: "Ειδοποίηση για νέα σημειώματα"
+withFileAntenna: "Μόνο σημειώματα με αρχεία"
+caseSensitive: "Διάκριση Πεζών-Κεφαλαίων"
+popularTags: "Δημοφιλείς ετικέτες"
+userList: "Λίστες"
+about: "Πληροφορίες"
+moderator: "Συντονιστής"
+moderation: "Συντονισμός"
+cacheClear: "Εκκαθάριση προσωρινής μνήμης"
+markAsReadAllNotifications: "Όλες οι ειδοποιήσεις διαβάστηκαν"
+group: "Ομάδα"
+groups: "Ομάδες"
+createGroup: "Δημιουργία ομάδας"
+ownedGroups: "Οι ομάδες σας"
+groupName: "Όνομα ομάδας"
+members: "Μέλη"
+transfer: "Μεταφορά"
+messagingWithUser: "Ιδιωτική συνομιλία"
+messagingWithGroup: "Ομαδική συνομιλία"
+title: "Τίτλος"
+text: "Κείμενο"
+enable: "Ενεργοποίηση"
+next: "Επόμενο"
+noteOf: "Σημείωμα από {user}"
+inviteToGroup: "Πρόσκληση στην ομάδα"
+quoteAttached: "Παράθεση"
+signinRequired: "Παρακαλούμε δημιουργήστε λογαριασμό ή συνδεθείτε πριν συνεχίσετε"
+category: "Κατηγορία"
+tags: "Ετικέτες"
+createAccount: "Δημιουργία λογαριασμού"
+local: "Τοπικό"
+remote: "Απομακρυσμένo"
+total: "Σύνολο"
+appearance: "Εμφάνιση"
+accountSettings: "Ρυθμίσεις λογαριασμού"
+sounds: "Ήχοι"
+sound: "Ήχοι"
+listen: "Ακρόαση"
+showInPage: "Εμφάνιση στη σελίδα"
+volume: "Ένταση"
+masterVolume: "Κύρια ένταση"
+details: "Λεπτομέρειες"
+install: "Εγκατάσταση"
+uninstall: "Κατάργηση εγκατάστασης"
+manage: "Διαχείριση"
+smtpHost: "Φιλοξενεί"
+smtpUser: "Όνομα μέλους"
+smtpPass: "Κωδικός πρόσβασης"
+notificationSetting: "Ρυθμίσεις ειδοποιήσεων"
+notificationSettingDesc: "Επιλέξτε τους τύπους ειδοποιήσεων που εμφανίζονται"
+switchUi: "Αλλαγή UI"
+clip: "Κλιπ"
+driveFilesCount: "Αριθμός αρχείων Αποθηκευτικού Χώρου"
+driveUsage: "Χρήση Αποθηκευτικού Χώρου"
+noteFavoritesCount: "Αριθμός αγαπημένων σημειωμάτων"
+clips: "Κλιπ"
+clearCache: "Εκκαθάριση προσωρινής μνήμης"
+emailNotification: "Ειδοποιήσεις μέσω mail"
+inChannelSearch: "Αναζήτηση στο κανάλι"
+info: "Πληροφορίες"
+notRecommended: "Δεν προτείνεται"
+switchAccount: "Αλλαγή λογαριασμού"
+user: "Μέλη"
+administration: "Διαχείριση"
+switch: "Εναλλαγή"
+gallery: "Γκαλερί"
+global: "Παγκόσμιο"
+searchResult: "Αποτελέσματα αναζήτησης"
+learnMore: "Μάθετε περισσότερα"
+controlPanel: "Πίνακας ελέγχου"
+manageAccounts: "Διαχείριση Λογαριασμών"
+searchByGoogle: "Αναζήτηση"
+file: "Αρχεία"
+recommended: "Προτεινόμενα"
+cannotUploadBecauseNoFreeSpace: "Το ανέβασμα απέτυχε λόγω ανεπαρκούς Αποθηκευτικού Χώρου"
+_email:
+  _follow:
+    title: "Έχετε ένα νέο ακόλουθο"
+_mfm:
+  mention: "Επισήμανση"
+  quote: "Παράθεση"
+  emoji: "Επιπλέον emoji"
+  search: "Αναζήτηση"
+_channel:
+  featured: "Δημοφιλή"
+_theme:
+  keys:
+    panel: "Πίνακας"
+    mention: "Επισήμανση"
+    renote: "Κοινοποίηση σημειώματος"
+_sfx:
+  note: "Σημειώματα"
+  notification: "Ειδοποιήσεις"
+  chat: "Συνομιλία"
+  chatBg: "Συνομιλία (Παρασκήνιο)"
+  antenna: "Αντένες"
+  channel: "Ειδοποιήσεις καναλιών"
+_ago:
+  future: "Μελλοντικό"
+  justNow: "Μόλις τώρα"
+  secondsAgo: "{n} δευτερόλεπτο(α) πριν"
+  minutesAgo: "{n} λεπτό(ά) πριν"
+  hoursAgo: "{n} ώρα(ες) πριν"
+  daysAgo: "{n} μέρα(ες) πριν"
+  weeksAgo: "{n} εβδομάδα(ες) πριν"
+  monthsAgo: "{n} μήνα(ες) πριν"
+  yearsAgo: "{n} έτος(η) πριν"
+_permissions:
+  "write:drive": "Επεξεργαστείτε ή διαγράψτε τα αρχεία και τους φακέλους του Αποθηκευτικού Χώρου σας"
+  "read:favorites": "Δείτε τη λίστα των αγαπημένων σας"
+  "write:favorites": "Επεξεργαστείτε τη λίστα των αγαπημένων σας"
+  "read:messaging": "Δείτε τις συνομιλίες σας"
+  "write:messaging": "Γράψτε ή διαγράψτε μηνύματα συνομιλίας"
+  "read:notifications": "Δείτε τις ειδοποιήσεις σας"
+  "write:notifications": "Διαχειριστείτε τις ειδοποιήσεις σας"
+  "read:pages": "Δείτε τις Σελίδες σας"
+  "write:pages": "Επεξεργαστείτε ή διαγράψτε τις σελίδες σας"
+_antennaSources:
+  all: "Όλα τα σημειώματα"
+  homeTimeline: "Σημειώματα από μέλη που ακολουθείτε"
+  users: "Σημειώματα από συγκεκριμένα μέλη"
+  userList: "Σημειώματα από καθορισμένη λίστα μελών"
+  userGroup: "Σημειώματα από μέλη καθορισμένης ομάδας"
+_widgets:
+  profile: "Προφίλ"
+  instanceInfo: "Πληροφορίες του instance"
+  notifications: "Ειδοποιήσεις"
+  timeline: "Χρονολόγιο"
+  calendar: "Ημερολόγιο"
+  trends: "Δημοφιλή"
+  clock: "Ρολόι"
+  activity: "Δραστηριότητα"
+  photos: "Φωτογραφίες"
+  digitalClock: "Ψηφιακό ρολόι"
+  federation: "Ομοσπονδία"
+  postForm: "Φόρμα δημοσίευσης"
+  button: "Κουμπί"
+  onlineUsers: "Συνδεδεμένα μέλη"
+  _userList:
+    chooseList: "Επιλέξτε μία λίστα"
+_cw:
+  show: "Δείτε περισσότερα"
+_visibility:
+  home: "Κεντρικό"
+  homeDescription: "Δημοσίευση στο κεντρικό χρονολόγιο μόνο"
+  followers: "Ακολουθούν"
+_profile:
+  name: "Όνομα"
+  username: "Όνομα μέλους"
+_exportOrImport:
+  allNotes: "Όλα τα σημειώματα"
+  followingList: "Ακολουθεί"
+  muteList: "Μέλη σε σίγαση"
+  blockingList: "Μπλοκαρισμένα μέλη"
+  userLists: "Λίστες"
+_charts:
+  federation: "Ομοσπονδία"
+_timelines:
+  home: "Κεντρικό"
+  local: "Τοπικό"
+  social: "Κοινωνικό"
+  global: "Παγκόσμιο"
+_pages:
+  viewPage: "Δείτε τις Σελίδες σας"
+  blocks:
+    image: "Εικόνες"
+_notification:
+  youGotMessagingMessageFromUser: "{name} σάς έστειλε ένα μήνυμα συνομιλίας"
+  youWereFollowed: "σε ακολούθησε"
+  _types:
+    follow: "Νέοι ακόλουθοι"
+    mention: "Επισήμανση"
+    renote: "Κοινοποίηση σημειώματος"
+    quote: "Παράθεση"
+    reaction: "Αντιδράσεις"
+  _actions:
+    reply: "Απάντηση"
+    renote: "Κοινοποίηση σημειώματος"
+_deck:
+  widgetsIntroduction: "Παρακαλούμε επιλέξτε \"Επεξεργασία μαραφετίων\" στο μενού και προσθέστε μαραφέτι."
+  _columns:
+    widgets: "Μαραφέτια"
+    notifications: "Ειδοποιήσεις"
+    tl: "Χρονολόγιο"
+    antenna: "Αντένες"
+    list: "Λίστα"
+    mentions: "Επισημάνσεις"

locales/en-US.yml

@@ -1,20 +1,20 @@
 ---
 _lang_: "English"
-headlineMisskey: "A network connected by notes"
+headlineMisskey: "An open source, decentralized social media platform that's free forever! 🚀"
-introMisskey: "Welcome! Misskey is an open source, decentralized microblogging service.\nCreate \"notes\" to share your thoughts with everyone around you. 📡\nWith \"reactions\", you can also quickly express your feelings about everyone's notes. 👍\nLet's explore a new world! 🚀"
+introMisskey: "Welcome! Calckey is an open source, decentralized social media platform that's free forever! 🚀"
 monthAndDay: "{month}/{day}"
 search: "Search"
 notifications: "Notifications"
 username: "Username"
 password: "Password"
 forgotPassword: "Forgot password"
-fetchingAsApObject: "Fetching from the Fediverse..."
+fetchingAsApObject: "Fetching from the Fediverse"
 ok: "OK"
 gotIt: "Got it!"
 cancel: "Cancel"
 enterUsername: "Enter username"
-renotedBy: "Renoted by {user}"
+renotedBy: "Boosted by {user}"
-noNotes: "No notes"
+noNotes: "No posts"
 noNotifications: "No notifications"
 instance: "Instance"
 settings: "Settings"
@@ -32,19 +32,20 @@ uploading: "Uploading..."
 save: "Save"
 users: "Users"
 addUser: "Add a user"
-favorite: "Add to favorites"
+addInstance: "Add an instance"
-favorites: "Favorites"
+favorite: "Add to bookmarks"
-unfavorite: "Remove from favorites"
+favorites: "Bookmarks"
-favorited: "Added to favorites."
+unfavorite: "Remove from bookmarks"
-alreadyFavorited: "Already added to favorites."
+favorited: "Added to bookmarks."
-cantFavorite: "Couldn't add to favorites."
+alreadyFavorited: "Already added to bookmarks."
+cantFavorite: "Couldn't add to bookmarks."
 pin: "Pin to profile"
 unpin: "Unpin from profile"
 copyContent: "Copy contents"
 copyLink: "Copy link"
 delete: "Delete"
 deleteAndEdit: "Delete and edit"
-deleteAndEditConfirm: "Are you sure you want to delete this note and edit it? You will lose all reactions, renotes and replies to it."
+deleteAndEditConfirm: "Are you sure you want to delete this post and edit it? You will lose all reactions, boosts and replies to it."
 addToList: "Add to list"
 sendMessage: "Send a message"
 copyUsername: "Copy username"
@@ -58,20 +59,20 @@ receiveFollowRequest: "Follow request received"
 followRequestAccepted: "Follow request accepted"
 mention: "Mention"
 mentions: "Mentions"
-directNotes: "Direct notes"
+directNotes: "Direct messages"
-importAndExport: "Import / Export"
+importAndExport: "Import/Export Data"
 import: "Import"
 export: "Export"
 files: "Files"
 download: "Download"
-driveFileDeleteConfirm: "Are you sure you want to delete the file \"{name}\"? Notes with this file attached will also be deleted."
+driveFileDeleteConfirm: "Are you sure you want to delete the file \"{name}\"? Posts with this file attached will also be deleted."
 unfollowConfirm: "Are you sure that you want to unfollow {name}?"
 exportRequested: "You've requested an export. This may take a while. It will be added to your Drive once completed."
 importRequested: "You've requested an import. This may take a while."
 lists: "Lists"
 noLists: "You don't have any lists"
-note: "Note"
+note: "Post"
-notes: "Notes"
+notes: "Posts"
 following: "Following"
 followers: "Followers"
 followsYou: "Follows you"
@@ -89,18 +90,18 @@ privacy: "Privacy"
 makeFollowManuallyApprove: "Follow requests require approval"
 defaultNoteVisibility: "Default visibility"
 follow: "Follow"
-followRequest: "Send follow request"
+followRequest: "Follow"
 followRequests: "Follow requests"
 unfollow: "Unfollow"
 followRequestPending: "Follow request pending"
 enterEmoji: "Enter an emoji"
-renote: "Renote"
+renote: "Boost"
-unrenote: "Take back renote"
+unrenote: "Take back boost"
-renoted: "Renoted."
+renoted: "Boosted."
-cantRenote: "This post can't be renoted."
+cantRenote: "This post can't be boosted."
-cantReRenote: "A renote can't be renoted."
+cantReRenote: "A boost can't be boosted."
 quote: "Quote"
-pinnedNote: "Pinned note"
+pinnedNote: "Pinned post"
 pinned: "Pin to profile"
 you: "You"
 clickToShow: "Click to show"
@@ -109,7 +110,7 @@ add: "Add"
 reaction: "Reactions"
 reactionSetting: "Reactions to show in the reaction picker"
 reactionSettingDescription2: "Drag to reorder, click to delete, press \"+\" to add."
-rememberNoteVisibility: "Remember note visibility settings"
+rememberNoteVisibility: "Remember post visibility settings"
 attachCancel: "Remove attachment"
 markAsSensitive: "Mark as NSFW"
 unmarkAsSensitive: "Unmark as NSFW"
@@ -134,21 +135,22 @@ emoji: "Emoji"
 emojis: "Emoji"
 emojiName: "Emoji name"
 emojiUrl: "Emoji URL"
-addEmoji: "Add an emoji"
+addEmoji: "Add"
 settingGuide: "Recommended settings"
 cacheRemoteFiles: "Cache remote files"
 cacheRemoteFilesDescription: "When this setting is disabled, remote files are loaded directly from the remote instance. Disabling this will decrease storage usage, but increase traffic, as thumbnails will not be generated."
 flagAsBot: "Mark this account as a bot"
-flagAsBotDescription: "Enable this option if this account is controlled by a program. If enabled, it will act as a flag for other developers to prevent endless interaction chains with other bots and adjust Misskey's internal systems to treat this account as a bot."
+flagAsBotDescription: "Enable this option if this account is controlled by a program. If enabled, it will act as a flag for other developers to prevent endless interaction chains with other bots and adjust Calckey's internal systems to treat this account as a bot."
-flagAsCat: "Mark this account as a cat"
+flagAsCat: "Are you a cat? 😺"
-flagAsCatDescription: "Enable this option to mark this account as a cat."
+flagAsCatDescription: "You'll get cat ears and speak like a cat!"
 flagShowTimelineReplies: "Show replies in timeline"
-flagShowTimelineRepliesDescription: "Shows replies of users to notes of other users in the timeline if turned on."
+flagShowTimelineRepliesDescription: "Shows replies of users to posts of other users in the timeline if turned on."
 autoAcceptFollowed: "Automatically approve follow requests from users you're following"
 addAccount: "Add account"
 loginFailed: "Failed to sign in"
 showOnRemote: "View on remote instance"
 general: "General"
+accountMoved: "User has moved to a new account:"
 wallpaper: "Wallpaper"
 setWallpaper: "Set wallpaper"
 removeWallpaper: "Remove wallpaper"
@@ -159,7 +161,8 @@ proxyAccount: "Proxy account"
 proxyAccountDescription: "A proxy account is an account that acts as a remote follower for users under certain conditions. For example, when a user adds a remote user to the list, the remote user's activity will not be delivered to the instance if no local user is following that user, so the proxy account will follow instead."
 host: "Host"
 selectUser: "Select a user"
-recipient: "Recipient"
+selectInstance: "Select an instance"
+recipient: "Recipient(s)"
 annotation: "Comments"
 federation: "Federation"
 instances: "Instances"
@@ -187,7 +190,7 @@ instanceInfo: "Instance Information"
 statistics: "Statistics"
 clearQueue: "Clear queue"
 clearQueueConfirmTitle: "Are you sure that you want to clear the queue?"
-clearQueueConfirmText: "Any undelivered notes remaining in the queue will not be federated. Usually this operation is not needed."
+clearQueueConfirmText: "Any undelivered posts remaining in the queue will not be federated. Usually this operation is not needed."
 clearCachedFiles: "Clear cache"
 clearCachedFilesConfirm: "Are you sure that you want to delete all cached remote files?"
 blockedInstances: "Blocked Instances"
@@ -196,10 +199,11 @@ muteAndBlock: "Mutes and Blocks"
 mutedUsers: "Muted users"
 blockedUsers: "Blocked users"
 noUsers: "There are no users"
+noInstances: "There are no instances"
 editProfile: "Edit profile"
-noteDeleteConfirm: "Are you sure you want to delete this note?"
+noteDeleteConfirm: "Are you sure you want to delete this post?"
-pinLimitExceeded: "You cannot pin any more notes"
+pinLimitExceeded: "You cannot pin any more posts"
-intro: "Installation of Misskey has been finished! Please create an admin user."
+intro: "Installation of Calckey has been finished! Please create an admin user."
 done: "Done"
 processing: "Processing..."
 preview: "Preview"
@@ -251,12 +255,13 @@ explore: "Explore"
 messageRead: "Read"
 noMoreHistory: "There is no further history"
 startMessaging: "Start a new chat"
+manageGroups: "Manage groups"
 nUsersRead: "read by {n}"
 agreeTo: "I agree to {0}"
 tos: "Terms of Service"
 start: "Begin"
 home: "Home"
-remoteUserCaution: "As this user is from a remote instance, the shown information may be incomplete."
+remoteUserCaution: "Information from remote users may be incomplete."
 activity: "Activity"
 images: "Images"
 birthday: "Birthday"
@@ -323,6 +328,7 @@ connectService: "Connect"
 disconnectService: "Disconnect"
 enableLocalTimeline: "Enable local timeline"
 enableGlobalTimeline: "Enable global timeline"
+enableRecommendedTimeline: "Enable recommended timeline"
 disablingTimelinesInfo: "Adminstrators and Moderators will always have access to all timelines, even if they are not enabled."
 registration: "Register"
 enableRegistration: "Enable new user registration"
@@ -339,7 +345,7 @@ pinnedUsersDescription: "List usernames separated by line breaks to be pinned in
 pinnedPages: "Pinned Pages"
 pinnedPagesDescription: "Enter the paths of the Pages you want to pin to the top page of this instance, separated by line breaks."
 pinnedClipId: "ID of the clip to pin"
-pinnedNotes: "Pinned notes"
+pinnedNotes: "Pinned posts"
 hcaptcha: "hCaptcha"
 enableHcaptcha: "Enable hCaptcha"
 hcaptchaSiteKey: "Site key"
@@ -356,14 +362,15 @@ antennaSource: "Antenna source"
 antennaKeywords: "Keywords to listen to"
 antennaExcludeKeywords: "Keywords to exclude"
 antennaKeywordsDescription: "Separate with spaces for an AND condition or with line breaks for an OR condition."
-notifyAntenna: "Notify about new notes"
+notifyAntenna: "Notify about new posts"
-withFileAntenna: "Only notes with files"
+withFileAntenna: "Only posts with files"
 enableServiceworker: "Enable Push-Notifications for your Browser"
 antennaUsersDescription: "List one username per line"
+antennaInstancesDescription: "List one instance host per line"
 caseSensitive: "Case sensitive"
 withReplies: "Include replies"
 connectedTo: "Following account(s) are connected"
-notesAndReplies: "Notes and replies"
+notesAndReplies: "Posts and replies"
 withFiles: "Including files"
 silence: "Silence"
 silenceConfirm: "Are you sure that you want to silence this user?"
@@ -378,7 +385,7 @@ exploreFediverse: "Explore the Fediverse"
 popularTags: "Popular tags"
 userList: "Lists"
 about: "About"
-aboutMisskey: "About Misskey"
+aboutMisskey: "About Calckey"
 administrator: "Administrator"
 token: "Token"
 twoStepAuthentication: "Two-factor authentication"
@@ -400,7 +407,7 @@ notFoundDescription: "No page corresponding to this URL could be found."
 uploadFolder: "Default folder for uploads"
 cacheClear: "Clear cache"
 markAsReadAllNotifications: "Mark all notifications as read"
-markAsReadAllUnreadNotes: "Mark all notes as read"
+markAsReadAllUnreadNotes: "Mark all posts as read"
 markAsReadAllTalkMessages: "Mark all messages as read"
 help: "Help"
 inputMessageHere: "Enter message here"
@@ -421,7 +428,7 @@ text: "Text"
 enable: "Enable"
 next: "Next"
 retype: "Enter again"
-noteOf: "Note by {user}"
+noteOf: "Post by {user}"
 inviteToGroup: "Invite to group"
 quoteAttached: "Quote"
 quoteQuestion: "Append as quote?"
@@ -479,8 +486,8 @@ accountSettings: "Account Settings"
 promotion: "Promoted"
 promote: "Promote"
 numberOfDays: "Number of days"
-hideThisNote: "Hide this note"
+hideThisNote: "Hide this post"
-showFeaturedNotesInTimeline: "Show featured notes in timelines"
+showFeaturedNotesInTimeline: "Show featured posts in timelines"
 objectStorage: "Object Storage"
 useObjectStorage: "Use object storage"
 objectStorageBaseUrl: "Base URL"
@@ -501,7 +508,7 @@ objectStorageSetPublicRead: "Set \"public-read\" on upload"
 serverLogs: "Server logs"
 deleteAll: "Delete all"
 showFixedPostForm: "Display the posting form at the top of the timeline"
-newNoteRecived: "There are new notes"
+newNoteRecived: "There are new posts"
 sounds: "Sounds"
 listen: "Listen"
 none: "None"
@@ -524,7 +531,7 @@ sort: "Sort"
 ascendingOrder: "Ascending"
 descendingOrder: "Descending"
 scratchpad: "Scratchpad"
-scratchpadDescription: "The Scratchpad provides an environment for AiScript experiments. You can write, execute, and check the results of it interacting with Misskey in it."
+scratchpadDescription: "The scratchpad provides an environment for AiScript experiments. You can write, execute, and check the results of it interacting with Calckey in it."
 output: "Output"
 script: "Script"
 disablePagesScript: "Disable AiScript on Pages"
@@ -545,8 +552,8 @@ addRelay: "Add Relay"
 inboxUrl: "Inbox URL"
 addedRelays: "Added Relays"
 serviceworkerInfo: "Must be enabled for push notifications."
-deletedNote: "Deleted note"
+deletedNote: "Deleted post"
-invisibleNote: "Invisible note"
+invisibleNote: "Invisible post"
 enableInfiniteScroll: "Automatically load more"
 visibility: "Visiblility"
 poll: "Poll"
@@ -580,7 +587,6 @@ tokenRequested: "Grant access to account"
 pluginTokenRequestedDescription: "This plugin will be able to use the permissions set here."
 notificationType: "Notification type"
 edit: "Edit"
-useStarForReactionFallback: "Use ★ as fallback if the reaction emoji is unknown"
 emailServer: "Email server"
 enableEmail: "Enable email distribution"
 emailConfigInfo: "Used to confirm your email during sign-up or if you forget your password"
@@ -624,7 +630,7 @@ sample: "Sample"
 abuseReports: "Reports"
 reportAbuse: "Report"
 reportAbuseOf: "Report {name}"
-fillAbuseReportDescription: "Please fill in details regarding this report. If it is about a specific note, please include its URL."
+fillAbuseReportDescription: "Please fill in details regarding this report. If it is about a specific post, please include its URL."
 abuseReported: "Your report has been sent. Thank you very much."
 reporter: "Reporter"
 reporteeOrigin: "Reportee Origin"
@@ -637,27 +643,27 @@ openInNewTab: "Open in new tab"
 openInSideView: "Open in side view"
 defaultNavigationBehaviour: "Default navigation behavior"
 editTheseSettingsMayBreakAccount: "Editing these settings may damage your account."
-instanceTicker: "Instance information of notes"
+instanceTicker: "Instance information of posts"
 waitingFor: "Waiting for {x}"
 random: "Random"
 system: "System"
-switchUi: "Switch UI"
+switchUi: "Layout"
 desktop: "Desktop"
 clip: "Clip"
 createNew: "Create new"
 optional: "Optional"
 createNewClip: "Create new clip"
 unclip: "Unclip"
-confirmToUnclipAlreadyClippedNote: "This note is already part of the \"{name}\" clip. Do you want to remove it from this clip instead?"
+confirmToUnclipAlreadyClippedNote: "This post is already part of the \"{name}\" clip. Do you want to remove it from this clip instead?"
 public: "Public"
-i18nInfo: "Misskey is being translated into various languages by volunteers. You can help at {link}."
+i18nInfo: "Calckey is being translated into various languages by volunteers. You can help at {link}."
 manageAccessTokens: "Manage access tokens"
 accountInfo: "Account Info"
-notesCount: "Number of notes"
+notesCount: "Number of posts"
 repliesCount: "Number of replies sent"
-renotesCount: "Number of renotes sent"
+renotesCount: "Number of boosts sent"
 repliedCount: "Number of replies received"
-renotedCount: "Number of renotes received"
+renotedCount: "Number of boosts received"
 followingCount: "Number of followed accounts"
 followersCount: "Number of followers"
 sentReactionsCount: "Number of sent reactions"
@@ -669,15 +675,15 @@ no: "No"
 driveFilesCount: "Number of Drive files"
 driveUsage: "Drive space usage"
 noCrawle: "Reject crawler indexing"
-noCrawleDescription: "Ask search engines to not index your profile page, notes, Pages, etc."
+noCrawleDescription: "Ask search engines to not index your profile page, posts, Pages, etc."
-lockedAccountInfo: "Unless you set your note visiblity to \"Followers only\", your notes will be visible to anyone, even if you require followers to be manually approved."
+lockedAccountInfo: "Unless you set your post visiblity to \"Followers only\", your posts will be visible to anyone, even if you require followers to be manually approved."
 alwaysMarkSensitive: "Mark as NSFW by default"
 loadRawImages: "Load original images instead of showing thumbnails"
 disableShowingAnimatedImages: "Don't play animated images"
 verificationEmailSent: "A verification email has been sent. Please follow the included link to complete verification."
 notSet: "Not set"
 emailVerified: "Email has been verified"
-noteFavoritesCount: "Number of favorite notes"
+noteFavoritesCount: "Number of bookmarked posts"
 pageLikesCount: "Number of liked Pages"
 pageLikedCount: "Number of received Page likes"
 contact: "Contact"
@@ -699,9 +705,9 @@ showTitlebar: "Show title bar"
 clearCache: "Clear cache"
 onlineUsersCount: "{n} users are online"
 nUsers: "{n} Users"
-nNotes: "{n} Notes"
+nNotes: "{n} Posts"
 sendErrorReports: "Send error reports"
-sendErrorReportsDescription: "When turned on, detailed error information will be shared with Misskey when a problem occurs, helping to improve the quality of Misskey.\nThis will include information such the version of your OS, what browser you're using, your activity in Misskey, etc."
+sendErrorReportsDescription: "When turned on, detailed error information will be shared with Calckey when a problem occurs, helping to improve the quality of Misskey.\nThis will include information such the version of your OS, what browser you're using, your activity in Calckey, etc."
 myTheme: "My theme"
 backgroundColor: "Background color"
 accentColor: "Accent color"
@@ -730,7 +736,7 @@ emailNotification: "Email notifications"
 publish: "Publish"
 inChannelSearch: "Search in channel"
 useReactionPickerForContextMenu: "Open reaction picker on right-click"
-typingUsers: "{users} is/are typing..."
+typingUsers: "{users} is typing"
 jumpToSpecifiedDate: "Jump to specific date"
 showingPastTimeline: "Currently displaying an old timeline"
 clear: "Return"
@@ -740,8 +746,8 @@ unlikeConfirm: "Really remove your like?"
 fullView: "Full view"
 quitFullView: "Exit full view"
 addDescription: "Add description"
-userPagePinTip: "You can display notes here by selecting \"Pin to profile\" from the menu of individual notes."
+userPagePinTip: "You can display posts here by selecting \"Pin to profile\" from the menu of individual posts."
-notSpecifiedMentionWarning: "This note contains mentions of users not included as recipients"
+notSpecifiedMentionWarning: "This post contains mentions of users not included as recipients"
 info: "About"
 userInfo: "User information"
 unknown: "Unknown"
@@ -768,9 +774,9 @@ noBotProtectionWarning: "Bot protection is not configured."
 configure: "Configure"
 postToGallery: "Create new gallery post"
 gallery: "Gallery"
-recentPosts: "Recent posts"
+recentPosts: "Recent pages"
-popularPosts: "Popular posts"
+popularPosts: "Popular pages"
-shareWithNote: "Share with note"
+shareWithNote: "Share with post"
 ads: "Advertisements"
 expiration: "Deadline"
 memo: "Memo"
@@ -780,11 +786,20 @@ middle: "Medium"
 low: "Low"
 emailNotConfiguredWarning: "Email address not set."
 ratio: "Ratio"
+secureMode: "Secure Mode (Authorized Fetch)"
+instanceSecurity: "Instance Security"
+secureModeInfo: "When requesting from other instances, do not send back without proof."
+privateMode: "Private Mode"
+privateModeInfo: "When enabled, only whitelisted instances can federate with your instances. All posts will be hidden from the public."
+allowedInstances: "Whitelisted Instances"
+allowedInstancesDescription: "Hosts of instances to be whitelisted for federation, each seperated by a new line (only applies in private mode)."
 previewNoteText: "Show preview"
 customCss: "Custom CSS"
 customCssWarn: "This setting should only be used if you know what it does. Entering improper values may cause the client to stop functioning normally."
 global: "Global"
+recommended: "Recommended"
 squareAvatars: "Display squared avatars"
+seperateRenoteQuote: "Seperate boost and quote buttons"
 sent: "Sent"
 received: "Received"
 searchResult: "Search results"
@@ -792,19 +807,20 @@ hashtags: "Hashtags"
 troubleshooting: "Troubleshooting"
 useBlurEffect: "Use blur effects in the UI"
 learnMore: "Learn more"
-misskeyUpdated: "Misskey has been updated!"
+misskeyUpdated: "Calckey has been updated!"
 whatIsNew: "Show changes"
 translate: "Translate"
 translatedFrom: "Translated from {x}"
 accountDeletionInProgress: "Account deletion is currently in progress"
 usernameInfo: "A name that identifies your account from others on this server.  You can use the alphabet (a~z, A~Z), digits (0~9) or underscores (_). Usernames cannot be changed later."
-aiChanMode: "Ai Mode"
+aiChanMode: "Ai-chan in Classic UI"
 keepCw: "Keep content warnings"
 pubSub: "Pub/Sub Accounts"
 lastCommunication: "Last communication"
 resolved: "Resolved"
 unresolved: "Unresolved"
 breakFollow: "Remove follower"
+breakFollowConfirm: "Are you sure want to remove follower?"
 itsOn: "Enabled"
 itsOff: "Disabled"
 emailRequiredForSignup: "Require email address for sign-up"
@@ -856,7 +872,6 @@ recentNHours: "Last {n} hours"
 recentNDays: "Last {n} days"
 noEmailServerWarning: "Email server not configured."
 thereIsUnresolvedAbuseReportWarning: "There are unsolved reports."
-recommended: "Recommended"
 check: "Check"
 driveCapOverrideLabel: "Change the drive capacity for this user"
 driveCapOverrideCaption: "Reset the capacity to default by inputting a value of 0 or lower."
@@ -893,6 +908,34 @@ navbar: "Navigation bar"
 shuffle: "Shuffle"
 account: "Account"
 move: "Move"
+showAds: "Show ads"
+enterSendsMessage: "Press Return in Messaging to send message (off is Ctrl + Return)"
+adminCustomCssWarn: "This setting should only be used if you know what it does. Entering improper values may cause EVERYONE'S clients to stop functioning normally. Please ensure your CSS works properly by testing it in your user settings."
+customMOTD: "Custom MOTD (splash screen messages)"
+customMOTDDescription: "Custom messages for the MOTD (splash screen) separated by line breaks to be shown randomly every time a user loads/reloads the page."
+customSplashIcons: "Custom splash screen icons (urls)"
+customSplashIconsDescription: "URLs for custom splash screen icons separated by line breaks to be shown randomly every time a user loads/reloads the page. Please make sure the images are on a static URL, preferably all resized to 192x192."
+showUpdates: "Show a popup when Calckey updates"
+recommendedInstances: "Recommended instances"
+recommendedInstancesDescription: "Recommended instances seperated by line breaks to appear in the recommended timeline. Do NOT add `https://`, ONLY the domain."
+caption: "Auto Caption"
+splash: "Splash Screen"
+updateAvailable: "There might be an update available!"
+swipeOnDesktop: "Allow mobile-style swiping on desktop"
+logoImageUrl: "Logo image URL"
+showAdminUpdates: "Indicate a new Calckey version is avaliable (admin only)"
+replayTutorial: "Replay tutorial"
+migration: "Migration"
+moveTo: "Move current account to new account"
+moveToLabel: "Account you're moving to:"
+moveAccount: "Move account!"
+moveAccountDescription: "This process is irreversible. Make sure you've set up an alias for this account on your new account before moving. Please enter the tag of the account formatted like @person@instance.com"
+moveFrom: "Move to this account from an older account"
+moveFromLabel: "Account you're moving from:"
+moveFromDescription: "This will set an alias of your old account so that you can move from that account to this current one. Do this BEFORE moving from your older account. Please enter the tag of the account formatted like @person@instance.com"
+migrationConfirm: "Are you absolutely sure you want to migrate your acccount to {account}? Once you do this, you won't be able to reverse it, and you won't be able to use your account normally again.\nAlso, please ensure that you've set this current account as the account you're moving from."
+defaultReaction: "Default emoji reaction for outgoing and incoming posts"
+
 _sensitiveMediaDetection:
   description: "Reduces the effort of server moderation through automatically recognizing NSFW media via Machine Learning. This will slightly increase the load on the server."
   sensitivity: "Detection sensitivity"
@@ -968,22 +1011,22 @@ _registry:
   domain: "Domain"
   createKey: "Create key"
 _aboutMisskey:
-  about: "Misskey is open-source software being developed by syuilo since 2014."
+  about: "Calckey is a fork of Misskey made by ThatOneCalculator, which has been in development since 2022."
   contributors: "Main contributors"
   allContributors: "All contributors"
   source: "Source code"
-  translation: "Translate Misskey"
+  translation: "Translate Calckey"
-  donate: "Donate to Misskey"
+  donate: "Donate to Calckey"
   morePatrons: "We also appreciate the support of many other helpers not listed here. Thank you! 🥰"
-  patrons: "Patrons"
+  patrons: "Calckey patrons"
 _nsfw:
   respect: "Hide NSFW media"
   ignore: "Don't hide NSFW media"
   force: "Hide all media"
 _mfm:
   cheatSheet: "MFM Cheatsheet"
-  intro: "MFM is a Misskey-exclusive markup language that can be used in many places. Here you can view a list of all available MFM syntax."
+  intro: "MFM is a markup language used on Misskey, Calckey, Akkoma, and more that can be used in many places. Here you can view a list of all available MFM syntax."
-  dummy: "Misskey expands the world of the Fediverse"
+  dummy: "Calckey expands the world of the Fediverse"
   mention: "Mention"
   mentionDescription: "You can specify a user by using an At-Symbol and a username."
   hashtag: "Hashtag"
@@ -1054,6 +1097,7 @@ _serverDisconnectedBehavior:
   reload: "Automatically reload"
   dialog: "Show warning dialog"
   quiet: "Show unobtrusive warning"
+  nothing: "Do nothing"
 _channel:
   create: "Create channel"
   edit: "Edit channel"
@@ -1063,7 +1107,10 @@ _channel:
   owned: "Owned"
   following: "Followed"
   usersCount: "{n} Participants"
-  notesCount: "{n} Notes"
+  notesCount: "{n} Posts"
+_messaging:
+  dms: "Private"
+  groups: "Groups"
 _menuDisplay:
   sideFull: "Side"
   sideIcon: "Side (Icons)"
@@ -1073,15 +1120,15 @@ _wordMute:
   muteWords: "Muted words"
   muteWordsDescription: "Separate with spaces for an AND condition or with line breaks for an OR condition."
   muteWordsDescription2: "Surround keywords with slashes to use regular expressions."
-  softDescription: "Hide notes that fulfil the set conditions from the timeline."
+  softDescription: "Hide posts that fulfil the set conditions from the timeline."
-  hardDescription: "Prevents notes fulfilling the set conditions from being added to the timeline. In addition, these notes will not be added to the timeline even if the conditions are changed."
+  hardDescription: "Prevents posts fulfilling the set conditions from being added to the timeline. In addition, these posts will not be added to the timeline even if the conditions are changed."
   soft: "Soft"
   hard: "Hard"
-  mutedNotes: "Muted notes"
+  mutedNotes: "Muted posts"
 _instanceMute:
-  instanceMuteDescription: "This will mute any notes/renotes from the listed instances, including those of users replying to a user from a muted instance."
+  instanceMuteDescription: "This will mute any posts/boosts from the listed instances, including those of users replying to a user from a muted instance."
   instanceMuteDescription2: "Separate with newlines"
-  title: "Hides notes from listed instances."
+  title: "Hides posts from listed instances."
   heading: "List of instances to be muted"
 _theme:
   explore: "Explore Themes"
@@ -1131,7 +1178,7 @@ _theme:
     hashtag: "Hashtag"
     mention: "Mention"
     mentionMe: "Mentions (Me)"
-    renote: "Renote"
+    renote: "Boost"
     modalBg: "Modal background"
     divider: "Divider"
     scrollbarHandle: "Scrollbar handle"
@@ -1158,8 +1205,8 @@ _theme:
     accentLighten: "Accent (Lightened)"
     fgHighlighted: "Highlighted Text"
 _sfx:
-  note: "New note"
+  note: "New post"
-  noteMy: "Own note"
+  noteMy: "Own post"
   notification: "Notifications"
   chat: "Chat"
   chatBg: "Chat (Background)"
@@ -1181,28 +1228,26 @@ _time:
   hour: "Hour(s)"
   day: "Day(s)"
 _tutorial:
-  title: "How to use Misskey"
+  title: "How to use Calckey"
   step1_1: "Welcome!"
-  step1_2: "This page is called the \"timeline\". It shows chronologically ordered \"notes\" of people who you \"follow\"."
+  step1_2: "Let's get you set up. You'll be up and running in no time!"
-  step1_3: "Your timeline is currently empty, since you have not posted any notes or followed anyone yet."
+  step2_1: "First, please fill out your profile."
-  step2_1: "Let's finish setting up your profile before writing a note or following anyone."
+  step2_2: "Providing some information about who you are will make it easier for others to tell if they want to see your posts or follow you."
-  step2_2: "Providing some information about who you are will make it easier for others to tell if they want to see your notes or follow you."
+  step3_1: "Now time to follow some people!"
-  step3_1: "Finished setting up your profile?"
+  step3_2: "Your home and social timelines are based off of who you follow, so try following a couple accounts to get started.\nClick the plus circle on the top right of a profile to follow them."
-  step3_2: "Then let's try posting a note next. You can do so by pressing the button with a pencil icon on the screen."
+  step4_1: "Let's get you out there."
-  step3_3: "Fill in the modal and press the button on the top right to post."
+  step4_2: "For your first post, some people like to made a {introduction} post or a simple \"Hello world!\""
-  step3_4: "Have nothing to say? Try \"just setting up my msky\"!"
+  step5_1: "Timelines, timelines everywhere!"
-  step4_1: "Finished posting your first note?"
+  step5_2: "Your instance has {timelines} different timelines enabled."
-  step4_2: "Hurray! Now your first note should be displayed on your timeline."
+  step5_3: "The Home {icon} timeline is where you can see posts from your followers."
-  step5_1: "Now, let's try making your timeline more lively by following other people."
+  step5_4: "The Local {icon} timeline is where you can see posts from everyone else on this instance."
-  step5_2: "{featured} will show you popular notes in this instance. {explore} will let you find popular users. Try finding people you'd like to follow there!"
+  step5_5: "The Recommended {icon} timeline is where you can see posts from instances the admins recommend."
-  step5_3: "To follow other users, click on their icon and press the \"Follow\" button on their profile."
+  step5_6: "The Social {icon} timeline is your home + local."
-  step5_4: "If the other user has a lock icon next to their name, it may take some time for that user to manually approve your follow request."
+  step5_7: "The Global {icon} timeline is where you can see posts from every other connected instance."
-  step6_1: "You should be able to see other users' notes on your timeline now."
+  step6_1: "So, what is this place?"
-  step6_2: "You can also put \"reactions\" on other people's notes to quickly respond to them."
+  step6_2: "Well, you didn't just join Calckey. You joined a portal to the Fediverse, an interconnected network of thousands of servers, called \"instances\"."
-  step6_3: "To attach a \"reaction\", press the \"+\" mark on another user's note and choose an emoji you'd like to react with."
+  step6_3: "Each server works in different ways, and not all servers run Calckey. This one does though! It's a bit complicated, but you'll get the hang of it in no time."
-  step7_1: "Congratulations! You have now finished Misskey's basic tutorial."
+  step6_4: "Now go, explore, and have fun!"
-  step7_2: "If you would like to learn more about Misskey, try the {help} section."
-  step7_3: "Now then, good luck and have fun with Misskey! 🚀"
 _2fa:
   alreadyRegistered: "You have already registered a 2-factor authentication device."
   registerDevice: "Register a new device"
@@ -1220,24 +1265,24 @@ _permissions:
   "write:blocks": "Edit your list of blocked users"
   "read:drive": "Access your Drive files and folders"
   "write:drive": "Edit or delete your Drive files and folders"
-  "read:favorites": "View your list of favorites"
+  "read:favorites": "View your list of bookmarks"
-  "write:favorites": "Edit your list of favorites"
+  "write:favorites": "Edit your list of bookmarks"
   "read:following": "View information on who you follow"
   "write:following": "Follow or unfollow other accounts"
   "read:messaging": "View your chats"
   "write:messaging": "Compose or delete chat messages"
   "read:mutes": "View your list of muted users"
   "write:mutes": "Edit your list of muted users"
-  "write:notes": "Compose or delete notes"
+  "write:notes": "Compose or delete posts"
   "read:notifications": "View your notifications"
   "write:notifications": "Manage your notifications"
   "read:reactions": "View your reactions"
   "write:reactions": "Edit your reactions"
   "write:votes": "Vote on a poll"
-  "read:pages": "View your pages"
+  "read:pages": "View your page"
-  "write:pages": "Edit or delete your pages"
+  "write:pages": "Edit or delete your page"
-  "read:page-likes": "View your likes on pages"
+  "read:page-likes": "View your likes on page"
-  "write:page-likes": "Edit your likes on pages"
+  "write:page-likes": "Edit your likes on page"
   "read:user-groups": "View your user groups"
   "write:user-groups": "Edit or delete your user groups"
   "read:channels": "View your channels"
@@ -1253,12 +1298,14 @@ _auth:
   pleaseGoBack: "Please go back to the application"
   callback: "Returning to the application"
   denied: "Access denied"
+  copyAsk: "Please paste the following authorization code to the application"
 _antennaSources:
-  all: "All notes"
+  all: "All posts"
-  homeTimeline: "Notes from followed users"
+  homeTimeline: "Posts from followed users"
-  users: "Notes from specific users"
+  users: "Posts from specific users"
-  userList: "Notes from a specified list of users"
+  userList: "Posts from a specified list of users"
-  userGroup: "Notes from users in a specified group"
+  userGroup: "Posts from users in a specified group"
+  instances: "Posts from all users on an instance"
 _weekday:
   sunday: "Sunday"
   monday: "Monday"
@@ -1289,7 +1336,9 @@ _widgets:
   jobQueue: "Job Queue"
   serverMetric: "Server metrics"
   aiscript: "AiScript console"
-  aichan: "Ai"
+  userList: "User list"
+  _userList:
+    chooseList: "Select a list"
 _cw:
   hide: "Hide"
   show: "Show content"
@@ -1319,7 +1368,7 @@ _poll:
   remainingSeconds: "{s} second(s) remaining"
 _visibility:
   public: "Public"
-  publicDescription: "Your note will be visible for all users"
+  publicDescription: "Your post will be visible for all users"
   home: "Home"
   homeDescription: "Post to home timeline only"
   followers: "Followers"
@@ -1329,8 +1378,8 @@ _visibility:
   localOnly: "Local only"
   localOnlyDescription: "Not visible to remote users"
 _postForm:
-  replyPlaceholder: "Reply to this note..."
+  replyPlaceholder: "Reply to this post..."
-  quotePlaceholder: "Quote this note..."
+  quotePlaceholder: "Quote this post..."
   channelPlaceholder: "Post to a channel..."
   _placeholders:
     a: "What are you up to?"
@@ -1352,7 +1401,7 @@ _profile:
   changeAvatar: "Change avatar"
   changeBanner: "Change banner"
 _exportOrImport:
-  allNotes: "All notes"
+  allNotes: "All posts"
   followingList: "Followed users"
   muteList: "Muted users"
   blockingList: "Blocked users"
@@ -1365,10 +1414,10 @@ _charts:
   usersIncDec: "Difference in the number of users"
   usersTotal: "Total number of users"
   activeUsers: "Active users"
-  notesIncDec: "Difference in the number of notes"
+  notesIncDec: "Difference in the number of posts"
-  localNotesIncDec: "Difference in the number of local notes"
+  localNotesIncDec: "Difference in the number of local posts"
-  remoteNotesIncDec: "Difference in the number of remote notes"
+  remoteNotesIncDec: "Difference in the number of remote posts"
-  notesTotal: "Total number of notes"
+  notesTotal: "Total number of posts"
   filesIncDec: "Difference in the number of files"
   filesTotal: "Total number of files"
   storageUsageIncDec: "Difference in storage usage"
@@ -1377,8 +1426,8 @@ _instanceCharts:
   requests: "Requests"
   users: "Difference in the number of users"
   usersTotal: "Cumulative number of users"
-  notes: "Difference in the number of notes"
+  notes: "Difference in the number of posts"
-  notesTotal: "Cumulative number of notes"
+  notesTotal: "Cumulative number of posts"
   ff: "Difference in the number of followed users / followers "
   ffTotal: "Cumulative number of followed users / followers"
   cacheSize: "Difference in cache size"
@@ -1388,6 +1437,7 @@ _instanceCharts:
 _timelines:
   home: "Home"
   local: "Local"
+  recommended: "Recommended"
   social: "Social"
   global: "Global"
 _pages:
@@ -1410,7 +1460,7 @@ _pages:
   liked: "Liked Pages"
   featured: "Popular"
   inspector: "Inspector"
-  contents: "Contents"
+  contents: "Content"
   content: "Page block"
   variables: "Variables"
   title: "Title"
@@ -1464,10 +1514,10 @@ _pages:
       id: "Canvas ID"
       width: "Width"
       height: "Height"
-    note: "Embedded note"
+    note: "Embedded post"
     _note:
-      id: "Note ID"
+      id: "Post ID"
-      idDescription: "You can alternatively paste the note URL here."
+      idDescription: "You can alternatively paste the post URL here."
       detailed: "Detailed view"
     switch: "Switch"
     _switch:
@@ -1688,7 +1738,7 @@ _notification:
   youGotMention: "{name} mentioned you"
   youGotReply: "{name} replied to you"
   youGotQuote: "{name} quoted you"
-  youRenoted: "Renote from {name}"
+  youRenoted: "Boost from {name}"
   youGotPoll: "{name} voted on your poll"
   youGotMessagingMessageFromUser: "{name} sent you a chat message"
   youGotMessagingMessageFromGroup: "A chat message was sent to the {name} group"
@@ -1703,7 +1753,7 @@ _notification:
     follow: "New followers"
     mention: "Mentions"
     reply: "Replies"
-    renote: "Renotes"
+    renote: "Boosts"
     quote: "Quotes"
     reaction: "Reactions"
     pollVote: "Votes on polls"
@@ -1715,7 +1765,7 @@ _notification:
   _actions:
     followBack: "followed you back"
     reply: "Reply"
-    renote: "Renote"
+    renote: "Boosts"
 _deck:
   alwaysShowMainColumn: "Always show main column"
   columnAlign: "Align columns"
@@ -1741,4 +1791,21 @@ _deck:
     antenna: "Antennas"
     list: "List"
     mentions: "Mentions"
-    direct: "Direct notes"
+    direct: "Direct messages"
+_apps:
+  apps: "Apps"
+  crossPlatform: "Cross platform"
+  mobile: "Mobile"
+  firstParty: "First party"
+  firstClass: "First class"
+  secondClass: "Second class"
+  thirdClass: "Third class"
+  free: "Free"
+  paid: "Paid"
+  pwa: "Install PWA"
+  kaiteki: "Kaiteki"
+  milktea: "Milktea"
+  subwayTooter: "Subway Tooter"
+  kimis: "Kimis"
+  theDesk: "TheDesk"
+  lesskey: "Lesskey"

locales/es-ES.yml

@@ -8,7 +8,7 @@ notifications: "Notificaciones"
 username: "Nombre de usuario"
 password: "Contraseña"
 forgotPassword: "Olvidé mi Contraseña"
-fetchingAsApObject: "Recuperando desde el Fediverso..."
+fetchingAsApObject: "Recuperando desde el Fediverso"
 ok: "OK"
 gotIt: "¡Lo tengo!"
 cancel: "Cancelar"
@@ -580,7 +580,6 @@ tokenRequested: "Permiso de acceso a la cuenta"
 pluginTokenRequestedDescription: "Este plugin podrá usar los permisos descritos aquí"
 notificationType: "Tipo de notificación"
 edit: "Editar"
-useStarForReactionFallback: "En caso de que los emojis de reacciones no sean claros, usar en su lugar una estrella"
 emailServer: "Servidor de correo"
 enableEmail: "Activar el envío de correos electrónicos"
 emailConfigInfo: "Usar en caso de validación de correo electrónico y pedido de contraseña"
@@ -650,7 +649,7 @@ createNewClip: "Crear clip nuevo"
 unclip: "Quitar clip"
 confirmToUnclipAlreadyClippedNote: "Esta nota ya está incluida en el clip \"{name}\". ¿Quiere quitar la nota del clip?"
 public: "Público"
-i18nInfo: "Misskey está siendo traducido a varios idiomas gracias a voluntarios. Se puede colaborar traduciendo en {link}"
+i18nInfo: "Calckey está siendo traducido a varios idiomas gracias a voluntarios. Se puede colaborar traduciendo en {link}"
 manageAccessTokens: "Administrar tokens de acceso"
 accountInfo: "Información de la Cuenta"
 notesCount: "Cantidad de notas"
@@ -1181,28 +1180,26 @@ _time:
   hour: "Horas"
   day: "Días"
 _tutorial:
-  title: "Cómo usar Misskey"
+  title: "Cómo usar Calckey"
-  step1_1: "Bienvenido"
+  step1_1: "¡Bienvenido!"
-  step1_2: "Esta imagen se llama \"Linea de tiempo\" y muestra en orden cronológico las \"notas\" tuyas y de la gente que \"sigues\""
+  step1_2: "Vamos a configurarte. Estarás listo y funcionando en poco tiempo"
-  step1_3: "Si no estás escribiendo ninguna nota y no estás siguiendo a nadie, es esperable que no se muestre nada en la linea de tiempo"
+  step2_1: "En primer lugar, rellena tu perfil"
-  step2_1: "Antes de crear notas y seguir a alguien, primero vamos a crear tu perfil"
+  step2_2: "Proporcionar algo de información sobre quién eres hará que sea más fácil para los demás saber si quieren ver tus notas o seguirte."
-  step2_2: "Si provees información sobre quien eres, será más fácil para que otros usuarios te sigan"
+  step3_1: "¡Ahora es el momento de seguir a algunas personas!"
-  step3_1: "¿Has podido crear tu perfil sin problemas?"
+  step3_2: "Tu página de inicio y tus líneas de tiempo sociales se basan en quién sigues, así que intenta seguir un par de cuentas para empezar.\nHaz clic en el círculo más en la parte superior derecha de un perfil para seguirlos."
-  step3_2: "Con esto, prueba hacer una nota. Aprieta el botón con forma de lápiz que está arriba de la imagen y abre el formulario."
+  step4_1: "Vamos a salir a la calle"
-  step3_3: "Si has escrito el contenido, aprieta el botón que está arriba a la derecha del formulario para postear."
+  step4_2: "Para tu primer post, a algunas personas les gusta hacer un post de {introduction} o un simple \"¡Hola mundo!\""
-  step3_4: "¿No se te ocurre un contenido? Prueba con decir \"Empecé a usar Misskey\""
+  step5_1: "¡Líneas de tiempo, líneas de tiempo por todas partes!"
-  step4_1: "¿Has posteado?"
+  step5_2: "Su instancia tiene {timelines} diferentes líneas de tiempo habilitadas"
-  step4_2: "Si tu nota puede verse en la linea de tiempo, fue todo un éxito."
+  step5_3: "La línea de tiempo Inicio {icon} es donde puedes ver las publicaciones de tus seguidores."
-  step5_1: "Luego, ponte a seguir a otra gente y haz que tu linea de tiempo esté más animada."
+  step5_4: "La línea de tiempo Local {icon} es donde puedes ver las publicaciones de todos los demás en esta instancia."
-  step5_2: "Puedes ver las notas destacadas en {featured} y desde allí seguir a usuarios que te importan. También puedes buscar usuario destacados en {explore}."
+  step5_5: "La línea de tiempo {icon} recomendada es donde puedes ver las publicaciones de las instancias que los administradores recomiendan."
-  step5_3: "Para seguir a un usuario, haz click en su avatar para ver su página de usuario y allí apretar el botón \"seguir\""
+  step5_6: "La línea de tiempo Social {icon} es donde puedes ver las publicaciones de los amigos de tus seguidores."
-  step5_4: "De esa manera, puede pasar un tiempo hasta que el usuario apruebe al seguidor."
+  step5_7: "La línea de tiempo Global {icon} es donde puedes ver las publicaciones de todas las demás instancias conectadas."
-  step6_1: "Si puedes ver en la linea de tiempo las notas de otros usuarios, fue todo un éxito."
+  step6_1: "Entonces, ¿qué es este lugar?"
-  step6_2: "En las notas de otros usuarios puedes añadir una \"reacción\", para poder responder rápidamente."
+  step6_2: "Bueno, no sólo te has unido a Calckey. Te has unido a un portal del Fediverso, una red interconectada de miles de servidores, llamada \"instancias\""
-  step6_3: "Para añadir una reacción, haz click en el botón \"+\" de la nota y elige la reacción que prefieras."
+  step6_3: "Cada servidor funciona de forma diferente, y no todos los servidores ejecutan Calckey. Sin embargo, ¡éste lo hace! Es un poco complicado, pero le cogerás el tranquillo enseguida"
-  step7_1: "Así terminó la explicación del funcionamiento básico de Misskey. Eso fue todo."
+  step6_4: "¡Ahora ve, explora y diviértete!"
-  step7_2: "Si quieres conocer más sobre Misskey, prueba con la sección {help}."
-  step7_3: "Así, disfruta de Misskey 🚀"
 _2fa:
   alreadyRegistered: "Ya has completado la configuración."
   registerDevice: "Registrar dispositivo"

locales/fr-FR.yml

@@ -8,7 +8,7 @@ notifications: "Notifications"
 username: "Nom d’utilisateur·rice"
 password: "Mot de passe"
 forgotPassword: "Mot de passe oublié"
-fetchingAsApObject: "Récupération depuis le fédiverse …"
+fetchingAsApObject: "Récupération depuis le fédiverse"
 ok: "OK"
 gotIt: "J’ai compris !"
 cancel: "Annuler"
@@ -567,14 +567,13 @@ large: "Grand"
 medium: "Moyen"
 small: "Petit"
 generateAccessToken: "Générer un jeton d'accès"
-permission: "Autorisations "
+permission: "Autorisations"
 enableAll: "Tout activer"
 disableAll: "Tout désactiver"
 tokenRequested: "Autoriser l'accès au compte"
 pluginTokenRequestedDescription: "Ce plugin pourra utiliser les autorisations définies ici."
 notificationType: "Type de notifications"
 edit: "Editer"
-useStarForReactionFallback: "Utiliser ★ comme alternative si l’émoji de réaction est inconnu"
 emailServer: "Serveur mail"
 enableEmail: "Activer la distribution de courriel"
 emailConfigInfo: "Utilisé pour confirmer votre adresse de courriel et la réinitialisation de votre mot de passe en cas d’oubli."
@@ -640,7 +639,7 @@ createNew: "Créer nouveau"
 optional: "Facultatif"
 createNewClip: "Créer un nouveau clip"
 public: "Public"
-i18nInfo: "Misskey est traduit dans différentes langues par des bénévoles. Vous pouvez contribuer à {link}."
+i18nInfo: "Calckey est traduit dans différentes langues par des bénévoles. Vous pouvez contribuer à {link}."
 manageAccessTokens: "Gérer les jetons d'accès"
 accountInfo: " Informations du compte "
 notesCount: "Nombre de notes"
@@ -1103,28 +1102,26 @@ _time:
   hour: "h"
   day: "j"
 _tutorial:
-  title: "Comment utiliser Misskey"
+  title: "Comment utiliser Calckey"
-  step1_1: "Bienvenue,"
+  step1_1 : "Bienvenue!"
-  step1_2: "Cette page est appelée « un fil ». Elle affiche les « notes » des personnes auxquelles vous êtes abonné dans un ordre chronologique."
+  step1_2 : "On va vous installer. Vous serez opérationnel en un rien de temps"
-  step1_3: "Votre fil est actuellement vide vu que vous ne suivez aucun compte et que vous n’avez publié aucune note, pour l’instant."
+  step2_1 : "Tout d'abord, remplissez votre profil"
-  step2_1: "Procédons d’abord à la préparation de votre profil avant d’écrire une note et/ou de vous abonner à un compte."
+  step2_2 : "En fournissant quelques informations sur qui vous êtes, il sera plus facile pour les autres de savoir s'ils veulent voir vos notes ou vous suivre."
-  step2_2: "En fournissant quelques informations sur vous, il sera plus facile pour les autres de s’abonner à votre compte."
+  step3_1 : "Maintenant il est temps de suivre des gens !"
-  step3_1: "Vous avez fini de créer votre profil ?"
+  step3_2 : "Votre page d'accueil et vos timelines sociales sont basées sur les personnes que vous suivez, alors essayez de suivre quelques comptes pour commencer.\nCliquez sur le cercle plus en haut à droite d'un profil pour le suivre."
-  step3_2: "L’étape suivante consiste à créer une note. Vous pouvez commencer en cliquant sur l’icône crayon sur l’écran."
+  step4_1 : "On y va."
-  step3_3: "Remplissez le cadran et cliquez sur le bouton en haut à droite pour envoyer."
+  step4_2 : "Pour votre premier post, certaines personnes aiment faire un post {introduction} ou un simple post 'Hello world'."
-  step3_4: "Vous n’avez rien à dire ? Essayez d’écrire « J’ai commencé à utiliser Misskey »."
+  step5_1 : "Lignes de temps, lignes de temps partout !"
-  step4_1: "Avez-vous publié votre première note ?"
+  step5_2 : "Votre instance a {timelines} différentes chronologies activées !"
-  step4_2: "Youpi ! Celle-ci est maintenant affichée sur votre fil d’actualité."
+  step5_3 : "La timeline Home {icon} est l'endroit où vous pouvez voir les publications de vos followers."
-  step5_1: "Maintenant, essayons de nous abonner à d’autres personnes afin de rendre votre fil plus vivant."
+  step5_4 : "La timeline locale {icon} est l'endroit où vous pouvez voir les messages de tout le monde sur cette instance."
-  step5_2: "La page {featured} affiche les notes en tendance sur la présente instance et {explore} vous permet de trouver des utilisateur·rice·s en tendance. Essayez de vous abonner aux gens que vous aimez !"
+  step5_5 : "La timeline {icon} recommandée est l'endroit où vous pouvez voir les messages des instances que les administrateurs recommandent."
-  step5_3: "Pour pouvoir suivre d’autres utilisateur·rice, cliquez sur leur avatar afin d’afficher la page du profil utilisateur ensuite appuyez sur le bouton « S’abonner »."
+  step5_6 : "La timeline {icon} sociale est l'endroit où vous pouvez voir les publications des amis de vos followers."
-  step5_4: "Si l’autre utilisateur possède une icône sous forme d’un cadenas à côté de son nom, il devra accepter votre demande d’abonnement manuellement."
+  step5_7 : "La timeline globale {icon} est l'endroit où vous pouvez voir les messages de toutes les autres instances connectées."
-  step6_1: "Maintenant, vous êtes en mesure de voir s’afficher les notes des autres utilisateur·rice·s sur votre propre fil."
+  step6_1 : "Alors quel est cet endroit ?"
-  step6_2: "Vous avez également la possibilité d’intéragir rapidement avec les notes des autres utilisateur·rice·s en ajoutant des « réactions »."
+  step6_2 : "Eh bien, vous ne venez pas de rejoindre Calckey. Vous avez rejoint un portail vers le Fediverse, un réseau interconnecté de milliers de serveurs, appelés \"instances\"."
-  step6_3: "Pour ajouter une réaction à une note, cliquez sur le signe « + » de celle-ci et sélectionnez l’émoji souhaité."
+  step6_3 : "Chaque serveur fonctionne différemment, et tous les serveurs n'utilisent pas Calckey. Cependant, celui-ci le fait ! C'est un peu délicat, mais vous aurez le coup de main en un rien de temps."
-  step7_1: "Félicitations ! Vous avez atteint la fin du tutoriel de base pour l’utilisation de Misskey."
+  step6_4 : "Maintenant, allez-y, explorez et amusez-vous !"
-  step7_2: "Si vous désirez en savoir plus sur Misskey, jetez un œil sur la section {help}."
-  step7_3: "Bon courage et amusez-vous bien sur Misskey ! 🚀"
 _2fa:
   alreadyRegistered: "Configuration déjà achevée."
   registerDevice: "Ajouter un nouvel appareil"

locales/hr-HR.yml

@@ -1 +0,0 @@
----

locales/ht-HT.yml

@@ -1 +0,0 @@
----

locales/id-ID.yml

@@ -8,7 +8,7 @@ notifications: "Pemberitahuan"
 username: "Nama Pengguna"
 password: "Kata sandi"
 forgotPassword: "Lupa Kata Sandi"
-fetchingAsApObject: "Mengambil data dari Fediverse..."
+fetchingAsApObject: "Mengambil data dari Fediverse"
 ok: "OK"
 gotIt: "Saya mengerti"
 cancel: "Batalkan"
@@ -577,7 +577,6 @@ tokenRequested: "Berikan ijin akses ke akun"
 pluginTokenRequestedDescription: "Plugin ini dapat menggunakan setelan ijin disini."
 notificationType: "Jenis pemberitahuan"
 edit: "Sunting"
-useStarForReactionFallback: "Gunakan ★ sebagai fallback jika reaksi emoji tidak diketahui"
 emailServer: "Peladen surel"
 enableEmail: "Nyalakan distribusi surel"
 emailConfigInfo: "Digunakan untuk mengonfirmasi surel kamu disaat mendaftar dan lupa kata sandi"
@@ -647,7 +646,7 @@ createNewClip: "Buat klip baru"
 unclip: "Batalkan klip"
 confirmToUnclipAlreadyClippedNote: "Catatan ini sudah disertakan di klip \"{name}\". Yakin ingin membatalkan catatan dari klip ini?"
 public: "Publik"
-i18nInfo: "Misskey diterjemahkan ke dalam banyak bahasa oleh sukarelawan. Kamu dapat ikut membantu di {link}."
+i18nInfo: "Calckey diterjemahkan ke dalam banyak bahasa oleh sukarelawan. Kamu dapat ikut membantu di {link}."
 manageAccessTokens: "Kelola access token"
 accountInfo: "Informasi akun"
 notesCount: "Jumlah catatan"
@@ -727,7 +726,7 @@ emailNotification: "Pemberitahuan surel"
 publish: "Terbitkan"
 inChannelSearch: "Cari di kanal"
 useReactionPickerForContextMenu: "Buka pemilih reaksi dengan klik-kanan"
-typingUsers: "{users} sedang mengetik..."
+typingUsers: "{users} sedang mengetik"
 jumpToSpecifiedDate: "Loncat ke tanggal spesifik"
 showingPastTimeline: "Sedang menampilkan linimasa lama"
 clear: "Bersihkan"

locales/index.js

@@ -4,6 +4,8 @@
 
 const fs = require('fs');
 const yaml = require('js-yaml');
+let languages = []
+let languages_custom = []
 
 const merge = (...args) => args.reduce((a, c) => ({
 	...a,
@@ -13,33 +15,20 @@ const merge = (...args) => args.reduce((a, c) => ({
 		.reduce((a, [k, v]) => (a[k] = merge(v, c[k]), a), {})
 }), {});
 
-const languages = [
+
-	'ar-SA',
+fs.readdirSync(__dirname).forEach((file) => {
-	'cs-CZ',
+	if (file.includes('.yml')){
-	'da-DK',
+		file = file.slice(0, file.indexOf('.'))
-	'de-DE',
+		languages.push(file);
-	'en-US',
+	}
-	'es-ES',
+})
-	'fr-FR',
+
-	'id-ID',
+fs.readdirSync(__dirname + '/../custom/locales').forEach((file) => {
-	'it-IT',
+	if (file.includes('.yml')){
-	'ja-JP',
+		file = file.slice(0, file.indexOf('.'))
-	'ja-KS',
+		languages_custom.push(file);
-	'kab-KAB',
+	}
-	'kn-IN',
+})
-	'ko-KR',
-	'nl-NL',
-	'no-NO',
-	'pl-PL',
-	'pt-PT',
-	'ru-RU',
-	'sk-SK',
-	'ug-CN',
-	'uk-UA',
-	'vi-VN',
-	'zh-CN',
-	'zh-TW',
-];
 
 const primaries = {
 	'en': 'US',
@@ -51,6 +40,8 @@ const primaries = {
 const clean = (text) => text.replace(new RegExp(String.fromCodePoint(0x08), 'g'), '');
 
 const locales = languages.reduce((a, c) => (a[c] = yaml.load(clean(fs.readFileSync(`${__dirname}/${c}.yml`, 'utf-8'))) || {}, a), {});
+const locales_custom = languages_custom.reduce((a, c) => (a[c] = yaml.load(clean(fs.readFileSync(`${__dirname}/../custom/locales/${c}.yml`, 'utf-8'))) || {}, a), {});
+Object.assign(locales, locales_custom)
 
 module.exports = Object.entries(locales)
 	.reduce((a, [k ,v]) => (a[k] = (() => {

locales/it-IT.yml

@@ -8,7 +8,7 @@ notifications: "Notifiche"
 username: "Nome utente"
 password: "Password"
 forgotPassword: "Hai dimenticato la tua password?"
-fetchingAsApObject: "Recuperando dal Fediverso..."
+fetchingAsApObject: "Recuperando dal Fediverso"
 ok: "OK"
 gotIt: "Ho capito"
 cancel: "Annulla"
@@ -573,7 +573,6 @@ tokenRequested: "Autorizza accesso all'account"
 pluginTokenRequestedDescription: "Il plugin potrà utilizzare le autorizzazioni impostate qui."
 notificationType: "Tipo di notifiche"
 edit: "Modifica"
-useStarForReactionFallback: "Se è sconosciuto l'emoji di reazione, usare la ★ come alternativa."
 emailServer: "Server email"
 enableEmail: "Abilita consegna email"
 emailConfigInfo: "Utilizzato per verificare il tuo indirizzo di posta elettronica e per reimpostare la tua password"
@@ -637,7 +636,7 @@ createNew: "Crea nuov@"
 optional: "Opzionale"
 createNewClip: "Nuova clip"
 public: "Pubblica"
-i18nInfo: "Misskey è tradotto in diverse lingue da volontari. Anche tu puoi contribuire su {link}."
+i18nInfo: "Calckey è tradotto in diverse lingue da volontari. Anche tu puoi contribuire su {link}."
 manageAccessTokens: "Gestisci token di accesso"
 accountInfo: "Informazioni account"
 notesCount: "Conteggio note"
@@ -1026,28 +1025,26 @@ _time:
   hour: "ore"
   day: "giorni"
 _tutorial:
-  title: "Come usare Misskey"
+  titolo: "Come usare Calckey"
-  step1_1: "Benvenuto/a!"
+  step1_1: "Benvenuto!"
-  step1_2: "Questa pagina si chiama una \" Timeline \". Mostra in ordine cronologico le \" note \" delle persone che segui."
+  step1_2: "Vediamo di configurarla. Sarete operativi in men che non si dica!"
-  step1_3: "Attualmente la tua Timeline è vuota perché non segui alcun account e non hai pubblicato alcuna nota ancora."
+  step2_1: "Per prima cosa, compila il tuo profilo"
-  step2_1: "Prima di scrivere una nota o di seguire un account, imposta il tuo profilo!"
+  step2_2: "Fornendo alcune informazioni su chi siete, sarà più facile per gli altri capire se vogliono vedere le vostre note o seguirvi"
-  step2_2: "Aggiungere qualche informazione su di te aumenterà le tue possibilità di essere seguit@ da altre persone. "
+  step3_1: "Ora è il momento di seguire alcune persone!"
-  step3_1: "Hai finito di impostare il tuo profilo?"
+  step3_2: "La vostra home e le vostre timeline social si basano su chi seguite, quindi provate a seguire un paio di account per iniziare.\nCliccate sul cerchio più in alto a destra di un profilo per seguirlo"
-  step3_2: "Ora, puoi pubblicare una nota. Facciamo una prova! Premi il pulsante a forma di penna in cima allo schermo per aprire una finestra di dialogo.  "
+  step4_1: "Fatevi conoscere"
-  step3_3: "Scritto il testo della nota, puoi pubblicarla premendo il pulsante nella parte superiore destra della finestra di dialogo."
+  step4_2: "Per il vostro primo post, alcuni preferiscono fare un post di {introduction} o un semplice \"Ciao mondo!\""
-  step3_4: "Non ti viene niente in mente? Perché non scrivi semplicemente \"Ho appena cominciato a usare Misskey\"?"
+  step5_1: "Linee temporali, linee temporali dappertutto!"
-  step4_1: "Hai pubblicato qualcosa?"
+  step5_2: "La tua istanza ha attivato {timelines} diverse timelines"
-  step4_2: "Se puoi visualizzare la tua nota sulla timeline, ce l'hai fatta!"
+  step5_3: "La timeline Home {icon} è quella in cui si possono vedere i post dei propri follower"
-  step5_1: "Adesso, cerca di seguire altre persone per vivacizzare la tua timeline. "
+  step5_4: "La timeline Locale {icon} è quella in cui si possono vedere i post di tutti gli altri utenti di questa istanza"
-  step5_2: "La pagina {featured} mostra le note di tendenza su questa istanza, e magari ti aiuterà a trovare account che ti piacciono e che vorrai seguire. Oppure, potrai trovare utenti popolari usando {explore}."
+  step5_5: "La timeline Raccomandati {icon} è quella in cui si possono vedere i post delle istanze raccomandate dagli amministratori"
-  step5_3: "Per seguire altrə utenti, clicca sul loro avatar per aprire la pagina di profilo dove puoi premere il pulsante \"Seguire\". "
+  step5_6: "La timeline Social {icon} è quella in cui si possono vedere i post degli amici dei propri follower"
-  step5_4: "Alcunə utenti scelgono di confermare manualmente le richieste di follow che ricevono, quindi a seconda delle persone potrebbe volerci un pò prima che la tua richiesta sia accolta."
+  step5_7: "La timeline Globale {icon} è quella in cui si possono vedere i post di ogni altra istanza collegata"
-  step6_1: "Ora, se puoi visualizzare le note di altrə utenti sulla tua timeline, ce l'hai fatta!"
+  step6_1: "Allora, cos'è questo posto?"
-  step6_2: "Puoi inviare una risposta rapida alle note di altrə utenti mandando loro \"reazioni\"."
+  step6_2: "Beh, non ti sei semplicemente unito a Calckey. Sei entrato in un portale del Fediverse, una rete interconnessa di migliaia di server, chiamata \"istanze\""
-  step6_3: "Per inviare una reazione, premi l'icona + della nota e scegli l'emoji che vuoi mandare."
+  step6_3: "Ogni server funziona in modo diverso, e non tutti i server eseguono Calckey. Questo però lo fa! È un po' complicato, ma ci riuscirete in poco tempo"
-  step7_1: "Complimenti! Sei arrivat@ alla fine dell'esercitazione di base su come usare Misskey. "
+  step6_4: "Ora andate, esplorate e divertitevi!"
-  step7_2: "Se vuoi saperne di più su Misskey, puoi dare un'occhiata alla sezione {help}."
-  step7_3: "Da ultimo, buon divertimento su Misskey! 🚀"
 _2fa:
   registerDevice: "Aggiungi dispositivo"
 _permissions:

locales/ja-JP.yml

@@ -149,6 +149,7 @@ addAccount: "アカウントを追加"
 loginFailed: "ログインに失敗しました"
 showOnRemote: "リモートで表示"
 general: "全般"
+accountMoved: "このユーザーは新しいアカウントに移行しました"
 wallpaper: "壁紙"
 setWallpaper: "壁紙を設定"
 removeWallpaper: "壁紙を削除"
@@ -251,6 +252,7 @@ explore: "みつける"
 messageRead: "既読"
 noMoreHistory: "これより過去の履歴はありません"
 startMessaging: "チャットを開始"
+manageGroups: "グループ管理"
 nUsersRead: "{n}人が読みました"
 agreeTo: "{0}に同意"
 tos: "利用規約"
@@ -323,6 +325,7 @@ connectService: "接続する"
 disconnectService: "切断する"
 enableLocalTimeline: "ローカルタイムラインを有効にする"
 enableGlobalTimeline: "グローバルタイムラインを有効にする"
+enableRecommendedTimeline: "推奨されるタイムラインを有効にする"
 disablingTimelinesInfo: "これらのタイムラインを無効化しても、利便性のため管理者およびモデレーターは引き続き利用することができます。"
 registration: "登録"
 enableRegistration: "誰でも新規登録できるようにする"
@@ -378,7 +381,7 @@ exploreFediverse: "Fediverseを探索"
 popularTags: "人気のタグ"
 userList: "リスト"
 about: "情報"
-aboutMisskey: "Misskeyについて"
+aboutMisskey: "Calckeyについて"
 administrator: "管理者"
 token: "トークン"
 twoStepAuthentication: "二段階認証"
@@ -580,7 +583,6 @@ tokenRequested: "アカウントへのアクセス許可"
 pluginTokenRequestedDescription: "このプラグインはここで設定した権限を行使できるようになります。"
 notificationType: "通知の種類"
 edit: "編集"
-useStarForReactionFallback: "リアクション絵文字が不明な場合、代わりに★を使う"
 emailServer: "メールサーバー"
 enableEmail: "メール配信機能を有効化する"
 emailConfigInfo: "メールアドレスの確認やパスワードリセットの際に使います"
@@ -650,7 +652,7 @@ createNewClip: "新しいクリップを作成"
 unclip: "クリップ解除"
 confirmToUnclipAlreadyClippedNote: "このノートはすでにクリップ「{name}」に含まれています。ノートをこのクリップから除外しますか？"
 public: "パブリック"
-i18nInfo: "Misskeyは有志によって様々な言語に翻訳されています。{link}で翻訳に協力できます。"
+i18nInfo: "Calckeyは有志によって様々な言語に翻訳されています。{link}で翻訳に協力できます。"
 manageAccessTokens: "アクセストークンの管理"
 accountInfo: "アカウント情報"
 notesCount: "ノートの数"
@@ -780,11 +782,19 @@ middle: "中"
 low: "低"
 emailNotConfiguredWarning: "メールアドレスの設定がされていません。"
 ratio: "比率"
+secureMode: "セキュアモード (Authorized Fetch)"
+instanceSecurity: "インスタンスのセキュリティー"
+secureModeInfo: "他のインスタンスからリクエストするときに、証明を付けなければ返送しません。他のインスタンスの設定ファイルでsignToActivityPubGetはtrueにしてください。"
+privateMode: "非公開モード"
+privateModeInfo: "有効にして、許可されているインスタンスのみがリクエストできます。すべてのノートが公開に非表示にします。"
+allowedInstances: "許可されたインスタンス"
+allowedInstancesDescription: "許可したいインスタンスのホストを改行で区切って設定します。非公開モードだけで有効です。"
 previewNoteText: "本文をプレビュー"
 customCss: "カスタムCSS"
 customCssWarn: "この設定は必ず知識のある方が行ってください。不適切な設定を行うとクライアントが正常に使用できなくなる恐れがあります。"
 global: "グローバル"
 squareAvatars: "アイコンを四角形で表示"
+seperateRenoteQuote: "リノートと引用ボタンを分ける"
 sent: "送信"
 received: "受信"
 searchResult: "検索結果"
@@ -799,12 +809,14 @@ translatedFrom: "{x}から翻訳"
 accountDeletionInProgress: "アカウントの削除が進行中です"
 usernameInfo: "サーバー上であなたのアカウントを一意に識別するための名前。アルファベット(a~z, A~Z)、数字(0~9)、およびアンダーバー(_)が使用できます。ユーザー名は後から変更することは出来ません。"
 aiChanMode: "藍モード"
+enterSendsMessage: "メッセージングでReturnキーを押すと、メッセージが送信されます（デフォルトはCtrl + Returnです）"
 keepCw: "CWを維持する"
 pubSub: "Pub/Subのアカウント"
 lastCommunication: "直近の通信"
 resolved: "解決済み"
 unresolved: "未解決"
 breakFollow: "フォロワーを解除"
+breakFollowConfirm: "フォロワー解除しますか？"
 itsOn: "オンになっています"
 itsOff: "オフになっています"
 emailRequiredForSignup: "アカウント登録にメールアドレスを必須にする"
@@ -889,10 +901,26 @@ beta: "ベータ"
 enableAutoSensitive: "自動NSFW判定"
 enableAutoSensitiveDescription: "利用可能な場合は、機械学習を利用して自動でメディアにNSFWフラグを設定します。この機能をオフにしても、インスタンスによっては自動で設定されることがあります。"
 activeEmailValidationDescription: "ユーザーのメールアドレスのバリデーションを、捨てアドかどうかや実際に通信可能かどうかなどを判定しより積極的に行います。オフにすると単に文字列として正しいかどうかのみチェックされます。"
+showAds: "広告を表示する"
 navbar: "ナビゲーションバー"
 shuffle: "シャッフル"
 account: "アカウント"
 move: "移動"
+adminCustomCssWarn: "この設定は、それが何をするものであるかを知っている場合のみ使用してください。不適切な値を入力すると、クライアントが正常に動作しなくなる可能性があります。ユーザー設定でCSSをテストし、正しく動作することを確認してください。"
+customMOTD: "カスタムMOTD(スプラッシュスクリーンメッセージ)"
+customMOTDDescription: "ユーザがページをロード/リロードするたびにランダムに表示される、改行で区切られたMOTD(スプラッシュスクリーン)用のカスタムメッセージ"
+customSplashIcons: "カスタムスプラッシュスクリーンアイコン"
+customSplashIconsDescription: "ユーザがページをロード/リロードするたびにランダムに表示される、改行で区切られたカスタムスプラッシュスクリーンアイコンの URL。画像は静的なURLで、できればすべて192x192にリサイズしてください。"
+showUpdates: "Calckeyの更新時にポップアップを表示する"
+recommendedInstances: "推奨インスタンス"
+recommendedInstancesDescription: "推奨タイムラインに表示するために改行で区切られた推奨インスタンス。`https://`を追加しないでください。ドメインのみを追加してください。"
+caption: "自動キャプション"
+splash: "スプラッシュスクリーン"
+updateAvailable: "アップデートがありますよ"
+swipeOnDesktop: "デスクトップでモバイルスタイルのスワイプを可能にする"
+logoImageUrl: "ロゴのURL"
+showAdminUpdates: "新しいCalckeyのバージョンが利用可能であることを示す(管理者のみ)"
+replayTutorial: "リプレイチュートリアル"
 
 _sensitiveMediaDetection:
   description: "機械学習を使って自動でセンシティブなメディアを検出し、モデレーションに役立てることができます。サーバーの負荷が少し増えます。"
@@ -981,7 +1009,7 @@ _registry:
   createKey: "キーを作成"
 
 _aboutMisskey:
-  about: "Misskeyはsyuiloによって2014年から開発されている、オープンソースのソフトウェアです。"
+  about: "Calckeyは、2022年から開発されているThatOneCalculator社製のMisskeyのforkです。"
   contributors: "主なコントリビューター"
   allContributors: "全てのコントリビューター"
   source: "ソースコード"
@@ -1071,6 +1099,7 @@ _serverDisconnectedBehavior:
   reload: "自動でリロード"
   dialog: "ダイアログで警告"
   quiet: "控えめに警告"
+  nothing: "何も起こらない"
 
 _channel:
   create: "チャンネルを作成"
@@ -1083,6 +1112,10 @@ _channel:
   usersCount: "{n}人が参加中"
   notesCount: "{n}投稿があります"
 
+_messaging:
+  dms: "ディーエム"
+  groups: "グループ"
+
 _menuDisplay:
   sideFull: "横"
   sideIcon: "横(アイコン)"
@@ -1208,28 +1241,26 @@ _time:
   day: "日"
 
 _tutorial:
-  title: "Misskeyの使い方"
+  title: "Calckeyの使い方"
-  step1_1: "ようこそ。"
+  step1_1: "ようこそ!"
-  step1_2: "この画面は「タイムライン」と呼ばれ、あなたや、あなたが「フォロー」する人の「ノート」が時系列で表示されます。"
+  step1_2: "設定をしてみましょう"
-  step1_3: "あなたはまだ何もノートを投稿しておらず、誰もフォローしていないので、タイムラインには何も表示されていないはずです。"
+  step2_1: "メモを書いたり、誰かをフォローする前に、プロフィールの設定を済ませましょう。"
-  step2_1: "ノートを作成したり誰かをフォローしたりする前に、まずあなたのプロフィールを完成させましょう。"
+  step2_2: "あなたが誰なのか、いくつかの情報を提供することで、他の人があなたのメモを見たり、フォローしたりしたいのかがわかりやすくなります。"
-  step2_2: "あなたがどんな人かわかると、多くの人にノートを見てもらえたり、フォローしてもらいやすくなります。"
+  step3_1: "さあ、何人かの人をフォローする時間です！"
-  step3_1: "プロフィール設定はうまくできましたか？"
+  step3_2: "あなたのホームとソーシャルタイムラインは、あなたが誰をフォローしているかで決まります。 まずは、いくつかのアカウントをフォローしてみましょう。"
-  step3_2: "では試しに、何かノートを投稿してみてください。画面上にある鉛筆マークのボタンを押すとフォームが開きます。"
+  step4_1: "さあ、外に出てみましょう。"
-  step3_3: "内容を書いたら、フォーム右上のボタンを押すと投稿できます。"
+  step4_2: "最初の投稿は、{introduction}の投稿や、シンプルに「こんにちは、世界よ！」的な投稿をするのが好きな人もいます。"
-  step3_4: "内容が思いつかない？「Misskey始めました」というのはいかがでしょう。"
+  step5_1: "タイムライン、タイムラインだらけ！"
-  step4_1: "投稿できましたか？"
+  step5_2: "あなたのインスタンスは{timelines}異なるタイムラインを有効にしています。"
-  step4_2: "あなたのノートがタイムラインに表示されていれば成功です。"
+  step5_3: "ホーム{icon}のタイムラインは、あなたのフォロワーからの投稿を見ることができます。"
-  step5_1: "次は、他の人をフォローしてタイムラインを賑やかにしたいところです。"
+  step5_4: "ローカル{icon}タイムラインは、このインスタンスのみんなの投稿を見ることができる場所です。"
-  step5_2: "{featured}で人気のノートが見れるので、その中から気になった人を選んでフォローしたり、{explore}で人気のユーザーを探すこともできます。"
+  step5_5: "おすすめ{icon}のタイムラインは、管理人がおすすめするインスタンスの投稿を見ることができます。"
-  step5_3: "ユーザーをフォローするには、ユーザーのアイコンをクリックしてユーザーページを表示し、「フォロー」ボタンを押します。"
+  step5_6: "ソーシャル{icon}のタイムラインは、あなたのフォロワーの友達の投稿を見ることができる場所です。"
-  step5_4: "ユーザーによっては、フォローが承認されるまで時間がかかる場合があります。"
+  step5_7: "グローバル{icon}タイムラインは、接続している他のすべてのインスタンスからの投稿を見ることができます。"
-  step6_1: "タイムラインに他のユーザーのノートが表示されていれば成功です。"
+  step6_1: "それで、ここは何なの？"
-  step6_2: "他の人のノートには、「リアクション」を付けることができ、簡単にあなたの反応を伝えられます。"
+  step6_2: "まあ、あなたはCalckeyに参加しただけではありません。何千ものサーバーが相互接続されたネットワークで インスタンスと呼ばれる。"
-  step6_3: "リアクションを付けるには、ノートの「+」マークをクリックして、好きなリアクションを選択します。"
+  step6_3: "各サーバーは異なる方法で動作し、すべてのサーバーがCalckeyを実行するわけではありません。でも、このサーバーは動くんです"
-  step7_1: "これで、Misskeyの基本的な使い方の説明は終わりました。お疲れ様でした。"
+  step6_4: "さあ、探検して、楽しんでください!"
-  step7_2: "もっとMisskeyについて知りたいときは、{help}を見てみてください。"
-  step7_3: "では、Misskeyをお楽しみください🚀"
 
 _2fa:
   alreadyRegistered: "既に設定は完了しています。"
@@ -1430,6 +1461,7 @@ _instanceCharts:
 _timelines:
   home: "ホーム"
   local: "ローカル"
+  recommended: "一押し"
   social: "ソーシャル"
   global: "グローバル"
 

locales/ja-KS.yml

@@ -579,7 +579,6 @@ tokenRequested: "アカウントへのアクセス許可"
 pluginTokenRequestedDescription: "このプラグインはここで設定した権限を使えるようになるで。"
 notificationType: "通知の種類"
 edit: "編集"
-useStarForReactionFallback: "リアクションがようわからん場合、★を使う"
 emailServer: "メールサーバー"
 enableEmail: "メール配信を受け取る"
 emailConfigInfo: "メールアドレスの確認とかパスワードリセットの時に使うで"
@@ -649,7 +648,7 @@ createNewClip: "新しいクリップを作るで"
 unclip: "クリップ解除するで"
 confirmToUnclipAlreadyClippedNote: "このノートはすでにクリップ「{name}」に含まれとるで。ノートをこのクリップから除外したる？"
 public: "パブリック"
-i18nInfo: "Misskeyは有志によっていろんな言語に翻訳されとるで。{link}で翻訳に協力したってやー。"
+i18nInfo: "Calckeyは有志によっていろんな言語に翻訳されとるで。{link}で翻訳に協力したってやー。"
 manageAccessTokens: "アクセストークンの管理"
 accountInfo: "アカウント情報"
 notesCount: "ノートの数やで"
@@ -1006,8 +1005,6 @@ _time:
   minute: "分"
   hour: "時間"
   day: "日"
-_tutorial:
-  step3_1: "プロフィール設定はええ感じにできたか？"
 _2fa:
   alreadyRegistered: "もう設定終わっとるわ。"
 _permissions:

locales/jbo-EN.yml

@@ -1 +0,0 @@
----

locales/kn-IN.yml

@@ -6,7 +6,7 @@ search: "ಹುಡುಕು"
 notifications: "ಅಧಿಸೂಚನೆಗಳು"
 username: "ಬಳಕೆಹೆಸರು"
 password: "ಗುಪ್ತಪದ"
-fetchingAsApObject: "ಒಕ್ಕೂಟದಿಂದ ಪಡೆಯಲಾಗುತ್ತಿದೆ..."
+fetchingAsApObject: "ಒಕ್ಕೂಟದಿಂದ ಪಡೆಯಲಾಗುತ್ತಿದೆ"
 ok: "ಸರಿ"
 gotIt: "ಅರ್ಥವಾಯಿತು!"
 cancel: "ರದ್ದು"

locales/ko-KR.yml

@@ -108,7 +108,7 @@ sensitive: "열람주의"
 add: "추가"
 reaction: "리액션"
 reactionSetting: "선택기에 표시할 리액션"
-reactionSettingDescription2: "끌어서 순서 변경, 클릭해서 삭제, ＋를 눌러서 추가할 수 있습니다."
+reactionSettingDescription2: "끌어서 순서 변경, 클릭해서 삭제, +를 눌러서 추가할 수 있습니다."
 rememberNoteVisibility: "공개 범위를 기억하기"
 attachCancel: "첨부 취소"
 markAsSensitive: "열람주의로 설정"
@@ -580,7 +580,6 @@ tokenRequested: "계정 접근 허용"
 pluginTokenRequestedDescription: "이 플러그인은 여기서 설정한 권한을 사용할 수 있게 됩니다."
 notificationType: "알림 유형"
 edit: "편집"
-useStarForReactionFallback: "알 수 없는 리액션 이모지 대신 ★ 사용"
 emailServer: "메일 서버"
 enableEmail: "이메일 송신 기능 활성화"
 emailConfigInfo: "가입 시 메일 주소 확인이나 비밀번호 초기화 시에 사용합니다."
@@ -650,7 +649,7 @@ createNewClip: "새 클립 만들기"
 unclip: "클립 해제"
 confirmToUnclipAlreadyClippedNote: "이 노트는 이미 \"{name}\" 클립에 포함되어 있습니다. 클립을 해제하시겠습니까?"
 public: "공개"
-i18nInfo: "Misskey는 자원봉사자들에 의해 다양한 언어로 번역되고 있습니다. {link}에서 번역에 참가할 수 있습니다."
+i18nInfo: "Calckey는 자원봉사자들에 의해 다양한 언어로 번역되고 있습니다. {link}에서 번역에 참가할 수 있습니다."
 manageAccessTokens: "액세스 토큰 관리"
 accountInfo: "계정 정보"
 notesCount: "노트 수"
@@ -730,7 +729,7 @@ emailNotification: "메일 알림"
 publish: "게시"
 inChannelSearch: "채널에서 검색"
 useReactionPickerForContextMenu: "우클릭하여 리액션 선택기 열기"
-typingUsers: "{users} 님이 입력하고 있어요.."
+typingUsers: "{users} 님이 입력하고 있어요"
 jumpToSpecifiedDate: "특정 날짜로 이동"
 showingPastTimeline: "과거의 타임라인을 표시하고 있어요"
 clear: "지우기"
@@ -912,8 +911,8 @@ _ffVisibility:
   private: "비공개"
 _signup:
   almostThere: "거의 다 끝났습니다"
-  emailAddressInfo: "당신이 사용하고 있는 이메일 주소를 입력해 주세요. 이메일 주소는 다른 유저에게 공개되지 않습니다."
+  emailAddressInfo: "당신이 사용하고 있는 이메일 주소를 입력해 주세요. 이메일 주소는 다른 유저에게 공개되지 않습니다."
-  emailSent: "입력하신 메일 주소({email})로 확인 메일을 보내드렸습니다. 가입을 완료하시려면 보내드린 메일에 있는 링크로 접속해 주세요."
+  emailSent: "입력하신 메일 주소({email})로 확인 메일을 보내드렸습니다. 가입을 완료하시려면 보내드린 메일에 있는 링크로 접속해 주세요."
 _accountDelete:
   accountDelete: "계정 삭제"
   mayTakeTime: "계정 삭제는 서버에 부하를 가하기 때문에, 작성한 콘텐츠나 업로드한 파일의 수가 많으면 완료까지 시간이 걸릴 수 있습니다."
@@ -1179,29 +1178,6 @@ _time:
   minute: "분"
   hour: "시간"
   day: "일"
-_tutorial:
-  title: "Misskey의 사용 방법"
-  step1_1: "환영합니다!"
-  step1_2: "이 페이지는 \"타임라인\"이라고 불립니다. 당신이 \"팔로우\"하고 있는 사람들의 \"노트\"가 시간순으로 나타납니다."
-  step1_3: "아직 아무 유저도 팔로우하고 있지 않기에 타임라인은 비어 있을 것입니다."
-  step2_1: "새 노트를 작성하거나 다른 사람을 팔로우하기 전에, 먼저 프로필을 완성해보도록 합시다."
-  step2_2: "당신이 어떤 사람인지를 알린다면, 다른 사람들이 당신을 팔로우할 확률이 올라갈 것입니다."
-  step3_1: "프로필 설정은 잘 끝내셨나요?"
-  step3_2: "그럼 시험삼아 노트를 작성해 보세요. 화면에 있는 연필 버튼을 누르면 작성 폼이 열립니다."
-  step3_3: "내용을 작성한 후, 폼 오른쪽 상단의 버튼을 눌러 노트를 올릴 수 있습니다."
-  step3_4: "쓸 말이 없나요? \"Misskey 시작했어요!\" 같은 건 어떨까요? :>"
-  step4_1: "노트 작성을 끝내셨나요?"
-  step4_2: "당신의 노트가 타임라인에 표시되어 있다면 성공입니다."
-  step5_1: "이제, 다른 사람을 팔로우하여 타임라인을 활기차게 만들어보도록 합시다."
-  step5_2: "{featured}에서 이 인스턴스의 인기 노트를 보실 수 있습니다. {explore}에서는 인기 사용자를 찾을 수 있구요. 마음에 드는 사람을 골라 팔로우해 보세요!"
-  step5_3: "다른 유저를 팔로우하려면 해당 유저의 아이콘을 클릭하여 프로필 페이지를 띄운 후, 팔로우 버튼을 눌러 주세요."
-  step5_4: "사용자에 따라 팔로우가 승인될 때까지 시간이 걸릴 수 있습니다."
-  step6_1: "타임라인에 다른 사용자의 노트가 나타난다면 성공입니다."
-  step6_2: "다른 유저의 노트에 \"리액션\"을 붙여 간단하게 당신의 반응을 전달할 수도 있습니다."
-  step6_3: "리액션을 붙이려면, 노트의 \"+\" 버튼을 클릭하고 원하는 이모지를 선택합니다."
-  step7_1: "이것으로 Misskey의 기본 튜토리얼을 마치겠습니다. 수고하셨습니다!"
-  step7_2: "Misskey에 대해 더 알고 싶으시다면 {help}를 참고해 주세요."
-  step7_3: "그럼 Misskey를 즐기세요! 🚀"
 _2fa:
   alreadyRegistered: "이미 설정이 완료되었습니다."
   registerDevice: "디바이스 등록"

locales/pl-PL.yml

@@ -8,7 +8,7 @@ notifications: "Powiadomienia"
 username: "Nazwa użytkownika"
 password: "Hasło"
 forgotPassword: "Nie pamiętam hasła"
-fetchingAsApObject: "Pobieranie z Fediwersum…"
+fetchingAsApObject: "Pobieranie z Fediwersum"
 ok: "OK"
 gotIt: "Rozumiem!"
 cancel: "Anuluj"
@@ -572,7 +572,6 @@ tokenRequested: "Przydziel dostęp do konta"
 pluginTokenRequestedDescription: "Ta wtyczka będzie mogła korzystać z ustawionych tu uprawnień."
 notificationType: "Rodzaj powiadomień"
 edit: "Edytuj"
-useStarForReactionFallback: "Użyj ★ jako zapasowego emoji, gdy emoji reakcji jest nieznane"
 emailServer: "Serwer poczty e-mail"
 enableEmail: "Włącz dostarczanie wiadomości e-mail"
 emailConfigInfo: "Wykorzystywany do potwierdzenia adresu e-mail w trakcie rejestracji, lub gdy zapomnisz hasła"
@@ -637,7 +636,7 @@ createNewClip: "Utwórz nowy klip"
 unclip: "Odczep"
 confirmToUnclipAlreadyClippedNote: "Ten wpis jest już częścią klipu \"{name}\". Czy chcesz ją usunąć z tego klipu?"
 public: "Publiczny"
-i18nInfo: "Misskey jest tłumaczone na wiele języków przez wolontariuszy. Możesz pomóc na {link}."
+i18nInfo: "Calckey jest tłumaczone na wiele języków przez wolontariuszy. Możesz pomóc na {link}."
 manageAccessTokens: "Zarządzaj tokenami dostępu"
 accountInfo: "Informacje o koncie"
 notesCount: "Liczba wpisów"
@@ -716,7 +715,7 @@ emailNotification: "Powiadomienia e-mail"
 publish: "Publikuj"
 inChannelSearch: "Szukaj na kanale"
 useReactionPickerForContextMenu: "Otwórz wybornik reakcji prawym kliknięciem"
-typingUsers: "{users} pisze(-ą)..."
+typingUsers: "{users} pisze"
 jumpToSpecifiedDate: "Przejdź do określonej daty"
 showingPastTimeline: "Obecnie wyświetla starą oś czasu"
 clear: "Wróć"
@@ -1112,28 +1111,26 @@ _time:
   hour: "godz."
   day: "dzień"
 _tutorial:
-  title: "Jak korzystać z Misskey"
+  title: "Jak korzystać z Calckey"
-  step1_1: "Witaj!"
+  step1_1: "Witamy!"
-  step1_2: "Ta strona nazywa się „oś czasu”. Pokazuje chronologicznie uporządkowane wpisy osób, które „śledzisz”."
+  step1_2: "Pozwól, że cię skonfigurujemy. Będziesz działać w mgnieniu oka!"
-  step1_3: "Twoja oś czasu jest jeszcze pusta, ponieważ nie opublikowałeś(-aś) jeszcze żadnych wpisów i nie obserwujesz jeszcze nikogo."
+  step2_1: "Po pierwsze, proszę wypełnić swój profil"
-  step2_1: "Ukończmy konfigurację profilu zanim utworzymy wpis lub zaczniemy kogoś obserwować."
+  step2_2: "Podanie kilku informacji o tym, kim jesteś, ułatwi innym stwierdzenie, czy chcą zobaczyć Twoje notatki lub śledzić Cię."
-  step2_2: "Podanie pewnych informacji o tym, kim jesteś, ułatwi innym określenie, czy chcą widzieć Twoje wpisy lub Cię obserwować."
+  step3_1: "Teraz czas na śledzenie niektórych osób!"
-  step3_1: "Zakończyłeś(-aś) konfigurację profilu?"
+  step3_2: "Twoje domowe i społeczne linie czasu opierają się na tym, kogo śledzisz, więc spróbuj śledzić kilka kont, aby zacząć.\nKliknij kółko z plusem w prawym górnym rogu profilu, aby go śledzić."
-  step3_2: "Następnie spróbujmy opublikować wpis. Możesz to zrobić, naciskając przycisk z ikoną ołówka na ekranie."
+  step4_1: "Pozwól, że się tam dostaniesz."
-  step3_3: "Wypełnij pole i kliknij przycisk w prawym górnym rogu by wysłać post."
+  step4_2: "Dla twojego pierwszego postu, niektórzy ludzie lubią zrobić {introduction} post lub prosty \"Hello world!\""
-  step3_4: "Nie masz nic do powiedzenia? Spróbuj \"ustawiam swój misskey\"!"
+  step5_1: "Timelines, timelines everywhere!"
-  step4_1: "Zakończyłeś publikowanie pierwszego wpisu?"
+  step5_2: "Twoja instancja ma włączone {timelines} różne timelines"
-  step4_2: "Hurra! Teraz Twój pierwszy wpis powinien być wyświetlany na Twojej osi czasu."
+  step5_3: "Oś czasu Home {icon} to miejsce, w którym możesz zobaczyć posty od swoich zwolenników"
-  step5_1: "Teraz spróbujmy ożywić Twoją oś czasu, przez zaobserwowanie innych ludzi."
+  step5_4: "The Local {icon} timeline to miejsce, w którym możesz zobaczyć posty od wszystkich innych osób na tej instancji."
-  step5_2: "{featured} pokaże Ci popularne wpisy na tej instancji. {explore} pozwoli Ci znaleźć popularnych użytkowników. Spróbuj znaleźć tam osoby, które chcesz obserwować!"
+  step5_5: "Oś czasu Recommended {icon} to miejsce, gdzie możesz zobaczyć posty z instancji, które admini polecają."
-  step5_3: "Aby obserwować innych użytkowników, kliknij ich ikonę i naciśnij przycisk \"Obserwuj\" na ich profilu."
+  step5_6: "Oś czasu Social {icon} to miejsce, w którym możesz zobaczyć posty od znajomych swoich followersów."
-  step5_4: "Jeśli inny użytkownik ma ikonę kłódki obok swojej nazwy, może minąć trochę czasu, zanim ten użytkownik ręcznie zatwierdzi Twoją prośbę o obserwowanie."
+  step5_7: "The Global {icon} timeline to miejsce, gdzie możesz zobaczyć posty z każdej innej połączonej instancji."
-  step6_1: "Powinieneś teraz widzieć wpisy innych użytkowników na swojej osi czasu."
+  step6_1: "Więc, co to jest to miejsce?"
-  step6_2: "Możesz także umieścić „reakcje” na wpisach innych osób, aby szybko na nie odpowiedzieć."
+  step6_2: "Cóż, nie dołączyłeś po prostu do Calckey. Dołączyłeś do portalu do Fediverse, połączonej sieci tysięcy serwerów, zwanych instancjami."
-  step6_3: "Aby dodać \"reakcję\", naciśnij znak \"+\" na wpisie innego użytkownika i wybierz emotikonę, którą chcesz zareagować."
+  step6_3: "Każdy serwer działa w inny sposób, i nie wszystkie serwery działają z Calckey. Ten jednak działa! Jest to trochę skomplikowane, ale w krótkim czasie załapiesz o co chodzi."
-  step7_1: "Gratulacje! Ukończyłeś podstawowy samouczek Misskey."
+  step6_4: "A teraz idź, odkrywaj i baw się dobrze!"
-  step7_2: "Jeśli chcesz dowiedzieć się więcej o Misskey, wypróbuj sekcję {help}."
-  step7_3: "A teraz powodzenia i baw się dobrze z Misskey! 🚀"
 _2fa:
   alreadyRegistered: "Zarejestrowałeś już urządzenie do uwierzytelniania dwuskładnikowego."
   registerDevice: "Zarejestruj nowe urządzenie"

locales/ro-RO.yml

@@ -8,7 +8,7 @@ notifications: "Notificări"
 username: "Nume de utilizator"
 password: "Parolă"
 forgotPassword: "Am uitat parola"
-fetchingAsApObject: "Se aduce din Fediverse..."
+fetchingAsApObject: "Se aduce din Fediverse"
 ok: "OK"
 gotIt: "Am înțeles!"
 cancel: "Anulează"
@@ -576,7 +576,6 @@ tokenRequested: "Acordă acces la cont"
 pluginTokenRequestedDescription: "Acest plugin va putea să folosească permisiunile setate aici."
 notificationType: "Tipul notificării"
 edit: "Editează"
-useStarForReactionFallback: "Folosește ★ ca fallback dacă emoji-ul este necunoscut"
 emailServer: "Server email"
 enableEmail: "Activează distribuția de emailuri"
 emailConfigInfo: "Folosit pentru a confirma emailul tău în timpul logări dacă îți uiți parola"

locales/ru-RU.yml

@@ -580,7 +580,6 @@ tokenRequested: "Открыть доступ к учётной записи"
 pluginTokenRequestedDescription: "Это расширение сможет пользоваться разрешениями, установленными здесь."
 notificationType: "Тип уведомления"
 edit: "Изменить"
-useStarForReactionFallback: "Ставить ★ в качестве реакции вместо неизвестного эмодзи"
 emailServer: "Сервер электронной почты"
 enableEmail: "Включить обмен электронной почтой"
 emailConfigInfo: "Используется для подтверждения адреса электронной почты и сброса пароля."
@@ -646,7 +645,7 @@ createNew: "Новый документ"
 optional: "Необязательно"
 createNewClip: "Новая подборка"
 public: "Общедоступно"
-i18nInfo: "Misskey переводят на разные языки добровольцы со всего света. Ваша помощь тоже пригодится здесь: {link}."
+i18nInfo: "Calckey переводят на разные языки добровольцы со всего света. Ваша помощь тоже пригодится здесь: {link}."
 manageAccessTokens: "Управление токенами доступа"
 accountInfo: "Сведения об учётной записи"
 notesCount: "Количество заметок"
@@ -1108,28 +1107,26 @@ _time:
   hour: "ч"
   day: "сут"
 _tutorial:
-  title: "Как пользоваться Misskey"
+  title: "Как использовать Calckey"
   step1_1: "Добро пожаловать!"
-  step1_2: "Эта страница называется «лента». Здесь будут появляться «заметки»: ваши личные и тех, на кого вы «подписаны». Они будут располагаться в порядке времени их появления."
+  step1_2: "Давайте настроим вас. Вы будете работать в кратчайшие сроки!"
-  step1_3: "Правда, ваша лента пока пуста. Она начнёт заполняться, когда вы будете писать свои заметки и подписываться на других."
+  step2_1: "Сначала, пожалуйста, заполните свой профиль"
-  step2_1: "Давайте, заполним профиль, прежде чем начать писать заметки и подписываться на других."
+  step2_2: "Предоставив некоторую информацию о себе, другим людям будет легче понять, хотят ли они видеть ваши записи или следить за вами."
-  step2_2: "То, что вы расскажете в профиле, поможет лучше вас узнать, а значит, многим будет легче присоединиться — вы скорее получите новых подписчиков и читателей."
+  step3_1: "Теперь пора следить за некоторыми людьми!"
-  step3_1: "Успешно заполнили профиль?"
+  step3_2: "Ваша домашняя и социальная ленты основаны на том, за кем вы следите, поэтому для начала попробуйте следить за парой аккаунтов.\nНажмите на кружок с плюсом в правом верхнем углу профиля, чтобы следить за ним."
-  step3_2: "Что ж, теперь самое время опубликуовать заметку. Если нажать вверху страницы на изображение карандаша, появится форма для текста."
+  step4_1: "Давайте выйдем на вас"
-  step3_3: "Напишите в неё, что хотите, и нажмите на кнопку в правом верхнем углу."
+  step4_2: "Для своего первого сообщения некоторые люди любят делать {introduction} сообщение или простое \"Hello world!\""
-  step3_4: "Ничего не приходит в голову? Как насчёт: «Я новенький, пока осваиваюсь в Misskey»?"
+  step5_1: "Временные рамки, везде временные рамки!"
-  step4_1: "С написанием первой заметки покончено?"
+  step5_2: "В вашем экземпляре включены {timelines} различных временных линий."
-  step4_2: "Отлично, теперь она должна появиться в вашей ленте."
+  step5_3: "Главная {icon} временная шкала - это шкала, где вы можете видеть сообщения ваших подписчиков."
-  step5_1: "А теперь самое время немного оживить ленту, подписавшись на других."
+  step5_4: "Местная {icon} временная шкала - это шкала, где вы можете видеть сообщения всех остальных пользователей данного экземпляра"
-  step5_2: "На странице «{featured}» собраны популярные сегодня заметки, читая которые, вы можете найти кого-то вам интересного, а на странице «{explore}» можно посмотреть, кто популярен у остальных."
+  step5_5: "Временная шкала Рекомендуемые {icon} - это шкала, где вы можете видеть сообщения от инстанций, рекомендованных администраторами."
-  step5_3: "Чтобы подписаться на кого-нибудь, щёлкните по его аватару и в открывшемся профиле нажмите кнопку «Подписаться»."
+  step5_6: "На временной шкале Social {icon} отображаются сообщения от друзей ваших подписчиков"
-  step5_4: "Некоторые пользователи (около их имени «висит замок») вручную подтверждают чужие подписки. Так что иногда подписка начинает работать не сразу.\n"
+  step5_7: "Глобальная {icon} временная шкала - это место, где вы можете видеть сообщения от всех других подключенных экземпляров"
-  step6_1: "Если теперь в ленте видны и чужие заметки, значит у вас получилось."
+  step6_1: "Итак, что это за место?"
-  step6_2: "Здесь можно непринуждённо выразить свои чувства к чьей-то заметке, отметив «реакцию» под ней."
+  step6_2: "Ну, вы не просто присоединились к Кальки. Вы присоединились к порталу в Fediverse, взаимосвязанной сети из тысяч серверов, называемых \"инстансами\"."
-  step6_3: "Отмечайте реакции, нажмая на символ «+» под заметкой и выбирая значок по душе."
+  step6_3: "Каждый сервер работает по-своему, и не на всех серверах работает Calckey. Но этот работает! Это немного сложно, но вы быстро разберетесь"
-  step7_1: "На этом вводный урок по использованию Misskey закончен. Спасибо, что прошли его до конца!"
+  step6_4: "Теперь идите, изучайте и развлекайтесь!"
-  step7_2: "Хотите изучить Misskey глубже — добро пожаловать в раздел «{help}»."
-  step7_3: "Приятно вам провести время с Misskey🚀"
 _2fa:
   alreadyRegistered: "Двухфакторная аутентификация уже настроена."
   registerDevice: "Зарегистрируйте ваше устройство"

locales/si-LK.yml

@@ -1 +0,0 @@
----

locales/sk-SK.yml

@@ -579,7 +579,6 @@ tokenRequested: "Povoliť prístup k účtu"
 pluginTokenRequestedDescription: "Tento plugin bude môcť používať oprávnenia nastavené tu."
 notificationType: "Typ oznámenia"
 edit: "Upraviť"
-useStarForReactionFallback: "Použiť ★ keď emoji reakcie nie je známe"
 emailServer: "Email server"
 enableEmail: "Zapnúť email"
 emailConfigInfo: "Používa sa na overenie emaily pri registrácii alebo pri zabudnutí hesla"
@@ -649,7 +648,7 @@ createNewClip: "Vytvoriť nový klip"
 unclip: "Odopnúť"
 confirmToUnclipAlreadyClippedNote: "Táto poznámka je už pripnutá ako \"{name}\". Naozaj ju chcete odopnúť?"
 public: "Verejné"
-i18nInfo: "Misskey je prekladaný do rôznych jazykov dobrovoľníkmi. Pomôcť môžete na {link}."
+i18nInfo: "Calckey je prekladaný do rôznych jazykov dobrovoľníkmi. Pomôcť môžete na {link}."
 manageAccessTokens: "Spravovať prístupové tokeny"
 accountInfo: "Informácie o účte"
 notesCount: "Počet poznámok"
@@ -729,7 +728,7 @@ emailNotification: "Emailové upozornenia"
 publish: "Zverejniť"
 inChannelSearch: "Hľadať v kanáli"
 useReactionPickerForContextMenu: "Otvoriť výber reakcií na pravý klik"
-typingUsers: "{users} píše/u"
+typingUsers: "{users} píše"
 jumpToSpecifiedDate: "Skočiť na konkrétny dátum"
 showingPastTimeline: "Práve vidíte starú časovú os"
 clear: "Vrátiť"
@@ -1176,28 +1175,26 @@ _time:
   hour: "hod"
   day: "dní"
 _tutorial:
-  title: "Ako používať Misskey"
+  title: "How to use Calckey"
-  step1_1: "Vitajte!"
+  step1_1: "Welcome!"
-  step1_2: "Táto stránka sa volá \"časová os\". Zobrazuje chronologicky zoradené \"poznámky\" od ľudí, ktorých sledujete."
+  step1_2: "Let's get you set up. You'll be up and running in no time!"
-  step1_3: "Vaša časová os je teraz prázdna pretože ste nepridali žiadne poznámky ani nikoho zatiaľ nesledujete."
+  step2_1: "First, please fill out your profile."
-  step2_1: "Podˇme dokončiť nastavenia vášho profilu pred napísaním poznámky alebo sledovaním niekoho."
+  step2_2: "Providing some information about who you are will make it easier for others to tell if they want to see your notes or follow you."
-  step2_2: "Poskytnutím informácií o vás uľahčíte ostatným, či chcú vidieť alebo sledovať vaše poznámky."
+  step3_1: "Now time to follow some people!"
-  step3_1: "Dokončili ste nastavovanie svojho profilu?"
+  step3_2: "Your home and social timelines are based off of who you follow, so try following a couple accounts to get started.\nClick the plus circle on the top right of a profile to follow them."
-  step3_2: "Poďme vyskúšať napísať poznámku. Môžete to spraviť stlačením ikony ceruzky na vrchu obrazovky."
+  step4_1: "Let's get you out there."
-  step3_3: "Vyplňte polia a stlačte tlačítko vpravo hore."
+  step4_2: "For your first post, some people like to made a {introduction} post or a simple \"Hello world!\""
-  step3_4: "Nemáte čo povedať? Skúste \"len si nastavujem môj msky\"!"
+  step5_1: "Timelines, timelines everywhere!"
-  step4_1: "Napísali ste svoju prvú poznámku?"
+  step5_2: "Your instance has {timelines} different timelines enabled."
-  step4_2: "Hurá! Teraz by vaša prvá poznámka mala byť na vašej časovej osi."
+  step5_3: "The Home {icon} timeline is where you can see posts from your followers."
-  step5_1: "Teraz skúsme oživiť časovú os sledovaním nejakých ľudí."
+  step5_4: "The Local {icon} timeline is where you can see posts from everyone else on this instance."
-  step5_2: "{featured} zobrazí populárne poznámku na tomto serveri. {explore} môžete objavovať populárnych používateľov. Skúste tam nájsť ľudí, ktorých by ste radi sledovali!"
+  step5_5: "The Recommended {icon} timeline is where you can see posts from instances the admins recommend."
-  step5_3: "Ak chcete sledovať ďalších používateľov, kliknite na ich ikonu a stlačte tlačidlo \"Sledovať\" na ich profile."
+  step5_6: "The Social {icon} timeline is where you can see posts from friends of your followers."
-  step5_4: "Ak má niektorý používateľ ikonu zámku vedľa svojho mena, znamená to, že môže trvať určitý čas, kým daný používateľ schváli vašu žiadosť o sledovanie."
+  step5_7: "The Global {icon} timeline is where you can see posts from every other connected instance."
-  step6_1: "Teraz by ste mali vidieť poznámky ďalších používateľov na svojej časovej osi."
+  step6_1: "So, what is this place?"
-  step6_2: "Môžete dať \"reakcie\" na poznámky ďalších ľudí ako rýchlu odpoveď."
+  step6_2: "Well, you didn't just join Calckey. You joined a portal to the Fediverse, an interconnected network of thousands of servers, called \"instances\"."
-  step6_3: "Reakciu pridáte kliknutím na \"+\" niekoho poznámke a vybratím emoji, ktorou chcete reagovať."
+  step6_3: "Each server works in different ways, and not all servers run Calckey. This one does though! It's a bit complicated, but you'll get the hang of it in no time."
-  step7_1: "Gralujeme! Dokončili ste základného sprievodcu Misskey."
+  step6_4: "Now go, explore, and have fun!"
-  step7_2: "Ak sa chcete naučiť viac o Misskey, skúste sekciu {help}."
-  step7_3: "A teraz, veľa šťastia, bavte sa s Misskey! 🚀"
 _2fa:
   alreadyRegistered: "Už ste zaregistrovali 2-faktorové autentifikačné zariadenie."
   registerDevice: "Registrovať nové zariadenie"

locales/sv-SE.yml

@@ -8,7 +8,7 @@ notifications: "Notifikationer"
 username: "Användarnamn"
 password: "Lösenord"
 forgotPassword: "Glömt lösenord"
-fetchingAsApObject: "Hämtar från Fediversum..."
+fetchingAsApObject: "Hämtar från Fediversum"
 ok: "OK"
 gotIt: "Uppfattat!"
 cancel: "Avbryt"

locales/th-TH.yml

@@ -8,7 +8,7 @@ notifications: "การเเจ้งเตือน"
 username: "ชื่อผู้ใช้"
 password: "รหัสผ่าน"
 forgotPassword: "ลืมรหัสผ่าน?"
-fetchingAsApObject: "กำลังดึงข้อมูล จาก เฟดิเวิร์ส..."
+fetchingAsApObject: "กำลังดึงข้อมูล จาก เฟดิเวิร์ส"
 ok: "ตกลง"
 gotIt: "เข้าใจแล้ว !"
 cancel: "ยกเลิก"
@@ -580,7 +580,6 @@ tokenRequested: "ให้สิทธิ์การเข้าถึงบั
 pluginTokenRequestedDescription: "ปลั๊กอินนี้จะสามารถใช้การอนุญาตที่ตั้งค่าไว้ที่นี่นะ"
 notificationType: "ประเภทการแจ้งเตือน"
 edit: "แก้ไข"
-useStarForReactionFallback: "ใช้ ★ เป็นทางเลือกแทนถ้าหากไม่ทราบอิโมจิ"
 emailServer: "อีเมล์เซิร์ฟเวอร์"
 enableEmail: "เปิดใช้งานการกระจายอีเมล"
 emailConfigInfo: "ใช้เพื่อยืนยันอีเมลของคุณระหว่างการสมัครหรือถ้าหากคุณลืมรหัสผ่าน"
@@ -650,7 +649,7 @@ createNewClip: "สร้างคลิปใหม่"
 unclip: "ลบคลิป"
 confirmToUnclipAlreadyClippedNote: "โน้ตนี้เป็นส่วนหนึ่งของคลิป \"{name}\" แล้ว คุณต้องการลบออกจากคลิปนี้แทนอย่างงั้นหรอ?"
 public: "สาธารณะ"
-i18nInfo: "Misskey กำลังได้รับการแปลเป็นภาษาต่างๆ โดยอาสาสมัคร คุณสามารถช่วยเหลือได้ที่ {link}"
+i18nInfo: "Calckey กำลังได้รับการแปลเป็นภาษาต่างๆ โดยอาสาสมัคร คุณสามารถช่วยเหลือได้ที่ {link}"
 manageAccessTokens: "การจัดการโทเค็นการเข้าถึง"
 accountInfo: "ข้อมูลบัญชี"
 notesCount: "จำนวนของโน้ต"
@@ -730,7 +729,7 @@ emailNotification: "การแจ้งเตือนทางอีเมล
 publish: "เผยแพร่"
 inChannelSearch: "ค้นหาในช่อง"
 useReactionPickerForContextMenu: "เปิดตัวเลือกปฏิกิริยาเมื่อคลิกขวา"
-typingUsers: "{users} กำลัง/กำลังพิมพ์..."
+typingUsers: "{users} กำลัง"
 jumpToSpecifiedDate: "ข้ามไปยังวันที่เฉพาะเจาะจง"
 showingPastTimeline: "กำลังแสดงผลไทม์ไลน์เก่า"
 clear: "ล้าง"

locales/uk-UA.yml

@@ -8,7 +8,7 @@ notifications: "Сповіщення"
 username: "Ім'я користувача"
 password: "Пароль"
 forgotPassword: "Я забув пароль"
-fetchingAsApObject: "Отримуємо з федіверсу..."
+fetchingAsApObject: "Отримуємо з федіверсу"
 ok: "OK"
 gotIt: "Зрозуміло!"
 cancel: "Скасувати"
@@ -577,7 +577,6 @@ tokenRequested: "Надати доступ до акаунту"
 pluginTokenRequestedDescription: "Цей плагін зможе використовувати дозволи які тут вказані."
 notificationType: "Тип сповіщення"
 edit: "Редагувати"
-useStarForReactionFallback: "Використовувати ★ як запасний варіант, якщо емодзі реакції невідомий"
 emailServer: "Сервер електронної пошти"
 enableEmail: "Увімкнути функцію доставки пошти"
 emailConfigInfo: "Використовується для підтвердження електронної пошти підчас реєстрації, а також для відновлення паролю."
@@ -645,7 +644,7 @@ createNew: "Створити новий"
 optional: "Необов'язково"
 createNewClip: "Створити нотатку"
 public: "Публічний"
-i18nInfo: "Misskey перекладається на різні мови волонтерами. Ви можете допомогти: {link}"
+i18nInfo: "Calckey перекладається на різні мови волонтерами. Ви можете допомогти: {link}"
 manageAccessTokens: "Керування токенами доступу"
 accountInfo: "Інформація про акаунт"
 notesCount: "Кількість нотаток"
@@ -940,28 +939,26 @@ _time:
   hour: "г"
   day: "д"
 _tutorial:
-  title: "Як користуватись Misskey"
+  title: "Як використовувати Calckey"
   step1_1: "Ласкаво просимо!"
-  step1_2: "Ця сторінка має назву \"стрічка подій\". На ній з'являються записи користувачів на яких ви підписані."
+  step1_2: "Давайте налаштуємо вас. Ви будете працювати в найкоротші терміни!"
-  step1_3: "Наразі ваша стрічка порожня, оскільки ви ще не написали жодної нотатки і не підписані на інших."
+  step2_1: "Спочатку, будь ласка, заповніть свій профіль"
-  step2_1: "Перш ніж зробити запис або підписатись на когось, спочатку заповніть свій обліковий запис."
+  step2_2: "Надавши деяку інформацію про себе, іншим людям буде легше зрозуміти, чи хочуть вони бачити ваші записи або стежити за вами."
-  step2_2: "Надання деякої інформації про себе дозволить іншим користувачам підписатись на вас."
+  step3_1: "Тепер настав час стежити за деякими людьми!"
-  step3_1: "Ви успішно налаштували свій обліковий запис?"
+  step3_2: "Ваша домашня і соціальна стрічки ґрунтуються на тому, за ким ви стежите, тому для початку спробуйте стежити за кількома акаунтами.\nНатисніть на гурток із плюсом у правому верхньому кутку профілю, щоб стежити за ним."
-  step3_2: "Наступним кроком є написання нотатки. Це можна зробити, натиснувши зображення олівця на екрані."
+  step4_1: "Давайте вийдемо на вас"
-  step3_3: "Після написання вмісту ви можете опублікувати його, натиснувши кнопку у верхньому правому куті форми."
+  step4_2: "Для свого першого повідомлення деякі люди люблять робити {introduction} повідомлення або просте \"Hello world!\""
-  step3_4: "Не знаєте що написати? Спробуйте \"налаштовую свій msky\"!"
+  step5_1: "Тимчасові рамки, скрізь тимчасові рамки!"
-  step4_1: "Ви розмістили свій перший запис?"
+  step5_2: "У вашому екземплярі включені {timelines} різних часових ліній."
-  step4_2: "Ура! Ваш перший запис відображається на вашій стрічці подій."
+  step5_3: "Головна {icon} часова шкала - це шкала, де ви можете бачити повідомлення ваших підписників."
-  step5_1: "Настав час оживити вашу стрічку подій підписавшись на інших користувачів."
+  step5_4: "Місцева {icon} тимчасова шкала - це шкала, де ви можете бачити повідомлення всіх інших користувачів даного екземпляра"
-  step5_2: "{featured} показує популярні записи , а {explore} популярних користувачів з цього інстансу. Спробуйте підписатись на користувача, який вам сподобався!"
+  step5_5: "Тимчасова шкала Рекомендовані {icon} - це шкала, де ви можете бачити повідомлення від інстанцій, рекомендованих адміністраторами."
-  step5_3: "Щоб підписатись на інших користувачів, нажміть на їхнє зображення, а потім на кнопку \"підписатись\"."
+  step5_6: "На часовій шкалі Social {icon} відображаються повідомлення від друзів ваших підписників"
-  step5_4: "Якщо користувач має замок при імені, то йому потрібно буде вручну підтвердити вашу заявку на підписку."
+  step5_7: "Глобальна {icon} часова шкала - це місце, де ви можете бачити повідомлення від усіх інших підключених екземплярів"
-  step6_1: "Тепер ви повинні бачити записи інших користувачів на вашій стрічці подій."
+  step6_1: "Отже, що це за місце?"
-  step6_2: "Також ви можете швидко відповісти, або  \"відреагувати\" на записи інших користувачів."
+  step6_2: "Ну, ви не просто приєдналися до Кальки. Ви приєдналися до порталу в Fediverse, взаємопов'язаної мережі з тисяч серверів, званих \"інстансами\"."
-  step6_3: "Щоб \"відреагувати\", нажміть на знак плюс \"+\" на записі і виберіть емоджі яким ви хочете \"відреагувати\"."
+  step6_3: "Кожен сервер працює по-своєму, і не на всіх серверах працює Calckey. Але цей працює! Це трохи складно, але ви швидко розберетеся"
-  step7_1: "Вітаю! Ви пройшли ознайомлення з Misskey."
+  step6_4: "Тепер ідіть, вивчайте і розважайтеся!"
-  step7_2: "Якщо ви хочете більше дізнатись про Misskey, зайдіть в розділ {help}."
-  step7_3: "Насолоджуйтесь Misskey! 🚀"
 _2fa:
   registerKey: "Зареєструвати новий ключ безпеки"
 _permissions:

locales/vi-VN.yml

@@ -8,7 +8,7 @@ notifications: "Thông báo"
 username: "Tên người dùng"
 password: "Mật khẩu"
 forgotPassword: "Quên mật khẩu"
-fetchingAsApObject: "Đang nạp dữ liệu từ Fediverse..."
+fetchingAsApObject: "Đang nạp dữ liệu từ Fediverse"
 ok: "Đồng ý"
 gotIt: "Đã hiểu!"
 cancel: "Hủy"
@@ -580,7 +580,6 @@ tokenRequested: "Cấp quyền truy cập vào tài khoản"
 pluginTokenRequestedDescription: "Plugin này sẽ có thể sử dụng các quyền được đặt ở đây."
 notificationType: "Loại thông báo"
 edit: "Sửa"
-useStarForReactionFallback: "Dùng ★ nếu emoji biểu cảm không có"
 emailServer: "Email máy chủ"
 enableEmail: "Bật phân phối email"
 emailConfigInfo: "Được dùng để xác minh email của bạn lúc đăng ký hoặc nếu bạn quên mật khẩu của mình"
@@ -650,7 +649,7 @@ createNewClip: "Tạo một ghim mới"
 unclip: "Bỏ ghim"
 confirmToUnclipAlreadyClippedNote: "Bài đăng này là một phần của \"{name}\" ghim. Bạn có muốn bỏ khỏi ghim?"
 public: "Công khai"
-i18nInfo: "Misskey đang được các tình nguyện viên dịch sang nhiều thứ tiếng khác nhau. Bạn có thể hỗ trợ tại {link}."
+i18nInfo: "Calckey đang được các tình nguyện viên dịch sang nhiều thứ tiếng khác nhau. Bạn có thể hỗ trợ tại {link}."
 manageAccessTokens: "Tạo mã truy cập"
 accountInfo: "Thông tin tài khoản"
 notesCount: "Số lượng tút"
@@ -730,7 +729,7 @@ emailNotification: "Thông báo email"
 publish: "Đăng"
 inChannelSearch: "Tìm trong kênh"
 useReactionPickerForContextMenu: "Nhấn chuột phải để mở bộ chọn biểu cảm"
-typingUsers: "{users} đang nhập…"
+typingUsers: "{users} đang nhập"
 jumpToSpecifiedDate: "Đến một ngày cụ thể"
 showingPastTimeline: "Hiện đang hiển thị dòng thời gian cũ"
 clear: "Hoàn lại"
@@ -1181,28 +1180,26 @@ _time:
   hour: "giờ"
   day: "ngày"
 _tutorial:
-  title: "Cách dùng Misskey"
+  title: "How to use Calckey"
-  step1_1: "Xin chào!"
+  step1_1: "Welcome!"
-  step1_2: "Trang này gọi là \"bảng tin\". Nó hiện \"tút\" từ những người mà bạn \"theo dõi\" theo thứ tự thời gian."
+  step1_2: "Let's get you set up. You'll be up and running in no time!"
-  step1_3: "Bảng tin của bạn đang trống, bởi vì bạn chưa đăng tút nào hoặc chưa theo dõi ai."
+  step2_1: "First, please fill out your profile."
-  step2_1: "Hãy hoàn thành việc thiết lập hồ sơ của bạn trước khi viết tút hoặc theo dõi bất kỳ ai."
+  step2_2: "Providing some information about who you are will make it easier for others to tell if they want to see your notes or follow you."
-  step2_2: "Cung cấp một số thông tin giới thiệu bạn là ai sẽ giúp người khác dễ dàng biết được họ muốn đọc tút hay theo dõi bạn."
+  step3_1: "Now time to follow some people!"
-  step3_1: "Hoàn thành thiết lập hồ sơ của bạn?"
+  step3_2: "Your home and social timelines are based off of who you follow, so try following a couple accounts to get started.\nClick the plus circle on the top right of a profile to follow them."
-  step3_2: "Sau đó, hãy thử đăng một tút tiếp theo. Bạn có thể làm như vậy bằng cách nhấn vào nút có biểu tượng bút chì trên màn hình."
+  step4_1: "Let's get you out there."
-  step3_3: "Nhập nội dung vào khung soạn thảo và nhấn nút đăng ở góc trên."
+  step4_2: "For your first post, some people like to made a {introduction} post or a simple \"Hello world!\""
-  step3_4: "Chưa biết nói gì? Thử \"Tôi mới tham gia Misskey\"!"
+  step5_1: "Timelines, timelines everywhere!"
-  step4_1: "Đăng xong tút đầu tiên của bạn?"
+  step5_2: "Your instance has {timelines} different timelines enabled."
-  step4_2: "De! Tút đầu tiên của bạn đã hiện trên bảng tin."
+  step5_3: "The Home {icon} timeline is where you can see posts from your followers."
-  step5_1: "Bây giờ, hãy thử làm cho bảng tin của bạn sinh động hơn bằng cách theo dõi những người khác."
+  step5_4: "The Local {icon} timeline is where you can see posts from everyone else on this instance."
-  step5_2: "{feature} sẽ hiển thị cho bạn các tút nổi bật trên máy chủ này. {explore} sẽ cho phép bạn tìm thấy những người dùng thú vị. Hãy thử tìm những người bạn muốn theo dõi ở đó!"
+  step5_5: "The Recommended {icon} timeline is where you can see posts from instances the admins recommend."
-  step5_3: "Để theo dõi những người dùng khác, hãy nhấn vào ảnh đại diện của họ và nhấn nút \"Theo dõi\" trên hồ sơ của họ."
+  step5_6: "The Social {icon} timeline is where you can see posts from friends of your followers."
-  step5_4: "Nếu người dùng khác có biểu tượng ổ khóa bên cạnh tên của họ, có thể mất một khoảng thời gian để người dùng đó phê duyệt yêu cầu theo dõi của bạn theo cách thủ công."
+  step5_7: "The Global {icon} timeline is where you can see posts from every other connected instance."
-  step6_1: "Bạn sẽ có thể xem tút của những người dùng khác trên bảng tin của mình ngay bây giờ."
+  step6_1: "So, what is this place?"
-  step6_2: "Bạn cũng có thể đặt \"biểu cảm\" trên tút của người khác để phản hồi nhanh chúng."
+  step6_2: "Well, you didn't just join Calckey. You joined a portal to the Fediverse, an interconnected network of thousands of servers, called \"instances\"."
-  step6_3: "Để đính kèm \"biểu cảm\", hãy nhấn vào dấu \"+\" trên tút của người dùng khác rồi chọn biểu tượng cảm xúc mà bạn muốn dùng."
+  step6_3: "Each server works in different ways, and not all servers run Calckey. This one does though! It's a bit complicated, but you'll get the hang of it in no time."
-  step7_1: "Xin chúc mừng! Bây giờ bạn đã hoàn thành phần hướng dẫn cơ bản của Misskey."
+  step6_4: "Now go, explore, and have fun!"
-  step7_2: "Nếu bạn muốn tìm hiểu thêm về Misskey, hãy thử phần {help}."
-  step7_3: "Bây giờ, chúc may mắn và vui vẻ với Misskey! 🚀"
 _2fa:
   alreadyRegistered: "Bạn đã đăng ký thiết bị xác minh 2 bước."
   registerDevice: "Đăng ký một thiết bị"