Add executionId and client IP to execution headers

Fix: Remove external dependnecies (unnessessary)

.coderabbit.yaml

@@ -0,0 +1,17 @@
+reviews:
+  path_filters:
+    - "!app/config/specs/**"
+    - "!docs/examples/**"
+    - "!docs/references/**"
+    - "!docs/sdks/**"
+  auto_review:
+    base_branches:
+      - main
+      - 1.6.x
+      - 1.7.x
+      - 1.8.x
+  high_level_summary: false
+  poem: false
+  sequence_diagrams: false
+  collapse_walkthrough: true
+  changed_files_summary: false

.env

@@ -2,6 +2,7 @@ _APP_ENV=development
 _APP_EDITION=self-hosted
 _APP_LOCALE=en
 _APP_WORKER_PER_CORE=6
+_APP_COMPRESSION_MIN_SIZE_BYTES=1024
 _APP_CONSOLE_WHITELIST_ROOT=disabled
 _APP_CONSOLE_WHITELIST_EMAILS=
 _APP_CONSOLE_SESSION_ALERTS=enabled
@@ -14,14 +15,22 @@ _APP_SYSTEM_TEAM_EMAIL=team@appwrite.io
 _APP_EMAIL_SECURITY=security@appwrite.io
 _APP_EMAIL_CERTIFICATES=certificates@appwrite.io
 _APP_SYSTEM_RESPONSE_FORMAT=
+_APP_CUSTOM_DOMAIN_DENY_LIST=
 _APP_OPTIONS_ABUSE=disabled
 _APP_OPTIONS_ROUTER_PROTECTION=disabled
 _APP_OPTIONS_FORCE_HTTPS=disabled
-_APP_OPTIONS_FUNCTIONS_FORCE_HTTPS=disabled
+_APP_OPTIONS_ROUTER_FORCE_HTTPS=disabled
 _APP_OPENSSL_KEY_V1=your-secret-key
+_APP_DNS=8.8.8.8
 _APP_DOMAIN=traefik
+_APP_CONSOLE_DOMAIN=localhost
 _APP_DOMAIN_FUNCTIONS=functions.localhost
-_APP_DOMAIN_TARGET=localhost
+_APP_DOMAIN_SITES=sites.localhost
+_APP_DOMAIN_TARGET_CNAME=test.localhost
+_APP_DOMAIN_TARGET_A=127.0.0.1
+_APP_DOMAIN_TARGET_AAAA=::1
+_APP_DOMAIN_TARGET_CAA=digicert.com
+_APP_RULES_FORMAT=md5
 _APP_REDIS_HOST=redis
 _APP_REDIS_PORT=6379
 _APP_REDIS_PASS=
@@ -37,6 +46,7 @@ _APP_STORAGE_S3_ACCESS_KEY=
 _APP_STORAGE_S3_SECRET=
 _APP_STORAGE_S3_REGION=us-east-1
 _APP_STORAGE_S3_BUCKET=
+_APP_STORAGE_S3_ENDPOINT=
 _APP_STORAGE_DO_SPACES_ACCESS_KEY=
 _APP_STORAGE_DO_SPACES_SECRET=
 _APP_STORAGE_DO_SPACES_REGION=us-east-1
@@ -66,24 +76,29 @@ _APP_SMS_FROM=+123456789
 _APP_SMS_PROJECTS_DENY_LIST=
 _APP_STORAGE_LIMIT=30000000
 _APP_STORAGE_PREVIEW_LIMIT=20000000
-_APP_FUNCTIONS_SIZE_LIMIT=30000000
+_APP_COMPUTE_SIZE_LIMIT=30000000
 _APP_FUNCTIONS_TIMEOUT=900
-_APP_FUNCTIONS_BUILD_TIMEOUT=900
-_APP_FUNCTIONS_CPUS=8
-_APP_FUNCTIONS_MEMORY=8192
-_APP_FUNCTIONS_INACTIVE_THRESHOLD=600
-_APP_FUNCTIONS_MAINTENANCE_INTERVAL=600
-_APP_FUNCTIONS_RUNTIMES_NETWORK=runtimes
+_APP_SITES_TIMEOUT=30
+_APP_COMPUTE_BUILD_TIMEOUT=900
+_APP_COMPUTE_CPUS=8
+_APP_COMPUTE_MEMORY=8192
+_APP_COMPUTE_INACTIVE_THRESHOLD=600
+_APP_COMPUTE_MAINTENANCE_INTERVAL=600
+_APP_COMPUTE_RUNTIMES_NETWORK=runtimes
 _APP_EXECUTOR_SECRET=your-secret-key
-_APP_EXECUTOR_HOST=http://proxy/v1
-_APP_FUNCTIONS_RUNTIMES=php-8.0,node-18.0,python-3.9,ruby-3.1
+_APP_EXECUTOR_HOST=http://exc1/v1
+_APP_BROWSER_HOST=http://appwrite-browser:3000/v1
+_APP_FUNCTIONS_RUNTIMES=node-22
+_APP_SITES_RUNTIMES=static-1,node-22
 _APP_MAINTENANCE_INTERVAL=86400
-_APP_MAINTENANCE_DELAY=
+_APP_MAINTENANCE_START_TIME=12:00
 _APP_MAINTENANCE_RETENTION_CACHE=2592000
 _APP_MAINTENANCE_RETENTION_EXECUTION=1209600
 _APP_MAINTENANCE_RETENTION_ABUSE=86400
 _APP_MAINTENANCE_RETENTION_AUDIT=1209600
+_APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE=15778800
 _APP_USAGE_AGGREGATION_INTERVAL=30
+_APP_STATS_RESOURCES_INTERVAL=30
 _APP_MAINTENANCE_RETENTION_USAGE_HOURLY=8640000
 _APP_MAINTENANCE_RETENTION_SCHEDULES=86400
 _APP_USAGE_STATS=enabled
@@ -107,3 +122,5 @@ _APP_MESSAGE_EMAIL_TEST_DSN=
 _APP_MESSAGE_PUSH_TEST_DSN=
 _APP_WEBHOOK_MAX_FAILED_ATTEMPTS=10
 _APP_PROJECT_REGIONS=default
+_APP_FUNCTIONS_CREATION_ABUSE_LIMIT=5000
+_APP_STATS_USAGE_DUAL_WRITING_DBS=database_db_main

.github/workflows/benchmark.yml

@@ -0,0 +1,121 @@
+name: Benchmark
+concurrency:
+  group: '${{ github.workflow }}-${{ github.ref }}'
+  cancel-in-progress: true
+env:
+  IMAGE: appwrite-dev
+  CACHE_KEY: 'appwrite-dev-${{ github.event.pull_request.head.sha }}'
+'on':
+  - pull_request
+jobs:
+  setup:
+    name: Setup & Build Appwrite Image
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Build Appwrite
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          push: false
+          tags: '${{ env.IMAGE }}'
+          load: true
+          cache-from: type=gha
+          cache-to: 'type=gha,mode=max'
+          outputs: 'type=docker,dest=/tmp/${{ env.IMAGE }}.tar'
+          build-args: |
+            DEBUG=false
+            TESTING=true
+            VERSION=dev
+      - name: Cache Docker Image
+        uses: actions/cache@v4
+        with:
+          key: '${{ env.CACHE_KEY }}'
+          path: '/tmp/${{ env.IMAGE }}.tar'
+  benchmarking:
+    name: Benchmark
+    runs-on: ubuntu-latest
+    needs: setup
+    permissions:
+      pull-requests: write
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Load Cache
+        uses: actions/cache@v4
+        with:
+          key: '${{ env.CACHE_KEY }}'
+          path: '/tmp/${{ env.IMAGE }}.tar'
+          fail-on-cache-miss: true
+      - name: Load and Start Appwrite
+        run: |
+          sed -i 's/traefik/localhost/g' .env
+          docker load --input /tmp/${{ env.IMAGE }}.tar
+          docker compose up -d
+          sleep 10
+      - name: Install Oha
+        run: |
+          echo "deb [signed-by=/usr/share/keyrings/azlux-archive-keyring.gpg] http://packages.azlux.fr/debian/ stable main" | sudo tee /etc/apt/sources.list.d/azlux.list
+          sudo wget -O /usr/share/keyrings/azlux-archive-keyring.gpg https://azlux.fr/repo.gpg
+          sudo apt update
+          sudo apt install oha
+          oha --version
+      - name: Benchmark PR
+        run: 'oha -z 180s http://localhost/v1/health/version --output-format json > benchmark.json'
+      - name: Cleaning
+        run: docker compose down -v
+      - name: Installing latest version
+        run: |
+          rm docker-compose.yml
+          rm .env
+          curl https://appwrite.io/install/compose -o docker-compose.yml
+          curl https://appwrite.io/install/env -o .env
+          sed -i 's/_APP_OPTIONS_ABUSE=enabled/_APP_OPTIONS_ABUSE=disabled/g' .env
+          docker compose up -d
+          sleep 10
+      - name: Benchmark Latest
+        run: oha -z 180s http://localhost/v1/health/version --output-format json > benchmark-latest.json
+      - name: Prepare comment
+        run: |
+          echo '## :sparkles: Benchmark results' > benchmark.txt
+          echo ' ' >> benchmark.txt
+          echo "- Requests per second: $(jq -r '.summary.requestsPerSec|tonumber?|floor|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark.json)" >> benchmark.txt
+          echo "- Requests with 200 status code: $(jq -r '.statusCodeDistribution."200"|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark.json)" >> benchmark.txt
+          echo "- P99 latency: $(jq -r '.latencyPercentiles.p99' benchmark.json )" >> benchmark.txt
+          echo " " >> benchmark.txt
+          echo " " >> benchmark.txt
+          echo "## :zap:  Benchmark Comparison" >> benchmark.txt
+          echo " " >> benchmark.txt
+          echo "| Metric | This PR | Latest version | "  >> benchmark.txt
+          echo "| --- | --- | --- | "  >> benchmark.txt
+          echo "| RPS | $(jq -r '.summary.requestsPerSec|tonumber?|floor|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark.json) | $(jq -r '.summary.requestsPerSec|tonumber|floor|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark-latest.json) | "  >> benchmark.txt
+          echo "| 200 | $(jq -r '.statusCodeDistribution."200"|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark.json) | $(jq -r '.statusCodeDistribution."200"|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark-latest.json) | "  >> benchmark.txt
+          echo "| P99 | $(jq -r '.latencyPercentiles.p99' benchmark.json ) | $(jq -r '.latencyPercentiles.p99' benchmark-latest.json ) | "  >> benchmark.txt
+      - name: Save results
+        uses: actions/upload-artifact@v4
+        if: '${{ !cancelled() }}'
+        with:
+          name: benchmark.json
+          path: benchmark.json
+          retention-days: 7
+      - name: Find Comment
+        if: github.event.pull_request.head.repo.full_name == github.repository
+        uses: peter-evans/find-comment@v3
+        id: fc
+        with:
+          issue-number: '${{ github.event.pull_request.number }}'
+          comment-author: 'github-actions[bot]'
+          body-includes: Benchmark results
+      - name: Comment on PR
+        if: github.event.pull_request.head.repo.full_name == github.repository
+        uses: peter-evans/create-or-update-comment@v4
+        with:
+          comment-id: '${{ steps.fc.outputs.comment-id }}'
+          issue-number: '${{ github.event.pull_request.number }}'
+          body-path: benchmark.txt
+          edit-mode: replace

.github/workflows/cleanup-cache.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         
       - name: Cleanup
         run: |

.github/workflows/codeql-analysis.yml

@@ -13,8 +13,13 @@ on:
   schedule:
     - cron: '0 16 * * 0'
 
+permissions:
+  contents: read
+
 jobs:
   analyze:
+    permissions:
+      security-events: write
     name: Analyze
     runs-on: ubuntu-latest
 
@@ -29,7 +34,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.

.github/workflows/linter.yml

@@ -12,7 +12,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 2
 

.github/workflows/publish.yml

@@ -12,7 +12,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 2
         submodules: recursive
@@ -26,7 +26,7 @@ jobs:
     - name: Login to Docker Hub
       uses: docker/login-action@v2
       with:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        username: ${{ vars.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
 
     - name: Extract metadata (tags, labels) for Docker

.github/workflows/release.yml

@@ -11,7 +11,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.
@@ -28,7 +28,7 @@ jobs:
     - name: Login to Docker Hub
       uses: docker/login-action@v2
       with:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        username: ${{ vars.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
 
     - name: Extract metadata (tags, labels) for Docker

.github/workflows/sdk-preview.yml

@@ -0,0 +1,54 @@
+name: "SDK Preview"
+
+on:
+  pull_request:
+    paths:
+      - 'app/config/specs/*-latest-console.json'
+  workflow_dispatch:
+    inputs:
+      platform:
+        type: choice
+        description: "Platform to build"
+        options:
+          - client
+          - server
+
+jobs:
+  setup:
+    name: Setup & Build SDK
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set SDK type
+        id: set-sdk
+        run: |
+          PLATFORM="${{ github.event.inputs.platform }}"
+          if [ -z "$PLATFORM" ]; then
+            PLATFORM="console"
+          fi
+          if [ "$PLATFORM" = "server" ]; then
+            echo "sdk_type=nodejs" >> $GITHUB_OUTPUT
+          else
+            echo "sdk_type=web" >> $GITHUB_OUTPUT
+          fi
+          echo "platform=$PLATFORM" >> $GITHUB_OUTPUT
+        
+      - name: Load and Start Appwrite
+        run: |
+          docker compose build
+          docker compose up -d
+          docker compose exec appwrite sdks --platform=${{ steps.set-sdk.outputs.platform }} --sdk=${{ steps.set-sdk.outputs.sdk_type }} --version=latest --git=no
+          sudo chown -R $USER:$USER ./app/sdks/${{ steps.set-sdk.outputs.platform }}-${{ steps.set-sdk.outputs.sdk_type }}
+          
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - name: Build and Publish SDK
+        working-directory: ./app/sdks/console-web
+        run: |
+            npm install
+            npm run build
+            npx pkg-pr-new publish --comment=update

.github/workflows/static-analysis.yml

@@ -0,0 +1,21 @@
+name: "Static code analysis"
+
+on: [pull_request]
+jobs:
+  lint:
+    name: CodeQL
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Check out the repo
+      uses: actions/checkout@v4
+
+    - name: Run CodeQL
+      run: |
+        docker run --rm -v $PWD:/app composer:2.6 sh -c \
+        "composer install --profile --ignore-platform-reqs && composer check"
+    
+    - name: Run Locale check
+      run: |
+        docker run --rm -v $PWD:/app node:24-alpine sh -c \
+        "cd /app/.github/workflows/static-analysis/locale && node index.js"

.github/workflows/static-analysis/locale/index.js

@@ -0,0 +1,115 @@
+/*
+ * Look into all local files, and collect unique keys.
+ * Ensure fallback locale (English) has translation for all keys.
+ * If configured as `const strict = true`, all locales will be checked to include all keys.
+ */
+
+import { readdir, readFile } from "fs/promises";
+import { join, dirname } from "path";
+import { fileURLToPath } from "url";
+
+const config = {
+  strict: false,
+  fallbackLocale: "en.json",
+};
+
+(async () => {
+  try {
+    // Prepare current directory equivalent in ES modules
+    const __filename = fileURLToPath(import.meta.url);
+    const __dirname = dirname(__filename);
+
+    const translationsPath = join(
+      __dirname,
+      "../../../../app/config/locale/translations",
+    );
+
+    const files = (await readdir(translationsPath)).filter((file) =>
+      file.endsWith(".json"),
+    );
+
+    if (files.length === 0) {
+      console.error("No translation files found in ", translationsPath);
+      process.exit(1);
+    }
+
+    // Check if fallback locale exists
+    if (!files.includes(config.fallbackLocale)) {
+      console.error(`Fallback locale file ${config.fallbackLocale} not found`);
+      process.exit(1);
+    }
+
+    console.log(
+      `Found ${files.length} translation files in ${translationsPath}`,
+    );
+
+    // Collect all unique keys from all translation files
+    const allKeys = new Set();
+
+    for (const file of files) {
+      const filePath = join(translationsPath, file);
+      const content = await readFile(filePath, "utf8");
+      const translations = JSON.parse(content);
+
+      // Add all keys from this file
+      Object.keys(translations).forEach((key) => allKeys.add(key));
+    }
+
+    console.log(`Total unique keys found across all locales: ${allKeys.size}`);
+
+    const localesToCheck = [];
+    if (config.strict) {
+      localesToCheck.push(...files);
+    } else {
+      localesToCheck.push(config.fallbackLocale);
+    }
+
+    let errorsCount = 0;
+    let missingLocaleCount = 0;
+
+    for (const localeToCheck of localesToCheck) {
+      // Read locale
+      const path = join(translationsPath, localeToCheck);
+      const content = await readFile(path, "utf8");
+      const translations = JSON.parse(content);
+
+      // Check for missing keys in the locale
+      const keys = new Set(Object.keys(translations));
+      console.log(`Keys in locale (${localeToCheck}): ${keys.size}`);
+
+      const missingKeys = [];
+      for (const key of allKeys) {
+        if (!keys.has(key)) {
+          missingKeys.push(key);
+        }
+      }
+
+      if (missingKeys.length > 0) {
+        console.error(
+          `\nERROR: Fallback locale (${localeToCheck}) is missing ${missingKeys.length} key(s):`,
+        );
+        missingKeys.sort().forEach((key) => {
+          console.error(`  - ${key}`);
+        });
+        console.error(
+          `\nTo fix this issue, add the missing keys to ${translationsPath}/${localeToCheck}`,
+        );
+        errorsCount++;
+        missingLocaleCount += missingKeys.length;
+      } else {
+        console.log(
+          `\nSUCCESS: Fallback locale (${localeToCheck}) contains all ${allKeys.size} keys.`,
+        );
+      }
+    }
+
+    if (errorsCount > 0) {
+      console.log(`\n${missingLocaleCount} locales missing found across ${errorsCount} locales.`);
+      process.exit(1);
+    }
+  } catch (error) {
+    console.error("Unexpected error.");
+    console.error(error);
+    process.exit(1);
+  }
+})();

.github/workflows/static-analysis/locale/package.json

@@ -0,0 +1,13 @@
+{
+  "name": "static-analysis-locale",
+  "version": "1.0.0",
+  "type": "module",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "description": ""
+}

.github/workflows/tests.yml

@@ -8,23 +8,47 @@ env:
   IMAGE: appwrite-dev
   CACHE_KEY: appwrite-dev-${{ github.event.pull_request.head.sha }}
 
-on: [pull_request]
+on: [ pull_request ]
 
 jobs:
+  check_database_changes:
+    name: Check if utopia-php/database changed
+    runs-on: ubuntu-latest
+    outputs:
+      database_changed: ${{ steps.check.outputs.database_changed }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Fetch base branch
+        run: git fetch origin ${{ github.event.pull_request.base.ref }}
+
+      - name: Check for utopia-php/database changes
+        id: check
+        run: |
+          if git diff origin/${{ github.event.pull_request.base.ref }} HEAD -- composer.lock | grep -q '"name": "utopia-php/database"'; then
+            echo "Database version changed, going to run all mode tests."
+            echo "database_changed=true" >> "$GITHUB_ENV"
+            echo "database_changed=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "database_changed=false" >> "$GITHUB_ENV"
+            echo "database_changed=false" >> "$GITHUB_OUTPUT"
+          fi
+
   setup:
     name: Setup & Build Appwrite Image
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Build Appwrite
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: false
@@ -39,7 +63,7 @@ jobs:
             VERSION=dev
 
       - name: Cache Docker Image
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           key: ${{ env.CACHE_KEY }}
           path: /tmp/${{ env.IMAGE }}.tar
@@ -51,10 +75,10 @@ jobs:
 
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Load Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           key: ${{ env.CACHE_KEY }}
           path: /tmp/${{ env.IMAGE }}.tar
@@ -66,6 +90,9 @@ jobs:
           docker compose up -d
           sleep 10
 
+      - name: Logs
+        run: docker compose logs appwrite
+
       - name: Doctor
         run: docker compose exec -T appwrite doctor
 
@@ -81,10 +108,10 @@ jobs:
     needs: setup
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Load Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           key: ${{ env.CACHE_KEY }}
           path: /tmp/${{ env.IMAGE }}.tar
@@ -95,14 +122,106 @@ jobs:
           docker load --input /tmp/${{ env.IMAGE }}.tar
           docker compose up -d
           sleep 10
+          
+      - name: Wait for Open Runtimes
+        timeout-minutes: 3
+        run: |
+          while ! docker compose logs openruntimes-executor | grep -q "Executor is ready."; do
+            echo "Waiting for Executor to come online"
+            sleep 1
+          done
 
       - name: Run General Tests
         run: docker compose exec -T appwrite test /usr/src/code/tests/e2e/General --debug
 
+      - name: Failure Logs
+        if: failure()
+        run: |
+          echo "=== Appwrite Worker Builds Logs ==="
+          docker compose logs appwrite-worker-builds
+          echo "=== OpenRuntimes Executor Logs ==="
+          docker compose logs openruntimes-executor
+
   e2e_service_test:
     name: E2E Service Test
     runs-on: ubuntu-latest
     needs: setup
+    strategy:
+      fail-fast: false
+      matrix:
+        service: [
+          Account,
+          Avatars,
+          Console,
+          Databases,
+          Functions,
+          FunctionsSchedule,
+          GraphQL,
+          Health,
+          Locale,
+          Projects,
+          Realtime,
+          Sites,
+          Proxy,
+          Storage,
+          Tokens,
+          Teams,
+          Users,
+          Webhooks,
+          VCS,
+          Messaging,
+          Migrations
+        ]
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Load Cache
+        uses: actions/cache@v4
+        with:
+          key: ${{ env.CACHE_KEY }}
+          path: /tmp/${{ env.IMAGE }}.tar
+          fail-on-cache-miss: true
+
+      - name: Load and Start Appwrite
+        run: |
+          docker load --input /tmp/${{ env.IMAGE }}.tar
+          sed -i 's|^_APP_BROWSER_HOST=.*|_APP_BROWSER_HOST=http://invalid-browser/v1|' .env
+          docker compose up -d
+          sleep 30
+
+      - name: Wait for Open Runtimes
+        timeout-minutes: 3
+        run: |
+          while ! docker compose logs openruntimes-executor | grep -q "Executor is ready."; do
+            echo "Waiting for Executor to come online"
+            sleep 1
+          done
+
+      - name: Run ${{ matrix.service }} tests with Project table mode
+        run: |
+          echo "Using project tables"
+          export _APP_DATABASE_SHARED_TABLES=
+          export _APP_DATABASE_SHARED_TABLES_V1=
+
+          docker compose exec -T \
+            -e _APP_DATABASE_SHARED_TABLES \
+            -e _APP_DATABASE_SHARED_TABLES_V1 \
+            appwrite test /usr/src/code/tests/e2e/Services/${{ matrix.service }} --debug --exclude-group devKeys,screenshots
+
+      - name: Failure Logs
+        if: failure()
+        run: |
+          echo "=== Appwrite Worker Builds Logs ==="
+          docker compose logs appwrite-worker-builds
+          echo "=== OpenRuntimes Executor Logs ==="
+          docker compose logs openruntimes-executor
+
+  e2e_shared_mode_test:
+    name: E2E Shared Mode Service Test
+    runs-on: ubuntu-latest
+    needs: [ setup, check_database_changes ]
+    if: needs.check_database_changes.outputs.database_changed == 'true'
     strategy:
       fail-fast: false
       matrix:
@@ -113,25 +232,34 @@ jobs:
             Console,
             Databases,
             Functions,
+            FunctionsSchedule,
             GraphQL,
             Health,
             Locale,
             Projects,
             Realtime,
+            Sites,
+            Proxy,
             Storage,
             Teams,
             Users,
             Webhooks,
             VCS,
             Messaging,
+            Migrations,
+            Tokens
           ]
+        tables-mode: [
+          'Shared V1',
+          'Shared V2',
+        ]
 
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Load Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           key: ${{ env.CACHE_KEY }}
           path: /tmp/${{ env.IMAGE }}.tar
@@ -141,88 +269,231 @@ jobs:
         run: |
           docker load --input /tmp/${{ env.IMAGE }}.tar
           docker compose up -d
-          sleep 25
+          sleep 30
 
-      - name: Run ${{matrix.service}} Tests
-        run: docker compose exec -T appwrite test /usr/src/code/tests/e2e/Services/${{matrix.service}} --debug
+      - name: Wait for Open Runtimes
+        timeout-minutes: 3
+        run: |
+          while ! docker compose logs openruntimes-executor | grep -q "Executor is ready."; do
+            echo "Waiting for Executor to come online"
+            sleep 1
+          done
 
-      - name: Run ${{matrix.service}} Shared Tables Tests
-        run: _APP_DATABASE_SHARED_TABLES=database_db_main docker compose exec -T appwrite test /usr/src/code/tests/e2e/Services/${{matrix.service}} --debug
+      - name: Run ${{ matrix.service }} tests with ${{ matrix.tables-mode }} table mode
+        run: |
+          if [ "${{ matrix.tables-mode }}" == "Shared V1" ]; then
+            echo "Using shared tables V1"
+            export _APP_DATABASE_SHARED_TABLES=database_db_main
+            export _APP_DATABASE_SHARED_TABLES_V1=database_db_main
+          elif [ "${{ matrix.tables-mode }}" == "Shared V2" ]; then
+            echo "Using shared tables V2"
+            export _APP_DATABASE_SHARED_TABLES=database_db_main
+            export _APP_DATABASE_SHARED_TABLES_V1=
+          fi
+      
+          docker compose exec -T \
+            -e _APP_DATABASE_SHARED_TABLES \
+            -e _APP_DATABASE_SHARED_TABLES_V1 \
+            appwrite test /usr/src/code/tests/e2e/Services/${{ matrix.service }} --debug --exclude-group devKeys,screenshots
 
-  benchamrking:
-    name: Benchmark
+      - name: Failure Logs
+        if: failure()
+        run: |
+          echo "=== Appwrite Worker Builds Logs ==="
+          docker compose logs appwrite-worker-builds
+          echo "=== OpenRuntimes Executor Logs ==="
+          docker compose logs openruntimes-executor
+
+  e2e_dev_keys:
+    name: E2E Service Test (Dev Keys)
     runs-on: ubuntu-latest
     needs: setup
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
+      - name: checkout
+        uses: actions/checkout@v4
+
       - name: Load Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           key: ${{ env.CACHE_KEY }}
           path: /tmp/${{ env.IMAGE }}.tar
           fail-on-cache-miss: true
+
       - name: Load and Start Appwrite
         run: |
-          sed -i 's/traefik/localhost/g' .env 
-          docker load --input /tmp/${{ env.IMAGE }}.tar          
+          docker load --input /tmp/${{ env.IMAGE }}.tar
+          sed -i 's/_APP_OPTIONS_ABUSE=disabled/_APP_OPTIONS_ABUSE=enabled/' .env
           docker compose up -d
-          sleep 10
-      - name: Install Oha
+          sleep 30
+
+      - name: Run Projects tests with dev keys in dedicated table mode
         run: |
-          echo "deb [signed-by=/usr/share/keyrings/azlux-archive-keyring.gpg] http://packages.azlux.fr/debian/ stable main" | sudo tee /etc/apt/sources.list.d/azlux.list
-          sudo wget -O /usr/share/keyrings/azlux-archive-keyring.gpg https://azlux.fr/repo.gpg
-          sudo apt update
-          sudo apt install oha
-      - name: Benchmark PR
-        run: oha -z 180s  http://localhost/v1/health/version -j > benchmark.json
-      - name: Cleaning
-        run: docker compose down -v
-      - name: Installing latest version
+          echo "Using project tables"
+          export _APP_DATABASE_SHARED_TABLES=
+          export _APP_DATABASE_SHARED_TABLES_V1=
+
+          docker compose exec -T \
+            -e _APP_DATABASE_SHARED_TABLES \
+            -e _APP_DATABASE_SHARED_TABLES_V1 \
+            appwrite test /usr/src/code/tests/e2e/Services/Projects --debug --group=devKeys
+
+      - name: Failure Logs
+        if: failure()
         run: |
-          rm docker-compose.yml
-          rm .env
-          curl https://appwrite.io/install/compose -o docker-compose.yml
-          curl https://appwrite.io/install/env -o .env
-          sed -i 's/_APP_OPTIONS_ABUSE=enabled/_APP_OPTIONS_ABUSE=disabled/g' .env
+          echo "=== Appwrite Worker Builds Logs ==="
+          docker compose logs appwrite-worker-builds
+          echo "=== OpenRuntimes Executor Logs ==="
+          docker compose logs openruntimes-executor
+
+  e2e_dev_keys_shared_mode:
+    name: E2E Shared Mode Service Test (Dev Keys)
+    runs-on: ubuntu-latest
+    needs: [ setup, check_database_changes ]
+    if: needs.check_database_changes.outputs.database_changed == 'true'
+    strategy:
+      fail-fast: false
+      matrix:
+        tables-mode: [
+          'Shared V1',
+          'Shared V2',
+        ]
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+
+      - name: Load Cache
+        uses: actions/cache@v4
+        with:
+          key: ${{ env.CACHE_KEY }}
+          path: /tmp/${{ env.IMAGE }}.tar
+          fail-on-cache-miss: true
+
+      - name: Load and Start Appwrite
+        run: |
+          docker load --input /tmp/${{ env.IMAGE }}.tar
+          sed -i 's/_APP_OPTIONS_ABUSE=disabled/_APP_OPTIONS_ABUSE=enabled/' .env
           docker compose up -d
-          sleep 10
-      - name: Benchmark Latest
-        run: oha -z 180s  http://localhost/v1/health/version -j > benchmark-latest.json
-      - name: Prepare comment
+          sleep 30
+
+      - name: Run Projects tests with dev keys in ${{ matrix.tables-mode }} table mode
         run: |
-          echo '## :sparkles: Benchmark results' > benchmark.txt
-          echo ' ' >> benchmark.txt
-          echo "- Requests per second: $(jq -r '.summary.requestsPerSec|tonumber?|floor|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark.json)" >> benchmark.txt
-          echo "- Requests with 200 status code: $(jq -r '.statusCodeDistribution."200"|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark.json)" >> benchmark.txt
-          echo "- P99 latency: $(jq -r '.latencyPercentiles.p99' benchmark.json )" >> benchmark.txt
-          echo " " >> benchmark.txt
-          echo " " >> benchmark.txt
-          echo "## :zap:  Benchmark Comparison" >> benchmark.txt
-          echo " " >> benchmark.txt
-          echo "| Metric | This PR | Latest version | "  >> benchmark.txt
-          echo "| --- | --- | --- | "  >> benchmark.txt
-          echo "| RPS | $(jq -r '.summary.requestsPerSec|tonumber?|floor|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark.json) | $(jq -r '.summary.requestsPerSec|tonumber|floor|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark-latest.json) | "  >> benchmark.txt
-          echo "| 200 | $(jq -r '.statusCodeDistribution."200"|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark.json) | $(jq -r '.statusCodeDistribution."200"|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark-latest.json) | "  >> benchmark.txt
-          echo "| P99 | $(jq -r '.latencyPercentiles.p99' benchmark.json ) | $(jq -r '.latencyPercentiles.p99' benchmark-latest.json ) | "  >> benchmark.txt
-      - name: Save results
-        uses: actions/upload-artifact@v4
-        if: ${{ !cancelled() }}
+          if [ "${{ matrix.tables-mode }}" == "Shared V1" ]; then
+            echo "Using shared tables V1"
+            export _APP_DATABASE_SHARED_TABLES=database_db_main
+            export _APP_DATABASE_SHARED_TABLES_V1=database_db_main
+          elif [ "${{ matrix.tables-mode }}" == "Shared V2" ]; then
+            echo "Using shared tables V2"
+            export _APP_DATABASE_SHARED_TABLES=database_db_main
+            export _APP_DATABASE_SHARED_TABLES_V1=
+          fi
+
+          docker compose exec -T \
+            -e _APP_DATABASE_SHARED_TABLES \
+            -e _APP_DATABASE_SHARED_TABLES_V1 \
+            appwrite test /usr/src/code/tests/e2e/Services/Projects --debug --group=devKeys
+
+      - name: Failure Logs
+        if: failure()
+        run: |
+          echo "=== Appwrite Worker Builds Logs ==="
+          docker compose logs appwrite-worker-builds
+          echo "=== OpenRuntimes Executor Logs ==="
+          docker compose logs openruntimes-executor
+
+  e2e_screenshots_keys:
+    name: E2E Service Test (Site Screenshots)
+    runs-on: ubuntu-latest
+    needs: setup
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+
+      - name: Load Cache
+        uses: actions/cache@v4
         with:
-          name: benchmark.json
-          path: benchmark.json
-          retention-days: 7
-      - name: Find Comment
-        uses: peter-evans/find-comment@v3
-        id: fc
+          key: ${{ env.CACHE_KEY }}
+          path: /tmp/${{ env.IMAGE }}.tar
+          fail-on-cache-miss: true
+
+      - name: Load and Start Appwrite
+        run: |
+          docker load --input /tmp/${{ env.IMAGE }}.tar
+          sed -i 's/_APP_OPTIONS_ABUSE=disabled/_APP_OPTIONS_ABUSE=enabled/' .env
+          docker compose up -d
+          sleep 30
+
+      - name: Run Site tests with browser connected in dedicated table mode
+        run: |
+          echo "Keeping original value of _APP_BROWSER_HOST"
+          echo "Using project tables"
+          export _APP_DATABASE_SHARED_TABLES=
+          export _APP_DATABASE_SHARED_TABLES_V1=
+
+          docker compose exec -T \
+            -e _APP_DATABASE_SHARED_TABLES \
+            -e _APP_DATABASE_SHARED_TABLES_V1 \
+            appwrite test /usr/src/code/tests/e2e/Services/Sites --debug --group=screenshots
+
+      - name: Failure Logs
+        if: failure()
+        run: |
+          echo "=== Appwrite Worker Builds Logs ==="
+          docker compose logs appwrite-worker-builds
+          echo "=== OpenRuntimes Executor Logs ==="
+          docker compose logs openruntimes-executor
+
+  e2e_screenshots_shared_mode:
+    name: E2E Shared Mode Service Test (Site Screenshots)
+    runs-on: ubuntu-latest
+    needs: [ setup, check_database_changes ]
+    if: needs.check_database_changes.outputs.database_changed == 'true'
+    strategy:
+      fail-fast: false
+      matrix:
+        tables-mode: [
+          'Shared V1',
+          'Shared V2',
+        ]
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+
+      - name: Load Cache
+        uses: actions/cache@v4
         with:
-          issue-number: ${{ github.event.pull_request.number }}
-          comment-author: 'github-actions[bot]'
-          body-includes: Benchmark results
-      - name: Comment on PR
-        uses: peter-evans/create-or-update-comment@v4
-        with:
-          comment-id: ${{ steps.fc.outputs.comment-id }}
-          issue-number: ${{ github.event.pull_request.number }}
-          body-path: benchmark.txt
-          edit-mode: replace
+          key: ${{ env.CACHE_KEY }}
+          path: /tmp/${{ env.IMAGE }}.tar
+          fail-on-cache-miss: true
+
+      - name: Load and Start Appwrite
+        run: |
+          docker load --input /tmp/${{ env.IMAGE }}.tar
+          sed -i 's/_APP_OPTIONS_ABUSE=disabled/_APP_OPTIONS_ABUSE=enabled/' .env
+          docker compose up -d
+          sleep 30
+
+      - name: Run Site tests with browser connected in ${{ matrix.tables-mode }} table mode
+        run: |
+          echo "Keeping original value of _APP_BROWSER_HOST"
+          if [ "${{ matrix.tables-mode }}" == "Shared V1" ]; then
+            echo "Using shared tables V1"
+            export _APP_DATABASE_SHARED_TABLES=database_db_main
+            export _APP_DATABASE_SHARED_TABLES_V1=database_db_main
+          elif [ "${{ matrix.tables-mode }}" == "Shared V2" ]; then
+            echo "Using shared tables V2"
+            export _APP_DATABASE_SHARED_TABLES=database_db_main
+            export _APP_DATABASE_SHARED_TABLES_V1=
+          fi
+
+          docker compose exec -T \
+            -e _APP_DATABASE_SHARED_TABLES \
+            -e _APP_DATABASE_SHARED_TABLES_V1 \
+            appwrite test /usr/src/code/tests/e2e/Services/Sites --debug --group=screenshots
+
+      - name: Failure Logs
+        if: failure()
+        run: |
+          echo "=== Appwrite Worker Builds Logs ==="
+          docker compose logs appwrite-worker-builds
+          echo "=== OpenRuntimes Executor Logs ==="
+          docker compose logs openruntimes-executor

.gitignore

@@ -3,6 +3,7 @@
 /node_modules/
 /tests/resources/storage/
 /tests/resources/functions/**/code.tar.gz
+/tests/resources/sites/**/code.tar.gz
 /app/sdks/*
 /.idea/
 !/.idea/workspace.xml
@@ -15,4 +16,5 @@ app/sdks
 dev/yasd_init.php
 .phpunit.result.cache
 Makefile
-appwrite.json
+appwrite.config.json
+/.zed/

.gitpod.yml

@@ -7,6 +7,7 @@ tasks:
       docker pull composer
     command: |
       docker run --rm --interactive --tty \
+      --user "$(id -u):$(id -g)" \
       --volume $PWD:/app \
       composer install \
       --ignore-platform-reqs \
@@ -23,11 +24,3 @@ vscode:
   extensions:
     - ms-azuretools.vscode-docker
     - zobo.php-intellisense
-
-github:
-  # https://www.gitpod.io/docs/prebuilds#github-specific-configuration
-  prebuilds:
-    # enable for pull requests coming from forks (defaults to false)
-    pullRequestsFromForks: true
-    # add a check to pull requests (defaults to true)
-    addCheck: false

CHANGES.md

@@ -1,3 +1,381 @@
+# Version 1.6.2
+
+## What's Changed
+
+### Notable changes
+
+* Delete git folder to reduce build size in [9076](https://github.com/appwrite/appwrite/pull/9076)
+* Upgrade assistant in [9100](https://github.com/appwrite/appwrite/pull/9100)
+* Use redis adapter for abuse in [9121](https://github.com/appwrite/appwrite/pull/9121)
+* Set base specification CPUs to 0.5 again in [9146](https://github.com/appwrite/appwrite/pull/9146)
+* Add new push message parameters in [9060](https://github.com/appwrite/appwrite/pull/9060)
+* Update audits to include user type in [9211](https://github.com/appwrite/appwrite/pull/9211)
+* Enable HEIC in [9251](https://github.com/appwrite/appwrite/pull/9251)
+* Added teamName to membership redirect url in [9269](https://github.com/appwrite/appwrite/pull/9269)
+* Add support endpoint url for S3 in [9303](https://github.com/appwrite/appwrite/pull/9303)
+* Added RuPay Credit Card Icon in Avatars Service in [5046](https://github.com/appwrite/appwrite/pull/5046)
+* Add figma oauth provider in [9623](https://github.com/appwrite/appwrite/pull/9623)
+* Update console to version 5.2.58 in [9637](https://github.com/appwrite/appwrite/pull/9637)
+
+### Fixes
+
+* Remove failed attribute in [9032](https://github.com/appwrite/appwrite/pull/9032)
+* Fix delete notFound attribute in [9038](https://github.com/appwrite/appwrite/pull/9038)
+* 🇮🇸 Added missing Icelandic translations for email strings. in [4848](https://github.com/appwrite/appwrite/pull/4848)
+* fix doc comment for filter method in [5769](https://github.com/appwrite/appwrite/pull/5769)
+* Delete attribute No throwing Exception on not found in [9157](https://github.com/appwrite/appwrite/pull/9157)
+* Fix VCS identity collision in [9138](https://github.com/appwrite/appwrite/pull/9138)
+* Fix disabling of email-otp when user wants to in [9200](https://github.com/appwrite/appwrite/pull/9200)
+* Ensure user can delete session in [9209](https://github.com/appwrite/appwrite/pull/9209)
+* Fix resend invitation in [9218](https://github.com/appwrite/appwrite/pull/9218)
+* Fix phone number parsing exception handling in [9246](https://github.com/appwrite/appwrite/pull/9246)
+* Fix amazon oauth in [9253](https://github.com/appwrite/appwrite/pull/9253)
+* Fix slack oauth scopes, and updated to v2 in [9228](https://github.com/appwrite/appwrite/pull/9228)
+* Fix forwarded user agent in [9271](https://github.com/appwrite/appwrite/pull/9271)
+* Fix WEBP File Preview Rendering Issue in [9321](https://github.com/appwrite/appwrite/pull/9321)
+* Fix build memory specifications in [9360](https://github.com/appwrite/appwrite/pull/9360)
+* Fix Self Hosting functions by adding missed config in [9373](https://github.com/appwrite/appwrite/pull/9373)
+* Fix resend team invite if already accepted in [9348](https://github.com/appwrite/appwrite/pull/9348)
+* Fix null errors on team invite in [9391](https://github.com/appwrite/appwrite/pull/9391)
+* Fix email (smtp) to multiple recipients in [9243](https://github.com/appwrite/appwrite/pull/9243)
+* Fix stats timing by using receivedAt date when available in [9428](https://github.com/appwrite/appwrite/pull/9428)
+* Make min/max params optional for attribute update in [9387](https://github.com/appwrite/appwrite/pull/9387)
+* Fix blocking of phone sessions when disabled on console in [9447](https://github.com/appwrite/appwrite/pull/9447)
+* Fix logging config in [9467](https://github.com/appwrite/appwrite/pull/9467)
+* Update audit timestamp origin in [9481](https://github.com/appwrite/appwrite/pull/9481)
+* Fix certificates in deletes worker in [9466](https://github.com/appwrite/appwrite/pull/9466)
+* Fix console audits delete in [9547](https://github.com/appwrite/appwrite/pull/9547)
+* Fix migrations in [9633](https://github.com/appwrite/appwrite/pull/9633)
+* Ensure all 4xx errors in OAuth redirect lead to the failure URL in [9679](https://github.com/appwrite/appwrite/pull/9679)
+* Treat 0 as unlimited for CPUs and memory in [9638](https://github.com/appwrite/appwrite/pull/9638)
+* Add contextual dispatch logic to fix high CPU usage in [9687](https://github.com/appwrite/appwrite/pull/9687)
+
+### Miscellaneous
+
+* Merge 1.6.x into feat-custom-cf-hostnames in [8904](https://github.com/appwrite/appwrite/pull/8904)
+* Improve compression param checks in [8922](https://github.com/appwrite/appwrite/pull/8922)
+* upgrade utopia storage in [8930](https://github.com/appwrite/appwrite/pull/8930)
+* Feat migration in [8797](https://github.com/appwrite/appwrite/pull/8797)
+* feat fix web routes in [8962](https://github.com/appwrite/appwrite/pull/8962)
+* Fix no pool access in [9027](https://github.com/appwrite/appwrite/pull/9027)
+* feat: use environment variable to check rules format in [9039](https://github.com/appwrite/appwrite/pull/9039)
+* Update storage.php in [9037](https://github.com/appwrite/appwrite/pull/9037)
+* Upgrade db 0.53.200 in [9050](https://github.com/appwrite/appwrite/pull/9050)
+* Chore: upgrade utopia storage in [9066](https://github.com/appwrite/appwrite/pull/9066)
+* Update usage-dump payload in [9085](https://github.com/appwrite/appwrite/pull/9085)
+* GitHub Workflows security hardening in [3728](https://github.com/appwrite/appwrite/pull/3728)
+* Update add-oauth2-provider.md in [4313](https://github.com/appwrite/appwrite/pull/4313)
+* update readme-cn some doc in [5278](https://github.com/appwrite/appwrite/pull/5278)
+* Add accessibility features in [7042](https://github.com/appwrite/appwrite/pull/7042)
+* Add Appwrite Cloud to read me. in [5445](https://github.com/appwrite/appwrite/pull/5445)
+* Migration throw error in [9092](https://github.com/appwrite/appwrite/pull/9092)
+* Fix usage payload bug in [9097](https://github.com/appwrite/appwrite/pull/9097)
+* chore: replace occurrences of dbForConsole to dbForPlatform in [9096](https://github.com/appwrite/appwrite/pull/9096)
+* fix(realtime): decrement connectionCounter only if connection is known in [9055](https://github.com/appwrite/appwrite/pull/9055)
+* payload bug fix in [9098](https://github.com/appwrite/appwrite/pull/9098)
+* Fix usage payload bug in [9099](https://github.com/appwrite/appwrite/pull/9099)
+* Usage payload debug in [9101](https://github.com/appwrite/appwrite/pull/9101)
+* Usage payload debug in [9103](https://github.com/appwrite/appwrite/pull/9103)
+* Usage payload debug in [9104](https://github.com/appwrite/appwrite/pull/9104)
+* Feat: createFunction abuse labels in [9102](https://github.com/appwrite/appwrite/pull/9102)
+* Docs-create-document in [9105](https://github.com/appwrite/appwrite/pull/9105)
+* Docs: Create document and unknown attribute error messages. in [5427](https://github.com/appwrite/appwrite/pull/5427)
+* Fix: update project accessed at from router and schedulers in [9109](https://github.com/appwrite/appwrite/pull/9109)
+* chore: initial commit in [9111](https://github.com/appwrite/appwrite/pull/9111)
+* chore: optimise webhooks payload in [9115](https://github.com/appwrite/appwrite/pull/9115)
+* Revert "chore: initial commit" in [9117](https://github.com/appwrite/appwrite/pull/9117)
+* chore: fix attribute name in [9118](https://github.com/appwrite/appwrite/pull/9118)
+* Migrate to redis abuse in [9124](https://github.com/appwrite/appwrite/pull/9124)
+* Added webhooks usage stats in [9125](https://github.com/appwrite/appwrite/pull/9125)
+* chore remove abuse cleanup in [9137](https://github.com/appwrite/appwrite/pull/9137)
+* fix: remove abuse delete trigger in [9139](https://github.com/appwrite/appwrite/pull/9139)
+* Remove firebase OAuth API endpoints in [9144](https://github.com/appwrite/appwrite/pull/9144)
+* chore: release client sdks in [9112](https://github.com/appwrite/appwrite/pull/9112)
+* Update general.php in [9155](https://github.com/appwrite/appwrite/pull/9155)
+* feat(swoole): allow configuration override of available cpus in [9177](https://github.com/appwrite/appwrite/pull/9177)
+* Usage databases api read writes addition in [9142](https://github.com/appwrite/appwrite/pull/9142)
+* Fix dead connections in [9190](https://github.com/appwrite/appwrite/pull/9190)
+* Add hostname to audits in [9165](https://github.com/appwrite/appwrite/pull/9165)
+* chore: shifted authphone usage tracking to api calls in [9191](https://github.com/appwrite/appwrite/pull/9191)
+* Revert "Fix dead connections" in [9201](https://github.com/appwrite/appwrite/pull/9201)
+* Add assertEventually to messaging provider logs test in [9192](https://github.com/appwrite/appwrite/pull/9192)
+* feat project sms usage in [9198](https://github.com/appwrite/appwrite/pull/9198)
+* chore: add audit labels to project resources in [9056](https://github.com/appwrite/appwrite/pull/9056)
+* fix sms usage in [9207](https://github.com/appwrite/appwrite/pull/9207)
+* Update database in [9202](https://github.com/appwrite/appwrite/pull/9202)
+* Fix dead connections in [9213](https://github.com/appwrite/appwrite/pull/9213)
+* Revert "Fix dead connections" in [9214](https://github.com/appwrite/appwrite/pull/9214)
+* Add logs db init for consistency in [9163](https://github.com/appwrite/appwrite/pull/9163)
+* Split the collection definitions in [9153](https://github.com/appwrite/appwrite/pull/9153)
+* Log path with populated parameters in [9220](https://github.com/appwrite/appwrite/pull/9220)
+* Add missing scope on function template in [9208](https://github.com/appwrite/appwrite/pull/9208)
+* Add relatedCollection default in [9225](https://github.com/appwrite/appwrite/pull/9225)
+* fix: function usage in [9235](https://github.com/appwrite/appwrite/pull/9235)
+* feat: optimise events payloads in [9232](https://github.com/appwrite/appwrite/pull/9232)
+* Optimise webhook events in [9168](https://github.com/appwrite/appwrite/pull/9168)
+* fix: maintenance job missing type in [9238](https://github.com/appwrite/appwrite/pull/9238)
+* Update Fetch to 0.3.0 in [9245](https://github.com/appwrite/appwrite/pull/9245)
+* Fix maintenance job in [9247](https://github.com/appwrite/appwrite/pull/9247)
+* chore: add missing case for executions in [9248](https://github.com/appwrite/appwrite/pull/9248)
+* Add index dependency exception in [9226](https://github.com/appwrite/appwrite/pull/9226)
+* chore: fix benchmarking test when made from fork in [9233](https://github.com/appwrite/appwrite/pull/9233)
+* Update SDK Generator versions in [9188](https://github.com/appwrite/appwrite/pull/9188)
+* chore: skipped job instead of throwing error in [9250](https://github.com/appwrite/appwrite/pull/9250)
+* Implement new SDK Class on 1.6.x in [9237](https://github.com/appwrite/appwrite/pull/9237)
+* Delete collection before Appwrite's attributes in [9256](https://github.com/appwrite/appwrite/pull/9256)
+* Feat batch usage dump in [9255](https://github.com/appwrite/appwrite/pull/9255)
+* Fix cloud tests in [9261](https://github.com/appwrite/appwrite/pull/9261)
+* Usage: Databases reads writes in [9260](https://github.com/appwrite/appwrite/pull/9260)
+* Update: Latest sdk specs in [9274](https://github.com/appwrite/appwrite/pull/9274)
+* Revert "Feat batch usage dump" in [9276](https://github.com/appwrite/appwrite/pull/9276)
+* feat: add fast2SMS adapter in [9263](https://github.com/appwrite/appwrite/pull/9263)
+* Update Sdk Generator dependency in [9280](https://github.com/appwrite/appwrite/pull/9280)
+* Transformed at addition in [9281](https://github.com/appwrite/appwrite/pull/9281)
+* Docs: clarify update endpoints only work on draft messages in [9236](https://github.com/appwrite/appwrite/pull/9236)
+* Update sdk generator dependency in [9282](https://github.com/appwrite/appwrite/pull/9282)
+* Revert "Transformed at addition" in [9284](https://github.com/appwrite/appwrite/pull/9284)
+* replaced init for cloud link in [9285](https://github.com/appwrite/appwrite/pull/9285)
+* Add transformed at in [9289](https://github.com/appwrite/appwrite/pull/9289)
+* Make migrations use Dynamic keys for destination in [9291](https://github.com/appwrite/appwrite/pull/9291)
+* Make sessions limit tests assert eventually in [9298](https://github.com/appwrite/appwrite/pull/9298)
+* Chore update database in [9306](https://github.com/appwrite/appwrite/pull/9306)
+* feat: add AMQP queues in [9287](https://github.com/appwrite/appwrite/pull/9287)
+* fix(test): use assertEventually instead of while(true) in [9308](https://github.com/appwrite/appwrite/pull/9308)
+* fix(certificate worker): events are published without queue name in [9309](https://github.com/appwrite/appwrite/pull/9309)
+* chore: update utopia-php/queue to 0.8.1 in [9311](https://github.com/appwrite/appwrite/pull/9311)
+* chore: update utopia-php/queue to 0.8.2 in [9312](https://github.com/appwrite/appwrite/pull/9312)
+* fix(schedule-tasks): revert back to direct pool usage in [9313](https://github.com/appwrite/appwrite/pull/9313)
+* feat: custom app schemes in [9262](https://github.com/appwrite/appwrite/pull/9262)
+* Revert "feat: custom app schemes" in [9319](https://github.com/appwrite/appwrite/pull/9319)
+* Restore "feat: custom app schemes"" in [9320](https://github.com/appwrite/appwrite/pull/9320)
+* Revert "Restore "feat: custom app schemes""" in [9323](https://github.com/appwrite/appwrite/pull/9323)
+* chore: update dependencies in [9330](https://github.com/appwrite/appwrite/pull/9330)
+* Feat: logs DB in [9272](https://github.com/appwrite/appwrite/pull/9272)
+* Catch invalid index in [9329](https://github.com/appwrite/appwrite/pull/9329)
+* Fix: missing call for image transformations counting in [9342](https://github.com/appwrite/appwrite/pull/9342)
+* Fix drop abuse on shared table project delete in [9346](https://github.com/appwrite/appwrite/pull/9346)
+* Only run all table mode tests on db update in [9338](https://github.com/appwrite/appwrite/pull/9338)
+* Fix: missing periodic metric in [9350](https://github.com/appwrite/appwrite/pull/9350)
+* feat(builds): check if function is blocked before building in [9332](https://github.com/appwrite/appwrite/pull/9332)
+* feat: batch create audit logs in [9347](https://github.com/appwrite/appwrite/pull/9347)
+* Chore: Update migrations in [9355](https://github.com/appwrite/appwrite/pull/9355)
+* Fix: metric time was not being written to DB in [9354](https://github.com/appwrite/appwrite/pull/9354)
+* Fix patch index validation in [9356](https://github.com/appwrite/appwrite/pull/9356)
+* Fix image trnasformation metrics in [9370](https://github.com/appwrite/appwrite/pull/9370)
+* Use batch delete in worker in [9375](https://github.com/appwrite/appwrite/pull/9375)
+* Fix Model Platform is missing response key: store  in [9361](https://github.com/appwrite/appwrite/pull/9361)
+* Feat key segmented usage in [9336](https://github.com/appwrite/appwrite/pull/9336)
+* Feat messaging metrics in [9353](https://github.com/appwrite/appwrite/pull/9353)
+* Fix removed audits for shared v2 in [9388](https://github.com/appwrite/appwrite/pull/9388)
+* chore: bump utopia-php/image to 0.8.0 in [9390](https://github.com/appwrite/appwrite/pull/9390)
+* Fix outdated CLI commands in documentation in [9122](https://github.com/appwrite/appwrite/pull/9122)
+* disable logs display in [9398](https://github.com/appwrite/appwrite/pull/9398)
+* Log batches per project in [9403](https://github.com/appwrite/appwrite/pull/9403)
+* Batch per project in [9410](https://github.com/appwrite/appwrite/pull/9410)
+* Fix: stats resources only queue projects accessed in last 3 hours in [9411](https://github.com/appwrite/appwrite/pull/9411)
+* Track options requests in [9397](https://github.com/appwrite/appwrite/pull/9397)
+* chore: bump docker-base in [9406](https://github.com/appwrite/appwrite/pull/9406)
+* refactor: migrate Realtime::send calls to queueForRealtime in [9325](https://github.com/appwrite/appwrite/pull/9325)
+* Revert "Fix: stats resources only queue projects accessed in last 3 hours" in [9424](https://github.com/appwrite/appwrite/pull/9424)
+* Remove usage and usage dump in favor of stats-usage and stats-usage-dump in [9339](https://github.com/appwrite/appwrite/pull/9339)
+* Fix: disable dual writing in [9429](https://github.com/appwrite/appwrite/pull/9429)
+* Disable transformedAt update for console users in [9425](https://github.com/appwrite/appwrite/pull/9425)
+* chore: add image transformation stats to usage endpoint in [9393](https://github.com/appwrite/appwrite/pull/9393)
+* chore: added timeout to deployment builds in tests in [9426](https://github.com/appwrite/appwrite/pull/9426)
+* fix: model for image transformations in usage project in [9442](https://github.com/appwrite/appwrite/pull/9442)
+* Feat: calculate database storage in stats-resources in [9443](https://github.com/appwrite/appwrite/pull/9443)
+* Activities batch writes in [9438](https://github.com/appwrite/appwrite/pull/9438)
+* chore: bump cache 0.12.x in [9412](https://github.com/appwrite/appwrite/pull/9412)
+* chore: queue console project for maintenance delete in [9479](https://github.com/appwrite/appwrite/pull/9479)
+* chore: added logsdb for deletes worker in [9462](https://github.com/appwrite/appwrite/pull/9462)
+* Feat: calculate and log time taken for each project in [9491](https://github.com/appwrite/appwrite/pull/9491)
+* chore: update initializing dbForLogs in [9494](https://github.com/appwrite/appwrite/pull/9494)
+* Feat bulk audit delete in [9487](https://github.com/appwrite/appwrite/pull/9487)
+* Prepare 1.6.2 release in [9499](https://github.com/appwrite/appwrite/pull/9499)
+* Regenerate specs in [9497](https://github.com/appwrite/appwrite/pull/9497)
+* Regenerate examples in [9498](https://github.com/appwrite/appwrite/pull/9498)
+* chore: bump sdk in [9414](https://github.com/appwrite/appwrite/pull/9414)
+* update queue to 0.9.* in [9505](https://github.com/appwrite/appwrite/pull/9505)
+* Feat improve delete queries in [9507](https://github.com/appwrite/appwrite/pull/9507)
+* Feat: Add rule attributes in [9508](https://github.com/appwrite/appwrite/pull/9508)
+* Sync main into 1.6.x in [9496](https://github.com/appwrite/appwrite/pull/9496)
+* Bump console to version 5.2.53 in [9495](https://github.com/appwrite/appwrite/pull/9495)
+* Prepare 1.6.1 release in [9294](https://github.com/appwrite/appwrite/pull/9294)
+* Improve delete ordering in [9512](https://github.com/appwrite/appwrite/pull/9512)
+* Cleanups in [9511](https://github.com/appwrite/appwrite/pull/9511)
+* Feat dynamic regions in [9408](https://github.com/appwrite/appwrite/pull/9408)
+* Feat env vars to system lib in [9515](https://github.com/appwrite/appwrite/pull/9515)
+* Feat: domains count in [9514](https://github.com/appwrite/appwrite/pull/9514)
+* Migration read from db in [9529](https://github.com/appwrite/appwrite/pull/9529)
+* feat: add pool telemetry in [9530](https://github.com/appwrite/appwrite/pull/9530)
+* Disable PDO persistence since we manage our own pool in [9526](https://github.com/appwrite/appwrite/pull/9526)
+* chore: set min operations to 1 for reads and writes in [9536](https://github.com/appwrite/appwrite/pull/9536)
+* Remove default region in [9430](https://github.com/appwrite/appwrite/pull/9430)
+* Use cursor pagination with bigger limit for maintenance project loop in [9546](https://github.com/appwrite/appwrite/pull/9546)
+* chore: stop tests on failure in [9525](https://github.com/appwrite/appwrite/pull/9525)
+* chore: only update total count for privileged users in [9554](https://github.com/appwrite/appwrite/pull/9554)
+* refactor: initialization of audit retention in [9563](https://github.com/appwrite/appwrite/pull/9563)
+* Delete worker queries fixes in [9523](https://github.com/appwrite/appwrite/pull/9523)
+* Bump database 0.62.x in [9568](https://github.com/appwrite/appwrite/pull/9568)
+* Fix: schedules region filtering in [9577](https://github.com/appwrite/appwrite/pull/9577)
+* Deletes worker fix selects for pagination in [9578](https://github.com/appwrite/appwrite/pull/9578)
+* Add $permissions for delete documents selects in [9579](https://github.com/appwrite/appwrite/pull/9579)
+* chore(audits): return queue pre-fetch results in [9533](https://github.com/appwrite/appwrite/pull/9533)
+* Revert "chore(audits): return queue pre-fetch results" in [9586](https://github.com/appwrite/appwrite/pull/9586)
+* Feat multi tenant insert in [9573](https://github.com/appwrite/appwrite/pull/9573)
+* Add order by for cursor in [9588](https://github.com/appwrite/appwrite/pull/9588)
+* Feat update fetch in [9592](https://github.com/appwrite/appwrite/pull/9592)
+* Fix tenant casting in [9598](https://github.com/appwrite/appwrite/pull/9598)
+* Feat update ws in [9602](https://github.com/appwrite/appwrite/pull/9602)
+* Update database in [9603](https://github.com/appwrite/appwrite/pull/9603)
+* Fix: image transformation cache in [9608](https://github.com/appwrite/appwrite/pull/9608)
+* Remove audit payload in [9610](https://github.com/appwrite/appwrite/pull/9610)
+* Sample rate from DSN in [9559](https://github.com/appwrite/appwrite/pull/9559)
+* Restrict role change for sole org owner in [9615](https://github.com/appwrite/appwrite/pull/9615)
+* chore: update php image to 0.8.1 in [9616](https://github.com/appwrite/appwrite/pull/9616)
+* feat: refactor executor setup in [9420](https://github.com/appwrite/appwrite/pull/9420)
+* chore: update gitpod.yml config in [9561](https://github.com/appwrite/appwrite/pull/9561)
+* chore: update dependencies in [9625](https://github.com/appwrite/appwrite/pull/9625)
+* Update migrations lib in [9628](https://github.com/appwrite/appwrite/pull/9628)
+* feat: cache telemetry in [9624](https://github.com/appwrite/appwrite/pull/9624)
+* Bump console to version 5.2.56 in [9631](https://github.com/appwrite/appwrite/pull/9631)
+* Multi region support in [8667](https://github.com/appwrite/appwrite/pull/8667)
+* Revert "Multi region support" in [9632](https://github.com/appwrite/appwrite/pull/9632)
+* Revert "Revert "Multi region support"" in [9636](https://github.com/appwrite/appwrite/pull/9636)
+* Fix tasks in [9644](https://github.com/appwrite/appwrite/pull/9644)
+* chore: updated the migration version to 8.6 in [9646](https://github.com/appwrite/appwrite/pull/9646)
+* Fix: merge the working of StatsUsage and StatsUsageDump in [9585](https://github.com/appwrite/appwrite/pull/9585)
+* Update database in [9643](https://github.com/appwrite/appwrite/pull/9643)
+* chore: fix error logging for CLI tasks in [9651](https://github.com/appwrite/appwrite/pull/9651)
+* fix: usage test assertion in [9653](https://github.com/appwrite/appwrite/pull/9653)
+* Fix keys in [9656](https://github.com/appwrite/appwrite/pull/9656)
+* Feat: multi tenant dual writing in [9583](https://github.com/appwrite/appwrite/pull/9583)
+* Fix/throwing 400 for null order attributes  in [9657](https://github.com/appwrite/appwrite/pull/9657)
+* feat: sdk group attribute in [9596](https://github.com/appwrite/appwrite/pull/9596)
+* Add configurable function and build size in [9648](https://github.com/appwrite/appwrite/pull/9648)
+* feat: update API endpoint in the code examples in [8933](https://github.com/appwrite/appwrite/pull/8933)
+* chore: abstract token secret hiding to response model in [9574](https://github.com/appwrite/appwrite/pull/9574)
+* chore: update sdks in [9655](https://github.com/appwrite/appwrite/pull/9655)
+* feat: allow non-critical events to ignore exceptions when enqueuing the event in [9680](https://github.com/appwrite/appwrite/pull/9680)
+* Revert "Add configurable function and build size" in [9681](https://github.com/appwrite/appwrite/pull/9681)
+* core: introduce endpoint.docs in specs in [9685](https://github.com/appwrite/appwrite/pull/9685)
+* fix: remove content-type header from get request specs in [9666](https://github.com/appwrite/appwrite/pull/9666)
+* chore: update flutter sdk in [9691](https://github.com/appwrite/appwrite/pull/9691)
+
+# Version 1.6.1
+
+## What's Changed
+
+### Notable changes
+
+* Remove JPEG fallback for webp by @lohanidamodar in https://github.com/appwrite/appwrite/pull/8746
+* Add heic and avif support by @lohanidamodar in https://github.com/appwrite/appwrite/pull/7718
+* Add new runtimes by @Meldiron in https://github.com/appwrite/appwrite/pull/8771
+* Remove audits deletion by @shimonewman in https://github.com/appwrite/appwrite/pull/8766
+* Bump assistant by @loks0n in https://github.com/appwrite/appwrite/pull/8801
+* Change max queries values to 500 by @fogelito in https://github.com/appwrite/appwrite/pull/8802
+* Allow '.wav' as 'audio/x-wav' as well by @basert in https://github.com/appwrite/appwrite/pull/8846
+* Use 1 instead of 0.5 cpu for default function specification by @loks0n in https://github.com/appwrite/appwrite/pull/8848
+* Update function runtimes by @christyjacob4 in https://github.com/appwrite/appwrite/pull/8781
+* Add a realtime heartbeat by @TorstenDittmann in https://github.com/appwrite/appwrite/pull/8943
+
+### Fixes
+
+* Trigger functions event only if event is not paused by @lohanidamodar in https://github.com/appwrite/appwrite/pull/8526
+* Update docker-compose to restart usage-dump by @feschaffa in https://github.com/appwrite/appwrite/pull/8642
+* Fix typo in scheduler base by @fogelito in https://github.com/appwrite/appwrite/pull/8691
+* Add domain and force HTTPS env vars to mail worker by @stnguyen90 in https://github.com/appwrite/appwrite/pull/8722
+* Fix webp by @lohanidamodar in https://github.com/appwrite/appwrite/pull/8732
+* Ignore junction tables by @fogelito in https://github.com/appwrite/appwrite/pull/8728
+* Fix logger throwing fatal error by @lohanidamodar in https://github.com/appwrite/appwrite/pull/8724
+* Fix missing protocol for testing SMTP by @byawitz in https://github.com/appwrite/appwrite/pull/8749
+* Make create execution async loose by @loks0n in https://github.com/appwrite/appwrite/pull/8707
+* Fix invalid cursor value by @fogelito in https://github.com/appwrite/appwrite/pull/8109
+* Fix target deletes by @abnegate in https://github.com/appwrite/appwrite/pull/8833
+* Fix translation commas by @loks0n in https://github.com/appwrite/appwrite/pull/8892
+* Fix Migrations having source creds being overwritten and add Migration tests by @PineappleIOnic in https://github.com/appwrite/appwrite/pull/8897
+* Fix validator usage for updating string size by @abnegate in https://github.com/appwrite/appwrite/pull/8890
+* Fix create user event not triggering by @loks0n in https://github.com/appwrite/appwrite/pull/8718
+* Improve error handling and logging in the database worker by @fogelito in https://github.com/appwrite/appwrite/pull/8944
+* Remove inaccurate info about leaving the URL parameter empty by @ebenezerdon in https://github.com/appwrite/appwrite/pull/8963
+* Ensure indexes are updated when updating an attribute key by @fogelito in https://github.com/appwrite/appwrite/pull/8971
+* Remove duplicate dart-2.16 runtime template by @stnguyen90 in https://github.com/appwrite/appwrite/pull/8972
+* Fix team invites with existing session by @TorstenDittmann in https://github.com/appwrite/appwrite/pull/9006
+* Improve handling of HTTP requests by dispatching to safe workers by @Meldiron in https://github.com/appwrite/appwrite/pull/9016
+* Fix users create session secret by @stnguyen90 in https://github.com/appwrite/appwrite/pull/9019
+* Fix swoole task warning by @Meldiron in https://github.com/appwrite/appwrite/pull/9025
+
+### Miscellaneous
+
+* Update Init copy by @adityaoberai in https://github.com/appwrite/appwrite/pull/8557
+* Fix security scan permissions and comment by @EVDOG4LIFE in https://github.com/appwrite/appwrite/pull/8525
+* Add Trivy security scans by @btme0011 in https://github.com/appwrite/appwrite/pull/6876
+* Update database stack by @abnegate in https://github.com/appwrite/appwrite/pull/8564
+* Bump database by @abnegate in https://github.com/appwrite/appwrite/pull/8573
+* Sync main with 1.5.x by @PineappleIOnic in https://github.com/appwrite/appwrite/pull/8589
+* Add AWS to one-click installs by @byawitz in https://github.com/appwrite/appwrite/pull/8593
+* Update Init copy in readme by @adityaoberai in https://github.com/appwrite/appwrite/pull/8618
+* Sync main into 1.6.x by @stnguyen90 in https://github.com/appwrite/appwrite/pull/8685
+* Sync 1.6.x into main by @stnguyen90 in https://github.com/appwrite/appwrite/pull/8686
+* Feat coroutines by @Meldiron in https://github.com/appwrite/appwrite/pull/7826
+* Sync main into 1.6.x by @Meldiron in https://github.com/appwrite/appwrite/pull/8719
+* Sentence casing endpoint API reference by @choir241 in https://github.com/appwrite/appwrite/pull/8617
+* DB storage metrics by @PineappleIOnic in https://github.com/appwrite/appwrite/pull/8404
+* Fix exception thrown when optional array attribute does not exist by @lohanidamodar in https://github.com/appwrite/appwrite/pull/8391
+* Add projects channels to realtime by @TorstenDittmann in https://github.com/appwrite/appwrite/pull/8735
+* Base for console roles support by @lohanidamodar in https://github.com/appwrite/appwrite/pull/8565
+* Remove DB disk storage calculation by @christyjacob4 in https://github.com/appwrite/appwrite/pull/8745
+* Messaging adapter default values by @shimonewman in https://github.com/appwrite/appwrite/pull/8742
+* Add payload response type by @loks0n in https://github.com/appwrite/appwrite/pull/8720
+* Fix flaky functions tests by @loks0n in https://github.com/appwrite/appwrite/pull/8682
+* Migrations Backups by @fogelito in https://github.com/appwrite/appwrite/pull/8186
+* Add test for response and request filters by @vermakhushboo in https://github.com/appwrite/appwrite/pull/8697
+* Bump version in SECURITY.md by @EVDOG4LIFE in https://github.com/appwrite/appwrite/pull/8755
+* Add originalId attribute to databases collection by @fogelito in https://github.com/appwrite/appwrite/pull/8764
+* Fix Walter References by @ItzNotABug in https://github.com/appwrite/appwrite/pull/8757
+* Update database by @abnegate in https://github.com/appwrite/appwrite/pull/8769
+* Move new attributes by @abnegate in https://github.com/appwrite/appwrite/pull/8777
+* Add ping endpoint by @loks0n in https://github.com/appwrite/appwrite/pull/8761
+* Fix GitHub action caching by @loks0n in https://github.com/appwrite/appwrite/pull/8772
+* Chore release ruby SDK by @abnegate in https://github.com/appwrite/appwrite/pull/8767
+* Call migration success on success by @abnegate in https://github.com/appwrite/appwrite/pull/8782
+* Update utopia-php/system to 0.9.0 by @basert in https://github.com/appwrite/appwrite/pull/8780
+* Move createDocument from api to worker by @vermakhushboo in https://github.com/appwrite/appwrite/pull/8776
+* Add missing indexes by @christyjacob4 in https://github.com/appwrite/appwrite/pull/8803
+* Update database by @abnegate in https://github.com/appwrite/appwrite/pull/8809
+* Fix typo in BLR region by @stnguyen90 in https://github.com/appwrite/appwrite/pull/8756
+* Add tests for project variables by @vermakhushboo in https://github.com/appwrite/appwrite/pull/8815
+* Replace 'Expires' with 'Cache-Control: private' header to avoid CDN caching by @basert in https://github.com/appwrite/appwrite/pull/8836
+* Allow blocking based on resource attributes by @basert in https://github.com/appwrite/appwrite/pull/8812
+* Check if resource is blocked inside functions worker by @basert in https://github.com/appwrite/appwrite/pull/8855
+* Fix missing allow attribute by @abnegate in https://github.com/appwrite/appwrite/pull/8889
+* Revert function execution order by @basert in https://github.com/appwrite/appwrite/pull/8857
+* Use resource type constants by @basert in https://github.com/appwrite/appwrite/pull/8895
+* Update Database lib by @PineappleIOnic in https://github.com/appwrite/appwrite/pull/8680
+* Update database by @abnegate in https://github.com/appwrite/appwrite/pull/8917
+* Update database by @abnegate in https://github.com/appwrite/appwrite/pull/8923
+* Update database for transaction counter fixes with retries by @abnegate in https://github.com/appwrite/appwrite/pull/8927
+* Validate string permissions  by @fogelito in https://github.com/appwrite/appwrite/pull/8929
+* Add PubSub adapter support by @basert in https://github.com/appwrite/appwrite/pull/8905
+* List memberships as client by @loks0n in https://github.com/appwrite/appwrite/pull/8913
+* Fix XDebug Extension not being removed by @PineappleIOnic in https://github.com/appwrite/appwrite/pull/8891
+* Update database by @abnegate in https://github.com/appwrite/appwrite/pull/8946
+* Use utopia compression by @loks0n in https://github.com/appwrite/appwrite/pull/8938
+* Make compression minimum size configurable by @loks0n in https://github.com/appwrite/appwrite/pull/8947
+* Revert "Update database" by @christyjacob4 in https://github.com/appwrite/appwrite/pull/8949
+* Fix setpaused by @loks0n in https://github.com/appwrite/appwrite/pull/8948
+* Use getDocument instead of find() for rules by @christyjacob4 in https://github.com/appwrite/appwrite/pull/8951
+* Remove double fetch from migrations worker by @PineappleIOnic in https://github.com/appwrite/appwrite/pull/8956
+* Fix memberships privacy MFA by @loks0n in https://github.com/appwrite/appwrite/pull/8969
+* Add telemetry by @basert in https://github.com/appwrite/appwrite/pull/8960
+* Send migration errors individually by @PineappleIOnic in https://github.com/appwrite/appwrite/pull/8959
+* Add console sdk previews by @TorstenDittmann in https://github.com/appwrite/appwrite/pull/8990
+* Unset index length by @fogelito in https://github.com/appwrite/appwrite/pull/8978
+* Update base to 0.9.5 by @basert in https://github.com/appwrite/appwrite/pull/9005
+* Sync main into 1.6.x by @TorstenDittmann in https://github.com/appwrite/appwrite/pull/9011
+* Improved shared tables V2 by @abnegate in https://github.com/appwrite/appwrite/pull/9013
+* Ensure backwards compatibility for 1.6.x by @christyjacob4 in https://github.com/appwrite/appwrite/pull/9018
+
 # Version 1.6.0
 
 ## What's Changed

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contributing
 
-We would ❤️ you to contribute to Appwrite and help make it better! We want contributing to Appwrite to be fun, enjoyable, and educational for anyone and everyone. All contributions are welcome, including issues, and new docs, as well as updates and tweaks, blog posts, workshops, and more.
+We would :heart: you to contribute to Appwrite and help make it better! We want contributing to Appwrite to be fun, enjoyable, and educational for anyone and everyone. All contributions are welcome, including issues, and new docs, as well as updates and tweaks, blog posts, workshops, and more.
 
 ## Here for Hacktoberfest?
 If you're here to contribute during Hacktoberfest, we're so happy to see you here. Appwrite has been a long-time participant of Hacktoberfest and we welcome you, whatever your experience level. This year, we're **only taking contributions for issues tagged** `hacktoberfest`, so we can focus our resources to support your contributions.
@@ -9,13 +9,37 @@ You can [find issues using this query](https://github.com/search?q=org%3Aappwrit
 
 ## How to Start?
 
-If you are worried or don’t know where to start, check out the next section that explains what kind of help we could use and where you can get involved. You can send your questions to [@appwrite](https://twitter.com/appwrite) on Twitter or to anyone from the [Appwrite team on Discord](https://appwrite.io/discord). You can also submit an issue, and a maintainer can guide you!
+Welcome! We're excited that you're interested in contributing to Appwrite. To make sure your time is valued and your contributions are successful, please follow these steps before writing any code:
+
+### 🔍 Step 1: Find an Issue
+
+Browse open issues and look for ones labeled [good first issue](https://github.com/search?q=org%3Aappwrite+is%3Aopen+type%3Aissue+label%3A%22good+first+issue%22&type=issues) or [help wanted](https://github.com/search?q=org%3Aappwrite+is%3Aopen+type%3Aissue+label%3A%22help+wanted%22&type=issues).
+
+If you're not sure which issue to pick, ask in our ⁠[maintainers channel](https://discord.com/channels/564160730845151244/636852860709240842) on Discord.
+
+### 📝 Step 2: Ask to Be Assigned
+
+Before working on an issue, comment on the GitHub issue asking to be assigned. This prevents multiple people working on the same task.
+
+Then, create a thread in the ⁠[maintainers channel](https://discord.com/channels/564160730845151244/636852860709240842) on Discord with a link to the issue.
+
+Our team is small and may not see your GitHub comment right away - posting in the ⁠[maintainers channel](https://discord.com/channels/564160730845151244/636852860709240842) ensures it gets seen.
+
+### 💬 Step 3: Don’t Submit Random PRs
+
+If you're not working on an assigned issue, create a GitHub issue first.
+
+PRs submitted without context or discussion may not align with our roadmap and may be closed without review.
+
+### ⚠️ Please Note
+
+We’re a very small team managing a large project. Many PRs are submitted, and while we appreciate every effort, we can only review contributions that follow the process above. This helps us keep things fair and organized.
 
 ## Code of Conduct
 
 Help us keep Appwrite open and inclusive. Please read and follow our [Code of Conduct](https://github.com/appwrite/.github/blob/main/CODE_OF_CONDUCT.md).
 
-## Submit a Pull Request 🚀
+## Submit a Pull Request :rocket:
 
 Branch naming convention is as following
 
@@ -65,13 +89,13 @@ Now, go a step further by running the linter using the following command to manu
 composer lint <your file path>
 ```
 
-This will give you a list of errors to rectify. If you need more information on the errors, you can pass in additional command line arguments to get more verbose information. More lists of available arguments can be found [here](https://github.com/squizlabs/PHP_CodeSniffer/wiki/Usage). A very useful command line argument is `--report=diff`. This will give you the expected changes by the linter for easy fixing of formatting issues.
+This will give you a list of errors to rectify. If you need more information on the errors, you can pass in additional command line arguments to get more verbose information. More lists of available arguments can be found [on PHP_Codesniffer usage Wiki](https://github.com/squizlabs/PHP_CodeSniffer/wiki/Usage). A very useful command line argument is `--report=diff`. This will give you the expected changes by the linter for easy fixing of formatting issues.
 
 ```bash
 composer lint --report=diff <your file path>
 ```
 
-5. Push changes to GitHub.
+5. Push changes to GitHub
 
 ```
 $ git push origin [name_of_your_new_branch]
@@ -163,6 +187,28 @@ Other containes should be named the same as their service, for example `redis` s
 - [Encryption](https://medium.com/searchencrypt/what-is-encryption-how-does-it-work-e8f20e340537#:~:text=Encryption%20is%20a%20process%20that,%2C%20or%20decrypt%2C%20the%20information.)
 - [Hashing](https://searchsqlserver.techtarget.com/definition/hashing#:~:text=Hashing%20is%20the%20transformation%20of,it%20using%20the%20original%20value.)
 
+## Modules
+
+As Appwrite grows, we noticed approach of having all service endpoints in `app/controllers/api/[service].php` is not maintainable. Not only it creates massive files, it also doesnt contain all product's features such as workers or tasks. While there might still be some occurances of those controller files, we avoid it in all new development, and gradually migrate existing controllers to **HTTP modules**.
+
+### HTTP Endpoints
+
+Every endpoint file follows below structure, making it consistent with HTTP REST endpoint path:
+
+```
+src/Appwrite/Platform/Modules/[service]/Http/[resource]/[action].php
+```
+
+Tips and tricks:
+
+1. If endpoint doesn't have resource, use service name as resource name too
+> Example: `Modules/Sites/Http/Sites/Get.php`
+
+2. If there are multiple resources, use then all in folder structure
+> Example: `Modules/Sites/Http/Deployments/Builds/Create.php`
+
+3. Action can only be `Get`, `Create`, `Update`, `Delete` or `XList`
+
 ## Architecture
 
 Appwrite's current structure is a combination of both [Monolithic](https://en.wikipedia.org/wiki/Monolithic_application) and [Microservice](https://en.wikipedia.org/wiki/Microservices) architectures.
@@ -301,7 +347,7 @@ Adding a new dependency should have vital value for the product with minimum pos
 
 ## Introducing New Features
 
-We would 💖 you to contribute to Appwrite, but we also want to ensure Appwrite is loyal to its vision and mission statement 🙏.
+We would :sparkling_heart: you to contribute to Appwrite, but we also want to ensure Appwrite is loyal to its vision and mission statement :pray:.
 
 For us to find the right balance, please open an issue explaining your ideas before introducing a new pull request.
 
@@ -319,10 +365,13 @@ These are the current metrics we collect usage stats for:
 | users | Total number of users per project|
 | executions | Total number of executions per project           | 
 | databases | Total number of databases per project             | 
+| databases.storage | Total amount of storage used by all databases per project (in bytes) |
 | collections | Total number of collections per project | 
 | {databaseInternalId}.collections | Total number of collections per database| 
+| {databaseInternalId}.storage | Sum of database storage (in bytes) |
 | documents | Total number of documents per project             | 
 | {databaseInternalId}.{collectionInternalId}.documents | Total number of documents per collection | 
+| {databaseInternalId}.{collectionInternalId}.storage | Sum of database storage used by the collection (in bytes) |
 | buckets | Total number of buckets per project               | 
 | files | Total number of files per project                 |
 | {bucketInternalId}.files.storage | Sum of files.storage per bucket (in bytes)                  |
@@ -364,7 +413,7 @@ In file `app/controllers/shared/api.php` On the database listener, add to an exi
 
 ```php
       case $document->getCollection() === 'teams':
-            $queueForUsage
+            $queueForStatsUsage
                 ->addMetric(METRIC_TEAMS, $value); // per project
             break;
 ```
@@ -376,10 +425,10 @@ In that case you need also to handle children removal using addReduce() method c
 ```php
 
  case $document->getCollection() === 'buckets': //buckets
-            $queueForUsage
+            $queueForStatsUsage
                 ->addMetric(METRIC_BUCKETS, $value); // per project
             if ($event === Database::EVENT_DOCUMENT_DELETE) {
-                $queueForUsage
+                $queueForStatsUsage
                     ->addReduce($document);
             }
             break;
@@ -390,8 +439,8 @@ In addition, you will also need to add some logic to the `reduce()` method of th
 
 ```php
 case $document->getCollection() === 'buckets':
-       $files = $dbForProject->getDocument('stats', md5(self::INFINITY_PERIOD . str_replace('{bucketInternalId}', $document->getInternalId(), METRIC_BUCKET_ID_FILES)));
-       $storage = $dbForProject->getDocument('stats', md5(self::INFINITY_PERIOD . str_replace('{bucketInternalId}', $document->getInternalId(), METRIC_BUCKET_ID_FILES_STORAGE)));
+       $files = $dbForProject->getDocument('stats', md5(self::INFINITY_PERIOD . str_replace('{bucketInternalId}', $document->getSequence(), METRIC_BUCKET_ID_FILES)));
+       $storage = $dbForProject->getDocument('stats', md5(self::INFINITY_PERIOD . str_replace('{bucketInternalId}', $document->getSequence(), METRIC_BUCKET_ID_FILES_STORAGE)));
 
        if (!empty($files['value'])) {
            $metrics[] = [
@@ -425,22 +474,22 @@ public function __construct()
       ->inject('dbForProject')
       ->inject('queueForFunctions')
       ->inject('queueForEvents')
-      ->inject('queueForUsage')
+      ->inject('queueForStatsUsage')
       ->inject('log')
-      ->callback(fn (Message $message, Database $dbForProject, Func $queueForFunctions, Event $queueForEvents, Usage $queueForUsage, Log $log) => $this->action($message, $dbForProject, $queueForFunctions, $queueForEvents, $queueForUsage, $log));
+      ->callback(fn (Message $message, Database $dbForProject, Func $queueForFunctions, Event $queueForEvents, StatsUsage $queueForStatsUsage, Log $log) => $this->action($message, $dbForProject, $queueForFunctions, $queueForEvents, $queueForStatsUsage, $log));
 }
 ```
 
 and then trigger the queue with the new metric like so: 
 
 ```php
-$queueForUsage
+$queueForStatsUsage
   ->addMetric(METRIC_BUILDS, 1)
   ->addMetric(METRIC_BUILDS_STORAGE, $build->getAttribute('size', 0))
   ->addMetric(METRIC_BUILDS_COMPUTE, (int)$build->getAttribute('duration', 0) * 1000)
-  ->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_BUILDS), 1) 
-  ->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_BUILDS_STORAGE), $build->getAttribute('size', 0))
-  ->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_BUILDS_COMPUTE), (int)$build->getAttribute('duration', 0) * 1000)
+  ->addMetric(str_replace('{functionInternalId}', $function->getSequence(), METRIC_FUNCTION_ID_BUILDS), 1) 
+  ->addMetric(str_replace('{functionInternalId}', $function->getSequence(), METRIC_FUNCTION_ID_BUILDS_STORAGE), $build->getAttribute('size', 0))
+  ->addMetric(str_replace('{functionInternalId}', $function->getSequence(), METRIC_FUNCTION_ID_BUILDS_COMPUTE), (int)$build->getAttribute('duration', 0) * 1000)
   ->setProject($project)
   ->trigger();
 ```
@@ -610,6 +659,18 @@ If you need to clear the cache, you can do so by running the following command:
 docker compose exec redis redis-cli FLUSHALL
 ```
 
+## Using preview domains locally
+
+Appwrite Functions are automatically given a domain you can visit to execute the function. This domain has format `[SOMETHING].functions.localhost` unless you changed `_APP_DOMAIN_FUNCTIONS` environment variable. This default value works great when running Appwrite locally, but it can be impossible to use preview domains with Cloud woekspaces such as Gitpod or GitHub Codespaces.
+
+To use preview domains on Cloud workspaces, you can visit hostname provided by them, and supply function's preview domain as URL parameter:
+
+```
+https://8080-appwrite-appwrite-mjeb3ebilwv.ws-eu116.gitpod.io/ping?preview=672b3c7eab1ac523ccf5.functions.localhost
+```
+
+The path was set to `/ping` intentionally. Visiting `/` for preview domains might trigger Console background worker, and trigger redirect to Console without our preview URL param. Visiting different path ensures this doesnt happen.
+
 ## Tutorials
 
 From time to time, our team will add tutorials that will help contributors find their way in the Appwrite source code. Below is a list of currently available tutorials:
@@ -625,7 +686,7 @@ Pull requests are great, but there are many other ways you can help Appwrite.
 
 ### Blogging & Speaking
 
-Blogging, speaking about, or creating tutorials about one of Appwrite’s many features are great ways to get the word out about Appwrite. Mention [@appwrite](https://twitter.com/appwrite) on Twitter and/or [email team@appwrite.io](mailto:team@appwrite.io) so we can give pointers and tips and help you spread the word by promoting your content on the different Appwrite communication channels. Please add your blog posts and videos of talks to our [Awesome Appwrite](https://github.com/appwrite/awesome-appwrite) repo on GitHub.
+Blogging, speaking about, or creating tutorials about one of Appwrite’s many features are great ways to get the word out about Appwrite. Mention [@appwrite on Twitter](https://twitter.com/appwrite) and/or [email team@appwrite.io](mailto:team@appwrite.io) so we can give pointers and tips and help you spread the word by promoting your content on the different Appwrite communication channels. Please add your blog posts and videos of talks to our [Awesome Appwrite](https://github.com/appwrite/awesome-appwrite) repo on GitHub.
 
 ### Presenting at Meetups
 

Dockerfile

@@ -12,7 +12,7 @@ RUN composer install --ignore-platform-reqs --optimize-autoloader \
     --no-plugins --no-scripts --prefer-dist \
     `if [ "$TESTING" != "true" ]; then echo "--no-dev"; fi`
 
-FROM appwrite/base:0.9.3 AS final
+FROM appwrite/base:0.10.1 AS final
 
 LABEL maintainer="team@appwrite.io"
 
@@ -28,6 +28,8 @@ RUN \
     apk add boost boost-dev; \
   fi
 
+RUN apk add libwebp
+
 WORKDIR /usr/src/code
 
 COPY --from=composer /usr/local/src/vendor /usr/src/code/vendor
@@ -42,12 +44,14 @@ COPY ./dev /usr/src/code/dev
 
 # Set Volumes
 RUN mkdir -p /storage/uploads && \
+    mkdir -p /storage/imports && \
     mkdir -p /storage/cache && \
     mkdir -p /storage/config && \
     mkdir -p /storage/certificates && \
     mkdir -p /storage/functions && \
     mkdir -p /storage/debug && \
     chown -Rf www-data.www-data /storage/uploads && chmod -Rf 0755 /storage/uploads && \
+    chown -Rf www-data.www-data /storage/imports && chmod -Rf 0755 /storage/imports && \
     chown -Rf www-data.www-data /storage/cache && chmod -Rf 0755 /storage/cache && \
     chown -Rf www-data.www-data /storage/config && chmod -Rf 0755 /storage/config && \
     chown -Rf www-data.www-data /storage/certificates && chmod -Rf 0755 /storage/certificates && \
@@ -66,6 +70,7 @@ RUN chmod +x /usr/local/bin/doctor && \
     chmod +x /usr/local/bin/sdks && \
     chmod +x /usr/local/bin/specs && \
     chmod +x /usr/local/bin/ssl && \
+    chmod +x /usr/local/bin/screenshot && \
     chmod +x /usr/local/bin/test && \
     chmod +x /usr/local/bin/upgrade && \
     chmod +x /usr/local/bin/vars && \
@@ -83,17 +88,18 @@ RUN chmod +x /usr/local/bin/doctor && \
     chmod +x /usr/local/bin/worker-messaging && \
     chmod +x /usr/local/bin/worker-migrations && \
     chmod +x /usr/local/bin/worker-webhooks && \
-    chmod +x /usr/local/bin/worker-usage && \
-    chmod +x /usr/local/bin/worker-usage-dump
+    chmod +x /usr/local/bin/worker-stats-usage && \
+    chmod +x /usr/local/bin/stats-resources && \
+    chmod +x /usr/local/bin/worker-stats-resources
 
 # Letsencrypt Permissions
 RUN mkdir -p /etc/letsencrypt/live/ && chmod -Rf 755 /etc/letsencrypt/live/
 
 # Enable Extensions
-RUN if [ "$DEBUG" == "true" ]; then cp /usr/src/code/dev/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini; fi
-RUN if [ "$DEBUG" == "true" ]; then mkdir -p /tmp/xdebug; fi
+RUN if [ "$DEBUG" = "true" ]; then cp /usr/src/code/dev/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini; fi
+RUN if [ "$DEBUG" = "true" ]; then mkdir -p /tmp/xdebug; fi
 RUN if [ "$DEBUG" = "false" ]; then rm -rf /usr/src/code/dev; fi
-RUN if [ "$DEBUG" = "false" ]; then rm -f /usr/local/lib/php/extensions/no-debug-non-zts-20220829/xdebug.so; fi
+RUN if [ "$DEBUG" = "false" ]; then rm -f /usr/local/lib/php/extensions/no-debug-non-zts-20230831/xdebug.so; fi
 
 EXPOSE 80
 

README-CN.md

@@ -1,8 +1,8 @@
-> 好消息！Appwrite 云现已进入公开测试版！立即访问 cloud.appwrite.io 注册，体验无忧的托管服务。今天就加入我们的云端吧！☁️🎉
+> 好消息！Appwrite 云现已进入公开测试版！立即访问 cloud.appwrite.io 注册，体验无忧的托管服务。今天就加入我们的云端吧！:cloud: :tada:
 
 <br />
 <p align="center">
-    <a href="https://appwrite.io" target="_blank"><img src="./public/images/banner.png" alt="Appwrite Logo"></a>
+    <a href="https://appwrite.io" target="_blank"><img src="./public/images/banner.png" alt="Appwrite banner with logo and slogan build like a team of hundreds""></a>
     <br />
     <br />
     <b>适用于[Flutter/Vue/Angular/React/iOS/Android/* 等等平台 *]的完整后端服务</b>
@@ -26,7 +26,7 @@
 
 [**Appwrite 云公开测试版！立即注册！**](https://cloud.appwrite.io)
 
-Appwrite 是一个基于 Docker 的端到端开发者平台，其容器化的微服务库可应用于网页端，移动端，以及后端。Appwrite 通过视觉化界面简化了从零开始编写 API 的繁琐过程，在保证软件安全的前提下为开发者创造了一个高效的开发环境。
+Appwrite 是一个基于 Docker 的端到端开发者平台，其容器化的微服务库可应用于网页端，移动端，原生应用，以及后端。它既包含后端服务器，也提供了用于部署静态和服务器端渲染前端的完全集成托管解决方案。Appwrite 通过视觉化界面简化了从零开始构建现代应用的复杂性和重复性，让您能够更快地构建安全的全栈应用。
 
 Appwrite 可以提供给开发者用户验证，外部授权，用户数据读写检索，文件储存，图像处理，云函数计算，[等多种服务](https://appwrite.io/docs).
 
@@ -36,6 +36,8 @@ Appwrite 可以提供给开发者用户验证，外部授权，用户数据读
 
 内容：
 
+
+- [开始](#开始)
 - [安装](#安装)
   - [Unix](#unix)
   - [Windows](#windows)
@@ -54,6 +56,9 @@ Appwrite 可以提供给开发者用户验证，外部授权，用户数据读
 - [订阅我们](#订阅我们)
 - [版权说明](#版权说明)
 
+## 开始
+要轻松开始使用Appwrite，您可以[**免费注册Appwrite Cloud**](https://cloud.appwrite.io/)。在Appwrite Cloud公开测试版期间，您可以完全免费使用Appwrite，而且我们不会收集您的信用卡信息。
+
 ## 安装
 
 Appwrite 的容器化服务器只需要一行指令就可以运行。您可以使用 docker-compose 在本地主机上运行 Appwrite，也可以在任何其他容器化工具（如 [Kubernetes](https://kubernetes.io/docs/home/)、[Docker Swarm](https://docs.docker.com/engine/swarm/) 或 [Rancher](https://rancher.com/docs/)）上运行 Appwrite。
@@ -67,7 +72,7 @@ docker run -it --rm \
     --volume /var/run/docker.sock:/var/run/docker.sock \
     --volume "$(pwd)"/appwrite:/usr/src/code/appwrite:rw \
     --entrypoint="install" \
-    appwrite/appwrite:1.6.0
+    appwrite/appwrite:1.7.4
 ```
 
 ### Windows
@@ -79,7 +84,7 @@ docker run -it --rm ^
     --volume //var/run/docker.sock:/var/run/docker.sock ^
     --volume "%cd%"/appwrite:/usr/src/code/appwrite:rw ^
     --entrypoint="install" ^
-    appwrite/appwrite:1.6.0
+    appwrite/appwrite:1.7.4
 ```
 
 #### PowerShell
@@ -89,7 +94,7 @@ docker run -it --rm `
     --volume /var/run/docker.sock:/var/run/docker.sock `
     --volume ${pwd}/appwrite:/usr/src/code/appwrite:rw `
     --entrypoint="install" `
-    appwrite/appwrite:1.6.0
+    appwrite/appwrite:1.7.4
 ```
 
 运行后，可以在浏览器上访问 http://localhost 找到 Appwrite 控制台。在非 Linux 的本机主机上完成安装后，服务器可能需要几分钟才能启动。
@@ -98,7 +103,42 @@ docker run -it --rm `
 
 ### 从旧版本升级
 
-如果您从旧版本升级 Appwrite 服务器，则应在设置完成后使用 Appwrite 迁移工具。有关这方面的更多信息，请查看 [安装文档](https://appwrite.io/docs/installation)。
+如果您从旧版本升级 Appwrite 服务器，则应在设置完成后使用 Appwrite 迁移工具。有关这方面的更多信息，请查看 [安装文档](https://appwrite.io/docs/self-hosting)。
+
+## 一键配置
+
+除了在本地运行 Appwrite，您还可以使用预配置的设置启动 Appwrite。这样可以让您快速启动并运行 Appwrite，而无需在本地计算机上安装 Docker。
+
+请从以下提供商中选择一个：
+
+<table border="0">
+  <tr>
+    <td align="center" width="100" height="100">
+      <a href="https://marketplace.digitalocean.com/apps/appwrite">
+        <img width="50" height="39" src="public/images/integrations/digitalocean-logo.svg" alt="DigitalOcean Logo" />
+          <br /><sub><b>DigitalOcean</b></sub></a>
+        </a>
+    </td>
+    <td align="center" width="100" height="100">
+      <a href="https://gitpod.io/#https://github.com/appwrite/integration-for-gitpod">
+        <img width="50" height="39" src="public/images/integrations/gitpod-logo.svg" alt="Gitpod Logo" />
+          <br /><sub><b>Gitpod</b></sub></a>    
+      </a>
+    </td>
+    <td align="center" width="100" height="100">
+      <a href="https://www.linode.com/marketplace/apps/appwrite/appwrite/">
+        <img width="50" height="39" src="public/images/integrations/akamai-logo.svg" alt="Akamai Logo" />
+          <br /><sub><b>Akamai Compute</b></sub></a>    
+      </a>
+    </td>
+    <td align="center" width="100" height="100">
+      <a href="https://aws.amazon.com/marketplace/pp/prodview-2hiaeo2px4md6">
+        <img width="50" height="39" src="public/images/integrations/aws-logo.svg" alt="AWS Logo" />
+          <br /><sub><b>AWS Marketplace</b></sub></a>    
+      </a>
+    </td>
+  </tr>
+</table>
 
 ## 入门
 
@@ -139,6 +179,8 @@ docker run -it --rm `
 - [**消息传递**](https://appwrite.io/docs/references/cloud/client-web/messaging) - 使用 Appwrite 消息传递功能通过推送通知、电子邮件和短信与用户进行通信。
 - [**语言适配**](https://appwrite.io/docs/references/cloud/client-web/locale) - 根据用户所在的的国家和地区做出合适的语言适配。
 - [**头像**](https://appwrite.io/docs/references/cloud/client-web/avatars) -管理用户头像、国家旗帜、浏览器图标、信用卡符号，和生成二维码。
+- [**MCP**](https://appwrite.io/docs/tooling/mcp) - 使用 Appwrite 的模型上下文协议（Model Context Protocol）服务器，允许大语言模型（LLM）和 AI 工具（如 Claude Desktop、Cursor 和 Windsurf Editor）通过自然语言直接与您的 Appwrite 项目交互。
+- [**站点**](https://appwrite.io/docs/products/sites) - 直接从 Appwrite 开发、部署和扩展您的 Web 应用程序，与您的后端一起。
   如需完整的 API 界面文档，请访问 [https://appwrite.io/docs](https://appwrite.io/docs)。如需更多教程、新闻和公告，请订阅我们的 [博客](https://medium.com/appwrite-io) 和 加入我们的[Discord 社区](https://discord.gg/GSeTUeA)。
 
 ### 开发套件
@@ -146,29 +188,25 @@ docker run -it --rm `
 以下是当前支持的平台和语言列表。如果您想帮助我们为您选择的平台添加支持，您可以访问我们的 [SDK 生成器](https://github.com/appwrite/sdk-generator) 项目并查看我们的 [贡献指南](https://github.com/appwrite/sdk-generator/blob/master/CONTRIBUTING.md)。
 
 #### 客户端
-
-- ✅ &nbsp; [Web](https://github.com/appwrite/sdk-for-web) (由 Appwrite 团队维护)
-- ✅ &nbsp; [Flutter](https://github.com/appwrite/sdk-for-flutter) (由 Appwrite 团队维护)
-- ✅ &nbsp; [Apple](https://github.com/appwrite/sdk-for-apple) (由 Appwrite 团队维护)
-- ✅ &nbsp; [Android](https://github.com/appwrite/sdk-for-android) (由 Appwrite 团队维护)
-- ✅ &nbsp; [React Native](https://github.com/appwrite/sdk-for-react-native) - **公测** (由 Appwrite 团队维护)
+* :white_check_mark:  &nbsp; [Web](https://github.com/appwrite/sdk-for-web) (由 Appwrite 团队维护)
+* :white_check_mark:  &nbsp; [Flutter](https://github.com/appwrite/sdk-for-flutter) (由 Appwrite 团队维护)
+* :white_check_mark:  &nbsp; [Apple](https://github.com/appwrite/sdk-for-apple) - **公测** (由 Appwrite 团队维护)
+* :white_check_mark:  &nbsp; [Android](https://github.com/appwrite/sdk-for-android) (由 Appwrite 团队维护)
 
 #### 服务器
-
-- ✅ &nbsp; [NodeJS](https://github.com/appwrite/sdk-for-node) (由 Appwrite 团队维护)
-- ✅ &nbsp; [PHP](https://github.com/appwrite/sdk-for-php) (由 Appwrite 团队维护)
-- ✅ &nbsp; [Dart](https://github.com/appwrite/sdk-for-dart) (由 Appwrite 团队维护)
-- ✅ &nbsp; [Deno](https://github.com/appwrite/sdk-for-deno) (由 Appwrite 团队维护)
-- ✅ &nbsp; [Ruby](https://github.com/appwrite/sdk-for-ruby) (由 Appwrite 团队维护)
-- ✅ &nbsp; [Python](https://github.com/appwrite/sdk-for-python) (由 Appwrite 团队维护)
-- ✅ &nbsp; [Kotlin](https://github.com/appwrite/sdk-for-kotlin) (由 Appwrite 团队维护)
-- ✅ &nbsp; [Swift](https://github.com/appwrite/sdk-for-swift) (由 Appwrite 团队维护)
-- ✅ &nbsp; [.NET](https://github.com/appwrite/sdk-for-dotnet) - **公测** (由 Appwrite 团队维护)
+* :white_check_mark:  &nbsp; [NodeJS](https://github.com/appwrite/sdk-for-node) (由 Appwrite 团队维护)
+* :white_check_mark:  &nbsp; [PHP](https://github.com/appwrite/sdk-for-php) (由 Appwrite 团队维护)
+* :white_check_mark:  &nbsp; [Dart](https://github.com/appwrite/sdk-for-dart) - (由 Appwrite 团队维护)
+* :white_check_mark:  &nbsp; [Deno](https://github.com/appwrite/sdk-for-deno) - **公测** (由 Appwrite 团队维护)
+* :white_check_mark:  &nbsp; [Ruby](https://github.com/appwrite/sdk-for-ruby) (由 Appwrite 团队维护)
+* :white_check_mark:  &nbsp; [Python](https://github.com/appwrite/sdk-for-python) (由 Appwrite 团队维护)
+* :white_check_mark:  &nbsp; [Kotlin](https://github.com/appwrite/sdk-for-kotlin) - **公测** (由 Appwrite 团队维护)
+* :white_check_mark:  &nbsp; [Apple](https://github.com/appwrite/sdk-for-apple) - **公测** (由 Appwrite 团队维护)
+* :white_check_mark:  &nbsp; [.NET](https://github.com/appwrite/sdk-for-dotnet) - **公测** (由 Appwrite 团队维护)
 
 #### 开发者社区
-
-- ✅ &nbsp; [Appcelerator Titanium](https://github.com/m1ga/ti.appwrite) (维护者 [Michael Gangolf](https://github.com/m1ga/))
-- ✅ &nbsp; [Godot Engine](https://github.com/GodotNuts/appwrite-sdk) (维护者 [fenix-hub @GodotNuts](https://github.com/fenix-hub))
+* :white_check_mark:  &nbsp; [Appcelerator Titanium](https://github.com/m1ga/ti.appwrite) (维护者 [Michael Gangolf](https://github.com/m1ga/))  
+* :white_check_mark:  &nbsp; [Godot Engine](https://github.com/GodotNuts/appwrite-sdk) (维护者 [fenix-hub @GodotNuts](https://github.com/fenix-hub))  
 
 找不到需要的的 SDK？ - 欢迎通过发起 PR 来帮助我们完善 Appwrite 的软件生态环境 [SDK 生成器](https://github.com/appwrite/sdk-generator)!
 

README.md

@@ -1,22 +1,25 @@
-> Appwrite Init has concluded! You can check out all the latest announcements [on our Init website](https://appwrite.io/init) 🚀
+
+> We just announced Auto-increment support for Appwrite Databases - [Learn more](https://appwrite.io/blog/post/announcing-auto-increment-support)
+
+> [Get started with Appwrite](https://apwr.dev/appcloud)
 
 <br />
 <p align="center">
-    <a href="https://appwrite.io" target="_blank"><img src="./public/images/banner.png" alt="Appwrite Logo"></a>
+    <a href="https://appwrite.io" target="_blank"><img src="./public/images/banner.png" alt="Appwrite banner, with logo and text saying "Build Like a Team of Hundreds"></a>
     <br />
     <br />
-    <b>Appwrite is a backend platform for developing Web, Mobile, and Flutter applications. Built with the open source community and optimized for developer experience in the coding languages you love.</b>
+    <b>Appwrite is an all-in-one development platform for Web, Mobile, and Flutter applications. Use built-in backend infrastructure and web hosting, all from a single place. Built with the open source community and optimized for developer experience in the coding languages you love.</b>
     <br />
     <br />
 </p>
 
 <!-- [![Build Status](https://img.shields.io/travis/com/appwrite/appwrite?style=flat-square)](https://travis-ci.com/appwrite/appwrite) -->
 
-[![We're Hiring](https://img.shields.io/static/v1?label=We're&message=Hiring&color=blue&style=flat-square)](https://appwrite.io/company/careers)
-[![Hacktoberfest](https://img.shields.io/static/v1?label=hacktoberfest&message=ready&color=191120&style=flat-square)](https://hacktoberfest.appwrite.io)
-[![Discord](https://img.shields.io/discord/564160730845151244?label=discord&style=flat-square)](https://appwrite.io/discord?r=Github)
-[![Build Status](https://img.shields.io/github/actions/workflow/status/appwrite/appwrite/tests.yml?branch=master&label=tests&style=flat-square)](https://github.com/appwrite/appwrite/actions)
-[![X Account](https://img.shields.io/twitter/follow/appwrite?color=00acee&label=twitter&style=flat-square)](https://twitter.com/appwrite)
+[![We're Hiring label](https://img.shields.io/static/v1?label=We're&message=Hiring&color=blue&style=flat-square)](https://appwrite.io/company/careers)
+[![Hacktoberfest label](https://img.shields.io/static/v1?label=hacktoberfest&message=ready&color=191120&style=flat-square)](https://hacktoberfest.appwrite.io)
+[![Discord label](https://img.shields.io/discord/564160730845151244?label=discord&style=flat-square)](https://appwrite.io/discord?r=Github)
+[![Build Status label](https://img.shields.io/github/actions/workflow/status/appwrite/appwrite/tests.yml?branch=master&label=tests&style=flat-square)](https://github.com/appwrite/appwrite/actions)
+[![X Account label](https://img.shields.io/twitter/follow/appwrite?color=00acee&label=twitter&style=flat-square)](https://twitter.com/appwrite)
 
 <!-- [![Docker Pulls](https://img.shields.io/docker/pulls/appwrite/appwrite?color=f02e65&style=flat-square)](https://hub.docker.com/r/appwrite/appwrite) -->
 <!-- [![Translate](https://img.shields.io/badge/translate-f02e65?style=flat-square)](docs/tutorials/add-translations.md) -->
@@ -24,11 +27,9 @@
 
 English | [简体中文](README-CN.md)
 
-[**Announcing Appwrite Cloud Public Beta! Sign up today!**](https://cloud.appwrite.io)
+Appwrite is an end-to-end platform for building Web, Mobile, Native, or Backend apps, packaged as a set of Docker microservices. It includes both a backend server and a fully integrated hosting solution for deploying static and server-side rendered frontends. Appwrite abstracts the complexity and repetitiveness required to build modern apps from scratch and allows you to build secure, full-stack applications faster.
 
-Appwrite is an end-to-end backend server for Web, Mobile, Native, or Backend apps packaged as a set of Docker<nobr> microservices. Appwrite abstracts the complexity and repetitiveness required to build a modern backend API from scratch and allows you to build secure apps faster.
-
-Using Appwrite, you can easily integrate your app with user authentication and multiple sign-in methods, a database for storing and querying users and team data, storage and file management, image manipulation, Cloud Functions, and [more services](https://appwrite.io/docs).
+Using Appwrite, you can easily integrate your app with user authentication and multiple sign-in methods, a database for storing and querying users and team data, storage and file management, image manipulation, Cloud Functions, messaging, and [more services](https://appwrite.io/docs).
 
 <p align="center">
     <br />
@@ -37,13 +38,14 @@ Using Appwrite, you can easily integrate your app with user authentication and m
     <br />
 </p>
 
-![Appwrite](public/images/github.png)
+![Appwrite project dashboard showing various Appwrite features](public/images/github.png)
 
-Find out more at: [https://appwrite.io](https://appwrite.io)
+Find out more at: [https://appwrite.io](https://appwrite.io).
 
 Table of Contents:
 
-- [Installation](#installation)
+- [Installation \& Setup](#installation--setup)
+- [Self-Hosting](#self-hosting)
   - [Unix](#unix)
   - [Windows](#windows)
     - [CMD](#cmd)
@@ -51,7 +53,7 @@ Table of Contents:
   - [Upgrade from an Older Version](#upgrade-from-an-older-version)
 - [One-Click Setups](#one-click-setups)
 - [Getting Started](#getting-started)
-  - [Services](#services)
+  - [Products](#products)
   - [SDKs](#sdks)
     - [Client](#client)
     - [Server](#server)
@@ -62,11 +64,15 @@ Table of Contents:
 - [Follow Us](#follow-us)
 - [License](#license)
 
-## Installation
+## Installation & Setup
+
+The easiest way to get started with Appwrite is by [signing up for Appwrite Cloud](https://cloud.appwrite.io/). While Appwrite Cloud is in public beta, you can build with Appwrite completely free, and we won't collect your credit card information.
+
+## Self-Hosting
 
 Appwrite is designed to run in a containerized environment. Running your server is as easy as running one command from your terminal. You can either run Appwrite on your localhost using docker-compose or on any other container orchestration tool, such as [Kubernetes](https://kubernetes.io/docs/home/), [Docker Swarm](https://docs.docker.com/engine/swarm/), or [Rancher](https://rancher.com/docs/).
 
-The easiest way to start running your Appwrite server is by running our docker-compose file. Before running the installation command, make sure you have [Docker](https://www.docker.com/products/docker-desktop) installed on your machine:
+Before running the installation command, make sure you have [Docker](https://www.docker.com/products/docker-desktop) installed on your machine:
 
 ### Unix
 
@@ -75,7 +81,7 @@ docker run -it --rm \
     --volume /var/run/docker.sock:/var/run/docker.sock \
     --volume "$(pwd)"/appwrite:/usr/src/code/appwrite:rw \
     --entrypoint="install" \
-    appwrite/appwrite:1.6.0
+    appwrite/appwrite:1.7.4
 ```
 
 ### Windows
@@ -87,7 +93,7 @@ docker run -it --rm ^
     --volume //var/run/docker.sock:/var/run/docker.sock ^
     --volume "%cd%"/appwrite:/usr/src/code/appwrite:rw ^
     --entrypoint="install" ^
-    appwrite/appwrite:1.6.0
+    appwrite/appwrite:1.7.4
 ```
 
 #### PowerShell
@@ -97,7 +103,7 @@ docker run -it --rm `
     --volume /var/run/docker.sock:/var/run/docker.sock `
     --volume ${pwd}/appwrite:/usr/src/code/appwrite:rw `
     --entrypoint="install" `
-    appwrite/appwrite:1.6.0
+    appwrite/appwrite:1.7.4
 ```
 
 Once the Docker installation is complete, go to http://localhost to access the Appwrite console from your browser. Please note that on non-Linux native hosts, the server might take a few minutes to start after completing the installation.
@@ -106,7 +112,7 @@ For advanced production and custom installation, check out our Docker [environme
 
 ### Upgrade from an Older Version
 
-If you are upgrading your Appwrite server from an older version, you should use the Appwrite migration tool once your setup is completed. For more information regarding this, check out the [Installation Docs](https://appwrite.io/docs/installation).
+If you are upgrading your Appwrite server from an older version, you should use the Appwrite migration tool once your setup is completed. For more information regarding this, check out the [Installation Docs](https://appwrite.io/docs/self-hosting).
 
 ## One-Click Setups
 
@@ -125,19 +131,19 @@ Choose from one of the providers below:
     <td align="center" width="100" height="100">
       <a href="https://gitpod.io/#https://github.com/appwrite/integration-for-gitpod">
         <img width="50" height="39" src="public/images/integrations/gitpod-logo.svg" alt="Gitpod Logo" />
-          <br /><sub><b>Gitpod</b></sub></a>    
+          <br /><sub><b>Gitpod</b></sub></a>
       </a>
     </td>
     <td align="center" width="100" height="100">
       <a href="https://www.linode.com/marketplace/apps/appwrite/appwrite/">
         <img width="50" height="39" src="public/images/integrations/akamai-logo.svg" alt="Akamai Logo" />
-          <br /><sub><b>Akamai Compute</b></sub></a>    
+          <br /><sub><b>Akamai Compute</b></sub></a>
       </a>
     </td>
     <td align="center" width="100" height="100">
       <a href="https://aws.amazon.com/marketplace/pp/prodview-2hiaeo2px4md6">
         <img width="50" height="39" src="public/images/integrations/aws-logo.svg" alt="AWS Logo" />
-          <br /><sub><b>AWS Marketplace</b></sub></a>    
+          <br /><sub><b>AWS Marketplace</b></sub></a>
       </a>
     </td>
   </tr>
@@ -183,6 +189,8 @@ Getting started with Appwrite is as easy as creating a new project, choosing you
 - [**Realtime**](https://appwrite.io/docs/realtime) - Listen to real-time events for any of your Appwrite services including users, storage, functions, databases, and more.
 - [**Locale**](https://appwrite.io/docs/references/cloud/client-web/locale) - Track your user's location and manage your app locale-based data.
 - [**Avatars**](https://appwrite.io/docs/references/cloud/client-web/avatars) - Manage your users' avatars, countries' flags, browser icons, and credit card symbols. Generate QR codes from links or plaintext strings.
+- [**MCP**](https://appwrite.io/docs/tooling/mcp) - Use Appwrite's Model Context Protocol (MCP) server to allow LLMs and AI tools like Claude Desktop, Cursor, and Windsurf Editor to directly interact with your Appwrite project through natural language.
+- [**Sites**](https://appwrite.io/docs/products/sites) - Develop, deploy, and scale your web applications directly from Appwrite, alongside your backend.
 
 For the complete API documentation, visit [https://appwrite.io/docs](https://appwrite.io/docs). For more tutorials, news and announcements check out our [blog](https://medium.com/appwrite-io) and [Discord Server](https://discord.gg/GSeTUeA).
 
@@ -192,34 +200,34 @@ Below is a list of currently supported platforms and languages. If you would lik
 
 #### Client
 
-- ✅ &nbsp; [Web](https://github.com/appwrite/sdk-for-web) (Maintained by the Appwrite Team)
-- ✅ &nbsp; [Flutter](https://github.com/appwrite/sdk-for-flutter) (Maintained by the Appwrite Team)
-- ✅ &nbsp; [Apple](https://github.com/appwrite/sdk-for-apple) (Maintained by the Appwrite Team)
-- ✅ &nbsp; [Android](https://github.com/appwrite/sdk-for-android) (Maintained by the Appwrite Team)
-- ✅ &nbsp; [React Native](https://github.com/appwrite/sdk-for-react-native) - **Beta** (Maintained by the Appwrite Team)
+- :white_check_mark: &nbsp; [Web](https://github.com/appwrite/sdk-for-web) (Maintained by the Appwrite Team)
+- :white_check_mark: &nbsp; [Flutter](https://github.com/appwrite/sdk-for-flutter) (Maintained by the Appwrite Team)
+- :white_check_mark: &nbsp; [Apple](https://github.com/appwrite/sdk-for-apple) (Maintained by the Appwrite Team)
+- :white_check_mark: &nbsp; [Android](https://github.com/appwrite/sdk-for-android) (Maintained by the Appwrite Team)
+- :white_check_mark: &nbsp; [React Native](https://github.com/appwrite/sdk-for-react-native) - **Beta** (Maintained by the Appwrite Team)
 
 #### Server
 
-- ✅ &nbsp; [NodeJS](https://github.com/appwrite/sdk-for-node) (Maintained by the Appwrite Team)
-- ✅ &nbsp; [PHP](https://github.com/appwrite/sdk-for-php) (Maintained by the Appwrite Team)
-- ✅ &nbsp; [Dart](https://github.com/appwrite/sdk-for-dart) (Maintained by the Appwrite Team)
-- ✅ &nbsp; [Deno](https://github.com/appwrite/sdk-for-deno) (Maintained by the Appwrite Team)
-- ✅ &nbsp; [Ruby](https://github.com/appwrite/sdk-for-ruby) (Maintained by the Appwrite Team)
-- ✅ &nbsp; [Python](https://github.com/appwrite/sdk-for-python) (Maintained by the Appwrite Team)
-- ✅ &nbsp; [Kotlin](https://github.com/appwrite/sdk-for-kotlin) (Maintained by the Appwrite Team)
-- ✅ &nbsp; [Swift](https://github.com/appwrite/sdk-for-swift) (Maintained by the Appwrite Team)
-- ✅ &nbsp; [.NET](https://github.com/appwrite/sdk-for-dotnet) - **Beta** (Maintained by the Appwrite Team)
+- :white_check_mark: &nbsp; [NodeJS](https://github.com/appwrite/sdk-for-node) (Maintained by the Appwrite Team)
+- :white_check_mark: &nbsp; [PHP](https://github.com/appwrite/sdk-for-php) (Maintained by the Appwrite Team)
+- :white_check_mark: &nbsp; [Dart](https://github.com/appwrite/sdk-for-dart) (Maintained by the Appwrite Team)
+- :white_check_mark: &nbsp; [Deno](https://github.com/appwrite/sdk-for-deno) (Maintained by the Appwrite Team)
+- :white_check_mark: &nbsp; [Ruby](https://github.com/appwrite/sdk-for-ruby) (Maintained by the Appwrite Team)
+- :white_check_mark: &nbsp; [Python](https://github.com/appwrite/sdk-for-python) (Maintained by the Appwrite Team)
+- :white_check_mark: &nbsp; [Kotlin](https://github.com/appwrite/sdk-for-kotlin) (Maintained by the Appwrite Team)
+- :white_check_mark: &nbsp; [Swift](https://github.com/appwrite/sdk-for-swift) (Maintained by the Appwrite Team)
+- :white_check_mark: &nbsp; [.NET](https://github.com/appwrite/sdk-for-dotnet) - **Beta** (Maintained by the Appwrite Team)
 
 #### Community
 
-- ✅ &nbsp; [Appcelerator Titanium](https://github.com/m1ga/ti.appwrite) (Maintained by [Michael Gangolf](https://github.com/m1ga/))
-- ✅ &nbsp; [Godot Engine](https://github.com/GodotNuts/appwrite-sdk) (Maintained by [fenix-hub @GodotNuts](https://github.com/fenix-hub))
+- :white_check_mark: &nbsp; [Appcelerator Titanium](https://github.com/m1ga/ti.appwrite) (Maintained by [Michael Gangolf](https://github.com/m1ga/))
+- :white_check_mark: &nbsp; [Godot Engine](https://github.com/GodotNuts/appwrite-sdk) (Maintained by [fenix-hub @GodotNuts](https://github.com/fenix-hub))
 
 Looking for more SDKs? - Help us by contributing a pull request to our [SDK Generator](https://github.com/appwrite/sdk-generator)!
 
 ## Architecture
 
-![Appwrite Architecture](docs/specs/overview.drawio.svg)
+![Appwrite Architecture showing how Appwrite is built and the services and tools it uses](docs/specs/overview.drawio.svg)
 
 Appwrite uses a microservices architecture that was designed for easy scaling and delegation of responsibilities. In addition, Appwrite supports multiple APIs, such as REST, WebSocket, and GraphQL to allow you to interact with your resources by leveraging your existing knowledge and protocols of choice.
 
@@ -229,7 +237,7 @@ The Appwrite API layer was designed to be extremely fast by leveraging in-memory
 
 All code contributions, including those of people having commit access, must go through a pull request and be approved by a core developer before being merged. This is to ensure a proper review of all the code.
 
-We truly ❤️ pull requests! If you wish to help, you can learn more about how you can contribute to this project in the [contribution guide](CONTRIBUTING.md).
+We truly :heart: pull requests! If you wish to help, you can learn more about how you can contribute to this project in the [contribution guide](CONTRIBUTING.md).
 
 ## Security
 

SECURITY.md

@@ -11,6 +11,7 @@
 | 1.3.x     | :white_check_mark: |
 | 1.4.x     | :white_check_mark: |
 | 1.5.x     | :white_check_mark: |
+| 1.6.x     | :white_check_mark: |
 
 ## Reporting a Vulnerability
 

app/cli.php

@@ -5,13 +5,20 @@ require_once __DIR__ . '/init.php';
 use Appwrite\Event\Certificate;
 use Appwrite\Event\Delete;
 use Appwrite\Event\Func;
+use Appwrite\Event\StatsResources;
+use Appwrite\Event\StatsUsage;
 use Appwrite\Platform\Appwrite;
 use Appwrite\Runtimes\Runtimes;
+use Executor\Executor;
+use Swoole\Runtime;
+use Swoole\Timer;
+use Utopia\Cache\Adapter\Pool as CachePool;
 use Utopia\Cache\Adapter\Sharding;
 use Utopia\Cache\Cache;
 use Utopia\CLI\CLI;
 use Utopia\CLI\Console;
 use Utopia\Config\Config;
+use Utopia\Database\Adapter\Pool as DatabasePool;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
 use Utopia\Database\Validator\Authorization;
@@ -19,12 +26,16 @@ use Utopia\DSN\DSN;
 use Utopia\Logger\Log;
 use Utopia\Platform\Service;
 use Utopia\Pools\Group;
-use Utopia\Queue\Connection;
+use Utopia\Queue\Broker\Pool as BrokerPool;
+use Utopia\Queue\Publisher;
 use Utopia\Registry\Registry;
 use Utopia\System\System;
+use Utopia\Telemetry\Adapter\None as NoTelemetry;
 
-// overwriting runtimes to be architectur agnostic for CLI
-Config::setParam('runtimes', (new Runtimes('v4'))->getAll(supported: false));
+use function Swoole\Coroutine\run;
+
+// overwriting runtimes to be architecture agnostic for CLI
+Config::setParam('runtimes', (new Runtimes('v5'))->getAll(supported: false));
 
 // require controllers after overwriting runtimes
 require_once __DIR__ . '/controllers/general.php';
@@ -38,11 +49,7 @@ CLI::setResource('cache', function ($pools) {
     $adapters = [];
 
     foreach ($list as $value) {
-        $adapters[] = $pools
-            ->get($value)
-            ->pop()
-            ->getResource()
-        ;
+        $adapters[] = new CachePool($pools->get($value));
     }
 
     return new Cache(new Sharding($adapters));
@@ -52,7 +59,7 @@ CLI::setResource('pools', function (Registry $register) {
     return $register->get('pools');
 }, ['register']);
 
-CLI::setResource('dbForConsole', function ($pools, $cache) {
+CLI::setResource('dbForPlatform', function ($pools, $cache) {
     $sleep = 3;
     $maxAttempts = 5;
     $attempts = 0;
@@ -62,14 +69,10 @@ CLI::setResource('dbForConsole', function ($pools, $cache) {
         $attempts++;
         try {
             // Prepare database connection
-            $dbAdapter = $pools
-                ->get('console')
-                ->pop()
-                ->getResource();
+            $adapter = new DatabasePool($pools->get('console'));
+            $dbForPlatform = new Database($adapter, $cache);
 
-            $dbForConsole = new Database($dbAdapter, $cache);
-
-            $dbForConsole
+            $dbForPlatform
                 ->setNamespace('_console')
                 ->setMetadata('host', \gethostname())
                 ->setMetadata('project', 'console');
@@ -78,14 +81,13 @@ CLI::setResource('dbForConsole', function ($pools, $cache) {
             $collections = Config::getParam('collections', [])['console'];
             $last = \array_key_last($collections);
 
-            if (!($dbForConsole->exists($dbForConsole->getDatabase(), $last))) { /** TODO cache ready variable using registry */
+            if (!($dbForPlatform->exists($dbForPlatform->getDatabase(), $last))) { /** TODO cache ready variable using registry */
                 throw new Exception('Tables not ready yet.');
             }
 
             $ready = true;
         } catch (\Throwable $err) {
             Console::warning($err->getMessage());
-            $pools->get('console')->reclaim();
             sleep($sleep);
         }
     } while ($attempts < $maxAttempts && !$ready);
@@ -94,15 +96,19 @@ CLI::setResource('dbForConsole', function ($pools, $cache) {
         throw new Exception("Console is not ready yet. Please try again later.");
     }
 
-    return $dbForConsole;
+    return $dbForPlatform;
 }, ['pools', 'cache']);
 
-CLI::setResource('getProjectDB', function (Group $pools, Database $dbForConsole, $cache) {
+CLI::setResource('console', function () {
+    return new Document(Config::getParam('console'));
+}, []);
+
+CLI::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform, $cache) {
     $databases = []; // TODO: @Meldiron This should probably be responsibility of utopia-php/pools
 
-    return function (Document $project) use ($pools, $dbForConsole, $cache, &$databases) {
+    return function (Document $project) use ($pools, $dbForPlatform, $cache, &$databases) {
         if ($project->isEmpty() || $project->getId() === 'console') {
-            return $dbForConsole;
+            return $dbForPlatform;
         }
 
         try {
@@ -114,41 +120,38 @@ CLI::setResource('getProjectDB', function (Group $pools, Database $dbForConsole,
 
         if (isset($databases[$dsn->getHost()])) {
             $database = $databases[$dsn->getHost()];
+            $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
 
-            if ($dsn->getHost() === System::getEnv('_APP_DATABASE_SHARED_TABLES', '')) {
+            if (\in_array($dsn->getHost(), $sharedTables)) {
                 $database
                     ->setSharedTables(true)
-                    ->setTenant($project->getInternalId())
+                    ->setTenant((int)$project->getSequence())
                     ->setNamespace($dsn->getParam('namespace'));
             } else {
                 $database
                     ->setSharedTables(false)
                     ->setTenant(null)
-                    ->setNamespace('_' . $project->getInternalId());
+                    ->setNamespace('_' . $project->getSequence());
             }
 
             return $database;
         }
 
-        $dbAdapter = $pools
-            ->get($dsn->getHost())
-            ->pop()
-            ->getResource();
-
-        $database = new Database($dbAdapter, $cache);
-
+        $adapter = new DatabasePool($pools->get($dsn->getHost()));
+        $database = new Database($adapter, $cache);
         $databases[$dsn->getHost()] = $database;
+        $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
 
-        if ($dsn->getHost() === System::getEnv('_APP_DATABASE_SHARED_TABLES', '')) {
+        if (\in_array($dsn->getHost(), $sharedTables)) {
             $database
                 ->setSharedTables(true)
-                ->setTenant($project->getInternalId())
+                ->setTenant((int)$project->getSequence())
                 ->setNamespace($dsn->getParam('namespace'));
         } else {
             $database
                 ->setSharedTables(false)
                 ->setTenant(null)
-                ->setNamespace('_' . $project->getInternalId());
+                ->setNamespace('_' . $project->getSequence());
         }
 
         $database
@@ -157,22 +160,73 @@ CLI::setResource('getProjectDB', function (Group $pools, Database $dbForConsole,
 
         return $database;
     };
-}, ['pools', 'dbForConsole', 'cache']);
+}, ['pools', 'dbForPlatform', 'cache']);
 
-CLI::setResource('queue', function (Group $pools) {
-    return $pools->get('queue')->pop()->getResource();
+CLI::setResource('getLogsDB', function (Group $pools, Cache $cache) {
+    $database = null;
+
+    return function (?Document $project = null) use ($pools, $cache, $database) {
+        if ($database !== null && $project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
+            $database->setTenant((int)$project->getSequence());
+            return $database;
+        }
+
+        $adapter = new DatabasePool($pools->get('logs'));
+        $database = new Database($adapter, $cache);
+
+        $database
+            ->setSharedTables(true)
+            ->setNamespace('logsV1')
+            ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_TASK)
+            ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);
+
+        // set tenant
+        if ($project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
+            $database->setTenant((int)$project->getSequence());
+        }
+
+        return $database;
+    };
+}, ['pools', 'cache']);
+CLI::setResource('publisher', function (Group $pools) {
+    return new BrokerPool(publisher: $pools->get('publisher'));
 }, ['pools']);
-CLI::setResource('queueForFunctions', function (Connection $queue) {
-    return new Func($queue);
-}, ['queue']);
-CLI::setResource('queueForDeletes', function (Connection $queue) {
-    return new Delete($queue);
-}, ['queue']);
-CLI::setResource('queueForCertificates', function (Connection $queue) {
-    return new Certificate($queue);
-}, ['queue']);
+CLI::setResource('publisherDatabases', function (BrokerPool $publisher) {
+    return $publisher;
+}, ['publisher']);
+CLI::setResource('publisherFunctions', function (BrokerPool $publisher) {
+    return $publisher;
+}, ['publisher']);
+CLI::setResource('publisherMigrations', function (BrokerPool $publisher) {
+    return $publisher;
+}, ['publisher']);
+CLI::setResource('publisherStatsUsage', function (BrokerPool $publisher) {
+    return $publisher;
+}, ['publisher']);
+CLI::setResource('queueForStatsUsage', function (Publisher $publisher) {
+    return new StatsUsage($publisher);
+}, ['publisher']);
+CLI::setResource('queueForStatsResources', function (Publisher $publisher) {
+    return new StatsResources($publisher);
+}, ['publisher']);
+CLI::setResource('queueForFunctions', function (Publisher $publisher) {
+    return new Func($publisher);
+}, ['publisher']);
+CLI::setResource('queueForDeletes', function (Publisher $publisher) {
+    return new Delete($publisher);
+}, ['publisher']);
+CLI::setResource('queueForCertificates', function (Publisher $publisher) {
+    return new Certificate($publisher);
+}, ['publisher']);
 CLI::setResource('logError', function (Registry $register) {
     return function (Throwable $error, string $namespace, string $action) use ($register) {
+        Console::error('[Error] Timestamp: ' . date('c', time()));
+        Console::error('[Error] Type: ' . get_class($error));
+        Console::error('[Error] Message: ' . $error->getMessage());
+        Console::error('[Error] File: ' . $error->getFile());
+        Console::error('[Error] Line: ' . $error->getLine());
+        Console::error('[Error] Trace: ' . $error->getTraceAsString());
+
         $logger = $register->get('logger');
 
         if ($logger) {
@@ -180,7 +234,7 @@ CLI::setResource('logError', function (Registry $register) {
 
             $log = new Log();
             $log->setNamespace($namespace);
-            $log->setServer(\gethostname());
+            $log->setServer(System::getEnv('_APP_LOGGING_SERVICE_IDENTIFIER', \gethostname()));
             $log->setVersion($version);
             $log->setType(Log::TYPE_ERROR);
             $log->setMessage($error->getMessage());
@@ -191,31 +245,55 @@ CLI::setResource('logError', function (Registry $register) {
             $log->addExtra('file', $error->getFile());
             $log->addExtra('line', $error->getLine());
             $log->addExtra('trace', $error->getTraceAsString());
+            $log->addExtra('detailedTrace', $error->getTrace());
 
             $log->setAction($action);
 
             $isProduction = System::getEnv('_APP_ENV', 'development') === 'production';
             $log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
 
-            $responseCode = $logger->addLog($log);
-            Console::info('Usage stats log pushed with status code: ' . $responseCode);
+            try {
+                $responseCode = $logger->addLog($log);
+                Console::info('Error log pushed with status code: ' . $responseCode);
+            } catch (Throwable $th) {
+                Console::error('Error pushing log: ' . $th->getMessage());
+            }
         }
-
-        Console::warning("Failed: {$error->getMessage()}");
-        Console::warning($error->getTraceAsString());
     };
 }, ['register']);
 
-$platform = new Appwrite();
-$platform->init(Service::TYPE_TASK);
+CLI::setResource('executor', fn () => new Executor());
 
+CLI::setResource('telemetry', fn () => new NoTelemetry());
+
+$platform = new Appwrite();
+$args = $platform->getEnv('argv');
+
+if (!isset($args[0])) {
+    Console::error('Missing task name');
+    Console::exit(1);
+}
+
+\array_shift($args);
+$taskName = $args[0];
+$platform->init(Service::TYPE_TASK);
 $cli = $platform->getCli();
 
 $cli
     ->error()
     ->inject('error')
-    ->action(function (Throwable $error) {
-        Console::error($error->getMessage());
+    ->inject('logError')
+    ->action(function (Throwable $error, callable $logError) use ($taskName) {
+        call_user_func_array($logError, [
+            $error,
+            'Task',
+            $taskName,
+        ]);
+
+        Timer::clearAll();
     });
 
-$cli->run();
+$cli->shutdown()->action(fn () => Timer::clearAll());
+
+Runtime::enableCoroutine(SWOOLE_HOOK_ALL);
+run($cli->run(...));

app/config/avatars/credit-cards.php

@@ -16,5 +16,6 @@ return [
     'union-china-pay' => ['name' => 'Union China Pay', 'path' => __DIR__ . '/credit-cards/union-china-pay.png'],
     'visa' => ['name' => 'Visa', 'path' => __DIR__ . '/credit-cards/visa.png'],
     'mir' => ['name' => 'MIR', 'path' => __DIR__ . '/credit-cards/mir.png'],
-    'maestro' => ['name' => 'Maestro', 'path' => __DIR__ . '/credit-cards/maestro.png']
+    'maestro' => ['name' => 'Maestro', 'path' => __DIR__ . '/credit-cards/maestro.png'],
+    'rupay' => ['name' => 'Rupay', 'path' => __DIR__ . '/credit-cards/rupay.png']
 ];

app/config/collections/databases.php

@@ -0,0 +1,126 @@
+<?php
+
+use Utopia\Database\Database;
+use Utopia\Database\Helpers\ID;
+
+return [
+    'collections' => [
+        '$collection' => ID::custom('databases'),
+        '$id' => ID::custom('collections'),
+        'name' => 'Collections',
+        'attributes' => [
+            [
+                '$id' => ID::custom('databaseInternalId'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => Database::LENGTH_KEY,
+                'signed' => true,
+                'required' => true,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
+            [
+                '$id' => ID::custom('databaseId'),
+                'type' => Database::VAR_STRING,
+                'signed' => true,
+                'size' => Database::LENGTH_KEY,
+                'format' => '',
+                'filters' => [],
+                'required' => true,
+                'default' => null,
+                'array' => false,
+            ],
+            [
+                '$id' => ID::custom('name'),
+                'type' => Database::VAR_STRING,
+                'size' => 256,
+                'required' => true,
+                'signed' => true,
+                'array' => false,
+                'filters' => [],
+            ],
+            [
+                '$id' => ID::custom('enabled'),
+                'type' => Database::VAR_BOOLEAN,
+                'signed' => true,
+                'size' => 0,
+                'format' => '',
+                'filters' => [],
+                'required' => true,
+                'default' => null,
+                'array' => false,
+            ],
+            [
+                '$id' => ID::custom('documentSecurity'),
+                'type' => Database::VAR_BOOLEAN,
+                'signed' => true,
+                'size' => 0,
+                'format' => '',
+                'filters' => [],
+                'required' => true,
+                'default' => null,
+                'array' => false,
+            ],
+            [
+                '$id' => ID::custom('attributes'),
+                'type' => Database::VAR_STRING,
+                'size' => 1000000,
+                'required' => false,
+                'signed' => true,
+                'array' => false,
+                'filters' => ['subQueryAttributes'],
+            ],
+            [
+                '$id' => ID::custom('indexes'),
+                'type' => Database::VAR_STRING,
+                'size' => 1000000,
+                'required' => false,
+                'signed' => true,
+                'array' => false,
+                'filters' => ['subQueryIndexes'],
+            ],
+            [
+                '$id' => ID::custom('search'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 16384,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
+        ],
+        'indexes' => [
+            [
+                '$id' => ID::custom('_fulltext_search'),
+                'type' => Database::INDEX_FULLTEXT,
+                'attributes' => ['search'],
+                'lengths' => [],
+                'orders' => [],
+            ],
+            [
+                '$id' => ID::custom('_key_name'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['name'],
+                'lengths' => [256],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_enabled'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['enabled'],
+                'lengths' => [],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_documentSecurity'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['documentSecurity'],
+                'lengths' => [],
+                'orders' => [Database::ORDER_ASC],
+            ],
+        ],
+    ]
+];

app/config/collections/logs.php

@@ -0,0 +1,94 @@
+<?php
+
+use Utopia\Database\Database;
+use Utopia\Database\Helpers\ID;
+
+$logsCollection = [];
+
+$logsCollection['stats'] = [
+    '$collection' => ID::custom(Database::METADATA),
+    '$id' => ID::custom('stats'),
+    'name' => 'stats',
+    'attributes' => [
+        [
+            '$id' => ID::custom('metric'),
+            'type' => Database::VAR_STRING,
+            'format' => '',
+            'size' => 255,
+            'signed' => true,
+            'required' => true,
+            'default' => null,
+            'array' => false,
+            'filters' => [],
+        ],
+        [
+            '$id' => ID::custom('region'),
+            'type' => Database::VAR_STRING,
+            'format' => '',
+            'size' => 255,
+            'signed' => true,
+            'required' => true,
+            'default' => null,
+            'array' => false,
+            'filters' => [],
+        ],
+        [
+            '$id' => ID::custom('value'),
+            'type' => Database::VAR_INTEGER,
+            'format' => '',
+            'size' => 8,
+            'signed' => true,
+            'required' => true,
+            'default' => null,
+            'array' => false,
+            'filters' => [],
+        ],
+        [
+            '$id' => ID::custom('time'),
+            'type' => Database::VAR_DATETIME,
+            'format' => '',
+            'size' => 0,
+            'signed' => false,
+            'required' => false,
+            'default' => null,
+            'array' => false,
+            'filters' => ['datetime'],
+        ],
+        [
+            '$id' => ID::custom('period'),
+            'type' => Database::VAR_STRING,
+            'format' => '',
+            'size' => 4,
+            'signed' => true,
+            'required' => true,
+            'default' => null,
+            'array' => false,
+            'filters' => [],
+        ],
+    ],
+    'indexes' => [
+        [
+            '$id' => ID::custom('_key_time'),
+            'type' => Database::INDEX_KEY,
+            'attributes' => ['time'],
+            'lengths' => [],
+            'orders' => [Database::ORDER_DESC],
+        ],
+        [
+            '$id' => ID::custom('_key_period_time'),
+            'type' => Database::INDEX_KEY,
+            'attributes' => ['period', 'time'],
+            'lengths' => [],
+            'orders' => [Database::ORDER_ASC],
+        ],
+        [
+            '$id' => ID::custom('_key_metric_period_time'),
+            'type' => Database::INDEX_UNIQUE,
+            'attributes' => ['metric', 'period', 'time'],
+            'lengths' => [],
+            'orders' => [Database::ORDER_DESC],
+        ],
+    ],
+];
+
+return $logsCollection;

app/config/console.php

@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * Initializes console project document.
+ */
+
+use Appwrite\Auth\Auth;
+use Appwrite\Network\Platform;
+use Utopia\Database\Helpers\ID;
+use Utopia\System\System;
+
+$console = [
+    '$id' => ID::custom('console'),
+    '$sequence' => ID::custom('console'),
+    'name' => 'Appwrite',
+    '$collection' => ID::custom('projects'),
+    'description' => 'Appwrite core engine',
+    'logo' => '',
+    'teamId' => null,
+    'webhooks' => [],
+    'keys' => [],
+    'platforms' => [
+        [
+            '$collection' => ID::custom('platforms'),
+            'name' => 'Localhost',
+            'type' => Platform::TYPE_WEB,
+            'hostname' => 'localhost',
+        ], // Current host is added on app init
+    ],
+    'region' => 'fra',
+    'legalName' => '',
+    'legalCountry' => '',
+    'legalState' => '',
+    'legalCity' => '',
+    'legalAddress' => '',
+    'legalTaxId' => '',
+    'auths' => [
+        'mockNumbers' => [],
+        'invites' => System::getEnv('_APP_CONSOLE_INVITES', 'enabled') === 'enabled',
+        'limit' => (System::getEnv('_APP_CONSOLE_WHITELIST_ROOT', 'enabled') === 'enabled') ? 1 : 0, // limit signup to 1 user
+        'duration' => Auth::TOKEN_EXPIRATION_LOGIN_LONG, // 1 Year in seconds
+        'sessionAlerts' => System::getEnv('_APP_CONSOLE_SESSION_ALERTS', 'disabled') === 'enabled'
+    ],
+    'authWhitelistEmails' => (!empty(System::getEnv('_APP_CONSOLE_WHITELIST_EMAILS', null))) ? \explode(',', System::getEnv('_APP_CONSOLE_WHITELIST_EMAILS', null)) : [],
+    'authWhitelistIPs' => (!empty(System::getEnv('_APP_CONSOLE_WHITELIST_IPS', null))) ? \explode(',', System::getEnv('_APP_CONSOLE_WHITELIST_IPS', null)) : [],
+    'oAuthProviders' => [
+        'githubEnabled' => true,
+        'githubSecret' => System::getEnv('_APP_CONSOLE_GITHUB_SECRET', ''),
+        'githubAppid' => System::getEnv('_APP_CONSOLE_GITHUB_APP_ID', '')
+    ],
+];
+
+return $console;

app/config/errors.php

@@ -24,6 +24,11 @@ return [
         'description' => 'Access to this API is forbidden.',
         'code' => 401,
     ],
+    Exception::GENERAL_RESOURCE_BLOCKED => [
+        'name' => Exception::GENERAL_RESOURCE_BLOCKED,
+        'description' => 'Access to this resource is blocked.',
+        'code' => 401,
+    ],
     Exception::GENERAL_UNKNOWN_ORIGIN => [
         'name' => Exception::GENERAL_UNKNOWN_ORIGIN,
         'description' => 'The request originated from an unknown origin. If you trust this domain, please list it as a trusted platform in the Appwrite console.',
@@ -76,7 +81,7 @@ return [
     ],
     Exception::GENERAL_ROUTE_NOT_FOUND => [
         'name' => Exception::GENERAL_ROUTE_NOT_FOUND,
-        'description' => 'The requested route was not found. Please refer to the API docs and try again.',
+        'description' => 'Route not found. Please ensure the endpoint is configured correctly and that the API route is valid for this SDK version. Refer to the API docs for more details.',
         'code' => 404,
     ],
     Exception::GENERAL_CURSOR_NOT_FOUND => [
@@ -344,11 +349,6 @@ return [
         'description' => 'Team with the requested ID could not be found.',
         'code' => 404,
     ],
-    Exception::TEAM_INVITE_ALREADY_EXISTS => [
-        'name' => Exception::TEAM_INVITE_ALREADY_EXISTS,
-        'description' => 'User has already been invited or is already a member of this team',
-        'code' => 409,
-    ],
     Exception::TEAM_INVITE_NOT_FOUND => [
         'name' => Exception::TEAM_INVITE_NOT_FOUND,
         'description' => 'The requested team invitation could not be found.',
@@ -356,7 +356,7 @@ return [
     ],
     Exception::TEAM_INVALID_SECRET => [
         'name' => Exception::TEAM_INVALID_SECRET,
-        'description' => 'The team invitation secret is invalid. Please request  a new invitation and try again.',
+        'description' => 'The team invitation secret is invalid. Please request a new invitation and try again.',
         'code' => 401,
     ],
     Exception::TEAM_MEMBERSHIP_MISMATCH => [
@@ -375,6 +375,13 @@ return [
         'code' => 409,
     ],
 
+    /** Console */
+    Exception::RESOURCE_ALREADY_EXISTS => [
+        'name' => Exception::RESOURCE_ALREADY_EXISTS,
+        'description' => 'Resource with the requested ID already exists. Please choose a different ID and try again.',
+        'code' => 409,
+    ],
+
     /** Membership */
     Exception::MEMBERSHIP_NOT_FOUND => [
         'name' => Exception::MEMBERSHIP_NOT_FOUND,
@@ -386,6 +393,16 @@ return [
         'description' => 'Membership is already confirmed.',
         'code' => 409,
     ],
+    Exception::MEMBERSHIP_DELETION_PROHIBITED => [
+        'name' => Exception::MEMBERSHIP_DELETION_PROHIBITED,
+        'description' => 'Membership deletion is prohibited.',
+        'code' => 400,
+    ],
+    Exception::MEMBERSHIP_DOWNGRADE_PROHIBITED => [
+        'name' => Exception::MEMBERSHIP_DOWNGRADE_PROHIBITED,
+        'description' => 'Membership role downgrade is prohibited.',
+        'code' => 400,
+    ],
 
     /** Avatars */
     Exception::AVATAR_SET_NOT_FOUND => [
@@ -481,6 +498,23 @@ return [
         'code' => 403,
     ],
 
+    /** Tokens */
+    Exception::TOKEN_NOT_FOUND => [
+        'name' => Exception::TOKEN_NOT_FOUND,
+        'description' => 'The requested file token could not be found.',
+        'code' => 404,
+    ],
+    Exception::TOKEN_EXPIRED => [
+        'name' => Exception::TOKEN_EXPIRED,
+        'description' => 'The requested file token has expired.',
+        'code' => 401,
+    ],
+    Exception::TOKEN_RESOURCE_TYPE_INVALID => [
+        'name' => Exception::TOKEN_RESOURCE_TYPE_INVALID,
+        'description' => 'The resource type for the token is invalid.',
+        'code' => 400,
+    ],
+
     /** VCS */
     Exception::INSTALLATION_NOT_FOUND => [
         'name' => Exception::INSTALLATION_NOT_FOUND,
@@ -520,7 +554,7 @@ return [
         'code' => 404,
     ],
     Exception::FUNCTION_ENTRYPOINT_MISSING => [
-        'name' => Exception::FUNCTION_RUNTIME_UNSUPPORTED,
+        'name' => Exception::FUNCTION_ENTRYPOINT_MISSING,
         'description' => 'Entrypoint for your Appwrite Function is missing. Please specify it when making deployment or update the entrypoint under your function\'s "Settings" > "Configuration" > "Entrypoint".',
         'code' => 404,
     ],
@@ -534,6 +568,28 @@ return [
         'description' => 'Function Template with the requested ID could not be found.',
         'code' => 404,
     ],
+    Exception::FUNCTION_RUNTIME_NOT_DETECTED => [
+        'name' => Exception::FUNCTION_RUNTIME_NOT_DETECTED,
+        'description' => 'Function runtime could not be detected.',
+        'code' => 400,
+    ],
+    Exception::FUNCTION_EXECUTE_PERMISSION_MISSING => [
+        'name' => Exception::FUNCTION_EXECUTE_PERMISSION_MISSING,
+        'description' => 'To execute function using domain, execute permissions must include "any" or "guests".',
+        'code' => 401,
+    ],
+
+    /** Sites */
+    Exception::SITE_NOT_FOUND => [
+        'name' => Exception::SITE_NOT_FOUND,
+        'description' => 'Site with the requested ID could not be found.',
+        'code' => 404,
+    ],
+    Exception::SITE_TEMPLATE_NOT_FOUND => [
+        'name' => Exception::SITE_TEMPLATE_NOT_FOUND,
+        'description' => 'Site Template with the requested ID could not be found.',
+        'code' => 404,
+    ],
 
     /** Builds  */
     Exception::BUILD_NOT_FOUND => [
@@ -556,6 +612,16 @@ return [
         'description' => 'Build with the requested ID is already completed and cannot be canceled.',
         'code' => 400,
     ],
+    Exception::BUILD_CANCELED => [
+        'name' => Exception::BUILD_CANCELED,
+        'description' => 'Build with the requested ID has been canceled.',
+        'code' => 400,
+    ],
+    Exception::BUILD_FAILED => [
+        'name' => Exception::BUILD_FAILED,
+        'description' => 'Build with the requested ID failed. Please check the logs for more information.',
+        'code' => 400,
+    ],
 
     /** Deployments */
     Exception::DEPLOYMENT_NOT_FOUND => [
@@ -577,6 +643,13 @@ return [
         'code' => 400,
     ],
 
+    /** Logs */
+    Exception::LOG_NOT_FOUND => [
+        'name' => Exception::LOG_NOT_FOUND,
+        'description' => 'Log with the requested ID could not be found.',
+        'code' => 404,
+    ],
+
     /** Databases */
     Exception::DATABASE_NOT_FOUND => [
         'name' => Exception::DATABASE_NOT_FOUND,
@@ -593,6 +666,11 @@ return [
         'description' => 'Database timed out. Try adjusting your queries or adding an index.',
         'code' => 408
     ],
+    Exception::DATABASE_QUERY_ORDER_NULL => [
+        'name' => Exception::DATABASE_QUERY_ORDER_NULL,
+        'description' => 'The order attribute had a null value. Cursor pagination requires all documents order attribute values are non-null.',
+        'code' => 400,
+    ],
 
     /** Collections */
     Exception::COLLECTION_NOT_FOUND => [
@@ -681,7 +759,7 @@ return [
     ],
     Exception::ATTRIBUTE_LIMIT_EXCEEDED => [
         'name' => Exception::ATTRIBUTE_LIMIT_EXCEEDED,
-        'description' => 'The maximum number of attributes has been reached.',
+        'description' => 'The maximum number or size of attributes for this collection has been reached.',
         'code' => 400,
     ],
     Exception::ATTRIBUTE_VALUE_INVALID => [
@@ -726,6 +804,11 @@ return [
         'description' => 'Index invalid.',
         'code' => 400,
     ],
+    Exception::INDEX_DEPENDENCY => [
+        'name' => Exception::INDEX_DEPENDENCY,
+        'description' => 'Attribute cannot be renamed or deleted. Please remove the associated index first.',
+        'code' => 409,
+    ],
 
     /** Project Errors */
     Exception::PROJECT_NOT_FOUND => [
@@ -796,7 +879,7 @@ return [
     Exception::RULE_VERIFICATION_FAILED => [
         'name' => Exception::RULE_VERIFICATION_FAILED,
         'description' => 'Domain verification failed. Please check if your DNS records are correct and try again.',
-        'code' => 401,
+        'code' => 400,
         'publish' => true
     ],
     Exception::PROJECT_SMTP_CONFIG_INVALID => [
@@ -839,6 +922,11 @@ return [
         'description' => 'Variable with the same ID already exists in this project. Try again with a different ID.',
         'code' => 409,
     ],
+    Exception::VARIABLE_CANNOT_UNSET_SECRET => [
+        'name' => Exception::VARIABLE_CANNOT_UNSET_SECRET,
+        'description' => 'Secret variables cannot be marked as non-secret. Please re-create the variable if this is your intention.',
+        'code' => 400,
+    ],
     Exception::GRAPHQL_NO_QUERY => [
         'name' => Exception::GRAPHQL_NO_QUERY,
         'description' => 'Param "query" is not optional.',

app/config/events.php

@@ -106,12 +106,15 @@ return [
                 'create' => [
                     '$description' => 'This event triggers when a document is created.',
                 ],
-                'delete' => [
-                    '$description' => 'This event triggers when a document is deleted.'
-                ],
                 'update' => [
                     '$description' => 'This event triggers when a document is updated.'
                 ],
+                'upsert' => [
+                    '$description' => 'This event triggers when a document is upserted.',
+                ],
+                'delete' => [
+                    '$description' => 'This event triggers when a document is deleted.'
+                ],
             ],
             'indexes' => [
                 '$model' => Response::MODEL_INDEX,
@@ -217,6 +220,34 @@ return [
             ],
         ]
     ],
+    'sites' => [
+        '$model' => Response::MODEL_SITE,
+        '$resource' => true,
+        '$description' => 'This event triggers on any sites event.',
+        'deployments' => [
+            '$model' => Response::MODEL_DEPLOYMENT,
+            '$resource' => true,
+            '$description' => 'This event triggers on any deployments event.',
+            'create' => [
+                '$description' => 'This event triggers when a deployment is created.',
+            ],
+            'delete' => [
+                '$description' => 'This event triggers when a deployment is deleted.'
+            ],
+            'update' => [
+                '$description' => 'This event triggers when a deployment is updated.'
+            ],
+        ],
+        'create' => [
+            '$description' => 'This event triggers when a site is created.'
+        ],
+        'delete' => [
+            '$description' => 'This event triggers when a site is deleted.',
+        ],
+        'update' => [
+            '$description' => 'This event triggers when a site is updated.',
+        ]
+    ],
     'functions' => [
         '$model' => Response::MODEL_FUNCTION,
         '$resource' => true,

app/config/frameworks.php

@@ -0,0 +1,312 @@
+<?php
+
+/**
+ * List of Appwrite Sites supported frameworks
+ */
+
+use Utopia\Config\Config;
+
+$templateRuntimes = Config::getParam('template-runtimes');
+
+function getVersions(array $versions, string $prefix)
+{
+    return array_map(function ($version) use ($prefix) {
+        return $prefix . '-' . $version;
+    }, $versions);
+}
+
+return [
+    'analog' => [
+        'key' => 'analog',
+        'name' => 'Analog',
+        'screenshotSleep' => 3000,
+        'buildRuntime' => 'node-22',
+        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
+        'bundleCommand' => 'bash /usr/local/server/helpers/analog/bundle.sh',
+        'envCommand' => 'source /usr/local/server/helpers/analog/env.sh',
+        'adapters' => [
+            'ssr' => [
+                'key' => 'ssr',
+                'buildCommand' => 'npm run build',
+                'installCommand' => 'npm install',
+                'outputDirectory' => './dist/analog',
+                'startCommand' => 'bash helpers/analog/server.sh',
+            ],
+            'static' => [
+                'key' => 'static',
+                'buildCommand' => 'npm run build',
+                'installCommand' => 'npm install',
+                'outputDirectory' => './dist/analog/public',
+                'startCommand' => 'bash helpers/server.sh',
+                'fallbackFile' => 'index.html'
+            ]
+        ]
+    ],
+    'angular' => [
+        'key' => 'angular',
+        'name' => 'Angular',
+        'screenshotSleep' => 3000,
+        'buildRuntime' => 'node-22',
+        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
+        'bundleCommand' => 'bash /usr/local/server/helpers/angular/bundle.sh',
+        'envCommand' => 'source /usr/local/server/helpers/angular/env.sh',
+        'adapters' => [
+            'ssr' => [
+                'key' => 'ssr',
+                'buildCommand' => 'npm run build',
+                'installCommand' => 'npm install',
+                'outputDirectory' => './dist/angular',
+                'startCommand' => 'bash helpers/angular/server.sh',
+            ],
+            'static' => [
+                'key' => 'static',
+                'buildCommand' => 'npm run build',
+                'installCommand' => 'npm install',
+                'outputDirectory' => './dist/angular/browser',
+                'startCommand' => 'bash helpers/server.sh',
+                'fallbackFile' => 'index.csr.html'
+            ]
+        ]
+    ],
+    'nextjs' => [
+        'key' => 'nextjs',
+        'name' => 'Next.js',
+        'screenshotSleep' => 3000,
+        'buildRuntime' => 'node-22',
+        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
+        'bundleCommand' => 'bash /usr/local/server/helpers/next-js/bundle.sh',
+        'envCommand' => 'source /usr/local/server/helpers/next-js/env.sh',
+        'adapters' => [
+            'ssr' => [
+                'key' => 'ssr',
+                'buildCommand' => 'npm run build',
+                'installCommand' => 'npm install',
+                'outputDirectory' => './.next',
+                'startCommand' => 'bash helpers/next-js/server.sh',
+            ],
+            'static' => [
+                'key' => 'static',
+                'buildCommand' => 'npm run build',
+                'installCommand' => 'npm install',
+                'outputDirectory' => './out',
+                'startCommand' => 'bash helpers/server.sh',
+            ]
+        ]
+    ],
+    'react' => [
+        'key' => 'react',
+        'name' => 'React',
+        'screenshotSleep' => 3000,
+        'buildRuntime' => 'node-22',
+        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
+        'adapters' => [
+            'static' => [
+                'key' => 'static',
+                'buildCommand' => 'npm run build',
+                'installCommand' => 'npm install',
+                'outputDirectory' => './dist',
+                'startCommand' => 'bash helpers/server.sh',
+                'fallbackFile' => 'index.html'
+            ]
+        ]
+    ],
+    'nuxt' => [
+        'key' => 'nuxt',
+        'name' => 'Nuxt',
+        'screenshotSleep' => 3000,
+        'buildRuntime' => 'node-22',
+        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
+        'bundleCommand' => 'bash /usr/local/server/helpers/nuxt/bundle.sh',
+        'envCommand' => 'source /usr/local/server/helpers/nuxt/env.sh',
+        'adapters' => [
+            'ssr' => [
+                'key' => 'ssr',
+                'buildCommand' => 'npm run build',
+                'installCommand' => 'npm install',
+                'outputDirectory' => './.output',
+                'startCommand' => 'bash helpers/nuxt/server.sh',
+            ],
+            'static' => [
+                'key' => 'static',
+                'buildCommand' => 'npm run generate',
+                'installCommand' => 'npm install',
+                'outputDirectory' => './output/public',
+                'startCommand' => 'bash helpers/server.sh',
+            ]
+        ]
+    ],
+    'vue' => [
+        'key' => 'vue',
+        'name' => 'Vue.js',
+        'screenshotSleep' => 5000,
+        'buildRuntime' => 'node-22',
+        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
+        'adapters' => [
+            'static' => [
+                'key' => 'static',
+                'buildCommand' => 'npm run build',
+                'installCommand' => 'npm install',
+                'outputDirectory' => './dist',
+                'startCommand' => 'bash helpers/server.sh',
+                'fallbackFile' => 'index.html'
+            ]
+        ]
+    ],
+    'sveltekit' => [
+        'key' => 'sveltekit',
+        'name' => 'SvelteKit',
+        'screenshotSleep' => 3000,
+        'buildRuntime' => 'node-22',
+        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
+        'bundleCommand' => 'bash /usr/local/server/helpers/sveltekit/bundle.sh',
+        'envCommand' => 'source /usr/local/server/helpers/sveltekit/env.sh',
+        'adapters' => [
+            'ssr' => [
+                'key' => 'ssr',
+                'buildCommand' => 'npm run build',
+                'installCommand' => 'npm install',
+                'outputDirectory' => './build',
+                'startCommand' => 'bash helpers/sveltekit/server.sh',
+            ],
+            'static' => [
+                'key' => 'static',
+                'buildCommand' => 'npm run build',
+                'installCommand' => 'npm install',
+                'outputDirectory' => './build',
+                'startCommand' => 'bash helpers/server.sh',
+            ]
+        ]
+    ],
+    'astro' => [
+        'key' => 'astro',
+        'name' => 'Astro',
+        'screenshotSleep' => 3000,
+        'buildRuntime' => 'node-22',
+        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
+        'bundleCommand' => 'bash /usr/local/server/helpers/astro/bundle.sh',
+        'envCommand' => 'source /usr/local/server/helpers/astro/env.sh',
+        'adapters' => [
+            'ssr' => [
+                'key' => 'ssr',
+                'buildCommand' => 'npm run build',
+                'installCommand' => 'npm install',
+                'outputDirectory' => './dist',
+                'startCommand' => 'bash helpers/astro/server.sh',
+            ],
+            'static' => [
+                'key' => 'static',
+                'buildCommand' => 'npm run build',
+                'installCommand' => 'npm install',
+                'outputDirectory' => './dist',
+                'startCommand' => 'bash helpers/server.sh',
+            ]
+        ]
+    ],
+    'remix' => [
+        'key' => 'remix',
+        'name' => 'Remix',
+        'screenshotSleep' => 3000,
+        'buildRuntime' => 'node-22',
+        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
+        'bundleCommand' => 'bash /usr/local/server/helpers/remix/bundle.sh',
+        'envCommand' => 'source /usr/local/server/helpers/remix/env.sh',
+        'adapters' => [
+            'ssr' => [
+                'key' => 'ssr',
+                'buildCommand' => 'npm run build',
+                'installCommand' => 'npm install',
+                'outputDirectory' => './build',
+                'startCommand' => 'bash helpers/remix/server.sh',
+            ],
+            'static' => [
+                'key' => 'static',
+                'buildCommand' => 'npm run build',
+                'installCommand' => 'npm install',
+                'outputDirectory' => './build/client',
+                'startCommand' => 'bash helpers/server.sh',
+            ]
+        ]
+    ],
+    'lynx' => [
+        'key' => 'lynx',
+        'name' => 'Lynx',
+        'screenshotSleep' => 5000,
+        'buildRuntime' => 'node-22',
+        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
+        'adapters' => [
+            'static' => [
+                'key' => 'static',
+                'buildCommand' => 'npm run build',
+                'installCommand' => 'npm install',
+                'outputDirectory' => './dist',
+                'startCommand' => 'bash helpers/server.sh',
+                'fallbackFile' => 'index.html'
+            ]
+        ]
+    ],
+    'flutter' => [
+        'key' => 'flutter',
+        'name' => 'Flutter',
+        'screenshotSleep' => 5000,
+        'buildRuntime' => 'flutter-3.29',
+        'runtimes' => getVersions($templateRuntimes['FLUTTER']['versions'], 'flutter'),
+        'adapters' => [
+            'static' => [
+                'key' => 'static',
+                'buildCommand' => 'flutter build web --release -t lib/main.dart',
+                'installCommand' => 'flutter pub get',
+                'outputDirectory' => './build/web',
+                'startCommand' => 'bash helpers/server.sh',
+            ],
+        ],
+    ],
+    'react-native' => [
+        'key' => 'react-native',
+        'name' => 'React Native',
+        'screenshotSleep' => 3000,
+        'buildRuntime' => 'node-22',
+        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
+        'adapters' => [
+            'static' => [
+                'key' => 'static',
+                'buildCommand' => 'npm run build',
+                'installCommand' => 'npm install',
+                'outputDirectory' => './dist',
+                'startCommand' => 'bash helpers/server.sh',
+                'fallbackFile' => 'index.html'
+            ]
+        ]
+    ],
+    'vite' => [
+        'key' => 'vite',
+        'name' => 'Vite',
+        'screenshotSleep' => 3000,
+        'buildRuntime' => 'node-22',
+        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
+        'adapters' => [
+            'static' => [
+                'key' => 'static',
+                'buildCommand' => 'npm run build',
+                'installCommand' => 'npm install',
+                'outputDirectory' => './dist',
+                'startCommand' => 'bash helpers/server.sh',
+            ],
+        ]
+    ],
+    'other' => [
+        'key' => 'other',
+        'name' => 'Other',
+        'screenshotSleep' => 3000,
+        'buildRuntime' => 'node-22',
+        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
+        'adapters' => [
+            'static' => [
+                'key' => 'static',
+                'buildCommand' => '',
+                'installCommand' => '',
+                'outputDirectory' => './',
+                'startCommand' => 'bash helpers/server.sh',
+            ],
+        ]
+    ],
+];

app/config/locale/continents.php

@@ -1,11 +1,46 @@
 <?php
 
+/**
+ * Continent codes with names and approximate central coordinates
+ *
+ * Coordinates represent approximate geographical centers of each continent
+ * Note: These are simplified centroids and may not represent the exact geographical center
+ */
+
 return [
-    'AF',
-    'AN',
-    'AS',
-    'EU',
-    'NA',
-    'OC',
-    'SA',
+    'AF' => [
+        'name' => 'Africa',
+        'latitude' => 8.7832,
+        'longitude' => 34.5085
+    ],
+    'AN' => [
+        'name' => 'Antarctica',
+        'latitude' => -82.8628,
+        'longitude' => 135.0000
+    ],
+    'AS' => [
+        'name' => 'Asia',
+        'latitude' => 34.0479,
+        'longitude' => 100.6197
+    ],
+    'EU' => [
+        'name' => 'Europe',
+        'latitude' => 54.5260,
+        'longitude' => 15.2551
+    ],
+    'NA' => [
+        'name' => 'North America',
+        'latitude' => 54.5260,
+        'longitude' => -105.2551
+    ],
+    'OC' => [
+        'name' => 'Oceania',
+        'latitude' => -22.7359,
+        'longitude' => 140.0188
+    ],
+    'SA' => [
+        'name' => 'South America',
+        'latitude' => -8.7832,
+        'longitude' => -55.4915
+    ],
 ];

app/config/locale/countries.php

@@ -1,209 +1,210 @@
 <?php
 
 /**
- * ISO 3166 standard country codes
+ * ISO 3166 standard country codes with country names and coordinates
  * https://www.iso.org/iso-3166-country-codes.html
  *
  * Source:
  * https://www.iso.org/obp/ui/#search/code/
+ * Coordinates source: Natural Earth Data (approximate country centroids)
  */
 
 return [
-    'AF',
-    'AO',
-    'AL',
-    'AD',
-    'AE',
-    'AR',
-    'AM',
-    'AG',
-    'AU',
-    'AT',
-    'AZ',
-    'BI',
-    'BE',
-    'BJ',
-    'BF',
-    'BD',
-    'BG',
-    'BH',
-    'BS',
-    'BA',
-    'BY',
-    'BZ',
-    'BO',
-    'BR',
-    'BB',
-    'BN',
-    'BT',
-    'BW',
-    'CF',
-    'CA',
-    'CH',
-    'CL',
-    'CN',
-    'CI',
-    'CM',
-    'CD',
-    'CG',
-    'CO',
-    'KM',
-    'CV',
-    'CR',
-    'CU',
-    'CY',
-    'CZ',
-    'DE',
-    'DJ',
-    'DM',
-    'DK',
-    'DO',
-    'DZ',
-    'EC',
-    'EG',
-    'ER',
-    'ES',
-    'EE',
-    'ET',
-    'FI',
-    'FJ',
-    'FR',
-    'FM',
-    'GA',
-    'GB',
-    'GE',
-    'GH',
-    'GN',
-    'GM',
-    'GW',
-    'GQ',
-    'GR',
-    'GD',
-    'GT',
-    'GY',
-    'HK',
-    'HN',
-    'HR',
-    'HT',
-    'HU',
-    'ID',
-    'IN',
-    'IE',
-    'IR',
-    'IQ',
-    'IS',
-    'IL',
-    'IT',
-    'JM',
-    'JO',
-    'JP',
-    'KZ',
-    'KE',
-    'KG',
-    'KH',
-    'KI',
-    'KN',
-    'KR',
-    'KW',
-    'LA',
-    'LB',
-    'LR',
-    'LY',
-    'LC',
-    'LI',
-    'LK',
-    'LS',
-    'LT',
-    'LU',
-    'LV',
-    'MA',
-    'MC',
-    'MD',
-    'MG',
-    'MV',
-    'MX',
-    'MH',
-    'MK',
-    'ML',
-    'MT',
-    'MM',
-    'ME',
-    'MN',
-    'MZ',
-    'MR',
-    'MU',
-    'MW',
-    'MY',
-    'NA',
-    'NE',
-    'NG',
-    'NI',
-    'NL',
-    'NO',
-    'NP',
-    'NR',
-    'NZ',
-    'OM',
-    'PK',
-    'PS',
-    'PA',
-    'PE',
-    'PH',
-    'PW',
-    'PG',
-    'PL',
-    'KP',
-    'PT',
-    'PY',
-    'QA',
-    'RO',
-    'RU',
-    'RW',
-    'SA',
-    'SD',
-    'SN',
-    'SG',
-    'SB',
-    'SL',
-    'SV',
-    'SM',
-    'SO',
-    'RS',
-    'SS',
-    'ST',
-    'SR',
-    'SK',
-    'SI',
-    'SE',
-    'SZ',
-    'SC',
-    'SY',
-    'TD',
-    'TG',
-    'TH',
-    'TJ',
-    'TM',
-    'TL',
-    'TO',
-    'TT',
-    'TN',
-    'TR',
-    'TV',
-    'TZ',
-    'TW',
-    'UG',
-    'UA',
-    'UY',
-    'US',
-    'UZ',
-    'VA',
-    'VC',
-    'VE',
-    'VN',
-    'VU',
-    'WS',
-    'YE',
-    'ZA',
-    'ZM',
-    'ZW',
+    'AF' => ['name' => 'Afghanistan', 'latitude' => 33.0, 'longitude' => 66.0],
+    'AO' => ['name' => 'Angola', 'latitude' => -12.5, 'longitude' => 18.5],
+    'AL' => ['name' => 'Albania', 'latitude' => 41.0, 'longitude' => 20.0],
+    'AD' => ['name' => 'Andorra', 'latitude' => 42.5, 'longitude' => 1.6],
+    'AE' => ['name' => 'United Arab Emirates', 'latitude' => 24.0, 'longitude' => 54.0],
+    'AR' => ['name' => 'Argentina', 'latitude' => -34.0, 'longitude' => -64.0],
+    'AM' => ['name' => 'Armenia', 'latitude' => 40.0, 'longitude' => 45.0],
+    'AG' => ['name' => 'Antigua and Barbuda', 'latitude' => 17.05, 'longitude' => -61.8],
+    'AU' => ['name' => 'Australia', 'latitude' => -25.0, 'longitude' => 135.0],
+    'AT' => ['name' => 'Austria', 'latitude' => 47.3, 'longitude' => 13.3],
+    'AZ' => ['name' => 'Azerbaijan', 'latitude' => 40.5, 'longitude' => 47.5],
+    'BI' => ['name' => 'Burundi', 'latitude' => -3.5, 'longitude' => 30.0],
+    'BE' => ['name' => 'Belgium', 'latitude' => 50.8, 'longitude' => 4.0],
+    'BJ' => ['name' => 'Benin', 'latitude' => 9.5, 'longitude' => 2.25],
+    'BF' => ['name' => 'Burkina Faso', 'latitude' => 13.0, 'longitude' => -2.0],
+    'BD' => ['name' => 'Bangladesh', 'latitude' => 24.0, 'longitude' => 90.0],
+    'BG' => ['name' => 'Bulgaria', 'latitude' => 43.0, 'longitude' => 25.0],
+    'BH' => ['name' => 'Bahrain', 'latitude' => 26.0, 'longitude' => 50.5],
+    'BS' => ['name' => 'Bahamas', 'latitude' => 24.25, 'longitude' => -76.0],
+    'BA' => ['name' => 'Bosnia and Herzegovina', 'latitude' => 44.0, 'longitude' => 18.0],
+    'BY' => ['name' => 'Belarus', 'latitude' => 53.0, 'longitude' => 28.0],
+    'BZ' => ['name' => 'Belize', 'latitude' => 17.25, 'longitude' => -88.75],
+    'BO' => ['name' => 'Bolivia', 'latitude' => -17.0, 'longitude' => -65.0],
+    'BR' => ['name' => 'Brazil', 'latitude' => -10.0, 'longitude' => -55.0],
+    'BB' => ['name' => 'Barbados', 'latitude' => 13.17, 'longitude' => -59.53],
+    'BN' => ['name' => 'Brunei', 'latitude' => 4.5, 'longitude' => 114.67],
+    'BT' => ['name' => 'Bhutan', 'latitude' => 27.5, 'longitude' => 90.5],
+    'BW' => ['name' => 'Botswana', 'latitude' => -22.0, 'longitude' => 24.0],
+    'CF' => ['name' => 'Central African Republic', 'latitude' => 7.0, 'longitude' => 21.0],
+    'CA' => ['name' => 'Canada', 'latitude' => 60.0, 'longitude' => -95.0],
+    'CH' => ['name' => 'Switzerland', 'latitude' => 47.0, 'longitude' => 8.0],
+    'CL' => ['name' => 'Chile', 'latitude' => -30.0, 'longitude' => -71.0],
+    'CN' => ['name' => 'China', 'latitude' => 35.0, 'longitude' => 105.0],
+    'CI' => ['name' => 'Côte d\'Ivoire', 'latitude' => 8.0, 'longitude' => -5.0],
+    'CM' => ['name' => 'Cameroon', 'latitude' => 6.0, 'longitude' => 12.0],
+    'CD' => ['name' => 'Democratic Republic of the Congo', 'latitude' => -2.5, 'longitude' => 23.5],
+    'CG' => ['name' => 'Republic of the Congo', 'latitude' => -1.0, 'longitude' => 15.0],
+    'CO' => ['name' => 'Colombia', 'latitude' => 4.0, 'longitude' => -72.0],
+    'KM' => ['name' => 'Comoros', 'latitude' => -12.17, 'longitude' => 44.25],
+    'CV' => ['name' => 'Cape Verde', 'latitude' => 16.0, 'longitude' => -24.0],
+    'CR' => ['name' => 'Costa Rica', 'latitude' => 10.0, 'longitude' => -84.0],
+    'CU' => ['name' => 'Cuba', 'latitude' => 21.5, 'longitude' => -80.0],
+    'CY' => ['name' => 'Cyprus', 'latitude' => 35.0, 'longitude' => 33.0],
+    'CZ' => ['name' => 'Czech Republic', 'latitude' => 49.75, 'longitude' => 15.5],
+    'DE' => ['name' => 'Germany', 'latitude' => 51.0, 'longitude' => 9.0],
+    'DJ' => ['name' => 'Djibouti', 'latitude' => 11.5, 'longitude' => 43.0],
+    'DM' => ['name' => 'Dominica', 'latitude' => 15.42, 'longitude' => -61.33],
+    'DK' => ['name' => 'Denmark', 'latitude' => 56.0, 'longitude' => 10.0],
+    'DO' => ['name' => 'Dominican Republic', 'latitude' => 19.0, 'longitude' => -70.67],
+    'DZ' => ['name' => 'Algeria', 'latitude' => 28.0, 'longitude' => 3.0],
+    'EC' => ['name' => 'Ecuador', 'latitude' => -2.0, 'longitude' => -77.5],
+    'EG' => ['name' => 'Egypt', 'latitude' => 27.0, 'longitude' => 30.0],
+    'ER' => ['name' => 'Eritrea', 'latitude' => 15.0, 'longitude' => 39.0],
+    'ES' => ['name' => 'Spain', 'latitude' => 40.0, 'longitude' => -4.0],
+    'EE' => ['name' => 'Estonia', 'latitude' => 59.0, 'longitude' => 26.0],
+    'ET' => ['name' => 'Ethiopia', 'latitude' => 8.0, 'longitude' => 38.0],
+    'FI' => ['name' => 'Finland', 'latitude' => 64.0, 'longitude' => 26.0],
+    'FJ' => ['name' => 'Fiji', 'latitude' => -18.0, 'longitude' => 175.0],
+    'FR' => ['name' => 'France', 'latitude' => 46.0, 'longitude' => 2.0],
+    'FM' => ['name' => 'Micronesia', 'latitude' => 6.92, 'longitude' => 158.25],
+    'GA' => ['name' => 'Gabon', 'latitude' => -1.0, 'longitude' => 11.75],
+    'GB' => ['name' => 'United Kingdom', 'latitude' => 54.0, 'longitude' => -2.0],
+    'GE' => ['name' => 'Georgia', 'latitude' => 42.0, 'longitude' => 43.5],
+    'GH' => ['name' => 'Ghana', 'latitude' => 8.0, 'longitude' => -2.0],
+    'GN' => ['name' => 'Guinea', 'latitude' => 11.0, 'longitude' => -10.0],
+    'GM' => ['name' => 'Gambia', 'latitude' => 13.47, 'longitude' => -16.57],
+    'GW' => ['name' => 'Guinea-Bissau', 'latitude' => 12.0, 'longitude' => -15.0],
+    'GQ' => ['name' => 'Equatorial Guinea', 'latitude' => 2.0, 'longitude' => 10.0],
+    'GR' => ['name' => 'Greece', 'latitude' => 39.0, 'longitude' => 22.0],
+    'GD' => ['name' => 'Grenada', 'latitude' => 12.12, 'longitude' => -61.67],
+    'GT' => ['name' => 'Guatemala', 'latitude' => 15.5, 'longitude' => -90.25],
+    'GY' => ['name' => 'Guyana', 'latitude' => 5.0, 'longitude' => -59.0],
+    'HK' => ['name' => 'Hong Kong', 'latitude' => 22.25, 'longitude' => 114.17],
+    'HN' => ['name' => 'Honduras', 'latitude' => 15.0, 'longitude' => -86.5],
+    'HR' => ['name' => 'Croatia', 'latitude' => 45.17, 'longitude' => 15.5],
+    'HT' => ['name' => 'Haiti', 'latitude' => 19.0, 'longitude' => -72.42],
+    'HU' => ['name' => 'Hungary', 'latitude' => 47.0, 'longitude' => 20.0],
+    'ID' => ['name' => 'Indonesia', 'latitude' => -5.0, 'longitude' => 120.0],
+    'IN' => ['name' => 'India', 'latitude' => 20.0, 'longitude' => 77.0],
+    'IE' => ['name' => 'Ireland', 'latitude' => 53.0, 'longitude' => -8.0],
+    'IR' => ['name' => 'Iran', 'latitude' => 32.0, 'longitude' => 53.0],
+    'IQ' => ['name' => 'Iraq', 'latitude' => 33.0, 'longitude' => 44.0],
+    'IS' => ['name' => 'Iceland', 'latitude' => 65.0, 'longitude' => -18.0],
+    'IL' => ['name' => 'Israel', 'latitude' => 31.5, 'longitude' => 34.75],
+    'IT' => ['name' => 'Italy', 'latitude' => 42.83, 'longitude' => 12.83],
+    'JM' => ['name' => 'Jamaica', 'latitude' => 18.25, 'longitude' => -77.5],
+    'JO' => ['name' => 'Jordan', 'latitude' => 31.0, 'longitude' => 36.0],
+    'JP' => ['name' => 'Japan', 'latitude' => 36.0, 'longitude' => 138.0],
+    'KZ' => ['name' => 'Kazakhstan', 'latitude' => 48.0, 'longitude' => 68.0],
+    'KE' => ['name' => 'Kenya', 'latitude' => 1.0, 'longitude' => 38.0],
+    'KG' => ['name' => 'Kyrgyzstan', 'latitude' => 41.0, 'longitude' => 75.0],
+    'KH' => ['name' => 'Cambodia', 'latitude' => 13.0, 'longitude' => 105.0],
+    'KI' => ['name' => 'Kiribati', 'latitude' => 1.42, 'longitude' => 173.0],
+    'KN' => ['name' => 'Saint Kitts and Nevis', 'latitude' => 17.33, 'longitude' => -62.75],
+    'KR' => ['name' => 'South Korea', 'latitude' => 37.0, 'longitude' => 127.5],
+    'KW' => ['name' => 'Kuwait', 'latitude' => 29.34, 'longitude' => 47.66],
+    'LA' => ['name' => 'Laos', 'latitude' => 18.0, 'longitude' => 105.0],
+    'LB' => ['name' => 'Lebanon', 'latitude' => 33.83, 'longitude' => 35.83],
+    'LR' => ['name' => 'Liberia', 'latitude' => 6.5, 'longitude' => -9.5],
+    'LY' => ['name' => 'Libya', 'latitude' => 25.0, 'longitude' => 17.0],
+    'LC' => ['name' => 'Saint Lucia', 'latitude' => 13.88, 'longitude' => -61.13],
+    'LI' => ['name' => 'Liechtenstein', 'latitude' => 47.17, 'longitude' => 9.53],
+    'LK' => ['name' => 'Sri Lanka', 'latitude' => 7.0, 'longitude' => 81.0],
+    'LS' => ['name' => 'Lesotho', 'latitude' => -29.5, 'longitude' => 28.5],
+    'LT' => ['name' => 'Lithuania', 'latitude' => 56.0, 'longitude' => 24.0],
+    'LU' => ['name' => 'Luxembourg', 'latitude' => 49.75, 'longitude' => 6.17],
+    'LV' => ['name' => 'latitudevia', 'latitude' => 57.0, 'longitude' => 25.0],
+    'MA' => ['name' => 'Morocco', 'latitude' => 32.0, 'longitude' => -5.0],
+    'MC' => ['name' => 'Monaco', 'latitude' => 43.73, 'longitude' => 7.4],
+    'MD' => ['name' => 'Moldova', 'latitude' => 47.0, 'longitude' => 29.0],
+    'MG' => ['name' => 'Madagascar', 'latitude' => -20.0, 'longitude' => 47.0],
+    'MV' => ['name' => 'Maldives', 'latitude' => 3.25, 'longitude' => 73.0],
+    'MX' => ['name' => 'Mexico', 'latitude' => 23.0, 'longitude' => -102.0],
+    'MH' => ['name' => 'Marshall Islands', 'latitude' => 9.0, 'longitude' => 168.0],
+    'MK' => ['name' => 'North Macedonia', 'latitude' => 41.83, 'longitude' => 22.0],
+    'ML' => ['name' => 'Mali', 'latitude' => 17.0, 'longitude' => -4.0],
+    'MT' => ['name' => 'Malta', 'latitude' => 35.83, 'longitude' => 14.58],
+    'MM' => ['name' => 'Myanmar', 'latitude' => 22.0, 'longitude' => 98.0],
+    'ME' => ['name' => 'Montenegro', 'latitude' => 42.5, 'longitude' => 19.3],
+    'MN' => ['name' => 'Mongolia', 'latitude' => 46.0, 'longitude' => 105.0],
+    'MZ' => ['name' => 'Mozambique', 'latitude' => -18.25, 'longitude' => 35.0],
+    'MR' => ['name' => 'Mauritania', 'latitude' => 20.0, 'longitude' => -12.0],
+    'MU' => ['name' => 'Mauritius', 'latitude' => -20.28, 'longitude' => 57.55],
+    'MW' => ['name' => 'Malawi', 'latitude' => -13.5, 'longitude' => 34.0],
+    'MY' => ['name' => 'Malaysia', 'latitude' => 2.5, 'longitude' => 112.5],
+    'NA' => ['name' => 'Namibia', 'latitude' => -22.0, 'longitude' => 17.0],
+    'NE' => ['name' => 'Niger', 'latitude' => 16.0, 'longitude' => 8.0],
+    'NG' => ['name' => 'Nigeria', 'latitude' => 10.0, 'longitude' => 8.0],
+    'NI' => ['name' => 'Nicaragua', 'latitude' => 13.0, 'longitude' => -85.0],
+    'NL' => ['name' => 'Netherlands', 'latitude' => 52.5, 'longitude' => 5.75],
+    'NO' => ['name' => 'Norway', 'latitude' => 62.0, 'longitude' => 10.0],
+    'NP' => ['name' => 'Nepal', 'latitude' => 28.0, 'longitude' => 84.0],
+    'NR' => ['name' => 'Nauru', 'latitude' => -0.53, 'longitude' => 166.92],
+    'NZ' => ['name' => 'New Zealand', 'latitude' => -41.0, 'longitude' => 174.0],
+    'OM' => ['name' => 'Oman', 'latitude' => 21.0, 'longitude' => 57.0],
+    'PK' => ['name' => 'Pakistan', 'latitude' => 30.0, 'longitude' => 70.0],
+    'PS' => ['name' => 'Palestine', 'latitude' => 31.9, 'longitude' => 35.2],
+    'PA' => ['name' => 'Panama', 'latitude' => 9.0, 'longitude' => -80.0],
+    'PE' => ['name' => 'Peru', 'latitude' => -10.0, 'longitude' => -76.0],
+    'PH' => ['name' => 'Philippines', 'latitude' => 13.0, 'longitude' => 122.0],
+    'PW' => ['name' => 'Palau', 'latitude' => 7.5, 'longitude' => 134.5],
+    'PG' => ['name' => 'Papua New Guinea', 'latitude' => -6.0, 'longitude' => 147.0],
+    'PL' => ['name' => 'Poland', 'latitude' => 52.0, 'longitude' => 20.0],
+    'KP' => ['name' => 'North Korea', 'latitude' => 40.0, 'longitude' => 127.0],
+    'PT' => ['name' => 'Portugal', 'latitude' => 39.5, 'longitude' => -8.0],
+    'PY' => ['name' => 'Paraguay', 'latitude' => -23.0, 'longitude' => -58.0],
+    'QA' => ['name' => 'Qatar', 'latitude' => 25.5, 'longitude' => 51.25],
+    'RO' => ['name' => 'Romania', 'latitude' => 46.0, 'longitude' => 25.0],
+    'RU' => ['name' => 'Russia', 'latitude' => 60.0, 'longitude' => 100.0],
+    'RW' => ['name' => 'Rwanda', 'latitude' => -2.0, 'longitude' => 30.0],
+    'SA' => ['name' => 'Saudi Arabia', 'latitude' => 25.0, 'longitude' => 45.0],
+    'SD' => ['name' => 'Sudan', 'latitude' => 15.0, 'longitude' => 30.0],
+    'SN' => ['name' => 'Senegal', 'latitude' => 14.0, 'longitude' => -14.0],
+    'SG' => ['name' => 'Singapore', 'latitude' => 1.37, 'longitude' => 103.8],
+    'SB' => ['name' => 'Solomon Islands', 'latitude' => -8.0, 'longitude' => 159.0],
+    'SL' => ['name' => 'Sierra Leone', 'latitude' => 8.5, 'longitude' => -11.5],
+    'SV' => ['name' => 'El Salvador', 'latitude' => 13.83, 'longitude' => -88.92],
+    'SM' => ['name' => 'San Marino', 'latitude' => 43.77, 'longitude' => 12.42],
+    'SO' => ['name' => 'Somalia', 'latitude' => 10.0, 'longitude' => 49.0],
+    'RS' => ['name' => 'Serbia', 'latitude' => 44.0, 'longitude' => 21.0],
+    'SS' => ['name' => 'South Sudan', 'latitude' => 8.0, 'longitude' => 30.0],
+    'ST' => ['name' => 'São Tomé and Príncipe', 'latitude' => 1.0, 'longitude' => 7.0],
+    'SR' => ['name' => 'Suriname', 'latitude' => 4.0, 'longitude' => -56.0],
+    'SK' => ['name' => 'Slovakia', 'latitude' => 48.67, 'longitude' => 19.5],
+    'SI' => ['name' => 'Slovenia', 'latitude' => 46.0, 'longitude' => 15.0],
+    'SE' => ['name' => 'Sweden', 'latitude' => 62.0, 'longitude' => 15.0],
+    'SZ' => ['name' => 'Eswatini', 'latitude' => -26.5, 'longitude' => 31.5],
+    'SC' => ['name' => 'Seychelles', 'latitude' => -4.58, 'longitude' => 55.67],
+    'SY' => ['name' => 'Syria', 'latitude' => 35.0, 'longitude' => 38.0],
+    'TD' => ['name' => 'Chad', 'latitude' => 15.0, 'longitude' => 19.0],
+    'TG' => ['name' => 'Togo', 'latitude' => 8.0, 'longitude' => 1.17],
+    'TH' => ['name' => 'Thailand', 'latitude' => 15.0, 'longitude' => 100.0],
+    'TJ' => ['name' => 'Tajikistan', 'latitude' => 39.0, 'longitude' => 71.0],
+    'TM' => ['name' => 'Turkmenistan', 'latitude' => 40.0, 'longitude' => 60.0],
+    'TL' => ['name' => 'Timor-Leste', 'latitude' => -8.83, 'longitude' => 125.92],
+    'TO' => ['name' => 'Tonga', 'latitude' => -20.0, 'longitude' => -175.0],
+    'TT' => ['name' => 'Trinidad and Tobago', 'latitude' => 11.0, 'longitude' => -61.0],
+    'TN' => ['name' => 'Tunisia', 'latitude' => 34.0, 'longitude' => 9.0],
+    'TR' => ['name' => 'Turkey', 'latitude' => 39.0, 'longitude' => 35.0],
+    'TV' => ['name' => 'Tuvalu', 'latitude' => -8.0, 'longitude' => 178.0],
+    'TZ' => ['name' => 'Tanzania', 'latitude' => -6.0, 'longitude' => 35.0],
+    'TW' => ['name' => 'Taiwan', 'latitude' => 23.5, 'longitude' => 121.0],
+    'UG' => ['name' => 'Uganda', 'latitude' => 1.0, 'longitude' => 32.0],
+    'UA' => ['name' => 'Ukraine', 'latitude' => 49.0, 'longitude' => 32.0],
+    'UY' => ['name' => 'Uruguay', 'latitude' => -33.0, 'longitude' => -56.0],
+    'US' => ['name' => 'United States', 'latitude' => 38.0, 'longitude' => -97.0],
+    'UZ' => ['name' => 'Uzbekistan', 'latitude' => 41.0, 'longitude' => 64.0],
+    'VA' => ['name' => 'Vatican City', 'latitude' => 41.9, 'longitude' => 12.45],
+    'VC' => ['name' => 'Saint Vincent and the Grenadines', 'latitude' => 13.25, 'longitude' => -61.2],
+    'VE' => ['name' => 'Venezuela', 'latitude' => 8.0, 'longitude' => -66.0],
+    'VN' => ['name' => 'Vietnam', 'latitude' => 16.0, 'longitude' => 106.0],
+    'VU' => ['name' => 'Vanuatu', 'latitude' => -16.0, 'longitude' => 167.0],
+    'WS' => ['name' => 'Samoa', 'latitude' => -13.58, 'longitude' => -172.33],
+    'YE' => ['name' => 'Yemen', 'latitude' => 15.0, 'longitude' => 48.0],
+    'ZA' => ['name' => 'South Africa', 'latitude' => -29.0, 'longitude' => 24.0],
+    'ZM' => ['name' => 'Zambia', 'latitude' => -15.0, 'longitude' => 30.0],
+    'ZW' => ['name' => 'Zimbabwe', 'latitude' => -20.0, 'longitude' => 30.0],
 ];

app/config/locale/templates/email-base-styled.tpl

@@ -79,7 +79,7 @@
         <style>
             a.button {
                 display: inline-block;
-                background: #fd366e;
+                background: {{accentColor}};
                 color: #ffffff;
                 border-radius: 8px;
                 height: 48px;
@@ -88,7 +88,7 @@
                 cursor: pointer;
                 text-align: center;
                 text-decoration: none;
-                border-color: #fd366e;
+                border-color: {{accentColor}};
                 border-style: solid;
                 border-width: 1px;
                 margin-right: 24px;
@@ -120,13 +120,18 @@
     </head>
 
     <body>
+        <div style="display: none; overflow: hidden; max-height: 0; max-width: 0; opacity: 0; line-height: 1px;">
+            {{preview}}
+            <div>{{previewWhitespace}}</div>
+        </div>
+
         <div class="main">
             <table>
                 <tr>
                     <td>
                         <img
                             height="32px"
-                            src="https://cloud.appwrite.io/images/mails/logo.png"
+                            src="{{logoUrl}}"
                         />
                     </td>
                 </tr>
@@ -164,7 +169,7 @@
                 <tr>
                     <td style="padding-left: 4px; padding-right: 4px">
                         <a
-                            href="https://twitter.com/appwrite"
+                            href="{{twitterUrl}}"
                             class="social-icon"
                             title="Twitter"
                         >
@@ -173,7 +178,7 @@
                     </td>
                     <td style="padding-left: 4px; padding-right: 4px">
                         <a
-                            href="https://appwrite.io/discord"
+                            href="{{discordUrl}}"
                             class="social-icon"
                         >
                             <img src="https://cloud.appwrite.io/images/mails/discord.png" height="24" width="24" />
@@ -181,7 +186,7 @@
                     </td>
                     <td style="padding-left: 4px; padding-right: 4px">
                         <a
-                            href="https://github.com/appwrite/appwrite"
+                            href="{{githubUrl}}"
                             class="social-icon"
                         >
                             <img src="https://cloud.appwrite.io/images/mails/github.png" height="24" width="24" />
@@ -191,11 +196,11 @@
             </table>
             <table style="width: auto; margin: 0 auto; margin-top: 60px">
                 <tr>
-                    <td><a href="https://appwrite.io/terms">Terms</a></td>
+                    <td><a href="{{termsUrl}}">Terms</a></td>
                     <td style="color: #e8e9f0">
                         <div style="margin: 0 8px">|</div>
                     </td>
-                    <td><a href="https://appwrite.io/privacy">Privacy</a></td>
+                    <td><a href="{{privacyUrl}}">Privacy</a></td>
                 </tr>
             </table>
             <p style="text-align: center" align="center">

app/config/locale/templates/email-base.tpl

@@ -121,6 +121,11 @@
 
 <body style="direction: {{direction}}">
 
+<div style="display: none; overflow: hidden; max-height: 0; max-width: 0; opacity: 0; line-height: 1px;">
+    {{preview}}
+    <div>{{previewWhitespace}}</div>
+</div>
+
 <div style="max-width:650px; word-wrap: break-word; overflow-wrap: break-word;
   word-break: normal; margin:0 auto;">
     <table style="margin-top: 32px">

app/config/locale/templates/email-inner-base.tpl

@@ -1,9 +1,9 @@
-<p>{{hello}},</p>
+<p>{{hello}}</p>
 <p>{{body}}</p>
-<p><a href="{{redirect}}" target="_blank">{{redirect}}</a></p>
+<p><a href="{{redirect}}" target="_blank" style="font-size: 14px; font-family: Inter, sans-serif; color: #ffffff; text-decoration: none; background-color: #2D2D31; border-radius: 8px; padding: 9px 14px; border: 1px solid #414146; display: inline-block; text-align:center; box-sizing: border-box;">{{buttonText}}</a></p>
 <p>{{footer}}</p>
 <p style="margin-bottom: 32px">
-    {{thanks}},
+    {{thanks}}
     <br/>
     {{signature}}
 </p>

app/config/locale/templates/email-magic-url.tpl

@@ -1,4 +1,4 @@
-<p>{{hello}},</p>
+<p>{{hello}}</p>
 
 <p>{{optionButton}}</p>
 

app/config/locale/templates/email-mfa-challenge.tpl

@@ -1,4 +1,4 @@
-<p>{{hello}},</p>
+<p>{{hello}}</p>
 
 <p>{{description}}</p>
 

app/config/locale/templates/email-otp.tpl

@@ -1,4 +1,4 @@
-<p>{{hello}},</p>
+<p>{{hello}}</p>
 
 <p>{{description}}</p>
 

app/config/locale/templates/email-session-alert.tpl

@@ -1,4 +1,4 @@
-<p>{{hello}},</p>
+<p>{{hello}}</p>
 
 <p>{{body}}</p>
 

app/config/locale/templates/email-smtp-test.tpl

@@ -9,4 +9,4 @@
 <p>If you have trouble with the sender's image, ensure it is set in the <a href="https://gravatar.com/">Gravatar database</a>.</p>
 
 <p style="margin-block-end: 0;">Best regards,</p>
-<p style="margin-block-start: 0;">Appwrtite team</p>
+<p style="margin-block-start: 0;">Appwrite team</p>

app/config/locale/templates/email-webhook-failed.tpl

@@ -14,7 +14,7 @@
 <table border="0" cellspacing="0" cellpadding="0" style="padding-top: 10px; padding-bottom: 10px; margin-top: 32px">
     <tr>
         <td style="border-radius: 8px; display: block; width: 100%;">
-            <a class="mobile-full-width" rel="noopener" target="_blank" href="{{host}}{{path}}" style="font-size: 14px; font-family: Inter; color: #ffffff; text-decoration: none; background-color: #FD366E; border-radius: 8px; padding: 9px 14px; border: 1px solid #FD366E; display: inline-block; text-align:center; box-sizing: border-box;">Webhook settings</a>
+            <a class="mobile-full-width" rel="noopener" target="_blank" href="{{host}}{{path}}" style="font-size: 14px; font-family: Inter; color: #ffffff; text-decoration: none; background-color: #2D2D31; border-radius: 8px; padding: 9px 14px; border: 1px solid #414146; display: inline-block; text-align:center; box-sizing: border-box;">Webhook settings</a>
         </td>
     </tr>
 </table>

app/config/locale/translations/af.json

@@ -4,28 +4,29 @@
     "settings.direction": "ltr",
     "emails.sender": "%s span",
     "emails.verification.subject": "Rekening Bevestiging",
-    "emails.verification.hello": "Goeie dag {{user}}",
+    "emails.verification.hello": "Goeie dag {{user}},",
     "emails.verification.body": "Volg hierdie skakel om u e-pos adres te bevestig.",
     "emails.verification.footer": "Ignoreer gerus hierdie boodskap as u nie die versoek gestuur het om u adres te bevestig nie.",
-    "emails.verification.thanks": "Baie dankie",
+    "emails.verification.thanks": "Baie dankie,",
+    "emails.verification.buttonText": "Bevestig e-posadres",
     "emails.verification.signature": "Die {{project}} span",
     "emails.magicSession.subject": "Teken aan",
-    "emails.magicSession.hello": "Goeie dag",
-    "emails.magicSession.body": "Volg hierdie skakel om in te teken.",
-    "emails.magicSession.footer": "Ignoreer gerus hierdie boodskap as u nie die versoek gestuur het om met die' adres in te teken nie.",
-    "emails.magicSession.thanks": "Baie dankie",
+    "emails.magicSession.hello": "Goeie dag,",
+    "emails.magicSession.thanks": "Baie dankie,",
     "emails.magicSession.signature": "Die {{project}} span",
     "emails.recovery.subject": "Herstel Wagwoord",
-    "emails.recovery.hello": "Goeie dag {{user}}",
+    "emails.recovery.hello": "Goeie dag {{user}},",
     "emails.recovery.body": "Volg hierdie skakel om u {{project}} wagwoord te herstel.",
     "emails.recovery.footer": "Ignoreer gerus hierdie boodskap as u nie die versoek gestuur het om u wagwoord te herstel nie.",
-    "emails.recovery.thanks": "Baie dankie",
+    "emails.recovery.thanks": "Baie dankie,",
+    "emails.recovery.buttonText": "Stel wagwoord terug",
     "emails.recovery.signature": "Die {{project}} span",
     "emails.invitation.subject": "Uitnodiging om by die %s span aan te sluit by %s",
     "emails.invitation.hello": "Goeie dag,",
     "emails.invitation.body": "Hierdie boodskap is aan u gestuur omdat {{owner}} u uitnooi om 'n lid van die {{team}} groep by die {{project}} projek te wees.",
     "emails.invitation.footer": "As u nie belang stel nie, kan u gerus hierdie boodskap ignoreer.",
-    "emails.invitation.thanks": "Baie dankie",
+    "emails.invitation.thanks": "Baie dankie,",
+    "emails.invitation.buttonText": "Aanvaar uitnodiging na {{team}}",
     "emails.invitation.signature": "Die {{project}} span",
     "locale.country.unknown": "Onbekend",
     "countries.af": "Afghanistan",
@@ -245,4 +246,4 @@
     "emails.otpSession.securityPhrase": "Die veiligheidsfrase vir hierdie e-pos is {{phrase}}. Jy kan hierdie e-pos vertrou as hierdie frase ooreenstem met die frase wat gewys is tydens aanmelding.",
     "emails.otpSession.thanks": "Dankie,",
     "emails.otpSession.signature": "{{project}} span"
-}
+}

app/config/locale/translations/ar-ma.json

@@ -4,34 +4,35 @@
     "settings.direction": "rtl",
     "emails.sender": "فرقة %s",
     "emails.verification.subject": "التيْقان ديال الحساب",
-    "emails.verification.hello": "السلام {{user}}",
+    "emails.verification.hello": "السلام {{user}}،",
     "emails.verification.body": "تبّع هاد الوصلة باش تيقّن لادريسة تاع ليميل ديالك.",
     "emails.verification.footer": "إلا ماشي نتا اللي طلبتي تيقّن هاد لادريسة تاع ليميل، ممكن تنخّل هاد البرية.",
-    "emails.verification.thanks": "شكرا",
+    "emails.verification.thanks": "شكرا،",
+    "emails.verification.buttonText": "تأكيد عنوان البريد الإلكتروني",
     "emails.verification.signature": "فرقة {{project}}",
     "emails.magicSession.subject": "تكونيكطا",
-    "emails.magicSession.hello": "السلام,",
-    "emails.magicSession.body": "تبّع هاد الوصلة باش تتكونيكطا.",
-    "emails.magicSession.footer": "إلا ماشي نتا اللي طلبتي تتكونيكطا بهاد ليميل، ممكن تنخّل هاد البرية.",
-    "emails.magicSession.thanks": "شكرا",
+    "emails.magicSession.hello": "السلام،",
+    "emails.magicSession.thanks": "شكرا،",
     "emails.magicSession.signature": "فرقة {{project}}",
     "emails.recovery.subject": "تبدال كلمة السر",
-    "emails.recovery.hello": "السلام {{user}}",
+    "emails.recovery.hello": "السلام {{user}}،",
     "emails.recovery.body": "تبّع هاد الوصلة باش تبدّل كلمة السر تاع {{project}}.",
     "emails.recovery.footer": "إلا ماشي نتا اللي طلبتي تبدّل كلمة السر، ممكن تنخّل هاد البرية.",
-    "emails.recovery.thanks": "شكرا",
+    "emails.recovery.thanks": "شكرا،",
+    "emails.recovery.buttonText": "إعادة تعيين كلمة السر",
     "emails.recovery.signature": "فرقة {{project}}",
     "emails.invitation.subject": "عراضة ل فرقة %s ف %s",
-    "emails.invitation.hello": "السلام",
+    "emails.invitation.hello": "السلام،",
     "emails.invitation.body": "هاد البرية تصيفطات ليك حيت {{owner}} بغى يعرض عليك تولّي عضو ف فرقة {{team}} عند {{project}}.",
     "emails.invitation.footer": "إلا كنتي ما مسوّقش, ممكن تنخّل هاد البرية.",
-    "emails.invitation.thanks": "شكرا",
+    "emails.invitation.thanks": "شكرا،",
+    "emails.invitation.buttonText": "اقبل الدعوة إلى {{team}}",
     "emails.invitation.signature": "فرقة {{project}}",
     "emails.certificate.subject": "السرتافيكة فشلات ل %s",
-    "emails.certificate.hello": "السلام",
+    "emails.certificate.hello": "السلام،",
     "emails.certificate.body": "السرتافيكة ديال الضومين ديالك '{{domain}}' ما قدّاتش تجينيرا. هادي هي المحاولة نمرة {{attempt}}, السبب ديال هاد الفشل هو: {{error}}",
     "emails.certificate.footer": "السرتافيكة الفايتة ديالك غاتبقى مزيانة لمدة  30 يوم من عند أول فشل. كانشجعوك بزاف أنك تبقشش فهاد الموضوع, وا إلّا الضومين ديالك ما غايبقاش خدّام فيه الـ SSL.",
-    "emails.certificate.thanks": "شكرا",
+    "emails.certificate.thanks": "شكرا،",
     "emails.certificate.signature": "فرقة {{project}}",
     "locale.country.unknown": "ما معروفش",
     "countries.af": "أفغانستان",

app/config/locale/translations/ar.json

@@ -4,28 +4,29 @@
     "settings.direction": "rtl",
     "emails.sender": "فريق %s",
     "emails.verification.subject": "تأكيد الحساب",
-    "emails.verification.hello": "مرحبا {{user}}",
+    "emails.verification.hello": "مرحبا {{user}}،",
     "emails.verification.body": "برجاء اتباع الرابط التالي لتأكيد بريدك الإلكتروني",
     "emails.verification.footer": "لو لم تطلب تأكيد هذا البريد الإلكتروني، يمكنك تجاهل هذه الرسالة",
-    "emails.verification.thanks": "شكرا",
+    "emails.verification.thanks": "شكرا،",
+    "emails.verification.buttonText": "تأكيد عنوان البريد الإلكتروني",
     "emails.verification.signature": "فريق {{project}}",
     "emails.magicSession.subject": "تسجيل الدخول",
-    "emails.magicSession.hello": "أهلا",
-    "emails.magicSession.body": "اتبع هذا الرابط لتسجيل الدخول",
-    "emails.magicSession.footer": "لو لم تطلب تسجيل الدخول بهذا البريد الاكتروني ، يمكنك تجاهل هذه الرسالة",
-    "emails.magicSession.thanks": "شكرا",
+    "emails.magicSession.hello": "أهلا،",
+    "emails.magicSession.thanks": "شكرا،",
     "emails.magicSession.signature": "فريق {{project}}",
     "emails.recovery.subject": "تغيير كلمة السر",
-    "emails.recovery.hello": "أهلا {{user}}",
+    "emails.recovery.hello": "أهلا {{user}}،",
     "emails.recovery.body": "برجاء اتباع الراط التالي لتغيير كلمة السر الخاصة بـ{{project}}",
     "emails.recovery.footer": "لولم تطلب تغيير كلمة السر، يمكنك تجاهل هذه الرسالة",
-    "emails.recovery.thanks": "شكرا",
+    "emails.recovery.thanks": "شكرا،",
+    "emails.recovery.buttonText": "إعادة تعيين كلمة المرور",
     "emails.recovery.signature": "فريق {{project}}",
     "emails.invitation.subject": "دعوة لفريق %s في %s",
-    "emails.invitation.hello": "أهلا",
+    "emails.invitation.hello": "أهلا،",
     "emails.invitation.body": "هذة الرسالة تم ارسالها لك لأن {{owner}} ارسل لك دعوة لتكون عضوا بفريق {{team}} في {{project}}",
     "emails.invitation.footer": "اذا كنت غير مهتم، يمكنك تجاهل هذه الرسالة",
-    "emails.invitation.thanks": "شكرا",
+    "emails.invitation.thanks": "شكرا،",
+    "emails.invitation.buttonText": "قبول الدعوة إلى {{team}}",
     "emails.invitation.signature": "فريق {{project}}",
     "locale.country.unknown": "مجهول",
     "countries.af": "أفغانستان",
@@ -245,4 +246,4 @@
     "emails.otpSession.securityPhrase": "عبارة الأمان لهذا البريد الإلكتروني هي {{phrase}}. يمكنك الوثوق بهذا البريد الإلكتروني إذا كانت هذه العبارة تتطابق مع العبارة المعروضة أثناء تسجيل الدخول.",
     "emails.otpSession.thanks": "شكرًا،",
     "emails.otpSession.signature": "فريق {{project}}"
-}
+}

app/config/locale/translations/as.json

@@ -4,28 +4,29 @@
     "settings.direction": "ltr",
     "emails.sender": "%s দল",
     "emails.verification.subject": "একাউণ্ট প্ৰমাণীকৰণ",
-    "emails.verification.hello": "নমস্কাৰ {{user}}",
+    "emails.verification.hello": "নমস্কাৰ {{user}},",
     "emails.verification.body": "আপোনাৰ ইমেইল ঠিকনা প্ৰমাণিত কৰিবলৈ এই লিংকটো অনুসৰণ কৰক।",
     "emails.verification.footer": "যদি আপুনি এই ঠিকনাটো সত্যাপিত কৰিবলৈ কোৱা নাই, আপুনি এই বাৰ্তাটো উপেক্ষা কৰিব পাৰে।",
-    "emails.verification.thanks": "ধন্যবাদ",
+    "emails.verification.thanks": "ধন্যবাদ,",
+    "emails.verification.buttonText": "ইমেইল ঠিকনা নিশ্চিত কৰক",
     "emails.verification.signature": "{{project}} দল",
     "emails.magicSession.subject": "লগইন",
-    "emails.magicSession.hello": "নমস্কাৰ",
-    "emails.magicSession.body": "লগইন কৰিবলৈ এই লিংকটো অনুসৰণ কৰক।",
-    "emails.magicSession.footer": "যদি আপুনি এই ইমেইল ব্যৱহাৰ কৰি লগইন কৰিবলৈ কোৱা নাছিল, আপুনি এই বাৰ্তাটো উপেক্ষা কৰিব পাৰে।",
-    "emails.magicSession.thanks": "ধন্যবাদ",
+    "emails.magicSession.hello": "নমস্কাৰ,",
+    "emails.magicSession.thanks": "ধন্যবাদ,",
     "emails.magicSession.signature": "{{project}} দল",
     "emails.recovery.subject": "পাছৱাৰ্ড ৰিছেট",
-    "emails.recovery.hello": "ধন্যবাদ {{user}}",
+    "emails.recovery.hello": "ধন্যবাদ {{user}},",
     "emails.recovery.body": "আপোনাৰ {{project}} পাছৱৰ্ড ৰিছেট কৰিবলৈ এই লিংকটো অনুসৰণ কৰক।.",
     "emails.recovery.footer": "যদি আপুনি আপোনাৰ পাছৱৰ্ড ৰিছেট কৰিবলৈ কোৱা নাছিল, আপুনি এই বাৰ্তাটো উপেক্ষা কৰিব পাৰে।",
-    "emails.recovery.thanks": "ধন্যবাদ",
+    "emails.recovery.thanks": "ধন্যবাদ,",
+    "emails.recovery.buttonText": "পাছৱৰ্ড ৰিছেট কৰক",
     "emails.recovery.signature": "{{project}} দল",
     "emails.invitation.subject": "%s বছৰত %s দললৈ নিমন্ত্ৰণ",
-    "emails.invitation.hello": "নমস্কাৰ",
+    "emails.invitation.hello": "নমস্কাৰ,",
     "emails.invitation.body": "এই মেইলটো আপোনালৈ প্ৰেৰণ কৰা হৈছিল কাৰণ {{owner}} জনে আপোনাক {{project}} বছৰবয়সত {{team}} দলৰ সদস্য হ'বলৈ আমন্ত্ৰণ জনাব বিচাৰিছিল।",
     "emails.invitation.footer": "যদি আপুনি আগ্ৰহী নহয়, আপুনি এই বাৰ্তাটো উপেক্ষা কৰিব পাৰে।",
-    "emails.invitation.thanks": "ধন্যবাদ",
+    "emails.invitation.thanks": "ধন্যবাদ,",
+    "emails.invitation.buttonText": "{{team}}-লৈ নিমন্ত্ৰণ গ্ৰহণ কৰক",
     "emails.invitation.signature": "{{project}} দল",
     "locale.country.unknown": "অজ্ঞাত ",
     "countries.af": "আফগানিস্তান ",
@@ -245,10 +246,10 @@
     "emails.otpSession.thanks": "ধন্যবাদ,",
     "emails.otpSession.signature": "{{project}} দল",
     "emails.certificate.subject": "%sৰ বাবে প্ৰমাণপত্ৰ ব্যৰ্থতা",
-    "emails.certificate.hello": "নমস্কাৰ",
+    "emails.certificate.hello": "নমস্কাৰ,",
     "emails.certificate.body": "আপোনাৰ ডোমেইন '{{domain}}' ৰ বাবে প্ৰমাণপত্ৰটো উত্‌পন্ন কৰিব পৰা নগ'ল। এয়া প্ৰচেষ্টা নম্বৰ {{attempt}}, আৰু বিফলতাৰ কাৰণ হ'ল: {{error}}",
     "emails.certificate.footer": "আপোনাৰ পূৰ্বৰ প্ৰমাণপত্ৰটো প্ৰথম ব্ৰিফল হোৱাৰ দিনৰ পৰা ৩০ দিনলৈ বৈধ থাকিব। আমি এই ঘটনাটোৰ তদন্ত কৰিবলৈ উচ্চ পৰামৰ্শ দিয়ে, অন্যথা আপোনাৰ ডোমেইনটো অবৈধ SSL যোগাযোগ অবিহনে থাকিব।",
-    "emails.certificate.thanks": "ধন্যবাদ",
+    "emails.certificate.thanks": "ধন্যবাদ,",
     "emails.certificate.signature": "{{project}} দল",
     "sms.verification.body": "{{secret}}"
-}
+}

app/config/locale/translations/az.json

@@ -4,28 +4,29 @@
     "settings.direction": "ltr",
     "emails.sender": "%s Komandası",
     "emails.verification.subject": "Hesab Doğrulama",
-    "emails.verification.hello": "Salam {{user}}",
+    "emails.verification.hello": "Salam {{user}},",
     "emails.verification.body": "E-poçt ünvanınızı təsdiq etmək üçün bu linki izləyin.",
     "emails.verification.footer": "Bu ünvanı doğrulamağı xahiş etməmisinizsə, bu mesajı gözardı edə bilərsiniz.",
-    "emails.verification.thanks": "Təşəkkürlər",
+    "emails.verification.thanks": "Təşəkkürlər,",
+    "emails.verification.buttonText": "E-poçt ünvanını təsdiqlə",
     "emails.verification.signature": "{{project}} komandası",
     "emails.magicSession.subject": "Daxil Olmaq",
-    "emails.magicSession.hello": "Salam",
-    "emails.magicSession.body": "Daxil olmaq üçün bu linki izləyin.",
-    "emails.magicSession.footer": "Bu e-poçtdan istifadə edərək giriş istəməmisinizsə, bu mesajı görməməzlikdən gələ bilərsiniz.",
-    "emails.magicSession.thanks": "Təşəkkürlər",
+    "emails.magicSession.hello": "Salam,",
+    "emails.magicSession.thanks": "Təşəkkürlər,",
     "emails.magicSession.signature": "{{project}} komandası",
     "emails.recovery.subject": "Şifrə Sıfırlanması",
-    "emails.recovery.hello": "Salam {{user}}",
+    "emails.recovery.hello": "Salam {{user}},",
     "emails.recovery.body": "{{project}} şifrənizi sıfırlamaq üçün bu linki izləyin.",
     "emails.recovery.footer": "Şifrənizi sıfırlamağı xahiş etməmisinizsə, bu mesajı gözardı edə bilərsiniz.",
-    "emails.recovery.thanks": "Təşəkkürlər",
+    "emails.recovery.thanks": "Təşəkkürlər,",
+    "emails.recovery.buttonText": "Şifrəni sıfırla",
     "emails.recovery.signature": "{{project}} komandası",
     "emails.invitation.subject": "%s Komandasına Dəvət %sdə",
-    "emails.invitation.hello": "Salam",
+    "emails.invitation.hello": "Salam,",
     "emails.invitation.body": "{{owner}}, {{project}}də {{team}} komandasına üzv olmağa dəvət etmək istədiyi üçün bu məktub sizə göndərildi.",
     "emails.invitation.footer": "Əgər maraqlanmırsınızsa, bu mesajı gözardı edə bilərsiniz.",
-    "emails.invitation.thanks": "Təşəkkürlər",
+    "emails.invitation.thanks": "Təşəkkürlər,",
+    "emails.invitation.buttonText": "{{team}} dəvətini qəbul et",
     "emails.invitation.signature": "{{project}} komandası",
     "locale.country.unknown": "Naməlum",
     "countries.af": "Əfqanıstan",
@@ -245,4 +246,4 @@
     "emails.otpSession.securityPhrase": "Bu e-poçtun təhlükəsizlik ifadəsi {{phrase}}-dir. Əgər bu ifadə daxil olarkən göstərilən ifadə ilə üst-üstə düşürsə, bu e-poçta etibar edə bilərsiniz.",
     "emails.otpSession.thanks": "Sağ olun,",
     "emails.otpSession.signature": "{{project}} komandası"
-}
+}

app/config/locale/translations/be.json

@@ -4,28 +4,29 @@
     "settings.direction": "ltr",
     "emails.sender": "Каманда %s",
     "emails.verification.subject": "Верыфікацыя акаўнта",
-    "emails.verification.hello": "Прывітанне {{user}}",
+    "emails.verification.hello": "Прывітанне {{user}},",
     "emails.verification.body": "Перайдзіце па гэтай спасылцы, каб пацвердзіць свой адрас электроннай пошты",
     "emails.verification.footer": "Калі вы не запытвалі пацвярджэнне гэтага адрасу, праігнаруйце гэтае паведамленне.",
-    "emails.verification.thanks": "Дзякуем",
+    "emails.verification.thanks": "Дзякуем,",
+    "emails.verification.buttonText": "Пацвердзіць адрас электроннай пошты",
     "emails.verification.signature": "каманда {{project}}",
     "emails.magicSession.subject": "Лагін",
-    "emails.magicSession.hello": "Прывітанне",
-    "emails.magicSession.body": "Перайдзіце па спасылцы, каб увайсці.",
-    "emails.magicSession.footer": "Калі вы не прасілі ўвайсці, выкарыстоўваючы гэты адрас электроннай пошты, праігнаруйце гэтае паведамленне.",
-    "emails.magicSession.thanks": "Дзякуем",
+    "emails.magicSession.hello": "Прывітанне,",
+    "emails.magicSession.thanks": "Дзякуем,",
     "emails.magicSession.signature": "каманда {{project}}",
     "emails.recovery.subject": "Скід пароля",
-    "emails.recovery.hello": "Прывітанне, {{user}}",
+    "emails.recovery.hello": "Прывітанне, {{user}},",
     "emails.recovery.body": "Перайдзіце па гэтай спасылцы, каб скінуць пароль для праекта {{project}}.",
     "emails.recovery.footer": "Калі вы не прасілі скінуць пароль, вы можаце праігнараваць гэта паведамленне.",
-    "emails.recovery.thanks": "Дзякуем",
+    "emails.recovery.thanks": "Дзякуем,",
+    "emails.recovery.buttonText": "Аднавіць пароль",
     "emails.recovery.signature": "каманда {{project}}",
     "emails.invitation.subject": "Запрошення до Команди %s у %s",
-    "emails.invitation.hello": "Прывітанне",
+    "emails.invitation.hello": "Прывітанне,",
     "emails.invitation.body": "Гэта паведамленне было адпраўлена вам, таму што {{owner}} хацеў запрасіць вас стаць членам каманды {{team}} у {{project}}.",
     "emails.invitation.footer": "Калі вам гэта не цікава, вы можаце праігнараваць гэтае паведамленне.",
-    "emails.invitation.thanks": "Дзякуем",
+    "emails.invitation.thanks": "Дзякуем,",
+    "emails.invitation.buttonText": "Прыняць запрашэнне ў {{team}}",
     "emails.invitation.signature": "каманда {{project}}",
     "locale.country.unknown": "Невядомы",
     "countries.af": "Афганістан",
@@ -245,10 +246,10 @@
     "emails.otpSession.thanks": "Дзякуй,",
     "emails.otpSession.signature": "каманда {{project}}",
     "emails.certificate.subject": "Сведчанне няўдалае для %s",
-    "emails.certificate.hello": "Прывітанне",
+    "emails.certificate.hello": "Прывітанне,",
     "emails.certificate.body": "Сертыфікат для вашага дамена '{{domain}}' не можа быць створаны. Гэта спроба нумар {{attempt}}, і прычынай няўдачы з'яўляецца: {{error}}",
     "emails.certificate.footer": "Ваш папярэдні сертыфікат будзе дзейнічаць 30 дзён з моманту першай няўдачы. Мы высока рэкамендуем расследаваць гэтую сітуацыю, інакш ваш дамен апынецца без дзейнага сертыфіката SSL-злучэння.",
-    "emails.certificate.thanks": "Дзякуй",
+    "emails.certificate.thanks": "Дзякуй,",
     "emails.certificate.signature": "каманда {{project}}",
     "sms.verification.body": "{{secret}}"
-}
+}

app/config/locale/translations/bg.json

@@ -4,28 +4,26 @@
     "settings.direction": "ltr",
     "emails.sender": "%s Екип",
     "emails.verification.subject": "",
-    "emails.verification.hello": "",
+    "emails.verification.hello": ",",
     "emails.verification.body": "",
     "emails.verification.footer": "",
-    "emails.verification.thanks": "",
+    "emails.verification.thanks": ",",
     "emails.verification.signature": "",
     "emails.magicSession.subject": "",
-    "emails.magicSession.hello": "",
-    "emails.magicSession.body": "",
-    "emails.magicSession.footer": "",
-    "emails.magicSession.thanks": "",
+    "emails.magicSession.hello": ",",
+    "emails.magicSession.thanks": ",",
     "emails.magicSession.signature": "",
     "emails.recovery.subject": "",
-    "emails.recovery.hello": "",
+    "emails.recovery.hello": ",",
     "emails.recovery.body": "",
     "emails.recovery.footer": "",
-    "emails.recovery.thanks": "",
+    "emails.recovery.thanks": ",",
     "emails.recovery.signature": "",
     "emails.invitation.subject": "",
-    "emails.invitation.hello": "",
+    "emails.invitation.hello": ",",
     "emails.invitation.body": "",
     "emails.invitation.footer": "",
-    "emails.invitation.thanks": "",
+    "emails.invitation.thanks": ",",
     "emails.invitation.signature": "",
     "locale.country.unknown": "Неизвестно",
     "countries.af": "Афганистан",
@@ -245,4 +243,4 @@
     "emails.otpSession.securityPhrase": "Фразата за сигурност за този имейл е {{phrase}}. Можете да се доверите на този имейл, ако тази фраза съвпада с фразата, показана по време на вписването.",
     "emails.otpSession.thanks": "Благодаря,",
     "emails.otpSession.signature": "екип на {{project}}"
-}
+}

app/config/locale/translations/bh.json

@@ -4,28 +4,29 @@
     "settings.direction": "ltr",
     "emails.sender": "%s टीम",
     "emails.verification.subject": "खाता प्रमाणिकरण",
-    "emails.verification.hello": "नमस्ते {{user}}",
+    "emails.verification.hello": "नमस्ते {{user}},",
     "emails.verification.body": "ईमेल प्रमाणिकरण करे क लेल दिहल गइल लिंक फॉलो करें|",
     "emails.verification.footer": "अगर ई पता को सत्यापित करे के लिए ना कहाले, तो आप ई संदेश क अनदेखा कर सकत अछि।",
-    "emails.verification.thanks": "धन्यवाद",
+    "emails.verification.thanks": "धन्यवाद,",
+    "emails.verification.buttonText": "ईमेल पता के पुष्टि करीं",
     "emails.verification.signature": "{{project}} टीम",
     "emails.magicSession.subject": "लॉग इन करीं|",
-    "emails.magicSession.hello": "प्रणाम",
-    "emails.magicSession.body": "लॉग इन करें लेल दिहल गइल लिंक फॉलो करें|",
-    "emails.magicSession.footer": "अगर लॉग इन करे के लिए ना कहाले, तो आप ई संदेश क अनदेखा कर सकत अछि।",
-    "emails.magicSession.thanks": "धन्यवाद",
+    "emails.magicSession.hello": "प्रणाम,",
+    "emails.magicSession.thanks": "धन्यवाद,",
     "emails.magicSession.signature": "{{project}} टीम",
     "emails.recovery.subject": "पासवर्ड बदल क लेल|",
-    "emails.recovery.hello": "प्रणाम {{user}}",
+    "emails.recovery.hello": "प्रणाम {{user}},",
     "emails.recovery.body": "पासवर्ड बदल क लेल दिहल गइल लिंक फॉलो करें|",
     "emails.recovery.footer": "अगर पासवर्ड बदल क लेल ना कहाले, तो आप ई संदेश क अनदेखा कर सकत अछि।",
-    "emails.recovery.thanks": "धन्यवाद",
+    "emails.recovery.thanks": "धन्यवाद,",
+    "emails.recovery.buttonText": "पासवर्ड रीसेट करीं",
     "emails.recovery.signature": "{{project}} टीम",
     "emails.invitation.subject": "%s टीम क %s पे न्योता देवे क लेल|",
-    "emails.invitation.hello": "प्रणाम",
+    "emails.invitation.hello": "प्रणाम,",
     "emails.invitation.body": "ई मेल आपके एही लेल भेजल गईल रहल काहे क {{owner}} आपके {{project}} क {{team}} टीम का सदस्य बनावे चाहित रहे|",
     "emails.invitation.footer": "अगर आवे क इच्छा ना होवत, तो आप ई संदेश क अनदेखा कर सकत अछि।",
-    "emails.invitation.thanks": "धन्यवाद",
+    "emails.invitation.thanks": "धन्यवाद,",
+    "emails.invitation.buttonText": "{{team}} में नेवता स्वीकार करीं",
     "emails.invitation.signature": "{{project}} टीम",
     "locale.country.unknown": "अनजान",
     "countries.af": "अफ़ग़ानिस्तान",
@@ -242,13 +243,13 @@
     "emails.otpSession.description": "जब आपको सुरक्षित रूप से अपना {{project}} खाता में साइन इन करे खातिर कहल जाए तऽ निम्नलिखित सत्यापन कोड दर्ज करीं। ई 15 मिनट में खत्म हो जई।",
     "emails.otpSession.clientInfo": "एह साइन इन के अनुरोध {{agentClient}} पर {{agentDevice}} {{agentOs}} का प्रयोग करि कऽ कइल गइल बा। यदि तूँ एह साइन इन के अनुरोध ना कइले रहीं, त तूँ एह ईमेल के नजरअंदाज कर सकेला।",
     "emails.otpSession.securityPhrase": "एही ईमेल खातिर सुरक्षा वाक्य {{phrase}} हऽ। अगर ई वाक्य साइन इन कइला के समय देखावल गेल वाक्य से मेल खाता, त एह ईमेल पर भरोसा कर सकैत छी।",
-    "emails.otpSession.thanks": "धन्यवाद",
+    "emails.otpSession.thanks": "धन्यवाद,",
     "emails.otpSession.signature": "{{project}} टीम",
     "emails.certificate.subject": "%s लेल प्रमाणपत्र असफलта",
-    "emails.certificate.hello": "नमस्ते",
+    "emails.certificate.hello": "नमस्ते,",
     "emails.certificate.body": "आपके डोमेन '{{domain}}' के लिए प्रमाणपत्र नहीं बनाया जा सका। ई प्रयास संख्या {{attempt}} है, और ई असफलता के कारण रहे: {{error}}",
     "emails.certificate.footer": "तोहार पिछलका प्रमाणपत्र पहिल असफलता से 30 दिन धरी मान्य होईत। हम बहुत जोर देके सलाह देतानी कि एह मामला के जांच करीं, नहीं त तोहार डोमेन बिना कोनो मान्य SSL संवाद के रहि जाईत।",
-    "emails.certificate.thanks": "धन्यवाद",
+    "emails.certificate.thanks": "धन्यवाद,",
     "emails.certificate.signature": "{{project}} टीम",
     "sms.verification.body": "{{secret}}"
-}
+}

app/config/locale/translations/bn.json

@@ -4,28 +4,29 @@
     "settings.direction": "ltr",
     "emails.sender": "%s টীম",
     "emails.verification.subject": "বিষয়",
-    "emails.verification.hello": "নমস্কার {{user}}",
+    "emails.verification.hello": "নমস্কার {{user}},",
     "emails.verification.body": "এই লিঙ্কের মাধ্যমে ইমেইল যাচাই করুন।",
     "emails.verification.footer": "আপনি যদি এই ঠিকানা যাচাই করতে না বলেন, তাহলে আপনি এই বার্তাটি উপেক্ষা করতে পারেন।",
-    "emails.verification.thanks": "ধন্যবাদ",
+    "emails.verification.thanks": "ধন্যবাদ,",
+    "emails.verification.buttonText": "ইমেইল ঠিকানা নিশ্চিত করুন",
     "emails.verification.signature": "{{project}} টীম",
     "emails.magicSession.subject": "লগ ইন",
-    "emails.magicSession.hello": "নমস্কার",
-    "emails.magicSession.body": "এই লিঙ্কের মাধ্যমে লগ ইন করুন।",
-    "emails.magicSession.footer": "আপনি যদি এই ইমেলটি ব্যবহার করে লগইন করতে না বলেন, তাহলে আপনি এই বার্তাটি উপেক্ষা করতে পারেন।",
-    "emails.magicSession.thanks": "ধন্যবাদ",
+    "emails.magicSession.hello": "নমস্কার,",
+    "emails.magicSession.thanks": "ধন্যবাদ,",
     "emails.magicSession.signature": "{{project}} টীম",
     "emails.recovery.subject": "পাসওয়ার্ড রিসেট",
-    "emails.recovery.hello": "নমস্কার {{user}}",
+    "emails.recovery.hello": "নমস্কার {{user}},",
     "emails.recovery.body": "এই লিঙ্কের মাধ্যমে আপনার {{project}} পাসওয়ার্ড পুনরায় সেট করুন।",
     "emails.recovery.footer": "আপনি যদি আপনার পাসওয়ার্ড পুনরায় সেট করতে না বলেন, তাহলে আপনি এই বার্তাটি উপেক্ষা করতে পারেন।",
-    "emails.recovery.thanks": "ধন্যবাদ",
+    "emails.recovery.thanks": "ধন্যবাদ,",
+    "emails.recovery.buttonText": "পাসওয়ার্ড রিসেট করুন",
     "emails.recovery.signature": "{{project}} টীম",
     "emails.invitation.subject": "%s টিমকে %s তে আমন্ত্রণ জানান",
-    "emails.invitation.hello": "নমস্কার",
+    "emails.invitation.hello": "নমস্কার,",
     "emails.invitation.body": "এই মেইলটি আপনাকে পাঠানো হয়েছে কারণ {{owner}} আপনাকে {{project}} এর সাথে যুক্ত {{team}} টিমের সদস্য হওয়ার জন্য আমন্ত্রণ জানাতে চেয়েছিলেন।",
     "emails.invitation.footer": "যদি এটি আপনার জন্য প্রয়োজনীয় না হয়, আপনি এই বার্তাটি উপেক্ষা করতে পারেন।",
-    "emails.invitation.thanks": "ধন্যবাদ",
+    "emails.invitation.thanks": "ধন্যবাদ,",
+    "emails.invitation.buttonText": "{{team}}-এর আমন্ত্রণ গ্রহণ করুন",
     "emails.invitation.signature": "{{project}} টীম",
     "locale.country.unknown": "অজানা",
     "countries.af": "আফগানিস্তান",
@@ -245,4 +246,4 @@
     "emails.otpSession.securityPhrase": "এই ইমেইলের জন্য সুরক্ষা বাক্য হলো {{phrase}}। যদি এই বাক্যটি সাইন ইনের সময় দেখানো বাক্যের সাথে মেলে, তাহলে আপনি এই ইমেইলটিকে বিশ্বাস করতে পারেন।",
     "emails.otpSession.thanks": "ধন্যবাদ,",
     "emails.otpSession.signature": "{{project}} দল"
-}
+}

app/config/locale/translations/bs.json

@@ -4,28 +4,26 @@
     "settings.direction": "ltr",
     "emails.sender": "%s Tim",
     "emails.verification.subject": "",
-    "emails.verification.hello": "",
+    "emails.verification.hello": ",",
     "emails.verification.body": "",
     "emails.verification.footer": "",
-    "emails.verification.thanks": "",
+    "emails.verification.thanks": ",",
     "emails.verification.signature": "",
     "emails.magicSession.subject": "",
-    "emails.magicSession.hello": "",
-    "emails.magicSession.body": "",
-    "emails.magicSession.footer": "",
-    "emails.magicSession.thanks": "",
+    "emails.magicSession.hello": ",",
+    "emails.magicSession.thanks": ",",
     "emails.magicSession.signature": "",
     "emails.recovery.subject": "",
-    "emails.recovery.hello": "",
+    "emails.recovery.hello": ",",
     "emails.recovery.body": "",
     "emails.recovery.footer": "",
-    "emails.recovery.thanks": "",
+    "emails.recovery.thanks": ",",
     "emails.recovery.signature": "",
     "emails.invitation.subject": "",
-    "emails.invitation.hello": "",
+    "emails.invitation.hello": ",",
     "emails.invitation.body": "",
     "emails.invitation.footer": "",
-    "emails.invitation.thanks": "",
+    "emails.invitation.thanks": ",",
     "emails.invitation.signature": "",
     "locale.country.unknown": "Nepoznat",
     "countries.af": "Afganistan",
@@ -245,4 +243,4 @@
     "emails.otpSession.securityPhrase": "Sigurnosna fraza za ovaj email je {{phrase}}. Možete vjerovati ovom emailu ako se ova fraza podudara sa frazom prikazanom prilikom prijave.",
     "emails.otpSession.thanks": "Hvala,",
     "emails.otpSession.signature": "tim {{project}}"
-}
+}

app/config/locale/translations/ca.json

@@ -4,28 +4,29 @@
     "settings.direction": "ltr",
     "emails.sender": "%s Equip",
     "emails.verification.subject": "Verificació del compte",
-    "emails.verification.hello": "Hola {{user}}",
+    "emails.verification.hello": "Hola {{user}},",
     "emails.verification.body": "Accedeix a aquest enllaç per tal de verificar la teva adreça electrònica.",
     "emails.verification.footer": "Si no has sol·licitat la verificació d'aquesta adreça electrònica, pots ignorar aquest missatge.",
-    "emails.verification.thanks": "Gràcies",
+    "emails.verification.thanks": "Gràcies,",
+    "emails.verification.buttonText": "Confirma l'adreça electrònica",
     "emails.verification.signature": "Equip {{project}}",
     "emails.magicSession.subject": "Entrar",
-    "emails.magicSession.hello": "Hola",
-    "emails.magicSession.body": "Accedeix a aquest enllaç per a entrar.",
-    "emails.magicSession.footer": "Si no has sol·licitat entrar amb aquesta adreça electrònica, pots ignorar aquest missatge.",
-    "emails.magicSession.thanks": "Gràcies",
+    "emails.magicSession.hello": "Hola,",
+    "emails.magicSession.thanks": "Gràcies,",
     "emails.magicSession.signature": "Equip {{project}}",
     "emails.recovery.subject": "Reinicialitzar contrasenya",
-    "emails.recovery.hello": "Hola {{user}}",
+    "emails.recovery.hello": "Hola {{user}},",
     "emails.recovery.body": "Accedeix a aquest enllaç per a reinicialitzar la teva contrasenya de {{project}}.",
     "emails.recovery.footer": "Si no has sol·licitat reinicialitzar la teva contrasenya, pots ignorar aquest missatge.",
-    "emails.recovery.thanks": "Gràcies",
+    "emails.recovery.thanks": "Gràcies,",
+    "emails.recovery.buttonText": "Restableix la contrasenya",
     "emails.recovery.signature": "Equip {{project}}",
     "emails.invitation.subject": "Invitació a l'equip %s a s%",
-    "emails.invitation.hello": "Hola",
+    "emails.invitation.hello": "Hola,",
     "emails.invitation.body": "Aquest correu se t'ha enviat perquè {{owner}} vol convidar-te a formar part de l'equip {{team}} al {{project}}.",
     "emails.invitation.footer": "Si no és del teu interès, pots ignorar aquest missatge.",
-    "emails.invitation.thanks": "Gràcies",
+    "emails.invitation.thanks": "Gràcies,",
+    "emails.invitation.buttonText": "Accepta la invitació a {{team}}",
     "emails.invitation.signature": "Equip {{project}}",
     "locale.country.unknown": "Desconegut",
     "countries.af": "Afganistan",
@@ -245,4 +246,4 @@
     "emails.otpSession.securityPhrase": "La frase de seguretat d'aquest correu electrònic és {{phrase}}. Podeu confiar en aquest correu electrònic si aquesta frase coincideix amb la frase mostrada durant l'inici de sessió.",
     "emails.otpSession.thanks": "Gràcies,",
     "emails.otpSession.signature": "equip {{project}}"
-}
+}

app/config/locale/translations/cs.json

@@ -4,28 +4,26 @@
     "settings.direction": "ltr",
     "emails.sender": "%s tým",
     "emails.verification.subject": "",
-    "emails.verification.hello": "",
+    "emails.verification.hello": ",",
     "emails.verification.body": "",
     "emails.verification.footer": "",
-    "emails.verification.thanks": "",
+    "emails.verification.thanks": ",",
     "emails.verification.signature": "",
     "emails.magicSession.subject": "",
-    "emails.magicSession.hello": "",
-    "emails.magicSession.body": "",
-    "emails.magicSession.footer": "",
-    "emails.magicSession.thanks": "",
+    "emails.magicSession.hello": ",",
+    "emails.magicSession.thanks": ",",
     "emails.magicSession.signature": "",
     "emails.recovery.subject": "",
-    "emails.recovery.hello": "",
+    "emails.recovery.hello": ",",
     "emails.recovery.body": "",
     "emails.recovery.footer": "",
-    "emails.recovery.thanks": "",
+    "emails.recovery.thanks": ",",
     "emails.recovery.signature": "",
     "emails.invitation.subject": "",
-    "emails.invitation.hello": "",
+    "emails.invitation.hello": ",",
     "emails.invitation.body": "",
     "emails.invitation.footer": "",
-    "emails.invitation.thanks": "",
+    "emails.invitation.thanks": ",",
     "emails.invitation.signature": "",
     "locale.country.unknown": "Neznámý",
     "countries.af": "Afghánistán",
@@ -245,4 +243,4 @@
     "emails.otpSession.securityPhrase": "Bezpečnostní fráze pro tento e-mail je {{phrase}}. Tomuto e-mailu můžete důvěřovat, pokud se tato fráze shoduje s frází zobrazenou při přihlášení.",
     "emails.otpSession.thanks": "Děkuji,",
     "emails.otpSession.signature": "tým {{project}}"
-}
+}

app/config/locale/translations/da.json

@@ -4,28 +4,29 @@
     "settings.direction": "ltr",
     "emails.sender": "%s Team",
     "emails.verification.subject": "Konto Verifikation",
-    "emails.verification.hello": "Hej {{user}}",
+    "emails.verification.hello": "Hej {{user}},",
     "emails.verification.body": "Følg dette link, for at verificere din email adresse.",
     "emails.verification.footer": "Hvis du ikke har bedt om at verificere denne adresse, ignorer venligst denne besked.",
-    "emails.verification.thanks": "Tak",
+    "emails.verification.thanks": "Tak,",
+    "emails.verification.buttonText": "Bekræft e-mailadresse",
     "emails.verification.signature": "{{project}} team",
     "emails.magicSession.subject": "Login",
-    "emails.magicSession.hello": "Hej",
-    "emails.magicSession.body": "Følg dette link for at logge ind.",
-    "emails.magicSession.footer": "Hvis du ikke har bedt om at logge ind med denne email, ignorer venligst denne besked.",
-    "emails.magicSession.thanks": "Tak",
+    "emails.magicSession.hello": "Hej,",
+    "emails.magicSession.thanks": "Tak,",
     "emails.magicSession.signature": "{{project}} team",
     "emails.recovery.subject": "Nulstil Password",
-    "emails.recovery.hello": "Hej {{user}}",
+    "emails.recovery.hello": "Hej {{user}},",
     "emails.recovery.body": "Følg dette link for at nulstille koden til {{project}}.",
     "emails.recovery.footer": "Hvis du ikke har bedt om at nulstille dit password, ignorer venligst denne besked.",
-    "emails.recovery.thanks": "Tak",
+    "emails.recovery.thanks": "Tak,",
+    "emails.recovery.buttonText": "Nulstil adgangskode",
     "emails.recovery.signature": "{{project}} team",
     "emails.invitation.subject": "Invitation til %s Team på %s",
-    "emails.invitation.hello": "Hej",
+    "emails.invitation.hello": "Hej,",
     "emails.invitation.body": "Denne mail blev sendt til dig, fordi {{owner}} vil invitere dig til at blive medlem af {{team}} teamet på {{project}}.",
     "emails.invitation.footer": "Hvis du ikke er interesseret, ignorer venligst denne besked.",
-    "emails.invitation.thanks": "Tak",
+    "emails.invitation.thanks": "Tak,",
+    "emails.invitation.buttonText": "Accepter invitation til {{team}}",
     "emails.invitation.signature": "{{project}} team",
     "locale.country.unknown": "Ukendt",
     "countries.af": "Afghanistan",
@@ -245,4 +246,4 @@
     "emails.otpSession.securityPhrase": "Sikkerhedsfrasen for denne e-mail er {{phrase}}. Du kan stole på denne e-mail, hvis denne frase matcher frasen vist under login.",
     "emails.otpSession.thanks": "Tak,",
     "emails.otpSession.signature": "{{project}} team"
-}
+}

app/config/locale/translations/de.json

@@ -4,28 +4,29 @@
     "settings.direction": "ltr",
     "emails.sender": "%s Team",
     "emails.verification.subject": "Kontoverifizierung",
-    "emails.verification.hello": "Hey {{user}}",
+    "emails.verification.hello": "Hey {{user}},",
     "emails.verification.body": "Folge diesem Link, um deine E-Mail-Adresse zu bestätigen.",
     "emails.verification.footer": "Solltest du keine Verifizierung dieser E-Mail-Adresse angefordert haben, kannst du diese Nachricht ignorieren.",
-    "emails.verification.thanks": "Danke",
+    "emails.verification.thanks": "Danke,",
+    "emails.verification.buttonText": "E-Mail-Adresse bestätigen",
     "emails.verification.signature": "{{project}}-Team",
     "emails.magicSession.subject": "Login",
-    "emails.magicSession.hello": "Hey",
-    "emails.magicSession.body": "Folge diesem Link, um dich einzuloggen.",
-    "emails.magicSession.footer": "Solltest du keinen Login für diese E-Mail-Adresse angefordert haben, kannst du diese Nachricht ignorieren.",
-    "emails.magicSession.thanks": "Danke",
+    "emails.magicSession.hello": "Hey,",
+    "emails.magicSession.thanks": "Danke,",
     "emails.magicSession.signature": "{{project}}-Team",
     "emails.recovery.subject": "Kennwort zurücksetzen",
-    "emails.recovery.hello": "Hallo {{user}}",
+    "emails.recovery.hello": "Hallo {{user}},",
     "emails.recovery.body": "Folge diesem Link, um dein {{project}}-Kennwort zurückzusetzen.",
     "emails.recovery.footer": "Solltest du keine Kennwort-Zurücksetzung angefordert haben, kannst du diese Nachricht ignorieren.",
-    "emails.recovery.thanks": "Danke",
+    "emails.recovery.thanks": "Danke,",
+    "emails.recovery.buttonText": "Passwort zurücksetzen",
     "emails.recovery.signature": "{{project}}-Team",
     "emails.invitation.subject": "Einladung zum %s-Team auf %s",
-    "emails.invitation.hello": "Hello",
+    "emails.invitation.hello": "Hello,",
     "emails.invitation.body": "Du erhälst diese E-Mail, weil {{owner}} dich in das Team {{team}} auf {{project}} eingeladen hat.",
     "emails.invitation.footer": "Wenn du nicht interessiert bist, kannst du diese Nachricht ignorieren.",
-    "emails.invitation.thanks": "Danke",
+    "emails.invitation.thanks": "Danke,",
+    "emails.invitation.buttonText": "Einladung zu {{team}} annehmen",
     "emails.invitation.signature": "{{project}}-Team",
     "locale.country.unknown": "Unbekannt",
     "countries.af": "Afghanistan",
@@ -244,5 +245,6 @@
     "emails.otpSession.clientInfo": "Diese Anmeldung wurde über {{agentClient}} auf {{agentDevice}} {{agentOs}} angefordert. Wenn Sie die Anmeldung nicht angefordert haben, können Sie diese E-Mail getrost ignorieren.",
     "emails.otpSession.securityPhrase": "Die Sicherheitsphrase für diese E-Mail lautet {{phrase}}. Sie können dieser E-Mail vertrauen, wenn diese Phrase mit der Phrase übereinstimmt, die beim Anmelden angezeigt wird.",
     "emails.otpSession.thanks": "Danke,",
-    "emails.otpSession.signature": "{{project}} Team"
-}
+    "emails.otpSession.signature": "{{project}} Team",
+    "mock": "Eine Beispielübersetzung für Testzwecke."
+}

app/config/locale/translations/el.json

@@ -4,28 +4,29 @@
     "settings.direction": "ltr",
     "emails.sender": "Ομάδα %s",
     "emails.verification.subject": "Επαλήθευση Λογαριασμού",
-    "emails.verification.hello": "Γεια σου {{user}}",
+    "emails.verification.hello": "Γεια σου {{user}},",
     "emails.verification.body": "Ακολουθήστε αυτό το link για να επαληθεύσετε τη δ/νση του email σας",
     "emails.verification.footer": "Εάν δεν ζητήσατε επαλήθευση αυτής της δ/νσης email, μπορείτε να αγνοήσετε αυτό το μήνυμα",
-    "emails.verification.thanks": "Ευχαριστούμε",
+    "emails.verification.thanks": "Ευχαριστούμε,",
+    "emails.verification.buttonText": "Επιβεβαιώστε διεύθυνση email",
     "emails.verification.signature": "Η ομάδα του {{project}}",
     "emails.magicSession.subject": "Είσοδος",
-    "emails.magicSession.hello": "Γεια σου",
-    "emails.magicSession.body": "Ακολουθήστε αυτό το link για να συνδεθείτε",
-    "emails.magicSession.footer": "Εάν δεν ζητήσατε να συνδεθείτε χρησιμοποιώντας αυτό το email, μπορείτε να αγνοήσετε αυτό το μήνυμα.",
-    "emails.magicSession.thanks": "Ευχαριστούμε",
+    "emails.magicSession.hello": "Γεια σου,",
+    "emails.magicSession.thanks": "Ευχαριστούμε,",
     "emails.magicSession.signature": "Η ομάδα του {{project}}",
     "emails.recovery.subject": "Αλλαγή κωδικού πρόσβασης",
-    "emails.recovery.hello": "Γεια σου {{user}}",
+    "emails.recovery.hello": "Γεια σου {{user}},",
     "emails.recovery.body": "Ακολουθήστε αυτό το link για να αλλάξετε τον {{project}} κωδικό σας",
     "emails.recovery.footer": "Εάν δεν ζητήσατε αλλαγή του κωδικού σας πρόσβασης, μπορείτε να αγνοήσετε αυτό το μήνυμα",
-    "emails.recovery.thanks": "Ευχαριστούμε",
+    "emails.recovery.thanks": "Ευχαριστούμε,",
+    "emails.recovery.buttonText": "Επαναφορά κωδικού πρόσβασης",
     "emails.recovery.signature": "Η ομάδα του {{project}}",
     "emails.invitation.subject": "Πρόσκληση στην %s Ομάδα στον %s",
-    "emails.invitation.hello": "Γεια σου",
+    "emails.invitation.hello": "Γεια σου,",
     "emails.invitation.body": "Αυτό το email στάλθηκε επειδή ο/η {{owner}} θέλει να σας προσκαλέσει να γίνετε μέλος της ομάδας {{team}} του {{project}}.",
     "emails.invitation.footer": "Εάν δεν ενδιαφέρεστε, μπορείτε να αγνοήσετε αυτό το μήνυμα.",
-    "emails.invitation.thanks": "Ευχαριστούμε",
+    "emails.invitation.thanks": "Ευχαριστούμε,",
+    "emails.invitation.buttonText": "Αποδεχόμενος την πρόσκληση στην {{team}}",
     "emails.invitation.signature": "Η ομάδα του {{project}}",
     "locale.country.unknown": "Άγνωστο",
     "countries.af": "Αφγανιστάν",
@@ -245,4 +246,4 @@
     "emails.otpSession.securityPhrase": "Η φράση ασφαλείας για αυτό το email είναι {{phrase}}. Μπορείτε να εμπιστευτείτε αυτό το email αν αυτή η φράση ταιριάζει με τη φράση που εμφανίστηκε κατά την είσοδο.",
     "emails.otpSession.thanks": "Ευχαριστώ,",
     "emails.otpSession.signature": "ομάδα {{project}}"
-}
+}

app/config/locale/translations/en.json

@@ -4,13 +4,16 @@
     "settings.direction": "ltr",
     "emails.sender": "%s Team",
     "emails.verification.subject": "Account Verification",
-    "emails.verification.hello": "Hello {{user}}",
+    "emails.verification.preview": "Verify your email to activate your {{project}} account.",
+    "emails.verification.hello": "Hello {{user}},",
     "emails.verification.body": "Follow this link to verify your email address to your {{b}}{{project}}{{/b}} account.",
     "emails.verification.footer": "If you didn’t ask to verify this address, you can ignore this message.",
-    "emails.verification.thanks": "Thanks",
+    "emails.verification.thanks": "Thanks,",
+    "emails.verification.buttonText": "Confirm email address",
     "emails.verification.signature": "{{project}} team",
     "emails.magicSession.subject": "{{project}} Login",
-    "emails.magicSession.hello": "Hello {{user}}",
+    "emails.magicSession.preview": "Sign in to {{project}} with your secure link. Expires in 1 hour.",
+    "emails.magicSession.hello": "Hello {{user}},",
     "emails.magicSession.optionButton": "Click the button below to securely sign in to your {{b}}{{project}}{{/b}} account. This link will expire in 1 hour.",
     "emails.magicSession.buttonText": "Sign in to {{project}}",
     "emails.magicSession.optionUrl": "If you are unable to sign in using the button above, please visit the following link:",
@@ -19,44 +22,52 @@
     "emails.magicSession.thanks": "Thanks,",
     "emails.magicSession.signature": "{{project}} team",
     "emails.sessionAlert.subject": "Security alert: new session on your {{project}} account",
-    "emails.sessionAlert.hello":"Hello {{user}}",
+    "emails.sessionAlert.preview": "New login detected on {{project}} at {{time}} UTC.",
+    "emails.sessionAlert.hello": "Hello {{user}},",
     "emails.sessionAlert.body": "A new session has been created on your {{b}}{{project}}{{/b}} account, {{b}}on {{date}}, {{year}} at {{time}} UTC{{/b}}.\nHere are the details of the new session: ",
     "emails.sessionAlert.listDevice": "Device: {{b}}{{device}}{{/b}}",
     "emails.sessionAlert.listIpAddress": "IP Address: {{b}}{{ipAddress}}{{/b}}",
     "emails.sessionAlert.listCountry": "Country: {{b}}{{country}}{{/b}}",
-    "emails.sessionAlert.footer":  "If this was you, there's nothing more you need to do.\nIf you didn't initiate this session or suspect any unauthorized activity, please secure your account.",
+    "emails.sessionAlert.footer": "If this was you, there's nothing more you need to do.\nIf you didn't initiate this session or suspect any unauthorized activity, please secure your account.",
     "emails.sessionAlert.thanks": "Thanks,",
     "emails.sessionAlert.signature": "{{project}} team",
     "emails.otpSession.subject": "OTP for {{project}} Login",
-    "emails.otpSession.hello": "Hello {{user}}",
+    "emails.otpSession.preview": "Use OTP {{otp}} to sign in to {{project}}. Expires in 15 minutes.",
+    "emails.otpSession.hello": "Hello {{user}},",
     "emails.otpSession.description": "Enter the following verification code when prompted to securely sign in to your {{b}}{{project}}{{/b}} account. This code will expire in 15 minutes.",
     "emails.otpSession.clientInfo": "This sign in was requested using {{b}}{{agentClient}}{{/b}} on {{b}}{{agentDevice}}{{/b}} {{b}}{{agentOs}}{{/b}}. If you didn't request the sign in, you can safely ignore this email.",
     "emails.otpSession.securityPhrase": "Security phrase for this email is {{b}}{{phrase}}{{/b}}. You can trust this email if this phrase matches the phrase shown during sign in.",
     "emails.otpSession.thanks": "Thanks,",
     "emails.otpSession.signature": "{{project}} team",
     "emails.mfaChallenge.subject": "Verification Code for {{project}}",
-    "emails.mfaChallenge.hello": "Hello {{user}}",
-    "emails.mfaChallenge.description": "Enter the following verification code to verify your email and activate two-step verification in {{b}}{{project}}{{/b}}. This code will expire in 15 minutes.",
+    "emails.mfaChallenge.preview": "Use code {{otp}} for two-step verification in {{project}}. Expires in 15 minutes.",
+    "emails.mfaChallenge.hello": "Hello {{user}},",
+    "emails.mfaChallenge.description": "Enter the following code to confirm your two-step verification in {{b}}{{project}}{{/b}}. This code will expire in 15 minutes.",
     "emails.mfaChallenge.clientInfo": "This verification code was requested using {{b}}{{agentClient}}{{/b}} on {{b}}{{agentDevice}}{{/b}} {{b}}{{agentOs}}{{/b}}. If you didn't request the verification code, you can safely ignore this email.",
     "emails.mfaChallenge.thanks": "Thanks,",
     "emails.mfaChallenge.signature": "{{project}} team",
     "emails.recovery.subject": "Password Reset",
-    "emails.recovery.hello": "Hello {{user}}",
+    "emails.recovery.preview": "Reset your {{project}} password using the link.",
+    "emails.recovery.hello": "Hello {{user}},",
     "emails.recovery.body": "Follow this link to reset your {{b}}{{project}}{{/b}} password.",
     "emails.recovery.footer": "If you didn't ask to reset your password, you can ignore this message.",
-    "emails.recovery.thanks": "Thanks",
+    "emails.recovery.thanks": "Thanks,",
+    "emails.recovery.buttonText": "Reset password",
     "emails.recovery.signature": "{{project}} team",
     "emails.invitation.subject": "Invitation to %s Team at %s",
-    "emails.invitation.hello": "Hello {{user}}",
-    "emails.invitation.body": "This mail was sent to you because {{b}}{{owner}}{{/b}} wanted to invite you to become a member of the {{b}}{{team}}{{/b}} team at {{b}}{{project}}{{/b}}.",
+    "emails.invitation.preview": "{{owner}} invited you to join {{team}} at {{project}}",
+    "emails.invitation.hello": "Hello {{user}},",
+    "emails.invitation.body": "This mail was sent to you because {{b}}{{owner}}{{/b}} invited you to become a member of the {{b}}{{team}}{{/b}} team at {{b}}{{project}}{{/b}}.",
     "emails.invitation.footer": "If you are not interested, you can ignore this message.",
-    "emails.invitation.thanks": "Thanks",
+    "emails.invitation.thanks": "Thanks,",
+    "emails.invitation.buttonText": "Accept invite to {{team}}",
     "emails.invitation.signature": "{{project}} team",
     "emails.certificate.subject": "Certificate failure for %s",
-    "emails.certificate.hello": "Hello",
+    "emails.certificate.preview": "Your domain %s certificate generation has failed.",
+    "emails.certificate.hello": "Hello,",
     "emails.certificate.body": "Certificate for your domain '{{domain}}' could not be generated. This is attempt no. {{attempt}}, and the failure was caused by: {{error}}",
     "emails.certificate.footer": "Your previous certificate will be valid for 30 days since the first failure. We highly recommend investigating this case, otherwise your domain will end up without a valid SSL communication.",
-    "emails.certificate.thanks": "Thanks",
+    "emails.certificate.thanks": "Thanks,",
     "emails.certificate.signature": "{{project}} team",
     "sms.verification.body": "{{secret}}",
     "locale.country.unknown": "Unknown",
@@ -263,5 +274,6 @@
     "continents.eu": "Europe",
     "continents.na": "North America",
     "continents.oc": "Oceania",
-    "continents.sa": "South America"
+    "continents.sa": "South America",
+    "mock": "A mock translation for testing purposes."
 }

app/config/locale/translations/eo.json

@@ -3,28 +3,29 @@
     "settings.direction": "ltr",
     "emails.sender": "Teamo %s",
     "emails.verification.subject": "Konta Konfirmo",
-    "emails.verification.hello": "Saluton {{user}}",
+    "emails.verification.hello": "Saluton {{user}},",
     "emails.verification.body": "Alklaku ĉi tiun ligon por kontroli vian retpoŝtan adreson.",
     "emails.verification.footer": "Se vi ne petis ĉi tiun konfirmon de ĉi tiu retpoŝto, vi povas ignori ĉi tiun mesaĝon.",
-    "emails.verification.thanks": "Dankegon.",
+    "emails.verification.thanks": "Dankegon.,",
+    "emails.verification.buttonText": "Konfirmi retadreson",
     "emails.verification.signature": "Teamo {{project}}",
     "emails.magicSession.subject": "Login",
-    "emails.magicSession.hello": "Saluton",
-    "emails.magicSession.body": "Alklaku ĉi tiun ligon por eniri.",
-    "emails.magicSession.footer": "Se vi ne petis ĉi tiun konfirmon de ĉi tiu retpoŝto, vi povas ignori ĉi tiun mesaĝon.",
-    "emails.magicSession.thanks": "Dankegon",
+    "emails.magicSession.hello": "Saluton,",
+    "emails.magicSession.thanks": "Dankegon,",
     "emails.magicSession.signature": "Teamo {{project}}",
     "emails.recovery.subject": "Parsvorta Restarigo",
-    "emails.recovery.hello": "Saluton {{user}}",
+    "emails.recovery.hello": "Saluton {{user}},",
     "emails.recovery.body": "Alklaku ĉi tiun ligon por reagordi vian pasvorton. {{project}}",
     "emails.recovery.footer": "Se vi ne petis reagordi vian pasvorton, vi povas ignori ĉi tiun mesaĝon.",
-    "emails.recovery.thanks": "Dankegon",
+    "emails.recovery.thanks": "Dankegon,",
+    "emails.recovery.buttonText": "Pasvorton restarigi",
     "emails.recovery.signature": "Teamo {{project}}",
     "emails.invitation.subject": "Invito al la Teamo %s em %s",
-    "emails.invitation.hello": "Dankegon",
+    "emails.invitation.hello": "Dankegon,",
     "emails.invitation.body": "Ĉi tiu retpoŝto estis sendita ĉar la {{owner}} volas inviti vin fariĝi membro de la Teamo {{team}} en {{project}}.",
     "emails.invitation.footer": "Se vi ne interesiĝas, vi povas ignori ĉi tiun mesaĝon.",
-    "emails.invitation.thanks": "Dankegon",
+    "emails.invitation.thanks": "Dankegon,",
+    "emails.invitation.buttonText": "Akcepti inviton al {{team}}",
     "emails.invitation.signature": "Teamo {{project}}",
     "locale.country.unknown": "Unknown",
     "countries.af": "Afghanistan",
@@ -245,4 +246,4 @@
     "emails.otpSession.securityPhrase": "Sekureca frazo por ĉi tiu retpoŝto estas {{phrase}}. Vi povas fidi ĉi tiun retpoŝton se tiu ĉi frazo kongruas kun la frazo montrita dum ensaluto.",
     "emails.otpSession.thanks": "Dankon,",
     "emails.otpSession.signature": "teamo de {{project}}"
-}
+}

app/config/locale/translations/es.json

@@ -4,28 +4,29 @@
     "settings.direction": "ltr",
     "emails.sender": "El equipo de %s",
     "emails.verification.subject": "Verificación de cuenta",
-    "emails.verification.hello": "Hola, {{name}}.",
+    "emails.verification.hello": "Hola, {{name}}.,",
     "emails.verification.body": "Haz clic en este enlace para verificar tu correo:",
     "emails.verification.footer": "Si no has solicitado verificar este correo, puedes ignorar este mensaje.",
-    "emails.verification.thanks": "Gracias.",
+    "emails.verification.thanks": "Gracias.,",
+    "emails.verification.buttonText": "Confirmar dirección de correo",
     "emails.verification.signature": "El equipo de {{project}}.",
     "emails.magicSession.subject": "Inicio de sesión",
-    "emails.magicSession.hello": "Hola",
-    "emails.magicSession.body": "Haz clic en este enlace para iniciar sesión:",
-    "emails.magicSession.footer": "Si no has solicitado iniciar sesión usando este correo, puedes ignorar este mensaje.",
-    "emails.magicSession.thanks": "Gracias.",
+    "emails.magicSession.hello": "Hola,",
+    "emails.magicSession.thanks": "Gracias.,",
     "emails.magicSession.signature": "El equipo de {{project}}",
     "emails.recovery.subject": "Restablecer contraseña",
-    "emails.recovery.hello": "Hola, {{name}}.",
+    "emails.recovery.hello": "Hola, {{name}}.,",
     "emails.recovery.body": "Haz clic en este enlace para restablecer la contraseña de {{project}}:",
     "emails.recovery.footer": "Si no has solicitado restablecer la contraseña, puedes ignorar este mensaje.",
-    "emails.recovery.thanks": "Gracias.",
+    "emails.recovery.thanks": "Gracias.,",
+    "emails.recovery.buttonText": "Restablecer contraseña",
     "emails.recovery.signature": "El equipo de {{project}}",
     "emails.invitation.subject": "Invitación al equipo %s en %s",
-    "emails.invitation.hello": "Hola",
+    "emails.invitation.hello": "Hola,",
     "emails.invitation.body": "Este correo ha sido enviado a petición de {{owner}} quién quiere invitarte a formar parte del equipo {{team}} en {{project}}.",
     "emails.invitation.footer": "Si no estás interesado, puedes ignorar este mensaje.",
-    "emails.invitation.thanks": "Gracias.",
+    "emails.invitation.thanks": "Gracias.,",
+    "emails.invitation.buttonText": "Aceptar invitación a {{team}}",
     "emails.invitation.signature": "El equipo de {{project}}",
     "locale.country.unknown": "Desconocido",
     "countries.af": "Afganistán",
@@ -239,10 +240,10 @@
     "emails.magicSession.securityPhrase": "La frase de seguridad para este correo electrónico es {{phrase}}. Puedes confiar en este correo electrónico si esta frase coincide con la frase que se muestra durante el inicio de sesión.",
     "emails.magicSession.optionUrl": "Si no puedes iniciar sesión utilizando el botón anterior, visita el siguiente enlace:",
     "emails.otpSession.subject": "Inicio de sesión en {{project}}",
-    "emails.otpSession.hello": "Hola",
+    "emails.otpSession.hello": "Hola,",
     "emails.otpSession.description": "Ingrese el siguiente código de verificación cuando se le solicite para iniciar sesión de forma segura en su cuenta de {{project}}. Expirará en 15 minutos.",
     "emails.otpSession.clientInfo": "Este inicio de sesión fue solicitado usando {{agentClient}} en {{agentDevice}} {{agentOs}}. Si no solicitaste el inicio de sesión, puedes ignorar este correo electrónico de forma segura.",
     "emails.otpSession.securityPhrase": "La frase de seguridad para este correo electrónico es {{phrase}}. Puedes confiar en este correo si esta frase coincide con la frase mostrada durante el inicio de sesión.",
-    "emails.otpSession.thanks": "Gracias.",
+    "emails.otpSession.thanks": "Gracias.,",
     "emails.otpSession.signature": "El equipo de {{project}}"
 }

app/config/locale/translations/fa.json

@@ -4,28 +4,29 @@
     "settings.direction": "rtl",
     "emails.sender": "تیم %s",
     "emails.verification.subject": "تأیید حساب",
-    "emails.verification.hello": "سلام {{user}}",
+    "emails.verification.hello": "سلام {{user}}،",
     "emails.verification.body": "برای تأیید ایمیل‌تان پیوند زیر را دنبال کنید.",
     "emails.verification.footer": "اگر شما درخواست تأیید حساب نداده‌اید، می‌توانید این پیام را نادیده بگیرید.",
-    "emails.verification.thanks": "سپاس فراوان",
+    "emails.verification.thanks": "سپاس فراوان،",
+    "emails.verification.buttonText": "آدرس ایمیل را تایید کنید",
     "emails.verification.signature": "تیم {{user}}",
     "emails.magicSession.subject": "ورود به حساب کاربری",
     "emails.magicSession.hello": "سلام،",
-    "emails.magicSession.body": "برای ورود به حساب‌تان پیوند زیر را دنبال کنید.",
-    "emails.magicSession.footer": "اگر شما درخواست ورود به حساب کاربری با استفاده از این ایمیل را نداد‌ه‌اید، می‌توانید این پیام را نادیده بگیرید.",
-    "emails.magicSession.thanks": "سپاس فراوان",
+    "emails.magicSession.thanks": "سپاس فراوان،",
     "emails.magicSession.signature": "تیم {{user}}",
     "emails.recovery.subject": "بازیابی گذرواژه",
-    "emails.recovery.hello": "سلام {{user}}",
+    "emails.recovery.hello": "سلام {{user}}،",
     "emails.recovery.body": "برای بازیابی گذرواژه‌تان پیوند زیر را دنبال کنید.",
     "emails.recovery.footer": "اگر شما درخواست بازیابی گذرواژه نداده‌اید، می‌توانید این پیام را نادیده بگیرید.",
-    "emails.recovery.thanks": "سپاس فراوان",
+    "emails.recovery.thanks": "سپاس فراوان،",
+    "emails.recovery.buttonText": "بازنشانی رمز عبور",
     "emails.recovery.signature": "تیم {{user}}",
     "emails.invitation.subject": "دعوت به تیم %s در %s",
-    "emails.invitation.hello": "سلام",
+    "emails.invitation.hello": "سلام،",
     "emails.invitation.body": "این ایمیل برای شما فرستاده شده‌است زیرا {{owner}} می‌خواهد شما را به تیم {{team}} در پروژه‌ی {{project}} بیفزاید.",
     "emails.invitation.footer": "اگر علاقه ندارید، می‌توانید این پیام را نادیده بگیرید.",
-    "emails.invitation.thanks": "سپاس فراوان",
+    "emails.invitation.thanks": "سپاس فراوان،",
+    "emails.invitation.buttonText": "دعوت را به {{team}} بپذیرید",
     "emails.invitation.signature": "تیم {{user}}",
     "locale.country.unknown": "ناشناخته",
     "countries.af": "افغانستان",
@@ -245,4 +246,4 @@
     "emails.otpSession.securityPhrase": "عبارت امنیتی برای این ایمیل {{phrase}} است. اگر این عبارت با عبارت نشان داده شده هنگام ورود به سیستم مطابقت داشته باشد، می‌توانید به این ایمیل اعتماد کنید.",
     "emails.otpSession.thanks": "متشکرم،",
     "emails.otpSession.signature": "تیم {{project}}"
-}
+}

app/config/locale/translations/fi.json

@@ -4,28 +4,26 @@
     "settings.direction": "ltr",
     "emails.sender": "%s Tiimi",
     "emails.verification.subject": "",
-    "emails.verification.hello": "",
+    "emails.verification.hello": ",",
     "emails.verification.body": "",
     "emails.verification.footer": "",
-    "emails.verification.thanks": "",
+    "emails.verification.thanks": ",",
     "emails.verification.signature": "",
     "emails.magicSession.subject": "",
-    "emails.magicSession.hello": "",
-    "emails.magicSession.body": "",
-    "emails.magicSession.footer": "",
-    "emails.magicSession.thanks": "",
+    "emails.magicSession.hello": ",",
+    "emails.magicSession.thanks": ",",
     "emails.magicSession.signature": "",
     "emails.recovery.subject": "",
-    "emails.recovery.hello": "",
+    "emails.recovery.hello": ",",
     "emails.recovery.body": "",
     "emails.recovery.footer": "",
-    "emails.recovery.thanks": "",
+    "emails.recovery.thanks": ",",
     "emails.recovery.signature": "",
     "emails.invitation.subject": "",
-    "emails.invitation.hello": "",
+    "emails.invitation.hello": ",",
     "emails.invitation.body": "",
     "emails.invitation.footer": "",
-    "emails.invitation.thanks": "",
+    "emails.invitation.thanks": ",",
     "emails.invitation.signature": "",
     "locale.country.unknown": "Unknown",
     "countries.af": "Afganistan",
@@ -245,4 +243,4 @@
     "emails.otpSession.securityPhrase": "Tämän sähköpostin turvalause on {{phrase}}. Voit luottaa tähän sähköpostiin, jos tämä lause vastaa kirjautumisen yhteydessä näytettyä lausetta.",
     "emails.otpSession.thanks": "Kiitos,",
     "emails.otpSession.signature": "{{project}} -tiimi"
-}
+}

app/config/locale/translations/fo.json

@@ -4,28 +4,26 @@
     "settings.direction": "ltr",
     "emails.sender": "%s Lið",
     "emails.verification.subject": "",
-    "emails.verification.hello": "",
+    "emails.verification.hello": ",",
     "emails.verification.body": "",
     "emails.verification.footer": "",
-    "emails.verification.thanks": "",
+    "emails.verification.thanks": ",",
     "emails.verification.signature": "",
     "emails.magicSession.subject": "",
-    "emails.magicSession.hello": "",
-    "emails.magicSession.body": "",
-    "emails.magicSession.footer": "",
-    "emails.magicSession.thanks": "",
+    "emails.magicSession.hello": ",",
+    "emails.magicSession.thanks": ",",
     "emails.magicSession.signature": "",
     "emails.recovery.subject": "",
-    "emails.recovery.hello": "",
+    "emails.recovery.hello": ",",
     "emails.recovery.body": "",
     "emails.recovery.footer": "",
-    "emails.recovery.thanks": "",
+    "emails.recovery.thanks": ",",
     "emails.recovery.signature": "",
     "emails.invitation.subject": "",
-    "emails.invitation.hello": "",
+    "emails.invitation.hello": ",",
     "emails.invitation.body": "",
     "emails.invitation.footer": "",
-    "emails.invitation.thanks": "",
+    "emails.invitation.thanks": ",",
     "emails.invitation.signature": "",
     "locale.country.unknown": "Ókjent",
     "countries.af": "Afghanistan",
@@ -245,4 +243,4 @@
     "emails.otpSession.securityPhrase": "Trygdarorðið fyri hesa teldupostin er {{phrase}}. Tú kanst líta á hesa teldupostin um hetta orðið passar við orðið víst tá tú ritaði inn.",
     "emails.otpSession.thanks": "Takk,",
     "emails.otpSession.signature": "{{project}} lið"
-}
+}

app/config/locale/translations/fr.json

@@ -4,28 +4,29 @@
     "settings.direction": "ltr",
     "emails.sender": "Équipe %s",
     "emails.verification.subject": "Vérification du compte",
-    "emails.verification.hello": "Bonjour {{user}}",
+    "emails.verification.hello": "Bonjour {{user}},",
     "emails.verification.body": "Suivez ce lien pour vérifier votre adresse e-mail.",
     "emails.verification.footer": "Si vous n'avez pas demandé à vérifier cette adresse, vous pouvez ignorer ce message.",
-    "emails.verification.thanks": "Merci",
+    "emails.verification.thanks": "Merci,",
+    "emails.verification.buttonText": "Confirmez l'adresse e-mail",
     "emails.verification.signature": "Équipe {{project}}",
     "emails.magicSession.subject": "Connexion",
-    "emails.magicSession.hello": "Bonjour",
-    "emails.magicSession.body": "Suivez ce lien pour vous connecter.",
-    "emails.magicSession.footer": "Si vous n'avez pas demandé à vous connecter en utilisant cet e-mail, vous pouvez ignorer ce message.",
-    "emails.magicSession.thanks": "Merci",
+    "emails.magicSession.hello": "Bonjour,",
+    "emails.magicSession.thanks": "Merci,",
     "emails.magicSession.signature": "L'équipe {{project}}",
     "emails.recovery.subject": "Réinitialisation du mot de passe",
-    "emails.recovery.hello": "Bonjour {{user}}",
+    "emails.recovery.hello": "Bonjour {{user}},",
     "emails.recovery.body": "Suivez ce lien pour réinitialiser votre mot de passe pour {{project}}.",
     "emails.recovery.footer": "Si vous n'avez pas demandé à réinitialiser votre mot de passe, vous pouvez ignorer ce message.",
-    "emails.recovery.thanks": "Merci",
+    "emails.recovery.thanks": "Merci,",
+    "emails.recovery.buttonText": "Réinitialisation du mot de passe",
     "emails.recovery.signature": "L'équipe {{project}}",
     "emails.invitation.subject": "Invitation à l'équipe %s de %s",
-    "emails.invitation.hello": "Bonjour",
+    "emails.invitation.hello": "Bonjour,",
     "emails.invitation.body": "Cet e-mail vous a été envoyé parce que {{owner}} souhaite vous inviter à devenir membre de l'équipe {{team}} pour {{project}}.",
     "emails.invitation.footer": "Si vous n'êtes pas intéressé, vous pouvez ignorer ce message.",
-    "emails.invitation.thanks": "Merci",
+    "emails.invitation.thanks": "Merci,",
+    "emails.invitation.buttonText": "Accepter l'invitation à {{team}}",
     "emails.invitation.signature": "L'équipe {{project}}",
     "locale.country.unknown": "Inconnu",
     "countries.af": "Afghanistan",
@@ -245,4 +246,4 @@
     "emails.otpSession.securityPhrase": "La phrase de sécurité pour cet e-mail est {{phrase}}. Vous pouvez faire confiance à cet e-mail si cette phrase correspond à celle affichée lors de la connexion.",
     "emails.otpSession.thanks": "Merci,",
     "emails.otpSession.signature": "équipe {{project}}"
-}
+}

app/config/locale/translations/ga.json

@@ -4,28 +4,29 @@
     "settings.direction": "ltr",
     "emails.sender": "%s Foireann",
     "emails.verification.subject": "Fíoraithe cuntais",
-    "emails.verification.hello": "Haigh {{user}}",
+    "emails.verification.hello": "Haigh {{user}},",
     "emails.verification.body": "Lean an nasc seo chun do ríomhphost a fhíorú.",
     "emails.verification.footer": "Mura ndearna tú iarratas an seoladh seo a fhíoru, déan neamhaird den teachtaireacht seo.",
-    "emails.verification.thanks": "Go raibh maith agat",
+    "emails.verification.thanks": "Go raibh maith agat,",
+    "emails.verification.buttonText": "Deimhnigh seoladh ríomhphoist",
     "emails.verification.signature": "{{project}} foireann",
     "emails.magicSession.subject": "Logáil isteach",
-    "emails.magicSession.hello": "Haigh",
-    "emails.magicSession.body": "Lean an nasc seo chun logáil isteach.",
-    "emails.magicSession.footer": "Mura ndearna tú iarratas logáil isteach leis an ríomhphost seo, déan neamhaird den teachtaireacht seo.",
-    "emails.magicSession.thanks": "Go raibh maith agat",
+    "emails.magicSession.hello": "Haigh,",
+    "emails.magicSession.thanks": "Go raibh maith agat,",
     "emails.magicSession.signature": "{{project}} foireann",
     "emails.recovery.subject": "Athshocrú pasfhocail",
-    "emails.recovery.hello": "Haigh {{user}}",
+    "emails.recovery.hello": "Haigh {{user}},",
     "emails.recovery.body": "Lean an nasc seo chun do pasfhocal {{project}} a athshocrú.",
     "emails.recovery.footer": "Mura ndearna tú iarratas do pasfhocal a athshocrú, déan neamhaird den teachtaireacht seo.",
-    "emails.recovery.thanks": "Go raibh maith agat",
+    "emails.recovery.thanks": "Go raibh maith agat,",
+    "emails.recovery.buttonText": "Athshocraigh focal faire",
     "emails.recovery.signature": "{{project}} foireann",
     "emails.invitation.subject": "Cuireadh do %s foireann ag %s",
-    "emails.invitation.hello": "Haigh",
+    "emails.invitation.hello": "Haigh,",
     "emails.invitation.body": "Seoladh an ríomhphost seo chugat mar ba mhaith le {{owner}} cuireadh a thabhairt duit bheith mar bhall den fhoireann {{team}} ag obair ar {{project}}.",
     "emails.invitation.footer": "Is cuma leat? Déan neamhaird den teachtaireacht seo.",
-    "emails.invitation.thanks": "Go raibh maith agat",
+    "emails.invitation.thanks": "Go raibh maith agat,",
+    "emails.invitation.buttonText": "Glac le cuireadh chuig {{team}}",
     "emails.invitation.signature": "{{project}} foireann",
     "locale.country.unknown": "Neamhaithnid",
     "countries.af": "An Afganastáin",
@@ -245,4 +246,4 @@
     "emails.otpSession.securityPhrase": "Frása slándála don ríomhphost seo ná {{phrase}}. Is féidir muinín a bheith agat as an ríomhphost seo má mheaitseálann an frása seo leis an bhfrása a taispeántar le linn síniú isteach.",
     "emails.otpSession.thanks": "Go raibh maith agat,",
     "emails.otpSession.signature": "foireann {{project}}"
-}
+}

app/config/locale/translations/gu.json

@@ -4,28 +4,29 @@
     "settings.direction": "ltr",
     "emails.sender": "%s ટીમ",
     "emails.verification.subject": "ખાતાની ચકાસણી",
-    "emails.verification.hello": "નમસ્કાર {{user}}",
+    "emails.verification.hello": "નમસ્કાર {{user}},",
     "emails.verification.body": "તમારું ઇમેઇલ સરનામું ચકાસવા માટે આ લિંકને અનુસરો.",
     "emails.verification.footer": "જો તમે આ સરનામાંની ચકાસણી કરવાનું ન કહ્યું હોય, તો તમે આ સંદેશને અવગણી શકો છો.",
-    "emails.verification.thanks": "આભાર",
+    "emails.verification.thanks": "આભાર,",
+    "emails.verification.buttonText": "ઇમેઇલ સરનામું ખાતરી કરો",
     "emails.verification.signature": "{{project}} ટીમ",
     "emails.magicSession.subject": "પ્રવેશ કરો",
-    "emails.magicSession.hello": "નમસ્કાર",
-    "emails.magicSession.body": "પ્રવેશ કરવા માટે આ લિંકને અનુસરો.",
-    "emails.magicSession.footer": "જો તમે આ ઇમેઇલનો ઉપયોગ કરીને પ્રવેશ કરવાનું ન કહ્યું હોય, તો તમે આ સંદેશને અવગણી શકો છો.",
-    "emails.magicSession.thanks": "આભાર",
+    "emails.magicSession.hello": "નમસ્કાર,",
+    "emails.magicSession.thanks": "આભાર,",
     "emails.magicSession.signature": "{{project}} ટીમ",
     "emails.recovery.subject": "પાસવર્ડ ફરીથી સેટ કરો",
-    "emails.recovery.hello": "નમસ્કાર {{user}}",
+    "emails.recovery.hello": "નમસ્કાર {{user}},",
     "emails.recovery.body": "તમારો {{project}} પાસવર્ડ ફરીથી સેટ કરવા માટે આ લિંકને અનુસરો.",
     "emails.recovery.footer": "જો તમે તમારો પાસવર્ડ ફરીથી સેટ કરવાનું ન કહ્યું હોય, તો તમે આ સંદેશને અવગણી શકો છો.",
-    "emails.recovery.thanks": "આભાર",
+    "emails.recovery.thanks": "આભાર,",
+    "emails.recovery.buttonText": "પાસવર્ડ રીસેટ કરો",
     "emails.recovery.signature": "{{project}} ટીમ",
     "emails.invitation.subject": "%s ટીમને %s પર આમંત્રણ",
-    "emails.invitation.hello": "નમસ્કાર",
+    "emails.invitation.hello": "નમસ્કાર,",
     "emails.invitation.body": "આ મેઇલ તમને મોકલવામાં આવ્યો હતો કારણ કે {{owner}} તમને {{project}} માં {{team}} ટીમના સભ્ય બનવા માટે આમંત્રિત કરવા માંગતા હતો.",
     "emails.invitation.footer": "જો તમને રસ નથી, તો તમે આ સંદેશને અવગણી શકો છો.",
-    "emails.invitation.thanks": "આભાર",
+    "emails.invitation.thanks": "આભાર,",
+    "emails.invitation.buttonText": "{{team}} નું આમંત્રણ સ્વીકારો",
     "emails.invitation.signature": "{{project}} ટીમ",
     "locale.country.unknown": "અજાણ",
     "countries.af": "અફઘાનિસ્તાન",
@@ -245,4 +246,4 @@
     "emails.otpSession.securityPhrase": "આ ઇમેઇલ માટેનો સુરક્ષા શબ્દ {{phrase}} છે. જો આ શબ્દ સાઇન ઇન વખતે દર્શાવેલા શબ્દ સાથે મેળ ખાતો હોય તો તમે આ ઇમેઇલ પર વિશ્વાસ કરી શકો છો.",
     "emails.otpSession.thanks": "આભાર,",
     "emails.otpSession.signature": "{{project}} ટીમ"
-}
+}

app/config/locale/translations/he.json

@@ -4,28 +4,29 @@
     "settings.direction": "rtl",
     "emails.sender": "צוות %s",
     "emails.verification.subject": "אימות חשבון",
-    "emails.verification.hello": "שלום {{user}}",
+    "emails.verification.hello": "שלום {{user}},",
     "emails.verification.body": "לחץ על קישור זה כדי לאמת את כתובת הדוא\"ל שלך.",
     "emails.verification.footer": "אם לא ביקשת לאמת כתובת זו, תוכל להתעלם מהודעה זו.",
-    "emails.verification.thanks": "תודה",
+    "emails.verification.thanks": "תודה,",
+    "emails.verification.buttonText": "אשר כתובת דוא\"ל",
     "emails.verification.signature": "צוות {{project}}",
     "emails.magicSession.subject": "כניסה למערכת",
-    "emails.magicSession.hello": "שלום",
-    "emails.magicSession.body": "לחץ על קישור זה כדי להיכנס.",
-    "emails.magicSession.footer": "אם לא ביקשת להיכנס באמצעות דוא\"ל זה, תוכל להתעלם מהודעה זו.",
-    "emails.magicSession.thanks": "תודה",
+    "emails.magicSession.hello": "שלום,",
+    "emails.magicSession.thanks": "תודה,",
     "emails.magicSession.signature": "צוות {{project}}",
     "emails.recovery.subject": "איפוס סיסמא",
-    "emails.recovery.hello": "שלום {{user}}",
+    "emails.recovery.hello": "שלום {{user}},",
     "emails.recovery.body": "עקוב אחר קישור זה כדי לאפס את סיסמתך ב-{{project}}.",
     "emails.recovery.footer": "אם לא ביקשת לאפס את הסיסמה, תוכל להתעלם מהודעה זו.",
-    "emails.recovery.thanks": "תודה",
+    "emails.recovery.thanks": "תודה,",
+    "emails.recovery.buttonText": "סיסמא איפוס",
     "emails.recovery.signature": "צוות {{project}}",
     "emails.invitation.subject": "הזמנה לצוות %s ב- %s",
-    "emails.invitation.hello": "שלום",
+    "emails.invitation.hello": "שלום,",
     "emails.invitation.body": "דואר זה נשלח אליך מכיוון ש {{owner}} רצה להזמין אותך להיות חבר בצוות {{team}} ב-{{project}}.",
     "emails.invitation.footer": "אם אינך מעוניין, תוכל להתעלם מהודעה זו.",
-    "emails.invitation.thanks": "תודה",
+    "emails.invitation.thanks": "תודה,",
+    "emails.invitation.buttonText": "אשר הזמנה ל-{{team}}",
     "emails.invitation.signature": "צוות {{project}}",
     "locale.country.unknown": "לא ידוע",
     "countries.af": "אפגניסטן",
@@ -245,4 +246,4 @@
     "emails.otpSession.securityPhrase": "משפט האבטחה למייל זה הוא {{phrase}}. אתה יכול לסמוך על המייל הזה אם המשפט הזה תואם את המשפט שהוצג במהלך הכניסה למערכת.",
     "emails.otpSession.thanks": "תודה,",
     "emails.otpSession.signature": "צוות {{project}}"
-}
+}

app/config/locale/translations/hi.json

@@ -4,28 +4,29 @@
     "settings.direction": "ltr",
     "emails.sender": "%s टीम",
     "emails.verification.subject": "अकाउंट वेरिफिकेशन ",
-    "emails.verification.hello": "नमस्ते {{user}}",
+    "emails.verification.hello": "नमस्ते {{user}},",
     "emails.verification.body": "इस लिंक के माध्यम से अपने ईमेल को सत्यापित कीजिये।",
     "emails.verification.footer": "यदि आप इस पते को सत्यापित नहीं करना चाहते हैं, तो आप इस संदेश को नज़रअंदाज़ कर सकते हैं।",
-    "emails.verification.thanks": "धन्यवाद",
+    "emails.verification.thanks": "धन्यवाद,",
+    "emails.verification.buttonText": "ईमेल पता सत्यापित करें",
     "emails.verification.signature": "{{project}} टीम",
     "emails.magicSession.subject": "लॉग इन",
-    "emails.magicSession.hello": "नमस्ते",
-    "emails.magicSession.body": "इस लिंक के माध्यम से लॉग-इन करें।",
-    "emails.magicSession.footer": "यदि आप इस ईमेल द्वारा लॉगिन नहीं करना चाहते हैं, तो आप इस संदेश को नज़रअंदाज़ कर सकते हैं।",
-    "emails.magicSession.thanks": "धन्यवाद",
+    "emails.magicSession.hello": "नमस्ते,",
+    "emails.magicSession.thanks": "धन्यवाद,",
     "emails.magicSession.signature": "{{project}} टीम",
     "emails.recovery.subject": "पासवर्ड रीसेट",
-    "emails.recovery.hello": "नमस्ते {{user}}",
+    "emails.recovery.hello": "नमस्ते {{user}},",
     "emails.recovery.body": "इस लिंक के माध्यम से अपना {{project}} पासवर्ड रीसेट करें।",
     "emails.recovery.footer": "यदि आप अपना पासवर्ड रीसेट नहीं करना चाहते हैं, तो आप इस संदेश को नज़रअंदाज़ कर सकते हैं।",
-    "emails.recovery.thanks": "धन्यवाद",
+    "emails.recovery.thanks": "धन्यवाद,",
+    "emails.recovery.buttonText": "पासवर्ड रीसेट करें",
     "emails.recovery.signature": "{{project}} टीम",
     "emails.invitation.subject": "%s टीम का यहाँ %s पर आमंत्रण",
-    "emails.invitation.hello": "नमस्ते",
+    "emails.invitation.hello": "नमस्ते,",
     "emails.invitation.body": "यह मेल आपको इसलिए भेजा गया है क्योंकि {{owner}} आपको {{team}} टीम का सदस्य बनाना चाहते है, जो {{project}} से जुड़ा हुआ है।",
     "emails.invitation.footer": "यदि आप इसमें रूचि नहीं रखते, तो आप इस संदेश को नज़रअंदाज़ कर सकते हैं।",
-    "emails.invitation.thanks": "धन्यवाद",
+    "emails.invitation.thanks": "धन्यवाद,",
+    "emails.invitation.buttonText": "{{team}} का निमंत्रण स्वीकार करें",
     "emails.invitation.signature": "{{project}} टीम",
     "locale.country.unknown": "अज्ञात",
     "countries.af": "अफ़ग़ानिस्तान",
@@ -245,4 +246,4 @@
     "emails.otpSession.securityPhrase": "इस ईमेल के लिए सुरक्षा वाक्यांश {{phrase}} है। अगर यह वाक्यांश साइन इन के दौरान दिखाए गए वाक्यांश से मेल खाता है, तो आप इस ईमेल पर भरोसा कर सकते हैं।",
     "emails.otpSession.thanks": "धन्यवाद,",
     "emails.otpSession.signature": "{{project}} टीम"
-}
+}

app/config/locale/translations/hr.json

@@ -4,28 +4,29 @@
     "settings.direction": "ltr",
     "emails.sender": "%s Tim",
     "emails.verification.subject": "Verifikacija računa",
-    "emails.verification.hello": "Pozdrav {{user}}",
+    "emails.verification.hello": "Pozdrav {{user}},",
     "emails.verification.body": "Slijedite ovu poveznicu da biste potvrdili svoju adresu e-pošte.",
     "emails.verification.footer": "Ukoliko niste zatražili potvrdu ove adrese, možete zanemariti ovu poruku.",
-    "emails.verification.thanks": "Hvala",
+    "emails.verification.thanks": "Hvala,",
+    "emails.verification.buttonText": "Potvrdi adresu e-pošte",
     "emails.verification.signature": "{{project}} tim",
     "emails.magicSession.subject": "Prijavite se",
-    "emails.magicSession.hello": "Pozdrav",
-    "emails.magicSession.body": "Slijedite ovu poveznicu za prijavu.",
-    "emails.magicSession.footer": "Ako niste zatražili prijavu putem ove e-pošte, možete zanemariti ovu poruku.",
-    "emails.magicSession.thanks": "Hvala",
+    "emails.magicSession.hello": "Pozdrav,",
+    "emails.magicSession.thanks": "Hvala,",
     "emails.magicSession.signature": "{{project}} tim",
     "emails.recovery.subject": "Ponovno postavljanje lozinke",
-    "emails.recovery.hello": "Pozdrav {{user}}",
+    "emails.recovery.hello": "Pozdrav {{user}},",
     "emails.recovery.body": "Slijedite ovu poveznicu za ponovno postavljanje {{project}} lozinke.",
     "emails.recovery.footer": "Ako niste zatražili ponovno postavljanje Vaše lozinke, možete zanemariti ovu poruku.",
-    "emails.recovery.thanks": "Hvala",
+    "emails.recovery.thanks": "Hvala,",
+    "emails.recovery.buttonText": "Resetiraj lozinku",
     "emails.recovery.signature": "{{project}} tim",
     "emails.invitation.subject": "Pozivnica za %s tim na %s",
-    "emails.invitation.hello": "Pozdrav",
+    "emails.invitation.hello": "Pozdrav,",
     "emails.invitation.body": "Ova poruka Vam je poslana jer Vas je {{owner}} htio pozvati da postanete član {{team}} tima na {{project}}.",
     "emails.invitation.footer": "Ukoliko niste zainteresirani, možete zanemariti ovu poruku.",
-    "emails.invitation.thanks": "Hvala",
+    "emails.invitation.thanks": "Hvala,",
+    "emails.invitation.buttonText": "Prihvati pozivnicu za {{team}}",
     "emails.invitation.signature": "{{project}} tim",
     "locale.country.unknown": "Nepoznato",
     "countries.af": "Afganistan",
@@ -245,4 +246,4 @@
     "emails.otpSession.securityPhrase": "Sigurnosna fraza za ovaj e-mail je {{phrase}}. Možete vjerovati ovom e-mailu ako se ova fraza podudara s frazom prikazanom prilikom prijave.",
     "emails.otpSession.thanks": "Hvala,",
     "emails.otpSession.signature": "tim {{project}}"
-}
+}

app/config/locale/translations/hu.json

@@ -4,28 +4,29 @@
     "settings.direction": "ltr",
     "emails.sender": "%s Csapat",
     "emails.verification.subject": "Fiók Megerősítése",
-    "emails.verification.hello": "Szia {{user}}",
+    "emails.verification.hello": "Szia {{user}},",
     "emails.verification.body": "Kattints a linkre, hogy megerősítsd az email címedet.",
     "emails.verification.footer": "Ha nem te kérted a címed megerősítését, akkor nyugodtan hagyd figyelmen kívül ezt az üzenetet.",
-    "emails.verification.thanks": "Köszönettel",
+    "emails.verification.thanks": "Köszönettel,",
+    "emails.verification.buttonText": "E-mail-cím megerősítése",
     "emails.verification.signature": "a {{project}} csapat",
     "emails.magicSession.subject": "Bejelentkezés",
-    "emails.magicSession.hello": "Szia",
-    "emails.magicSession.body": "Kattints a linkre a bejelentkezéshez.",
-    "emails.magicSession.footer": "Ha nem te szerettél volna bejelentkezni ezzel az email címmel, akkor nyugodtan hagyd figyelmen kívül ezt az üzenetet.",
-    "emails.magicSession.thanks": "Köszönettel",
+    "emails.magicSession.hello": "Szia,",
+    "emails.magicSession.thanks": "Köszönettel,",
     "emails.magicSession.signature": "a {{project}} csapat",
     "emails.recovery.subject": "Jelszó Visszaállítása",
-    "emails.recovery.hello": "Hahó, {{user}}",
+    "emails.recovery.hello": "Hahó, {{user}},",
     "emails.recovery.body": "Kattints a linkre a {{project}} jelszavad visszaállításához.",
     "emails.recovery.footer": "Ha nem te kezdeményezted a jelszavad visszaállítását, akkor nyugodtan hagyd figyelmen kívül ezt az üzenetet.",
-    "emails.recovery.thanks": "Köszönettel",
+    "emails.recovery.thanks": "Köszönettel,",
+    "emails.recovery.buttonText": "Jelszó visszaállítása",
     "emails.recovery.signature": "a {{project}} csapat",
     "emails.invitation.subject": "Meghívó a(z) %s csapatba, a(z) %s projektbe",
-    "emails.invitation.hello": "Szia",
+    "emails.invitation.hello": "Szia,",
     "emails.invitation.body": "Ezt a levelet azért kaptad, mert {{owner}} meghívott, hogy légy a {{team}} csapat tagja a {{project}} projektben.",
     "emails.invitation.footer": "Ha nem érdekel a lehetőség, nyugodtan hagyd figyelmen kívül ezt az üzenetet.",
-    "emails.invitation.thanks": "Köszönettel",
+    "emails.invitation.thanks": "Köszönettel,",
+    "emails.invitation.buttonText": "Elfogadni meghívást a {{team}-re",
     "emails.invitation.signature": "a {{project}} csapat",
     "locale.country.unknown": "Ismeretlen",
     "countries.af": "Afganisztán",
@@ -245,4 +246,4 @@
     "emails.otpSession.securityPhrase": "Az e-mailhez tartozó biztonsági kód: {{phrase}}. Ennek az e-mailnek megbízhat, ha a megjelenített kód megegyezik a bejelentkezéskor megjelenő kóddal.",
     "emails.otpSession.thanks": "Köszönöm,",
     "emails.otpSession.signature": "{{project}} csapat"
-}
+}

app/config/locale/translations/hy.json

@@ -4,28 +4,26 @@
     "settings.direction": "ltr",
     "emails.sender": "Թիմ %s",
     "emails.verification.subject": "",
-    "emails.verification.hello": "",
+    "emails.verification.hello": ",",
     "emails.verification.body": "",
     "emails.verification.footer": "",
-    "emails.verification.thanks": "",
+    "emails.verification.thanks": ",",
     "emails.verification.signature": "",
     "emails.magicSession.subject": "",
-    "emails.magicSession.hello": "",
-    "emails.magicSession.body": "",
-    "emails.magicSession.footer": "",
-    "emails.magicSession.thanks": "",
+    "emails.magicSession.hello": ",",
+    "emails.magicSession.thanks": ",",
     "emails.magicSession.signature": "",
     "emails.recovery.subject": "",
-    "emails.recovery.hello": "",
+    "emails.recovery.hello": ",",
     "emails.recovery.body": "",
     "emails.recovery.footer": "",
-    "emails.recovery.thanks": "",
+    "emails.recovery.thanks": ",",
     "emails.recovery.signature": "",
     "emails.invitation.subject": "",
-    "emails.invitation.hello": "",
+    "emails.invitation.hello": ",",
     "emails.invitation.body": "",
     "emails.invitation.footer": "",
-    "emails.invitation.thanks": "",
+    "emails.invitation.thanks": ",",
     "emails.invitation.signature": "",
     "locale.country.unknown": "Անհայտ",
     "countries.af": "Աֆղանստան",
@@ -245,4 +243,4 @@
     "emails.otpSession.securityPhrase": "Այս էլ.փոստի անվտանգության արտահայտությունը {{phrase}} է: Կարող եք վստահել այս էլ.փոստին, եթե այս արտահայտությունը համընկնում է մուտք գործելու պահին տրված արտահայտության հետ։",
     "emails.otpSession.thanks": "Շնորհակալ եմ,",
     "emails.otpSession.signature": "{{project}} թիմ"
-}
+}

app/config/locale/translations/id.json

@@ -4,28 +4,29 @@
     "settings.direction": "ltr",
     "emails.sender": "Tim %s",
     "emails.verification.subject": "Verifikasi Akun",
-    "emails.verification.hello": "Hai {{user}}",
+    "emails.verification.hello": "Hai {{user}},",
     "emails.verification.body": "Ikuti tautan ini untuk memverifikasi alamat email Anda.",
     "emails.verification.footer": "Jika Anda tidak meminta untuk memverifikasi alamat email ini, Anda dapat mengabaikan pesan ini.",
-    "emails.verification.thanks": "Terima kasih",
+    "emails.verification.thanks": "Terima kasih,",
+    "emails.verification.buttonText": "Konfirmasi alamat email",
     "emails.verification.signature": "Tim {{project}}",
     "emails.magicSession.subject": "Masuk",
-    "emails.magicSession.hello": "Hai",
-    "emails.magicSession.body": "Ikuti tautan ini untuk masuk.",
-    "emails.magicSession.footer": "Jika Anda tidak meminta untuk masuk menggunakan email ini, Anda dapat mengabaikan pesan ini.",
-    "emails.magicSession.thanks": "Terima kasih",
+    "emails.magicSession.hello": "Hai,",
+    "emails.magicSession.thanks": "Terima kasih,",
     "emails.magicSession.signature": "Tim {{project}}",
     "emails.recovery.subject": "Atur Ulang Kata Sandi",
-    "emails.recovery.hello": "Halo {{user}}",
+    "emails.recovery.hello": "Halo {{user}},",
     "emails.recovery.body": "Ikuti tautan ini untuk menyetel ulang kata sandi {{project}} Anda.",
     "emails.recovery.footer": "Jika Anda tidak meminta untuk menyetel ulang kata sandi, Anda dapat mengabaikan pesan ini.",
-    "emails.recovery.thanks": "Terima kasih",
+    "emails.recovery.thanks": "Terima kasih,",
+    "emails.recovery.buttonText": "Atur ulang kata sandi",
     "emails.recovery.signature": "Tim {{project}}",
     "emails.invitation.subject": "Undangan ke Tim %s di %s",
-    "emails.invitation.hello": "Halo",
+    "emails.invitation.hello": "Halo,",
     "emails.invitation.body": "Email ini dikirimkan kepada Anda karena {{owner}} ingin mengundang Anda untuk menjadi anggota tim {{team}} di {{project}}.",
     "emails.invitation.footer": "Jika Anda tidak tertarik, Anda dapat mengabaikan pesan ini.",
-    "emails.invitation.thanks": "Terima kasih",
+    "emails.invitation.thanks": "Terima kasih,",
+    "emails.invitation.buttonText": "Terima undangan ke {{team}}",
     "emails.invitation.signature": "Tim {{project}}",
     "locale.country.unknown": "Tidak diketahui",
     "countries.af": "Afganistan",
@@ -245,4 +246,4 @@
     "emails.otpSession.securityPhrase": "Frasa keamanan untuk email ini adalah {{phrase}}. Anda dapat mempercayai email ini jika frasa tersebut cocok dengan frasa yang ditampilkan saat masuk.",
     "emails.otpSession.thanks": "Terima kasih,",
     "emails.otpSession.signature": "tim {{project}}"
-}
+}

app/config/locale/translations/is.json

@@ -4,28 +4,26 @@
     "settings.direction": "ltr",
     "emails.sender": "%s Teymi",
     "emails.verification.subject": "",
-    "emails.verification.hello": "",
+    "emails.verification.hello": ",",
     "emails.verification.body": "",
     "emails.verification.footer": "",
-    "emails.verification.thanks": "",
+    "emails.verification.thanks": ",",
     "emails.verification.signature": "",
     "emails.magicSession.subject": "",
-    "emails.magicSession.hello": "",
-    "emails.magicSession.body": "",
-    "emails.magicSession.footer": "",
-    "emails.magicSession.thanks": "",
+    "emails.magicSession.hello": ",",
+    "emails.magicSession.thanks": ",",
     "emails.magicSession.signature": "",
     "emails.recovery.subject": "",
-    "emails.recovery.hello": "",
+    "emails.recovery.hello": ",",
     "emails.recovery.body": "",
     "emails.recovery.footer": "",
-    "emails.recovery.thanks": "",
+    "emails.recovery.thanks": ",",
     "emails.recovery.signature": "",
     "emails.invitation.subject": "",
-    "emails.invitation.hello": "",
+    "emails.invitation.hello": ",",
     "emails.invitation.body": "",
     "emails.invitation.footer": "",
-    "emails.invitation.thanks": "",
+    "emails.invitation.thanks": ",",
     "emails.invitation.signature": "",
     "locale.country.unknown": "Óþekktur",
     "countries.af": "Afganistan",
@@ -245,4 +243,4 @@
     "emails.otpSession.securityPhrase": "Öryggissetning fyrir þetta tölvupóst er {{phrase}}. Þú getur treyst þessum tölvupósti ef þessi setning passar við setninguna sem birtist við innskráningu.",
     "emails.otpSession.thanks": "Takk,",
     "emails.otpSession.signature": "{{project}} liðið"
-}
+}

app/config/locale/translations/it.json

@@ -4,28 +4,29 @@
     "settings.direction": "ltr",
     "emails.sender": "Team %s",
     "emails.verification.subject": "Verifica account",
-    "emails.verification.hello": "Ciao {{user}}",
+    "emails.verification.hello": "Ciao {{user}},",
     "emails.verification.body": "Clicca questo link per verificare il tuo indirizzo email.",
     "emails.verification.footer": "Se non hai richiesto la verifica dell’indirizzo email, puoi ignorare questo messaggio.",
-    "emails.verification.thanks": "Grazie",
+    "emails.verification.thanks": "Grazie,",
+    "emails.verification.buttonText": "Confermare l'indirizzo email",
     "emails.verification.signature": "Il team {{project}}",
     "emails.magicSession.subject": "Login",
-    "emails.magicSession.hello": "Ciao",
-    "emails.magicSession.body": "Clicca questo link per accedere.",
-    "emails.magicSession.footer": "Se non hai richiesto di effettuare l’accesso, puoi ignorare questo messaggio.",
-    "emails.magicSession.thanks": "Grazie",
+    "emails.magicSession.hello": "Ciao,",
+    "emails.magicSession.thanks": "Grazie,",
     "emails.magicSession.signature": "Il team {{project}}",
     "emails.recovery.subject": "Reimpostazione password",
-    "emails.recovery.hello": "Ciao {{user}}",
+    "emails.recovery.hello": "Ciao {{user}},",
     "emails.recovery.body": "Clicca questo link per reimpostare la tua password di {{project}}.",
     "emails.recovery.footer": "Se non hai richiesto la reimpostazione della password, puoi ignorare questo messaggio.",
-    "emails.recovery.thanks": "Grazie",
+    "emails.recovery.thanks": "Grazie,",
+    "emails.recovery.buttonText": "Reimposta password",
     "emails.recovery.signature": "Il team {{project}}",
     "emails.invitation.subject": "Invito al Team %s per %s",
-    "emails.invitation.hello": "Ciao",
+    "emails.invitation.hello": "Ciao,",
     "emails.invitation.body": "Hai ricevuto questa email perché {{owner}} ti ha invitato a diventare un membro del team {{team}} di {{project}}.",
     "emails.invitation.footer": "Ignora questo messaggio se non sei interessatə.",
-    "emails.invitation.thanks": "Grazie",
+    "emails.invitation.thanks": "Grazie,",
+    "emails.invitation.buttonText": "Accetta invito a {{team}}",
     "emails.invitation.signature": "Il team {{project}}",
     "locale.country.unknown": "Sconosciuto",
     "countries.af": "Afghanistan",
@@ -245,4 +246,4 @@
     "emails.otpSession.securityPhrase": "La frase di sicurezza per questa email è {{phrase}}. Puoi fidarti di questa email se questa frase corrisponde alla frase mostrata durante l'accesso.",
     "emails.otpSession.thanks": "Grazie,",
     "emails.otpSession.signature": "team {{project}}"
-}
+}

app/config/locale/translations/ja.json

@@ -4,28 +4,29 @@
     "settings.direction": "ltr",
     "emails.sender": "%s チーム",
     "emails.verification.subject": "アカウント認証",
-    "emails.verification.hello": "こんにちは{{user}}さん",
+    "emails.verification.hello": "こんにちは{{user}}さん、",
     "emails.verification.body": "メールアドレスを有効化するためには下記リンクをクリックして下さい。",
     "emails.verification.footer": "このメールに心当たりが無い場合は破棄をお願いいたします。",
-    "emails.verification.thanks": "ご利用いただきありがとうございます。",
+    "emails.verification.thanks": "ご利用いただきありがとうございます。、",
+    "emails.verification.buttonText": "メールアドレスを確認する",
     "emails.verification.signature": "{{project}}チーム",
     "emails.magicSession.subject": "ログイン",
-    "emails.magicSession.hello": "こんにちは",
-    "emails.magicSession.body": "ログインするためには下記リンクをクリックしてください。",
-    "emails.magicSession.footer": "このメールに心当たりが無い場合は破棄をお願いいたします。",
-    "emails.magicSession.thanks": "ご利用いただきありがとうございます。",
+    "emails.magicSession.hello": "こんにちは、",
+    "emails.magicSession.thanks": "ご利用いただきありがとうございます。、",
     "emails.magicSession.signature": "{{project}}チーム",
     "emails.recovery.subject": "パスワードリセット",
-    "emails.recovery.hello": "こんにちは{{user}}さん",
+    "emails.recovery.hello": "こんにちは{{user}}さん、",
     "emails.recovery.body": "パスワードをリセットするためには下記リンクをクリックしてください。",
     "emails.recovery.footer": "このメールに心当たりが無い場合は破棄をお願いいたします。",
-    "emails.recovery.thanks": "ご利用いただきありがとうございます。",
+    "emails.recovery.thanks": "ご利用いただきありがとうございます。、",
+    "emails.recovery.buttonText": "パスワードをリセット",
     "emails.recovery.signature": "{{project}}チーム",
     "emails.invitation.subject": "%sチームへの招待が%sから来ました。",
-    "emails.invitation.hello": "こんにちは",
+    "emails.invitation.hello": "こんにちは、",
     "emails.invitation.body": "{{owner}}さんが{{project}}の{{team}}チームにあなたを招待しています。",
     "emails.invitation.footer": "このメールに心当たりが無い場合は破棄をお願いいたします。",
-    "emails.invitation.thanks": "ご利用いただきありがとうございます。",
+    "emails.invitation.thanks": "ご利用いただきありがとうございます。、",
+    "emails.invitation.buttonText": "{{team}}への招待を承諾する",
     "emails.invitation.signature": "{{project}}チーム",
     "locale.country.unknown": "不明",
     "countries.af": "アフガニスタン",
@@ -239,10 +240,10 @@
     "emails.magicSession.securityPhrase": "このメールのセキュリティフレーズは{{phrase}}です。サインイン時に表示されたフレーズと一致する場合、このメールは信頼できます。",
     "emails.magicSession.optionUrl": "上記のボタンを使用してサインインすることができない場合は、次のリンクにアクセスしてください：",
     "emails.otpSession.subject": "プロジェクト ログイン",
-    "emails.otpSession.hello": "こんにちは。",
+    "emails.otpSession.hello": "こんにちは。、",
     "emails.otpSession.description": "以下の確認コードを入力して、{{project}}アカウントに安全にサインインしてください。このコードは15分後に失効します。",
     "emails.otpSession.clientInfo": "このサインインは、{{agentClient}} を使い {{agentDevice}} {{agentOs}} で要求されました。サインインを要求していない場合、このメールを無視しても安全です。",
     "emails.otpSession.securityPhrase": "このメールのセキュリティフレーズは{{phrase}}です。サインイン時に表示されたフレーズと一致する場合、このメールを信頼できます。",
-    "emails.otpSession.thanks": "ありがとうございます。",
+    "emails.otpSession.thanks": "ありがとうございます。、",
     "emails.otpSession.signature": "{{project}} チーム"
-}
+}

app/config/locale/translations/jv.json

@@ -4,28 +4,29 @@
     "settings.direction": "ltr",
     "emails.sender": "Tim %s",
     "emails.verification.subject": "Verifikasi Akun",
-    "emails.verification.hello": "Hai {{user}}",
+    "emails.verification.hello": "Hai {{user}},",
     "emails.verification.body": "Klik link iki kanggo verifikasi alamat email sampeyan.",
     "emails.verification.footer": "Yen sampeyan ora njaluk verifikasi alamat iki, sampeyan iso nglirwakake pesen iki.",
-    "emails.verification.thanks": "Matur nuwun",
+    "emails.verification.thanks": "Matur nuwun,",
+    "emails.verification.buttonText": "Konfirmasi alamat email",
     "emails.verification.signature": "Tim {{project}}",
     "emails.magicSession.subject": "Masuk",
-    "emails.magicSession.hello": "Hai",
-    "emails.magicSession.body": "Klik link iki kanggo masuk.",
-    "emails.magicSession.footer": "Yen sampeyan ora njaluk masuk nggunakake alamat email iki, sampeyan iso nglirwakake pesen iki.",
-    "emails.magicSession.thanks": "Matur nuwun",
+    "emails.magicSession.hello": "Hai,",
+    "emails.magicSession.thanks": "Matur nuwun,",
     "emails.magicSession.signature": "Tim {{project}}",
     "emails.recovery.subject": "Setel ulang sandi",
-    "emails.recovery.hello": "Halo {{user}}",
+    "emails.recovery.hello": "Halo {{user}},",
     "emails.recovery.body": "Klik link iki kanggo setel ulang sandi {{project}}.",
     "emails.recovery.footer": "Yen sampeyan ora njaluk setel ulang sandi, sampeyan iso nglirwakake pesen iki.",
-    "emails.recovery.thanks": "Matur nuwun",
+    "emails.recovery.thanks": "Matur nuwun,",
+    "emails.recovery.buttonText": "Reset sandhi",
     "emails.recovery.signature": "Tim {{project}}",
     "emails.invitation.subject": "Undangan ke Tim %s di %s",
-    "emails.invitation.hello": "Halo",
+    "emails.invitation.hello": "Halo,",
     "emails.invitation.body": "Email iki dikirim menyang sampeyan amarga {{owner}} pengin ngajak sampeyan dadi anggota tim {{team}} di {{project}}.",
     "emails.invitation.footer": "Yen sampeyan ora tertarik, sampeyan iso nglirwakake pesen iki.",
-    "emails.invitation.thanks": "Matur nuwun",
+    "emails.invitation.thanks": "Matur nuwun,",
+    "emails.invitation.buttonText": "Tampa undhangan menyang {{team}}",
     "emails.invitation.signature": "Tim {{project}}",
     "locale.country.unknown": "Ora dingerteni",
     "countries.af": "Afghanistan",
@@ -245,4 +246,4 @@
     "emails.otpSession.securityPhrase": "Tembung keamanan kanggo email iki yaiku {{phrase}}. Sampeyan bisa percaya email iki menawa tembung kasebut cocog karo tembung sing ditampilake nalika mlebu.",
     "emails.otpSession.thanks": "Matur nuwun,",
     "emails.otpSession.signature": "tim {{project}}"
-}
+}

app/config/locale/translations/km.json

@@ -11,8 +11,6 @@
     "emails.verification.signature": "",
     "emails.magicSession.subject": "",
     "emails.magicSession.hello": "",
-    "emails.magicSession.body": "",
-    "emails.magicSession.footer": "",
     "emails.magicSession.thanks": "",
     "emails.magicSession.signature": "",
     "emails.recovery.subject": "",
@@ -239,10 +237,10 @@
     "emails.magicSession.securityPhrase": "ឃ្លាសម្ងាត់សម្រាប់អ៊ីមែលនេះគឺ {{phrase}}។ អ្នកអាចទុកចិត្តលើអ៊ីមែលនេះប្រសិនបើឃ្លានេះត្រូវគ្នាជាមួយឃ្លាដែលបង្ហាញឡើងពេលចូលប្រើ។",
     "emails.magicSession.optionUrl": "ប្រសិនបើអ្នកមិនអាចចូលប្រើប្រាស់ដោយប្រើប៊ូតុងខាងលើនេះទេ សូមចូលទៅកាន់តំណភ្ជាប់ខាងក្រោម៖",
     "emails.otpSession.subject": "ការចូល {{project}}",
-    "emails.otpSession.hello": "ជំរាបសួរ,",
+    "emails.otpSession.hello": "ជំរាបសួរ",
     "emails.otpSession.description": "បញ្ចូលលេខកូដផ្ទៀងផ្ទាត់ខាងក្រោមនេះនៅពេលដែលបានស្នើ ដើម្បីចូលទៅកាន់គណនី {{project}} របស់អ្នកដោយមានសុវត្ថិភាព។ វានឹងផុតកំណត់ក្នុងរយៈពេល 15 នាទី។",
     "emails.otpSession.clientInfo": "ការចូលប្រព័ន្ធនេះត្រូវបានស្នើរបស់អ្នកប្រើប្រាស់តាមរយៈ {{agentClient}} នៅលើ {{agentDevice}} {{agentOs}}។ ប្រសិនបើអ្នកមិនបានស្នើរការចូលប្រព័ន្ធនេះទេ អ្នកអាចមិនអើពើអ៊ីម៉ែលនេះបាន។",
     "emails.otpSession.securityPhrase": "ឃ្លាសម្រាប់សុវត្ថិភាពអ៊ីមែលនេះគឺ {{phrase}}។ អ្នកអាចទុកចិត្តនូវអ៊ីមែលនេះប្រសិនបើឃ្លានេះត្រូវគ្នាជាមួយឃ្លាដែលបានបង្ហាញពេលចូលគណនី។",
-    "emails.otpSession.thanks": "អរគុណ,",
+    "emails.otpSession.thanks": "អរគុណ",
     "emails.otpSession.signature": "ក្រុម {{project}}"
-}
+}

app/config/locale/translations/kn.json

@@ -4,28 +4,29 @@
     "settings.direction": "ltr",
     "emails.sender": "%s ತಂಡ",
     "emails.verification.subject": "ಖಾತೆ ಪರಿಶೀಲನೆ",
-    "emails.verification.hello": "ನಮಸ್ಕಾರ {{user}}",
+    "emails.verification.hello": "ನಮಸ್ಕಾರ {{user}},",
     "emails.verification.body": "ನಿಮ್ಮ ಇಮೇಲ್ ವಿಳಾಸ ಪರಿಶೀಲನೆಗೆ ಈ ಲಿಂಕನ್ನು ಅನುಸರಿಸಿ",
     "emails.verification.footer": "ನೀವು ಇಮೇಲ್ ವಿಳಾಸ ಪರಿಶೀಲನೆಗೆ ಕೇಳದಿದ್ದರೆ, ಈ ಸಂದೇಶವನ್ನು ನಿರ್ಲಕ್ಷಿಸಿ",
-    "emails.verification.thanks": "ಧನ್ಯವಾದಗಳು",
+    "emails.verification.thanks": "ಧನ್ಯವಾದಗಳು,",
+    "emails.verification.buttonText": "ಇಮೇಲ್ ವಿಳಾಸವನ್ನು ದೃಢೀಕರಿಸಿ",
     "emails.verification.signature": "{{project}} ತಂಡ",
     "emails.magicSession.subject": "ಲಾಗಿನ್",
-    "emails.magicSession.hello": "ನಮಸ್ಕಾರ",
-    "emails.magicSession.body": "ಲಾಗಿನ್ ಮಾಡಲಿಕ್ಕೆ ಈ ಲಿಂಕನ್ನು ಅನುಸರಿಸಿ",
-    "emails.magicSession.footer": "ನೀವು ಈ ಇಮೇಲನಿಂದ ಲಾಗಿನ್ ಮಾಡಲು ಕೇಳದಿದ್ದರೆ, ಈ ಸಂದೇಶವನ್ನು ನಿರ್ಲಕ್ಷಿಸಿ",
-    "emails.magicSession.thanks": "ಧನ್ಯವಾದಗಳು",
+    "emails.magicSession.hello": "ನಮಸ್ಕಾರ,",
+    "emails.magicSession.thanks": "ಧನ್ಯವಾದಗಳು,",
     "emails.magicSession.signature": "{{project}} ತಂಡ",
     "emails.recovery.subject": "ಗುಪ್ತಪದ ಮರುಹೊಂದಿಸಿ",
-    "emails.recovery.hello": "ನಮಸ್ಕಾರ {{user}}",
+    "emails.recovery.hello": "ನಮಸ್ಕಾರ {{user}},",
     "emails.recovery.body": "ನಿಮ್ಮ {{project}} ಗುಪ್ತಪದವನ್ನು ಮರುಹೊಂದಿಸಲು ಈ ಲಿಂಕನ್ನು ಅನುಸರಿಸಿ",
     "emails.recovery.footer": "ನೀವು ಗುಪ್ತಪದವನ್ನು ಮರುಹೊಂದಿಸಲು ಕೇಳದಿದ್ದರೆ, ಈ ಸಂದೇಶವನ್ನು ನಿರ್ಲಕ್ಷಿಸಿ",
-    "emails.recovery.thanks": "ಧನ್ಯವಾದಗಳು",
+    "emails.recovery.thanks": "ಧನ್ಯವಾದಗಳು,",
+    "emails.recovery.buttonText": "ಗುಪ್ತಪದವನ್ನು ಮರುಸೆಟ್ ಮಾಡಿ",
     "emails.recovery.signature": "{{project}} ತಂಡ",
     "emails.invitation.subject": "%s ತಂಡಕ್ಕೆ %s ರಲ್ಲಿ ಆಹ್ವಾನ",
-    "emails.invitation.hello": "ನಮಸ್ಕಾರ",
+    "emails.invitation.hello": "ನಮಸ್ಕಾರ,",
     "emails.invitation.body": "ಈ ಇಮೇಲ್ ನಿಮಗೆ ಬಂದಿದೆ ಏಕೆಂದರೆ {{owner}} ನಿಮ್ಮನ್ನು {{team}} ತಂಡದ {{project}}ರಲ್ಲಿ ಸದಸ್ಯ ಆಗಲಿಕ್ಕೆ ಆಹ್ವಾನಿಸಿದ್ದಾರೆ",
     "emails.invitation.footer": "ನಿಮಗೆ ಆಸಕ್ತಿಯಿಲ್ಲದಿದ್ದರೆ, ಈ ಸಂದೇಶವನ್ನು ನಿರ್ಲಕ್ಷಿಸಿ",
-    "emails.invitation.thanks": "ಧನ್ಯವಾದಗಳು",
+    "emails.invitation.thanks": "ಧನ್ಯವಾದಗಳು,",
+    "emails.invitation.buttonText": "{{team}} ಗೆ ಆಹ್ವಾನವನ್ನು ಸ್ವೀಕರಿಸಿ",
     "emails.invitation.signature": "{{project}} ತಂಡ",
     "locale.country.unknown": "Unknown",
     "countries.af": "ಅಫ್ಘಾನಿಸ್ತಾನ",
@@ -245,4 +246,4 @@
     "emails.otpSession.securityPhrase": "ಈ ಇಮೇಲ್‌ಗೆ ಭದ್ರತಾ ಪದವು {{phrase}}. ನೀವು ಸೈನ್ ಇನ್ ಮಾಡುವಾಗ ತೋರಿಸಿದ ಪದವು ಇದರೊಂದಿಗೆ ಹೊಂದಿಕೊಂಡರೆ ಈ ಇಮೇಲನ್ನು ನೀವು ನಂಬಬಹುದು.",
     "emails.otpSession.thanks": "ಧನ್ಯವಾದಗಳು,",
     "emails.otpSession.signature": "ಪ್ರಾಜೆಕ್ಟ್ ತಂಡ"
-}
+}

app/config/locale/translations/ko.json

@@ -4,28 +4,29 @@
     "settings.direction": "ltr",
     "emails.sender": "%s 팀",
     "emails.verification.subject": "계정 인증",
-    "emails.verification.hello": "안녕하세요 {{user}}님",
+    "emails.verification.hello": "안녕하세요 {{user}}님、",
     "emails.verification.body": "이메일 인증을 위해 링크를 클릭하여주세요.",
     "emails.verification.footer": "이메일 인증을 부탁하지 않으셨다면 이 메시지를 무시하여주세요.",
-    "emails.verification.thanks": "감사합니다",
+    "emails.verification.thanks": "감사합니다、",
+    "emails.verification.buttonText": "이메일 주소를 확인합니다",
     "emails.verification.signature": "{{project}} 팀",
     "emails.magicSession.subject": "로그인",
-    "emails.magicSession.hello": "안녕하세요",
-    "emails.magicSession.body": "로그인 하시려면 링크를 클릭하여주세요.",
-    "emails.magicSession.footer": "이 이메일 계정으로 로그인 신청을 하지 않으셨다면 이 메세지를 무시하여주세요.",
-    "emails.magicSession.thanks": "감사합니다",
+    "emails.magicSession.hello": "안녕하세요、",
+    "emails.magicSession.thanks": "감사합니다、",
     "emails.magicSession.signature": "{{project}} 팀",
     "emails.recovery.subject": "비밀번호 재설정",
-    "emails.recovery.hello": "안녕하세요 {{user}}님",
+    "emails.recovery.hello": "안녕하세요 {{user}}님、",
     "emails.recovery.body": "{{project}}의 비밀번호 재설정을 위해 링크를 클릭하여주세요.",
     "emails.recovery.footer": "비밀번호 재설정 신청을 하지 않으셨다면 이 메세지를 무시하여주세요.",
-    "emails.recovery.thanks": "감사합니다",
+    "emails.recovery.thanks": "감사합니다、",
+    "emails.recovery.buttonText": "비밀번호 재설정",
     "emails.recovery.signature": "{{project}} 팀",
     "emails.invitation.subject": "초대장 %s 팀 - %s",
-    "emails.invitation.hello": "안녕하세요",
+    "emails.invitation.hello": "안녕하세요、",
     "emails.invitation.body": "{{owner}}님이 귀하를 {{project}}의 {{team}} 팀으로 초대합니다.",
     "emails.invitation.footer": "팀에 합류할 의사가 없으시면 이 메세지를 무시하여주세요.",
-    "emails.invitation.thanks": "감사합니다",
+    "emails.invitation.thanks": "감사합니다、",
+    "emails.invitation.buttonText": "{{team}} 초대를 수락하기",
     "emails.invitation.signature": "{{project}} 팀",
     "locale.country.unknown": "알려지지 않은",
     "countries.af": "아프가니스탄",
@@ -239,10 +240,10 @@
     "emails.magicSession.securityPhrase": "이 이메일의 보안 구절은 {{phrase}}입니다. 로그인할 때 표시되는 구절과 일치한다면 이 이메일을 신뢰할 수 있습니다.",
     "emails.magicSession.optionUrl": "위의 버튼을 사용하여 로그인할 수 없다면, 다음 링크를 방문해 주세요:",
     "emails.otpSession.subject": "{{project}} 로그인",
-    "emails.otpSession.hello": "안녕하세요,",
+    "emails.otpSession.hello": "안녕하세요、",
     "emails.otpSession.description": "다음 인증 코드를 입력하면 보안을 유지하며 {{project}} 계정에 안전하게 로그인할 수 있습니다. 15분 후에 만료됩니다.",
     "emails.otpSession.clientInfo": "이 로그인은 {{agentClient}}을 사용하여 {{agentDevice}} {{agentOs}}에서 요청되었습니다. 로그인을 요청하지 않았다면, 이 이메일을 안심하고 무시하셔도 됩니다.",
     "emails.otpSession.securityPhrase": "이 이메일의 보안 구절은 {{phrase}}입니다. 로그인하는 동안 표시된 구절과 이 구절이 일치하면 이 이메일을 신뢰할 수 있습니다.",
-    "emails.otpSession.thanks": "감사합니다,",
+    "emails.otpSession.thanks": "감사합니다、",
     "emails.otpSession.signature": "{{project}} 팀"
-}
+}

app/config/locale/translations/la.json

@@ -4,28 +4,29 @@
     "settings.direction": "ltr*",
     "emails.sender": "%s team",
     "emails.verification.subject": "Ratio comprobatio",
-    "emails.verification.hello": "Salve ibi {{user}}",
+    "emails.verification.hello": "Salve ibi {{user}},",
     "emails.verification.body": "Sequere hanc nexum ut quin inscriptionem tuum.",
     "emails.verification.footer": "Si verificationem huius inscriptionis non postulasti, nuntium hunc ignorare potes.",
-    "emails.verification.thanks": "Gratias",
+    "emails.verification.thanks": "Gratias,",
+    "emails.verification.buttonText": "Confirma inscriptionem electronicam",
     "emails.verification.signature": "{{project}} Team",
     "emails.magicSession.subject": "Log in",
-    "emails.magicSession.hello": "Salve ibi",
-    "emails.magicSession.body": "Hanc nexum cum login",
-    "emails.magicSession.footer": "Si verificationem huius inscriptionis non postulasti, nuntium hunc ignorare potes.",
-    "emails.magicSession.thanks": "Gratias",
+    "emails.magicSession.hello": "Salve ibi,",
+    "emails.magicSession.thanks": "Gratias,",
     "emails.magicSession.signature": "{{project}} team",
     "emails.recovery.subject": "Recuperet password",
-    "emails.recovery.hello": "Salve ibi {{user}}",
+    "emails.recovery.hello": "Salve ibi {{user}},",
     "emails.recovery.body": "Sequere hanc conjunctionem ut recipias project password {{project}}",
     "emails.recovery.footer": "Si tesseram tuam recuperare non petis, nuntium hunc ignorare potes",
-    "emails.recovery.thanks": "Gratias",
+    "emails.recovery.thanks": "Gratias,",
+    "emails.recovery.buttonText": "Reset password",
     "emails.recovery.signature": "{{project}} team",
     "emails.invitation.subject": "Invitatio pro %s in quadrigis %s",
-    "emails.invitation.hello": "Salve ibi",
+    "emails.invitation.hello": "Salve ibi,",
     "emails.invitation.body": "Haec inscriptio ad te missa est quia dominus incepto {{owner}} te invitare vult ut membrum {{team}} quadrigis fias ad {{project}}",
     "emails.invitation.footer": "Si non quaero, potes hunc nuntium ignorare",
-    "emails.invitation.thanks": "Gratias",
+    "emails.invitation.thanks": "Gratias,",
+    "emails.invitation.buttonText": "Accipe invitare ad {{team}}",
     "emails.invitation.signature": "{{project}} team",
     "locale.country.unknown": "Ignotum",
     "countries.af": "Afghanistan",
@@ -245,10 +246,10 @@
     "emails.otpSession.thanks": "Gratias,",
     "emails.otpSession.signature": "{{project}} team -> {{project}} grex",
     "emails.certificate.subject": "Defectio testimonii pro %s",
-    "emails.certificate.hello": "Salve",
+    "emails.certificate.hello": "Salve,",
     "emails.certificate.body": "Certificatum pro dominio tuo '{{domain}}' generari non potuit. Hoc conatus num. {{attempt}} est, et defectus causatus est ab: {{error}}",
     "emails.certificate.footer": "Praeclarum tuum testificationem valet ad XXX dies a primo defectu. Magnopere suademus ut hoc casum investiges, alioquin dominium tuum sine valida SSL communicatione erit.",
-    "emails.certificate.thanks": "Gratias",
+    "emails.certificate.thanks": "Gratias,",
     "emails.certificate.signature": "team {{project}}",
     "sms.verification.body": "{{secret}}"
 }

app/config/locale/translations/lb.json

@@ -4,28 +4,29 @@
     "settings.direction": "ltr",
     "emails.sender": "%s Team",
     "emails.verification.subject": "Kont Verifikatioun",
-    "emails.verification.hello": "Hey {{user}}",
+    "emails.verification.hello": "Hey {{user}},",
     "emails.verification.body": "Follegt dëse Link fir Är E -Mail Adress z'iwwerpréiwen.",
     "emails.verification.footer": "Wann Dir net gefrot hutt dës Adress z'iwwerpréiwen, kënnt Dir dëse Message ignoréieren.",
-    "emails.verification.thanks": "Merci",
+    "emails.verification.thanks": "Merci,",
+    "emails.verification.buttonText": "E-Mail-Adress bestätegen",
     "emails.verification.signature": "{{project}} équipe",
     "emails.magicSession.subject": "Login",
-    "emails.magicSession.hello": "Hey",
-    "emails.magicSession.body": "Follegt dëse Link fir umellen.",
-    "emails.magicSession.footer": "Wann Dir net gefrot hutt Iech mat dëser E -Mail anzemelden, kënnt Dir dëse Message ignoréieren.",
-    "emails.magicSession.thanks": "Merci",
+    "emails.magicSession.hello": "Hey,",
+    "emails.magicSession.thanks": "Merci,",
     "emails.magicSession.signature": "{{project}} équipe",
     "emails.recovery.subject": "Password Reset",
-    "emails.recovery.hello": "Hello {{user}}",
+    "emails.recovery.hello": "Hello {{user}},",
     "emails.recovery.body": "Follegt dëse Link fir Äert {{project}} Passwuert zréckzesetzen.",
     "emails.recovery.footer": "Wann Dir net gefrot hutt Äert Passwuert zréckzesetzen, kënnt Dir dëse Message ignoréieren.",
-    "emails.recovery.thanks": "Merci",
+    "emails.recovery.thanks": "Merci,",
+    "emails.recovery.buttonText": "Passwuert zrécksetzen",
     "emails.recovery.signature": "{{project}} équipe",
     "emails.invitation.subject": "Invitatioun un %s équipe bei %s",
-    "emails.invitation.hello": "Hallo",
+    "emails.invitation.hello": "Hallo,",
     "emails.invitation.body": "Dës E -Mail gouf un Iech geschéckt well {{owner}} Iech invitéiere wëllt fir Member vum {{team}} Team bei {{project}} ze ginn.",
     "emails.invitation.footer": "Wann Dir net interesséiert sidd, kënnt Dir dëse Message ignoréieren.",
-    "emails.invitation.thanks": "Merci",
+    "emails.invitation.thanks": "Merci,",
+    "emails.invitation.buttonText": "Invitatioun bei {{team}} akzeptéieren",
     "emails.invitation.signature": "{{project}} équipe",
     "locale.country.unknown": "Onbekannt",
     "countries.af": "Afghanistan",
@@ -244,4 +245,4 @@
     "emails.otpSession.securityPhrase": "D'Sécherheetsausso fir dësen E-Mail ass {{phrase}}. Dir kënnt dësem E-Mail vertrauen, wann dës Ausso mat der Ausso iwwereneestëmmt, déi beim Umellen gewise ginn ass.",
     "emails.otpSession.thanks": "Merci,",
     "emails.otpSession.signature": "{{project}} Equipe"
-}
+}

app/config/locale/translations/lt.json

@@ -4,28 +4,29 @@
     "settings.direction": "ltr",
     "emails.sender": "%s komanda",
     "emails.verification.subject": "Paskyros Patvirtinimas",
-    "emails.verification.hello": "Labas {{user}}",
+    "emails.verification.hello": "Labas {{user}},",
     "emails.verification.body": "Spauskite šią nuorodą, kad patvirtintumėte savo el. paštą.",
     "emails.verification.footer": "Jei neprašėte patvirtinti šio el. pašto, galite ignoruoti šį pranešimą.",
-    "emails.verification.thanks": "Ačiū",
+    "emails.verification.thanks": "Ačiū,",
+    "emails.verification.buttonText": "Patvirtinti el. pašto adresą",
     "emails.verification.signature": "{{project}} komanda",
     "emails.magicSession.subject": "Prisijungti",
-    "emails.magicSession.hello": "Labas",
-    "emails.magicSession.body": "Spauskite šią nuorodą, kad prisijungtumėte.",
-    "emails.magicSession.footer": "Jei neprašėte prisijungti naudojantis šiuo el. paštu, galite ignoruoti šį pranešimą.",
-    "emails.magicSession.thanks": "Ačiū",
+    "emails.magicSession.hello": "Labas,",
+    "emails.magicSession.thanks": "Ačiū,",
     "emails.magicSession.signature": "{{project}} komanda",
     "emails.recovery.subject": "Slaptažodžio Atkūrimas",
-    "emails.recovery.hello": "Labas {{user}}",
+    "emails.recovery.hello": "Labas {{user}},",
     "emails.recovery.body": "Spauskite šią nuorodą, kad atkurtumėte projekto {{project}} slaptažodį.",
     "emails.recovery.footer": "Jei neprašėte atkurti savo slaptažodzio, galite ignoruoti šį pranešimą.",
-    "emails.recovery.thanks": "Ačiū",
+    "emails.recovery.thanks": "Ačiū,",
+    "emails.recovery.buttonText": "Atstatyti slaptažodį",
     "emails.recovery.signature": "{{project}} komanda",
     "emails.invitation.subject": "Pakvietimas į %s komandą %s projekte",
-    "emails.invitation.hello": "Labas",
+    "emails.invitation.hello": "Labas,",
     "emails.invitation.body": "Šis el. laiškas buvo atsiųstas jums, nes {{owner}} norėjo jus pakviesti tapti projekto {{project}} dalimi {{team}} komandoje.",
     "emails.invitation.footer": "Jei jūsų tai nedomina, galite ignoruoti šį pranešimą.",
-    "emails.invitation.thanks": "Ačiū",
+    "emails.invitation.thanks": "Ačiū,",
+    "emails.invitation.buttonText": "Priimti kvietimą į {{team}}",
     "emails.invitation.signature": "{{project}} komanda",
     "locale.country.unknown": "Nežinoma",
     "countries.af": "Afganistanas",
@@ -245,4 +246,4 @@
     "emails.otpSession.securityPhrase": "Šio el. laiško saugumo frazė yra {{phrase}}. Galite pasitikėti šiuo el. laišku, jei ši frazė atitinka frazę, rodytą prisijungimo metu.",
     "emails.otpSession.thanks": "Ačiū,",
     "emails.otpSession.signature": "{{project}} komanda"
-}
+}

app/config/locale/translations/lv.json

@@ -4,28 +4,29 @@
     "settings.direction": "ltr",
     "emails.sender": "%s komanda",
     "emails.verification.subject": "Konta verifikācija",
-    "emails.verification.hello": "Sveicināti, {{user}}",
+    "emails.verification.hello": "Sveicināti, {{user}},",
     "emails.verification.body": "Sekojiet saitei, lai apstiprinātu savu e-pasta adresi.",
     "emails.verification.footer": "Ja Jūs nepieprasījāt šīs adreses apstiprinājumu, lūdzu, ignorējiet šo ziņu.",
-    "emails.verification.thanks": "Paldies",
+    "emails.verification.thanks": "Paldies,",
+    "emails.verification.buttonText": "Apstiprināt e-pasta adresi",
     "emails.verification.signature": "{{project}} komanda",
     "emails.magicSession.subject": "Ieiet",
-    "emails.magicSession.hello": "Sveicināti",
-    "emails.magicSession.body": "Sekojiet saitei, lai ieietu.",
-    "emails.magicSession.footer": "Ja Jūs nepieprasījāt ieiet ar šo e-pasta adresi, lūdzu, ignorējiet šo ziņu.",
-    "emails.magicSession.thanks": "Paldies",
+    "emails.magicSession.hello": "Sveicināti,",
+    "emails.magicSession.thanks": "Paldies,",
     "emails.magicSession.signature": "{{project}} komanda",
     "emails.recovery.subject": "Paroles atjaunināšana",
-    "emails.recovery.hello": "Labdien, {{user}}",
+    "emails.recovery.hello": "Labdien, {{user}},",
     "emails.recovery.body": "Sekojiet saitei, lai atjauninātu {{project}} paroli.",
     "emails.recovery.footer": "Ja Jūs nepieprasījāt paroles atjaunināšanu, lūdzu, ignorējiet šo ziņu.",
-    "emails.recovery.thanks": "Paldies",
+    "emails.recovery.thanks": "Paldies,",
+    "emails.recovery.buttonText": "Atiestatīt paroli",
     "emails.recovery.signature": "{{project}} komanda",
     "emails.invitation.subject": "Ielūgums piebiedroties %s komandai %s projektā.",
-    "emails.invitation.hello": "Labdien",
+    "emails.invitation.hello": "Labdien,",
     "emails.invitation.body": "Šis e-pasts tika nosūtīts Jums, jo {{owner}} vēlējās Jūs ielūgt kļūt par {{team}} komandas biedru {{project}} projektā.",
     "emails.invitation.footer": "Ja Jūs neesat ieinteresēts, lūdzu, ignorējiet šo ziņu.",
-    "emails.invitation.thanks": "Paldies",
+    "emails.invitation.thanks": "Paldies,",
+    "emails.invitation.buttonText": "Pieņemt ielūgumu uz {{team}}",
     "emails.invitation.signature": "{{project}} komanda",
     "locale.country.unknown": "Nav zināms",
     "countries.af": "Afganistāna",
@@ -245,4 +246,4 @@
     "emails.otpSession.securityPhrase": "Drošības frāze šim e-pastam ir {{phrase}}. Šim e-pastam var uzticēties, ja šī frāze sakrīt ar frāzi, kas parādīta pieslēdzoties.",
     "emails.otpSession.thanks": "Paldies,",
     "emails.otpSession.signature": "{{project}} komanda"
-}
+}

app/config/locale/translations/ml.json

@@ -4,28 +4,29 @@
     "settings.direction": "ltr",
     "emails.sender": "%s ടീം",
     "emails.verification.subject": "അക്കൗണ്ട് സ്ഥിരീകരണം",
-    "emails.verification.hello": "നമസ്കാരം {{user}}",
+    "emails.verification.hello": "നമസ്കാരം {{user}},",
     "emails.verification.body": "നിങ്ങളുടെ ഇമെയിൽ വിലാസം സ്ഥിരീകരിക്കുന്നതിനായി ഈ ലിങ്ക് പിന്തുടരുക.",
     "emails.verification.footer": "ഈ വിലാസം സ്ഥിരീകരിക്കാന്‍ നിങ്ങൾ ആവശ്യപ്പെട്ടില്ലെങ്കിൽ, നിങ്ങൾക്ക് ഈ സന്ദേശം അവഗണിക്കാവുന്നതാണ്.",
-    "emails.verification.thanks": "നന്ദി",
+    "emails.verification.thanks": "നന്ദി,",
+    "emails.verification.buttonText": "ഇമെയിൽ വിലാസം സ്ഥിരീകരിക്കുക",
     "emails.verification.signature": "{{project}} ടീം",
     "emails.magicSession.subject": "ലോഗിൻ",
-    "emails.magicSession.hello": "നമസ്കാരം",
-    "emails.magicSession.body": "ലോഗിൻ ചെയ്യുന്നതിനായി ഈ ലിങ്ക് പിന്തുടരുക.",
-    "emails.magicSession.footer": "ഈ ഇമെയിൽ ഉപയോഗിച്ച് ലോഗിൻ ചെയ്യാൻ നിങ്ങൾ ആവശ്യപ്പെട്ടില്ലെങ്കിൽ, ഈ സന്ദേശം അവഗണിക്കാവുന്നതാണ്.",
-    "emails.magicSession.thanks": "നന്ദി",
+    "emails.magicSession.hello": "നമസ്കാരം,",
+    "emails.magicSession.thanks": "നന്ദി,",
     "emails.magicSession.signature": "{{project}} ടീം",
     "emails.recovery.subject": "രഹസ്യവാക്ക് പുനക്രമീകരണം",
-    "emails.recovery.hello": "നമസ്കാരം {{user}}",
+    "emails.recovery.hello": "നമസ്കാരം {{user}},",
     "emails.recovery.body": "നിങ്ങളുടെ {{Project}} രഹസ്യവാക്ക് പുനക്രമീകരിക്കുന്നതിന് ഈ ലിങ്ക് പിന്തുടരുക.",
     "emails.recovery.footer": "നിങ്ങളുടെ രഹസ്യവാക്ക് പുനക്രമീകരിക്കാന്‍ നിങ്ങൾ ആവശ്യപ്പെട്ടില്ലെങ്കിൽ, ഈ സന്ദേശം അവഗണിക്കാവുന്നതാണ്.",
-    "emails.recovery.thanks": "നന്ദി",
+    "emails.recovery.thanks": "നന്ദി,",
+    "emails.recovery.buttonText": "പാസ്‌വേഡ് റീസെറ്റ് ചെയ്യുക",
     "emails.recovery.signature": "{{project}} ടീം",
     "emails.invitation.subject": "%s -ലെ %s ടീമിലേക്കുള്ള ക്ഷണം",
-    "emails.invitation.hello": "നമസ്കാരം",
+    "emails.invitation.hello": "നമസ്കാരം,",
     "emails.invitation.body": "നിങ്ങളെ {{project}} -ലെ {{team}} ടീമിലെ അംഗമാകുവാന്‍ ക്ഷണിക്കാൻ {{owner}} ആഗ്രഹിക്കുന്നതിനാലാണ് ഈ മെയിൽ നിങ്ങൾക്ക് അയക്കുന്നത്.",
     "emails.invitation.footer": "നിങ്ങൾക്ക് താൽപ്പര്യമില്ലെങ്കിൽ, ഈ സന്ദേശം അവഗണിക്കാവുന്നതാണ്.",
-    "emails.invitation.thanks": "നന്ദി",
+    "emails.invitation.thanks": "നന്ദി,",
+    "emails.invitation.buttonText": "{{team}} ലേക്കുള്ള ക്ഷണം സ്വീകരിക്കുക",
     "emails.invitation.signature": "{{project}} ടീം",
     "locale.country.unknown": "Unknown",
     "countries.af": "അഫ്ഗാനിസ്ഥാൻ",
@@ -245,10 +246,10 @@
     "emails.otpSession.thanks": "നന്ദി,",
     "emails.otpSession.signature": "പ്രോജക്ട് ടീം",
     "emails.certificate.subject": "%s ന് സർട്ടിഫിക്കറ്റ് പരാജയപ്പെട്ടു",
-    "emails.certificate.hello": "ഹലോ",
+    "emails.certificate.hello": "ഹലോ,",
     "emails.certificate.body": "നിങ്ങളുടെ ഡൊമൈൻ '{{domain}}'നു വേണ്ടിയുള്ള സർട്ടിഫിക്കറ്റ് ഉണ്ടാക്കാനായില്ല. ഇത് ശ്രമം നമ്പർ {{attempt}} ആണ്, പരാജയപ്പെട്ടത് ഇതു മൂലമാണ്: {{error}}",
     "emails.certificate.footer": "നിങ്ങളുടെ മുൻപത്തെ സർട്ടിഫിക്കറ്റ് ആദ്യ പരാജയത്തിനു ശേഷം 30 ദിവസം വരെ സാധുവായിരിക്കും. ഈ കേസ് അന്വേഷിച്ചു നോക്കുന്നത് ഞങ്ങൾ ശക്തമായി ശുപാർശ ചെയ്യുന്നു, അല്ലെങ്കിൽ നിങ്ങളുടെ ഡൊമെയ്‌ൻ സാധുവായ SSL കമ്മ്യൂണിക്കേഷനില്ലാത്ത ഒരു അവസ്ഥയിലാകും.",
-    "emails.certificate.thanks": "നന്ദി",
+    "emails.certificate.thanks": "നന്ദി,",
     "emails.certificate.signature": "{{project}} ടീം",
     "sms.verification.body": "{{secret}}"
-}
+}

app/config/locale/translations/mr.json

@@ -4,28 +4,29 @@
     "settings.direction": "ltr",
     "emails.sender": "%s टीम",
     "emails.verification.subject": "खाते सत्यापन",
-    "emails.verification.hello": "नमस्कार {{user}}",
+    "emails.verification.hello": "नमस्कार {{user}},",
     "emails.verification.body": "आपला ईमेल पत्ता सत्यापित करण्यासाठी या दुव्याचे अनुसरण करा.",
     "emails.verification.footer": "आपण या पत्त्याची पडताळणी करण्यास सांगितले नसल्यास, आपण या संदेशाकडे दुर्लक्ष करू शकता.",
-    "emails.verification.thanks": "धन्यवाद",
+    "emails.verification.thanks": "धन्यवाद,",
+    "emails.verification.buttonText": "ईमेल पत्ता सत्यापित करा",
     "emails.verification.signature": "{{project}} संघ",
     "emails.magicSession.subject": "लॉगिन करा",
-    "emails.magicSession.hello": "नमस्कार ",
-    "emails.magicSession.body": "लॉगिन करण्यासाठी या लिंकचे अनुसरण करा.",
-    "emails.magicSession.footer": "आपण या ईमेलचा वापर करून लॉगिन करण्यास सांगितले नसल्यास, आपण या संदेशाकडे दुर्लक्ष करू शकता.",
-    "emails.magicSession.thanks": "धन्यवाद",
+    "emails.magicSession.hello": "नमस्कार ,",
+    "emails.magicSession.thanks": "धन्यवाद,",
     "emails.magicSession.signature": "{{project}} संघ",
     "emails.recovery.subject": "पासवर्ड रीसेट",
-    "emails.recovery.hello": "नमस्कार {{user}}",
+    "emails.recovery.hello": "नमस्कार {{user}},",
     "emails.recovery.body": "आपला {{project}}चे पासवर्ड रीसेट करण्यासाठी या लिंकचे अनुसरण करा",
     "emails.recovery.footer": "आपण आपला पासवर्ड रीसेट करण्यास सांगितले नसल्यास, आपण या संदेशाकडे दुर्लक्ष करू शकता.",
-    "emails.recovery.thanks": "धन्यवाद",
+    "emails.recovery.thanks": "धन्यवाद,",
+    "emails.recovery.buttonText": "पासवर्ड रीसेट करा",
     "emails.recovery.signature": "{{project}} संघ",
     "emails.invitation.subject": "%s संघ  %s येथे सामील होण्यासाठी आमंत्रण",
-    "emails.invitation.hello": "नमस्कार",
+    "emails.invitation.hello": "नमस्कार,",
     "emails.invitation.body": "हा मेल तुम्हाला पाठवला होता कारण {{owner}} तुम्हाला {{project}} येथे {{team}} टीमचे सदस्य होण्यासाठी आमंत्रित करू इच्छित होते.",
     "emails.invitation.footer": "आपल्याला स्वारस्य नसल्यास, आपण या संदेशाकडे दुर्लक्ष करू शकता.",
-    "emails.invitation.thanks": "धन्यवाद",
+    "emails.invitation.thanks": "धन्यवाद,",
+    "emails.invitation.buttonText": "{{team}} साठी आमंत्रण स्वीकारा",
     "emails.invitation.signature": "{{project}} संघ",
     "locale.country.unknown": "अज्ञात",
     "countries.af": "अफगानिस्तान",
@@ -245,4 +246,4 @@
     "emails.otpSession.securityPhrase": "या ईमेलसाठीचे सुरक्षा वाक्यांश {{phrase}} आहे. जर हे वाक्यांश साइन इन करताना दाखवल्या गेलेल्या वाक्यांशाशी जुळत असेल तर आपण या ईमेलवर विश्वास ठेवू शकता.",
     "emails.otpSession.thanks": "धन्यवाद,",
     "emails.otpSession.signature": "{{project}} संघ"
-}
+}

app/config/locale/translations/ms.json

@@ -4,28 +4,29 @@
     "settings.direction": "ltr",
     "emails.sender": "%s Team",
     "emails.verification.subject": "Pengesahan Akaun",
-    "emails.verification.hello": "Hey {{user}}",
+    "emails.verification.hello": "Hey {{user}},",
     "emails.verification.body": "Tekan pautan ini untuk mengesahkan alamat email anda.",
     "emails.verification.footer": "Sekiranya anda tidak membuat permintaan untuk mengesahkan email ini, sila abaikan mesej ini.",
-    "emails.verification.thanks": "Terima kasih",
+    "emails.verification.thanks": "Terima kasih,",
+    "emails.verification.buttonText": "Sahkan alamat email",
     "emails.verification.signature": "{{project}} team",
     "emails.magicSession.subject": "Log masuk",
-    "emails.magicSession.hello": "Hey",
-    "emails.magicSession.body": "Tekan pautan ini untuk log masuk.",
-    "emails.magicSession.footer": "Sekiranya anda tidak membuat permintaan untuk log masuk menggunakan email ini, sila abaikan mesej ini.",
-    "emails.magicSession.thanks": "Terima kasih",
+    "emails.magicSession.hello": "Hey,",
+    "emails.magicSession.thanks": "Terima kasih,",
     "emails.magicSession.signature": "{{project}} team",
     "emails.recovery.subject": "Menetap semula Kata Laluan",
-    "emails.recovery.hello": "Hello {{user}}",
+    "emails.recovery.hello": "Hello {{user}},",
     "emails.recovery.body": "Tekan pautan ini untuk menetapkan semula kata laluan {{project}}.",
     "emails.recovery.footer": "Sekiranya anda tidak membuat permintaan menetap semula kata laluan, sila abaikan mesej ini.",
-    "emails.recovery.thanks": "Terima kasih",
+    "emails.recovery.thanks": "Terima kasih,",
+    "emails.recovery.buttonText": "Tetapkan semula kata laluan",
     "emails.recovery.signature": "{{project}} team",
     "emails.invitation.subject": "Jemputan ke pasukan %s di %s",
-    "emails.invitation.hello": "Hello",
+    "emails.invitation.hello": "Hello,",
     "emails.invitation.body": "Anda menerima mel ini kerana {{owner}} ingin menjemput anda untuk menjadi ahli pasukan {{team}} di {{project}}.",
     "emails.invitation.footer": "Sekiranya anda tidak berminat, sila abaikan mesej ini.",
-    "emails.invitation.thanks": "Terima kasih",
+    "emails.invitation.thanks": "Terima kasih,",
+    "emails.invitation.buttonText": "Terima jemputan ke {{team}}",
     "emails.invitation.signature": "{{project}} team",
     "locale.country.unknown": "Tidak Diketahui",
     "countries.af": "Afghanistan",
@@ -245,4 +246,4 @@
     "emails.otpSession.securityPhrase": "Frasa keselamatan untuk email ini adalah {{phrase}}. Anda boleh mempercayai email ini jika frasa ini sepadan dengan frasa yang ditunjukkan semasa log masuk.",
     "emails.otpSession.thanks": "Terima kasih,",
     "emails.otpSession.signature": "pasukan {{project}}"
-}
+}

app/config/locale/translations/nb.json

@@ -4,28 +4,29 @@
     "settings.direction": "ltr",
     "emails.sender": "%s Team",
     "emails.verification.subject": "Kontobekreftelse",
-    "emails.verification.hello": "Hei {{user}}",
+    "emails.verification.hello": "Hei {{user}},",
     "emails.verification.body": "Følg denne lenken for å bekrefte din e-postadresse.",
     "emails.verification.footer": "Dersom du ikke ba om å bekrefte e-postadressen, kan du se bort fra denne meldingen.",
-    "emails.verification.thanks": "Takk",
+    "emails.verification.thanks": "Takk,",
+    "emails.verification.buttonText": "Bekreft e-postadresse",
     "emails.verification.signature": "{{project}} team",
     "emails.magicSession.subject": "Pålogging",
-    "emails.magicSession.hello": "Hei",
-    "emails.magicSession.body": "Følg denne lenken for å logge på.",
-    "emails.magicSession.footer": "Dersom du ikke ba om å logge på med denne e-postadressen, kan du se bort fra denne meldingen.",
-    "emails.magicSession.thanks": "Takk",
+    "emails.magicSession.hello": "Hei,",
+    "emails.magicSession.thanks": "Takk,",
     "emails.magicSession.signature": "{{project}} team",
     "emails.recovery.subject": "Nullstille passord",
-    "emails.recovery.hello": "Hei {{user}}",
+    "emails.recovery.hello": "Hei {{user}},",
     "emails.recovery.body": "Følg denne lenken for å nullstille ditt {{project}} passord.",
     "emails.recovery.footer": "Dersom du ikke ba om å nullstille passordet ditt, kan du se bort fra denne meldingen.",
-    "emails.recovery.thanks": "Takk",
+    "emails.recovery.thanks": "Takk,",
+    "emails.recovery.buttonText": "Tilbakestill passord",
     "emails.recovery.signature": "{{project}} team",
     "emails.invitation.subject": "Invitasjon til %s Team ved %s",
-    "emails.invitation.hello": "Hei",
+    "emails.invitation.hello": "Hei,",
     "emails.invitation.body": "Denne meldingen ble sendt til deg fordi {{owner}} ønsket å invitere deg til å bli medlem av {{team}} team ved {{project}}.",
     "emails.invitation.footer": "Dersom du ikke er interessert, kan du se bort fra denne meldingen.",
-    "emails.invitation.thanks": "Takk",
+    "emails.invitation.thanks": "Takk,",
+    "emails.invitation.buttonText": "Godta invitasjon til {{team}}",
     "emails.invitation.signature": "{{project}} team",
     "locale.country.unknown": "Ukjent",
     "countries.af": "Afghanistan",
@@ -245,4 +246,4 @@
     "emails.otpSession.securityPhrase": "Sikkerhetsfrasen for denne e-posten er {{phrase}}. Du kan stole på denne e-posten hvis denne frasen stemmer overens med frasen som ble vist under pålogging.",
     "emails.otpSession.thanks": "Takk,",
     "emails.otpSession.signature": "{{project}} team"
-}
+}

app/config/locale/translations/ne.json

@@ -4,28 +4,29 @@
     "settings.direction": "ltr",
     "emails.sender": "%s समूह",
     "emails.verification.subject": "खाता प्रमाणिकरण",
-    "emails.verification.hello": "नमस्ते {{user}}",
+    "emails.verification.hello": "नमस्ते {{user}},",
     "emails.verification.body": "इमेल ठेगाना प्रमाणित गर्नको लागी यो लिंकमा जानुहोस।",
     "emails.verification.footer": "यदि तपाइँले आफ्नो खाता प्रमाणित गर्न सोध्नु भएको छैन भने तपाइँले यो सन्देश लाई बेवास्ता गर्न सक्नुहुन्छ।",
-    "emails.verification.thanks": "धन्यवाद",
+    "emails.verification.thanks": "धन्यवाद,",
+    "emails.verification.buttonText": "इमेल ठेगाना पुष्टि गर्नुहोस्",
     "emails.verification.signature": "{{project}} समूह",
     "emails.magicSession.subject": "लगइन",
-    "emails.magicSession.hello": "नमस्ते",
-    "emails.magicSession.body": "लगइन गर्नको लागी यो लिंकमा जानुहोस।",
-    "emails.magicSession.footer": "यदि तपाइँले यो इमेल प्रयोग गरेर लगइन गर्न सोध्नु भएको छैन भने तपाइँले यो सन्देश लाई बेवास्ता गर्न सक्नुहुन्छ।",
-    "emails.magicSession.thanks": "धन्यवाद",
+    "emails.magicSession.hello": "नमस्ते,",
+    "emails.magicSession.thanks": "धन्यवाद,",
     "emails.magicSession.signature": "{{project}} समूह",
     "emails.recovery.subject": "पासवर्ड रिसेट",
-    "emails.recovery.hello": "नमस्ते {{user}}",
+    "emails.recovery.hello": "नमस्ते {{user}},",
     "emails.recovery.body": "{{project}}को पासवर्ड रिसेट गर्नको लागी यो लिंकमा जानुहोस।",
     "emails.recovery.footer": "यदि तपाइँले आफ्नो पासवर्ड रिसेट गर्न सोध्नु भएको छैन भने तपाइँले यो सन्देश लाई बेवास्ता गर्न सक्नुहुन्छ।",
-    "emails.recovery.thanks": "धन्यवाद",
+    "emails.recovery.thanks": "धन्यवाद,",
+    "emails.recovery.buttonText": "रिसेट पासवर्ड",
     "emails.recovery.signature": "{{project}} समूह",
     "emails.invitation.subject": "%s समूहको लागि %s मा निमन्त्रणा",
-    "emails.invitation.hello": "नमस्ते",
+    "emails.invitation.hello": "नमस्ते,",
     "emails.invitation.body": "{{owner}}ले तपाइँलाई {{project}}मा {{team}}को सदस्य बन्न आमन्त्रित गर्न चाहनु भएको छ। त्येसैले तपाइँलाई यो सन्देश पठाइएको हो।",
     "emails.invitation.footer": "यदि तपाइँ इच्छुक हुनुहुन्न भने, तपाइँले यो सन्देशलाई बेवास्ता गर्न सक्नुहुन्छ।",
-    "emails.invitation.thanks": "धन्यवाद",
+    "emails.invitation.thanks": "धन्यवाद,",
+    "emails.invitation.buttonText": "{{team}} मा निमन्त्रणा स्वीकार गर्नुहोस्",
     "emails.invitation.signature": "{{project}} समूह",
     "locale.country.unknown": "अज्ञात",
     "countries.af": "अफगानिस्तान",
@@ -245,4 +246,4 @@
     "emails.otpSession.securityPhrase": "यस ईमेलको लागि सुरक्षा वाक्य {{phrase}} हो। यदि यो वाक्य साइन इन गर्दा देखाइएको वाक्यसँग मेल खान्छ भने तपाईँले यो ईमेलमा विश्वास गर्न सक्नुहुन्छ।",
     "emails.otpSession.thanks": "धन्यवाद,",
     "emails.otpSession.signature": "{{project}} टिम"
-}
+}

app/config/locale/translations/nl.json

@@ -4,28 +4,29 @@
     "settings.direction": "ltr",
     "emails.sender": "%s Team",
     "emails.verification.subject": "Account Verificatie",
-    "emails.verification.hello": "Hoi {{user}}",
+    "emails.verification.hello": "Hoi {{user}},",
     "emails.verification.body": "Volg deze link om uw e-mail te verifieren",
     "emails.verification.footer": "Als u geen aanvraag voor verificatie heeft gemaakt, kan u deze mail negeren",
-    "emails.verification.thanks": "Bedankt",
+    "emails.verification.thanks": "Bedankt,",
+    "emails.verification.buttonText": "Bevestig e-mailadres",
     "emails.verification.signature": "{{project}} team",
     "emails.magicSession.subject": "Login",
-    "emails.magicSession.hello": "Hoi",
-    "emails.magicSession.body": "Volg deze link om in te loggen",
-    "emails.magicSession.footer": "Als u geen aanvraag heeft gemaakt om met deze mail in te loggen, kan u deze mail negeren",
-    "emails.magicSession.thanks": "Bedankt",
+    "emails.magicSession.hello": "Hoi,",
+    "emails.magicSession.thanks": "Bedankt,",
     "emails.magicSession.signature": "{{project}} team",
     "emails.recovery.subject": "Wachtwoord Herinstellen",
-    "emails.recovery.hello": "Hallo {{user}}",
+    "emails.recovery.hello": "Hallo {{user}},",
     "emails.recovery.body": "Volg deze link om het wachtwoord van uw project {{project}} te wijzigen",
     "emails.recovery.footer": "Als u geen aanvraag heeft gemaakt om uw wachtwoord te wijzigen, kan u deze mail negeren",
-    "emails.recovery.thanks": "Bedankt",
+    "emails.recovery.thanks": "Bedankt,",
+    "emails.recovery.buttonText": "Wachtwoord opnieuw instellen",
     "emails.recovery.signature": "{{project}} team",
     "emails.invitation.subject": "Uitnodiging van %s Team uit %s",
     "emails.invitation.hello": "Hallo,",
     "emails.invitation.body": "U ontvangt deze mail want u was uitgenodig door {{owner}} om lid van het {{team}} team te worden in {{project}} ",
     "emails.invitation.footer": "Als u niet geintereseerd bent, kan u deze mail negeren.",
-    "emails.invitation.thanks": "Bedankt",
+    "emails.invitation.thanks": "Bedankt,",
+    "emails.invitation.buttonText": "Uitnodiging voor {{team}} accepteren",
     "emails.invitation.signature": "{{project}} team",
     "locale.country.unknown": "Onbekend",
     "countries.af": "Afghanistan",
@@ -245,4 +246,4 @@
     "emails.otpSession.securityPhrase": "De beveiligingszin voor deze e-mail is {{phrase}}. U kunt deze e-mail vertrouwen als deze zin overeenkomt met de zin die wordt getoond tijdens het inloggen.",
     "emails.otpSession.thanks": "Bedankt,",
     "emails.otpSession.signature": "{{project}} team"
-}
+}

app/config/locale/translations/nn.json

@@ -4,28 +4,29 @@
     "settings.direction": "ltr",
     "emails.sender": "%s Team",
     "emails.verification.subject": "Kontostadfesting",
-    "emails.verification.hello": "Hallo {{user}}",
+    "emails.verification.hello": "Hallo {{user}},",
     "emails.verification.body": "Følg denne lenkja for å bekrefta din e-postadresse.",
     "emails.verification.footer": "Om du ikkje bad om å bekrefta e-postadressa, kan du ignorera denne meldinga.",
-    "emails.verification.thanks": "Takk",
+    "emails.verification.thanks": "Takk,",
+    "emails.verification.buttonText": "Stadfest e-postadresse",
     "emails.verification.signature": "{{project}} team",
     "emails.magicSession.subject": "Pålogging",
-    "emails.magicSession.hello": "Hei",
-    "emails.magicSession.body": "Følg denne lenkja for å logge på.",
-    "emails.magicSession.footer": "Om du ikkje ba om å logge på med denne e-postadressa, kan du ignorera denne meldinga.",
-    "emails.magicSession.thanks": "Takk",
+    "emails.magicSession.hello": "Hei,",
+    "emails.magicSession.thanks": "Takk,",
     "emails.magicSession.signature": "{{project}} team",
     "emails.recovery.subject": "Nullstilla passord",
-    "emails.recovery.hello": "Hallo {{user}}",
+    "emails.recovery.hello": "Hallo {{user}},",
     "emails.recovery.body": "Følg denne lenkja for å nullstilla ditt {{project}} passord.",
     "emails.recovery.footer": "Om du ikkje ba om å nullstilla passordet ditt, kan du ignorera denne meldinga.",
-    "emails.recovery.thanks": "Takk",
+    "emails.recovery.thanks": "Takk,",
+    "emails.recovery.buttonText": "Nullstill passord",
     "emails.recovery.signature": "{{project}} team",
     "emails.invitation.subject": "Innbyding til %s Team ved %s",
-    "emails.invitation.hello": "Hallo",
+    "emails.invitation.hello": "Hallo,",
     "emails.invitation.body": "Denne meldinga ble sendt til deg fordi {{owner}} ynskja å invitera deg til å bli medlem av {{team}} team i {{project}}.",
     "emails.invitation.footer": "Om du ikkje er interessert, kan du ignorera denne meldinga.",
-    "emails.invitation.thanks": "Takk",
+    "emails.invitation.thanks": "Takk,",
+    "emails.invitation.buttonText": "Godta invitasjon til {{team}}",
     "emails.invitation.signature": "{{project}} team",
     "locale.country.unknown": "Ukjend",
     "countries.af": "Afghanistan",
@@ -245,10 +246,10 @@
     "emails.otpSession.thanks": "Takk,",
     "emails.otpSession.signature": "{{project}}-laget",
     "emails.certificate.subject": "Sertifikatfeil for %s",
-    "emails.certificate.hello": "Hei",
+    "emails.certificate.hello": "Hei,",
     "emails.certificate.body": "Sertifikatet for domenet ditt '{{domain}}' kunne ikkje opprettast. Dette er forsøk nr. {{attempt}}, og feilen blei forårsaka av: {{error}}",
     "emails.certificate.footer": "Førre sertifikatet ditt vil vere gyldig i 30 dagar sidan den første feilen. Vi rår sterkt til at du undersøkjer denne saka, elles vil domenet ditt ende opp utan gyldig SSL-kommunikasjon.",
-    "emails.certificate.thanks": "Takk",
+    "emails.certificate.thanks": "Takk,",
     "emails.certificate.signature": "{{project}} team",
     "sms.verification.body": "{{secret}}"
-}
+}

app/config/locale/translations/or.json

@@ -4,28 +4,29 @@
     "settings.direction": "ltr",
     "emails.sender": "%s ଦଳ",
     "emails.verification.subject": "ଖାତା ଯାଞ୍ଚ",
-    "emails.verification.hello": "ନମସ୍କାର {{user}}",
+    "emails.verification.hello": "ନମସ୍କାର {{user}},",
     "emails.verification.body": "ଆପଣଙ୍କର ଇମେଲ୍ ଠିକଣା ଯାଞ୍ଚ କରିବାକୁ ଏହି ଲିଙ୍କ୍ ଅନୁସରଣ କରନ୍ତୁ |",
     "emails.verification.footer": "ଯଦି ଆପଣ ଏହି ଠିକଣା ଯାଞ୍ଚ କରିବାକୁ କହି ନାହାଁନ୍ତି, ତେବେ ଆପଣ ଏହି ସନ୍ଦେଶକୁ ଉପେକ୍ଷା କରିପାରିବେ |",
-    "emails.verification.thanks": "ଧନ୍ୟବାଦ",
+    "emails.verification.thanks": "ଧନ୍ୟବାଦ,",
+    "emails.verification.buttonText": "ଇମେଲ ଠିକଣା ନିଶ୍ଚିତ କରନ୍ତୁ",
     "emails.verification.signature": "{{project}} ଦଳ",
     "emails.magicSession.subject": "ଲଗଇନ୍ କରନ୍ତୁ",
-    "emails.magicSession.hello": "ନମସ୍କାର",
-    "emails.magicSession.body": "ଲଗଇନ୍ କରିବାକୁ ଏହି ଲିଙ୍କ୍ ଅନୁସରଣ କରନ୍ତୁ |",
-    "emails.magicSession.footer": "ଯଦି ଆପଣ ଏହି ଇମେଲ୍ ବ୍ୟବହାର କରି ଲଗଇନ୍ କରିବାକୁ କହି ନାହାଁନ୍ତି, ତେବେ ଆପଣ ଏହି ସନ୍ଦେଶକୁ ଉପେକ୍ଷା କରିପାରିବେ |",
-    "emails.magicSession.thanks": "ଧନ୍ୟବାଦ",
+    "emails.magicSession.hello": "ନମସ୍କାର,",
+    "emails.magicSession.thanks": "ଧନ୍ୟବାଦ,",
     "emails.magicSession.signature": "{{project}} ଦଳ",
     "emails.recovery.subject": "ପାସୱାର୍ଡ ପୁନଃ ସେଟ୍ କରନ୍ତୁ |",
-    "emails.recovery.hello": "ନମସ୍କାର {{user}}",
+    "emails.recovery.hello": "ନମସ୍କାର {{user}},",
     "emails.recovery.body": "ଆପଣଙ୍କର {{project}} ପାସୱାର୍ଡ ପୁନଃ ସେଟ୍ କରିବାକୁ ଏହି ଲିଙ୍କକୁ ଅନୁସରଣ କରନ୍ତୁ |",
     "emails.recovery.footer": "ଯଦି ଆପଣ ଆପଣଙ୍କର ପାସୱାର୍ଡ ପୁନଃ ସେଟ୍ କରିବାକୁ କହି ନାହାଁନ୍ତି, ତେବେ ଆପଣ ଏହି ସନ୍ଦେଶକୁ ଉପେକ୍ଷା କରିପାରିବେ |",
-    "emails.recovery.thanks": "ଧନ୍ୟବାଦ",
+    "emails.recovery.thanks": "ଧନ୍ୟବାଦ,",
+    "emails.recovery.buttonText": "ପାସୱାର୍ଡ ପୁନଃସେଟ୍ କରନ୍ତୁ",
     "emails.recovery.signature": "{{project}} ଦଳ",
     "emails.invitation.subject": "%s ରେ %s ଦଳକୁ ନିମନ୍ତ୍ରଣ |",
-    "emails.invitation.hello": "ନମସ୍କାର",
+    "emails.invitation.hello": "ନମସ୍କାର,",
     "emails.invitation.body": "ଏହି ମେଲ୍ ଆପଣଙ୍କୁ ପଠାଯାଇଥିଲା କାରଣ {{owner}} ଆପଣଙ୍କୁ {{project} ରେ {{team}} ଦଳର ସଦସ୍ୟ ହେବାକୁ ଆମନ୍ତ୍ରଣ କରିବାକୁ ଚାହୁଁଥିଲେ |",
     "emails.invitation.footer": "ଯଦି ଆପଣ ଆଗ୍ରହୀ ନୁହଁନ୍ତି, ଆପଣ ଏହି ସନ୍ଦେଶକୁ ଅଣଦେଖା କରିପାରିବେ |",
-    "emails.invitation.thanks": "ଧନ୍ୟବାଦ",
+    "emails.invitation.thanks": "ଧନ୍ୟବାଦ,",
+    "emails.invitation.buttonText": "{{team}} ପାଇଁ ଆମନ୍ତ୍ରଣ ଗ୍ରହଣ କରନ୍ତୁ",
     "emails.invitation.signature": "{{project}} ଦଳ",
     "locale.country.unknown": "ଅଜ୍ଞାତ",
     "countries.af": "ଆଫଗାନିସ୍ତାନ",
@@ -245,4 +246,4 @@
     "emails.otpSession.securityPhrase": "ଏହି ଇମେଲର ସୁରକ୍ଷା ବାକ୍ୟାଂଶ ହେଉଛି {{phrase}}। ସାଇନ୍ ଇନ୍ କରିବା ସମୟରେ ଦେଖାଯାଇଥିବା ବାକ୍ୟାଂଶ ସହ ଏହା ମେଳେ ଯଦି, ଆପଣ ଏହି ଇମେଲକୁ ଆସ୍ଥା କରି ପାରିବେ।",
     "emails.otpSession.thanks": "ଧନ୍ୟବାଦ,",
     "emails.otpSession.signature": "ପ୍ରକଳ୍ପ ଟିମ୍ବ୍"
-}
+}

app/config/locale/translations/pa.json

@@ -4,28 +4,26 @@
     "settings.direction": "ltr",
     "emails.sender": "%s ਟੀਮ",
     "emails.verification.subject": "",
-    "emails.verification.hello": "",
+    "emails.verification.hello": ",",
     "emails.verification.body": "",
     "emails.verification.footer": "",
-    "emails.verification.thanks": "",
+    "emails.verification.thanks": ",",
     "emails.verification.signature": "",
     "emails.magicSession.subject": "",
-    "emails.magicSession.hello": "",
-    "emails.magicSession.body": "",
-    "emails.magicSession.footer": "",
-    "emails.magicSession.thanks": "",
+    "emails.magicSession.hello": ",",
+    "emails.magicSession.thanks": ",",
     "emails.magicSession.signature": "",
     "emails.recovery.subject": "",
-    "emails.recovery.hello": "",
+    "emails.recovery.hello": ",",
     "emails.recovery.body": "",
     "emails.recovery.footer": "",
-    "emails.recovery.thanks": "",
+    "emails.recovery.thanks": ",",
     "emails.recovery.signature": "",
     "emails.invitation.subject": "",
-    "emails.invitation.hello": "",
+    "emails.invitation.hello": ",",
     "emails.invitation.body": "",
     "emails.invitation.footer": "",
-    "emails.invitation.thanks": "",
+    "emails.invitation.thanks": ",",
     "emails.invitation.signature": "",
     "locale.country.unknown": "ਅਣਜਾਣ",
     "countries.af": "ਅਫਗਾਨਿਸਤਾਨ",
@@ -245,4 +243,4 @@
     "emails.otpSession.securityPhrase": "ਇਸ ਈਮੇਲ ਲਈ ਸੁਰੱਖਿਆ ਵਾਕ ਹੈ {{phrase}}। ਜੇ ਇਹ ਵਾਕ ਸਾਈਨ ਇਨ ਕਰਨ ਸਮੇਂ ਦਿਖਾਈ ਦੇਣ ਵਾਲੇ ਵਾਕ ਨਾਲ ਮੇਲ ਖਾਂਦਾ ਹੈ ਤਾਂ ਤੁਸੀਂ ਇਸ ਈਮੇਲ 'ਤੇ ਭਰੋਸਾ ਕਰ ਸਕਦੇ ਹੋ।",
     "emails.otpSession.thanks": "ਧੰਨਵਾਦ,",
     "emails.otpSession.signature": "{{project}} ਟੀਮ"
-}
+}

app/config/locale/translations/pl.json

@@ -4,28 +4,29 @@
     "settings.direction": "ltr",
     "emails.sender": "Zespół %s",
     "emails.verification.subject": "Weryfikacja konta",
-    "emails.verification.hello": "Cześć {{user}}",
+    "emails.verification.hello": "Cześć {{user}},",
     "emails.verification.body": "Przejdź do tego linku, aby zweryfikować swój adres e-mail.",
     "emails.verification.footer": "Jeśli to nie Ty prosiłeś o zweryfikowanie tego adresu, zignoruj tę wiadomość.",
-    "emails.verification.thanks": "Dziękujemy",
+    "emails.verification.thanks": "Dziękujemy,",
+    "emails.verification.buttonText": "Potwierdź adres e-mail",
     "emails.verification.signature": "Zespół {{project}}",
     "emails.magicSession.subject": "Logowanie",
-    "emails.magicSession.hello": "Cześć",
-    "emails.magicSession.body": "Kliknij w ten link, aby zalogować się.",
-    "emails.magicSession.footer": "Jeśli to nie Ty prosiłeś o logowanie przy użyciu tego adresu e-mail, zignoruj tę wiadomość.",
-    "emails.magicSession.thanks": "Dziękujemy",
+    "emails.magicSession.hello": "Cześć,",
+    "emails.magicSession.thanks": "Dziękujemy,",
     "emails.magicSession.signature": "Zespół {{project}}",
     "emails.recovery.subject": "Resetowanie hasła",
-    "emails.recovery.hello": "Cześć {{user}}",
+    "emails.recovery.hello": "Cześć {{user}},",
     "emails.recovery.body": "Przejdź do tego linku, aby zresetować hasło dla {{project}}.",
     "emails.recovery.footer": "Jeśli to nie Ty prosiłeś o zresetowanie swojego hasła, zignoruj tę wiadomość.",
-    "emails.recovery.thanks": "Dziękujemy",
+    "emails.recovery.thanks": "Dziękujemy,",
+    "emails.recovery.buttonText": "Zresetuj hasło",
     "emails.recovery.signature": "Zespół {{project}}",
     "emails.invitation.subject": "Zaproszenie do zespołu %s w %s",
-    "emails.invitation.hello": "Cześć",
+    "emails.invitation.hello": "Cześć,",
     "emails.invitation.body": "Otrzymujesz tę wiadomość, ponieważ {{owner}} zaprasza Cię do grona członków zespołu {{team}} w projekcie {{project}}.",
     "emails.invitation.footer": "Jeśli nie jesteś zainteresowany, zignoruj tę wiadomość.",
-    "emails.invitation.thanks": "Dziękujemy",
+    "emails.invitation.thanks": "Dziękujemy,",
+    "emails.invitation.buttonText": "Zaakceptuj zaproszenie do {{team}}",
     "emails.invitation.signature": "Zespół {{project}}",
     "locale.country.unknown": "Nieznany",
     "countries.af": "Afganistan",
@@ -245,4 +246,4 @@
     "emails.otpSession.securityPhrase": "Hasłem zabezpieczającym dla tego e-maila jest {{phrase}}. Możesz zaufać temu e-mailowi, jeśli hasło zgadza się z hasłem wyświetlonym podczas logowania.",
     "emails.otpSession.thanks": "Dzięki,",
     "emails.otpSession.signature": "team {{project}}"
-}
+}

app/config/locale/translations/pt-br.json

@@ -4,28 +4,29 @@
     "settings.direction": "ltr",
     "emails.sender": "Time %s",
     "emails.verification.subject": "Verificação da Conta",
-    "emails.verification.hello": "Olá {{user}}",
+    "emails.verification.hello": "Olá {{user}},",
     "emails.verification.body": "Clique neste link para verificar o seu endereço de e-mail.",
     "emails.verification.footer": "Se você não solicitou a verificação deste e-mail, ignore essa mensagem.",
-    "emails.verification.thanks": "Muito obrigado",
+    "emails.verification.thanks": "Muito obrigado,",
+    "emails.verification.buttonText": "Confirmar endereço de e-mail",
     "emails.verification.signature": "Time {{project}}",
     "emails.magicSession.subject": "Login",
-    "emails.magicSession.hello": "Olá",
-    "emails.magicSession.body": "Clique neste link para entrar.",
-    "emails.magicSession.footer": "Se você não solicitou conectar-se com este e-mail, ignore essa mensagem.",
-    "emails.magicSession.thanks": "Muito obrigado",
+    "emails.magicSession.hello": "Olá,",
+    "emails.magicSession.thanks": "Muito obrigado,",
     "emails.magicSession.signature": "Time {{project}}",
     "emails.recovery.subject": "Redefinição de senha",
-    "emails.recovery.hello": "Olá {{user}}",
+    "emails.recovery.hello": "Olá {{user}},",
     "emails.recovery.body": "Clique neste link para redefinir sua senha do {{project}}.",
     "emails.recovery.footer": "Se você não solicitou a redefinição da sua senha, você pode ignorar essa mensagem.",
-    "emails.recovery.thanks": "Muito obrigado",
+    "emails.recovery.thanks": "Muito obrigado,",
+    "emails.recovery.buttonText": "Redefinir senha",
     "emails.recovery.signature": "Time {{project}}",
     "emails.invitation.subject": "Convite para o Time %s em %s",
-    "emails.invitation.hello": "Olá",
+    "emails.invitation.hello": "Olá,",
     "emails.invitation.body": "Este e-mail foi enviado porque {{owner}} deseja convidar você a se tornar membro do Time {{team}} em {{project}}.",
     "emails.invitation.footer": "Caso não tenha interesse, ignore essa mensagem.",
-    "emails.invitation.thanks": "Muito obrigado",
+    "emails.invitation.thanks": "Muito obrigado,",
+    "emails.invitation.buttonText": "Aceitar convite para {{team}}",
     "emails.invitation.signature": "Time {{project}}",
     "locale.country.unknown": "Desconhecido",
     "countries.af": "Afeganistão",
@@ -245,4 +246,4 @@
     "emails.otpSession.securityPhrase": "A frase de segurança para este e-mail é {{phrase}}. Você pode confiar neste e-mail se esta frase corresponder à frase mostrada durante o login.",
     "emails.otpSession.thanks": "Obrigado,",
     "emails.otpSession.signature": "equipe {{project}}"
-}
+}

app/config/locale/translations/pt-pt.json

@@ -4,28 +4,29 @@
     "settings.direction": "ltr",
     "emails.sender": "Equipa %s",
     "emails.verification.subject": "Verificação de contas",
-    "emails.verification.hello": "Hey {{user}}",
+    "emails.verification.hello": "Hey {{user}},",
     "emails.verification.body": "Siga esta ligação para verificar o seu endereço de correio electrónico.",
     "emails.verification.footer": "Se não pediu para verificar este endereço, pode ignorar esta mensagem.",
-    "emails.verification.thanks": "Obrigado",
+    "emails.verification.thanks": "Obrigado,",
+    "emails.verification.buttonText": "Confirmar endereço de email",
     "emails.verification.signature": "Equipa {{project}}",
     "emails.magicSession.subject": "Login",
-    "emails.magicSession.hello": "Olá ",
-    "emails.magicSession.body": "Siga esta ligação para iniciar sessão.",
-    "emails.magicSession.footer": "Se não pediu para entrar usando este e-mail, pode ignorar esta mensagem.",
-    "emails.magicSession.thanks": "Obrigado",
+    "emails.magicSession.hello": "Olá ,",
+    "emails.magicSession.thanks": "Obrigado,",
     "emails.magicSession.signature": "Equipa {{project}}",
     "emails.recovery.subject": "Redefinição de senha",
-    "emails.recovery.hello": "Olá {{user}}",
+    "emails.recovery.hello": "Olá {{user}},",
     "emails.recovery.body": "Utilize este link para redefinir a palavra-passe do seu projecto {{project}}",
     "emails.recovery.footer": "Se não pediu para redefinir a sua palavra-passe, pode ignorar esta mensagem.",
-    "emails.recovery.thanks": "Obrigado",
+    "emails.recovery.thanks": "Obrigado,",
+    "emails.recovery.buttonText": "Repor palavra-passe",
     "emails.recovery.signature": "Equipa {{project}}",
     "emails.invitation.subject": "Convite à equipa de %s às %s",
-    "emails.invitation.hello": "Olá",
+    "emails.invitation.hello": "Olá,",
     "emails.invitation.body": "Este correio foi-lhe enviado porque {{owner}} queria convidá-lo a tornar-se membro da equipa {{team}} da {{project}}.",
     "emails.invitation.footer": "Se não estiver interessado, pode ignorar esta mensagem.",
-    "emails.invitation.thanks": "Obrigado",
+    "emails.invitation.thanks": "Obrigado,",
+    "emails.invitation.buttonText": "Aceitar convite para o {{team}}",
     "emails.invitation.signature": "Equipa {{project}}",
     "locale.country.unknown": "Desconhecido",
     "countries.af": "Afeganistão",
@@ -245,4 +246,4 @@
     "emails.otpSession.securityPhrase": "A frase de segurança para este email é {{phrase}}. Você pode confiar neste email se essa frase corresponder à frase mostrada durante o login.",
     "emails.otpSession.thanks": "Obrigado,",
     "emails.otpSession.signature": "equipe {{project}}"
-}
+}

app/config/locale/translations/ro.json

@@ -4,28 +4,29 @@
     "settings.direction": "ltr",
     "emails.sender": "%s Echipa",
     "emails.verification.subject": "Verificare cont",
-    "emails.verification.hello": "Bună ziua, {{user}}",
+    "emails.verification.hello": "Bună ziua, {{user}},",
     "emails.verification.body": "Click pe acest link pentru a valida adresa de email.",
     "emails.verification.footer": "Dacă nu ai cerut validarea adresei de email, poți ignora acest mesaj.",
-    "emails.verification.thanks": "Mulțumim",
+    "emails.verification.thanks": "Mulțumim,",
+    "emails.verification.buttonText": "Confirmă adresa de email",
     "emails.verification.signature": "Echipa {{project}}",
     "emails.magicSession.subject": "Login",
-    "emails.magicSession.hello": "Bună ziua",
-    "emails.magicSession.body": "Urmează acest link pentru logare.",
-    "emails.magicSession.footer": "Dacă nu ai incercat să te loghezi folosing această adresa de email, poți ignora acest mesaj.",
-    "emails.magicSession.thanks": "Mulțumim",
+    "emails.magicSession.hello": "Bună ziua,",
+    "emails.magicSession.thanks": "Mulțumim,",
     "emails.magicSession.signature": "Echipa {{project}}",
     "emails.recovery.subject": "Resetare parolă",
-    "emails.recovery.hello": "Bună ziua, {{user}}",
+    "emails.recovery.hello": "Bună ziua, {{user}},",
     "emails.recovery.body": "Click aici pentru a reseta parola pentru {{project}}",
     "emails.recovery.footer": "Dacă nu ai cerut să îți schimbi parola, ignoră acest mesaj.",
-    "emails.recovery.thanks": "Mulțumim",
+    "emails.recovery.thanks": "Mulțumim,",
+    "emails.recovery.buttonText": "Resetează parola",
     "emails.recovery.signature": "Echipa {{project}}",
     "emails.invitation.subject": "Invitatie catre %s Echipa la %s",
-    "emails.invitation.hello": "Bună ziua",
+    "emails.invitation.hello": "Bună ziua,",
     "emails.invitation.body": "Acest email a fost trimis pentru că {{owner}} a vrut ca tu să devii membru al echipei {{team}} la {{project}}.",
     "emails.invitation.footer": "Dacă nu esti interesat, poți ignora acest email.",
-    "emails.invitation.thanks": "Mulțumim",
+    "emails.invitation.thanks": "Mulțumim,",
+    "emails.invitation.buttonText": "Acceptă invitația la {{team}}",
     "emails.invitation.signature": "Echipa {{project}}",
     "locale.country.unknown": "Necunoscut",
     "countries.af": "Afghanistan",
@@ -245,4 +246,4 @@
     "emails.otpSession.securityPhrase": "Fraza de securitate pentru acest e-mail este {{phrase}}. Puteți avea încredere în acest e-mail dacă fraza se potrivește cu cea afișată în timpul autentificării.",
     "emails.otpSession.thanks": "Mulțumesc,",
     "emails.otpSession.signature": "echipa {{project}}"
-}
+}

app/config/locale/translations/ru.json

@@ -4,28 +4,29 @@
     "settings.direction": "ltr",
     "emails.sender": "Команда %s",
     "emails.verification.subject": "Верификация аккаунта",
-    "emails.verification.hello": "Здравствуйте, {{user}}",
+    "emails.verification.hello": "Здравствуйте, {{user}},",
     "emails.verification.body": "Перейдите по ссылке, чтобы подтвердить свой адрес электронной почты.",
     "emails.verification.footer": "Если вы не запрашивали подтверждение этого адреса, проигнорируйте это сообщение.",
-    "emails.verification.thanks": "Спасибо",
+    "emails.verification.thanks": "Спасибо,",
+    "emails.verification.buttonText": "Подтвердить адрес электронной почты",
     "emails.verification.signature": "команда {{project}}",
     "emails.magicSession.subject": "Логин",
-    "emails.magicSession.hello": "Здравствуйте",
-    "emails.magicSession.body": "Перейдите по ссылке, чтобы войти.",
-    "emails.magicSession.footer": "Если вы не просили войти, используя этот адрес электронной почты, проигнорируйте это сообщение.",
-    "emails.magicSession.thanks": "Спасибо",
+    "emails.magicSession.hello": "Здравствуйте,",
+    "emails.magicSession.thanks": "Спасибо,",
     "emails.magicSession.signature": "команда {{project}}",
     "emails.recovery.subject": "Сброс пароля",
-    "emails.recovery.hello": "Здравствуйте, {{user}}",
+    "emails.recovery.hello": "Здравствуйте, {{user}},",
     "emails.recovery.body": "Перейдите по этой ссылке для того чтобы сбросить свой пароль для проекта {{project}}",
     "emails.recovery.footer": "Если вы не запрашивали сброс пароля, проигнорируйте это сообщение.",
-    "emails.recovery.thanks": "Спасибо",
+    "emails.recovery.thanks": "Спасибо,",
+    "emails.recovery.buttonText": "Сбросить пароль",
     "emails.recovery.signature": "команда {{project}}",
     "emails.invitation.subject": "Приглашение в команду %s по проекту %s",
-    "emails.invitation.hello": "Здравствуйте",
+    "emails.invitation.hello": "Здравствуйте,",
     "emails.invitation.body": "Это письмо отправлено вам, потому что {{owner}} приглашает стать членом команды {{team}} в проекте {{project}}.",
     "emails.invitation.footer": "Если вы не заинтересованы, проигнорируйте это сообщение.",
-    "emails.invitation.thanks": "Спасибо",
+    "emails.invitation.thanks": "Спасибо,",
+    "emails.invitation.buttonText": "Принять приглашение в {{team}}",
     "emails.invitation.signature": "команда {{project}}",
     "locale.country.unknown": "Неизвестно",
     "countries.af": "Афганистан",
@@ -245,4 +246,4 @@
     "emails.otpSession.securityPhrase": "Фраза безопасности для этого письма {{phrase}}. Вы можете доверять этому письму, если эта фраза совпадает с фразой, показанной во время входа в систему.",
     "emails.otpSession.thanks": "Спасибо,",
     "emails.otpSession.signature": "команда {{project}}"
-}
+}