Merge pull request #1312 from umami-software/dev

v1.34.0
2022-07-21 02:31:38 -07:00 · 2022-07-21 02:31:38 -07:00 · 16046a50a4
parent b290f95b85 358c725828
commit 16046a50a4
157 changed files with 2713 additions and 2118 deletions
--- a/.eslintrc.json
+++ b/.eslintrc.json
@ -16,7 +16,8 @@
    "react/display-name": "off",
    "react/react-in-jsx-scope": "off",
    "react/prop-types": "off",
-    "import/no-anonymous-default-export": "off"
+    "import/no-anonymous-default-export": "off",
+    "@next/next/no-img-element": "off"
  },
  "globals": {
    "React": "writable"
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -15,10 +15,6 @@ jobs:
    strategy:
      matrix:
        include:
-        - node-version: 12.x
-          db-type: postgresql
-        - node-version: 12.x
-          db-type: mysql
        - node-version: 14.x
          db-type: postgresql
        - node-version: 14.x
--- a/components/common/UpdateNotice.js
+++ b/components/common/UpdateNotice.js
@ -3,12 +3,12 @@ import { FormattedMessage } from 'react-intl';
 import ButtonLayout from 'components/layout/ButtonLayout';
 import useStore, { checkVersion } from 'store/version';
 import { setItem } from 'lib/web';
-import { VERSION_CHECK, VERSION_URL } from 'lib/constants';
+import { REPO_URL, VERSION_CHECK } from 'lib/constants';
 import Button from './Button';
 import styles from './UpdateNotice.module.css';

 export default function UpdateNotice() {
-  const { latest, checked, hasUpdate } = useStore();
+  const { latest, checked, hasUpdate, releaseUrl } = useStore();
  const [dismissed, setDismissed] = useState(false);

  const updateCheck = useCallback(() => {
@ -18,7 +18,7 @@ export default function UpdateNotice() {
  function handleViewClick() {
    updateCheck();
    setDismissed(true);
-    location.href = VERSION_URL;
+    location.href = releaseUrl || REPO_URL;
  }

  function handleDismissClick() {
--- a/components/layout/Footer.js
+++ b/components/layout/Footer.js
@ -4,7 +4,7 @@ import { FormattedMessage } from 'react-intl';
 import Link from 'components/common/Link';
 import styles from './Footer.module.css';
 import useStore from 'store/version';
-import { HOMEPAGE_URL, VERSION_URL } from 'lib/constants';
+import { HOMEPAGE_URL, REPO_URL } from 'lib/constants';

 export default function Footer() {
  const { current } = useStore();
@ -26,8 +26,11 @@ export default function Footer() {
        />
      </div>
      <div className={classNames(styles.version, 'col-12 col-md-4')}>
-        <Link href={VERSION_URL}>{`v${current}`}</Link>
+        <Link href={REPO_URL}>{`v${current}`}</Link>
      </div>
+      {!process.env.telemetryDisabled && (
+        <img src={`https://i.umami.is/a.png?v=${current}`} alt="" />
+      )}
    </footer>
  );
 }
--- a/components/metrics/FilterTags.js
+++ b/components/metrics/FilterTags.js
@ -2,6 +2,7 @@ import React from 'react';
 import classNames from 'classnames';
 import Button from 'components/common/Button';
 import Times from 'assets/times.svg';
+import { safeDecodeURI } from 'lib/url';
 import styles from './FilterTags.module.css';

 export default function FilterTags({ params, onClick }) {
@ -17,7 +18,7 @@ export default function FilterTags({ params, onClick }) {
        return (
          <div key={key} className={styles.tag}>
            <Button icon={<Times />} onClick={() => onClick(key)} variant="action" iconRight>
-              {`${key}: ${params[key]}`}
+              {`${key}: ${safeDecodeURI(params[key])}`}
            </Button>
          </div>
        );
--- a/components/metrics/PagesTable.js
+++ b/components/metrics/PagesTable.js
@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { FormattedMessage } from 'react-intl';
+import { useIntl, defineMessage } from 'react-intl';
 import FilterLink from 'components/common/FilterLink';
 import FilterButtons from 'components/common/FilterButtons';
 import { urlFilter } from 'lib/filters';
@ -8,15 +8,26 @@ import MetricsTable from './MetricsTable';
 export const FILTER_COMBINED = 0;
 export const FILTER_RAW = 1;

-export default function PagesTable({ websiteId, websiteDomain, showFilters, ...props }) {
+const messages = defineMessage({
+  combined: { id: 'metrics.filter.combined', defaultMessage: 'Combined' },
+  raw: { id: 'metrics.filter.raw', defaultMessage: 'Raw' },
+  pages: { id: 'metrics.pages', defaultMessage: 'Pages' },
+  views: { id: 'metrics.views', defaultMessage: 'View' },
+});
+
+export default function PagesTable({ websiteId, showFilters, ...props }) {
  const [filter, setFilter] = useState(FILTER_COMBINED);
+  const { formatMessage } = useIntl();

  const buttons = [
    {
-      label: <FormattedMessage id="metrics.filter.combined" defaultMessage="Combined" />,
+      label: formatMessage(messages.combined),
      value: FILTER_COMBINED,
    },
-    { label: <FormattedMessage id="metrics.filter.raw" defaultMessage="Raw" />, value: FILTER_RAW },
+    {
+      label: formatMessage(messages.raw),
+      value: FILTER_RAW,
+    },
  ];

  const renderLink = ({ x: url }) => {
@ -27,12 +38,11 @@ export default function PagesTable({ websiteId, websiteDomain, showFilters, ...p
    <>
      {showFilters && <FilterButtons buttons={buttons} selected={filter} onClick={setFilter} />}
      <MetricsTable
-        title={<FormattedMessage id="metrics.pages" defaultMessage="Pages" />}
+        title={formatMessage(messages.pages)}
        type="url"
-        metric={<FormattedMessage id="metrics.views" defaultMessage="Views" />}
+        metric={formatMessage(messages.views)}
        websiteId={websiteId}
-        dataFilter={urlFilter}
-        filterOptions={{ domain: websiteDomain, raw: filter === FILTER_RAW }}
+        dataFilter={filter !== FILTER_RAW ? urlFilter : null}
        renderLabel={renderLink}
        {...props}
      />
--- a/components/metrics/ReferrersTable.js
+++ b/components/metrics/ReferrersTable.js
@ -1,31 +1,40 @@
 import React, { useState } from 'react';
-import { FormattedMessage } from 'react-intl';
+import { useIntl, defineMessages } from 'react-intl';
 import MetricsTable from './MetricsTable';
 import FilterButtons from 'components/common/FilterButtons';
 import FilterLink from 'components/common/FilterLink';
 import { refFilter } from 'lib/filters';

-export const FILTER_DOMAIN_ONLY = 0;
-export const FILTER_COMBINED = 1;
-export const FILTER_RAW = 2;
+export const FILTER_COMBINED = 0;
+export const FILTER_RAW = 1;

-export default function ReferrersTable({ websiteId, websiteDomain, showFilters, ...props }) {
+const messages = defineMessages({
+  combined: { id: 'metrics.filter.combined', defaultMessage: 'Combined' },
+  raw: { id: 'metrics.filter.raw', defaultMessage: 'Raw' },
+  referrers: { id: 'metrics.referrers', defaultMessage: 'Referrers' },
+  views: { id: 'metrics.views', defaultMessage: 'Views' },
+  none: { id: 'label.none', defaultMessage: 'None' },
+});
+
+export default function ReferrersTable({ websiteId, showFilters, ...props }) {
  const [filter, setFilter] = useState(FILTER_COMBINED);
+  const { formatMessage } = useIntl();
+  const none = formatMessage(messages.none);

  const buttons = [
    {
-      label: <FormattedMessage id="metrics.filter.domain-only" defaultMessage="Domain only" />,
-      value: FILTER_DOMAIN_ONLY,
-    },
-    {
-      label: <FormattedMessage id="metrics.filter.combined" defaultMessage="Combined" />,
+      label: formatMessage(messages.combined),
      value: FILTER_COMBINED,
    },
-    { label: <FormattedMessage id="metrics.filter.raw" defaultMessage="Raw" />, value: FILTER_RAW },
+    { label: formatMessage(messages.raw), value: FILTER_RAW },
  ];

  const renderLink = ({ w: link, x: referrer }) => {
-    return <FilterLink id="referrer" value={referrer} externalUrl={link} />;
+    return referrer ? (
+      <FilterLink id="referrer" value={referrer} externalUrl={link} />
+    ) : (
+      `(${none})`
+    );
  };

  return (
@ -33,16 +42,11 @@ export default function ReferrersTable({ websiteId, websiteDomain, showFilters,
      {showFilters && <FilterButtons buttons={buttons} selected={filter} onClick={setFilter} />}
      <MetricsTable
        {...props}
-        title={<FormattedMessage id="metrics.referrers" defaultMessage="Referrers" />}
+        title={formatMessage(messages.referrers)}
        type="referrer"
-        metric={<FormattedMessage id="metrics.views" defaultMessage="Views" />}
+        metric={formatMessage(messages.views)}
        websiteId={websiteId}
-        dataFilter={refFilter}
-        filterOptions={{
-          domain: websiteDomain,
-          domainOnly: filter === FILTER_DOMAIN_ONLY,
-          raw: filter === FILTER_RAW,
-        }}
+        dataFilter={filter !== FILTER_RAW ? refFilter : null}
        renderLabel={renderLink}
      />
    </>
--- a/components/metrics/ScreenTable.js
+++ b/components/metrics/ScreenTable.js
@ -0,0 +1,15 @@
+import React from 'react';
+import MetricsTable from './MetricsTable';
+import { FormattedMessage } from 'react-intl';
+
+export default function ScreenTable({ websiteId, ...props }) {
+  return (
+    <MetricsTable
+      {...props}
+      title={<FormattedMessage id="metrics.screens" defaultMessage="Screen" />}
+      type="screen"
+      metric={<FormattedMessage id="metrics.visitors" defaultMessage="Visitors" />}
+      websiteId={websiteId}
+    />
+  );
+}
--- a/components/pages/WebsiteDetails.js
+++ b/components/pages/WebsiteDetails.js
@ -22,6 +22,7 @@ import useFetch from 'hooks/useFetch';
 import usePageQuery from 'hooks/usePageQuery';
 import { DEFAULT_ANIMATION_DURATION } from 'lib/constants';
 import styles from './WebsiteDetails.module.css';
+import ScreenTable from 'components/metrics/ScreenTable';

 const views = {
  url: PagesTable,
@ -29,6 +30,7 @@ const views = {
  browser: BrowsersTable,
  os: OSTable,
  device: DevicesTable,
+  screen: ScreenTable,
  country: CountriesTable,
  language: LanguagesTable,
  event: EventsTable,
@ -64,6 +66,10 @@ export default function WebsiteDetails({ websiteId }) {
      label: <FormattedMessage id="metrics.referrers" defaultMessage="Referrers" />,
      value: resolve({ view: 'referrer' }),
    },
+    {
+      label: <FormattedMessage id="metrics.screens" defaultMessage="Screens" />,
+      value: resolve({ view: 'screen' }),
+    },
    {
      label: <FormattedMessage id="metrics.browsers" defaultMessage="Browsers" />,
      value: resolve({ view: 'browser' }),
--- a/db/mysql/migrations/01_init/migration.sql
+++ b/db/mysql/migrations/01_init/migration.sql
@ -9,7 +9,7 @@ CREATE TABLE `account` (

    UNIQUE INDEX `username`(`username`),
    PRIMARY KEY (`user_id`)
-) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;

 -- CreateTable
 CREATE TABLE `event` (
@ -25,7 +25,7 @@ CREATE TABLE `event` (
    INDEX `event_session_id_idx`(`session_id`),
    INDEX `event_website_id_idx`(`website_id`),
    PRIMARY KEY (`event_id`)
-) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;

 -- CreateTable
 CREATE TABLE `pageview` (
@ -42,7 +42,7 @@ CREATE TABLE `pageview` (
    INDEX `pageview_website_id_idx`(`website_id`),
    INDEX `pageview_website_id_session_id_created_at_idx`(`website_id`, `session_id`, `created_at`),
    PRIMARY KEY (`view_id`)
-) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;

 -- CreateTable
 CREATE TABLE `session` (
@ -62,7 +62,7 @@ CREATE TABLE `session` (
    INDEX `session_created_at_idx`(`created_at`),
    INDEX `session_website_id_idx`(`website_id`),
    PRIMARY KEY (`session_id`)
-) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;

 -- CreateTable
 CREATE TABLE `website` (
@ -78,7 +78,7 @@ CREATE TABLE `website` (
    UNIQUE INDEX `share_id`(`share_id`),
    INDEX `website_user_id_idx`(`user_id`),
    PRIMARY KEY (`website_id`)
-) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;

 -- AddForeignKey
 ALTER TABLE `event` ADD CONSTRAINT `event_ibfk_2` FOREIGN KEY (`session_id`) REFERENCES `session`(`session_id`) ON DELETE CASCADE ON UPDATE NO ACTION;
--- a/db/postgresql/schema.prisma
+++ b/db/postgresql/schema.prisma
@ -9,7 +9,7 @@ datasource db {

 model account {
  user_id    Int       @id @default(autoincrement())
-  username   String    @unique(map: "account.username_unique") @db.VarChar(255)
+  username   String    @unique @db.VarChar(255)
  password   String    @db.VarChar(60)
  is_admin   Boolean   @default(false)
  created_at DateTime? @default(now()) @db.Timestamptz(6)
@ -25,8 +25,8 @@ model event {
  url         String    @db.VarChar(500)
  event_type  String    @db.VarChar(50)
  event_value String    @db.VarChar(50)
-  session     session   @relation(fields: [session_id], references: [session_id], onDelete: Cascade)
-  website     website   @relation(fields: [website_id], references: [website_id], onDelete: Cascade)
+  session     session   @relation(fields: [session_id], references: [session_id], onDelete: Cascade, onUpdate: NoAction)
+  website     website   @relation(fields: [website_id], references: [website_id], onDelete: Cascade, onUpdate: NoAction)

  @@index([created_at])
  @@index([session_id])
@ -40,8 +40,8 @@ model pageview {
  created_at DateTime? @default(now()) @db.Timestamptz(6)
  url        String    @db.VarChar(500)
  referrer   String?   @db.VarChar(500)
-  session    session   @relation(fields: [session_id], references: [session_id], onDelete: Cascade)
-  website    website   @relation(fields: [website_id], references: [website_id], onDelete: Cascade)
+  session    session   @relation(fields: [session_id], references: [session_id], onDelete: Cascade, onUpdate: NoAction)
+  website    website   @relation(fields: [website_id], references: [website_id], onDelete: Cascade, onUpdate: NoAction)

  @@index([created_at])
  @@index([session_id])
@ -52,17 +52,17 @@ model pageview {

 model session {
  session_id   Int        @id @default(autoincrement())
-  session_uuid String     @unique(map: "session.session_uuid_unique") @db.Uuid
+  session_uuid String     @unique @db.Uuid
  website_id   Int
  created_at   DateTime?  @default(now()) @db.Timestamptz(6)
  hostname     String?    @db.VarChar(100)
  browser      String?    @db.VarChar(20)
  os           String?    @db.VarChar(20)
-  device       String?    @db.VarChar(20)
  screen       String?    @db.VarChar(11)
  language     String?    @db.VarChar(35)
  country      String?    @db.Char(2)
-  website      website    @relation(fields: [website_id], references: [website_id], onDelete: Cascade)
+  device       String?    @db.VarChar(20)
+  website      website    @relation(fields: [website_id], references: [website_id], onDelete: Cascade, onUpdate: NoAction)
  event        event[]
  pageview     pageview[]

@ -72,16 +72,16 @@ model session {

 model website {
  website_id   Int        @id @default(autoincrement())
-  website_uuid String     @unique(map: "website.website_uuid_unique") @db.Uuid
-  user_id      Int
+  website_uuid String     @unique @db.Uuid
  name         String     @db.VarChar(100)
-  domain       String?    @db.VarChar(500)
-  share_id     String?    @unique(map: "website.share_id_unique") @db.VarChar(64)
  created_at   DateTime?  @default(now()) @db.Timestamptz(6)
-  account      account    @relation(fields: [user_id], references: [user_id], onDelete: Cascade)
+  user_id      Int
+  domain       String?    @db.VarChar(500)
+  share_id     String?    @unique(map: "website_share_id_idx") @db.VarChar(64)
+  account      account    @relation(fields: [user_id], references: [user_id], onDelete: NoAction, onUpdate: NoAction)
  event        event[]
  pageview     pageview[]
  session      session[]

  @@index([user_id])
-}
+}
--- a/lang/ar-SA.json
+++ b/lang/ar-SA.json
@ -37,6 +37,7 @@
  "label.more": "المزيد",
  "label.name": "الإسم",
  "label.new-password": "كلمة مرور جديدة",
+  "label.none": "None",
  "label.owner": "Owner",
  "label.password": "كلمة المرور",
  "label.passwords-dont-match": "كلمة المرور غير متطابقة",
@ -97,13 +98,13 @@
  "metrics.devices": "الأجهزة",
  "metrics.events": "الأحداث",
  "metrics.filter.combined": "مجمعة",
-  "metrics.filter.domain-only": "نطاق فقط",
  "metrics.filter.raw": "مفصلة",
  "metrics.languages": "Languages",
  "metrics.operating-systems": "نظام التشغيل",
  "metrics.page-views": "مشاهدات الصفحة",
  "metrics.pages": "الصفحات",
  "metrics.referrers": "التحويلات",
+  "metrics.screens": "Screens",
  "metrics.unique-visitors": "زائرون فريدون",
  "metrics.views": "مشاهدات",
  "metrics.visitors": "زوار"
--- a/lang/ca-ES.json
+++ b/lang/ca-ES.json
@ -37,6 +37,7 @@
  "label.more": "Més",
  "label.name": "Nom",
  "label.new-password": "Contrasenya nova",
+  "label.none": "None",
  "label.owner": "Propietari",
  "label.password": "Contrasenya",
  "label.passwords-dont-match": "Les contrasenyes no coincideixen",
@ -97,13 +98,13 @@
  "metrics.devices": "Dispositius",
  "metrics.events": "Esdeveniments",
  "metrics.filter.combined": "Combinat",
-  "metrics.filter.domain-only": "Només domini",
  "metrics.filter.raw": "En cru",
  "metrics.languages": "Llengües",
  "metrics.operating-systems": "Sistemes operatius",
  "metrics.page-views": "Pàgines vistes",
  "metrics.pages": "Pàgines",
  "metrics.referrers": "Referents",
+  "metrics.screens": "Screens",
  "metrics.unique-visitors": "Visitants únics",
  "metrics.views": "Vistes",
  "metrics.visitors": "Visitants"
--- a/lang/cs-CZ.json
+++ b/lang/cs-CZ.json
@ -37,6 +37,7 @@
  "label.more": "Více",
  "label.name": "Jméno",
  "label.new-password": "Nové heslo",
+  "label.none": "None",
  "label.owner": "Owner",
  "label.password": "Heslo",
  "label.passwords-dont-match": "Hesla se neschodují",
@ -97,13 +98,13 @@
  "metrics.devices": "Zařízení",
  "metrics.events": "Události",
  "metrics.filter.combined": "Kombinace",
-  "metrics.filter.domain-only": "Domény",
  "metrics.filter.raw": "Nezpracované",
  "metrics.languages": "Languages",
  "metrics.operating-systems": "Operační systém",
  "metrics.page-views": "Zobrazení stránek",
  "metrics.pages": "Stránky",
  "metrics.referrers": "Odkazy",
+  "metrics.screens": "Screens",
  "metrics.unique-visitors": "Jedinečné návštěvy",
  "metrics.views": "Zobrazení",
  "metrics.visitors": "Návštěvy"
--- a/lang/da-DK.json
+++ b/lang/da-DK.json
@ -4,9 +4,9 @@
  "label.add-website": "Tilføj hjemmeside",
  "label.administrator": "Administrator",
  "label.all": "Alle",
-  "label.all-events": "All events",
-  "label.all-time": "All time",
-  "label.all-websites": "Alle websites",
+  "label.all-events": "Alle hændelser",
+  "label.all-time": "Altid",
+  "label.all-websites": "Alle hjemmesider",
  "label.back": "Tilbage",
  "label.cancel": "Afvis",
  "label.change-password": "Skift adgangskode",
@ -28,30 +28,31 @@
  "label.enable-share-url": "Aktivér delings-URL",
  "label.invalid": "Ugyldig",
  "label.invalid-domain": "Ugyldigt domæne",
-  "label.language": "Language",
+  "label.language": "Sprog",
  "label.last-days": "Sidste {x} dage",
  "label.last-hours": "Sidste {x} timer",
-  "label.logged-in-as": "Loggede ind som {username}",
+  "label.logged-in-as": "Logget ind som {username}",
  "label.login": "Log ind",
  "label.logout": "Log ud",
  "label.more": "Mere",
  "label.name": "Navn",
  "label.new-password": "Ny adgangskode",
-  "label.owner": "Owner",
+  "label.none": "None",
+  "label.owner": "Ejer",
  "label.password": "Adgangskode",
-  "label.passwords-dont-match": "Adgangskoder matcher ikke",
+  "label.passwords-dont-match": "Adgangskoderne matcher ikke",
  "label.profile": "Profil",
  "label.realtime": "Realtid",
  "label.realtime-logs": "Realtid logs",
  "label.refresh": "Opdater",
  "label.required": "Påkrævet",
-  "label.reset": "Reset",
-  "label.reset-website": "Reset statistics",
+  "label.reset": "Nulstil",
+  "label.reset-website": "Nulstil statistikker",
  "label.save": "Gem",
  "label.settings": "Indstillinger",
  "label.share-url": "Del URL",
  "label.single-day": "Enkelt dag",
-  "label.theme": "Theme",
+  "label.theme": "Tema",
  "label.this-month": "Denne måned",
  "label.this-week": "Denne uge",
  "label.this-year": "Dette år",
@ -64,7 +65,7 @@
  "label.websites": "Hjemmesider",
  "message.active-users": "{x} nuværende {x, plural, one {bruger} other {brugere}}",
  "message.confirm-delete": "Er du sikker på at du vil slette {target}?",
-  "message.confirm-reset": "Are your sure you want to reset {target}'s statistics?",
+  "message.confirm-reset": "Er du sikker på at du ville nulstille {target}'s statistikker?",
  "message.copied": "Kopieret!",
  "message.delete-warning": "Alle tilknyttede data slettes også.",
  "message.failure": "Noget gik galt.",
@ -75,14 +76,14 @@
  "message.log.visitor": "Besøgende fra {country} bruger {browser} på {os} {device}",
  "message.new-version-available": "Ny udgave af Umami {version} er tilgængelig!",
  "message.no-data-available": "Ingen data tilgængelig.",
-  "message.no-websites-configured": "Du har ikke konfigureret nogen websteder.",
+  "message.no-websites-configured": "Du har ikke konfigureret nogen hjemmesider.",
  "message.page-not-found": "Side ikke fundet.",
  "message.powered-by": "Drevet af {name}",
-  "message.reset-warning": "All statistics for this website will be deleted, but your tracking code will remain intact.",
+  "message.reset-warning": "Alle statistikker for denne hjemmeside ville blive slettet, men sporingskode ville forblive intakt.",
  "message.save-success": "Gemt!",
-  "message.share-url": "Dette er den offentligt delings-URL til {target}.",
-  "message.toggle-charts": "Toggle charts",
-  "message.track-stats": "For at spore statistik for {target} skal du placere følgende kode i {head} sektionen på dit websted.",
+  "message.share-url": "Dette er den offentlige delings-URL til {target}.",
+  "message.toggle-charts": "Ændre graf",
+  "message.track-stats": "For at spore statistik for {target} skal du placere følgende kode i {head} sektionen på din hjemmeside.",
  "message.type-delete": "Skriv {delete} i boksen nedenfor, for at bekræfte.",
  "message.type-reset": "Skriv {reset} i boksen nedenfor, for at bekræfte.",
  "metrics.actions": "Handlinger",
@ -97,13 +98,13 @@
  "metrics.devices": "Enheder",
  "metrics.events": "Hændelser",
  "metrics.filter.combined": "Kombineret",
-  "metrics.filter.domain-only": "Kun domæne",
  "metrics.filter.raw": "Rå",
-  "metrics.languages": "Languages",
+  "metrics.languages": "Sprog",
  "metrics.operating-systems": "Operativsystemer",
  "metrics.page-views": "Sidevisninger",
  "metrics.pages": "Sider",
  "metrics.referrers": "Henvisninger",
+  "metrics.screens": "Screens",
  "metrics.unique-visitors": "Unikke besøgende",
  "metrics.views": "Visninger",
  "metrics.visitors": "Besøgende"
--- a/lang/de-DE.json
+++ b/lang/de-DE.json
@ -37,6 +37,7 @@
  "label.more": "Mehr",
  "label.name": "Name",
  "label.new-password": "Neues Passwort",
+  "label.none": "None",
  "label.owner": "Besitzer",
  "label.password": "Passwort",
  "label.passwords-dont-match": "Passwörter stimmen nicht überein",
@ -97,13 +98,13 @@
  "metrics.devices": "Geräte",
  "metrics.events": "Ereignisse",
  "metrics.filter.combined": "Kombiniert",
-  "metrics.filter.domain-only": "Nur diese Domain",
  "metrics.filter.raw": "Rohdaten",
  "metrics.languages": "Sprachen",
  "metrics.operating-systems": "Betriebssysteme",
  "metrics.page-views": "Seitenaufrufe",
  "metrics.pages": "Seiten",
  "metrics.referrers": "Referrer",
+  "metrics.screens": "Bildschirmauflösungen",
  "metrics.unique-visitors": "Eindeutige Besucher",
  "metrics.views": "Aufrufe",
  "metrics.visitors": "Besucher"
--- a/lang/el-GR.json
+++ b/lang/el-GR.json
@ -37,6 +37,7 @@
  "label.more": "Περισσότερα",
  "label.name": "Όνομα",
  "label.new-password": "Νέος κωδικός",
+  "label.none": "None",
  "label.owner": "Owner",
  "label.password": "Κωδικός",
  "label.passwords-dont-match": "Οι κωδικοί πρόσβασης δεν ταιριάζουν",
@ -97,13 +98,13 @@
  "metrics.devices": "Συσκευές",
  "metrics.events": "Γεγονότα",
  "metrics.filter.combined": "Σε συνδυασμό",
-  "metrics.filter.domain-only": "Μόνο τομέας",
  "metrics.filter.raw": "Ακατέργαστο",
  "metrics.languages": "Languages",
  "metrics.operating-systems": "Λειτουργικά συστήματα",
  "metrics.page-views": "Προβολές σελίδας",
  "metrics.pages": "Σελίδες",
  "metrics.referrers": "Παραπομπές",
+  "metrics.screens": "Screens",
  "metrics.unique-visitors": "Μοναδικοί επισκέπτες",
  "metrics.views": "Προβολές",
  "metrics.visitors": "Επισκέπτες"
--- a/lang/en-GB.json
+++ b/lang/en-GB.json
@ -37,6 +37,7 @@
  "label.more": "More",
  "label.name": "Name",
  "label.new-password": "New password",
+  "label.none": "None",
  "label.owner": "Owner",
  "label.password": "Password",
  "label.passwords-dont-match": "Passwords don't match",
@ -97,13 +98,13 @@
  "metrics.devices": "Devices",
  "metrics.events": "Events",
  "metrics.filter.combined": "Combined",
-  "metrics.filter.domain-only": "Domain only",
  "metrics.filter.raw": "Raw",
  "metrics.languages": "Languages",
  "metrics.operating-systems": "Operating systems",
  "metrics.page-views": "Page views",
  "metrics.pages": "Pages",
  "metrics.referrers": "Referrers",
+  "metrics.screens": "Screens",
  "metrics.unique-visitors": "Unique visitors",
  "metrics.views": "Views",
  "metrics.visitors": "Visitors"
--- a/lang/en-US.json
+++ b/lang/en-US.json
@ -37,6 +37,7 @@
  "label.more": "More",
  "label.name": "Name",
  "label.new-password": "New password",
+  "label.none": "None",
  "label.owner": "Owner",
  "label.password": "Password",
  "label.passwords-dont-match": "Passwords don't match",
@ -97,13 +98,13 @@
  "metrics.devices": "Devices",
  "metrics.events": "Events",
  "metrics.filter.combined": "Combined",
-  "metrics.filter.domain-only": "Domain only",
  "metrics.filter.raw": "Raw",
  "metrics.languages": "Languages",
  "metrics.operating-systems": "Operating systems",
  "metrics.page-views": "Page views",
  "metrics.pages": "Pages",
  "metrics.referrers": "Referrers",
+  "metrics.screens": "Screens",
  "metrics.unique-visitors": "Unique visitors",
  "metrics.views": "Views",
  "metrics.visitors": "Visitors"
--- a/lang/es-MX.json
+++ b/lang/es-MX.json
@ -37,6 +37,7 @@
  "label.more": "Más",
  "label.name": "Nombre",
  "label.new-password": "Nueva contraseña",
+  "label.none": "None",
  "label.owner": "Propietario",
  "label.password": "Contraseña",
  "label.passwords-dont-match": "Las contraseñas no coinciden",
@ -97,13 +98,13 @@
  "metrics.devices": "Dispositivos",
  "metrics.events": "Eventos",
  "metrics.filter.combined": "Combinado",
-  "metrics.filter.domain-only": "Únicamente dominio",
  "metrics.filter.raw": "Personalizado",
  "metrics.languages": "Idiomas",
  "metrics.operating-systems": "Sistemas operativos",
  "metrics.page-views": "Vistas",
  "metrics.pages": "Páginas",
  "metrics.referrers": "Referentes",
+  "metrics.screens": "Screens",
  "metrics.unique-visitors": "Visitantes únicos",
  "metrics.views": "Vistas",
  "metrics.visitors": "Visitantes"
--- a/lang/fa-IR.json
+++ b/lang/fa-IR.json
@ -37,6 +37,7 @@
  "label.more": "بیشتر",
  "label.name": "نام",
  "label.new-password": "رمز جدید",
+  "label.none": "None",
  "label.owner": "ایجاد شده توسط",
  "label.password": "رمز",
  "label.passwords-dont-match": "رمزها یکسان نیستند",
@ -97,13 +98,13 @@
  "metrics.devices": "دستگاه‌ها",
  "metrics.events": "رویدادها",
  "metrics.filter.combined": "ترکیب شده",
-  "metrics.filter.domain-only": "فقط دامنه",
  "metrics.filter.raw": "خام",
  "metrics.languages": "زبان‌ها",
  "metrics.operating-systems": "سیستم‌عامل‌ها",
  "metrics.page-views": "بازدید صفحه",
  "metrics.pages": "صفحه‌ها",
  "metrics.referrers": "ارجاع دهندگان",
+  "metrics.screens": "Screens",
  "metrics.unique-visitors": "بازدیدکننده‌های یکتا",
  "metrics.views": "بازدید",
  "metrics.visitors": "بازدیدکننده"
--- a/lang/fi-FI.json
+++ b/lang/fi-FI.json
@ -37,6 +37,7 @@
  "label.more": "Lisää",
  "label.name": "Nimi",
  "label.new-password": "Uusi salasana",
+  "label.none": "None",
  "label.owner": "Omistaja",
  "label.password": "Salasana",
  "label.passwords-dont-match": "Salasanat eivät täsmää",
@ -97,13 +98,13 @@
  "metrics.devices": "Laitteet",
  "metrics.events": "Tapahtumat",
  "metrics.filter.combined": "Yhdistetty",
-  "metrics.filter.domain-only": "Vain verkkotunnus",
  "metrics.filter.raw": "Käsittelemätön",
  "metrics.languages": "Kielet",
  "metrics.operating-systems": "Käyttöjärjestelmät",
  "metrics.page-views": "Sivun näyttökerrat",
  "metrics.pages": "Sivut",
  "metrics.referrers": "Viittaajat",
+  "metrics.screens": "Screens",
  "metrics.unique-visitors": "Yksittäiset kävijät",
  "metrics.views": "Näyttökerrat",
  "metrics.visitors": "Vierailijat"
--- a/lang/fo-FO.json
+++ b/lang/fo-FO.json
@ -37,6 +37,7 @@
  "label.more": "Meira",
  "label.name": "Navn",
  "label.new-password": "Nýtt loyniorð",
+  "label.none": "None",
  "label.owner": "Owner",
  "label.password": "Loyniorð",
  "label.passwords-dont-match": "Loyniorðini eru ikki eins",
@ -97,13 +98,13 @@
  "metrics.devices": "Tóleindir",
  "metrics.events": "Hendingar/tiltøk",
  "metrics.filter.combined": "Samansett",
-  "metrics.filter.domain-only": "Bara økisnavn",
  "metrics.filter.raw": "Óviðgjørt",
  "metrics.languages": "Languages",
  "metrics.operating-systems": "Stýrikervir",
  "metrics.page-views": "Opnaðar síðir",
  "metrics.pages": "Síðir",
  "metrics.referrers": "Framsendingar",
+  "metrics.screens": "Screens",
  "metrics.unique-visitors": "Einsýna vitjanir",
  "metrics.views": "Sýningar",
  "metrics.visitors": "Vitjandi"
--- a/lang/fr-FR.json
+++ b/lang/fr-FR.json
@ -37,6 +37,7 @@
  "label.more": "Plus",
  "label.name": "Nom",
  "label.new-password": "Nouveau mot de passe",
+  "label.none": "None",
  "label.owner": "Propriétaire",
  "label.password": "Mot de passe",
  "label.passwords-dont-match": "Les mots de passe ne correspondent pas",
@ -97,13 +98,13 @@
  "metrics.devices": "Appareils",
  "metrics.events": "Événements",
  "metrics.filter.combined": "Combiné",
-  "metrics.filter.domain-only": "Domaine uniquement",
  "metrics.filter.raw": "Brut",
  "metrics.languages": "Langages",
  "metrics.operating-systems": "Systèmes d'exploitation",
  "metrics.page-views": "Pages vues",
  "metrics.pages": "Pages",
  "metrics.referrers": "Sources",
+  "metrics.screens": "Screens",
  "metrics.unique-visitors": "Visiteurs uniques",
  "metrics.views": "Vues",
  "metrics.visitors": "Visiteurs"
--- a/lang/ga-ES.json
+++ b/lang/ga-ES.json
@ -37,6 +37,7 @@
  "label.more": "Máis",
  "label.name": "Nome",
  "label.new-password": "Novo contrasinal",
+  "label.none": "None",
  "label.owner": "Dona",
  "label.password": "Contrasinal",
  "label.passwords-dont-match": "Non concordan os contrasinais",
@ -97,13 +98,13 @@
  "metrics.devices": "Dispositivos",
  "metrics.events": "Eventos",
  "metrics.filter.combined": "Combinado",
-  "metrics.filter.domain-only": "Só dominio",
  "metrics.filter.raw": "Raw",
  "metrics.languages": "Idiomas",
  "metrics.operating-systems": "Sistemas operativos",
  "metrics.page-views": "Vistas de páxinas",
  "metrics.pages": "Páxinas",
  "metrics.referrers": "Orixes",
+  "metrics.screens": "Screens",
  "metrics.unique-visitors": "Visitas únicas",
  "metrics.views": "Visualizacións",
  "metrics.visitors": "Visitantes"
--- a/lang/he-IL.json
+++ b/lang/he-IL.json
@ -37,6 +37,7 @@
  "label.more": "עוד",
  "label.name": "שם",
  "label.new-password": "סיסמה חדשה",
+  "label.none": "None",
  "label.owner": "Owner",
  "label.password": "סיסמה",
  "label.passwords-dont-match": "סיסמאות לא תואמות",
@ -97,13 +98,13 @@
  "metrics.devices": "מכשירים",
  "metrics.events": "אירועים",
  "metrics.filter.combined": "משותף",
-  "metrics.filter.domain-only": "דומיין בלבד",
  "metrics.filter.raw": "גולמי",
  "metrics.languages": "Languages",
  "metrics.operating-systems": "מערכות הפעלה",
  "metrics.page-views": "צפיות בדפים",
  "metrics.pages": "דפים",
  "metrics.referrers": "מפנים",
+  "metrics.screens": "Screens",
  "metrics.unique-visitors": "מבקרים ייחודיים",
  "metrics.views": "צפיות",
  "metrics.visitors": "מבקרים"
--- a/lang/hi-IN.json
+++ b/lang/hi-IN.json
@ -37,6 +37,7 @@
  "label.more": "और",
  "label.name": "नाम",
  "label.new-password": "नया पासवर्ड",
+  "label.none": "None",
  "label.owner": "Owner",
  "label.password": "पासवर्ड",
  "label.passwords-dont-match": "पासवर्ड मेल नहीं खाते",
@ -97,13 +98,13 @@
  "metrics.devices": "उपकरण",
  "metrics.events": "स्पर्धाएँ",
  "metrics.filter.combined": "संयुक्त",
-  "metrics.filter.domain-only": "केवल डोमेन",
  "metrics.filter.raw": "रॉ",
  "metrics.languages": "Languages",
  "metrics.operating-systems": "ऑपरेटिंग सिस्टम",
  "metrics.page-views": "पृष्ठ दृश्य",
  "metrics.pages": "पृष्ठों",
  "metrics.referrers": "सन्दर्भदाता",
+  "metrics.screens": "Screens",
  "metrics.unique-visitors": "अद्वितीय आगंतुकों",
  "metrics.views": "दृश्य",
  "metrics.visitors": "आगंतुकों"
--- a/lang/hu-HU.json
+++ b/lang/hu-HU.json
@ -37,6 +37,7 @@
  "label.more": "Bővebben",
  "label.name": "Név",
  "label.new-password": "Új jelszó",
+  "label.none": "None",
  "label.owner": "Owner",
  "label.password": "Jelszó",
  "label.passwords-dont-match": "A jelszavak nem egyeznek",
@ -97,13 +98,13 @@
  "metrics.devices": "Eszközök",
  "metrics.events": "Események",
  "metrics.filter.combined": "Összevont",
-  "metrics.filter.domain-only": "Csak domain",
  "metrics.filter.raw": "Nyers",
  "metrics.languages": "Languages",
  "metrics.operating-systems": "Operációs rendszerek",
  "metrics.page-views": "Oldalmegtekintések",
  "metrics.pages": "Oldalak",
  "metrics.referrers": "Hivatkozók",
+  "metrics.screens": "Screens",
  "metrics.unique-visitors": "Egyedi látogatók",
  "metrics.views": "Megtekintések",
  "metrics.visitors": "Látogatók"
--- a/lang/id-ID.json
+++ b/lang/id-ID.json
@ -37,6 +37,7 @@
  "label.more": "Lebih banyak",
  "label.name": "Nama",
  "label.new-password": "Kata sandi baru",
+  "label.none": "None",
  "label.owner": "Owner",
  "label.password": "Kata sandi",
  "label.passwords-dont-match": "Kata sandi tidak cocok",
@ -97,13 +98,13 @@
  "metrics.devices": "Perangkat",
  "metrics.events": "Perihal",
  "metrics.filter.combined": "Gabungan",
-  "metrics.filter.domain-only": "Hanya domain",
  "metrics.filter.raw": "Mentah",
  "metrics.languages": "Languages",
  "metrics.operating-systems": "Sistem Operasi",
  "metrics.page-views": "Tampilan halaman",
  "metrics.pages": "Halaman",
  "metrics.referrers": "Perujuk",
+  "metrics.screens": "Screens",
  "metrics.unique-visitors": "Pengunjung unik",
  "metrics.views": "Tampilan",
  "metrics.visitors": "Pengunjung"
--- a/lang/it-IT.json
+++ b/lang/it-IT.json
@ -37,6 +37,7 @@
  "label.more": "Dettagli",
  "label.name": "Nome",
  "label.new-password": "Nuova password",
+  "label.none": "None",
  "label.owner": "Proprietario",
  "label.password": "Password",
  "label.passwords-dont-match": "Le password non corrispondono",
@ -97,13 +98,13 @@
  "metrics.devices": "Dispositivi",
  "metrics.events": "Eventi",
  "metrics.filter.combined": "Aggregati",
-  "metrics.filter.domain-only": "Solo dominio",
  "metrics.filter.raw": "Raw",
  "metrics.languages": "Lingue",
  "metrics.operating-systems": "Sistemi operativi",
  "metrics.page-views": "Visualizzazioni di pagina",
  "metrics.pages": "Pagine",
  "metrics.referrers": "Referrers",
+  "metrics.screens": "Screens",
  "metrics.unique-visitors": "Visitatori unici",
  "metrics.views": "Visualizzazioni",
  "metrics.visitors": "Visitatori"
--- a/lang/ja-JP.json
+++ b/lang/ja-JP.json
@ -37,6 +37,7 @@
  "label.more": "さらに表示",
  "label.name": "名前",
  "label.new-password": "新しいパスワード",
+  "label.none": "None",
  "label.owner": "Owner",
  "label.password": "パスワード",
  "label.passwords-dont-match": "パスワードが一致しません",
@ -97,13 +98,13 @@
  "metrics.devices": "デバイス",
  "metrics.events": "イベント",
  "metrics.filter.combined": "パスまで",
-  "metrics.filter.domain-only": "ドメインのみ",
  "metrics.filter.raw": "すべて表示",
  "metrics.languages": "Languages",
  "metrics.operating-systems": "OS",
  "metrics.page-views": "閲覧数",
  "metrics.pages": "ページ",
  "metrics.referrers": "リファラー",
+  "metrics.screens": "Screens",
  "metrics.unique-visitors": "ユニーク訪問者数",
  "metrics.views": "閲覧数",
  "metrics.visitors": "訪問者数"
--- a/lang/ko-KR.json
+++ b/lang/ko-KR.json
@ -37,6 +37,7 @@
  "label.more": "더 보기",
  "label.name": "이름",
  "label.new-password": "새 비밀번호",
+  "label.none": "None",
  "label.owner": "Owner",
  "label.password": "비밀번호",
  "label.passwords-dont-match": "비밀번호가 일치하지 않음",
@ -97,13 +98,13 @@
  "metrics.devices": "기기",
  "metrics.events": "이벤트",
  "metrics.filter.combined": "합쳐서 보기",
-  "metrics.filter.domain-only": "도메인만",
  "metrics.filter.raw": "전체 보기",
  "metrics.languages": "Languages",
  "metrics.operating-systems": "운영체제",
  "metrics.page-views": "페이지 뷰(PV)",
  "metrics.pages": "페이지",
  "metrics.referrers": "리퍼러",
+  "metrics.screens": "Screens",
  "metrics.unique-visitors": "순방문자(UV)",
  "metrics.views": "조회수",
  "metrics.visitors": "방문객"
--- a/lang/lt-LT.json
+++ b/lang/lt-LT.json
@ -37,6 +37,7 @@
  "label.more": "Daugiau",
  "label.name": "Pavadinimas",
  "label.new-password": "Naujas slaptažodis",
+  "label.none": "None",
  "label.owner": "Savininkas",
  "label.password": "Slaptažodis",
  "label.passwords-dont-match": "Slaptažodžiai nesutampa",
@ -97,13 +98,13 @@
  "metrics.devices": "Įrenginiai",
  "metrics.events": "Įvykiai",
  "metrics.filter.combined": "Kombinuoti",
-  "metrics.filter.domain-only": "Tik domenas",
  "metrics.filter.raw": "Neapdoroti",
  "metrics.languages": "Kalbos",
  "metrics.operating-systems": "Operacinės sistemos",
  "metrics.page-views": "Puslapių peržiūros",
  "metrics.pages": "Puslapiai",
  "metrics.referrers": "Referrers",
+  "metrics.screens": "Screens",
  "metrics.unique-visitors": "Unikalūs lankytojai",
  "metrics.views": "Peržiūros",
  "metrics.visitors": "Lankytojai"
--- a/lang/mn-MN.json
+++ b/lang/mn-MN.json
@ -37,6 +37,7 @@
  "label.more": "Цааш",
  "label.name": "Нэр",
  "label.new-password": "Шинэ нууц үг",
+  "label.none": "None",
  "label.owner": "Эзэмшигч",
  "label.password": "Нууц үг",
  "label.passwords-dont-match": "Нууц үг тохирохгүй байна",
@ -97,13 +98,13 @@
  "metrics.devices": "Төхөөрөмж",
  "metrics.events": "Үйлдэл",
  "metrics.filter.combined": "Нэгтгэсэн",
-  "metrics.filter.domain-only": "Зөвхөн домэйн",
  "metrics.filter.raw": "Түүхий",
  "metrics.languages": "Хэл",
  "metrics.operating-systems": "Үйлдлийн систем",
  "metrics.page-views": "Хуудас үзсэн",
  "metrics.pages": "Хуудас",
  "metrics.referrers": "Чиглүүлэгч",
+  "metrics.screens": "Screens",
  "metrics.unique-visitors": "Зочин",
  "metrics.views": "Үзсэн",
  "metrics.visitors": "Зочин"
--- a/lang/ms-MY.json
+++ b/lang/ms-MY.json
@ -37,6 +37,7 @@
  "label.more": "Lebih banyak lagi",
  "label.name": "Nama",
  "label.new-password": "Kata laluan baru",
+  "label.none": "None",
  "label.owner": "Owner",
  "label.password": "Kata laluan",
  "label.passwords-dont-match": "Kata laluan tidak sepadan",
@ -97,13 +98,13 @@
  "metrics.devices": "Peranti",
  "metrics.events": "Peristiwa",
  "metrics.filter.combined": "Digabungkan",
-  "metrics.filter.domain-only": "Domain sahaja",
  "metrics.filter.raw": "Mentah",
  "metrics.languages": "Languages",
  "metrics.operating-systems": "Sistem operasi",
  "metrics.page-views": "Paparan halaman",
  "metrics.pages": "Halaman",
  "metrics.referrers": "Perujuk",
+  "metrics.screens": "Screens",
  "metrics.unique-visitors": "Pelawat unik",
  "metrics.views": "Lawatan",
  "metrics.visitors": "Pelawat"
--- a/lang/nb-NO.json
+++ b/lang/nb-NO.json
@ -4,8 +4,8 @@
  "label.add-website": "Legg til nettsted",
  "label.administrator": "Administrator",
  "label.all": "Alle",
-  "label.all-events": "All events",
-  "label.all-time": "All time",
+  "label.all-events": "Alle hendelser",
+  "label.all-time": "Noensinne",
  "label.all-websites": "Alle nettsteder",
  "label.back": "Tilbake",
  "label.cancel": "Avvis",
@ -14,7 +14,7 @@
  "label.copy-to-clipboard": "Kopier til utklippstavle",
  "label.current-password": "Nåværende passord",
  "label.custom-range": "Egendefinert utvalg",
-  "label.dashboard": "Dashboard",
+  "label.dashboard": "Dashbord",
  "label.date-range": "Datointervall",
  "label.default-date-range": "Standard datoperiode",
  "label.delete": "Slett",
@ -28,16 +28,17 @@
  "label.enable-share-url": "Aktiver delings-URL",
  "label.invalid": "Ugyldig",
  "label.invalid-domain": "Ugyldig domene",
-  "label.language": "Language",
+  "label.language": "Språk",
  "label.last-days": "Siste {x} dager",
  "label.last-hours": "Siste {x} timer",
-  "label.logged-in-as": "Logget på som {brukernavn}",
+  "label.logged-in-as": "Logget på som {username}",
  "label.login": "Logg inn",
  "label.logout": "Logg ut",
  "label.more": "Mer",
  "label.name": "Navn",
  "label.new-password": "Nytt passord",
-  "label.owner": "Owner",
+  "label.none": "None",
+  "label.owner": "Eier",
  "label.password": "Passord",
  "label.passwords-dont-match": "Passordene er ikke like",
  "label.profile": "Profil",
@ -46,7 +47,7 @@
  "label.refresh": "Oppdater",
  "label.required": "Påkrevd",
  "label.reset": "Nullstill",
-  "label.reset-website": "Reset statistics",
+  "label.reset-website": "Nullstill statistikk",
  "label.save": "Lagre",
  "label.settings": "Innstillinger",
  "label.share-url": "Del URL",
@ -64,7 +65,7 @@
  "label.websites": "Nettsteder",
  "message.active-users": "{x} {x, plural, one {besøkende} other {besøkende}} nå",
  "message.confirm-delete": "Er du sikker på at du vil slette {target}?",
-  "message.confirm-reset": "Are your sure you want to reset {target}'s statistics?",
+  "message.confirm-reset": "Er du sikker på at du vil nullstille {target}'s statistikk?",
  "message.copied": "Kopiert!",
  "message.delete-warning": "Alle tilknyttede data slettes også.",
  "message.failure": "Noe gikk galt.",
@ -78,15 +79,15 @@
  "message.no-websites-configured": "Du har ikke satt opp noen nettsteder.",
  "message.page-not-found": "Side ikke funnet.",
  "message.powered-by": "Drevet av {name}",
-  "message.reset-warning": "All statistics for this website will be deleted, but your tracking code will remain intact.",
+  "message.reset-warning": "All statistikk for denne nettsiden vil bli slettet, men sporingskoden din vil forbli uberørt.",
  "message.save-success": "Lagret!",
  "message.share-url": "Dette er den offentlige delings-URL-en for {target}.",
-  "message.toggle-charts": "Toggle charts",
+  "message.toggle-charts": "Veksle grafer",
  "message.track-stats": "For å spore statistikk for {target}, plasser følgende kode i {head}-delen av nettstedet ditt.",
  "message.type-delete": "Skriv inn {delete} i boksen nedenfor for å bekrefte.",
  "message.type-reset": "Skriv inn {reset} i boksen nedenfor for å bekrefte.",
  "metrics.actions": "Handlinger",
-  "metrics.average-visit-time": "Gjennomsnittlig besøkelsestid",
+  "metrics.average-visit-time": "Gjennomsnittlig besøkstid",
  "metrics.bounce-rate": "Avvisningsfrekvens",
  "metrics.browsers": "Nettlesere",
  "metrics.countries": "Land",
@ -97,13 +98,13 @@
  "metrics.devices": "Enheter",
  "metrics.events": "Arrangementer",
  "metrics.filter.combined": "Kombinert",
-  "metrics.filter.domain-only": "Bare domene",
  "metrics.filter.raw": "Rå",
-  "metrics.languages": "Languages",
+  "metrics.languages": "Språk",
  "metrics.operating-systems": "Operativsystemer",
  "metrics.page-views": "Sidevisninger",
  "metrics.pages": "Sider",
  "metrics.referrers": "Referanser",
+  "metrics.screens": "Screens",
  "metrics.unique-visitors": "Unike besøkende",
  "metrics.views": "Visninger",
  "metrics.visitors": "Besøkende"
--- a/lang/nl-NL.json
+++ b/lang/nl-NL.json
@ -5,7 +5,7 @@
  "label.administrator": "Administrator",
  "label.all": "Alles",
  "label.all-events": "Alle gebeurtenissen",
-  "label.all-time": "All time",
+  "label.all-time": "Onbeperkt",
  "label.all-websites": "Alle websites",
  "label.back": "Terug",
  "label.cancel": "Annuleren",
@ -28,7 +28,7 @@
  "label.enable-share-url": "Sta delen via openbare URL toe",
  "label.invalid": "Ongeldig",
  "label.invalid-domain": "Ongeldig domein",
-  "label.language": "Language",
+  "label.language": "Taal",
  "label.last-days": "Laatste {x} dagen",
  "label.last-hours": "Laatste {x} uur",
  "label.logged-in-as": "Ingelogd als {username}",
@ -37,7 +37,8 @@
  "label.more": "Toon meer",
  "label.name": "Naam",
  "label.new-password": "Nieuw wachtwoord",
-  "label.owner": "Owner",
+  "label.none": "None",
+  "label.owner": "Eigenaar",
  "label.password": "Wachtwoord",
  "label.passwords-dont-match": "Wachtwoorden komen niet overeen",
  "label.profile": "Profiel",
@ -46,12 +47,12 @@
  "label.refresh": "Vernieuwen",
  "label.required": "Verplicht",
  "label.reset": "Resetten",
-  "label.reset-website": "Reset statistics",
+  "label.reset-website": "Statistieken opnieuw instellen",
  "label.save": "Opslaan",
  "label.settings": "Instellingen",
  "label.share-url": "URL delen",
  "label.single-day": "Enkele dag",
-  "label.theme": "Theme",
+  "label.theme": "Thema",
  "label.this-month": "Deze maand",
  "label.this-week": "Deze week",
  "label.this-year": "Dit jaar",
@ -64,7 +65,7 @@
  "label.websites": "Websites",
  "message.active-users": "{x} actieve {x, plural, one {bezoeker} other {bezoekers}}",
  "message.confirm-delete": "Weet je zeker dat je {target} wilt verwijderen?",
-  "message.confirm-reset": "Are your sure you want to reset {target}'s statistics?",
+  "message.confirm-reset": "Weet je zeker dat je de statistieken van {target} opnieuw wilt instellen?",
  "message.copied": "Gekopiëerd!",
  "message.delete-warning": "Alle verwante gegezens zullen ook verwijderd worden.",
  "message.failure": "Er is iets misgegaan.",
@ -81,7 +82,7 @@
  "message.reset-warning": "All statistics for this website will be deleted, but your tracking code will remain intact.",
  "message.save-success": "Opslaan succesvol.",
  "message.share-url": "Met deze URL kan {target} openbaar gedeeld worden.",
-  "message.toggle-charts": "Toggle charts",
+  "message.toggle-charts": "Grafieken tonen/verbergen",
  "message.track-stats": "Om statistieken voor {target} bij te houden, plaats je de volgende code in het {head} gedeelte van je website.",
  "message.type-delete": "Type {delete} in onderstaande veld om dit te bevestigen.",
  "message.type-reset": "Type {reset} in onderstaande veld om dit te bevestigen.",
@ -97,13 +98,13 @@
  "metrics.devices": "Apparaten",
  "metrics.events": "Gebeurtenissen",
  "metrics.filter.combined": "Gecombineerd",
-  "metrics.filter.domain-only": "Alleen domein",
  "metrics.filter.raw": "Ruw",
  "metrics.languages": "Languages",
-  "metrics.operating-systems": "Besturingssysteem",
+  "metrics.operating-systems": "Besturingssystemen",
  "metrics.page-views": "Paginaweergaven",
  "metrics.pages": "Pagina's",
  "metrics.referrers": "Verwijzers",
+  "metrics.screens": "Screens",
  "metrics.unique-visitors": "Unieke bezoekers",
  "metrics.views": "Weergaven",
  "metrics.visitors": "Bezoekers"
--- a/lang/pl-PL.json
+++ b/lang/pl-PL.json
@ -37,6 +37,7 @@
  "label.more": "Więcej",
  "label.name": "Nazwa",
  "label.new-password": "Nowe hasło",
+  "label.none": "None",
  "label.owner": "Właściciel",
  "label.password": "Hasło",
  "label.passwords-dont-match": "Hasła się nie zgadzają",
@ -97,13 +98,13 @@
  "metrics.devices": "Urządzenia",
  "metrics.events": "Zdarzenia",
  "metrics.filter.combined": "Połączone",
-  "metrics.filter.domain-only": "Tylko domena",
  "metrics.filter.raw": "Surowe dane",
  "metrics.languages": "Języki",
  "metrics.operating-systems": "System operacyjny",
  "metrics.page-views": "Wyświetlenia strony",
  "metrics.pages": "Strony",
  "metrics.referrers": "Źródła odsyłające",
+  "metrics.screens": "Screens",
  "metrics.unique-visitors": "Unikalni odwiedzający",
  "metrics.views": "Wyświetlenia",
  "metrics.visitors": "Odwiedzający"
--- a/lang/pt-BR.json
+++ b/lang/pt-BR.json
@ -37,6 +37,7 @@
  "label.more": "Mais",
  "label.name": "Nome",
  "label.new-password": "Nova senha",
+  "label.none": "None",
  "label.owner": "Proprietário",
  "label.password": "Senha",
  "label.passwords-dont-match": "As senhas não correspondem",
@ -97,13 +98,13 @@
  "metrics.devices": "Dispositivos",
  "metrics.events": "Eventos",
  "metrics.filter.combined": "Combinado",
-  "metrics.filter.domain-only": "Apenas domínio",
  "metrics.filter.raw": "Dados brutos",
  "metrics.languages": "Idiomas",
  "metrics.operating-systems": "Sistemas operacionais",
  "metrics.page-views": "Visualizações de página",
  "metrics.pages": "Páginas",
  "metrics.referrers": "Referências",
+  "metrics.screens": "Screens",
  "metrics.unique-visitors": "Visitantes únicos",
  "metrics.views": "Visualizações",
  "metrics.visitors": "Visitantes"
--- a/lang/pt-PT.json
+++ b/lang/pt-PT.json
@ -37,6 +37,7 @@
  "label.more": "Mais",
  "label.name": "Nome",
  "label.new-password": "Nova senha",
+  "label.none": "None",
  "label.owner": "Proprietário",
  "label.password": "Senha",
  "label.passwords-dont-match": "As senhas não coincidem",
@ -97,13 +98,13 @@
  "metrics.devices": "Dispositivos",
  "metrics.events": "Eventos",
  "metrics.filter.combined": "Combinado",
-  "metrics.filter.domain-only": "Apenas domínio",
  "metrics.filter.raw": "Dados brutos",
  "metrics.languages": "Línguas",
  "metrics.operating-systems": "Sistemas operativos",
  "metrics.page-views": "Visualizações da página",
  "metrics.pages": "Páginas",
  "metrics.referrers": "Referenciadores",
+  "metrics.screens": "Screens",
  "metrics.unique-visitors": "Visitantes únicos",
  "metrics.views": "Visualizações",
  "metrics.visitors": "Visitantes"
--- a/lang/ro-RO.json
+++ b/lang/ro-RO.json
@ -37,6 +37,7 @@
  "label.more": "Mai mult",
  "label.name": "Nume",
  "label.new-password": "Parola nouă",
+  "label.none": "None",
  "label.owner": "Owner",
  "label.password": "Parolă",
  "label.passwords-dont-match": "Parolele nu se potrivesc",
@ -97,13 +98,13 @@
  "metrics.devices": "Dispozitive",
  "metrics.events": "Evenimente",
  "metrics.filter.combined": "Combinat",
-  "metrics.filter.domain-only": "Numai domeniu",
  "metrics.filter.raw": "Brut",
  "metrics.languages": "Languages",
  "metrics.operating-systems": "Sisteme de operare",
  "metrics.page-views": "Vizualizări de pagină",
  "metrics.pages": "Pagini",
  "metrics.referrers": "Site-uri de proveniență",
+  "metrics.screens": "Screens",
  "metrics.unique-visitors": "Vizitatori unici",
  "metrics.views": "Vizualizări",
  "metrics.visitors": "Vizitatori"
--- a/lang/ru-RU.json
+++ b/lang/ru-RU.json
@ -37,6 +37,7 @@
  "label.more": "Больше",
  "label.name": "Имя",
  "label.new-password": "Новый пароль",
+  "label.none": "None",
  "label.owner": "Владелец",
  "label.password": "Пароль",
  "label.passwords-dont-match": "Пароли не совпадают",
@ -97,13 +98,13 @@
  "metrics.devices": "Устройства",
  "metrics.events": "События",
  "metrics.filter.combined": "Объединенные",
-  "metrics.filter.domain-only": "Только домен",
  "metrics.filter.raw": "Сырые данные",
  "metrics.languages": "Языки",
  "metrics.operating-systems": "Операционные системы",
  "metrics.page-views": "Просмотры страниц",
  "metrics.pages": "Страницы",
  "metrics.referrers": "Источники",
+  "metrics.screens": "Screens",
  "metrics.unique-visitors": "Уникальные посетители",
  "metrics.views": "Просмотры",
  "metrics.visitors": "Посетители"
--- a/lang/sk-SK.json
+++ b/lang/sk-SK.json
@ -37,6 +37,7 @@
  "label.more": "Viac",
  "label.name": "Meno",
  "label.new-password": "Nové heslo",
+  "label.none": "None",
  "label.owner": "Owner",
  "label.password": "Heslo",
  "label.passwords-dont-match": "Hesla se nezhodujú",
@ -97,13 +98,13 @@
  "metrics.devices": "Zariadenie",
  "metrics.events": "Udalosti",
  "metrics.filter.combined": "Kombinácie",
-  "metrics.filter.domain-only": "Domény",
  "metrics.filter.raw": "Nezpracované",
  "metrics.languages": "Languages",
  "metrics.operating-systems": "Operačný systém",
  "metrics.page-views": "Zobrazenie stánok",
  "metrics.pages": "Stránky",
  "metrics.referrers": "Odkazy",
+  "metrics.screens": "Screens",
  "metrics.unique-visitors": "Jedinečné návštevy",
  "metrics.views": "Zobrazení",
  "metrics.visitors": "Návštevy"
--- a/lang/sl-SI.json
+++ b/lang/sl-SI.json
@ -37,6 +37,7 @@
  "label.more": "Več",
  "label.name": "Ime",
  "label.new-password": "Novo geslo",
+  "label.none": "None",
  "label.owner": "Owner",
  "label.password": "Geslo",
  "label.passwords-dont-match": "Gesli se ne ujemata",
@ -97,13 +98,13 @@
  "metrics.devices": "Naprave",
  "metrics.events": "Dogodki",
  "metrics.filter.combined": "Skupno",
-  "metrics.filter.domain-only": "Samo domena",
  "metrics.filter.raw": "Neobdelane meritve",
  "metrics.languages": "Languages",
  "metrics.operating-systems": "Operacijski sistemi",
  "metrics.page-views": "Ogledi strani",
  "metrics.pages": "Strani",
  "metrics.referrers": "Viri",
+  "metrics.screens": "Screens",
  "metrics.unique-visitors": "Unikatni obiskovalci",
  "metrics.views": "Ogledi",
  "metrics.visitors": "Obiskovalci"
--- a/lang/sv-SE.json
+++ b/lang/sv-SE.json
@ -37,6 +37,7 @@
  "label.more": "Mer",
  "label.name": "Namn",
  "label.new-password": "Nytt lösenord",
+  "label.none": "None",
  "label.owner": "Ägare",
  "label.password": "Lösenord",
  "label.passwords-dont-match": "Lösenorden är inte samma",
@ -97,13 +98,13 @@
  "metrics.devices": "Enheter",
  "metrics.events": "Händelser",
  "metrics.filter.combined": "Kombinerade",
-  "metrics.filter.domain-only": "Endast domän",
  "metrics.filter.raw": "Rådata",
  "metrics.languages": "Språk",
  "metrics.operating-systems": "Operativsystem",
  "metrics.page-views": "Sidvisningar",
  "metrics.pages": "Sidor",
  "metrics.referrers": "Hänvisare",
+  "metrics.screens": "Screens",
  "metrics.unique-visitors": "Unika besökare",
  "metrics.views": "Visningar",
  "metrics.visitors": "Besökare"
--- a/lang/ta-IN.json
+++ b/lang/ta-IN.json
@ -37,6 +37,7 @@
  "label.more": "மேலும்",
  "label.name": "பெயர்",
  "label.new-password": "புதிய கடவுச்சொல்",
+  "label.none": "None",
  "label.owner": "Owner",
  "label.password": "கடவுச்சொல்",
  "label.passwords-dont-match": "இருக்கடவுச்சொல் பொருந்தவில்லை",
@ -97,13 +98,13 @@
  "metrics.devices": "சாதனங்கள்",
  "metrics.events": "நிகழ்வுகள்",
  "metrics.filter.combined": "ஒருங்கிணைந்த",
-  "metrics.filter.domain-only": "கள முகவரி மட்டும்",
  "metrics.filter.raw": "மூல",
  "metrics.languages": "Languages",
  "metrics.operating-systems": "இயக்க முறைமைகள்",
  "metrics.page-views": "பக்க காட்சிகள்",
  "metrics.pages": "பக்கங்கள்",
  "metrics.referrers": "குறிப்பிடுவோர்",
+  "metrics.screens": "Screens",
  "metrics.unique-visitors": "தனிப்பட்ட பார்வையாளர்கள்",
  "metrics.views": "பார்வைகள்",
  "metrics.visitors": "பார்வையாளர்கள்"
--- a/lang/tr-TR.json
+++ b/lang/tr-TR.json
@ -37,6 +37,7 @@
  "label.more": "Detaylı göster",
  "label.name": "İsim",
  "label.new-password": "Yeni parola",
+  "label.none": "None",
  "label.owner": "Owner",
  "label.password": "Parola",
  "label.passwords-dont-match": "Parolalar uyuşmuyor",
@ -97,13 +98,13 @@
  "metrics.devices": "Cihazlar",
  "metrics.events": "Olaylar",
  "metrics.filter.combined": "Birleşik",
-  "metrics.filter.domain-only": "Yalnızca alan adı",
  "metrics.filter.raw": "Ham",
  "metrics.languages": "Languages",
  "metrics.operating-systems": "İşletim sistemi",
  "metrics.page-views": "Sayfa görünümü",
  "metrics.pages": "Sayfalar",
  "metrics.referrers": "Yönlendirenler",
+  "metrics.screens": "Ekranlar",
  "metrics.unique-visitors": "Tekil kullanıcı",
  "metrics.views": "Görüntüleme",
  "metrics.visitors": "Ziyaretçi"
--- a/lang/uk-UA.json
+++ b/lang/uk-UA.json
@ -37,6 +37,7 @@
  "label.more": "Більше",
  "label.name": "Ім'я",
  "label.new-password": "Новий пароль",
+  "label.none": "None",
  "label.owner": "Власник",
  "label.password": "Пароль",
  "label.passwords-dont-match": "Паролі не співпадають",
@ -97,13 +98,13 @@
  "metrics.devices": "Пристрої",
  "metrics.events": "Події",
  "metrics.filter.combined": "Об'єднані",
-  "metrics.filter.domain-only": "Лише домен",
  "metrics.filter.raw": "Сирі дані",
  "metrics.languages": "Мови",
  "metrics.operating-systems": "Операційні системи",
  "metrics.page-views": "Перегляди сторінок",
  "metrics.pages": "Сторінки",
  "metrics.referrers": "Джерела",
+  "metrics.screens": "Screens",
  "metrics.unique-visitors": "Унікальні відвідувачі",
  "metrics.views": "Перегляди",
  "metrics.visitors": "Відвідувачі"
--- a/lang/ur-PK.json
+++ b/lang/ur-PK.json
@ -37,6 +37,7 @@
  "label.more": "مزید",
  "label.name": "نام",
  "label.new-password": "نیا پاس ورڈ",
+  "label.none": "None",
  "label.owner": "مالک",
  "label.password": "پاس ورڈ",
  "label.passwords-dont-match": "پاس ورڈز مماثل نہیں ہیں",
@ -97,13 +98,13 @@
  "metrics.devices": "آلات",
  "metrics.events": "واقعات",
  "metrics.filter.combined": "مشترکہ",
-  "metrics.filter.domain-only": "صرف ڈومین",
  "metrics.filter.raw": "خام",
  "metrics.languages": "زبانیں",
  "metrics.operating-systems": "آپریٹنگ سسٹمز",
  "metrics.page-views": "صفحہ کے نظارے",
  "metrics.pages": "صفحات",
  "metrics.referrers": "بھیجنے والے",
+  "metrics.screens": "Screens",
  "metrics.unique-visitors": "منفرد زائرین",
  "metrics.views": "مناظر",
  "metrics.visitors": "زائرین"
--- a/lang/vi-VN.json
+++ b/lang/vi-VN.json
@ -37,6 +37,7 @@
  "label.more": "Thêm",
  "label.name": "Tên",
  "label.new-password": "Mật khẩu mới",
+  "label.none": "None",
  "label.owner": "Chủ sở hữu",
  "label.password": "Mật khẩu",
  "label.passwords-dont-match": "Mật khẩu không đồng nhất",
@ -97,13 +98,13 @@
  "metrics.devices": "Thiết bị",
  "metrics.events": "Sự kiện",
  "metrics.filter.combined": "Kết hợp",
-  "metrics.filter.domain-only": "Chỉ tên miền",
  "metrics.filter.raw": "Gốc",
  "metrics.languages": "Ngôn ngữ",
  "metrics.operating-systems": "Hệ điều hành",
  "metrics.page-views": "Lượt xem",
  "metrics.pages": "Trang",
  "metrics.referrers": "Liên kết giới thiệu",
+  "metrics.screens": "Screens",
  "metrics.unique-visitors": "Khách truy cập một lần",
  "metrics.views": "Xem",
  "metrics.visitors": "Khách"
--- a/lang/zh-CN.json
+++ b/lang/zh-CN.json
@ -37,6 +37,7 @@
  "label.more": "更多",
  "label.name": "名字",
  "label.new-password": "新密码",
+  "label.none": "None",
  "label.owner": "所有者",
  "label.password": "密码",
  "label.passwords-dont-match": "密码不一致",
@ -97,13 +98,13 @@
  "metrics.devices": "设备",
  "metrics.events": "行为类别",
  "metrics.filter.combined": "总和",
-  "metrics.filter.domain-only": "只看域名",
  "metrics.filter.raw": "原始",
-  "metrics.languages": "Languages",
+  "metrics.languages": "语言",
  "metrics.operating-systems": "操作系统",
  "metrics.page-views": "页面浏览量",
  "metrics.pages": "网页",
  "metrics.referrers": "来源域名",
+  "metrics.screens": "Screens",
  "metrics.unique-visitors": "独立访客",
  "metrics.views": "浏览量",
  "metrics.visitors": "访客"
--- a/lang/zh-TW.json
+++ b/lang/zh-TW.json
@ -37,6 +37,7 @@
  "label.more": "更多",
  "label.name": "名字",
  "label.new-password": "新密碼",
+  "label.none": "None",
  "label.owner": "Owner",
  "label.password": "密碼",
  "label.passwords-dont-match": "密碼不一致",
@ -97,13 +98,13 @@
  "metrics.devices": "裝置",
  "metrics.events": "行為類別",
  "metrics.filter.combined": "總和",
-  "metrics.filter.domain-only": "僅域名",
  "metrics.filter.raw": "原始",
  "metrics.languages": "Languages",
  "metrics.operating-systems": "操作系统",
  "metrics.page-views": "網頁流量",
  "metrics.pages": "網頁",
  "metrics.referrers": "指入域名",
+  "metrics.screens": "Screens",
  "metrics.unique-visitors": "獨立訪客",
  "metrics.views": "頁面流量",
  "metrics.visitors": "獨立訪客"
--- a/lib/auth.js
+++ b/lib/auth.js
@ -1,6 +1,6 @@
 import { parseSecureToken, parseToken } from './crypto';
 import { SHARE_TOKEN_HEADER } from './constants';
-import { getWebsiteById } from './queries';
+import { getWebsiteById } from 'queries';

 export async function getAuthToken(req) {
  try {
--- a/lib/constants.js
+++ b/lib/constants.js
@ -7,7 +7,8 @@ export const DASHBOARD_CONFIG = 'umami.dashboard';
 export const VERSION_CHECK = 'umami.version-check';
 export const SHARE_TOKEN_HEADER = 'x-umami-share-token';
 export const HOMEPAGE_URL = 'https://umami.is';
-export const VERSION_URL = 'https://github.com/mikecao/umami/releases';
+export const REPO_URL = 'https://github.com/umami-software/umami';
+export const UPDATES_URL = 'https://api.umami.is/v1/updates';

 export const DEFAULT_LOCALE = 'en-US';
 export const DEFAULT_THEME = 'light';
--- a/lib/db.js
+++ b/lib/db.js
@ -1,6 +1,10 @@
 import { PrismaClient } from '@prisma/client';
 import chalk from 'chalk';

+BigInt.prototype.toJSON = function () {
+  return Number(this);
+};
+
 const options = {
  log: [
    {
@ -14,20 +18,20 @@ function logQuery(e) {
  console.log(chalk.yellow(e.params), '->', e.query, chalk.greenBright(`${e.duration}ms`));
 }

-let prisma;
+function getClient(options) {
+  const prisma = new PrismaClient(options);

-if (process.env.NODE_ENV === 'production') {
-  prisma = new PrismaClient(options);
-} else {
-  if (!global.prisma) {
-    global.prisma = new PrismaClient(options);
+  if (process.env.LOG_QUERY) {
+    prisma.$on('query', logQuery);
  }

-  prisma = global.prisma;
+  return prisma;
 }

-if (process.env.LOG_QUERY) {
-  prisma.$on('query', logQuery);
+const prisma = global.prisma || getClient(options);
+
+if (process.env.NODE_ENV !== 'production') {
+  global.prisma = prisma;
 }

 export default prisma;
--- a/lib/filters.js
+++ b/lib/filters.js
@ -1,14 +1,10 @@
-import { removeTrailingSlash, removeWWW, getDomainName } from './url';
+import { removeWWW } from './url';

-export const urlFilter = (data, { raw }) => {
+export const urlFilter = data => {
  const isValidUrl = url => {
    return url !== '' && url !== null && !url.startsWith('#');
  };

-  if (raw) {
-    return data.filter(({ x }) => isValidUrl(x));
-  }
-
  const cleanUrl = url => {
    try {
      const { pathname, search } = new URL(url, location.origin);
@ -44,66 +40,26 @@ export const urlFilter = (data, { raw }) => {
  return Object.keys(map).map(key => ({ x: key, y: map[key] }));
 };

-export const refFilter = (data, { domain, domainOnly, raw }) => {
-  const domainName = getDomainName(domain);
-  const regex = new RegExp(`http[s]?://([a-z0-9-]+\\.)*${domainName}`);
+export const refFilter = data => {
  const links = {};

-  const isValidRef = referrer => {
-    return (
-      referrer !== '' && referrer !== null && !referrer.startsWith('/') && !referrer.startsWith('#')
-    );
-  };
-
-  const cleanUrl = url => {
-    try {
-      const { hostname, origin, pathname, searchParams, protocol } = new URL(url);
-
-      if (regex.test(url)) {
-        return null;
-      }
-
-      if (domainOnly && hostname) {
-        return removeWWW(hostname);
-      }
-
-      if (!origin || origin === 'null') {
-        return `${protocol}${removeTrailingSlash(pathname)}`;
-      }
-
-      if (protocol.startsWith('http')) {
-        const path = removeTrailingSlash(pathname);
-        const referrer = searchParams.get('referrer');
-        const query = referrer ? `?referrer=${referrer}` : '';
-
-        return removeTrailingSlash(`${removeWWW(hostname)}${path}`) + query;
-      }
-
-      return null;
-    } catch {
-      return null;
-    }
-  };
-
-  if (raw) {
-    return data.filter(({ x }) => isValidRef(x) && !regex.test(x));
-  }
-
  const map = data.reduce((obj, { x, y }) => {
-    if (!isValidRef(x)) {
-      return obj;
+    let id;
+
+    try {
+      const url = new URL(x);
+
+      id = removeWWW(url.hostname) || url.href;
+    } catch {
+      id = '';
    }

-    const url = cleanUrl(x);
+    links[id] = x;

-    links[url] = x;
-
-    if (url) {
-      if (!obj[url]) {
-        obj[url] = y;
-      } else {
-        obj[url] += y;
-      }
+    if (!obj[id]) {
+      obj[id] = y;
+    } else {
+      obj[id] += y;
    }

    return obj;
--- a/lib/queries.js
+++ b/lib/queries.js
@ -1,13 +1,6 @@
-import moment from 'moment-timezone';
+import { MYSQL, MYSQL_DATE_FORMATS, POSTGRESQL, POSTGRESQL_DATE_FORMATS } from 'lib/constants';
 import prisma from 'lib/db';
-import { subMinutes } from 'date-fns';
-import {
-  MYSQL,
-  POSTGRESQL,
-  MYSQL_DATE_FORMATS,
-  POSTGRESQL_DATE_FORMATS,
-  URL_LENGTH,
-} from 'lib/constants';
+import moment from 'moment-timezone';

 export function getDatabase() {
  const type =
@ -21,24 +14,36 @@ export function getDatabase() {
  return type;
 }

+export function getDateStringQuery(data, unit) {
+  const db = getDatabase();
+
+  if (db === POSTGRESQL) {
+    return `to_char(${data}, '${POSTGRESQL_DATE_FORMATS[unit]}')`;
+  }
+
+  if (db === MYSQL) {
+    return `DATE_FORMAT(${data}, '${MYSQL_DATE_FORMATS[unit]}')`;
+  }
+}
+
 export function getDateQuery(field, unit, timezone) {
  const db = getDatabase();

  if (db === POSTGRESQL) {
    if (timezone) {
-      return `to_char(date_trunc('${unit}', ${field} at time zone '${timezone}'), '${POSTGRESQL_DATE_FORMATS[unit]}')`;
+      return `date_trunc('${unit}', ${field} at time zone '${timezone}')`;
    }
-    return `to_char(date_trunc('${unit}', ${field}), '${POSTGRESQL_DATE_FORMATS[unit]}')`;
+    return `date_trunc('${unit}', ${field})`;
  }

  if (db === MYSQL) {
    if (timezone) {
      const tz = moment.tz(timezone).format('Z');

-      return `DATE_FORMAT(convert_tz(${field},'+00:00','${tz}'), '${MYSQL_DATE_FORMATS[unit]}')`;
+      return `convert_tz(${field},'+00:00','${tz}')`;
    }

-    return `DATE_FORMAT(${field}, '${MYSQL_DATE_FORMATS[unit]}')`;
+    return `${field}`;
  }
 }

@ -54,11 +59,11 @@ export function getTimestampInterval(field) {
  }
 }

-export function getFilterQuery(table, filters = {}, params = []) {
+export function getFilterQuery(table, column, filters = {}, params = []) {
  const query = Object.keys(filters).reduce((arr, key) => {
    const value = filters[key];

-    if (value === undefined) {
+    if (!value || value === true) {
      return arr;
    }

@ -89,7 +94,8 @@ export function getFilterQuery(table, filters = {}, params = []) {

      case 'referrer':
        if (table === 'pageview') {
-          arr.push(`and ${table}.referrer like $${params.length + 1}`);
+          arr.push(`and ${table}.referrer like $${params.length + 1} `);
+          arr.push(`and ${table}.referrer not like '/%'`);
          params.push(`%${decodeURIComponent(value)}%`);
        }
        break;
@ -109,7 +115,7 @@ export function getFilterQuery(table, filters = {}, params = []) {
  return query.join('\n');
 }

-export function parseFilters(table, filters = {}, params = []) {
+export function parseFilters(table, column, filters = {}, params = []) {
  const { domain, url, event_url, referrer, os, browser, device, country, event_type } = filters;

  const pageviewFilters = { domain, url, referrer };
@ -125,9 +131,9 @@ export function parseFilters(table, filters = {}, params = []) {
      os || browser || device || country
        ? `inner join session on ${table}.session_id = session.session_id`
        : '',
-    pageviewQuery: getFilterQuery('pageview', pageviewFilters, params),
-    sessionQuery: getFilterQuery('session', sessionFilters, params),
-    eventQuery: getFilterQuery('event', eventFilters, params),
+    pageviewQuery: getFilterQuery('pageview', column, pageviewFilters, params),
+    sessionQuery: getFilterQuery('session', column, sessionFilters, params),
+    eventQuery: getFilterQuery('event', column, eventFilters, params),
  };
 }

@ -148,455 +154,3 @@ export async function rawQuery(query, params = []) {

  return runQuery(prisma.$queryRawUnsafe.apply(prisma, [sql, ...params]));
 }
-
-export async function getWebsiteById(website_id) {
-  return runQuery(
-    prisma.website.findUnique({
-      where: {
-        website_id,
-      },
-    }),
-  );
-}
-
-export async function getWebsiteByUuid(website_uuid) {
-  return runQuery(
-    prisma.website.findUnique({
-      where: {
-        website_uuid,
-      },
-    }),
-  );
-}
-
-export async function getWebsiteByShareId(share_id) {
-  return runQuery(
-    prisma.website.findUnique({
-      where: {
-        share_id,
-      },
-    }),
-  );
-}
-
-export async function getUserWebsites(user_id) {
-  return runQuery(
-    prisma.website.findMany({
-      where: {
-        user_id,
-      },
-      orderBy: {
-        name: 'asc',
-      },
-    }),
-  );
-}
-
-export async function getAllWebsites() {
-  let data = await runQuery(
-    prisma.website.findMany({
-      orderBy: [
-        {
-          user_id: 'asc',
-        },
-        {
-          name: 'asc',
-        },
-      ],
-      include: {
-        account: {
-          select: {
-            username: true,
-          },
-        },
-      },
-    }),
-  );
-  return data.map(i => ({ ...i, account: i.account.username }));
-}
-
-export async function createWebsite(user_id, data) {
-  return runQuery(
-    prisma.website.create({
-      data: {
-        account: {
-          connect: {
-            user_id,
-          },
-        },
-        ...data,
-      },
-    }),
-  );
-}
-
-export async function updateWebsite(website_id, data) {
-  return runQuery(
-    prisma.website.update({
-      where: {
-        website_id,
-      },
-      data,
-    }),
-  );
-}
-
-export async function resetWebsite(website_id) {
-  return runQuery(prisma.$queryRaw`delete from session where website_id=${website_id}`);
-}
-
-export async function deleteWebsite(website_id) {
-  return runQuery(
-    prisma.website.delete({
-      where: {
-        website_id,
-      },
-    }),
-  );
-}
-
-export async function createSession(website_id, data) {
-  return runQuery(
-    prisma.session.create({
-      data: {
-        website_id,
-        ...data,
-      },
-      select: {
-        session_id: true,
-      },
-    }),
-  );
-}
-
-export async function getSessionByUuid(session_uuid) {
-  return runQuery(
-    prisma.session.findUnique({
-      where: {
-        session_uuid,
-      },
-    }),
-  );
-}
-
-export async function savePageView(website_id, session_id, url, referrer) {
-  return runQuery(
-    prisma.pageview.create({
-      data: {
-        website_id,
-        session_id,
-        url: url?.substr(0, URL_LENGTH),
-        referrer: referrer?.substr(0, URL_LENGTH),
-      },
-    }),
-  );
-}
-
-export async function saveEvent(website_id, session_id, url, event_type, event_value) {
-  return runQuery(
-    prisma.event.create({
-      data: {
-        website_id,
-        session_id,
-        url: url?.substr(0, URL_LENGTH),
-        event_type: event_type?.substr(0, 50),
-        event_value: event_value?.substr(0, 50),
-      },
-    }),
-  );
-}
-
-export async function getAccounts() {
-  return runQuery(
-    prisma.account.findMany({
-      orderBy: [
-        { is_admin: 'desc' },
-        {
-          username: 'asc',
-        },
-      ],
-      select: {
-        user_id: true,
-        username: true,
-        is_admin: true,
-        created_at: true,
-        updated_at: true,
-      },
-    }),
-  );
-}
-
-export async function getAccountById(user_id) {
-  return runQuery(
-    prisma.account.findUnique({
-      where: {
-        user_id,
-      },
-    }),
-  );
-}
-
-export async function getAccountByUsername(username) {
-  return runQuery(
-    prisma.account.findUnique({
-      where: {
-        username,
-      },
-    }),
-  );
-}
-
-export async function updateAccount(user_id, data) {
-  return runQuery(
-    prisma.account.update({
-      where: {
-        user_id,
-      },
-      data,
-    }),
-  );
-}
-
-export async function deleteAccount(user_id) {
-  return runQuery(
-    prisma.account.delete({
-      where: {
-        user_id,
-      },
-    }),
-  );
-}
-
-export async function createAccount(data) {
-  return runQuery(
-    prisma.account.create({
-      data,
-    }),
-  );
-}
-
-export async function getSessions(websites, start_at) {
-  return runQuery(
-    prisma.session.findMany({
-      where: {
-        website: {
-          website_id: {
-            in: websites,
-          },
-        },
-        created_at: {
-          gte: start_at,
-        },
-      },
-    }),
-  );
-}
-
-export async function getPageviews(websites, start_at) {
-  return runQuery(
-    prisma.pageview.findMany({
-      where: {
-        website: {
-          website_id: {
-            in: websites,
-          },
-        },
-        created_at: {
-          gte: start_at,
-        },
-      },
-    }),
-  );
-}
-
-export async function getEvents(websites, start_at) {
-  return runQuery(
-    prisma.event.findMany({
-      where: {
-        website: {
-          website_id: {
-            in: websites,
-          },
-        },
-        created_at: {
-          gte: start_at,
-        },
-      },
-    }),
-  );
-}
-
-export function getWebsiteStats(website_id, start_at, end_at, filters = {}) {
-  const params = [website_id, start_at, end_at];
-  const { pageviewQuery, sessionQuery, joinSession } = parseFilters('pageview', filters, params);
-
-  return rawQuery(
-    `
-      select sum(t.c) as "pageviews",
-        count(distinct t.session_id) as "uniques",
-        sum(case when t.c = 1 then 1 else 0 end) as "bounces",
-        sum(t.time) as "totaltime"
-      from (
-         select pageview.session_id,
-           ${getDateQuery('pageview.created_at', 'hour')},
-           count(*) c,
-           ${getTimestampInterval('pageview.created_at')} as "time"
-         from pageview
-           ${joinSession}
-         where pageview.website_id=$1
-         and pageview.created_at between $2 and $3
-         ${pageviewQuery}
-         ${sessionQuery}
-         group by 1, 2
-     ) t
-    `,
-    params,
-  );
-}
-
-export function getPageviewStats(
-  website_id,
-  start_at,
-  end_at,
-  timezone = 'utc',
-  unit = 'day',
-  count = '*',
-  filters = {},
-) {
-  const params = [website_id, start_at, end_at];
-  const { pageviewQuery, sessionQuery, joinSession } = parseFilters('pageview', filters, params);
-
-  return rawQuery(
-    `
-    select ${getDateQuery('pageview.created_at', unit, timezone)} t,
-      count(${count}) y
-    from pageview
-      ${joinSession}
-    where pageview.website_id=$1
-    and pageview.created_at between $2 and $3
-    ${pageviewQuery}
-    ${sessionQuery}
-    group by 1
-    order by 1
-    `,
-    params,
-  );
-}
-
-export function getSessionMetrics(website_id, start_at, end_at, field, filters = {}) {
-  const params = [website_id, start_at, end_at];
-  const { pageviewQuery, sessionQuery, joinSession } = parseFilters('pageview', filters, params);
-
-  return rawQuery(
-    `
-    select ${field} x, count(*) y
-    from session as x
-    where x.session_id in (
-      select pageview.session_id
-      from pageview
-        ${joinSession}
-      where pageview.website_id=$1
-      and pageview.created_at between $2 and $3
-      ${pageviewQuery}
-      ${sessionQuery}
-    )
-    group by 1
-    order by 2 desc
-    `,
-    params,
-  );
-}
-
-export function getPageviewMetrics(website_id, start_at, end_at, field, table, filters = {}) {
-  const params = [website_id, start_at, end_at];
-  const { pageviewQuery, sessionQuery, eventQuery, joinSession } = parseFilters(
-    table,
-    filters,
-    params,
-  );
-
-  return rawQuery(
-    `
-    select ${field} x, count(*) y
-    from ${table}
-      ${joinSession}
-    where ${table}.website_id=$1
-    and ${table}.created_at between $2 and $3
-    ${pageviewQuery}
-    ${joinSession && sessionQuery}
-    ${eventQuery}
-    group by 1
-    order by 2 desc
-    `,
-    params,
-  );
-}
-
-export function getActiveVisitors(website_id) {
-  const date = subMinutes(new Date(), 5);
-  const params = [website_id, date];
-
-  return rawQuery(
-    `
-    select count(distinct session_id) x
-    from pageview
-    where website_id=$1
-    and created_at >= $2
-    `,
-    params,
-  );
-}
-
-export function getEventMetrics(
-  website_id,
-  start_at,
-  end_at,
-  timezone = 'utc',
-  unit = 'day',
-  filters = {},
-) {
-  const params = [website_id, start_at, end_at];
-
-  return rawQuery(
-    `
-    select
-      event_value x,
-      ${getDateQuery('created_at', unit, timezone)} t,
-      count(*) y
-    from event
-    where website_id=$1
-    and created_at between $2 and $3
-    ${getFilterQuery('event', filters, params)}
-    group by 1, 2
-    order by 2
-    `,
-    params,
-  );
-}
-
-export async function getRealtimeData(websites, time) {
-  const [pageviews, sessions, events] = await Promise.all([
-    getPageviews(websites, time),
-    getSessions(websites, time),
-    getEvents(websites, time),
-  ]);
-
-  return {
-    pageviews: pageviews.map(({ view_id, ...props }) => ({
-      __id: `p${view_id}`,
-      view_id,
-      ...props,
-    })),
-    sessions: sessions.map(({ session_id, ...props }) => ({
-      __id: `s${session_id}`,
-      session_id,
-      ...props,
-    })),
-    events: events.map(({ event_id, ...props }) => ({
-      __id: `e${event_id}`,
-      event_id,
-      ...props,
-    })),
-    timestamp: Date.now(),
-  };
-}
--- a/lib/session.js
+++ b/lib/session.js
@ -1,4 +1,4 @@
-import { getWebsiteByUuid, getSessionByUuid, createSession } from 'lib/queries';
+import { getWebsiteByUuid, getSessionByUuid, createSession } from 'queries';
 import { getJsonBody, getClientInfo } from 'lib/request';
 import { uuid, isValidUuid, parseToken } from 'lib/crypto';

--- a/lib/url.js
+++ b/lib/url.js
@ -6,14 +6,6 @@ export function removeWWW(url) {
  return url && url.length > 1 && url.startsWith('www.') ? url.slice(4) : url;
 }

-export function getDomainName(str) {
-  try {
-    return new URL(str).hostname;
-  } catch (e) {
-    return str;
-  }
-}
-
 export function getQueryString(params = {}) {
  const map = Object.keys(params).reduce((arr, key) => {
    if (params[key] !== undefined) {
--- a/pages/_middleware.js
+++ b/pages/_middleware.js
@ -1,5 +1,23 @@
 import { NextResponse } from 'next/server';

+export const config = {
+  matcher: '/:path*',
+};
+
+function customCollectEndpoint(req) {
+  const collectEndpoint = process.env.COLLECT_API_ENDPOINT;
+
+  if (collectEndpoint) {
+    const url = req.nextUrl.clone();
+    const { pathname } = url;
+
+    if (pathname.endsWith(collectEndpoint)) {
+      url.pathname = '/api/collect';
+      return NextResponse.rewrite(url);
+    }
+  }
+}
+
 function customScriptName(req) {
  const scriptName = process.env.TRACKER_SCRIPT_NAME;

@ -23,8 +41,8 @@ function forceSSL(req, res) {
  return res;
 }

-export function middleware(req) {
-  const fns = [customScriptName];
+export default function middleware(req) {
+  const fns = [customCollectEndpoint, customScriptName];

  for (const fn of fns) {
    const res = fn(req);
--- a/next.config.js
+++ b/next.config.js
@ -6,11 +6,10 @@ module.exports = {
    currentVersion: pkg.version,
    loginDisabled: process.env.DISABLE_LOGIN,
    updatesDisabled: process.env.DISABLE_UPDATES,
+    telemetryDisabled: process.env.DISABLE_TELEMETRY,
  },
  basePath: process.env.BASE_PATH,
-  experimental: {
-    outputStandalone: true,
-  },
+  output: 'standalone',
  eslint: {
    ignoreDuringBuilds: true,
  },
--- a/package.json
+++ b/package.json
@ -1,13 +1,13 @@
 {
  "name": "umami",
-  "version": "1.33.1",
+  "version": "1.34.0",
  "description": "A simple, fast, privacy-focused alternative to Google Analytics.",
  "author": "Mike Cao <mike@mikecao.com>",
  "license": "MIT",
  "homepage": "https://umami.is",
  "repository": {
    "type": "git",
-    "url": "https://github.com/mikecao/umami.git"
+    "url": "https://github.com/umami-software/umami.git"
  },
  "scripts": {
    "dev": "next dev",
@ -55,7 +55,7 @@
  },
  "dependencies": {
    "@fontsource/inter": "4.5.7",
-    "@prisma/client": "3.15.2",
+    "@prisma/client": "4.1.0",
    "bcryptjs": "^2.4.3",
    "chalk": "^4.1.1",
    "chart.js": "^2.9.4",
@ -79,8 +79,8 @@
    "jose": "2.0.5",
    "maxmind": "^4.3.6",
    "moment-timezone": "^0.5.33",
-    "next": "12.1.0",
-    "node-fetch": "^3.2.3",
+    "next": "^12.2.0",
+    "node-fetch": "^3.2.8",
    "npm-run-all": "^4.1.5",
    "prop-types": "^15.7.2",
    "react": "^17.0.0",
@ -101,10 +101,11 @@
  "devDependencies": {
    "@formatjs/cli": "^4.2.29",
    "@rollup/plugin-buble": "^0.21.3",
+    "@rollup/plugin-replace": "^4.0.0",
    "@svgr/webpack": "^6.2.1",
    "cross-env": "^7.0.3",
    "eslint": "^7.32.0",
-    "eslint-config-next": "^12.0.1",
+    "eslint-config-next": "^12.2.0",
    "eslint-config-prettier": "^8.5.0",
    "eslint-plugin-prettier": "^4.0.0",
    "extract-react-intl-messages": "^4.1.1",
@ -116,7 +117,7 @@
    "postcss-preset-env": "7.4.3",
    "postcss-rtlcss": "^3.6.1",
    "prettier": "^2.6.2",
-    "prisma": "3.15.2",
+    "prisma": "4.1.0",
    "prompts": "2.4.2",
    "rollup": "^2.70.1",
    "rollup-plugin-terser": "^7.0.2",
--- a/pages/api/account/[id].js
+++ b/pages/api/account/[id].js
@ -1,4 +1,4 @@
-import { getAccountById, deleteAccount } from 'lib/queries';
+import { getAccountById, deleteAccount } from 'queries';
 import { useAuth } from 'lib/middleware';
 import { methodNotAllowed, ok, unauthorized } from 'lib/response';

--- a/pages/api/account/index.js
+++ b/pages/api/account/index.js
@ -1,4 +1,4 @@
-import { getAccountById, getAccountByUsername, updateAccount, createAccount } from 'lib/queries';
+import { getAccountById, getAccountByUsername, updateAccount, createAccount } from 'queries';
 import { useAuth } from 'lib/middleware';
 import { hashPassword } from 'lib/crypto';
 import { ok, unauthorized, methodNotAllowed, badRequest } from 'lib/response';
--- a/pages/api/account/password.js
+++ b/pages/api/account/password.js
@ -1,4 +1,4 @@
-import { getAccountById, updateAccount } from 'lib/queries';
+import { getAccountById, updateAccount } from 'queries';
 import { useAuth } from 'lib/middleware';
 import { badRequest, methodNotAllowed, ok, unauthorized } from 'lib/response';
 import { checkPassword, hashPassword } from 'lib/crypto';
--- a/pages/api/accounts/index.js
+++ b/pages/api/accounts/index.js
@ -1,4 +1,4 @@
-import { getAccounts } from 'lib/queries';
+import { getAccounts } from 'queries';
 import { useAuth } from 'lib/middleware';
 import { ok, unauthorized, methodNotAllowed } from 'lib/response';

--- a/pages/api/auth/login.js
+++ b/pages/api/auth/login.js
@ -1,5 +1,5 @@
 import { checkPassword, createSecureToken } from 'lib/crypto';
-import { getAccountByUsername } from 'lib/queries';
+import { getAccountByUsername } from 'queries/admin/account/getAccountByUsername';
 import { ok, unauthorized, badRequest } from 'lib/response';

 export default async (req, res) => {
--- a/pages/api/collect.js
+++ b/pages/api/collect.js
@ -1,7 +1,7 @@
 const { Resolver } = require('dns').promises;
 import isbot from 'isbot';
 import ipaddr from 'ipaddr.js';
-import { savePageView, saveEvent } from 'lib/queries';
+import { savePageView, saveEvent } from 'queries';
 import { useCors, useSession } from 'lib/middleware';
 import { getJsonBody, getIpAddress } from 'lib/request';
 import { ok, send, badRequest, forbidden } from 'lib/response';
--- a/pages/api/realtime/init.js
+++ b/pages/api/realtime/init.js
@ -1,7 +1,7 @@
 import { subMinutes } from 'date-fns';
 import { useAuth } from 'lib/middleware';
 import { ok, methodNotAllowed } from 'lib/response';
-import { getUserWebsites, getRealtimeData } from 'lib/queries';
+import { getUserWebsites, getRealtimeData } from 'queries';
 import { createToken } from 'lib/crypto';

 export default async (req, res) => {
--- a/pages/api/realtime/update.js
+++ b/pages/api/realtime/update.js
@ -1,6 +1,6 @@
 import { useAuth } from 'lib/middleware';
 import { ok, methodNotAllowed, badRequest } from 'lib/response';
-import { getRealtimeData } from 'lib/queries';
+import { getRealtimeData } from 'queries';
 import { parseToken } from 'lib/crypto';
 import { SHARE_TOKEN_HEADER } from 'lib/constants';

--- a/pages/api/share/[id].js
+++ b/pages/api/share/[id].js
@ -1,4 +1,4 @@
-import { getWebsiteByShareId } from 'lib/queries';
+import { getWebsiteByShareId } from 'queries';
 import { ok, notFound, methodNotAllowed } from 'lib/response';
 import { createToken } from 'lib/crypto';

--- a/pages/api/website/[id]/active.js
+++ b/pages/api/website/[id]/active.js
@ -1,7 +1,7 @@
-import { getActiveVisitors } from 'lib/queries';
 import { methodNotAllowed, ok, unauthorized } from 'lib/response';
 import { allowQuery } from 'lib/auth';
 import { useCors } from 'lib/middleware';
+import { getActiveVisitors } from 'queries';

 export default async (req, res) => {
  if (req.method === 'GET') {
--- a/pages/api/website/[id]/events.js
+++ b/pages/api/website/[id]/events.js
@ -1,5 +1,5 @@
 import moment from 'moment-timezone';
-import { getEventMetrics } from 'lib/queries';
+import { getEventMetrics } from 'queries';
 import { ok, badRequest, methodNotAllowed, unauthorized } from 'lib/response';
 import { allowQuery } from 'lib/auth';
 import { useCors } from 'lib/middleware';
--- a/pages/api/website/[id]/index.js
+++ b/pages/api/website/[id]/index.js
@ -1,4 +1,4 @@
-import { deleteWebsite, getWebsiteById } from 'lib/queries';
+import { deleteWebsite, getWebsiteById } from 'queries';
 import { methodNotAllowed, ok, unauthorized } from 'lib/response';
 import { allowQuery } from 'lib/auth';
 import { useCors } from 'lib/middleware';
--- a/pages/api/website/[id]/metrics.js
+++ b/pages/api/website/[id]/metrics.js
@ -1,9 +1,9 @@
-import { getPageviewMetrics, getSessionMetrics, getWebsiteById } from 'lib/queries';
+import { getPageviewMetrics, getSessionMetrics, getWebsiteById } from 'queries';
 import { ok, methodNotAllowed, unauthorized, badRequest } from 'lib/response';
 import { allowQuery } from 'lib/auth';
 import { useCors } from 'lib/middleware';

-const sessionColumns = ['browser', 'os', 'device', 'country', 'language'];
+const sessionColumns = ['browser', 'os', 'device', 'screen', 'country', 'language'];
 const pageviewColumns = ['url', 'referrer'];

 function getTable(type) {
@ -69,7 +69,7 @@ export default async (req, res) => {
    if (pageviewColumns.includes(type) || type === 'event') {
      let domain;
      if (type === 'referrer') {
-        const website = getWebsiteById(websiteId);
+        const website = await getWebsiteById(websiteId);

        if (!website) {
          return badRequest(res);
@ -80,17 +80,18 @@ export default async (req, res) => {

      const column = getColumn(type);
      const table = getTable(type);
-
-      const data = await getPageviewMetrics(websiteId, startDate, endDate, column, table, {
+      const filters = {
        domain,
        url: type !== 'url' && table !== 'event' ? url : undefined,
-        referrer: type !== 'referrer' ? referrer : undefined,
+        referrer: type !== 'referrer' ? referrer : true,
        os: type !== 'os' ? os : undefined,
        browser: type !== 'browser' ? browser : undefined,
        device: type !== 'device' ? device : undefined,
        country: type !== 'country' ? country : undefined,
        event_url: type !== 'url' && table === 'event' ? url : undefined,
-      });
+      };
+
+      const data = await getPageviewMetrics(websiteId, startDate, endDate, column, table, filters);

      return ok(res, data);
    }
--- a/pages/api/website/[id]/pageviews.js
+++ b/pages/api/website/[id]/pageviews.js
@ -1,5 +1,5 @@
 import moment from 'moment-timezone';
-import { getPageviewStats } from 'lib/queries';
+import { getPageviewStats } from 'queries';
 import { ok, badRequest, methodNotAllowed, unauthorized } from 'lib/response';
 import { allowQuery } from 'lib/auth';
 import { useCors } from 'lib/middleware';
--- a/pages/api/website/[id]/reset.js
+++ b/pages/api/website/[id]/reset.js
@ -1,4 +1,4 @@
-import { resetWebsite } from 'lib/queries';
+import { resetWebsite } from 'queries';
 import { methodNotAllowed, ok, unauthorized } from 'lib/response';
 import { allowQuery } from 'lib/auth';

--- a/pages/api/website/[id]/stats.js
+++ b/pages/api/website/[id]/stats.js
@ -1,4 +1,4 @@
-import { getWebsiteStats } from 'lib/queries';
+import { getWebsiteStats } from 'queries';
 import { methodNotAllowed, ok, unauthorized } from 'lib/response';
 import { allowQuery } from 'lib/auth';
 import { useCors } from 'lib/middleware';
@ -41,7 +41,7 @@ export default async (req, res) => {
    const stats = Object.keys(metrics[0]).reduce((obj, key) => {
      obj[key] = {
        value: Number(metrics[0][key]) || 0,
-        change: Number(metrics[0][key] - prevPeriod[0][key]) || 0,
+        change: Number(metrics[0][key]) - Number(prevPeriod[0][key]) || 0,
      };
      return obj;
    }, {});
--- a/pages/api/website/index.js
+++ b/pages/api/website/index.js
@ -1,4 +1,4 @@
-import { updateWebsite, createWebsite, getWebsiteById } from 'lib/queries';
+import { updateWebsite, createWebsite, getWebsiteById } from 'queries';
 import { useAuth } from 'lib/middleware';
 import { uuid, getRandomChars } from 'lib/crypto';
 import { ok, unauthorized, methodNotAllowed } from 'lib/response';
--- a/pages/api/websites/index.js
+++ b/pages/api/websites/index.js
@ -1,4 +1,4 @@
-import { getAllWebsites, getUserWebsites } from 'lib/queries';
+import { getAllWebsites, getUserWebsites } from 'queries';
 import { useAuth } from 'lib/middleware';
 import { ok, methodNotAllowed, unauthorized } from 'lib/response';

--- a/public/intl/messages/ar-SA.json
+++ b/public/intl/messages/ar-SA.json
@ -247,6 +247,12 @@
      "value": "كلمة مرور جديدة"
    }
  ],
+  "label.none": [
+    {
+      "type": 0,
+      "value": "None"
+    }
+  ],
  "label.owner": [
    {
      "type": 0,
@ -728,13 +734,7 @@
  "metrics.filter.combined": [
    {
      "type": 0,
-      "value": "مجمعة"
-    }
-  ],
-  "metrics.filter.domain-only": [
-    {
-      "type": 0,
-      "value": "نطاق فقط"
+      "value": "Combined"
    }
  ],
  "metrics.filter.raw": [
@ -773,6 +773,12 @@
      "value": "التحويلات"
    }
  ],
+  "metrics.screens": [
+    {
+      "type": 0,
+      "value": "Screens"
+    }
+  ],
  "metrics.unique-visitors": [
    {
      "type": 0,
--- a/public/intl/messages/ca-ES.json
+++ b/public/intl/messages/ca-ES.json
@ -247,6 +247,12 @@
      "value": "Contrasenya nova"
    }
  ],
+  "label.none": [
+    {
+      "type": 0,
+      "value": "None"
+    }
+  ],
  "label.owner": [
    {
      "type": 0,
@ -728,13 +734,7 @@
  "metrics.filter.combined": [
    {
      "type": 0,
-      "value": "Combinat"
-    }
-  ],
-  "metrics.filter.domain-only": [
-    {
-      "type": 0,
-      "value": "Només domini"
+      "value": "Combined"
    }
  ],
  "metrics.filter.raw": [
@ -773,6 +773,12 @@
      "value": "Referents"
    }
  ],
+  "metrics.screens": [
+    {
+      "type": 0,
+      "value": "Screens"
+    }
+  ],
  "metrics.unique-visitors": [
    {
      "type": 0,
--- a/public/intl/messages/cs-CZ.json
+++ b/public/intl/messages/cs-CZ.json
@ -247,6 +247,12 @@
      "value": "Nové heslo"
    }
  ],
+  "label.none": [
+    {
+      "type": 0,
+      "value": "None"
+    }
+  ],
  "label.owner": [
    {
      "type": 0,
@ -728,13 +734,7 @@
  "metrics.filter.combined": [
    {
      "type": 0,
-      "value": "Kombinace"
-    }
-  ],
-  "metrics.filter.domain-only": [
-    {
-      "type": 0,
-      "value": "Domény"
+      "value": "Combined"
    }
  ],
  "metrics.filter.raw": [
@ -773,6 +773,12 @@
      "value": "Odkazy"
    }
  ],
+  "metrics.screens": [
+    {
+      "type": 0,
+      "value": "Screens"
+    }
+  ],
  "metrics.unique-visitors": [
    {
      "type": 0,
--- a/public/intl/messages/da-DK.json
+++ b/public/intl/messages/da-DK.json
@ -32,19 +32,19 @@
  "label.all-events": [
    {
      "type": 0,
-      "value": "All events"
+      "value": "Alle hændelser"
    }
  ],
  "label.all-time": [
    {
      "type": 0,
-      "value": "All time"
+      "value": "Altid"
    }
  ],
  "label.all-websites": [
    {
      "type": 0,
-      "value": "Alle websites"
+      "value": "Alle hjemmesider"
    }
  ],
  "label.back": [
@ -176,7 +176,7 @@
  "label.language": [
    {
      "type": 0,
-      "value": "Language"
+      "value": "Sprog"
    }
  ],
  "label.last-days": [
@ -210,7 +210,7 @@
  "label.logged-in-as": [
    {
      "type": 0,
-      "value": "Loggede ind som "
+      "value": "Logget ind som "
    },
    {
      "type": 1,
@ -247,10 +247,16 @@
      "value": "Ny adgangskode"
    }
  ],
+  "label.none": [
+    {
+      "type": 0,
+      "value": "None"
+    }
+  ],
  "label.owner": [
    {
      "type": 0,
-      "value": "Owner"
+      "value": "Ejer"
    }
  ],
  "label.password": [
@ -262,7 +268,7 @@
  "label.passwords-dont-match": [
    {
      "type": 0,
-      "value": "Adgangskoder matcher ikke"
+      "value": "Adgangskoderne matcher ikke"
    }
  ],
  "label.profile": [
@ -298,13 +304,13 @@
  "label.reset": [
    {
      "type": 0,
-      "value": "Reset"
+      "value": "Nulstil"
    }
  ],
  "label.reset-website": [
    {
      "type": 0,
-      "value": "Reset statistics"
+      "value": "Nulstil statistikker"
    }
  ],
  "label.save": [
@ -334,7 +340,7 @@
  "label.theme": [
    {
      "type": 0,
-      "value": "Theme"
+      "value": "Tema"
    }
  ],
  "label.this-month": [
@ -448,7 +454,7 @@
  "message.confirm-reset": [
    {
      "type": 0,
-      "value": "Are your sure you want to reset "
+      "value": "Er du sikker på at du ville nulstille "
    },
    {
      "type": 1,
@ -456,7 +462,7 @@
    },
    {
      "type": 0,
-      "value": "'s statistics?"
+      "value": "'s statistikker?"
    }
  ],
  "message.copied": [
@ -558,7 +564,7 @@
  "message.no-websites-configured": [
    {
      "type": 0,
-      "value": "Du har ikke konfigureret nogen websteder."
+      "value": "Du har ikke konfigureret nogen hjemmesider."
    }
  ],
  "message.page-not-found": [
@ -580,7 +586,7 @@
  "message.reset-warning": [
    {
      "type": 0,
-      "value": "All statistics for this website will be deleted, but your tracking code will remain intact."
+      "value": "Alle statistikker for denne hjemmeside ville blive slettet, men sporingskode ville forblive intakt."
    }
  ],
  "message.save-success": [
@ -592,7 +598,7 @@
  "message.share-url": [
    {
      "type": 0,
-      "value": "Dette er den offentligt delings-URL til "
+      "value": "Dette er den offentlige delings-URL til "
    },
    {
      "type": 1,
@ -606,7 +612,7 @@
  "message.toggle-charts": [
    {
      "type": 0,
-      "value": "Toggle charts"
+      "value": "Ændre graf"
    }
  ],
  "message.track-stats": [
@ -628,7 +634,7 @@
    },
    {
      "type": 0,
-      "value": " sektionen på dit websted."
+      "value": " sektionen på din hjemmeside."
    }
  ],
  "message.type-delete": [
@ -728,13 +734,7 @@
  "metrics.filter.combined": [
    {
      "type": 0,
-      "value": "Kombineret"
-    }
-  ],
-  "metrics.filter.domain-only": [
-    {
-      "type": 0,
-      "value": "Kun domæne"
+      "value": "Combined"
    }
  ],
  "metrics.filter.raw": [
@ -746,7 +746,7 @@
  "metrics.languages": [
    {
      "type": 0,
-      "value": "Languages"
+      "value": "Sprog"
    }
  ],
  "metrics.operating-systems": [
@ -773,6 +773,12 @@
      "value": "Henvisninger"
    }
  ],
+  "metrics.screens": [
+    {
+      "type": 0,
+      "value": "Screens"
+    }
+  ],
  "metrics.unique-visitors": [
    {
      "type": 0,
--- a/public/intl/messages/de-DE.json
+++ b/public/intl/messages/de-DE.json
@ -247,6 +247,12 @@
      "value": "Neues Passwort"
    }
  ],
+  "label.none": [
+    {
+      "type": 0,
+      "value": "None"
+    }
+  ],
  "label.owner": [
    {
      "type": 0,
@ -728,13 +734,7 @@
  "metrics.filter.combined": [
    {
      "type": 0,
-      "value": "Kombiniert"
-    }
-  ],
-  "metrics.filter.domain-only": [
-    {
-      "type": 0,
-      "value": "Nur diese Domain"
+      "value": "Combined"
    }
  ],
  "metrics.filter.raw": [
@ -773,6 +773,12 @@
      "value": "Referrer"
    }
  ],
+  "metrics.screens": [
+    {
+      "type": 0,
+      "value": "Bildschirmauflösungen"
+    }
+  ],
  "metrics.unique-visitors": [
    {
      "type": 0,
--- a/public/intl/messages/el-GR.json
+++ b/public/intl/messages/el-GR.json
@ -247,6 +247,12 @@
      "value": "Νέος κωδικός"
    }
  ],
+  "label.none": [
+    {
+      "type": 0,
+      "value": "None"
+    }
+  ],
  "label.owner": [
    {
      "type": 0,
@ -728,13 +734,7 @@
  "metrics.filter.combined": [
    {
      "type": 0,
-      "value": "Σε συνδυασμό"
-    }
-  ],
-  "metrics.filter.domain-only": [
-    {
-      "type": 0,
-      "value": "Μόνο τομέας"
+      "value": "Combined"
    }
  ],
  "metrics.filter.raw": [
@ -773,6 +773,12 @@
      "value": "Παραπομπές"
    }
  ],
+  "metrics.screens": [
+    {
+      "type": 0,
+      "value": "Screens"
+    }
+  ],
  "metrics.unique-visitors": [
    {
      "type": 0,
--- a/public/intl/messages/en-GB.json
+++ b/public/intl/messages/en-GB.json
@ -247,6 +247,12 @@
      "value": "New password"
    }
  ],
+  "label.none": [
+    {
+      "type": 0,
+      "value": "None"
+    }
+  ],
  "label.owner": [
    {
      "type": 0,
@ -731,12 +737,6 @@
      "value": "Combined"
    }
  ],
-  "metrics.filter.domain-only": [
-    {
-      "type": 0,
-      "value": "Domain only"
-    }
-  ],
  "metrics.filter.raw": [
    {
      "type": 0,
@ -773,6 +773,12 @@
      "value": "Referrers"
    }
  ],
+  "metrics.screens": [
+    {
+      "type": 0,
+      "value": "Screens"
+    }
+  ],
  "metrics.unique-visitors": [
    {
      "type": 0,
--- a/public/intl/messages/en-US.json
+++ b/public/intl/messages/en-US.json
@ -247,6 +247,12 @@
      "value": "New password"
    }
  ],
+  "label.none": [
+    {
+      "type": 0,
+      "value": "None"
+    }
+  ],
  "label.owner": [
    {
      "type": 0,
@ -731,12 +737,6 @@
      "value": "Combined"
    }
  ],
-  "metrics.filter.domain-only": [
-    {
-      "type": 0,
-      "value": "Domain only"
-    }
-  ],
  "metrics.filter.raw": [
    {
      "type": 0,
@ -773,6 +773,12 @@
      "value": "Referrers"
    }
  ],
+  "metrics.screens": [
+    {
+      "type": 0,
+      "value": "Screens"
+    }
+  ],
  "metrics.unique-visitors": [
    {
      "type": 0,
--- a/public/intl/messages/es-MX.json
+++ b/public/intl/messages/es-MX.json
@ -247,6 +247,12 @@
      "value": "Nueva contraseña"
    }
  ],
+  "label.none": [
+    {
+      "type": 0,
+      "value": "None"
+    }
+  ],
  "label.owner": [
    {
      "type": 0,
@ -728,13 +734,7 @@
  "metrics.filter.combined": [
    {
      "type": 0,
-      "value": "Combinado"
-    }
-  ],
-  "metrics.filter.domain-only": [
-    {
-      "type": 0,
-      "value": "Únicamente dominio"
+      "value": "Combined"
    }
  ],
  "metrics.filter.raw": [
@ -773,6 +773,12 @@
      "value": "Referentes"
    }
  ],
+  "metrics.screens": [
+    {
+      "type": 0,
+      "value": "Screens"
+    }
+  ],
  "metrics.unique-visitors": [
    {
      "type": 0,
--- a/public/intl/messages/fa-IR.json
+++ b/public/intl/messages/fa-IR.json
@ -247,6 +247,12 @@
      "value": "رمز جدید"
    }
  ],
+  "label.none": [
+    {
+      "type": 0,
+      "value": "None"
+    }
+  ],
  "label.owner": [
    {
      "type": 0,
@ -712,13 +718,7 @@
  "metrics.filter.combined": [
    {
      "type": 0,
-      "value": "ترکیب شده"
-    }
-  ],
-  "metrics.filter.domain-only": [
-    {
-      "type": 0,
-      "value": "فقط دامنه"
+      "value": "Combined"
    }
  ],
  "metrics.filter.raw": [
@ -757,6 +757,12 @@
      "value": "ارجاع دهندگان"
    }
  ],
+  "metrics.screens": [
+    {
+      "type": 0,
+      "value": "Screens"
+    }
+  ],
  "metrics.unique-visitors": [
    {
      "type": 0,
--- a/public/intl/messages/fi-FI.json
+++ b/public/intl/messages/fi-FI.json
@ -247,6 +247,12 @@
      "value": "Uusi salasana"
    }
  ],
+  "label.none": [
+    {
+      "type": 0,
+      "value": "None"
+    }
+  ],
  "label.owner": [
    {
      "type": 0,
@ -728,13 +734,7 @@
  "metrics.filter.combined": [
    {
      "type": 0,
-      "value": "Yhdistetty"
-    }
-  ],
-  "metrics.filter.domain-only": [
-    {
-      "type": 0,
-      "value": "Vain verkkotunnus"
+      "value": "Combined"
    }
  ],
  "metrics.filter.raw": [
@ -773,6 +773,12 @@
      "value": "Viittaajat"
    }
  ],
+  "metrics.screens": [
+    {
+      "type": 0,
+      "value": "Screens"
+    }
+  ],
  "metrics.unique-visitors": [
    {
      "type": 0,
--- a/public/intl/messages/fo-FO.json
+++ b/public/intl/messages/fo-FO.json
@ -247,6 +247,12 @@
      "value": "Nýtt loyniorð"
    }
  ],
+  "label.none": [
+    {
+      "type": 0,
+      "value": "None"
+    }
+  ],
  "label.owner": [
    {
      "type": 0,
@ -728,13 +734,7 @@
  "metrics.filter.combined": [
    {
      "type": 0,
-      "value": "Samansett"
-    }
-  ],
-  "metrics.filter.domain-only": [
-    {
-      "type": 0,
-      "value": "Bara økisnavn"
+      "value": "Combined"
    }
  ],
  "metrics.filter.raw": [
@ -773,6 +773,12 @@
      "value": "Framsendingar"
    }
  ],
+  "metrics.screens": [
+    {
+      "type": 0,
+      "value": "Screens"
+    }
+  ],
  "metrics.unique-visitors": [
    {
      "type": 0,
--- a/public/intl/messages/fr-FR.json
+++ b/public/intl/messages/fr-FR.json
@ -239,6 +239,12 @@
      "value": "Nouveau mot de passe"
    }
  ],
+  "label.none": [
+    {
+      "type": 0,
+      "value": "None"
+    }
+  ],
  "label.owner": [
    {
      "type": 0,
@ -724,13 +730,7 @@
  "metrics.filter.combined": [
    {
      "type": 0,
-      "value": "Combiné"
-    }
-  ],
-  "metrics.filter.domain-only": [
-    {
-      "type": 0,
-      "value": "Domaine uniquement"
+      "value": "Combined"
    }
  ],
  "metrics.filter.raw": [
@ -769,6 +769,12 @@
      "value": "Sources"
    }
  ],
+  "metrics.screens": [
+    {
+      "type": 0,
+      "value": "Screens"
+    }
+  ],
  "metrics.unique-visitors": [
    {
      "type": 0,
--- a/public/intl/messages/ga-ES.json
+++ b/public/intl/messages/ga-ES.json
@ -247,6 +247,12 @@
      "value": "Novo contrasinal"
    }
  ],
+  "label.none": [
+    {
+      "type": 0,
+      "value": "None"
+    }
+  ],
  "label.owner": [
    {
      "type": 0,
@ -728,13 +734,7 @@
  "metrics.filter.combined": [
    {
      "type": 0,
-      "value": "Combinado"
-    }
-  ],
-  "metrics.filter.domain-only": [
-    {
-      "type": 0,
-      "value": "Só dominio"
+      "value": "Combined"
    }
  ],
  "metrics.filter.raw": [
@ -773,6 +773,12 @@
      "value": "Orixes"
    }
  ],
+  "metrics.screens": [
+    {
+      "type": 0,
+      "value": "Screens"
+    }
+  ],
  "metrics.unique-visitors": [
    {
      "type": 0,
--- a/public/intl/messages/he-IL.json
+++ b/public/intl/messages/he-IL.json
@ -239,6 +239,12 @@
      "value": "סיסמה חדשה"
    }
  ],
+  "label.none": [
+    {
+      "type": 0,
+      "value": "None"
+    }
+  ],
  "label.owner": [
    {
      "type": 0,
@ -708,13 +714,7 @@
  "metrics.filter.combined": [
    {
      "type": 0,
-      "value": "משותף"
-    }
-  ],
-  "metrics.filter.domain-only": [
-    {
-      "type": 0,
-      "value": "דומיין בלבד"
+      "value": "Combined"
    }
  ],
  "metrics.filter.raw": [
@ -753,6 +753,12 @@
      "value": "מפנים"
    }
  ],
+  "metrics.screens": [
+    {
+      "type": 0,
+      "value": "Screens"
+    }
+  ],
  "metrics.unique-visitors": [
    {
      "type": 0,
--- a/public/intl/messages/hi-IN.json
+++ b/public/intl/messages/hi-IN.json
@ -247,6 +247,12 @@
      "value": "नया पासवर्ड"
    }
  ],
+  "label.none": [
+    {
+      "type": 0,
+      "value": "None"
+    }
+  ],
  "label.owner": [
    {
      "type": 0,
@ -716,13 +722,7 @@
  "metrics.filter.combined": [
    {
      "type": 0,
-      "value": "संयुक्त"
-    }
-  ],
-  "metrics.filter.domain-only": [
-    {
-      "type": 0,
-      "value": "केवल डोमेन"
+      "value": "Combined"
    }
  ],
  "metrics.filter.raw": [
@ -761,6 +761,12 @@
      "value": "सन्दर्भदाता"
    }
  ],
+  "metrics.screens": [
+    {
+      "type": 0,
+      "value": "Screens"
+    }
+  ],
  "metrics.unique-visitors": [
    {
      "type": 0,
--- a/public/intl/messages/hu-HU.json
+++ b/public/intl/messages/hu-HU.json
@ -247,6 +247,12 @@
      "value": "Új jelszó"
    }
  ],
+  "label.none": [
+    {
+      "type": 0,
+      "value": "None"
+    }
+  ],
  "label.owner": [
    {
      "type": 0,
@ -728,13 +734,7 @@
  "metrics.filter.combined": [
    {
      "type": 0,
-      "value": "Összevont"
-    }
-  ],
-  "metrics.filter.domain-only": [
-    {
-      "type": 0,
-      "value": "Csak domain"
+      "value": "Combined"
    }
  ],
  "metrics.filter.raw": [
@ -773,6 +773,12 @@
      "value": "Hivatkozók"
    }
  ],
+  "metrics.screens": [
+    {
+      "type": 0,
+      "value": "Screens"
+    }
+  ],
  "metrics.unique-visitors": [
    {
      "type": 0,
--- a/public/intl/messages/id-ID.json
+++ b/public/intl/messages/id-ID.json
@ -239,6 +239,12 @@
      "value": "Kata sandi baru"
    }
  ],
+  "label.none": [
+    {
+      "type": 0,
+      "value": "None"
+    }
+  ],
  "label.owner": [
    {
      "type": 0,
@ -696,13 +702,7 @@
  "metrics.filter.combined": [
    {
      "type": 0,
-      "value": "Gabungan"
-    }
-  ],
-  "metrics.filter.domain-only": [
-    {
-      "type": 0,
-      "value": "Hanya domain"
+      "value": "Combined"
    }
  ],
  "metrics.filter.raw": [
@ -741,6 +741,12 @@
      "value": "Perujuk"
    }
  ],
+  "metrics.screens": [
+    {
+      "type": 0,
+      "value": "Screens"
+    }
+  ],
  "metrics.unique-visitors": [
    {
      "type": 0,
--- a/public/intl/messages/it-IT.json
+++ b/public/intl/messages/it-IT.json
@ -247,6 +247,12 @@
      "value": "Nuova password"
    }
  ],
+  "label.none": [
+    {
+      "type": 0,
+      "value": "None"
+    }
+  ],
  "label.owner": [
    {
      "type": 0,
@ -732,13 +738,7 @@
  "metrics.filter.combined": [
    {
      "type": 0,
-      "value": "Aggregati"
-    }
-  ],
-  "metrics.filter.domain-only": [
-    {
-      "type": 0,
-      "value": "Solo dominio"
+      "value": "Combined"
    }
  ],
  "metrics.filter.raw": [
@ -777,6 +777,12 @@
      "value": "Referrers"
    }
  ],
+  "metrics.screens": [
+    {
+      "type": 0,
+      "value": "Screens"
+    }
+  ],
  "metrics.unique-visitors": [
    {
      "type": 0,
--- a/public/intl/messages/ja-JP.json
+++ b/public/intl/messages/ja-JP.json
@ -247,6 +247,12 @@
      "value": "新しいパスワード"
    }
  ],
+  "label.none": [
+    {
+      "type": 0,
+      "value": "None"
+    }
+  ],
  "label.owner": [
    {
      "type": 0,
@ -700,13 +706,7 @@
  "metrics.filter.combined": [
    {
      "type": 0,
-      "value": "パスまで"
-    }
-  ],
-  "metrics.filter.domain-only": [
-    {
-      "type": 0,
-      "value": "ドメインのみ"
+      "value": "Combined"
    }
  ],
  "metrics.filter.raw": [
@ -745,6 +745,12 @@
      "value": "リファラー"
    }
  ],
+  "metrics.screens": [
+    {
+      "type": 0,
+      "value": "Screens"
+    }
+  ],
  "metrics.unique-visitors": [
    {
      "type": 0,
--- a/Show More
+++ b/Show More