feat: add vite-plugin sentry

2023-04-01 12:49:06 +02:00
187 changed files with 14534 additions and 8503 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -42,12 +42,11 @@ steps:
 #        - .cache

  - name: dependencies
-    image: node:20-alpine
+    image: node:18-alpine
    pull: always
    environment:
      PNPM_CACHE_FOLDER: .cache/pnpm
      CYPRESS_CACHE_FOLDER: .cache/cypress
-      PUPPETEER_SKIP_DOWNLOAD: true
    commands:
      - corepack enable && pnpm config set store-dir .cache/pnpm
      - pnpm install --fetch-timeout 100000
@ -55,7 +54,7 @@ steps:
 #      - restore-cache

  - name: lint
-    image: node:20-alpine
+    image: node:18-alpine
    pull: always
    environment:
      PNPM_CACHE_FOLDER: .cache/pnpm
@ -66,7 +65,7 @@ steps:
      - dependencies

  - name: build-prod
-    image: node:20-alpine
+    image: node:18-alpine
    pull: always
    environment:
      PNPM_CACHE_FOLDER: .cache/pnpm
@ -83,7 +82,7 @@ steps:
      - dependencies

  - name: test-unit
-    image: node:20-alpine
+    image: node:18-alpine
    pull: always
    commands:
      - corepack enable && pnpm config set store-dir .cache/pnpm
@ -93,7 +92,7 @@ steps:

  - name: typecheck
    failure: ignore
-    image: node:20-alpine
+    image: node:18-alpine
    pull: always
    environment:
      PNPM_CACHE_FOLDER: .cache/pnpm
@ -143,9 +142,8 @@ steps:
 #      - dependencies

  - name: deploy-preview
-    image: williamjackson/netlify-cli
+    image: node:18-alpine
    pull: always
-    user: root # The rest runs as root and thus the permissions wouldn't work
    environment:
      NETLIFY_AUTH_TOKEN:
        from_secret: netlify_auth_token
@ -208,7 +206,7 @@ steps:
 #        - .cache

  - name: build
-    image: node:20-alpine
+    image: node:18-alpine
    pull: always
    environment:
      PNPM_CACHE_FOLDER: .cache/pnpm
@ -285,7 +283,7 @@ steps:
 #        - .cache

  - name: build
-    image: node:20-alpine
+    image: node:18-alpine
    pull: always
    environment:
      PNPM_CACHE_FOLDER: .cache/pnpm
@ -355,7 +353,8 @@ type: docker
 name: docker-release

 depends_on:
-  - build
+  - release-latest
+  - release-version

 trigger:
  ref:
@ -383,7 +382,8 @@ steps:
      repo: vikunja/frontend
      tags: unstable
      build_args:
-        - USE_RELEASE=false
+        - USE_RELEASE=true
+        - RELEASE_VERSION=unstable
      platforms:
        - linux/386
        - linux/amd64
@ -417,7 +417,8 @@ steps:
        from_secret: docker_password
      repo: vikunja/frontend
      build_args:
-        - USE_RELEASE=false
+        - USE_RELEASE=true
+        - RELEASE_VERSION=${DRONE_TAG##v}
      platforms:
        - linux/386
        - linux/amd64
@ -527,6 +528,6 @@ steps:
        from_secret: crowdin_key
 ---
 kind: signature
-hmac: a41964ffb64789df5553d7f51e05ac60d8243a4d8b7dfdd5be8de851aea5f9d7
+hmac: 303afeb09b75a57ba88720b45dc06c8bf2c7320e19d738d8299f325438246f75

 ...
--- a/.nvmrc
+++ b/.nvmrc
@ -1 +1 @@
-18.16.0
+18.15.0
--- a/.vscode.example/extensions.json
+++ b/.vscode.example/extensions.json
@ -8,7 +8,6 @@
    "lokalise.i18n-ally",
    "mgmcdermott.vscode-language-babel",
    "mikestead.dotenv",
-    "Syler.sass-indented",
-    "zixuanchen.vitest-explorer"
+    "Syler.sass-indented"
  ]
 }
--- a/7
+++ b/7
@ -3,17 +3,16 @@
 #  │─││ │││  │ │
 #  ┘─┘┘─┘┘┘─┘┘─┘

-FROM --platform=$BUILDPLATFORM node:20-alpine AS builder
+FROM --platform=$BUILDPLATFORM node:18-alpine AS builder

 WORKDIR /build

 ARG USE_RELEASE=false
-ARG RELEASE_VERSION=unstable
+ARG RELEASE_VERSION=main
 ENV PNPM_CACHE_FOLDER .cache/pnpm/

 COPY package.json ./
 COPY pnpm-lock.yaml ./
-COPY patches ./patches/

 RUN if [ "$USE_RELEASE" != true ]; then \
      # https://pnpm.io/installation#using-corepack
@ -55,8 +54,6 @@ ENV VIKUNJA_LOG_FORMAT main
 ENV VIKUNJA_API_URL /api/v1
 ENV VIKUNJA_SENTRY_ENABLED false
 ENV VIKUNJA_SENTRY_DSN https://85694a2d757547cbbc90cd4b55c5a18d@o1047380.ingest.sentry.io/6024480
-ENV VIKUNJA_PROJECT_INFINITE_NESTING_ENABLED false
-ENV VIKUNJA_ALLOW_ICON_CHANGES true

 COPY docker/injector.sh /docker-entrypoint.d/50-injector.sh
 COPY docker/ipv6-disable.sh /docker-entrypoint.d/60-ipv6-disable.sh
--- a/cypress.config.ts
+++ b/cypress.config.ts
@ -24,5 +24,4 @@ export default defineConfig({
 	},
 	viewportWidth: 1600,
 	viewportHeight: 900,
-	experimentalMemoryManagement: true,
 })
--- a/cypress/e2e/misc/editor.spec.ts
+++ b/cypress/e2e/misc/editor.spec.ts
@ -2,6 +2,7 @@ import {createFakeUserAndLogin} from '../../support/authenticateUser'

 import {TaskFactory} from '../../factories/task'
 import {ProjectFactory} from '../../factories/project'
+import {NamespaceFactory} from '../../factories/namespace'
 import {UserProjectFactory} from '../../factories/users_project'
 import {BucketFactory} from '../../factories/bucket'

@ -9,6 +10,7 @@ describe('Editor', () => {
 	createFakeUserAndLogin()
 	
 	beforeEach(() => {
+		NamespaceFactory.create(1)
 		ProjectFactory.create(1)
 		BucketFactory.create(1)
 		TaskFactory.truncate()
--- a/cypress/e2e/misc/menu.spec.ts
+++ b/cypress/e2e/misc/menu.spec.ts
@ -8,20 +8,20 @@ describe('The Menu', () => {
 	})

 	it('Is visible by default on desktop', () => {
-		cy.get('.menu-container')
+		cy.get('.namespace-container')
 			.should('have.class', 'is-active')
 	})

 	it('Can be hidden on desktop', () => {
 		cy.get('button.menu-show-button:visible')
 			.click()
-		cy.get('.menu-container')
+		cy.get('.namespace-container')
 			.should('not.have.class', 'is-active')
 	})

 	it('Is hidden by default on mobile', () => {
 		cy.viewport('iphone-8')
-		cy.get('.menu-container')
+		cy.get('.namespace-container')
 			.should('not.have.class', 'is-active')
 	})

@ -29,7 +29,7 @@ describe('The Menu', () => {
 		cy.viewport('iphone-8')
 		cy.get('button.menu-show-button:visible')
 			.click()
-		cy.get('.menu-container')
+		cy.get('.namespace-container')
 			.should('have.class', 'is-active')
 	})
 })
--- a/cypress/e2e/project/namespaces.spec.ts
+++ b/cypress/e2e/project/namespaces.spec.ts
@ -0,0 +1,145 @@
+import {createFakeUserAndLogin} from '../../support/authenticateUser'
+
+import {ProjectFactory} from '../../factories/project'
+import {NamespaceFactory} from '../../factories/namespace'
+
+describe('Namepaces', () => {
+	createFakeUserAndLogin()
+
+	let namespaces
+
+	beforeEach(() => {
+		namespaces = NamespaceFactory.create(1)
+		ProjectFactory.create(1)
+	})
+
+	it('Should be all there', () => {
+		cy.visit('/namespaces')
+		cy.get('[data-cy="namespace-title"]')
+			.should('contain', namespaces[0].title)
+	})
+
+	it('Should create a new Namespace', () => {
+		const newNamespaceTitle = 'New Namespace'
+
+		cy.visit('/namespaces')
+		cy.get('[data-cy="new-namespace"]')
+			.should('contain', 'New namespace')
+			.click()
+
+		cy.url()
+			.should('contain', '/namespaces/new')
+		cy.get('.card-header-title')
+			.should('contain', 'New namespace')
+		cy.get('input.input')
+			.type(newNamespaceTitle)
+		cy.get('.button')
+			.contains('Create')
+			.click()
+
+		cy.get('.global-notification')
+			.should('contain', 'Success')
+		cy.get('.namespace-container')
+			.should('contain', newNamespaceTitle)
+		cy.url()
+			.should('contain', '/namespaces')
+	})
+
+	it('Should rename the namespace all places', () => {
+		const newNamespaces = NamespaceFactory.create(5)
+		const newNamespaceName = 'New namespace name'
+
+		cy.visit('/namespaces')
+
+		cy.get(`.namespace-container .menu.namespaces-lists .namespace-title:contains(${newNamespaces[0].title}) .dropdown .dropdown-trigger`)
+			.click()
+		cy.get('.namespace-container .menu.namespaces-lists .namespace-title .dropdown .dropdown-content')
+			.contains('Edit')
+			.click()
+		cy.url()
+			.should('contain', '/settings/edit')
+		cy.get('#namespacetext')
+			.invoke('val')
+			.should('equal', newNamespaces[0].title) // wait until the namespace data is loaded
+		cy.get('#namespacetext')
+			.type(`{selectall}${newNamespaceName}`)
+		cy.get('footer.card-footer .button')
+			.contains('Save')
+			.click()
+
+		cy.get('.global-notification', { timeout: 1000 })
+			.should('contain', 'Success')
+		cy.get('.namespace-container .menu.namespaces-lists')
+			.should('contain', newNamespaceName)
+			.should('not.contain', newNamespaces[0].title)
+		cy.get('[data-cy="namespaces-list"]')
+			.should('contain', newNamespaceName)
+			.should('not.contain', newNamespaces[0].title)
+	})
+
+	it('Should remove a namespace when deleting it', () => {
+		const newNamespaces = NamespaceFactory.create(5)
+
+		cy.visit('/')
+
+		cy.get(`.namespace-container .menu.namespaces-lists .namespace-title:contains(${newNamespaces[0].title}) .dropdown .dropdown-trigger`)
+			.click()
+		cy.get('.namespace-container .menu.namespaces-lists .namespace-title .dropdown .dropdown-content')
+			.contains('Delete')
+			.click()
+		cy.url()
+			.should('contain', '/settings/delete')
+		cy.get('[data-cy="modalPrimary"]')
+			.contains('Do it')
+			.click()
+
+		cy.get('.global-notification')
+			.should('contain', 'Success')
+		cy.get('.namespace-container .menu.namespaces-lists')
+			.should('not.contain', newNamespaces[0].title)
+	})
+
+	it('Should not show archived projects & namespaces if the filter is not checked', () => {
+		const n = NamespaceFactory.create(1, {
+			id: 2,
+			is_archived: true,
+		}, false)
+		ProjectFactory.create(1, {
+			id: 2,
+			namespace_id: n[0].id,
+		}, false)
+
+		ProjectFactory.create(1, {
+			id: 3,
+			is_archived: true,
+		}, false)
+
+		// Initial
+		cy.visit('/namespaces')
+		cy.get('.namespace')
+			.should('not.contain', 'Archived')
+
+		// Show archived
+		cy.get('[data-cy="show-archived-check"] .fancycheckbox__content')
+			.should('be.visible')
+			.click()
+		cy.get('[data-cy="show-archived-check"] input')
+			.should('be.checked')
+		cy.get('.namespace')
+			.should('contain', 'Archived')
+
+		// Don't show archived
+		cy.get('[data-cy="show-archived-check"] .fancycheckbox__content')
+			.should('be.visible')
+			.click()
+		cy.get('[data-cy="show-archived-check"] input')
+			.should('not.be.checked')
+
+		// Second time visiting after unchecking
+		cy.visit('/namespaces')
+		cy.get('[data-cy="show-archived-check"] input')
+			.should('not.be.checked')
+		cy.get('.namespace')
+			.should('not.contain', 'Archived')
+	})
+})
--- a/cypress/e2e/project/prepareProjects.ts
+++ b/cypress/e2e/project/prepareProjects.ts
@ -1,7 +1,9 @@
 import {ProjectFactory} from '../../factories/project'
+import {NamespaceFactory} from '../../factories/namespace'
 import {TaskFactory} from '../../factories/task'

 export function createProjects() {
+	NamespaceFactory.create(1)
 	const projects = ProjectFactory.create(1, {
 		title: 'First Project'
 	})
--- a/cypress/e2e/project/project-history.spec.ts
+++ b/cypress/e2e/project/project-history.spec.ts
@ -8,30 +8,37 @@ describe('Project History', () => {
 	prepareProjects()
 	
 	it('should show a project history on the home page', () => {
-		cy.intercept(Cypress.env('API_URL') + '/projects*').as('loadProjectArray')
+		cy.intercept(Cypress.env('API_URL') + '/namespaces*').as('loadNamespaces')
 		cy.intercept(Cypress.env('API_URL') + '/projects/*').as('loadProject')
 		
 		const projects = ProjectFactory.create(6)

 		cy.visit('/')
-		cy.wait('@loadProjectArray')
+		cy.wait('@loadNamespaces')
 		cy.get('body')
 			.should('not.contain', 'Last viewed')

 		cy.visit(`/projects/${projects[0].id}`)
+		cy.wait('@loadNamespaces')
 		cy.wait('@loadProject')
 		cy.visit(`/projects/${projects[1].id}`)
+		cy.wait('@loadNamespaces')
 		cy.wait('@loadProject')
 		cy.visit(`/projects/${projects[2].id}`)
+		cy.wait('@loadNamespaces')
 		cy.wait('@loadProject')
 		cy.visit(`/projects/${projects[3].id}`)
+		cy.wait('@loadNamespaces')
 		cy.wait('@loadProject')
 		cy.visit(`/projects/${projects[4].id}`)
+		cy.wait('@loadNamespaces')
 		cy.wait('@loadProject')
 		cy.visit(`/projects/${projects[5].id}`)
+		cy.wait('@loadNamespaces')
 		cy.wait('@loadProject')

 		// cy.visit('/')
+		// cy.wait('@loadNamespaces')
 		// Not using cy.visit here to work around the redirect issue fixed in #1337
 		cy.get('nav.menu.top-menu a')
 			.contains('Overview')
--- a/cypress/e2e/project/project-view-list.spec.ts
+++ b/cypress/e2e/project/project-view-list.spec.ts
@ -58,6 +58,7 @@ describe('Project View Project', () => {
 		})
 		const projects = ProjectFactory.create(2, {
 			owner_id: '{increment}',
+			namespace_id: '{increment}',
 		})
 		cy.visit(`/projects/${projects[1].id}/`)

--- a/cypress/e2e/project/project.spec.ts
+++ b/cypress/e2e/project/project.spec.ts
@ -1,7 +1,6 @@
 import {createFakeUserAndLogin} from '../../support/authenticateUser'

 import {TaskFactory} from '../../factories/task'
-import {ProjectFactory} from '../../factories/project'
 import {prepareProjects} from './prepareProjects'

 describe('Projects', () => {
@ -11,20 +10,23 @@ describe('Projects', () => {
 	prepareProjects((newProjects) => (projects = newProjects))

 	it('Should create a new project', () => {
-		cy.visit('/projects')
-		cy.get('.project-header [data-cy=new-project]')
+		cy.visit('/')
+		cy.get('.namespace-title .dropdown-trigger')
+			.click()
+		cy.get('.namespace-title .dropdown .dropdown-item')
+			.contains('New project')
 			.click()
 		cy.url()
-			.should('contain', '/projects/new')
+			.should('contain', '/projects/new/1')
 		cy.get('.card-header-title')
 			.contains('New project')
-		cy.get('input[name=projectTitle]')
+		cy.get('input.input')
 			.type('New Project')
 		cy.get('.button')
 			.contains('Create')
 			.click()

-		cy.get('.global-notification', {timeout: 1000}) // Waiting until the request to create the new project is done
+		cy.get('.global-notification', { timeout: 1000 }) // Waiting until the request to create the new project is done
 			.should('contain', 'Success')
 		cy.url()
 			.should('contain', '/projects/')
@ -54,9 +56,9 @@ describe('Projects', () => {
 		cy.get('.project-title')
 			.should('contain', 'First Project')

-		cy.get('.menu-container .menu-list li:first-child .dropdown .menu-list-dropdown-trigger')
+		cy.get('.namespace-container .menu.namespaces-lists .menu-list li:first-child .dropdown .menu-list-dropdown-trigger')
 			.click()
-		cy.get('.menu-container .menu-list li:first-child .dropdown .dropdown-content')
+		cy.get('.namespace-container .menu.namespaces-lists .menu-list li:first-child .dropdown .dropdown-content')
 			.contains('Edit')
 			.click()
 		cy.get('#title')
@ -70,21 +72,21 @@ describe('Projects', () => {
 		cy.get('.project-title')
 			.should('contain', newProjectName)
 			.should('not.contain', projects[0].title)
-		cy.get('.menu-container .menu-list li:first-child')
+		cy.get('.namespace-container .menu.namespaces-lists .menu-list li:first-child')
 			.should('contain', newProjectName)
 			.should('not.contain', projects[0].title)
 		cy.visit('/')
-		cy.get('.project-grid')
+		cy.get('.card-content')
 			.should('contain', newProjectName)
 			.should('not.contain', projects[0].title)
 	})

-	it('Should remove a project when deleting it', () => {
+	it('Should remove a project', () => {
 		cy.visit(`/projects/${projects[0].id}`)

-		cy.get('.menu-container .menu-list li:first-child .dropdown .menu-list-dropdown-trigger')
+		cy.get('.namespace-container .menu.namespaces-lists .menu-list li:first-child .dropdown .menu-list-dropdown-trigger')
 			.click()
-		cy.get('.menu-container .menu-list li:first-child .dropdown .dropdown-content')
+		cy.get('.namespace-container .menu.namespaces-lists .menu-list li:first-child .dropdown .dropdown-content')
 			.contains('Delete')
 			.click()
 		cy.url()
@ -95,15 +97,15 @@ describe('Projects', () => {

 		cy.get('.global-notification')
 			.should('contain', 'Success')
-		cy.get('.menu-container .menu-list')
+		cy.get('.namespace-container .menu.namespaces-lists .menu-list')
 			.should('not.contain', projects[0].title)
 		cy.location('pathname')
 			.should('equal', '/')
 	})
-
+	
 	it('Should archive a project', () => {
 		cy.visit(`/projects/${projects[0].id}`)
-
+		
 		cy.get('.project-title-dropdown')
 			.click()
 		cy.get('.project-title-dropdown .dropdown-menu .dropdown-item')
@ -113,59 +115,10 @@ describe('Projects', () => {
 			.should('contain.text', 'Archive this project')
 		cy.get('.modal-content [data-cy=modalPrimary]')
 			.click()
-
-		cy.get('.menu-container .menu-list')
+		
+		cy.get('.namespace-container .menu.namespaces-lists .menu-list')
 			.should('not.contain', projects[0].title)
 		cy.get('main.app-content')
 			.should('contain.text', 'This project is archived. It is not possible to create new or edit tasks for it.')
 	})
-
-	it('Should show all projects on the projects page', () => {
-		const projects = ProjectFactory.create(10)
-
-		cy.visit('/projects')
-
-		projects.forEach(p => {
-			cy.get('[data-cy="projects-list"]')
-				.should('contain', p.title)
-		})
-	})
-
-	it('Should not show archived projects if the filter is not checked', () => {
-		ProjectFactory.create(1, {
-			id: 2,
-		}, false)
-		ProjectFactory.create(1, {
-			id: 3,
-			is_archived: true,
-		}, false)
-
-		// Initial
-		cy.visit('/projects')
-		cy.get('.project-grid')
-			.should('not.contain', 'Archived')
-
-		// Show archived
-		cy.get('[data-cy="show-archived-check"] label span')
-			.should('be.visible')
-			.click()
-		cy.get('[data-cy="show-archived-check"] input')
-			.should('be.checked')
-		cy.get('.project-grid')
-			.should('contain', 'Archived')
-
-		// Don't show archived
-		cy.get('[data-cy="show-archived-check"] label span')
-			.should('be.visible')
-			.click()
-		cy.get('[data-cy="show-archived-check"] input')
-			.should('not.be.checked')
-
-		// Second time visiting after unchecking
-		cy.visit('/projects')
-		cy.get('[data-cy="show-archived-check"] input')
-			.should('not.be.checked')
-		cy.get('.project-grid')
-			.should('not.contain', 'Archived')
-	})
 })
--- a/cypress/e2e/task/overview.spec.ts
+++ b/cypress/e2e/task/overview.spec.ts
@ -3,10 +3,12 @@ import {createFakeUserAndLogin} from '../../support/authenticateUser'
 import {ProjectFactory} from '../../factories/project'
 import {seed} from '../../support/seed'
 import {TaskFactory} from '../../factories/task'
+import {NamespaceFactory} from '../../factories/namespace'
 import {BucketFactory} from '../../factories/bucket'
 import {updateUserSettings} from '../../support/updateUserSettings'

 function seedTasks(numberOfTasks = 50, startDueDate = new Date()) {
+	NamespaceFactory.create(1)
 	const project = ProjectFactory.create()[0]
 	BucketFactory.create(1, {
 		project_id: project.id,
@ -135,7 +137,8 @@ describe('Home Page Task Overview', () => {
 		cy.visit('/')
 		
 		cy.get('.home.app-content .content')
-			.should('contain.text', 'Import your projects and tasks from other services into Vikunja:')
+			.should('contain.text', 'You can create a new project for your new tasks:')
+			.should('contain.text', 'Or import your projects and tasks from other services into Vikunja:')
 	})
 	
 	it('Should not show the cta buttons for new project when there are tasks', () => {
--- a/cypress/e2e/task/task.spec.ts
+++ b/cypress/e2e/task/task.spec.ts
@ -4,6 +4,7 @@ import {TaskFactory} from '../../factories/task'
 import {ProjectFactory} from '../../factories/project'
 import {TaskCommentFactory} from '../../factories/task_comment'
 import {UserFactory} from '../../factories/user'
+import {NamespaceFactory} from '../../factories/namespace'
 import {UserProjectFactory} from '../../factories/users_project'
 import {TaskAssigneeFactory} from '../../factories/task_assignee'
 import {LabelFactory} from '../../factories/labels'
@ -46,11 +47,13 @@ function uploadAttachmentAndVerify(taskId: number) {
 describe('Task', () => {
 	createFakeUserAndLogin()

+	let namespaces
 	let projects
 	let buckets

 	beforeEach(() => {
 		// UserFactory.create(1)
+		namespaces = NamespaceFactory.create(1)
 		projects = ProjectFactory.create(1)
 		buckets = BucketFactory.create(1, {
 			project_id: projects[0].id,
@ -107,7 +110,7 @@ describe('Task', () => {
 		cy.get('.tasks .task .favorite')
 			.first()
 			.click()
-		cy.get('.menu-container')
+		cy.get('.menu.namespaces-lists')
 			.should('contain', 'Favorites')
 	})

@ -130,6 +133,7 @@ describe('Task', () => {
 			cy.get('.task-view h1.title.task-id')
 				.should('contain', '#1')
 			cy.get('.task-view h6.subtitle')
+				.should('contain', namespaces[0].title)
 				.should('contain', projects[0].title)
 			cy.get('.task-view .details.content.description')
 				.should('contain', tasks[0].description)
@ -256,6 +260,7 @@ describe('Task', () => {
 				.click()

 			cy.get('.task-view h6.subtitle')
+				.should('contain', namespaces[0].title)
 				.should('contain', projects[1].title)
 			cy.get('.global-notification')
 				.should('contain', 'Success')
--- a/cypress/e2e/tsconfig.json
+++ b/cypress/e2e/tsconfig.json
@ -1,5 +1,5 @@
 {
-  "extends": "@vue/tsconfig/tsconfig.dom.json",
+  "extends": "@vue/tsconfig/tsconfig.web.json",
  "include": ["./**/*", "../support/**/*", "../factories/**/*"],
  "compilerOptions": {
    "baseUrl": ".",
--- a/cypress/factories/namespace.ts
+++ b/cypress/factories/namespace.ts
@ -0,0 +1,18 @@
+import {faker} from '@faker-js/faker'
+import {Factory} from '../support/factory'
+
+export class NamespaceFactory extends Factory {
+	static table = 'namespaces'
+
+	static factory() {
+		const now = new Date()
+
+		return {
+			id: '{increment}',
+			title: faker.lorem.words(3),
+			owner_id: 1,
+			created: now.toISOString(),
+			updated: now.toISOString(),
+		}
+	}
+}
--- a/cypress/factories/project.ts
+++ b/cypress/factories/project.ts
@ -11,6 +11,7 @@ export class ProjectFactory extends Factory {
 			id: '{increment}',
 			title: faker.lorem.words(3),
 			owner_id: 1,
+			namespace_id: 1,
 			created: now.toISOString(),
 			updated: now.toISOString(),
 		}
--- a/docker/injector.sh
+++ b/docker/injector.sh
@ -11,7 +11,5 @@ VIKUNJA_SENTRY_DSN="$(echo "$VIKUNJA_SENTRY_DSN" | sed -r 's/([:;])/\\\1/g')"
 sed -ri "s:^(\s*window.API_URL\s*=)\s*.+:\1 '${VIKUNJA_API_URL}':g" /usr/share/nginx/html/index.html
 sed -ri "s:^(\s*window.SENTRY_ENABLED\s*=)\s*.+:\1 ${VIKUNJA_SENTRY_ENABLED}:g" /usr/share/nginx/html/index.html
 sed -ri "s:^(\s*window.SENTRY_DSN\s*=)\s*.+:\1 '${VIKUNJA_SENTRY_DSN}':g" /usr/share/nginx/html/index.html
-sed -ri "s:^(\s*window.PROJECT_INFINITE_NESTING_ENABLED\s*=)\s*.+:\1 '${VIKUNJA_PROJECT_INFINITE_NESTING_ENABLED}':g" /usr/share/nginx/html/index.html
-sed -ri "s:^(\s*window.ALLOW_ICON_CHANGES\s*=)\s*.+:\1 ${VIKUNJA_ALLOW_ICON_CHANGES}:g" /usr/share/nginx/html/index.html

 date -uIseconds | xargs echo 'info: started at'
--- a/docker/ipv6-disable.sh
+++ b/docker/ipv6-disable.sh
--- a/docker/nginx.conf
+++ b/docker/nginx.conf
@ -4,6 +4,7 @@

 pid                  /tmp/nginx.pid;
 worker_processes     auto;
+worker_rlimit_nofile 65535;

 events {
  multi_accept       on;
--- a/env.config.d.ts
+++ b/env.config.d.ts
@ -6,4 +6,14 @@ declare module 'postcss-easings' {
 declare module 'postcss-easing-gradients' {
  import postcssEasingGradients from 'postcss-easing-gradients'
  export default postcssEasingGradients
+}
+
+declare module 'postcss-focus-within/browser' {
+  import focusWithinInit from 'postcss-focus-within/browser'
+  export default focusWithinInit
+}
+
+declare module 'css-has-pseudo/browser' {
+  import cssHasPseudo from 'css-has-pseudo/browser'
+  export default cssHasPseudo
 }
--- a/env.d.ts
+++ b/env.d.ts
@ -1,16 +1,17 @@
 /// <reference types="vite/client" />
 /// <reference types="vite-svg-loader" />
+/// <reference types="vite-plugin-sentry/client" />
 /// <reference types="cypress" />
 /// <reference types="@histoire/plugin-vue/components" />

 declare module 'postcss-focus-within/browser' {
-	import focusWithinInit from 'postcss-focus-within/browser'
-	export default focusWithinInit
+  import focusWithinInit from 'postcss-focus-within/browser'
+  export default focusWithinInit
 }

 declare module 'css-has-pseudo/browser' {
-	import cssHasPseudo from 'css-has-pseudo/browser'
-	export default cssHasPseudo
+  import cssHasPseudo from 'css-has-pseudo/browser'
+  export default cssHasPseudo
 }

 interface ImportMetaEnv {
@ -27,9 +28,9 @@ interface ImportMetaEnv {
 	readonly SENTRY_RELEASE?: string

 	readonly VITE_WORKBOX_DEBUG?: boolean
-	readonly VITE_IS_ONLINE: boolean
+	readonly VITE_IS_ONLINE?: boolean
 }

 interface ImportMeta {
-	readonly env: ImportMetaEnv
-}
+  readonly env: ImportMetaEnv
+}
--- a/flake.lock
+++ b/flake.lock
@ -2,11 +2,11 @@
  "nodes": {
    "nixpkgs": {
      "locked": {
-        "lastModified": 1685498995,
-        "narHash": "sha256-rdyjnkq87tJp+T2Bm1OD/9NXKSsh/vLlPeqCc/mm7qs=",
+        "lastModified": 1680030621,
+        "narHash": "sha256-qQa1NeS5Rvk2lgK5lSk986PC6I72yIHejzM8PFu+dHs=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "9cfaa8a1a00830d17487cb60a19bb86f96f09b27",
+        "rev": "402cc3633cc60dfc50378197305c984518b30773",
        "type": "github"
      },
      "original": {
--- a/index.html
+++ b/index.html
@ -27,11 +27,6 @@
 	// our sentry instance to notify us of potential problems.
 	window.SENTRY_ENABLED = false
 	window.SENTRY_DSN = 'https://85694a2d757547cbbc90cd4b55c5a18d@o1047380.ingest.sentry.io/6024480'
-	// If enabled, allows the user to nest projects infinitely, instead of the default 2 levels.
-	// This setting might change in the future or be removed completely.
-	window.PROJECT_INFINITE_NESTING_ENABLED = false
-	// Allow changing the logo and other icons based on various occasions throughout the year.
-	window.ALLOW_ICON_CHANGES = true
 </script>
 </body>
 </html>
--- a/package.json
+++ b/package.json
@ -13,7 +13,7 @@
  },
  "homepage": "https://vikunja.io/",
  "funding": "https://opencollective.com/vikunja",
-  "packageManager": "pnpm@8.6.2",
+  "packageManager": "pnpm@7.30.5",
  "keywords": [
    "todo",
    "productivity",
@ -51,98 +51,98 @@
    "@fortawesome/vue-fontawesome": "3.0.3",
    "@github/hotkey": "2.0.1",
    "@infectoone/vue-ganttastic": "2.1.4",
-    "@intlify/unplugin-vue-i18n": "0.11.0",
-    "@kyvg/vue3-notification": "2.9.1",
-    "@sentry/tracing": "7.55.2",
-    "@sentry/vue": "7.55.2",
-    "@vueuse/core": "10.2.0",
-    "axios": "1.4.0",
+    "@intlify/unplugin-vue-i18n": "0.10.0",
+    "@kyvg/vue3-notification": "2.9.0",
+    "@sentry/tracing": "7.46.0",
+    "@sentry/vue": "7.46.0",
+    "@vueuse/core": "9.13.0",
+    "axios": "1.3.4",
    "blurhash": "2.0.5",
    "bulma-css-variables": "0.9.33",
    "camel-case": "4.1.2",
-    "codemirror": "5.65.13",
-    "date-fns": "2.30.0",
-    "dayjs": "1.11.8",
-    "dompurify": "3.0.3",
+    "codemirror": "5.65.12",
+    "date-fns": "2.29.3",
+    "dayjs": "1.11.7",
+    "dompurify": "3.0.1",
    "easymde": "2.18.0",
    "fast-deep-equal": "3.1.3",
    "flatpickr": "4.6.13",
    "flexsearch": "0.7.31",
-    "floating-vue": "2.0.0-beta.22",
-    "highlight.js": "11.8.0",
+    "floating-vue": "2.0.0-beta.20",
+    "highlight.js": "11.7.0",
    "is-touch-device": "1.0.1",
    "klona": "2.0.6",
    "lodash.debounce": "4.0.8",
-    "marked": "5.1.0",
-    "pinia": "2.0.36",
+    "marked": "4.3.0",
+    "pinia": "2.0.33",
    "register-service-worker": "1.7.2",
    "snake-case": "3.0.4",
    "sortablejs": "1.15.0",
-    "ufo": "1.1.2",
+    "ufo": "1.1.1",
    "vue": "3.2.47",
    "vue-advanced-cropper": "2.8.8",
    "vue-flatpickr-component": "11.0.3",
    "vue-i18n": "9.2.2",
-    "vue-router": "4.2.2",
-    "workbox-precaching": "7.0.0",
+    "vue-router": "4.1.6",
+    "workbox-precaching": "6.5.4",
    "zhyswan-vuedraggable": "4.1.3"
  },
  "devDependencies": {
-    "@4tw/cypress-drag-drop": "2.2.4",
+    "@4tw/cypress-drag-drop": "2.2.3",
    "@cypress/vite-dev-server": "5.0.5",
    "@cypress/vue": "5.0.5",
-    "@faker-js/faker": "8.0.2",
-    "@histoire/plugin-screenshot": "0.16.1",
-    "@histoire/plugin-vue": "0.16.1",
-    "@rushstack/eslint-patch": "1.3.2",
-    "@tsconfig/node18": "2.0.1",
-    "@types/codemirror": "5.60.8",
-    "@types/dompurify": "3.0.2",
+    "@faker-js/faker": "7.6.0",
+    "@histoire/plugin-screenshot": "0.15.9",
+    "@histoire/plugin-vue": "0.15.8",
+    "@rushstack/eslint-patch": "1.2.0",
+    "@types/codemirror": "5.60.7",
+    "@types/dompurify": "3.0.0",
    "@types/flexsearch": "0.7.3",
    "@types/is-touch-device": "1.0.0",
    "@types/lodash.debounce": "4.0.7",
-    "@types/marked": "5.0.0",
-    "@types/node": "18.16.18",
+    "@types/marked": "4.0.8",
+    "@types/node": "18.15.11",
    "@types/postcss-preset-env": "7.7.0",
    "@types/sortablejs": "1.15.1",
-    "@typescript-eslint/eslint-plugin": "5.59.11",
-    "@typescript-eslint/parser": "5.59.11",
-    "@vitejs/plugin-legacy": "4.0.4",
-    "@vitejs/plugin-vue": "4.2.3",
-    "@vue/eslint-config-typescript": "11.0.3",
+    "@typescript-eslint/eslint-plugin": "5.57.0",
+    "@typescript-eslint/parser": "5.57.0",
+    "@vitejs/plugin-legacy": "4.0.2",
+    "@vitejs/plugin-vue": "4.1.0",
+    "@vue/eslint-config-typescript": "11.0.2",
    "@vue/test-utils": "2.3.2",
-    "@vue/tsconfig": "0.4.0",
+    "@vue/tsconfig": "0.1.3",
    "autoprefixer": "10.4.14",
-    "browserslist": "4.21.7",
-    "caniuse-lite": "1.0.30001500",
+    "browserslist": "4.21.5",
+    "caniuse-lite": "1.0.30001470",
    "css-has-pseudo": "5.0.2",
-    "csstype": "3.1.2",
-    "cypress": "12.14.0",
-    "esbuild": "0.18.4",
-    "eslint": "8.43.0",
-    "eslint-plugin-vue": "9.13.0",
-    "happy-dom": "9.20.3",
-    "histoire": "0.16.2",
-    "postcss": "8.4.24",
+    "csstype": "3.1.1",
+    "cypress": "12.9.0",
+    "esbuild": "0.17.14",
+    "eslint": "8.37.0",
+    "eslint-plugin-vue": "9.10.0",
+    "happy-dom": "8.9.0",
+    "histoire": "0.15.9",
+    "netlify-cli": "13.2.1",
+    "postcss": "8.4.21",
    "postcss-easing-gradients": "3.0.1",
    "postcss-easings": "3.0.1",
    "postcss-focus-within": "7.0.2",
-    "postcss-preset-env": "8.5.0",
+    "postcss-preset-env": "8.3.0",
    "rimraf": "3.0.2",
-    "rollup": "3.25.1",
-    "rollup-plugin-visualizer": "5.9.2",
-    "sass": "1.63.4",
+    "rollup": "3.20.2",
+    "rollup-plugin-visualizer": "5.9.0",
+    "sass": "1.60.0",
    "start-server-and-test": "2.0.0",
-    "typescript": "5.1.3",
-    "vite": "4.3.9",
+    "typescript": "5.0.3",
+    "vite": "4.2.1",
    "vite-plugin-inject-preload": "1.3.1",
-    "vite-plugin-pwa": "0.16.4",
-    "vite-plugin-sentry": "1.1.6",
+    "vite-plugin-pwa": "0.14.7",
+    "vite-plugin-sentry": "1.1.7",
    "vite-svg-loader": "4.0.0",
-    "vitest": "0.32.2",
-    "vue-tsc": "1.8.0",
+    "vitest": "0.29.8",
+    "vue-tsc": "1.2.0",
    "wait-on": "7.0.1",
-    "workbox-cli": "7.0.0"
+    "workbox-cli": "6.5.4"
  },
  "pnpm": {
    "patchedDependencies": {
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/renovate.json
+++ b/renovate.json
@ -6,7 +6,7 @@
  ],
  "packageRules": [
    {
-      "matchPackageNames": ["happy-dom"],
+      "matchPackageNames": ["netlify-cli", "happy-dom"],
      "extends": ["schedule:weekly"]
    },
    {
--- a/scripts/deploy-preview-netlify.mjs
+++ b/scripts/deploy-preview-netlify.mjs
@ -33,9 +33,9 @@ const promiseExec = cmd => {
 }

 (async function () {
-	let stdout = await promiseExec(`/home/node/docker-netlify-cli/node_modules/.bin/netlify link --id ${siteId}`)
+	let stdout = await promiseExec(`./node_modules/.bin/netlify link --id ${siteId}`)
 	console.log(stdout)
-	stdout = await promiseExec(`/home/node/docker-netlify-cli/node_modules/.bin/netlify deploy --alias ${alias}`)
+	stdout = await promiseExec(`./node_modules/.bin/netlify deploy --alias ${alias}`)
 	console.log(stdout)

 	const data = await fetch(prIssueCommentsUrl).then(response => response.json())
--- a/scripts/deploy-preview-netlify.mjs.sha384
+++ b/scripts/deploy-preview-netlify.mjs.sha384
@ -1 +1 @@
-4a7c1293c7b12e9ab476cdf35251a407c6a1cd005d22c06df994222cccfb25cde5f47d15866a098c9d739778fee4dc19  ./scripts/deploy-preview-netlify.mjs
+57af69409e66bc87f4f2fc5822dd8d3c2eb47c601f81af1ac4a56f3e2d80837b1a2de06f4ff57695ec379b7c15b881e3  ./scripts/deploy-preview-netlify.mjs
--- a/src/App.vue
+++ b/src/App.vue
@ -12,7 +12,6 @@
 		<keyboard-shortcuts v-if="keyboardShortcutsActive"/>
 		
 		<Teleport to="body">
-			<AddToHomeScreen/>
 			<UpdateNotification/>
 			<Notification/>
 		</Teleport>
@ -44,7 +43,6 @@ import {useBaseStore} from '@/stores/base'

 import {useColorScheme} from '@/composables/useColorScheme'
 import {useBodyClass} from '@/composables/useBodyClass'
-import AddToHomeScreen from '@/components/home/AddToHomeScreen.vue'

 const baseStore = useBaseStore()
 const authStore = useAuthStore()
@ -94,7 +92,7 @@ watch(userEmailConfirm, (userEmailConfirm) => {
 	router.push({name: 'user.login'})
 }, { immediate: true })

-setLanguage(authStore.settings.language)
+setLanguage()
 useColorScheme()
 </script>

--- a/src/assets/no-auth-image.jpg
+++ b/src/assets/no-auth-image.jpg
--- a/src/components/base/Expandable.vue
+++ b/src/components/base/Expandable.vue
@ -32,7 +32,7 @@ import {computed, ref} from 'vue'
 import {getInheritedBackgroundColor} from '@/helpers/getInheritedBackgroundColor'

 const props = defineProps({
-  /** Whether the Expandable is open or not */
+  /** Wheather the Expandable is open or not */
  open: {
    type: Boolean,
    default: false,
--- a/src/components/date/datemathHelp.story.vue
+++ b/src/components/date/datemathHelp.story.vue
@ -1,11 +0,0 @@
-<script setup lang="ts">
-import datemathHelp from './datemathHelp.vue'
-</script>
-
-<template>
-  <Story>
-    <Variant title="Default">
-      <datemathHelp />
-    </Variant>
-  </Story>
-</template>
--- a/src/components/date/datemathHelp.vue
+++ b/src/components/date/datemathHelp.vue
@ -1,8 +1,7 @@
 <template>
 	<card
 		class="has-no-shadow how-it-works-modal"
-		:title="$t('input.datemathHelp.title')"
-	>
+		:title="$t('input.datemathHelp.title')">
 		<p>
 			{{ $t('input.datemathHelp.intro') }}
 		</p>
@ -28,11 +27,11 @@
 		</p>
 		<p>{{ $t('misc.forExample') }}</p>
 		<ul>
-			<li><code>+1d</code> {{ $t('input.datemathHelp.add1Day') }}</li>
-			<li><code>-1d</code> {{ $t('input.datemathHelp.minus1Day') }}</li>
-			<li><code>/d</code> {{ $t('input.datemathHelp.roundDay') }}</li>
+			<li><code>+1d</code>{{ $t('input.datemathHelp.add1Day') }}</li>
+			<li><code>-1d</code>{{ $t('input.datemathHelp.minus1Day') }}</li>
+			<li><code>/d</code>{{ $t('input.datemathHelp.roundDay') }}</li>
 		</ul>
-		<h3>{{ $t('input.datemathHelp.supportedUnits') }}</h3>
+		<p>{{ $t('input.datemathHelp.supportedUnits') }}</p>
 		<table class="table">
 			<tbody>
 			<tr>
@ -70,7 +69,7 @@
 			</tbody>
 		</table>

-		<h3>{{ $t('input.datemathHelp.someExamples') }}</h3>
+		<p>{{ $t('input.datemathHelp.someExamples') }}</p>
 		<table class="table">
 			<tbody>
 			<tr>
@ -101,7 +100,7 @@
 				<td><code>{{ exampleDate }}||+1M/d</code></td>
 				<td>
 					<i18n-t keypath="input.datemathHelp.examples.datePlusMonth" scope="global">
-						<strong>{{ exampleDate }}</strong>
+						<code>{{ exampleDate }}</code>
 					</i18n-t>
 				</td>
 			</tr>
@ -111,15 +110,13 @@
 </template>

 <script lang="ts" setup>
-import {formatDateShort} from '@/helpers/time/formatDate'
-
+import {formatDate} from '@/helpers/time/formatDate'
 import BaseButton from '@/components/base/BaseButton.vue'

-const exampleDate = formatDateShort(new Date())
+const exampleDate = formatDate(new Date(), 'yyyy-MM-dd')
 </script>

 <style scoped lang="scss">
-// FIXME: Remove style overwrites
 .how-it-works-modal {
 	font-size: 1rem;
 }
--- a/src/components/home/AddToHomeScreen.vue
+++ b/src/components/home/AddToHomeScreen.vue
@ -1,80 +0,0 @@
-<template>
-	<div
-		v-if="shouldShowMessage"
-		class="add-to-home-screen"
-		:class="{'has-update-available': hasUpdateAvailable}"
-	>
-		<icon icon="arrow-up-from-bracket" class="add-icon"/>
-		<p>
-			{{ $t('home.addToHomeScreen') }}
-		</p>
-		<BaseButton @click="() => hideMessage = true" class="hide-button">
-			<icon icon="x"/>
-		</BaseButton>
-	</div>
-</template>
-
-<script lang="ts" setup>
-import BaseButton from '@/components/base/BaseButton.vue'
-import {useLocalStorage} from '@vueuse/core'
-import {computed} from 'vue'
-import {useBaseStore} from '@/stores/base'
-
-const baseStore = useBaseStore()
-
-const hideMessage = useLocalStorage('hideAddToHomeScreenMessage', false)
-const hasUpdateAvailable = computed(() => baseStore.updateAvailable)
-
-const shouldShowMessage = computed(() => {
-	if (hideMessage.value) {
-		return false
-	}
-
-	if (typeof window !== 'undefined' && window.matchMedia('(display-mode: standalone)').matches) {
-		return false
-	}
-
-	return true
-})
-</script>
-
-<style lang="scss" scoped>
-.add-to-home-screen {
-	position: fixed;
-	// FIXME: We should prevent usage of z-index or
-	// at least define it centrally
-	// the highest z-index of a modal is .hint-modal with 4500
-	z-index: 5000;
-	bottom: 1rem;
-	inset-inline: 1rem;
-	max-width: max-content;
-	margin-inline: auto;
-
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	gap: 1rem;
-	padding: .5rem 1rem;
-	background: var(--grey-900);
-	border-radius: $radius;
-	font-size: .9rem;
-	color: var(--grey-200);
-
-	@media screen and (min-width: $tablet) {
-		display: none;
-	}
-	
-	&.has-update-available {
-		bottom: 5rem;
-	}
-}
-
-.add-icon {
-	color: var(--primary-light);
-}
-
-.hide-button {
-	padding: .25rem .5rem;
-	cursor: pointer;
-}
-</style>
--- a/src/components/home/Logo.vue
+++ b/src/components/home/Logo.vue
@ -9,7 +9,7 @@ import {MILLISECONDS_A_HOUR} from '@/constants/date'
 const now = useNow({
 	interval: MILLISECONDS_A_HOUR,
 })
-const Logo = computed(() => window.ALLOW_ICON_CHANGES && now.value.getMonth() === 5 ? LogoFullPride : LogoFull)
+const Logo = computed(() => now.value.getMonth() === 5 ? LogoFullPride : LogoFull)
 </script>

 <template>
--- a/src/components/home/ProjectsNavigation.vue
+++ b/src/components/home/ProjectsNavigation.vue
@ -1,109 +0,0 @@
-<template>
-	<draggable
-		v-model="availableProjects"
-		animation="100"
-		ghostClass="ghost"
-		group="projects"
-		@start="() => drag = true"
-		@end="saveProjectPosition"
-		handle=".handle"
-		tag="menu"
-		item-key="id"
-		:disabled="!canEditOrder"
-		filter=".drag-disabled"
-		:component-data="{
-			type: 'transition-group',
-			name: !drag ? 'flip-list' : null,
-			class: [
-				'menu-list can-be-hidden',
-				{ 'dragging-disabled': !canEditOrder }
-			],
-		}"
-	>
-		<template #item="{element: project}">
-			<ProjectsNavigationItem
-				:class="{'drag-disabled': project.id < 0}"
-				:project="project"
-				:is-loading="projectUpdating[project.id]"
-				:can-collapse="canCollapse"
-				:level="level"
-				:data-project-id="project.id"
-			/>
-		</template>
-	</draggable>
-</template>
-
-<script lang="ts" setup>
-import {ref, watch} from 'vue'
-import draggable from 'zhyswan-vuedraggable'
-import type {SortableEvent} from 'sortablejs'
-
-import ProjectsNavigationItem from '@/components/home/ProjectsNavigationItem.vue'
-
-import {calculateItemPosition} from '@/helpers/calculateItemPosition'
-import type {IProject} from '@/modelTypes/IProject'
-
-import {useProjectStore} from '@/stores/projects'
-
-const props = defineProps<{
-	modelValue?: IProject[],
-	canEditOrder: boolean,
-	canCollapse?: boolean,
-	level?: number,
-}>()
-const emit = defineEmits<{
-	(e: 'update:modelValue', projects: IProject[]): void
-}>()
-
-const drag = ref(false)
-
-const projectStore = useProjectStore()
-
-// Vue draggable will modify the projects list as it changes their position which will not work on a prop.
-// Hence, we'll clone the prop and work on the clone.
-const availableProjects = ref<IProject[]>([])
-watch(
-	() => props.modelValue,
-	projects => {
-		availableProjects.value = projects || []
-	},
-	{immediate: true},
-)
-
-const projectUpdating = ref<{ [id: IProject['id']]: boolean }>({})
-
-async function saveProjectPosition(e: SortableEvent) {
-	if (!e.newIndex && e.newIndex !== 0) return
-
-	const projectsActive = availableProjects.value
-	// If the project was dragged to the last position, Safari will report e.newIndex as the size of the projectsActive
-	// array instead of using the position. Because the index is wrong in that case, dragging the project will fail.
-	// To work around that we're explicitly checking that case here and decrease the index.
-	const newIndex = e.newIndex === projectsActive.length ? e.newIndex - 1 : e.newIndex
-
-	const projectId = parseInt(e.item.dataset.projectId)
-	const project = projectStore.projects[projectId]
-
-	const parentProjectId = e.to.parentNode.dataset.projectId ? parseInt(e.to.parentNode.dataset.projectId) : 0
-	const projectBefore = projectsActive[newIndex - 1] ?? null
-	const projectAfter = projectsActive[newIndex + 1] ?? null
-	projectUpdating.value[project.id] = true
-
-	const position = calculateItemPosition(
-		projectBefore !== null ? projectBefore.position : null,
-		projectAfter !== null ? projectAfter.position : null,
-	)
-
-	try {
-		// create a copy of the project in order to not violate pinia manipulation
-		await projectStore.updateProject({
-			...project,
-			position,
-			parentProjectId,
-		})
-		emit('update:modelValue', availableProjects.value)
-	} finally {
-		projectUpdating.value[project.id] = false
-	}
-}
-</script>
--- a/src/components/home/ProjectsNavigationItem.vue
+++ b/src/components/home/ProjectsNavigationItem.vue
@ -1,175 +0,0 @@
-<template>
-	<li
-		class="list-menu loader-container is-loading-small"
-		:class="{'is-loading': isLoading}"
-	>
-		<div>
-			<BaseButton
-				v-if="canCollapse && childProjects?.length > 0"
-				@click="childProjectsOpen = !childProjectsOpen"
-				class="collapse-project-button"
-			>
-				<icon icon="chevron-down" :class="{ 'project-is-collapsed': !childProjectsOpen }"/>
-			</BaseButton>
-			<BaseButton
-				:to="{ name: 'project.index', params: { projectId: project.id} }"
-				class="list-menu-link"
-				:class="{'router-link-exact-active': currentProject?.id === project.id}"
-			>
-				<span
-					v-if="!canCollapse || childProjects?.length === 0"
-					class="collapse-project-button-placeholder"
-				></span>
-				<div class="color-bubble-handle-wrapper" :class="{'is-draggable': project.id > 0}">
-					<ColorBubble
-						v-if="project.hexColor !== ''"
-						:color="project.hexColor"
-					/>
-					<span v-else-if="project.id < -1" class="saved-filter-icon icon menu-item-icon">
-						<icon icon="filter"/>
-					</span>
-					<span
-						v-if="project.id > 0"
-						class="icon menu-item-icon handle lines-handle"
-						:class="{'has-color-bubble': project.hexColor !== ''}"
-					>
-						<icon icon="grip-lines"/>
-					</span>
-				</div>
-				<span class="project-menu-title">{{ getProjectTitle(project) }}</span>
-			</BaseButton>
-			<BaseButton
-				v-if="project.id > 0"
-				class="favorite"
-				:class="{'is-favorite': project.isFavorite}"
-				@click="projectStore.toggleProjectFavorite(project)"
-			>
-				<icon :icon="project.isFavorite ? 'star' : ['far', 'star']"/>
-			</BaseButton>
-			<ProjectSettingsDropdown
-				v-if="project.id > 0"
-				class="menu-list-dropdown"
-				:project="project"
-				:level="level"
-			>
-				<template #trigger="{toggleOpen}">
-					<BaseButton class="menu-list-dropdown-trigger" @click="toggleOpen">
-						<icon icon="ellipsis-h" class="icon"/>
-					</BaseButton>
-				</template>
-			</ProjectSettingsDropdown>
-			<span class="list-setting-spacer" v-else></span>
-		</div>
-		<ProjectsNavigation
-			v-if="canNestDeeper && childProjectsOpen && canCollapse"
-			:model-value="childProjects"
-			:can-edit-order="true"
-			:can-collapse="canCollapse"
-			:level="level + 1"
-		/>
-	</li>
-</template>
-
-<script setup lang="ts">
-import {computed, ref} from 'vue'
-import {useProjectStore} from '@/stores/projects'
-import {useBaseStore} from '@/stores/base'
-
-import type {IProject} from '@/modelTypes/IProject'
-
-import BaseButton from '@/components/base/BaseButton.vue'
-import ProjectSettingsDropdown from '@/components/project/project-settings-dropdown.vue'
-import {getProjectTitle} from '@/helpers/getProjectTitle'
-import ColorBubble from '@/components/misc/colorBubble.vue'
-import ProjectsNavigation from '@/components/home/ProjectsNavigation.vue'
-import {canNestProjectDeeper} from '@/helpers/canNestProjectDeeper'
-
-const props = withDefaults(defineProps<{
-	project: IProject,
-	isLoading?: boolean,
-	canCollapse?: boolean,
-	level?: number,
-}>(), {
-	level: 0,
-})
-
-const projectStore = useProjectStore()
-const baseStore = useBaseStore()
-const currentProject = computed(() => baseStore.currentProject)
-
-const childProjectsOpen = ref(true)
-
-const childProjects = computed(() => {
-	if (!canNestDeeper.value) {
-		return []
-	}
-
-	return projectStore.getChildProjects(props.project.id)
-		.filter(p => !p.isArchived)
-		.sort((a, b) => a.position - b.position)
-})
-
-const canNestDeeper = computed(() => canNestProjectDeeper(props.level))
-</script>
-
-<style lang="scss" scoped>
-.list-setting-spacer {
-	width: 5rem;
-	flex-shrink: 0;
-}
-
-.project-is-collapsed {
-	transform: rotate(-90deg);
-}
-
-.favorite {
-	transition: opacity $transition, color $transition;
-	opacity: 0;
-
-	&:hover,
-	&.is-favorite {
-		opacity: 1;
-		color: var(--warning);
-	}
-}
-
-.list-menu:hover > div > .favorite {
-	opacity: 1;
-}
-
-.list-menu:hover > div > a > .color-bubble-handle-wrapper.is-draggable > {
-	.saved-filter-icon,
-	.color-bubble {
-		opacity: 0;
-	}
-}
-
-.color-bubble-handle-wrapper {
-	position: relative;
-	width: 1rem;
-	height: 1rem;
-	display: flex;
-	align-items: center;
-	justify-content: flex-start;
-	margin-right: .25rem;
-	flex-shrink: 0;
-
-	.color-bubble, .icon {
-		transition: all $transition;
-		position: absolute;
-		width: 12px;
-		margin: 0 !important;
-		padding: 0 !important;
-	}
-}
-
-.project-menu-title {
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-
-.saved-filter-icon {
-	color: var(--grey-300) !important;
-	font-size: .75rem;
-}
-</style>
--- a/src/components/home/TheNavigation.vue
+++ b/src/components/home/TheNavigation.vue
@ -7,9 +7,8 @@

 		<MenuButton class="menu-button" />

-		<div v-if="currentProject?.id" class="project-title-wrapper">
-			<h1 class="project-title">
-				{{ currentProject.title === '' ? $t('misc.loading') : getProjectTitle(currentProject) }}
+		<div v-if="currentProject.id" class="project-title-wrapper">
+			<h1 class="project-title">{{ currentProject.title === '' ? $t('misc.loading') : getProjectTitle(currentProject) }}
 			</h1>

 			<BaseButton :to="{ name: 'project.info', params: { projectId: currentProject.id } }" class="project-title-button">
@ -90,7 +89,7 @@ import { useAuthStore } from '@/stores/auth'
 const baseStore = useBaseStore()
 const currentProject = computed(() => baseStore.currentProject)
 const background = computed(() => baseStore.background)
-const canWriteCurrentProject = computed(() => baseStore.currentProject?.maxRight > Rights.READ)
+const canWriteCurrentProject = computed(() => baseStore.currentProject.maxRight > Rights.READ)
 const menuActive = computed(() => baseStore.menuActive)

 const authStore = useAuthStore()
--- a/src/components/home/UpdateNotification.vue
+++ b/src/components/home/UpdateNotification.vue
@ -12,12 +12,9 @@
 </template>

 <script lang="ts" setup>
-import {computed, ref} from 'vue'
-import {useBaseStore} from '@/stores/base'
+import {ref} from 'vue'

-const baseStore = useBaseStore()
-
-const updateAvailable = computed(() => baseStore.updateAvailable)
+const updateAvailable = ref(false)
 const registration = ref(null)
 const refreshing = ref(false)

@ -34,11 +31,11 @@ navigator?.serviceWorker?.addEventListener(
 function showRefreshUI(e: Event) {
 	console.log('recieved refresh event', e)
 	registration.value = e.detail
-	baseStore.setUpdateAvailable(true)
+	updateAvailable.value = true
 }

 function refreshApp() {
-	baseStore.setUpdateAvailable(false)
+	updateAvailable.value = false
 	if (!registration.value || !registration.value.waiting) {
 		return
 	}
@ -68,6 +65,7 @@ function refreshApp() {
 	border-radius: $radius;
 	font-size: .9rem;
 	color: var(--grey-900);
+
 }

 .update-notification__message {
--- a/src/components/home/contentAuth.vue
+++ b/src/components/home/contentAuth.vue
@ -69,7 +69,6 @@ import BaseButton from '@/components/base/BaseButton.vue'

 import {useBaseStore} from '@/stores/base'
 import {useLabelStore} from '@/stores/labels'
-import {useProjectStore} from '@/stores/projects'

 import {useRouteWithModal} from '@/composables/useRouteWithModal'
 import {useRenewTokenOnFocus} from '@/composables/useRenewTokenOnFocus'
@ -95,13 +94,14 @@ watch(() => route.name as string, (routeName) => {
 		(
 			[
 				'home',
+				'namespace.edit',
 				'teams.index',
 				'teams.edit',
 				'tasks.range',
 				'labels.index',
 				'migrate.start',
 				'migrate.wunderlist',
-				'projects.index',
+				'namespaces.index',
 			].includes(routeName) ||
 			routeName.startsWith('user.settings')
 		)
@ -116,9 +116,6 @@ useRenewTokenOnFocus()

 const labelStore = useLabelStore()
 labelStore.loadAllLabels()
-
-const projectStore = useProjectStore()
-projectStore.loadProjects()
 </script>

 <style lang="scss" scoped>
--- a/src/components/home/contentLinkShare.vue
+++ b/src/components/home/contentLinkShare.vue
@ -9,9 +9,9 @@
 				<Logo class="logo" v-if="logoVisible"/>
 				<h1
 					:class="{'m-0': !logoVisible}"
-					:style="{ 'opacity': currentProject?.title === '' ? '0': '1' }"
+					:style="{ 'opacity': currentProject.title === '' ? '0': '1' }"
 					class="title">
-					{{ currentProject?.title === '' ? $t('misc.loading') : currentProject?.title }}
+					{{ currentProject.title === '' ? $t('misc.loading') : currentProject.title }}
 				</h1>
 				<div class="box has-text-left view">
 					<router-view/>
--- a/src/components/home/navigation.vue
+++ b/src/components/home/navigation.vue
@ -1,10 +1,10 @@
 <template>
-	<aside :class="{'is-active': baseStore.menuActive}" class="menu-container">
+	<aside :class="{'is-active': menuActive}" class="namespace-container">
 		<nav class="menu top-menu">
 			<router-link :to="{name: 'home'}" class="logo">
 				<Logo width="164" height="48"/>
 			</router-link>
-			<menu class="menu-list other-menu-items">
+			<ul class="menu-list">
 				<li>
 					<router-link :to="{ name: 'home'}" v-shortcut="'g o'">
 						<span class="menu-item-icon icon">
@ -22,11 +22,11 @@
 					</router-link>
 				</li>
 				<li>
-					<router-link :to="{ name: 'projects.index'}" v-shortcut="'g p'">
+					<router-link :to="{ name: 'namespaces.index'}" v-shortcut="'g n'">
 						<span class="menu-item-icon icon">
 							<icon icon="layer-group"/>
 						</span>
-						{{ $t('project.projects') }}
+						{{ $t('namespace.title') }}
 					</router-link>
 				</li>
 				<li>
@ -45,55 +45,238 @@
 						{{ $t('team.title') }}
 					</router-link>
 				</li>
-			</menu>
+			</ul>
 		</nav>

-		<Loading
-			v-if="projectStore.isLoading"
-			variant="small"
-		/>
-		<template v-else>
-			<nav class="menu" v-if="favoriteProjects">
-				<ProjectsNavigation
-					:model-value="favoriteProjects" 
-					:can-edit-order="false"
-					:can-collapse="false"
-				/>
-			</nav>
-
-			<nav class="menu">
-				<ProjectsNavigation
-					:model-value="projects"
-					:can-edit-order="true"
-					:can-collapse="true"
-					:level="1"
-				/>
-			</nav>
-		</template>
-
+		<nav class="menu namespaces-lists loader-container is-loading-small" :class="{'is-loading': loading}">
+			<template v-for="(n, nk) in namespaces" :key="n.id">
+				<div class="namespace-title" :class="{'has-menu': n.id > 0}">
+					<BaseButton
+						@click="toggleProjects(n.id)"
+						class="menu-label"
+						v-tooltip="namespaceTitles[nk]"
+					>
+						<ColorBubble
+								v-if="n.hexColor !== ''"
+								:color="n.hexColor"
+								class="mr-1"
+						/>
+						<span class="name">{{ namespaceTitles[nk] }}</span>
+						<div
+								class="icon menu-item-icon is-small toggle-lists-icon pl-2"
+								:class="{'active': typeof projectsVisible[n.id] !== 'undefined' ? projectsVisible[n.id] : true}"
+						>
+							<icon icon="chevron-down"/>
+						</div>
+						<span class="count" :class="{'ml-2 mr-0': n.id > 0}">
+							({{ namespaceProjectsCount[nk] }})
+						</span>
+					</BaseButton>
+					<namespace-settings-dropdown class="menu-list-dropdown" :namespace="n" v-if="n.id > 0"/>
+				</div>
+				<!--
+					NOTE: a v-model / computed setter is not possible, since the updateActiveProjects function
+					triggered by the change needs to have access to the current namespace
+				-->
+				<draggable
+						v-if="projectsVisible[n.id] ?? true"
+						v-bind="dragOptions"
+						:modelValue="activeProjects[nk]"
+						@update:modelValue="(projects) => updateActiveProjects(n, projects)"
+						group="namespace-lists"
+						@start="() => drag = true"
+						@end="saveListPosition"
+						handle=".handle"
+						:disabled="n.id < 0 || undefined"
+						tag="ul"
+						item-key="id"
+						:data-namespace-id="n.id"
+						:data-namespace-index="nk"
+						:component-data="{
+							type: 'transition-group',
+							name: !drag ? 'flip-list' : null,
+							class: [
+								'menu-list can-be-hidden',
+								{ 'dragging-disabled': n.id < 0 }
+							]
+						}"
+				>
+					<template #item="{element: l}">
+						<li
+							class="list-menu loader-container is-loading-small"
+							:class="{'is-loading': projectUpdating[l.id]}"
+						>
+							<BaseButton
+								:to="{ name: 'project.index', params: { projectId: l.id} }"
+								class="list-menu-link"
+								:class="{'router-link-exact-active': currentProject.id === l.id}"
+							>
+								<span class="icon menu-item-icon handle">
+									<icon icon="grip-lines"/>
+								</span>
+								<ColorBubble
+										v-if="l.hexColor !== ''"
+										:color="l.hexColor"
+										class="mr-1"
+								/>
+								<span class="list-menu-title">{{ getProjectTitle(l) }}</span>
+							</BaseButton>
+							<BaseButton
+								v-if="l.id > 0"
+								class="favorite"
+								:class="{'is-favorite': l.isFavorite}"
+								@click="projectStore.toggleProjectFavorite(l)"
+							>
+								<icon :icon="l.isFavorite ? 'star' : ['far', 'star']"/>
+							</BaseButton>
+							<ProjectSettingsDropdown class="menu-list-dropdown" :project="l" v-if="l.id > 0">
+								<template #trigger="{toggleOpen}">
+									<BaseButton class="menu-list-dropdown-trigger" @click="toggleOpen">
+										<icon icon="ellipsis-h" class="icon"/>
+									</BaseButton>
+								</template>
+							</ProjectSettingsDropdown>
+							<span class="list-setting-spacer" v-else></span>
+						</li>
+					</template>
+				</draggable>
+			</template>
+		</nav>
 		<PoweredByLink/>
 	</aside>
 </template>

 <script setup lang="ts">
-import {computed} from 'vue'
+import {ref, computed, onBeforeMount} from 'vue'
+import draggable from 'zhyswan-vuedraggable'
+import type {SortableEvent} from 'sortablejs'

+import BaseButton from '@/components/base/BaseButton.vue'
+import ProjectSettingsDropdown from '@/components/project/project-settings-dropdown.vue'
+import NamespaceSettingsDropdown from '@/components/namespace/namespace-settings-dropdown.vue'
 import PoweredByLink from '@/components/home/PoweredByLink.vue'
 import Logo from '@/components/home/Logo.vue'
-import Loading from '@/components/misc/loading.vue'
+
+import {calculateItemPosition} from '@/helpers/calculateItemPosition'
+import {getNamespaceTitle} from '@/helpers/getNamespaceTitle'
+import {getProjectTitle} from '@/helpers/getProjectTitle'
+import type {IProject} from '@/modelTypes/IProject'
+import type {INamespace} from '@/modelTypes/INamespace'
+import ColorBubble from '@/components/misc/colorBubble.vue'

 import {useBaseStore} from '@/stores/base'
 import {useProjectStore} from '@/stores/projects'
-import ProjectsNavigation from '@/components/home/ProjectsNavigation.vue'
+import {useNamespaceStore} from '@/stores/namespaces'
+
+const drag = ref(false)
+const dragOptions = {
+	animation: 100,
+	ghostClass: 'ghost',
+}

 const baseStore = useBaseStore()
+const namespaceStore = useNamespaceStore()
+const currentProject = computed(() => baseStore.currentProject)
+const menuActive = computed(() => baseStore.menuActive)
+const loading = computed(() => namespaceStore.isLoading)
+
+
+const namespaces = computed(() => {
+	return namespaceStore.namespaces.filter(n => !n.isArchived)
+})
+const activeProjects = computed(() => {
+	return namespaces.value.map(({projects}) => {
+		return projects?.filter(item => {
+			return typeof item !== 'undefined' && !item.isArchived
+		})
+	})
+})
+
+const namespaceTitles = computed(() => {
+	return namespaces.value.map((namespace) => getNamespaceTitle(namespace))
+})
+
+const namespaceProjectsCount = computed(() => {
+	return namespaces.value.map((_, index) => activeProjects.value[index]?.length ?? 0)
+})
+
 const projectStore = useProjectStore()

-const projects = computed(() => projectStore.notArchivedRootProjects)
-const favoriteProjects = computed(() => projectStore.favoriteProjects)
+function toggleProjects(namespaceId: INamespace['id']) {
+	projectsVisible.value[namespaceId] = !projectsVisible.value[namespaceId]
+}
+
+const projectsVisible = ref<{ [id: INamespace['id']]: boolean }>({})
+// FIXME: async action will be unfinished when component mounts
+onBeforeMount(async () => {
+	const namespaces = await namespaceStore.loadNamespaces()
+	namespaces.forEach(n => {
+		if (typeof projectsVisible.value[n.id] === 'undefined') {
+			projectsVisible.value[n.id] = true
+		}
+	})
+})
+
+function updateActiveProjects(namespace: INamespace, activeProjects: IProject[]) {
+	// This is a bit hacky: since we do have to filter out the archived items from the list
+	// for vue draggable updating it is not as simple as replacing it.
+	// To work around this, we merge the active projects with the archived ones. Doing so breaks the order
+	// because now all archived projects are sorted after the active ones. This is fine because they are sorted
+	// later when showing them anyway, and it makes the merging happening here a lot easier.
+	const projects = [
+		...activeProjects,
+		...namespace.projects.filter(l => l.isArchived),
+	]
+
+	namespaceStore.setNamespaceById({
+		...namespace,
+		projects,
+	})
+}
+
+const projectUpdating = ref<{ [id: INamespace['id']]: boolean }>({})
+
+async function saveListPosition(e: SortableEvent) {
+	if (!e.newIndex && e.newIndex !== 0) return
+
+	const namespaceId = parseInt(e.to.dataset.namespaceId as string)
+	const newNamespaceIndex = parseInt(e.to.dataset.namespaceIndex as string)
+
+	const projectsActive = activeProjects.value[newNamespaceIndex]
+	// If the project was dragged to the last position, Safari will report e.newIndex as the size of the projectsActive
+	// array instead of using the position. Because the index is wrong in that case, dragging the project will fail.
+	// To work around that we're explicitly checking that case here and decrease the index.
+	const newIndex = e.newIndex === projectsActive.length ? e.newIndex - 1 : e.newIndex
+
+	const project = projectsActive[newIndex]
+	const projectBefore = projectsActive[newIndex - 1] ?? null
+	const projectAfter = projectsActive[newIndex + 1] ?? null
+	projectUpdating.value[project.id] = true
+
+	const position = calculateItemPosition(
+		projectBefore !== null ? projectBefore.position : null,
+		projectAfter !== null ? projectAfter.position : null,
+	)
+
+	try {
+		// create a copy of the project in order to not violate pinia manipulation
+		await projectStore.updateProject({
+			...project,
+			position,
+			namespaceId,
+		})
+	} finally {
+		projectUpdating.value[project.id] = false
+	}
+}
 </script>

 <style lang="scss" scoped>
+$navbar-padding: 2rem;
+$vikunja-nav-background: var(--site-background);
+$vikunja-nav-color: var(--grey-700);
+$vikunja-nav-selected-width: 0.4rem;
+
 .logo {
 	display: block;

@ -106,10 +289,10 @@ const favoriteProjects = computed(() => projectStore.favoriteProjects)
 	}
 }

-.menu-container {
-	background: var(--site-background);
+.namespace-container {
+	background: $vikunja-nav-background;
 	color: $vikunja-nav-color;
-	padding: 1rem 0;
+	padding: 0 0 1rem;
 	transition: transform $transition-duration ease-in;
 	position: fixed;
 	top: $navbar-height;
@ -131,24 +314,252 @@ const favoriteProjects = computed(() => projectStore.favoriteProjects)
 	}
 }

-.top-menu .menu-list {
-	li {
-		font-weight: 600;
-		font-family: $vikunja-font;
+// these are general menu styles
+// should be in own components
+.menu {
+	.menu-label,
+	.menu-list .list-menu-link,
+	.menu-list a {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		cursor: pointer;
+
+		.color-bubble {
+			height: 12px;
+			flex: 0 0 12px;
+		}
 	}

-	.list-menu-link,
-	li > a {
-		padding-left: 2rem;
-		display: inline-block;
+	.menu-list {
+		li {
+			height: 44px;
+			display: flex;
+			align-items: center;

-		.icon {
-			padding-bottom: .25rem;
+			&:hover {
+				background: var(--white);
+			}
+
+			.menu-list-dropdown {
+				opacity: 1;
+				transition: $transition;
+			}
+
+			@media(hover: hover) and (pointer: fine) {
+				.menu-list-dropdown {
+					opacity: 0;
+				}
+
+				&:hover .menu-list-dropdown {
+					opacity: 1;
+				}
+			}
+
+		}
+
+		.menu-item-icon {
+			color: var(--grey-400);
+		}
+
+		.menu-list-dropdown-trigger {
+			display: flex;
+			padding: 0.5rem;
+		}
+
+		.flip-list-move {
+			transition: transform $transition-duration;
+		}
+
+		.ghost {
+			background: var(--grey-200);
+
+			* {
+				opacity: 0;
+			}
+		}
+
+		a:hover {
+			background: transparent;
+		}
+
+		.list-menu-link,
+		li > a {
+			color: $vikunja-nav-color;
+			padding: 0.75rem .5rem 0.75rem ($navbar-padding * 1.5 - 1.75rem);
+			transition: all 0.2s ease;
+
+			border-radius: 0;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			overflow: hidden;
+			width: 100%;
+			border-left: $vikunja-nav-selected-width solid transparent;
+
+			&:hover {
+				border-left: $vikunja-nav-selected-width solid var(--primary);
+			}
+
+			&.router-link-exact-active {
+				color: var(--primary);
+				border-left: $vikunja-nav-selected-width solid var(--primary);
+			}
+
+			.icon {
+				height: 1rem;
+				vertical-align: middle;
+				padding-right: 0.5rem;
+			}
+
+			&.router-link-exact-active .icon:not(.handle) {
+				color: var(--primary);
+			}
+
+			.handle {
+				opacity: 0;
+				transition: opacity $transition;
+				margin-right: .25rem;
+			}
+
+			&:hover .handle {
+				opacity: 1;
+			}
+		}
+		&:not(.dragging-disabled) .handle {
+			cursor: grab;
 		}
 	}
 }

-.menu + .menu {
+.top-menu {
+	margin-top: math.div($navbar-padding, 2);
+
+	.menu-list {
+		li {
+			font-weight: 600;
+			font-family: $vikunja-font;
+		}
+
+		.list-menu-link,
+		li > a {
+			padding-left: 2rem;
+			display: inline-block;
+
+			.icon {
+				padding-bottom: .25rem;
+			}
+		}
+	}
+}
+
+.namespaces-lists {
 	padding-top: math.div($navbar-padding, 2);
+
+	.menu-label {
+		font-size: 1rem;
+		font-weight: 700;
+		font-weight: bold;
+		font-family: $vikunja-font;
+		color: $vikunja-nav-color;
+		font-weight: 600;
+		min-height: 2.5rem;
+		padding-top: 0;
+		padding-left: $navbar-padding;
+
+		overflow: hidden;
+		margin-bottom: 0;
+		flex: 1 1 auto;
+
+		.name {
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
+			margin-right: auto;
+		}
+
+		.count {
+			color: var(--grey-500);
+			margin-right: .5rem;
+			// align brackets with number
+			font-feature-settings: "case";
+		}
+	}
+
+	.favorite {
+		margin-left: .25rem;
+		transition: opacity $transition, color $transition;
+		opacity: 1;
+
+		&.is-favorite {
+			color: var(--warning);
+			opacity: 1;
+		}
+	}
+
+
+	@media(hover: hover) and (pointer: fine) {
+		.list-menu .favorite {
+			opacity: 0;
+		}
+
+		.list-menu:hover .favorite,
+		.favorite.is-favorite {
+			opacity: 1;
+		}
+	}
+
+	.list-menu-title {
+		overflow: hidden;
+		text-overflow: ellipsis;
+		width: 100%;
+	}
+
+	.color-bubble {
+		width: 14px;
+		height: 14px;
+		flex-basis: auto;
+	}
+
+	.is-archived {
+		min-width: 85px;
+	}
+}
+
+.namespace-title {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	color: $vikunja-nav-color;
+	padding: 0 .25rem;
+
+	.toggle-lists-icon {
+		svg {
+			transition: all $transition;
+			transform: rotate(90deg);
+			opacity: 1;
+		}
+
+		&.active svg {
+			transform: rotate(0deg);
+			opacity: 0;
+		}
+	}
+
+	&:hover .toggle-lists-icon svg {
+		opacity: 1;
+	}
+
+	&:not(.has-menu) .toggle-lists-icon {
+		padding-right: 1rem;
+	}
+}
+
+.list-setting-spacer {
+	width: 2.5rem;
+	flex-shrink: 0;
+}
+
+.namespaces-list.loader-container.is-loading {
+	min-height: calc(100vh - #{$navbar-height + 1.5rem + 1rem + 1.5rem});
 }
 </style>
--- a/src/components/input/SelectNamespace.vue
+++ b/src/components/input/SelectNamespace.vue
@ -0,0 +1,63 @@
+<template>
+	<multiselect
+		v-model="selectedNamespaces"
+		:search-results="foundNamespaces"
+		:loading="namespaceService.loading"
+		:multiple="true"
+		:placeholder="$t('namespace.search')"
+		label="namespace"
+		@search="findNamespaces"
+	/>
+</template>
+
+<script setup lang="ts">
+import {computed, ref, shallowReactive, watchEffect, type PropType} from 'vue'
+
+import Multiselect from '@/components/input/multiselect.vue'
+
+import type {INamespace} from '@/modelTypes/INamespace'
+
+import NamespaceService from '@/services/namespace'
+import {includesById} from '@/helpers/utils'
+
+const props = defineProps({
+	modelValue: {
+		type: Array as PropType<INamespace[]>,
+		default: () => [],
+	},
+})
+const emit = defineEmits<{
+	(e: 'update:modelValue', value: INamespace[]): void
+}>()
+
+const namespaces = ref<INamespace[]>([])
+
+watchEffect(() => {
+	namespaces.value = props.modelValue
+})
+
+const selectedNamespaces = computed({
+	get() {
+		return namespaces.value
+	},
+	set: (value) => {
+		namespaces.value = value
+		emit('update:modelValue', value)
+	},
+})
+
+const namespaceService = shallowReactive(new NamespaceService())
+const foundNamespaces = ref<INamespace[]>([])
+
+async function findNamespaces(query: string) {
+	if (query === '') {
+		foundNamespaces.value = []
+		return
+	}
+
+	const response = await namespaceService.getAll({}, {s: query}) as INamespace[]
+
+	// Filter selected items from the results
+	foundNamespaces.value = response.filter(({id}) => !includesById(namespaces.value, id))
+}
+</script>
--- a/src/components/input/SimpleButton.vue
+++ b/src/components/input/SimpleButton.vue
@ -1,26 +0,0 @@
-<template>
-	<BaseButton class="simple-button">
-		<slot/>
-	</BaseButton>
-</template>
-
-<script lang="ts" setup>
-import BaseButton from '@/components/base/BaseButton.vue'
-</script>
-
-<style lang="scss" scoped>
-.simple-button {
-	color: var(--text);
-	padding: .25rem .5rem;
-	transition: background-color $transition;
-	border-radius: $radius;
-	display: block;
-	margin: .1rem 0;
-	width: 100%;
-	text-align: left;
-
-	&:hover {
-		background: var(--white);
-	}
-}
-</style>
--- a/src/components/input/datepicker.vue
+++ b/src/components/input/datepicker.vue
@ -1,15 +1,78 @@
 <template>
 	<div class="datepicker">
-		<SimpleButton @click.stop="toggleDatePopup" class="show" :disabled="disabled || undefined">
+		<BaseButton @click.stop="toggleDatePopup" class="show" :disabled="disabled || undefined">
 			{{ date === null ? chooseDateLabel : formatDateShort(date) }}
-		</SimpleButton>
+		</BaseButton>

 		<CustomTransition name="fade">
 			<div v-if="show" class="datepicker-popup" ref="datepickerPopup">

-				<DatepickerInline
-					v-model="date"
-					@update:model-value="updateData"
+				<BaseButton
+					v-if="(new Date()).getHours() < 21"
+					class="datepicker__quick-select-date"
+					@click.stop="setDate('today')"
+				>
+					<span class="icon"><icon :icon="['far', 'calendar-alt']"/></span>
+					<span class="text">
+						<span>{{ $t('input.datepicker.today') }}</span>
+						<span class="weekday">{{ getWeekdayFromStringInterval('today') }}</span>
+					</span>
+				</BaseButton>
+				<BaseButton
+					class="datepicker__quick-select-date"
+					@click.stop="setDate('tomorrow')"
+				>
+					<span class="icon"><icon :icon="['far', 'sun']"/></span>
+					<span class="text">
+						<span>{{ $t('input.datepicker.tomorrow') }}</span>
+						<span class="weekday">{{ getWeekdayFromStringInterval('tomorrow') }}</span>
+					</span>
+				</BaseButton>
+				<BaseButton
+					class="datepicker__quick-select-date"
+					@click.stop="setDate('nextMonday')"
+				>
+					<span class="icon"><icon icon="coffee"/></span>
+					<span class="text">
+						<span>{{ $t('input.datepicker.nextMonday') }}</span>
+						<span class="weekday">{{ getWeekdayFromStringInterval('nextMonday') }}</span>
+					</span>
+				</BaseButton>
+				<BaseButton
+					class="datepicker__quick-select-date"
+					@click.stop="setDate('thisWeekend')"
+				>
+					<span class="icon"><icon icon="cocktail"/></span>
+					<span class="text">
+						<span>{{ $t('input.datepicker.thisWeekend') }}</span>
+						<span class="weekday">{{ getWeekdayFromStringInterval('thisWeekend') }}</span>
+					</span>
+				</BaseButton>
+				<BaseButton
+					class="datepicker__quick-select-date"
+					@click.stop="setDate('laterThisWeek')"
+				>
+					<span class="icon"><icon icon="chess-knight"/></span>
+					<span class="text">
+						<span>{{ $t('input.datepicker.laterThisWeek') }}</span>
+						<span class="weekday">{{ getWeekdayFromStringInterval('laterThisWeek') }}</span>
+					</span>
+				</BaseButton>
+				<BaseButton
+					class="datepicker__quick-select-date"
+					@click.stop="setDate('nextWeek')"
+				>
+					<span class="icon"><icon icon="forward"/></span>
+					<span class="text">
+						<span>{{ $t('input.datepicker.nextWeek') }}</span>
+						<span class="weekday">{{ getWeekdayFromStringInterval('nextWeek') }}</span>
+					</span>
+				</BaseButton>
+
+				<flat-pickr
+					:config="flatPickerConfig"
+					class="input"
+					v-model="flatPickrDate"
 				/>

 				<x-button
@ -26,15 +89,19 @@
 </template>

 <script setup lang="ts">
-import {ref, onMounted, onBeforeUnmount, toRef, watch, type PropType} from 'vue'
+import {ref, onMounted, onBeforeUnmount, toRef, watch, computed, type PropType} from 'vue'
+import flatPickr from 'vue-flatpickr-component'
+import 'flatpickr/dist/flatpickr.css'

+import BaseButton from '@/components/base/BaseButton.vue'
 import CustomTransition from '@/components/misc/CustomTransition.vue'
-import DatepickerInline from '@/components/input/datepickerInline.vue'
-import SimpleButton from '@/components/input/SimpleButton.vue'

-import {formatDateShort} from '@/helpers/time/formatDate'
+import {formatDate, formatDateShort} from '@/helpers/time/formatDate'
+import {calculateDayInterval} from '@/helpers/time/calculateDayInterval'
+import {calculateNearestHours} from '@/helpers/time/calculateNearestHours'
 import {closeWhenClickedOutside} from '@/helpers/closeWhenClickedOutside'
 import {createDateFromString} from '@/helpers/time/createDateFromString'
+import {useAuthStore} from '@/stores/auth'
 import {useI18n} from 'vue-i18n'

 const props = defineProps({
@ -58,6 +125,8 @@ const props = defineProps({

 const emit = defineEmits(['update:modelValue', 'close', 'close-on-change'])

+const {t} = useI18n({useScope: 'global'})
+
 const date = ref<Date | null>()
 const show = ref(false)
 const changed = ref(false)
@ -72,6 +141,37 @@ watch(
 	{immediate: true},
 )

+const authStore = useAuthStore()
+const weekStart = computed(() => authStore.settings.weekStart)
+const flatPickerConfig = computed(() => ({
+	altFormat: t('date.altFormatLong'),
+	altInput: true,
+	dateFormat: 'Y-m-d H:i',
+	enableTime: true,
+	time_24hr: true,
+	inline: true,
+	locale: {
+		firstDayOfWeek: weekStart.value,
+	},
+}))
+
+// Since flatpickr dates are strings, we need to convert them to native date objects.
+// To make that work, we need a separate variable since flatpickr does not have a change event.
+const flatPickrDate = computed({
+	set(newValue: string | Date) {
+		date.value = createDateFromString(newValue)
+		updateData()
+	},
+	get() {
+		if (!date.value) {
+			return ''
+		}
+
+		return formatDate(date.value, 'yyy-LL-dd H:mm')
+	},
+})
+
+
 function setDateValue(dateString: string | Date | null) {
 	if (dateString === null) {
 		date.value = null
@ -112,6 +212,29 @@ function close() {
 		}
 	}, 200)
 }
+
+function setDate(dateString: string) {
+	if (date.value === null) {
+		date.value = new Date()
+	}
+
+	const interval = calculateDayInterval(dateString)
+	const newDate = new Date()
+	newDate.setDate(newDate.getDate() + interval)
+	newDate.setHours(calculateNearestHours(newDate))
+	newDate.setMinutes(0)
+	newDate.setSeconds(0)
+	date.value = newDate
+	flatPickrDate.value = newDate
+	updateData()
+}
+
+function getWeekdayFromStringInterval(dateString: string) {
+	const interval = calculateDayInterval(dateString)
+	const newDate = new Date()
+	newDate.setDate(newDate.getDate() + interval)
+	return formatDate(newDate, 'E')
+}
 </script>

 <style lang="scss" scoped>
@ -134,6 +257,42 @@ function close() {
 	}
 }

+.datepicker__quick-select-date {
+	display: flex;
+	align-items: center;
+	padding: 0 .5rem;
+	width: 100%;
+	height: 2.25rem;
+	color: var(--text);
+	transition: all $transition;
+
+	&:first-child {
+		border-radius: $radius $radius 0 0;
+	}
+
+	&:hover {
+		background: var(--grey-100);
+	}
+
+	.text {
+		width: 100%;
+		font-size: .85rem;
+		display: flex;
+		justify-content: space-between;
+		padding-right: .25rem;
+
+		.weekday {
+			color: var(--text-light);
+			text-transform: capitalize;
+		}
+	}
+
+	.icon {
+		width: 2rem;
+		text-align: center;
+	}
+}
+	
 .datepicker__close-button {
 	margin: 1rem;
 	width: calc(100% - 2rem);
--- a/src/components/input/datepickerInline.vue
+++ b/src/components/input/datepickerInline.vue
@ -1,228 +0,0 @@
-<template>
-	<BaseButton
-		v-if="(new Date()).getHours() < 21"
-		class="datepicker__quick-select-date"
-		@click.stop="setDate('today')"
-	>
-		<span class="icon"><icon :icon="['far', 'calendar-alt']"/></span>
-		<span class="text">
-			<span>{{ $t('input.datepicker.today') }}</span>
-			<span class="weekday">{{ getWeekdayFromStringInterval('today') }}</span>
-		</span>
-	</BaseButton>
-	<BaseButton
-		class="datepicker__quick-select-date"
-		@click.stop="setDate('tomorrow')"
-	>
-		<span class="icon"><icon :icon="['far', 'sun']"/></span>
-		<span class="text">
-			<span>{{ $t('input.datepicker.tomorrow') }}</span>
-			<span class="weekday">{{ getWeekdayFromStringInterval('tomorrow') }}</span>
-		</span>
-	</BaseButton>
-	<BaseButton
-		class="datepicker__quick-select-date"
-		@click.stop="setDate('nextMonday')"
-	>
-		<span class="icon"><icon icon="coffee"/></span>
-		<span class="text">
-			<span>{{ $t('input.datepicker.nextMonday') }}</span>
-			<span class="weekday">{{ getWeekdayFromStringInterval('nextMonday') }}</span>
-		</span>
-	</BaseButton>
-	<BaseButton
-		class="datepicker__quick-select-date"
-		@click.stop="setDate('thisWeekend')"
-	>
-		<span class="icon"><icon icon="cocktail"/></span>
-		<span class="text">
-			<span>{{ $t('input.datepicker.thisWeekend') }}</span>
-			<span class="weekday">{{ getWeekdayFromStringInterval('thisWeekend') }}</span>
-		</span>
-	</BaseButton>
-	<BaseButton
-		class="datepicker__quick-select-date"
-		@click.stop="setDate('laterThisWeek')"
-	>
-		<span class="icon"><icon icon="chess-knight"/></span>
-		<span class="text">
-			<span>{{ $t('input.datepicker.laterThisWeek') }}</span>
-			<span class="weekday">{{ getWeekdayFromStringInterval('laterThisWeek') }}</span>
-		</span>
-	</BaseButton>
-	<BaseButton
-		class="datepicker__quick-select-date"
-		@click.stop="setDate('nextWeek')"
-	>
-		<span class="icon"><icon icon="forward"/></span>
-		<span class="text">
-			<span>{{ $t('input.datepicker.nextWeek') }}</span>
-			<span class="weekday">{{ getWeekdayFromStringInterval('nextWeek') }}</span>
-		</span>
-	</BaseButton>
-
-	<div class="flatpickr-container">
-		<flat-pickr
-			:config="flatPickerConfig"
-			v-model="flatPickrDate"
-		/>
-	</div>
-</template>
-
-<script lang="ts" setup>
-import {ref, toRef, watch, computed, type PropType} from 'vue'
-import flatPickr from 'vue-flatpickr-component'
-import 'flatpickr/dist/flatpickr.css'
-
-import BaseButton from '@/components/base/BaseButton.vue'
-
-import {formatDate} from '@/helpers/time/formatDate'
-import {calculateDayInterval} from '@/helpers/time/calculateDayInterval'
-import {calculateNearestHours} from '@/helpers/time/calculateNearestHours'
-import {createDateFromString} from '@/helpers/time/createDateFromString'
-import {useAuthStore} from '@/stores/auth'
-import {useI18n} from 'vue-i18n'
-
-const props = defineProps({
-	modelValue: {
-		type: [Date, null, String] as PropType<Date | null | string>,
-		validator: prop => prop instanceof Date || prop === null || typeof prop === 'string',
-		default: null,
-	},
-})
-
-const emit = defineEmits(['update:modelValue', 'close-on-change'])
-
-const {t} = useI18n({useScope: 'global'})
-
-const date = ref<Date | null>()
-const changed = ref(false)
-
-const modelValue = toRef(props, 'modelValue')
-watch(
-	modelValue,
-	setDateValue,
-	{immediate: true},
-)
-
-const authStore = useAuthStore()
-const weekStart = computed(() => authStore.settings.weekStart)
-const flatPickerConfig = computed(() => ({
-	altFormat: t('date.altFormatLong'),
-	altInput: true,
-	dateFormat: 'Y-m-d H:i',
-	enableTime: true,
-	time_24hr: true,
-	inline: true,
-	locale: {
-		firstDayOfWeek: weekStart.value,
-	},
-}))
-
-// Since flatpickr dates are strings, we need to convert them to native date objects.
-// To make that work, we need a separate variable since flatpickr does not have a change event.
-const flatPickrDate = computed({
-	set(newValue: string | Date | null) {
-		if (newValue === null) {
-			date.value = null
-			return
-		}
-
-		date.value = createDateFromString(newValue)
-		updateData()
-	},
-	get() {
-		if (!date.value) {
-			return ''
-		}
-
-		return formatDate(date.value, 'yyy-LL-dd H:mm')
-	},
-})
-
-
-function setDateValue(dateString: string | Date | null) {
-	if (dateString === null) {
-		date.value = null
-		return
-	}
-	date.value = createDateFromString(dateString)
-}
-
-function updateData() {
-	changed.value = true
-	emit('update:modelValue', date.value)
-}
-
-function setDate(dateString: string) {
-	if (date.value === null) {
-		date.value = new Date()
-	}
-
-	const interval = calculateDayInterval(dateString)
-	const newDate = new Date()
-	newDate.setDate(newDate.getDate() + interval)
-	newDate.setHours(calculateNearestHours(newDate))
-	newDate.setMinutes(0)
-	newDate.setSeconds(0)
-	date.value = newDate
-	flatPickrDate.value = newDate
-	updateData()
-}
-
-function getWeekdayFromStringInterval(dateString: string) {
-	const interval = calculateDayInterval(dateString)
-	const newDate = new Date()
-	newDate.setDate(newDate.getDate() + interval)
-	return formatDate(newDate, 'E')
-}
-</script>
-
-<style lang="scss" scoped>
-.datepicker__quick-select-date {
-	display: flex;
-	align-items: center;
-	padding: 0 .5rem;
-	width: 100%;
-	height: 2.25rem;
-	color: var(--text);
-	transition: all $transition;
-
-	&:first-child {
-		border-radius: $radius $radius 0 0;
-	}
-
-	&:hover {
-		background: var(--grey-100);
-	}
-
-	.text {
-		width: 100%;
-		font-size: .85rem;
-		display: flex;
-		justify-content: space-between;
-		padding-right: .25rem;
-
-		.weekday {
-			color: var(--text-light);
-			text-transform: capitalize;
-		}
-	}
-
-	.icon {
-		width: 2rem;
-		text-align: center;
-	}
-}
-
-.flatpickr-container {
-	:deep(.flatpickr-calendar) {
-		margin: 0 auto 8px;
-		box-shadow: none;
-	}
-
-	:deep(.input) {
-		border: none;
-	}
-}
-</style>
--- a/src/components/input/editor.vue
+++ b/src/components/input/editor.vue
@ -4,7 +4,7 @@

 		<vue-easymde
 			:configs="config"
-			@change="() => bubbleNow()"
+			@change="() => bubble()"
 			@update:modelValue="handleInput"
 			class="content"
 			v-if="isEditActive"
@ -35,7 +35,7 @@
 				</BaseButton>
 				<BaseButton
 					v-else-if="isEditActive"
-					@click="bubbleSaveClick"
+					@click="toggleEdit"
 					class="done-edit">
 					{{ $t('misc.save') }}
 				</BaseButton>
@ -56,7 +56,7 @@
 			</ul>
 			<x-button
 				v-else-if="isEditActive"
-				@click="bubbleSaveClick"
+				@click="toggleEdit"
 				variant="secondary"
 				:shadow="false"
 				v-cy="'saveEditor'">
@ -84,8 +84,8 @@ import {createRandomID} from '@/helpers/randomId'

 import BaseButton from '@/components/base/BaseButton.vue'
 import ButtonLink from '@/components/misc/ButtonLink.vue'
-import type {IAttachment} from '@/modelTypes/IAttachment'
-import type {ITask} from '@/modelTypes/ITask'
+import type { IAttachment } from '@/modelTypes/IAttachment'
+import type { ITask } from '@/modelTypes/ITask'

 const props = defineProps({
 	modelValue: {
@ -115,7 +115,7 @@ const props = defineProps({
 		default: true,
 	},
 	bottomActions: {
-		type: Array,
+		type: Array, 
 		default: () => [],
 	},
 	emptyText: {
@ -134,9 +134,10 @@ const props = defineProps({
 	},
 })

-const emit = defineEmits(['update:modelValue', 'save'])
+const emit = defineEmits(['update:modelValue'])

 const text = ref('')
+const changeTimeout = ref<ReturnType<typeof setTimeout> | null>(null)
 const isEditActive = ref(false)
 const isPreviewActive = ref(true)

@ -147,7 +148,7 @@ const preview = ref('')
 const attachmentService = new AttachmentService()

 type CacheKey = `${ITask['id']}-${IAttachment['id']}`
-const loadedAttachments = ref<{ [key: CacheKey]: string }>({})
+const loadedAttachments = ref<{[key: CacheKey]: string}>({})
 const config = ref(createEasyMDEConfig({
 	placeholder: props.placeholder,
 	uploadImage: props.uploadEnabled,
@ -174,7 +175,7 @@ watch(
 		if (oldVal === '' && text.value === modelValue.value) {
 			return
 		}
-		bubbleNow()
+		bubble()
 	},
 )

@ -207,11 +208,17 @@ function handleInput(val: string) {
 	}

 	text.value = val
-	bubbleNow()
+	bubble(1000)
 }

-function bubbleNow() {
-	emit('update:modelValue', text.value)
+function bubble(timeout = 500) {
+	if (changeTimeout.value !== null) {
+		clearTimeout(changeTimeout.value)
+	}
+
+	changeTimeout.value = setTimeout(() => {
+		emit('update:modelValue', text.value)
+	}, timeout)
 }

 function replaceAt(str: string, index: number, replacement: string) {
@ -280,26 +287,24 @@ function handleCheckboxClick(e: Event) {
 		return
 	}
 	const projectPrefix = text.value.substring(index, index + 1)
-
+	
 	console.debug({index, projectPrefix, checked, text: text.value})

 	text.value = replaceAt(text.value, index, `${projectPrefix} ${checked ? '[x]' : '[ ]'} `)
-	bubbleNow()
-	emit('save', text.value)
+	bubble()
 	renderPreview()
 }

 function toggleEdit() {
-	isPreviewActive.value = false
-	isEditActive.value = true
-}
-
-function bubbleSaveClick() {
-	isPreviewActive.value = true
-	isEditActive.value = false
-	renderPreview()
-	bubbleNow()
-	emit('save', text.value)
+	if (isEditActive.value) {
+		isPreviewActive.value = true
+		isEditActive.value = false
+		renderPreview()
+		bubble(0) // save instantly
+	} else {
+		isPreviewActive.value = false
+		isEditActive.value = true
+	}
 }
 </script>

--- a/src/components/input/multiselect.vue
+++ b/src/components/input/multiselect.vue
@ -32,8 +32,6 @@
 					@keydown.down.exact.prevent="() => preSelect(0)"
 					ref="searchInput"
 					@focus="handleFocus"
-					:autocomplete="autocompleteEnabled ? undefined : 'off'"
-					:spellcheck="autocompleteEnabled ? undefined : 'false'"
 				/>
 			</div>
 		</div>
@ -198,13 +196,6 @@ const props = defineProps({
 		type: Boolean,
 		default: true,
 	},
-	/**
-	 * If false, the search input will get the autocomplete="off" attributes attached to it.
-	 */
-	autocompleteEnabled: {
-		type: Boolean,
-		default: true,
-	},
 })

 const emit = defineEmits<{
--- a/src/components/misc/Icon.ts
+++ b/src/components/misc/Icon.ts
@ -4,7 +4,6 @@ import {
 	faAngleRight,
 	faArchive,
 	faArrowLeft,
-	faArrowUpFromBracket,
 	faBars,
 	faBell,
 	faCalendar,
@ -57,7 +56,7 @@ import {
 	faTimes,
 	faTrashAlt,
 	faUser,
-	faUsers, faX,
+	faUsers,
 } from '@fortawesome/free-solid-svg-icons'
 import {
 	faBellSlash,
@ -68,11 +67,10 @@ import {
 	faStar,
 	faSun,
 	faTimesCircle,
-	faCircleQuestion,
 } from '@fortawesome/free-regular-svg-icons'
 import {FontAwesomeIcon} from '@fortawesome/vue-fontawesome'

-import type {FontAwesomeIcon as FontAwesomeIconFixedTypes} from '@/types/vue-fontawesome'
+import type { FontAwesomeIcon as FontAwesomeIconFixedTypes } from '@/types/vue-fontawesome'

 library.add(faAlignLeft)
 library.add(faAngleRight)
@ -88,7 +86,6 @@ library.add(faCheckDouble)
 library.add(faChessKnight)
 library.add(faChevronDown)
 library.add(faCircleInfo)
-library.add(faCircleQuestion)
 library.add(faClock)
 library.add(faCloudDownloadAlt)
 library.add(faCloudUploadAlt)
@ -140,8 +137,6 @@ library.add(faTimesCircle)
 library.add(faTrashAlt)
 library.add(faUser)
 library.add(faUsers)
-library.add(faArrowUpFromBracket)
-library.add(faX)

 // overwriting the wrong types
 export default FontAwesomeIcon as unknown as FontAwesomeIconFixedTypes
--- a/src/components/misc/card.vue
+++ b/src/components/misc/card.vue
@ -24,12 +24,12 @@
 			}"
 		>
 			<div :class="{'content': hasContent}">
-				<slot/>
+				<slot />
 			</div>
 		</div>

 		<footer v-if="$slots.footer" class="card-footer">
-			<slot name="footer"/>
+			<slot name="footer" />
 		</footer>
 	</div>
 </template>
@ -76,27 +76,22 @@ defineEmits(['close'])

 <style lang="scss" scoped>
 .card {
-	background-color: var(--white);
-	border-radius: $radius;
-	margin-bottom: 1rem;
-	border: 1px solid var(--card-border-color);
-	box-shadow: var(--shadow-sm);
-
-	@media print {
-		box-shadow: none;
-		border: none;
-	}
+  background-color: var(--white);
+  border-radius: $radius;
+  margin-bottom: 1rem;
+  border: 1px solid var(--card-border-color);
+  box-shadow: var(--shadow-sm);
 }

 .card-header {
-	box-shadow: none;
-	border-bottom: 1px solid var(--card-border-color);
-	border-radius: $radius $radius 0 0;
+  box-shadow: none;
+  border-bottom: 1px solid var(--card-border-color);
+  border-radius: $radius $radius 0 0;
 }

 .card-footer {
-	background-color: var(--grey-50);
-	border-top: 0;
+  background-color: var(--grey-50);
+  border-top: 0;
 	padding: var(--modal-card-head-padding);
 	display: flex;
 	justify-content: flex-end;
--- a/src/components/misc/keyboard-shortcuts/shortcuts.ts
+++ b/src/components/misc/keyboard-shortcuts/shortcuts.ts
@ -44,8 +44,8 @@ export const KEYBOARD_SHORTCUTS : ShortcutGroup[] = [
 				combination: 'then',
 			},
 			{
-				title: 'keyboardShortcuts.navigation.projects',
-				keys: ['g', 'p'],
+				title: 'keyboardShortcuts.navigation.namespaces',
+				keys: ['g', 'n'],
 				combination: 'then',
 			},
 			{
@ -140,18 +140,6 @@ export const KEYBOARD_SHORTCUTS : ShortcutGroup[] = [
 				title: 'keyboardShortcuts.task.description',
 				keys: ['e'],
 			},
-			{
-				title: 'keyboardShortcuts.task.priority',
-				keys: ['p'],
-			},
-			{
-				title: 'keyboardShortcuts.task.delete',
-				keys: ['shift', 'delete'],
-			},
-			{
-				title: 'keyboardShortcuts.task.favorite',
-				keys: ['s'],
-			},
 		],
 	},
-]
+]
--- a/src/components/misc/loading.vue
+++ b/src/components/misc/loading.vue
@ -1,21 +1,13 @@
 <template>
-	<div class="loader-container is-loading" :class="{'is-small': variant === 'small'}"></div>
+	<div class="loader-container is-loading"></div>
 </template>

 <script lang="ts">
 export default {
-	inheritAttrs: true,
+	inheritAttrs: false,
 }
 </script>

-<script lang="ts" setup>
-const {
-	variant = 'default',
-} = defineProps<{
-	variant?: 'default' | 'small'
-}>()
-</script>
-
 <style scoped lang="scss">
 .loader-container {
 	height: 100%;
@ -28,18 +20,5 @@ const {
 		min-height: 50px;
 		min-width: 100px;
 	}
-
-	&.is-small {
-		min-width: 100%;
-		height: 150px;
-
-		&.is-loading::after {
-			width: 3rem;
-			height: 3rem;
-			top: calc(50% - 1.5rem);
-			left: calc(50% - 1.5rem);
-			border-width: 3px;
-		}
-	}
 }
 </style>
--- a/src/components/misc/popup.vue
+++ b/src/components/misc/popup.vue
@ -8,7 +8,7 @@
 		}"
 		ref="popup"
 	>
-		<slot name="content" :isOpen="open" :toggle="toggle"/>
+		<slot name="content" :isOpen="open"/>
 	</div>
 </template>

@ -23,14 +23,11 @@ const props = defineProps({
 	},
 })

-const emit = defineEmits(['close'])
-
 const open = ref(false)
 const popup = ref<HTMLElement | null>(null)

 function close() {
 	open.value = false
-	emit('close')
 }

 function toggle() {
--- a/src/components/misc/subscription.vue
+++ b/src/components/misc/subscription.vue
@ -47,7 +47,7 @@ import {success} from '@/message'
 import type { IconProp } from '@fortawesome/fontawesome-svg-core'

 const props = defineProps({
-	entity: String as ISubscription['entity'],
+	entity: String,
 	entityId: Number,
 	isButton: {
 		type: Boolean,
@ -73,6 +73,12 @@ const {t} = useI18n({useScope: 'global'})

 const tooltipText = computed(() => {
 	if (disabled.value) {
+		if (props.entity === 'project' && subscriptionEntity.value === 'namespace') {
+			return t('task.subscription.subscribedProjectThroughParentNamespace')
+		}
+		if (props.entity === 'task' && subscriptionEntity.value === 'namespace') {
+			return t('task.subscription.subscribedTaskThroughParentNamespace')
+		}
 		if (props.entity === 'task' && subscriptionEntity.value === 'project') {
 			return t('task.subscription.subscribedTaskThroughParentProject')
 		}
@ -81,6 +87,10 @@ const tooltipText = computed(() => {
 	}

 	switch (props.entity) {
+		case 'namespace':
+			return props.modelValue !== null ?
+				t('task.subscription.subscribedNamespace') :
+				t('task.subscription.notSubscribedNamespace')
 		case 'project':
 			return props.modelValue !== null ?
 				t('task.subscription.subscribedProject') :
@ -120,6 +130,9 @@ async function subscribe() {

 	let message = ''
 	switch (props.entity) {
+		case 'namespace':
+			message = t('task.subscription.subscribeSuccessNamespace')
+			break
 		case 'project':
 			message = t('task.subscription.subscribeSuccessProject')
 			break
@ -140,6 +153,9 @@ async function unsubscribe() {

 	let message = ''
 	switch (props.entity) {
+		case 'namespace':
+			message = t('task.subscription.unsubscribeSuccessNamespace')
+			break
 		case 'project':
 			message = t('task.subscription.unsubscribeSuccessProject')
 			break
--- a/src/components/misc/user.vue
+++ b/src/components/misc/user.vue
@ -48,11 +48,10 @@ const displayName = computed(() => getDisplayName(props.user))

 <style lang="scss" scoped>
 .user {
-	display: flex;
-	justify-items: center;
+	margin: .5rem;

 	&.is-inline {
-		display: inline-flex;
+		display: inline;
 	}
 }

--- a/src/components/namespace/namespace-settings-dropdown.vue
+++ b/src/components/namespace/namespace-settings-dropdown.vue
@ -0,0 +1,103 @@
+<template>
+	<dropdown>
+		<template #trigger="triggerProps">
+			<slot name="trigger" v-bind="triggerProps">
+				<BaseButton class="dropdown-trigger" @click="triggerProps.toggleOpen">
+					<icon icon="ellipsis-h" class="icon"/>
+				</BaseButton>
+			</slot>
+		</template>
+
+		<template v-if="namespace.isArchived">
+			<dropdown-item
+				:to="{ name: 'namespace.settings.archive', params: { id: namespace.id } }"
+				icon="archive"
+			>
+				{{ $t('menu.unarchive') }}
+			</dropdown-item>
+		</template>
+		<template v-else>
+			<dropdown-item
+				:to="{ name: 'namespace.settings.edit', params: { id: namespace.id } }"
+				icon="pen"
+			>
+				{{ $t('menu.edit') }}
+			</dropdown-item>
+			<dropdown-item
+				:to="{ name: 'namespace.settings.share', params: { namespaceId: namespace.id } }"
+				icon="share-alt"
+			>
+				{{ $t('menu.share') }}
+			</dropdown-item>
+			<dropdown-item
+				:to="{ name: 'project.create', params: { namespaceId: namespace.id } }"
+				icon="plus"
+			>
+				{{ $t('menu.newProject') }}
+			</dropdown-item>
+			<dropdown-item
+				:to="{ name: 'namespace.settings.archive', params: { id: namespace.id } }"
+				icon="archive"
+			>
+				{{ $t('menu.archive') }}
+			</dropdown-item>
+			<Subscription
+				class="has-no-shadow"
+				:is-button="false"
+				entity="namespace"
+				:entity-id="namespace.id"
+				:model-value="subscription"
+				@update:model-value="setSubscriptionInStore"
+				type="dropdown"
+			/>
+			<dropdown-item
+				:to="{ name: 'namespace.settings.delete', params: { id: namespace.id } }"
+				icon="trash-alt"
+				class="has-text-danger"
+			>
+				{{ $t('menu.delete') }}
+			</dropdown-item>
+		</template>
+	</dropdown>
+</template>
+
+<script setup lang="ts">
+import {ref, onMounted, type PropType} from 'vue'
+
+import BaseButton from '@/components/base/BaseButton.vue'
+import Dropdown from '@/components/misc/dropdown.vue'
+import DropdownItem from '@/components/misc/dropdown-item.vue'
+import Subscription from '@/components/misc/subscription.vue'
+import type {INamespace} from '@/modelTypes/INamespace'
+import type {ISubscription} from '@/modelTypes/ISubscription'
+import {useNamespaceStore} from '@/stores/namespaces'
+
+const props = defineProps({
+	namespace: {
+		type: Object as PropType<INamespace>,
+		required: true,
+	},
+})
+
+const namespaceStore = useNamespaceStore()
+
+const subscription = ref<ISubscription | null>(null)
+onMounted(() => {
+	subscription.value = props.namespace.subscription
+})
+
+function setSubscriptionInStore(sub: ISubscription) {
+	subscription.value = sub
+	namespaceStore.setNamespaceById({
+		...props.namespace,
+		subscription: sub,
+	})
+}
+</script>
+
+<style scoped lang="scss">
+.dropdown-trigger {
+	padding: 0.5rem;
+	display: flex;
+}
+</style>
--- a/src/components/notifications/notifications.vue
+++ b/src/components/notifications/notifications.vue
@ -20,8 +20,7 @@
 						:user="n.notification.doer"
 						:show-username="false"
 						:avatar-size="16"
-						v-if="n.notification.doer"
-					/>
+						v-if="n.notification.doer"/>
 					<div class="detail">
 						<div>
 							<span class="has-text-weight-bold mr-1" v-if="n.notification.doer">
@ -146,13 +145,12 @@ function to(n, index) {

 	.trigger-button {
 		width: 100%;
-		position: relative;
 	}

 	.unread-indicator {
 		position: absolute;
-		top: 1rem;
-		right: .5rem;
+		top: .75rem;
+		right: 1.15rem;
 		width: .75rem;
 		height: .75rem;

--- a/src/components/project/ProjectWrapper.vue
+++ b/src/components/project/ProjectWrapper.vue
@ -1,13 +1,9 @@
 <template>
 	<div
-		:class="{ 'is-loading': projectService.loading, 'is-archived': currentProject?.isArchived}"
+		:class="{ 'is-loading': projectService.loading, 'is-archived': currentProject.isArchived}"
 		class="loader-container"
 	>
-		<h1 class="project-title-print">
-			{{ getProjectTitle(currentProject) }}
-		</h1>
-		
-		<div class="switch-view-container d-print-none">
+		<div class="switch-view-container">
 			<div class="switch-view">
 				<BaseButton
 					v-shortcut="'g l'"
@ -49,8 +45,8 @@
 			<slot name="header" />
 		</div>
 		<CustomTransition name="fade">
-			<Message variant="warning" v-if="currentProject?.isArchived" class="mb-4">
-				{{ $t('project.archivedMessage') }}
+			<Message variant="warning" v-if="currentProject.isArchived" class="mb-4">
+				{{ $t('project.archived') }}
 			</Message>
 		</CustomTransition>

@ -102,7 +98,7 @@ const currentProject = computed(() => {
 		maxRight: null,
 	} : baseStore.currentProject
 })
-useTitle(() => currentProject.value?.id ? getProjectTitle(currentProject.value) : '')
+useTitle(() => currentProject.value.id ? getProjectTitle(currentProject.value) : '')

 // watchEffect would be called every time the prop would get a value assigned, even if that value was the same as before.
 // This resulted in loading and setting the project multiple times, even when navigating away from it.
@ -122,7 +118,7 @@ watch(
 			(
 				projectIdToLoad === loadedProjectId.value ||
 				typeof projectIdToLoad === 'undefined' ||
-				projectIdToLoad === currentProject.value?.id
+				projectIdToLoad === currentProject.value.id
 			)
 			&& typeof currentProject.value !== 'undefined' && currentProject.value.maxRight !== null
 		) {
@ -134,8 +130,8 @@ watch(

 		// Set the current project to the one we're about to load so that the title is already shown at the top
 		loadedProjectId.value = 0
-		const projectFromStore = projectStore.projects[projectData.id]
-		if (projectFromStore) {
+		const projectFromStore = projectStore.getProjectById(projectData.id)
+		if (projectFromStore !== null) {
 			baseStore.setBackground(null)
 			baseStore.setBlurHash(null)
 			baseStore.handleSetCurrentProject({project: projectFromStore})
@ -201,15 +197,4 @@ watch(
 .is-archived .notification.is-warning {
  margin-bottom: 1rem;
 }
-
-.project-title-print {
-	display: none;
-	font-size: 1.75rem;
-	text-align: center;
-	margin-bottom: .5rem;
-	
-	@media print {
-		display: block;
-	}
-}
 </style>
--- a/src/components/project/partials/ProjectCard.vue
+++ b/src/components/project/partials/ProjectCard.vue
@ -15,14 +15,9 @@
 			:class="{'is-visible': background}"
 			:style="{'background-image': background !== null ? `url(${background})` : undefined}"
 		/>
-		<span v-if="project.isArchived" class="is-archived" >{{ $t('project.archived') }}</span>
+		<span v-if="project.isArchived" class="is-archived" >{{ $t('namespace.archived') }}</span>

-		<div class="project-title" aria-hidden="true">
-			<span v-if="project.id < -1" class="saved-filter-icon icon">
-				<icon icon="filter"/>
-			</span>
-			{{ project.title }}
-		</div>
+		<div class="project-title" aria-hidden="true">{{ project.title }}</div>
 		<BaseButton
 			class="project-button"
 			:aria-label="project.title"
@ -184,9 +179,4 @@ const projectStore = useProjectStore()
    opacity: 1;
  }
 }
-
-.saved-filter-icon {
-	color: var(--grey-300);
-	font-size: .75em;
-}
 </style>
--- a/src/components/project/partials/filters.vue
+++ b/src/components/project/partials/filters.vue
@ -147,7 +147,6 @@
 			<label class="label">{{ $t('task.attributes.labels') }}</label>
 			<div class="control labels-list">
 				<edit-labels
-					:creatable="false"
 					v-model="entities.labels"
 					@update:model-value="changeLabelFilter"
 				/>
@ -166,6 +165,16 @@
 					/>
 				</div>
 			</div>
+			<div class="field">
+				<label class="label">{{ $t('namespace.namespaces') }}</label>
+				<div class="control">
+					<SelectNamespace
+						v-model="entities.namespace"
+						@select="changeMultiselectFilter('namespace', 'namespace')"
+						@remove="changeMultiselectFilter('namespace', 'namespace')"
+					/>
+				</div>
+			</div>
 		</template>
 	</card>
 </template>
@ -180,6 +189,7 @@ import {camelCase} from 'camel-case'

 import type {ILabel} from '@/modelTypes/ILabel'
 import type {IUser} from '@/modelTypes/IUser'
+import type {INamespace} from '@/modelTypes/INamespace'
 import type {IProject} from '@/modelTypes/IProject'

 import {useLabelStore} from '@/stores/labels'
@ -191,6 +201,7 @@ import EditLabels from '@/components/tasks/partials/editLabels.vue'
 import Fancycheckbox from '@/components/input/fancycheckbox.vue'
 import SelectUser from '@/components/input/SelectUser.vue'
 import SelectProject from '@/components/input/SelectProject.vue'
+import SelectNamespace from '@/components/input/SelectNamespace.vue'

 import {parseDateOrString} from '@/helpers/time/parseDateOrString'
 import {dateIsValid, formatISO} from '@/helpers/time/formatDate'
@ -198,6 +209,7 @@ import {objectToSnakeCase} from '@/helpers/case'

 import UserService from '@/services/user'
 import ProjectService from '@/services/project'
+import NamespaceService from '@/services/namespace'

 // FIXME: do not use this here for now. instead create new version from DEFAULT_PARAMS
 import {getDefaultParams} from '@/composables/useTaskList'
@ -228,6 +240,7 @@ const DEFAULT_FILTERS = {
 	assignees: '',
 	labels: '',
 	project_id: '',
+	namespace: '',
 } as const

 const props = defineProps({
@ -252,20 +265,23 @@ const filters = ref({...DEFAULT_FILTERS})
 const services = {
 	users: shallowReactive(new UserService()),
 	projects: shallowReactive(new ProjectService()),
+  namespace: shallowReactive(new NamespaceService()),
 }

 interface Entities {
 	users: IUser[]
 	labels: ILabel[]
 	projects: IProject[]
+	namespace: INamespace[]
 }

-type EntityType = 'users' | 'labels' | 'projects'
+type EntityType = 'users' | 'labels' | 'projects' | 'namespace'

 const entities: Entities = reactive({
 	users: [],
 	labels: [],
 	projects: [],
+	namespace: [],
 })

 onMounted(() => {
@ -312,6 +328,7 @@ function prepareFilters() {
 	prepareDate('reminders')
 	prepareRelatedObjectFilter('users', 'assignees')
 	prepareRelatedObjectFilter('projects', 'project_id')
+	prepareRelatedObjectFilter('namespace')

 	prepareSingleValue('labels')

--- a/src/components/project/project-settings-dropdown.vue
+++ b/src/components/project/project-settings-dropdown.vue
@ -72,13 +72,6 @@
 				@update:model-value="setSubscriptionInStore"
 				type="dropdown"
 			/>
-			<dropdown-item
-				v-if="level < 2"
-				:to="{ name: 'project.createFromParent', params: { parentProjectId: project.id } }"
-				icon="layer-group"
-			>
-				{{ $t('menu.createProject') }}
-			</dropdown-item>
 			<dropdown-item
 				:to="{ name: 'project.settings.delete', params: { projectId: project.id } }"
 				icon="trash-alt"
@ -103,18 +96,17 @@ import type {ISubscription} from '@/modelTypes/ISubscription'
 import {isSavedFilter} from '@/services/savedFilter'
 import {useConfigStore} from '@/stores/config'
 import {useProjectStore} from '@/stores/projects'
+import {useNamespaceStore} from '@/stores/namespaces'

 const props = defineProps({
 	project: {
 		type: Object as PropType<IProject>,
 		required: true,
 	},
-	level: {
-		type: Number,
-	},
 })

 const projectStore = useProjectStore()
+const namespaceStore = useNamespaceStore()
 const subscription = ref<ISubscription | null>(null)
 watchEffect(() => {
 	subscription.value = props.project.subscription ?? null
@ -130,5 +122,6 @@ function setSubscriptionInStore(sub: ISubscription) {
 		subscription: sub,
 	}
 	projectStore.setProject(updatedProject)
+	namespaceStore.setProjectInNamespaceById(updatedProject)
 }
 </script>
--- a/src/components/quick-actions/quick-actions.vue
+++ b/src/components/quick-actions/quick-actions.vue
@ -61,6 +61,7 @@ import {useRouter} from 'vue-router'
 import TaskService from '@/services/task'
 import TeamService from '@/services/team'

+import NamespaceModel from '@/models/namespace'
 import TeamModel from '@/models/team'
 import ProjectModel from '@/models/project'

@ -69,16 +70,18 @@ import QuickAddMagic from '@/components/tasks/partials/quick-add-magic.vue'

 import {useBaseStore} from '@/stores/base'
 import {useProjectStore} from '@/stores/projects'
+import {useNamespaceStore} from '@/stores/namespaces'
 import {useLabelStore} from '@/stores/labels'
 import {useTaskStore} from '@/stores/tasks'
-import {useAuthStore} from '@/stores/auth'

 import {getHistory} from '@/modules/projectHistory'
 import {parseTaskText, PrefixMode, PREFIXES} from '@/modules/parseTaskText'
+import {getQuickAddMagicMode} from '@/helpers/quickAddMagicMode'
 import {success} from '@/message'

 import type {ITeam} from '@/modelTypes/ITeam'
 import type {ITask} from '@/modelTypes/ITask'
+import type {INamespace} from '@/modelTypes/INamespace'
 import type {IProject} from '@/modelTypes/IProject'

 const {t} = useI18n({useScope: 'global'})
@ -86,9 +89,9 @@ const router = useRouter()

 const baseStore = useBaseStore()
 const projectStore = useProjectStore()
+const namespaceStore = useNamespaceStore()
 const labelStore = useLabelStore()
 const taskStore = useTaskStore()
-const authStore = useAuthStore()

 type DoAction<Type = any> = { type: ACTION_TYPE } & Type

@ -102,6 +105,7 @@ enum ACTION_TYPE {
 enum COMMAND_TYPE {
 	NEW_TASK = 'newTask',
 	NEW_PROJECT = 'newProject',
+	NEW_NAMESPACE = 'newNamespace',
 	NEW_TEAM = 'newTeam',
 }

@ -143,15 +147,24 @@ const foundProjects = computed(() => {
 		return []
 	}

+	const ncache: { [id: ProjectModel['id']]: INamespace } = {}
 	const history = getHistory()
 	const allProjects = [
 		...new Set([
-			...history.map((l) => projectStore.projects[l.id]),
+			...history.map((l) => projectStore.getProjectById(l.id)),
 			...projectStore.searchProject(project),
 		]),
 	]

-	return allProjects.filter(l => Boolean(l))
+	return allProjects.filter((l) => {
+		if (typeof l === 'undefined' || l === null) {
+			return false
+		}
+		if (typeof ncache[l.namespaceId] === 'undefined') {
+			ncache[l.namespaceId] = namespaceStore.getNamespaceById(l.namespaceId)
+		}
+		return !ncache[l.namespaceId].isArchived
+	})
 })

 // FIXME: use fuzzysearch
@ -192,6 +205,7 @@ const results = computed<Result[]>(() => {

 const loading = computed(() => 
 	taskService.loading ||
+	namespaceStore.isLoading ||
 	projectStore.isLoading ||
 	teamService.loading,
 )
@ -216,6 +230,12 @@ const commands = computed<{ [key in COMMAND_TYPE]: Command }>(() => ({
 		placeholder: t('quickActions.newProject'),
 		action: newProject,
 	},
+	newNamespace: {
+		type: COMMAND_TYPE.NEW_NAMESPACE,
+		title: t('quickActions.cmds.newNamespace'),
+		placeholder: t('quickActions.newNamespace'),
+		action: newNamespace,
+	},
 	newTeam: {
 		type: COMMAND_TYPE.NEW_TEAM,
 		title: t('quickActions.cmds.newTeam'),
@ -232,6 +252,7 @@ const currentProject = computed(() => Object.keys(baseStore.currentProject).leng
 )

 const hintText = computed(() => {
+	let namespace
 	if (selectedCmd.value !== null && currentProject.value !== null) {
 		switch (selectedCmd.value.type) {
 			case COMMAND_TYPE.NEW_TASK:
@ -239,11 +260,16 @@ const hintText = computed(() => {
 					title: currentProject.value.title,
 				})
 			case COMMAND_TYPE.NEW_PROJECT:
-				return t('quickActions.createProject')
+				namespace = namespaceStore.getNamespaceById(
+					currentProject.value.namespaceId,
+				)
+				return t('quickActions.createProject', {
+					title: namespace?.title,
+				})
 		}
 	}
 	const prefixes =
-		PREFIXES[authStore.settings.frontendSettings.quickAddMagicMode] ?? PREFIXES[PrefixMode.Default]
+		PREFIXES[getQuickAddMagicMode()] ?? PREFIXES[PrefixMode.Default]
 	return t('quickActions.hint', prefixes)
 })

@ -252,11 +278,11 @@ const availableCmds = computed(() => {
 	if (currentProject.value !== null) {
 		cmds.push(commands.value.newTask, commands.value.newProject)
 	}
-	cmds.push(commands.value.newTeam)
+	cmds.push(commands.value.newNamespace, commands.value.newTeam)
 	return cmds
 })

-const parsedQuery = computed(() => parseTaskText(query.value, authStore.settings.frontendSettings.quickAddMagicMode))
+const parsedQuery = computed(() => parseTaskText(query.value, getQuickAddMagicMode()))

 const searchMode = computed(() => {
 	if (query.value === '') {
@ -370,7 +396,7 @@ function searchTasks() {
 		const r = await taskService.getAll({}, params) as  DoAction<ITask>[]
 		foundTasks.value = r.map((t) => {
 			t.type = ACTION_TYPE.TASK
-			const project = projectStore.projects[t.projectId]
+			const project = projectStore.getProjectById(t.projectId)
 			if (project !== null) {
 				t.title = `${t.title} (${project.title})`
 			}
@ -478,10 +504,21 @@ async function newProject() {
 	if (currentProject.value === null) {
 		return
 	}
-	await projectStore.createProject(new ProjectModel({
+	const newProject = await projectStore.createProject(new ProjectModel({
 		title: query.value,
+		namespaceId: currentProject.value.namespaceId,
 	}))
 	success({ message: t('project.create.createdSuccess')})
+	await router.push({
+		name: 'project.index',
+		params: { projectId: newProject.id },
+	})
+}
+
+async function newNamespace() {
+	const newNamespace = new NamespaceModel({ title: query.value })
+	await namespaceStore.createNamespace(newNamespace)
+	success({ message: t('namespace.create.success')  })
 }

 async function newTeam() {
--- a/src/components/sharing/userTeam.vue
+++ b/src/components/sharing/userTeam.vue
@ -139,6 +139,10 @@ import {ref, reactive, computed, shallowReactive, type Ref} from 'vue'
 import type {PropType} from 'vue'
 import {useI18n} from 'vue-i18n'

+import UserNamespaceService from '@/services/userNamespace'
+import UserNamespaceModel from '@/models/userNamespace'
+import type {IUserNamespace} from '@/modelTypes/IUserNamespace'
+
 import UserProjectService from '@/services/userProject'
 import UserProjectModel from '@/models/userProject'
 import type {IUserProject} from '@/modelTypes/IUserProject'
@ -147,6 +151,10 @@ import UserService from '@/services/user'
 import UserModel, { getDisplayName } from '@/models/user'
 import type {IUser} from '@/modelTypes/IUser'

+import TeamNamespaceService from '@/services/teamNamespace'
+import TeamNamespaceModel from '@/models/teamNamespace'
+import type { ITeamNamespace } from '@/modelTypes/ITeamNamespace'
+
 import TeamProjectService from '@/services/teamProject'
 import TeamProjectModel from '@/models/teamProject'
 import type { ITeamProject } from '@/modelTypes/ITeamProject'
@ -162,15 +170,13 @@ import Nothing from '@/components/misc/nothing.vue'
 import {success} from '@/message'
 import {useAuthStore} from '@/stores/auth'

-// FIXME: I think this whole thing can now only manage user/team sharing for projects? Maybe remove a little generalization?
-
 const props = defineProps({
 	type: {
-		type: String as PropType<'project'>,
+		type: String as PropType<'project' | 'namespace'>,
 		default: '',
 	},
 	shareType: {
-		type: String as PropType<'user' | 'team'>,
+		type: String as PropType<'user' | 'team' | 'namespace'>,
 		default: '',
 	},
 	id: {
@ -185,9 +191,9 @@ const props = defineProps({

 const {t} = useI18n({useScope: 'global'})

-// This user service is a userProjectService, depending on the type we are using
-let stuffService: UserProjectService | TeamProjectService
-let stuffModel: IUserProject | ITeamProject
+// This user service is either a userNamespaceService or a userProjectService, depending on the type we are using
+let stuffService: UserNamespaceService | UserProjectService | TeamProjectService | TeamNamespaceService
+let stuffModel: IUserNamespace | IUserProject | ITeamProject | ITeamNamespace
 let searchService: UserService | TeamService
 let sharable: Ref<IUser | ITeam>

@ -225,6 +231,10 @@ const sharableName = computed(() => {
 		return t('project.list.title')
 	}

+	if (props.shareType === 'namespace') {
+		return t('namespace.namespace')
+	}
+
 	return ''
 })

@ -237,6 +247,11 @@ if (props.shareType === 'user') {
 	if (props.type === 'project') {
 		stuffService = shallowReactive(new UserProjectService())
 		stuffModel = reactive(new UserProjectModel({projectId: props.id}))
+	} else if (props.type === 'namespace') {
+		stuffService = shallowReactive(new UserNamespaceService())
+		stuffModel = reactive(new UserNamespaceModel({
+			namespaceId: props.id,
+		}))
 	} else {
 		throw new Error('Unknown type: ' + props.type)
 	}
@ -249,6 +264,11 @@ if (props.shareType === 'user') {
 	if (props.type === 'project') {
 		stuffService = shallowReactive(new TeamProjectService())
 		stuffModel = reactive(new TeamProjectModel({projectId: props.id}))
+	} else if (props.type === 'namespace') {
+		stuffService = shallowReactive(new TeamNamespaceService())
+		stuffModel = reactive(new TeamNamespaceModel({
+			namespaceId: props.id,
+		}))
 	} else {
 		throw new Error('Unknown type: ' + props.type)
 	}
--- a/src/components/tasks/add-task.vue
+++ b/src/components/tasks/add-task.vue
@ -1,7 +1,7 @@
 <template>
 	<div class="task-add" ref="taskAdd">
 		<div class="add-task__field field is-grouped">
-			<p class="control has-icons-left has-icons-right is-expanded">
+			<p class="control has-icons-left is-expanded">
 				<textarea
 					class="add-task-textarea input"
 					:class="{'textarea-empty': newTaskTitle === ''}"
@ -16,7 +16,6 @@
 				<span class="icon is-small is-left">
 					<icon icon="tasks"/>
 				</span>
-				<quick-add-magic :highlight-hint-icon="taskAddHovered"/>
 			</p>
 			<p class="control">
 				<x-button
@ -33,10 +32,11 @@
 				</x-button>
 			</p>
 		</div>
-		<Expandable :open="errorMessage !== ''">
+		<Expandable :open="errorMessage !== '' || taskAddFocused || taskAddHovered && debouncedTaskAddHovered">
 			<p class="pt-3 mt-0 help is-danger" v-if="errorMessage !== ''">
 				{{ errorMessage }}
 			</p>
+			<quick-add-magic v-else class="quick-add-magic" />
 		</Expandable>
 	</div>
 </template>
@ -44,7 +44,7 @@
 <script setup lang="ts">
 import {computed, ref} from 'vue'
 import {useI18n} from 'vue-i18n'
-import {useElementHover} from '@vueuse/core'
+import {refDebounced, useElementHover, useFocusWithin} from '@vueuse/core'

 import {RELATION_KIND} from '@/types/IRelationKind'
 import type {ITask} from '@/modelTypes/ITask'
@ -77,6 +77,8 @@ const {t} = useI18n({useScope: 'global'})
 const authStore = useAuthStore()
 const taskStore = useTaskStore()

+const taskAdd = ref<HTMLTextAreaElement | null>(null)
+
 // enable only if we don't have a modal
 // onStartTyping(() => {
 // 	if (newTaskInput.value === null || document.activeElement === newTaskInput.value) {
@ -85,8 +87,10 @@ const taskStore = useTaskStore()
 // 	newTaskInput.value.focus()
 // })

-const taskAdd = ref<HTMLTextAreaElement | null>(null)
+const { focused: taskAddFocused } = useFocusWithin(taskAdd)
+
 const taskAddHovered = useElementHover(taskAdd)
+const debouncedTaskAddHovered = refDebounced(taskAddHovered, 500)

 const errorMessage = ref('')

@ -116,12 +120,12 @@ async function addTask() {
 	// This allows us to find the tasks with the title they had before being parsed
 	// by quick add magic.
 	const createdTasks: { [key: ITask['title']]: ITask } = {}
-	const tasksToCreate = parseSubtasksViaIndention(newTaskTitle.value, authStore.settings.frontendSettings.quickAddMagicMode)
+	const tasksToCreate = parseSubtasksViaIndention(newTaskTitle.value)

 	// We ensure all labels exist prior to passing them down to the create task method
 	// In the store it will only ever see one task at a time so there's no way to reliably 
 	// check if a new label was created before (because everything happens async).
-	const allLabels = tasksToCreate.map(({title}) => getLabelsFromPrefix(title, authStore.settings.frontendSettings.quickAddMagicMode) ?? [])
+	const allLabels = tasksToCreate.map(({title}) => getLabelsFromPrefix(title) ?? [])
 	await taskStore.ensureLabelsExist(allLabels.flat())

 	const newTasks = tasksToCreate.map(async ({title, project}) => {
@ -240,14 +244,7 @@ defineExpose({
 	text-overflow: ellipsis;
 }

-.control.has-icons-left .icon,
-.control.has-icons-right .icon {
-	transition: all $transition;
-}
-</style>
-
-<style>
-button.show-helper-text {
-	right: 0;
+.quick-add-magic {
+	padding-top: 0.75rem;
 }
 </style>
--- a/src/components/tasks/partials/comments.vue
+++ b/src/components/tasks/partials/comments.vue
@ -74,13 +74,9 @@
 						@update:model-value="
 							() => {
 								toggleEdit(c)
-								editCommentWithDelay()
+								editComment()
 							}
 						"
-						@save="() => {
-							toggleEdit(c)
-							editComment()
-						}"
 						:bottom-actions="actions[c.id]"
 						:show-save="true"
 					/>
@ -283,26 +279,10 @@ function toggleDelete(commentId: ITaskComment['id']) {
 	commentToDelete.id = commentId
 }

-const changeTimeout = ref<ReturnType<typeof setTimeout> | null>(null)
-
-async function editCommentWithDelay() {
-	if (changeTimeout.value !== null) {
-		clearTimeout(changeTimeout.value)
-	}
-
-	changeTimeout.value = setTimeout(async () => {
-		await editComment()
-	}, 5000)
-}
-
 async function editComment() {
 	if (commentEdit.comment === '') {
 		return
 	}
-	
-	if (changeTimeout.value !== null) {
-		clearTimeout(changeTimeout.value)
-	}

 	saving.value = commentEdit.id

--- a/src/components/tasks/partials/description.vue
+++ b/src/components/tasks/partials/description.vue
@ -25,8 +25,7 @@
 			:show-save="true"
 			edit-shortcut="e"
 			v-model="task.description"
-			@update:model-value="saveWithDelay"
-			@save="save"
+			@update:model-value="save"
 		/>
 	</div>
 </template>
@ -41,6 +40,7 @@ import type {ITask} from '@/modelTypes/ITask'
 import {useTaskStore} from '@/stores/tasks'
 import TaskModel from '@/models/task'

+
 const props = defineProps({
 	modelValue: {
 		type: Object as PropType<ITask>,
@ -74,23 +74,7 @@ watch(
 	{immediate: true},
 )

-const changeTimeout = ref<ReturnType<typeof setTimeout> | null>(null)
-
-async function saveWithDelay() {
-	if (changeTimeout.value !== null) {
-		clearTimeout(changeTimeout.value)
-	}
-
-	changeTimeout.value = setTimeout(async () => {
-		await save()
-	}, 5000)
-}
-
 async function save() {
-	if (changeTimeout.value !== null) {
-		clearTimeout(changeTimeout.value)
-	}
-
 	saving.value = true

 	try {
--- a/src/components/tasks/partials/editAssignees.vue
+++ b/src/components/tasks/partials/editAssignees.vue
@ -9,19 +9,15 @@
 		label="name"
 		:select-placeholder="$t('task.assignee.selectPlaceholder')"
 		v-model="assignees"
-		:autocomplete-enabled="false"
 	>
 		<template #tag="{item: user}">
 			<span class="assignee">
-				<user :avatar-size="32" :show-username="false" :user="user" class="m-2"/>
+				<user :avatar-size="32" :show-username="false" :user="user"/>
 				<BaseButton @click="removeAssignee(user)" class="remove-assignee" v-if="!disabled">
 					<icon icon="times"/>
 				</BaseButton>
 			</span>
 		</template>
-		<template #searchResult="{option: user}">
-			<user :avatar-size="24" :show-username="true" :user="user"/>
-		</template>
 	</Multiselect>
 </template>

@ -108,6 +104,11 @@ async function removeAssignee(user: IUser) {
 }

 async function findUser(query: string) {
+	if (query === '') {
+		foundUsers.value = []
+		return
+	}
+
 	const response = await projectUserService.getAll({projectId: props.projectId}, {s: query}) as IUser[]

 	// Filter the results to not include users who are already assigned
--- a/src/components/tasks/partials/editLabels.vue
+++ b/src/components/tasks/partials/editLabels.vue
@ -7,7 +7,7 @@
 		:search-results="foundLabels"
 		@select="addLabel"
 		label="title"
-		:creatable="creatable"
+		:creatable="true"
 		@create="createAndAddLabel"
 		:create-placeholder="$t('task.label.createPlaceholder')"
 		v-model="labels"
@ -65,10 +65,6 @@ const props = defineProps({
 	disabled: {
 		default: false,
 	},
-	creatable: {
-		type: Boolean,
-		default: true,
-	},
 })

 const emit = defineEmits(['update:modelValue'])
--- a/src/components/tasks/partials/projectSearch.vue
+++ b/src/components/tasks/partials/projectSearch.vue
@ -11,10 +11,8 @@
 		@search="findProjects"
 	>
 		<template #searchResult="{option}">
-			<span class="has-text-grey" v-if="projectStore.getAncestors(option).length > 1">
-				{{ projectStore.getAncestors(option).filter(p => p.id !== option.id).map(p => getProjectTitle(p)).join(' &gt; ') }} &gt;
-			</span>
-			{{ getProjectTitle(option) }}
+			<span class="project-namespace-title search-result">{{ namespace((option as IProject).namespaceId) }} ></span>
+			{{ (option as IProject).title }}
 		</template>
 	</Multiselect>
 </template>
@ -22,11 +20,13 @@
 <script lang="ts" setup>
 import {reactive, ref, watch} from 'vue'
 import type {PropType} from 'vue'
+import {useI18n} from 'vue-i18n'

 import type {IProject} from '@/modelTypes/IProject'
+import type {INamespace} from '@/modelTypes/INamespace'

 import {useProjectStore} from '@/stores/projects'
-import {getProjectTitle} from '@/helpers/getProjectTitle'
+import {useNamespaceStore} from '@/stores/namespaces'

 import ProjectModel from '@/models/project'

@ -40,6 +40,8 @@ const props = defineProps({
 })
 const emit = defineEmits(['update:modelValue'])

+const {t} = useI18n({useScope: 'global'})
+
 const project: IProject = reactive(new ProjectModel())

 watch(
@ -52,6 +54,7 @@ watch(
 )

 const projectStore = useProjectStore()
+const namespaceStore = useNamespaceStore()
 const foundProjects = ref<IProject[]>([])
 function findProjects(query: string) {
 	if (query === '') {
@ -67,4 +70,17 @@ function select(l: IProject | null) {
 	Object.assign(project, l)
 	emit('update:modelValue', project)
 }
+
+function namespace(namespaceId: INamespace['id']) {
+	const namespace = namespaceStore.getNamespaceById(namespaceId)
+	return namespace !== null
+		? namespace.title
+		: t('project.shared')
+}
 </script>
+
+<style lang="scss" scoped>
+.project-namespace-title {
+	color: var(--grey-500);
+}
+</style>
--- a/src/components/tasks/partials/quick-add-magic.vue
+++ b/src/components/tasks/partials/quick-add-magic.vue
@ -1,14 +1,9 @@
 <template>
-	<template v-if="mode !== 'disabled' && prefixes !== undefined">
-		<BaseButton
-			@click="() => visible = true"
-			class="icon is-small show-helper-text"
-			v-tooltip="$t('task.quickAddMagic.hint')"
-			:aria-label="$t('task.quickAddMagic.hint')"
-			:class="{'is-highlighted': highlightHintIcon}"
-		>
-			<icon :icon="['far', 'circle-question']"/>
-		</BaseButton>
+	<div v-if="mode !== 'disabled' && prefixes !== undefined">
+		<p class="help has-text-grey">
+			{{ $t('task.quickAddMagic.hint') }}.
+			<ButtonLink @click="() => visible = true">{{ $t('task.quickAddMagic.what') }}</ButtonLink>
+		</p>
 		<modal
 			:enabled="visible"
 			@close="() => visible = false"
@ -74,7 +69,7 @@
 					<li>17th ({{ $t('task.quickAddMagic.dateNth', {day: '17'}) }})</li>
 				</ul>
 				<p>{{ $t('task.quickAddMagic.dateTime', {time: 'at 17:00', timePM: '5pm'}) }}</p>
-
+				
 				<h3>{{ $t('task.quickAddMagic.repeats') }}</h3>
 				<p>{{ $t('task.quickAddMagic.repeatsDescription', {suffix: 'every {amount} {type}'}) }}</p>
 				<p>{{ $t('misc.forExample') }}</p>
@ -91,36 +86,19 @@
 				</ul>
 			</card>
 		</modal>
-	</template>
+	</div>
 </template>

 <script setup lang="ts">
 import {ref, computed} from 'vue'

-import BaseButton from '@/components/base/BaseButton.vue'
+import ButtonLink from '@/components/misc/ButtonLink.vue'

+import {getQuickAddMagicMode} from '@/helpers/quickAddMagicMode'
 import {PREFIXES} from '@/modules/parseTaskText'
-import {useAuthStore} from '@/stores/auth'
-
-const authStore = useAuthStore()

 const visible = ref(false)
-const mode = computed(() => authStore.settings.frontendSettings.quickAddMagicMode)
-
-defineProps<{
-	highlightHintIcon: boolean,
-}>()
+const mode = ref(getQuickAddMagicMode())

 const prefixes = computed(() => PREFIXES[mode.value])
 </script>
-
-<style lang="scss" scoped>
-.show-helper-text {
-	// Bulma adds pointer-events: none to the icon so we need to override it back here.
-	pointer-events: auto !important;
-}
-
-.is-highlighted {
-	color: inherit !important;
-}
-</style>
--- a/src/components/tasks/partials/relatedTasks.vue
+++ b/src/components/tasks/partials/relatedTasks.vue
@ -46,6 +46,11 @@
 									class="different-project"
 									v-if="task.projectId !== projectId"
 								>
+									<span
+										v-if="task.differentNamespace !== null"
+										v-tooltip="$t('task.relation.differentNamespace')">
+										{{ task.differentNamespace }} >
+									</span>
 									<span
 										v-if="task.differentProject !== null"
 										v-tooltip="$t('task.relation.differentProject')">
@ -96,6 +101,11 @@
 								class="different-project"
 								v-if="t.projectId !== projectId"
 							>
+								<span
+									v-if="t.differentNamespace !== null"
+									v-tooltip="$t('task.relation.differentNamespace')">
+									{{ t.differentNamespace }} >
+								</span>
 								<span
 									v-if="t.differentProject !== null"
 									v-tooltip="$t('task.relation.differentProject')">
@ -158,9 +168,10 @@ import BaseButton from '@/components/base/BaseButton.vue'
 import Multiselect from '@/components/input/multiselect.vue'
 import Fancycheckbox from '@/components/input/fancycheckbox.vue'

+import {useNamespaceStore} from '@/stores/namespaces'
+
 import {error, success} from '@/message'
 import {useTaskStore} from '@/stores/tasks'
-import {useProjectStore} from '@/stores/projects'

 const props = defineProps({
 	taskId: {
@ -185,7 +196,7 @@ const props = defineProps({
 })

 const taskStore = useTaskStore()
-const projectStore = useProjectStore()
+const namespaceStore = useNamespaceStore()
 const route = useRoute()
 const {t} = useI18n({useScope: 'global'})

@ -219,15 +230,26 @@ async function findTasks(newQuery: string) {
 	foundTasks.value = await taskService.getAll({}, {s: newQuery})
 }

+const getProjectAndNamespaceById = (projectId: number) => namespaceStore.getProjectAndNamespaceById(projectId, true)
+
+const namespace = computed(() => getProjectAndNamespaceById(props.projectId)?.namespace)
+
 function mapRelatedTasks(tasks: ITask[]) {
 	return tasks.map(task => {
 		// by doing this here once we can save a lot of duplicate calls in the template
-		const project = projectStore.projects[task.ProjectId]
+		const {
+			project,
+			namespace: taskNamespace,
+		} = getProjectAndNamespaceById(task.projectId) || {project: null, namespace: null}

 		return {
 			...task,
+			differentNamespace:
+				(taskNamespace !== null &&
+					taskNamespace.id !== namespace.value.id &&
+					taskNamespace?.title) || null,
 			differentProject:
-				(project &&
+				(project !== null &&
 					task.projectId !== props.projectId &&
 					project?.title) || null,
 		}
@ -420,6 +442,5 @@ async function toggleTaskDone(task: ITask) {
 .task-done-checkbox {
 	padding: 0;
 	height: 18px; // The exact height of the checkbox in the container
-	margin-right: .75rem;
 }
 </style>
--- a/src/components/tasks/partials/reminder-detail.vue
+++ b/src/components/tasks/partials/reminder-detail.vue
@ -1,277 +0,0 @@
-<template>
-	<div>
-		<Popup @close="showFormSwitch = null">
-			<template #trigger="{toggle}">
-				<SimpleButton
-					v-tooltip="reminder.reminder && reminder.relativeTo !== null ? formatDateShort(reminder.reminder) : null"
-					@click.prevent.stop="toggle()"
-				>
-					{{ reminderText }}
-				</SimpleButton>
-			</template>
-			<template #content="{isOpen, toggle}">
-				<Card class="reminder-options-popup" :class="{'is-open': isOpen}" :padding="false">
-					<div class="options" v-if="activeForm === null">
-						<SimpleButton
-							v-for="(p, k) in presets"
-							:key="k"
-							class="option-button"
-							:class="{'currently-active': p.relativePeriod === modelValue?.relativePeriod && modelValue?.relativeTo === p.relativeTo}"
-							@click="setReminderFromPreset(p, toggle)"
-						>
-							{{ formatReminder(p) }}
-						</SimpleButton>
-						<SimpleButton
-							@click="showFormSwitch = 'relative'"
-							class="option-button"
-							:class="{'currently-active': typeof modelValue !== 'undefined' && modelValue?.relativeTo !== null && presets.find(p => p.relativePeriod === modelValue?.relativePeriod && modelValue?.relativeTo === p.relativeTo) === undefined}"
-						>
-							{{ $t('task.reminder.custom') }}
-						</SimpleButton>
-						<SimpleButton
-							@click="showFormSwitch = 'absolute'"
-							class="option-button"
-							:class="{'currently-active': modelValue?.relativeTo === null}"
-						>
-							{{ $t('task.reminder.dateAndTime') }}
-						</SimpleButton>
-					</div>
-
-					<ReminderPeriod
-						v-if="activeForm === 'relative'"
-						v-model="reminder"
-						@update:modelValue="updateDataAndMaybeClose(toggle)"
-					/>
-
-					<DatepickerInline
-						v-if="activeForm === 'absolute'"
-						v-model="reminderDate"
-						@update:modelValue="setReminderDate"
-					/>
-
-					<x-button
-						v-if="showFormSwitch !== null"
-						class="reminder__close-button"
-						:shadow="false"
-						@click="toggle"
-					>
-						{{ $t('misc.confirm') }}
-					</x-button>
-				</Card>
-			</template>
-		</Popup>
-	</div>
-</template>
-
-<script setup lang="ts">
-import {computed, ref, watch} from 'vue'
-import {toRef} from '@vueuse/core'
-import {SECONDS_A_DAY, SECONDS_A_HOUR} from '@/constants/date'
-import {IReminderPeriodRelativeTo, REMINDER_PERIOD_RELATIVE_TO_TYPES} from '@/types/IReminderPeriodRelativeTo'
-import {useI18n} from 'vue-i18n'
-
-import {PeriodUnit, secondsToPeriod} from '@/helpers/time/period'
-import type {ITaskReminder} from '@/modelTypes/ITaskReminder'
-import {formatDateShort} from '@/helpers/time/formatDate'
-
-import DatepickerInline from '@/components/input/datepickerInline.vue'
-import ReminderPeriod from '@/components/tasks/partials/reminder-period.vue'
-import Popup from '@/components/misc/popup.vue'
-
-import TaskReminderModel from '@/models/taskReminder'
-import Card from '@/components/misc/card.vue'
-import SimpleButton from '@/components/input/SimpleButton.vue'
-
-const {t} = useI18n({useScope: 'global'})
-
-const props = withDefaults(defineProps<{
-	modelValue?: ITaskReminder,
-	disabled?: boolean,
-	clearAfterUpdate?: boolean,
-	defaultRelativeTo?: null | IReminderPeriodRelativeTo,
-}>(), {
-	disabled: false,
-	clearAfterUpdate: false,
-	defaultRelativeTo: REMINDER_PERIOD_RELATIVE_TO_TYPES.DUEDATE,
-})
-
-const emit = defineEmits(['update:modelValue'])
-
-const reminder = ref<ITaskReminder>(new TaskReminderModel())
-
-const presets = computed<TaskReminderModel[]>(() => [
-	{reminder: null, relativePeriod: 0, relativeTo: props.defaultRelativeTo},
-	{reminder: null, relativePeriod: -2 * SECONDS_A_HOUR, relativeTo: props.defaultRelativeTo},
-	{reminder: null, relativePeriod: -1 * SECONDS_A_DAY, relativeTo: props.defaultRelativeTo},
-	{reminder: null, relativePeriod: -1 * SECONDS_A_DAY * 3, relativeTo: props.defaultRelativeTo},
-	{reminder: null, relativePeriod: -1 * SECONDS_A_DAY * 7, relativeTo: props.defaultRelativeTo},
-	{reminder: null, relativePeriod: -1 * SECONDS_A_DAY * 30, relativeTo: props.defaultRelativeTo},
-])
-const reminderDate = ref(null)
-
-type availableForms = null | 'relative' | 'absolute'
-
-const showFormSwitch = ref<availableForms>(null)
-
-const activeForm = computed<availableForms>(() => {
-	if (props.defaultRelativeTo === null) {
-		return 'absolute'
-	}
-
-	return showFormSwitch.value
-})
-
-const reminderText = computed(() => {
-
-	if (reminder.value.relativeTo !== null) {
-		return formatReminder(reminder.value)
-	}
-
-	if (reminder.value.reminder !== null) {
-		return formatDateShort(reminder.value.reminder)
-	}
-
-	return t('task.addReminder')
-})
-
-const modelValue = toRef(props, 'modelValue')
-watch(
-	modelValue,
-	(newReminder) => {
-		reminder.value = newReminder || new TaskReminderModel()
-	},
-	{immediate: true},
-)
-
-function updateData() {
-	emit('update:modelValue', reminder.value)
-
-	if (props.clearAfterUpdate) {
-		reminder.value = new TaskReminderModel()
-	}
-}
-
-function setReminderDate() {
-	reminder.value.reminder = reminderDate.value === null
-		? null
-		: new Date(reminderDate.value)
-	reminder.value.relativeTo = null
-	reminder.value.relativePeriod = 0
-	updateData()
-}
-
-function setReminderFromPreset(preset, toggle) {
-	reminder.value = preset
-	updateData()
-	toggle()
-}
-
-function updateDataAndMaybeClose(toggle) {
-	updateData()
-	if (props.clearAfterUpdate) {
-		toggle()
-	}
-}
-
-function formatReminder(reminder: TaskReminderModel) {
-	const period = secondsToPeriod(reminder.relativePeriod)
-
-	if (period.amount === 0) {
-		switch (reminder.relativeTo) {
-			case REMINDER_PERIOD_RELATIVE_TO_TYPES.DUEDATE:
-				return t('task.reminder.onDueDate')
-			case REMINDER_PERIOD_RELATIVE_TO_TYPES.STARTDATE:
-				return t('task.reminder.onStartDate')
-			case REMINDER_PERIOD_RELATIVE_TO_TYPES.ENDDATE:
-				return t('task.reminder.onEndDate')
-		}
-	}
-
-	const amountAbs = Math.abs(period.amount)
-
-	let relativeTo = ''
-	switch (reminder.relativeTo) {
-		case REMINDER_PERIOD_RELATIVE_TO_TYPES.DUEDATE:
-			relativeTo = t('task.attributes.dueDate')
-			break
-		case REMINDER_PERIOD_RELATIVE_TO_TYPES.STARTDATE:
-			relativeTo = t('task.attributes.startDate')
-			break
-		case REMINDER_PERIOD_RELATIVE_TO_TYPES.ENDDATE:
-			relativeTo = t('task.attributes.endDate')
-			break
-	}
-
-	if (reminder.relativePeriod <= 0) {
-		return t('task.reminder.before', {
-			amount: amountAbs,
-			unit: translateUnit(amountAbs, period.unit),
-			type: relativeTo,
-		})
-	}
-
-	return t('task.reminder.after', {
-		amount: amountAbs,
-		unit: translateUnit(amountAbs, period.unit),
-		type: relativeTo,
-	})
-}
-
-function translateUnit(amount: number, unit: PeriodUnit): string {
-	switch (unit) {
-		case 'seconds':
-			return t('time.units.seconds', amount)
-		case 'minutes':
-			return t('time.units.minutes', amount)
-		case 'hours':
-			return t('time.units.hours', amount)
-		case 'days':
-			return t('time.units.days', amount)
-		case 'weeks':
-			return t('time.units.weeks', amount)
-		case 'years':
-			return t('time.units.years', amount)
-	}
-}
-</script>
-
-<style lang="scss" scoped>
-.options {
-	display: flex;
-	flex-direction: column;
-	align-items: flex-start;
-}
-
-:deep(.popup) {
-	top: unset;
-}
-
-.reminder-options-popup {
-	width: 310px;
-	z-index: 99;
-
-	@media screen and (max-width: ($tablet)) {
-		width: calc(100vw - 5rem);
-	}
-
-	.option-button {
-		font-size: .85rem;
-		border-radius: 0;
-		padding: .5rem;
-		margin: 0;
-
-		&:hover {
-			background: var(--grey-100);
-		}
-	}
-}
-
-.reminder__close-button {
-	margin: .5rem;
-	width: calc(100% - 1rem);
-}
-
-.currently-active {
-	color: var(--primary);
-}
-</style>
--- a/src/components/tasks/partials/reminder-period.vue
+++ b/src/components/tasks/partials/reminder-period.vue
@ -1,131 +0,0 @@
-<template>
-	<div
-		class="reminder-period control"
-	>
-		<input
-			class="input"
-			v-model.number="period.duration"
-			type="number"
-			min="0"
-			@change="updateData"
-		/>
-
-		<div class="select">
-			<select v-model="period.durationUnit" @change="updateData">
-				<option value="minutes">{{ $t('time.units.minutes', period.duration) }}</option>
-				<option value="hours">{{ $t('time.units.hours', period.duration) }}</option>
-				<option value="days">{{ $t('time.units.days', period.duration) }}</option>
-				<option value="weeks">{{ $t('time.units.weeks', period.duration) }}</option>
-			</select>
-		</div>
-
-		<div class="select">
-			<select v-model.number="period.sign" @change="updateData">
-				<option value="-1">
-					{{ $t('task.reminder.beforeShort') }}
-				</option>
-				<option value="1">
-					{{ $t('task.reminder.afterShort') }}
-				</option>
-			</select>
-		</div>
-
-		<div class="select">
-			<select v-model="period.relativeTo" @change="updateData">
-				<option :value="REMINDER_PERIOD_RELATIVE_TO_TYPES.DUEDATE">
-					{{ $t('task.attributes.dueDate') }}
-				</option>
-				<option :value="REMINDER_PERIOD_RELATIVE_TO_TYPES.STARTDATE">
-					{{ $t('task.attributes.startDate') }}
-				</option>
-				<option :value="REMINDER_PERIOD_RELATIVE_TO_TYPES.ENDDATE">
-					{{ $t('task.attributes.endDate') }}
-				</option>
-			</select>
-		</div>
-	</div>
-</template>
-
-<script setup lang="ts">
-import {ref, watch, type PropType} from 'vue'
-import {toRef} from '@vueuse/core'
-
-import {periodToSeconds, PeriodUnit, secondsToPeriod} from '@/helpers/time/period'
-
-import TaskReminderModel from '@/models/taskReminder'
-
-import type {ITaskReminder} from '@/modelTypes/ITaskReminder'
-import {REMINDER_PERIOD_RELATIVE_TO_TYPES, type IReminderPeriodRelativeTo} from '@/types/IReminderPeriodRelativeTo'
-
-const props = defineProps({
-	modelValue: {
-		type: Object as PropType<ITaskReminder>,
-		required: false,
-	},
-	disabled: {
-		type: Boolean,
-		default: false,
-	},
-})
-
-const emit = defineEmits(['update:modelValue'])
-
-const reminder = ref<ITaskReminder>(new TaskReminderModel())
-
-interface PeriodInput {
-	duration: number,
-	durationUnit: PeriodUnit,
-	relativeTo: IReminderPeriodRelativeTo,
-	sign: -1 | 1,
-}
-
-const period = ref<PeriodInput>({
-	duration: 0,
-	durationUnit: 'hours',
-	relativeTo: REMINDER_PERIOD_RELATIVE_TO_TYPES.DUEDATE,
-	sign: -1,
-})
-
-const modelValue = toRef(props, 'modelValue')
-watch(
-	modelValue,
-	(value) => {
-		const p = secondsToPeriod(value?.relativePeriod)
-		period.value.durationUnit = p.unit
-		period.value.duration = Math.abs(p.amount)
-		period.value.relativeTo = value?.relativeTo || REMINDER_PERIOD_RELATIVE_TO_TYPES.DUEDATE
-	},
-	{immediate: true},
-)
-
-watch(
-	() => period.value.duration,
-	value => {
-		if (value < 0) {
-			period.value.duration = value * -1
-		}
-	},
-)
-
-function updateData() {
-	reminder.value.relativePeriod = period.value.sign * periodToSeconds(Math.abs(period.value.duration), period.value.durationUnit)
-	reminder.value.relativeTo = period.value.relativeTo
-	reminder.value.reminder = null
-
-	emit('update:modelValue', reminder.value)
-}
-</script>
-
-<style lang="scss" scoped>
-.reminder-period {
-	display: flex;
-	flex-direction: column;
-	gap: .25rem;
-	padding: .5rem .5rem 0;
-
-	.input, .select select {
-		width: 100% !important;
-		height: auto;
-	}
-}
-</style>
--- a/src/components/tasks/partials/reminders.story.vue
+++ b/src/components/tasks/partials/reminders.story.vue
@ -1,26 +0,0 @@
-<script setup lang="ts">
-import reminders from './reminders.vue'
-import {ref} from 'vue'
-import ReminderDetail from '@/components/tasks/partials/reminder-detail.vue'
-
-const reminderNow = ref({reminder: new Date(), relativePeriod: 0, relativeTo: null } )
-const relativeReminder = ref({reminder: null, relativePeriod: 1, relativeTo: 'due_date' } )
-const newReminder = ref(null)
-</script>
-
-<template>
-	<Story>
-		<Variant title="Default">
-			<reminders/>
-		</Variant>
-		<Variant title="Reminder Detail with fixed date">
-			<reminder-detail v-model="reminderNow"/>
-		</Variant>
-		<Variant title="Reminder Detail with relative date">
-			<reminder-detail v-model="relativeReminder"/>
-		</Variant>
-		<Variant title="New Reminder Detail">
-			<reminder-detail v-model="newReminder"/>
-		</Variant>
-	</Story>
-</template>
--- a/src/components/tasks/partials/reminders.vue
+++ b/src/components/tasks/partials/reminders.vue
@ -3,96 +3,104 @@
 		<div
 			v-for="(r, index) in reminders"
 			:key="index"
-			:class="{ 'overdue': r.reminder < new Date() }"
+			:class="{ 'overdue': r < new Date()}"
 			class="reminder-input"
 		>
-			<ReminderDetail
-				class="reminder-detail"
-				:disabled="disabled"
+			<Datepicker
 				v-model="reminders[index]"
-				@update:model-value="updateData"
-				:default-relative-to="defaultRelativeTo"
+				:disabled="disabled"
+				@close-on-change="() => addReminderDate(index)"
 			/>
-			<BaseButton
-				v-if="!disabled"
-				@click="removeReminderByIndex(index)"
-				class="remove"
-			>
-				<icon icon="times"/>
+			<BaseButton @click="removeReminderByIndex(index)" v-if="!disabled" class="remove">
+				<icon icon="times"></icon>
 			</BaseButton>
 		</div>
-
-		<ReminderDetail
-			:disabled="disabled"
-			@update:modelValue="addNewReminder"
-			:clear-after-update="true"
-			:default-relative-to="defaultRelativeTo"
-		/>
+		<div class="reminder-input" v-if="!disabled">
+			<Datepicker
+				v-model="newReminder"
+				@close-on-change="() => addReminderDate()"
+				:choose-date-label="$t('task.addReminder')"
+			/>
+		</div>
 	</div>
 </template>

 <script setup lang="ts">
-import {ref, watch, computed} from 'vue'
-
-import type {ITaskReminder} from '@/modelTypes/ITaskReminder'
+import {type PropType, ref, onMounted, watch} from 'vue'

 import BaseButton from '@/components/base/BaseButton.vue'
-import ReminderDetail from '@/components/tasks/partials/reminder-detail.vue'
-import type {ITask} from '@/modelTypes/ITask'
-import {REMINDER_PERIOD_RELATIVE_TO_TYPES} from '@/types/IReminderPeriodRelativeTo'
+import Datepicker from '@/components/input/datepicker.vue'

-const props = withDefaults(defineProps<{
-	modelValue: ITask,
-	disabled?: boolean,
-}>(), {
-	modelValue: [],
-	disabled: false,
+type Reminder = Date | string
+
+
+
+const props = defineProps({
+	modelValue: {
+		type: Array as PropType<Reminder[]>,
+		default: () => [],
+		validator(prop) {
+			// This allows arrays of Dates and strings
+			if (!(prop instanceof Array)) {
+				return false
+			}
+
+			const isDate = (e: unknown) => e instanceof Date
+			const isString = (e: unknown) => typeof e === 'string'
+
+			for (const e of prop) {
+				if (!isDate(e) && !isString(e)) {
+					return false
+				}
+			}
+
+			return true
+		},
+	},
+	disabled: {
+		type: Boolean,
+		default: false,
+	},
 })

 const emit = defineEmits(['update:modelValue'])

-const reminders = ref<ITaskReminder[]>([])
+const reminders = ref<Reminder[]>([])

-watch(
-	() => props.modelValue.reminders,
-	(newVal) => {
-		reminders.value = newVal
-	},
-	{immediate: true, deep: true}, // deep watcher so that we get the resolved date after updating the task
-)
-
-const defaultRelativeTo = computed(() => {
-	if (typeof props.modelValue === 'undefined') {
-		return null
-	}
-	
-	if (props.modelValue?.dueDate) {
-		return REMINDER_PERIOD_RELATIVE_TO_TYPES.DUEDATE
-	}
-	
-	if (props.modelValue.dueDate === null && props.modelValue.startDate !== null) {
-		return REMINDER_PERIOD_RELATIVE_TO_TYPES.STARTDATE
-	}
-	
-	if (props.modelValue.dueDate === null && props.modelValue.startDate === null && props.modelValue.endDate !== null) {
-		return REMINDER_PERIOD_RELATIVE_TO_TYPES.ENDDATE
-	}
-	
-	return null
+onMounted(() => {
+	reminders.value = [...props.modelValue]
 })

+watch(
+	() => props.modelValue,
+	(newVal) => {
+		for (const i in newVal) {
+			if (typeof newVal[i] === 'string') {
+				newVal[i] = new Date(newVal[i])
+			}
+		}
+		reminders.value = newVal
+	},
+)
+
+
 function updateData() {
-	emit('update:modelValue', {
-		...props.modelValue,
-		reminders: reminders.value,
-	})
+	emit('update:modelValue', reminders.value)
 }

-function addNewReminder(newReminder: ITaskReminder) {
-	if (newReminder === null) {
+const newReminder = ref(null)
+function addReminderDate(index : number | null = null) {
+	// New Date
+	if (index === null) {
+		if (newReminder.value === null) {
+			return
+		}
+		reminders.value.push(new Date(newReminder.value))
+		newReminder.value = null
+	} else if(reminders.value[index] === null) {
 		return
 	}
-	reminders.value.push(newReminder)
+
 	updateData()
 }

@ -103,27 +111,23 @@ function removeReminderByIndex(index: number) {
 </script>

 <style lang="scss" scoped>
-.reminder-input {
-	display: flex;
-	align-items: center;
+.reminders {
+  .reminder-input {
+    display: flex;
+    align-items: center;

-	&.overdue :deep(.datepicker .show) {
-		color: var(--danger);
-	}
+    &.overdue :deep(.datepicker .show) {
+      color: var(--danger);
+    }

-	&::last-child {
-		margin-bottom: 0.75rem;
-	}
-}
+    &:last-child {
+      margin-bottom: 0.75rem;
+    }

-.reminder-detail {
-	width: 100%;
-}
-
-.remove {
-	color: var(--danger);
-	vertical-align: top;
-	padding-left: .5rem;
-	line-height: 1;
+    .remove {
+      color: var(--danger);
+      padding-left: .5rem;
+    }
+  }
 }
 </style>
--- a/src/components/tasks/partials/repeatAfter.vue
+++ b/src/components/tasks/partials/repeatAfter.vue
@ -70,7 +70,6 @@ import {error} from '@/message'
 import {TASK_REPEAT_MODES} from '@/types/IRepeatMode'
 import type {IRepeatAfter} from '@/types/IRepeatAfter'
 import type {ITask} from '@/modelTypes/ITask'
-import TaskModel from '@/models/task'

 const props = defineProps({
 	modelValue: {
@ -88,7 +87,7 @@ const {t} = useI18n({useScope: 'global'})

 const emit = defineEmits(['update:modelValue'])

-const task = ref<ITask>(new TaskModel())
+const task = ref<ITask>()
 const repeatAfter = reactive({
 	amount: 0,
 	type: '',
@ -96,7 +95,7 @@ const repeatAfter = reactive({

 watch(
 	() => props.modelValue,
-	(value: ITask) => {
+	(value) => {
 		task.value = value
 		if (typeof value.repeatAfter !== 'undefined') {
 			Object.assign(repeatAfter, value.repeatAfter)
@ -106,14 +105,11 @@ watch(
 )

 function updateData() {
-	if (!task.value || 
-		(task.value.repeatMode === TASK_REPEAT_MODES.REPEAT_MODE_DEFAULT && repeatAfter.amount === 0) ||
-		(task.value.repeatMode === TASK_REPEAT_MODES.REPEAT_MODE_FROM_CURRENT_DATE && repeatAfter.amount === 0)
-	) {
+	if (!task.value || task.value.repeatMode !== TASK_REPEAT_MODES.REPEAT_MODE_DEFAULT && repeatAfter.amount === 0) {
 		return
 	}

-	if (task.value.repeatMode === TASK_REPEAT_MODES.REPEAT_MODE_DEFAULT && repeatAfter.amount < 0) {
+	if (repeatAfter.amount < 0) {
 		error({message: t('task.repeat.invalidAmount')})
 		return
 	}
--- a/src/components/tasks/partials/singleTaskInProject.vue
+++ b/src/components/tasks/partials/singleTaskInProject.vue
@ -7,19 +7,19 @@
 		/>

 		<ColorBubble
-			v-if="showProjectColor && projectColor !== '' && currentProject?.id !== task.projectId"
+			v-if="showProjectColor && projectColor !== '' && currentProject.id !== task.projectId"
 			:color="projectColor"
 			class="mr-1"
 		/>

 		<router-link
 			:to="taskDetailRoute"
-			:class="{ 'done': task.done, 'show-project': showProject && project}"
+			:class="{ 'done': task.done, 'show-project': showProject && project !== null}"
 			class="tasktext"
 		>
 			<span>
 				<router-link
-					v-if="showProject && typeof project !== 'undefined'"
+					v-if="showProject && project !== null"
 					:to="{ name: 'project.list', params: { projectId: task.projectId } }"
 					class="task-project"
 					:class="{'mr-2': task.hexColor !== ''}"
@ -34,7 +34,7 @@
 				/>

 				<!-- Show any parent tasks to make it clear this task is a sub task of something -->
-				<span class="parent-tasks" v-if="typeof task.relatedTasks?.parenttask !== 'undefined'">
+				<span class="parent-tasks" v-if="typeof task.relatedTasks.parenttask !== 'undefined'">
 					<template v-for="(pt, i) in task.relatedTasks.parenttask">
 						{{ pt.title }}<template v-if="(i + 1) < task.relatedTasks.parenttask.length">,&nbsp;</template>
 					</template>
@ -56,7 +56,6 @@
 				:key="task.id + 'assignee' + a.id + i"
 				:show-username="false"
 				:user="a"
-				class="m-2"
 			/>

 			<!-- FIXME: use popup -->
@ -105,7 +104,7 @@
 		</progress>

 		<router-link
-			v-if="!showProject && currentProject?.id !== task.projectId && project"
+			v-if="!showProject && currentProject.id !== task.projectId && project !== null"
 			:to="{ name: 'project.list', params: { projectId: task.projectId } }"
 			class="task-project"
 			v-tooltip="$t('task.detail.belongsToProject', {project: project.title})"
@ -150,6 +149,7 @@ import {formatDateSince, formatISO, formatDateLong} from '@/helpers/time/formatD
 import {success} from '@/message'

 import {useProjectStore} from '@/stores/projects'
+import {useNamespaceStore} from '@/stores/namespaces'
 import {useBaseStore} from '@/stores/base'
 import {useTaskStore} from '@/stores/tasks'

@ -209,9 +209,10 @@ onBeforeUnmount(() => {
 const baseStore = useBaseStore()
 const projectStore = useProjectStore()
 const taskStore = useTaskStore()
+const namespaceStore = useNamespaceStore()

-const project = computed(() => projectStore.projects[task.value.projectId])
-const projectColor = computed(() => project.value ? project.value?.hexColor : '')
+const project = computed(() => projectStore.getProjectById(task.value.projectId))
+const projectColor = computed(() => project.value !== null ? project.value.hexColor : '')

 const currentProject = computed(() => {
 	return typeof baseStore.currentProject === 'undefined' ? {
@ -256,8 +257,10 @@ function undoDone(checked: boolean) {
 }

 async function toggleFavorite() {
-	task.value = await taskStore.toggleFavorite(task.value)
+	task.value.isFavorite = !task.value.isFavorite
+	task.value = await taskService.update(task.value)
 	emit('task-updated', task.value)
+	namespaceStore.loadNamespacesIfFavoritesDontExist()
 }

 const deferDueDate = ref<typeof DeferTask | null>(null)
--- a/src/composables/useColorScheme.ts
+++ b/src/composables/useColorScheme.ts
@ -1,7 +1,8 @@
 import {computed, watch, readonly} from 'vue'
-import {createSharedComposable, usePreferredColorScheme, tryOnMounted} from '@vueuse/core'
+import {useStorage, createSharedComposable, usePreferredColorScheme, tryOnMounted} from '@vueuse/core'
 import type {BasicColorSchema} from '@vueuse/core'
-import {useAuthStore} from '@/stores/auth'
+
+const STORAGE_KEY = 'color-scheme'

 const DEFAULT_COLOR_SCHEME_SETTING: BasicColorSchema = 'light'

@ -16,8 +17,7 @@ const CLASS_LIGHT = 'light'
 // - value is synced via `createSharedComposable`
 // https://github.com/vueuse/vueuse/blob/main/packages/core/useDark/index.ts 
 export const useColorScheme = createSharedComposable(() => {
-	const authStore = useAuthStore()
-	const store = computed(() => authStore.settings.frontendSettings.colorSchema)
+	const store = useStorage<BasicColorSchema>(STORAGE_KEY, DEFAULT_COLOR_SCHEME_SETTING)

 	const preferredColorScheme = usePreferredColorScheme()

--- a/src/composables/useNamespaceSearch.ts
+++ b/src/composables/useNamespaceSearch.ts
@ -0,0 +1,19 @@
+import {ref, computed} from 'vue'
+import {useNamespaceStore} from '@/stores/namespaces'
+
+export function useNamespaceSearch() {
+	const query = ref('')
+	
+	const namespaceStore = useNamespaceStore()
+	const namespaces = computed(() => namespaceStore.searchNamespace(query.value))
+	
+	function findNamespaces(newQuery: string) {
+		query.value = newQuery
+	}
+
+	return {
+		namespaces,
+		findNamespaces,
+	}
+}
+
--- a/src/composables/useTitle.ts
+++ b/src/composables/useTitle.ts
@ -1,7 +1,7 @@
-import {computed} from 'vue'
-import type {Ref} from 'vue'
+import { computed } from 'vue'
+import type { Ref } from 'vue'

-import {useTitle as useTitleVueUse, toRef} from '@vueuse/core'
+import {useTitle as useTitleVueUse, resolveRef} from '@vueuse/core'

 type UseTitleParameters = Parameters<typeof useTitleVueUse>

@ -9,12 +9,12 @@ export function useTitle(...args: UseTitleParameters) {

 	const [newTitle, ...restArgs] = args

-	const pageTitle = toRef(newTitle) as Ref<string>
+  const pageTitle = resolveRef(newTitle) as Ref<string>

-	const completeTitle = computed(() =>
+	const completeTitle = computed(() => 
 		(typeof pageTitle.value === 'undefined' || pageTitle.value === '')
-			? 'Vikunja'
-			: `${pageTitle.value} | Vikunja`,
+		? 'Vikunja'
+		: `${pageTitle.value} | Vikunja`,
 	)

 	return useTitleVueUse(completeTitle, ...restArgs)
--- a/src/helpers/canNestProjectDeeper.ts
+++ b/src/helpers/canNestProjectDeeper.ts
@ -1,7 +0,0 @@
-export function canNestProjectDeeper(level: number) {
-	if (level < 2) {
-		return true
-	}
-
-	return level >= 2 && window.PROJECT_INFINITE_NESTING_ENABLED
-}
--- a/src/helpers/getNamespaceTitle.ts
+++ b/src/helpers/getNamespaceTitle.ts
@ -0,0 +1,15 @@
+import {i18n} from '@/i18n'
+import type {INamespace} from '@/modelTypes/INamespace'
+
+export const getNamespaceTitle = (n: INamespace) => {
+	if (n.id === -1) {
+		return i18n.global.t('namespace.pseudo.sharedProjects.title')
+	}
+	if (n.id === -2) {
+		return i18n.global.t('namespace.pseudo.favorites.title')
+	}
+	if (n.id === -3) {
+		return i18n.global.t('namespace.pseudo.savedFilters.title')
+	}
+	return n.title
+}
--- a/src/helpers/getProjectTitle.ts
+++ b/src/helpers/getProjectTitle.ts
@ -1,14 +1,9 @@
 import {i18n} from '@/i18n'
 import type {IProject} from '@/modelTypes/IProject'

-export function getProjectTitle(project: IProject) {
-	if (project.id === -1) {
+export function getProjectTitle(l: IProject) {
+	if (l.id === -1) {
 		return i18n.global.t('project.pseudo.favorites.title')
 	}
-
-	if (project.title === 'Inbox') {
-		return i18n.global.t('project.inboxTitle')
-	}
-
-	return project.title
+	return l.title
 }
--- a/src/helpers/parseSubtasksViaIndention.test.ts
+++ b/src/helpers/parseSubtasksViaIndention.test.ts
@ -1,6 +1,5 @@
-import {describe, expect, it} from 'vitest'
+import {describe, it, expect} from 'vitest'
 import {parseSubtasksViaIndention} from '@/helpers/parseSubtasksViaIndention'
-import {PrefixMode} from '@/modules/parseTaskText'

 describe('Parse Subtasks via Relation', () => {
 	it('Should not return a parent for a single task', () => {
@ -11,7 +10,7 @@ describe('Parse Subtasks via Relation', () => {
 	})
 	it('Should not return a parent for multiple tasks without indention', () => {
 		const tasks = parseSubtasksViaIndention(`task one
-task two`, PrefixMode.Default)
+task two`)

 		expect(tasks).to.have.length(2)
 		expect(tasks[0].parent).toBeNull()
@ -19,7 +18,7 @@ task two`, PrefixMode.Default)
 	})
 	it('Should return a parent for two tasks with indention', () => {
 		const tasks = parseSubtasksViaIndention(`parent task
-  sub task`, PrefixMode.Default)
+  sub task`)

 		expect(tasks).to.have.length(2)
 		expect(tasks[0].parent).toBeNull()
@ -30,7 +29,7 @@ task two`, PrefixMode.Default)
 	it('Should return a parent for multiple subtasks', () => {
 		const tasks = parseSubtasksViaIndention(`parent task
  sub task one
-  sub task two`, PrefixMode.Default)
+  sub task two`)

 		expect(tasks).to.have.length(3)
 		expect(tasks[0].parent).toBeNull()
@ -43,7 +42,7 @@ task two`, PrefixMode.Default)
 	it('Should work with multiple indention levels', () => {
 		const tasks = parseSubtasksViaIndention(`parent task
  sub task
-    sub sub task`, PrefixMode.Default)
+    sub sub task`)

 		expect(tasks).to.have.length(3)
 		expect(tasks[0].parent).toBeNull()
@ -57,7 +56,7 @@ task two`, PrefixMode.Default)
 		const tasks = parseSubtasksViaIndention(`parent task
  sub task
    sub sub task one
-    sub sub task two`, PrefixMode.Default)
+    sub sub task two`)

 		expect(tasks).to.have.length(4)
 		expect(tasks[0].parent).toBeNull()
@ -74,7 +73,7 @@ task two`, PrefixMode.Default)
  sub task
    sub sub task one
      sub sub sub task
-    sub sub task two`, PrefixMode.Default)
+    sub sub task two`)

 		expect(tasks).to.have.length(5)
 		expect(tasks[0].parent).toBeNull()
@ -91,7 +90,7 @@ task two`, PrefixMode.Default)
 	it('Should return a parent for multiple subtasks with special stuff', () => {
 		const tasks = parseSubtasksViaIndention(`* parent task
  * sub task one
-  sub task two`, PrefixMode.Default)
+  sub task two`)

 		expect(tasks).to.have.length(3)
 		expect(tasks[0].parent).toBeNull()
@ -102,7 +101,7 @@ task two`, PrefixMode.Default)
 		expect(tasks[2].parent).to.eq('parent task')
 	})
 	it('Should not break when the first line is indented', () => {
-		const tasks = parseSubtasksViaIndention('  single task', PrefixMode.Default)
+		const tasks = parseSubtasksViaIndention('  single task')

 		expect(tasks).to.have.length(1)
 		expect(tasks[0].parent).toBeNull()
@ -111,7 +110,7 @@ task two`, PrefixMode.Default)
 		const tasks = parseSubtasksViaIndention(
 `parent task +list
  sub task 1
-  sub task 2`, PrefixMode.Default)
+  sub task 2`)
 		
 		expect(tasks).to.have.length(3)
 		expect(tasks[0].project).to.eq('list')
--- a/src/helpers/parseSubtasksViaIndention.ts
+++ b/src/helpers/parseSubtasksViaIndention.ts
@ -1,4 +1,4 @@
-import {getProjectFromPrefix, PrefixMode} from '@/modules/parseTaskText'
+import {getProjectFromPrefix} from '@/modules/parseTaskText'

 export interface TaskWithParent {
 	title: string,
@ -16,7 +16,7 @@ const spaceRegex = /^ */
 * @param taskTitles should be multiple lines of task tiles with indention to declare their parent/subtask
 * relation between each other.
 */
-export function parseSubtasksViaIndention(taskTitles: string, prefixMode: PrefixMode): TaskWithParent[] {
+export function parseSubtasksViaIndention(taskTitles: string): TaskWithParent[] {
 	const titles = taskTitles.split(/[\r\n]+/)

 	return titles.map((title, index) => {
@ -26,7 +26,7 @@ export function parseSubtasksViaIndention(taskTitles: string, prefixMode: Prefix
 			project: null,
 		}

-		task.project = getProjectFromPrefix(task.title, prefixMode)
+		task.project = getProjectFromPrefix(task.title)

 		if (index === 0) {
 			return task
@ -49,7 +49,7 @@ export function parseSubtasksViaIndention(taskTitles: string, prefixMode: Prefix
 			task.parent = task.parent.replace(spaceRegex, '')
 			if (task.project === null) {
 				// This allows to specify a project once for the parent task and inherit it to all subtasks
-				task.project = getProjectFromPrefix(task.parent, prefixMode)
+				task.project = getProjectFromPrefix(task.parent)
 			}
 		}

--- a/src/helpers/playPop.ts
+++ b/src/helpers/playPop.ts
@ -2,6 +2,15 @@ import popSoundFile from '@/assets/audio/pop.mp3'

 export const playSoundWhenDoneKey = 'playSoundWhenTaskDone'

+export function playPop() {
+	const enabled = localStorage.getItem(playSoundWhenDoneKey) === 'true'
+	if (!enabled) {
+		return
+	}
+
+	playPopSound()
+}
+
 export function playPopSound() {
 	const popSound = new Audio(popSoundFile)
 	popSound.play()
--- a/src/helpers/quickAddMagicMode.ts
+++ b/src/helpers/quickAddMagicMode.ts
@ -0,0 +1,21 @@
+import {PrefixMode} from '@/modules/parseTaskText'
+
+const key = 'quickAddMagicMode'
+
+export const setQuickAddMagicMode = (mode: PrefixMode) => {
+	localStorage.setItem(key, mode)
+}
+
+export const getQuickAddMagicMode = (): PrefixMode => {
+	const mode = localStorage.getItem(key)
+
+	switch (mode) {
+		case null:
+		case PrefixMode.Default:
+			return PrefixMode.Default
+		case PrefixMode.Todoist:
+			return PrefixMode.Todoist
+	}
+
+	return PrefixMode.Disabled
+}
--- a/src/helpers/time/parseDate.ts
+++ b/src/helpers/time/parseDate.ts
@ -129,7 +129,7 @@ const addTimeToDate = (text: string, date: Date, previousMatch: string | null):
 }

 export const getDateFromText = (text: string, now: Date = new Date()) => {
-	const fullDateRegex = /(^| )([0-9][0-9]?\/[0-9][0-9]?\/[0-9][0-9]([0-9][0-9])?|[0-9][0-9][0-9][0-9]\/[0-9][0-9]?\/[0-9][0-9]?|[0-9][0-9][0-9][0-9]-[0-9][0-9]?-[0-9][0-9]?)/ig
+	const fullDateRegex = / ([0-9][0-9]?\/[0-9][0-9]?\/[0-9][0-9]([0-9][0-9])?|[0-9][0-9][0-9][0-9]\/[0-9][0-9]?\/[0-9][0-9]?|[0-9][0-9][0-9][0-9]-[0-9][0-9]?-[0-9][0-9]?)/ig

 	// 1. Try parsing the text as a "usual" date, like 2021-06-24 or 06/24/2021
 	let results: string[] | null = fullDateRegex.exec(text)
@ -138,7 +138,7 @@ export const getDateFromText = (text: string, now: Date = new Date()) => {
 	let containsYear = true
 	if (result === null) {
 		// 2. Try parsing the date as something like "jan 21" or "21 jan"
-		const monthRegex = new RegExp(`(^| )(${monthsRegexGroup} [0-9][0-9]?|[0-9][0-9]? ${monthsRegexGroup})`, 'ig')
+		const monthRegex = new RegExp(` (${monthsRegexGroup} [0-9][0-9]?|[0-9][0-9]? ${monthsRegexGroup})`, 'ig')
 		results = monthRegex.exec(text)
 		result = results === null ? null : `${results[0]} ${now.getFullYear()}`.trim()
 		foundText = results === null ? '' : results[0].trim()
@ -146,7 +146,7 @@ export const getDateFromText = (text: string, now: Date = new Date()) => {

 		if (result === null) {
 			// 3. Try parsing the date as "27/01" or "01/27"
-			const monthNumericRegex = /(^| )([0-9][0-9]?\/[0-9][0-9]?)/ig
+			const monthNumericRegex = / ([0-9][0-9]?\/[0-9][0-9]?)/ig
 			results = monthNumericRegex.exec(text)

 			// Put the year before or after the date, depending on what works
@ -299,7 +299,7 @@ const getDateFromWeekday = (text: string): dateFoundResult => {
 }

 const getDayFromText = (text: string) => {
-	const matcher = /(^| )(([1-2][0-9])|(3[01])|(0?[1-9]))(st|nd|rd|th|\.)($| )/ig
+	const matcher = /($| )(([1-2][0-9])|(3[01])|(0?[1-9]))(st|nd|rd|th|\.)($| )/ig
 	const results = matcher.exec(text)
 	if (results === null) {
 		return {
--- a/src/helpers/time/period.ts
+++ b/src/helpers/time/period.ts
@ -1,50 +0,0 @@
-import {
-	SECONDS_A_DAY,
-	SECONDS_A_HOUR,
-	SECONDS_A_MINUTE,
-	SECONDS_A_MONTH,
-	SECONDS_A_WEEK,
-	SECONDS_A_YEAR,
-} from '@/constants/date'
-
-export type PeriodUnit = 'seconds' | 'minutes' | 'hours' | 'days' | 'weeks' | 'months' | 'years'
-
-/**
- * Convert time period given as seconds to days, hour, minutes, seconds
- */
-export function secondsToPeriod(seconds: number): { unit: PeriodUnit, amount: number } {
-	if (seconds % SECONDS_A_DAY === 0) {
-		if (seconds % SECONDS_A_WEEK === 0) {
-			return {unit: 'weeks', amount: seconds / SECONDS_A_WEEK}
-		} else if (seconds % SECONDS_A_MONTH === 0) {
-			return {unit: 'days', amount: seconds / SECONDS_A_MONTH * 30}
-		} else if (seconds % SECONDS_A_YEAR === 0) {
-			return {unit: 'years', amount: seconds / SECONDS_A_YEAR}
-		} else {
-			return {unit: 'days', amount: seconds / SECONDS_A_DAY}
-		}
-	}
-
-	return {
-		unit: 'hours',
-		amount: seconds / SECONDS_A_HOUR,
-	}
-}
-
-/**
- * Convert time period of days, hour, minutes, seconds to duration in seconds
- */
-export function periodToSeconds(period: number, unit: PeriodUnit): number {
-	switch (unit) {
-		case 'minutes':
-			return period * SECONDS_A_MINUTE
-		case 'hours':
-			return period * SECONDS_A_HOUR
-		case 'days':
-			return period * SECONDS_A_DAY
-		case 'weeks':
-			return period * SECONDS_A_WEEK
-	}
-
-	return 0
-}
--- a/src/i18n/index.ts
+++ b/src/i18n/index.ts
@ -32,7 +32,7 @@ export const i18n = createI18n({
 	} as Record<SupportedLocale, any>,
 })

-export async function setLanguage(lang: SupportedLocale): Promise<SupportedLocale | undefined> {
+export async function setLanguage(lang: SupportedLocale = getCurrentLanguage()): Promise<SupportedLocale | undefined> {
 	if (!lang) {
 		throw new Error()
 	}
@ -53,7 +53,12 @@ export async function setLanguage(lang: SupportedLocale): Promise<SupportedLocal
 	return lang
 }

-export function getBrowserLanguage(): SupportedLocale {
+export function getCurrentLanguage(): SupportedLocale {
+	const savedLanguage = localStorage.getItem('language') as SupportedLocale | null
+	if (savedLanguage !== null) {
+		return savedLanguage
+	}
+
 	const browserLanguage = navigator.language

 	const language = Object.keys(SUPPORTED_LOCALES).find(langKey => {
@ -62,3 +67,8 @@ export function getBrowserLanguage(): SupportedLocale {

 	return language || DEFAULT_LANGUAGE
 }
+
+export async function saveLanguage(lang: SupportedLocale) {
+	localStorage.setItem('language', lang)
+	await setLanguage()
+}
--- a/src/i18n/lang/ca-ES.json
+++ b/src/i18n/lang/ca-ES.json
@ -5,9 +5,10 @@
    "welcomeDay": "Hi {username}!",
    "welcomeEvening": "Good Evening {username}!",
    "lastViewed": "Last viewed",
-    "addToHomeScreen": "Add this app to your home screen for faster access and improved experience.",
    "project": {
-      "importText": "Import your projects and tasks from other services into Vikunja:",
+      "newText": "You can create a new project for your new tasks:",
+      "new": "New project",
+      "importText": "Or import your projects and tasks from other services into Vikunja:",
      "import": "Import your data into Vikunja"
    }
  },
@ -77,8 +78,8 @@
        "savedSuccess": "The settings were successfully updated.",
        "emailReminders": "Send me reminders for tasks via Email",
        "overdueReminders": "Send me a summary of my undone overdue tasks every day",
-        "discoverableByName": "Allow other users to add me as a member to teams or projects when they search for my name",
-        "discoverableByEmail": "Allow other users to add me as a member to teams or projects when they search for my full email",
+        "discoverableByName": "Let other users find me when they search for my name",
+        "discoverableByEmail": "Let other users find me when they search for my full email",
        "playSoundWhenDone": "Play a sound when marking tasks as done",
        "weekStart": "Week starts on",
        "weekStartSunday": "Sunday",
@ -142,7 +143,7 @@
    },
    "deletion": {
      "title": "Delete your Vikunja Account",
-      "text1": "The deletion of your account is permanent and cannot be undone. We will delete all your projects, tasks and everything associated with it.",
+      "text1": "The deletion of your account is permanent and cannot be undone. We will delete all your namespaces, projects, tasks and everything associated with it.",
      "text2": "To proceed, please enter your password. You will receive an email with further instructions.",
      "confirm": "Delete my account",
      "requestSuccess": "The request was successful. You'll receive an email with further instructions.",
@ -156,7 +157,7 @@
    },
    "export": {
      "title": "Export your Vikunja data",
-      "description": "You can request a copy of all your Vikunja data. This includes Projects, Tasks and everything associated to them. You can import this data in any Vikunja instance through the migration function.",
+      "description": "You can request a copy of all your Vikunja data. This include Namespaces, Projects, Tasks and everything associated to them. You can import this data in any Vikunja instance through the migration function.",
      "descriptionPasswordRequired": "Please enter your password to proceed:",
      "request": "Request a copy of my Vikunja Data",
      "success": "You've successfully requested your Vikunja Data! We will send you an email once it's ready to download.",
@ -164,18 +165,14 @@
    }
  },
  "project": {
-    "archivedMessage": "This project is archived. It is not possible to create new or edit tasks for it.",
-    "archived": "Archived",
-    "showArchived": "Show Archived",
+    "archived": "This project is archived. It is not possible to create new or edit tasks for it.",
    "title": "Project Title",
    "color": "Color",
    "projects": "Projects",
-    "parent": "Parent Project",
    "search": "Type to search for a project…",
    "searchSelect": "Click or press enter to select this project",
    "shared": "Shared Projects",
    "noDescriptionAvailable": "No project description is available.",
-    "inboxTitle": "Inbox",
    "create": {
      "header": "New project",
      "titlePlaceholder": "The project's title goes here…",
@ -213,7 +210,7 @@
    "duplicate": {
      "title": "Duplicate this project",
      "label": "Duplicate",
-      "text": "Select a parent project which should hold the duplicated project:",
+      "text": "Select a namespace which should hold the duplicated project:",
      "success": "The project was successfully duplicated."
    },
    "edit": {
@ -241,7 +238,7 @@
        "namePlaceholder": "e.g. Lorem Ipsum",
        "nameExplanation": "All actions done by this link share will show up with the name.",
        "password": "Password (optional)",
-        "passwordExplanation": "When signing in, the user will be required to enter this password.",
+        "passwordExplanation": "When authenticating, the user will be required to enter this password.",
        "noName": "No name set",
        "remove": "Remove a link share",
        "removeText": "Are you sure you want to remove this link share? It will no longer be possible to access this project with this link share. This cannot be undone!",
@ -324,6 +321,67 @@
      }
    }
  },
+  "namespace": {
+    "title": "Namespaces & Projects",
+    "namespace": "Namespace",
+    "showArchived": "Show Archived",
+    "noneAvailable": "You don't have any namespaces right now.",
+    "unarchive": "Un-Archive",
+    "archived": "Archived",
+    "noProjects": "This namespace does not contain any projects.",
+    "createProject": "Create a new project in this namespace.",
+    "namespaces": "Namespaces",
+    "search": "Type to search for a namespace…",
+    "create": {
+      "title": "New namespace",
+      "titleRequired": "Please specify a title.",
+      "explanation": "A namespace is a collection of projects you can share and use to organize your projects with. In fact, every project belongs to a namespace.",
+      "tooltip": "What's a namespace?",
+      "success": "The namespace was successfully created."
+    },
+    "archive": {
+      "titleArchive": "Archive \"{namespace}\"",
+      "titleUnarchive": "Un-Archive \"{namespace}\"",
+      "archiveText": "You won't be able to edit this namespace or create new projects until you un-archive it. This will also archive all projects in this namespace.",
+      "unarchiveText": "You will be able to create new projects or edit it.",
+      "success": "The namespace was successfully archived.",
+      "unarchiveSuccess": "The namespace was successfully un-archived.",
+      "description": "If a namespace is archived, you cannot create new projects or edit it."
+    },
+    "delete": {
+      "title": "Delete \"{namespace}\"",
+      "text1": "Are you sure you want to delete this namespace and all of its contents?",
+      "text2": "This includes all projects and tasks and CANNOT BE UNDONE!",
+      "success": "The namespace was successfully deleted."
+    },
+    "edit": {
+      "title": "Edit \"{namespace}\"",
+      "success": "The namespace was successfully updated."
+    },
+    "share": {
+      "title": "Share \"{namespace}\""
+    },
+    "attributes": {
+      "title": "Namespace Title",
+      "titlePlaceholder": "The namespace title goes here…",
+      "description": "Description",
+      "descriptionPlaceholder": "The namespaces description goes here…",
+      "color": "Color",
+      "archived": "Is Archived",
+      "isArchived": "This namespace is archived"
+    },
+    "pseudo": {
+      "sharedProjects": {
+        "title": "Shared Projects"
+      },
+      "favorites": {
+        "title": "Favorites"
+      },
+      "savedFilters": {
+        "title": "Filters"
+      }
+    }
+  },
  "filters": {
    "title": "Filters",
    "clear": "Clear Filters",
@ -345,7 +403,7 @@
    },
    "create": {
      "title": "New Saved Filter",
-      "description": "A saved filter is a virtual project which is computed from a set of filters each time it is accessed.",
+      "description": "A saved filter is a virtual project which is computed from a set of filters each time it is accessed. Once created, it will appear in a special namespace.",
      "action": "Create new saved filter",
      "titleRequired": "Please provide a title for the filter."
    },
@ -471,7 +529,7 @@
      "code": "Code",
      "quote": "Quote",
      "unorderedList": "Unordered List",
-      "orderedList": "Ordered List",
+      "orderedList  ": "Ordered List",
      "cleanBlock": "Clean Block",
      "link": "Link",
      "image": "Image",
@ -508,14 +566,14 @@
      "canuse": "You can use date math to filter for relative dates.",
      "learnhow": "Check out how it works",
      "title": "Date Math",
-      "intro": "Specify relative dates which are resolved on the fly by Vikunja when applying the filter.",
+      "intro": "Date Math allows you to specify relative dates which are resolved on the fly by Vikunja when applying the filter.",
      "expression": "Each Date Math expression starts with an anchor date, which can either be {0}, or a date string ending with {1}. This anchor date can optionally be followed by one or more maths expressions.",
      "similar": "These expressions are similar to the ones provided by {0} and {1}.",
      "add1Day": "Add one day",
      "minus1Day": "Subtract one day",
      "roundDay": "Round down to the nearest day",
-      "supportedUnits": "Supported time units",
-      "someExamples": "Examples of time expressions",
+      "supportedUnits": "Supported time units are:",
+      "someExamples": "Some examples of time expressions:",
      "units": {
        "seconds": "Seconds",
        "minutes": "Minutes",
@ -616,13 +674,19 @@
      "updated": "Updated"
    },
    "subscription": {
+      "subscribedProjectThroughParentNamespace": "You can't unsubscribe here because you are subscribed to this project through its namespace.",
+      "subscribedTaskThroughParentNamespace": "You can't unsubscribe here because you are subscribed to this task through its namespace.",
      "subscribedTaskThroughParentProject": "You can't unsubscribe here because you are subscribed to this task through its project.",
+      "subscribedNamespace": "You are currently subscribed to this namespace and will receive notifications for changes.",
+      "notSubscribedNamespace": "You are not subscribed to this namespace and won't receive notifications for changes.",
      "subscribedProject": "You are currently subscribed to this project and will receive notifications for changes.",
      "notSubscribedProject": "You are not subscribed to this project and won't receive notifications for changes.",
      "subscribedTask": "You are currently subscribed to this task and will receive notifications for changes.",
      "notSubscribedTask": "You are not subscribed to this task and won't receive notifications for changes.",
      "subscribe": "Subscribe",
      "unsubscribe": "Unsubscribe",
+      "subscribeSuccessNamespace": "You are now subscribed to this namespace",
+      "unsubscribeSuccessNamespace": "You are now unsubscribed to this namespace",
      "subscribeSuccessProject": "You are now subscribed to this project",
      "unsubscribeSuccessProject": "You are now unsubscribed to this project",
      "subscribeSuccessTask": "You are now subscribed to this task",
@ -699,6 +763,7 @@
      "searchPlaceholder": "Type search for a new task to add as related…",
      "createPlaceholder": "Add this as new related task",
      "differentProject": "This task belongs to a different project.",
+      "differentNamespace": "This task belongs to a different namespace.",
      "noneYet": "No task relations yet.",
      "delete": "Delete Task Relation",
      "deleteText1": "Are you sure you want to delete this task relation?",
@ -718,17 +783,6 @@
        "copiedto": "Copied To | Copied To"
      }
    },
-    "reminder": {
-      "before": "{amount} {unit} before {type}",
-      "after": "{amount} {unit} after {type}",
-      "beforeShort": "before",
-      "afterShort": "after",
-      "onDueDate": "On the due date",
-      "onStartDate": "On the start date",
-      "onEndDate": "On the end date",
-      "custom": "Custom",
-      "dateAndTime": "Date and time"
-    },
    "repeat": {
      "everyDay": "Every Day",
      "everyWeek": "Every Week",
@ -746,7 +800,8 @@
      "invalidAmount": "Please enter more than 0."
    },
    "quickAddMagic": {
-      "hint": "Use magic prefixes to define due dates, assignees and other task properties.",
+      "hint": "You can use Quick Add Magic",
+      "what": "What?",
      "title": "Quick Add Magic",
      "intro": "When creating a task, you can use special keywords to directly add attributes to the newly created task. This allows to add commonly used attributes to tasks much faster.",
      "multiple": "You can use this multiple times.",
@ -793,19 +848,19 @@
      "delete": {
        "header": "Delete the team",
        "text1": "Are you sure you want to delete this team and all of its members?",
-        "text2": "All team members will lose access to projects shared with this team. This CANNOT BE UNDONE!",
+        "text2": "All team members will lose access to projects and namespaces shared with this team. This CANNOT BE UNDONE!",
        "success": "The team was successfully deleted."
      },
      "deleteUser": {
        "header": "Remove a user from the team",
        "text1": "Are you sure you want to remove this user from the team?",
-        "text2": "They will lose access to all projects this team has access to. This CANNOT BE UNDONE!",
+        "text2": "They will lose access to all projects and namespaces this team has access to. This CANNOT BE UNDONE!",
        "success": "The user was successfully deleted from the team."
      },
      "leave": {
        "title": "Leave team",
        "text1": "Are you sure you want to leave this team?",
-        "text2": "You will lose access to all projects this team has access to. If you change your mind you'll need a team admin to add you again.",
+        "text2": "You will lose access to all projects and namespaces this team has access to. If you change your mind you'll need a team admin to add you again.",
        "success": "You have successfully left the team."
      }
    },
@ -839,10 +894,7 @@
      "color": "Change the color of this task",
      "move": "Move this task to another project",
      "reminder": "Manage reminders of this task",
-      "description": "Toggle editing of the task description",
-      "delete": "Delete this task",
-      "priority": "Change the priority of this task",
-      "favorite": "Mark this task as favorite / unfavorite"
+      "description": "Toggle editing of the task description"
    },
    "project": {
      "title": "Project Views",
@ -855,9 +907,9 @@
      "title": "Navigation",
      "overview": "Navigate to overview",
      "upcoming": "Navigate to upcoming tasks",
+      "namespaces": "Navigate to namespaces & projects",
      "labels": "Navigate to labels",
-      "teams": "Navigate to teams",
-      "projects": "Navigate to projects"
+      "teams": "Navigate to teams"
    }
  },
  "update": {
@ -872,8 +924,7 @@
    "unarchive": "Un-Archive",
    "setBackground": "Set background",
    "share": "Share",
-    "newProject": "New project",
-    "createProject": "Create project"
+    "newProject": "New project"
  },
  "apiConfig": {
    "url": "Vikunja URL",
@ -892,7 +943,7 @@
  "notification": {
    "title": "Notifications",
    "none": "You don't have any notifications. Have a nice day!",
-    "explainer": "Notifications will appear here when actions projects or tasks you subscribed to happen."
+    "explainer": "Notifications will appear here when actions on namespaces, projects or tasks you subscribed to happen."
  },
  "quickActions": {
    "commands": "Commands",
@ -903,12 +954,14 @@
    "teams": "Teams",
    "newProject": "Enter the title of the new project…",
    "newTask": "Enter the title of the new task…",
+    "newNamespace": "Enter the title of the new namespace…",
    "newTeam": "Enter the name of the new team…",
    "createTask": "Create a task in the current project ({title})",
-    "createProject": "Create a project",
+    "createProject": "Create a project in the current namespace ({title})",
    "cmds": {
      "newTask": "New task",
      "newProject": "New project",
+      "newNamespace": "New namespace",
      "newTeam": "New team"
    }
  },
@ -964,9 +1017,16 @@
    "4017": "Invalid task filter comparator.",
    "4018": "Invalid task filter concatenator.",
    "4019": "Invalid task filter value.",
+    "5001": "The namespace does not exist.",
+    "5003": "You do not have access to the specified namespace.",
+    "5006": "The namespace name cannot be empty.",
+    "5009": "You need to have namespace read access to perform that action.",
+    "5010": "This team does not have access to that namespace.",
+    "5011": "This user has already access to that namespace.",
+    "5012": "The namespace is archived and can therefore only be accessed read only.",
    "6001": "The team name cannot be empty.",
    "6002": "The team does not exist.",
-    "6004": "The team already has access to that project.",
+    "6004": "The team already has access to that namespace or project.",
    "6005": "The user is already a member of that team.",
    "6006": "Cannot delete the last team member.",
    "6007": "The team does not have access to the project to perform that action.",
@ -992,16 +1052,5 @@
    "title": "About",
    "frontendVersion": "Frontend Version: {version}",
    "apiVersion": "API Version: {version}"
-  },
-  "time": {
-    "units": {
-      "seconds": "second|seconds",
-      "minutes": "minute|minutes",
-      "hours": "hour|hours",
-      "days": "day|days",
-      "weeks": "week|weeks",
-      "months": "month|months",
-      "years": "year|years"
-    }
  }
-}
+}
--- a/src/i18n/lang/cs-CZ.json
+++ b/src/i18n/lang/cs-CZ.json
@ -5,9 +5,10 @@
    "welcomeDay": "Ahoj {username}!",
    "welcomeEvening": "Dobrý večer {username}!",
    "lastViewed": "Naposledy zobrazeno",
-    "addToHomeScreen": "Add this app to your home screen for faster access and improved experience.",
    "project": {
-      "importText": "Import your projects and tasks from other services into Vikunja:",
+      "newText": "You can create a new project for your new tasks:",
+      "new": "New project",
+      "importText": "Or import your projects and tasks from other services into Vikunja:",
      "import": "Import your data into Vikunja"
    }
  },
@ -77,8 +78,8 @@
        "savedSuccess": "Nastavení bylo úspěšně aktualizováno.",
        "emailReminders": "Posílat mi připomenutí pro úkoly e-mailem",
        "overdueReminders": "Pošlete mi každý den shrnutí mých zpožděných úkolů",
-        "discoverableByName": "Allow other users to add me as a member to teams or projects when they search for my name",
-        "discoverableByEmail": "Allow other users to add me as a member to teams or projects when they search for my full email",
+        "discoverableByName": "Nechat ostatní uživatele mě najít podle jména",
+        "discoverableByEmail": "Nechat ostatní uživatele mě najít podle e-mailu",
        "playSoundWhenDone": "Přehrát zvuk při označení úkolů jako hotovo",
        "weekStart": "Začátek týdne",
        "weekStartSunday": "Neděle",
@ -142,7 +143,7 @@
    },
    "deletion": {
      "title": "Smazat svůj účet",
-      "text1": "The deletion of your account is permanent and cannot be undone. We will delete all your projects, tasks and everything associated with it.",
+      "text1": "The deletion of your account is permanent and cannot be undone. We will delete all your namespaces, projects, tasks and everything associated with it.",
      "text2": "Chcete-li pokračovat, zadejte své heslo. Obdržíte e-mail s dalšími pokyny.",
      "confirm": "Smazat můj účet",
      "requestSuccess": "Požadavek byl úspěšný. Obdržíte e-mail s dalšími pokyny.",
@ -156,7 +157,7 @@
    },
    "export": {
      "title": "Exportovat data účtu",
-      "description": "You can request a copy of all your Vikunja data. This includes Projects, Tasks and everything associated to them. You can import this data in any Vikunja instance through the migration function.",
+      "description": "You can request a copy of all your Vikunja data. This include Namespaces, Projects, Tasks and everything associated to them. You can import this data in any Vikunja instance through the migration function.",
      "descriptionPasswordRequired": "Pokračujte zadáním vašeho hesla:",
      "request": "Požádat o kopii mých dat",
      "success": "Úspěšně jste požádali o svá data! Jakmile budou připravena ke stažení, pošleme Vám e-mail.",
@ -164,18 +165,14 @@
    }
  },
  "project": {
-    "archivedMessage": "This project is archived. It is not possible to create new or edit tasks for it.",
-    "archived": "Archived",
-    "showArchived": "Show Archived",
+    "archived": "This project is archived. It is not possible to create new or edit tasks for it.",
    "title": "Project Title",
    "color": "Color",
    "projects": "Projects",
-    "parent": "Parent Project",
    "search": "Type to search for a project…",
    "searchSelect": "Click or press enter to select this project",
    "shared": "Shared Projects",
    "noDescriptionAvailable": "No project description is available.",
-    "inboxTitle": "Inbox",
    "create": {
      "header": "New project",
      "titlePlaceholder": "The project's title goes here…",
@ -213,7 +210,7 @@
    "duplicate": {
      "title": "Duplicate this project",
      "label": "Duplicate",
-      "text": "Select a parent project which should hold the duplicated project:",
+      "text": "Select a namespace which should hold the duplicated project:",
      "success": "The project was successfully duplicated."
    },
    "edit": {
@ -241,7 +238,7 @@
        "namePlaceholder": "e.g. Lorem Ipsum",
        "nameExplanation": "All actions done by this link share will show up with the name.",
        "password": "Password (optional)",
-        "passwordExplanation": "When signing in, the user will be required to enter this password.",
+        "passwordExplanation": "When authenticating, the user will be required to enter this password.",
        "noName": "No name set",
        "remove": "Remove a link share",
        "removeText": "Are you sure you want to remove this link share? It will no longer be possible to access this project with this link share. This cannot be undone!",
@ -324,6 +321,67 @@
      }
    }
  },
+  "namespace": {
+    "title": "Namespaces & Projects",
+    "namespace": "Prostor",
+    "showArchived": "Zobrazit archivované",
+    "noneAvailable": "Momentálně nemáte žádné prostory.",
+    "unarchive": "Obnovit archiv",
+    "archived": "Archivováno",
+    "noProjects": "This namespace does not contain any projects.",
+    "createProject": "Create a new project in this namespace.",
+    "namespaces": "Prostory",
+    "search": "Začni psát pro vyhledání prostoru…",
+    "create": {
+      "title": "Nový prostor",
+      "titleRequired": "Uveďte prosím název.",
+      "explanation": "A namespace is a collection of projects you can share and use to organize your projects with. In fact, every project belongs to a namespace.",
+      "tooltip": "Co je prostor?",
+      "success": "Prostor byl úspěšně vytvořen."
+    },
+    "archive": {
+      "titleArchive": "Archivovat \"{namespace}\"",
+      "titleUnarchive": "Odarchivovat \"{namespace}\"",
+      "archiveText": "You won't be able to edit this namespace or create new projects until you un-archive it. This will also archive all projects in this namespace.",
+      "unarchiveText": "You will be able to create new projects or edit it.",
+      "success": "Prostor byl úspěšně archivován.",
+      "unarchiveSuccess": "Jmenný prostor byl úspěšně obnoven.",
+      "description": "If a namespace is archived, you cannot create new projects or edit it."
+    },
+    "delete": {
+      "title": "Smazat \"{namespace}\"",
+      "text1": "Opravdu chcete odstranit tento prostor a všechen jeho obsah?",
+      "text2": "This includes all projects and tasks and CANNOT BE UNDONE!",
+      "success": "Prostor byl úspěšně smazán."
+    },
+    "edit": {
+      "title": "Upravit \"{namespace}\"",
+      "success": "Prostor byl úspěšně aktualizován."
+    },
+    "share": {
+      "title": "Sdílet \"{namespace}\""
+    },
+    "attributes": {
+      "title": "Název prostoru",
+      "titlePlaceholder": "Název seznamu přijde sem…",
+      "description": "Popis",
+      "descriptionPlaceholder": "Popis seznamu přijde sem…",
+      "color": "Barva",
+      "archived": "Archivováno",
+      "isArchived": "Tento prostor je archivován"
+    },
+    "pseudo": {
+      "sharedProjects": {
+        "title": "Shared Projects"
+      },
+      "favorites": {
+        "title": "Oblíbené"
+      },
+      "savedFilters": {
+        "title": "Filtry"
+      }
+    }
+  },
  "filters": {
    "title": "Filtry",
    "clear": "Vymazat filtry",
@ -345,7 +403,7 @@
    },
    "create": {
      "title": "Nový uložený filtr",
-      "description": "A saved filter is a virtual project which is computed from a set of filters each time it is accessed.",
+      "description": "A saved filter is a virtual project which is computed from a set of filters each time it is accessed. Once created, it will appear in a special namespace.",
      "action": "Vytvořit uložený filtr",
      "titleRequired": "Please provide a title for the filter."
    },
@ -471,7 +529,7 @@
      "code": "Kód",
      "quote": "Citace",
      "unorderedList": "Seznam s odrážkami",
-      "orderedList": "Ordered List",
+      "orderedList  ": "Ordered List",
      "cleanBlock": "Čistý blok",
      "link": "Odkaz",
      "image": "Obrázek",
@ -508,14 +566,14 @@
      "canuse": "Můžete použít vzorec pro filtrování podle relativních datumů.",
      "learnhow": "Podívejte se, jak to funguje",
      "title": "Datumový vzorec",
-      "intro": "Specify relative dates which are resolved on the fly by Vikunja when applying the filter.",
+      "intro": "Datumový vzorec umožňuje určit relativní data, která jsou při použití filtru vyřešena za běhu Vikunjou.",
      "expression": "Každý datumový matematický výraz začíná datem ukotvení, které může být buď {0}, nebo datový řetězec končící {1}. Po tomto ukotvení může volitelně následovat jeden nebo více matematických výrazů.",
      "similar": "Tyto výrazy jsou podobné výrazům poskytnutým {0} a {1}.",
      "add1Day": "Přidat jeden den",
      "minus1Day": "Odečíst jeden den",
      "roundDay": "Zaokrouhlit dolů na nejbližší den",
-      "supportedUnits": "Supported time units",
-      "someExamples": "Examples of time expressions",
+      "supportedUnits": "Podporované časové jednotky jsou:",
+      "someExamples": "Některé příklady časových výrazů:",
      "units": {
        "seconds": "Sekundy",
        "minutes": "Minuty",
@ -616,13 +674,19 @@
      "updated": "Aktualizováno"
    },
    "subscription": {
+      "subscribedProjectThroughParentNamespace": "You can't unsubscribe here because you are subscribed to this project through its namespace.",
+      "subscribedTaskThroughParentNamespace": "Zde se nemůžete odhlásit, protože jste přihlášeni k odběru tohoto úkolu prostřednictvím jeho prostoru.",
      "subscribedTaskThroughParentProject": "You can't unsubscribe here because you are subscribed to this task through its project.",
+      "subscribedNamespace": "Nyní jste přihlášeni k odběru tohoto prostoru a budete dostávat oznámení o změnách.",
+      "notSubscribedNamespace": "Nejste přihlášeni k odběru tohoto prostoru, takže nebudete dostávat upozornění na změny.",
      "subscribedProject": "You are currently subscribed to this project and will receive notifications for changes.",
      "notSubscribedProject": "You are not subscribed to this project and won't receive notifications for changes.",
      "subscribedTask": "Nyní jste přihlášeni k odběru tohoto úkolu a budete dostávat oznámení o změnách.",
      "notSubscribedTask": "Nejste přihlášeni k odběru tohoto úkolu, takže nebudete dostávat upozornění na změny.",
      "subscribe": "Odebírat",
      "unsubscribe": "Odhlásit odběr",
+      "subscribeSuccessNamespace": "Nyní jste přihlášeni k tomuto prostoru",
+      "unsubscribeSuccessNamespace": "Nyní jste odhlášeni od tohoto prostoru",
      "subscribeSuccessProject": "You are now subscribed to this project",
      "unsubscribeSuccessProject": "You are now unsubscribed to this project",
      "subscribeSuccessTask": "Nyní jste přihlášeni k tomuto úkolu",
@ -699,6 +763,7 @@
      "searchPlaceholder": "Hledejte nový úkol, který chcete přidat jako související…",
      "createPlaceholder": "Přidat toto jako nový související úkol",
      "differentProject": "This task belongs to a different project.",
+      "differentNamespace": "Tento úkol patří do jiného prostoru.",
      "noneYet": "Zatím žádné vztahy mezi úkoly.",
      "delete": "Odstranit vztah k úloze",
      "deleteText1": "Jste si jisti, že chcete odstranit tento vztah úkolu?",
@ -718,17 +783,6 @@
        "copiedto": "Zkopírováno do | Zkopírováno do"
      }
    },
-    "reminder": {
-      "before": "{amount} {unit} before {type}",
-      "after": "{amount} {unit} after {type}",
-      "beforeShort": "before",
-      "afterShort": "after",
-      "onDueDate": "On the due date",
-      "onStartDate": "On the start date",
-      "onEndDate": "On the end date",
-      "custom": "Custom",
-      "dateAndTime": "Date and time"
-    },
    "repeat": {
      "everyDay": "Každý den",
      "everyWeek": "Každý týden",
@ -746,7 +800,8 @@
      "invalidAmount": "Zadejte prosím více než 0."
    },
    "quickAddMagic": {
-      "hint": "Use magic prefixes to define due dates, assignees and other task properties.",
+      "hint": "Můžeš použít Kouzelné rychlé přidání",
+      "what": "Co?",
      "title": "Kouzelné rychlé přidání",
      "intro": "Při vytváření úkolu můžete použít speciální klíčová slova pro přímé přidání atributů k nově vytvořenému úkolu. To umožňuje přidat běžně používané atributy k úkolům mnohem rychleji.",
      "multiple": "Toto můžete použít několikrát.",
@ -793,19 +848,19 @@
      "delete": {
        "header": "Smazat tým",
        "text1": "Jste si jisti, že chcete smazat tento tým a všechny jeho členy?",
-        "text2": "All team members will lose access to projects shared with this team. This CANNOT BE UNDONE!",
+        "text2": "All team members will lose access to projects and namespaces shared with this team. This CANNOT BE UNDONE!",
        "success": "Tým byl úspěšně smazán."
      },
      "deleteUser": {
        "header": "Odebrat uživatele z týmu",
        "text1": "Opravdu chcete odebrat tohoto uživatele z týmu?",
-        "text2": "They will lose access to all projects this team has access to. This CANNOT BE UNDONE!",
+        "text2": "They will lose access to all projects and namespaces this team has access to. This CANNOT BE UNDONE!",
        "success": "Uživatel byl úspěšně odstraněn z týmu."
      },
      "leave": {
        "title": "Opustit tým",
        "text1": "Opravdu chcete opustit tento tým?",
-        "text2": "You will lose access to all projects this team has access to. If you change your mind you'll need a team admin to add you again.",
+        "text2": "You will lose access to all projects and namespaces this team has access to. If you change your mind you'll need a team admin to add you again.",
        "success": "Úspěšně jste opustili tým."
      }
    },
@ -839,10 +894,7 @@
      "color": "Změnit barvu tohoto úkolu",
      "move": "Move this task to another project",
      "reminder": "Spravovat připomenutí této úlohy",
-      "description": "Přepnout úpravy popisu úkolu",
-      "delete": "Delete this task",
-      "priority": "Change the priority of this task",
-      "favorite": "Mark this task as favorite / unfavorite"
+      "description": "Přepnout úpravy popisu úkolu"
    },
    "project": {
      "title": "Project Views",
@ -855,9 +907,9 @@
      "title": "Navigace",
      "overview": "Přejít na přehled",
      "upcoming": "Přejít na nadcházející úkoly",
+      "namespaces": "Navigate to namespaces & projects",
      "labels": "Přejít na štítky",
-      "teams": "Přejít na týmy",
-      "projects": "Navigate to projects"
+      "teams": "Přejít na týmy"
    }
  },
  "update": {
@ -872,8 +924,7 @@
    "unarchive": "Zrušit archivaci",
    "setBackground": "Nastavit pozadí",
    "share": "Sdílet",
-    "newProject": "New project",
-    "createProject": "Create project"
+    "newProject": "New project"
  },
  "apiConfig": {
    "url": "Vikunja URL",
@ -892,7 +943,7 @@
  "notification": {
    "title": "Oznámení",
    "none": "Nemáte žádná oznámení. Mějte příjemný den!",
-    "explainer": "Notifications will appear here when actions projects or tasks you subscribed to happen."
+    "explainer": "Notifications will appear here when actions on namespaces, projects or tasks you subscribed to happen."
  },
  "quickActions": {
    "commands": "Příkazy",
@ -903,12 +954,14 @@
    "teams": "Týmy",
    "newProject": "Enter the title of the new project…",
    "newTask": "Zadejte název nového úkolu…",
+    "newNamespace": "Zadejte název nového prostoru…",
    "newTeam": "Zadejte název nového týmu…",
    "createTask": "Create a task in the current project ({title})",
-    "createProject": "Create a project",
+    "createProject": "Create a project in the current namespace ({title})",
    "cmds": {
      "newTask": "Nový úkol",
      "newProject": "New project",
+      "newNamespace": "Nový prostor",
      "newTeam": "Nový tým"
    }
  },
@ -964,9 +1017,16 @@
    "4017": "Neplatný komparátor filtru úkolů.",
    "4018": "Neplatné zřetězení filtru úkolů.",
    "4019": "Neplatná hodnota filtru úkolů.",
+    "5001": "Prostor neexistuje.",
+    "5003": "Nemáte přístup ke zvolenému prostoru.",
+    "5006": "Název prostoru nemůže být prázdný.",
+    "5009": "Pro provedení této akce musíte mít k prostoru přístup ke čtení.",
+    "5010": "Tento tým nemá k tomuto prostoru přístup.",
+    "5011": "Tento uživatel již má přístup k tomuto prostoru.",
+    "5012": "Prostor je archivován, a proto je přístupný pouze pro čtení.",
    "6001": "Název týmu nemůže být prázdný.",
    "6002": "Tým neexistuje.",
-    "6004": "The team already has access to that project.",
+    "6004": "The team already has access to that namespace or project.",
    "6005": "Uživatel je již členem tohoto týmu.",
    "6006": "Nelze odstranit posledního člena týmu.",
    "6007": "The team does not have access to the project to perform that action.",
@ -992,16 +1052,5 @@
    "title": "O aplikaci",
    "frontendVersion": "Verze frontendu: {version}",
    "apiVersion": "Verze API: {version}"
-  },
-  "time": {
-    "units": {
-      "seconds": "second|seconds",
-      "minutes": "minute|minutes",
-      "hours": "hour|hours",
-      "days": "day|days",
-      "weeks": "week|weeks",
-      "months": "month|months",
-      "years": "year|years"
-    }
  }
-}
+}
--- a/src/i18n/lang/da-DK.json
+++ b/src/i18n/lang/da-DK.json
@ -5,9 +5,10 @@
    "welcomeDay": "Hej {username}!",
    "welcomeEvening": "Godaften {username}!",
    "lastViewed": "Sidst vist",
-    "addToHomeScreen": "Add this app to your home screen for faster access and improved experience.",
    "project": {
-      "importText": "Import your projects and tasks from other services into Vikunja:",
+      "newText": "You can create a new project for your new tasks:",
+      "new": "New project",
+      "importText": "Or import your projects and tasks from other services into Vikunja:",
      "import": "Import your data into Vikunja"
    }
  },
@ -77,8 +78,8 @@
        "savedSuccess": "Indstillingerne er gemt.",
        "emailReminders": "Send mig påmindelser for opgaver via e-mail",
        "overdueReminders": "Send mig en oversigt over mine ufærdige opgaver hver dag",
-        "discoverableByName": "Allow other users to add me as a member to teams or projects when they search for my name",
-        "discoverableByEmail": "Allow other users to add me as a member to teams or projects when they search for my full email",
+        "discoverableByName": "Lad andre brugere finde mig, når de søger efter mit navn",
+        "discoverableByEmail": "Lad andre brugere finde mig, når de søger efter min fulde e-mail",
        "playSoundWhenDone": "Afspil en lyd, når du markerer opgaver som udført",
        "weekStart": "Ugen starter på en",
        "weekStartSunday": "Søndag",
@ -142,7 +143,7 @@
    },
    "deletion": {
      "title": "Slet din Vikunja konto",
-      "text1": "The deletion of your account is permanent and cannot be undone. We will delete all your projects, tasks and everything associated with it.",
+      "text1": "The deletion of your account is permanent and cannot be undone. We will delete all your namespaces, projects, tasks and everything associated with it.",
      "text2": "For at fortsætte, skal du indtaste din adgangskode. Du vil modtage en e-mail med yderligere instruktioner.",
      "confirm": "Slet min konto",
      "requestSuccess": "Anmodningen blev gennemført. Du vil modtage en e-mail med yderligere instruktioner.",
@ -156,7 +157,7 @@
    },
    "export": {
      "title": "Eksporter dine Vikunja-data",
-      "description": "You can request a copy of all your Vikunja data. This includes Projects, Tasks and everything associated to them. You can import this data in any Vikunja instance through the migration function.",
+      "description": "You can request a copy of all your Vikunja data. This include Namespaces, Projects, Tasks and everything associated to them. You can import this data in any Vikunja instance through the migration function.",
      "descriptionPasswordRequired": "Indtast venligst din adgangskode for at fortsætte:",
      "request": "Anmod om en kopi af mine Vikunja-data",
      "success": "Du har anmodet om dine Vikunja-data! Vi sender dig en e-mail, når den er klar til hentning.",
@ -164,18 +165,14 @@
    }
  },
  "project": {
-    "archivedMessage": "This project is archived. It is not possible to create new or edit tasks for it.",
-    "archived": "Archived",
-    "showArchived": "Show Archived",
+    "archived": "This project is archived. It is not possible to create new or edit tasks for it.",
    "title": "Project Title",
    "color": "Color",
    "projects": "Projects",
-    "parent": "Parent Project",
    "search": "Type to search for a project…",
    "searchSelect": "Click or press enter to select this project",
    "shared": "Shared Projects",
    "noDescriptionAvailable": "No project description is available.",
-    "inboxTitle": "Inbox",
    "create": {
      "header": "New project",
      "titlePlaceholder": "The project's title goes here…",
@ -213,7 +210,7 @@
    "duplicate": {
      "title": "Duplicate this project",
      "label": "Duplicate",
-      "text": "Select a parent project which should hold the duplicated project:",
+      "text": "Select a namespace which should hold the duplicated project:",
      "success": "The project was successfully duplicated."
    },
    "edit": {
@ -241,7 +238,7 @@
        "namePlaceholder": "e.g. Lorem Ipsum",
        "nameExplanation": "All actions done by this link share will show up with the name.",
        "password": "Password (optional)",
-        "passwordExplanation": "When signing in, the user will be required to enter this password.",
+        "passwordExplanation": "When authenticating, the user will be required to enter this password.",
        "noName": "No name set",
        "remove": "Remove a link share",
        "removeText": "Are you sure you want to remove this link share? It will no longer be possible to access this project with this link share. This cannot be undone!",
@ -324,6 +321,67 @@
      }
    }
  },
+  "namespace": {
+    "title": "Namespaces & Projects",
+    "namespace": "Navneområde",
+    "showArchived": "Vis arkiverede",
+    "noneAvailable": "Du har ingen navneområder lige nu.",
+    "unarchive": "Tilbagekald",
+    "archived": "Arkiveret",
+    "noProjects": "This namespace does not contain any projects.",
+    "createProject": "Create a new project in this namespace.",
+    "namespaces": "Navneområder",
+    "search": "Skriv for at søge efter et navneområde…",
+    "create": {
+      "title": "Nyt navneområde",
+      "titleRequired": "Angiv venligst en titel.",
+      "explanation": "A namespace is a collection of projects you can share and use to organize your projects with. In fact, every project belongs to a namespace.",
+      "tooltip": "Hvad er et navneområde?",
+      "success": "Navneområdet blev oprettet."
+    },
+    "archive": {
+      "titleArchive": "Arkiver \"{namespace}\"",
+      "titleUnarchive": "Fjern arkivering \"{namespace}\"",
+      "archiveText": "You won't be able to edit this namespace or create new projects until you un-archive it. This will also archive all projects in this namespace.",
+      "unarchiveText": "You will be able to create new projects or edit it.",
+      "success": "Navneområdet blev arkiveret.",
+      "unarchiveSuccess": "Navneområdet blev tilbagekaldt.",
+      "description": "If a namespace is archived, you cannot create new projects or edit it."
+    },
+    "delete": {
+      "title": "Slet \"{namespace}\"",
+      "text1": "Er du sikker på, at du vil slette dette navneområde og alt dets indhold?",
+      "text2": "This includes all projects and tasks and CANNOT BE UNDONE!",
+      "success": "Navneområdet blev slettet."
+    },
+    "edit": {
+      "title": "Rediger \"{namespace}\"",
+      "success": "Navneområdet blev opdateret."
+    },
+    "share": {
+      "title": "Del \"{namespace}\""
+    },
+    "attributes": {
+      "title": "Navneområde Titel",
+      "titlePlaceholder": "Navneområdets titel skrives her…",
+      "description": "Beskrivelse",
+      "descriptionPlaceholder": "Navneområdets beskrivelse skrives her…",
+      "color": "Farve",
+      "archived": "Er Arkiveret",
+      "isArchived": "Dette navneområde er arkiveret"
+    },
+    "pseudo": {
+      "sharedProjects": {
+        "title": "Shared Projects"
+      },
+      "favorites": {
+        "title": "Favoritter"
+      },
+      "savedFilters": {
+        "title": "Filtre"
+      }
+    }
+  },
  "filters": {
    "title": "Filtre",
    "clear": "Ryd Filtre",
@ -345,7 +403,7 @@
    },
    "create": {
      "title": "Nyt Gemt Filter",
-      "description": "A saved filter is a virtual project which is computed from a set of filters each time it is accessed.",
+      "description": "A saved filter is a virtual project which is computed from a set of filters each time it is accessed. Once created, it will appear in a special namespace.",
      "action": "Opret nyt gemt filter",
      "titleRequired": "Please provide a title for the filter."
    },
@ -471,7 +529,7 @@
      "code": "Kode",
      "quote": "Citat",
      "unorderedList": "Usorteret liste",
-      "orderedList": "Ordered List",
+      "orderedList  ": "Ordered List",
      "cleanBlock": "Ryd Blok",
      "link": "Link",
      "image": "Billede",
@ -508,14 +566,14 @@
      "canuse": "Du kan bruge datomatematik til at filtrere for relative datoer.",
      "learnhow": "Se hvordan det virker",
      "title": "Datomatematik",
-      "intro": "Specify relative dates which are resolved on the fly by Vikunja when applying the filter.",
+      "intro": "Dato Matematik giver dig mulighed for at angive relative datoer, som er løst løbende af Vikunja, når du anvender filteret.",
      "expression": "Hver Datomatematik udtryk starter med en ankerdato, som enten kan være {0} eller en datostreng, der slutter med {1}. Denneanker dato kan eventuelt efterfølges af en eller flere matematik udtryk.",
      "similar": "Disse udtryk ligner dem fra {0} og {1}.",
      "add1Day": "Læg en dag til",
      "minus1Day": "Træk en dag fra",
      "roundDay": "Rund ned til nærmeste dag",
-      "supportedUnits": "Supported time units",
-      "someExamples": "Examples of time expressions",
+      "supportedUnits": "Understøttede tidsenheder er:",
+      "someExamples": "Eksempler på tidsudtryk:",
      "units": {
        "seconds": "Sekunder",
        "minutes": "Minutter",
@ -616,13 +674,19 @@
      "updated": "Opdateret"
    },
    "subscription": {
+      "subscribedProjectThroughParentNamespace": "You can't unsubscribe here because you are subscribed to this project through its namespace.",
+      "subscribedTaskThroughParentNamespace": "Du kan ikke afmelde dig her, fordi du abonnerer på denne opgave gennem dens navneområde.",
      "subscribedTaskThroughParentProject": "You can't unsubscribe here because you are subscribed to this task through its project.",
+      "subscribedNamespace": "Du abonnerer i øjeblikket på dette navneområde og vil modtage notifikationer om ændringer.",
+      "notSubscribedNamespace": "Du abonnerer ikke på dette navneområde og modtager ikke notifikationer om ændringer.",
      "subscribedProject": "You are currently subscribed to this project and will receive notifications for changes.",
      "notSubscribedProject": "You are not subscribed to this project and won't receive notifications for changes.",
      "subscribedTask": "Du abonnerer på denne opgave og vil modtage notifikationer om ændringer.",
      "notSubscribedTask": "Du abonnerer ikke på denne opgave og modtager ikke notifikationer om ændringer.",
      "subscribe": "Abonner",
      "unsubscribe": "Afmeld",
+      "subscribeSuccessNamespace": "Du abonnerer nu på dette navneområde",
+      "unsubscribeSuccessNamespace": "Du er nu afmeldt dette navneområde",
      "subscribeSuccessProject": "You are now subscribed to this project",
      "unsubscribeSuccessProject": "You are now unsubscribed to this project",
      "subscribeSuccessTask": "Du abonnerer nu på denne opgave",
@ -699,6 +763,7 @@
      "searchPlaceholder": "Indtast søgning efter en ny opgave der tilføjes som relateret…",
      "createPlaceholder": "Tilføj dette som en ny relateret opgave",
      "differentProject": "This task belongs to a different project.",
+      "differentNamespace": "Denne opgave hører til et andet navneområde.",
      "noneYet": "Ingen opgaverelationer endnu.",
      "delete": "Slet Opgaverelation",
      "deleteText1": "Er du sikker på, at du vil slette denne opgaverelation?",
@ -718,17 +783,6 @@
        "copiedto": "Kopieret Til | Kopieret Til"
      }
    },
-    "reminder": {
-      "before": "{amount} {unit} before {type}",
-      "after": "{amount} {unit} after {type}",
-      "beforeShort": "before",
-      "afterShort": "after",
-      "onDueDate": "On the due date",
-      "onStartDate": "On the start date",
-      "onEndDate": "On the end date",
-      "custom": "Custom",
-      "dateAndTime": "Date and time"
-    },
    "repeat": {
      "everyDay": "Hver Dag",
      "everyWeek": "Hver Uge",
@ -746,7 +800,8 @@
      "invalidAmount": "Angiv venligst mere end 0."
    },
    "quickAddMagic": {
-      "hint": "Use magic prefixes to define due dates, assignees and other task properties.",
+      "hint": "Du kan bruge Hurtigtilføjelsesmagi",
+      "what": "Hvad?",
      "title": "Hurtigtilføjelsemagi",
      "intro": "Når du opretter en opgave, kan du bruge specielle søgeord til direkte at tilføje attributter til den nyoprettede opgave. Dette giver muligheden for at tilføje almindeligt anvendte attributter til opgaver meget hurtigere.",
      "multiple": "Du kan bruge dette flere gange.",
@ -793,19 +848,19 @@
      "delete": {
        "header": "Slet holdet",
        "text1": "Er du sikker på du vil slette dette hold og alle dets medlemmer?",
-        "text2": "All team members will lose access to projects shared with this team. This CANNOT BE UNDONE!",
+        "text2": "All team members will lose access to projects and namespaces shared with this team. This CANNOT BE UNDONE!",
        "success": "Holdet blev slettet."
      },
      "deleteUser": {
        "header": "Fjern en bruger fra holdet",
        "text1": "Er du sikker på du vil fjerne denne bruger fra holdet?",
-        "text2": "They will lose access to all projects this team has access to. This CANNOT BE UNDONE!",
+        "text2": "They will lose access to all projects and namespaces this team has access to. This CANNOT BE UNDONE!",
        "success": "Brugeren blev fjernet fra holdet."
      },
      "leave": {
        "title": "Forlad hold",
        "text1": "Er du sikker på du vil forlade dette hold?",
-        "text2": "You will lose access to all projects this team has access to. If you change your mind you'll need a team admin to add you again.",
+        "text2": "You will lose access to all projects and namespaces this team has access to. If you change your mind you'll need a team admin to add you again.",
        "success": "Du har forladt holdet."
      }
    },
@ -839,10 +894,7 @@
      "color": "Skift farven på denne opgave",
      "move": "Move this task to another project",
      "reminder": "Administrer påmindelser om denne opgave",
-      "description": "Slå redigering af opgavebeskrivelse til/fra",
-      "delete": "Delete this task",
-      "priority": "Change the priority of this task",
-      "favorite": "Mark this task as favorite / unfavorite"
+      "description": "Slå redigering af opgavebeskrivelse til/fra"
    },
    "project": {
      "title": "Project Views",
@ -855,9 +907,9 @@
      "title": "Navigation",
      "overview": "Gå til oversigt",
      "upcoming": "Gå til kommende opgaver",
+      "namespaces": "Navigate to namespaces & projects",
      "labels": "Naviger til etiketter",
-      "teams": "Naviger til hold",
-      "projects": "Navigate to projects"
+      "teams": "Naviger til hold"
    }
  },
  "update": {
@ -872,8 +924,7 @@
    "unarchive": "Tilbagekald",
    "setBackground": "Indstil baggrund",
    "share": "Del",
-    "newProject": "New project",
-    "createProject": "Create project"
+    "newProject": "New project"
  },
  "apiConfig": {
    "url": "Vikunja URL",
@ -892,7 +943,7 @@
  "notification": {
    "title": "Notifikationer",
    "none": "Du har ingen notifikationer. Hav en dejlig dag!",
-    "explainer": "Notifications will appear here when actions projects or tasks you subscribed to happen."
+    "explainer": "Notifications will appear here when actions on namespaces, projects or tasks you subscribed to happen."
  },
  "quickActions": {
    "commands": "Kommandoer",
@ -903,12 +954,14 @@
    "teams": "Hold",
    "newProject": "Enter the title of the new project…",
    "newTask": "Indtast titlen på den nye opgave…",
+    "newNamespace": "Indtast titlen på det nye navneområde…",
    "newTeam": "Indtast navnet på det nye hold…",
    "createTask": "Create a task in the current project ({title})",
-    "createProject": "Create a project",
+    "createProject": "Create a project in the current namespace ({title})",
    "cmds": {
      "newTask": "Ny Opgave",
      "newProject": "New project",
+      "newNamespace": "Nyt navneområde",
      "newTeam": "Nyt hold"
    }
  },
@ -964,9 +1017,16 @@
    "4017": "Ugyldig komparator til opgavefilter.",
    "4018": "Ugyldig sammenkædning til opgavefilter.",
    "4019": "Ugyldig værdi til opgavefilter.",
+    "5001": "Navneområdet findes ikke.",
+    "5003": "Du har ikke adgang til det angivne navneområde.",
+    "5006": "Navneområdets navn må ikke være tomt.",
+    "5009": "Du skal have navneområde læseadgang for at udføre denne handling.",
+    "5010": "Dette hold har ikke adgang til dette navneområde.",
+    "5011": "Denne bruger har allerede adgang til dette navneområde.",
+    "5012": "Navneområdet er arkiveret og kan derfor kun læses.",
    "6001": "Holdnavnet må ikke være tomt.",
    "6002": "Holdet findes ikke.",
-    "6004": "The team already has access to that project.",
+    "6004": "The team already has access to that namespace or project.",
    "6005": "Brugeren er allerede medlem af holdet.",
    "6006": "Kan ikke slette det sidste holdmedlem.",
    "6007": "The team does not have access to the project to perform that action.",
@ -992,16 +1052,5 @@
    "title": "Om",
    "frontendVersion": "Frontend Version: {version}",
    "apiVersion": "API Version: {version}"
-  },
-  "time": {
-    "units": {
-      "seconds": "second|seconds",
-      "minutes": "minute|minutes",
-      "hours": "hour|hours",
-      "days": "day|days",
-      "weeks": "week|weeks",
-      "months": "month|months",
-      "years": "year|years"
-    }
  }
-}
+}
--- a/src/i18n/lang/de-DE.json
+++ b/src/i18n/lang/de-DE.json
@ -5,10 +5,11 @@
    "welcomeDay": "Hallo {username}!",
    "welcomeEvening": "Guten Abend, {username}!",
    "lastViewed": "Zuletzt angesehen",
-    "addToHomeScreen": "Füge diese App deinem Startbildschirm hinzu, um schneller darauf zuzugreifen und das Erlebnis zu verbessern.",
    "project": {
-      "importText": "Importiere deine Projekte und Aufgaben aus anderen Diensten in Vikunja:",
-      "import": "Importiere deine Daten in Vikunja"
+      "newText": "Du kannst ein neues Projekt für deine neuen Aufgaben erstellen:",
+      "new": "New project",
+      "importText": "Or import your projects and tasks from other services into Vikunja:",
+      "import": "Import your data into Vikunja"
    }
  },
  "404": {
@ -77,14 +78,14 @@
        "savedSuccess": "Die Einstellungen wurden erfolgreich aktualisiert.",
        "emailReminders": "Erinnerungen an Aufgaben per E-Mail senden",
        "overdueReminders": "Sende mir jeden Tag eine Zusammenfassung meiner überfälligen Aufgaben",
-        "discoverableByName": "Erlaube anderen Benutzer:innen, mich als Mitglied zu Teams oder Projekten hinzuzufügen, wenn sie nach meinem Namen suchen",
-        "discoverableByEmail": "Erlaube anderen Benutzer:innen, mich als Mitglied zu Teams oder Projekten hinzuzufügen, wenn sie nach meiner vollständigen E-Mail Adresse suchen",
+        "discoverableByName": "Andere können mich finden, wenn sie nach meinem Namen suchen",
+        "discoverableByEmail": "Andere können mich finden, wenn sie nach meiner kompletten E-Mail-Adresse suchen",
        "playSoundWhenDone": "Einen Ton abspielen, wenn Aufgaben als erledigt markiert werden",
        "weekStart": "Woche beginnt am",
        "weekStartSunday": "Sonntag",
        "weekStartMonday": "Montag",
        "language": "Sprache",
-        "defaultProject": "Standard-Projekt",
+        "defaultProject": "Default Project",
        "timezone": "Zeitzone",
        "overdueTasksRemindersTime": "Zeit der E-Mail-Zusammenfassung der überfälligen Aufgaben"
      },
@ -142,7 +143,7 @@
    },
    "deletion": {
      "title": "Lösche deinen Vikunja-Account",
-      "text1": "Das Löschen deines Accounts ist dauerhaft und unwiderruflich. Alle Projekte, Aufgaben und zugehörige Daten werden gelöscht.",
+      "text1": "The deletion of your account is permanent and cannot be undone. We will delete all your namespaces, projects, tasks and everything associated with it.",
      "text2": "Zum Fortfahren gib bitte dein Passwort ein. Du erhältst eine E-Mail mit weiteren Anweisungen.",
      "confirm": "Meinen Account löschen",
      "requestSuccess": "Die Anfrage war erfolgreich. Du erhältst eine E-Mail mit weiteren Anweisungen.",
@ -156,7 +157,7 @@
    },
    "export": {
      "title": "Exportiere deine Vikunja-Daten",
-      "description": "Du kannst eine Kopie deiner Daten bei Vikunja anfordern. Dazu gehören Projekte, Aufgaben und alles, was damit zusammenhängt. Du kannst diese Daten dann in jeder Vikunja-Instanz über die Migrationsfunktion importieren.",
+      "description": "You can request a copy of all your Vikunja data. This include Namespaces, Projects, Tasks and everything associated to them. You can import this data in any Vikunja instance through the migration function.",
      "descriptionPasswordRequired": "Bitte gib dein Passwort ein, um fortzufahren:",
      "request": "Eine Kopie meiner Vikunja Daten anfordern",
      "success": "Du hast deine Daten bei Vikunja erfolgreich angefordert! Wir schicken dir eine E-Mail, sobald sie zum Download bereitstehen.",
@ -164,163 +165,220 @@
    }
  },
  "project": {
-    "archivedMessage": "Dieses Projekt ist archiviert. Es ist nicht möglich, neue Aufgaben zu erstellen oder es zu bearbeiten.",
-    "archived": "Archiviert",
-    "showArchived": "Archivierte anzeigen",
-    "title": "Projekttitel",
-    "color": "Farbe",
-    "projects": "Projekte",
-    "parent": "Übergeordnetes Projekt",
-    "search": "Tippe, um nach einem Projekt zu suchen…",
-    "searchSelect": "Klicke oder drücke die Eingabetaste, um dieses Projekt auszuwählen",
-    "shared": "Geteilte Projekte",
-    "noDescriptionAvailable": "Keine Projektbeschreibung verfügbar.",
-    "inboxTitle": "Eingang",
+    "archived": "This project is archived. It is not possible to create new or edit tasks for it.",
+    "title": "Project Title",
+    "color": "Color",
+    "projects": "Projects",
+    "search": "Type to search for a project…",
+    "searchSelect": "Click or press enter to select this project",
+    "shared": "Shared Projects",
+    "noDescriptionAvailable": "No project description is available.",
    "create": {
-      "header": "Neues Projekt",
-      "titlePlaceholder": "Der Titel des Projekts kommt hier hin…",
-      "addTitleRequired": "Bitte gebe einen Titel an.",
-      "createdSuccess": "Das Projekt wurde erfolgreich erstellt.",
-      "addProjectRequired": "Bitte gebe ein Projekt an oder lege ein Standard-Projekt in den Einstellungen fest."
+      "header": "New project",
+      "titlePlaceholder": "The project's title goes here…",
+      "addTitleRequired": "Please specify a title.",
+      "createdSuccess": "The project was successfully created.",
+      "addProjectRequired": "Please specify a project or set a default project in the settings."
    },
    "archive": {
-      "title": "„{project}“ archivieren",
-      "archive": "Dieses Projekt archivieren",
-      "unarchive": "Archivierung dieses Projekts aufheben",
-      "unarchiveText": "Du wirst neue Aufgaben erstellen oder sie bearbeiten können.",
-      "archiveText": "Du kannst dieses Projekt nicht bearbeiten oder neue Aufgaben erstellen, bis du die Archivierung aufhebst.",
-      "success": "Das Projekt wurde erfolgreich archiviert."
+      "title": "Archive \"{project}\"",
+      "archive": "Archive this project",
+      "unarchive": "Un-Archive this project",
+      "unarchiveText": "You will be able to create new tasks or edit it.",
+      "archiveText": "You won't be able to edit this project or create new tasks until you un-archive it.",
+      "success": "The project was successfully archived."
    },
    "background": {
-      "title": "Projekthintergrund festlegen",
-      "remove": "Hintergrund entfernen",
-      "upload": "Wähle einen Hintergrund von deinem Computer",
-      "searchPlaceholder": "Nach einem Hintergrund suchen…",
+      "title": "Set project background",
+      "remove": "Remove Background",
+      "upload": "Choose a background from your pc",
+      "searchPlaceholder": "Search for a background…",
      "poweredByUnsplash": "Powered by Unsplash",
-      "loadMore": "Weitere Bilder laden",
-      "success": "Der Hintergrund wurde erfolgreich eingestellt!",
-      "removeSuccess": "Der Hintergrund wurde erfolgreich entfernt!"
+      "loadMore": "Load more photos",
+      "success": "The background has been set successfully!",
+      "removeSuccess": "The background has been removed successfully!"
    },
    "delete": {
-      "title": "„{project}“ löschen",
-      "header": "Dieses Projekt löschen",
-      "text1": "Bist du sicher, dass du dieses Projekt und alle seine Inhalte löschen willst?",
-      "text2": "Dies umfasst alle Aufgaben und kann NICHT rückgängig gemacht werden!",
-      "success": "Das Projekt wurde erfolgreich gelöscht.",
-      "tasksToDelete": "Dies löscht unwiderruflich ca. {count} Aufgaben.",
-      "noTasksToDelete": "Dieses Projekt enthält keine Aufgaben, es kann sicher gelöscht werden."
+      "title": "Delete \"{project}\"",
+      "header": "Delete this project",
+      "text1": "Are you sure you want to delete this project and all of its contents?",
+      "text2": "This includes all tasks and CANNOT BE UNDONE!",
+      "success": "The project was successfully deleted.",
+      "tasksToDelete": "This will irrevocably remove approx. {count} tasks.",
+      "noTasksToDelete": "This project does not contain any tasks, it should be safe to delete."
    },
    "duplicate": {
-      "title": "Dupliziere dieses Projekt",
-      "label": "Duplizieren",
-      "text": "Wähle ein übergeordnetes Projekt aus, welches das duplizierte Projekt enthalten soll:",
-      "success": "Das Projekt wurde erfolgreich dupliziert."
+      "title": "Duplicate this project",
+      "label": "Duplicate",
+      "text": "Select a namespace which should hold the duplicated project:",
+      "success": "The project was successfully duplicated."
    },
    "edit": {
-      "header": "Dieses Projekt bearbeiten",
-      "title": "„{project}“ bearbeiten",
-      "titlePlaceholder": "Der Titel des Projekts kommt hier hin…",
-      "identifierTooltip": "Der Projektbezeichner kann zur eindeutigen Identifizierung einer Aufgabe über mehrere Projekte hinweg verwendet werden. Du kannst ihn auf leer setzen, um ihn zu deaktivieren.",
-      "identifier": "Projektbezeichner",
-      "identifierPlaceholder": "Der Projektbezeichner kommt hierhin…",
-      "description": "Beschreibung",
-      "descriptionPlaceholder": "Projektbeschreibung eingeben…",
-      "color": "Farbe",
-      "success": "Das Projekt wurde erfolgreich aktualisiert."
+      "header": "Edit This Project",
+      "title": "Edit \"{project}\"",
+      "titlePlaceholder": "The project title goes here…",
+      "identifierTooltip": "The project identifier can be used to uniquely identify a task across projects. You can set it to empty to disable it.",
+      "identifier": "Project Identifier",
+      "identifierPlaceholder": "The project identifier goes here…",
+      "description": "Description",
+      "descriptionPlaceholder": "The projects description goes here…",
+      "color": "Color",
+      "success": "The project was successfully updated."
    },
    "share": {
-      "header": "Projekt teilen",
-      "title": "„{project}“ teilen",
-      "share": "Teilen",
+      "header": "Share this project",
+      "title": "Share \"{project}\"",
+      "share": "Share",
      "links": {
-        "title": "Linkfreigaben",
-        "what": "Was ist eine Linkfreigabe?",
-        "explanation": "Mit Linkfreigaben kannst Projekt du Listen mit Benutzer:innen ohne Vikunja-Account teilen.",
-        "create": "Erstelle ein neue Linkfreigabe",
+        "title": "Share Links",
+        "what": "What is a share link?",
+        "explanation": "Share Links allow you to easily share a project with other users who don't have an account on Vikunja.",
+        "create": "Create a new link share",
        "name": "Name (optional)",
-        "namePlaceholder": "z.B. Lorem Ipsum",
-        "nameExplanation": "Alle Aktionen, die mit dieser Linkfreigabe durchgeführt werden, werden mit diesem Namen angezeigt.",
-        "password": "Passwort (optional)",
-        "passwordExplanation": "Bei der Authentifizierung wird der:die Benutzer:in aufgefordert, dieses Passwort einzugeben.",
-        "noName": "Kein Name festgelegt",
-        "remove": "Linkfreigabe entfernen",
-        "removeText": "Bist du sicher, dass du diese Linkfreigabe unwiderruflich löschen möchtest? Über die Linkfreigabe ist danach der Zugriff auf dieses Projekt nicht mehr möglich!",
-        "createSuccess": "Die Linkfreigabe wurde erfolgreich erstellt.",
-        "deleteSuccess": "Die Linkfreigabe wurde erfolgreich gelöscht",
-        "view": "Ansicht",
-        "sharedBy": "Von {0} geteilt"
+        "namePlaceholder": "e.g. Lorem Ipsum",
+        "nameExplanation": "All actions done by this link share will show up with the name.",
+        "password": "Password (optional)",
+        "passwordExplanation": "When authenticating, the user will be required to enter this password.",
+        "noName": "No name set",
+        "remove": "Remove a link share",
+        "removeText": "Are you sure you want to remove this link share? It will no longer be possible to access this project with this link share. This cannot be undone!",
+        "createSuccess": "The link share was successfully created.",
+        "deleteSuccess": "The link share was successfully deleted",
+        "view": "View",
+        "sharedBy": "Shared by {0}"
      },
      "userTeam": {
-        "typeUser": "Benutzer:in | Benutzer:innen",
-        "typeTeam": "Team | Teams",
-        "shared": "Geteilt mit diesen {type}",
-        "you": "Du",
-        "notShared": "Noch nicht mit einem {type} geteilt.",
-        "removeHeader": "Einen {type} von {sharable} entfernen",
-        "removeText": "Diesen {sharable} von {type} entfernen? Dies kann nicht rückgängig gemacht werden!",
-        "removeSuccess": "{sharable} wurde erfolgreich von {type} entfernt.",
-        "addedSuccess": "{type} wurde erfolgreich hinzugefügt.",
-        "updatedSuccess": "{type} wurde erfolgreich hinzugefügt."
+        "typeUser": "user | users",
+        "typeTeam": "team | teams",
+        "shared": "Shared with these {type}",
+        "you": "You",
+        "notShared": "Not shared with any {type} yet.",
+        "removeHeader": "Remove a {type} from the {sharable}",
+        "removeText": "Are you sure you want to remove this {sharable} from the {type}? This cannot be undone!",
+        "removeSuccess": "The {sharable} was successfully removed from the {type}.",
+        "addedSuccess": "The {type} was successfully added.",
+        "updatedSuccess": "The {type} was successfully added."
      },
      "right": {
-        "title": "Berechtigung",
-        "read": "Nur Leserechte",
-        "readWrite": "Lesen & Schreiben",
+        "title": "Permission",
+        "read": "Read only",
+        "readWrite": "Read & write",
        "admin": "Admin"
      },
      "attributes": {
        "link": "Link",
-        "delete": "Löschen"
+        "delete": "Delete"
      }
    },
    "list": {
-      "title": "Liste",
-      "add": "Hinzufügen",
-      "addPlaceholder": "Neue Aufgabe hinzufügen…",
-      "empty": "Dieses Project ist derzeit leer.",
-      "newTaskCta": "Eine neue Aufgabe erstellen.",
-      "editTask": "Aufgabe bearbeiten"
+      "title": "List",
+      "add": "Add",
+      "addPlaceholder": "Add a new task…",
+      "empty": "This project is currently empty.",
+      "newTaskCta": "Create a new task.",
+      "editTask": "Edit Task"
    },
    "gantt": {
      "title": "Gantt",
-      "showTasksWithoutDates": "Aufgaben anzeigen, für die keine Daten festgelegt sind",
-      "size": "Größe",
-      "default": "Standard",
-      "month": "Monat",
-      "day": "Tag",
-      "hour": "Stunde",
-      "range": "Zeitraum",
-      "noDates": "Diese Aufgabe hat keine Daten definiert."
+      "showTasksWithoutDates": "Show tasks which don't have dates set",
+      "size": "Size",
+      "default": "Default",
+      "month": "Month",
+      "day": "Day",
+      "hour": "Hour",
+      "range": "Date Range",
+      "noDates": "This task has no dates set."
    },
    "table": {
-      "title": "Tabelle",
-      "columns": "Spalten"
+      "title": "Table",
+      "columns": "Columns"
    },
    "kanban": {
      "title": "Kanban",
      "limit": "Limit: {limit}",
-      "noLimit": "Nicht gesetzt",
-      "doneBucket": "Erledigt Spalte",
-      "doneBucketHint": "Alle Aufgaben, die in diese Spalte verschoben werden, werden automatisch als erledigt markiert.",
-      "doneBucketHintExtended": "Alle Aufgaben, die in die Erledigt Spalte verschoben wurden, werden automatisch als erledigt markiert. Aufgaben, die in einer anderen Spalte als Erledigt markiert wurden, werden auch in diese Spalte verschoben.",
-      "doneBucketSavedSuccess": "Erledigt Spalte gespeichert.",
-      "deleteLast": "Du kannst die letzte Spalte nicht entfernen.",
-      "addTaskPlaceholder": "Gebe einen Aufgabentitel ein …",
-      "addTask": "Eine Aufgabe hinzufügen",
-      "addAnotherTask": "Weitere Aufgabe hinzufügen",
-      "addBucket": "Eine neue Spalte erstellen",
-      "addBucketPlaceholder": "Gebe einen Spaltentitel ein…",
-      "deleteHeaderBucket": "Spalte löschen",
-      "deleteBucketText1": "Bist du sicher, dass du diese Spalte löschen möchtest?",
-      "deleteBucketText2": "Dies löscht keine Aufgaben, sondern verschiebt sie in die Standardspalte.",
-      "deleteBucketSuccess": "Die Spalte wurde erfolgreich gelöscht.",
-      "bucketTitleSavedSuccess": "Der Spaltenname wurde erfolgreich gespeichert.",
-      "bucketLimitSavedSuccess": "Das Spaltenlimit wurde erfolgreich gespeichert.",
-      "collapse": "Spalte einklappen"
+      "noLimit": "Not Set",
+      "doneBucket": "Done bucket",
+      "doneBucketHint": "All tasks moved into this bucket will automatically marked as done.",
+      "doneBucketHintExtended": "All tasks moved into the done bucket will be marked as done automatically. All tasks marked as done from elsewhere will be moved as well.",
+      "doneBucketSavedSuccess": "The done bucket has been saved successfully.",
+      "deleteLast": "You cannot remove the last bucket.",
+      "addTaskPlaceholder": "Enter the new task title…",
+      "addTask": "Add a task",
+      "addAnotherTask": "Add another task",
+      "addBucket": "Create a new bucket",
+      "addBucketPlaceholder": "Enter the new bucket title…",
+      "deleteHeaderBucket": "Delete the bucket",
+      "deleteBucketText1": "Are you sure you want to delete this bucket?",
+      "deleteBucketText2": "This will not delete any tasks but move them into the default bucket.",
+      "deleteBucketSuccess": "The bucket has been deleted successfully.",
+      "bucketTitleSavedSuccess": "The bucket title has been saved successfully.",
+      "bucketLimitSavedSuccess": "The bucket limit been saved successfully.",
+      "collapse": "Collapse this bucket"
    },
    "pseudo": {
+      "favorites": {
+        "title": "Favorites"
+      }
+    }
+  },
+  "namespace": {
+    "title": "Namespaces & Projects",
+    "namespace": "Namespace",
+    "showArchived": "Archivierte anzeigen",
+    "noneAvailable": "Du hast momentan keine Namespaces.",
+    "unarchive": "Archivierung aufheben",
+    "archived": "Archiviert",
+    "noProjects": "This namespace does not contain any projects.",
+    "createProject": "Create a new project in this namespace.",
+    "namespaces": "Namespaces",
+    "search": "Beginne zu schreiben, um einen Namespace zu suchen…",
+    "create": {
+      "title": "Neuer Namespace",
+      "titleRequired": "Bitte gebe einen Titel an.",
+      "explanation": "A namespace is a collection of projects you can share and use to organize your projects with. In fact, every project belongs to a namespace.",
+      "tooltip": "Was ist ein Namespace?",
+      "success": "Der Namespace wurde erfolgreich erstellt."
+    },
+    "archive": {
+      "titleArchive": "„{namespace}“ archivieren",
+      "titleUnarchive": "Archivierung von \"{namespace}\" aufheben",
+      "archiveText": "You won't be able to edit this namespace or create new projects until you un-archive it. This will also archive all projects in this namespace.",
+      "unarchiveText": "You will be able to create new projects or edit it.",
+      "success": "Der Namespace wurde erfolgreich archiviert.",
+      "unarchiveSuccess": "Der Namespace wurde erfolgreich wiederhergestellt.",
+      "description": "If a namespace is archived, you cannot create new projects or edit it."
+    },
+    "delete": {
+      "title": "„{namespace}“ löschen",
+      "text1": "Diesen Namespace mit sämtlichem Inhalt löschen?",
+      "text2": "This includes all projects and tasks and CANNOT BE UNDONE!",
+      "success": "Der Namespace wurde erfolgreich gelöscht."
+    },
+    "edit": {
+      "title": "„{namespace}“ bearbeiten",
+      "success": "Der Namespace wurde erfolgreich aktualisiert."
+    },
+    "share": {
+      "title": "„{namespace}“ teilen"
+    },
+    "attributes": {
+      "title": "Namespace Titel",
+      "titlePlaceholder": "Titel des Namespace angeben…",
+      "description": "Beschreibung",
+      "descriptionPlaceholder": "Beschreibung für den Namespace eingeben…",
+      "color": "Farbe",
+      "archived": "Ist archiviert",
+      "isArchived": "Dieser Namespace ist archiviert"
+    },
+    "pseudo": {
+      "sharedProjects": {
+        "title": "Shared Projects"
+      },
      "favorites": {
        "title": "Favoriten"
+      },
+      "savedFilters": {
+        "title": "Filter"
      }
    }
  },
@ -345,7 +403,7 @@
    },
    "create": {
      "title": "Neuer gespeicherter Filter",
-      "description": "Ein gespeicherter Filter ist ein virtuelles Projekt, das bei jedem Zugriff aus einem Satz von Filtern errechnet wird.",
+      "description": "A saved filter is a virtual project which is computed from a set of filters each time it is accessed. Once created, it will appear in a special namespace.",
      "action": "Neuen gespeicherten Filter erstellen",
      "titleRequired": "Bitte gib den Titel für den Filter an."
    },
@ -377,7 +435,7 @@
  "label": {
    "title": "Labels",
    "manage": "Label verwalten",
-    "description": "Klicke auf ein Label um es zu editieren. Du kannst alle Labels, welche du erstellt hast, editieren. Du kannst alle Labels, welche mit einer Aufgabe verknüpft sind, auf die du Zugriff hast, benutzen.",
+    "description": "Click on a label to edit it. You can edit all labels you created, you can use all labels which are associated with a task to whose project you have access.",
    "newCTA": "Du hast momentan keine Labels.",
    "search": "Beginne zu schreiben, um nach einem Label zu suchen…",
    "create": {
@ -402,7 +460,7 @@
  },
  "sharing": {
    "authenticating": "Authentifizierung …",
-    "passwordRequired": "Dieses geteilte Projekt benötigt ein Passwort. Bitte gebe es unten ein:",
+    "passwordRequired": "This shared project requires a password. Please enter it below:",
    "error": "Es ist ein Fehler aufgetreten.",
    "invalidPassword": "Das Passwort ist ungültig."
  },
@ -471,7 +529,7 @@
      "code": "Code",
      "quote": "Zitat",
      "unorderedList": "Ungeordnete Liste",
-      "orderedList": "Geordnete Liste",
+      "orderedList  ": "Ordered List",
      "cleanBlock": "Formatierung löschen",
      "link": "Link",
      "image": "Bild",
@ -508,14 +566,14 @@
      "canuse": "Du kannst Datumsberechnung verwenden, um nach relativen Daten zu filtern.",
      "learnhow": "Sieh dir an, wie es funktioniert",
      "title": "Datumsberechnung",
-      "intro": "Du kannst relative Daten angeben, die bei der Anwendung des Filters von Vikunja aufgelöst werden.",
+      "intro": "Die Datumsberechnung erlaubt es, relative Daten anzugeben, die bei der Anwendung des Filters von Vikunja aufgelöst werden.",
      "expression": "Jeder Ausdruck der Datumsberechnung beginnt mit einem Datumswert, welcher entweder {0} sein kann oder mit {1} endet. Auf diesen Datumswert kann optional ein oder mehrere mathematische Ausdrücke folgen.",
      "similar": "Diese Ausdrücke ähneln denen von {0} und {1}.",
      "add1Day": "Einen Tag hinzufügen",
      "minus1Day": "Einen Tag abziehen",
      "roundDay": "Auf den nächsten Tag abrunden",
-      "supportedUnits": "Unterstützte Zeiteinheiten",
-      "someExamples": "Beispiele für Zeitausdrücke",
+      "supportedUnits": "Unterstützte Zeiteinheiten sind:",
+      "someExamples": "Einige Beispiele für Zeitausdrücke:",
      "units": {
        "seconds": "Sekunden",
        "minutes": "Minuten",
@ -561,7 +619,7 @@
      "chooseDueDate": "Klicke hier, um ein Fälligkeitsdatum zu setzen",
      "chooseStartDate": "Klicke hier, um ein Startdatum zu setzen",
      "chooseEndDate": "Klicke hier, um ein Enddatum zu setzen",
-      "move": "Aufgabe in ein anderes Projekt verschieben",
+      "move": "Move task to a different project",
      "done": "Als erledigt markieren!",
      "undone": "Als nicht erledigt markieren",
      "created": "Erstellt {0} von {1}",
@ -569,7 +627,7 @@
      "doneAt": "Erledigt {0}",
      "updateSuccess": "Die Aufgabe wurde erfolgreich gespeichert.",
      "deleteSuccess": "Die Aufgabe wurde erfolgreich gelöscht.",
-      "belongsToProject": "Diese Aufgabe gehört zum Projekt „{project}“",
+      "belongsToProject": "This task belongs to project '{project}'",
      "due": "Fällig {at}",
      "closePopup": "Popup schließen",
      "delete": {
@ -589,7 +647,7 @@
        "percentDone": "Fortschritt einstellen",
        "attachments": "Anhänge hinzufügen",
        "relatedTasks": "Beziehung hinzufügen",
-        "moveProject": "Verschieben",
+        "moveProject": "Move",
        "color": "Farbe setzen",
        "delete": "Löschen",
        "favorite": "Zu Favoriten hinzufügen",
@ -616,15 +674,21 @@
      "updated": "Aktualisiert"
    },
    "subscription": {
-      "subscribedTaskThroughParentProject": "Du kannst hier nicht de-abonnieren, da du diese Aufgabe über ihr Projekt abonniert hast.",
-      "subscribedProject": "Du hast dieses Projekt abonniert und erhältst Benachrichtigungen über Änderungen.",
-      "notSubscribedProject": "Du hast dieses Projekt nicht abonniert und erhältst keine Benachrichtigungen über Änderungen.",
+      "subscribedProjectThroughParentNamespace": "You can't unsubscribe here because you are subscribed to this project through its namespace.",
+      "subscribedTaskThroughParentNamespace": "Du kannst hier nicht de-abonnieren, da du diese Aufgabe über ihren Namespace abonniert hast.",
+      "subscribedTaskThroughParentProject": "You can't unsubscribe here because you are subscribed to this task through its project.",
+      "subscribedNamespace": "Du hast diesen Namespace abonniert und erhältst Benachrichtigungen über Änderungen.",
+      "notSubscribedNamespace": "Du hast diesen Namespace nicht abonniert und erhältst keine Benachrichtigungen über Änderungen.",
+      "subscribedProject": "You are currently subscribed to this project and will receive notifications for changes.",
+      "notSubscribedProject": "You are not subscribed to this project and won't receive notifications for changes.",
      "subscribedTask": "Du hast diese Aufgabe abonniert und erhältst Benachrichtigungen über Änderungen.",
      "notSubscribedTask": "Du hast diese Aufgabe nicht abonniert und erhältst keine Benachrichtigungen über Änderungen.",
      "subscribe": "Abonnieren",
      "unsubscribe": "Abbestellen",
-      "subscribeSuccessProject": "Du hast dieses Projekt jetzt abonniert",
-      "unsubscribeSuccessProject": "Du hast dieses Projekt jetzt nicht mehr abonniert",
+      "subscribeSuccessNamespace": "Du hast diesen Namespace jetzt abonniert",
+      "unsubscribeSuccessNamespace": "Du hast diesen Namespace jetzt nicht mehr abonniert",
+      "subscribeSuccessProject": "You are now subscribed to this project",
+      "unsubscribeSuccessProject": "You are now unsubscribed to this project",
      "subscribeSuccessTask": "Du hast diese Aufgabe jetzt abonniert",
      "unsubscribeSuccessTask": "Du hast diese Aufgabe jetzt nicht mehr abonniert"
    },
@ -698,7 +762,8 @@
      "new": "Neue Aufgabenbeziehung",
      "searchPlaceholder": "Beginne zu schreiben, um eine Aufgabe zu suchen, die als Beziehung hinzugefügt werden soll…",
      "createPlaceholder": "Füge diese Aufgabe als neue Aufgabenbeziehung hinzu",
-      "differentProject": "Diese Aufgabe gehört zu einem anderen Projekt.",
+      "differentProject": "This task belongs to a different project.",
+      "differentNamespace": "Diese Aufgabe gehört zu einem anderen Namespace.",
      "noneYet": "Keine Aufgabenbeziehung vorhanden.",
      "delete": "Aufgabenbeziehung entfernen",
      "deleteText1": "Willst du diese Aufgabenbeziehung wirklich entfernen?",
@ -718,17 +783,6 @@
        "copiedto": "Kopiert nach | Kopiert nach"
      }
    },
-    "reminder": {
-      "before": "{amount} {unit} before {type}",
-      "after": "{amount} {unit} after {type}",
-      "beforeShort": "before",
-      "afterShort": "after",
-      "onDueDate": "On the due date",
-      "onStartDate": "On the start date",
-      "onEndDate": "On the end date",
-      "custom": "Custom",
-      "dateAndTime": "Date and time"
-    },
    "repeat": {
      "everyDay": "Jeden Tag",
      "everyWeek": "Jede Woche",
@ -746,7 +800,8 @@
      "invalidAmount": "Bitte mehr als 0 eingeben."
    },
    "quickAddMagic": {
-      "hint": "Verwende magische Präfixe, um Fälligkeitsdaten, Zuweisungen und andere Aufgabeneigenschaften zu definieren.",
+      "hint": "Du kannst Quick Add Magic verwenden",
+      "what": "Was?",
      "title": "Quick Add Magic",
      "intro": "Beim Erstellen einer Aufgabe kannst du spezielle Schlüsselwörter verwenden, um Attribute direkt zu der neu erstellten Aufgabe hinzuzufügen. Dadurch können häufig verwendete Attribute schneller zu Aufgaben hinzugefügt werden.",
      "multiple": "Du kannst das mehrmals benutzen.",
@ -757,10 +812,10 @@
      "priority1": "Um die Priorität einer Aufgabe zu setzen, gibt eine Zahl zwischen 1 und 5 mit einem vorangestellten {prefix} ein.",
      "priority2": "Je höher die Zahl, desto höher die Priorität.",
      "assignees": "Um die Aufgabe direkt jemandem zuzuweisen, füge vor dem Anmeldenamen der Person ein {prefix} Zeichen ein.",
-      "project1": "Um ein Projekt für die Aufgabe festzulegen, gib seinen Namen mit einem vorangestellten {prefix} ein.",
-      "project2": "Dies gibt einen Fehler zurück, wenn das Projekt nicht existiert.",
-      "project3": "Um Leerzeichen zu verwenden, füge einfach ein \" oder ' um den Namen des Projekts hinzu.",
-      "project4": "Zum Beispiel: {prefix}\"Projekt mit Leerzeichen\".",
+      "project1": "To set a project for the task to appear in, enter its name prefixed with {prefix}.",
+      "project2": "This will return an error if the project does not exist.",
+      "project3": "To use spaces, simply add a \" or ' around the project name.",
+      "project4": "For example: {prefix}\"Project with spaces\".",
      "dateAndTime": "Datum und Uhrzeit",
      "date": "Jedes Datum wird als Enddatum der neuen Aufgabe verwendet. Du kannst Daten in jedem dieser Formate verwenden:",
      "dateWeekday": "jeder Wochentag, wird das nächste Datum mit diesem Tag verwenden",
@ -793,19 +848,19 @@
      "delete": {
        "header": "Team löschen",
        "text1": "Bist du sicher, dass du dieses Team und alle seine Mitglieder löschen willst?",
-        "text2": "Alle Teammitglieder verlieren den Zugriff auf Projekte, die mit diesem Team geteilt sind. Dies KANN NICHT rückgängig gemacht werden!",
+        "text2": "All team members will lose access to projects and namespaces shared with this team. This CANNOT BE UNDONE!",
        "success": "Das Team wurde erfolgreich gelöscht."
      },
      "deleteUser": {
        "header": "Benutzer:innen aus dem Team entfernen",
        "text1": "Bist du sicher, dass du diese:n Benutzer:in aus dem Team entfernen willst?",
-        "text2": "Diese:r Benutzer:in verliert den Zugriff auf alle Projekte, auf die dieses Team Zugriff hat. Dies kann nicht rückgängig gemacht werden!",
+        "text2": "They will lose access to all projects and namespaces this team has access to. This CANNOT BE UNDONE!",
        "success": "Der:die Benutzer:in wurde erfolgreich aus dem Team gelöscht."
      },
      "leave": {
        "title": "Team verlassen",
        "text1": "Bist du sicher, dass du dieses Team verlassen willst?",
-        "text2": "Du wirst Zugriff auf alle Projekte verlieren, auf die dieses Team Zugriff hat. Wenn du deine Meinung änderst, musst du durch einen Team-Admin wieder hinzugefügt werden.",
+        "text2": "You will lose access to all projects and namespaces this team has access to. If you change your mind you'll need a team admin to add you again.",
        "success": "Du hast das Team erfolgreich verlassen."
      }
    },
@ -837,27 +892,24 @@
      "attachment": "Einen Anhang dieser Aufgabe hinzufügen",
      "related": "Ändere die Abhängigen Aufgaben dieser Aufgabe",
      "color": "Die Farbe dieser Aufgabe ändern",
-      "move": "Aufgabe in ein anderes Projekt verschieben",
+      "move": "Move this task to another project",
      "reminder": "Erinnerungen für diese Aufgabe verwalten",
-      "description": "Aufgabenbeschreibung bearbeiten",
-      "delete": "Diese Aufgabe löschen",
-      "priority": "Die Priorität dieser Aufgabe ändern",
-      "favorite": "Diese Aufgabe zum Favoriten machen / von Favoriten entfernen"
+      "description": "Aufgabenbeschreibung bearbeiten"
    },
    "project": {
-      "title": "Projektansichten",
-      "switchToListView": "Zu Listenansicht wechseln",
-      "switchToGanttView": "Zur Ganttansicht wechseln",
-      "switchToKanbanView": "Zur Kanbanansicht wechseln",
-      "switchToTableView": "Zur Tabellenansicht wechseln"
+      "title": "Project Views",
+      "switchToListView": "Switch to list view",
+      "switchToGanttView": "Switch to gantt view",
+      "switchToKanbanView": "Switch to kanban view",
+      "switchToTableView": "Switch to table view"
    },
    "navigation": {
      "title": "Navigation",
      "overview": "Die Startseite aufrufen",
      "upcoming": "Anstehende Aufgaben aufrufen",
+      "namespaces": "Navigate to namespaces & projects",
      "labels": "Labels aufrufen",
-      "teams": "Teams aufrufen",
-      "projects": "Projekte aufrufen"
+      "teams": "Teams aufrufen"
    }
  },
  "update": {
@ -872,8 +924,7 @@
    "unarchive": "Archivierung aufheben",
    "setBackground": "Hintergrund einstellen",
    "share": "Teilen",
-    "newProject": "Neues Projekt",
-    "createProject": "Projekt erstellen"
+    "newProject": "New project"
  },
  "apiConfig": {
    "url": "Vikunja-URL",
@ -892,23 +943,25 @@
  "notification": {
    "title": "Benachrichtigungen",
    "none": "Du hast keine Benachrichtigungen. Einen schönen Tag noch!",
-    "explainer": "Benachrichtigungen werden hier angezeigt, wenn Aktionen für Projekte oder Aufgaben, die du abonniert hast, ausgeführt werden."
+    "explainer": "Notifications will appear here when actions on namespaces, projects or tasks you subscribed to happen."
  },
  "quickActions": {
    "commands": "Befehle",
    "placeholder": "Gib einen Befehl oder eine Suche ein …",
-    "hint": "Du kannst {project} verwenden, um die Suche auf ein Projekt zu beschränken. Kombiniere {project} oder {label} (Labels) mit einer Suchabfrage, um eine Aufgabe mit diesen Labels oder auf diesem Projekt zu suchen. Verwende {assignee}, um nur nach Teams zu suchen.",
+    "hint": "You can use {project} to limit the search to a project. Combine {project} or {label} (labels) with a search query to search for a task with these labels or on that project. Use {assignee} to only search for teams.",
    "tasks": "Aufgaben",
-    "projects": "Projekte",
+    "projects": "Projects",
    "teams": "Teams",
-    "newProject": "Gib den Titel des neuen Projekts ein…",
+    "newProject": "Enter the title of the new project…",
    "newTask": "Gib den Titel der neuen Aufgabe ein …",
+    "newNamespace": "Gib den Titel des neuen Namespaces ein…",
    "newTeam": "Gib den Namen des neuen Teams ein …",
-    "createTask": "Eine Aufgabe im aktuellen Projekt erstellen ({title})",
-    "createProject": "Projekt erstellen",
+    "createTask": "Create a task in the current project ({title})",
+    "createProject": "Create a project in the current namespace ({title})",
    "cmds": {
      "newTask": "Neue Aufgabe",
-      "newProject": "Neues Projekt",
+      "newProject": "New project",
+      "newNamespace": "Neuer Namespace",
      "newTeam": "Neues Team"
    }
  },
@ -939,15 +992,15 @@
    "1018": "Die Avatareinstellungen sind falsch.",
    "2001": "Die ID kann nicht leer oder 0 sein.",
    "2002": "Ein Teil der Anfragedaten ist ungültig.",
-    "3001": "Das Projekt ist nicht vorhanden.",
-    "3004": "Um das zu machen, benötigst du eine Leseberechtigung für dieses Projekt.",
-    "3005": "Der Projekttitel darf nicht leer sein.",
-    "3006": "Diese Linkfreigabe existiert nicht.",
-    "3007": "Ein Projekt mit diesem Bezeichner existiert bereits.",
-    "3008": "Dieses Projekt ist archiviert und kann deshalb nur gelesen werden. Dies gilt auch für alle Aufgaben, die mit diesem Projekt verbunden sind.",
-    "4001": "Der Aufgabentitel kann nicht leer sein.",
-    "4002": "Diese Aufgabe existiert nicht.",
-    "4003": "Alle Massenbearbeitungen an Aufgaben müssen zum selben Projekt gehören.",
+    "3001": "The project does not exist.",
+    "3004": "You need to have read permissions on that project to perform that action.",
+    "3005": "The project title cannot be empty.",
+    "3006": "The project share does not exist.",
+    "3007": "A project with this identifier already exists.",
+    "3008": "The project is archived and can therefore only be accessed read only. This is also true for all tasks associated with this project.",
+    "4001": "The project task text cannot be empty.",
+    "4002": "The project task does not exist.",
+    "4003": "All bulk editing tasks must belong to the same project.",
    "4004": "Es benötigt mindestens einen Task, um eine Massenänderung durchzuführen.",
    "4005": "Du hast keine Berechtigungen, um diese Aufgabe anzuzeigen.",
    "4006": "Du kannst die übergeordnete Aufgabe nicht auf sich selbst referenzieren.",
@ -964,23 +1017,30 @@
    "4017": "Ungültiger Aufgabenfilter (Vergleichskriterium).",
    "4018": "Ungültige Verkettung von Aufgabenfiltern.",
    "4019": "Ungültiger Aufgabenfilter (Wert).",
+    "5001": "Dieser Namespace existiert nicht.",
+    "5003": "Du hast keinen Zugriff auf den Namespace.",
+    "5006": "Der Namespace Titel kann nicht leer sein.",
+    "5009": "Du benötigst Leserechte in diesem Namespace, um diese Aktion durchzuführen.",
+    "5010": "Dieses Team hat keinen Zugriff auf diesen Namespace.",
+    "5011": "Diese:r Benutzer:in hat bereits Zugriff auf diesen Namespace.",
+    "5012": "Dieser Namespace ist archiviert und kann deshalb nur gelesen werden.",
    "6001": "Der Teamname kann nicht leer sein.",
    "6002": "Das Team existiert nicht.",
-    "6004": "Das Team hat bereits Zugriff auf dieses Projekt.",
+    "6004": "The team already has access to that namespace or project.",
    "6005": "Diese:r Benutzer:in ist bereits dem Team beigetreten.",
    "6006": "Du kannst den:die letzten Benutzer:in dieses Teams nicht löschen.",
-    "6007": "Das Team hat keine Berechtigungen auf diesem Projekt, um das durchzuführen.",
-    "7002": "Der:die Benutzer:in hat bereits Zugriff auf dieses Projekt",
-    "7003": "Du hast keinen Zugriff auf dieses Projekt.",
+    "6007": "The team does not have access to the project to perform that action.",
+    "7002": "The user already has access to that project.",
+    "7003": "You do not have access to that project.",
    "8001": "Dieses Label existiert bereits auf dieser Aufgabe.",
    "8002": "Das Label existiert nicht.",
    "8003": "Du hast keinen Zugriff auf dieses Label.",
    "9001": "Das Recht ist ungültig.",
    "10001": "Diese Spalte existiert nicht.",
-    "10002": "Diese Spalte gehört nicht zu diesem Projekt.",
-    "10003": "Du kannst die letze Spalte in einem Projekt nicht entfernen.",
+    "10002": "The bucket does not belong to that project.",
+    "10003": "You cannot remove the last bucket on a project.",
    "10004": "Du kannst die Aufgabe nicht in diese Spalte legen, da sie schon die maximale Anzahl an Aufgaben enthält.",
-    "10005": "Es kann nur eine Erledigt-Spalte pro Projekt geben.",
+    "10005": "There can be only one done bucket per project.",
    "11001": "Der gespeicherte Filter existiert nicht.",
    "11002": "Gespeicherte Ansichten sind für Linkfreigaben nicht verfügbar.",
    "12001": "Der Abonnement-Typ ist ungültig.",
@ -992,16 +1052,5 @@
    "title": "Über",
    "frontendVersion": "Frontend-Version: {version}",
    "apiVersion": "API-Version: {version}"
-  },
-  "time": {
-    "units": {
-      "seconds": "second|seconds",
-      "minutes": "minute|minutes",
-      "hours": "hour|hours",
-      "days": "day|days",
-      "weeks": "week|weeks",
-      "months": "month|months",
-      "years": "year|years"
-    }
  }
-}
+}
--- a/src/i18n/lang/de-swiss.json
+++ b/src/i18n/lang/de-swiss.json
@ -5,10 +5,11 @@
    "welcomeDay": "Hallo {username}!",
    "welcomeEvening": "Guten Abend, {username}!",
    "lastViewed": "Zletscht ahglueget",
-    "addToHomeScreen": "Füge diese App deinem Startbildschirm hinzu, um schneller darauf zuzugreifen und das Erlebnis zu verbessern.",
    "project": {
-      "importText": "Importiere deine Projekte und Aufgaben aus anderen Diensten in Vikunja:",
-      "import": "Importiere deine Daten in Vikunja"
+      "newText": "Du kannst ein neues Projekt für deine neuen Aufgaben erstellen:",
+      "new": "New project",
+      "importText": "Or import your projects and tasks from other services into Vikunja:",
+      "import": "Import your data into Vikunja"
    }
  },
  "404": {
@ -77,14 +78,14 @@
        "savedSuccess": "Die Iihstellige sind erfolgriich aktualisiert wordä.",
        "emailReminders": "Schick mir e Errinnerig für Uufgabe per E-Mail",
        "overdueReminders": "Sende mir jeden Tag eine Zusammenfassung meiner überfälligen Aufgaben",
-        "discoverableByName": "Erlaube anderen Benutzer:innen, mich als Mitglied zu Teams oder Projekten hinzuzufügen, wenn sie nach meinem Namen suchen",
-        "discoverableByEmail": "Erlaube anderen Benutzer:innen, mich als Mitglied zu Teams oder Projekten hinzuzufügen, wenn sie nach meiner vollständigen E-Mail Adresse suchen",
+        "discoverableByName": "Anderi Lüüt chend mi findä, wenn si nach miim Name sueched",
+        "discoverableByEmail": "Anderi Benutzer chend mich finde, wenns mini voll E-Mail Adressä sueched",
        "playSoundWhenDone": "Spil es Tönli ab, wenn en Task als fertig markiert wird",
        "weekStart": "D'Wuche fangt ah am",
        "weekStartSunday": "Sunntig",
        "weekStartMonday": "Määntig",
        "language": "Sproch",
-        "defaultProject": "Standard-Projekt",
+        "defaultProject": "Default Project",
        "timezone": "Zeitzone",
        "overdueTasksRemindersTime": "Zeit der E-Mail-Zusammenfassung der überfälligen Aufgaben"
      },
@ -142,7 +143,7 @@
    },
    "deletion": {
      "title": "Lösche deinen Vikunja-Account",
-      "text1": "Das Löschen deines Accounts ist dauerhaft und unwiderruflich. Alle Projekte, Aufgaben und zugehörige Daten werden gelöscht.",
+      "text1": "The deletion of your account is permanent and cannot be undone. We will delete all your namespaces, projects, tasks and everything associated with it.",
      "text2": "Zum Fortfahren gib bitte dein Passwort ein. Du erhältst eine E-Mail mit weiteren Anweisungen.",
      "confirm": "Meinen Account löschen",
      "requestSuccess": "Die Anfrage war erfolgreich. Du erhältst eine E-Mail mit weiteren Anweisungen.",
@ -156,7 +157,7 @@
    },
    "export": {
      "title": "Exportiere deine Vikunja-Daten",
-      "description": "Du kannst eine Kopie deiner Daten bei Vikunja anfordern. Dazu gehören Projekte, Aufgaben und alles, was damit zusammenhängt. Du kannst diese Daten dann in jeder Vikunja-Instanz über die Migrationsfunktion importieren.",
+      "description": "You can request a copy of all your Vikunja data. This include Namespaces, Projects, Tasks and everything associated to them. You can import this data in any Vikunja instance through the migration function.",
      "descriptionPasswordRequired": "Bitte gib dein Passwort ein, um fortzufahren:",
      "request": "Eine Kopie meiner Vikunja Daten anfordern",
      "success": "Du hast deine Daten bei Vikunja erfolgreich angefordert! Wir schicken dir eine E-Mail, sobald sie zum Download bereitstehen.",
@ -164,163 +165,220 @@
    }
  },
  "project": {
-    "archivedMessage": "Dieses Projekt ist archiviert. Es ist nicht möglich, neue Aufgaben zu erstellen oder es zu bearbeiten.",
-    "archived": "Archiviert",
-    "showArchived": "Archivierte anzeigen",
-    "title": "Projekttitel",
-    "color": "Farbe",
-    "projects": "Projekte",
-    "parent": "Übergeordnetes Projekt",
-    "search": "Tippe, um nach einem Projekt zu suchen…",
-    "searchSelect": "Klicke oder drücke die Eingabetaste, um dieses Projekt auszuwählen",
-    "shared": "Geteilte Projekte",
-    "noDescriptionAvailable": "Keine Projektbeschreibung verfügbar.",
-    "inboxTitle": "Eingang",
+    "archived": "This project is archived. It is not possible to create new or edit tasks for it.",
+    "title": "Project Title",
+    "color": "Color",
+    "projects": "Projects",
+    "search": "Type to search for a project…",
+    "searchSelect": "Click or press enter to select this project",
+    "shared": "Shared Projects",
+    "noDescriptionAvailable": "No project description is available.",
    "create": {
-      "header": "Neues Projekt",
-      "titlePlaceholder": "Der Titel des Projekts kommt hier hin…",
-      "addTitleRequired": "Bitte gebe einen Titel an.",
-      "createdSuccess": "Das Projekt wurde erfolgreich erstellt.",
-      "addProjectRequired": "Bitte gebe ein Projekt an oder lege ein Standard-Projekt in den Einstellungen fest."
+      "header": "New project",
+      "titlePlaceholder": "The project's title goes here…",
+      "addTitleRequired": "Please specify a title.",
+      "createdSuccess": "The project was successfully created.",
+      "addProjectRequired": "Please specify a project or set a default project in the settings."
    },
    "archive": {
-      "title": "„{project}“ archivieren",
-      "archive": "Dieses Projekt archivieren",
-      "unarchive": "Archivierung dieses Projekts aufheben",
-      "unarchiveText": "Du wirst neue Aufgaben erstellen oder sie bearbeiten können.",
-      "archiveText": "Du kannst dieses Projekt nicht bearbeiten oder neue Aufgaben erstellen, bis du die Archivierung aufhebst.",
-      "success": "Das Projekt wurde erfolgreich archiviert."
+      "title": "Archive \"{project}\"",
+      "archive": "Archive this project",
+      "unarchive": "Un-Archive this project",
+      "unarchiveText": "You will be able to create new tasks or edit it.",
+      "archiveText": "You won't be able to edit this project or create new tasks until you un-archive it.",
+      "success": "The project was successfully archived."
    },
    "background": {
-      "title": "Projekthintergrund festlegen",
-      "remove": "Hintergrund entfernen",
-      "upload": "Wähle einen Hintergrund von deinem Computer",
-      "searchPlaceholder": "Nach einem Hintergrund suchen…",
+      "title": "Set project background",
+      "remove": "Remove Background",
+      "upload": "Choose a background from your pc",
+      "searchPlaceholder": "Search for a background…",
      "poweredByUnsplash": "Powered by Unsplash",
-      "loadMore": "Weitere Bilder laden",
-      "success": "Der Hintergrund wurde erfolgreich eingestellt!",
-      "removeSuccess": "Der Hintergrund wurde erfolgreich entfernt!"
+      "loadMore": "Load more photos",
+      "success": "The background has been set successfully!",
+      "removeSuccess": "The background has been removed successfully!"
    },
    "delete": {
-      "title": "„{project}“ löschen",
-      "header": "Dieses Projekt löschen",
-      "text1": "Bist du sicher, dass du dieses Projekt und alle seine Inhalte löschen willst?",
-      "text2": "Dies umfasst alle Aufgaben und kann NICHT rückgängig gemacht werden!",
-      "success": "Das Projekt wurde erfolgreich gelöscht.",
-      "tasksToDelete": "Dies löscht unwiderruflich ca. {count} Aufgaben.",
-      "noTasksToDelete": "Dieses Projekt enthält keine Aufgaben, es kann sicher gelöscht werden."
+      "title": "Delete \"{project}\"",
+      "header": "Delete this project",
+      "text1": "Are you sure you want to delete this project and all of its contents?",
+      "text2": "This includes all tasks and CANNOT BE UNDONE!",
+      "success": "The project was successfully deleted.",
+      "tasksToDelete": "This will irrevocably remove approx. {count} tasks.",
+      "noTasksToDelete": "This project does not contain any tasks, it should be safe to delete."
    },
    "duplicate": {
-      "title": "Dupliziere dieses Projekt",
-      "label": "Duplizieren",
-      "text": "Wähle ein übergeordnetes Projekt aus, welches das duplizierte Projekt enthalten soll:",
-      "success": "Das Projekt wurde erfolgreich dupliziert."
+      "title": "Duplicate this project",
+      "label": "Duplicate",
+      "text": "Select a namespace which should hold the duplicated project:",
+      "success": "The project was successfully duplicated."
    },
    "edit": {
-      "header": "Dieses Projekt bearbeiten",
-      "title": "„{project}“ bearbeiten",
-      "titlePlaceholder": "Der Titel des Projekts kommt hier hin…",
-      "identifierTooltip": "Der Projektbezeichner kann zur eindeutigen Identifizierung einer Aufgabe über mehrere Projekte hinweg verwendet werden. Du kannst ihn auf leer setzen, um ihn zu deaktivieren.",
-      "identifier": "Projektbezeichner",
-      "identifierPlaceholder": "Der Projektbezeichner kommt hierhin…",
-      "description": "Beschreibung",
-      "descriptionPlaceholder": "Projektbeschreibung eingeben…",
-      "color": "Farbe",
-      "success": "Das Projekt wurde erfolgreich aktualisiert."
+      "header": "Edit This Project",
+      "title": "Edit \"{project}\"",
+      "titlePlaceholder": "The project title goes here…",
+      "identifierTooltip": "The project identifier can be used to uniquely identify a task across projects. You can set it to empty to disable it.",
+      "identifier": "Project Identifier",
+      "identifierPlaceholder": "The project identifier goes here…",
+      "description": "Description",
+      "descriptionPlaceholder": "The projects description goes here…",
+      "color": "Color",
+      "success": "The project was successfully updated."
    },
    "share": {
-      "header": "Projekt teilen",
-      "title": "„{project}“ teilen",
-      "share": "Teilen",
+      "header": "Share this project",
+      "title": "Share \"{project}\"",
+      "share": "Share",
      "links": {
-        "title": "Linkfreigaben",
-        "what": "Was ist eine Linkfreigabe?",
-        "explanation": "Mit Linkfreigaben kannst Projekt du Listen mit Benutzer:innen ohne Vikunja-Account teilen.",
-        "create": "Erstelle ein neue Linkfreigabe",
+        "title": "Share Links",
+        "what": "What is a share link?",
+        "explanation": "Share Links allow you to easily share a project with other users who don't have an account on Vikunja.",
+        "create": "Create a new link share",
        "name": "Name (optional)",
-        "namePlaceholder": "z.B. Lorem Ipsum",
-        "nameExplanation": "Alle Aktionen, die mit dieser Linkfreigabe durchgeführt werden, werden mit diesem Namen angezeigt.",
-        "password": "Passwort (optional)",
-        "passwordExplanation": "Bei der Authentifizierung wird der:die Benutzer:in aufgefordert, dieses Passwort einzugeben.",
-        "noName": "Kein Name festgelegt",
-        "remove": "Linkfreigabe entfernen",
-        "removeText": "Bist du sicher, dass du diese Linkfreigabe unwiderruflich löschen möchtest? Über die Linkfreigabe ist danach der Zugriff auf dieses Projekt nicht mehr möglich!",
-        "createSuccess": "Die Linkfreigabe wurde erfolgreich erstellt.",
-        "deleteSuccess": "Die Linkfreigabe wurde erfolgreich gelöscht",
-        "view": "Ansicht",
-        "sharedBy": "Von {0} geteilt"
+        "namePlaceholder": "e.g. Lorem Ipsum",
+        "nameExplanation": "All actions done by this link share will show up with the name.",
+        "password": "Password (optional)",
+        "passwordExplanation": "When authenticating, the user will be required to enter this password.",
+        "noName": "No name set",
+        "remove": "Remove a link share",
+        "removeText": "Are you sure you want to remove this link share? It will no longer be possible to access this project with this link share. This cannot be undone!",
+        "createSuccess": "The link share was successfully created.",
+        "deleteSuccess": "The link share was successfully deleted",
+        "view": "View",
+        "sharedBy": "Shared by {0}"
      },
      "userTeam": {
-        "typeUser": "Benutzer:in | Benutzer:innen",
-        "typeTeam": "Team | Teams",
-        "shared": "Geteilt mit diesen {type}",
-        "you": "Du",
-        "notShared": "Noch nicht mit einem {type} geteilt.",
-        "removeHeader": "Einen {type} von {sharable} entfernen",
-        "removeText": "Diesen {sharable} von {type} entfernen? Dies kann nicht rückgängig gemacht werden!",
-        "removeSuccess": "{sharable} wurde erfolgreich von {type} entfernt.",
-        "addedSuccess": "{type} wurde erfolgreich hinzugefügt.",
-        "updatedSuccess": "{type} wurde erfolgreich hinzugefügt."
+        "typeUser": "user | users",
+        "typeTeam": "team | teams",
+        "shared": "Shared with these {type}",
+        "you": "You",
+        "notShared": "Not shared with any {type} yet.",
+        "removeHeader": "Remove a {type} from the {sharable}",
+        "removeText": "Are you sure you want to remove this {sharable} from the {type}? This cannot be undone!",
+        "removeSuccess": "The {sharable} was successfully removed from the {type}.",
+        "addedSuccess": "The {type} was successfully added.",
+        "updatedSuccess": "The {type} was successfully added."
      },
      "right": {
-        "title": "Berechtigung",
-        "read": "Nur Leserechte",
-        "readWrite": "Lesen & Schreiben",
+        "title": "Permission",
+        "read": "Read only",
+        "readWrite": "Read & write",
        "admin": "Admin"
      },
      "attributes": {
        "link": "Link",
-        "delete": "Löschen"
+        "delete": "Delete"
      }
    },
    "list": {
-      "title": "Liste",
-      "add": "Hinzufügen",
-      "addPlaceholder": "Neue Aufgabe hinzufügen…",
-      "empty": "Dieses Project ist derzeit leer.",
-      "newTaskCta": "Eine neue Aufgabe erstellen.",
-      "editTask": "Aufgabe bearbeiten"
+      "title": "List",
+      "add": "Add",
+      "addPlaceholder": "Add a new task…",
+      "empty": "This project is currently empty.",
+      "newTaskCta": "Create a new task.",
+      "editTask": "Edit Task"
    },
    "gantt": {
      "title": "Gantt",
-      "showTasksWithoutDates": "Aufgaben anzeigen, für die keine Daten festgelegt sind",
-      "size": "Größe",
-      "default": "Standard",
-      "month": "Monat",
-      "day": "Tag",
-      "hour": "Stunde",
-      "range": "Zeitraum",
-      "noDates": "Diese Aufgabe hat keine Daten definiert."
+      "showTasksWithoutDates": "Show tasks which don't have dates set",
+      "size": "Size",
+      "default": "Default",
+      "month": "Month",
+      "day": "Day",
+      "hour": "Hour",
+      "range": "Date Range",
+      "noDates": "This task has no dates set."
    },
    "table": {
-      "title": "Tabelle",
-      "columns": "Spalten"
+      "title": "Table",
+      "columns": "Columns"
    },
    "kanban": {
      "title": "Kanban",
      "limit": "Limit: {limit}",
-      "noLimit": "Nicht gesetzt",
-      "doneBucket": "Erledigt Spalte",
-      "doneBucketHint": "Alle Aufgaben, die in diese Spalte verschoben werden, werden automatisch als erledigt markiert.",
-      "doneBucketHintExtended": "Alle Aufgaben, die in die Erledigt Spalte verschoben wurden, werden automatisch als erledigt markiert. Aufgaben, die in einer anderen Spalte als Erledigt markiert wurden, werden auch in diese Spalte verschoben.",
-      "doneBucketSavedSuccess": "Erledigt Spalte gespeichert.",
-      "deleteLast": "Du kannst die letzte Spalte nicht entfernen.",
-      "addTaskPlaceholder": "Gebe einen Aufgabentitel ein …",
-      "addTask": "Eine Aufgabe hinzufügen",
-      "addAnotherTask": "Weitere Aufgabe hinzufügen",
-      "addBucket": "Eine neue Spalte erstellen",
-      "addBucketPlaceholder": "Gebe einen Spaltentitel ein…",
-      "deleteHeaderBucket": "Spalte löschen",
-      "deleteBucketText1": "Bist du sicher, dass du diese Spalte löschen möchtest?",
-      "deleteBucketText2": "Dies löscht keine Aufgaben, sondern verschiebt sie in die Standardspalte.",
-      "deleteBucketSuccess": "Die Spalte wurde erfolgreich gelöscht.",
-      "bucketTitleSavedSuccess": "Der Spaltenname wurde erfolgreich gespeichert.",
-      "bucketLimitSavedSuccess": "Das Spaltenlimit wurde erfolgreich gespeichert.",
-      "collapse": "Spalte einklappen"
+      "noLimit": "Not Set",
+      "doneBucket": "Done bucket",
+      "doneBucketHint": "All tasks moved into this bucket will automatically marked as done.",
+      "doneBucketHintExtended": "All tasks moved into the done bucket will be marked as done automatically. All tasks marked as done from elsewhere will be moved as well.",
+      "doneBucketSavedSuccess": "The done bucket has been saved successfully.",
+      "deleteLast": "You cannot remove the last bucket.",
+      "addTaskPlaceholder": "Enter the new task title…",
+      "addTask": "Add a task",
+      "addAnotherTask": "Add another task",
+      "addBucket": "Create a new bucket",
+      "addBucketPlaceholder": "Enter the new bucket title…",
+      "deleteHeaderBucket": "Delete the bucket",
+      "deleteBucketText1": "Are you sure you want to delete this bucket?",
+      "deleteBucketText2": "This will not delete any tasks but move them into the default bucket.",
+      "deleteBucketSuccess": "The bucket has been deleted successfully.",
+      "bucketTitleSavedSuccess": "The bucket title has been saved successfully.",
+      "bucketLimitSavedSuccess": "The bucket limit been saved successfully.",
+      "collapse": "Collapse this bucket"
    },
    "pseudo": {
      "favorites": {
-        "title": "Favoriten"
+        "title": "Favorites"
+      }
+    }
+  },
+  "namespace": {
+    "title": "Namespaces & Projects",
+    "namespace": "Namensruum",
+    "showArchived": "Archivierti aahzeige",
+    "noneAvailable": "Du hesch momentan kein Namensruuim.",
+    "unarchive": "Ent-archiviere",
+    "archived": "Archiviert",
+    "noProjects": "This namespace does not contain any projects.",
+    "createProject": "Create a new project in this namespace.",
+    "namespaces": "Namensrüüm",
+    "search": "Schriib, um nachemne Namensruum z'sueche…",
+    "create": {
+      "title": "Neuer Namespace",
+      "titleRequired": "Bitte gib en Titl ah.",
+      "explanation": "A namespace is a collection of projects you can share and use to organize your projects with. In fact, every project belongs to a namespace.",
+      "tooltip": "Was isch en Namensruum?",
+      "success": "Namensruum erstellt."
+    },
+    "archive": {
+      "titleArchive": "\"{namespace}\" archiviere",
+      "titleUnarchive": "\"{namespace}\" ent-archiviere",
+      "archiveText": "You won't be able to edit this namespace or create new projects until you un-archive it. This will also archive all projects in this namespace.",
+      "unarchiveText": "You will be able to create new projects or edit it.",
+      "success": "De Namensruum isch erfolgriich archiviert worde.",
+      "unarchiveSuccess": "Der Namespace wurde erfolgreich wiederhergestellt.",
+      "description": "If a namespace is archived, you cannot create new projects or edit it."
+    },
+    "delete": {
+      "title": "\"{namespace}\" chüble",
+      "text1": "Bisch du dir sicher, dass du de Namensruum und all ihren Inhalt chüble wetsch?",
+      "text2": "This includes all projects and tasks and CANNOT BE UNDONE!",
+      "success": "Namensruum g'chüblet."
+    },
+    "edit": {
+      "title": "\"{namespace}\" bearbeite",
+      "success": "Namensruum aktualisiert."
+    },
+    "share": {
+      "title": "\"{namespace}\" teile"
+    },
+    "attributes": {
+      "title": "Namensruumtitl",
+      "titlePlaceholder": "De Namensruumtitl chunt da ahne…",
+      "description": "Beschriibig",
+      "descriptionPlaceholder": "D'Namensruum Beschriibig chunt da ahne…",
+      "color": "Farb",
+      "archived": "Isch archiviert",
+      "isArchived": "De Namensruum isch archiviert"
+    },
+    "pseudo": {
+      "sharedProjects": {
+        "title": "Shared Projects"
+      },
+      "favorites": {
+        "title": "Favorite"
+      },
+      "savedFilters": {
+        "title": "Filter"
      }
    }
  },
@ -345,7 +403,7 @@
    },
    "create": {
      "title": "Neuer gespeicherter Filter",
-      "description": "Ein gespeicherter Filter ist ein virtuelles Projekt, das bei jedem Zugriff aus einem Satz von Filtern errechnet wird.",
+      "description": "A saved filter is a virtual project which is computed from a set of filters each time it is accessed. Once created, it will appear in a special namespace.",
      "action": "Neue gspeicherete Filter erstelle",
      "titleRequired": "Bitte gib den Titel für den Filter an."
    },
@ -377,7 +435,7 @@
  "label": {
    "title": "Labels",
    "manage": "Label migriere",
-    "description": "Klicke auf ein Label um es zu editieren. Du kannst alle Labels, welche du erstellt hast, editieren. Du kannst alle Labels, welche mit einer Aufgabe verknüpft sind, auf die du Zugriff hast, benutzen.",
+    "description": "Click on a label to edit it. You can edit all labels you created, you can use all labels which are associated with a task to whose project you have access.",
    "newCTA": "Du hesch momentan kei Labels.",
    "search": "Schriib, um nachemne Label z'sueche…",
    "create": {
@ -402,7 +460,7 @@
  },
  "sharing": {
    "authenticating": "Authentifiziere…",
-    "passwordRequired": "Dieses geteilte Projekt benötigt ein Passwort. Bitte gebe es unten ein:",
+    "passwordRequired": "This shared project requires a password. Please enter it below:",
    "error": "Het en Fähler geh. :(",
    "invalidPassword": "Da Passwort isch ungültig."
  },
@ -471,7 +529,7 @@
      "code": "Code",
      "quote": "Zitaat",
      "unorderedList": "Ungordnedi Listä",
-      "orderedList": "Geordnete Liste",
+      "orderedList  ": "Ordered List",
      "cleanBlock": "Formatierig Lösche",
      "link": "Link",
      "image": "Bild",
@ -508,14 +566,14 @@
      "canuse": "Du kannst Datumsberechnung verwenden, um nach relativen Daten zu filtern.",
      "learnhow": "Sieh dir an, wie es funktioniert",
      "title": "Datumsberechnung",
-      "intro": "Du kannst relative Daten angeben, die bei der Anwendung des Filters von Vikunja aufgelöst werden.",
+      "intro": "Die Datumsberechnung erlaubt es, relative Daten anzugeben, die bei der Anwendung des Filters von Vikunja aufgelöst werden.",
      "expression": "Jeder Ausdruck der Datumsberechnung beginnt mit einem Datumswert, welcher entweder {0} sein kann oder mit {1} endet. Auf diesen Datumswert kann optional ein oder mehrere mathematische Ausdrücke folgen.",
      "similar": "Diese Ausdrücke ähneln denen von {0} und {1}.",
      "add1Day": "Einen Tag hinzufügen",
      "minus1Day": "Einen Tag abziehen",
      "roundDay": "Auf den nächsten Tag abrunden",
-      "supportedUnits": "Unterstützte Zeiteinheiten",
-      "someExamples": "Beispiele für Zeitausdrücke",
+      "supportedUnits": "Unterstützte Zeiteinheiten sind:",
+      "someExamples": "Einige Beispiele für Zeitausdrücke:",
      "units": {
        "seconds": "Sekunden",
        "minutes": "Minuten",
@ -561,7 +619,7 @@
      "chooseDueDate": "Druck da, um es Fälligkeitsdatum z'setze",
      "chooseStartDate": "Druck dah, um es Startdatum z'setze",
      "chooseEndDate": "Druck da, um es Enddatum z'setze",
-      "move": "Aufgabe in ein anderes Projekt verschieben",
+      "move": "Move task to a different project",
      "done": "Als erledigt markieren!",
      "undone": "Als unerledigt markierä",
      "created": "Erstellt am {0} vo {1}",
@ -569,7 +627,7 @@
      "doneAt": "{0} erledigt",
      "updateSuccess": "Die Uufgab isch erfolgriich g'speichered wore.",
      "deleteSuccess": "Die Uufgab isch erfolgriich g'chüblet wore.",
-      "belongsToProject": "Diese Aufgabe gehört zum Projekt „{project}“",
+      "belongsToProject": "This task belongs to project '{project}'",
      "due": "Fällig bis {at}",
      "closePopup": "Popup schließen",
      "delete": {
@ -589,7 +647,7 @@
        "percentDone": "Fortschritt einstellen",
        "attachments": "Anhänge hinzufügen",
        "relatedTasks": "Beziehung hinzufügen",
-        "moveProject": "Verschieben",
+        "moveProject": "Move",
        "color": "Farbe setzen",
        "delete": "Löschen",
        "favorite": "Zu Favoriten hinzufügen",
@ -616,15 +674,21 @@
      "updated": "Aktualisiert"
    },
    "subscription": {
-      "subscribedTaskThroughParentProject": "Du kannst hier nicht de-abonnieren, da du diese Aufgabe über ihr Projekt abonniert hast.",
-      "subscribedProject": "Du hast dieses Projekt abonniert und erhältst Benachrichtigungen über Änderungen.",
-      "notSubscribedProject": "Du hast dieses Projekt nicht abonniert und erhältst keine Benachrichtigungen über Änderungen.",
+      "subscribedProjectThroughParentNamespace": "You can't unsubscribe here because you are subscribed to this project through its namespace.",
+      "subscribedTaskThroughParentNamespace": "Du kannst hier nicht de-abonnieren, da du diese Aufgabe über ihren Namespace abonniert hast.",
+      "subscribedTaskThroughParentProject": "You can't unsubscribe here because you are subscribed to this task through its project.",
+      "subscribedNamespace": "Du hast diesen Namespace abonniert und erhältst Benachrichtigungen über Änderungen.",
+      "notSubscribedNamespace": "Du hast diesen Namespace nicht abonniert und erhältst keine Benachrichtigungen über Änderungen.",
+      "subscribedProject": "You are currently subscribed to this project and will receive notifications for changes.",
+      "notSubscribedProject": "You are not subscribed to this project and won't receive notifications for changes.",
      "subscribedTask": "Du hast diese Aufgabe abonniert und erhältst Benachrichtigungen über Änderungen.",
      "notSubscribedTask": "Du hast diese Aufgabe nicht abonniert und erhältst keine Benachrichtigungen über Änderungen.",
      "subscribe": "Abooniere",
      "unsubscribe": "Deabonniere",
-      "subscribeSuccessProject": "Du hast dieses Projekt jetzt abonniert",
-      "unsubscribeSuccessProject": "Du hast dieses Projekt jetzt nicht mehr abonniert",
+      "subscribeSuccessNamespace": "Du hast diesen Namespace jetzt abonniert",
+      "unsubscribeSuccessNamespace": "Du hast diesen Namespace jetzt nicht mehr abonniert",
+      "subscribeSuccessProject": "You are now subscribed to this project",
+      "unsubscribeSuccessProject": "You are now unsubscribed to this project",
      "subscribeSuccessTask": "Du hast diese Aufgabe jetzt abonniert",
      "unsubscribeSuccessTask": "Du hast diese Aufgabe jetzt nicht mehr abonniert"
    },
@ -698,7 +762,8 @@
      "new": "Neui Uufgabe Beziehig",
      "searchPlaceholder": "Schriib, um e neui Uufgab als Zueghörigkeit hinzuezfüege…",
      "createPlaceholder": "Das als en neui Zueghörigkeit hinzuefüege",
-      "differentProject": "Diese Aufgabe gehört zu einem anderen Projekt.",
+      "differentProject": "This task belongs to a different project.",
+      "differentNamespace": "Diese Aufgabe gehört zu einem anderen Namespace.",
      "noneYet": "S'git kei Uufgabe Beziehige.",
      "delete": "Uufgabe Beziehig chüble",
      "deleteText1": "Bisch du dir sicher, dass du die Zueghörigkeit chüblä wetsch?",
@ -718,17 +783,6 @@
        "copiedto": "Kopiert nach | Kopiert nach"
      }
    },
-    "reminder": {
-      "before": "{amount} {unit} before {type}",
-      "after": "{amount} {unit} after {type}",
-      "beforeShort": "before",
-      "afterShort": "after",
-      "onDueDate": "On the due date",
-      "onStartDate": "On the start date",
-      "onEndDate": "On the end date",
-      "custom": "Custom",
-      "dateAndTime": "Date and time"
-    },
    "repeat": {
      "everyDay": "Jedä Tag",
      "everyWeek": "Jedi Wuche",
@ -746,7 +800,8 @@
      "invalidAmount": "Bitte mehr als 0 eingeben."
    },
    "quickAddMagic": {
-      "hint": "Verwende magische Präfixe, um Fälligkeitsdaten, Zuweisungen und andere Aufgabeneigenschaften zu definieren.",
+      "hint": "Du chasch Quick Add Magic verwendä",
+      "what": "Was?",
      "title": "Quick Add Magic",
      "intro": "Bim erstelle vonere Uufgab, chasch du spezielli Schlüsselwörter verwende, umm Attribute direkt zu dere Uufgab hinzuezfüege. Das Erlaubts, um pblichi Attribute schneller zu Uufgabe hinzuezfüege.",
      "multiple": "Du chasch da mehrmals mache.",
@ -757,10 +812,10 @@
      "priority1": "Um e Task Priorität z'setze: füeg e nummere zwüsched 1 und 5, mit em {prefix} als Prefix iih.",
      "priority2": "Je höher d'nummere, desto höher d'Priorität.",
      "assignees": "Um die Aufgabe direkt jemandem zuzuweisen, füge vor dem Anmeldenamen der Person ein {prefix} Zeichen ein.",
-      "project1": "Um ein Projekt für die Aufgabe festzulegen, gib seinen Namen mit einem vorangestellten {prefix} ein.",
-      "project2": "Dies gibt einen Fehler zurück, wenn das Projekt nicht existiert.",
-      "project3": "Um Leerzeichen zu verwenden, füge einfach ein \" oder ' um den Namen des Projekts hinzu.",
-      "project4": "Zum Beispiel: {prefix}\"Projekt mit Leerzeichen\".",
+      "project1": "To set a project for the task to appear in, enter its name prefixed with {prefix}.",
+      "project2": "This will return an error if the project does not exist.",
+      "project3": "To use spaces, simply add a \" or ' around the project name.",
+      "project4": "For example: {prefix}\"Project with spaces\".",
      "dateAndTime": "Datum und Ziit",
      "date": "Jedes Datum wird als Abgabedatum für di neu Uufgab gnoh. Du chasch Date i de folgende Format verwende:",
      "dateWeekday": "jede Wuchetaag wird nimmt s'negste Datum mit dem Datum",
@ -793,19 +848,19 @@
      "delete": {
        "header": "Das Team chüble",
        "text1": "Bischder sicher, dasst wetsch da Team mit allne Mitglieder lösche?",
-        "text2": "Alle Teammitglieder verlieren den Zugriff auf Projekte, die mit diesem Team geteilt sind. Dies KANN NICHT rückgängig gemacht werden!",
+        "text2": "All team members will lose access to projects and namespaces shared with this team. This CANNOT BE UNDONE!",
        "success": "Da Team isch erfolgriich g'chüblet wore."
      },
      "deleteUser": {
        "header": "Benutzer usem Team entferne",
        "text1": "Bisch du dir sicher, dass du de Benutzer usm Team werfe wetsch?",
-        "text2": "Diese:r Benutzer:in verliert den Zugriff auf alle Projekte, auf die dieses Team Zugriff hat. Dies kann nicht rückgängig gemacht werden!",
+        "text2": "They will lose access to all projects and namespaces this team has access to. This CANNOT BE UNDONE!",
        "success": "Benutzer erfolgriich usegworfe."
      },
      "leave": {
        "title": "Team verlassen",
        "text1": "Bist du sicher, dass du dieses Team verlassen willst?",
-        "text2": "Du wirst Zugriff auf alle Projekte verlieren, auf die dieses Team Zugriff hat. Wenn du deine Meinung änderst, musst du durch einen Team-Admin wieder hinzugefügt werden.",
+        "text2": "You will lose access to all projects and namespaces this team has access to. If you change your mind you'll need a team admin to add you again.",
        "success": "Du hast das Team erfolgreich verlassen."
      }
    },
@ -837,27 +892,24 @@
      "attachment": "En Aahang dere Uufgab hinzuefüege",
      "related": "Beziehige vo dere Uufgab bearbeite",
      "color": "Die Farbe dieser Aufgabe ändern",
-      "move": "Aufgabe in ein anderes Projekt verschieben",
+      "move": "Move this task to another project",
      "reminder": "Erinnerungen für diese Aufgabe verwalten",
-      "description": "Aufgabenbeschreibung bearbeiten",
-      "delete": "Diese Aufgabe löschen",
-      "priority": "Die Priorität dieser Aufgabe ändern",
-      "favorite": "Diese Aufgabe zum Favoriten machen / von Favoriten entfernen"
+      "description": "Aufgabenbeschreibung bearbeiten"
    },
    "project": {
-      "title": "Projektansichten",
-      "switchToListView": "Zu Listenansicht wechseln",
-      "switchToGanttView": "Zur Ganttansicht wechseln",
-      "switchToKanbanView": "Zur Kanbanansicht wechseln",
-      "switchToTableView": "Zur Tabellenansicht wechseln"
+      "title": "Project Views",
+      "switchToListView": "Switch to list view",
+      "switchToGanttView": "Switch to gantt view",
+      "switchToKanbanView": "Switch to kanban view",
+      "switchToTableView": "Switch to table view"
    },
    "navigation": {
      "title": "Navigation",
      "overview": "Die Startseite aufrufen",
      "upcoming": "Anstehende Aufgaben aufrufen",
+      "namespaces": "Navigate to namespaces & projects",
      "labels": "Labels aufrufen",
-      "teams": "Teams aufrufen",
-      "projects": "Projekte aufrufen"
+      "teams": "Teams aufrufen"
    }
  },
  "update": {
@ -872,8 +924,7 @@
    "unarchive": "Ent-archiviere",
    "setBackground": "Hintergrund iihstelle",
    "share": "Teilä",
-    "newProject": "Neues Projekt",
-    "createProject": "Projekt erstellen"
+    "newProject": "New project"
  },
  "apiConfig": {
    "url": "Vikunja URL",
@ -892,23 +943,25 @@
  "notification": {
    "title": "Benachrichtigunge",
    "none": "Du hesch kei neui Benachrichtunge. Heb e schös Tägli!",
-    "explainer": "Benachrichtigungen werden hier angezeigt, wenn Aktionen für Projekte oder Aufgaben, die du abonniert hast, ausgeführt werden."
+    "explainer": "Notifications will appear here when actions on namespaces, projects or tasks you subscribed to happen."
  },
  "quickActions": {
    "commands": "Befehl",
    "placeholder": "Schriib en Befehl oder suech…",
-    "hint": "Du kannst {project} verwenden, um die Suche auf ein Projekt zu beschränken. Kombiniere {project} oder {label} (Labels) mit einer Suchabfrage, um eine Aufgabe mit diesen Labels oder auf diesem Projekt zu suchen. Verwende {assignee}, um nur nach Teams zu suchen.",
+    "hint": "You can use {project} to limit the search to a project. Combine {project} or {label} (labels) with a search query to search for a task with these labels or on that project. Use {assignee} to only search for teams.",
    "tasks": "Uufgabe",
-    "projects": "Projekte",
+    "projects": "Projects",
    "teams": "Teams",
-    "newProject": "Gib den Titel des neuen Projekts ein…",
+    "newProject": "Enter the title of the new project…",
    "newTask": "Gib en Titl für die neu Uufgab iih…",
+    "newNamespace": "Gib en Titl für de neu Namensruum iih…",
    "newTeam": "Gib en Name für da neui Team iih…",
-    "createTask": "Eine Aufgabe im aktuellen Projekt erstellen ({title})",
-    "createProject": "Projekt erstellen",
+    "createTask": "Create a task in the current project ({title})",
+    "createProject": "Create a project in the current namespace ({title})",
    "cmds": {
      "newTask": "Neui Uufgab",
-      "newProject": "Neues Projekt",
+      "newProject": "New project",
+      "newNamespace": "Neue Namensruum",
      "newTeam": "Neus Team"
    }
  },
@ -939,15 +992,15 @@
    "1018": "Die Benutzer Profilbild Iihstellige sind nid gültig.",
    "2001": "ID chann nid leer oder 0 sii.",
    "2002": "Ebbis vo de Ahfragedate isch ungültig.",
-    "3001": "Das Projekt ist nicht vorhanden.",
-    "3004": "Um das zu machen, benötigst du eine Leseberechtigung für dieses Projekt.",
-    "3005": "Der Projekttitel darf nicht leer sein.",
-    "3006": "Diese Linkfreigabe existiert nicht.",
-    "3007": "Ein Projekt mit diesem Bezeichner existiert bereits.",
-    "3008": "Dieses Projekt ist archiviert und kann deshalb nur gelesen werden. Dies gilt auch für alle Aufgaben, die mit diesem Projekt verbunden sind.",
-    "4001": "Der Aufgabentitel kann nicht leer sein.",
-    "4002": "Diese Aufgabe existiert nicht.",
-    "4003": "Alle Massenbearbeitungen an Aufgaben müssen zum selben Projekt gehören.",
+    "3001": "The project does not exist.",
+    "3004": "You need to have read permissions on that project to perform that action.",
+    "3005": "The project title cannot be empty.",
+    "3006": "The project share does not exist.",
+    "3007": "A project with this identifier already exists.",
+    "3008": "The project is archived and can therefore only be accessed read only. This is also true for all tasks associated with this project.",
+    "4001": "The project task text cannot be empty.",
+    "4002": "The project task does not exist.",
+    "4003": "All bulk editing tasks must belong to the same project.",
    "4004": "Es bruucht mindestens ei Uufgab, um e Masseänderig durezfüehre.",
    "4005": "Du hesch kei Berechtigung, um die Uufgab ahzzeige.",
    "4006": "Du chasch kei übergordneti Uufgab uf sich selbst refferenziere.",
@ -964,23 +1017,30 @@
    "4017": "Ungültige Uufgabefilter vergliich.",
    "4018": "Ungültige Verkettung von Aufgabenfiltern.",
    "4019": "Ungültigi Uufgabe Filter Wert.",
+    "5001": "De Namensruum existiert nid.",
+    "5003": "Du hesch kei Zuegriff zu dem Namensruum.",
+    "5006": "De Namensruum Name cha nid leer sii.",
+    "5009": "Du bruuchsch Läsezuegriff uf de Namensruum, um das durezfüehre.",
+    "5010": "Da Team hett kei zuegriff uf de Namensruum.",
+    "5011": "De Benutzer hett bereits zuegriff uf de Namensruum.",
+    "5012": "De Namensruum isch momentan schriibgschützt weil er archiviert isch.",
    "6001": "Der Teamname kann nicht leer sein.",
    "6002": "Da Team giz nid.",
-    "6004": "Das Team hat bereits Zugriff auf dieses Projekt.",
+    "6004": "The team already has access to that namespace or project.",
    "6005": "De Benutzer isch scho bi dem Team.",
    "6006": "Du chasch nid de letschti Benutzer vom Team lösche.",
-    "6007": "Das Team hat keine Berechtigungen auf diesem Projekt, um das durchzuführen.",
-    "7002": "Der:die Benutzer:in hat bereits Zugriff auf dieses Projekt",
-    "7003": "Du hast keinen Zugriff auf dieses Projekt.",
+    "6007": "The team does not have access to the project to perform that action.",
+    "7002": "The user already has access to that project.",
+    "7003": "You do not have access to that project.",
    "8001": "Da Label existiert scho für die Uufgab.",
    "8002": "Das Label giz nid.",
    "8003": "Du hesch kei Zuegriff uf da Label.",
    "9001": "Die Berechtigung isch ungültig.",
    "10001": "De Chübl gits nid.",
-    "10002": "Diese Spalte gehört nicht zu diesem Projekt.",
-    "10003": "Du kannst die letze Spalte in einem Projekt nicht entfernen.",
+    "10002": "The bucket does not belong to that project.",
+    "10003": "You cannot remove the last bucket on a project.",
    "10004": "Du chasch die Uufgab nid dem Chübl zue wiise, weil er d'Limite für Uufgabe erreicht het.",
-    "10005": "Es kann nur eine Erledigt-Spalte pro Projekt geben.",
+    "10005": "There can be only one done bucket per project.",
    "11001": "De g'speicheret Filter giz nid.",
    "11002": "G'speichereti Filter chend nid Teilt werde.",
    "12001": "De Abonnement Entitätstyp isch ungültig.",
@ -992,16 +1052,5 @@
    "title": "Über",
    "frontendVersion": "Frontend Version: {version}",
    "apiVersion": "API Version: {version}"
-  },
-  "time": {
-    "units": {
-      "seconds": "second|seconds",
-      "minutes": "minute|minutes",
-      "hours": "hour|hours",
-      "days": "day|days",
-      "weeks": "week|weeks",
-      "months": "month|months",
-      "years": "year|years"
-    }
  }
-}
+}
--- a/src/i18n/lang/en.json
+++ b/src/i18n/lang/en.json
@ -5,9 +5,10 @@
    "welcomeDay": "Hi {username}!",
    "welcomeEvening": "Good Evening {username}!",
    "lastViewed": "Last viewed",
-    "addToHomeScreen": "Add this app to your home screen for faster access and improved experience.",
    "project": {
-      "importText": "Import your projects and tasks from other services into Vikunja:",
+      "newText": "You can create a new project for your new tasks:",
+      "new": "New project",
+      "importText": "Or import your projects and tasks from other services into Vikunja:",
      "import": "Import your data into Vikunja"
    }
  },
@ -77,8 +78,8 @@
        "savedSuccess": "The settings were successfully updated.",
        "emailReminders": "Send me reminders for tasks via Email",
        "overdueReminders": "Send me a summary of my undone overdue tasks every day",
-        "discoverableByName": "Allow other users to add me as a member to teams or projects when they search for my name",
-        "discoverableByEmail": "Allow other users to add me as a member to teams or projects when they search for my full email",
+        "discoverableByName": "Let other users find me when they search for my name",
+        "discoverableByEmail": "Let other users find me when they search for my full email",
        "playSoundWhenDone": "Play a sound when marking tasks as done",
        "weekStart": "Week starts on",
        "weekStartSunday": "Sunday",
@ -142,7 +143,7 @@
    },
    "deletion": {
      "title": "Delete your Vikunja Account",
-      "text1": "The deletion of your account is permanent and cannot be undone. We will delete all your projects, tasks and everything associated with it.",
+      "text1": "The deletion of your account is permanent and cannot be undone. We will delete all your namespaces, projects, tasks and everything associated with it.",
      "text2": "To proceed, please enter your password. You will receive an email with further instructions.",
      "confirm": "Delete my account",
      "requestSuccess": "The request was successful. You'll receive an email with further instructions.",
@ -156,7 +157,7 @@
    },
    "export": {
      "title": "Export your Vikunja data",
-      "description": "You can request a copy of all your Vikunja data. This includes Projects, Tasks and everything associated to them. You can import this data in any Vikunja instance through the migration function.",
+      "description": "You can request a copy of all your Vikunja data. This include Namespaces, Projects, Tasks and everything associated to them. You can import this data in any Vikunja instance through the migration function.",
      "descriptionPasswordRequired": "Please enter your password to proceed:",
      "request": "Request a copy of my Vikunja Data",
      "success": "You've successfully requested your Vikunja Data! We will send you an email once it's ready to download.",
@ -164,18 +165,14 @@
    }
  },
  "project": {
-    "archivedMessage": "This project is archived. It is not possible to create new or edit tasks for it.",
-    "archived": "Archived",
-    "showArchived": "Show Archived",
+    "archived": "This project is archived. It is not possible to create new or edit tasks for it.",
    "title": "Project Title",
    "color": "Color",
    "projects": "Projects",
-    "parent": "Parent Project",
    "search": "Type to search for a project…",
    "searchSelect": "Click or press enter to select this project",
    "shared": "Shared Projects",
    "noDescriptionAvailable": "No project description is available.",
-    "inboxTitle": "Inbox",
    "create": {
      "header": "New project",
      "titlePlaceholder": "The project's title goes here…",
@ -213,7 +210,7 @@
    "duplicate": {
      "title": "Duplicate this project",
      "label": "Duplicate",
-      "text": "Select a parent project which should hold the duplicated project:",
+      "text": "Select a namespace which should hold the duplicated project:",
      "success": "The project was successfully duplicated."
    },
    "edit": {
@ -241,7 +238,7 @@
        "namePlaceholder": "e.g. Lorem Ipsum",
        "nameExplanation": "All actions done by this link share will show up with the name.",
        "password": "Password (optional)",
-        "passwordExplanation": "When signing in, the user will be required to enter this password.",
+        "passwordExplanation": "When authenticating, the user will be required to enter this password.",
        "noName": "No name set",
        "remove": "Remove a link share",
        "removeText": "Are you sure you want to remove this link share? It will no longer be possible to access this project with this link share. This cannot be undone!",
@ -324,6 +321,67 @@
      }
    }
  },
+  "namespace": {
+    "title": "Namespaces & Projects",
+    "namespace": "Namespace",
+    "showArchived": "Show Archived",
+    "noneAvailable": "You don't have any namespaces right now.",
+    "unarchive": "Un-Archive",
+    "archived": "Archived",
+    "noProjects": "This namespace does not contain any projects.",
+    "createProject": "Create a new project in this namespace.",
+    "namespaces": "Namespaces",
+    "search": "Type to search for a namespace…",
+    "create": {
+      "title": "New namespace",
+      "titleRequired": "Please specify a title.",
+      "explanation": "A namespace is a collection of projects you can share and use to organize your projects with. In fact, every project belongs to a namespace.",
+      "tooltip": "What's a namespace?",
+      "success": "The namespace was successfully created."
+    },
+    "archive": {
+      "titleArchive": "Archive \"{namespace}\"",
+      "titleUnarchive": "Un-Archive \"{namespace}\"",
+      "archiveText": "You won't be able to edit this namespace or create new projects until you un-archive it. This will also archive all projects in this namespace.",
+      "unarchiveText": "You will be able to create new projects or edit it.",
+      "success": "The namespace was successfully archived.",
+      "unarchiveSuccess": "The namespace was successfully un-archived.",
+      "description": "If a namespace is archived, you cannot create new projects or edit it."
+    },
+    "delete": {
+      "title": "Delete \"{namespace}\"",
+      "text1": "Are you sure you want to delete this namespace and all of its contents?",
+      "text2": "This includes all projects and tasks and CANNOT BE UNDONE!",
+      "success": "The namespace was successfully deleted."
+    },
+    "edit": {
+      "title": "Edit \"{namespace}\"",
+      "success": "The namespace was successfully updated."
+    },
+    "share": {
+      "title": "Share \"{namespace}\""
+    },
+    "attributes": {
+      "title": "Namespace Title",
+      "titlePlaceholder": "The namespace title goes here…",
+      "description": "Description",
+      "descriptionPlaceholder": "The namespaces description goes here…",
+      "color": "Color",
+      "archived": "Is Archived",
+      "isArchived": "This namespace is archived"
+    },
+    "pseudo": {
+      "sharedProjects": {
+        "title": "Shared Projects"
+      },
+      "favorites": {
+        "title": "Favorites"
+      },
+      "savedFilters": {
+        "title": "Filters"
+      }
+    }
+  },
  "filters": {
    "title": "Filters",
    "clear": "Clear Filters",
@ -345,7 +403,7 @@
    },
    "create": {
      "title": "New Saved Filter",
-      "description": "A saved filter is a virtual project which is computed from a set of filters each time it is accessed.",
+      "description": "A saved filter is a virtual project which is computed from a set of filters each time it is accessed. Once created, it will appear in a special namespace.",
      "action": "Create new saved filter",
      "titleRequired": "Please provide a title for the filter."
    },
@ -471,7 +529,7 @@
      "code": "Code",
      "quote": "Quote",
      "unorderedList": "Unordered List",
-      "orderedList": "Ordered List",
+      "orderedList  ": "Ordered List",
      "cleanBlock": "Clean Block",
      "link": "Link",
      "image": "Image",
@ -511,14 +569,14 @@
      "canuse": "You can use date math to filter for relative dates.",
      "learnhow": "Check out how it works",
      "title": "Date Math",
-      "intro": "Specify relative dates which are resolved on the fly by Vikunja when applying the filter.",
+      "intro": "Date Math allows you to specify relative dates which are resolved on the fly by Vikunja when applying the filter.",
      "expression": "Each Date Math expression starts with an anchor date, which can either be {0}, or a date string ending with {1}. This anchor date can optionally be followed by one or more maths expressions.",
      "similar": "These expressions are similar to the ones provided by {0} and {1}.",
      "add1Day": "Add one day",
      "minus1Day": "Subtract one day",
      "roundDay": "Round down to the nearest day",
-      "supportedUnits": "Supported time units",
-      "someExamples": "Examples of time expressions",
+      "supportedUnits": "Supported time units are:",
+      "someExamples": "Some examples of time expressions:",
      "units": {
        "seconds": "Seconds",
        "minutes": "Minutes",
@ -619,13 +677,19 @@
      "updated": "Updated"
    },
    "subscription": {
+      "subscribedProjectThroughParentNamespace": "You can't unsubscribe here because you are subscribed to this project through its namespace.",
+      "subscribedTaskThroughParentNamespace": "You can't unsubscribe here because you are subscribed to this task through its namespace.",
      "subscribedTaskThroughParentProject": "You can't unsubscribe here because you are subscribed to this task through its project.",
+      "subscribedNamespace": "You are currently subscribed to this namespace and will receive notifications for changes.",
+      "notSubscribedNamespace": "You are not subscribed to this namespace and won't receive notifications for changes.",
      "subscribedProject": "You are currently subscribed to this project and will receive notifications for changes.",
      "notSubscribedProject": "You are not subscribed to this project and won't receive notifications for changes.",
      "subscribedTask": "You are currently subscribed to this task and will receive notifications for changes.",
      "notSubscribedTask": "You are not subscribed to this task and won't receive notifications for changes.",
      "subscribe": "Subscribe",
      "unsubscribe": "Unsubscribe",
+      "subscribeSuccessNamespace": "You are now subscribed to this namespace",
+      "unsubscribeSuccessNamespace": "You are now unsubscribed to this namespace",
      "subscribeSuccessProject": "You are now subscribed to this project",
      "unsubscribeSuccessProject": "You are now unsubscribed to this project",
      "subscribeSuccessTask": "You are now subscribed to this task",
@ -702,6 +766,7 @@
      "searchPlaceholder": "Type search for a new task to add as related…",
      "createPlaceholder": "Add this as new related task",
      "differentProject": "This task belongs to a different project.",
+      "differentNamespace": "This task belongs to a different namespace.",
      "noneYet": "No task relations yet.",
      "delete": "Delete Task Relation",
      "deleteText1": "Are you sure you want to delete this task relation?",
@ -721,17 +786,6 @@
        "copiedto": "Copied To | Copied To"
      }
    },
-    "reminder": {
-      "before": "{amount} {unit} before {type}",
-      "after": "{amount} {unit} after {type}",
-      "beforeShort": "before",
-      "afterShort": "after",
-      "onDueDate": "On the due date",
-      "onStartDate": "On the start date",
-      "onEndDate": "On the end date",
-      "custom": "Custom",
-      "dateAndTime": "Date and time"
-    },
    "repeat": {
      "everyDay": "Every Day",
      "everyWeek": "Every Week",
@ -749,7 +803,8 @@
      "invalidAmount": "Please enter more than 0."
    },
    "quickAddMagic": {
-      "hint": "Use magic prefixes to define due dates, assignees and other task properties.",
+      "hint": "You can use Quick Add Magic",
+      "what": "What?",
      "title": "Quick Add Magic",
      "intro": "When creating a task, you can use special keywords to directly add attributes to the newly created task. This allows to add commonly used attributes to tasks much faster.",
      "multiple": "You can use this multiple times.",
@ -796,19 +851,19 @@
      "delete": {
        "header": "Delete the team",
        "text1": "Are you sure you want to delete this team and all of its members?",
-        "text2": "All team members will lose access to projects shared with this team. This CANNOT BE UNDONE!",
+        "text2": "All team members will lose access to projects and namespaces shared with this team. This CANNOT BE UNDONE!",
        "success": "The team was successfully deleted."
      },
      "deleteUser": {
        "header": "Remove a user from the team",
        "text1": "Are you sure you want to remove this user from the team?",
-        "text2": "They will lose access to all projects this team has access to. This CANNOT BE UNDONE!",
+        "text2": "They will lose access to all projects and namespaces this team has access to. This CANNOT BE UNDONE!",
        "success": "The user was successfully deleted from the team."
      },
      "leave": {
        "title": "Leave team",
        "text1": "Are you sure you want to leave this team?",
-        "text2": "You will lose access to all projects this team has access to. If you change your mind you'll need a team admin to add you again.",
+        "text2": "You will lose access to all projects and namespaces this team has access to. If you change your mind you'll need a team admin to add you again.",
        "success": "You have successfully left the team."
      }
    },
@ -842,10 +897,7 @@
      "color": "Change the color of this task",
      "move": "Move this task to another project",
      "reminder": "Manage reminders of this task",
-      "description": "Toggle editing of the task description",
-      "delete": "Delete this task",
-      "priority": "Change the priority of this task",
-      "favorite": "Mark this task as favorite / unfavorite"
+      "description": "Toggle editing of the task description"
    },
    "project": {
      "title": "Project Views",
@ -858,9 +910,9 @@
      "title": "Navigation",
      "overview": "Navigate to overview",
      "upcoming": "Navigate to upcoming tasks",
+      "namespaces": "Navigate to namespaces & projects",
      "labels": "Navigate to labels",
-      "teams": "Navigate to teams",
-      "projects": "Navigate to projects"
+      "teams": "Navigate to teams"
    }
  },
  "update": {
@ -875,8 +927,7 @@
    "unarchive": "Un-Archive",
    "setBackground": "Set background",
    "share": "Share",
-    "newProject": "New project",
-    "createProject": "Create project"
+    "newProject": "New project"
  },
  "apiConfig": {
    "url": "Vikunja URL",
@ -895,7 +946,7 @@
  "notification": {
    "title": "Notifications",
    "none": "You don't have any notifications. Have a nice day!",
-    "explainer": "Notifications will appear here when actions projects or tasks you subscribed to happen."
+    "explainer": "Notifications will appear here when actions on namespaces, projects or tasks you subscribed to happen."
  },
  "quickActions": {
    "commands": "Commands",
@ -906,12 +957,14 @@
    "teams": "Teams",
    "newProject": "Enter the title of the new project…",
    "newTask": "Enter the title of the new task…",
+    "newNamespace": "Enter the title of the new namespace…",
    "newTeam": "Enter the name of the new team…",
    "createTask": "Create a task in the current project ({title})",
-    "createProject": "Create a project",
+    "createProject": "Create a project in the current namespace ({title})",
    "cmds": {
      "newTask": "New task",
      "newProject": "New project",
+      "newNamespace": "New namespace",
      "newTeam": "New team"
    }
  },
@ -967,9 +1020,16 @@
    "4017": "Invalid task filter comparator.",
    "4018": "Invalid task filter concatenator.",
    "4019": "Invalid task filter value.",
+    "5001": "The namespace does not exist.",
+    "5003": "You do not have access to the specified namespace.",
+    "5006": "The namespace name cannot be empty.",
+    "5009": "You need to have namespace read access to perform that action.",
+    "5010": "This team does not have access to that namespace.",
+    "5011": "This user has already access to that namespace.",
+    "5012": "The namespace is archived and can therefore only be accessed read only.",
    "6001": "The team name cannot be empty.",
    "6002": "The team does not exist.",
-    "6004": "The team already has access to that project.",
+    "6004": "The team already has access to that namespace or project.",
    "6005": "The user is already a member of that team.",
    "6006": "Cannot delete the last team member.",
    "6007": "The team does not have access to the project to perform that action.",
@ -995,16 +1055,5 @@
    "title": "About",
    "frontendVersion": "Frontend Version: {version}",
    "apiVersion": "API Version: {version}"
-  },
-  "time": {
-    "units": {
-      "seconds": "second|seconds",
-      "minutes": "minute|minutes",
-      "hours": "hour|hours",
-      "days": "day|days",
-      "weeks": "week|weeks",
-      "months": "month|months",
-      "years": "year|years"
-    }
  }
-}
+}
--- a/src/i18n/lang/eo-UY.json
+++ b/src/i18n/lang/eo-UY.json
--- a/src/i18n/lang/es-ES.json
+++ b/src/i18n/lang/es-ES.json
@ -5,9 +5,10 @@
    "welcomeDay": "¡Hola {username}!",
    "welcomeEvening": "¡Buenas Tardes {username}!",
    "lastViewed": "Visto por última vez",
-    "addToHomeScreen": "Add this app to your home screen for faster access and improved experience.",
    "project": {
-      "importText": "Import your projects and tasks from other services into Vikunja:",
+      "newText": "You can create a new project for your new tasks:",
+      "new": "New project",
+      "importText": "Or import your projects and tasks from other services into Vikunja:",
      "import": "Import your data into Vikunja"
    }
  },
@ -77,8 +78,8 @@
        "savedSuccess": "Ajustes actualizados con éxito.",
        "emailReminders": "Enviarme recordatorios de tareas vía Correo Electrónico",
        "overdueReminders": "Enviarme un resumen de mis tareas pendientes todos los días",
-        "discoverableByName": "Allow other users to add me as a member to teams or projects when they search for my name",
-        "discoverableByEmail": "Allow other users to add me as a member to teams or projects when they search for my full email",
+        "discoverableByName": "Permitir que otros usuarios me encuentren cuando busquen mi nombre",
+        "discoverableByEmail": "Permitir que otros usuarios me encuentren cuando busquen mi correo completo",
        "playSoundWhenDone": "Reproducir un sonido cuando marque tareas como completadas",
        "weekStart": "La semana empieza en",
        "weekStartSunday": "Domingo",
@ -142,7 +143,7 @@
    },
    "deletion": {
      "title": "Eliminar tu Cuenta de Vikunja",
-      "text1": "The deletion of your account is permanent and cannot be undone. We will delete all your projects, tasks and everything associated with it.",
+      "text1": "The deletion of your account is permanent and cannot be undone. We will delete all your namespaces, projects, tasks and everything associated with it.",
      "text2": "Para continuar, por favor, introduce tu contraseña. Recibirás un correo electrónico con más instrucciones.",
      "confirm": "Eliminar mi cuenta",
      "requestSuccess": "La solicitud ha sido exitosa. Recibirás un correo electrónico con más instrucciones.",
@ -156,7 +157,7 @@
    },
    "export": {
      "title": "Exportar tus datos de Vikunja",
-      "description": "You can request a copy of all your Vikunja data. This includes Projects, Tasks and everything associated to them. You can import this data in any Vikunja instance through the migration function.",
+      "description": "You can request a copy of all your Vikunja data. This include Namespaces, Projects, Tasks and everything associated to them. You can import this data in any Vikunja instance through the migration function.",
      "descriptionPasswordRequired": "Por favor, introduce tu contraseña para continuar:",
      "request": "Solicitar una copia de mis datos de Vikunja",
      "success": "Tu petición de datos de Vikunja ha sido procesada correctamente. Te enviaremos un correo una vez esté lista para descargar.",
@ -164,18 +165,14 @@
    }
  },
  "project": {
-    "archivedMessage": "This project is archived. It is not possible to create new or edit tasks for it.",
-    "archived": "Archived",
-    "showArchived": "Show Archived",
+    "archived": "This project is archived. It is not possible to create new or edit tasks for it.",
    "title": "Project Title",
    "color": "Color",
    "projects": "Projects",
-    "parent": "Parent Project",
    "search": "Type to search for a project…",
    "searchSelect": "Click or press enter to select this project",
    "shared": "Shared Projects",
    "noDescriptionAvailable": "No project description is available.",
-    "inboxTitle": "Inbox",
    "create": {
      "header": "New project",
      "titlePlaceholder": "The project's title goes here…",
@ -213,7 +210,7 @@
    "duplicate": {
      "title": "Duplicate this project",
      "label": "Duplicate",
-      "text": "Select a parent project which should hold the duplicated project:",
+      "text": "Select a namespace which should hold the duplicated project:",
      "success": "The project was successfully duplicated."
    },
    "edit": {
@ -241,7 +238,7 @@
        "namePlaceholder": "e.g. Lorem Ipsum",
        "nameExplanation": "All actions done by this link share will show up with the name.",
        "password": "Password (optional)",
-        "passwordExplanation": "When signing in, the user will be required to enter this password.",
+        "passwordExplanation": "When authenticating, the user will be required to enter this password.",
        "noName": "No name set",
        "remove": "Remove a link share",
        "removeText": "Are you sure you want to remove this link share? It will no longer be possible to access this project with this link share. This cannot be undone!",
@ -324,6 +321,67 @@
      }
    }
  },
+  "namespace": {
+    "title": "Namespaces & Projects",
+    "namespace": "Proyecto",
+    "showArchived": "Mostrar Archivados",
+    "noneAvailable": "No tienes ningún proyecto en este momento.",
+    "unarchive": "Desarchivar",
+    "archived": "Archivado",
+    "noProjects": "This namespace does not contain any projects.",
+    "createProject": "Create a new project in this namespace.",
+    "namespaces": "Proyectos",
+    "search": "Escribe para buscar un proyecto…",
+    "create": {
+      "title": "Nuevo proyecto",
+      "titleRequired": "Por favor, especifica un título.",
+      "explanation": "A namespace is a collection of projects you can share and use to organize your projects with. In fact, every project belongs to a namespace.",
+      "tooltip": "¿Qué es un proyecto?",
+      "success": "El proyecto se ha creado correctamente."
+    },
+    "archive": {
+      "titleArchive": "Archivar \"{namespace}\"",
+      "titleUnarchive": "Desarchivar \"{namespace}\"",
+      "archiveText": "You won't be able to edit this namespace or create new projects until you un-archive it. This will also archive all projects in this namespace.",
+      "unarchiveText": "You will be able to create new projects or edit it.",
+      "success": "El proyecto fue archivado con éxito.",
+      "unarchiveSuccess": "El proyecto se ha desarchivado con éxito.",
+      "description": "If a namespace is archived, you cannot create new projects or edit it."
+    },
+    "delete": {
+      "title": "Eliminar \"{namespace}\"",
+      "text1": "¿Estás seguro de que deseas eliminar este proyecto y todo su contenido?",
+      "text2": "This includes all projects and tasks and CANNOT BE UNDONE!",
+      "success": "El proyecto se ha eliminado con éxito."
+    },
+    "edit": {
+      "title": "Editar \"{namespace}\"",
+      "success": "El proyecto se actualizó con éxito."
+    },
+    "share": {
+      "title": "Compartir \"{namespace}\""
+    },
+    "attributes": {
+      "title": "Título del proyecto",
+      "titlePlaceholder": "El título del proyecto va aquí…",
+      "description": "Descripción",
+      "descriptionPlaceholder": "La descripción del proyecto va aquí…",
+      "color": "Color",
+      "archived": "Está archivado",
+      "isArchived": "Este proyecto está archivado"
+    },
+    "pseudo": {
+      "sharedProjects": {
+        "title": "Shared Projects"
+      },
+      "favorites": {
+        "title": "Favoritos"
+      },
+      "savedFilters": {
+        "title": "Filtros"
+      }
+    }
+  },
  "filters": {
    "title": "Filtros",
    "clear": "Limpiar Filtros",
@ -345,7 +403,7 @@
    },
    "create": {
      "title": "New Saved Filter",
-      "description": "A saved filter is a virtual project which is computed from a set of filters each time it is accessed.",
+      "description": "A saved filter is a virtual project which is computed from a set of filters each time it is accessed. Once created, it will appear in a special namespace.",
      "action": "Create new saved filter",
      "titleRequired": "Please provide a title for the filter."
    },
@ -471,7 +529,7 @@
      "code": "Código",
      "quote": "Cita",
      "unorderedList": "Lista no ordenada",
-      "orderedList": "Ordered List",
+      "orderedList  ": "Ordered List",
      "cleanBlock": "Borrar Bloque",
      "link": "Enlace",
      "image": "Imagen",
@ -508,14 +566,14 @@
      "canuse": "Puedes usar ecuaciones para filtrar por fechas relacionadas.",
      "learnhow": "Mira cómo funciona",
      "title": "Ecuaciones",
-      "intro": "Specify relative dates which are resolved on the fly by Vikunja when applying the filter.",
+      "intro": "Las Ecuaciones permiten determinar qué fechas relacionadas te mostrará Vikunja al aplicar este filtro.",
      "expression": "Cada expresión matemática empieza con una fecha ancla, que puede ser {0}, o una cadena de texto que acabe en {1}. Opcionalmente, esta fecha puede estar seguida de una o más expresiones.",
      "similar": "Estas expresiones son similares a las definidas en {0} y {1}.",
      "add1Day": "Añadir un día",
      "minus1Day": "Subtract one day",
      "roundDay": "Round down to the nearest day",
-      "supportedUnits": "Supported time units",
-      "someExamples": "Examples of time expressions",
+      "supportedUnits": "Supported time units are:",
+      "someExamples": "Some examples of time expressions:",
      "units": {
        "seconds": "Seconds",
        "minutes": "Minutes",
@ -616,13 +674,19 @@
      "updated": "Actualizado"
    },
    "subscription": {
+      "subscribedProjectThroughParentNamespace": "You can't unsubscribe here because you are subscribed to this project through its namespace.",
+      "subscribedTaskThroughParentNamespace": "No puede cancelar la suscripción aquí porque está suscrito a esta tarea a través de su proyecto.",
      "subscribedTaskThroughParentProject": "You can't unsubscribe here because you are subscribed to this task through its project.",
+      "subscribedNamespace": "Actualmente está suscrito a este proyecto y recibirás notificaciones de cambios.",
+      "notSubscribedNamespace": "No está suscrito a este proyecto y no recibirá notificaciones de cambios.",
      "subscribedProject": "You are currently subscribed to this project and will receive notifications for changes.",
      "notSubscribedProject": "You are not subscribed to this project and won't receive notifications for changes.",
      "subscribedTask": "Actualmente estás suscrito a esta tarea y recibirás notificaciones de cambios.",
      "notSubscribedTask": "No estás suscrito a esta tarea y no recibirás notificaciones de cambios.",
      "subscribe": "Suscribirse",
      "unsubscribe": "Desuscribirse",
+      "subscribeSuccessNamespace": "Ahora está suscrito a este proyecto",
+      "unsubscribeSuccessNamespace": "Ya no está suscrito a este proyecto",
      "subscribeSuccessProject": "You are now subscribed to this project",
      "unsubscribeSuccessProject": "You are now unsubscribed to this project",
      "subscribeSuccessTask": "You are now subscribed to this task",
@ -699,6 +763,7 @@
      "searchPlaceholder": "Escriba para buscar una nueva tarea a añadir como relacionada…",
      "createPlaceholder": "Añadir esto como nueva tarea relacionada",
      "differentProject": "This task belongs to a different project.",
+      "differentNamespace": "Esta tarea pertenece a un proyecto diferente.",
      "noneYet": "Aún no hay tareas relacionadas.",
      "delete": "Eliminar Relación de Tarea",
      "deleteText1": "¿Está seguro que desea eliminar esta relación de la tarea?",
@ -718,17 +783,6 @@
        "copiedto": "Copiado A | Copiado A"
      }
    },
-    "reminder": {
-      "before": "{amount} {unit} before {type}",
-      "after": "{amount} {unit} after {type}",
-      "beforeShort": "before",
-      "afterShort": "after",
-      "onDueDate": "On the due date",
-      "onStartDate": "On the start date",
-      "onEndDate": "On the end date",
-      "custom": "Custom",
-      "dateAndTime": "Date and time"
-    },
    "repeat": {
      "everyDay": "Cada Día",
      "everyWeek": "Cada Semana",
@ -746,7 +800,8 @@
      "invalidAmount": "Por favor introduzca más de 0."
    },
    "quickAddMagic": {
-      "hint": "Use magic prefixes to define due dates, assignees and other task properties.",
+      "hint": "Puede usar Añadido Rápido Mágico",
+      "what": "¿Qué?",
      "title": "Añadido Rápido Mágico",
      "intro": "Al crear una tarea, puede utilizar palabras clave especiales para añadir directamente atributos a la tarea recién creada. Esto permite agregar atributos comúnmente usados en tareas mucho más rápido.",
      "multiple": "Puedes usar esto varias veces.",
@ -793,19 +848,19 @@
      "delete": {
        "header": "Delete the team",
        "text1": "Are you sure you want to delete this team and all of its members?",
-        "text2": "All team members will lose access to projects shared with this team. This CANNOT BE UNDONE!",
+        "text2": "All team members will lose access to projects and namespaces shared with this team. This CANNOT BE UNDONE!",
        "success": "El equipo fue eliminado con éxito."
      },
      "deleteUser": {
        "header": "Remove a user from the team",
        "text1": "Are you sure you want to remove this user from the team?",
-        "text2": "They will lose access to all projects this team has access to. This CANNOT BE UNDONE!",
+        "text2": "They will lose access to all projects and namespaces this team has access to. This CANNOT BE UNDONE!",
        "success": "El usuario fue quitado del equipo con éxito."
      },
      "leave": {
        "title": "Leave team",
        "text1": "Are you sure you want to leave this team?",
-        "text2": "You will lose access to all projects this team has access to. If you change your mind you'll need a team admin to add you again.",
+        "text2": "You will lose access to all projects and namespaces this team has access to. If you change your mind you'll need a team admin to add you again.",
        "success": "Has abandonado el equipo con éxito."
      }
    },
@ -839,10 +894,7 @@
      "color": "Cambia el color de esta tarea",
      "move": "Move this task to another project",
      "reminder": "Administrar recordatorios de esta tarea",
-      "description": "Editar la descripción de la tarea",
-      "delete": "Delete this task",
-      "priority": "Change the priority of this task",
-      "favorite": "Mark this task as favorite / unfavorite"
+      "description": "Editar la descripción de la tarea"
    },
    "project": {
      "title": "Project Views",
@ -855,9 +907,9 @@
      "title": "Secciones",
      "overview": "Ir a resumen",
      "upcoming": "Ir a tareas próximas",
+      "namespaces": "Navigate to namespaces & projects",
      "labels": "Ir a etiquetas",
-      "teams": "Ir a equipos",
-      "projects": "Navigate to projects"
+      "teams": "Ir a equipos"
    }
  },
  "update": {
@ -872,8 +924,7 @@
    "unarchive": "Desarchivar",
    "setBackground": "Establecer fondo",
    "share": "Compartir",
-    "newProject": "New project",
-    "createProject": "Create project"
+    "newProject": "New project"
  },
  "apiConfig": {
    "url": "URL de Vikunja",
@ -892,7 +943,7 @@
  "notification": {
    "title": "Notificaciones",
    "none": "No tienes notificaciones. ¡Que tengas un buen día!",
-    "explainer": "Notifications will appear here when actions projects or tasks you subscribed to happen."
+    "explainer": "Notifications will appear here when actions on namespaces, projects or tasks you subscribed to happen."
  },
  "quickActions": {
    "commands": "Commands",
@ -903,12 +954,14 @@
    "teams": "Teams",
    "newProject": "Enter the title of the new project…",
    "newTask": "Enter the title of the new task…",
+    "newNamespace": "Enter the title of the new namespace…",
    "newTeam": "Enter the name of the new team…",
    "createTask": "Create a task in the current project ({title})",
-    "createProject": "Create a project",
+    "createProject": "Create a project in the current namespace ({title})",
    "cmds": {
      "newTask": "New task",
      "newProject": "New project",
+      "newNamespace": "New namespace",
      "newTeam": "New team"
    }
  },
@ -964,9 +1017,16 @@
    "4017": "Comparador de filtro de tarea inválido.",
    "4018": "Concatenador de filtro de tarea inválido.",
    "4019": "Valor de filtro de tarea inválido.",
+    "5001": "El proyecto no existe.",
+    "5003": "No tiene acceso al proyecto especificado.",
+    "5006": "El nombre del proyecto no puede estar vacío.",
+    "5009": "Necesita tener acceso de lectura al proyecto para realizar esa acción.",
+    "5010": "Este equipo no tiene acceso a ese proyecto.",
+    "5011": "Este usuario ya tiene acceso a ese proyecto.",
+    "5012": "El proyecto está archivado y por lo tanto solo podrá acceder en modo solo lectura.",
    "6001": "El nombre del equipo no puede estar vacío.",
    "6002": "Este equipo no existe.",
-    "6004": "The team already has access to that project.",
+    "6004": "The team already has access to that namespace or project.",
    "6005": "El usuario ya es miembro de ese equipo.",
    "6006": "No se puede quitar al último miembro del equipo.",
    "6007": "The team does not have access to the project to perform that action.",
@ -992,16 +1052,5 @@
    "title": "Acerca de",
    "frontendVersion": "Frontend Version: {version}",
    "apiVersion": "Versión de la API: {version}"
-  },
-  "time": {
-    "units": {
-      "seconds": "second|seconds",
-      "minutes": "minute|minutes",
-      "hours": "hour|hours",
-      "days": "day|days",
-      "weeks": "week|weeks",
-      "months": "month|months",
-      "years": "year|years"
-    }
  }
-}
+}
--- a/src/i18n/lang/fr-FR.json
+++ b/src/i18n/lang/fr-FR.json
--- a/Show More
+++ b/Show More
 @ -1 +1 @@
 .16.0
 .15.0