remove chown

Co-authored-by: Jake Barnby <jakeb994@gmail.com>

.env

@@ -1,30 +1,20 @@
 _APP_ENV=development
-_APP_EDITION=self-hosted
 _APP_LOCALE=en
-_APP_WORKER_PER_CORE=6
-_APP_COMPRESSION_MIN_SIZE_BYTES=1024
+_APP_WORKER_PER_CORE=2
 _APP_CONSOLE_WHITELIST_ROOT=disabled
 _APP_CONSOLE_WHITELIST_EMAILS=
-_APP_CONSOLE_SESSION_ALERTS=enabled
+_APP_CONSOLE_WHITELIST_CODES=code-zero,code-one
 _APP_CONSOLE_WHITELIST_IPS=
-_APP_CONSOLE_COUNTRIES_DENYLIST=AQ
-_APP_CONSOLE_HOSTNAMES=localhost,appwrite.io,*.appwrite.io
+_APP_CONSOLE_INVITES=enabled
 _APP_SYSTEM_EMAIL_NAME=Appwrite
-_APP_SYSTEM_EMAIL_ADDRESS=noreply@appwrite.io
-_APP_SYSTEM_TEAM_EMAIL=team@appwrite.io
-_APP_EMAIL_SECURITY=security@appwrite.io
-_APP_EMAIL_CERTIFICATES=certificates@appwrite.io
+_APP_SYSTEM_EMAIL_ADDRESS=team@appwrite.io
+_APP_SYSTEM_SECURITY_EMAIL_ADDRESS=security@appwrite.io
 _APP_SYSTEM_RESPONSE_FORMAT=
 _APP_OPTIONS_ABUSE=disabled
-_APP_OPTIONS_ROUTER_PROTECTION=disabled
 _APP_OPTIONS_FORCE_HTTPS=disabled
-_APP_OPTIONS_COMPUTE_FORCE_HTTPS=disabled
 _APP_OPENSSL_KEY_V1=your-secret-key
-_APP_DOMAIN=traefik
-_APP_DOMAIN_FUNCTIONS=functions.localhost
-_APP_DOMAIN_SITES=sites.localhost
-_APP_DOMAIN_TARGET=test.appwrite.io
-_APP_RULES_FORMAT=md5
+_APP_DOMAIN=demo.appwrite.io
+_APP_DOMAIN_TARGET=demo.appwrite.io
 _APP_REDIS_HOST=redis
 _APP_REDIS_PORT=6379
 _APP_REDIS_PASS=
@@ -35,84 +25,61 @@ _APP_DB_SCHEMA=appwrite
 _APP_DB_USER=user
 _APP_DB_PASS=password
 _APP_DB_ROOT_PASS=rootsecretpassword
-_APP_STORAGE_DEVICE=Local
-_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
-_APP_STORAGE_DO_SPACES_BUCKET=
-_APP_STORAGE_BACKBLAZE_ACCESS_KEY=
-_APP_STORAGE_BACKBLAZE_SECRET=
-_APP_STORAGE_BACKBLAZE_REGION=us-west-004
-_APP_STORAGE_BACKBLAZE_BUCKET=
-_APP_STORAGE_LINODE_ACCESS_KEY=
-_APP_STORAGE_LINODE_SECRET=
-_APP_STORAGE_LINODE_REGION=eu-central-1
-_APP_STORAGE_LINODE_BUCKET=
-_APP_STORAGE_WASABI_ACCESS_KEY=
-_APP_STORAGE_WASABI_SECRET=
-_APP_STORAGE_WASABI_REGION=eu-central-1
-_APP_STORAGE_WASABI_BUCKET=
+_APP_CONNECTIONS_MAX=3100
+_APP_POOL_CLIENTS=14
+_APP_CONNECTIONS_DB_REPLICAS=db_fra1_02=mariadb://root:rootsecretpassword@mariadb:3306/appwrite
+_APP_CONNECTIONS_DB_PROJECT=db_fra1_02=mariadb://user:password@mariadb:3306/appwrite
+_APP_CONNECTIONS_DB_CONSOLE=db_fra1_01=mariadb://user:password@mariadb:3306/appwrite
+_APP_CONNECTIONS_CACHE=redis_fra1_01=redis://redis:6379
+_APP_CONNECTIONS_QUEUE=redis_fra1_01=redis://redis:6379
+_APP_CONNECTIONS_PUBSUB=redis_fra1_01=redis://redis:6379
+_APP_CONNECTIONS_STORAGE=local://localhost
 _APP_STORAGE_ANTIVIRUS=disabled
 _APP_STORAGE_ANTIVIRUS_HOST=clamav
 _APP_STORAGE_ANTIVIRUS_PORT=3310
+_APP_INFLUXDB_HOST=influxdb
+_APP_INFLUXDB_PORT=8086
+_APP_STATSD_HOST=telegraf
+_APP_STATSD_PORT=8125
 _APP_SMTP_HOST=maildev
 _APP_SMTP_PORT=1025
 _APP_SMTP_SECURE=
 _APP_SMTP_USERNAME=
 _APP_SMTP_PASSWORD=
+_APP_USERS_STATS_RECIPIENTS=
+_APP_HAMSTER_INTERVAL=86400
+_APP_HAMSTER_TIME=21:00
+_APP_MIXPANEL_TOKEN=
 _APP_SMS_PROVIDER=sms://username:password@mock
 _APP_SMS_FROM=+123456789
-_APP_SMS_PROJECTS_DENY_LIST=
 _APP_STORAGE_LIMIT=30000000
 _APP_STORAGE_PREVIEW_LIMIT=20000000
-_APP_COMPUTE_SIZE_LIMIT=30000000
-_APP_COMPUTE_TIMEOUT=900
-_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_FUNCTIONS_SIZE_LIMIT=30000000
+_APP_FUNCTIONS_TIMEOUT=900
+_APP_FUNCTIONS_BUILD_TIMEOUT=900
+_APP_FUNCTIONS_CPUS=1
+_APP_FUNCTIONS_MEMORY=512
+_APP_FUNCTIONS_INACTIVE_THRESHOLD=600
+_APP_FUNCTIONS_MAINTENANCE_INTERVAL=600
+_APP_FUNCTIONS_RUNTIMES_NETWORK=runtimes
 _APP_EXECUTOR_SECRET=your-secret-key
 _APP_EXECUTOR_HOST=http://exc1/v1
-_APP_FUNCTIONS_RUNTIMES=php-8.0,node-18.0,python-3.9,ruby-3.1
-_APP_SITES_RUNTIMES=static-1,node-22,flutter-3.29
-_APP_SITES_FRAMEWORKS=sveltekit,nextjs,nuxt,astro,remix,flutter,other,react,vue,analog,angular,vite
+_APP_FUNCTIONS_RUNTIMES=
 _APP_MAINTENANCE_INTERVAL=86400
-_APP_MAINTENANCE_DELAY=
 _APP_MAINTENANCE_RETENTION_CACHE=2592000
 _APP_MAINTENANCE_RETENTION_EXECUTION=1209600
 _APP_MAINTENANCE_RETENTION_ABUSE=86400
 _APP_MAINTENANCE_RETENTION_AUDIT=1209600
-_APP_USAGE_AGGREGATION_INTERVAL=30
-_APP_STATS_RESOURCES_INTERVAL=3600
-_APP_MAINTENANCE_RETENTION_USAGE_HOURLY=8640000
 _APP_MAINTENANCE_RETENTION_SCHEDULES=86400
+_APP_MAINTENANCE_RETENTION_USAGE_HOURLY=8640000
 _APP_USAGE_STATS=enabled
+_APP_USAGE_AGGREGATION_INTERVAL=30
+_APP_LOGGING_PROVIDER=
 _APP_LOGGING_CONFIG=
-_APP_GRAPHQL_MAX_BATCH_SIZE=10
-_APP_GRAPHQL_MAX_COMPLEXITY=250
-_APP_GRAPHQL_MAX_DEPTH=4
+_APP_REGION=default
 _APP_DOCKER_HUB_USERNAME=
 _APP_DOCKER_HUB_PASSWORD=
-_APP_VCS_GITHUB_APP_NAME=
-_APP_VCS_GITHUB_PRIVATE_KEY=disabled
-_APP_VCS_GITHUB_APP_ID=
-_APP_VCS_GITHUB_CLIENT_ID=
-_APP_VCS_GITHUB_CLIENT_SECRET=
-_APP_VCS_GITHUB_WEBHOOK_SECRET=
-_APP_MIGRATIONS_FIREBASE_CLIENT_ID=
-_APP_MIGRATIONS_FIREBASE_CLIENT_SECRET=
-_APP_ASSISTANT_OPENAI_API_KEY=
-_APP_MESSAGE_SMS_TEST_DSN=
-_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
+_APP_CONSOLE_GITHUB_SECRET=
+_APP_CONSOLE_GITHUB_APP_ID=
+_DO_SPACES_BUCKET_NAME=backups-v1
+_DO_SPACES_REGION=fra1

.gitattributes

@@ -1,7 +1,28 @@
-app/config/** linguist-detectable=false
-app/views/** linguist-detectable=false
-app/controllers/** linguist-detectable=false
-src/** linguist-detectable=false
-tests/** linguist-detectable=false
-public/scripts/** linguist-detectable=false
-public/dist/scripts/** linguist-detectable=false
+app/config/* linguist-detectable=false
+app/config/*/* linguist-detectable=false
+app/config/*/*/* linguist-detectable=false
+app/config/*/*/*/* linguist-detectable=false
+app/views/* linguist-detectable=false
+app/views/*/* linguist-detectable=false
+app/views/*/*/* linguist-detectable=false
+app/views/*/*/*/* linguist-detectable=false
+app/controllers/* linguist-detectable=false
+app/controllers/*/* linguist-detectable=false
+app/controllers/*/*/* linguist-detectable=false
+app/controllers/*/*/*/* linguist-detectable=false
+app/controllers/*/*/*/*/* linguist-detectable=false
+src/* linguist-detectable=false
+src/*/* linguist-detectable=false
+src/*/*/* linguist-detectable=false
+src/*/*/*/* linguist-detectable=false
+src/*/*/*/*/* linguist-detectable=false
+tests/* linguist-detectable=false
+tests/*/* linguist-detectable=false
+tests/*/*/* linguist-detectable=false
+tests/*/*/*/* linguist-detectable=false
+tests/*/*/*/*/* linguist-detectable=false
+tests/*/*/*/*/*/* linguist-detectable=false
+public/scripts/* linguist-detectable=false
+public/scripts/*/*/* linguist-detectable=false
+public/scripts/*/*/*/* linguist-detectable=false
+public/dist/scripts/* linguist-detectable=false

.github/PULL_REQUEST_TEMPLATE.md

@@ -11,17 +11,21 @@ Happy contributing!
 
 ## What does this PR do?
 
-(Provide a description of what this PR does and why it's needed.)
+(Provide a description of what this PR does.)
 
 ## Test Plan
 
-(Write your test plan here. If you changed any code, please provide us with clear instructions on how you verified your changes work. Screenshots may also be helpful.)
+(Write your test plan here. If you changed any code, please provide us with clear instructions on how you verified your changes work.)
 
 ## Related PRs and Issues
 
-- (Related PR or issue)
+(If this PR is related to any other PR or resolves any issue or related to any issue link all related PR and issues here.)
 
-## Checklist
+### Have you added your change to the [Changelog](https://github.com/appwrite/appwrite/blob/master/CHANGES.md)?
 
-- [ ] Have you read the [Contributing Guidelines on issues](https://github.com/appwrite/appwrite/blob/master/CONTRIBUTING.md)?
-- [ ] If the PR includes a change to an API's metadata (desc, label, params, etc.), does it also include updated API specs and example docs?
+(The CHANGES.md file tracks all the changes that make it to the `main` branch. Add your change to this file in the following format)
+- One line description of your PR [#pr_number](Link to your PR)
+
+### Have you read the [Contributing Guidelines on issues](https://github.com/appwrite/appwrite/blob/master/CONTRIBUTING.md)?
+
+(Write your answer here.)

.github/workflows/check-dependencies.yml

@@ -1,19 +0,0 @@
-name: Check dependencies
-
-# Adapted from https://google.github.io/osv-scanner/github-action/#scan-on-pull-request
-
-on:
-  pull_request:
-    branches: [main, 1.*.x]
-  merge_group:
-    branches: [main, 1.*.x]
-
-permissions:
-  # Require writing security events to upload SARIF file to security tab
-  security-events: write
-  # Only need to read contents
-  contents: read
-
-jobs:
-  scan-pr:
-    uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable.yml@v1.7.1"

.github/workflows/cleanup-cache.yml

@@ -1,39 +0,0 @@
-name: Cleanup Cache
-
-on:
-  pull_request:
-    types:
-      - closed
-
-jobs:
-  cleanup:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v3
-        
-      - name: Cleanup
-        run: |
-          gh extension install actions/gh-actions-cache
-          
-          REPO=${{ github.repository }}
-          BRANCH="refs/pull/${{ github.event.pull_request.number }}/merge"
-
-          while true
-          do
-            cacheKeysForPR=$(gh actions-cache list -R $REPO -B $BRANCH -L 100 | cut -f 1 )
-
-            if [ -z "$cacheKeysForPR" ]
-            then
-              break
-            fi
-
-            ## Setting this to not fail the workflow while deleting cache keys. 
-            set +e
-            for cacheKey in $cacheKeysForPR
-            do
-              gh actions-cache delete $cacheKey -R $REPO -B $BRANCH --confirm
-            done
-          done
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/codeql-analysis.yml

@@ -1,9 +1,5 @@
 name: "CodeQL"
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 on:
   push:
     branches: [master]
@@ -13,13 +9,8 @@ on:
   schedule:
     - cron: '0 16 * * 0'
 
-permissions:
-  contents: read
-
 jobs:
   analyze:
-    permissions:
-      security-events: write
     name: Analyze
     runs-on: ubuntu-latest
 
@@ -34,7 +25,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.
@@ -47,14 +38,14 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v1
       with:
         languages: ${{ matrix.language }}
 
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v1
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -68,4 +59,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v1

.github/workflows/linter.yml

@@ -1,9 +1,5 @@
 name: "Linter"
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 on: [pull_request]
 jobs:
   lint:
@@ -18,10 +14,6 @@ jobs:
 
     - run: git checkout HEAD^2
 
-    - name: Validate composer.json and composer.lock
-      run: |
-        docker run --rm -v $PWD:/app composer sh -c \
-        "composer validate"
     - name: Run Linter
       run: |
         docker run --rm -v $PWD:/app composer sh -c \

.github/workflows/nightly.yml

@@ -1,47 +0,0 @@
-name: Nightly Security Scan
-on:
-  schedule:
-    - cron: '0 0 * * *'  # 12am UTC daily runtime
-  workflow_dispatch:
-
-jobs:
-  scan-image:
-    name: Scan Docker Image
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-      - name: Build the Docker image
-        run: docker build . -t appwrite_image:latest
-      - name: Run Trivy vulnerability scanner on image
-        uses: aquasecurity/trivy-action@0.20.0
-        with:
-          image-ref: 'appwrite_image:latest'
-          format: 'sarif'
-          output: 'trivy-image-results.sarif'
-          ignore-unfixed: 'false'
-          severity: 'CRITICAL,HIGH'
-      - name: Upload Docker Image Scan Results
-        uses: github/codeql-action/upload-sarif@v2
-        with:
-          sarif_file: 'trivy-image-results.sarif'
-
-  scan-code:
-    name: Scan Code
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v4
-      - name: Run Trivy vulnerability scanner on filesystem
-        uses: aquasecurity/trivy-action@0.20.0
-        with:
-          scan-type: 'fs'
-          format: 'sarif'
-          output: 'trivy-fs-results.sarif'
-          severity: 'CRITICAL,HIGH'
-      - name: Upload Code Scan Results
-        uses: github/codeql-action/upload-sarif@v2
-        with:
-          sarif_file: 'trivy-fs-results.sarif'

.github/workflows/pr-scan.yml

@@ -1,105 +0,0 @@
-name: PR Security Scan
-on: 
-  pull_request_target:
-    types: [opened, synchronize, reopened]
- 
-jobs:
-  scan:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      pull-requests: write
-    steps:
-    - name: Check out code 
-      uses: actions/checkout@v4
-      with:
-        ref: ${{ github.event.pull_request.head.sha }}
-        fetch-depth: 0
-        submodules: 'recursive'
-
-    - name: Build the Docker image
-      uses: docker/build-push-action@v5
-      with: 
-        context: .
-        push: false
-        load: true
-        tags: pr_image:${{ github.sha }}
-
-    - name: Run Trivy vulnerability scanner on image
-      uses: aquasecurity/trivy-action@0.20.0
-      with:
-        image-ref: 'pr_image:${{ github.sha }}'
-        format: 'json'
-        output: 'trivy-image-results.json'
-        severity: 'CRITICAL,HIGH'
-
-    - name: Run Trivy vulnerability scanner on source code
-      uses: aquasecurity/trivy-action@0.20.0
-      with:
-        scan-type: 'fs'
-        scan-ref: '.'
-        format: 'json'
-        output: 'trivy-fs-results.json'
-        severity: 'CRITICAL,HIGH'
-
-    - name: Process Trivy scan results
-      id: process-results
-      uses: actions/github-script@v7
-      with:
-        script: |
-          const fs = require('fs');
-          let commentBody = '## Security Scan Results for PR\n\n';
-          
-          function processResults(results, title) {
-            let sectionBody = `### ${title}\n\n`;
-            if (results.Results && results.Results.some(result => result.Vulnerabilities && result.Vulnerabilities.length > 0)) {
-              sectionBody += '| Package | Version | Vulnerability | Severity |\n';
-              sectionBody += '|---------|---------|----------------|----------|\n';
-              
-              const uniqueVulns = new Set();
-              results.Results.forEach(result => {
-                if (result.Vulnerabilities) {
-                  result.Vulnerabilities.forEach(vuln => {
-                    const vulnKey = `${vuln.PkgName}-${vuln.InstalledVersion}-${vuln.VulnerabilityID}`;
-                    if (!uniqueVulns.has(vulnKey)) {
-                      uniqueVulns.add(vulnKey);
-                      sectionBody += `| ${vuln.PkgName} | ${vuln.InstalledVersion} | [${vuln.VulnerabilityID}](https://nvd.nist.gov/vuln/detail/${vuln.VulnerabilityID}) | ${vuln.Severity} |\n`;
-                    }
-                  });
-                }
-              });
-            } else {
-              sectionBody += '🎉 No vulnerabilities found!\n';
-            }
-            return sectionBody;
-          }
-          
-          try {
-            const imageResults = JSON.parse(fs.readFileSync('trivy-image-results.json', 'utf8'));
-            const fsResults = JSON.parse(fs.readFileSync('trivy-fs-results.json', 'utf8'));
-            
-            commentBody += processResults(imageResults, "Docker Image Scan Results");
-            commentBody += '\n';
-            commentBody += processResults(fsResults, "Source Code Scan Results");
-            
-          } catch (error) {
-            commentBody += `There was an error while running the security scan: ${error.message}\n`;
-            commentBody += 'Please contact the core team for assistance.';
-          }
-          
-          core.setOutput('comment-body', commentBody);
-    - name: Find Comment
-      uses: peter-evans/find-comment@v3
-      id: fc
-      with:
-        issue-number: ${{ github.event.pull_request.number }}
-        comment-author: 'github-actions[bot]'
-        body-includes: Security Scan Results for PR
-
-    - name: Create or update comment
-      uses: peter-evans/create-or-update-comment@v3
-      with:
-        issue-number: ${{ github.event.pull_request.number }}
-        comment-id: ${{ steps.fc.outputs.comment-id }}
-        body: ${{ steps.process-results.outputs.comment-body }}
-        edit-mode: replace

.github/workflows/publish.yml

@@ -1,9 +1,9 @@
-name: "Build and Publish Appwrite Images for Cloud"
+name: "Build and Publish"
 
 on:
   push:
     tags:
-      - cl-*
+      - appwrite-*
 
 jobs:
   build-publish:
@@ -16,12 +16,7 @@ jobs:
       with:
         fetch-depth: 2
         submodules: recursive
-
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v3
-
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
+        ref: feat-db-pools-master
 
     - name: Login to Docker Hub
       uses: docker/login-action@v2
@@ -41,11 +36,11 @@ jobs:
       uses: docker/build-push-action@v4
       with:
         context: .
-        platforms: linux/amd64,linux/arm64
+        platforms: linux/amd64
         build-args: |
           VERSION=${{ steps.meta.outputs.version }}
           VITE_APPWRITE_GROWTH_ENDPOINT=https://growth.appwrite.io/v1
           VITE_GA_PROJECT=G-L7G2B6PLDS
           VITE_CONSOLE_MODE=cloud
         push: true
-        tags: ${{ steps.meta.outputs.tags }}
+        tags: ${{ steps.meta.outputs.tags }}

.github/workflows/release.yml

@@ -1,53 +0,0 @@
-name: "Release"
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  tests:
-    name: Release
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
-      with:
-        # We must fetch at least the immediate parents so that if this is
-        # a pull request then we can checkout the head.
-        fetch-depth: 2
-        # Fetch submodules
-        submodules: recursive
-
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v2
-
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
-
-    - name: Login to Docker Hub
-      uses: docker/login-action@v2
-      with:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-    - name: Extract metadata (tags, labels) for Docker
-      id: meta
-      uses: docker/metadata-action@v4
-      with:
-        images: appwrite/appwrite
-        tags: |
-          type=semver,pattern={{major}}.{{minor}}.{{patch}}
-          type=semver,pattern={{major}}.{{minor}}
-          type=semver,pattern={{major}}
-
-    - name: Build and push
-      uses: docker/build-push-action@v4
-      with:
-        context: .
-        platforms: linux/amd64,linux/arm64
-        build-args: |
-          VERSION=${{ steps.meta.outputs.version }}
-        push: true
-        tags: ${{ steps.meta.outputs.tags }}
-        labels: ${{ steps.meta.outputs.labels }}

.github/workflows/sdk-preview.yml

@@ -1,33 +0,0 @@
-name: "Console SDK Preview"
-
-on:
-  pull_request:
-    paths:
-      - 'app/config/specs/*-latest-console.json'
-
-
-jobs:
-  setup:
-    name: Setup & Build Console SDK
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        
-      - name: Load and Start Appwrite
-        run: |
-          docker compose build
-          docker compose up -d
-          docker compose exec appwrite sdks --platform=console --sdk=web --version=latest --git=no
-          sudo chown -R $USER:$USER ./app/sdks/console-web
-          
-      - 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/stale.yml

@@ -1,23 +0,0 @@
-name: Mark stale issues
-
-on:
-  schedule:
-    - cron: "0 0 * * *"  # Midnight Runtime
-
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/stale@v9
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          stale-issue-message: "This issue has been labeled as a 'question', indicating that it requires additional information from the requestor. It has been inactive for 7 days. If no further activity occurs, this issue will be closed in 14 days."
-          stale-issue-label: "stale"
-          days-before-stale: 7
-          days-before-close: 14
-          remove-stale-when-updated: true
-          close-issue-message: "This issue has been closed due to inactivity. If you still require assistance, please provide the requested information."
-          close-issue-reason: "not_planned"
-          operations-per-run: 100
-          only-labels: "question"

.github/workflows/static-analysis.yml

@@ -1,16 +0,0 @@
-name: "Static code analysis"
-
-on: [pull_request]
-jobs:
-  lint:
-    name: CodeQL
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Check out the repo
-      uses: actions/checkout@v2
-
-    - name: Run CodeQL
-      run: |
-        docker run --rm -v $PWD:/app composer:2.6 sh -c \
-        "composer install --profile --ignore-platform-reqs && composer check"

.github/workflows/tests.yml

@@ -1,352 +1,44 @@
 name: "Tests"
 
-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 ]
-
+on: [pull_request]
 jobs:
-  check_database_changes:
-    name: Check if utopia-php/database changed
+  tests:
+    name: Unit & E2E
     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@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
-
-  unit_test:
-    name: Unit Test
-    runs-on: ubuntu-latest
-    needs: setup
 
     steps:
-      - name: checkout
-        uses: actions/checkout@v4
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        # We must fetch at least the immediate parents so that if this is
+        # a pull request then we can checkout the head.
+        fetch-depth: 2
+        # Fetch submodules
+        submodules: recursive
 
-      - name: Load Cache
-        uses: actions/cache@v4
-        with:
-          key: ${{ env.CACHE_KEY }}
-          path: /tmp/${{ env.IMAGE }}.tar
-          fail-on-cache-miss: true
+    # If this run was triggered by a pull request event, then checkout
+    # the head of the pull request instead of the merge commit.
+    - run: git checkout HEAD^2
+      if: ${{ github.event_name == 'pull_request' }}
 
-      - name: Load and Start Appwrite
-        run: |
-          docker load --input /tmp/${{ env.IMAGE }}.tar
-          docker compose up -d
-          sleep 10
+    - name: Build Appwrite
+      # Upstream bug causes buildkit pulls to fail so prefetch base images
+      # https://github.com/moby/moby/issues/41864
+      run:  |
+        export COMPOSE_INTERACTIVE_NO_CLI
+        export DOCKER_BUILDKIT=1
+        export COMPOSE_DOCKER_CLI_BUILD=1
+        export BUILDKIT_PROGRESS=plain
+        docker pull composer:2.0
+        docker compose build appwrite
+        docker compose up -d
+        sleep 30
+    
+    - name: Doctor
+      run: docker compose exec -T appwrite doctor
 
-      - name: Logs
-        run: docker compose logs appwrite
+    - name: Environment Variables
+      run:  docker compose exec -T appwrite vars
 
-      - name: Doctor
-        run: docker compose exec -T appwrite doctor
-
-      - name: Environment Variables
-        run: docker compose exec -T appwrite vars
-
-      - name: Run Unit Tests
-        run: docker compose exec appwrite test /usr/src/code/tests/unit
-
-  e2e_general_test:
-    name: E2E General Test
-    runs-on: ubuntu-latest
-    needs: setup
-    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
-          docker compose up -d
-          sleep 10
-
-      - name: Run General Tests
-        run: docker compose exec -T appwrite test /usr/src/code/tests/e2e/General --debug
-
-  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,
-          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
-          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
-
-  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:
-        service:
-          [
-            Account,
-            Avatars,
-            Console,
-            Databases,
-            Functions,
-            FunctionsSchedule,
-            GraphQL,
-            Health,
-            Locale,
-            Projects,
-            Realtime,
-            Sites,
-            Proxy,
-            Storage,
-            Teams,
-            Users,
-            Webhooks,
-            VCS,
-            Messaging,
-            Migrations
-          ]
-        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
-          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 ${{ 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
-
-  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
-      - 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
-        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 -j > 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
+    - name: Run Tests
+      run: docker compose exec -T appwrite test --debug

.gitignore

@@ -3,18 +3,14 @@
 /node_modules/
 /tests/resources/storage/
 /tests/resources/functions/**/code.tar.gz
-/tests/resources/sites/**/code.tar.gz
 /app/sdks/*
 /.idea/
-!/.idea/workspace.xml
-!/.idea/php.xml
 .DS_Store
 .php_cs.cache
-.phpactor.json
 debug/
 app/sdks
 dev/yasd_init.php
 .phpunit.result.cache
-Makefile
-appwrite.json
-/.zed/
+/backup-data/
+/restore-data/
+/varlibmysql/

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "app/console"]
+	path = app/console
+	url = https://github.com/appwrite/console
+	branch = cloud-cards

.gitpod.yml

@@ -8,7 +8,7 @@ tasks:
     command: |
       docker run --rm --interactive --tty \
       --volume $PWD:/app \
-      composer install \
+      composer update \
       --ignore-platform-reqs \
       --optimize-autoloader \
       --no-plugins \
@@ -17,6 +17,7 @@ tasks:
 
 ports:
   - port: 8080
+    onOpen: open-preview
     visibility: public
 
 vscode:

CONTRIBUTING.md

@@ -1,23 +1,18 @@
 # Contributing
 
-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.
-
-You can [find issues using this query](https://github.com/search?q=org%3Aappwrite+is%3Aopen+type%3Aissue+label%3Ahacktoberfest&type=issues).
+We would ❤️ for 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, new docs as well as updates and tweaks, blog posts, workshops, and more.
 
 ## 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 on Twitter](https://twitter.com/appwrite) 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!
+If you are worried or don’t know where to start, check out our next section explaining what kind of help we could use and where can you get involved. You can reach out with questions to [Eldad Fux (@eldadfux)](https://twitter.com/eldadfux) or [@appwrite](https://twitter.com/appwrite) on Twitter, and anyone from the [Appwrite team on Discord](https://discord.gg/GSeTUeA). You can also submit an issue, and a maintainer can guide you!
 
 ## 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).
+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 :rocket:
+## Submit a Pull Request 🚀
 
-Branch naming convention is as following
+Branch naming convention is as follows
 
 `TYPE-ISSUE_ID-DESCRIPTION`
 
@@ -29,7 +24,7 @@ doc-548-submit-a-pull-request-section-to-contribution-guide
 
 When `TYPE` can be:
 
-- **feat** - a new feature
+- **feat** - is a new feature
 - **doc** - documentation only changes
 - **cicd** - changes related to CI/CD system
 - **fix** - a bug fix
@@ -45,27 +40,27 @@ For the initial start, fork the project and use git clone command to do
 $ git pull
 ```
 
-2. Create a new branch from `master` like: `doc-548-submit-a-pull-request-section-to-contribution-guide`.<br/>
+2. Create new branch from `master` like: `doc-548-submit-a-pull-request-section-to-contribution-guide`<br/>
 
 ```
 $ git checkout -b [name_of_your_new_branch]
 ```
 
-3. Work - commit - repeat (make sure you're on the correct branch!)
+3. Work - commit - repeat ( be sure to be in your branch )
 
-4. Before you push your changes, make sure your code follows the `PSR12` coding standards, which is the standard that Appwrite currently follows. You can easily do this by running the formatter.
+4. Before you push your changes, make sure your code follows the `PSR12` coding standards, which is the standard Appwrite follows currently. You can easily do this by running the formatter.
 
 ```bash
 composer format <your file path>
 ```
 
-Now, go a step further by running the linter using the following command to manually fix the issues the formatter wasn't able to.
+Now, go a step further by running the linter by the following command to manually fix the issues the formatter wasn't able to fix.
 
 ```bash
 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 [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.
+This will give you a list of errors for you to rectify, if there is an instance you need more information on the errors being displayed you can pass in additional command line arguments. More list 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.
 
 ```bash
 composer lint --report=diff <your file path>
@@ -81,23 +76,23 @@ $ git push origin [name_of_your_new_branch]
    If you go to your repository on GitHub, you'll see a `Compare & pull request` button. Click on that button.
 7. Start a Pull Request
    Now submit the pull request and click on `Create pull request`.
-8. Get a code review approval/reject.
-9. After approval, merge your PR.
+8. Get a code review approval/reject
+9. After approval, merge your PR
 10. GitHub will automatically delete the branch after the merge is done. (they can still be restored).
 
 ## Setup From Source
 
 To set up a working **development environment**, just fork the project git repository and install the backend and frontend dependencies using the proper package manager and create run the docker-compose stack.
 
-> If you just want to install Appwrite for day-to-day use and not as a contributor, you can reference the [installation guide](https://github.com/appwrite/appwrite#installation), the [getting started guide](https://appwrite.io/docs/quick-starts), or the main [README](README.md) file.
+> If you just want to install Appwrite for day-to-day usage and not as a code maintainer use this [installation guide](https://github.com/appwrite/appwrite#installation).
+
+Please note that these instructions are for setting a functional dev environment. If you want to set up an Appwrite instance to integrate into your app, you should probably try and install Appwrite by using the instructions in the [getting started guide](https://appwrite.io/docs/getting-started-for-web) or in the main [README](README.md) file.
 
 ```bash
 git clone git@github.com:[YOUR_FORK_HERE]/appwrite.git
 
 cd appwrite
 
-git submodule update --init
-
 docker compose build
 docker compose up -d
 ```
@@ -114,9 +109,7 @@ docker run --rm --interactive --tty \
 
 ### User Interface
 
-Appwrite's UI is built with [Svelte](https://svelte.dev/), [Svelte Kit](https://kit.svelte.dev/), and the [Pink Design](https://github.com/appwrite/pink) component library. You can find the source code in the [Appwrite Console](https://github.com/appwrite/console) repository.
-
-To contribute to the UI, head to the [Contribution Guide](https://github.com/appwrite/console/blob/main/CONTRIBUTING.md) of Appwrite Console.
+Appwrite uses an internal micro-framework called Litespeed.js to build simple UI components in vanilla JS and [less](http://lesscss.org/) for compiling CSS code. To apply any of your changes to the UI, use the `gulp build` or `gulp less` commands, and restart the Appwrite main container to load the new static files to memory using `docker compose restart appwrite`.
 
 ### Get Started
 
@@ -124,7 +117,7 @@ After finishing the installation process, you can start writing and editing code
 
 #### Advanced Topics
 
-We love to create issues that are good for beginners and label them as `good first issue` or `hacktoberfest`, but some more advanced topics might require extra knowledge. Below is a list of links you can use to learn about the more advanced topics that will help you master the Appwrite codebase.
+We love to create issues that are good for beginners and label them as `good first issue` or `hacktoberfest`, but some more advanced topics might require extra knowledge. Below is a list of links you can use to learn more about some of the more advanced topics that will help you master the Appwrite codebase.
 
 ##### Tools and Libs
 
@@ -148,14 +141,6 @@ Learn more at our [Technology Stack](#technology-stack) section.
 - [Microservices vs Monolithic](https://www.mulesoft.com/resources/api/microservices-vs-monolithic#:~:text=Microservices%20architecture%20vs%20monolithic%20architecture&text=A%20monolithic%20application%20is%20built%20as%20a%20single%20unit.&text=To%20make%20any%20alterations%20to,formally%20with%20business%2Doriented%20APIs.)
 - [MVVM](https://en.wikipedia.org/wiki/Model%E2%80%93view%E2%80%93viewmodel) - Appwrite console architecture
 
-##### Container Namespace Conventions
-To keep our services easy to understand within Docker we follow a naming convention for all our containers depending on it's intended use.
-
-`appwrite-worker-X` - Workers (`src/Appwrite/Platform/Workers/*`)
-`appwrite-task-X` - Tasks (`src/Appwrite/Platform/Tasks/*`)
-
-Other containes should be named the same as their service, for example `redis` should just be called `redis`.
-
 ##### Security
 
 - [Appwrite Auth and ACL](https://github.com/appwrite/appwrite/blob/master/docs/specs/authentication.drawio.svg)
@@ -163,31 +148,9 @@ 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.
+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, but our final goal, as we grow, is to be using only microservices.
 
 ---
 
@@ -225,17 +188,16 @@ Appwrite's current structure is a combination of both [Monolithic](https://en.wi
 ├── src # Supporting libraries (each lib has one role, common libs are released as individual projects)
 │   └── Appwrite
 │       ├── Auth
+│       ├── Database
 │       ├── Detector
 │       ├── Docker
-|       ├── DSN
 │       ├── Event
 │       ├── Extend
-│       ├── GraphQL
-│       ├── Messaging
 │       ├── Migration
 │       ├── Network
 │       ├── OpenSSL
-│       ├── Promises
+│       ├── Realtime
+│       ├── Resque
 │       ├── Specification
 │       ├── Task
 │       ├── Template
@@ -251,13 +213,13 @@ Appwrite's current structure is a combination of both [Monolithic](https://en.wi
 
 Appwrite's main API container is designed as a monolithic app. This is a decision we made to allow us to develop the project faster while still being a very small team.
 
-Although the Appwrite API is a monolithic app, it has a very clear separation of concern as each internal service or worker is separated by its container, which allows us to start breaking services for better maintenance and scalability as we grow.
+Although the Appwrite API is a monolithic app, it has a very clear separation of concern as each internal service or worker is separated by its container, which will allow us as we grow to start breaking services for better maintenance and scalability.
 
 ### The Microservice Part
 
 Each container in Appwrite is a microservice on its own. Each service is an independent process that can scale without regard to any of the other services.
 
-Currently, all the Appwrite microservices are intended to communicate using the TCP protocol over a private network. With the exception of the public-facing port 80 and 443, which by default are used to expose the Appwrite HTTP API, you should **avoid exposing any other services' ports**.
+Currently, all of the Appwrite microservices are intended to communicate using the TCP protocol over a private network. You should be aware to not expose any of the services to the public-facing network, besides the public port 80 and 443, who, by default, are used to expose the Appwrite HTTP API.
 
 ## Ports
 
@@ -265,42 +227,43 @@ Appwrite dev version uses ports 80 and 443 as an entry point to the Appwrite API
 
 ## Technology Stack
 
-To start helping us to improve the Appwrite server by submitting code, prior knowledge of Appwrite's technology stack can help you get started.
+To start helping us to improve the Appwrite server by submitting code, prior knowledge of Appwrite's technology stack can help you with getting started.
 
-Appwrite stack is a combination of a variety of open-source technologies and tools. Appwrite backend API is written primarily with PHP version 7 and above, on top of the [Utopia PHP framework](https://github.com/utopia-php/framework). The Appwrite frontend is built with tools like gulp, less, and [litespeed.js](https://github.com/litespeed-js). We use Docker as the container technology to package the Appwrite server for easy on-cloud, on-premise, or on-localhost integration.
+Appwrite stack is combined from a variety of open-source technologies and tools. Appwrite backend API is written primarily with PHP version 7 and above on top of the [Utopia PHP framework](https://github.com/utopia-php/framework). The Appwrite frontend is built with tools like gulp, less, and [litespeed.js](https://github.com/litespeed-js). We use Docker as the container technology to package the Appwrite server for easy integration on-cloud, on-premise, or on-localhosts.
 
 ### Other Technologies
 
-- Redis - for managing cache and in-memory data (currently, we do not use Redis for persistent data).
-- MariaDB - for database storage and queries.
+- Redis - for managing cache and in-memory data (currently, we do not use Redis for persistent data)
+- MariaDB - for database storage and queries
 - InfluxDB - for managing stats and time-series based data
 - Statsd - for sending data over UDP protocol (using Telegraf)
-- ClamAV - for validating and scanning storage files.
+- ClamAV - for validating and scanning storage files
 - Imagemagick - for manipulating and managing image media files.
-- Webp - for better compression of images on supporting clients.
-- SMTP - for sending email messages and alerts.
+- Webp - for better compression of images on supporting clients
+- SMTP - for sending email messages and alerts
+- Resque - for managing data queues and scheduled tasks over a Redis server
 
 ## Package Managers
 
-Appwrite uses a package manager for managing code dependencies for both backend and frontend development. We try our best to avoid creating any unnecessary dependencies. New dependency to the project is subjected to a lead developer's review and approval.
+Appwrite uses a package manager for managing code dependencies for both backend and frontend development. We try our best to avoid creating any unnecessary, and any new dependency to the project is subjected to a lead developer review and approval.
 
-Many of Appwrite's internal modules are also used as dependencies to allow other Appwrite projects to reuse them and as a way to contribute back to the community.
+Many of Appwrite's internal modules are also used as dependencies to allow other Appwrite's projects to reuse them and as a way to contribute them back to the community.
 
 Appwrite uses [PHP's Composer](https://getcomposer.org/) for managing dependencies on the server-side and [JS NPM](https://www.npmjs.com/) for managing dependencies on the frontend side.
 
 ## Coding Standards
 
-Appwrite follows the [PHP-FIG standards](https://www.php-fig.org/). Currently, we use both PSR-0 and PSR-12 for coding standards and autoloading standards.
+Appwrite is following the [PHP-FIG standards](https://www.php-fig.org/). Currently, we are using both PSR-0 and PSR-12 for coding standards and autoloading standards.
 
-We use prettier for our JS coding standards and auto-formatting for our code.
+We use prettier for our JS coding standards and auto-formatting our code.
 
 ## Scalability, Speed, and Performance
 
 Appwrite is built to scale. Please keep in mind that the Appwrite stack can run in different environments and different scales.
 
-We intend Appwrite to be as easy to set up as possible in a single localhost, and to grow easily into a large environment with dozens and even hundreds of instances.
+We wish Appwrite will be as easy to set up and in a single, localhost, and easy to grow to a large environment with dozens and even hundreds of instances.
 
-When contributing code, please take into account the following:
+When contributing code, please take into account the following considerations:
 
 - Response Time
 - Throughput
@@ -311,165 +274,25 @@ When contributing code, please take into account the following:
 - Background Jobs
 - Task Execution Time
 
-## Security and Privacy
+## Security & Privacy
 
 Security and privacy are extremely important to Appwrite, developers, and users alike. Make sure to follow the best industry standards and practices.
 
 ## Dependencies
 
-Please avoid introducing new dependencies to Appwrite without consulting the team. New dependencies can be very helpful, but they also introduce new security and privacy risks, add complexity, and impact the total docker image size.
+Please avoid introducing new dependencies to Appwrite without consulting the team. New dependencies can be very helpful but also introduce new security and privacy issues, complexity, and impact total docker image size.
 
-Adding a new dependency should have vital value for the product with minimum possible risk.
+Adding a new dependency should have vital value on the product with minimum possible risk.
 
 ## Introducing New Features
 
-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:.
+We would 💖 you to contribute to Appwrite, but we would also like to make sure Appwrite is as great as possible and loyal to its vision and mission statement 🙏.
 
 For us to find the right balance, please open an issue explaining your ideas before introducing a new pull request.
 
-This will allow the Appwrite community to sufficiently discuss the new feature value and how it fits within the product roadmap and vision.
-
-This is also important for the Appwrite lead developers to be able to provide technical input and potentially a different emphasis regarding the feature design and architecture. Some bigger features might need to go through our [RFC process](https://github.com/appwrite/rfc).
-
-## Adding New Usage Metrics
-
-These are the current metrics we collect usage stats for:
-
-| Metric | Description                                       |
-|--------|-------------------------------------------------|
-| teams  | Total number of teams per project |
-| 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)                  |
-| functions | Total number of functions per project             |
-| deployments | Total number of deployments per project           |
-| builds | Total number of builds per project                |
-| {resourceType}.{resourceInternalId}.deployments | Total number of deployments per function           |
-| executions | Total number of executions per project |
-| {functionInternalId}.executions | Total number of executions per function  |
-| files.storage | Sum of files storage per project  (in bytes)      | 
-| deployments.storage | Sum of deployments storage per project (in bytes) |
-| {resourceType}.{resourceInternalId}.deployments.storage | Sum of deployments storage per function (in bytes)         |
-| builds.storage | Sum of builds storage per project (in bytes)      |
-| builds.compute | Sum of compute duration per project (in seconds)  |
-| {functionInternalId}.builds.storage | Sum of builds storage per function (in bytes)              |
-| {functionInternalId}.builds.compute | Sum of compute duration per function (in seconds) |
-| network.requests | Total number of network requests per project |
-| executions.compute | Sum of compute duration per project (in seconds) |
-| network.inbound | Sum of network inbound traffic per project (in bytes)|
-| network.outbound | Sum of network outbound traffic per project (in bytes)|
-
-> Note: The curly brackets in the metric name represents a template and is replaced with a value when the metric is processed.
-
-Metrics are collected within 3 scopes Daily, monthly, an infinity. Adding new usage metric in order to aggregate usage stats is very simple, but very much dependent on where do you want to collect
-statistics ,via API or via background worker. For both cases you will need to add a `const` variable in `app/init.php` under the usage metrics list using the naming convention `METRIC_<RESOURCE_NAME>` as shown below.
-
-```php
-// Usage metrics
-const METRIC_FUNCTIONS  = 'functions';
-const METRIC_DEPLOYMENTS  = 'deployments';
-const METRIC_DEPLOYMENTS_STORAGE  = 'deployments.storage';
-```
-
-Next follow the appropriate steps below depending on whether you're adding the metric to the API or the worker. 
-
-**API**
-
-In file `app/controllers/shared/api.php` On the database listener, add to an existing or create a new switch case. Add a call to the usage worker with your new metric const like so:
-
-```php
-      case $document->getCollection() === 'teams':
-            $queueForStatsUsage
-                ->addMetric(METRIC_TEAMS, $value); // per project
-            break;
-```
-There are cases when you need to handle metric that has a parent entity, like buckets.
-Files are linked to a parent bucket, you should verify you remove the files stats when you delete a bucket.
-
-In that case you need also to handle children removal using addReduce() method call.
-
-```php
-
- case $document->getCollection() === 'buckets': //buckets
-            $queueForStatsUsage
-                ->addMetric(METRIC_BUCKETS, $value); // per project
-            if ($event === Database::EVENT_DOCUMENT_DELETE) {
-                $queueForStatsUsage
-                    ->addReduce($document);
-            }
-            break;
-  
-```
-
-In addition, you will also need to add some logic to the `reduce()` method of the Usage worker located in `/src/Appwrite/Platform/Workers/Usage.php`, like so:
-
-```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)));
-
-       if (!empty($files['value'])) {
-           $metrics[] = [
-              'key' => METRIC_FILES,
-              'value' => ($files['value'] * -1),
-           ];
-        }
-
-        if (!empty($storage['value'])) {
-           $metrics[] = [
-              'key' => METRIC_FILES_STORAGE,
-              'value' => ($storage['value'] * -1),
-             ];
-         }
-       break;
-```
-
-**Background worker**
-
-You need to inject the usage queue in the desired worker on the constructor method
-```php
-/**
-* @throws Exception
-*/
-public function __construct()
-{
-   $this
-      ->desc('Functions worker')
-      ->groups(['functions'])
-      ->inject('message')
-      ->inject('dbForProject')
-      ->inject('queueForFunctions')
-      ->inject('queueForEvents')
-      ->inject('queueForStatsUsage')
-      ->inject('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
-$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)
-  ->setProject($project)
-  ->trigger();
-```
+This will allow the Appwrite community to have sufficient discussion about the new feature value and how it fits in the product roadmap and vision.
 
+This is also important for the Appwrite lead developers to be able to give technical input and different emphasis regarding the feature design and architecture. Some bigger features might need to go through our [RFC process](https://github.com/appwrite/rfc).
 
 ## Build
 
@@ -493,46 +316,30 @@ The Runtimes for all supported cloud functions (multicore builds) can be found a
 
 ## Generate SDK
 
-The following steps are used to generate a new console SDK:
+For generating a new console SDK follow the next steps:
 
-1. Update the console spec file located at `app/config/specs/swagger2-<version-number>.console.json` using Appwrite Tasks. Run the `php app/cli.php specs version=<version-number> mode=normal` command in a running `appwrite/appwrite` container.
-2. Generate a new SDK using the command `php app/cli.php sdks`.
-3. Change your working dir using `cd app/sdks/console-web`.
-4. Build the new SDK `npm run build`.
-5. Copy `iife/sdk.js` to `appwrite.js`.
-6. Go back to the root of the project `run npm run build`.
+1. Update the console spec file located at `app/config/specs/swagger2-<version-number>.console.json` using Appwrite Tasks. Run the `php app/cli.php specs <version-number> normal` command in a running `appwrite/appwrite` container.
+2. Generate a new SDK using the command `php app/cli.php sdks`
+3. Change your working dir using `cd app/sdks/console-web`
+4. Build the new SDK `npm run build`
+5. Copy `iife/sdk.js` to `appwrite.js`
+6. Go back to the root of the project `run npm run build`
 
 ## Checklist for Releasing SDKs
 
-Things to remember when releasing SDKs:
+Things to remember when releasing SDKs
 
-- Update the Changelogs in **docs/sdks** (right now only Dart and Flutter are using these).
-- Update **GETTING_STARTED.md** in **docs/sdks** for each SDKs if any changes in the related APIs are in there.
-- Update SDK versions as required on **app/config/platforms.php**.
-- Generate SDKs using the command `php app/cli.php sdks` and follow the instructions.
-- Release new tags on GitHub repository for each SDK.
+- Update the Changelogs in **docs/sdks** (right now only Dart and Flutter are using these)
+- Update **GETTING_STARTED.md** in **docs/sdks** for each SDKs if any changes in the related APIs in there
+- Update SDK versions as required on **app/config/platforms.php**
+- Generate SDKs using the command `php app/cli.php sdks` and follow the instructions
+- Release new tags on GitHub repository for each SDKs
 
 ## Debug
 
-Appwrite uses [XDebug](https://github.com/xdebug/xdebug) debugger, which can be made available during build of Appwrite. You can connect to the debugger using VS Code's [PHP Debug](https://marketplace.visualstudio.com/items?itemName=felixfbecker.php-debug) extension.
+Appwrite uses [yasd](https://github.com/swoole/yasd) debugger, which can be made available during build of Appwrite. You can connect to the debugger using VS Code [PHP Debug](https://marketplace.visualstudio.com/items?itemName=felixfbecker.php-debug) extension or if you are in PHP Storm you don't need any plugin. Below are the settings required for remote debugger connection.
 
-If you are in PHP Storm you don't need any plugin. Below are the settings required for remote debugger connection:
-
-1. Set **DEBUG** build arg in **appwrite** service in **docker-compose.yml** file.
-2. If needed edit the **dev/xdebug.ini** file to your needs.
-3. Launch your Appwrite instance while your debugger is listening for connections.
-
-## Profiling
-Appwrite uses XDebug [Profiler](https://xdebug.org/docs/profiler) for generating **CacheGrind** files. The generated file would be located in each of the `appwrite` containers inside the `/tmp/xdebug` folder.
-
-To disable the profiler while debugging remove the `,profiler` mode from the `xdebug.ini` file
-```diff
-zend_extension=xdebug
-
-[xdebug]
--xdebug.mode=develop,debug,profile
-+xdebug.mode=develop,debug
-```
+First, you need to create an init file. Duplicate **dev/yasd_init.php.stub** file and name it **dev/yasd_init.php** and then change the IP address to your development machine's IP. Without the proper IP address debugger won't connect. And you also need to set **DEBUG** build arg in **appwrite** service in **docker-compose.yml** file.
 
 ### VS Code Launch Configuration
 
@@ -550,7 +357,7 @@ zend_extension=xdebug
 
 ### PHPStorm Setup
 
-In settings, go to **Languages & Frameworks** > **PHP** > **Debug**, under **Xdebug** set the debug port to **9005** and enable the **can accept external connections** checkbox.
+In settings, go to **Languages & Frameworks** > **PHP** > **Debug**, there under **Xdebug** set the debug port to **9005** and enable **can accept external connections** checkbox.
 
 ## Tests
 
@@ -578,12 +385,6 @@ To run end-2-end tests for a specific service use:
 docker compose exec appwrite test /usr/src/code/tests/e2e/Services/[ServiceName]
 ```
 
-To run one specific test:
-
-```bash
-docker compose exec appwrite vendor/bin/phpunit --filter [FunctionName]
-```
-
 ## Benchmarking
 
 You can use WRK Docker image to benchmark the server performance. Benchmarking is extremely useful when you want to compare how the server behaves before and after a change has been applied. Replace [APPWRITE_HOSTNAME_OR_IP] with your Appwrite server hostname or IP. Note that localhost is not accessible from inside the WRK container.
@@ -627,59 +428,39 @@ composer lint
 composer lint <your file path>
 ```
 
-## Clearing the Cache
-
-If you need to clear the cache, you can do so by running the following command:
-
-```bash
-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:
 
 - [Adding Support for a New OAuth2 Provider](./docs/tutorials/add-oauth2-provider.md)
-- [Appwrite Environment Variables](./docs/tutorials/add-environment-variable.md)
-- [Running in Production](https://appwrite.io/docs/advanced/self-hosting/production)
+- [Appwrite Environment Variables](./docs/tutorials/environment-variables.md)
+- [Running in Production](./docs/tutorials/running-in-production.md)
 - [Adding Storage Adapter](./docs/tutorials/add-storage-adapter.md)
 
 ## Other Ways to Help
 
-Pull requests are great, but there are many other ways you can help Appwrite.
+Pull requests are great, but there are many other areas where 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 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.
+Blogging, speaking about, or creating tutorials about one of Appwrite’s many features. 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.
 
 ### Presenting at Meetups
 
-We encourage our contributors to present at meetups and conferences about your Appwrite projects. Your unique challenges and successes in building things with Appwrite can provide great speaking material. We’d love to review your talk abstract/CFP, so get in touch with us if you’d like some help!
+Presenting at meetups and conferences about your Appwrite projects. Your unique challenges and successes in building things with Appwrite can provide great speaking material. We’d love to review your talk abstract/CFP, so get in touch with us if you’d like some help!
 
-### Sending Feedbacks and Reporting Bugs
+### Sending Feedbacks & Reporting Bugs
 
-Sending feedback is a great way for us to understand your different use cases of Appwrite better. If you had any issues, bugs, or want to share your experience, feel free to do so on our GitHub issues page or at our [Discord channel](https://discord.gg/GSeTUeA).
+Sending feedback is a great way for us to understand your different use cases of Appwrite better. If you had any issues, bugs, or want to share about your experience, feel free to do so on our GitHub issues page or at our [Discord channel](https://discord.gg/GSeTUeA).
 
 ### Submitting New Ideas
 
-If you think Appwrite could use a new feature, please open an issue on our GitHub repository, stating as much information as you have about your new idea and its implications. We would also use this issue to gather more information, get more feedback from the community, and have a proper discussion about the new feature.
+If you think Appwrite could use a new feature, please open an issue on our GitHub repository, stating as much information as you can think about your new idea and it's implications. We would also use this issue to gather more information, get more feedback from the community, and have a proper discussion about the new feature.
 
 ### Improving Documentation
 
-Submitting documentation updates, enhancements, designs, or bug fixes, as well as spelling or grammar fixes is much appreciated.
+Submitting documentation updates, enhancements, designs, or bug fixes. Spelling or grammar fixes will be very much appreciated.
 
 ### Helping Someone
 
-Consider searching for Appwrite on Discord, GitHub, or StackOverflow to help someone who needs help. You can also help by teaching others how to contribute to Appwrite's repo!
+Searching for Appwrite on Discord, GitHub, or StackOverflow and helping someone else who needs help. You can also help by teaching others how to contribute to Appwrite's repo!

Dockerfile

@@ -1,4 +1,4 @@
-FROM composer:2.0 AS composer
+FROM composer:2.0 as composer
 
 ARG TESTING=false
 ENV TESTING=$TESTING
@@ -12,7 +12,24 @@ 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.10.1 AS final
+FROM node:16.14.2-alpine3.15 as node
+
+COPY app/console /usr/local/src/console
+
+WORKDIR /usr/local/src/console
+
+ARG VITE_GA_PROJECT
+ARG VITE_CONSOLE_MODE
+ARG VITE_APPWRITE_GROWTH_ENDPOINT=https://growth.appwrite.io/v1
+
+ENV VITE_GA_PROJECT=$VITE_GA_PROJECT
+ENV VITE_CONSOLE_MODE=$VITE_CONSOLE_MODE
+ENV VITE_APPWRITE_GROWTH_ENDPOINT=$VITE_APPWRITE_GROWTH_ENDPOINT
+
+RUN npm ci
+RUN npm run build
+
+FROM appwrite/base:0.2.2 as final
 
 LABEL maintainer="team@appwrite.io"
 
@@ -20,19 +37,62 @@ ARG VERSION=dev
 ARG DEBUG=false
 ENV DEBUG=$DEBUG
 
-ENV _APP_VERSION=$VERSION \
-    _APP_HOME=https://appwrite.io
+ENV DOCKER_CONFIG=${DOCKER_CONFIG:-$HOME/.docker}
+ENV DOCKER_COMPOSE_VERSION=v2.5.0
+
+ENV _APP_SERVER=swoole \
+    _APP_ENV=production \
+    _APP_LOCALE=en \
+    _APP_DOMAIN=localhost \
+    _APP_DOMAIN_TARGET=localhost \
+    _APP_HOME=https://appwrite.io \
+    _APP_EDITION=community \
+    _APP_CONSOLE_WHITELIST_ROOT=enabled \
+    _APP_OPTIONS_ABUSE=enabled \
+    _APP_OPTIONS_FORCE_HTTPS=disabled \
+    _APP_OPENSSL_KEY_V1=your-secret-key \
+    _APP_STORAGE_LIMIT=10000000 \
+    _APP_STORAGE_ANTIVIRUS=enabled \
+    _APP_STORAGE_ANTIVIRUS_HOST=clamav \
+    _APP_STORAGE_ANTIVIRUS_PORT=3310 \
+    _APP_REDIS_HOST=redis \
+    _APP_REDIS_PORT=6379 \
+    _APP_DB_HOST=mariadb \
+    _APP_DB_PORT=3306 \
+    _APP_DB_USER=root \
+    _APP_DB_PASS=password \
+    _APP_DB_SCHEMA=appwrite \
+    _APP_INFLUXDB_HOST=influxdb \
+    _APP_INFLUXDB_PORT=8086 \
+    _APP_STATSD_HOST=telegraf \
+    _APP_STATSD_PORT=8125 \
+    _APP_FUNCTIONS_SIZE_LIMIT=30000000 \
+    _APP_FUNCTIONS_TIMEOUT=900 \
+    _APP_FUNCTIONS_CPUS=1 \
+    _APP_FUNCTIONS_MEMORY=128 \
+    _APP_EXECUTOR_SECRET=a-random-secret \
+    _APP_EXECUTOR_HOST=http://exc1/v1 \
+    _APP_SETUP=self-hosted \
+    _APP_VERSION=$VERSION \
+    _APP_USAGE_STATS=enabled \
+    # 14 Days = 1209600 s
+    _APP_MAINTENANCE_RETENTION_EXECUTION=1209600 \
+    _APP_MAINTENANCE_RETENTION_AUDIT=1209600 \
+    # 1 Day = 86400 s
+    _APP_MAINTENANCE_RETENTION_ABUSE=86400 \
+    _APP_MAINTENANCE_RETENTION_USAGE_HOURLY=8640000 \
+    _APP_MAINTENANCE_INTERVAL=86400
+
 
 RUN \
   if [ "$DEBUG" == "true" ]; then \
     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
+COPY --from=node /usr/local/src/console/build /usr/src/code/console
 
 # Add Source Code
 COPY ./app /usr/src/code/app
@@ -40,7 +100,6 @@ COPY ./public /usr/src/code/public
 COPY ./bin /usr/local/bin
 COPY ./docs /usr/src/code/docs
 COPY ./src /usr/src/code/src
-COPY ./dev /usr/src/code/dev
 
 # Set Volumes
 RUN mkdir -p /storage/uploads && \
@@ -58,48 +117,56 @@ RUN mkdir -p /storage/uploads && \
 
 # Executables
 RUN chmod +x /usr/local/bin/doctor && \
-    chmod +x /usr/local/bin/install && \
+    chmod +x /usr/local/bin/patch-delete-schedule-updated-at-attribute && \
+    chmod +x /usr/local/bin/clear-card-cache && \
+    chmod +x /usr/local/bin/calc-users-stats && \
+    chmod +x /usr/local/bin/calc-tier-stats && \
+    chmod +x /usr/local/bin/patch-delete-project-collections && \
     chmod +x /usr/local/bin/maintenance &&  \
+    chmod +x /usr/local/bin/db-backup &&  \
+    chmod +x /usr/local/bin/db-restore &&  \
+    chmod +x /usr/local/bin/volume-sync && \
+    chmod +x /usr/local/bin/usage && \
+    chmod +x /usr/local/bin/install && \
     chmod +x /usr/local/bin/migrate && \
     chmod +x /usr/local/bin/realtime && \
-    chmod +x /usr/local/bin/schedule-functions && \
-    chmod +x /usr/local/bin/schedule-executions && \
-    chmod +x /usr/local/bin/schedule-messages && \
+    chmod +x /usr/local/bin/schedule && \
     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/hamster && \
     chmod +x /usr/local/bin/test && \
-    chmod +x /usr/local/bin/upgrade && \
     chmod +x /usr/local/bin/vars && \
-    chmod +x /usr/local/bin/queue-retry && \
-    chmod +x /usr/local/bin/queue-count-failed && \
-    chmod +x /usr/local/bin/queue-count-processing && \
-    chmod +x /usr/local/bin/queue-count-success && \
     chmod +x /usr/local/bin/worker-audits && \
-    chmod +x /usr/local/bin/worker-builds && \
     chmod +x /usr/local/bin/worker-certificates && \
     chmod +x /usr/local/bin/worker-databases && \
     chmod +x /usr/local/bin/worker-deletes && \
     chmod +x /usr/local/bin/worker-functions && \
+    chmod +x /usr/local/bin/worker-builds && \
     chmod +x /usr/local/bin/worker-mails && \
     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-stats-usage && \
-    chmod +x /usr/local/bin/worker-stats-usage-dump && \
-    chmod +x /usr/local/bin/stats-resources && \
-    chmod +x /usr/local/bin/worker-stats-resources
+    chmod +x /usr/local/bin/worker-webhooks
 
 # 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" = "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-20230831/xdebug.so; fi
+RUN if [ "$DEBUG" == "true" ]; then printf "zend_extension=yasd \nyasd.debug_mode=remote \nyasd.init_file=/usr/local/dev/yasd_init.php \nyasd.remote_port=9005 \nyasd.log_level=-1" >> /usr/local/etc/php/conf.d/yasd.ini; fi
+
+RUN if [ "$DEBUG" == "true" ]; then echo "opcache.enable=0" >> /usr/local/etc/php/conf.d/appwrite.ini; fi
+RUN echo "opcache.preload_user=www-data" >> /usr/local/etc/php/conf.d/appwrite.ini
+RUN echo "opcache.preload=/usr/src/code/app/preload.php" >> /usr/local/etc/php/conf.d/appwrite.ini
+RUN echo "opcache.enable_cli=1" >> /usr/local/etc/php/conf.d/appwrite.ini
+RUN echo "default_socket_timeout=-1" >> /usr/local/etc/php/conf.d/appwrite.ini
+RUN echo "opcache.jit_buffer_size=100M" >> /usr/local/etc/php/conf.d/appwrite.ini
+RUN echo "opcache.jit=1235" >> /usr/local/etc/php/conf.d/appwrite.ini
+
+RUN \
+  apk update \
+  && apk add --no-cache \
+  docker \
+  && rm -rf /var/cache/apk/*
 
 EXPOSE 80
 
-CMD [ "php", "app/http.php" ]
+CMD [ "php", "app/http.php", "-dopcache.preload=opcache.preload=/usr/src/code/app/preload.php" ]

HACKTOBERFEST.md

@@ -1,57 +0,0 @@
-# Appwrite hacktoberfest contribution
-
-Welcome to the Appwrite Hacktoberfest contribution! We appreciate your interest in contributing to our open-source project. Please read this carefully to understand how to get started and make your contributions count.
-
-## Familiarize with the project
-
-Before you start contributing, familiarize yourself with our project by reading the [main README](https://github.com/appwrite/appwrite/blob/main/README.md).
-
-## Code of conduct
-
-Please ensure that you always follow our [Code of Conduct](https://github.com/appwrite/awesome-appwrite/blob/master/CODE_OF_CONDUCT.md). We aim to maintain a respectful and inclusive community.
-
-## Contributing guide
-
-Please review our [Contributing Guide](https://github.com/appwrite/appwrite/blob/main/CONTRIBUTING.md) before contributing. It will help you learn about the architecture, instructions on how to update code, run tests, and submit a PR.
-
-## Hacktoberfest contribution guidelines
-
-To participate in Hacktoberfest with Appwrite, follow these guidelines:
-
-1. **Valid issues**: To make your contribution count, please look for issues labeled with `hacktoberfest`. Only issues labeled with `hacktoberfest` will count as a valid contribution.
-
-2. **Wait for issue assignment**: After you have identified an issue to work on, please wait for it to be assigned to you by our team. We assign issues on a first-come, first-serve basis.
-
-3. **Knowing about labels**:  We do not have the `hacktoberfest` label in our repositories, but we use it on specific issues. For your pull request to be valid, our team will review and add the `hacktoberfest-accepted` label once it meets the criteria.
-
-4. **Discuss new issues**: If you're interested in finding and adding new issues for Hacktoberfest, please discuss it with the team on our [Discord server](https://appwrite.io/discord) in the `#hacktoberfest` channel.
-
-5. **Be patient with pull request reviews**: PR reviews may take up to 15 days due to the volume of contributions. However, we also host PR review parties every week where you can add your PRs for instant review.
-
-6. **Regular updates**: If you've been assigned an issue, it's essential to share updates every 3 days. Failure to do so may result in being unassigned from the issue.
-
-## Getting started
-
-1. Fork the Appwrite repository you'd like to contribute to.
-
-2. Clone your forked repository to your local machine.
-
-   ```bash
-   git clone https://github.com/your-username/repository-name.git
-   ```
-
-3. Create a new branch for your contribution.
-
-   ```bash
-   git checkout -b TYPE-ISSUE_ID-DESCRIPTION
-   ```
-4. Make your changes, commit them, and push them to your forked repository.
-
-   ```bash
-   git commit -m "Add your commit message here"
-   git push origin TYPE-ISSUE_ID-DESCRIPTION
-   ```
- 
-5. Create a Pull Request (PR) from your forked repository to the Appwrite repository. Be sure to reference the issue you are addressing in your PR description.
-
-Thank you for contributing to Appwrite, and we look forward to your Hacktoberfest contributions! If you have any questions or need assistance, feel free to ask on our Discord server or in the issue discussion. Happy hacking!

README-CN.md

@@ -1,8 +1,6 @@
-> 好消息！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 banner with logo and slogan build like a team of hundreds""></a>
+    <a href="https://appwrite.io" target="_blank"><img width="260" height="39" src="https://appwrite.io/images/appwrite.svg" alt="Appwrite Logo"></a>
     <br />
     <br />
     <b>适用于[Flutter/Vue/Angular/React/iOS/Android/* 等等平台 *]的完整后端服务</b>
@@ -12,10 +10,9 @@
 
 <!-- [![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=friendly&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)
+[![Build Status](https://img.shields.io/github/workflow/status/appwrite/appwrite/Tests?label=tests&style=flat-square)](https://github.com/appwrite/appwrite/actions)
 [![Twitter Account](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) -->
@@ -24,9 +21,9 @@
 
 [English](README.md) | 简体中文
 
-[**Appwrite 云公开测试版！立即注册！**](https://cloud.appwrite.io)
+[**我们发布了 Appwrite Console 2.0 版本，点击这里了解更多！**](https://medium.com/appwrite-io/announcing-console-2-0-2e0e96891cb0?source=friends_link&sk=7a82b4069778e3adc165dc026e960fe1)
 
-Appwrite 是一个基于 Docker 的端到端开发者平台，其容器化的微服务库可应用于网页端，移动端，以及后端。Appwrite 通过视觉化界面简化了从零开始编写 API 的繁琐过程，在保证软件安全的前提下为开发者创造了一个高效的开发环境。
+Appwrite是一个基于Docker的端到端开发者平台，其容器化的微服务库可应用于网页端，移动端，以及后端。Appwrite 通过视觉化界面极简了从零编写 API 的繁琐过程，在保证软件安全的前提下为开发者创造了一个高效的开发环境。
 
 Appwrite 可以提供给开发者用户验证，外部授权，用户数据读写检索，文件储存，图像处理，云函数计算，[等多种服务](https://appwrite.io/docs).
 
@@ -36,8 +33,6 @@ Appwrite 可以提供给开发者用户验证，外部授权，用户数据读
 
 内容：
 
-
-- [开始](#开始)
 - [安装](#安装)
   - [Unix](#unix)
   - [Windows](#windows)
@@ -56,14 +51,11 @@ 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。
+Appwrite 的容器化服务器只需要一行指令就可以运行。您可以使用 docker-compose 在本地主机上运行 Appwrite，也可以在任何其他容器化工具（如 Kubernetes、Docker Swarm 或 Rancher）上运行 Appwrite。
 
-启动 Appwrite 服务器的最简单方法是运行我们的 docker-compose 文件。在运行安装命令之前，请确保您的机器上安装了 [Docker](https://dockerdocs.cn/get-docker/index.html)：
+开始运行 Appwrite 服务器的最简单方法是运行我们的 docker-compose 文件。在运行安装命令之前，请确保您的机器上安装了 [Docker](https://dockerdocs.cn/get-docker/index.html)：
 
 ### Unix
 
@@ -72,7 +64,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.2
+    appwrite/appwrite:1.1.2
 ```
 
 ### Windows
@@ -84,129 +76,78 @@ 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.2
+    appwrite/appwrite:1.1.2
 ```
 
 #### PowerShell
 
 ```powershell
-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.2
+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.1.2
 ```
 
 运行后，可以在浏览器上访问 http://localhost 找到 Appwrite 控制台。在非 Linux 的本机主机上完成安装后，服务器可能需要几分钟才能启动。
 
+
 需要自定义容器构架，请查看我们的 Docker [环境变量](https://appwrite.io/docs/environment-variables) 文档。您还可以参考我们的 [docker-compose.yml](https://appwrite.io/install/compose) 和 [.env](https://appwrite.io/install/env) 文件手动设置环境。
 
 ### 从旧版本升级
 
-如果您从旧版本升级 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>
+如果您从旧版本升级 Appwrite 服务器，则应在设置完成后使用 Appwrite 迁移工具。有关这方面的更多信息，请查看 [安装文档](https://appwrite.io/docs/installation)。
 
 ## 入门
 
 开始使用 Appwrite 只需要在控制台创建一个新项目，选择开发平台，然后抓取我们的开发套件。您可以从以下的教程中找到你喜欢的平台开始使用 Appwrite。
 
-| 类别               | 技术                                                                        |
-| ------------------ | --------------------------------------------------------------------------- |
-| **Web 应用**       | [Web 快速开始](https://appwrite.io/docs/quick-starts/web)                   |
-|                    | [Next.js 快速开始](https://appwrite.io/docs/quick-starts/nextjs)            |
-|                    | [React 快速开始](https://appwrite.io/docs/quick-starts/react)               |
-|                    | [Vue.js 快速开始](https://appwrite.io/docs/quick-starts/vue)                |
-|                    | [Nuxt 快速开始](https://appwrite.io/docs/quick-starts/nuxt)                 |
-|                    | [SvelteKit 快速开始](https://appwrite.io/docs/quick-starts/sveltekit)       |
-|                    | [Refine 快速开始](https://appwrite.io/docs/quick-starts/refine)             |
-|                    | [Angular 快速开始](https://appwrite.io/docs/quick-starts/angular)           |
-| **苹果于安卓应用** | [React Native 快速开始](https://appwrite.io/docs/quick-starts/react-native) |
-|                    | [Flutter 快速开始](https://appwrite.io/docs/quick-starts/flutter)           |
-|                    | [Apple 快速开始](https://appwrite.io/docs/quick-starts/apple)               |
-|                    | [Android 快速开始](https://appwrite.io/docs/quick-starts/android)           |
-| **服务器**         | [Node.js 快速开始](https://appwrite.io/docs/quick-starts/node)              |
-|                    | [Python 快速开始](https://appwrite.io/docs/quick-starts/python)             |
-|                    | [.NET 快速开始](https://appwrite.io/docs/quick-starts/dotnet)               |
-|                    | [Dart 快速开始](https://appwrite.io/docs/quick-starts/dart)                 |
-|                    | [Ruby 快速开始](https://appwrite.io/docs/quick-starts/ruby)                 |
-|                    | [Deno 快速开始](https://appwrite.io/docs/quick-starts/deno)                 |
-|                    | [PHP 快速开始](https://appwrite.io/docs/quick-starts/php)                   |
-|                    | [Kotlin 快速开始](https://appwrite.io/docs/quick-starts/kotlin)             |
-|                    | [Swift 快速开始](https://appwrite.io/docs/quick-starts/swift)               |
+* [开始使用 Web](https://appwrite.io/docs/getting-started-for-web)
+* [开始使用 Flutter](https://appwrite.io/docs/getting-started-for-flutter)
+* [开始使用 Apple](https://appwrite.io/docs/getting-started-for-apple)
+* [开始使用 Android](https://appwrite.io/docs/getting-started-for-android)
+* [开始使用 Server](https://appwrite.io/docs/getting-started-for-server)
+* [开始使用 CLI](https://appwrite.io/docs/command-line)
 
 ### 软件服务
 
-- [**帐户**](https://appwrite.io/docs/references/cloud/client-web/account) -管理当前用户的帐户和登录方式。跟踪和管理用户 Session，登录设备，登录方法和查看相关记录。
-- [**用户**](https://appwrite.io/docs/server/users) - 在以管理员模式登录时管理和列出所有用户。
-- [**团队**](https://appwrite.io/docs/references/cloud/client-web/teams) - 管理用户分组。邀请成员，管理团队中的用户权限和用户角色。
-- [**数据库**](https://appwrite.io/docs/references/cloud/client-web/databases) - 管理数据库文档和文档集。用检索界面来对文档和文档集进行读取，创建，更新，和删除。
-- [**贮存**](https://appwrite.io/docs/references/cloud/client-web/storage) - 管理文件的阅读、创建、删除和预览。设置文件的预览来满足程序的个性化需求。所有文件都由 ClamAV 扫描并安全存储和加密。
-- [**云函数**](https://appwrite.io/docs/server/functions) - 在安全，隔离的环境中运行自定义代码。这些代码可以被事件，CRON，或者手动操作触发。
-- [**消息传递**](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) -管理用户头像、国家旗帜、浏览器图标、信用卡符号，和生成二维码。
-  如需完整的 API 界面文档，请访问 [https://appwrite.io/docs](https://appwrite.io/docs)。如需更多教程、新闻和公告，请订阅我们的 [博客](https://medium.com/appwrite-io) 和 加入我们的[Discord 社区](https://discord.gg/GSeTUeA)。
+* [**帐户**](https://appwrite.io/docs/client/account) -管理当前用户的帐户和登录方式。跟踪和管理用户 Session，登录设备，登录方法和查看相关记录。
+* [**用户**](https://appwrite.io/docs/server/users) - 在以管理员模式登录时管理和列出所有用户。
+* [**团队**](https://appwrite.io/docs/client/teams) - 管理用户分组。邀请成员，管理团队中的用户权限和用户角色。
+* [**数据库**](https://appwrite.io/docs/client/databases) - 管理数据库文档和文档集。用检索界面来对文档和文档集进行读取，创建，更新，和删除。
+* [**贮存**](https://appwrite.io/docs/client/storage) - 管理文件的阅读、创建、删除和预览。设置文件的预览来满足程序的个性化需求。所有文件都由 ClamAV 扫描并安全存储和加密。
+* [**云函数**](https://appwrite.io/docs/server/functions) - 在安全，隔离的环境中运行自定义代码。这些代码可以被事件，CRON，或者手动操作触发。
+* [**语言适配**](https://appwrite.io/docs/client/locale) - 根据用户所在的的国家和地区做出合适的语言适配。
+* [**头像**](https://appwrite.io/docs/client/avatars) -管理用户头像、国家旗帜、浏览器图标、信用卡符号，和生成二维码。 
+如需完整的 API 界面文档，请访问 [https://appwrite.io/docs](https://appwrite.io/docs)。如需更多教程、新闻和公告，请订阅我们的 [博客](https://medium.com/appwrite-io) 和 加入我们的[Discord 社区](https://discord.gg/GSeTUeA)。
 
 ### 开发套件
 
 以下是当前支持的平台和语言列表。如果您想帮助我们为您选择的平台添加支持，您可以访问我们的 [SDK 生成器](https://github.com/appwrite/sdk-generator) 项目并查看我们的 [贡献指南](https://github.com/appwrite/sdk-generator/blob/master/CONTRIBUTING.md)。
 
 #### 客户端
-* :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; [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 团队维护)
 
 #### 服务器
-* :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; [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; [Apple](https://github.com/appwrite/sdk-for-apple) - **公测** (由 Appwrite 团队维护)
+* ✅  &nbsp; [.NET](https://github.com/appwrite/sdk-for-dotnet) - **公测** (由 Appwrite 团队维护)
 
 #### 开发者社区
-* :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))  
+* ✅  &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))  
+
+找不到需要的的 SDK？ - 欢迎通过发起PR来帮助我们完善Appwrite的软件生态环境 [SDK 生成器](https://github.com/appwrite/sdk-generator)!
 
-找不到需要的的 SDK？ - 欢迎通过发起 PR 来帮助我们完善 Appwrite 的软件生态环境 [SDK 生成器](https://github.com/appwrite/sdk-generator)!
 
 ## 软件架构
 
@@ -218,17 +159,17 @@ Appwrite API 界面层利用后台缓存和任务委派来提供极速的响应
 
 ## 贡献代码
 
-为了确保正确审查，所有代码贡献 - 包括来自具有直接提交更改权限的贡献者 - 都必须提交 PR 请求并在合并分支之前得到核心开发人员的批准。
+所有代码贡献 - 包括来自具有直接提交更改权限的贡献者 - 都必须提交PR请求并在合并分支之前得到核心开发人员的批准。这是为了确保正确审查所有代码。
 
-我们欢迎所有人提交 PR！如果您愿意提供帮助，可以在 [贡献指南](CONTRIBUTING.md) 中了解有关如何为项目做出贡献的更多信息。
+我们欢迎所有人提交PR！如果您愿意提供帮助，可以在 [贡献指南](CONTRIBUTING.md) 中了解有关如何为项目做出贡献的更多信息。
 
 ## 安全
 
-为了保护您的隐私，请避免在 GitHub 上发布安全问题。发送问题至 security@appwrite.io，我们将为您做更细致的解答。
+为了保护您的隐私，请避免在GitHub 上发布安全问题。发送问题至 security@appwrite.io，我们将为您做更细致的解答。
 
 ## 订阅我们
 
-加入我们在世界各地不断发展的社区！请参阅我们的官方 [博客](https://medium.com/appwrite-io)。在 [Twitter](https://twitter.com/appwrite)、[Facebook 页面](https://www.facebook.com/appwrite.io)、[Facebook 群组](https://www.facebook.com/appwrite.io/groups/)、[开发者社区](https://dev.to/appwrite) 等平台订阅我们或加入我们的 [Discord 社区](https://discord.gg/GSeTUeA) 以获得更多帮助，想法和讨论。
+加入我们在世界各地不断发展的社区！请参阅我们的官方 [博客](https://medium.com/appwrite-io)。在 [Twitter](https://twitter.com/appwrite)、[Facebook 页面](https://www.facebook.com/appwrite.io)、[Facebook 群组](https://www.facebook)、[开发者社区](https://dev.to/appwrite) 等平台订阅我们或加入我们的 [Discord 社区](https://discord.gg/GSeTUeA) 以获得更多帮助，想法和讨论。
 
 ## 版权说明
 

README.md

@@ -1,22 +1,23 @@
-> Appwrite Init has concluded! You can check out all the latest announcements [on our Init website](https://appwrite.io/init) :rocket:
+> It's going to get cloudy! 🌩 ☂️
+> The Appwrite Cloud is coming soon! You can learn more about our upcoming hosted solution and signup for free credits at: https://appwrite.io/cloud
 
 <br />
 <p align="center">
-    <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>
+    <a href="https://appwrite.io" target="_blank"><img width="260" height="39" src="https://appwrite.io/images/appwrite.svg" alt="Appwrite Logo"></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>A complete backend solution for your [Flutter / Vue / Angular / React / iOS / Android / *ANY OTHER*] app</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 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)
+[![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/workflow/status/appwrite/appwrite/Tests?label=tests&style=flat-square)](https://github.com/appwrite/appwrite/actions)
+[![Twitter Account](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 +25,11 @@
 
 English | [简体中文](README-CN.md)
 
-[**Announcing Appwrite Cloud Public Beta! Sign up today!**](https://cloud.appwrite.io)
+[**Appwrite Console 2.0 has been released! Learn what's new!**](https://medium.com/appwrite-io/announcing-console-2-0-2e0e96891cb0?source=friends_link&sk=7a82b4069778e3adc165dc026e960fe1)
 
 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 & 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).
 
 <p align="center">
     <br />
@@ -37,20 +38,18 @@ Using Appwrite, you can easily integrate your app with user authentication and m
     <br />
 </p>
 
-![Appwrite project dashboard showing various Appwrite features](public/images/github.png)
+![Appwrite](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:
 
-- [Getting Started](#getting-started)
-- [Self-Hosting](#self-hosting)
+- [Installation](#installation)
   - [Unix](#unix)
   - [Windows](#windows)
     - [CMD](#cmd)
     - [PowerShell](#powershell)
   - [Upgrade from an Older Version](#upgrade-from-an-older-version)
-- [One-Click Setups](#one-click-setups)
 - [Getting Started](#getting-started)
   - [Services](#services)
   - [SDKs](#sdks)
@@ -63,14 +62,11 @@ Table of Contents:
 - [Follow Us](#follow-us)
 - [License](#license)
 
-## Getting Started
-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 you credit card information. 
+## Installation
 
-## Self-Hosting
+Appwrite backend server is designed to run in a container 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 like Kubernetes, Docker Swarm, or Rancher.
 
-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/).
-
-Before running the installation command, make sure you have [Docker](https://www.docker.com/products/docker-desktop) installed on your machine:
+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:
 
 ### Unix
 
@@ -79,7 +75,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.2
+    appwrite/appwrite:1.1.2
 ```
 
 ### Windows
@@ -91,7 +87,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.2
+    appwrite/appwrite:1.1.2
 ```
 
 #### PowerShell
@@ -101,20 +97,20 @@ 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.2
+    appwrite/appwrite:1.1.2
 ```
 
-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.
+Once the Docker installation completes, 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 installation completes.
 
 For advanced production and custom installation, check out our Docker [environment variables](https://appwrite.io/docs/environment-variables) docs. You can also use our public [docker-compose.yml](https://appwrite.io/install/compose) and [.env](https://appwrite.io/install/env) files to manually set up an environment.
 
 ### 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/self-hosting).
+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).
 
 ## One-Click Setups
 
-In addition to running Appwrite locally, you can also launch Appwrite using a pre-configured setup. This allows you to get up and running quickly with Appwrite without installing Docker on your local machine.
+In addition to running Appwrite locally, you can also launch Appwrite using a pre-configured setup. This allows you to get up and running with Appwrite quickly without installing Docker on your local machine.
 
 Choose from one of the providers below:
 
@@ -132,18 +128,6 @@ Choose from one of the providers below:
           <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>
 
@@ -151,89 +135,70 @@ Choose from one of the providers below:
 
 Getting started with Appwrite is as easy as creating a new project, choosing your platform, and integrating its SDK into your code. You can easily get started with your platform of choice by reading one of our Getting Started tutorials.
 
-| Platform              | Technology                                                                         |
-| --------------------- | ---------------------------------------------------------------------------------- |
-| **Web app**           | [Quick start for Web](https://appwrite.io/docs/quick-starts/web)                   |
-|                       | [Quick start for Next.js](https://appwrite.io/docs/quick-starts/nextjs)            |
-|                       | [Quick start for React](https://appwrite.io/docs/quick-starts/react)               |
-|                       | [Quick start for Vue.js](https://appwrite.io/docs/quick-starts/vue)                |
-|                       | [Quick start for Nuxt](https://appwrite.io/docs/quick-starts/nuxt)                 |
-|                       | [Quick start for SvelteKit](https://appwrite.io/docs/quick-starts/sveltekit)       |
-|                       | [Quick start for Refine](https://appwrite.io/docs/quick-starts/refine)             |
-|                       | [Quick start for Angular](https://appwrite.io/docs/quick-starts/angular)           |
-| **Mobile and Native** | [Quick start for React Native](https://appwrite.io/docs/quick-starts/react-native) |
-|                       | [Quick start for Flutter](https://appwrite.io/docs/quick-starts/flutter)           |
-|                       | [Quick start for Apple](https://appwrite.io/docs/quick-starts/apple)               |
-|                       | [Quick start for Android](https://appwrite.io/docs/quick-starts/android)           |
-| **Server**            | [Quick start for Node.js](https://appwrite.io/docs/quick-starts/node)              |
-|                       | [Quick start for Python](https://appwrite.io/docs/quick-starts/python)             |
-|                       | [Quick start for .NET](https://appwrite.io/docs/quick-starts/dotnet)               |
-|                       | [Quick start for Dart](https://appwrite.io/docs/quick-starts/dart)                 |
-|                       | [Quick start for Ruby](https://appwrite.io/docs/quick-starts/ruby)                 |
-|                       | [Quick start for Deno](https://appwrite.io/docs/quick-starts/deno)                 |
-|                       | [Quick start for PHP](https://appwrite.io/docs/quick-starts/php)                   |
-|                       | [Quick start for Kotlin](https://appwrite.io/docs/quick-starts/kotlin)             |
-|                       | [Quick start for Swift](https://appwrite.io/docs/quick-starts/swift)               |
+- [Getting Started for Web](https://appwrite.io/docs/getting-started-for-web)
+- [Getting Started for Flutter](https://appwrite.io/docs/getting-started-for-flutter)
+- [Getting Started for Apple](https://appwrite.io/docs/getting-started-for-apple)
+- [Getting Started for Android](https://appwrite.io/docs/getting-started-for-android)
+- [Getting Started for Server](https://appwrite.io/docs/getting-started-for-server)
+- [Getting Started for CLI](https://appwrite.io/docs/command-line)
 
-### Products
+### Services
 
-- [**Account**](https://appwrite.io/docs/references/cloud/client-web/account) - Manage current user authentication and account. Track and manage the user sessions, devices, sign-in methods, and security logs.
+- [**Account**](https://appwrite.io/docs/client/account) - Manage current user authentication and account. Track and manage the user sessions, devices, sign-in methods, and security logs.
 - [**Users**](https://appwrite.io/docs/server/users) - Manage and list all project users when building backend integrations with Server SDKs.
-- [**Teams**](https://appwrite.io/docs/references/cloud/client-web/teams) - Manage and group users in teams. Manage memberships, invites, and user roles within a team.
-- [**Databases**](https://appwrite.io/docs/references/cloud/client-web/databases) - Manage databases, collections, and documents. Read, create, update, and delete documents and filter lists of document collections using advanced filters.
-- [**Storage**](https://appwrite.io/docs/references/cloud/client-web/storage) - Manage storage files. Read, create, delete, and preview files. Manipulate the preview of your files to perfectly fit your app. All files are scanned by ClamAV and stored in a secure and encrypted way.
-- [**Functions**](https://appwrite.io/docs/references/cloud/server-nodejs/functions) - Customize your Appwrite project by executing your custom code in a secure, isolated environment. You can trigger your code on any Appwrite system event either manually or using a CRON schedule.
-- [**Messaging**](https://appwrite.io/docs/references/cloud/client-web/messaging) - Communicate with your users through push notifications, emails, and SMS text messages using Appwrite Messaging.
-- [**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.
+- [**Teams**](https://appwrite.io/docs/client/teams) - Manage and group users in teams. Manage memberships, invites, and user roles within a team.
+- [**Databases**](https://appwrite.io/docs/client/databases) - Manage databases, collections and documents. Read, create, update, and delete documents and filter lists of document collections using advanced filters.
+- [**Storage**](https://appwrite.io/docs/client/storage) - Manage storage files. Read, create, delete, and preview files. Manipulate the preview of your files to fit your app perfectly. All files are scanned by ClamAV and stored in a secure and encrypted way.
+- [**Functions**](https://appwrite.io/docs/server/functions) - Customize your Appwrite server by executing your custom code in a secure, isolated environment. You can trigger your code on any Appwrite system event, manually or using a CRON schedule.
+- [**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/client/locale) - Track your user's location, and manage your app locale-based data.
+- [**Avatars**](https://appwrite.io/docs/client/avatars) - Manage your users' avatars, countries' flags, browser icons, credit card symbols, and generate QR codes.
 
 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).
 
 ### SDKs
 
-Below is a list of currently supported platforms and languages. If you would like to help us add support to your platform of choice, you can go over to our [SDK Generator](https://github.com/appwrite/sdk-generator) project and view our [contribution guide](https://github.com/appwrite/sdk-generator/blob/master/CONTRIBUTING.md).
+Below is a list of currently supported platforms and languages. If you wish to help us add support to your platform of choice, you can go over to our [SDK Generator](https://github.com/appwrite/sdk-generator) project and view our [contribution guide](https://github.com/appwrite/sdk-generator/blob/master/CONTRIBUTING.md).
 
 #### Client
 
-- :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)
+- ✅ &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) - **Beta** (Maintained by the Appwrite Team)
+- ✅ &nbsp; [Android](https://github.com/appwrite/sdk-for-android) (Maintained by the Appwrite Team)
 
 #### Server
 
-- :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)
+- ✅ &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) - **Beta** (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) - **Beta** (Maintained by the Appwrite Team)
+- ✅ &nbsp; [Apple](https://github.com/appwrite/sdk-for-apple) - **Beta** (Maintained by the Appwrite Team)
+- ✅ &nbsp; [.NET](https://github.com/appwrite/sdk-for-dotnet) - **Experimental** (Maintained by the Appwrite Team)
 
 #### Community
 
-- :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))
+- ✅ &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))
 
 Looking for more SDKs? - Help us by contributing a pull request to our [SDK Generator](https://github.com/appwrite/sdk-generator)!
 
 ## Architecture
 
-![Appwrite Architecture showing how Appwrite is built and the services and tools it uses](docs/specs/overview.drawio.svg)
+![Appwrite Architecture](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.
+Appwrite uses a microservices architecture that was designed for easy scaling and delegation of responsibilities. In addition, Appwrite supports multiple APIs (REST, WebSocket, and GraphQL-soon) to allow you to interact with your resources by leveraging your existing knowledge and protocols of choice.
 
 The Appwrite API layer was designed to be extremely fast by leveraging in-memory caching and delegating any heavy-lifting tasks to the Appwrite background workers. The background workers also allow you to precisely control your compute capacity and costs using a message queue to handle the load. You can learn more about our architecture in the [contribution guide](CONTRIBUTING.md#architecture-1).
 
 ## Contributing
 
-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.
+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 :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).
+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).
 
 ## Security
 
@@ -241,7 +206,7 @@ For security issues, kindly email us at [security@appwrite.io](mailto:security@a
 
 ## Follow Us
 
-Join our growing community around the world! Check out our official [Blog](https://appwrite.io/blog). Follow us on [X](https://twitter.com/appwrite), [LinkedIn](https://www.linkedin.com/company/appwrite/), [Dev Community](https://dev.to/appwrite) or join our live [Discord server](https://appwrite.io/discord) for more help, ideas, and discussions.
+Join our growing community around the world! See our official [Blog](https://medium.com/appwrite-io). Follow us on [Twitter](https://twitter.com/appwrite), [Facebook Page](https://www.facebook.com/appwrite.io), [Facebook Group](https://www.facebook.com/groups/appwrite.developers/), [Dev Community](https://dev.to/appwrite) or join our live [Discord server](https://discord.gg/GSeTUeA) for more help, ideas, and discussions.
 
 ## License
 

SECURITY.md

@@ -2,16 +2,12 @@
 
 ## Supported Versions
 
-| Version   | Supported          |
-| --------- | ------------------ |
-| <= 0.15.x | :x:                |
-| 1.0.x     | :white_check_mark: |
-| 1.1.x     | :white_check_mark: |
-| 1.2.x     | :white_check_mark: |
-| 1.3.x     | :white_check_mark: |
-| 1.4.x     | :white_check_mark: |
-| 1.5.x     | :white_check_mark: |
-| 1.6.x     | :white_check_mark: |
+| Version | Supported          |
+| ------- | ------------------ |
+| <= 0.14 | :x:                |
+| 1.15.x  | :white_check_mark: |
+| 1.0.x   | :white_check_mark: |
+| 1.1.x   | :white_check_mark: |
 
 ## Reporting a Vulnerability
 

app/cli.php

@@ -1,39 +1,27 @@
 <?php
 
 require_once __DIR__ . '/init.php';
+require_once __DIR__ . '/controllers/general.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 Utopia\CLI\CLI;
+use Utopia\Database\Validator\Authorization;
+use Utopia\Platform\Service;
+use Utopia\App;
+use Utopia\CLI\Console;
 use Utopia\Cache\Adapter\Sharding;
 use Utopia\Cache\Cache;
-use Utopia\CLI\CLI;
-use Utopia\CLI\Console;
 use Utopia\Config\Config;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
-use Utopia\Database\Validator\Authorization;
-use Utopia\DSN\DSN;
 use Utopia\Logger\Log;
-use Utopia\Platform\Service;
 use Utopia\Pools\Group;
-use Utopia\Queue\Publisher;
 use Utopia\Registry\Registry;
-use Utopia\System\System;
-
-// overwriting runtimes to be architectur agnostic for CLI
-Config::setParam('runtimes', (new Runtimes('v5'))->getAll(supported: false));
-
-// require controllers after overwriting runtimes
-require_once __DIR__ . '/controllers/general.php';
 
 Authorization::disable();
 
-CLI::setResource('register', fn () => $register);
+CLI::setResource('register', fn()=>$register);
 
 CLI::setResource('cache', function ($pools) {
     $list = Config::getParam('pools-cache', []);
@@ -54,7 +42,7 @@ CLI::setResource('pools', function (Registry $register) {
     return $register->get('pools');
 }, ['register']);
 
-CLI::setResource('dbForPlatform', function ($pools, $cache) {
+CLI::setResource('dbForConsole', function ($pools, $cache) {
     $sleep = 3;
     $maxAttempts = 5;
     $attempts = 0;
@@ -69,164 +57,103 @@ CLI::setResource('dbForPlatform', function ($pools, $cache) {
                 ->pop()
                 ->getResource();
 
-            $dbForPlatform = new Database($dbAdapter, $cache);
-
-            $dbForPlatform
-                ->setNamespace('_console')
-                ->setMetadata('host', \gethostname())
-                ->setMetadata('project', 'console');
+            $dbForConsole = new Database($dbAdapter, $cache);
+            $dbForConsole->setNamespace('console');
 
             // Ensure tables exist
             $collections = Config::getParam('collections', [])['console'];
             $last = \array_key_last($collections);
 
-            if (!($dbForPlatform->exists($dbForPlatform->getDatabase(), $last))) { /** TODO cache ready variable using registry */
+            if (!($dbForConsole->exists($dbForConsole->getDefaultDatabase(), $last))) { /** TODO cache ready variable using registry */
                 throw new Exception('Tables not ready yet.');
             }
 
             $ready = true;
-        } catch (\Throwable $err) {
+        } catch (\Exception $err) {
             Console::warning($err->getMessage());
             $pools->get('console')->reclaim();
             sleep($sleep);
         }
-    } while ($attempts < $maxAttempts && !$ready);
+    } while ($attempts < $maxAttempts);
 
     if (!$ready) {
         throw new Exception("Console is not ready yet. Please try again later.");
     }
 
-    return $dbForPlatform;
+    return $dbForConsole;
 }, ['pools', 'cache']);
 
-CLI::setResource('console', function () {
-    return new Document(Config::getParam('console'));
-}, []);
-
-CLI::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform, $cache) {
+CLI::setResource('getProjectDB', function (Group $pools, Database $dbForConsole, $cache) {
     $databases = []; // TODO: @Meldiron This should probably be responsibility of utopia-php/pools
 
-    return function (Document $project) use ($pools, $dbForPlatform, $cache, &$databases) {
+    $getProjectDB = function (Document $project) use ($pools, $dbForConsole, $cache, &$databases) {
         if ($project->isEmpty() || $project->getId() === 'console') {
-            return $dbForPlatform;
+            return $dbForConsole;
         }
 
-        try {
-            $dsn = new DSN($project->getAttribute('database'));
-        } catch (\InvalidArgumentException) {
-            // TODO: Temporary until all projects are using shared tables
-            $dsn = new DSN('mysql://' . $project->getAttribute('database'));
-        }
-
-        if (isset($databases[$dsn->getHost()])) {
-            $database = $databases[$dsn->getHost()];
-            $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
-
-            if (\in_array($dsn->getHost(), $sharedTables)) {
-                $database
-                    ->setSharedTables(true)
-                    ->setTenant($project->getInternalId())
-                    ->setNamespace($dsn->getParam('namespace'));
-            } else {
-                $database
-                    ->setSharedTables(false)
-                    ->setTenant(null)
-                    ->setNamespace('_' . $project->getInternalId());
-            }
+        $databaseName = $project->getAttribute('database');
 
+        if (isset($databases[$databaseName])) {
+            $database = $databases[$databaseName];
+            $database->setNamespace('_' . $project->getInternalId());
             return $database;
         }
 
         $dbAdapter = $pools
-            ->get($dsn->getHost())
+            ->get($databaseName)
             ->pop()
             ->getResource();
 
         $database = new Database($dbAdapter, $cache);
-        $databases[$dsn->getHost()] = $database;
-        $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
 
-        if (\in_array($dsn->getHost(), $sharedTables)) {
-            $database
-                ->setSharedTables(true)
-                ->setTenant($project->getInternalId())
-                ->setNamespace($dsn->getParam('namespace'));
-        } else {
-            $database
-                ->setSharedTables(false)
-                ->setTenant(null)
-                ->setNamespace('_' . $project->getInternalId());
-        }
+        $databases[$databaseName] = $database;
 
-        $database
-            ->setMetadata('host', \gethostname())
-            ->setMetadata('project', $project->getId());
+        $database->setNamespace('_' . $project->getInternalId());
 
         return $database;
     };
-}, ['pools', 'dbForPlatform', 'cache']);
 
-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($project->getInternalId());
-            return $database;
+    return $getProjectDB;
+}, ['pools', 'dbForConsole', 'cache']);
+
+CLI::setResource('influxdb', function (Registry $register) {
+    $client = $register->get('influxdb'); /** @var InfluxDB\Client $client */
+    $attempts = 0;
+    $max = 10;
+    $sleep = 1;
+
+    do { // check if telegraf database is ready
+        try {
+            $attempts++;
+            $database = $client->selectDB('telegraf');
+            if (in_array('telegraf', $client->listDatabases())) {
+                break; // leave the do-while if successful
+            }
+        } catch (\Throwable $th) {
+            Console::warning("InfluxDB not ready. Retrying connection ({$attempts})...");
+            if ($attempts >= $max) {
+                throw new \Exception('InfluxDB database not ready yet');
+            }
+            sleep($sleep);
         }
+    } while ($attempts < $max);
+    return $database;
+}, ['register']);
 
-        $dbAdapter = $pools
-            ->get('logs')
-            ->pop()
-            ->getResource();
-
-        $database = new Database(
-            $dbAdapter,
-            $cache
-        );
-
-        $database
-            ->setSharedTables(true)
-            ->setNamespace('logsV1')
-            ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS)
-            ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);
-
-        // set tenant
-        if ($project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
-            $database->setTenant($project->getInternalId());
-        }
-
-        return $database;
-    };
-}, ['pools', 'cache']);
-
-CLI::setResource('queueForStatsUsage', function (Connection $publisher) {
-    return new StatsUsage($publisher);
-}, ['publisher']);
-CLI::setResource('queueForStatsResources', function (Publisher $publisher) {
-    return new StatsResources($publisher);
-}, ['publisher']);
-CLI::setResource('publisher', function (Group $pools) {
-    return $pools->get('publisher')->pop()->getResource();
+CLI::setResource('queueForFunctions', function (Group $pools) {
+    return new Func($pools->get('queue')->pop()->getResource());
 }, ['pools']);
-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) {
         $logger = $register->get('logger');
 
         if ($logger) {
-            $version = System::getEnv('_APP_VERSION', 'UNKNOWN');
+            $version = App::getEnv('_APP_VERSION', 'UNKNOWN');
 
             $log = new Log();
             $log->setNamespace($namespace);
-            $log->setServer(System::getEnv('_APP_LOGGING_SERVICE_IDENTIFIER', \gethostname()));
+            $log->setServer(\gethostname());
             $log->setVersion($version);
             $log->setType(Log::TYPE_ERROR);
             $log->setMessage($error->getMessage());
@@ -237,18 +164,15 @@ 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';
+            $isProduction = App::getEnv('_APP_ENV', 'development') === 'production';
             $log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
 
-            try {
-                $responseCode = $logger->addLog($log);
-                Console::info('Error log pushed with status code: ' . $responseCode);
-            } catch (Throwable $th) {
-                Console::error('Error pushing log: ' . $th->getMessage());
-            }
+            $responseCode = $logger->addLog($log);
+            Console::info('Usage stats log pushed with status code: ' . $responseCode);
         }
 
         Console::warning("Failed: {$error->getMessage()}");
@@ -257,7 +181,7 @@ CLI::setResource('logError', function (Registry $register) {
 }, ['register']);
 
 $platform = new Appwrite();
-$platform->init(Service::TYPE_TASK);
+$platform->init(Service::TYPE_CLI);
 
 $cli = $platform->getCli();
 

app/config/apis.php

@@ -1,16 +0,0 @@
-<?php
-
-return [
-    'rest' => [
-        'key' => 'rest',
-        'name' => 'REST',
-    ],
-    'graphql' => [
-        'key' => 'graphql',
-        'name' => 'GraphQL',
-    ],
-    'realtime' => [
-        'key' => 'realtime',
-        'name' => 'Realtime',
-    ],
-];

app/config/auth.php

@@ -7,28 +7,21 @@ return [
         'name' => 'Email/Password',
         'key' => 'emailPassword',
         'icon' => '/images/users/email.png',
-        'docs' => 'https://appwrite.io/docs/references/cloud/client-web/account#accountCreateEmailPasswordSession',
+        'docs' => 'https://appwrite.io/docs/client/account?sdk=web-default#accountCreateEmailSession',
         'enabled' => true,
     ],
     'magic-url' => [
         'name' => 'Magic URL',
         'key' => 'usersAuthMagicURL',
         'icon' => '/images/users/magic-url.png',
-        'docs' => 'https://appwrite.io/docs/references/cloud/client-web/account#accountCreateMagicURLToken',
-        'enabled' => true,
-    ],
-    'email-otp' => [
-        'name' => 'Email (OTP)',
-        'key' => 'emailOtp',
-        'icon' => '/images/users/email.png',
-        'docs' => 'https://appwrite.io/docs/references/cloud/client-web/account#accountCreateEmailToken',
+        'docs' => 'https://appwrite.io/docs/client/account?sdk=web-default#accountCreateMagicURLSession',
         'enabled' => true,
     ],
     'anonymous' => [
         'name' => 'Anonymous',
         'key' => 'anonymous',
         'icon' => '/images/users/anonymous.png',
-        'docs' => 'https://appwrite.io/docs/references/cloud/client-web/account#accountCreateAnonymousSession',
+        'docs' => 'https://appwrite.io/docs/client/account?sdk=web-default#accountCreateAnonymousSession',
         'enabled' => true,
     ],
     'invites' => [
@@ -49,7 +42,7 @@ return [
         'name' => 'Phone',
         'key' => 'phone',
         'icon' => '/images/users/phone.png',
-        'docs' => 'https://appwrite.io/docs/references/cloud/client-web/account#accountCreatePhoneToken',
+        'docs' => 'https://appwrite.io/docs/client/account?sdk=web-default#accountCreatePhoneSession',
         'enabled' => true,
     ],
 ];

app/config/avatars/browsers.php

@@ -2,21 +2,20 @@
 
 return [
     // Codes based on: https://github.com/matomo-org/device-detector/blob/master/Parser/Client/Browser.php
-    'aa' => ['name' => 'Avant Browser', 'path' => __DIR__ . '/browsers/avant.png'],
-    'an' => ['name' => 'Android WebView Beta', 'path' => __DIR__ . '/browsers/android-webview-beta.png'],
-    'ch' => ['name' => 'Google Chrome', 'path' => __DIR__ . '/browsers/chrome.png'],
-    'ci' => ['name' => 'Google Chrome (iOS)', 'path' => __DIR__ . '/browsers/chrome.png'],
-    'cm' => ['name' => 'Google Chrome (Mobile)', 'path' => __DIR__ . '/browsers/chrome.png'],
-    'cr' => ['name' => 'Chromium', 'path' => __DIR__ . '/browsers/chromium.png'],
-    'ff' => ['name' => 'Mozilla Firefox', 'path' => __DIR__ . '/browsers/firefox.png'],
-    'sf' => ['name' => 'Safari', 'path' => __DIR__ . '/browsers/safari.png'],
-    'mf' => ['name' => 'Mobile Safari', 'path' => __DIR__ . '/browsers/safari.png'],
-    'ps' => ['name' => 'Microsoft Edge', 'path' => __DIR__ . '/browsers/edge.png'],
-    'oi' => ['name' => 'Microsoft Edge (iOS)', 'path' => __DIR__ . '/browsers/edge.png'],
-    'om' => ['name' => 'Opera Mini', 'path' => __DIR__ . '/browsers/opera-mini.png'],
-    'op' => ['name' => 'Opera', 'path' => __DIR__ . '/browsers/opera.png'],
-    'on' => ['name' => 'Opera (Next)', 'path' => __DIR__ . '/browsers/opera.png'],
-
+    'aa' => __DIR__ . '/browsers/avant.png',
+    'an' => __DIR__ . '/browsers/android-webview-beta.png',
+    'ch' => __DIR__ . '/browsers/chrome.png',
+    'ci' => __DIR__ . '/browsers/chrome.png', //Chrome Mobile iOS
+    'cm' => __DIR__ . '/browsers/chrome.png', //Chrome Mobile
+    'cr' => __DIR__ . '/browsers/chromium.png',
+    'ff' => __DIR__ . '/browsers/firefox.png',
+    'sf' => __DIR__ . '/browsers/safari.png',
+    'mf' => __DIR__ . '/browsers/safari.png',
+    'ps' => __DIR__ . '/browsers/edge.png',
+    'oi' => __DIR__ . '/browsers/edge.png',
+    'om' => __DIR__ . '/browsers/opera-mini.png',
+    'op' => __DIR__ . '/browsers/opera.png',
+    'on' => __DIR__ . '/browsers/opera.png',
 
     /*
     '36' => '360 Phone Browser',

app/config/avatars/credit-cards.php

@@ -1,21 +1,20 @@
 <?php
 
 return [
-    'amex' => ['name' => 'American Express', 'path' => __DIR__ . '/credit-cards/amex.png'],
-    'argencard' => ['name' => 'Argencard', 'path' => __DIR__ . '/credit-cards/argencard.png'],
-    'cabal' => ['name' => 'Cabal', 'path' => __DIR__ . '/credit-cards/cabal.png'],
-    'cencosud' => ['name' => 'Cencosud', 'path' => __DIR__ . '/credit-cards/cencosud.png'],
-    'diners' => ['name' => 'Diners Club', 'path' => __DIR__ . '/credit-cards/diners.png'],
-    'discover' => ['name' => 'Discover', 'path' => __DIR__ . '/credit-cards/discover.png'],
-    'elo' => ['name' => 'Elo', 'path' => __DIR__ . '/credit-cards/elo.png'],
-    'hipercard' => ['name' => 'Hipercard', 'path' => __DIR__ . '/credit-cards/hipercard.png'],
-    'jcb' => ['name' => 'JCB', 'path' => __DIR__ . '/credit-cards/jcb.png'],
-    'mastercard' => ['name' => 'Mastercard', 'path' => __DIR__ . '/credit-cards/mastercard.png'],
-    'naranja' => ['name' => 'Naranja', 'path' => __DIR__ . '/credit-cards/naranja.png'],
-    'targeta-shopping' => ['name' => 'Tarjeta Shopping', 'path' => __DIR__ . '/credit-cards/tarjeta-shopping.png'],
-    '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'],
-    'rupay' => ['name' => 'Rupay', 'path' => __DIR__ . '/credit-cards/rupay.png']
+    'amex' => __DIR__ . '/credit-cards/amex.png',
+    'argencard' => __DIR__ . '/credit-cards/argencard.png',
+    'cabal' => __DIR__ . '/credit-cards/cabal.png',
+    'censosud' => __DIR__ . '/credit-cards/consosud.png',
+    'diners' => __DIR__ . '/credit-cards/diners.png',
+    'discover' => __DIR__ . '/credit-cards/discover.png',
+    'elo' => __DIR__ . '/credit-cards/elo.png',
+    'hipercard' => __DIR__ . '/credit-cards/hipercard.png',
+    'jcb' => __DIR__ . '/credit-cards/jcb.png',
+    'mastercard' => __DIR__ . '/credit-cards/mastercard.png',
+    'naranja' => __DIR__ . '/credit-cards/naranja.png',
+    'targeta-shopping' => __DIR__ . '/credit-cards/tarjeta-shopping.png',
+    'union-china-pay' => __DIR__ . '/credit-cards/union-china-pay.png',
+    'visa' => __DIR__ . '/credit-cards/visa.png',
+    'mir' => __DIR__ . '/credit-cards/mir.png',
+    'maestro' => __DIR__ . '/credit-cards/maestro.png',
 ];

app/config/avatars/flags.php

@@ -1,199 +1,198 @@
 <?php
 
 return [
-    'af' => ['name' => 'Afghanistan', 'path' => __DIR__ . '/flags/af.png'],
-    'ao' => ['name' => 'Angola', 'path' => __DIR__ . '/flags/ao.png'],
-    'al' => ['name' => 'Albania', 'path' => __DIR__ . '/flags/al.png'],
-    'ad' => ['name' => 'Andorra', 'path' => __DIR__ . '/flags/ad.png'],
-    'ae' => ['name' => 'United Arab Emirates', 'path' => __DIR__ . '/flags/ae.png'],
-    'ar' => ['name' => 'Argentina', 'path' => __DIR__ . '/flags/ar.png'],
-    'am' => ['name' => 'Armenia', 'path' => __DIR__ . '/flags/am.png'],
-    'ag' => ['name' => 'Antigua and Barbuda', 'path' => __DIR__ . '/flags/ag.png'],
-    'au' => ['name' => 'Australia', 'path' => __DIR__ . '/flags/au.png'],
-    'at' => ['name' => 'Austria', 'path' => __DIR__ . '/flags/at.png'],
-    'az' => ['name' => 'Azerbaijan', 'path' => __DIR__ . '/flags/az.png'],
-    'bi' => ['name' => 'Burundi', 'path' => __DIR__ . '/flags/bi.png'],
-    'be' => ['name' => 'Belgium', 'path' => __DIR__ . '/flags/be.png'],
-    'bj' => ['name' => 'Benin', 'path' => __DIR__ . '/flags/bj.png'],
-    'bf' => ['name' => 'Burkina Faso', 'path' => __DIR__ . '/flags/bf.png'],
-    'bd' => ['name' => 'Bangladesh', 'path' => __DIR__ . '/flags/bd.png'],
-    'bg' => ['name' => 'Bulgaria', 'path' => __DIR__ . '/flags/bg.png'],
-    'bh' => ['name' => 'Bahrain', 'path' => __DIR__ . '/flags/bh.png'],
-    'bs' => ['name' => 'Bahamas', 'path' => __DIR__ . '/flags/bs.png'],
-    'ba' => ['name' => 'Bosnia and Herzegovina', 'path' => __DIR__ . '/flags/ba.png'],
-    'by' => ['name' => 'Belarus', 'path' => __DIR__ . '/flags/by.png'],
-    'bz' => ['name' => 'Belize', 'path' => __DIR__ . '/flags/bz.png'],
-    'bo' => ['name' => 'Bolivia', 'path' => __DIR__ . '/flags/bo.png'],
-    'br' => ['name' => 'Brazil', 'path' => __DIR__ . '/flags/br.png'],
-    'bb' => ['name' => 'Barbados', 'path' => __DIR__ . '/flags/bb.png'],
-    'bn' => ['name' => 'Brunei Darussalam', 'path' => __DIR__ . '/flags/bn.png'],
-    'bt' => ['name' => 'Bhutan', 'path' => __DIR__ . '/flags/bt.png'],
-    'bw' => ['name' => 'Botswana', 'path' => __DIR__ . '/flags/bw.png'],
-    'cf' => ['name' => 'Central African Republic', 'path' => __DIR__ . '/flags/cf.png'],
-    'ca' => ['name' => 'Canada', 'path' => __DIR__ . '/flags/ca.png'],
-    'ch' => ['name' => 'Switzerland', 'path' => __DIR__ . '/flags/ch.png'],
-    'cl' => ['name' => 'Chile', 'path' => __DIR__ . '/flags/cl.png'],
-    'cn' => ['name' => 'China', 'path' => __DIR__ . '/flags/cn.png'],
-    'ci' => ['name' => 'Côte d\'Ivoire', 'path' => __DIR__ . '/flags/ci.png'],
-    'cm' => ['name' => 'Cameroon', 'path' => __DIR__ . '/flags/cm.png'],
-    'cd' => ['name' => 'Democratic Republic of the Congo', 'path' => __DIR__ . '/flags/cd.png'],
-    'cg' => ['name' => 'Republic of the Congo', 'path' => __DIR__ . '/flags/cg.png'],
-    'co' => ['name' => 'Colombia', 'path' => __DIR__ . '/flags/co.png'],
-    'km' => ['name' => 'Comoros', 'path' => __DIR__ . '/flags/km.png'],
-    'cv' => ['name' => 'Cape Verde', 'path' => __DIR__ . '/flags/cv.png'],
-    'cr' => ['name' => 'Costa Rica', 'path' => __DIR__ . '/flags/cr.png'],
-    'cu' => ['name' => 'Cuba', 'path' => __DIR__ . '/flags/cu.png'],
-    'cy' => ['name' => 'Cyprus', 'path' => __DIR__ . '/flags/cy.png'],
-    'cz' => ['name' => 'Czech Republic', 'path' => __DIR__ . '/flags/cz.png'],
-    'de' => ['name' => 'Germany', 'path' => __DIR__ . '/flags/de.png'],
-    'dj' => ['name' => 'Djibouti', 'path' => __DIR__ . '/flags/dj.png'],
-    'dm' => ['name' => 'Dominica', 'path' => __DIR__ . '/flags/dm.png'],
-    'dk' => ['name' => 'Denmark', 'path' => __DIR__ . '/flags/dk.png'],
-    'do' => ['name' => 'Dominican Republic', 'path' => __DIR__ . '/flags/do.png'],
-    'dz' => ['name' => 'Algeria', 'path' => __DIR__ . '/flags/dz.png'],
-    'ec' => ['name' => 'Ecuador', 'path' => __DIR__ . '/flags/ec.png'],
-    'eg' => ['name' => 'Egypt', 'path' => __DIR__ . '/flags/eg.png'],
-    'er' => ['name' => 'Eritrea', 'path' => __DIR__ . '/flags/er.png'],
-    'es' => ['name' => 'Spain', 'path' => __DIR__ . '/flags/es.png'],
-    'ee' => ['name' => 'Estonia', 'path' => __DIR__ . '/flags/ee.png'],
-    'et' => ['name' => 'Ethiopia', 'path' => __DIR__ . '/flags/et.png'],
-    'fi' => ['name' => 'Finland', 'path' => __DIR__ . '/flags/fi.png'],
-    'fj' => ['name' => 'Fiji', 'path' => __DIR__ . '/flags/fj.png'],
-    'fr' => ['name' => 'France', 'path' => __DIR__ . '/flags/fr.png'],
-    'fm' => ['name' => 'Micronesia (Federated States of)', 'path' => __DIR__ . '/flags/fm.png'],
-    'ga' => ['name' => 'Gabon', 'path' => __DIR__ . '/flags/ga.png'],
-    'gb' => ['name' => 'United Kingdom', 'path' => __DIR__ . '/flags/gb.png'],
-    'ge' => ['name' => 'Georgia', 'path' => __DIR__ . '/flags/ge.png'],
-    'gh' => ['name' => 'Ghana', 'path' => __DIR__ . '/flags/gh.png'],
-    'gn' => ['name' => 'Guinea', 'path' => __DIR__ . '/flags/gn.png'],
-    'gm' => ['name' => 'Gambia', 'path' => __DIR__ . '/flags/gm.png'],
-    'gw' => ['name' => 'Guinea-Bissau', 'path' => __DIR__ . '/flags/gw.png'],
-    'gq' => ['name' => 'Equatorial Guinea', 'path' => __DIR__ . '/flags/gq.png'],
-    'gr' => ['name' => 'Greece', 'path' => __DIR__ . '/flags/gr.png'],
-    'gd' => ['name' => 'Grenada', 'path' => __DIR__ . '/flags/gd.png'],
-    'gt' => ['name' => 'Guatemala', 'path' => __DIR__ . '/flags/gt.png'],
-    'gy' => ['name' => 'Guyana', 'path' => __DIR__ . '/flags/gy.png'],
-    'hn' => ['name' => 'Honduras', 'path' => __DIR__ . '/flags/hn.png'],
-    'hr' => ['name' => 'Croatia', 'path' => __DIR__ . '/flags/hr.png'],
-    'ht' => ['name' => 'Haiti', 'path' => __DIR__ . '/flags/ht.png'],
-    'hu' => ['name' => 'Hungary', 'path' => __DIR__ . '/flags/hu.png'],
-    'id' => ['name' => 'Indonesia', 'path' => __DIR__ . '/flags/id.png'],
-    'in' => ['name' => 'India', 'path' => __DIR__ . '/flags/in.png'],
-    'ie' => ['name' => 'Ireland', 'path' => __DIR__ . '/flags/ie.png'],
-    'ir' => ['name' => 'Iran (Islamic Republic of)', 'path' => __DIR__ . '/flags/ir.png'],
-    'iq' => ['name' => 'Iraq', 'path' => __DIR__ . '/flags/iq.png'],
-    'is' => ['name' => 'Iceland', 'path' => __DIR__ . '/flags/is.png'],
-    'il' => ['name' => 'Israel', 'path' => __DIR__ . '/flags/il.png'],
-    'it' => ['name' => 'Italy', 'path' => __DIR__ . '/flags/it.png'],
-    'jm' => ['name' => 'Jamaica', 'path' => __DIR__ . '/flags/jm.png'],
-    'jo' => ['name' => 'Jordan', 'path' => __DIR__ . '/flags/jo.png'],
-    'jp' => ['name' => 'Japan', 'path' => __DIR__ . '/flags/jp.png'],
-    'kz' => ['name' => 'Kazakhstan', 'path' => __DIR__ . '/flags/kz.png'],
-    'ke' => ['name' => 'Kenya', 'path' => __DIR__ . '/flags/ke.png'],
-    'kg' => ['name' => 'Kyrgyzstan', 'path' => __DIR__ . '/flags/kg.png'],
-    'kh' => ['name' => 'Cambodia', 'path' => __DIR__ . '/flags/kh.png'],
-    'ki' => ['name' => 'Kiribati', 'path' => __DIR__ . '/flags/ki.png'],
-    'kn' => ['name' => 'Saint Kitts and Nevis', 'path' => __DIR__ . '/flags/kn.png'],
-    'kr' => ['name' => 'South Korea', 'path' => __DIR__ . '/flags/kr.png'],
-    'kw' => ['name' => 'Kuwait', 'path' => __DIR__ . '/flags/kw.png'],
-    'la' => ['name' => 'Lao People\'s Democratic Republic', 'path' => __DIR__ . '/flags/la.png'],
-    'lb' => ['name' => 'Lebanon', 'path' => __DIR__ . '/flags/lb.png'],
-    'lr' => ['name' => 'Liberia', 'path' => __DIR__ . '/flags/lr.png'],
-    'ly' => ['name' => 'Libya', 'path' => __DIR__ . '/flags/ly.png'],
-    'lc' => ['name' => 'Saint Lucia', 'path' => __DIR__ . '/flags/lc.png'],
-    'li' => ['name' => 'Liechtenstein', 'path' => __DIR__ . '/flags/li.png'],
-    'lk' => ['name' => 'Sri Lanka', 'path' => __DIR__ . '/flags/lk.png'],
-    'ls' => ['name' => 'Lesotho', 'path' => __DIR__ . '/flags/ls.png'],
-    'lt' => ['name' => 'Lithuania', 'path' => __DIR__ . '/flags/lt.png'],
-    'lu' => ['name' => 'Luxembourg', 'path' => __DIR__ . '/flags/lu.png'],
-    'lv' => ['name' => 'Latvia', 'path' => __DIR__ . '/flags/lv.png'],
-    'ma' => ['name' => 'Morocco', 'path' => __DIR__ . '/flags/ma.png'],
-    'mc' => ['name' => 'Monaco', 'path' => __DIR__ . '/flags/mc.png'],
-    'md' => ['name' => 'Moldova', 'path' => __DIR__ . '/flags/md.png'],
-    'mg' => ['name' => 'Madagascar', 'path' => __DIR__ . '/flags/mg.png'],
-    'mv' => ['name' => 'Maldives', 'path' => __DIR__ . '/flags/mv.png'],
-    'mx' => ['name' => 'Mexico', 'path' => __DIR__ . '/flags/mx.png'],
-    'mh' => ['name' => 'Marshall Islands', 'path' => __DIR__ . '/flags/mh.png'],
-    'mk' => ['name' => 'North Macedonia', 'path' => __DIR__ . '/flags/mk.png'],
-    'ml' => ['name' => 'Mali', 'path' => __DIR__ . '/flags/ml.png'],
-    'mt' => ['name' => 'Malta', 'path' => __DIR__ . '/flags/mt.png'],
-    'mm' => ['name' => 'Myanmar', 'path' => __DIR__ . '/flags/mm.png'],
-    'me' => ['name' => 'Montenegro', 'path' => __DIR__ . '/flags/me.png'],
-    'mn' => ['name' => 'Mongolia', 'path' => __DIR__ . '/flags/mn.png'],
-    'mz' => ['name' => 'Mozambique', 'path' => __DIR__ . '/flags/mz.png'],
-    'mr' => ['name' => 'Mauritania', 'path' => __DIR__ . '/flags/mr.png'],
-    'mu' => ['name' => 'Mauritius', 'path' => __DIR__ . '/flags/mu.png'],
-    'mw' => ['name' => 'Malawi', 'path' => __DIR__ . '/flags/mw.png'],
-    'my' => ['name' => 'Malaysia', 'path' => __DIR__ . '/flags/my.png'],
-    'na' => ['name' => 'Namibia', 'path' => __DIR__ . '/flags/na.png'],
-    'ne' => ['name' => 'Niger', 'path' => __DIR__ . '/flags/ne.png'],
-    'ng' => ['name' => 'Nigeria', 'path' => __DIR__ . '/flags/ng.png'],
-    'ni' => ['name' => 'Nicaragua', 'path' => __DIR__ . '/flags/ni.png'],
-    'nl' => ['name' => 'Netherlands', 'path' => __DIR__ . '/flags/nl.png'],
-    'no' => ['name' => 'Norway', 'path' => __DIR__ . '/flags/no.png'],
-    'np' => ['name' => 'Nepal', 'path' => __DIR__ . '/flags/np.png'],
-    'nr' => ['name' => 'Nauru', 'path' => __DIR__ . '/flags/nr.png'],
-    'nz' => ['name' => 'New Zealand', 'path' => __DIR__ . '/flags/nz.png'],
-    'om' => ['name' => 'Oman', 'path' => __DIR__ . '/flags/om.png'],
-    'pk' => ['name' => 'Pakistan', 'path' => __DIR__ . '/flags/pk.png'],
-    'pa' => ['name' => 'Panama', 'path' => __DIR__ . '/flags/pa.png'],
-    'pe' => ['name' => 'Peru', 'path' => __DIR__ . '/flags/pe.png'],
-    'ph' => ['name' => 'Philippines', 'path' => __DIR__ . '/flags/ph.png'],
-    'pw' => ['name' => 'Palau', 'path' => __DIR__ . '/flags/pw.png'],
-    'pg' => ['name' => 'Papua New Guinea', 'path' => __DIR__ . '/flags/pg.png'],
-    'pl' => ['name' => 'Poland', 'path' => __DIR__ . '/flags/pl.png'],
-    'pf' => ['name' => 'French Polynesia', 'path' => __DIR__ . '/flags/pf.png'],
-    'kp' => ['name' => 'North Korea', 'path' => __DIR__ . '/flags/kp.png'],
-    'pt' => ['name' => 'Portugal', 'path' => __DIR__ . '/flags/pt.png'],
-    'py' => ['name' => 'Paraguay', 'path' => __DIR__ . '/flags/py.png'],
-    'qa' => ['name' => 'Qatar', 'path' => __DIR__ . '/flags/qa.png'],
-    'ro' => ['name' => 'Romania', 'path' => __DIR__ . '/flags/ro.png'],
-    'ru' => ['name' => 'Russia', 'path' => __DIR__ . '/flags/ru.png'],
-    'rw' => ['name' => 'Rwanda', 'path' => __DIR__ . '/flags/rw.png'],
-    'sa' => ['name' => 'Saudi Arabia', 'path' => __DIR__ . '/flags/sa.png'],
-    'sd' => ['name' => 'Sudan', 'path' => __DIR__ . '/flags/sd.png'],
-    'sn' => ['name' => 'Senegal', 'path' => __DIR__ . '/flags/sn.png'],
-    'sg' => ['name' => 'Singapore', 'path' => __DIR__ . '/flags/sg.png'],
-    'sb' => ['name' => 'Solomon Islands', 'path' => __DIR__ . '/flags/sb.png'],
-    'sl' => ['name' => 'Sierra Leone', 'path' => __DIR__ . '/flags/sl.png'],
-    'sv' => ['name' => 'El Salvador', 'path' => __DIR__ . '/flags/sv.png'],
-    'sm' => ['name' => 'San Marino', 'path' => __DIR__ . '/flags/sm.png'],
-    'so' => ['name' => 'Somalia', 'path' => __DIR__ . '/flags/so.png'],
-    'rs' => ['name' => 'Serbia', 'path' => __DIR__ . '/flags/rs.png'],
-    'ss' => ['name' => 'South Sudan', 'path' => __DIR__ . '/flags/ss.png'],
-    'st' => ['name' => 'Sao Tome and Principe', 'path' => __DIR__ . '/flags/st.png'],
-    'sr' => ['name' => 'Suriname', 'path' => __DIR__ . '/flags/sr.png'],
-    'sk' => ['name' => 'Slovakia', 'path' => __DIR__ . '/flags/sk.png'],
-    'si' => ['name' => 'Slovenia', 'path' => __DIR__ . '/flags/si.png'],
-    'se' => ['name' => 'Sweden', 'path' => __DIR__ . '/flags/se.png'],
-    'sz' => ['name' => 'Eswatini', 'path' => __DIR__ . '/flags/sz.png'],
-    'sc' => ['name' => 'Seychelles', 'path' => __DIR__ . '/flags/sc.png'],
-    'sy' => ['name' => 'Syria', 'path' => __DIR__ . '/flags/sy.png'],
-    'td' => ['name' => 'Chad', 'path' => __DIR__ . '/flags/td.png'],
-    'tg' => ['name' => 'Togo', 'path' => __DIR__ . '/flags/tg.png'],
-    'th' => ['name' => 'Thailand', 'path' => __DIR__ . '/flags/th.png'],
-    'tj' => ['name' => 'Tajikistan', 'path' => __DIR__ . '/flags/tj.png'],
-    'tm' => ['name' => 'Turkmenistan', 'path' => __DIR__ . '/flags/tm.png'],
-    'tl' => ['name' => 'Timor-Leste', 'path' => __DIR__ . '/flags/tl.png'],
-    'to' => ['name' => 'Tonga', 'path' => __DIR__ . '/flags/to.png'],
-    'tt' => ['name' => 'Trinidad and Tobago', 'path' => __DIR__ . '/flags/tt.png'],
-    'tn' => ['name' => 'Tunisia', 'path' => __DIR__ . '/flags/tn.png'],
-    'tr' => ['name' => 'Turkey', 'path' => __DIR__ . '/flags/tr.png'],
-    'tv' => ['name' => 'Tuvalu', 'path' => __DIR__ . '/flags/tv.png'],
-    'tz' => ['name' => 'Tanzania', 'path' => __DIR__ . '/flags/tz.png'],
-    'ug' => ['name' => 'Uganda', 'path' => __DIR__ . '/flags/ug.png'],
-    'ua' => ['name' => 'Ukraine', 'path' => __DIR__ . '/flags/ua.png'],
-    'uy' => ['name' => 'Uruguay', 'path' => __DIR__ . '/flags/uy.png'],
-    'us' => ['name' => 'United States', 'path' => __DIR__ . '/flags/us.png'],
-    'uz' => ['name' => 'Uzbekistan', 'path' => __DIR__ . '/flags/uz.png'],
-    'va' => ['name' => 'Vatican City', 'path' => __DIR__ . '/flags/va.png'],
-    'vc' => ['name' => 'Saint Vincent and the Grenadines', 'path' => __DIR__ . '/flags/vc.png'],
-    've' => ['name' => 'Venezuela', 'path' => __DIR__ . '/flags/ve.png'],
-    'vn' => ['name' => 'Vietnam', 'path' => __DIR__ . '/flags/vn.png'],
-    'vu' => ['name' => 'Vanuatu', 'path' => __DIR__ . '/flags/vu.png'],
-    'ws' => ['name' => 'Samoa', 'path' => __DIR__ . '/flags/ws.png'],
-    'ye' => ['name' => 'Yemen', 'path' => __DIR__ . '/flags/ye.png'],
-    'za' => ['name' => 'South Africa', 'path' => __DIR__ . '/flags/za.png'],
-    'zm' => ['name' => 'Zambia', 'path' => __DIR__ . '/flags/zm.png'],
-    'zw' => ['name' => 'Zimbabwe', 'path' => __DIR__ . '/flags/zw.png'],
+    'af' => __DIR__ . '/flags/af.png',
+    'ao' => __DIR__ . '/flags/ao.png',
+    'al' => __DIR__ . '/flags/al.png',
+    'ad' => __DIR__ . '/flags/ad.png',
+    'ae' => __DIR__ . '/flags/ae.png',
+    'ar' => __DIR__ . '/flags/ar.png',
+    'am' => __DIR__ . '/flags/am.png',
+    'ag' => __DIR__ . '/flags/ag.png',
+    'au' => __DIR__ . '/flags/au.png',
+    'at' => __DIR__ . '/flags/at.png',
+    'az' => __DIR__ . '/flags/az.png',
+    'bi' => __DIR__ . '/flags/bi.png',
+    'be' => __DIR__ . '/flags/be.png',
+    'bj' => __DIR__ . '/flags/bj.png',
+    'bf' => __DIR__ . '/flags/bf.png',
+    'bd' => __DIR__ . '/flags/bd.png',
+    'bg' => __DIR__ . '/flags/bg.png',
+    'bh' => __DIR__ . '/flags/bh.png',
+    'bs' => __DIR__ . '/flags/bs.png',
+    'ba' => __DIR__ . '/flags/ba.png',
+    'by' => __DIR__ . '/flags/by.png',
+    'bz' => __DIR__ . '/flags/bz.png',
+    'bo' => __DIR__ . '/flags/bo.png',
+    'br' => __DIR__ . '/flags/br.png',
+    'bb' => __DIR__ . '/flags/bb.png',
+    'bn' => __DIR__ . '/flags/bn.png',
+    'bt' => __DIR__ . '/flags/bt.png',
+    'bw' => __DIR__ . '/flags/bw.png',
+    'cf' => __DIR__ . '/flags/cf.png',
+    'ca' => __DIR__ . '/flags/ca.png',
+    'ch' => __DIR__ . '/flags/ch.png',
+    'cl' => __DIR__ . '/flags/cl.png',
+    'cn' => __DIR__ . '/flags/cn.png',
+    'ci' => __DIR__ . '/flags/ci.png',
+    'cm' => __DIR__ . '/flags/cm.png',
+    'cd' => __DIR__ . '/flags/cd.png',
+    'cg' => __DIR__ . '/flags/cg.png',
+    'co' => __DIR__ . '/flags/co.png',
+    'km' => __DIR__ . '/flags/km.png',
+    'cv' => __DIR__ . '/flags/cv.png',
+    'cr' => __DIR__ . '/flags/cr.png',
+    'cu' => __DIR__ . '/flags/cu.png',
+    'cy' => __DIR__ . '/flags/cy.png',
+    'cz' => __DIR__ . '/flags/cz.png',
+    'de' => __DIR__ . '/flags/de.png',
+    'dj' => __DIR__ . '/flags/dj.png',
+    'dm' => __DIR__ . '/flags/dm.png',
+    'dk' => __DIR__ . '/flags/dk.png',
+    'do' => __DIR__ . '/flags/do.png',
+    'dz' => __DIR__ . '/flags/dz.png',
+    'ec' => __DIR__ . '/flags/ec.png',
+    'eg' => __DIR__ . '/flags/eg.png',
+    'er' => __DIR__ . '/flags/er.png',
+    'es' => __DIR__ . '/flags/es.png',
+    'ee' => __DIR__ . '/flags/ee.png',
+    'et' => __DIR__ . '/flags/et.png',
+    'fi' => __DIR__ . '/flags/fi.png',
+    'fj' => __DIR__ . '/flags/fj.png',
+    'fr' => __DIR__ . '/flags/fr.png',
+    'fm' => __DIR__ . '/flags/fm.png',
+    'ga' => __DIR__ . '/flags/ga.png',
+    'gb' => __DIR__ . '/flags/gb.png',
+    'ge' => __DIR__ . '/flags/ge.png',
+    'gh' => __DIR__ . '/flags/gh.png',
+    'gn' => __DIR__ . '/flags/gn.png',
+    'gm' => __DIR__ . '/flags/gm.png',
+    'gw' => __DIR__ . '/flags/gw.png',
+    'gq' => __DIR__ . '/flags/gq.png',
+    'gr' => __DIR__ . '/flags/gr.png',
+    'gd' => __DIR__ . '/flags/gd.png',
+    'gt' => __DIR__ . '/flags/gt.png',
+    'gy' => __DIR__ . '/flags/gy.png',
+    'hn' => __DIR__ . '/flags/hn.png',
+    'hr' => __DIR__ . '/flags/hr.png',
+    'ht' => __DIR__ . '/flags/ht.png',
+    'hu' => __DIR__ . '/flags/hu.png',
+    'id' => __DIR__ . '/flags/id.png',
+    'in' => __DIR__ . '/flags/in.png',
+    'ie' => __DIR__ . '/flags/ie.png',
+    'ir' => __DIR__ . '/flags/ir.png',
+    'iq' => __DIR__ . '/flags/iq.png',
+    'is' => __DIR__ . '/flags/is.png',
+    'il' => __DIR__ . '/flags/il.png',
+    'it' => __DIR__ . '/flags/it.png',
+    'jm' => __DIR__ . '/flags/jm.png',
+    'jo' => __DIR__ . '/flags/jo.png',
+    'jp' => __DIR__ . '/flags/jp.png',
+    'kz' => __DIR__ . '/flags/kz.png',
+    'ke' => __DIR__ . '/flags/ke.png',
+    'kg' => __DIR__ . '/flags/kg.png',
+    'kh' => __DIR__ . '/flags/kh.png',
+    'ki' => __DIR__ . '/flags/ki.png',
+    'kn' => __DIR__ . '/flags/kn.png',
+    'kr' => __DIR__ . '/flags/kr.png',
+    'kw' => __DIR__ . '/flags/kw.png',
+    'la' => __DIR__ . '/flags/la.png',
+    'lb' => __DIR__ . '/flags/lb.png',
+    'lr' => __DIR__ . '/flags/lr.png',
+    'ly' => __DIR__ . '/flags/ly.png',
+    'lc' => __DIR__ . '/flags/lc.png',
+    'li' => __DIR__ . '/flags/li.png',
+    'lk' => __DIR__ . '/flags/lk.png',
+    'ls' => __DIR__ . '/flags/ls.png',
+    'lt' => __DIR__ . '/flags/ls.png',
+    'lu' => __DIR__ . '/flags/lu.png',
+    'lv' => __DIR__ . '/flags/lv.png',
+    'ma' => __DIR__ . '/flags/ma.png',
+    'mc' => __DIR__ . '/flags/mc.png',
+    'md' => __DIR__ . '/flags/md.png',
+    'mg' => __DIR__ . '/flags/mg.png',
+    'mv' => __DIR__ . '/flags/mv.png',
+    'mx' => __DIR__ . '/flags/mx.png',
+    'mh' => __DIR__ . '/flags/mh.png',
+    'mk' => __DIR__ . '/flags/mk.png',
+    'ml' => __DIR__ . '/flags/ml.png',
+    'mt' => __DIR__ . '/flags/mt.png',
+    'mm' => __DIR__ . '/flags/mm.png',
+    'me' => __DIR__ . '/flags/me.png',
+    'mn' => __DIR__ . '/flags/mn.png',
+    'mz' => __DIR__ . '/flags/mz.png',
+    'mr' => __DIR__ . '/flags/mr.png',
+    'mu' => __DIR__ . '/flags/mu.png',
+    'mw' => __DIR__ . '/flags/mw.png',
+    'my' => __DIR__ . '/flags/my.png',
+    'na' => __DIR__ . '/flags/na.png',
+    'ne' => __DIR__ . '/flags/ne.png',
+    'ng' => __DIR__ . '/flags/ng.png',
+    'ni' => __DIR__ . '/flags/ni.png',
+    'nl' => __DIR__ . '/flags/nl.png',
+    'no' => __DIR__ . '/flags/no.png',
+    'np' => __DIR__ . '/flags/np.png',
+    'nr' => __DIR__ . '/flags/nr.png',
+    'nz' => __DIR__ . '/flags/nz.png',
+    'om' => __DIR__ . '/flags/om.png',
+    'pk' => __DIR__ . '/flags/pk.png',
+    'pa' => __DIR__ . '/flags/pa.png',
+    'pe' => __DIR__ . '/flags/pe.png',
+    'ph' => __DIR__ . '/flags/ph.png',
+    'pw' => __DIR__ . '/flags/pw.png',
+    'pg' => __DIR__ . '/flags/pg.png',
+    'pl' => __DIR__ . '/flags/pl.png',
+    'kp' => __DIR__ . '/flags/kp.png',
+    'pt' => __DIR__ . '/flags/pt.png',
+    'py' => __DIR__ . '/flags/py.png',
+    'qa' => __DIR__ . '/flags/qa.png',
+    'ro' => __DIR__ . '/flags/ro.png',
+    'ru' => __DIR__ . '/flags/ru.png',
+    'rw' => __DIR__ . '/flags/rw.png',
+    'sa' => __DIR__ . '/flags/sa.png',
+    'sd' => __DIR__ . '/flags/sd.png',
+    'sn' => __DIR__ . '/flags/sn.png',
+    'sg' => __DIR__ . '/flags/sg.png',
+    'sb' => __DIR__ . '/flags/sb.png',
+    'sl' => __DIR__ . '/flags/sl.png',
+    'sv' => __DIR__ . '/flags/sv.png',
+    'sm' => __DIR__ . '/flags/sm.png',
+    'so' => __DIR__ . '/flags/so.png',
+    'rs' => __DIR__ . '/flags/rs.png',
+    'ss' => __DIR__ . '/flags/ss.png',
+    'st' => __DIR__ . '/flags/st.png',
+    'sr' => __DIR__ . '/flags/sr.png',
+    'sk' => __DIR__ . '/flags/sk.png',
+    'si' => __DIR__ . '/flags/si.png',
+    'se' => __DIR__ . '/flags/se.png',
+    'sz' => __DIR__ . '/flags/sz.png',
+    'sc' => __DIR__ . '/flags/sc.png',
+    'sy' => __DIR__ . '/flags/sy.png',
+    'td' => __DIR__ . '/flags/td.png',
+    'tg' => __DIR__ . '/flags/tg.png',
+    'th' => __DIR__ . '/flags/th.png',
+    'tj' => __DIR__ . '/flags/tj.png',
+    'tm' => __DIR__ . '/flags/tm.png',
+    'tl' => __DIR__ . '/flags/tl.png',
+    'to' => __DIR__ . '/flags/to.png',
+    'tt' => __DIR__ . '/flags/tt.png',
+    'tn' => __DIR__ . '/flags/tn.png',
+    'tr' => __DIR__ . '/flags/tr.png',
+    'tv' => __DIR__ . '/flags/tv.png',
+    'tz' => __DIR__ . '/flags/tz.png',
+    'ug' => __DIR__ . '/flags/ug.png',
+    'ua' => __DIR__ . '/flags/ua.png',
+    'uy' => __DIR__ . '/flags/uy.png',
+    'us' => __DIR__ . '/flags/us.png',
+    'uz' => __DIR__ . '/flags/uz.png',
+    'va' => __DIR__ . '/flags/va.png',
+    'vc' => __DIR__ . '/flags/vc.png',
+    've' => __DIR__ . '/flags/ve.png',
+    'vn' => __DIR__ . '/flags/vn.png',
+    'vu' => __DIR__ . '/flags/vu.png',
+    'ws' => __DIR__ . '/flags/ws.png',
+    'ye' => __DIR__ . '/flags/ye.png',
+    'za' => __DIR__ . '/flags/za.png',
+    'zm' => __DIR__ . '/flags/zm.png',
+    'zw' => __DIR__ . '/flags/zw.png',
 ];

app/config/cloud/contributors.json

@@ -0,0 +1 @@
+[1297371,1759475,6360216,20852629,5857008,19310830,9708641,26739219,23742426,22174310,77877486,1477010,29069505,62933155,45863583,42211,176163,58045728,7091609,31401437,1911066,66096031,22432834,43054051,79051850,22895284,100597998,91385411,49699333,7818620,11004008,54898623,27856297,33250853,49375670,30630364,50206,47822499,7481165,52557347,13681567,20492520,51369094,51821861,50256986,28431370,13692220,24373771,15938422,27148250,14805534,36137226,36071208,40193621,56179878,53281158,48085134,19358691,32528768,19733683,37348419,13719696,18309412,42106787,53618500,5306011,4408379,35486736,18586611,15062564,27011453,56090587,44623032,25107942,81188,33922418,16717633,32809211,69401139,25815659,4104127,20889958,3102249,12476526,2635185,28495651,50957556,2791280,31023616,20955511,835733,471907,69008866,44906587,45271396,76054330,45748739,41908747,23402178,47356149,8921,36632821,3668741,71702982,29725587,26303198,785830,51410502,60089135,2847349,43172716,48546075,8216525,41161981,51828039,4334997,80918302,38534289,47860497,80036766,41341387,49818988,58487637,29237374,46913894,5148229,4377199,29686102,26272249,75117692,4090256,27357868,33062368,38664231,46695441,743291,22633385,6368283,11593067,45097959,43381712,3284228,1972717,33012425,61755381,25405707,3144291,44156359,5497267,7423905,20716175,28586681,5975506,23518097,22187384,24191952,7768078,971530,51240166,55633427,34207400,77061285,11719476,35950229,66742927,34406802,802933,50047839,39148877,26602940,9693472,44273767,19362725,31209978,30521594,686298,6237394,35039730,42580581,36671793,8502129,8466918,81866614,54903252,28373606,13381361,72331432,30694270,5355510,8209163,86675510,9453522,42496309,56145786,2149381,393945,22084723,52621436,8872447,5575392,29619660,5547479,8852116,11151445,4717349,17725274,65615065,18537755,29292618,53044263,26597930,10313411,55998629,77529288,17404636,33729848,19422168,17916404,66111735,10329006,33502846,398230,81643826,105039167,47522632,91655303,9774614,10603631,284924,60857954,22885912,116552306,36103454,794606,27729549,1754457,36594527,13899668,78664749,47406531,27698189,5305654,53345517,6756412,29176704,77790497,47504894,37251540,52361778,52200375,1351177,66022861,73975409,25745396,31433638,37118134,43210805,20317665,11923975,47187468,16362381,36751163,14959876,32362757,65529384,52352285,74085816,3628535,43902034,75667593,26132902,466713,617558,96806061,33605526,11290524,43621940,12446314,17146935,55018955,56096559,79797000,40014186,34449936,58387964,23368207,42414965,44056349,33743031,12294525,58251592,33755729,9021747,932084,11428067,97121933,80122730,60894542,58583793,56051809,32243289,9934371,90936802,74638775,65399526,77604,64524822,47782249,43633955,42793632,55969597,72334601,82395440,92818577,60866204,65016769,23725091,45892107,55308895,86314140,82756460,47685349,63562160,73419211,1613216,50882624,91469717,46166258,60927324,41763158,83607556,2171717,50497814,39427312,61322830,40076195,39419448,29397545,55090719,53259730,20885012,64558515,69677883,55741087,72426535,46033036,68477507,30376878,73700530,25518600,29922887,36229969,47573417,40424087,49054503,16880385,22801227,72848513,64347914,814402,49149679,55017867,49481876,67067955,31439735,63878173,80322286,43746210,17332970,22702905,62476876,89888292,75736952,54059881,90782137,63588969,57111920,63330165,70258211,46371923,17837758,59364507,52203828,60147326,18481195,74822422,9803078,67309607,60410049,47360939,19922556,90848252,24698014,58886915,63579762,96648934,68523530,60518745,37345795,3929651,54993657,52061363,43019989,5787917,94674993,71593494,17143469,10288548,1830380,71510505,59124772,2335145,70798495,46474346,49263351,52062536,63151043,65248303,26071571,53626355,43992469,60785452,63467479,71837281,19490891,58628586,38250310,7271718,1110414,57227290,11625672,85063520,88965873,70096901,42029519,85363195,64471630,69353350,66922161,2221746,100430077,12299813,62690310,68282006,99184676,2450,22989561,22212661,59973863,11232940,76688923,22321353,77732479,84286404,32268377,34828782,23068019,57074509,24620969,20735983,26173690,75809937,49760818,86646105,52617262]

app/config/cloud/employees.json

@@ -0,0 +1,33 @@
+{
+  "eldad@appwrite.io": { "memberSince": "2020-10-15", "spot": "0", "gitHub": "eldadfux" },
+  "christy@appwrite.io": { "memberSince": "2020-12-01", "spot": "1", "gitHub": "christyjacob4" },
+  "torsten@appwrite.io": { "memberSince": "2020-12-28", "spot": "2", "gitHub": "torstendittmann" },
+  "damodar@appwrite.io": { "memberSince": "2021-01-02", "spot": "3", "gitHub": "lohanidamodar" },
+  "bradley@appwrite.io": { "memberSince": "2021-05-21", "spot": "5", "gitHub": "PineappleIOnic" },
+  "jake@appwrite.io": { "memberSince": "2021-06-28", "spot": "6", "gitHub": "abnegate" },
+  "sara@appwrite.io": { "memberSince": "2021-08-16", "spot": "7", "gitHub": "sarakaandorp" },
+  "matej@appwrite.io": { "memberSince": "2021-08-23", "spot": "8", "gitHub": "meldiron" },
+  "aditya@appwrite.io": { "memberSince": "2021-09-01", "spot": "9", "gitHub": "adityaoberai" },
+  "wess@appwrite.io": { "memberSince": "2021-11-08", "spot": "12", "gitHub": "wess" },
+  "may@appwrite.io": { "memberSince": "2021-11-28", "spot": "14", "gitHub": "MayEnder" },
+  "elad@appwrite.io": { "memberSince": "2021-12-19", "spot": "15", "gitHub": "elad2412" },
+  "vincent@appwrite.io": { "memberSince": "2022-01-01", "spot": "16", "gitHub": "gewenyu99" },
+  "haimantika@appwrite.io": { "memberSince": "2022-04-01", "spot": "18", "gitHub": "Haimantika" },
+  "chen@appwrite.io": { "memberSince": "2022-01-24", "spot": "19", "gitHub": "chenparnasa" },
+  "tessa@appwrite.io": { "memberSince": "2022-04-21", "spot": "20", "gitHub": "tessamero" },
+  "shimon@appwrite.io": { "memberSince": "2022-05-01", "spot": "23", "gitHub": "shimonewman" },
+  "shmuel@appwrite.io": { "memberSince": "2022-03-20", "spot": "24", "gitHub": "fogelito" },
+  "arman@appwrite.io": { "memberSince": "2022-04-04", "spot": "25", "gitHub": "ArmanNik" },
+  "carla@appwrite.io": { "memberSince": "2022-04-04", "spot": "26", "gitHub": "heyCarla" },
+  "emma@appwrite.io": { "memberSince": "2022-05-08", "spot": "27", "gitHub": "emmacarpagnano1" },
+  "dylan@appwrite.io": { "memberSince": "2022-05-09", "spot": "28", "gitHub": "DylanG-64" },
+  "steven@appwrite.io": { "memberSince": "2022-07-01", "spot": "30", "gitHub": "stnguyen90" },
+  "jyoti@appwrite.io": { "memberSince": "2022-10-24", "spot": "31", "gitHub": "joeyouss" },
+  "jade@appwrite.io": { "memberSince": "2022-10-31", "spot": "32", "gitHub": "dajebp" },
+  "khushboo@appwrite.io": { "memberSince": "2021-11-08", "spot": "13", "gitHub": "vermakhushboo" },
+  "thomas@appwrite.io": { "memberSince": "2022-11-03", "spot": "34", "gitHub": "TGlide" },
+  "holly@appwrite.io": { "memberSince": "2022-12-05", "spot": "35", "gitHub": "HollyBarclay" },
+  "laura@appwrite.io": { "memberSince": "2023-01-25", "spot": "36", "gitHub": "LauraDuRy" },
+  "caio@appwrite.io": { "memberSince": "2023-03-27", "spot": "37", "gitHub": "ariascaio" },
+  "luke@appwrite.io": { "memberSince": "2023-05-04", "spot": "38", "gitHub": "loks0n" }
+}

app/config/cloud/heroes.json

@@ -0,0 +1,9 @@
+{
+  "bishwajeet.techmaster@gmail.com": { "memberSince": "2023-02-07" },
+  "lucasaudart@gmail.com": { "memberSince": "2023-02-07" },
+  "tkarmakar27112000@gmail.com": { "memberSince": "2023-02-07" },
+  "alves.mckl@gmail.com": { "memberSince": "2023-02-07" },
+  "dpns_nampula@rnlay.com": { "memberSince": "2023-02-07" },
+  "a.stephensimon@outlook.com": { "memberSince": "2023-02-07" },
+  "hidianapham@gmail.com": { "memberSince": "2023-02-07" }
+}

app/config/collections/databases.php

@@ -1,126 +0,0 @@
-<?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

@@ -1,94 +0,0 @@
-<?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

@@ -1,52 +0,0 @@
-<?php
-
-/**
- * Initializes console project document.
- */
-
-use Appwrite\Auth\Auth;
-use Appwrite\Network\Validator\Origin;
-use Utopia\Database\Helpers\ID;
-use Utopia\System\System;
-
-$console = [
-    '$id' => ID::custom('console'),
-    '$internalId' => 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' => Origin::CLIENT_TYPE_WEB,
-            'hostname' => 'localhost',
-        ], // Current host is added on app init
-    ],
-    '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

@@ -5,13 +5,12 @@
  */
 
 use Appwrite\Extend\Exception;
-use Appwrite\Messaging\Status as MessageStatus;
 
 return [
     /** General Errors */
     Exception::GENERAL_UNKNOWN => [
         'name' => Exception::GENERAL_UNKNOWN,
-        'description' => 'An unknown error has occurred. Please check the logs for more information.',
+        'description' => 'An unknown error has occured. Please check the logs for more information.',
         'code' => 500,
     ],
     Exception::GENERAL_MOCK => [
@@ -24,25 +23,15 @@ 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.',
         'code' => 403,
     ],
-    Exception::GENERAL_API_DISABLED => [
-        'name' => Exception::GENERAL_API_DISABLED,
-        'description' => 'The requested API is disabled. You can enable the API from the Appwrite console.',
-        'code' => 403,
-    ],
     Exception::GENERAL_SERVICE_DISABLED => [
         'name' => Exception::GENERAL_SERVICE_DISABLED,
         'description' => 'The requested service is disabled. You can enable the service from the Appwrite console.',
-        'code' => 403,
+        'code' => 503,
     ],
     Exception::GENERAL_UNAUTHORIZED_SCOPE => [
         'name' => Exception::GENERAL_UNAUTHORIZED_SCOPE,
@@ -97,53 +86,18 @@ return [
     Exception::GENERAL_PROTOCOL_UNSUPPORTED => [
         'name' => Exception::GENERAL_PROTOCOL_UNSUPPORTED,
         'description' => 'The request cannot be fulfilled with the current protocol. Please check the value of the _APP_OPTIONS_FORCE_HTTPS environment variable.',
-        'code' => 426,
+        'code' => 500,
     ],
     Exception::GENERAL_CODES_DISABLED => [
         'name' => Exception::GENERAL_CODES_DISABLED,
         'description' => 'Invitation codes are disabled on this server. Please contact the server administrator.',
         'code' => 500,
     ],
-    Exception::GENERAL_USAGE_DISABLED => [
-        'name' => Exception::GENERAL_USAGE_DISABLED,
-        'description' => 'Usage stats is not configured. Please check the value of the _APP_USAGE_STATS environment variable of your Appwrite server.',
-        'code' => 501,
-    ],
-    Exception::GENERAL_NOT_IMPLEMENTED => [
-        'name' => Exception::GENERAL_NOT_IMPLEMENTED,
-        'description' => 'This method was not fully implemented yet. If you believe this is a mistake, please upgrade your Appwrite server version.',
-        'code' => 405,
-    ],
-    Exception::GENERAL_INVALID_EMAIL => [
-        'name' => Exception::GENERAL_INVALID_EMAIL,
-        'description' => 'Value must be a valid email address.',
-        'code' => 400,
-    ],
-    Exception::GENERAL_INVALID_PHONE => [
-        'name' => Exception::GENERAL_INVALID_PHONE,
-        'description' => 'Value must be a valid phone number. Format this number with a leading \'+\' and a country code, e.g., +16175551212.',
-        'code' => 400,
-    ],
-    Exception::GENERAL_REGION_ACCESS_DENIED => [
-        'name' => Exception::GENERAL_REGION_ACCESS_DENIED,
-        'description' => 'Your location is not supported due to legal requirements.',
-        'code' => 451,
-    ],
-    Exception::GENERAL_BAD_REQUEST => [
-        'name' => Exception::GENERAL_BAD_REQUEST,
-        'description' => 'There was an error processing your request. Please check the inputs and try again.',
-        'code' => 400,
-    ],
 
     /** User Errors */
     Exception::USER_COUNT_EXCEEDED => [
         'name' => Exception::USER_COUNT_EXCEEDED,
         'description' => 'The current project has exceeded the maximum number of users. Please check your user limit in the Appwrite console.',
-        'code' => 400,
-    ],
-    Exception::USER_CONSOLE_COUNT_EXCEEDED => [
-        'name' => Exception::USER_CONSOLE_COUNT_EXCEEDED,
-        'description' => 'Sign up to the console is restricted. You can contact an administrator to update console sign up restrictions by setting _APP_CONSOLE_WHITELIST_ROOT to "disabled".',
         'code' => 501,
     ],
     Exception::USER_JWT_INVALID => [
@@ -153,12 +107,12 @@ return [
     ],
     Exception::USER_ALREADY_EXISTS => [
         'name' => Exception::USER_ALREADY_EXISTS,
-        'description' => 'A user with the same id, email, or phone already exists in this project.',
+        'description' => 'A user with the same email already exists in your project.',
         'code' => 409,
     ],
     Exception::USER_BLOCKED => [
         'name' => Exception::USER_BLOCKED,
-        'description' => 'The current user has been blocked. You can unblock the user by making a request to the User API\'s "Update User Status" endpoint or in the Appwrite Console\'s Auth section.',
+        'description' => 'The current user has been blocked.',
         'code' => 401,
     ],
     Exception::USER_INVALID_TOKEN => [
@@ -198,7 +152,7 @@ return [
     ],
     Exception::USER_SESSION_ALREADY_EXISTS => [
         'name' => Exception::USER_SESSION_ALREADY_EXISTS,
-        'description' => 'Creation of a session is prohibited when a session is active.',
+        'description' => 'Creation of anonymous users is prohibited when a session is active.',
         'code' => 401,
     ],
     Exception::USER_NOT_FOUND => [
@@ -216,26 +170,11 @@ return [
         'description' => 'Passwords do not match. Please check the password and confirm password.',
         'code' => 400,
     ],
-    Exception::USER_PASSWORD_RECENTLY_USED => [
-        'name' => Exception::USER_PASSWORD_RECENTLY_USED,
-        'description' => 'The password you are trying to use is similar to your previous password. For your security, please choose a different password and try again.',
-        'code' => 400,
-    ],
-    Exception::USER_PASSWORD_PERSONAL_DATA => [
-        'name' => Exception::USER_PASSWORD_PERSONAL_DATA,
-        'description' => 'The password you are trying to use contains references to your name, email, phone or userID. For your security, please choose a different password and try again.',
-        'code' => 400,
-    ],
     Exception::USER_SESSION_NOT_FOUND => [
         'name' => Exception::USER_SESSION_NOT_FOUND,
         'description' => 'The current user session could not be found.',
         'code' => 404,
     ],
-    Exception::USER_IDENTITY_NOT_FOUND => [
-        'name' => Exception::USER_IDENTITY_NOT_FOUND,
-        'description' => 'The identity could not be found. Please sign in with OAuth provider to create identity first.',
-        'code' => 404,
-    ],
     Exception::USER_UNAUTHORIZED => [
         'name' => Exception::USER_UNAUTHORIZED,
         'description' => 'The current user is not authorized to perform the requested action.',
@@ -245,33 +184,12 @@ return [
         'name' => Exception::USER_AUTH_METHOD_UNSUPPORTED,
         'description' => 'The requested authentication method is either disabled or unsupported. Please check the supported authentication methods in the Appwrite console.',
         'code' => 501,
-        'publish' => false,
     ],
     Exception::USER_PHONE_ALREADY_EXISTS => [
         'name' => Exception::USER_PHONE_ALREADY_EXISTS,
         'description' => 'A user with the same phone number already exists in the current project.',
         'code' => 409,
     ],
-    Exception::USER_RECOVERY_CODES_ALREADY_EXISTS => [
-        'name' => Exception::USER_RECOVERY_CODES_ALREADY_EXISTS,
-        'description' => 'The current user already generated recovery codes and they can only be read once for security reasons.',
-        'code' => 409,
-    ],
-    Exception::USER_AUTHENTICATOR_NOT_FOUND => [
-        'name' => Exception::USER_AUTHENTICATOR_NOT_FOUND,
-        'description' => 'Authenticator could not be found on the current user.',
-        'code' => 404,
-    ],
-    Exception::USER_RECOVERY_CODES_NOT_FOUND => [
-        'name' => Exception::USER_RECOVERY_CODES_NOT_FOUND,
-        'description' => 'Recovery codes could not be found on the current user.',
-        'code' => 404,
-    ],
-    Exception::USER_AUTHENTICATOR_ALREADY_VERIFIED => [
-        'name' => Exception::USER_AUTHENTICATOR_ALREADY_VERIFIED,
-        'description' => 'This authenticator is already verified on the current user.',
-        'code' => 409,
-    ],
     Exception::USER_PHONE_NOT_FOUND => [
         'name' => Exception::USER_PHONE_NOT_FOUND,
         'description' => 'The current user does not have a phone number associated with their account.',
@@ -282,66 +200,6 @@ return [
         'description' => 'Missing ID from OAuth2 provider.',
         'code' => 400,
     ],
-    Exception::USER_MORE_FACTORS_REQUIRED => [
-        'name' => Exception::USER_MORE_FACTORS_REQUIRED,
-        'description' => 'More factors are required to complete the sign in process.',
-        'code' => 401,
-    ],
-    Exception::USER_CHALLENGE_REQUIRED => [
-        'name' => Exception::USER_CHALLENGE_REQUIRED,
-        'description' => 'A recently successful challenge is required to complete this action. A challenge is considered recent for 5 minutes.',
-        'code' => 401,
-    ],
-    Exception::USER_OAUTH2_BAD_REQUEST => [
-        'name' => Exception::USER_OAUTH2_BAD_REQUEST,
-        'description' => 'OAuth2 provider rejected the bad request.',
-        'code' => 400,
-    ],
-    Exception::USER_OAUTH2_UNAUTHORIZED => [
-        'name' => Exception::USER_OAUTH2_UNAUTHORIZED,
-        'description' => 'OAuth2 provider rejected the unauthorized request.',
-        'code' => 401,
-    ],
-    Exception::USER_OAUTH2_PROVIDER_ERROR => [
-        'name' => Exception::USER_OAUTH2_PROVIDER_ERROR,
-        'description' => 'OAuth2 provider returned some error.',
-        'code' => 424,
-    ],
-    Exception::USER_EMAIL_ALREADY_VERIFIED => [
-        'name' => Exception::USER_EMAIL_ALREADY_VERIFIED,
-        'description' => 'User email is already verified',
-        'code' => 409,
-    ],
-    Exception::USER_PHONE_ALREADY_VERIFIED => [
-        'name' => Exception::USER_PHONE_ALREADY_VERIFIED,
-        'description' => 'User phone is already verified',
-        'code' => 409
-    ],
-    Exception::USER_DELETION_PROHIBITED => [
-        'name' => Exception::USER_DELETION_PROHIBITED,
-        'description' => 'User deletion is not allowed for users with active memberships. Please delete all confirmed memberships before deleting the account.',
-        'code' => 400
-    ],
-    Exception::USER_TARGET_NOT_FOUND => [
-        'name' => Exception::USER_TARGET_NOT_FOUND,
-        'description' => 'The target could not be found.',
-        'code' => 404,
-    ],
-    Exception::USER_TARGET_ALREADY_EXISTS => [
-        'name' => Exception::USER_TARGET_ALREADY_EXISTS,
-        'description' => 'A target with the same ID already exists.',
-        'code' => 409,
-    ],
-    Exception::USER_API_KEY_AND_SESSION_SET => [
-        'name' => Exception::USER_API_KEY_AND_SESSION_SET,
-        'description' => 'API key and session used in the same request. Use either `setSession` or `setKey`. Learn about which authentication method to use in the SSR docs: https://appwrite.io/docs/products/auth/server-side-rendering',
-        'code' => 403,
-    ],
-    Exception::API_KEY_EXPIRED => [
-        'name' => Exception::API_KEY_EXPIRED,
-        'description' => 'The dynamic API key has expired. Please don\'t use dynamic API keys for more than duration of the execution.',
-        'code' => 401,
-    ],
 
     /** Teams */
     Exception::TEAM_NOT_FOUND => [
@@ -349,6 +207,11 @@ 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 +219,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.',
         'code' => 401,
     ],
     Exception::TEAM_MEMBERSHIP_MISMATCH => [
@@ -369,18 +232,6 @@ return [
         'description' => 'The invite does not belong to the current user.',
         'code' => 401,
     ],
-    Exception::TEAM_ALREADY_EXISTS => [
-        'name' => Exception::TEAM_ALREADY_EXISTS,
-        'description' => 'Team with requested ID already exists. Please choose a different ID and try again.',
-        '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 => [
@@ -390,7 +241,7 @@ return [
     ],
     Exception::MEMBERSHIP_ALREADY_CONFIRMED => [
         'name' => Exception::MEMBERSHIP_ALREADY_CONFIRMED,
-        'description' => 'Membership is already confirmed.',
+        'description' => 'Membership already confirmed',
         'code' => 409,
     ],
 
@@ -422,11 +273,6 @@ return [
     ],
 
     /** Storage */
-    Exception::STORAGE_FILE_ALREADY_EXISTS => [
-        'name' => Exception::STORAGE_FILE_ALREADY_EXISTS,
-        'description' => 'A storage file with the requested ID already exists.',
-        'code' => 409,
-    ],
     Exception::STORAGE_FILE_NOT_FOUND => [
         'name' => Exception::STORAGE_FILE_NOT_FOUND,
         'description' => 'The requested file could not be found.',
@@ -459,7 +305,7 @@ return [
     ],
     Exception::STORAGE_BUCKET_ALREADY_EXISTS => [
         'name' => Exception::STORAGE_BUCKET_ALREADY_EXISTS,
-        'description' => 'A storage bucket with the requested ID already exists. Try again with a different ID or use ID.unique() to generate a unique ID.',
+        'description' => 'A storage bucket with the requested ID already exists.',
         'code' => 409,
     ],
     Exception::STORAGE_BUCKET_NOT_FOUND => [
@@ -477,43 +323,6 @@ return [
         'description' => 'The requested range is not satisfiable. Please check the value of the Range header.',
         'code' => 416,
     ],
-    Exception::STORAGE_INVALID_APPWRITE_ID => [
-        'name' => Exception::STORAGE_INVALID_APPWRITE_ID,
-        'description' => 'The value for x-appwrite-id header is invalid. Please check the value of the x-appwrite-id header is a valid id and not unique().',
-        'code' => 400,
-    ],
-    Exception::STORAGE_FILE_NOT_PUBLIC => [
-        'name' => Exception::STORAGE_FILE_NOT_PUBLIC,
-        'description' => 'The requested file is not publicly readable.',
-        'code' => 403,
-    ],
-
-    /** VCS */
-    Exception::INSTALLATION_NOT_FOUND => [
-        'name' => Exception::INSTALLATION_NOT_FOUND,
-        'description' => 'Installation with the requested ID could not be found. Check to see if the ID is correct, or create the installation.',
-        'code' => 404,
-    ],
-    Exception::PROVIDER_REPOSITORY_NOT_FOUND => [
-        'name' => Exception::PROVIDER_REPOSITORY_NOT_FOUND,
-        'description' => 'VCS (Version Control System) repository with the requested ID could not be found. Check to see if the ID is correct, and if it belongs to installationId you provided.',
-        'code' => 404,
-    ],
-    Exception::REPOSITORY_NOT_FOUND => [
-        'name' => Exception::REPOSITORY_NOT_FOUND,
-        'description' => 'Repository with the requested ID could not be found. Check to see if the ID is correct, or create the repository.',
-        'code' => 404,
-    ],
-    Exception::PROVIDER_CONTRIBUTION_CONFLICT => [
-        'name' => Exception::PROVIDER_CONTRIBUTION_CONFLICT,
-        'description' => 'External contribution is already authorized.',
-        'code' => 409,
-    ],
-    Exception::GENERAL_PROVIDER_FAILURE => [
-        'name' => Exception::GENERAL_PROVIDER_FAILURE,
-        'description' => 'VCS (Version Control System) provider failed to process the request. We believe this is an error with the VCS provider. Try again, or contact support for more information.',
-        'code' => 400,
-    ],
 
     /** Functions  */
     Exception::FUNCTION_NOT_FOUND => [
@@ -526,43 +335,6 @@ return [
         'description' => 'The requested runtime is either inactive or unsupported. Please check the value of the _APP_FUNCTIONS_RUNTIMES environment variable.',
         'code' => 404,
     ],
-    Exception::FUNCTION_ENTRYPOINT_MISSING => [
-        '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,
-    ],
-    Exception::FUNCTION_SYNCHRONOUS_TIMEOUT => [
-        'name' => Exception::FUNCTION_SYNCHRONOUS_TIMEOUT,
-        'description' => 'Synchronous function execution timed out. Use asynchronous execution instead, or ensure the execution duration doesn\'t exceed 30 seconds.',
-        'code' => 408,
-    ],
-    Exception::FUNCTION_TEMPLATE_NOT_FOUND => [
-        'name' => Exception::FUNCTION_TEMPLATE_NOT_FOUND,
-        '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,
-    ],
-
-    /** Sites */
-    Exception::SITE_NOT_FOUND => [
-        'name' => Exception::SITE_NOT_FOUND,
-        'description' => 'Site with the requested ID could not be found.',
-        'code' => 404,
-    ],
-    Exception::SITE_FRAMEWORK_UNSUPPORTED => [
-        'name' => Exception::SITE_FRAMEWORK_UNSUPPORTED,
-        'description' => 'The requested framework is either inactive or unsupported. Please check the value of the _APP_SITES_FRAMEWORKS environment variable.',
-        '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 => [
@@ -580,11 +352,6 @@ return [
         'description' => 'Build with the requested ID is already in progress. Please wait before you can retry.',
         'code' => 400,
     ],
-    Exception::BUILD_ALREADY_COMPLETED => [
-        'name' => Exception::BUILD_ALREADY_COMPLETED,
-        'description' => 'Build with the requested ID is already completed and cannot be canceled.',
-        'code' => 400,
-    ],
 
     /** Deployments */
     Exception::DEPLOYMENT_NOT_FOUND => [
@@ -600,35 +367,18 @@ return [
         'code' => 404,
     ],
 
-    Exception::EXECUTION_IN_PROGRESS => [
-        'name' => Exception::EXECUTION_IN_PROGRESS,
-        'description' => 'Can\'t delete ongoing execution. Please wait for execution to finish before deleting it.',
-        '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,
         'description' => 'Database not found',
         'code' => 404
     ],
+
     Exception::DATABASE_ALREADY_EXISTS => [
         'name' => Exception::DATABASE_ALREADY_EXISTS,
         'description' => 'Database already exists',
         'code' => 409
     ],
-    Exception::DATABASE_TIMEOUT => [
-        'name' => Exception::DATABASE_TIMEOUT,
-        'description' => 'Database timed out. Try adjusting your queries or adding an index.',
-        'code' => 408
-    ],
 
     /** Collections */
     Exception::COLLECTION_NOT_FOUND => [
@@ -638,7 +388,7 @@ return [
     ],
     Exception::COLLECTION_ALREADY_EXISTS => [
         'name' => Exception::COLLECTION_ALREADY_EXISTS,
-        'description' => 'A collection with the requested ID already exists. Try again with a different ID or use ID.unique() to generate a unique ID.',
+        'description' => 'A collection with the requested ID already exists.',
         'code' => 409,
     ],
     Exception::COLLECTION_LIMIT_EXCEEDED => [
@@ -658,31 +408,16 @@ return [
         'description' => 'The document structure is invalid. Please ensure the attributes match the collection definition.',
         'code' => 400,
     ],
-    Exception::DOCUMENT_MISSING_DATA => [
-        'name' => Exception::DOCUMENT_MISSING_DATA,
-        'description' => 'The document data is missing. Try again with document data populated',
-        'code' => 400,
-    ],
     Exception::DOCUMENT_MISSING_PAYLOAD => [
         'name' => Exception::DOCUMENT_MISSING_PAYLOAD,
-        'description' => 'The document data and permissions are missing. You must provide either document data or permissions to be updated.',
+        'description' => 'The document payload is missing.',
         'code' => 400,
     ],
     Exception::DOCUMENT_ALREADY_EXISTS => [
         'name' => Exception::DOCUMENT_ALREADY_EXISTS,
-        'description' => 'Document with the requested ID already exists. Try again with a different ID or use ID.unique() to generate a unique ID.',
+        'description' => 'Document with the requested ID already exists.',
         'code' => 409,
     ],
-    Exception::DOCUMENT_UPDATE_CONFLICT => [
-        'name' => Exception::DOCUMENT_UPDATE_CONFLICT,
-        'description' => 'Remote document is newer than local.',
-        'code' => 409,
-    ],
-    Exception::DOCUMENT_DELETE_RESTRICTED => [
-        'name' => Exception::DOCUMENT_DELETE_RESTRICTED,
-        'description' => 'Document cannot be deleted because it is referenced by another document.',
-        'code' => 403,
-    ],
 
     /** Attributes */
     Exception::ATTRIBUTE_NOT_FOUND => [
@@ -692,12 +427,12 @@ return [
     ],
     Exception::ATTRIBUTE_UNKNOWN => [
         'name' => Exception::ATTRIBUTE_UNKNOWN,
-        'description' => 'The attribute required for the index could not be found. Please confirm all your attributes are in the available state.',
+        'description' => 'The attribute required for the index could not be found. Please confirm all your attributes are in the <span class="tag">available</span> state.',
         'code' => 400,
     ],
     Exception::ATTRIBUTE_NOT_AVAILABLE => [
         'name' => Exception::ATTRIBUTE_NOT_AVAILABLE,
-        'description' => 'The requested attribute is not yet available. Please try again later.',
+        'description' => 'The requested attribute is not yet <span class="tag">available</span>. Please try again later.',
         'code' => 400,
     ],
     Exception::ATTRIBUTE_FORMAT_UNSUPPORTED => [
@@ -707,17 +442,17 @@ return [
     ],
     Exception::ATTRIBUTE_DEFAULT_UNSUPPORTED => [
         'name' => Exception::ATTRIBUTE_DEFAULT_UNSUPPORTED,
-        'description' => 'Default values cannot be set for array or required attributes.',
+        'description' => 'Default values cannot be set for <span class="tag">array</span> and <span class="tag">required</span> attributes.',
         'code' => 400,
     ],
     Exception::ATTRIBUTE_ALREADY_EXISTS => [
         'name' => Exception::ATTRIBUTE_ALREADY_EXISTS,
-        'description' => 'Attribute with the requested key already exists. Attribute keys must be unique, try again with a different key.',
+        'description' => 'Attribute with the requested ID already exists.',
         'code' => 409,
     ],
     Exception::ATTRIBUTE_LIMIT_EXCEEDED => [
         'name' => Exception::ATTRIBUTE_LIMIT_EXCEEDED,
-        'description' => 'The maximum number or size of attributes for this collection has been reached.',
+        'description' => 'The maximum number of attributes has been reached.',
         'code' => 400,
     ],
     Exception::ATTRIBUTE_VALUE_INVALID => [
@@ -725,21 +460,6 @@ return [
         'description' => 'The attribute value is invalid. Please check the type, range and value of the attribute.',
         'code' => 400,
     ],
-    Exception::ATTRIBUTE_TYPE_INVALID => [
-        'name' => Exception::ATTRIBUTE_TYPE_INVALID,
-        'description' => 'The attribute type is invalid.',
-        'code' => 400,
-    ],
-    Exception::RELATIONSHIP_VALUE_INVALID => [
-        'name' => Exception::RELATIONSHIP_VALUE_INVALID,
-        'description' => 'The relationship value is invalid.',
-        'code' => 400,
-    ],
-    Exception::ATTRIBUTE_INVALID_RESIZE => [
-        'name' => Exception::ATTRIBUTE_INVALID_RESIZE,
-        'description' => "Existing data is too large for new size, truncate your existing data then try again.",
-        'code' => 400,
-    ],
 
     /** Indexes */
     Exception::INDEX_NOT_FOUND => [
@@ -754,17 +474,7 @@ return [
     ],
     Exception::INDEX_ALREADY_EXISTS => [
         'name' => Exception::INDEX_ALREADY_EXISTS,
-        'description' => 'Index with the requested key already exists. Try again with a different key.',
-        'code' => 409,
-    ],
-    Exception::INDEX_INVALID => [
-        'name' => Exception::INDEX_INVALID,
-        '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.',
+        'description' => 'Index with the requested ID already exists.',
         'code' => 409,
     ],
 
@@ -776,9 +486,14 @@ return [
     ],
     Exception::PROJECT_ALREADY_EXISTS => [
         'name' => Exception::PROJECT_ALREADY_EXISTS,
-        'description' => 'Project with the requested ID already exists. Try again with a different ID or use ID.unique() to generate a unique ID.',
+        'description' => 'Project with the requested ID already exists.',
         'code' => 409,
     ],
+    Exception::PROJECT_UNKNOWN => [
+        'name' => Exception::PROJECT_UNKNOWN,
+        'description' => 'The project ID is either missing or not valid. Please check the value of the X-Appwrite-Project header to ensure the correct project ID is being used.',
+        'code' => 400,
+    ],
     Exception::PROJECT_PROVIDER_DISABLED => [
         'name' => Exception::PROJECT_PROVIDER_DISABLED,
         'description' => 'The chosen OAuth provider is disabled. You can enable the OAuth provider using the Appwrite console.',
@@ -787,7 +502,7 @@ return [
     Exception::PROJECT_PROVIDER_UNSUPPORTED => [
         'name' => Exception::PROJECT_PROVIDER_UNSUPPORTED,
         'description' => 'The chosen OAuth provider is unsupported. Please check the <a href="/docs/client/account?sdk=web-default#accountCreateOAuth2Session">Create OAuth2 Session docs</a> for the complete list of supported OAuth providers.',
-        'code' => 400,
+        'code' => 501,
     ],
     Exception::PROJECT_INVALID_SUCCESS_URL => [
         'name' => Exception::PROJECT_INVALID_SUCCESS_URL,
@@ -809,52 +524,6 @@ return [
         'description' => 'The project key has expired. Please generate a new key using the Appwrite console.',
         'code' => 401,
     ],
-    Exception::ROUTER_HOST_NOT_FOUND => [
-        'name' => Exception::ROUTER_HOST_NOT_FOUND,
-        'description' => 'Host is not trusted. This could occur because you have not configured a custom domain. Add a custom domain to your project first and try again.',
-        'code' => 404,
-    ],
-    Exception::ROUTER_DOMAIN_NOT_CONFIGURED => [
-        'name' => Exception::ROUTER_DOMAIN_NOT_CONFIGURED,
-        'description' => '_APP_DOMAIN, _APP_DOMAIN_TARGET, and _APP_DOMAIN_FUNCTIONS environment variables have not been configured. Please configure the domain environment variables before accessing the Appwrite Console via any IP address or hostname other than localhost. This value could be an IP like 203.0.113.0 or a hostname like example.com.',
-        'code' => 500,
-    ],
-    Exception::RULE_RESOURCE_NOT_FOUND => [
-        'name' => Exception::RULE_RESOURCE_NOT_FOUND,
-        'description' => 'Resource could not be found. Please check if the resourceId and resourceType are correct, or if the resource actually exists.',
-        'code' => 404,
-    ],
-    Exception::RULE_NOT_FOUND => [
-        'name' => Exception::RULE_NOT_FOUND,
-        'description' => 'Rule with the requested ID could not be found. Please check if the ID provided is correct or if the rule actually exists.',
-        'code' => 404,
-    ],
-    Exception::RULE_ALREADY_EXISTS => [
-        'name' => Exception::RULE_ALREADY_EXISTS,
-        'description' => 'Domain is already used. Please try again with a different domain.',
-        'code' => 409,
-    ],
-    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,
-        'publish' => true
-    ],
-    Exception::PROJECT_SMTP_CONFIG_INVALID => [
-        'name' => Exception::PROJECT_SMTP_CONFIG_INVALID,
-        'description' => 'Provided SMTP config is invalid. Please check the configured values and try again.',
-        'code' => 400,
-    ],
-    Exception::PROJECT_TEMPLATE_DEFAULT_DELETION => [
-        'name' => Exception::PROJECT_TEMPLATE_DEFAULT_DELETION,
-        'description' => 'You can\'t delete default template. If you are trying to reset your template changes, you can ignore this error as it\'s already been reset.',
-        'code' => 401,
-    ],
-    Exception::PROJECT_REGION_UNSUPPORTED => [
-        'name' => Exception::PROJECT_REGION_UNSUPPORTED,
-        'description' => 'The requested region is either inactive or unsupported. Please check the value of the _APP_REGIONS environment variable.',
-        'code' => 400,
-    ],
     Exception::WEBHOOK_NOT_FOUND => [
         'name' => Exception::WEBHOOK_NOT_FOUND,
         'description' => 'Webhook with the requested ID could not be found.',
@@ -870,6 +539,21 @@ return [
         'description' => 'Platform with the requested ID could not be found.',
         'code' => 404,
     ],
+    Exception::DOMAIN_NOT_FOUND => [
+        'name' => Exception::DOMAIN_NOT_FOUND,
+        'description' => 'Domain with the requested ID could not be found.',
+        'code' => 404,
+    ],
+    Exception::DOMAIN_ALREADY_EXISTS => [
+        'name' => Exception::DOMAIN_ALREADY_EXISTS,
+        'description' => 'The requested domain is currently in use by a project.',
+        'code' => 409,
+    ],
+    Exception::DOMAIN_FORBIDDEN => [
+        'name' => Exception::DOMAIN_FORBIDDEN,
+        'description' => 'The requested domain cannot be used as a custom domain.',
+        'code' => 403,
+    ],
     Exception::VARIABLE_NOT_FOUND => [
         'name' => Exception::VARIABLE_NOT_FOUND,
         'description' => 'Variable with the requested ID could not be found.',
@@ -877,191 +561,12 @@ return [
     ],
     Exception::VARIABLE_ALREADY_EXISTS => [
         'name' => Exception::VARIABLE_ALREADY_EXISTS,
-        'description' => 'Variable with the same ID already exists in this project. Try again with a different ID.',
+        'description' => 'Variable with the same ID already exists in your project.',
         '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.',
-        'code' => 400,
-    ],
-    Exception::GRAPHQL_TOO_MANY_QUERIES => [
-        'name' => Exception::GRAPHQL_TOO_MANY_QUERIES,
-        'description' => 'Too many queries.',
-        'code' => 400,
-    ],
-
-    /** Migrations */
-    Exception::MIGRATION_NOT_FOUND => [
-        'name' => Exception::MIGRATION_NOT_FOUND,
-        'description' => 'Migration with the requested ID could not be found. Please verify that the provided ID is correct and try again.',
-        'code' => 404,
-    ],
-    Exception::MIGRATION_ALREADY_EXISTS => [
-        'name' => Exception::MIGRATION_ALREADY_EXISTS,
-        'description' => 'Migration with the requested ID already exists. Try again with a different ID.',
-        'code' => 409,
-    ],
-    Exception::MIGRATION_IN_PROGRESS => [
-        'name' => Exception::MIGRATION_IN_PROGRESS,
-        'description' => 'Migration is already in progress. You can check the status of the migration in your Appwrite Console\'s "Settings" > "Migrations".',
-        'code' => 409,
-    ],
-
-    /** Realtime */
-    Exception::REALTIME_MESSAGE_FORMAT_INVALID => [
-        'name' => Exception::REALTIME_MESSAGE_FORMAT_INVALID,
-        'description' => 'Message format is not valid.',
-        'code' => 1003,
-    ],
-    Exception::REALTIME_POLICY_VIOLATION => [
-        'name' => Exception::REALTIME_POLICY_VIOLATION,
-        'description' => 'Policy violation.',
-        'code' => 1008,
-    ],
-    Exception::REALTIME_TOO_MANY_MESSAGES => [
-        'name' => Exception::REALTIME_TOO_MANY_MESSAGES,
-        'description' => 'Too many messages.',
-        'code' => 1013,
-    ],
-    Exception::MIGRATION_PROVIDER_ERROR => [
-        'name' => Exception::MIGRATION_PROVIDER_ERROR,
-        'description' => 'An error occurred on the provider\'s side. Please try again later.',
-        'code' => 400,
-    ],
-
-    /** Health */
-    Exception::HEALTH_QUEUE_SIZE_EXCEEDED => [
-        'name' => Exception::HEALTH_QUEUE_SIZE_EXCEEDED,
-        'description' => 'Queue size threshold hit.',
-        'code' => 503,
-        'publish' => false
-    ],
-
-    Exception::HEALTH_CERTIFICATE_EXPIRED => [
-        'name' => Exception::HEALTH_CERTIFICATE_EXPIRED,
-        'description' => 'The SSL certificate for the specified domain has expired and is no longer valid.',
-        'code' => 404,
-    ],
-
-    Exception::HEALTH_INVALID_HOST => [
-        'name' => Exception::HEALTH_INVALID_HOST,
-        'description' => 'Failed to establish a connection to the specified domain. Please verify the domain name and ensure that the server is running and accessible.',
-        'code' => 404,
-    ],
-
-    /** Providers */
-    Exception::PROVIDER_NOT_FOUND => [
-        'name' => Exception::PROVIDER_NOT_FOUND,
-        'description' => 'Provider with the requested ID could not be found.',
-        'code' => 404,
-    ],
-    Exception::PROVIDER_ALREADY_EXISTS => [
-        'name' => Exception::PROVIDER_ALREADY_EXISTS,
-        'description' => 'Provider with the requested ID already exists.',
-        'code' => 409,
-    ],
-    Exception::PROVIDER_INCORRECT_TYPE => [
-        'name' => Exception::PROVIDER_INCORRECT_TYPE,
-        'description' => 'Provider with the requested ID is of the incorrect type.',
-        'code' => 400,
-    ],
-    Exception::PROVIDER_MISSING_CREDENTIALS => [
-        'name' => Exception::PROVIDER_MISSING_CREDENTIALS,
-        'description' => 'Provider with the requested ID is missing credentials.',
-        'code' => 400,
-    ],
-
-    /** Topics */
-    Exception::TOPIC_NOT_FOUND => [
-        'name' => Exception::TOPIC_NOT_FOUND,
-        'description' => 'Topic with the request ID could not be found.',
-        'code' => 404,
-    ],
-    Exception::TOPIC_ALREADY_EXISTS => [
-        'name' => Exception::TOPIC_ALREADY_EXISTS,
-        'description' => 'Topic with the request ID already exists.',
-        'code' => 409,
-    ],
-
-    /** Subscribers */
-    Exception::SUBSCRIBER_NOT_FOUND => [
-        'name' => Exception::SUBSCRIBER_NOT_FOUND,
-        'description' => 'Subscriber with the request ID could not be found.',
-        'code' => 404,
-    ],
-    Exception::SUBSCRIBER_ALREADY_EXISTS => [
-        'name' => Exception::SUBSCRIBER_ALREADY_EXISTS,
-        'description' => 'Subscriber with the request ID already exists.',
-        'code' => 409,
-    ],
-
-    /** Messages */
-    Exception::MESSAGE_NOT_FOUND => [
-        'name' => Exception::MESSAGE_NOT_FOUND,
-        'description' => 'Message with the requested ID could not be found.',
-        'code' => 404,
-    ],
-    Exception::MESSAGE_MISSING_TARGET => [
-        'name' => Exception::MESSAGE_MISSING_TARGET,
-        'description' => 'Message with the requested ID has no recipients (topics or users or targets).',
-        'code' => 400,
-    ],
-    Exception::MESSAGE_ALREADY_SENT => [
-        'name' => Exception::MESSAGE_ALREADY_SENT,
-        'description' => 'Message with the requested ID has already been sent.',
-        'code' => 400,
-    ],
-    Exception::MESSAGE_ALREADY_PROCESSING => [
-        'name' => Exception::MESSAGE_ALREADY_PROCESSING,
-        'description' => 'Message with the requested ID is already being processed.',
-        'code' => 400,
-    ],
-    Exception::MESSAGE_ALREADY_FAILED => [
-        'name' => Exception::MESSAGE_ALREADY_FAILED,
-        'description' => 'Message with the requested ID has already failed.',
-        'code' => 400,
-    ],
-    Exception::MESSAGE_ALREADY_SCHEDULED => [
-        'name' => Exception::MESSAGE_ALREADY_SCHEDULED,
-        'description' => 'Message with the requested ID has already been scheduled for delivery.',
-        'code' => 400,
-    ],
-    Exception::MESSAGE_TARGET_NOT_EMAIL => [
-        'name' => Exception::MESSAGE_TARGET_NOT_EMAIL,
-        'description' => 'Message with the target ID is not an email target.',
-        'code' => 400,
-    ],
-    Exception::MESSAGE_TARGET_NOT_SMS => [
-        'name' => Exception::MESSAGE_TARGET_NOT_SMS,
-        'description' => 'Message with the target ID is not an SMS target.',
-        'code' => 400,
-    ],
-    Exception::MESSAGE_TARGET_NOT_PUSH => [
-        'name' => Exception::MESSAGE_TARGET_NOT_PUSH,
-        'description' => 'Message with the target ID is not a push target.',
-        'code' => 400,
-    ],
-    Exception::MESSAGE_MISSING_SCHEDULE => [
-        'name' => Exception::MESSAGE_MISSING_SCHEDULE,
-        'description' => 'Message can not have status ' . MessageStatus::SCHEDULED . ' without a schedule.',
-        'code' => 400,
-    ],
-    Exception::SCHEDULE_NOT_FOUND => [
-        'name' => Exception::SCHEDULE_NOT_FOUND,
-        'description' => 'Schedule with the requested ID could not be found.',
-        'code' => 404,
-    ],
-
-    /** Targets */
-    Exception::TARGET_PROVIDER_INVALID_TYPE => [
-        'name' => Exception::TARGET_PROVIDER_INVALID_TYPE,
-        'description' => 'Target has an invalid provider type.',
-        'code' => 400,
+    Exception::DOMAIN_VERIFICATION_FAILED => [
+        'name' => Exception::DOMAIN_VERIFICATION_FAILED,
+        'description' => 'Domain verification for the requested domain has failed.',
+        'code' => 401,
     ],
 ];

app/config/events.php

@@ -44,28 +44,6 @@ return [
                 '$description' => 'This event triggers when a verification token for a user is validated.'
             ],
         ],
-        'targets' => [
-            '$model' => Response::MODEL_TARGET,
-            '$resource' => true,
-            '$description' => 'This event triggers on any user\'s target event.',
-            'create' => [
-                '$description' => 'This event triggers when a user\'s target is created.',
-            ],
-            'update' => [
-                '$description' => 'This event triggers when a user\'s target is updated.',
-            ],
-            'delete' => [
-                '$description' => 'This event triggers when a user\'s target is deleted.',
-            ],
-        ],
-        'tokens' => [
-            '$model' => Response::MODEL_TOKEN,
-            '$resource' => true,
-            '$description' => 'This event triggers on any user\'s token event.',
-            'create' => [
-                '$description' => 'This event triggers when a user\'s token is created.',
-            ],
-        ],
         'create' => [
             '$description' => 'This event triggers when a user is created.'
         ],
@@ -205,44 +183,13 @@ return [
             ],
         ],
         'create' => [
-            '$description' => 'This event triggers when a team is created.'
+            '$description' => 'This event triggers when a bucket is created.'
         ],
         'delete' => [
-            '$description' => 'This event triggers when a team is deleted.',
+            '$description' => 'This event triggers when a bucket is deleted.',
         ],
         'update' => [
-            '$description' => 'This event triggers when a team is updated.',
-            'prefs' => [
-                '$description' => 'This event triggers when a team\'s preferences are updated.',
-            ],
-        ]
-    ],
-    '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.',
+            '$description' => 'This event triggers when a bucket is updated.',
         ]
     ],
     'functions' => [
@@ -286,69 +233,5 @@ return [
         'update' => [
             '$description' => 'This event triggers when a function is updated.',
         ]
-    ],
-    'messages' => [
-        '$model' => Response::MODEL_MESSAGE,
-        '$resource' => true,
-        '$description' => 'This event triggers on any messaging event.',
-        'create' => [
-            '$description' => 'This event triggers when a message is created.',
-        ],
-        'update' => [
-            '$description' => 'This event triggers when a message is updated.',
-        ],
-    ],
-    'topics' => [
-        '$model' => Response::MODEL_TOPIC,
-        '$resource' => true,
-        '$description' => 'This event triggers on any topic event.',
-        'create' => [
-            '$description' => 'This event triggers when a topic is created.',
-        ],
-        'update' => [
-            '$description' => 'This event triggers when a topic is updated.',
-        ],
-        'delete' => [
-            '$description' => 'This event triggers when a topic is deleted.'
-        ],
-        'subscribers' => [
-            '$model' => Response::MODEL_SUBSCRIBER,
-            '$resource' => true,
-            '$description' => 'This event triggers on any subscriber event.',
-            'create' => [
-                '$description' => 'This event triggers when a subscriber is created.',
-            ],
-            'delete' => [
-                '$description' => 'This event triggers when a subscriber is deleted.'
-            ],
-        ],
-    ],
-    'providers' => [
-        '$model' => Response::MODEL_PROVIDER,
-        '$resource' => true,
-        '$description' => 'This event triggers on any provider event.',
-        'create' => [
-            '$description' => 'This event triggers when a provider is created.',
-        ],
-        'update' => [
-            '$description' => 'This event triggers when a provider is updated.',
-        ],
-        'delete' => [
-            '$description' => 'This event triggers when a provider is deleted.'
-        ],
-    ],
-    'rules' => [
-        '$model' => Response::MODEL_PROXY_RULE,
-        '$resource' => true,
-        '$description' => 'This event triggers on any proxy rule event.',
-        'create' => [
-            '$description' => 'This event triggers when a proxy rule is created.'
-        ],
-        'delete' => [
-            '$description' => 'This event triggers when a proxy rule is deleted.',
-        ],
-        'update' => [
-            '$description' => 'This event triggers when a proxy rule is updated.',
-        ]
     ]
 ];

app/config/frameworks.php

@@ -1,266 +0,0 @@
-<?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',
-        'buildRuntime' => 'node-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'bundleCommand' => 'sh /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' => 'sh helpers/analog/server.sh',
-            ],
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './dist/analog/public',
-                'startCommand' => 'sh helpers/server.sh',
-                'fallbackFile' => 'index.html'
-            ]
-        ]
-    ],
-    'angular' => [
-        'key' => 'angular',
-        'name' => 'Angular',
-        'buildRuntime' => 'node-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'bundleCommand' => 'sh /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' => 'sh helpers/angular/server.sh',
-            ],
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './dist/angular/browser',
-                'startCommand' => 'sh helpers/server.sh',
-                'fallbackFile' => 'index.csr.html'
-            ]
-        ]
-    ],
-    'nextjs' => [
-        'key' => 'nextjs',
-        'name' => 'Next.js',
-        'buildRuntime' => 'node-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'bundleCommand' => 'sh /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' => 'sh helpers/next-js/server.sh',
-            ],
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './out',
-                'startCommand' => 'sh helpers/server.sh',
-            ]
-        ]
-    ],
-    'react' => [
-        'key' => 'react',
-        'name' => 'React',
-        'buildRuntime' => 'node-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'adapters' => [
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './dist',
-                'startCommand' => 'sh helpers/server.sh',
-                'fallbackFile' => 'index.html'
-            ]
-        ]
-    ],
-    'nuxt' => [
-        'key' => 'nuxt',
-        'name' => 'Nuxt',
-        'buildRuntime' => 'node-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'bundleCommand' => 'sh /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' => 'sh helpers/nuxt/server.sh',
-            ],
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'npm run generate',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './output/public',
-                'startCommand' => 'sh helpers/server.sh',
-            ]
-        ]
-    ],
-    'vue' => [
-        'key' => 'vue',
-        'name' => 'Vue.js',
-        'buildRuntime' => 'node-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'adapters' => [
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './dist',
-                'startCommand' => 'sh helpers/server.sh',
-                'fallbackFile' => 'index.html'
-            ]
-        ]
-    ],
-    'sveltekit' => [
-        'key' => 'sveltekit',
-        'name' => 'SvelteKit',
-        'buildRuntime' => 'node-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'bundleCommand' => 'sh /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' => 'sh helpers/sveltekit/server.sh',
-            ],
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './build',
-                'startCommand' => 'sh helpers/server.sh',
-            ]
-        ]
-    ],
-    'astro' => [
-        'key' => 'astro',
-        'name' => 'Astro',
-        'buildRuntime' => 'node-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'bundleCommand' => 'sh /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' => 'sh helpers/astro/server.sh',
-            ],
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './dist',
-                'startCommand' => 'sh helpers/server.sh',
-            ]
-        ]
-    ],
-    'remix' => [
-        'key' => 'remix',
-        'name' => 'Remix',
-        'buildRuntime' => 'node-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'bundleCommand' => 'sh /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' => 'sh helpers/remix/server.sh',
-            ],
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './build/client',
-                'startCommand' => 'sh helpers/server.sh',
-            ]
-        ]
-    ],
-    'flutter' => [
-        'key' => 'flutter',
-        'name' => 'Flutter',
-        'buildRuntime' => 'flutter-3.29',
-        'runtimes' => getVersions($templateRuntimes['FLUTTER']['versions'], 'flutter'),
-        'adapters' => [
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'flutter build web',
-                'installCommand' => '',
-                'outputDirectory' => './build/web',
-                'startCommand' => 'sh helpers/server.sh',
-            ],
-        ],
-    ],
-    'vite' => [
-        'key' => 'vite',
-        'name' => 'Vite',
-        'buildRuntime' => 'node-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'adapters' => [
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './dist',
-                'startCommand' => 'sh helpers/server.sh',
-            ],
-        ]
-    ],
-    'other' => [
-        'key' => 'other',
-        'name' => 'Other',
-        'buildRuntime' => 'node-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'adapters' => [
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => '',
-                'installCommand' => '',
-                'outputDirectory' => './',
-                'startCommand' => 'sh helpers/server.sh',
-            ],
-        ]
-    ],
-];

app/config/locale/codes.php

@@ -1,537 +1,76 @@
 <?php
 
-/**
- * ISO 639-1 standard language codes
- * https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
- *
- * Source:
- * https://www.andiamo.co.uk/resources/iso-language-codes/
- *
- */
-
 return [
-    [
-        "code" => "af",
-        "name" => "Afrikaans",
-    ],
-    [
-        "code" => "ar-ae",
-        "name" => "Arabic (U.A.E.)",
-    ],
-    [
-        "code" => "ar-bh",
-        "name" => "Arabic (Bahrain)",
-    ],
-    [
-        "code" => "ar-dz",
-        "name" => "Arabic (Algeria)",
-    ],
-    [
-        "code" => "ar-eg",
-        "name" => "Arabic (Egypt)",
-    ],
-    [
-        "code" => "ar-iq",
-        "name" => "Arabic (Iraq)",
-    ],
-    [
-        "code" => "ar-jo",
-        "name" => "Arabic (Jordan)",
-    ],
-    [
-        "code" => "ar-kw",
-        "name" => "Arabic (Kuwait)",
-    ],
-    [
-        "code" => "ar-lb",
-        "name" => "Arabic (Lebanon)",
-    ],
-    [
-        "code" => "ar-ly",
-        "name" => "Arabic (Libya)",
-    ],
-    [
-        "code" => "ar-ma",
-        "name" => "Arabic (Morocco)",
-    ],
-    [
-        "code" => "ar-om",
-        "name" => "Arabic (Oman)",
-    ],
-    [
-        "code" => "ar-qa",
-        "name" => "Arabic (Qatar)",
-    ],
-    [
-        "code" => "ar-sa",
-        "name" => "Arabic (Saudi Arabia)",
-    ],
-    [
-        "code" => "ar-sy",
-        "name" => "Arabic (Syria)",
-    ],
-    [
-        "code" => "ar-tn",
-        "name" => "Arabic (Tunisia)",
-    ],
-    [
-        "code" => "ar-ye",
-        "name" => "Arabic (Yemen)",
-    ],
-    [
-        "code" => "as",
-        "name" => "Assamese",
-    ],
-    [
-        "code" => "az",
-        "name" => "Azerbaijani",
-    ],
-    [
-        "code" => "be",
-        "name" => "Belarusian",
-    ],
-    [
-        "code" => "bg",
-        "name" => "Bulgarian",
-    ],
-    [
-        "code" => "bh",
-        "name" => "Bihari",
-    ],
-    [
-        "code" => "bn",
-        "name" => "Bengali",
-    ],
-    [
-        "code" => "bs",
-        "name" => "Bosnian",
-    ],
-    [
-        "code" => "ca",
-        "name" => "Catalan",
-    ],
-    [
-        "code" => "cs",
-        "name" => "Czech",
-    ],
-    [
-        "code" => "cy",
-        "name" => "Welsh",
-    ],
-    [
-        "code" => "da",
-        "name" => "Danish",
-    ],
-    [
-        "code" => "de",
-        "name" => "German (Standard)",
-    ],
-    [
-        "code" => "de-at",
-        "name" => "German (Austria)",
-    ],
-    [
-        "code" => "de-ch",
-        "name" => "German (Switzerland)",
-    ],
-    [
-        "code" => "de-li",
-        "name" => "German (Liechtenstein)",
-    ],
-    [
-        "code" => "de-lu",
-        "name" => "German (Luxembourg)",
-    ],
-    [
-        "code" => "el",
-        "name" => "Greek",
-    ],
-    [
-        "code" => "en",
-        "name" => "English",
-    ],
-    [
-        "code" => "en-au",
-        "name" => "English (Australia)",
-    ],
-    [
-        "code" => "en-bz",
-        "name" => "English (Belize)",
-    ],
-    [
-        "code" => "en-ca",
-        "name" => "English (Canada)",
-    ],
-    [
-        "code" => "en-gb",
-        "name" => "English (United Kingdom)",
-    ],
-    [
-        "code" => "en-ie",
-        "name" => "English (Ireland)",
-    ],
-    [
-        "code" => "en-jm",
-        "name" => "English (Jamaica)",
-    ],
-    [
-        "code" => "en-nz",
-        "name" => "English (New Zealand)",
-    ],
-    [
-        "code" => "en-tt",
-        "name" => "English (Trinidad)",
-    ],
-    [
-        "code" => "en-us",
-        "name" => "English (United States)",
-    ],
-    [
-        "code" => "en-za",
-        "name" => "English (South Africa)",
-    ],
-    [
-        "code" => "eo",
-        "name" => "Esperanto",
-    ],
-    [
-        "code" => "es",
-        "name" => "Spanish (Spain)",
-    ],
-    [
-        "code" => "es-ar",
-        "name" => "Spanish (Argentina)",
-    ],
-    [
-        "code" => "es-bo",
-        "name" => "Spanish (Bolivia)",
-    ],
-    [
-        "code" => "es-cl",
-        "name" => "Spanish (Chile)",
-    ],
-    [
-        "code" => "es-co",
-        "name" => "Spanish (Colombia)",
-    ],
-    [
-        "code" => "es-cr",
-        "name" => "Spanish (Costa Rica)",
-    ],
-    [
-        "code" => "es-do",
-        "name" => "Spanish (Dominican Republic)",
-    ],
-    [
-        "code" => "es-ec",
-        "name" => "Spanish (Ecuador)",
-    ],
-    [
-        "code" => "es-gt",
-        "name" => "Spanish (Guatemala)",
-    ],
-    [
-        "code" => "es-hn",
-        "name" => "Spanish (Honduras)",
-    ],
-    [
-        "code" => "es-mx",
-        "name" => "Spanish (Mexico)",
-    ],
-    [
-        "code" => "es-ni",
-        "name" => "Spanish (Nicaragua)",
-    ],
-    [
-        "code" => "es-pa",
-        "name" => "Spanish (Panama)",
-    ],
-    [
-        "code" => "es-pe",
-        "name" => "Spanish (Peru)",
-    ],
-    [
-        "code" => "es-pr",
-        "name" => "Spanish (Puerto Rico)",
-    ],
-    [
-        "code" => "es-py",
-        "name" => "Spanish (Paraguay)",
-    ],
-    [
-        "code" => "es-sv",
-        "name" => "Spanish (El Salvador)",
-    ],
-    [
-        "code" => "es-uy",
-        "name" => "Spanish (Uruguay)",
-    ],
-    [
-        "code" => "es-ve",
-        "name" => "Spanish (Venezuela)",
-    ],
-    [
-        "code" => "et",
-        "name" => "Estonian",
-    ],
-    [
-        "code" => "eu",
-        "name" => "Basque",
-    ],
-    [
-        "code" => "fa",
-        "name" => "Farsi",
-    ],
-    [
-        "code" => "fi",
-        "name" => "Finnish",
-    ],
-    [
-        "code" => "fo",
-        "name" => "Faeroese",
-    ],
-    [
-        "code" => "fr",
-        "name" => "French (Standard)",
-    ],
-    [
-        "code" => "fr-be",
-        "name" => "French (Belgium)",
-    ],
-    [
-        "code" => "fr-ca",
-        "name" => "French (Canada)",
-    ],
-    [
-        "code" => "fr-ch",
-        "name" => "French (Switzerland)",
-    ],
-    [
-        "code" => "fr-lu",
-        "name" => "French (Luxembourg)",
-    ],
-    [
-        "code" => "ga",
-        "name" => "Irish",
-    ],
-    [
-        "code" => "gd",
-        "name" => "Gaelic (Scotland)",
-    ],
-    [
-        "code" => "he",
-        "name" => "Hebrew",
-    ],
-    [
-        "code" => "hi",
-        "name" => "Hindi",
-    ],
-    [
-        "code" => "hr",
-        "name" => "Croatian",
-    ],
-    [
-        "code" => "hu",
-        "name" => "Hungarian",
-    ],
-    [
-        "code" => "id",
-        "name" => "Indonesian",
-    ],
-    [
-        "code" => "is",
-        "name" => "Icelandic",
-    ],
-    [
-        "code" => "it",
-        "name" => "Italian (Standard)",
-    ],
-    [
-        "code" => "it-ch",
-        "name" => "Italian (Switzerland)",
-    ],
-    [
-        "code" => "ja",
-        "name" => "Japanese",
-    ],
-    [
-        "code" => "ji",
-        "name" => "Yiddish",
-    ],
-    [
-        "code" => "ko",
-        "name" => "Korean",
-    ],
-    [
-        "code" => "ku",
-        "name" => "Kurdish",
-    ],
-    [
-        "code" => "lt",
-        "name" => "Lithuanian",
-    ],
-    [
-        "code" => "lv",
-        "name" => "Latvian",
-    ],
-    [
-        "code" => "mk",
-        "name" => "Macedonian (FYROM)",
-    ],
-    [
-        "code" => "ml",
-        "name" => "Malayalam",
-    ],
-    [
-        "code" => "ms",
-        "name" => "Malaysian",
-    ],
-    [
-        "code" => "mt",
-        "name" => "Maltese",
-    ],
-    [
-        "code" => "nb",
-        "name" => "Norwegian (Bokmål)",
-    ],
-    [
-        "code" => "ne",
-        "name" => "Nepali",
-    ],
-    [
-        "code" => "nl",
-        "name" => "Dutch (Standard)",
-    ],
-    [
-        "code" => "nl-be",
-        "name" => "Dutch (Belgium)",
-    ],
-    [
-        "code" => "nn",
-        "name" => "Norwegian (Nynorsk)",
-    ],
-    [
-        "code" => "no",
-        "name" => "Norwegian",
-    ],
-    [
-        "code" => "pa",
-        "name" => "Punjabi",
-    ],
-    [
-        "code" => "pl",
-        "name" => "Polish",
-    ],
-    [
-        "code" => "pt",
-        "name" => "Portuguese (Portugal)",
-    ],
-    [
-        "code" => "pt-br",
-        "name" => "Portuguese (Brazil)",
-    ],
-    [
-        "code" => "rm",
-        "name" => "Rhaeto-Romanic",
-    ],
-    [
-        "code" => "ro",
-        "name" => "Romanian",
-    ],
-    [
-        "code" => "ro-md",
-        "name" => "Romanian (Republic of Moldova)",
-    ],
-    [
-        "code" => "ru",
-        "name" => "Russian",
-    ],
-    [
-        "code" => "ru-md",
-        "name" => "Russian (Republic of Moldova)",
-    ],
-    [
-        "code" => "sb",
-        "name" => "Sorbian",
-    ],
-    [
-        "code" => "sk",
-        "name" => "Slovak",
-    ],
-    [
-        "code" => "sl",
-        "name" => "Slovenian",
-    ],
-    [
-        "code" => "sq",
-        "name" => "Albanian",
-    ],
-    [
-        "code" => "sr",
-        "name" => "Serbian",
-    ],
-    [
-        "code" => "sv",
-        "name" => "Swedish",
-    ],
-    [
-        "code" => "sv-fi",
-        "name" => "Swedish (Finland)",
-    ],
-    [
-        "code" => "th",
-        "name" => "Thai",
-    ],
-    [
-        "code" => "tn",
-        "name" => "Tswana",
-    ],
-    [
-        "code" => "tr",
-        "name" => "Turkish",
-    ],
-    [
-        "code" => "ts",
-        "name" => "Tsonga",
-    ],
-    [
-        "code" => "ua",
-        "name" => "Ukrainian",
-    ],
-    [
-        "code" => "ur",
-        "name" => "Urdu",
-    ],
-    [
-        "code" => "ve",
-        "name" => "Venda",
-    ],
-    [
-        "code" => "vi",
-        "name" => "Vietnamese",
-    ],
-    [
-        "code" => "xh",
-        "name" => "Xhosa",
-    ],
-    [
-        "code" => "zh-cn",
-        "name" => "Chinese (PRC)",
-    ],
-    [
-        "code" => "zh-hk",
-        "name" => "Chinese (Hong Kong)",
-    ],
-    [
-        "code" => "zh-sg",
-        "name" => "Chinese (Singapore)",
-    ],
-    [
-        "code" => "zh-tw",
-        "name" => "Chinese (Taiwan)",
-    ],
-    [
-        "code" => "zu",
-        "name" => "Zulu",
-    ],
+    'af', // Afrikaans
+    'ar', // Arabic
+    'as', // Assamese
+    'az', // Azerbaijani
+    'be', // Belarusian
+    'bg', // Bulgarian
+    'bh', // Bihari
+    'bn', // Bengali
+    'bs', // Bosnian
+    'ca', // Catalan
+    'cs', // Czech
+    'da', // Danish
+    'de', // German
+    'en', // English
+    'eo', // Esperanto
+    'es', // Spanish
+    'fa', // Farsi/Persian
+    'fi', // Finnish
+    'fo', // Faroese
+    'fr', // French
+    'el', // Greek
+    'ga', // Irish
+    'gu', // Gujrati
+    'he', // Hebrew
+    'hi', // Hindi,
+    'hr', // Croatian
+    'hu', // Hungarian
+    'hy', // Armenian
+    'id', // Indonesian
+    'is', // Icelandic
+    'it', // Italian
+    'ja', // Japanese
+    'jv', // Javanese
+    'kn', // Kannada
+    'km', // Khmer
+    'ko', // Korean
+    'la', // Latin
+    'lb', // Luxembourgish
+    'lt', // Lithuanian
+    'lv', // Latvian
+    'ml', // Malayalam
+    'mr', // Marathi
+    'ms', // Malay
+    'nb', // Norwegian bokmål
+    'nl', // Dutch
+    'nn', // Norwegian nynorsk
+    'ne', // Nepali
+    'or', // Oriya
+    'tl', // Filipino
+    'pl', // Polish
+    'pt-br', // Portuguese - Brazil
+    'pt-pt', // Portuguese - Portugal
+    'pa', // Punjabi
+    'ro', // Romanian
+    'ru', // Russian
+    'sa', //Sanskrit
+    'sd', // Sindhi
+    'si', // Sinhala
+    'sk', // Slovakia
+    'sl', // Slovenian
+    'sn', // Shona
+    'sq', // Albanian
+    'sv', // Swedish
+    'ta', // Tamil
+    'te', // Telugu
+    'th', // Thai
+    'tr', // Turkish
+    'uk', // Ukrainian
+    'ur', // Urdu
+    'vi', // Vietnamese
+    'zh-cn', // Chinese - China
+    'zh-tw', // Chinese - Taiwan
 ];

app/config/locale/countries.php

@@ -1,13 +1,5 @@
 <?php
 
-/**
- * ISO 3166 standard country codes
- * https://www.iso.org/iso-3166-country-codes.html
- *
- * Source:
- * https://www.iso.org/obp/ui/#search/code/
- */
-
 return [
     'AF',
     'AO',
@@ -81,7 +73,6 @@ return [
     'GD',
     'GT',
     'GY',
-    'HK',
     'HN',
     'HR',
     'HT',
@@ -145,7 +136,6 @@ return [
     'NZ',
     'OM',
     'PK',
-    'PS',
     'PA',
     'PE',
     'PH',
@@ -190,7 +180,6 @@ return [
     'TR',
     'TV',
     'TZ',
-    'TW',
     'UG',
     'UA',
     'UY',

app/config/locale/languages.php

@@ -654,15 +654,10 @@ return [
         "nativeName" => "پښتو"
     ],
     [
-        "code" => "pt-pt",
+        "code" => "pt",
         "name" => "Portuguese",
         "nativeName" => "Português"
     ],
-    [
-        "code" => "pt-br",
-        "name" => "Portuguese (Brazilian)",
-        "nativeName" => "Português"
-    ],
     [
         "code" => "qu",
         "name" => "Quechua",
@@ -924,13 +919,8 @@ return [
         "nativeName" => "Cuengh / Tôô / 壮语"
     ],
     [
-        "code" => "zh-cn",
-        "name" => "Chinese (Simplified)",
-        "nativeName" => "中文"
-    ],
-    [
-        "code" => "zh-tw",
-        "name" => "Chinese (Traditional)",
+        "code" => "zh",
+        "name" => "Chinese",
         "nativeName" => "中文"
     ],
     [

app/config/locale/phones.php

@@ -136,7 +136,6 @@ return [
     'NZ' => '64',
     'OM' => '968',
     'PK' => '92',
-    'PS' => '970',
     'PA' => '507',
     'PE' => '51',
     'PH' => '63',
@@ -180,7 +179,6 @@ return [
     'TN' => '216',
     'TR' => '90',
     'TV' => '688',
-    'TW' => '886',
     'TZ' => '255',
     'UG' => '256',
     'UA' => '380',

app/config/locale/templates.php

@@ -1,19 +0,0 @@
-<?php
-
-return [
-    'email' => [
-        'verification',
-        'magicSession',
-        'recovery',
-        'invitation',
-        'mfaChallenge',
-        'sessionAlert',
-        'otpSession'
-    ],
-    'sms' => [
-        'verification',
-        'login',
-        'invitation',
-        'mfaChallenge'
-    ]
-];

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

@@ -1,207 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-        <link rel="preconnect" href="https://fonts.googleapis.com">
-        <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-        <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600&family=Poppins:wght@500;600&display=swap">
-        <style>
-            @media (max-width:500px) {
-                .mobile-full-width {
-                    width: 100%;
-                }
-            }
-            .main a {
-                color: currentColor;
-            }
-            .main {
-                padding: 32px;
-                line-height: 1.5;
-                color: #616b7c;
-                font-size: 15px;
-                font-weight: 400;
-                font-family: "Inter", sans-serif;
-                background-color: #ffffff;
-                margin: 0;
-                padding: 0;
-            }
-            a {
-                color: currentColor;
-                word-break: break-all;
-            }
-            table {
-                width: 100%;
-                border-spacing: 0 !important;
-            }
-            table, tr, th, td {
-                margin: 0;
-                padding: 0;
-            }
-            td {
-                vertical-align: top;
-            }
-            .main {
-                max-width: 650px;
-                margin: 0 auto;
-                margin-top: 32px;
-            }
-            h1 {
-                font-size: 22px;
-                margin-bottom: 0px;
-                margin-top: 0px;
-                color: #373b4d;
-            }
-            h2 {
-                font-size: 20px;
-                font-weight: 600;
-                color: #373b4d;
-            }
-            h3 {
-                font-size: 14px;
-                font-weight: 500;
-                color: #373b4d;
-                line-height: 21px;
-                margin: 0;
-                padding: 0;
-            }
-            h4 {
-                font-family: "DM Sans", sans-serif;
-                font-weight: 600;
-                font-size: 12px;
-                color: #4f5769;
-                margin: 0;
-                padding: 0;
-            }
-            hr {
-                border: none;
-                border-top: 1px solid #e8e9f0;
-            }
-        </style>
-        <style>
-            a.button {
-                display: inline-block;
-                background: #fd366e;
-                color: #ffffff;
-                border-radius: 8px;
-                height: 48px;
-                padding: 12px 20px;
-                box-sizing: border-box;
-                cursor: pointer;
-                text-align: center;
-                text-decoration: none;
-                border-color: #fd366e;
-                border-style: solid;
-                border-width: 1px;
-                margin-right: 24px;
-                margin-top: 8px;
-            }
-            a.button:hover,
-            a.button:focus {
-                opacity: 0.8;
-            }
-            @media only screen and (max-width: 600px) {
-                .button {
-                    width: 100%;
-                }
-            }
-            .social-icon {
-                border-radius: 6px;
-                background: rgba(216, 216, 219, 0.1);
-                width: 32px;
-                height: 32px;
-                line-height: 32px;
-                display: flex; 
-                align-items: center; 
-                justify-content: center;
-            }
-            .social-icon > img {
-                margin: auto;
-            }
-        </style>
-    </head>
-
-    <body>
-        <div class="main">
-            <table>
-                <tr>
-                    <td>
-                        <img
-                            height="32px"
-                            src="https://cloud.appwrite.io/images/mails/logo.png"
-                        />
-                    </td>
-                </tr>
-            </table>
-
-            <table style="margin-top: 32px">
-                <tr>
-                    <td>
-                        <h1>{{subject}}</h1>
-                    </td>
-                </tr>
-            </table>
-
-            <table style="margin-top: 32px">
-                <tr>
-                    <td>
-{{body}}
-                    </td>
-                </tr>
-            </table>
-
-            <table
-                style="
-                    padding-top: 32px;
-                    margin-top: 32px;
-                    border-top: solid 1px #e8e9f0;
-                "
-            >
-                <tr>
-                    <td></td>
-                </tr>
-            </table>
-
-            <table style="width: auto; margin: 0 auto">
-                <tr>
-                    <td style="padding-left: 4px; padding-right: 4px">
-                        <a
-                            href="https://twitter.com/appwrite"
-                            class="social-icon"
-                            title="Twitter"
-                        >
-                            <img src="https://cloud.appwrite.io/images/mails/x.png" height="24" width="24" />
-                        </a>
-                    </td>
-                    <td style="padding-left: 4px; padding-right: 4px">
-                        <a
-                            href="https://appwrite.io/discord"
-                            class="social-icon"
-                        >
-                            <img src="https://cloud.appwrite.io/images/mails/discord.png" height="24" width="24" />
-                        </a>
-                    </td>
-                    <td style="padding-left: 4px; padding-right: 4px">
-                        <a
-                            href="https://github.com/appwrite/appwrite"
-                            class="social-icon"
-                        >
-                            <img src="https://cloud.appwrite.io/images/mails/github.png" height="24" width="24" />
-                        </a>
-                    </td>
-                </tr>
-            </table>
-            <table style="width: auto; margin: 0 auto; margin-top: 60px">
-                <tr>
-                    <td><a href="https://appwrite.io/terms">Terms</a></td>
-                    <td style="color: #e8e9f0">
-                        <div style="margin: 0 8px">|</div>
-                    </td>
-                    <td><a href="https://appwrite.io/privacy">Privacy</a></td>
-                </tr>
-            </table>
-            <p style="text-align: center" align="center">
-                &copy; {{year}} Appwrite | 251 Little Falls Drive, Wilmington 19808,
-                Delaware, United States
-            </p>
-        </div>
-    </body>
-</html>

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

@@ -1,136 +1,165 @@
 <!doctype html>
 <html>
-    <head>
-        <link rel="preconnect" href="https://fonts.googleapis.com">
-        <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-        <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600&family=Poppins:wght@500;600&display=swap">
-        <style>
-            body {
-                padding: 32px;
-                line-height: 1.5;
-                color: #616b7c;
-                font-size: 15px;
-                font-weight: 400;
-                font-family: "Inter", sans-serif;
-                background-color: #ffffff;
-                margin: 0;
-                padding: 0;
-            }
-            a {
-                color: currentColor;
-                word-break: break-all;
-            }
-            table {
-                width: 100%;
-                border-spacing: 0 !important;
-            }
-            table, tr, th, td {
-                margin: 0;
-                padding: 0;
-            }
-            td {
-                vertical-align: top;
-            }
-            .main {
-                max-width: 650px;
-                margin: 0 auto;
-                margin-top: 32px;
-            }
-            h1 {
-                font-size: 22px;
-                margin-bottom: 0px;
-                margin-top: 0px;
-                color: #373b4d;
-            }
-            h2 {
-                font-size: 20px;
-                font-weight: 600;
-                color: #373b4d;
-            }
-            h3 {
-                font-size: 14px;
-                font-weight: 500;
-                color: #373b4d;
-                line-height: 21px;
-                margin: 0;
-                padding: 0;
-            }
-            h4 {
-                font-family: "DM Sans", sans-serif;
-                font-weight: 600;
-                font-size: 12px;
-                color: #4f5769;
-                margin: 0;
-                padding: 0;
-            }
-            hr {
-                border: none;
-                border-top: 1px solid #e8e9f0;
-            }
-        </style>
-    </head>
 
 <head>
-    <link rel="preconnect" href="https://fonts.googleapis.com">
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <link
-            href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600&family=Poppins:wght@500;600&display=swap"
-            rel="stylesheet">
-    <style>
-        a { color:currentColor; word-break: break-all; }
-        body {
-            background-color: #ffffff;
-            padding: 32px;
-            color: #616B7C;
-            font-size: 15px;
-            font-family: 'Inter', sans-serif;
-            line-height: 150%;
-        }
+  <meta name="viewport" content="width=device-width" />
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  <title>{{subject}}</title>
+  <style>
+    body {
+      background-color: {{bg-body}};
+      color: {{text-content}};
+      font-family: sans-serif;
+      -webkit-font-smoothing: antialiased;
+      font-size: 14px;
+      line-height: 1.4;
+      margin: 0;
+      padding: 0;
+      -ms-text-size-adjust: 100%;
+      -webkit-text-size-adjust: 100%;
+    }
 
-        table {
-            width: 100%;
-            border-spacing: 0 !important;
-        }
+    table {
+      border-collapse: separate;
+      mso-table-lspace: 0pt;
+      mso-table-rspace: 0pt;
+      width: 100%;
+    }
 
-        table,
-        tr,
-        th,
-        td {
-            margin: 0;
-            padding: 0;
-        }
+    table td {
+      font-family: sans-serif;
+      font-size: 14px;
+      vertical-align: top;
+    }
 
-        td {
-            vertical-align: top;
-        }
+    .body {
+      background-color: {{bg-body}};
+      width: 100%;
+    }
 
-        h* {
-            font-family: 'Poppins', sans-serif;
-        }
+    .container {
+      display: block;
+      margin: 0 auto !important;
+      max-width: 580px;
+      padding: 10px;
+      width: 580px;
+    }
 
-        hr {
-            border: none;
-            border-top: 1px solid #E8E9F0;
-        }
+    .content {
+      box-sizing: border-box;
+      display: block;
+      margin: 0 auto;
+      max-width: 580px;
+      padding: 10px;
+      color: {{text-content}};
+    }
 
-        p {
-            margin-bottom: 10px;
-        }
-    </style>
+    .main {
+      background: {{bg-content}};
+      border-radius: 10px;
+      width: 100%;
+    }
+
+    .wrapper {
+      box-sizing: border-box;
+      padding: 30px 30px 15px 30px;
+    }
+
+    .content-block {
+      padding-bottom: 10px;
+      padding-top: 10px;
+    }
+
+    p {
+      font-family: sans-serif;
+      font-size: 14px;
+      font-weight: normal;
+      margin: 0;
+      margin-bottom: 15px;
+    }
+
+    a {
+      word-break: break-all;
+    }
+
+    @media only screen and (max-width: 620px) {
+      .container {
+        padding: 0;
+        width: 100%;
+      }
+    }
+
+    @media all {
+      .ExternalClass {
+        width: 100%;
+      }
+
+      .ExternalClass,
+      .ExternalClass p,
+      .ExternalClass span,
+      .ExternalClass font,
+      .ExternalClass td,
+      .ExternalClass div {
+        line-height: 100%;
+      }
+
+      .apple-link a {
+        color: inherit !important;
+        font-family: inherit !important;
+        font-size: inherit !important;
+        font-weight: inherit !important;
+        line-height: inherit !important;
+        text-decoration: none !important;
+      }
+
+      #MessageViewBody a {
+        color: inherit;
+        text-decoration: none;
+        font-size: inherit;
+        font-family: inherit;
+        font-weight: inherit;
+        line-height: inherit;
+      }
+
+    }
+  </style>
 </head>
 
 <body style="direction: {{direction}}">
+  <table role="presentation" border="0" cellpadding="0" cellspacing="0" class="body">
+    <tr>
+      <td>&nbsp;</td>
+      <td class="container">
+        <div class="content">
+          <table role="presentation" class="main">
+            <tr>
+              <td class="wrapper">
+                <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                  <tr>
+                    <td>
+                      <p>{{hello}}</p>
+                      <p>{{body}}</p>
+                      <a href="{{redirect}}" target="_blank">{{redirect}}</a>
+                      <p></br>{{footer}}</p>
+                      <p>{{thanks}}
+                      </br>
+                      {{signature}}
+                      </p>
+                    </td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+          </table>
+        </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">
-        <tr>
-            <td>
-                {{body}}
-            </td>
-        </tr>
-    </table>
-</div>
-
+        <!-- <div style="text-align: center; line-height: 25px; margin: 15px 0; font-size: 12px; color: #40404c;">
+          <a href="https://appwrite.io" style="text-decoration: none; color: #40404c;">Powered by <img src="https://appwrite.io/images/appwrite-footer-light.svg" height="15" style="margin: -3px 0" /></a>
+        </div> -->
+      </td>
+      <td>&nbsp;</td>
+    </tr>
+  </table>
 </body>
+
 </html>

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

@@ -1,22 +0,0 @@
-<p>Hello,</p>
-<p>Your domain <strong>{{domain}}</strong> failed to generate certificate after <strong>{{attempts}}</strong> consecutive attempts with the following error:</p>
-
-<table border="0" cellspacing="0" cellpadding="0" style="padding-top: 10px; padding-bottom: 10px; display: inline-block;">
-    <tr>
-        <td align="center" style="border-radius: 8px; background-color: #ffffff;">
-            <p style="text-align: start; font-size: 14px; font-family: Inter; color: #414146; text-decoration: none; border-radius: 8px; padding: 32px; border: 1px solid #EDEDF0; display: inline-block; word-break: break-word;">
-                {{error}}
-            </p>
-        </td>
-    </tr>
-</table>
-
-<p>We suggest to follow the below steps:</p>
-<ol>
-    <li>Examine the logs above to try and identify the issue</li>
-    <li>Ensure your domain has not expired</li>
-    <li>Check your DNS configuration for any unexpected values</li>
-    <li>Manually re-trigger a certificate generation from the Appwrite Console</li>
-</ol>
-
-<p>The existing certificate will remain valid for 30 days from the initial failure. It is highly recommended to investigate this issue; failing to do so will lead to security vulnerabilities.</p>

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

@@ -1,9 +0,0 @@
-<p>{{hello}}</p>
-<p>{{body}}</p>
-<p><a href="{{redirect}}" target="_blank">{{redirect}}</a></p>
-<p>{{footer}}</p>
-<p style="margin-bottom: 32px">
-    {{thanks}}
-    <br/>
-    {{signature}}
-</p>

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

@@ -1,24 +0,0 @@
-<p>{{hello}}</p>
-
-<p>{{optionButton}}</p>
-
-<table border="0" cellspacing="0" cellpadding="0" style="padding-top: 10px; padding-bottom: 10px; display: inline-block;">
-    <tr>
-        <td align="center" style="border-radius: 8px; background-color: #19191D;">
-            <a rel="noopener" target="_blank" href="{{redirect}}" style="font-size: 14px; font-family: Inter; color: #ffffff; text-decoration: none; border-radius: 8px; padding: 9px 14px; border: 1px solid #19191D; display: inline-block;">{{buttonText}}</a>
-        </td>
-    </tr>
-</table>
-
-<p>{{optionUrl}}</p>
-
-<a href="{{redirect}}" target="_blank" style="font-size: 12px; line-height: 100%;">{{redirect}}</a>
-
-<p>{{clientInfo}}</p>
-
-<p style="margin-bottom: 0px;">{{thanks}}</p>
-<p style="margin-top: 0px;">{{signature}}</p>
-
-<hr style="margin-block-start: 1rem; margin-block-end: 1rem;">
-
-<p style="opacity: 0.7;">{{securityPhrase}}</p>

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

@@ -1,16 +0,0 @@
-<p>{{hello}}</p>
-
-<p>{{description}}</p>
-
-<table border="0" cellspacing="0" cellpadding="0" style="padding-top: 10px; padding-bottom: 10px; display: inline-block;">
-    <tr>
-        <td align="center" style="border-radius: 8px; background-color: #ffffff;">
-            <p style="font-size: 24px; text-indent: 18px; letter-spacing: 18px; font-family: 'Inter', sans-serif; color: #414146; text-decoration: none; border-radius: 8px; padding: 24px 12px; border: 1px solid #EDEDF0; display: inline-block; font-weight: bold; ">{{otp}}</p>
-        </td>
-    </tr>
-</table>
-
-<p>{{clientInfo}}</p>
-
-<p style="margin-bottom: 0px;">{{thanks}}</p>
-<p style="margin-top: 0px;">{{signature}}</p>

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

@@ -1,20 +0,0 @@
-<p>{{hello}}</p>
-
-<p>{{description}}</p>
-
-<table border="0" cellspacing="0" cellpadding="0" style="padding-top: 10px; padding-bottom: 10px; display: inline-block;">
-    <tr>
-        <td align="center" style="border-radius: 8px; background-color: #ffffff;">
-            <p style="font-size: 24px; text-indent: 18px; letter-spacing: 18px; font-family: Inter; color: #414146; text-decoration: none; border-radius: 8px; padding: 24px 12px; border: 1px solid #EDEDF0; display: inline-block; font-weight: bold; ">{{otp}}</p>
-        </td>
-    </tr>
-</table>
-
-<p>{{clientInfo}}</p>
-
-<p style="margin-bottom: 0px;">{{thanks}}</p>
-<p style="margin-top: 0px;">{{signature}}</p>
-
-<hr style="margin-block-start: 1rem; margin-block-end: 1rem;">
-
-<p style="opacity: 0.7;">{{securityPhrase}}</p>

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

@@ -1,14 +0,0 @@
-<p>{{hello}}</p>
-
-<p>{{body}}</p>
-
-<ol>
-    <li>{{listDevice}}</li>
-    <li>{{listIpAddress}}</li>
-    <li>{{listCountry}}</li>
-</ol>
-
-<p>{{footer}}</p>
-
-<p style="margin-bottom: 0px;">{{thanks}}</p>
-<p style="margin-top: 0px;">{{signature}}</p>

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

@@ -1,12 +0,0 @@
-<p style="margin-block-start: 0;">Hello,</p>
-
-<p>This email ensures your custom SMTP configuration is working correctly. Please review your sender Information details:</p>
-
-<p style="margin-block-end: 0;">From: <strong>{{from}}</strong></p>
-<p style="margin-block-start: 0;">Reply-To: <strong>{{replyTo}}</strong></p>
-
-<p>If this email was labeled as spam, please check your SMTP server settings to ensure they meet your provider's requirements. Often, missing DNS configurations or security checks mandated by your SMTP provider affect email delivery.</p>
-<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>

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

@@ -1,20 +0,0 @@
-<p>Hi <strong>{{user}}</strong>,</p>
-<p>Your webhook <strong>{{webhook}}</strong> on project <strong>{{project}}</strong> has been paused after {{attempts}} consecutive failures.</p>
-<p>Webhook Endpoint: <strong>{{url}}</strong></p>
-<p>Error: <strong>{{error}}</strong></p>
-<p>To restore your webhook's functionality and reset attempts, we suggest to follow the below steps:</p>
-<ol>
-    <li>Examine the logs of both Appwrite Console and your webhook server to identify the issue.</li>
-    <li>Investigate potential network issues and use webhook testing tools to verify expected behaviour.</li>
-    <li>Ensure the webhook endpoint is reachable and configured to accept incoming POST requests.</li>
-    <li>Confirm that the webhook doesn't return error status codes such as 400 or 500.</li>
-</ol>
-<p>After the issue is resolved, please make sure to re-enable the webhook directly through the webhook settings.</p>
-
-<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>
-        </td>
-    </tr>
-</table>

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

@@ -1 +0,0 @@
-{{token}}

app/config/locale/translations/af.json

@@ -4,28 +4,28 @@
     "settings.direction": "ltr",
     "emails.sender": "%s span",
     "emails.verification.subject": "Rekening Bevestiging",
-    "emails.verification.hello": "Goeie dag {{user}},",
+    "emails.verification.hello": "Goeie dag {{name}}",
     "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.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.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 {{name}}",
     "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.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.signature": "Die {{project}} span",
     "locale.country.unknown": "Onbekend",
     "countries.af": "Afghanistan",
@@ -100,7 +100,6 @@
     "countries.gd": "Grenada",
     "countries.gt": "Guatemala",
     "countries.gy": "Guyana",
-    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Kroasië",
     "countries.ht": "Haiti",
@@ -164,7 +163,6 @@
     "countries.nz": "Nieu-Seeland",
     "countries.om": "Oman",
     "countries.pk": "Pakistan",
-    "countries.ps": "Palestine",
     "countries.pa": "Panama",
     "countries.pe": "Peru",
     "countries.ph": "Filippyne",
@@ -208,7 +206,6 @@
     "countries.tn": "Tunisië",
     "countries.tr": "Turkye",
     "countries.tv": "Tuvalu",
-    "countries.tw": "Taiwan",
     "countries.tz": "Tanzanië",
     "countries.ug": "Uganda",
     "countries.ua": "Oekraïne",
@@ -231,18 +228,5 @@
     "continents.eu": "Europa",
     "continents.na": "Noord-Amerika",
     "continents.oc": "Oseanië",
-    "continents.sa": "Suid-Amerika",
-    "emails.magicSession.optionButton": "Klik op die knoppie hieronder om veilig aan te meld by jou {{project}} rekening. Dit sal oor 1 uur verval.",
-    "emails.magicSession.buttonText": "Meld aan by {{project}}",
-    "emails.magicSession.clientInfo": "Hierdie teken-in is aangevra met behulp van {{agentClient}} op {{agentDevice}} {{agentOs}}. As jy nie die teken-in versoek het nie, kan jy hierdie e-pos veilig ignoreer.",
-    "sms.verification.body": "{{secret}}",
-    "emails.magicSession.securityPhrase": "Die sekuriteitsfrase vir hierdie e-pos is {{phrase}}. Jy kan hierdie e-pos vertrou as hierdie frase ooreenstem met die frase wat tydens aanmelding getoon is.",
-    "emails.magicSession.optionUrl": "As u nie met die knoppie hierbo kan aanmeld nie, besoek asseblief die volgende skakel:",
-    "emails.otpSession.subject": "{{project}} Aanteken",
-    "emails.otpSession.hello": "Hallo,",
-    "emails.otpSession.description": "Voer die volgende verifikasiekode in wanneer daar versoek word om veilig aan te meld by jou {{project}} rekening. Dit sal verval oor 15 minute.",
-    "emails.otpSession.clientInfo": "Hierdie aanmelding is versoek met behulp van {{agentClient}} op {{agentDevice}} {{agentOs}}. As jy nie die aanmelding versoek het nie, kan jy hierdie e-pos veilig ignoreer.",
-    "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"
-}
+    "continents.sa": "Suid-Amerika"
+}

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

@@ -1,238 +0,0 @@
-{
-    "settings.inspire": "\"الفن ديال الحكمة هو الفن ديال أنك تعرف أش تنخّل.\"",
-    "settings.locale": "ar-ma",
-    "settings.direction": "rtl",
-    "emails.sender": "فرقة %s",
-    "emails.verification.subject": "التيْقان ديال الحساب",
-    "emails.verification.hello": "السلام {{user}}،",
-    "emails.verification.body": "تبّع هاد الوصلة باش تيقّن لادريسة تاع ليميل ديالك.",
-    "emails.verification.footer": "إلا ماشي نتا اللي طلبتي تيقّن هاد لادريسة تاع ليميل، ممكن تنخّل هاد البرية.",
-    "emails.verification.thanks": "شكرا،",
-    "emails.verification.signature": "فرقة {{project}}",
-    "emails.magicSession.subject": "تكونيكطا",
-    "emails.magicSession.hello": "السلام،",
-    "emails.magicSession.body": "تبّع هاد الوصلة باش تتكونيكطا.",
-    "emails.magicSession.footer": "إلا ماشي نتا اللي طلبتي تتكونيكطا بهاد ليميل، ممكن تنخّل هاد البرية.",
-    "emails.magicSession.thanks": "شكرا،",
-    "emails.magicSession.signature": "فرقة {{project}}",
-    "emails.recovery.subject": "تبدال كلمة السر",
-    "emails.recovery.hello": "السلام {{user}}،",
-    "emails.recovery.body": "تبّع هاد الوصلة باش تبدّل كلمة السر تاع {{project}}.",
-    "emails.recovery.footer": "إلا ماشي نتا اللي طلبتي تبدّل كلمة السر، ممكن تنخّل هاد البرية.",
-    "emails.recovery.thanks": "شكرا،",
-    "emails.recovery.signature": "فرقة {{project}}",
-    "emails.invitation.subject": "عراضة ل فرقة %s ف %s",
-    "emails.invitation.hello": "السلام،",
-    "emails.invitation.body": "هاد البرية تصيفطات ليك حيت {{owner}} بغى يعرض عليك تولّي عضو ف فرقة {{team}} عند {{project}}.",
-    "emails.invitation.footer": "إلا كنتي ما مسوّقش, ممكن تنخّل هاد البرية.",
-    "emails.invitation.thanks": "شكرا،",
-    "emails.invitation.signature": "فرقة {{project}}",
-    "emails.certificate.subject": "السرتافيكة فشلات ل %s",
-    "emails.certificate.hello": "السلام،",
-    "emails.certificate.body": "السرتافيكة ديال الضومين ديالك '{{domain}}' ما قدّاتش تجينيرا. هادي هي المحاولة نمرة {{attempt}}, السبب ديال هاد الفشل هو: {{error}}",
-    "emails.certificate.footer": "السرتافيكة الفايتة ديالك غاتبقى مزيانة لمدة  30 يوم من عند أول فشل. كانشجعوك بزاف أنك تبقشش فهاد الموضوع, وا إلّا الضومين ديالك ما غايبقاش خدّام فيه الـ SSL.",
-    "emails.certificate.thanks": "شكرا،",
-    "emails.certificate.signature": "فرقة {{project}}",
-    "locale.country.unknown": "ما معروفش",
-    "countries.af": "أفغانستان",
-    "countries.ao": "أنڭولا",
-    "countries.al": "ألبانيا",
-    "countries.ad": "أندورا",
-    "countries.ae": "الإمارات العربية المتّاحدة",
-    "countries.ar": "الأرجنتين",
-    "countries.am": "أرمينيا",
-    "countries.ag": "أنتيڭوا وبربودا",
-    "countries.au": "ؤسطراليا",
-    "countries.at": "النامسا",
-    "countries.az": "أديربيجان",
-    "countries.bi": "بوروندي",
-    "countries.be": "بلجيكا",
-    "countries.bj": "بينين",
-    "countries.bf": "بوركينا فاصو",
-    "countries.bd": "بنڭلاديش",
-    "countries.bg": "بلڭاريا",
-    "countries.bh": "البحرين",
-    "countries.bs": "دزيرات البهاما",
-    "countries.ba": "البوسنة ؤ الهرسك",
-    "countries.by": "بيلاروسيا",
-    "countries.bz": "بيليز",
-    "countries.bo": "بوليڤيا",
-    "countries.br": "البرازيل",
-    "countries.bb": "باربادوس",
-    "countries.bn": "بروناي",
-    "countries.bt": "بوتان",
-    "countries.bw": "بوتسوانا",
-    "countries.cf": "جمهورية إفريقيا الوسطانية",
-    "countries.ca": "كانادا",
-    "countries.ch": "سويسرا",
-    "countries.cl": "تشيلي",
-    "countries.cn": "الشينوا",
-    "countries.ci": "ساحل العاج",
-    "countries.cm": "الكاميرون",
-    "countries.cd": "جمهورية الكونڭو الديمقراطية",
-    "countries.cg": "جمهورية الكونڭو",
-    "countries.co": "كولومبيا",
-    "countries.km": "دزيرات القومور",
-    "countries.cv": "الراس الخضر",
-    "countries.cr": "كوسطاريكا",
-    "countries.cu": "كوبا",
-    "countries.cy": "قوبروص",
-    "countries.cz": "التشيك",
-    "countries.de": "ألمانيا",
-    "countries.dj": "دجيبوتي",
-    "countries.dm": "ضومينيكا",
-    "countries.dk": "الدنمارك",
-    "countries.do": "جمهورية الضومينيكان",
-    "countries.dz": "الدزاير",
-    "countries.ec": "إكوادور",
-    "countries.eg": "مصر",
-    "countries.er": "إريتريا",
-    "countries.es": "سبانيا",
-    "countries.ee": "إسطونيا",
-    "countries.et": "إتيوپيا",
-    "countries.fi": "فينلاندا",
-    "countries.fj": "فيدجي",
-    "countries.fr": "فرانسا",
-    "countries.fm": "ميكرونيزيا",
-    "countries.ga": "الڭابون",
-    "countries.gb": "المملكة المتّاحدة",
-    "countries.ge": "تجورجيا",
-    "countries.gh": "غانا",
-    "countries.gn": "غينيا",
-    "countries.gm": "ڭامبيا",
-    "countries.gw": "غينيا بيساو",
-    "countries.gq": "غينيا الستوائية",
-    "countries.gr": "اليونان",
-    "countries.gd": "ڭرينادا",
-    "countries.gt": "ڭواتيمالا",
-    "countries.gy": "ڭيانا",
-    "countries.hn": "هوندوراس",
-    "countries.hr": "كرواتيا",
-    "countries.ht": "هايتي",
-    "countries.hu": "الماجر",
-    "countries.id": "إندونيسيا",
-    "countries.in": "الهند",
-    "countries.ie": "إرلاندا",
-    "countries.ir": "إران",
-    "countries.iq": "العراق",
-    "countries.is": "إسلاندا",
-    "countries.il": "إسرائيل",
-    "countries.it": "الطاليان",
-    "countries.jm": "جامايكا",
-    "countries.jo": "الأردن",
-    "countries.jp": "الجاپون",
-    "countries.kz": "كازاخستان",
-    "countries.ke": "كينيا",
-    "countries.kg": "قيرغيزستان",
-    "countries.kh": "كمبوديا",
-    "countries.ki": "كيريباتي",
-    "countries.kn": "سانت كيتس ؤ نيفيس",
-    "countries.kr": "كوريا الجنوبية",
-    "countries.kw": "الكويت",
-    "countries.la": "لاوس",
-    "countries.lb": "لبنان",
-    "countries.lr": "ليبيريا",
-    "countries.ly": "ليبيا",
-    "countries.lc": "سانت لوسيا",
-    "countries.li": "ليختنشتاين",
-    "countries.lk": "سري لانكا",
-    "countries.ls": "ليسوتو",
-    "countries.lt": "ليتوانيا",
-    "countries.lu": "لوكسمبورڭ",
-    "countries.lv": "لاتفيا",
-    "countries.ma": "المغريب",
-    "countries.mc": "موناكو",
-    "countries.md": "مولضوڤا",
-    "countries.mg": "ماداغشقار",
-    "countries.mv": "دزيرات المالديڤ",
-    "countries.mx": "الميكسيك",
-    "countries.mh": "دزيرات مارشال",
-    "countries.mk": "مقدونيا",
-    "countries.ml": "مالي",
-    "countries.mt": "مالطا",
-    "countries.mm": "ميانمار",
-    "countries.me": "مونطينيڭرو",
-    "countries.mn": "منغوليا",
-    "countries.mz": "الموزمبيق",
-    "countries.mr": "موريتانيا",
-    "countries.mu": "موريشيوس",
-    "countries.mw": "مالاوي",
-    "countries.my": "ماليزيا",
-    "countries.na": "ناميبيا",
-    "countries.ne": "النيجر",
-    "countries.ng": "نيجيريا",
-    "countries.ni": "نيكاراڭوا",
-    "countries.nl": "هولاندا",
-    "countries.no": "النرويج",
-    "countries.np": "نيپال",
-    "countries.nr": "ناورو",
-    "countries.nz": "نيوزيلاندا",
-    "countries.om": "عمّان",
-    "countries.pk": "پاكيستان",
-    "countries.pa": "پاناما",
-    "countries.pe": "الپيرو",
-    "countries.ph": "الفيليپين",
-    "countries.pw": "پالاو",
-    "countries.pg": "پاپوا غينيا الجديدة",
-    "countries.pl": "پولاندا",
-    "countries.kp": "كوريا الشمالية",
-    "countries.pt": "البرطقيز",
-    "countries.py": "الپاراڭواي",
-    "countries.qa": "قطر",
-    "countries.ro": "رومانيا",
-    "countries.ru": "روسيا",
-    "countries.rw": "روّاندا",
-    "countries.sa": "المملكة العربية السعودية",
-    "countries.sd": "السودان",
-    "countries.sn": "السينيڭال",
-    "countries.sg": "سنغافورة",
-    "countries.sb": "دزيرات سليمان",
-    "countries.sl": "صييراليون",
-    "countries.sv": "السالڤاضور",
-    "countries.sm": "سان مارينو",
-    "countries.so": "الصومال",
-    "countries.rs": "صيربيا",
-    "countries.ss": "جنوب السودان",
-    "countries.st": "صاو طومي ؤ پرينسيپي",
-    "countries.sr": "سورينام",
-    "countries.sk": "صلوڤاكيا",
-    "countries.si": "صلوڤينيا",
-    "countries.se": "السويد",
-    "countries.sz": "سوازيلاند",
-    "countries.sc": "السيشيل",
-    "countries.sy": "سوريا",
-    "countries.td": "تشاد",
-    "countries.tg": "الطوڭو",
-    "countries.th": "الطايلوند",
-    "countries.tj": "طادجيكيستان",
-    "countries.tm": "تركمانيستان",
-    "countries.tl": "تيمور الشرقية",
-    "countries.to": "تونڭا",
-    "countries.tt": "ترينيداد ؤ طوباڭو",
-    "countries.tn": "تونس",
-    "countries.tr": "توركيا",
-    "countries.tv": "توڤالو",
-    "countries.tz": "طنزانيا",
-    "countries.ug": "ؤڭاندا",
-    "countries.ua": "ؤكرانيا",
-    "countries.uy": "ؤروڭواي",
-    "countries.us": "ميريكان",
-    "countries.uz": "ؤزباكيستان",
-    "countries.va": "مدينة الڤاتيكان",
-    "countries.vc": "سانت ڤانسون ؤ دزيرات ڭرينادين",
-    "countries.ve": "ڤينيزويلا",
-    "countries.vn": "ڤيطنام",
-    "countries.vu": "ڤانواتو",
-    "countries.ws": "ساموا",
-    "countries.ye": "اليمن",
-    "countries.za": "جنوب إفريقيا",
-    "countries.zm": "زامبيا",
-    "countries.zw": "زيمبابوي",
-    "continents.af": "أفريقيا",
-    "continents.an": "القارة القطبية الجنوبية",
-    "continents.as": "أسيا",
-    "continents.eu": "ؤروپا",
-    "continents.na": "ميريكان الشمالية",
-    "continents.oc": "ؤقيانوسيا",
-    "continents.sa": "ميريكان الجنوبية"
-}

app/config/locale/translations/ar.json

@@ -4,28 +4,28 @@
     "settings.direction": "rtl",
     "emails.sender": "فريق %s",
     "emails.verification.subject": "تأكيد الحساب",
-    "emails.verification.hello": "مرحبا {{user}}،",
+    "emails.verification.hello": "مرحبا {{name}}",
     "emails.verification.body": "برجاء اتباع الرابط التالي لتأكيد بريدك الإلكتروني",
     "emails.verification.footer": "لو لم تطلب تأكيد هذا البريد الإلكتروني، يمكنك تجاهل هذه الرسالة",
-    "emails.verification.thanks": "شكرا،",
+    "emails.verification.thanks": "شكرا",
     "emails.verification.signature": "فريق {{project}}",
     "emails.magicSession.subject": "تسجيل الدخول",
     "emails.magicSession.hello": "أهلا،",
     "emails.magicSession.body": "اتبع هذا الرابط لتسجيل الدخول",
     "emails.magicSession.footer": "لو لم تطلب تسجيل الدخول بهذا البريد الاكتروني ، يمكنك تجاهل هذه الرسالة",
-    "emails.magicSession.thanks": "شكرا،",
+    "emails.magicSession.thanks": "شكرا",
     "emails.magicSession.signature": "فريق {{project}}",
     "emails.recovery.subject": "تغيير كلمة السر",
-    "emails.recovery.hello": "أهلا {{user}}،",
+    "emails.recovery.hello": "أهلا {{name}}",
     "emails.recovery.body": "برجاء اتباع الراط التالي لتغيير كلمة السر الخاصة بـ{{project}}",
     "emails.recovery.footer": "لولم تطلب تغيير كلمة السر، يمكنك تجاهل هذه الرسالة",
-    "emails.recovery.thanks": "شكرا،",
+    "emails.recovery.thanks": "شكرا",
     "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.signature": "فريق {{project}}",
     "locale.country.unknown": "مجهول",
     "countries.af": "أفغانستان",
@@ -100,7 +100,6 @@
     "countries.gd": "غرينادا",
     "countries.gt": "غواتيمالا",
     "countries.gy": "غيانا",
-    "countries.hk": "هونغ كونغ",
     "countries.hn": "هندوراس",
     "countries.hr": "كرواتيا",
     "countries.ht": "هايتي",
@@ -164,7 +163,6 @@
     "countries.nz": "نيوزيلندا",
     "countries.om": "عمان",
     "countries.pk": "باكستان",
-    "countries.ps": "فلسطين",
     "countries.pa": "بنما",
     "countries.pe": "بيرو",
     "countries.ph": "الفلبين",
@@ -208,7 +206,6 @@
     "countries.tn": "تونس",
     "countries.tr": "تركيا",
     "countries.tv": "توفالو",
-    "countries.tw": "تايوان",
     "countries.tz": "تنزانيا",
     "countries.ug": "أوغندا",
     "countries.ua": "أوكرانيا",
@@ -231,18 +228,5 @@
     "continents.eu": "أوروبا",
     "continents.na": "امريكا الشمالية",
     "continents.oc": "أوقيانوسيا",
-    "continents.sa": "امريكا الجنوبية",
-    "emails.magicSession.optionButton": "انقر على الزر أدناه لتسجيل الدخول بأمان إلى حساب {{project}} الخاص بك. سينتهي في غضون ساعة واحدة.",
-    "emails.magicSession.buttonText": "تسجيل الدخول إلى {{project}}",
-    "emails.magicSession.clientInfo": "تم طلب هذا الدخول باستخدام {{agentClient}} على {{agentDevice}} {{agentOs}}. إذا لم تطلب الدخول، يمكنك تجاهل هذا البريد الإلكتروني بأمان.",
-    "sms.verification.body": "{{secret}}",
-    "emails.magicSession.securityPhrase": "عبارة الأمان لهذا البريد الإلكتروني هي {{phrase}}. يمكنك الوثوق بهذا البريد الإلكتروني إذا كانت هذه العبارة تطابق العبارة التي تظهر أثناء التسجيل.",
-    "emails.magicSession.optionUrl": "إذا لم تتمكن من تسجيل الدخول باستخدام الزر أعلاه، يرجى زيارة الرابط التالي:",
-    "emails.otpSession.subject": "تسجيل دخول {{project}}",
-    "emails.otpSession.hello": "مرحبا،",
-    "emails.otpSession.description": "أدخل رمز التحقق التالي عندما يُطلب منك لتسجيل الدخول بأمان إلى حساب {{project}} الخاص بك. سينتهي صلاحيته في غضون 15 دقيقة.",
-    "emails.otpSession.clientInfo": "تم طلب هذا الدخول باستخدام {{agentClient}} على جهاز {{agentDevice}} {{agentOs}}. إذا لم تطلب الدخول، يمكنك تجاهل هذا البريد الإلكتروني بأمان.",
-    "emails.otpSession.securityPhrase": "عبارة الأمان لهذا البريد الإلكتروني هي {{phrase}}. يمكنك الوثوق بهذا البريد الإلكتروني إذا كانت هذه العبارة تتطابق مع العبارة المعروضة أثناء تسجيل الدخول.",
-    "emails.otpSession.thanks": "شكرًا،",
-    "emails.otpSession.signature": "فريق {{project}}"
-}
+    "continents.sa": "امريكا الجنوبية"
+}

app/config/locale/translations/as.json

@@ -4,28 +4,28 @@
     "settings.direction": "ltr",
     "emails.sender": "%s দল",
     "emails.verification.subject": "একাউণ্ট প্ৰমাণীকৰণ",
-    "emails.verification.hello": "নমস্কাৰ {{user}},",
+    "emails.verification.hello": "নমস্কাৰ {{name}}",
     "emails.verification.body": "আপোনাৰ ইমেইল ঠিকনা প্ৰমাণিত কৰিবলৈ এই লিংকটো অনুসৰণ কৰক।",
     "emails.verification.footer": "যদি আপুনি এই ঠিকনাটো সত্যাপিত কৰিবলৈ কোৱা নাই, আপুনি এই বাৰ্তাটো উপেক্ষা কৰিব পাৰে।",
-    "emails.verification.thanks": "ধন্যবাদ,",
+    "emails.verification.thanks": "ধন্যবাদ",
     "emails.verification.signature": "{{project}} দল",
     "emails.magicSession.subject": "লগইন",
     "emails.magicSession.hello": "নমস্কাৰ,",
     "emails.magicSession.body": "লগইন কৰিবলৈ এই লিংকটো অনুসৰণ কৰক।",
     "emails.magicSession.footer": "যদি আপুনি এই ইমেইল ব্যৱহাৰ কৰি লগইন কৰিবলৈ কোৱা নাছিল, আপুনি এই বাৰ্তাটো উপেক্ষা কৰিব পাৰে।",
-    "emails.magicSession.thanks": "ধন্যবাদ,",
+    "emails.magicSession.thanks": "ধন্যবাদ",
     "emails.magicSession.signature": "{{project}} দল",
     "emails.recovery.subject": "পাছৱাৰ্ড ৰিছেট",
-    "emails.recovery.hello": "ধন্যবাদ {{user}},",
+    "emails.recovery.hello": "ধন্যবাদ {{name}}",
     "emails.recovery.body": "আপোনাৰ {{project}} পাছৱৰ্ড ৰিছেট কৰিবলৈ এই লিংকটো অনুসৰণ কৰক।.",
     "emails.recovery.footer": "যদি আপুনি আপোনাৰ পাছৱৰ্ড ৰিছেট কৰিবলৈ কোৱা নাছিল, আপুনি এই বাৰ্তাটো উপেক্ষা কৰিব পাৰে।",
-    "emails.recovery.thanks": "ধন্যবাদ,",
+    "emails.recovery.thanks": "ধন্যবাদ",
     "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.signature": "{{project}} দল",
     "locale.country.unknown": "অজ্ঞাত ",
     "countries.af": "আফগানিস্তান ",
@@ -100,7 +100,6 @@
     "countries.gd": "গ্ৰেনাডা",
     "countries.gt": "গুয়াতেমালা",
     "countries.gy": "গায়ানা",
-    "countries.hk": "হং কং",
     "countries.hn": "হণ্ডুৰাছ",
     "countries.hr": "ক্ৰোৱেছিয়া",
     "countries.ht": "হাইতি",
@@ -164,7 +163,6 @@
     "countries.nz": "নিউজিলেণ্ড",
     "countries.om": "ওমান",
     "countries.pk": "পাকিস্তান",
-    "countries.ps": "প্যালেস্টাইন",
     "countries.pa": "পানামা",
     "countries.pe": "পেৰু",
     "countries.ph": "ফিলিপাইনচ",
@@ -208,7 +206,6 @@
     "countries.tn": "টিউনিচিয়া",
     "countries.tr": "তুৰ্কী",
     "countries.tv": "টুভালু",
-    "countries.tw": "তাইওয়ান",
     "countries.tz": "তাঞ্জানিয়া",
     "countries.ug": "উগাণ্ডা",
     "countries.ua": "ইউক্ৰেইন",
@@ -231,24 +228,5 @@
     "continents.eu": "ইউৰোপ",
     "continents.na": "উত্তৰ আমেৰিকা",
     "continents.oc": "ওচেনিয়া",
-    "continents.sa": "দক্ষিণ আমেৰিকা",
-    "emails.magicSession.optionButton": "তলৰ বুটামটো ক্লিক কৰি আপোনাৰ {{project}} একাউণ্টত নিৰাপদে চাইন ইন কৰক। ই এঘণ্টাৰ ভিতৰত অবৈধ হ'ব।",
-    "emails.magicSession.buttonText": "{{project}}ত প্ৰৱেশ কৰক",
-    "emails.magicSession.optionUrl": "আপুনি ওপৰত দিয়া বুটাম ব্যৱহাৰ কৰি সাইন ইন কৰিব নোৱাৰিলে, অনুগ্ৰহ কৰি তলৰ লিংকটো ভ্ৰমণ কৰক:",
-    "emails.magicSession.clientInfo": "এই চাইন ইনটো {{agentClient}} ব্যৱহাৰ কৰি {{agentDevice}} {{agentOs}}ত অনুৰোধ কৰা হৈছিল। আপুনি যদি চাইন ইনৰ অনুৰোধ নকৰা নাই, তেন্তে আপুনি এই ইমেইলখন নিৰাপদে উপেক্ষা কৰিব পাৰে।",
-    "emails.magicSession.securityPhrase": "এই ইমেইলৰ বাবে নিরাপত্তা বাক্য হৈছে {{phrase}}। যদি এই বাক্যটো সাইন ইন কৰাৰ সময়ত দেখুওৱা বাক্যটোৰ সৈতে মিলে, তেন্তে আপুনি এই ইমেইলটোত বিশ্বাস কৰিব পাৰে।",
-    "emails.otpSession.subject": "{{project}} লগইন",
-    "emails.otpSession.hello": "নমস্কাৰ,",
-    "emails.otpSession.description": "নিৰাপদে আপোনাৰ {{project}} একাউণ্টত চাইন ইন কৰাৰ সময়ত অনুৰোধ কৰা হ'লে তলৰ প্ৰমাণীকৰণ কোডটো প্ৰবেশ কৰক। ই ১৫ মিনিটত অবৈধ হৈ পৰিব।",
-    "emails.otpSession.clientInfo": "এই চিনাক্তকৰণৰ অনুৰোধ {{agentClient}} ৰ জৰিয়তে {{agentDevice}} {{agentOs}} ত কৰা হৈছিল। আপুনি যদি চিনাক্তকৰণৰ অনুৰোধ কৰা নাই, তেন্তে আপুনি এই ইমেইলটো নিৰাপদে অগ্ৰাহ্য কৰিব পাৰে।",
-    "emails.otpSession.securityPhrase": "এই ইমেইলৰ সুৰক্ষা বাক্যটো হৈছে {{phrase}}। আপুনি এই ইমেইলটোত আস্থা ৰাখিব পাৰে যদি প্ৰবেশৰ সময়ত দেখুৱাই থকা বাক্যটোৰ লগত এই বাক্যটো মেলে।",
-    "emails.otpSession.thanks": "ধন্যবাদ,",
-    "emails.otpSession.signature": "{{project}} দল",
-    "emails.certificate.subject": "%sৰ বাবে প্ৰমাণপত্ৰ ব্যৰ্থতা",
-    "emails.certificate.hello": "নমস্কাৰ,",
-    "emails.certificate.body": "আপোনাৰ ডোমেইন '{{domain}}' ৰ বাবে প্ৰমাণপত্ৰটো উত্‌পন্ন কৰিব পৰা নগ'ল। এয়া প্ৰচেষ্টা নম্বৰ {{attempt}}, আৰু বিফলতাৰ কাৰণ হ'ল: {{error}}",
-    "emails.certificate.footer": "আপোনাৰ পূৰ্বৰ প্ৰমাণপত্ৰটো প্ৰথম ব্ৰিফল হোৱাৰ দিনৰ পৰা ৩০ দিনলৈ বৈধ থাকিব। আমি এই ঘটনাটোৰ তদন্ত কৰিবলৈ উচ্চ পৰামৰ্শ দিয়ে, অন্যথা আপোনাৰ ডোমেইনটো অবৈধ SSL যোগাযোগ অবিহনে থাকিব।",
-    "emails.certificate.thanks": "ধন্যবাদ,",
-    "emails.certificate.signature": "{{project}} দল",
-    "sms.verification.body": "{{secret}}"
-}
+    "continents.sa": "দক্ষিণ আমেৰিকা"
+}

app/config/locale/translations/az.json

@@ -4,28 +4,28 @@
     "settings.direction": "ltr",
     "emails.sender": "%s Komandası",
     "emails.verification.subject": "Hesab Doğrulama",
-    "emails.verification.hello": "Salam {{user}},",
+    "emails.verification.hello": "Salam {{name}}",
     "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.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.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 {{name}}",
     "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.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.signature": "{{project}} komandası",
     "locale.country.unknown": "Naməlum",
     "countries.af": "Əfqanıstan",
@@ -100,7 +100,6 @@
     "countries.gd": "Qrenada",
     "countries.gt": "Qvatemala",
     "countries.gy": "Guyana",
-    "countries.hk": "Honq Konq",
     "countries.hn": "Honduras",
     "countries.hr": "Xorvatiya",
     "countries.ht": "Haiti",
@@ -164,7 +163,6 @@
     "countries.nz": "Yeni Zelandiya",
     "countries.om": "Oman",
     "countries.pk": "Pakistan",
-    "countries.ps": "Fələstin",
     "countries.pa": "Panama",
     "countries.pe": "Peru",
     "countries.ph": "Filippin",
@@ -208,7 +206,6 @@
     "countries.tn": "Tunis",
     "countries.tr": "Türkiyə",
     "countries.tv": "Tuvalu",
-    "countries.tw": "Tayvan",
     "countries.tz": "Tanzaniya",
     "countries.ug": "Uqanda",
     "countries.ua": "Ukrayna",
@@ -224,25 +221,5 @@
     "countries.ye": "Yəmən",
     "countries.za": "Cənubi Afrika",
     "countries.zm": "Zambiya",
-    "countries.zw": "Zimbabve",
-    "emails.magicSession.optionButton": "Aşağıdaki düyməyə basaraq {{project}} hesabınıza təhlükəsiz şəkildə daxil olun. Bu, 1 saat sonra müddəti bitəcək.",
-    "emails.magicSession.buttonText": "{{project}} layihəsinə daxil olun",
-    "emails.magicSession.clientInfo": "Bu giriş, {{agentClient}} vasitəsi ilə {{agentDevice}} {{agentOs}} istifadə edərək tələb olunmuşdur. Əgər siz girişi tələb etməmisinizsə, bu e-poçtu təhlükəsiz şəkildə yoksayabilirsiniz.",
-    "continents.af": "Afrika",
-    "continents.an": "Antarktida",
-    "continents.as": "Asiya",
-    "continents.eu": "Avropa",
-    "continents.na": "Şimali Amerika",
-    "continents.oc": "Okeaniya",
-    "continents.sa": "Cənubi Amerika",
-    "sms.verification.body": "{{secret}}",
-    "emails.magicSession.securityPhrase": "Bu e-poçt üçün 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.magicSession.optionUrl": "Əgər yuxarıdakı düyməni istifadə edərək daxil ola bilmirsizsə, zəhmət olmasa aşağıdakı linkə daxil olun:",
-    "emails.otpSession.subject": "{{project}} Giriş",
-    "emails.otpSession.hello": "Salam,",
-    "emails.otpSession.description": "İstifadəçi tələb olunan zaman {{project}} hesabınıza təhlükəsiz daxil olmaq üçün aşağıdakı təsdiqləmə kodunu daxil edin. Bu kod 15 dəqiqə sonra etibarsız olacaq.",
-    "emails.otpSession.clientInfo": "Bu giriş {{agentClient}} vasitəsilə {{agentDevice}} {{agentOs}} istifadə edərək istənildi. Əgər siz giriş istəməmisinizsə, bu e-poçtu laqeyd qoya bilərsiniz.",
-    "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ı"
+    "countries.zw": "Zimbabve"
 }

app/config/locale/translations/be.json

@@ -4,28 +4,28 @@
     "settings.direction": "ltr",
     "emails.sender": "Каманда %s",
     "emails.verification.subject": "Верыфікацыя акаўнта",
-    "emails.verification.hello": "Прывітанне {{user}},",
+    "emails.verification.hello": "Прывітанне {{name}}",
     "emails.verification.body": "Перайдзіце па гэтай спасылцы, каб пацвердзіць свой адрас электроннай пошты",
     "emails.verification.footer": "Калі вы не запытвалі пацвярджэнне гэтага адрасу, праігнаруйце гэтае паведамленне.",
-    "emails.verification.thanks": "Дзякуем,",
+    "emails.verification.thanks": "Дзякуем",
     "emails.verification.signature": "каманда {{project}}",
     "emails.magicSession.subject": "Лагін",
     "emails.magicSession.hello": "Прывітанне,",
     "emails.magicSession.body": "Перайдзіце па спасылцы, каб увайсці.",
     "emails.magicSession.footer": "Калі вы не прасілі ўвайсці, выкарыстоўваючы гэты адрас электроннай пошты, праігнаруйце гэтае паведамленне.",
-    "emails.magicSession.thanks": "Дзякуем,",
+    "emails.magicSession.thanks": "Дзякуем",
     "emails.magicSession.signature": "каманда {{project}}",
     "emails.recovery.subject": "Скід пароля",
-    "emails.recovery.hello": "Прывітанне, {{user}},",
+    "emails.recovery.hello": "Прывітанне, {{name}}",
     "emails.recovery.body": "Перайдзіце па гэтай спасылцы, каб скінуць пароль для праекта {{project}}.",
     "emails.recovery.footer": "Калі вы не прасілі скінуць пароль, вы можаце праігнараваць гэта паведамленне.",
-    "emails.recovery.thanks": "Дзякуем,",
+    "emails.recovery.thanks": "Дзякуем",
     "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.signature": "каманда {{project}}",
     "locale.country.unknown": "Невядомы",
     "countries.af": "Афганістан",
@@ -100,7 +100,6 @@
     "countries.gd": "Грэнада",
     "countries.gt": "Гватэмала",
     "countries.gy": "Гаяна",
-    "countries.hk": "Гонконг",
     "countries.hn": "Гандурас",
     "countries.hr": "Харватыя",
     "countries.ht": "Гаіці",
@@ -164,7 +163,6 @@
     "countries.nz": "Новая Зеландыя",
     "countries.om": "Аман",
     "countries.pk": "Пакістан",
-    "countries.ps": "Палестина",
     "countries.pa": "Панама",
     "countries.pe": "Перу",
     "countries.ph": "Філіпіны",
@@ -208,7 +206,6 @@
     "countries.tn": "Туніс",
     "countries.tr": "Турцыя",
     "countries.tv": "Тувалу",
-    "countries.tw": "Тайвань",
     "countries.tz": "Танзанія",
     "countries.ug": "Уганда",
     "countries.ua": "Украіна",
@@ -231,24 +228,5 @@
     "continents.eu": "Еўропа",
     "continents.na": "Паўночная Амерыка",
     "continents.oc": "Акіянія",
-    "continents.sa": "Паўднёвая Амерыка",
-    "emails.magicSession.optionButton": "Націсніце кнопку ніжэй, каб бяспечна ўвайсці ў свой рахунак {{project}}. Яна спыніць дзеянне праз 1 гадзіну.",
-    "emails.magicSession.buttonText": "Увайдзіце ў {{project}}",
-    "emails.magicSession.optionUrl": "Калі ў вас не атрымліваецца ўвайсці, выкарыстоўваючы кнопку вышэй, калі ласка, наведайце наступную спасылку:",
-    "emails.magicSession.clientInfo": "Гэты ўваход быў запытаны праз {{agentClient}} на {{agentDevice}} {{agentOs}}. Калі вы не запытвалі ўваход, вы можаце бяспечна ігнараваць гэты ліст.",
-    "emails.magicSession.securityPhrase": "Фраза бяспекі для гэтага ліста - {{phrase}}. Вы можаце давяраць гэтаму лісту, калі гэтая фраза супадае з фразай, якая была паказана пры ўваходзе ў сістэму.",
-    "emails.otpSession.subject": "{{project}} Уваход",
-    "emails.otpSession.hello": "Прывітанне,",
-    "emails.otpSession.description": "Увядзіце наступны код пацверджання, калі будзеце запытаны, каб бяспечна ўвайсці ў ваш уліковы запіс {{project}}. Ён страціць сілу праз 15 хвілін.",
-    "emails.otpSession.clientInfo": "Гэты ўваход быў запытаны пры дапамозе {{agentClient}} на {{agentDevice}} {{agentOs}}. Калі вы не запытвалі ўваход, вы можаце бяспечна ігнараваць гэты ліст.",
-    "emails.otpSession.securityPhrase": "Фраза бяспекі для гэтага ліста - {{phrase}}. Вы можаце давяраць гэтаму лісту, калі гэтая фраза супадае з фразай, паказанай пры ўваходзе.",
-    "emails.otpSession.thanks": "Дзякуй,",
-    "emails.otpSession.signature": "каманда {{project}}",
-    "emails.certificate.subject": "Сведчанне няўдалае для %s",
-    "emails.certificate.hello": "Прывітанне,",
-    "emails.certificate.body": "Сертыфікат для вашага дамена '{{domain}}' не можа быць створаны. Гэта спроба нумар {{attempt}}, і прычынай няўдачы з'яўляецца: {{error}}",
-    "emails.certificate.footer": "Ваш папярэдні сертыфікат будзе дзейнічаць 30 дзён з моманту першай няўдачы. Мы высока рэкамендуем расследаваць гэтую сітуацыю, інакш ваш дамен апынецца без дзейнага сертыфіката SSL-злучэння.",
-    "emails.certificate.thanks": "Дзякуй,",
-    "emails.certificate.signature": "каманда {{project}}",
-    "sms.verification.body": "{{secret}}"
+    "continents.sa": "Паўднёвая Амерыка"
 }

app/config/locale/translations/bg.json

@@ -4,28 +4,28 @@
     "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.hello": "",
     "emails.magicSession.body": "",
     "emails.magicSession.footer": "",
-    "emails.magicSession.thanks": ",",
+    "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": "Афганистан",
@@ -100,7 +100,6 @@
     "countries.gd": "Гренада",
     "countries.gt": "Гватемала",
     "countries.gy": "Гвиана",
-    "countries.hk": "Хонг Конг",
     "countries.hn": "Хондурас",
     "countries.hr": "Хърватия",
     "countries.ht": "Хаити",
@@ -164,7 +163,6 @@
     "countries.nz": "Нова Зеландия",
     "countries.om": "Оман",
     "countries.pk": "Пакистан",
-    "countries.ps": "Палестина",
     "countries.pa": "Панама",
     "countries.pe": "Перу",
     "countries.ph": "Филипини",
@@ -208,7 +206,6 @@
     "countries.tn": "Тунис",
     "countries.tr": "Турция",
     "countries.tv": "Тувалу",
-    "countries.tw": "Тайван",
     "countries.tz": "Танзания",
     "countries.ug": "Уганда",
     "countries.ua": "Украйна",
@@ -231,18 +228,5 @@
     "continents.eu": "Европа",
     "continents.na": "Северна Америка",
     "continents.oc": "Океания",
-    "continents.sa": "Южна Америка",
-    "emails.magicSession.optionButton": "Натиснете бутона по-долу, за да се впишете сигурно във вашия {{project}} акаунт. Той ще изтече след 1 час.",
-    "emails.magicSession.buttonText": "Влезте в {{project}}",
-    "emails.magicSession.clientInfo": "Този вход беше заявен чрез {{agentClient}} на {{agentDevice}} {{agentOs}}. Ако не сте поискали входа, можете безопасно да игнорирате този имейл.",
-    "sms.verification.body": "{{secret}}",
-    "emails.magicSession.securityPhrase": "Фразата за сигурност на този имейл е {{phrase}}. Можете да се доверите на този имейл, ако тази фраза съвпада с фразата, показана по време на вписването.",
-    "emails.magicSession.optionUrl": "Ако не можете да влезете чрез горния бутон, моля, посетете следния линк:",
-    "emails.otpSession.subject": "Вход в {{project}}",
-    "emails.otpSession.hello": "Здравейте,",
-    "emails.otpSession.description": "Въведете следния верификационен код, когато ви бъде поискано, за да се впишете сигурно в своята {{project}} сметка. Ще изтече след 15 минути.",
-    "emails.otpSession.clientInfo": "Този вход беше заявен чрез {{agentClient}} на {{agentDevice}} {{agentOs}}. Ако не сте заявили входа, можете спокойно да пренебрегнете този имейл.",
-    "emails.otpSession.securityPhrase": "Фразата за сигурност за този имейл е {{phrase}}. Можете да се доверите на този имейл, ако тази фраза съвпада с фразата, показана по време на вписването.",
-    "emails.otpSession.thanks": "Благодаря,",
-    "emails.otpSession.signature": "екип на {{project}}"
-}
+    "continents.sa": "Южна Америка"
+}

app/config/locale/translations/bh.json

@@ -4,28 +4,28 @@
     "settings.direction": "ltr",
     "emails.sender": "%s टीम",
     "emails.verification.subject": "खाता प्रमाणिकरण",
-    "emails.verification.hello": "नमस्ते {{user}},",
+    "emails.verification.hello": "नमस्ते {{name}}",
     "emails.verification.body": "ईमेल प्रमाणिकरण करे क लेल दिहल गइल लिंक फॉलो करें|",
     "emails.verification.footer": "अगर ई पता को सत्यापित करे के लिए ना कहाले, तो आप ई संदेश क अनदेखा कर सकत अछि।",
-    "emails.verification.thanks": "धन्यवाद,",
+    "emails.verification.thanks": "धन्यवाद",
     "emails.verification.signature": "{{project}} टीम",
     "emails.magicSession.subject": "लॉग इन करीं|",
-    "emails.magicSession.hello": "प्रणाम,",
+    "emails.magicSession.hello": "प्रणाम",
     "emails.magicSession.body": "लॉग इन करें लेल दिहल गइल लिंक फॉलो करें|",
     "emails.magicSession.footer": "अगर लॉग इन करे के लिए ना कहाले, तो आप ई संदेश क अनदेखा कर सकत अछि।",
-    "emails.magicSession.thanks": "धन्यवाद,",
+    "emails.magicSession.thanks": "धन्यवाद",
     "emails.magicSession.signature": "{{project}} टीम",
     "emails.recovery.subject": "पासवर्ड बदल क लेल|",
-    "emails.recovery.hello": "प्रणाम {{user}},",
+    "emails.recovery.hello": "प्रणाम {{name}}",
     "emails.recovery.body": "पासवर्ड बदल क लेल दिहल गइल लिंक फॉलो करें|",
     "emails.recovery.footer": "अगर पासवर्ड बदल क लेल ना कहाले, तो आप ई संदेश क अनदेखा कर सकत अछि।",
-    "emails.recovery.thanks": "धन्यवाद,",
+    "emails.recovery.thanks": "धन्यवाद",
     "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.signature": "{{project}} टीम",
     "locale.country.unknown": "अनजान",
     "countries.af": "अफ़ग़ानिस्तान",
@@ -100,7 +100,6 @@
     "countries.gd": "ग्रेनाडा",
     "countries.gt": "ग्वाटेमाला",
     "countries.gy": "गयाना",
-    "countries.hk": "हांगकांग",
     "countries.hn": "होंडुरस",
     "countries.hr": "क्रोएशिया",
     "countries.ht": "हैती",
@@ -164,7 +163,6 @@
     "countries.nz": "न्यूजीलैंड",
     "countries.om": "ओमान",
     "countries.pk": "पाकिस्तान",
-    "countries.ps": "पैलिस्टाइन",
     "countries.pa": "पनामा",
     "countries.pe": "पेरू",
     "countries.ph": "फिलीपींस",
@@ -208,7 +206,6 @@
     "countries.tn": "ट्यूनीशिया",
     "countries.tr": "तुर्की",
     "countries.tv": "तुवालू",
-    "countries.tw": "ताइवान",
     "countries.tz": "तंजानिया",
     "countries.ug": "युगांडा",
     "countries.ua": "यूक्रेन",
@@ -231,24 +228,5 @@
     "continents.eu": "यूरोप",
     "continents.na": "उत्तरी अमेरिका",
     "continents.oc": "ओशिनिया",
-    "continents.sa": "दक्षिण अमेरिका",
-    "emails.magicSession.optionButton": "नीचा देल बटन पर क्लिक करीं अपना {{project}} खाता में सुरक्षित रूप से साइन इन करे खातिर। ई 1 घंटा में समाप्त हो जाई।",
-    "emails.magicSession.buttonText": "{{project}} में साइन इन करीं",
-    "emails.magicSession.optionUrl": "अगर रउआ उपरका बटन से साइन इन ना कर पाईं तs, कृपया निचे दिहल लिंक पर जाई:",
-    "emails.magicSession.clientInfo": "ई साइन इन अनुरोध किया गेल {{agentClient}} पर {{agentDevice}} {{agentOs}} पर. यदि अहाँ एहि साइन इन के अनुरोध नै कइनी होखी तs अहाँ ई ईमेल के अनदेखा क सकऽ छी.",
-    "emails.magicSession.securityPhrase": "एह ईमेल खातिर सुरक्षा वाक्य {{phrase}} हऽ। ई ईमेल पर भरोसा करीं जदि ई वाक्य साइन इन करत समय देखावल वाक्य से मिलता हो।",
-    "emails.otpSession.subject": "प्रोजेक्ट लॉगिन",
-    "emails.otpSession.hello": "नमस्ते,",
-    "emails.otpSession.description": "जब आपको सुरक्षित रूप से अपना {{project}} खाता में साइन इन करे खातिर कहल जाए तऽ निम्नलिखित सत्यापन कोड दर्ज करीं। ई 15 मिनट में खत्म हो जई।",
-    "emails.otpSession.clientInfo": "एह साइन इन के अनुरोध {{agentClient}} पर {{agentDevice}} {{agentOs}} का प्रयोग करि कऽ कइल गइल बा। यदि तूँ एह साइन इन के अनुरोध ना कइले रहीं, त तूँ एह ईमेल के नजरअंदाज कर सकेला।",
-    "emails.otpSession.securityPhrase": "एही ईमेल खातिर सुरक्षा वाक्य {{phrase}} हऽ। अगर ई वाक्य साइन इन कइला के समय देखावल गेल वाक्य से मेल खाता, त एह ईमेल पर भरोसा कर सकैत छी।",
-    "emails.otpSession.thanks": "धन्यवाद,",
-    "emails.otpSession.signature": "{{project}} टीम",
-    "emails.certificate.subject": "%s लेल प्रमाणपत्र असफलта",
-    "emails.certificate.hello": "नमस्ते,",
-    "emails.certificate.body": "आपके डोमेन '{{domain}}' के लिए प्रमाणपत्र नहीं बनाया जा सका। ई प्रयास संख्या {{attempt}} है, और ई असफलता के कारण रहे: {{error}}",
-    "emails.certificate.footer": "तोहार पिछलका प्रमाणपत्र पहिल असफलता से 30 दिन धरी मान्य होईत। हम बहुत जोर देके सलाह देतानी कि एह मामला के जांच करीं, नहीं त तोहार डोमेन बिना कोनो मान्य SSL संवाद के रहि जाईत।",
-    "emails.certificate.thanks": "धन्यवाद,",
-    "emails.certificate.signature": "{{project}} टीम",
-    "sms.verification.body": "{{secret}}"
-}
+    "continents.sa": "दक्षिण अमेरिका"
+}

app/config/locale/translations/bn.json

@@ -4,28 +4,28 @@
     "settings.direction": "ltr",
     "emails.sender": "%s টীম",
     "emails.verification.subject": "বিষয়",
-    "emails.verification.hello": "নমস্কার {{user}},",
+    "emails.verification.hello": "নমস্কার {{name}}",
     "emails.verification.body": "এই লিঙ্কের মাধ্যমে ইমেইল যাচাই করুন।",
     "emails.verification.footer": "আপনি যদি এই ঠিকানা যাচাই করতে না বলেন, তাহলে আপনি এই বার্তাটি উপেক্ষা করতে পারেন।",
-    "emails.verification.thanks": "ধন্যবাদ,",
+    "emails.verification.thanks": "ধন্যবাদ",
     "emails.verification.signature": "{{project}} টীম",
     "emails.magicSession.subject": "লগ ইন",
-    "emails.magicSession.hello": "নমস্কার,",
+    "emails.magicSession.hello": "নমস্কার",
     "emails.magicSession.body": "এই লিঙ্কের মাধ্যমে লগ ইন করুন।",
     "emails.magicSession.footer": "আপনি যদি এই ইমেলটি ব্যবহার করে লগইন করতে না বলেন, তাহলে আপনি এই বার্তাটি উপেক্ষা করতে পারেন।",
-    "emails.magicSession.thanks": "ধন্যবাদ,",
+    "emails.magicSession.thanks": "ধন্যবাদ",
     "emails.magicSession.signature": "{{project}} টীম",
     "emails.recovery.subject": "পাসওয়ার্ড রিসেট",
-    "emails.recovery.hello": "নমস্কার {{user}},",
+    "emails.recovery.hello": "নমস্কার {{name}}",
     "emails.recovery.body": "এই লিঙ্কের মাধ্যমে আপনার {{project}} পাসওয়ার্ড পুনরায় সেট করুন।",
     "emails.recovery.footer": "আপনি যদি আপনার পাসওয়ার্ড পুনরায় সেট করতে না বলেন, তাহলে আপনি এই বার্তাটি উপেক্ষা করতে পারেন।",
-    "emails.recovery.thanks": "ধন্যবাদ,",
+    "emails.recovery.thanks": "ধন্যবাদ",
     "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.signature": "{{project}} টীম",
     "locale.country.unknown": "অজানা",
     "countries.af": "আফগানিস্তান",
@@ -100,7 +100,6 @@
     "countries.gd": "গ্রেনাডা",
     "countries.gt": "গুয়াতেমালা",
     "countries.gy": "গায়ানা",
-    "countries.hk": "হংকং",
     "countries.hn": "হন্ডুরাস",
     "countries.hr": "ক্রোয়েশিয়া",
     "countries.ht": "হাইতি",
@@ -164,7 +163,6 @@
     "countries.nz": "নিউজিল্যান্ড",
     "countries.om": "ওমান",
     "countries.pk": "পাকিস্তান",
-    "countries.ps": "প্যালেস্টাইন",
     "countries.pa": "পানামা",
     "countries.pe": "পেরু",
     "countries.ph": "ফিলিপাইন",
@@ -208,7 +206,6 @@
     "countries.tn": "তিউনিসিয়া",
     "countries.tr": "তুরস্ক",
     "countries.tv": "টুভালু",
-    "countries.tw": "তাইওয়ান",
     "countries.tz": "তানজানিয়া",
     "countries.ug": "উগান্ডা",
     "countries.ua": "ইউক্রেন",
@@ -231,18 +228,5 @@
     "continents.eu": "ইউরোপ",
     "continents.na": "উত্তর আমেরিকা",
     "continents.oc": "ওশেনিয়া",
-    "continents.sa": "দক্ষিণ আমেরিকা",
-    "emails.magicSession.optionButton": "নীচের বোতামে ক্লিক করুন আপনার {{project}} অ্যাকাউন্টে নিরাপদে সাইন ইন করতে। এটি ১ ঘন্টা পরে মেয়াদ উত্তীর্ণ হবে।",
-    "emails.magicSession.buttonText": "{{project}}-এ সাইন ইন করুন",
-    "emails.magicSession.clientInfo": "এই সাইন ইনটি {{agentClient}} ব্যবহার করে {{agentDevice}} {{agentOs}}-এ অনুরোধ করা হয়েছিল। যদি আপনি সাইন ইনের অনুরোধ করেননি, আপনি নিরাপদে এই ইমেইলটি উপেক্ষা করতে পারেন।",
-    "sms.verification.body": "{{secret}}",
-    "emails.magicSession.securityPhrase": "এই ইমেলের জন্য নিরাপত্তা বাক্যটি হল {{phrase}}। সাইন-ইনের সময় দেখানো বাক্যটির সাথে এই বাক্যটি মিলে গেলে আপনি এই ইমেইলকে বিশ্বাস করতে পারেন।",
-    "emails.magicSession.optionUrl": "উপরের বোতামটি ব্যবহার করে আপনি যদি সাইন ইন করতে অক্ষম হন, অনুগ্রহ করে নিম্নলিখিত লিঙ্কটি দেখুন:",
-    "emails.otpSession.subject": "{{project}} লগইন",
-    "emails.otpSession.hello": "নমস্কার,",
-    "emails.otpSession.description": "নিরাপদে আপনার {{project}} অ্যাকাউন্টে সাইন ইন করার জন্য যখন বলা হবে, তখন নিম্নলিখিত যাচাইকরণ কোডটি প্রবেশ করান। এটি ১৫ মিনিটের মধ্যে মেয়াদোত্তীর্ণ হয়ে যাবে।",
-    "emails.otpSession.clientInfo": "এই সাইন ইনটি {{agentClient}} ব্যবহার করে {{agentDevice}} {{agentOs}}-এ অনুরোধ করা হয়েছে। আপনি যদি সাইন ইনের অনুরোধ না করে থাকেন, আপনি নিরাপদে এই ইমেলটি উপেক্ষা করতে পারেন।",
-    "emails.otpSession.securityPhrase": "এই ইমেইলের জন্য সুরক্ষা বাক্য হলো {{phrase}}। যদি এই বাক্যটি সাইন ইনের সময় দেখানো বাক্যের সাথে মেলে, তাহলে আপনি এই ইমেইলটিকে বিশ্বাস করতে পারেন।",
-    "emails.otpSession.thanks": "ধন্যবাদ,",
-    "emails.otpSession.signature": "{{project}} দল"
+    "continents.sa": "দক্ষিণ আমেরিকা"
 }

app/config/locale/translations/bs.json

@@ -4,28 +4,28 @@
     "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.hello": "",
     "emails.magicSession.body": "",
     "emails.magicSession.footer": "",
-    "emails.magicSession.thanks": ",",
+    "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",
@@ -100,7 +100,6 @@
     "countries.gd": "Grenada",
     "countries.gt": "Guatemala",
     "countries.gy": "Gvajana",
-    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Hrvatska",
     "countries.ht": "Haiti",
@@ -164,7 +163,6 @@
     "countries.nz": "Novi Zeland",
     "countries.om": "Oman",
     "countries.pk": "Pakistan",
-    "countries.ps": "Palestina",
     "countries.pa": "Panama",
     "countries.pe": "Peru",
     "countries.ph": "Filipini",
@@ -208,7 +206,6 @@
     "countries.tn": "Tunis",
     "countries.tr": "Turska",
     "countries.tv": "Tuvalu",
-    "countries.tw": "Tajvan",
     "countries.tz": "Tanzania",
     "countries.ug": "Uganda",
     "countries.ua": "Ukrajina",
@@ -231,18 +228,5 @@
     "continents.eu": "Europa",
     "continents.na": "Sjeverna Amerika",
     "continents.oc": "Okeanija",
-    "continents.sa": "Južna Amerika",
-    "emails.magicSession.optionButton": "Kliknite na dugme ispod kako biste se sigurno prijavili na svoj {{project}} račun. Istek će se dogoditi za 1 sat.",
-    "emails.magicSession.buttonText": "Prijavi se na {{project}}",
-    "emails.magicSession.clientInfo": "Ova prijava je zatražena korištenjem {{agentClient}} na {{agentDevice}} {{agentOs}}. Ako niste zahtjevali prijavu, možete sigurno ignorirati ovaj e-mail.",
-    "sms.verification.body": "{{secret}}",
-    "emails.magicSession.securityPhrase": "Sigurnosna fraza za ovaj email je {{phrase}}. Ovom emailu možete vjerovati ako se fraza poklapa sa frazom prikazanom prilikom prijave.",
-    "emails.magicSession.optionUrl": "Ako ne možete da se prijavite koristeći gornje dugme, molimo posetite sledeći link:",
-    "emails.otpSession.subject": "{{project}} Prijava",
-    "emails.otpSession.hello": "Zdravo,",
-    "emails.otpSession.description": "Unesite sljedeći verifikacijski kod kada budete upitani kako biste sigurno pristupili vašem {{project}} računu. Istjeći će za 15 minuta.",
-    "emails.otpSession.clientInfo": "Ovaj zahtjev za prijavom je poslan koristeći {{agentClient}} na {{agentDevice}} {{agentOs}}. Ako niste zatražili prijavu, možete sigurno ignorisati ovaj email.",
-    "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}}"
-}
+    "continents.sa": "Južna Amerika"
+}

app/config/locale/translations/ca.json

@@ -4,28 +4,28 @@
     "settings.direction": "ltr",
     "emails.sender": "%s Equip",
     "emails.verification.subject": "Verificació del compte",
-    "emails.verification.hello": "Hola {{user}},",
+    "emails.verification.hello": "Hola {{name}}",
     "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.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.thanks": "Gràcies",
     "emails.magicSession.signature": "Equip {{project}}",
     "emails.recovery.subject": "Reinicialitzar contrasenya",
-    "emails.recovery.hello": "Hola {{user}},",
+    "emails.recovery.hello": "Hola {{name}}",
     "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.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.signature": "Equip {{project}}",
     "locale.country.unknown": "Desconegut",
     "countries.af": "Afganistan",
@@ -100,7 +100,6 @@
     "countries.gd": "Granada",
     "countries.gt": "Guatemala",
     "countries.gy": "Guaiana",
-    "countries.hk": "Hong Kong",
     "countries.hn": "Hondures",
     "countries.hr": "Croàcia",
     "countries.ht": "Haití",
@@ -164,7 +163,6 @@
     "countries.nz": "Nova Zelanda",
     "countries.om": "Oman",
     "countries.pk": "Pakistan",
-    "countries.ps": "Palestina",
     "countries.pa": "Panamà",
     "countries.pe": "Perú",
     "countries.ph": "Filipines",
@@ -208,7 +206,6 @@
     "countries.tn": "Tunísia",
     "countries.tr": "Turquia",
     "countries.tv": "Tuvalu",
-    "countries.tw": "Taiwan",
     "countries.tz": "Tanzània",
     "countries.ug": "Uganda",
     "countries.ua": "Ucraïna",
@@ -231,18 +228,5 @@
     "continents.eu": "Europa",
     "continents.na": "Amèrica del Nord",
     "continents.oc": "Oceania",
-    "continents.sa": "Amèrica del Sud",
-    "emails.magicSession.optionButton": "Feu clic al botó de sota per iniciar sessió de manera segura al vostre compte {{project}}. Caducarà en 1 hora.",
-    "emails.magicSession.buttonText": "Inicia sessió a {{project}}",
-    "emails.magicSession.clientInfo": "Aquest inici de sessió s'ha sol·licitat utilitzant {{agentClient}} en {{agentDevice}} {{agentOs}}. Si no has sol·licitat l'inici de sessió, pots ignorar aquest correu electrònic amb seguretat.",
-    "sms.verification.body": "{{secret}}",
-    "emails.magicSession.securityPhrase": "La frase de seguretat d'aquest correu electrònic és {{phrase}}. Podeu confiar en aquest correu si aquesta frase coincideix amb la frase mostrada durant l'inici de sessió.",
-    "emails.magicSession.optionUrl": "Si no podeu iniciar sessió utilitzant el botó de dalt, visiteu l'enllaç següent:",
-    "emails.otpSession.subject": "Inici de sessió de {{project}}",
-    "emails.otpSession.hello": "Hola,",
-    "emails.otpSession.description": "Introduïu el següent codi de verificació quan us ho sol·licitin per iniciar sessió de manera segura al vostre compte {{project}}. Caducarà en 15 minuts.",
-    "emails.otpSession.clientInfo": "Aquest inici de sessió s'ha sol·licitat utilitzant {{agentClient}} en {{agentDevice}} {{agentOs}}. Si no has sol·licitat l'inici de sessió, pots ignorar aquest correu electrònic sense cap problema.",
-    "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}}"
-}
+    "continents.sa": "Amèrica del Sud"
+}

app/config/locale/translations/cs.json

@@ -4,28 +4,28 @@
     "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.hello": "",
     "emails.magicSession.body": "",
     "emails.magicSession.footer": "",
-    "emails.magicSession.thanks": ",",
+    "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",
@@ -100,7 +100,6 @@
     "countries.gd": "Grenada",
     "countries.gt": "Guatemala",
     "countries.gy": "Guyana",
-    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Chorvatsko",
     "countries.ht": "Haiti",
@@ -164,7 +163,6 @@
     "countries.nz": "Nový Zéland",
     "countries.om": "Omán",
     "countries.pk": "Pákistán",
-    "countries.ps": "Palestina",
     "countries.pa": "Panama",
     "countries.pe": "Peru",
     "countries.ph": "Filipíny",
@@ -208,7 +206,6 @@
     "countries.tn": "Tunisko",
     "countries.tr": "Turecko",
     "countries.tv": "Tuvalu",
-    "countries.tw": "Tchaj-wan",
     "countries.tz": "Tanzanie",
     "countries.ug": "Uganda",
     "countries.ua": "Ukraine",
@@ -231,18 +228,5 @@
     "continents.eu": "Evropa",
     "continents.na": "Severní Amerika",
     "continents.oc": "Oceánie",
-    "continents.sa": "Jižní Amerika",
-    "emails.magicSession.optionButton": "Klikněte na tlačítko níže pro bezpečné přihlášení do vašeho účtu {{project}}. Platnost vyprší za 1 hodinu.",
-    "emails.magicSession.buttonText": "Přihlaste se k {{project}}",
-    "emails.magicSession.clientInfo": "Toto přihlášení bylo požadováno prostřednictvím {{agentClient}} na {{agentDevice}} {{agentOs}}. Pokud jste se nepřihlašovali, můžete tento e-mail bezpečně ignorovat.",
-    "sms.verification.body": "{{secret}}",
-    "emails.magicSession.securityPhrase": "Bezpečnostní fráze pro tento e-mail je {{phrase}}. Tomuto e-mailu můžete důvěřovat, pokud tato fráze odpovídá frázi zobrazené při přihlášení.",
-    "emails.magicSession.optionUrl": "Pokud se nemůžete přihlásit pomocí výše uvedeného tlačítka, prosím navštivte následující odkaz:",
-    "emails.otpSession.subject": "{{project}} Přihlášení",
-    "emails.otpSession.hello": "Ahoj,",
-    "emails.otpSession.description": "Zadejte následující ověřovací kód, když budete vyzváni, abyste se bezpečně přihlásili ke svému účtu {{project}}. Platnost kódu vyprší za 15 minut.",
-    "emails.otpSession.clientInfo": "Tento přihlašovací pokus byl proveden pomocí {{agentClient}} na zařízení {{agentDevice}} {{agentOs}}. Pokud jste se nepřihlašovali, tento e-mail můžete bezpečně ignorovat.",
-    "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}}"
-}
+    "continents.sa": "Jižní Amerika"
+}

app/config/locale/translations/da.json

@@ -1,31 +1,31 @@
 {
-    "settings.inspire": "\"Kunsten at være klog er kunsten at vide, hvad man skal overse.\"",
+    "settings.inspire": "\"Kunsten at være klog er kunsten at vide, hvad man skal overse.\"",  
     "settings.locale": "da",
     "settings.direction": "ltr",
     "emails.sender": "%s Team",
     "emails.verification.subject": "Konto Verifikation",
-    "emails.verification.hello": "Hej {{user}},",
+    "emails.verification.hello": "Hej {{name}}",
     "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.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.thanks": "Tak",
     "emails.magicSession.signature": "{{project}} team",
     "emails.recovery.subject": "Nulstil Password",
-    "emails.recovery.hello": "Hej {{user}},",
+    "emails.recovery.hello": "Hej {{name}}",
     "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.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.signature": "{{project}} team",
     "locale.country.unknown": "Ukendt",
     "countries.af": "Afghanistan",
@@ -100,7 +100,6 @@
     "countries.gd": "Grenada",
     "countries.gt": "Guatemala",
     "countries.gy": "Guyana",
-    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Kroatien",
     "countries.ht": "Haiti",
@@ -164,7 +163,6 @@
     "countries.nz": "New Zealand",
     "countries.om": "Oman",
     "countries.pk": "Pakistan",
-    "countries.ps": "Palæstina",
     "countries.pa": "Panama",
     "countries.pe": "Peru",
     "countries.ph": "Filippinerne",
@@ -208,7 +206,6 @@
     "countries.tn": "Tunisien",
     "countries.tr": "Tyrkiet",
     "countries.tv": "Tuvalu",
-    "countries.tw": "Taiwan",
     "countries.tz": "Tanzania",
     "countries.ug": "Uganda",
     "countries.ua": "Ukraine",
@@ -231,18 +228,5 @@
     "continents.eu": "Europa",
     "continents.na": "Nordamerica",
     "continents.oc": "Oceanien",
-    "continents.sa": "Sydamerica",
-    "emails.magicSession.optionButton": "Klik på knappen nedenfor for sikkert at logge ind på din {{project}} konto. Den udløber om 1 time.",
-    "emails.magicSession.buttonText": "Log ind på {{project}}",
-    "emails.magicSession.clientInfo": "Denne log ind blev anmodet ved hjælp af {{agentClient}} på {{agentDevice}} {{agentOs}}. Hvis du ikke anmodede om log ind, kan du trygt ignorere denne e-mail.",
-    "sms.verification.body": "{{secret}}",
-    "emails.magicSession.securityPhrase": "Sikkerhedsfrasen for denne e-mail er {{phrase}}. Du kan stole på denne e-mail, hvis denne frase matcher den viste frase under log ind.",
-    "emails.magicSession.optionUrl": "Hvis du ikke kan logge ind ved at bruge knappen ovenfor, besøg venligst følgende link:",
-    "emails.otpSession.subject": "{{project}} Login",
-    "emails.otpSession.hello": "Hej,",
-    "emails.otpSession.description": "Indtast følgende bekræftelseskode, når du bliver bedt om det, for sikkert at logge ind på din {{project}} konto. Den udløber om 15 minutter.",
-    "emails.otpSession.clientInfo": "Denne indlogning blev anmodet om ved hjælp af {{agentClient}} på {{agentDevice}} {{agentOs}}. Hvis du ikke har anmodet om indlogningen, kan du trygt ignorere denne e-mail.",
-    "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"
+    "continents.sa": "Sydamerica"
 }

app/config/locale/translations/de.json

@@ -4,28 +4,28 @@
     "settings.direction": "ltr",
     "emails.sender": "%s Team",
     "emails.verification.subject": "Kontoverifizierung",
-    "emails.verification.hello": "Hey {{user}},",
+    "emails.verification.hello": "Hey {{name}}",
     "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.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.thanks": "Danke",
     "emails.magicSession.signature": "{{project}}-Team",
     "emails.recovery.subject": "Kennwort zurücksetzen",
-    "emails.recovery.hello": "Hallo {{user}},",
+    "emails.recovery.hello": "Hallo {{name}}",
     "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.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.signature": "{{project}}-Team",
     "locale.country.unknown": "Unbekannt",
     "countries.af": "Afghanistan",
@@ -100,7 +100,6 @@
     "countries.gd": "Grenada",
     "countries.gt": "Guatemala",
     "countries.gy": "Guyana",
-    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Kroatien",
     "countries.ht": "Haiti",
@@ -164,7 +163,6 @@
     "countries.nz": "Neuseeland",
     "countries.om": "Oman",
     "countries.pk": "Pakistan",
-    "countries.ps": "Palästina",
     "countries.pa": "Panama",
     "countries.pe": "Peru",
     "countries.ph": "Philippinen",
@@ -208,7 +206,6 @@
     "countries.tn": "Tunesien",
     "countries.tr": "Türkei",
     "countries.tv": "Tuvalu",
-    "countries.tw": "Taiwan",
     "countries.tz": "Tansania",
     "countries.ug": "Uganda",
     "countries.ua": "Ukraine",
@@ -231,18 +228,5 @@
     "continents.eu": "Europa",
     "continents.na": "Nordamerika",
     "continents.oc": "Ozeanien",
-    "continents.sa": "Südamerika",
-    "emails.magicSession.optionButton": "Klicken Sie auf den unten stehenden Button, um sicher in Ihr {{project}}-Konto einzuloggen. Er verfällt in 1 Stunde.",
-    "emails.magicSession.buttonText": "Melden Sie sich bei {{project}} an",
-    "emails.magicSession.clientInfo": "Dieser Anmeldeversuch wurde über {{agentClient}} auf {{agentDevice}} {{agentOs}} angefordert. Wenn Sie die Anmeldung nicht angefordert haben, können Sie diese E-Mail getrost ignorieren.",
-    "sms.verification.body": "{{secret}}",
-    "emails.magicSession.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 wurde.",
-    "emails.magicSession.optionUrl": "Wenn Sie sich nicht über den obigen Button anmelden können, besuchen Sie bitte den folgenden Link:",
-    "emails.otpSession.subject": "{{project}} Anmeldung",
-    "emails.otpSession.hello": "Hallo,",
-    "emails.otpSession.description": "Geben Sie den folgenden Verifizierungscode ein, wenn Sie aufgefordert werden, um sich sicher in Ihrem {{project}} Konto anzumelden. Er verfällt in 15 Minuten.",
-    "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"
+    "continents.sa": "Südamerika"
 }

app/config/locale/translations/el.json

@@ -4,28 +4,28 @@
     "settings.direction": "ltr",
     "emails.sender": "Ομάδα %s",
     "emails.verification.subject": "Επαλήθευση Λογαριασμού",
-    "emails.verification.hello": "Γεια σου {{user}},",
+    "emails.verification.hello": "Γεια σου {{name}}",
     "emails.verification.body": "Ακολουθήστε αυτό το link για να επαληθεύσετε τη δ/νση του email σας",
     "emails.verification.footer": "Εάν δεν ζητήσατε επαλήθευση αυτής της δ/νσης email, μπορείτε να αγνοήσετε αυτό το μήνυμα",
-    "emails.verification.thanks": "Ευχαριστούμε,",
+    "emails.verification.thanks": "Ευχαριστούμε",
     "emails.verification.signature": "Η ομάδα του {{project}}",
     "emails.magicSession.subject": "Είσοδος",
     "emails.magicSession.hello": "Γεια σου,",
     "emails.magicSession.body": "Ακολουθήστε αυτό το link για να συνδεθείτε",
     "emails.magicSession.footer": "Εάν δεν ζητήσατε να συνδεθείτε χρησιμοποιώντας αυτό το email, μπορείτε να αγνοήσετε αυτό το μήνυμα.",
-    "emails.magicSession.thanks": "Ευχαριστούμε,",
+    "emails.magicSession.thanks": "Ευχαριστούμε",
     "emails.magicSession.signature": "Η ομάδα του {{project}}",
     "emails.recovery.subject": "Αλλαγή κωδικού πρόσβασης",
-    "emails.recovery.hello": "Γεια σου {{user}},",
+    "emails.recovery.hello": "Γεια σου {{name}}",
     "emails.recovery.body": "Ακολουθήστε αυτό το link για να αλλάξετε τον {{project}} κωδικό σας",
     "emails.recovery.footer": "Εάν δεν ζητήσατε αλλαγή του κωδικού σας πρόσβασης, μπορείτε να αγνοήσετε αυτό το μήνυμα",
-    "emails.recovery.thanks": "Ευχαριστούμε,",
+    "emails.recovery.thanks": "Ευχαριστούμε",
     "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.signature": "Η ομάδα του {{project}}",
     "locale.country.unknown": "Άγνωστο",
     "countries.af": "Αφγανιστάν",
@@ -100,7 +100,6 @@
     "countries.gd": "Γρενάδα",
     "countries.gt": "Γουατεμάλα",
     "countries.gy": "Γουιάνα",
-    "countries.hk": "Χονγκ Κονγκ",
     "countries.hn": "Ονδούρα",
     "countries.hr": "Κροατία",
     "countries.ht": "Αϊτή",
@@ -164,7 +163,6 @@
     "countries.nz": "Νέα Ζηλανδία",
     "countries.om": "Ομάν",
     "countries.pk": "Πακιστάν",
-    "countries.ps": "Παλαιστίνη",
     "countries.pa": "Παναμάς",
     "countries.pe": "Περού",
     "countries.ph": "Φιλιππίνες",
@@ -208,7 +206,6 @@
     "countries.tn": "Τυνησία",
     "countries.tr": "Τουρκία",
     "countries.tv": "Τουβαλού",
-    "countries.tw": "Ταϊβάν",
     "countries.tz": "Τανζανία",
     "countries.ug": "Ουγκάντα",
     "countries.ua": "Ουκρανία",
@@ -231,18 +228,5 @@
     "continents.eu": "Ευρώπη",
     "continents.na": "Βόρεια Αμερική",
     "continents.oc": "Ωκεανία",
-    "continents.sa": "Νότια Αμερική",
-    "emails.magicSession.optionButton": "Κάντε κλικ στο κουμπί παρακάτω για να συνδεθείτε με ασφάλεια στον λογαριασμό σας στο {{project}}. Θα λήξει σε 1 ώρα.",
-    "emails.magicSession.buttonText": "Συνδεθείτε στο {{project}}",
-    "emails.magicSession.clientInfo": "Η σύνδεση αυτή ζητήθηκε χρησιμοποιώντας το {{agentClient}} στο {{agentDevice}} {{agentOs}}. Εάν δεν ζητήσατε τη σύνδεση, μπορείτε να αγνοήσετε με ασφάλεια αυτό το email.",
-    "sms.verification.body": "{{secret}}",
-    "emails.magicSession.securityPhrase": "Η φράση ασφαλείας για αυτό το email είναι {{phrase}}. Μπορείτε να εμπιστευτείτε αυτό το email αν αυτή η φράση ταιριάζει με τη φράση που εμφανίζεται κατά την είσοδο.",
-    "emails.magicSession.optionUrl": "Εάν δεν μπορείτε να συνδεθείτε χρησιμοποιώντας το παραπάνω κουμπί, παρακαλώ επισκεφτείτε τον παρακάτω σύνδεσμο:",
-    "emails.otpSession.subject": "{{project}} Σύνδεση",
-    "emails.otpSession.hello": "Γεια σου,",
-    "emails.otpSession.description": "Εισάγετε τον ακόλουθο κωδικό επαλήθευσης όταν σας ζητηθεί για να συνδεθείτε με ασφάλεια στον λογαριασμό σας {{project}}. Θα λήξει σε 15 λεπτά.",
-    "emails.otpSession.clientInfo": "Αυτή η είσοδος ζητήθηκε με χρήση {{agentClient}} σε {{agentDevice}} {{agentOs}}. Εάν δεν ζητήσατε την είσοδο, μπορείτε να αγνοήσετε αυτό το email με ασφάλεια.",
-    "emails.otpSession.securityPhrase": "Η φράση ασφαλείας για αυτό το email είναι {{phrase}}. Μπορείτε να εμπιστευτείτε αυτό το email αν αυτή η φράση ταιριάζει με τη φράση που εμφανίστηκε κατά την είσοδο.",
-    "emails.otpSession.thanks": "Ευχαριστώ,",
-    "emails.otpSession.signature": "ομάδα {{project}}"
+    "continents.sa": "Νότια Αμερική"
 }

app/config/locale/translations/en.json

@@ -4,61 +4,35 @@
     "settings.direction": "ltr",
     "emails.sender": "%s Team",
     "emails.verification.subject": "Account Verification",
-    "emails.verification.hello": "Hello {{user}},",
-    "emails.verification.body": "Follow this link to verify your email address to your {{b}}{{project}}{{/b}} account.",
+    "emails.verification.hello": "Hey {{name}}",
+    "emails.verification.body": "Follow this link to verify your email address.",
     "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.signature": "{{project}} team",
-    "emails.magicSession.subject": "{{project}} Login",
-    "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:",
-    "emails.magicSession.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.magicSession.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.magicSession.thanks": "Thanks,",
+    "emails.magicSession.subject": "Login",
+    "emails.magicSession.hello": "Hey,",
+    "emails.magicSession.body": "Follow this link to login.",
+    "emails.magicSession.footer": "If you didn’t ask to login using this email, you can ignore this message.",
+    "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.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.thanks": "Thanks,",
-    "emails.sessionAlert.signature": "{{project}} team",
-    "emails.otpSession.subject": "OTP for {{project}} Login",
-    "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.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.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.hello": "Hello {{name}}",
+    "emails.recovery.body": "Follow this link to reset your {{project}} password.",
+    "emails.recovery.footer": "If you didn’t ask to reset your password, you can ignore this message.",
+    "emails.recovery.thanks": "Thanks",
     "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.hello": "Hello",
+    "emails.invitation.body": "This mail was sent to you because {{owner}} wanted to invite you to become a member of the {{team}} team at {{project}}.",
     "emails.invitation.footer": "If you are not interested, you can ignore this message.",
-    "emails.invitation.thanks": "Thanks,",
+    "emails.invitation.thanks": "Thanks",
     "emails.invitation.signature": "{{project}} team",
     "emails.certificate.subject": "Certificate failure for %s",
-    "emails.certificate.hello": "Hello,",
+    "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",
     "countries.af": "Afghanistan",
     "countries.ao": "Angola",
@@ -132,7 +106,6 @@
     "countries.gd": "Grenada",
     "countries.gt": "Guatemala",
     "countries.gy": "Guyana",
-    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Croatia",
     "countries.ht": "Haiti",
@@ -196,7 +169,6 @@
     "countries.nz": "New Zealand",
     "countries.om": "Oman",
     "countries.pk": "Pakistan",
-    "countries.ps": "Palestine",
     "countries.pa": "Panama",
     "countries.pe": "Peru",
     "countries.ph": "Philippines",
@@ -240,7 +212,6 @@
     "countries.tn": "Tunisia",
     "countries.tr": "Turkey",
     "countries.tv": "Tuvalu",
-    "countries.tw": "Taiwan",
     "countries.tz": "Tanzania",
     "countries.ug": "Uganda",
     "countries.ua": "Ukraine",

app/config/locale/translations/eo.json

@@ -1,32 +1,32 @@
-{
-    "settings.locale": "eo",
-    "settings.direction": "ltr",
-    "emails.sender": "Teamo %s",
-    "emails.verification.subject": "Konta Konfirmo",
-    "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.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.signature": "Teamo {{project}}",
-    "emails.recovery.subject": "Parsvorta Restarigo",
-    "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.signature": "Teamo {{project}}",
-    "emails.invitation.subject": "Invito al la Teamo %s em %s",
-    "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.signature": "Teamo {{project}}",
-    "locale.country.unknown": "Unknown",
+{  
+     "settings.locale": "eo",
+     "settings.direction": "ltr",
+     "emails.sender": "Teamo %s",
+     "emails.verification.subject": "Konta Konfirmo",
+     "emails.verification.hello": "Saluton {{name}}",
+     "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.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.signature": "Teamo {{project}}",
+     "emails.recovery.subject": "Parsvorta Restarigo",
+     "emails.recovery.hello": "Saluton {{name}}",
+     "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.signature": "Teamo {{project}}",
+     "emails.invitation.subject": "Invito al la Teamo %s em %s",
+     "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.signature": "Teamo {{project}}",
+     "locale.country.unknown": "Unknown",
     "countries.af": "Afghanistan",
     "countries.ao": "Angola",
     "countries.al": "Albania",
@@ -99,7 +99,6 @@
     "countries.gd": "Grenada",
     "countries.gt": "Guatemala",
     "countries.gy": "Guyana",
-    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Croatia",
     "countries.ht": "Haiti",
@@ -163,7 +162,6 @@
     "countries.nz": "New Zealand",
     "countries.om": "Oman",
     "countries.pk": "Pakistan",
-    "countries.ps": "Palestinio",
     "countries.pa": "Panama",
     "countries.pe": "Peru",
     "countries.ph": "Philippines",
@@ -207,7 +205,6 @@
     "countries.tn": "Tunisia",
     "countries.tr": "Turkey",
     "countries.tv": "Tuvalu",
-    "countries.tw": "Tajvano",
     "countries.tz": "Tanzania",
     "countries.ug": "Uganda",
     "countries.ua": "Ukraine",
@@ -230,19 +227,5 @@
     "continents.eu": "Europe",
     "continents.na": "North America",
     "continents.oc": "Oceania",
-    "continents.sa": "South America",
-    "settings.inspire": "\"La arto esti saĝa estas la arto scii kion preteratenti.\"",
-    "emails.magicSession.optionButton": "Alklaku la suban butonon por sekure ensaluti al via {{project}}-konto. Ĝi eksvalidiĝos post 1 horo.",
-    "emails.magicSession.buttonText": "Ensalutu al {{project}}",
-    "emails.magicSession.clientInfo": "Ĉi tiu ensaluto estis petita per {{agentClient}} en {{agentDevice}} {{agentOs}}. Se vi ne petis la ensaluton, vi povas sekure ignori ĉi tiun retpoŝton.",
-    "sms.verification.body": "{{secret}}",
-    "emails.magicSession.securityPhrase": "La sekureca frazo por ĉi tiu retpoŝto estas {{phrase}}. Vi povas fidi ĉi tiun retpoŝton se ĉi tiu frazo kongruas kun la frazo montrita dum ensaluto.",
-    "emails.magicSession.optionUrl": "Se vi ne povas ensaluti per la supra butono, bonvolu viziti la jenan ligilon:",
-    "emails.otpSession.subject": "{{project}} Ensaluto",
-    "emails.otpSession.hello": "Saluton,",
-    "emails.otpSession.description": "Enigu la jenan kontrolkodon kiam oni petos ĝin por sekure ensaluti en vian {{project}} konton. Ĝi eksvalidiĝos post 15 minutoj.",
-    "emails.otpSession.clientInfo": "Ĉi tiu ensaluto estis petita per {{agentClient}} en {{agentDevice}} {{agentOs}}. Se vi ne petis la ensaluton, vi povas sekure ignori ĉi tiun retpoŝton.",
-    "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}}"
+    "continents.sa": "South America"
 }

app/config/locale/translations/es.json

@@ -2,31 +2,31 @@
     "settings.inspire": "\"El arte de ser sabio es el arte de saber qué pasar por alto\"",
     "settings.locale": "es",
     "settings.direction": "ltr",
-    "emails.sender": "El equipo de %s",
+    "emails.sender": "Equipo %s",
     "emails.verification.subject": "Verificación de cuenta",
-    "emails.verification.hello": "Hola, {{name}}.,",
-    "emails.verification.body": "Haz clic en este enlace para verificar tu correo:",
+    "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.signature": "El equipo de {{project}}.",
+    "emails.verification.thanks": "Gracias",
+    "emails.verification.signature": "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.signature": "El equipo de {{project}}",
+    "emails.magicSession.body": "Haz clic en este enlace para iniciar sesión.",
+    "emails.magicSession.footer": "Si no has solicitado ingresar usando este correo, puedes ignorar este mensaje.",
+    "emails.magicSession.thanks": "Gracias",
+    "emails.magicSession.signature": "Equipo de {{project}}",
     "emails.recovery.subject": "Restablecer contraseña",
-    "emails.recovery.hello": "Hola, {{name}}.,",
-    "emails.recovery.body": "Haz clic en este enlace para restablecer la contraseña de {{project}}:",
+    "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.signature": "El equipo de {{project}}",
+    "emails.recovery.thanks": "Gracias",
+    "emails.recovery.signature": "Equipo de {{project}}",
     "emails.invitation.subject": "Invitación al equipo %s en %s",
-    "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.signature": "El equipo de {{project}}",
+    "emails.invitation.hello": "Hola",
+    "emails.invitation.body": "Este correo ha sido enviado a petición de {{owner}} quien quiere invitarte a formar parte del equipo {{team}} en {{project}}.",
+    "emails.invitation.footer": "Si no estas interesado, puedes ignorar este mensaje.",
+    "emails.invitation.thanks": "Gracias",
+    "emails.invitation.signature": "Equipo de {{project}}",
     "locale.country.unknown": "Desconocido",
     "countries.af": "Afganistán",
     "countries.ao": "Angola",
@@ -100,7 +100,6 @@
     "countries.gd": "Granada",
     "countries.gt": "Guatemala",
     "countries.gy": "Guayana",
-    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Croacia",
     "countries.ht": "Haití",
@@ -164,7 +163,6 @@
     "countries.nz": "Nueva Zelanda",
     "countries.om": "Omán",
     "countries.pk": "Pakistán",
-    "countries.ps": "Palestina",
     "countries.pa": "Panamá",
     "countries.pe": "Perú",
     "countries.ph": "Filipinas",
@@ -208,7 +206,6 @@
     "countries.tn": "Túnez",
     "countries.tr": "Turquía",
     "countries.tv": "Tuvalu",
-    "countries.tw": "Taiwán",
     "countries.tz": "Tanzania",
     "countries.ug": "Uganda",
     "countries.ua": "Ucrania",
@@ -231,18 +228,5 @@
     "continents.eu": "Europa",
     "continents.na": "América del Norte",
     "continents.oc": "Oceanía",
-    "continents.sa": "América del Sur",
-    "emails.magicSession.optionButton": "Haz clic en el botón de abajo para iniciar sesión de forma segura en tu cuenta de {{project}}. Caducará en 1 hora.",
-    "emails.magicSession.buttonText": "Iniciar sesión en {{project}}",
-    "emails.magicSession.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.",
-    "sms.verification.body": "{{secret}}",
-    "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.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.signature": "El equipo de {{project}}"
-}
+    "continents.sa": "América del Sur"
+}

app/config/locale/translations/fa.json

@@ -4,29 +4,29 @@
     "settings.direction": "rtl",
     "emails.sender": "تیم %s",
     "emails.verification.subject": "تأیید حساب",
-    "emails.verification.hello": "سلام {{user}}،",
+    "emails.verification.hello": "سلام {{name}}",
     "emails.verification.body": "برای تأیید ایمیل‌تان پیوند زیر را دنبال کنید.",
     "emails.verification.footer": "اگر شما درخواست تأیید حساب نداده‌اید، می‌توانید این پیام را نادیده بگیرید.",
-    "emails.verification.thanks": "سپاس فراوان،",
-    "emails.verification.signature": "تیم {{user}}",
+    "emails.verification.thanks": "سپاس فراوان",
+    "emails.verification.signature": "تیم {{name}}",
     "emails.magicSession.subject": "ورود به حساب کاربری",
     "emails.magicSession.hello": "سلام،",
     "emails.magicSession.body": "برای ورود به حساب‌تان پیوند زیر را دنبال کنید.",
     "emails.magicSession.footer": "اگر شما درخواست ورود به حساب کاربری با استفاده از این ایمیل را نداد‌ه‌اید، می‌توانید این پیام را نادیده بگیرید.",
-    "emails.magicSession.thanks": "سپاس فراوان،",
-    "emails.magicSession.signature": "تیم {{user}}",
+    "emails.magicSession.thanks": "سپاس فراوان",
+    "emails.magicSession.signature": "تیم {{name}}",
     "emails.recovery.subject": "بازیابی گذرواژه",
-    "emails.recovery.hello": "سلام {{user}}،",
+    "emails.recovery.hello": "سلام {{name}}",
     "emails.recovery.body": "برای بازیابی گذرواژه‌تان پیوند زیر را دنبال کنید.",
     "emails.recovery.footer": "اگر شما درخواست بازیابی گذرواژه نداده‌اید، می‌توانید این پیام را نادیده بگیرید.",
-    "emails.recovery.thanks": "سپاس فراوان،",
-    "emails.recovery.signature": "تیم {{user}}",
+    "emails.recovery.thanks": "سپاس فراوان",
+    "emails.recovery.signature": "تیم {{name}}",
     "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.signature": "تیم {{user}}",
+    "emails.invitation.thanks": "سپاس فراوان",
+    "emails.invitation.signature": "تیم {{name}}",
     "locale.country.unknown": "ناشناخته",
     "countries.af": "افغانستان",
     "countries.ao": "آنگولا",
@@ -100,7 +100,6 @@
     "countries.gd": "گرنادا",
     "countries.gt": "گواتمالا",
     "countries.gy": "گویان",
-    "countries.hk": "هنگ کنگ",
     "countries.hn": "هندوراس",
     "countries.hr": "کرواسی",
     "countries.ht": "هائیتی",
@@ -164,7 +163,6 @@
     "countries.nz": "نیوزلند",
     "countries.om": "عمان",
     "countries.pk": "پاکستان",
-    "countries.ps": "فلسطین",
     "countries.pa": "پاناما",
     "countries.pe": "پرو",
     "countries.ph": "فیلیپین",
@@ -208,7 +206,6 @@
     "countries.tn": "تونس",
     "countries.tr": "ترکیه",
     "countries.tv": "تووالو",
-    "countries.tw": "تایوان",
     "countries.tz": "تانزانیا",
     "countries.ug": "اوگاندا",
     "countries.ua": "اوکراین",
@@ -231,18 +228,5 @@
     "continents.eu": "اروپا",
     "continents.na": "آمریکای شمالی",
     "continents.oc": "اقیانوسیه",
-    "continents.sa": "آمریکای جنوبی",
-    "emails.magicSession.optionButton": "بر روی دکمه زیر کلیک کنید تا به صورت امن وارد حساب {{project}} خود شوید. این دکمه یک ساعت دیگر منقضی می‌شود.",
-    "emails.magicSession.buttonText": "ورود به {{project}}",
-    "emails.magicSession.clientInfo": "این ورود به سیستم با استفاده از {{agentClient}} در {{agentDevice}} {{agentOs}} درخواست شده است. اگر شما این ورود به سیستم را درخواست نکرده‌اید، می‌توانید به راحتی این ایمیل را نادیده بگیرید.",
-    "sms.verification.body": "{{secret}}",
-    "emails.magicSession.securityPhrase": "عبارت امنیتی برای این ایمیل {{phrase}} است. اگر این عبارت با عبارت نشان داده شده در هنگام ورود به سیستم مطابقت داشت، می‌توانید به این ایمیل اعتماد کنید.",
-    "emails.magicSession.optionUrl": "اگر قادر به ورود با استفاده از دکمه بالا نیستید، لطفاً از لینک زیر دیدن فرمایید:",
-    "emails.otpSession.subject": "ورود {{project}}",
-    "emails.otpSession.hello": "سلام،",
-    "emails.otpSession.description": "وقتی از شما خواسته شد، کد تأیید زیر را برای ورود ایمن به حساب کاربری {{project}} خود وارد کنید. این کد تا ۱۵ دقیقه دیگر منقضی می‌شود.",
-    "emails.otpSession.clientInfo": "این ورود به سیستم با استفاده از {{agentClient}} در {{agentDevice}} {{agentOs}} درخواست شده است. اگر شما این ورود به سیستم را درخواست نکرده‌اید، می‌توانید به راحتی این ایمیل را نادیده بگیرید.",
-    "emails.otpSession.securityPhrase": "عبارت امنیتی برای این ایمیل {{phrase}} است. اگر این عبارت با عبارت نشان داده شده هنگام ورود به سیستم مطابقت داشته باشد، می‌توانید به این ایمیل اعتماد کنید.",
-    "emails.otpSession.thanks": "متشکرم،",
-    "emails.otpSession.signature": "تیم {{project}}"
+    "continents.sa": "آمریکای جنوبی"
 }

app/config/locale/translations/fi.json

@@ -4,28 +4,28 @@
     "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.hello": "",
     "emails.magicSession.body": "",
     "emails.magicSession.footer": "",
-    "emails.magicSession.thanks": ",",
+    "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",
@@ -100,7 +100,6 @@
     "countries.gd": "Grenada",
     "countries.gt": "Guatemala",
     "countries.gy": "Guyana",
-    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Kroatia",
     "countries.ht": "Haiti",
@@ -164,7 +163,6 @@
     "countries.nz": "Uusi-Seelanti",
     "countries.om": "Oman",
     "countries.pk": "Pakistan",
-    "countries.ps": "Palestiina",
     "countries.pa": "Panama",
     "countries.pe": "Peru",
     "countries.ph": "Filippiinit",
@@ -208,7 +206,6 @@
     "countries.tn": "Tunisia",
     "countries.tr": "Turkki",
     "countries.tv": "Tuvalu",
-    "countries.tw": "Taiwan",
     "countries.tz": "Tansania",
     "countries.ug": "Uganda",
     "countries.ua": "Ukraina",
@@ -231,18 +228,5 @@
     "continents.eu": "Eurooppa",
     "continents.na": "Pohjois Amerikka",
     "continents.oc": "Oceania",
-    "continents.sa": "Etelä Amerikka",
-    "emails.magicSession.optionButton": "Napsauta alla olevaa painiketta kirjautuaksesi turvallisesti {{project}}-tiliisi. Se vanhenee tunnissa.",
-    "emails.magicSession.buttonText": "Kirjaudu sisään {{project}}",
-    "emails.magicSession.clientInfo": "Tämä kirjautuminen pyydettiin käyttäen {{agentClient}} {{agentDevice}} {{agentOs}}. Jos et pyytänyt kirjautumista, voit huoletta jättää tämän sähköpostin huomiotta.",
-    "sms.verification.body": "{{secret}}",
-    "emails.magicSession.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.magicSession.optionUrl": "Jos et pysty kirjautumaan sisään yllä olevaa painiketta käyttäen, käy seuraavassa linkissä:",
-    "emails.otpSession.subject": "{{project}} Kirjautuminen",
-    "emails.otpSession.hello": "Hei,",
-    "emails.otpSession.description": "Syötä seuraava vahvistuskoodi, kun sinua pyydetään tekemään se turvallisesti kirjautuaksesi {{project}}-tilillesi. Se vanhenee 15 minuutin kuluttua.",
-    "emails.otpSession.clientInfo": "Tämä kirjautumispyyntö tehtiin käyttämällä {{agentClient}} laitteella {{agentDevice}} {{agentOs}}. Jos et pyytänyt kirjautumista, voit huoletta ohittaa tämän sähköpostin.",
-    "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"
-}
+    "continents.sa": "Etelä Amerikka"
+}

app/config/locale/translations/fo.json

@@ -4,28 +4,28 @@
     "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.hello": "",
     "emails.magicSession.body": "",
     "emails.magicSession.footer": "",
-    "emails.magicSession.thanks": ",",
+    "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",
@@ -100,7 +100,6 @@
     "countries.gd": "Grenada",
     "countries.gt": "Guatemala",
     "countries.gy": "Gujana",
-    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Kroatia",
     "countries.ht": "Haiti",
@@ -164,7 +163,6 @@
     "countries.nz": "Nýsæland",
     "countries.om": "Oman",
     "countries.pk": "Pakistan",
-    "countries.ps": "Palestina",
     "countries.pa": "Panama",
     "countries.pe": "Peru",
     "countries.ph": "Filipsoyggjar",
@@ -208,7 +206,6 @@
     "countries.tn": "Tunesia",
     "countries.tr": "Turkaland",
     "countries.tv": "Tuvalu",
-    "countries.tw": "Taivan",
     "countries.tz": "Tansania",
     "countries.ug": "Uganda",
     "countries.ua": "Ukraina",
@@ -231,18 +228,5 @@
     "continents.eu": "Europa",
     "continents.na": "Norðuramerika",
     "continents.oc": "Kyrrahavsoyggjarnar",
-    "continents.sa": "Suðuramerika",
-    "emails.magicSession.optionButton": "Trýst á knøttin niðanfyri fyri at rita trygt inn á tína {{project}} konto. Tað fer at ganga út um 1 tíma.",
-    "emails.magicSession.buttonText": "Innrita á {{project}}",
-    "emails.magicSession.clientInfo": "Hetta innritingarbeiðið varð umbiðið við {{agentClient}} á {{agentDevice}} {{agentOs}}. Um tú ikki bað um innritingina, kanst tú trygt ignoreri hendan teldupostin.",
-    "sms.verification.body": "{{secret}}",
-    "emails.magicSession.securityPhrase": "Trygdarorðið fyri hesa teldupostadressuna er {{phrase}}. Tú kanst líta á hesa teldupostadressu, um hetta orðið samsvarar við orðið víst tá tú ritaði inn.",
-    "emails.magicSession.optionUrl": "Um tú ikki fært innritað við at brúka knøttin omanfyri, vinarliga vitja hesa leinkjuna:",
-    "emails.otpSession.subject": "{{project}} Ritarinn",
-    "emails.otpSession.hello": "Hallo,",
-    "emails.otpSession.description": "Skriva hesa váttanarkotu tá tú verður biðin um tað, fyri at rita trygt inn á tín {{project}} konto. Hon gongur út um 15 minuttir.",
-    "emails.otpSession.clientInfo": "Hendan innritað varð umbidin við {{agentClient}} á {{agentDevice}} {{agentOs}}. Um tú ikki hevur umbiðið innritingina, kanst tú trygt ignorera hesa teldupostin.",
-    "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ð"
-}
+    "continents.sa": "Suðuramerika"
+}

app/config/locale/translations/fr.json

@@ -4,29 +4,35 @@
     "settings.direction": "ltr",
     "emails.sender": "Équipe %s",
     "emails.verification.subject": "Vérification du compte",
-    "emails.verification.hello": "Bonjour {{user}},",
+    "emails.verification.hello": "Bonjour {{name}}",
     "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.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.thanks": "Merci",
     "emails.magicSession.signature": "L'équipe {{project}}",
     "emails.recovery.subject": "Réinitialisation du mot de passe",
-    "emails.recovery.hello": "Bonjour {{user}},",
-    "emails.recovery.body": "Suivez ce lien pour réinitialiser votre mot de passe pour {{project}}.",
+    "emails.recovery.hello": "Bonjour {{name}}",
+    "emails.recovery.body": "Suivez ce lien pour réinitialiser votre mot de passe pour {{projet}}.",
     "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.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.signature": "L'équipe {{project}}",
+    "emails.certificate.subject": "Échec du certificat pour %s",
+    "emails.certificate.hello": "Bonjour",
+    "emails.certificate.body": "Le certificate pour votre domaine '{{domain}}' n'a pas pu être généré. Ceci est la tentative {{tentative}} et l'échec a été causé par : {{erreur}}",
+    "emails.certificate.footer": "Votre certificat précédent sera valide pendant 30 jours à compter de la première défaillance. Nous vous recommandons fortement d'enquêter sur ce cas, sinon votre domaine se retrouvera sans communication SSL valide.",
+    "emails.certificate.thanks": "Merci",
+    "emails.certificate.signature": "L'équipe {{project}}",
     "locale.country.unknown": "Inconnu",
     "countries.af": "Afghanistan",
     "countries.ao": "Angola",
@@ -100,7 +106,6 @@
     "countries.gd": "Grenade",
     "countries.gt": "Guatemala",
     "countries.gy": "Guyane",
-    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Croatie",
     "countries.ht": "Haïti",
@@ -164,7 +169,6 @@
     "countries.nz": "Nouvelle-Zélande",
     "countries.om": "Oman",
     "countries.pk": "Pakistan",
-    "countries.ps": "Palestine",
     "countries.pa": "Panama",
     "countries.pe": "Pérou",
     "countries.ph": "Philippines",
@@ -208,7 +212,6 @@
     "countries.tn": "Tunisie",
     "countries.tr": "Turquie",
     "countries.tv": "Tuvalu",
-    "countries.tw": "Taïwan",
     "countries.tz": "Tanzanie",
     "countries.ug": "Uganda",
     "countries.ua": "Ukraine",
@@ -231,18 +234,5 @@
     "continents.eu": "Europe",
     "continents.na": "Amérique du Nord",
     "continents.oc": "Océanie",
-    "continents.sa": "Amérique du Sud",
-    "emails.magicSession.optionButton": "Cliquez sur le bouton ci-dessous pour vous connecter en toute sécurité à votre compte {{project}}. Il expirera dans 1 heure.",
-    "emails.magicSession.buttonText": "Connectez-vous à {{project}}",
-    "emails.magicSession.optionUrl": "Si le bouton ci-dessus ne s'affiche pas, utilisez le lien suivant :",
-    "emails.magicSession.clientInfo": "Cette connexion a été demandée en utilisant {{agentClient}} sur {{agentDevice}} {{agentOs}}. Si vous n'avez pas demandé cette connexion, vous pouvez ignorer cet email en toute sécurité.",
-    "sms.verification.body": "{{secret}}",
-    "emails.magicSession.securityPhrase": "La phrase de sécurité pour cet email est {{phrase}}. Vous pouvez faire confiance à cet email si cette phrase correspond à celle affichée lors de la connexion.",
-    "emails.otpSession.subject": "Connexion {{project}}",
-    "emails.otpSession.hello": "Bonjour,",
-    "emails.otpSession.description": "Entrez le code de vérification suivant lorsque cela vous sera demandé pour vous connecter en toute sécurité à votre compte {{project}}. Il expirera dans 15 minutes.",
-    "emails.otpSession.clientInfo": "Cette connexion a été demandée en utilisant {{agentClient}} sur {{agentDevice}} {{agentOs}}. Si vous n'avez pas demandé cette connexion, vous pouvez ignorer cet e-mail en toute sécurité.",
-    "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}}"
+    "continents.sa": "Amérique du Sud"
 }

app/config/locale/translations/ga.json

@@ -4,28 +4,28 @@
     "settings.direction": "ltr",
     "emails.sender": "%s Foireann",
     "emails.verification.subject": "Fíoraithe cuntais",
-    "emails.verification.hello": "Haigh {{user}},",
+    "emails.verification.hello": "Haigh {{name}}",
     "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.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.thanks": "Go raibh maith agat",
     "emails.magicSession.signature": "{{project}} foireann",
     "emails.recovery.subject": "Athshocrú pasfhocail",
-    "emails.recovery.hello": "Haigh {{user}},",
+    "emails.recovery.hello": "Haigh {{name}}",
     "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.signature": "{{project}} foireann",
     "emails.invitation.subject": "Cuireadh do %s foireann ag %s",
-    "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.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.signature": "{{project}} foireann",
     "locale.country.unknown": "Neamhaithnid",
     "countries.af": "An Afganastáin",
@@ -100,7 +100,6 @@
     "countries.gd": "Greanáda",
     "countries.gt": "Guatamala",
     "countries.gy": "An Ghuáin",
-    "countries.hk": "Hong Kong",
     "countries.hn": "Hondúras",
     "countries.hr": "An Chróit",
     "countries.ht": "Háítí",
@@ -164,7 +163,6 @@
     "countries.nz": "An Nua-Shéalainn",
     "countries.om": "Óman",
     "countries.pk": "An Phacastáin",
-    "countries.ps": "An Phalaistín",
     "countries.pa": "Panama",
     "countries.pe": "Peiriú",
     "countries.ph": "Na hOileáin Fhilipíneacha",
@@ -208,7 +206,6 @@
     "countries.tn": "An Túinéis",
     "countries.tr": "An Tuirc",
     "countries.tv": "Túvalú",
-    "countries.tw": "An Téaváin",
     "countries.tz": "An Tansáin",
     "countries.ug": "Uganda",
     "countries.ua": "An Úcráin",
@@ -231,18 +228,5 @@
     "continents.eu": "An Eoraip",
     "continents.na": "Meiriceá Thuaidh",
     "continents.oc": "An Aigéine",
-    "continents.sa": "Meiriceá Theas",
-    "emails.magicSession.optionButton": "Cliceáil ar an gcnaipe thíos le síní isteach go sábháilte i do chuntas {{project}}. Rachaidh sé in éag i gceann 1 uair.",
-    "emails.magicSession.buttonText": "Sínigh isteach i {{project}}",
-    "emails.magicSession.clientInfo": "Rinneadh an logáil isteach seo a iarraidh ag baint úsáide as {{agentClient}} ar {{agentDevice}} {{agentOs}}. Mura ndearna tú an logáil isteach a iarraidh, is féidir leat neamhaird sábháilte a dhéanamh den ríomhphost seo.",
-    "sms.verification.body": "{{secret}}",
-    "emails.magicSession.securityPhrase": "Is é an abairt 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 abairt seo leis an abairt a taispeántar le linn sínithe isteach.",
-    "emails.magicSession.optionUrl": "Mura bhfuil tú in ann síniú isteach ag baint úsáid as an gcnaipe thuas, téigh chuig an nasc seo a leanas:",
-    "emails.otpSession.subject": "Login {{project}}",
-    "emails.otpSession.hello": "Dia dhuit,",
-    "emails.otpSession.description": "Iontráil an cód fíoraithe seo a leanas nuair a iarrtar ort chun síní isteach go slán ar do chuntas {{project}}. Rachaidh sé in éag i gceann 15 nóiméad.",
-    "emails.otpSession.clientInfo": "Rinneadh an iarratas seo chun síniú isteach ag baint úsáide as {{agentClient}} ar {{agentDevice}} {{agentOs}}. Mura ndearna tú an iarratas chun síniú isteach, is féidir leat an ríomhphost seo a neamhaird go sábháilte.",
-    "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}}"
+    "continents.sa": "Meiriceá Theas"
 }

app/config/locale/translations/gu.json

@@ -4,28 +4,28 @@
     "settings.direction": "ltr",
     "emails.sender": "%s ટીમ",
     "emails.verification.subject": "ખાતાની ચકાસણી",
-    "emails.verification.hello": "નમસ્કાર {{user}},",
+    "emails.verification.hello": "નમસ્કાર {{name}}",
     "emails.verification.body": "તમારું ઇમેઇલ સરનામું ચકાસવા માટે આ લિંકને અનુસરો.",
     "emails.verification.footer": "જો તમે આ સરનામાંની ચકાસણી કરવાનું ન કહ્યું હોય, તો તમે આ સંદેશને અવગણી શકો છો.",
-    "emails.verification.thanks": "આભાર,",
+    "emails.verification.thanks": "આભાર",
     "emails.verification.signature": "{{project}} ટીમ",
     "emails.magicSession.subject": "પ્રવેશ કરો",
     "emails.magicSession.hello": "નમસ્કાર,",
     "emails.magicSession.body": "પ્રવેશ કરવા માટે આ લિંકને અનુસરો.",
     "emails.magicSession.footer": "જો તમે આ ઇમેઇલનો ઉપયોગ કરીને પ્રવેશ કરવાનું ન કહ્યું હોય, તો તમે આ સંદેશને અવગણી શકો છો.",
-    "emails.magicSession.thanks": "આભાર,",
+    "emails.magicSession.thanks": "આભાર",
     "emails.magicSession.signature": "{{project}} ટીમ",
     "emails.recovery.subject": "પાસવર્ડ ફરીથી સેટ કરો",
-    "emails.recovery.hello": "નમસ્કાર {{user}},",
+    "emails.recovery.hello": "નમસ્કાર {{name}}",
     "emails.recovery.body": "તમારો {{project}} પાસવર્ડ ફરીથી સેટ કરવા માટે આ લિંકને અનુસરો.",
     "emails.recovery.footer": "જો તમે તમારો પાસવર્ડ ફરીથી સેટ કરવાનું ન કહ્યું હોય, તો તમે આ સંદેશને અવગણી શકો છો.",
-    "emails.recovery.thanks": "આભાર,",
+    "emails.recovery.thanks": "આભાર",
     "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.signature": "{{project}} ટીમ",
     "locale.country.unknown": "અજાણ",
     "countries.af": "અફઘાનિસ્તાન",
@@ -100,7 +100,6 @@
     "countries.gd": "ગ્રેનાડા",
     "countries.gt": "ગ્વાટેમાલા",
     "countries.gy": "ગુયાના",
-    "countries.hk": "હોંગ કોંગ",
     "countries.hn": "હોન્ડુરાસ",
     "countries.hr": "ક્રોએશિયા",
     "countries.ht": "હૈતી",
@@ -164,7 +163,6 @@
     "countries.nz": "ન્યુઝીલેન્ડ",
     "countries.om": "ઓમાન",
     "countries.pk": "પાકિસ્તાન",
-    "countries.ps": "પેલેસ્ટાઇન",
     "countries.pa": "પનામા",
     "countries.pe": "પેરુ",
     "countries.ph": "ફિલિપાઇન્સ",
@@ -208,7 +206,6 @@
     "countries.tn": "ટ્યુનિશિયા",
     "countries.tr": "તુર્કી",
     "countries.tv": "તુવાલુ",
-    "countries.tw": "તાઇવાન",
     "countries.tz": "તાંઝાનિયા",
     "countries.ug": "યુગાન્ડા",
     "countries.ua": "યુક્રેન",
@@ -231,18 +228,5 @@
     "continents.eu": "યુરોપ",
     "continents.na": "ઉત્તર અમેરિકા",
     "continents.oc": "ઓશનિયા",
-    "continents.sa": "દક્ષિણ અમેરિકા",
-    "emails.magicSession.optionButton": "નીચે આપેલ બટન પર ક્લિક કરો તમારા {{project}} ખાતામાં સુરક્ષિત રીતે સાઇન ઈન કરવા માટે. તે 1 કલાકમાં સમાપ્ત થઈ જશે.",
-    "emails.magicSession.buttonText": "સાઇન ઇન કરો {{project}}",
-    "emails.magicSession.clientInfo": "આ સાઇન ઇન વિનંતી {{agentClient}} નો ઉપયોગ કરીને {{agentDevice}} {{agentOs}} પર કરવામાં આવી હતી. જો તમે સાઇન ઇનની વિનંતી કરી ન હોય, તો આ ઇમેઇલને સલામત રીતે અવગણી શકો છો.",
-    "sms.verification.body": "{{secret}}",
-    "emails.magicSession.securityPhrase": "આ ઇમેઇલ માટેનું સુરક્ષા વાક્ય {{phrase}} છે. જો આ વાક્ય સાઇન ઇન દરમિયાન દર્શાવેલા વાક્ય સાથે મેળ ખાય તો તમે આ ઇમેઇલ પર વિશ્વાસ કરી શકો છો.",
-    "emails.magicSession.optionUrl": "જો તમે ઉપરની બટનનો ઉપયોગ કરીને સાઇન ઇન કરી શકતા નથી, કૃપા કરીને નીચેની લિંક પર જાઓ:",
-    "emails.otpSession.subject": "{{project}} લૉગિન",
-    "emails.otpSession.hello": "હેલો,",
-    "emails.otpSession.description": "જ્યારે તમને તમારા {{project}} ખાતામાં સુરક્ષિત રીતે સાઇન ઇન કરવા માટે કહેવાય ત્યારે નીચે આપેલો ચકાસણી કોડ દાખલ કરો. તે 15 મિનિટમાં સમાપ્ત થઈ જશે.",
-    "emails.otpSession.clientInfo": "આ સાઇન ઇનની વિનંતી {{agentClient}} નો ઉપયોગ કરીને {{agentDevice}} {{agentOs}} પર થઈ છે. જો તમે સાઇન ઇનની વિનંતી કરી ન હોય, તો આ ઈમેલને સુરક્ષિત રીતે અવગણી શકો છો.",
-    "emails.otpSession.securityPhrase": "આ ઇમેઇલ માટેનો સુરક્ષા શબ્દ {{phrase}} છે. જો આ શબ્દ સાઇન ઇન વખતે દર્શાવેલા શબ્દ સાથે મેળ ખાતો હોય તો તમે આ ઇમેઇલ પર વિશ્વાસ કરી શકો છો.",
-    "emails.otpSession.thanks": "આભાર,",
-    "emails.otpSession.signature": "{{project}} ટીમ"
-}
+    "continents.sa": "દક્ષિણ અમેરિકા"
+}

app/config/locale/translations/he.json

@@ -4,28 +4,28 @@
     "settings.direction": "rtl",
     "emails.sender": "צוות %s",
     "emails.verification.subject": "אימות חשבון",
-    "emails.verification.hello": "שלום {{user}},",
+    "emails.verification.hello": "שלום {{name}}",
     "emails.verification.body": "לחץ על קישור זה כדי לאמת את כתובת הדוא\"ל שלך.",
     "emails.verification.footer": "אם לא ביקשת לאמת כתובת זו, תוכל להתעלם מהודעה זו.",
-    "emails.verification.thanks": "תודה,",
+    "emails.verification.thanks": "תודה",
     "emails.verification.signature": "צוות {{project}}",
     "emails.magicSession.subject": "כניסה למערכת",
     "emails.magicSession.hello": "שלום,",
     "emails.magicSession.body": "לחץ על קישור זה כדי להיכנס.",
     "emails.magicSession.footer": "אם לא ביקשת להיכנס באמצעות דוא\"ל זה, תוכל להתעלם מהודעה זו.",
-    "emails.magicSession.thanks": "תודה,",
+    "emails.magicSession.thanks": "תודה",
     "emails.magicSession.signature": "צוות {{project}}",
     "emails.recovery.subject": "איפוס סיסמא",
-    "emails.recovery.hello": "שלום {{user}},",
+    "emails.recovery.hello": "שלום {{name}}",
     "emails.recovery.body": "עקוב אחר קישור זה כדי לאפס את סיסמתך ב-{{project}}.",
     "emails.recovery.footer": "אם לא ביקשת לאפס את הסיסמה, תוכל להתעלם מהודעה זו.",
-    "emails.recovery.thanks": "תודה,",
+    "emails.recovery.thanks": "תודה",
     "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.signature": "צוות {{project}}",
     "locale.country.unknown": "לא ידוע",
     "countries.af": "אפגניסטן",
@@ -100,7 +100,6 @@
     "countries.gd": "גרנדה",
     "countries.gt": "גואטמלה",
     "countries.gy": "גיאנה",
-    "countries.hk": "הונג קונג",
     "countries.hn": "הונדורס",
     "countries.hr": "קרואטיה",
     "countries.ht": "האיטי",
@@ -164,7 +163,6 @@
     "countries.nz": "ניו זילנד",
     "countries.om": "עומאן",
     "countries.pk": "פקיסטן",
-    "countries.ps": "פלסטין",
     "countries.pa": "פנמה",
     "countries.pe": "פרו",
     "countries.ph": "הפיליפינים",
@@ -208,7 +206,6 @@
     "countries.tn": "תוניסיה",
     "countries.tr": "טורקיה",
     "countries.tv": "טובאלו",
-    "countries.tw": "טייוואן",
     "countries.tz": "טנזניה",
     "countries.ug": "אוגנדה",
     "countries.ua": "אוקראינה",
@@ -231,18 +228,5 @@
     "continents.eu": "אירופה",
     "continents.na": "צפון אמריקה",
     "continents.oc": "אוקיאניה",
-    "continents.sa": "דרום אמריקה",
-    "emails.magicSession.optionButton": "לחץ על הכפתור למטה כדי להיכנס לחשבון {{project}} שלך באופן מאובטח. תוקף הכניסה יפוג תוך שעה.",
-    "emails.magicSession.buttonText": "היכנס ל-{{project}}",
-    "emails.magicSession.clientInfo": "ההתחברות הזו נעשתה באמצעות {{agentClient}} על {{agentDevice}} {{agentOs}}. אם לא ביקשת את ההתחברות הזו, באפשרותך להתעלם בבטחה מהאימייל הזה.",
-    "sms.verification.body": "{{secret}}",
-    "emails.magicSession.securityPhrase": "משפט הביטחון עבור הודעת הדוא\"ל הזו הוא {{phrase}}. תוכל לסמוך על הודעת הדוא\"ל הזו אם המשפט הזה תואם למשפט שהוצג בעת ההתחברות.",
-    "emails.magicSession.optionUrl": "אם אינך יכול להיכנס באמצעות הכפתור למעלה, בקר בקישור הבא:",
-    "emails.otpSession.subject": "התחברות למערכת {{project}}",
-    "emails.otpSession.hello": "שלום,",
-    "emails.otpSession.description": "הזן את קוד האימות הבא כאשר תתבקש כדי להיכנס לחשבון {{project}} שלך באופן מאובטח. הוא יפוג בעוד 15 דקות.",
-    "emails.otpSession.clientInfo": "ההתחברות הזו בוקשה באמצעות {{agentClient}} על {{agentDevice}} {{agentOs}}. אם לא ביקשת את ההתחברות, באפשרותך להתעלם בבטחה ממייל זה.",
-    "emails.otpSession.securityPhrase": "משפט האבטחה למייל זה הוא {{phrase}}. אתה יכול לסמוך על המייל הזה אם המשפט הזה תואם את המשפט שהוצג במהלך הכניסה למערכת.",
-    "emails.otpSession.thanks": "תודה,",
-    "emails.otpSession.signature": "צוות {{project}}"
-}
+    "continents.sa": "דרום אמריקה"
+}

app/config/locale/translations/hi.json

@@ -4,28 +4,28 @@
     "settings.direction": "ltr",
     "emails.sender": "%s टीम",
     "emails.verification.subject": "अकाउंट वेरिफिकेशन ",
-    "emails.verification.hello": "नमस्ते {{user}},",
+    "emails.verification.hello": "नमस्ते {{name}}",
     "emails.verification.body": "इस लिंक के माध्यम से अपने ईमेल को सत्यापित कीजिये।",
     "emails.verification.footer": "यदि आप इस पते को सत्यापित नहीं करना चाहते हैं, तो आप इस संदेश को नज़रअंदाज़ कर सकते हैं।",
-    "emails.verification.thanks": "धन्यवाद,",
+    "emails.verification.thanks": "धन्यवाद",
     "emails.verification.signature": "{{project}} टीम",
     "emails.magicSession.subject": "लॉग इन",
     "emails.magicSession.hello": "नमस्ते,",
     "emails.magicSession.body": "इस लिंक के माध्यम से लॉग-इन करें।",
     "emails.magicSession.footer": "यदि आप इस ईमेल द्वारा लॉगिन नहीं करना चाहते हैं, तो आप इस संदेश को नज़रअंदाज़ कर सकते हैं।",
-    "emails.magicSession.thanks": "धन्यवाद,",
+    "emails.magicSession.thanks": "धन्यवाद",
     "emails.magicSession.signature": "{{project}} टीम",
     "emails.recovery.subject": "पासवर्ड रीसेट",
-    "emails.recovery.hello": "नमस्ते {{user}},",
+    "emails.recovery.hello": "नमस्ते {{name}}",
     "emails.recovery.body": "इस लिंक के माध्यम से अपना {{project}} पासवर्ड रीसेट करें।",
     "emails.recovery.footer": "यदि आप अपना पासवर्ड रीसेट नहीं करना चाहते हैं, तो आप इस संदेश को नज़रअंदाज़ कर सकते हैं।",
-    "emails.recovery.thanks": "धन्यवाद,",
+    "emails.recovery.thanks": "धन्यवाद",
     "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.signature": "{{project}} टीम",
     "locale.country.unknown": "अज्ञात",
     "countries.af": "अफ़ग़ानिस्तान",
@@ -100,7 +100,6 @@
     "countries.gd": "ग्रेनाडा",
     "countries.gt": "ग्वाटेमाला",
     "countries.gy": "गयाना",
-    "countries.hk": "हांग कांग",
     "countries.hn": "होंडुरस",
     "countries.hr": "क्रोएशिया",
     "countries.ht": "हैती",
@@ -164,7 +163,6 @@
     "countries.nz": "न्यूजीलैंड",
     "countries.om": "ओमान",
     "countries.pk": "पाकिस्तान",
-    "countries.ps": "पैलिस्टाइन",
     "countries.pa": "पनामा",
     "countries.pe": "पेरू",
     "countries.ph": "फिलीपींस",
@@ -208,7 +206,6 @@
     "countries.tn": "ट्यूनीशिया",
     "countries.tr": "तुर्की",
     "countries.tv": "तुवालू",
-    "countries.tw": "ताइवान",
     "countries.tz": "तंजानिया",
     "countries.ug": "युगांडा",
     "countries.ua": "यूक्रेन",
@@ -231,18 +228,5 @@
     "continents.eu": "यूरोप",
     "continents.na": "उत्तरी अमेरिका",
     "continents.oc": "ओशिनिया",
-    "continents.sa": "दक्षिण अमेरिका",
-    "emails.magicSession.optionButton": "नीचे दिए गए बटन पर क्लिक करके अपने {{project}} खाते में सुरक्षित रूप से साइन इन करें। यह 1 घंटे में समाप्त हो जाएगा।",
-    "emails.magicSession.buttonText": "{{project}} में साइन इन करें",
-    "emails.magicSession.clientInfo": "यह साइन इन {{agentClient}} का उपयोग करके {{agentDevice}} {{agentOs}} पर किया गया था। यदि आपने साइन इन का अनुरोध नहीं किया है, तो आप इस ईमेल को सुरक्षित रूप से अनदेखा कर सकते हैं।",
-    "sms.verification.body": "{{secret}}",
-    "emails.magicSession.securityPhrase": "इस ईमेल का सुरक्षा वाक्यांश {{phrase}} है। यदि यह वाक्यांश साइन इन के दौरान दिखाए गए वाक्यांश से मेल खाता है तो आप इस ईमेल पर भरोसा कर सकते हैं।",
-    "emails.magicSession.optionUrl": "यदि आप ऊपर दिए गए बटन का उपयोग करके साइन इन नहीं कर पा रहे हैं, कृपया निम्नलिखित लिंक पर जाएँ:",
-    "emails.otpSession.subject": "{{project}} लॉगिन",
-    "emails.otpSession.hello": "नमस्ते,",
-    "emails.otpSession.description": "निर्दिष्ट सत्यापन कोड दर्ज करें जब आपको आपके {{project}} खाते में सुरक्षित रूप से साइन इन करने के लिए कहा जाए। यह 15 मिनट में समाप्त हो जाएगा।",
-    "emails.otpSession.clientInfo": "यह साइन इन {{agentClient}} का उपयोग करके {{agentDevice}} {{agentOs}} पर किया गया था। यदि आपने साइन इन का अनुरोध नहीं किया है, तो आप इस ईमेल को नजरअंदाज कर सकते हैं।",
-    "emails.otpSession.securityPhrase": "इस ईमेल के लिए सुरक्षा वाक्यांश {{phrase}} है। अगर यह वाक्यांश साइन इन के दौरान दिखाए गए वाक्यांश से मेल खाता है, तो आप इस ईमेल पर भरोसा कर सकते हैं।",
-    "emails.otpSession.thanks": "धन्यवाद,",
-    "emails.otpSession.signature": "{{project}} टीम"
+    "continents.sa": "दक्षिण अमेरिका"
 }

app/config/locale/translations/hr.json

@@ -4,28 +4,28 @@
     "settings.direction": "ltr",
     "emails.sender": "%s Tim",
     "emails.verification.subject": "Verifikacija računa",
-    "emails.verification.hello": "Pozdrav {{user}},",
+    "emails.verification.hello": "Pozdrav {{name}}",
     "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.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.thanks": "Hvala",
     "emails.magicSession.signature": "{{project}} tim",
     "emails.recovery.subject": "Ponovno postavljanje lozinke",
-    "emails.recovery.hello": "Pozdrav {{user}},",
+    "emails.recovery.hello": "Pozdrav {{name}}",
     "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.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.signature": "{{project}} tim",
     "locale.country.unknown": "Nepoznato",
     "countries.af": "Afganistan",
@@ -100,7 +100,6 @@
     "countries.gd": "Grenada",
     "countries.gt": "Gvatemala",
     "countries.gy": "Gvajana",
-    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Hrvatska",
     "countries.ht": "Haiti",
@@ -164,7 +163,6 @@
     "countries.nz": "Novi Zeland",
     "countries.om": "Oman",
     "countries.pk": "Pakistan",
-    "countries.ps": "Palestina",
     "countries.pa": "Panama",
     "countries.pe": "Peru",
     "countries.ph": "Filipini",
@@ -208,7 +206,6 @@
     "countries.tn": "Tunis",
     "countries.tr": "Turska",
     "countries.tv": "Tuvalu",
-    "countries.tw": "Tajvan",
     "countries.tz": "Tanzanija",
     "countries.ug": "Uganda",
     "countries.ua": "Ukrajina",
@@ -231,18 +228,5 @@
     "continents.eu": "Europa",
     "continents.na": "Sjeverna Amerika",
     "continents.oc": "Oceanija",
-    "continents.sa": "Južna Amerika",
-    "emails.magicSession.optionButton": "Kliknite gumb ispod kako biste sigurno prijavili u svoj {{project}} račun. Istek će za 1 sat.",
-    "emails.magicSession.buttonText": "Prijavite se u {{project}}",
-    "emails.magicSession.clientInfo": "Ova se prijava zatražila koristeći {{agentClient}} na uređaju {{agentDevice}} {{agentOs}}. Ako niste zatražili prijavu, možete slobodno zanemariti ovaj e-mail.",
-    "sms.verification.body": "{{secret}}",
-    "emails.magicSession.securityPhrase": "Sigurnosna fraza za ovaj e-mail je {{phrase}}. Ovom e-mailu možete vjerovati ako se fraza podudara s frazom prikazanom tijekom prijave.",
-    "emails.magicSession.optionUrl": "Ako se ne možete prijaviti koristeći gornji gumb, posjetite sljedeću poveznicu:",
-    "emails.otpSession.subject": "Prijava na {{project}}",
-    "emails.otpSession.hello": "Zdravo,",
-    "emails.otpSession.description": "Unesite sljedeći verifikacijski kod kada budete pozvani kako biste se sigurno prijavili na svoj {{project}} račun. Istjeći će za 15 minuta.",
-    "emails.otpSession.clientInfo": "Ova prijava je zatražena pomoću {{agentClient}} na {{agentDevice}} {{agentOs}}. Ako niste zatražili prijavu, ovaj e-mail možete sigurno zanemariti.",
-    "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}}"
-}
+    "continents.sa": "Južna Amerika"
+}

app/config/locale/translations/hu.json

@@ -4,28 +4,28 @@
     "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 {{name}}",
     "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.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.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ó, {{name}}",
     "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.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.signature": "a {{project}} csapat",
     "locale.country.unknown": "Ismeretlen",
     "countries.af": "Afganisztán",
@@ -100,7 +100,6 @@
     "countries.gd": "Grenada",
     "countries.gt": "Guatemala",
     "countries.gy": "Guyana",
-    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Horvátország",
     "countries.ht": "Haiti",
@@ -164,7 +163,6 @@
     "countries.nz": "Új-Zéland",
     "countries.om": "Omán",
     "countries.pk": "Pakisztán",
-    "countries.ps": "Palesztina",
     "countries.pa": "Panama",
     "countries.pe": "Peru",
     "countries.ph": "Fülöp-szigetek",
@@ -208,7 +206,6 @@
     "countries.tn": "Tunézia",
     "countries.tr": "Törökország",
     "countries.tv": "Tuvalu",
-    "countries.tw": "Tajvan",
     "countries.tz": "Tanzánia",
     "countries.ug": "Uganda",
     "countries.ua": "Ukrajna",
@@ -231,18 +228,5 @@
     "continents.eu": "Európa",
     "continents.na": "Észak-Amerika",
     "continents.oc": "Óceánia",
-    "continents.sa": "Dél-Amerika",
-    "emails.magicSession.optionButton": "Kattintson az alábbi gombra, hogy biztonságosan bejelentkezzen a {{project}} fiókjába. A link 1 óra múlva lejár.",
-    "emails.magicSession.buttonText": "Jelentkezzen be a {{project}} szolgáltatásba.",
-    "emails.magicSession.clientInfo": "Ezt a bejelentkezést a(z) {{agentClient}} használatával kérték az Ön {{agentDevice}} {{agentOs}} eszközén. Ha Ön nem kezdeményezte ezt a bejelentkezést, nyugodtan hagyja figyelmen kívül ezt az e-mailt.",
-    "sms.verification.body": "{{secret}}",
-    "emails.magicSession.securityPhrase": "Az e-mailhez tartozó biztonsági kifejezés: {{phrase}}. Megbízhat ebben az e-mailben, ha ez a kifejezés megegyezik a bejelentkezéskor megjelenített kifejezéssel.",
-    "emails.magicSession.optionUrl": "Amennyiben az előző gomb használatával nem tud bejelentkezni, kérjük látogassa meg a következő linket:",
-    "emails.otpSession.subject": "{{project}} Bejelentkezés",
-    "emails.otpSession.hello": "Szia,",
-    "emails.otpSession.description": "Adja meg a következő megerősítő kódot, amikor arra kéri a rendszer, hogy biztonságosan bejelentkezhessen a {{project}} fiókjába. A kód 15 perc múlva lejár.",
-    "emails.otpSession.clientInfo": "Ez a bejelentkezés a(z) {{agentClient}} használatával lett kérve a(z) {{agentDevice}} {{agentOs}} eszközön. Ha Ön nem kérte a bejelentkezést, nyugodtan figyelmen kívül hagyhatja ezt az e-mailt.",
-    "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"
-}
+    "continents.sa": "Dél-Amerika"
+}

app/config/locale/translations/hy.json

@@ -4,28 +4,28 @@
     "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.hello": "",
     "emails.magicSession.body": "",
     "emails.magicSession.footer": "",
-    "emails.magicSession.thanks": ",",
+    "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": "Աֆղանստան",
@@ -100,7 +100,6 @@
     "countries.gd": "Գրենադա",
     "countries.gt": "Գվատեմալա",
     "countries.gy": "Գայանա",
-    "countries.hk": "Հոնգ Կոնգ",
     "countries.hn": "Գոնդուրաս",
     "countries.hr": "Խորվաթիա",
     "countries.ht": "Հաիթի",
@@ -164,7 +163,6 @@
     "countries.nz": "Նոր Զելանդիա",
     "countries.om": "Օման",
     "countries.pk": "Պակիստան",
-    "countries.ps": "Պաղեստին",
     "countries.pa": "Պանամա",
     "countries.pe": "Պերու",
     "countries.ph": "Ֆիլիպիններ",
@@ -208,7 +206,6 @@
     "countries.tn": "Թունիս",
     "countries.tr": "Թուրքիա",
     "countries.tv": "Տուվալու",
-    "countries.tw": "Թայվան",
     "countries.tz": "Տանզանիա",
     "countries.ug": "Ուգանդա",
     "countries.ua": "Ուկրաինա",
@@ -231,18 +228,5 @@
     "continents.eu": "Եվրոպա",
     "continents.na": "Հյուսիսային Ամերիկա",
     "continents.oc": "Օկեանիա",
-    "continents.sa": "Հարավային Ամերիկա",
-    "emails.magicSession.optionButton": "Սեղմեք ներքևի կոճակը՝ ապահով մուտք գործելու {{project}} հաշիվդ։ Այն կանցնի 1 ժամից։",
-    "emails.magicSession.buttonText": "Մուտք գործեք {{project}} համար",
-    "emails.magicSession.clientInfo": "Սա մուտք գործելը խնդրվել է `{{agentClient}}`-ի միջոցով {{agentDevice}} {{agentOs}}-ում: Եթե դուք չեք խնդրել մուտք գործելը, ապա կարող եք անտեղյակ մնալ այս էլփոստից:",
-    "sms.verification.body": "{{secret}}",
-    "emails.magicSession.securityPhrase": "Այս էլհասցեի անվտանգության արտահայտությունը {{phrase}} է: Դուք կարող եք հավատալ այս էլհասցեին, եթե այդ արտահայտությունը համընկնում է ներմուծման պրոցեսին՝ երբ դուք գրանցվել եք։",
-    "emails.magicSession.optionUrl": "Եթե չեք կարող մուտք գործել վերը նշված կոճակով, այցելեք հետևյալ հղումը՝",
-    "emails.otpSession.subject": "{{project}} Մուտք",
-    "emails.otpSession.hello": "Բարև,",
-    "emails.otpSession.description": "Երբ Ձեզ հարցնեն մուտքագրել վավերացման կոդը ապահով մուտքի համար Ձեր {{project}} հաշիվը, մուտքագրեք հետևյալ կոդը։ Այն կարճատև է 15 րոպե:",
-    "emails.otpSession.clientInfo": "Սույն մուտքը խնդրված է {{agentClient}}-ի կողմից {{agentDevice}} {{agentOs}}-ում։ Եթե Դուք չեք խնդրել մուտքը, ապա հանգիստ անտեսել այս էլփոստը։",
-    "emails.otpSession.securityPhrase": "Այս էլ.փոստի անվտանգության արտահայտությունը {{phrase}} է: Կարող եք վստահել այս էլ.փոստին, եթե այս արտահայտությունը համընկնում է մուտք գործելու պահին տրված արտահայտության հետ։",
-    "emails.otpSession.thanks": "Շնորհակալ եմ,",
-    "emails.otpSession.signature": "{{project}} թիմ"
-}
+    "continents.sa": "Հարավային Ամերիկա"
+}

app/config/locale/translations/id.json

@@ -4,28 +4,28 @@
     "settings.direction": "ltr",
     "emails.sender": "Tim %s",
     "emails.verification.subject": "Verifikasi Akun",
-    "emails.verification.hello": "Hai {{user}},",
+    "emails.verification.hello": "Hai {{name}}",
     "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.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.thanks": "Terima kasih",
     "emails.magicSession.signature": "Tim {{project}}",
     "emails.recovery.subject": "Atur Ulang Kata Sandi",
-    "emails.recovery.hello": "Halo {{user}},",
+    "emails.recovery.hello": "Halo {{name}}",
     "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.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.signature": "Tim {{project}}",
     "locale.country.unknown": "Tidak diketahui",
     "countries.af": "Afganistan",
@@ -100,7 +100,6 @@
     "countries.gd": "Grenada",
     "countries.gt": "Guatemala",
     "countries.gy": "Guyana",
-    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Kroasia",
     "countries.ht": "Haiti",
@@ -164,7 +163,6 @@
     "countries.nz": "Selandia Baru",
     "countries.om": "Oman",
     "countries.pk": "Pakistan",
-    "countries.ps": "Palestina",
     "countries.pa": "Panama",
     "countries.pe": "Peru",
     "countries.ph": "Filipina",
@@ -208,7 +206,6 @@
     "countries.tn": "Tunisia",
     "countries.tr": "Turki",
     "countries.tv": "Tuvalu",
-    "countries.tw": "Taiwan",
     "countries.tz": "Tanzania",
     "countries.ug": "Uganda",
     "countries.ua": "Ukraina",
@@ -231,18 +228,5 @@
     "continents.eu": "Eropa",
     "continents.na": "Amerika Utara",
     "continents.oc": "Oseania",
-    "continents.sa": "Amerika Selatan",
-    "emails.magicSession.optionButton": "Klik tombol di bawah ini untuk masuk ke akun {{project}} Anda dengan aman. Ini akan kedaluwarsa dalam 1 jam.",
-    "emails.magicSession.buttonText": "Masuk ke {{project}}",
-    "emails.magicSession.clientInfo": "Tanda masuk ini diminta menggunakan {{agentClient}} di {{agentDevice}} {{agentOs}}. Jika Anda tidak meminta untuk masuk, Anda dapat mengabaikan email ini dengan aman.",
-    "sms.verification.body": "{{secret}}",
-    "emails.magicSession.securityPhrase": "Frasa keamanan untuk email ini adalah {{phrase}}. Anda dapat mempercayai email ini jika frasa tersebut cocok dengan frasa yang ditampilkan saat masuk.",
-    "emails.magicSession.optionUrl": "Jika Anda tidak dapat masuk menggunakan tombol di atas, silakan kunjungi tautan berikut:",
-    "emails.otpSession.subject": "Login {{project}}",
-    "emails.otpSession.hello": "Halo,",
-    "emails.otpSession.description": "Masukkan kode verifikasi berikut saat diminta untuk masuk ke akun {{project}} Anda dengan aman. Kode ini akan kedaluwarsa dalam waktu 15 menit.",
-    "emails.otpSession.clientInfo": "Tanda masuk ini diminta menggunakan {{agentClient}} pada {{agentDevice}} {{agentOs}}. Jika Anda tidak meminta tanda masuk, Anda dapat mengabaikan email ini dengan aman.",
-    "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}}"
-}
+    "continents.sa": "Amerika Selatan"
+}

app/config/locale/translations/is.json

@@ -4,28 +4,28 @@
     "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.hello": "",
     "emails.magicSession.body": "",
     "emails.magicSession.footer": "",
-    "emails.magicSession.thanks": ",",
+    "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",
@@ -100,7 +100,6 @@
     "countries.gd": "Grenada",
     "countries.gt": "Gvatemala",
     "countries.gy": "Guyana",
-    "countries.hk": "Hong Kong",
     "countries.hn": "Hondúras",
     "countries.hr": "Króatía",
     "countries.ht": "Haítí",
@@ -164,7 +163,6 @@
     "countries.nz": "Nýja Sjáland",
     "countries.om": "Óman",
     "countries.pk": "Pakistan",
-    "countries.ps": "Palestína",
     "countries.pa": "Panama",
     "countries.pe": "Perú",
     "countries.ph": "Filippseyjar",
@@ -208,7 +206,6 @@
     "countries.tn": "Túnis",
     "countries.tr": "Tyrkland",
     "countries.tv": "Túvalú",
-    "countries.tw": "Taívan",
     "countries.tz": "Tansanía",
     "countries.ug": "Úganda",
     "countries.ua": "Úkraína",
@@ -231,18 +228,5 @@
     "continents.eu": "Evrópa",
     "continents.na": "Norður Ameríka",
     "continents.oc": "Eyjaálfu",
-    "continents.sa": "Suður Ameríka",
-    "emails.magicSession.optionButton": "Smelltu á hnappinn hér fyrir neðan til að skrá þig örugglega inn á {{project}} reikninginn þinn. Hann rennur út eftir 1 klukkustund.",
-    "emails.magicSession.buttonText": "Skráðu þig inn á {{project}}",
-    "emails.magicSession.clientInfo": "Þessi innskráning var óskað eftir með {{agentClient}} á {{agentDevice}} {{agentOs}}. Ef þú baðst ekki um innskráninguna geturðu hundsað þennan tölvupóst örugglega.",
-    "sms.verification.body": "{{secret}}",
-    "emails.magicSession.securityPhrase": "Öryggisfrasi fyrir þetta tölvupóst er {{phrase}}. Þú getur treyst þessum tölvupósti ef þessi frasi passar við frasann sem birtist við innskráningu.",
-    "emails.magicSession.optionUrl": "Ef þú getur ekki skráð þig inn með hnappnum hér að ofan, vinsamlegast heimsækðu eftirfarandi tengil:",
-    "emails.otpSession.subject": "{{project}} Innskráning",
-    "emails.otpSession.hello": "Halló,",
-    "emails.otpSession.description": "Sláðu inn eftirfarandi staðfestingarkóða þegar þú ert beðinn um það til að skrá þig örugglega inn á {{project}} reikninginn þinn. Hann rennur út eftir 15 mínútur.",
-    "emails.otpSession.clientInfo": "Innskráningin var óskað eftir með því að nota {{agentClient}} á {{agentDevice}} {{agentOs}}. Ef þú baðst ekki um innskráninguna getur þú hunsað þennan tölvupóst örugglega.",
-    "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ð"
-}
+    "continents.sa": "Suður Ameríka"
+}

app/config/locale/translations/it.json

@@ -4,28 +4,28 @@
     "settings.direction": "ltr",
     "emails.sender": "Team %s",
     "emails.verification.subject": "Verifica account",
-    "emails.verification.hello": "Ciao {{user}},",
+    "emails.verification.hello": "Ciao {{name}}",
     "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.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.thanks": "Grazie",
     "emails.magicSession.signature": "Il team {{project}}",
     "emails.recovery.subject": "Reimpostazione password",
-    "emails.recovery.hello": "Ciao {{user}},",
+    "emails.recovery.hello": "Ciao {{name}}",
     "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.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.signature": "Il team {{project}}",
     "locale.country.unknown": "Sconosciuto",
     "countries.af": "Afghanistan",
@@ -100,7 +100,6 @@
     "countries.gd": "Grenada",
     "countries.gt": "Guatemala",
     "countries.gy": "Guyana",
-    "countries.hk": "Hong Kong",
     "countries.hn": "Honduras",
     "countries.hr": "Croazia",
     "countries.ht": "Haiti",
@@ -164,7 +163,6 @@
     "countries.nz": "Nuova Zelanda",
     "countries.om": "Oman",
     "countries.pk": "Pakistan",
-    "countries.ps": "Palestina",
     "countries.pa": "Panama",
     "countries.pe": "Perù",
     "countries.ph": "Filippine",
@@ -208,7 +206,6 @@
     "countries.tn": "Tunisia",
     "countries.tr": "Turchia",
     "countries.tv": "Tuvalu",
-    "countries.tw": "Taiwan",
     "countries.tz": "Tanzania",
     "countries.ug": "Uganda",
     "countries.ua": "Ucraina",
@@ -231,18 +228,5 @@
     "continents.eu": "Europa",
     "continents.na": "Nord America",
     "continents.oc": "Oceania",
-    "continents.sa": "Sud America",
-    "emails.magicSession.optionButton": "Fai clic sul pulsante qui sotto per accedere in modo sicuro al tuo account {{project}}. Scadrà tra 1 ora.",
-    "emails.magicSession.buttonText": "Accedi a {{project}}",
-    "emails.magicSession.clientInfo": "Questo accesso è stato richiesto utilizzando {{agentClient}} su {{agentDevice}} {{agentOs}}. Se non hai richiesto l'accesso, puoi tranquillamente ignorare questa email.",
-    "sms.verification.body": "{{secret}}",
-    "emails.magicSession.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.magicSession.optionUrl": "Se non riesci ad accedere utilizzando il pulsante qui sopra, ti preghiamo di visitare il seguente link:",
-    "emails.otpSession.subject": "Accesso a {{project}}",
-    "emails.otpSession.hello": "Ciao,",
-    "emails.otpSession.description": "Inserisci il seguente codice di verifica quando ti viene richiesto per accedere in modo sicuro al tuo account {{project}}. Scadrà tra 15 minuti.",
-    "emails.otpSession.clientInfo": "Questa registrazione è stata richiesta tramite {{agentClient}} su {{agentDevice}} {{agentOs}}. Se non hai richiesto la registrazione, puoi ignorare tranquillamente questa email.",
-    "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}}"
-}
+    "continents.sa": "Sud America"
+}

app/config/locale/translations/ja.json

@@ -4,28 +4,28 @@
     "settings.direction": "ltr",
     "emails.sender": "%s チーム",
     "emails.verification.subject": "アカウント認証",
-    "emails.verification.hello": "こんにちは{{user}}さん、",
+    "emails.verification.hello": "こんにちは{{name}}さん",
     "emails.verification.body": "メールアドレスを有効化するためには下記リンクをクリックして下さい。",
     "emails.verification.footer": "このメールに心当たりが無い場合は破棄をお願いいたします。",
-    "emails.verification.thanks": "ご利用いただきありがとうございます。、",
+    "emails.verification.thanks": "ご利用いただきありがとうございます。",
     "emails.verification.signature": "{{project}}チーム",
     "emails.magicSession.subject": "ログイン",
-    "emails.magicSession.hello": "こんにちは、",
+    "emails.magicSession.hello": "こんにちは",
     "emails.magicSession.body": "ログインするためには下記リンクをクリックしてください。",
     "emails.magicSession.footer": "このメールに心当たりが無い場合は破棄をお願いいたします。",
-    "emails.magicSession.thanks": "ご利用いただきありがとうございます。、",
+    "emails.magicSession.thanks": "ご利用いただきありがとうございます。",
     "emails.magicSession.signature": "{{project}}チーム",
     "emails.recovery.subject": "パスワードリセット",
-    "emails.recovery.hello": "こんにちは{{user}}さん、",
+    "emails.recovery.hello": "こんにちは{{name}}さん",
     "emails.recovery.body": "パスワードをリセットするためには下記リンクをクリックしてください。",
     "emails.recovery.footer": "このメールに心当たりが無い場合は破棄をお願いいたします。",
-    "emails.recovery.thanks": "ご利用いただきありがとうございます。、",
+    "emails.recovery.thanks": "ご利用いただきありがとうございます。",
     "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.signature": "{{project}}チーム",
     "locale.country.unknown": "不明",
     "countries.af": "アフガニスタン",
@@ -100,7 +100,6 @@
     "countries.gd": "グレナダ",
     "countries.gt": "グアテマラ",
     "countries.gy": "ガイアナ",
-    "countries.hk": "香港",
     "countries.hn": "ホンジュラス",
     "countries.hr": "クロアチア",
     "countries.ht": "ハイチ",
@@ -164,7 +163,6 @@
     "countries.nz": "ニュージーランド",
     "countries.om": "オマーン",
     "countries.pk": "パキスタン",
-    "countries.ps": "パレスチナ",
     "countries.pa": "パナマ",
     "countries.pe": "ペルー",
     "countries.ph": "フィリピン",
@@ -208,7 +206,6 @@
     "countries.tn": "チュニジア",
     "countries.tr": "トルコ",
     "countries.tv": "ツバル",
-    "countries.tw": "台湾",
     "countries.tz": "タンザニア",
     "countries.ug": "ウガンダ",
     "countries.ua": "ウクライナ",
@@ -231,18 +228,5 @@
     "continents.eu": "ヨーロッパ",
     "continents.na": "北米",
     "continents.oc": "オセアニア",
-    "continents.sa": "南アメリカ",
-    "emails.magicSession.optionButton": "以下のボタンをクリックして、安全に{{project}}アカウントにサインインしてください。有効期限は1時間です。",
-    "emails.magicSession.buttonText": "{{project}} にサインイン",
-    "emails.magicSession.clientInfo": "このサインインは{{agentClient}}を使用して{{agentDevice}} {{agentOs}}で要求されました。サインインを要求していない場合は、このメールを安全に無視してください。",
-    "sms.verification.body": "{{secret}}",
-    "emails.magicSession.securityPhrase": "このメールのセキュリティフレーズは{{phrase}}です。サインイン時に表示されたフレーズと一致する場合、このメールは信頼できます。",
-    "emails.magicSession.optionUrl": "上記のボタンを使用してサインインすることができない場合は、次のリンクにアクセスしてください：",
-    "emails.otpSession.subject": "プロジェクト ログイン",
-    "emails.otpSession.hello": "こんにちは。、",
-    "emails.otpSession.description": "以下の確認コードを入力して、{{project}}アカウントに安全にサインインしてください。このコードは15分後に失効します。",
-    "emails.otpSession.clientInfo": "このサインインは、{{agentClient}} を使い {{agentDevice}} {{agentOs}} で要求されました。サインインを要求していない場合、このメールを無視しても安全です。",
-    "emails.otpSession.securityPhrase": "このメールのセキュリティフレーズは{{phrase}}です。サインイン時に表示されたフレーズと一致する場合、このメールを信頼できます。",
-    "emails.otpSession.thanks": "ありがとうございます。、",
-    "emails.otpSession.signature": "{{project}} チーム"
+    "continents.sa": "南アメリカ"
 }