Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Added regions and cities support.
Mike Caof2edd0d604b7
diff --git a/components/common/HamburgerButton.js b/components/common/HamburgerButton.jsindex a2d267792..b3e0b54fd 100644--- a/components/common/HamburgerButton.js+++ b/components/common/HamburgerButton.js@@ -32,9 +32,13 @@ export default function HamburgerButton() {label: formatMessage(labels.users),url: '/settings/users',},+ {+ label: formatMessage(labels.profile),+ url: '/settings/profile',+ },],},- {+ cloudMode && {label: formatMessage(labels.profile),url: '/settings/profile',},diff --git a/components/common/WorldMap.js b/components/common/WorldMap.jsindex b774702bb..b5a40fc52 100644--- a/components/common/WorldMap.js+++ b/components/common/WorldMap.js@@ -9,7 +9,8 @@ import styles from './WorldMap.module.css';import useCountryNames from 'hooks/useCountryNames';import useLocale from 'hooks/useLocale';import HoverTooltip from './HoverTooltip';-import { formatLongNumber } from '../../lib/format';+import { formatLongNumber } from 'lib/format';+import { percentFilter } from 'lib/filters';function WorldMap({ data, className }) {const { basePath } = useRouter();@@ -26,10 +27,11 @@ function WorldMap({ data, className }) {);const { locale } = useLocale();const countryNames = useCountryNames(locale);+ const metrics = useMemo(() => percentFilter(data), [data]);function getFillColor(code) {if (code === 'AQ') return;- const country = data?.find(({ x }) => x === code);+ const country = metrics?.find(({ x }) => x === code);if (!country) {return colors.fillColor;@@ -46,7 +48,7 @@ function WorldMap({ data, className }) {function handleHover(code) {if (code === 'AQ') return;- const country = data?.find(({ x }) => x === code);+ const country = metrics?.find(({ x }) => x === code);setTooltip(`${countryNames[code]}: ${formatLongNumber(country?.y || 0)} visitors`);}diff --git a/components/messages.js b/components/messages.jsindex bfb173e82..6100afbfa 100644--- a/components/messages.js+++ b/components/messages.js@@ -113,6 +113,8 @@ export const labels = defineMessages({editDashboard: { id: 'label.edit-dashboard', defaultMessage: 'Edit dashboard' },title: { id: 'label.title', defaultMessage: 'Title' },view: { id: 'label.view', defaultMessage: 'View' },+ cities: { id: 'label.cities', defaultMessage: 'Cities' },+ regions: { id: 'label.regions', defaultMessage: 'Regions' },});export const messages = defineMessages({diff --git a/components/metrics/CitiesTable.js b/components/metrics/CitiesTable.jsnew file mode 100644index 000000000..4aa613344--- /dev/null+++ b/components/metrics/CitiesTable.js@@ -0,0 +1,30 @@+import MetricsTable from './MetricsTable';+import { emptyFilter } from 'lib/filters';+import FilterLink from 'components/common/FilterLink';+import useLocale from 'hooks/useLocale';+import useMessages from 'hooks/useMessages';++export default function CitiesTable({ websiteId, ...props }) {+ const { locale } = useLocale();+ const { formatMessage, labels } = useMessages();++ function renderLink({ x }) {+ return (+ <div className={locale}>+ <FilterLink id="city" value={x} />+ </div>+ );+ }++ return (+ <MetricsTable+ {...props}+ title={formatMessage(labels.cities)}+ type="city"+ metric={formatMessage(labels.visitors)}+ websiteId={websiteId}+ dataFilter={emptyFilter}+ renderLabel={renderLink}+ />+ );+}diff --git a/components/metrics/CountriesTable.js b/components/metrics/CountriesTable.jsindex 5e7d8a8d9..dcebe5e07 100644--- a/components/metrics/CountriesTable.js+++ b/components/metrics/CountriesTable.js@@ -1,11 +1,10 @@import MetricsTable from './MetricsTable';-import { percentFilter } from 'lib/filters';import FilterLink from 'components/common/FilterLink';import useCountryNames from 'hooks/useCountryNames';import useLocale from 'hooks/useLocale';import useMessages from 'hooks/useMessages';-export default function CountriesTable({ websiteId, onDataLoad, ...props }) {+export default function CountriesTable({ websiteId, ...props }) {const { locale } = useLocale();const countryNames = useCountryNames(locale);const { formatMessage, labels } = useMessages();@@ -25,7 +24,6 @@ export default function CountriesTable({ websiteId, onDataLoad, ...props }) {type="country"metric={formatMessage(labels.visitors)}websiteId={websiteId}- onDataLoad={data => onDataLoad?.(percentFilter(data))}renderLabel={renderLink}/>);diff --git a/components/metrics/MetricsTable.js b/components/metrics/MetricsTable.jsindex 2e20dfc6c..0d83fc22e 100644--- a/components/metrics/MetricsTable.js+++ b/components/metrics/MetricsTable.js@@ -29,7 +29,7 @@ export default function MetricsTable({const {resolveUrl,router,- query: { url, referrer, os, browser, device, country },+ query: { url, referrer, os, browser, device, country, region, city },} = usePageQuery();const { formatMessage, labels } = useMessages();const { get, useQuery } = useApi();@@ -37,7 +37,7 @@ export default function MetricsTable({const { data, isLoading, isFetched, error } = useQuery(['websites:metrics',- { websiteId, type, modified, url, referrer, os, browser, device, country },+ { websiteId, type, modified, url, referrer, os, browser, device, country, region, city },],() =>get(`/websites/${websiteId}/metrics`, {@@ -50,6 +50,8 @@ export default function MetricsTable({browser,device,country,+ region,+ city,}),{ onSuccess: onDataLoad, retryDelay: delay || DEFAULT_ANIMATION_DURATION },);diff --git a/components/metrics/RegionsTable.js b/components/metrics/RegionsTable.jsnew file mode 100644index 000000000..87a15b40a--- /dev/null+++ b/components/metrics/RegionsTable.js@@ -0,0 +1,31 @@+import MetricsTable from './MetricsTable';+import { emptyFilter } from 'lib/filters';+import FilterLink from 'components/common/FilterLink';+import useLocale from 'hooks/useLocale';+import useMessages from 'hooks/useMessages';+import regions from 'public/iso-3166-2.json';++export default function RegionsTable({ websiteId, ...props }) {+ const { locale } = useLocale();+ const { formatMessage, labels } = useMessages();++ function renderLink({ x }) {+ return (+ <div className={locale}>+ <FilterLink id="region" value={x} label={regions[x] || x} />+ </div>+ );+ }++ return (+ <MetricsTable+ {...props}+ title={formatMessage(labels.regions)}+ type="region"+ metric={formatMessage(labels.visitors)}+ websiteId={websiteId}+ dataFilter={emptyFilter}+ renderLabel={renderLink}+ />+ );+}diff --git a/components/metrics/WebsiteChart.js b/components/metrics/WebsiteChart.jsindex cf900f766..cc27ac25c 100644--- a/components/metrics/WebsiteChart.js+++ b/components/metrics/WebsiteChart.js@@ -33,13 +33,16 @@ export default function WebsiteChart({const { startDate, endDate, unit, value, modified } = dateRange;const [timezone] = useTimezone();const {- query: { url, referrer, os, browser, device, country, title },+ query: { url, referrer, os, browser, device, country, region, city, title },} = usePageQuery();const { get, useQuery } = useApi();const { ref, isSticky } = useSticky({ enabled: stickyHeader });const { data, isLoading, error } = useQuery(- ['websites:pageviews', { websiteId, modified, url, referrer, os, browser, device, country }],+ [+ 'websites:pageviews',+ { websiteId, modified, url, referrer, os, browser, device, country, region, city, title },+ ],() =>get(`/websites/${websiteId}/pageviews`, {startAt: +startDate,@@ -52,6 +55,9 @@ export default function WebsiteChart({browser,device,country,+ region,+ city,+ title,}),{ onSuccess: onDataLoad },);@@ -82,7 +88,7 @@ export default function WebsiteChart({</WebsiteHeader><FilterTagswebsiteId={websiteId}- params={{ url, referrer, os, browser, device, country, title }}+ params={{ url, referrer, os, browser, device, country, region, city, title }}/><Rowref={ref}diff --git a/components/pages/settings/teams/TeamDeleteForm.js b/components/pages/settings/teams/TeamDeleteForm.jsindex fe300aec8..66752d0b4 100644--- a/components/pages/settings/teams/TeamDeleteForm.js+++ b/components/pages/settings/teams/TeamDeleteForm.js@@ -19,7 +19,7 @@ export default function TeamDeleteForm({ teamId, teamName, onSave, onClose }) {return (<Form onSubmit={handleSubmit} error={error}><p>- <FormattedMessage {...messages.confirmDelete} values={{ name: <b>{teamName}</b> }} />+ <FormattedMessage {...messages.confirmDelete} values={{ target: <b>{teamName}</b> }} /></p><FormButtons flex><SubmitButton variant="danger" disabled={isLoading}>diff --git a/components/pages/websites/WebsiteMenuView.js b/components/pages/websites/WebsiteMenuView.jsindex 000a46e5c..865311b0c 100644--- a/components/pages/websites/WebsiteMenuView.js+++ b/components/pages/websites/WebsiteMenuView.js@@ -3,6 +3,8 @@ import Link from 'next/link';import { GridRow, GridColumn } from 'components/layout/Grid';import BrowsersTable from 'components/metrics/BrowsersTable';import CountriesTable from 'components/metrics/CountriesTable';+import RegionsTable from 'components/metrics/RegionsTable';+import CitiesTable from 'components/metrics/CitiesTable';import DevicesTable from 'components/metrics/DevicesTable';import LanguagesTable from 'components/metrics/LanguagesTable';import OSTable from 'components/metrics/OSTable';@@ -26,6 +28,8 @@ const views = {device: DevicesTable,screen: ScreenTable,country: CountriesTable,+ region: RegionsTable,+ city: CitiesTable,language: LanguagesTable,event: EventsTable,query: QueryParametersTable,@@ -69,6 +73,16 @@ export default function WebsiteMenuView({ websiteId, websiteDomain }) {label: formatMessage(labels.countries),url: resolveUrl({ view: 'country' }),},+ {+ key: 'region',+ label: formatMessage(labels.regions),+ url: resolveUrl({ view: 'region' }),+ },+ {+ key: 'city',+ label: formatMessage(labels.cities),+ url: resolveUrl({ view: 'city' }),+ },{key: 'language',label: formatMessage(labels.languages),diff --git a/lang/ar-SA.json b/lang/ar-SA.jsonindex 40893a155..a9f8e4fc9 100644--- a/lang/ar-SA.json+++ b/lang/ar-SA.json@@ -3,7 +3,7 @@"label.actions": "اجراءات","label.activity-log": "Activity log","label.add-website": "إضافة موقع",- "label.administrator": "مدير عام؟",+ "label.admin": "مدير عام؟","label.all": "الكل","label.all-time": "All time","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "المتصفحات","label.cancel": "إلغاء","label.change-password": "تغيير كلمة المرور",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "تأكيد كلمة المرور",@@ -70,6 +71,7 @@"label.referrers": "التحويلات","label.refresh": "تحديث","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "اجباري","label.reset": "اعادة تعيين",@@ -103,6 +105,7 @@"label.user": "User","label.username": "اسم المستخدم","label.users": "Users",+ "label.view": "View","label.view-details": "عرض التفاصيل","label.views": "مشاهدات","label.visitors": "زوار",diff --git a/lang/be-BY.json b/lang/be-BY.jsonindex 1983e55d4..11eb8b540 100644--- a/lang/be-BY.json+++ b/lang/be-BY.json@@ -3,7 +3,7 @@"label.actions": "Дзеянні","label.activity-log": "Activity log","label.add-website": "Дадаць сайт",- "label.administrator": "Адміністратар",+ "label.admin": "Адміністратар","label.all": "Усё","label.all-time": "Увесь час","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "Браўзеры","label.cancel": "Адмена","label.change-password": "Змяніць пароль",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "Падцвердзіць пароль",@@ -70,6 +71,7 @@"label.referrers": "Referrers","label.refresh": "Аднавіць","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "Абавязкова","label.reset": "Скінуць",@@ -103,6 +105,7 @@"label.user": "User","label.username": "Імя карыстальніка","label.users": "Users",+ "label.view": "View","label.view-details": "Пабачыць дэталі","label.views": "Прагляды","label.visitors": "Наведвальнікі",diff --git a/lang/bn-BD.json b/lang/bn-BD.jsonindex 2023f3127..fd7dc1118 100644--- a/lang/bn-BD.json+++ b/lang/bn-BD.json@@ -3,7 +3,7 @@"label.actions": "অ্যাকশনস","label.activity-log": "Activity log","label.add-website": "ওয়েবসাইট যুক্ত করুন",- "label.administrator": "অ্যাডমিন",+ "label.admin": "অ্যাডমিন","label.all": "সবগুলো","label.all-time": "সব সময়","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "ব্রাউজার","label.cancel": "বাতিল","label.change-password": "পাসওয়ার্ড পরিবর্তন করুন",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "পাসওয়ার্ড নিশ্চিত করুন",@@ -70,6 +71,7 @@"label.referrers": "রেফারার্স","label.refresh": "রিফ্রেশ","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "প্রয়োজনীয়","label.reset": "রিসেট",@@ -103,6 +105,7 @@"label.user": "User","label.username": "ব্যবহারকারীর নাম","label.users": "Users",+ "label.view": "View","label.view-details": "বিস্তারিত দেখুন","label.views": "ভিউস","label.visitors": "পরিদর্শনার্থী",diff --git a/lang/ca-ES.json b/lang/ca-ES.jsonindex 548b29960..ae293a0cb 100644--- a/lang/ca-ES.json+++ b/lang/ca-ES.json@@ -3,7 +3,7 @@"label.actions": "Accions","label.activity-log": "Activity log","label.add-website": "Afegeix lloc web",- "label.administrator": "Administrador",+ "label.admin": "Administrador","label.all": "Tots","label.all-time": "Sempre","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "Navegadors","label.cancel": "Cancel·la","label.change-password": "Canvia la contrasenya",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "Confirma la contrasenya",@@ -70,6 +71,7 @@"label.referrers": "Referents","label.refresh": "Refresca","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "Obligatori","label.reset": "Restableix",@@ -103,6 +105,7 @@"label.user": "User","label.username": "Nom d'usuari","label.users": "Users",+ "label.view": "View","label.view-details": "Veure els detalls","label.views": "Vistes","label.visitors": "Visitants",diff --git a/lang/cs-CZ.json b/lang/cs-CZ.jsonindex 30c584059..63e53df5c 100644--- a/lang/cs-CZ.json+++ b/lang/cs-CZ.json@@ -3,7 +3,7 @@"label.actions": "Akce","label.activity-log": "Activity log","label.add-website": "Přidat web",- "label.administrator": "Administrátor",+ "label.admin": "Administrátor","label.all": "Vše","label.all-time": "All time","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "Prohlížeč","label.cancel": "Zrušit","label.change-password": "Změnit heslo",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "Potvrdit heslo",@@ -70,6 +71,7 @@"label.referrers": "Odkazy","label.refresh": "Obnovit","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "Vyžadováno","label.reset": "Reset",@@ -103,6 +105,7 @@"label.user": "User","label.username": "Uživatelské jméno","label.users": "Users",+ "label.view": "View","label.view-details": "Zobrazit detaily","label.views": "Zobrazení","label.visitors": "Návštěvy",diff --git a/lang/da-DK.json b/lang/da-DK.jsonindex 5b83bff69..ec2311ebb 100644--- a/lang/da-DK.json+++ b/lang/da-DK.json@@ -3,7 +3,7 @@"label.actions": "Handlinger","label.activity-log": "Activity log","label.add-website": "Tilføj hjemmeside",- "label.administrator": "Administrator",+ "label.admin": "Administrator","label.all": "Alle","label.all-time": "Altid","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "Browsere","label.cancel": "Afvis","label.change-password": "Skift adgangskode",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "Godkendt adgangskode",@@ -70,6 +71,7 @@"label.referrers": "Henvisninger","label.refresh": "Opdater","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "Påkrævet","label.reset": "Nulstil",@@ -103,6 +105,7 @@"label.user": "User","label.username": "Brugernavn","label.users": "Users",+ "label.view": "View","label.view-details": "Vis detajler","label.views": "Visninger","label.visitors": "Besøgende",diff --git a/lang/de-CH.json b/lang/de-CH.jsonindex af65fe78d..0492081e4 100644--- a/lang/de-CH.json+++ b/lang/de-CH.json@@ -3,7 +3,7 @@"label.actions": "Aktione","label.activity-log": "Activity log","label.add-website": "Websiite hinzuefüege",- "label.administrator": "Administrator",+ "label.admin": "Administrator","label.all": "Alli","label.all-time": "Gesamte Zitruum","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "Browser","label.cancel": "Abbreche","label.change-password": "Passwort ändere",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "Passwort widerhole",@@ -70,6 +71,7 @@"label.referrers": "Referrer","label.refresh": "Aktualisiere","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "Erforderlich","label.reset": "Zruggsetze",@@ -103,6 +105,7 @@"label.user": "User","label.username": "Benutzername","label.users": "Users",+ "label.view": "View","label.view-details": "Details azeige","label.views": "Ufrüef","label.visitors": "Bsuecher",diff --git a/lang/de-DE.json b/lang/de-DE.jsonindex 16cee96f9..7691f29bb 100644--- a/lang/de-DE.json+++ b/lang/de-DE.json@@ -3,7 +3,7 @@"label.actions": "Aktionen","label.activity-log": "Activity log","label.add-website": "Webseite hinzufügen",- "label.administrator": "Administrator",+ "label.admin": "Administrator","label.all": "Alle","label.all-time": "Gesamter Zeitraum","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "Browser","label.cancel": "Abbrechen","label.change-password": "Passwort ändern",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "Passwort wiederholen",@@ -70,6 +71,7 @@"label.referrers": "Referrer","label.refresh": "Aktualisieren","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "Erforderlich","label.reset": "Zurücksetzen",@@ -103,6 +105,7 @@"label.user": "User","label.username": "Benutzername","label.users": "Users",+ "label.view": "View","label.view-details": "Details anzeigen","label.views": "Aufrufe","label.visitors": "Besucher",diff --git a/lang/el-GR.json b/lang/el-GR.jsonindex aacda6f3b..5d565a9c4 100644--- a/lang/el-GR.json+++ b/lang/el-GR.json@@ -3,7 +3,7 @@"label.actions": "Ενέργειες","label.activity-log": "Activity log","label.add-website": "Προσθήκη ιστότοπου",- "label.administrator": "Διαχειριστής",+ "label.admin": "Διαχειριστής","label.all": "All","label.all-time": "All time","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "Προγράμματα περιήγησης","label.cancel": "Ακύρωση","label.change-password": "Αλλαγή κωδικού",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "Επιβεβαίωση κωδικού",@@ -70,6 +71,7 @@"label.referrers": "Παραπομπές","label.refresh": "Ανανέωση","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "Απαιτείται","label.reset": "Επαναφορά",@@ -103,6 +105,7 @@"label.user": "User","label.username": "Όνομα χρήστη","label.users": "Users",+ "label.view": "View","label.view-details": "Λεπτομέρειες","label.views": "Προβολές","label.visitors": "Επισκέπτες",diff --git a/lang/en-GB.json b/lang/en-GB.jsonindex 19ec8537b..44b4e4757 100644--- a/lang/en-GB.json+++ b/lang/en-GB.json@@ -3,7 +3,7 @@"label.actions": "Actions","label.activity-log": "Activity log","label.add-website": "Add website",- "label.administrator": "Administrator",+ "label.admin": "Administrator","label.all": "All","label.all-time": "All time","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "Browsers","label.cancel": "Cancel","label.change-password": "Change password",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "Confirm password",@@ -70,6 +71,7 @@"label.referrers": "Referrers","label.refresh": "Refresh","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "Required","label.reset": "Reset",@@ -103,6 +105,7 @@"label.user": "User","label.username": "Username","label.users": "Users",+ "label.view": "View","label.view-details": "View details","label.views": "Views","label.visitors": "Visitors",diff --git a/lang/en-US.json b/lang/en-US.jsonindex 19ec8537b..44b4e4757 100644--- a/lang/en-US.json+++ b/lang/en-US.json@@ -3,7 +3,7 @@"label.actions": "Actions","label.activity-log": "Activity log","label.add-website": "Add website",- "label.administrator": "Administrator",+ "label.admin": "Administrator","label.all": "All","label.all-time": "All time","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "Browsers","label.cancel": "Cancel","label.change-password": "Change password",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "Confirm password",@@ -70,6 +71,7 @@"label.referrers": "Referrers","label.refresh": "Refresh","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "Required","label.reset": "Reset",@@ -103,6 +105,7 @@"label.user": "User","label.username": "Username","label.users": "Users",+ "label.view": "View","label.view-details": "View details","label.views": "Views","label.visitors": "Visitors",diff --git a/lang/es-MX.json b/lang/es-MX.jsonindex 68700d5e7..e0ae880cc 100644--- a/lang/es-MX.json+++ b/lang/es-MX.json@@ -3,7 +3,7 @@"label.actions": "Acciones","label.activity-log": "Activity log","label.add-website": "Agregar sitio",- "label.administrator": "Administrador",+ "label.admin": "Administrador","label.all": "Todos","label.all-time": "Todos los tiempos","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "Navegadores","label.cancel": "Cancelar","label.change-password": "Cambiar contraseña",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "Confirmar contraseña",@@ -70,6 +71,7 @@"label.referrers": "Referido desde","label.refresh": "Actualizar","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "Obligatorio","label.reset": "Reiniciar",@@ -103,6 +105,7 @@"label.user": "User","label.username": "Nombre de usuario","label.users": "Users",+ "label.view": "View","label.view-details": "Ver detalles","label.views": "Vistas","label.visitors": "Visitantes",diff --git a/lang/fa-IR.json b/lang/fa-IR.jsonindex a2ea5d6ea..60bfaf509 100644--- a/lang/fa-IR.json+++ b/lang/fa-IR.json@@ -3,7 +3,7 @@"label.actions": "اقدامات","label.activity-log": "Activity log","label.add-website": "افزودن وبسایت",- "label.administrator": "مدیر",+ "label.admin": "مدیر","label.all": "همه","label.all-time": "همه زمان","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "مروگرها","label.cancel": "انصراف","label.change-password": "تغییر رمز",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "تایید رمز",@@ -70,6 +71,7 @@"label.referrers": "ارجاع دهندگان","label.refresh": "بهروزرسانی","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "ضروری","label.reset": "بازنشانی",@@ -103,6 +105,7 @@"label.user": "User","label.username": "نام کاربری","label.users": "Users",+ "label.view": "View","label.view-details": "مشاهدهی جزئیات","label.views": "بازدید","label.visitors": "بازدیدکننده",diff --git a/lang/fi-FI.json b/lang/fi-FI.jsonindex f183f2f2b..d4553fd86 100644--- a/lang/fi-FI.json+++ b/lang/fi-FI.json@@ -3,7 +3,7 @@"label.actions": "Toiminnat","label.activity-log": "Activity log","label.add-website": "Lisää verkkosivu",- "label.administrator": "Järjestelmänvalvoja",+ "label.admin": "Järjestelmänvalvoja","label.all": "Kaikki","label.all-time": "Alusta lähtien","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "Selaimet","label.cancel": "Peruuta","label.change-password": "Vaihda salasana",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "Vahvista salasana",@@ -70,6 +71,7 @@"label.referrers": "Viittaajat","label.refresh": "Päivitä","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "Vaaditaan","label.reset": "Nollaa",@@ -103,6 +105,7 @@"label.user": "User","label.username": "Käyttäjänimi","label.users": "Users",+ "label.view": "View","label.view-details": "Katso tiedot","label.views": "Näyttökerrat","label.visitors": "Vierailijat",diff --git a/lang/fo-FO.json b/lang/fo-FO.jsonindex a9d627b21..4b35c74e1 100644--- a/lang/fo-FO.json+++ b/lang/fo-FO.json@@ -3,7 +3,7 @@"label.actions": "Gerðir","label.activity-log": "Activity log","label.add-website": "Legg heimasíðu afturat",- "label.administrator": "Fyrisitari",+ "label.admin": "Fyrisitari","label.all": "Alt","label.all-time": "All time","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "Kagar","label.cancel": "Strika","label.change-password": "Skift loyniorð",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "Vátta loyniorð",@@ -70,6 +71,7 @@"label.referrers": "Framsendingar","label.refresh": "Endurskapa","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "Kravt","label.reset": "Nulstilla",@@ -103,6 +105,7 @@"label.user": "User","label.username": "Brúkaranavn","label.users": "Users",+ "label.view": "View","label.view-details": "Vís frágreiðing","label.views": "Sýningar","label.visitors": "Vitjandi",diff --git a/lang/fr-FR.json b/lang/fr-FR.jsonindex 7c2e4cf26..64b2a2a59 100644--- a/lang/fr-FR.json+++ b/lang/fr-FR.json@@ -3,7 +3,7 @@"label.actions": "Actions","label.activity-log": "Activity log","label.add-website": "Ajouter un site",- "label.administrator": "Administrateur",+ "label.admin": "Administrateur","label.all": "Tout","label.all-time": "Toutes les données","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "Navigateurs","label.cancel": "Annuler","label.change-password": "Changer le mot de passe",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "Confirmation du mot de passe",@@ -70,6 +71,7 @@"label.referrers": "Sources","label.refresh": "Rafraîchir","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "Requis","label.reset": "Réinitialiser",@@ -103,6 +105,7 @@"label.user": "User","label.username": "Nom d'utilisateur","label.users": "Users",+ "label.view": "View","label.view-details": "Voir les details","label.views": "Vues","label.visitors": "Visiteurs",diff --git a/lang/ga-ES.json b/lang/ga-ES.jsonindex 8fa40a08b..378c60315 100644--- a/lang/ga-ES.json+++ b/lang/ga-ES.json@@ -3,7 +3,7 @@"label.actions": "Accións","label.activity-log": "Activity log","label.add-website": "Engadir sitio web",- "label.administrator": "Administradora",+ "label.admin": "Administradora","label.all": "Todo","label.all-time": "Sempre","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "Navegadores","label.cancel": "Cancelar","label.change-password": "Mudar contrasinal",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "Confirmar contrasinal",@@ -70,6 +71,7 @@"label.referrers": "Orixes","label.refresh": "Actualizar","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "Requerido","label.reset": "Restablecer",@@ -103,6 +105,7 @@"label.user": "User","label.username": "Identificador","label.users": "Users",+ "label.view": "View","label.view-details": "Ver detalles","label.views": "Visualizacións","label.visitors": "Visitantes",diff --git a/lang/he-IL.json b/lang/he-IL.jsonindex e7d6c6c0c..2bd8f5995 100644--- a/lang/he-IL.json+++ b/lang/he-IL.json@@ -3,7 +3,7 @@"label.actions": "פעולות","label.activity-log": "Activity log","label.add-website": "הוספת אתר",- "label.administrator": "מנהל",+ "label.admin": "מנהל","label.all": "הכל","label.all-time": "All time","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "דפדפנים","label.cancel": "ביטול","label.change-password": "שינוי סיסמה",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "אישור סיסמה",@@ -70,6 +71,7 @@"label.referrers": "מפנים","label.refresh": "רענון","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "נדרש","label.reset": "איפוס",@@ -103,6 +105,7 @@"label.user": "User","label.username": "שם משתמש","label.users": "Users",+ "label.view": "View","label.view-details": "פרטים נוספים","label.views": "צפיות","label.visitors": "מבקרים",diff --git a/lang/hi-IN.json b/lang/hi-IN.jsonindex 95ec92fa3..2b7d21c74 100644--- a/lang/hi-IN.json+++ b/lang/hi-IN.json@@ -3,7 +3,7 @@"label.actions": "कार्य","label.activity-log": "Activity log","label.add-website": "वेबसाइट",- "label.administrator": "प्रशासक",+ "label.admin": "प्रशासक","label.all": "सब","label.all-time": "All time","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "वेब ब्राउज़र","label.cancel": "रद्द करें","label.change-password": "पासवर्ड बदलें",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "पासवर्ड की पुष्टि कीजिये",@@ -70,6 +71,7 @@"label.referrers": "सन्दर्भदाता","label.refresh": "रिफ्रेश","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "अपेक्षित","label.reset": "रीसेट",@@ -103,6 +105,7 @@"label.user": "User","label.username": "उपयोगकर्ता नाम","label.users": "Users",+ "label.view": "View","label.view-details": "विवरण देखें","label.views": "दृश्य","label.visitors": "आगंतुकों",diff --git a/lang/hu-HU.json b/lang/hu-HU.jsonindex d0b56302f..bf19fd42e 100644--- a/lang/hu-HU.json+++ b/lang/hu-HU.json@@ -3,7 +3,7 @@"label.actions": "Műveletek","label.activity-log": "Activity log","label.add-website": "Weboldal hozzáadása",- "label.administrator": "Adminisztrátor",+ "label.admin": "Adminisztrátor","label.all": "Összes","label.all-time": "All time","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "Böngészők","label.cancel": "Mégsem","label.change-password": "Jelszó módosítása",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "Jelszó megerősítése",@@ -70,6 +71,7 @@"label.referrers": "Hivatkozók","label.refresh": "Frissítés","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "Kötelező","label.reset": "Visszaállítás",@@ -103,6 +105,7 @@"label.user": "User","label.username": "Felhasználónév","label.users": "Users",+ "label.view": "View","label.view-details": "Részletek","label.views": "Megtekintések","label.visitors": "Látogatók",diff --git a/lang/id-ID.json b/lang/id-ID.jsonindex 798ba3f79..cda084d3b 100644--- a/lang/id-ID.json+++ b/lang/id-ID.json@@ -3,7 +3,7 @@"label.actions": "Aksi","label.activity-log": "Activity log","label.add-website": "Tambah situs web",- "label.administrator": "Pengelola",+ "label.admin": "Pengelola","label.all": "Semua","label.all-time": "Semua waktu","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "Peramban","label.cancel": "Batal","label.change-password": "Ganti kata sandi",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "Konfirmasi kata sandi",@@ -70,6 +71,7 @@"label.referrers": "Perujuk","label.refresh": "Segarkan","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "Wajib","label.reset": "Atur ulang",@@ -103,6 +105,7 @@"label.user": "User","label.username": "Nama pengguna","label.users": "Users",+ "label.view": "View","label.view-details": "Lihat Detil","label.views": "Tampilan","label.visitors": "Pengunjung",diff --git a/lang/it-IT.json b/lang/it-IT.jsonindex 9cd8c8731..b87b961f3 100644--- a/lang/it-IT.json+++ b/lang/it-IT.json@@ -3,7 +3,7 @@"label.actions": "Azioni","label.activity-log": "Activity log","label.add-website": "Aggiungi sito",- "label.administrator": "Amministratore",+ "label.admin": "Amministratore","label.all": "Tutto","label.all-time": "Sempre","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "Browser","label.cancel": "Annulla","label.change-password": "Modifica password",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "Conferma password",@@ -70,6 +71,7 @@"label.referrers": "Referrers","label.refresh": "Ricarica","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "Obbligatorio","label.reset": "Reset",@@ -103,6 +105,7 @@"label.user": "User","label.username": "Nome utente","label.users": "Users",+ "label.view": "View","label.view-details": "Vedi dettagli","label.views": "Visualizzazioni","label.visitors": "Visitatori",diff --git a/lang/ja-JP.json b/lang/ja-JP.jsonindex 48693b4ed..ff67be3cf 100644--- a/lang/ja-JP.json+++ b/lang/ja-JP.json@@ -3,7 +3,7 @@"label.actions": "アクション","label.activity-log": "Activity log","label.add-website": "Webサイトの追加",- "label.administrator": "管理者",+ "label.admin": "管理者","label.all": "すべて表示","label.all-time": "All time","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "ブラウザ","label.cancel": "キャンセル","label.change-password": "パスワード変更",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "パスワード(確認)",@@ -70,6 +71,7 @@"label.referrers": "リファラー","label.refresh": "更新","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "必須","label.reset": "リセット",@@ -103,6 +105,7 @@"label.user": "User","label.username": "ユーザー名","label.users": "Users",+ "label.view": "View","label.view-details": "詳細を見る","label.views": "閲覧数","label.visitors": "訪問者数",diff --git a/lang/km-KH.json b/lang/km-KH.jsonindex 7c80952a3..6e19db70d 100644--- a/lang/km-KH.json+++ b/lang/km-KH.json@@ -3,7 +3,7 @@"label.actions": "សកម្មភាព","label.activity-log": "Activity log","label.add-website": "បន្ថែមគេហទំព័រ",- "label.administrator": "អ្នកគ្រប់គ្រង",+ "label.admin": "អ្នកគ្រប់គ្រង","label.all": "ទាំងអស់","label.all-time": "គ្រប់ពេល","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "កម្មវិធី","label.cancel": "បោះបង់","label.change-password": "ផ្លាស់ប្តូរពាក្យសម្ងាត់",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "បញ្ជាក់ពាក្យសម្ងាត់",@@ -70,6 +71,7 @@"label.referrers": "អ្នកណែនាំ","label.refresh": "ផ្ទុកឡើងវិញ","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "ទាមទារ","label.reset": "កំណត់ឡើងវិញ",@@ -103,6 +105,7 @@"label.user": "User","label.username": "ឈ្មោះអ្នកប្រើប្រាស់","label.users": "Users",+ "label.view": "View","label.view-details": "មើលព័ត៌មានលម្អិត","label.views": "អ្នកចូលមើល","label.visitors": "អ្នកទស្សនា",diff --git a/lang/ko-KR.json b/lang/ko-KR.jsonindex fb92232f0..8283dc9e4 100644--- a/lang/ko-KR.json+++ b/lang/ko-KR.json@@ -3,7 +3,7 @@"label.actions": "액션","label.activity-log": "Activity log","label.add-website": "웹사이트 추가",- "label.administrator": "관리자",+ "label.admin": "관리자","label.all": "전체","label.all-time": "All time","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "브라우저","label.cancel": "취소","label.change-password": "비밀번호 변경",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "비밀번호 확인",@@ -70,6 +71,7 @@"label.referrers": "리퍼러","label.refresh": "새로고침","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "필수","label.reset": "리셋",@@ -103,6 +105,7 @@"label.user": "User","label.username": "사용자명","label.users": "Users",+ "label.view": "View","label.view-details": "상세보기","label.views": "조회수","label.visitors": "방문객",diff --git a/lang/lt-LT.json b/lang/lt-LT.jsonindex f54c4ae74..df658b090 100644--- a/lang/lt-LT.json+++ b/lang/lt-LT.json@@ -3,7 +3,7 @@"label.actions": "Veiksmai","label.activity-log": "Activity log","label.add-website": "Pridėti svetainę",- "label.administrator": "Administratorius",+ "label.admin": "Administratorius","label.all": "Visi","label.all-time": "Visas laikotarpis","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "Naršyklės","label.cancel": "Atšaukti","label.change-password": "Pakeisti slaptažodį",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "Patvirtinti slaptažodį",@@ -70,6 +71,7 @@"label.referrers": "Referrers","label.refresh": "Atnaujinti","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "Reikalinga","label.reset": "Atstatyti",@@ -103,6 +105,7 @@"label.user": "User","label.username": "Vartotojo vardas","label.users": "Users",+ "label.view": "View","label.view-details": "Peržiūrėti detaliau","label.views": "Peržiūros","label.visitors": "Lankytojai",diff --git a/lang/mn-MN.json b/lang/mn-MN.jsonindex 809a0c2bd..e8b69761c 100644--- a/lang/mn-MN.json+++ b/lang/mn-MN.json@@ -3,7 +3,7 @@"label.actions": "Үйлдлүүд","label.activity-log": "Activity log","label.add-website": "Веб нэмэх",- "label.administrator": "Админ",+ "label.admin": "Админ","label.all": "Бүх","label.all-time": "Бүх цаг үеийн","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "Хөтөч","label.cancel": "Цуцлах","label.change-password": "Нууц үг солих",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "Шинэ нууц үгээ давтах",@@ -70,6 +71,7 @@"label.referrers": "Чиглүүлэгч","label.refresh": "Сэргээх","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "Шаардлагатай","label.reset": "Хуучин хэвд нь оруулах",@@ -103,6 +105,7 @@"label.user": "User","label.username": "Хэрэглэгчийн нэр","label.users": "Users",+ "label.view": "View","label.view-details": "Дэлгэрүүлж харах","label.views": "Үзсэн","label.visitors": "Зочин",diff --git a/lang/ms-MY.json b/lang/ms-MY.jsonindex 25d0e9dbd..76cda201f 100644--- a/lang/ms-MY.json+++ b/lang/ms-MY.json@@ -3,7 +3,7 @@"label.actions": "Aksi","label.activity-log": "Activity log","label.add-website": "Tambah laman web",- "label.administrator": "Pentadbir",+ "label.admin": "Pentadbir","label.all": "Semua","label.all-time": "All time","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "Pelayar web","label.cancel": "Batal","label.change-password": "Tukar kata laluan",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "Sahkan kata laluan",@@ -70,6 +71,7 @@"label.referrers": "Perujuk","label.refresh": "Muat semula","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "Diperlukan","label.reset": "Tetapkan semula",@@ -103,6 +105,7 @@"label.user": "User","label.username": "Nama pengguna","label.users": "Users",+ "label.view": "View","label.view-details": "Lihat butiran","label.views": "Lawatan","label.visitors": "Pelawat",diff --git a/lang/nb-NO.json b/lang/nb-NO.jsonindex 5683fb191..bde63809c 100644--- a/lang/nb-NO.json+++ b/lang/nb-NO.json@@ -3,7 +3,7 @@"label.actions": "Handlinger","label.activity-log": "Activity log","label.add-website": "Legg til nettsted",- "label.administrator": "Administrator",+ "label.admin": "Administrator","label.all": "Alle","label.all-time": "Noensinne","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "Nettlesere","label.cancel": "Avvis","label.change-password": "Bytt passord",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "Godkjenn passord",@@ -70,6 +71,7 @@"label.referrers": "Referanser","label.refresh": "Oppdater","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "Påkrevd","label.reset": "Nullstill",@@ -103,6 +105,7 @@"label.user": "User","label.username": "Brukernavn","label.users": "Users",+ "label.view": "View","label.view-details": "Vis detaljer","label.views": "Visninger","label.visitors": "Besøkende",diff --git a/lang/nl-NL.json b/lang/nl-NL.jsonindex 5f79c3bfd..f5aaa0b2b 100644--- a/lang/nl-NL.json+++ b/lang/nl-NL.json@@ -3,7 +3,7 @@"label.actions": "Acties","label.activity-log": "Activity log","label.add-website": "Website toevoegen",- "label.administrator": "Administrator",+ "label.admin": "Administrator","label.all": "Alles","label.all-time": "Onbeperkt","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "Browsers","label.cancel": "Annuleren","label.change-password": "Wachtwoord wijzigen",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "Wachtwoord bevestigen",@@ -70,6 +71,7 @@"label.referrers": "Verwijzers","label.refresh": "Vernieuwen","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "Verplicht","label.reset": "Resetten",@@ -103,6 +105,7 @@"label.user": "User","label.username": "Gebruikersnaam","label.users": "Users",+ "label.view": "View","label.view-details": "Meer details","label.views": "Weergaven","label.visitors": "Bezoekers",diff --git a/lang/pl-PL.json b/lang/pl-PL.jsonindex bbe7a4cd5..7bad1366c 100644--- a/lang/pl-PL.json+++ b/lang/pl-PL.json@@ -3,7 +3,7 @@"label.actions": "Działania","label.activity-log": "Activity log","label.add-website": "Dodaj witrynę",- "label.administrator": "Administrator",+ "label.admin": "Administrator","label.all": "Wszystkie","label.all-time": "Cały czas","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "Przeglądarki","label.cancel": "Anuluj","label.change-password": "Zmień hasło",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "Potwierdź hasło",@@ -70,6 +71,7 @@"label.referrers": "Źródła odsyłające","label.refresh": "Odśwież","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "Wymagany","label.reset": "Zresetuj",@@ -103,6 +105,7 @@"label.user": "User","label.username": "Nazwa użytkownika","label.users": "Users",+ "label.view": "View","label.view-details": "Pokaż szczegóły","label.views": "Wyświetlenia","label.visitors": "Odwiedzający",diff --git a/lang/pt-BR.json b/lang/pt-BR.jsonindex 9aa9dba72..d0474f2f5 100644--- a/lang/pt-BR.json+++ b/lang/pt-BR.json@@ -3,7 +3,7 @@"label.actions": "Ações","label.activity-log": "Activity log","label.add-website": "Adicionar site",- "label.administrator": "Administrador",+ "label.admin": "Administrador","label.all": "Todos","label.all-time": "Todo o período","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "Navegadores","label.cancel": "Cancelar","label.change-password": "Alterar a senha",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "Confirme a nova senha",@@ -70,6 +71,7 @@"label.referrers": "Referências","label.refresh": "Atualizar","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "Obrigatório","label.reset": "Redefinir",@@ -103,6 +105,7 @@"label.user": "User","label.username": "Nome de usuário","label.users": "Users",+ "label.view": "View","label.view-details": "Ver detalhes","label.views": "Visualizações","label.visitors": "Visitantes",diff --git a/lang/pt-PT.json b/lang/pt-PT.jsonindex 0ca02f189..b25f28d4f 100644--- a/lang/pt-PT.json+++ b/lang/pt-PT.json@@ -3,7 +3,7 @@"label.actions": "Ações","label.activity-log": "Activity log","label.add-website": "Adicionar website",- "label.administrator": "Administrador",+ "label.admin": "Administrador","label.all": "Todos","label.all-time": "Todo o tempo","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "Navegadores","label.cancel": "Cancelar","label.change-password": "Alterar senha",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "Confirmar senha",@@ -70,6 +71,7 @@"label.referrers": "Referenciadores","label.refresh": "Atualizar","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "Obrigatório","label.reset": "Repor",@@ -103,6 +105,7 @@"label.user": "User","label.username": "Nome de utilizador","label.users": "Users",+ "label.view": "View","label.view-details": "Ver detalhes","label.views": "Visualizações","label.visitors": "Visitantes",diff --git a/lang/ro-RO.json b/lang/ro-RO.jsonindex 80780de34..12c9da8ff 100644--- a/lang/ro-RO.json+++ b/lang/ro-RO.json@@ -3,7 +3,7 @@"label.actions": "Acțiuni","label.activity-log": "Activity log","label.add-website": "Adăugare site web",- "label.administrator": "Administrator",+ "label.admin": "Administrator","label.all": "Toate","label.all-time": "All time","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "Browsere","label.cancel": "Anulează","label.change-password": "Schimbare parolă",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "Confirmare parolă",@@ -70,6 +71,7 @@"label.referrers": "Site-uri de proveniență","label.refresh": "Reîmprospătare","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "Obligatoriu","label.reset": "Resetează",@@ -103,6 +105,7 @@"label.user": "User","label.username": "Nume utilizator","label.users": "Users",+ "label.view": "View","label.view-details": "Vizualizare detalii","label.views": "Vizualizări","label.visitors": "Vizitatori",diff --git a/lang/ru-RU.json b/lang/ru-RU.jsonindex e315fcc76..9a03e37a2 100644--- a/lang/ru-RU.json+++ b/lang/ru-RU.json@@ -3,7 +3,7 @@"label.actions": "Действия","label.activity-log": "Activity log","label.add-website": "Добавить сайт",- "label.administrator": "Администратор",+ "label.admin": "Администратор","label.all": "Все","label.all-time": "Все время","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "Браузеры","label.cancel": "Отменить","label.change-password": "Изменить пароль",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "Подтвердить пароль",@@ -70,6 +71,7 @@"label.referrers": "Источники","label.refresh": "Обновить","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "Обязательное","label.reset": "Сбросить",@@ -103,6 +105,7 @@"label.user": "User","label.username": "Имя пользователя","label.users": "Users",+ "label.view": "View","label.view-details": "Посмотреть детали","label.views": "Просмотры","label.visitors": "Посетители",diff --git a/lang/sk-SK.json b/lang/sk-SK.jsonindex 4a051ba5e..dda7aee36 100644--- a/lang/sk-SK.json+++ b/lang/sk-SK.json@@ -3,7 +3,7 @@"label.actions": "Akcie","label.activity-log": "Activity log","label.add-website": "Pridať web",- "label.administrator": "Administrátor",+ "label.admin": "Administrátor","label.all": "Všetko","label.all-time": "All time","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "Prehliadač","label.cancel": "Zrušiť","label.change-password": "Zmeniť heslo",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "Potvrdiť heslo",@@ -70,6 +71,7 @@"label.referrers": "Odkazy","label.refresh": "Obnoviť","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "Povinné","label.reset": "Reset",@@ -103,6 +105,7 @@"label.user": "User","label.username": "Užívateľské meno","label.users": "Users",+ "label.view": "View","label.view-details": "Zobraziť detaily","label.views": "Zobrazení","label.visitors": "Návštevy",diff --git a/lang/sl-SI.json b/lang/sl-SI.jsonindex aa36d437b..c18dc6c8c 100644--- a/lang/sl-SI.json+++ b/lang/sl-SI.json@@ -3,7 +3,7 @@"label.actions": "Dejanja","label.activity-log": "Activity log","label.add-website": "Dodaj spletno mesto",- "label.administrator": "Administrator",+ "label.admin": "Administrator","label.all": "Vse","label.all-time": "All time","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "Brskalniki","label.cancel": "Prekliči","label.change-password": "Zamenjaj geslo",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "Potrditev gesla",@@ -70,6 +71,7 @@"label.referrers": "Viri","label.refresh": "Osveži","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "Zahtevano","label.reset": "Ponastavi",@@ -103,6 +105,7 @@"label.user": "User","label.username": "Uporabniško ime","label.users": "Users",+ "label.view": "View","label.view-details": "Prikaži podrobnosti","label.views": "Ogledi","label.visitors": "Obiskovalci",diff --git a/lang/sv-SE.json b/lang/sv-SE.jsonindex c1387840a..bef279f54 100644--- a/lang/sv-SE.json+++ b/lang/sv-SE.json@@ -3,7 +3,7 @@"label.actions": "Händelser","label.activity-log": "Activity log","label.add-website": "Lägg till webbsajt",- "label.administrator": "Administratör",+ "label.admin": "Administratör","label.all": "Alla","label.all-time": "Sedan början","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "Webbläsare","label.cancel": "Avbryt","label.change-password": "Byt lösenord",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "Bekräfta lösenord",@@ -70,6 +71,7 @@"label.referrers": "Hänvisare","label.refresh": "Uppdatera","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "Krävs","label.reset": "Återställ",@@ -103,6 +105,7 @@"label.user": "User","label.username": "Användarnamn","label.users": "Users",+ "label.view": "View","label.view-details": "Visa detaljer","label.views": "Visningar","label.visitors": "Besökare",diff --git a/lang/ta-IN.json b/lang/ta-IN.jsonindex 61cbc1330..27c5f7fc4 100644--- a/lang/ta-IN.json+++ b/lang/ta-IN.json@@ -3,7 +3,7 @@"label.actions": "செயல்கள்","label.activity-log": "Activity log","label.add-website": "வலைத்தளத்தைச் சேர்க்க",- "label.administrator": "நிர்வாகியைச் சேர்க்க",+ "label.admin": "நிர்வாகியைச் சேர்க்க","label.all": "எல்லாம்","label.all-time": "All time","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "உலாவிகள்","label.cancel": "ரத்துசெய்","label.change-password": "கடவுச்சொல்லை மாற்று",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "கடவுச்சொல்லை உறுதிப்படுத்தவும்",@@ -70,6 +71,7 @@"label.referrers": "குறிப்பிடுவோர்","label.refresh": "புதுப்பிப்பு","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "தேவையானவை","label.reset": "மீட்டமை",@@ -103,6 +105,7 @@"label.user": "User","label.username": "பயனர்பெயர்","label.users": "Users",+ "label.view": "View","label.view-details": "விபரங்களை பார்","label.views": "பார்வைகள்","label.visitors": "பார்வையாளர்கள்",diff --git a/lang/th-TH.json b/lang/th-TH.jsonindex 23fd7030b..d640256f4 100644--- a/lang/th-TH.json+++ b/lang/th-TH.json@@ -3,7 +3,7 @@"label.actions": "การกระทำ","label.activity-log": "Activity log","label.add-website": "เพิ่มเว็บไซต์",- "label.administrator": "ผู้ดูแลระบบ",+ "label.admin": "ผู้ดูแลระบบ","label.all": "ทั้งหมด","label.all-time": "ทุกช่วงเวลา","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "เบราว์เซอร์","label.cancel": "ยกเลิก","label.change-password": "เปลี่ยนรหัสผ่าน",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "ยืนยันรหัสผ่าน",@@ -70,6 +71,7 @@"label.referrers": "แหล่งที่มา","label.refresh": "รีเฟรช","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "ต้องการ","label.reset": "รีเซต",@@ -103,6 +105,7 @@"label.user": "User","label.username": "ชื่อผู้ใช้","label.users": "Users",+ "label.view": "View","label.view-details": "แสดงรายละเอียด","label.views": "การเข้าชม","label.visitors": "ผู้เข้าชม",diff --git a/lang/tr-TR.json b/lang/tr-TR.jsonindex 6009fef80..1c950a447 100644--- a/lang/tr-TR.json+++ b/lang/tr-TR.json@@ -3,7 +3,7 @@"label.actions": "Hareketler","label.activity-log": "Activity log","label.add-website": "Web sitesi ekle",- "label.administrator": "Yönetici",+ "label.admin": "Yönetici","label.all": "Tümü","label.all-time": "All time","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "Tarayıcılar","label.cancel": "İptal","label.change-password": "Şifre değiştir",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "Parolayı onayla",@@ -70,6 +71,7 @@"label.referrers": "Yönlendirenler","label.refresh": "Yenile","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "Zorunlu alan","label.reset": "Sıfırla",@@ -103,6 +105,7 @@"label.user": "User","label.username": "Kullanıcı adı","label.users": "Users",+ "label.view": "View","label.view-details": "Detayı incele","label.views": "Görüntüleme","label.visitors": "Ziyaretçi",diff --git a/lang/uk-UA.json b/lang/uk-UA.jsonindex 6068b6f8d..6af6077d7 100644--- a/lang/uk-UA.json+++ b/lang/uk-UA.json@@ -3,7 +3,7 @@"label.actions": "Дії","label.activity-log": "Activity log","label.add-website": "Додати сайт",- "label.administrator": "Адміністратор",+ "label.admin": "Адміністратор","label.all": "Всі","label.all-time": "Весь час","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "Браузери","label.cancel": "Відмінити","label.change-password": "Змінити пароль",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "Підтвердити пароль",@@ -70,6 +71,7 @@"label.referrers": "Джерела","label.refresh": "Оновити","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "Обов'язкове","label.reset": "Скинути",@@ -103,6 +105,7 @@"label.user": "User","label.username": "Ім'я користувача","label.users": "Users",+ "label.view": "View","label.view-details": "Переглянути деталі","label.views": "Перегляди","label.visitors": "Відвідувачі",diff --git a/lang/ur-PK.json b/lang/ur-PK.jsonindex 47807e0d0..9ac24ff64 100644--- a/lang/ur-PK.json+++ b/lang/ur-PK.json@@ -3,7 +3,7 @@"label.actions": "اعمال","label.activity-log": "Activity log","label.add-website": "ویب سائٹ کا اضافہ کریں",- "label.administrator": "منتظم",+ "label.admin": "منتظم","label.all": "تمام","label.all-time": "تمام وقت","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "براؤزرز","label.cancel": "منسوخ","label.change-password": "پاس ورڈ تبدیل کریں",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "پاس ورڈ کی تصدیق کریں",@@ -70,6 +71,7 @@"label.referrers": "بھیجنے والے","label.refresh": "تازہ دم کریں","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "درکار ہے","label.reset": "دوبارہ ترتیب دیں",@@ -103,6 +105,7 @@"label.user": "User","label.username": "صارف نام","label.users": "Users",+ "label.view": "View","label.view-details": "تفصیلات دیکھیں","label.views": "مناظر","label.visitors": "زائرین",diff --git a/lang/vi-VN.json b/lang/vi-VN.jsonindex b9394817b..53918d991 100644--- a/lang/vi-VN.json+++ b/lang/vi-VN.json@@ -3,7 +3,7 @@"label.actions": "Hành động","label.activity-log": "Activity log","label.add-website": "Thêm website",- "label.administrator": "Quản trị",+ "label.admin": "Quản trị","label.all": "Tất cả","label.all-time": "Toàn thời gian","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "Trình duyệt","label.cancel": "Huỷ bỏ","label.change-password": "Đổi mật khẩu",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "Xác nhận mật khẩu",@@ -70,6 +71,7 @@"label.referrers": "Liên kết giới thiệu","label.refresh": "Làm mới","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "Yêu cầu","label.reset": "Tái thiết lập",@@ -103,6 +105,7 @@"label.user": "User","label.username": "Tên đăng nhập","label.users": "Users",+ "label.view": "View","label.view-details": "Xem chi tiết","label.views": "Xem","label.visitors": "Khách",diff --git a/lang/zh-CN.json b/lang/zh-CN.jsonindex d9d7a87ff..6d3cc9d69 100644--- a/lang/zh-CN.json+++ b/lang/zh-CN.json@@ -3,7 +3,7 @@"label.actions": "用户行为","label.activity-log": "Activity log","label.add-website": "添加网站",- "label.administrator": "管理员",+ "label.admin": "管理员","label.all": "所有","label.all-time": "所有时间段","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "浏览器","label.cancel": "取消","label.change-password": "更新密码",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "确认密码",@@ -70,6 +71,7 @@"label.referrers": "来源域名","label.refresh": "刷新","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "必填","label.reset": "重置",@@ -103,6 +105,7 @@"label.user": "User","label.username": "用户名","label.users": "Users",+ "label.view": "View","label.view-details": "查看更多","label.views": "浏览量","label.visitors": "访客",diff --git a/lang/zh-TW.json b/lang/zh-TW.jsonindex 0a721506d..51ae913b7 100644--- a/lang/zh-TW.json+++ b/lang/zh-TW.json@@ -3,7 +3,7 @@"label.actions": "用戶行為","label.activity-log": "Activity log","label.add-website": "增加網站",- "label.administrator": "管理員",+ "label.admin": "管理員","label.all": "所有","label.all-time": "所有時間段","label.analytics": "Analytics",@@ -13,6 +13,7 @@"label.browsers": "瀏覽器","label.cancel": "取消","label.change-password": "更新密碼",+ "label.cities": "Cities","label.clear-all": "Clear all","label.confirm": "Confirm","label.confirm-password": "確認密碼",@@ -70,6 +71,7 @@"label.referrers": "指入域名","label.refresh": "刷新","label.regenerate": "Regenerate",+ "label.regions": "Regions","label.remove": "Remove","label.required": "必填","label.reset": "重置",@@ -103,6 +105,7 @@"label.user": "User","label.username": "用户名","label.users": "Users",+ "label.view": "View","label.view-details": "查看更多","label.views": "頁面流量","label.visitors": "獨立訪客",diff --git a/lib/constants.ts b/lib/constants.tsindex e028b3f47..9b16fc55e 100644--- a/lib/constants.ts+++ b/lib/constants.ts@@ -37,10 +37,9 @@ export const SESSION_COLUMNS = ['os','device','screen',- 'country','language',- 'subdivision1',- 'subdivision2',+ 'country',+ 'region','city',];@@ -50,6 +49,7 @@ export const FILTER_COLUMNS = {title: 'page_title',query: 'url_query',event: 'event_name',+ region: 'subdivision1',};export const EVENT_TYPE = {diff --git a/pages/api/websites/[id]/metrics.ts b/pages/api/websites/[id]/metrics.tsindex d586b82c9..5cf818a05 100644--- a/pages/api/websites/[id]/metrics.ts+++ b/pages/api/websites/[id]/metrics.ts@@ -20,8 +20,7 @@ export interface WebsiteMetricsRequestQuery {browser: string;device: string;country: string;- subdivision1: string;- subdivision2: string;+ region: string;city: string;}@@ -46,8 +45,7 @@ export default async (browser,device,country,- subdivision1,- subdivision2,+ region,city,} = req.query;@@ -66,8 +64,7 @@ export default async (browser,device,country,- subdivision1,- subdivision2,+ region,city,};@@ -111,8 +108,7 @@ export default async (browser,device,country,- subdivision1,- subdivision2,+ region,city,};